date:20190529

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

2019-05-29 Thread translation

commit 71faccef244ab3f5cc82751a77a10743f73278d4
Author: Translation commit bot 
Date:   Thu May 30 01:51:01 2019 +

Update translations for tpo-web_completed
---
 contents+pt-BR.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index eb9aa557e..df14bb708 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -10,8 +10,8 @@
 # Danihells , 2019
 # Communia , 2019
 # Emma Peel, 2019
-# Eduardo Addad de Oliveira , 2019
 # Chacal E., 2019
+# Eduardo Addad de Oliveira , 2019
 # 
 msgid ""
 msgstr ""
@@ -19,7 +19,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-29 09:02+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Chacal E., 2019\n"
+"Last-Translator: Eduardo Addad de Oliveira , 2019\n"
 "Language-Team: Portuguese (Brazil) 
(https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -889,11 +889,11 @@ msgstr ""
 #: templates/hero-download-languages.html:2
 #: templates/hero-download-options.html:2
 msgid "DEFEND YOURSELF"
-msgstr ""
+msgstr "DEFENDA-SE"
 
 #: templates/hero-download-tor.html:2
 msgid "GROW THE NETWORK"
-msgstr ""
+msgstr "Aumente a rede"
 
 #: templates/hero-download.html:2
 msgid "Defend yourself."

___
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-29 Thread translation

commit 4b4df99f10395239dfd791fe90c835783afe2734
Author: Translation commit bot 
Date:   Thu May 30 01:51:26 2019 +

Update translations for support-portal_completed
---
 contents+pt-BR.po | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index 909702781..864e435fb 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -6,10 +6,10 @@
 # erinm, 2019
 # Alexei GonÃ§alves de Oliveira , 2019
 # Greg Strider , 2019
-# Eduardo Addad de Oliveira , 2019
 # Emma Peel, 2019
 # Communia , 2019
 # Chacal E., 2019
+# Eduardo Addad de Oliveira , 2019
 # 
 msgid ""
 msgstr ""
@@ -17,7 +17,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-24 08:29+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Chacal E., 2019\n"
+"Last-Translator: Eduardo Addad de Oliveira , 2019\n"
 "Language-Team: Portuguese (Brazil) 
(https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -3883,6 +3883,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 ""
+"E se vocÃª estiver acessando um site com HTTPS e serviÃ§o de onion, ele "
+"mostrarÃ¡ um Ãcone de uma cebola verde e um cadeado."
 
 #: https//support.torproject.org/onionservices/onionservices-2/
 #: (content/onionservices/onionservices-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/support-portal] Update translations for support-portal

2019-05-29 Thread translation

commit 26f4d58587a8ee4c7aac5871818cd4529c0c99df
Author: Translation commit bot 
Date:   Thu May 30 01:51:19 2019 +

Update translations for support-portal
---
 contents+pt-BR.po | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index 909702781..864e435fb 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -6,10 +6,10 @@
 # erinm, 2019
 # Alexei GonÃ§alves de Oliveira , 2019
 # Greg Strider , 2019
-# Eduardo Addad de Oliveira , 2019
 # Emma Peel, 2019
 # Communia , 2019
 # Chacal E., 2019
+# Eduardo Addad de Oliveira , 2019
 # 
 msgid ""
 msgstr ""
@@ -17,7 +17,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-24 08:29+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Chacal E., 2019\n"
+"Last-Translator: Eduardo Addad de Oliveira , 2019\n"
 "Language-Team: Portuguese (Brazil) 
(https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -3883,6 +3883,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 ""
+"E se vocÃª estiver acessando um site com HTTPS e serviÃ§o de onion, ele "
+"mostrarÃ¡ um Ãcone de uma cebola verde e um cadeado."
 
 #: https//support.torproject.org/onionservices/onionservices-2/
 #: (content/onionservices/onionservices-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-29 Thread translation

commit b103ea75e1d0fcc13023b43b85a337831375450a
Author: Translation commit bot 
Date:   Thu May 30 01:50:55 2019 +

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

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index eb9aa557e..df14bb708 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -10,8 +10,8 @@
 # Danihells , 2019
 # Communia , 2019
 # Emma Peel, 2019
-# Eduardo Addad de Oliveira , 2019
 # Chacal E., 2019
+# Eduardo Addad de Oliveira , 2019
 # 
 msgid ""
 msgstr ""
@@ -19,7 +19,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-29 09:02+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Chacal E., 2019\n"
+"Last-Translator: Eduardo Addad de Oliveira , 2019\n"
 "Language-Team: Portuguese (Brazil) 
(https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -889,11 +889,11 @@ msgstr ""
 #: templates/hero-download-languages.html:2
 #: templates/hero-download-options.html:2
 msgid "DEFEND YOURSELF"
-msgstr ""
+msgstr "DEFENDA-SE"
 
 #: templates/hero-download-tor.html:2
 msgid "GROW THE NETWORK"
-msgstr ""
+msgstr "Aumente a rede"
 
 #: templates/hero-download.html:2
 msgid "Defend yourself."

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

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

2019-05-29 Thread translation

commit 5101aa9cd1a48eaae0112add717259b9f216cde8
Author: Translation commit bot 
Date:   Thu May 30 01:49:23 2019 +

Update translations for torbutton-torbuttonproperties_completed
---
 zh-CN/torbutton.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zh-CN/torbutton.properties b/zh-CN/torbutton.properties
index 4dbf1a919..1ea67a1cb 100644
--- a/zh-CN/torbutton.properties
+++ b/zh-CN/torbutton.properties
@@ -34,7 +34,7 @@ torbutton.popup.confirm_newnym = Tor æµè§å¨å°å³éå
¨é¨çªå£åæ ç¾é¡µ
 torbutton.maximize_warning = æå¤§å Tor 
æµè§å¨çªå£ä¹åï¼ç½ç«å¯è·åæ¾ç¤ºå¨å°ºå¯¸ä¿¡æ¯ï¼ä»èå¯è·è¸ªç¨æ·ãå»ºè®®ä½¿ç¨é»è®¤ç
 Tor æµè§å¨çªå£å¤§å°ã
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=æ¤ç½ç« (%S) è¯å¾è·å HTML5 Canva 
å¾åæ°æ®ï¼è¯¥æ°æ®å¯ç¨ä½ä½ æç¨è®¡ç®æºçå¯ä¸æ è¯ã\n\nTor 
æµè§å¨æ¯å¦åºåè®¸æ¤ç½ç«è·å HTML5 Canva å¾åæ°æ®ï¼
+canvas.siteprompt=æ¤ç½ç«ï¼%Sï¼è¯å¾è·å HTML5 Canva 
å¾åæ°æ®ï¼è¯¥æ°æ®å¯ç¨ä½ä½ æç¨è®¡ç®æºçå¯ä¸æ è¯ã\n\nTor 
æµè§å¨æ¯å¦åºåè®¸æ¤ç½ç«è·å HTML5 Canva å¾åæ°æ®ï¼
 canvas.notNow=æä¸
 canvas.notNowAccessKey=N
 canvas.allow=ä»¥åä¸ç´åè®¸
@@ -56,5 +56,5 @@ profileMigrationFailed=è½¬ç§»æ¨å·²æçéç½®æä»¶ %S 
å¤±è´¥ã\næ°è®¾ç½®å°
 updateDownloadingPanelUILabel=æ£ä¸è½½ %S æ´æ°
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=è¿æ¥å·²ç»è¢«å 
å¯ï¼æ´è±æå¡ï¼ %1$S, %2$S å¯é¥, %3$Sï¼
+pageInfo_OnionEncryptionWithBitsAndProtocol=è¿æ¥å·²ç»è¢«å 
å¯ï¼æ´è±æå¡ï¼%1$Sï¼%2$S ä½å¯é¥ï¼%3$Sï¼
 pageInfo_OnionEncryption=è¿æ¥å·²ç»è¢«å å¯ï¼æ´è±æå¡ï¼

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

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

2019-05-29 Thread translation

commit 9addf97a64f3ada2a712b6cb75b4357130e29883
Author: Translation commit bot 
Date:   Thu May 30 01:49:14 2019 +

Update translations for torbutton-torbuttonproperties
---
 zh-CN/torbutton.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zh-CN/torbutton.properties b/zh-CN/torbutton.properties
index 4dbf1a919..1ea67a1cb 100644
--- a/zh-CN/torbutton.properties
+++ b/zh-CN/torbutton.properties
@@ -34,7 +34,7 @@ torbutton.popup.confirm_newnym = Tor æµè§å¨å°å³éå
¨é¨çªå£åæ ç¾é¡µ
 torbutton.maximize_warning = æå¤§å Tor 
æµè§å¨çªå£ä¹åï¼ç½ç«å¯è·åæ¾ç¤ºå¨å°ºå¯¸ä¿¡æ¯ï¼ä»èå¯è·è¸ªç¨æ·ãå»ºè®®ä½¿ç¨é»è®¤ç
 Tor æµè§å¨çªå£å¤§å°ã
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=æ¤ç½ç« (%S) è¯å¾è·å HTML5 Canva 
å¾åæ°æ®ï¼è¯¥æ°æ®å¯ç¨ä½ä½ æç¨è®¡ç®æºçå¯ä¸æ è¯ã\n\nTor 
æµè§å¨æ¯å¦åºåè®¸æ¤ç½ç«è·å HTML5 Canva å¾åæ°æ®ï¼
+canvas.siteprompt=æ¤ç½ç«ï¼%Sï¼è¯å¾è·å HTML5 Canva 
å¾åæ°æ®ï¼è¯¥æ°æ®å¯ç¨ä½ä½ æç¨è®¡ç®æºçå¯ä¸æ è¯ã\n\nTor 
æµè§å¨æ¯å¦åºåè®¸æ¤ç½ç«è·å HTML5 Canva å¾åæ°æ®ï¼
 canvas.notNow=æä¸
 canvas.notNowAccessKey=N
 canvas.allow=ä»¥åä¸ç´åè®¸
@@ -56,5 +56,5 @@ profileMigrationFailed=è½¬ç§»æ¨å·²æçéç½®æä»¶ %S 
å¤±è´¥ã\næ°è®¾ç½®å°
 updateDownloadingPanelUILabel=æ£ä¸è½½ %S æ´æ°
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=è¿æ¥å·²ç»è¢«å 
å¯ï¼æ´è±æå¡ï¼ %1$S, %2$S å¯é¥, %3$Sï¼
+pageInfo_OnionEncryptionWithBitsAndProtocol=è¿æ¥å·²ç»è¢«å 
å¯ï¼æ´è±æå¡ï¼%1$Sï¼%2$S ä½å¯é¥ï¼%3$Sï¼
 pageInfo_OnionEncryption=è¿æ¥å·²ç»è¢«å å¯ï¼æ´è±æå¡ï¼

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

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

2019-05-29 Thread translation

commit 14d0ac0b2dc0837c90b7ed3a3c505e10488ec664
Author: Translation commit bot 
Date:   Thu May 30 01:21:09 2019 +

Update translations for whisperback
---
 zh_CN/zh_CN.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po
index 68c26d3ee..f4b04adf2 100644
--- a/zh_CN/zh_CN.po
+++ b/zh_CN/zh_CN.po
@@ -18,7 +18,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-29 12:08+0200\n"
-"PO-Revision-Date: 2019-05-24 23:52+\n"
+"PO-Revision-Date: 2019-05-30 00:55+\n"
 "Last-Translator: Yikai Yang \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"

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

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

2019-05-29 Thread translation

commit f900c5e2f5aab4ace16326f7b2a751838bac79ef
Author: Translation commit bot 
Date:   Thu May 30 01:21:16 2019 +

Update translations for whisperback_completed
---
 zh_CN/zh_CN.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po
index 68c26d3ee..f4b04adf2 100644
--- a/zh_CN/zh_CN.po
+++ b/zh_CN/zh_CN.po
@@ -18,7 +18,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-29 12:08+0200\n"
-"PO-Revision-Date: 2019-05-24 23:52+\n"
+"PO-Revision-Date: 2019-05-30 00:55+\n"
 "Last-Translator: Yikai Yang \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"

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

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

2019-05-29 Thread translation

commit 3b1590856695aad2ce45ef847df0f23b581ba7d0
Author: Translation commit bot 
Date:   Thu May 30 01:20:11 2019 +

Update translations for torbutton-securitylevelproperties
---
 zh-CN/securitylevel.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh-CN/securitylevel.properties b/zh-CN/securitylevel.properties
index f64dfb3e9..b0d26217b 100644
--- a/zh-CN/securitylevel.properties
+++ b/zh-CN/securitylevel.properties
@@ -3,7 +3,7 @@ securityLevel.customWarning = èªå®ä¹
 securityLevel.overview = ç¦ç¨é¨åè½å½±åä½ å®å
¨åå¿åæ§çäºèç½åè½ã
 securityLevel.standard.level = æ åå®å¨æ§
 securityLevel.standard.tooltip = å®å¨ççº§ï¼æ å
-securityLevel.standard.summary = å°å¯ç¨ææToræµè§å¨ä¸ç½ç«åè½ã
+securityLevel.standard.summary = å°å¯ç¨ Tor 
æµè§å¨åç½ç«çææåè½ã
 securityLevel.safer.level = ä¸çå®å¨æ§
 securityLevel.safer.tooltip = å®å¨ççº§ï¼è¾å®å¨
 securityLevel.safer.summary = 
ç¦ç¨ç½ç«åè½éå¸¸æ¯å±é©çï¼è¿ä¼å¯¼è´ä¸äºç«ä¸è½æ£å¸¸è¿ä½ã

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

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

2019-05-29 Thread translation

commit b12c1a23e910c1f53e10a8ea89ade40311aba6ee
Author: Translation commit bot 
Date:   Thu May 30 01:20:17 2019 +

Update translations for torbutton-securitylevelproperties_completed
---
 zh-CN/securitylevel.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh-CN/securitylevel.properties b/zh-CN/securitylevel.properties
index f64dfb3e9..b0d26217b 100644
--- a/zh-CN/securitylevel.properties
+++ b/zh-CN/securitylevel.properties
@@ -3,7 +3,7 @@ securityLevel.customWarning = èªå®ä¹
 securityLevel.overview = ç¦ç¨é¨åè½å½±åä½ å®å
¨åå¿åæ§çäºèç½åè½ã
 securityLevel.standard.level = æ åå®å¨æ§
 securityLevel.standard.tooltip = å®å¨ççº§ï¼æ å
-securityLevel.standard.summary = å°å¯ç¨ææToræµè§å¨ä¸ç½ç«åè½ã
+securityLevel.standard.summary = å°å¯ç¨ Tor 
æµè§å¨åç½ç«çææåè½ã
 securityLevel.safer.level = ä¸çå®å¨æ§
 securityLevel.safer.tooltip = å®å¨ççº§ï¼è¾å®å¨
 securityLevel.safer.summary = 
ç¦ç¨ç½ç«åè½éå¸¸æ¯å±é©çï¼è¿ä¼å¯¼è´ä¸äºç«ä¸è½æ£å¸¸è¿ä½ã

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

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

2019-05-29 Thread translation

commit 8af565615e57e88741cb4da214f773880183e0d8
Author: Translation commit bot 
Date:   Thu May 30 01:19:52 2019 +

Update translations for torbutton-abouttbupdatedtd_completed
---
 zh-CN/abouttbupdate.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zh-CN/abouttbupdate.dtd b/zh-CN/abouttbupdate.dtd
index 7d15c9c4d..385bcc4a5 100644
--- a/zh-CN/abouttbupdate.dtd
+++ b/zh-CN/abouttbupdate.dtd
@@ -1,5 +1,5 @@
-
-
+
+
 
 
 

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

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

2019-05-29 Thread translation

commit 846044798da74a8ee2a8e8551a384b9c39814a1a
Author: Translation commit bot 
Date:   Thu May 30 01:19:29 2019 +

Update translations for torbutton-torbuttondtd_completed
---
 zh-CN/torbutton.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/zh-CN/torbutton.dtd b/zh-CN/torbutton.dtd
index 98cdfa117..22f3b1965 100644
--- a/zh-CN/torbutton.dtd
+++ b/zh-CN/torbutton.dtd
@@ -1,10 +1,10 @@
 
 
-
+
 
 
 
-
+
 
 
 
@@ -24,7 +24,7 @@
 
 
 
-
+
 
 
 
@@ -37,5 +37,5 @@
 
 
 
-
+
 

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

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

2019-05-29 Thread translation

commit db2b73b99f65b6f18fa3de9a9c785fc4f64fc08d
Author: Translation commit bot 
Date:   Thu May 30 01:19:58 2019 +

Update translations for torbutton-browseronboardingproperties
---
 zh-CN/browserOnboarding.properties | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/zh-CN/browserOnboarding.properties 
b/zh-CN/browserOnboarding.properties
index 6fae2753e..f56822a84 100644
--- a/zh-CN/browserOnboarding.properties
+++ b/zh-CN/browserOnboarding.properties
@@ -4,17 +4,17 @@
 
 onboarding.tour-tor-welcome=æ¬¢è¿
 onboarding.tour-tor-welcome.title=ä¸åå°±ç»ªã
-onboarding.tour-tor-welcome.description=Tor Browser 
å¨æµè§äºèç½ä¸æä¾æé«æ åçéç§åå®å¨ä¿æ¤ï¼å¸®å©ä½ 
å¯¹æè·è¸ªãçæ§åå®¡æ¥ãè¿ä¸ªå¿«éæåä¼åä½ ä»ç»æä»¬æ¯ææ 
·åçã
+onboarding.tour-tor-welcome.description=Tor 
æµè§å¨å¨æµè§äºèç½ä¸æä¾æé«æ åçéç§åå®å
¨ä¿æ¤ï¼å¸®å©ä½ å¯¹æè·è¸ªãçæ§åå®¡æ¥ãè¿ä¸ªå¿«éæåä¼åä½ 
ä»ç»æä»¬æ¯ææ ·åçã
 onboarding.tour-tor-welcome.next-button=åå¾âéç§â
 
 onboarding.tour-tor-privacy=éç§
 onboarding.tour-tor-privacy.title=æç»è·è¸ªååæ¢ã
-onboarding.tour-tor-privacy.description=Tor Browser ä¼éç¦» Cookie 
ï¼å¹¶å¨ä½ æµè§ç»ææ¶å é¤ Cookies 
ååå²è®°å½ãè¿äºä¿®æ¹ä¿è¯äºä½ çå®å
¨åéç§å¨æµè§è¿ç¨ä¸æ¶å°ä¿æ¤ãç¹å» âTor ç½ç»â 
äºè§£æä»¬å¦ä½å¨ç½ç»å±çº§è¿è¡ä¿æ¤ã
+onboarding.tour-tor-privacy.description=Tor æµè§å¨ä¼éç¦» Cookie 
ï¼å¹¶å¨ä½ æµè§ç»ææ¶å é¤ Cookies 
ååå²è®°å½ãè¿äºä¿®æ¹ä¿è¯äºä½ çå®å
¨åéç§å¨æµè§è¿ç¨ä¸åå°ä¿æ¤ãç¹å»âTor 
ç½ç»âä»¥äºè§£æä»¬å¦ä½å¨ç½ç»å±çº§è¿è¡ä¿æ¤ã
 onboarding.tour-tor-privacy.button=åå¾âTor ç½ç»â
 
 onboarding.tour-tor-network=Tor ç½ç»
 onboarding.tour-tor-network.title=éè¿éä¸å¿åçç½ç»è¿è¡æµè§ã
-onboarding.tour-tor-network.description=Tor Browser å°ä½ 
åä¸çæ°ååå¿æ¿èæ¯æç Tor ç½ç»ç¸è¿ãå VPN 
ä¸åçæ¯ï¼è¿éä¸ä¼æåç¹æéï¼ä¹ä¸éè¦ä½ 
ä¸ºäºç§å¯æµè§ä¿¡ä»»æä¸ä¸ªä¸å¿åçå®ä½ã
+onboarding.tour-tor-network.description=Tor æµè§å¨å°ä½ 
åä¸çæ°ååå¿æ¿èæ¯æç Tor ç½ç»ç¸è¿ãå VPN 
ä¸åçæ¯ï¼è¿éä¸ä¼æåç¹æéï¼ä¹ä¸éè¦ä½ 
ä¸ºäºç§å¯æµè§ä¿¡ä»»æä¸ä¸ªä¸å¿åçå®ä½ã
 onboarding.tour-tor-network.button=åå¾ âæ¾ç¤ºé¾è·¯'
 
 onboarding.tour-tor-circuit-display=æ¾ç¤ºé¾è·¯
@@ -24,8 +24,8 @@ 
onboarding.tour-tor-circuit-display.button=æ¥çæçè·¯å¾ã
 onboarding.tour-tor-circuit-display.next-button=åå¾âå®å¨â
 
 onboarding.tour-tor-security=å®å¨
-onboarding.tour-tor-security.title=èªå®ä½ çæµè§ä½éªã
-onboarding.tour-tor-security.description=æä»¬ä¹æä¾æ´å¤éé¡¹æ¥è¿ä¸æ¥å¼ºå
 Tor Browser çå®å¨æ§ãå®å¨è®¾ç½®å¯ä»¥åè®¸ä½ 
å±è½å¯è½ä¼è¢«ç¨äºæ»å»ä½ ççµèçåç´ 
ãç¹å»ä¸æ¹çæé®æ¥äºè§£ä¸åçéé¡¹çä½ç¨ã
+onboarding.tour-tor-security.title=èªå®ä¹ä½ çæµè§ä½éªã
+onboarding.tour-tor-security.description=æä»¬ä¹æä¾æ´å¤éé¡¹æ¥è¿ä¸æ¥å¼ºå
 Tor æµè§å¨çå®å¨æ§ãå®å¨è®¾ç½®å¯ä»¥åè®¸ä½ 
å±è½å¯è½ä¼è¢«ç¨äºæ»å»ä½ ççµèçåç´ 
ãç¹å»ä¸æ¹çæé®æ¥äºè§£ä¸åçéé¡¹çä½ç¨ã
 
onboarding.tour-tor-security.description-suffix=æ³¨ï¼é»è®¤è®¾ç½®ä¸ï¼NoScript
 å HTTPS Everywhere ä¸å¨å·¥å·æ 
åºç°ï¼ä½æ¨å¯ä»¥âå®å¶âæ¨çå·¥å·æ æ¥æ·»å ä¸¤èçå¾æ ã
 onboarding.tour-tor-security-level.button=æ¥çä½ è®¾ç½®çå®å¨çº§å«
 onboarding.tour-tor-security-level.next-button=åå¾âä½éªå°è´´å£«â
@@ -48,7 +48,7 @@ onboarding.tour-tor-update.prefix-updated=å·²æ´æ°
 
 onboarding.tour-tor-toolbar=å·¥å·æ 
 onboarding.tour-tor-toolbar-update-8.5.title=å·¥å·æ å¸å±
-onboarding.tour-tor-toolbar-update-8.5.description=æä»¬æ¹è¿äºæµè§å¨çå·¥å
·æ å¸å±ãæä»¬æToræé®å¾æ ç§»å¨å°äºå°åæ 
çåé¢ãæä»¬å¨å®æè¾¹è¿å äºä¸ä¸ªå®å¨çº§å«å¾æ ã
+onboarding.tour-tor-toolbar-update-8.5.description=æä»¬æ¹è¿äºæµè§å¨çå·¥å
·æ å¸å±ãæä»¬æ Tor æé®å¾æ ç§»å¨å°äºå°åæ 
çåé¢ãæä»¬å¨å®æè¾¹è¿å äºä¸ä¸ªå®å¨çº§å«å¾æ ã
 onboarding.tour-tor-toolbar-update-8.5.next-button=åå¾âå®å¨â
 
 onboarding.tour-tor-security-update-8.5.title=å®å¨çº§å«ä½éª

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

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

2019-05-29 Thread translation

commit 6def1e569e08b6a7427296f169cec718d61891b5
Author: Translation commit bot 
Date:   Thu May 30 01:20:05 2019 +

Update translations for torbutton-browseronboardingproperties_completed
---
 zh-CN/browserOnboarding.properties | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/zh-CN/browserOnboarding.properties 
b/zh-CN/browserOnboarding.properties
index 6fae2753e..f56822a84 100644
--- a/zh-CN/browserOnboarding.properties
+++ b/zh-CN/browserOnboarding.properties
@@ -4,17 +4,17 @@
 
 onboarding.tour-tor-welcome=æ¬¢è¿
 onboarding.tour-tor-welcome.title=ä¸åå°±ç»ªã
-onboarding.tour-tor-welcome.description=Tor Browser 
å¨æµè§äºèç½ä¸æä¾æé«æ åçéç§åå®å¨ä¿æ¤ï¼å¸®å©ä½ 
å¯¹æè·è¸ªãçæ§åå®¡æ¥ãè¿ä¸ªå¿«éæåä¼åä½ ä»ç»æä»¬æ¯ææ 
·åçã
+onboarding.tour-tor-welcome.description=Tor 
æµè§å¨å¨æµè§äºèç½ä¸æä¾æé«æ åçéç§åå®å
¨ä¿æ¤ï¼å¸®å©ä½ å¯¹æè·è¸ªãçæ§åå®¡æ¥ãè¿ä¸ªå¿«éæåä¼åä½ 
ä»ç»æä»¬æ¯ææ ·åçã
 onboarding.tour-tor-welcome.next-button=åå¾âéç§â
 
 onboarding.tour-tor-privacy=éç§
 onboarding.tour-tor-privacy.title=æç»è·è¸ªååæ¢ã
-onboarding.tour-tor-privacy.description=Tor Browser ä¼éç¦» Cookie 
ï¼å¹¶å¨ä½ æµè§ç»ææ¶å é¤ Cookies 
ååå²è®°å½ãè¿äºä¿®æ¹ä¿è¯äºä½ çå®å
¨åéç§å¨æµè§è¿ç¨ä¸æ¶å°ä¿æ¤ãç¹å» âTor ç½ç»â 
äºè§£æä»¬å¦ä½å¨ç½ç»å±çº§è¿è¡ä¿æ¤ã
+onboarding.tour-tor-privacy.description=Tor æµè§å¨ä¼éç¦» Cookie 
ï¼å¹¶å¨ä½ æµè§ç»ææ¶å é¤ Cookies 
ååå²è®°å½ãè¿äºä¿®æ¹ä¿è¯äºä½ çå®å
¨åéç§å¨æµè§è¿ç¨ä¸åå°ä¿æ¤ãç¹å»âTor 
ç½ç»âä»¥äºè§£æä»¬å¦ä½å¨ç½ç»å±çº§è¿è¡ä¿æ¤ã
 onboarding.tour-tor-privacy.button=åå¾âTor ç½ç»â
 
 onboarding.tour-tor-network=Tor ç½ç»
 onboarding.tour-tor-network.title=éè¿éä¸å¿åçç½ç»è¿è¡æµè§ã
-onboarding.tour-tor-network.description=Tor Browser å°ä½ 
åä¸çæ°ååå¿æ¿èæ¯æç Tor ç½ç»ç¸è¿ãå VPN 
ä¸åçæ¯ï¼è¿éä¸ä¼æåç¹æéï¼ä¹ä¸éè¦ä½ 
ä¸ºäºç§å¯æµè§ä¿¡ä»»æä¸ä¸ªä¸å¿åçå®ä½ã
+onboarding.tour-tor-network.description=Tor æµè§å¨å°ä½ 
åä¸çæ°ååå¿æ¿èæ¯æç Tor ç½ç»ç¸è¿ãå VPN 
ä¸åçæ¯ï¼è¿éä¸ä¼æåç¹æéï¼ä¹ä¸éè¦ä½ 
ä¸ºäºç§å¯æµè§ä¿¡ä»»æä¸ä¸ªä¸å¿åçå®ä½ã
 onboarding.tour-tor-network.button=åå¾ âæ¾ç¤ºé¾è·¯'
 
 onboarding.tour-tor-circuit-display=æ¾ç¤ºé¾è·¯
@@ -24,8 +24,8 @@ 
onboarding.tour-tor-circuit-display.button=æ¥çæçè·¯å¾ã
 onboarding.tour-tor-circuit-display.next-button=åå¾âå®å¨â
 
 onboarding.tour-tor-security=å®å¨
-onboarding.tour-tor-security.title=èªå®ä½ çæµè§ä½éªã
-onboarding.tour-tor-security.description=æä»¬ä¹æä¾æ´å¤éé¡¹æ¥è¿ä¸æ¥å¼ºå
 Tor Browser çå®å¨æ§ãå®å¨è®¾ç½®å¯ä»¥åè®¸ä½ 
å±è½å¯è½ä¼è¢«ç¨äºæ»å»ä½ ççµèçåç´ 
ãç¹å»ä¸æ¹çæé®æ¥äºè§£ä¸åçéé¡¹çä½ç¨ã
+onboarding.tour-tor-security.title=èªå®ä¹ä½ çæµè§ä½éªã
+onboarding.tour-tor-security.description=æä»¬ä¹æä¾æ´å¤éé¡¹æ¥è¿ä¸æ¥å¼ºå
 Tor æµè§å¨çå®å¨æ§ãå®å¨è®¾ç½®å¯ä»¥åè®¸ä½ 
å±è½å¯è½ä¼è¢«ç¨äºæ»å»ä½ ççµèçåç´ 
ãç¹å»ä¸æ¹çæé®æ¥äºè§£ä¸åçéé¡¹çä½ç¨ã
 
onboarding.tour-tor-security.description-suffix=æ³¨ï¼é»è®¤è®¾ç½®ä¸ï¼NoScript
 å HTTPS Everywhere ä¸å¨å·¥å·æ 
åºç°ï¼ä½æ¨å¯ä»¥âå®å¶âæ¨çå·¥å·æ æ¥æ·»å ä¸¤èçå¾æ ã
 onboarding.tour-tor-security-level.button=æ¥çä½ è®¾ç½®çå®å¨çº§å«
 onboarding.tour-tor-security-level.next-button=åå¾âä½éªå°è´´å£«â
@@ -48,7 +48,7 @@ onboarding.tour-tor-update.prefix-updated=å·²æ´æ°
 
 onboarding.tour-tor-toolbar=å·¥å·æ 
 onboarding.tour-tor-toolbar-update-8.5.title=å·¥å·æ å¸å±
-onboarding.tour-tor-toolbar-update-8.5.description=æä»¬æ¹è¿äºæµè§å¨çå·¥å
·æ å¸å±ãæä»¬æToræé®å¾æ ç§»å¨å°äºå°åæ 
çåé¢ãæä»¬å¨å®æè¾¹è¿å äºä¸ä¸ªå®å¨çº§å«å¾æ ã
+onboarding.tour-tor-toolbar-update-8.5.description=æä»¬æ¹è¿äºæµè§å¨çå·¥å
·æ å¸å±ãæä»¬æ Tor æé®å¾æ ç§»å¨å°äºå°åæ 
çåé¢ãæä»¬å¨å®æè¾¹è¿å äºä¸ä¸ªå®å¨çº§å«å¾æ ã
 onboarding.tour-tor-toolbar-update-8.5.next-button=åå¾âå®å¨â
 
 onboarding.tour-tor-security-update-8.5.title=å®å¨çº§å«ä½éª

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

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

2019-05-29 Thread translation

commit c1ade5acd5e5715dcad399d59838a7770f134b24
Author: Translation commit bot 
Date:   Thu May 30 01:19:23 2019 +

Update translations for torbutton-torbuttondtd
---
 zh-CN/torbutton.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/zh-CN/torbutton.dtd b/zh-CN/torbutton.dtd
index 98cdfa117..22f3b1965 100644
--- a/zh-CN/torbutton.dtd
+++ b/zh-CN/torbutton.dtd
@@ -1,10 +1,10 @@
 
 
-
+
 
 
 
-
+
 
 
 
@@ -24,7 +24,7 @@
 
 
 
-
+
 
 
 
@@ -37,5 +37,5 @@
 
 
 
-
+
 

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

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

2019-05-29 Thread translation

commit 0257618ae553fa4bcd7910530e28bdcb32fed03e
Author: Translation commit bot 
Date:   Thu May 30 01:19:16 2019 +

Update translations for torbutton-torbuttonproperties_completed
---
 zh-CN/torbutton.properties | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/zh-CN/torbutton.properties b/zh-CN/torbutton.properties
index 983b32799..4dbf1a919 100644
--- a/zh-CN/torbutton.properties
+++ b/zh-CN/torbutton.properties
@@ -1,12 +1,12 @@
 torbutton.circuit_display.internet = äºèç½
 torbutton.circuit_display.ip_unknown = IP æªç¥
-torbutton.circuit_display.onion_site = onion ç«ç¹
+torbutton.circuit_display.onion_site = æ´è±ç«ç¹
 torbutton.circuit_display.this_browser = æ¬æµè§å¨
 torbutton.circuit_display.relay = ä¸ç»§
 torbutton.circuit_display.tor_bridge = ç½æ¡¥
 torbutton.circuit_display.unknown_country = æªç¥å½å®¶
-torbutton.circuit_display.guard = ä¸è½¬
-torbutton.circuit_display.guard_note = æ¨çä¸è½¬èç¹ä¼¼ä¹å¹¶æªæ¹å
+torbutton.circuit_display.guard = å®å«
+torbutton.circuit_display.guard_note = æ¨ç[å®å«]èç¹ä¼¼ä¹å¹¶æªæ¹å
 torbutton.circuit_display.learn_more = è¯¦ç»äºè§£
 torbutton.content_sizer.margin_tooltip = Tor æµè§å¨æ·»å 
äºä¸äºè¾¹æ¡ï¼ä»¥éä½çªå£å¤§å°çç¬ç¹æ§ï¼ä»¤å¨çº¿è·è¸ªçæ§åå¾æ´å
 å°é¾ã
 torbutton.panel.tooltip.disabled = ç¹å»å¯ç¨ Tor
@@ -15,7 +15,7 @@ torbutton.panel.label.disabled = Tor å·²ç¦ç¨
 torbutton.panel.label.enabled = Tor å·²å¯ç¨
 extensions.torbut...@torproject.org.description = Torbutton 
æ¯ä¸ä¸ªæé®ï¼å¯å¯¹âTor 
è®¾ç½®âè¿è¡ä¿®æ¹ï¼å¹¶å¯å¿«éèæ¹ä¾¿å°æ¸é¤æµè§å¨éç§æ°æ®ã
 torbutton.popup.external.title = ä¸è½½ä¸ä¸ªå¤é¨æä»¶ç±»åï¼
-torbutton.popup.external.app = Tor Browser æ 
æ³æ¾ç¤ºæ¤æä»¶ãæ¨éè¦ç¨å¶ä»åºç¨ç¨åºæå¼å®ã\n\n
+torbutton.popup.external.app = Tor æµè§å¨æ 
æ³æ¾ç¤ºæ¤æä»¶ãæ¨éè¦ç¨å¶ä»åºç¨ç¨åºæå¼å®ã\n\n
 torbutton.popup.external.note = 
é¨åæä»¶ç±»åå¯è½ä¼å¯¼è´åºç¨ç¨åºå¨ä¸ä½¿ç¨ Tor çæ
åµä¸è¿æ¥äºèç½ã\n\n
 torbutton.popup.external.suggest = ä¸ºäºå®å
¨èµ·è§ï¼æ¨åºè¯¥åªå¨ç¦»çº¿ç¶æä¸æå¼ä¸è½½çæä»¶ï¼æèä½¿ç¨ 
Tor Live CDï¼ä¾å¦ Tailsã\n
 torbutton.popup.launch = ä¸è½½æä»¶
@@ -29,12 +29,12 @@ torbutton.popup.short_torbrowser = Torbutton 
éè¦ä¿¡æ¯ï¼\n\nTorbutton ç®å
 
 torbutton.popup.confirm_plugins = Flash 
ä¹ç±»çæä»¶å¯å¯¹ç¨æ·çéç§ä¸å¿åæ§é 
æå±å®³ã\n\nå®ä»¬è¿å¯è½ç»è¿ Tor èæ³æ¼ç¨æ·çå½åä½ç½®å IP 
å°åã\n\næ¯å¦ç¡®å®å¯ç¨æä»¶ï¼\n\n
 torbutton.popup.never_ask_again = ä¸åè¯¢é®
-torbutton.popup.confirm_newnym = Tor Browser å°å³éå¨é¨çªå£åæ 
ç¾é¡µãææç½ç«ä¼è¯é½å°ä¸¢å¤±ã\n\næ¯å¦é©¬ä¸éå¯ Tor Browser 
ä»¥éç½®èº«ä»½æ è¯ï¼\n\n
+torbutton.popup.confirm_newnym = Tor æµè§å¨å°å³éå¨é¨çªå£åæ 
ç¾é¡µãææç½ç«ä¼è¯é½å°ä¸¢å¤±ã\n\næ¯å¦é©¬ä¸éå¯ Tor 
æµè§å¨ä»¥éç½®èº«ä»½æ è¯ï¼\n\n
 
-torbutton.maximize_warning = æå¤§å Tor Browser 
çªå£ä¹åï¼ç½ç«å¯è·åæ¾ç¤ºå¨å°ºå¯¸ä¿¡æ¯ï¼ä»èå¯è·è¸ªç¨æ·ãå»ºè®®ä½¿ç¨é»è®¤çTor
 Browser çªå£å¤§å°ã
+torbutton.maximize_warning = æå¤§å Tor 
æµè§å¨çªå£ä¹åï¼ç½ç«å¯è·åæ¾ç¤ºå¨å°ºå¯¸ä¿¡æ¯ï¼ä»èå¯è·è¸ªç¨æ·ãå»ºè®®ä½¿ç¨é»è®¤ç
 Tor æµè§å¨çªå£å¤§å°ã
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=æ¤ç½ç« (%S) è¯å¾è·å HTML5 Canva 
å¾åæ°æ®ï¼è¯¥æ°æ®å¯ç¨ä½ä½ æç¨è®¡ç®æºçå¯ä¸æ è¯ã\n\nTor 
Browser æ¯å¦åºåè®¸æ¤ç½ç«è·å HTML5 Canva å¾åæ°æ®ï¼
+canvas.siteprompt=æ¤ç½ç« (%S) è¯å¾è·å HTML5 Canva 
å¾åæ°æ®ï¼è¯¥æ°æ®å¯ç¨ä½ä½ æç¨è®¡ç®æºçå¯ä¸æ è¯ã\n\nTor 
æµè§å¨æ¯å¦åºåè®¸æ¤ç½ç«è·å HTML5 Canva å¾åæ°æ®ï¼
 canvas.notNow=æä¸
 canvas.notNowAccessKey=N
 canvas.allow=ä»¥åä¸ç´åè®¸

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

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

2019-05-29 Thread translation

commit 0e95e68936fa6723374a7649ee51b8ab5ba0d2d3
Author: Translation commit bot 
Date:   Thu May 30 01:19:46 2019 +

Update translations for torbutton-abouttbupdatedtd
---
 zh-CN/abouttbupdate.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zh-CN/abouttbupdate.dtd b/zh-CN/abouttbupdate.dtd
index 7d15c9c4d..385bcc4a5 100644
--- a/zh-CN/abouttbupdate.dtd
+++ b/zh-CN/abouttbupdate.dtd
@@ -1,5 +1,5 @@
-
-
+
+
 
 
 

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

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

2019-05-29 Thread translation

commit b783c87afc82e6ef887b8dead96455ec18bada37
Author: Translation commit bot 
Date:   Thu May 30 01:19:10 2019 +

Update translations for torbutton-torbuttonproperties
---
 zh-CN/torbutton.properties | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/zh-CN/torbutton.properties b/zh-CN/torbutton.properties
index 983b32799..4dbf1a919 100644
--- a/zh-CN/torbutton.properties
+++ b/zh-CN/torbutton.properties
@@ -1,12 +1,12 @@
 torbutton.circuit_display.internet = äºèç½
 torbutton.circuit_display.ip_unknown = IP æªç¥
-torbutton.circuit_display.onion_site = onion ç«ç¹
+torbutton.circuit_display.onion_site = æ´è±ç«ç¹
 torbutton.circuit_display.this_browser = æ¬æµè§å¨
 torbutton.circuit_display.relay = ä¸ç»§
 torbutton.circuit_display.tor_bridge = ç½æ¡¥
 torbutton.circuit_display.unknown_country = æªç¥å½å®¶
-torbutton.circuit_display.guard = ä¸è½¬
-torbutton.circuit_display.guard_note = æ¨çä¸è½¬èç¹ä¼¼ä¹å¹¶æªæ¹å
+torbutton.circuit_display.guard = å®å«
+torbutton.circuit_display.guard_note = æ¨ç[å®å«]èç¹ä¼¼ä¹å¹¶æªæ¹å
 torbutton.circuit_display.learn_more = è¯¦ç»äºè§£
 torbutton.content_sizer.margin_tooltip = Tor æµè§å¨æ·»å 
äºä¸äºè¾¹æ¡ï¼ä»¥éä½çªå£å¤§å°çç¬ç¹æ§ï¼ä»¤å¨çº¿è·è¸ªçæ§åå¾æ´å
 å°é¾ã
 torbutton.panel.tooltip.disabled = ç¹å»å¯ç¨ Tor
@@ -15,7 +15,7 @@ torbutton.panel.label.disabled = Tor å·²ç¦ç¨
 torbutton.panel.label.enabled = Tor å·²å¯ç¨
 extensions.torbut...@torproject.org.description = Torbutton 
æ¯ä¸ä¸ªæé®ï¼å¯å¯¹âTor 
è®¾ç½®âè¿è¡ä¿®æ¹ï¼å¹¶å¯å¿«éèæ¹ä¾¿å°æ¸é¤æµè§å¨éç§æ°æ®ã
 torbutton.popup.external.title = ä¸è½½ä¸ä¸ªå¤é¨æä»¶ç±»åï¼
-torbutton.popup.external.app = Tor Browser æ 
æ³æ¾ç¤ºæ¤æä»¶ãæ¨éè¦ç¨å¶ä»åºç¨ç¨åºæå¼å®ã\n\n
+torbutton.popup.external.app = Tor æµè§å¨æ 
æ³æ¾ç¤ºæ¤æä»¶ãæ¨éè¦ç¨å¶ä»åºç¨ç¨åºæå¼å®ã\n\n
 torbutton.popup.external.note = 
é¨åæä»¶ç±»åå¯è½ä¼å¯¼è´åºç¨ç¨åºå¨ä¸ä½¿ç¨ Tor çæ
åµä¸è¿æ¥äºèç½ã\n\n
 torbutton.popup.external.suggest = ä¸ºäºå®å
¨èµ·è§ï¼æ¨åºè¯¥åªå¨ç¦»çº¿ç¶æä¸æå¼ä¸è½½çæä»¶ï¼æèä½¿ç¨ 
Tor Live CDï¼ä¾å¦ Tailsã\n
 torbutton.popup.launch = ä¸è½½æä»¶
@@ -29,12 +29,12 @@ torbutton.popup.short_torbrowser = Torbutton 
éè¦ä¿¡æ¯ï¼\n\nTorbutton ç®å
 
 torbutton.popup.confirm_plugins = Flash 
ä¹ç±»çæä»¶å¯å¯¹ç¨æ·çéç§ä¸å¿åæ§é 
æå±å®³ã\n\nå®ä»¬è¿å¯è½ç»è¿ Tor èæ³æ¼ç¨æ·çå½åä½ç½®å IP 
å°åã\n\næ¯å¦ç¡®å®å¯ç¨æä»¶ï¼\n\n
 torbutton.popup.never_ask_again = ä¸åè¯¢é®
-torbutton.popup.confirm_newnym = Tor Browser å°å³éå¨é¨çªå£åæ 
ç¾é¡µãææç½ç«ä¼è¯é½å°ä¸¢å¤±ã\n\næ¯å¦é©¬ä¸éå¯ Tor Browser 
ä»¥éç½®èº«ä»½æ è¯ï¼\n\n
+torbutton.popup.confirm_newnym = Tor æµè§å¨å°å³éå¨é¨çªå£åæ 
ç¾é¡µãææç½ç«ä¼è¯é½å°ä¸¢å¤±ã\n\næ¯å¦é©¬ä¸éå¯ Tor 
æµè§å¨ä»¥éç½®èº«ä»½æ è¯ï¼\n\n
 
-torbutton.maximize_warning = æå¤§å Tor Browser 
çªå£ä¹åï¼ç½ç«å¯è·åæ¾ç¤ºå¨å°ºå¯¸ä¿¡æ¯ï¼ä»èå¯è·è¸ªç¨æ·ãå»ºè®®ä½¿ç¨é»è®¤çTor
 Browser çªå£å¤§å°ã
+torbutton.maximize_warning = æå¤§å Tor 
æµè§å¨çªå£ä¹åï¼ç½ç«å¯è·åæ¾ç¤ºå¨å°ºå¯¸ä¿¡æ¯ï¼ä»èå¯è·è¸ªç¨æ·ãå»ºè®®ä½¿ç¨é»è®¤ç
 Tor æµè§å¨çªå£å¤§å°ã
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=æ¤ç½ç« (%S) è¯å¾è·å HTML5 Canva 
å¾åæ°æ®ï¼è¯¥æ°æ®å¯ç¨ä½ä½ æç¨è®¡ç®æºçå¯ä¸æ è¯ã\n\nTor 
Browser æ¯å¦åºåè®¸æ¤ç½ç«è·å HTML5 Canva å¾åæ°æ®ï¼
+canvas.siteprompt=æ¤ç½ç« (%S) è¯å¾è·å HTML5 Canva 
å¾åæ°æ®ï¼è¯¥æ°æ®å¯ç¨ä½ä½ æç¨è®¡ç®æºçå¯ä¸æ è¯ã\n\nTor 
æµè§å¨æ¯å¦åºåè®¸æ¤ç½ç«è·å HTML5 Canva å¾åæ°æ®ï¼
 canvas.notNow=æä¸
 canvas.notNowAccessKey=N
 canvas.allow=ä»¥åä¸ç´åè®¸

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

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

2019-05-29 Thread translation

commit 0297762462fb644d6c55d921169b0bef832ffc24
Author: Translation commit bot 
Date:   Thu May 30 01:18:53 2019 +

Update translations for torbutton-brandproperties_completed
---
 zh-CN/brand.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zh-CN/brand.properties b/zh-CN/brand.properties
index 4804bae77..bd6b86b4a 100644
--- a/zh-CN/brand.properties
+++ b/zh-CN/brand.properties
@@ -2,9 +2,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShorterName=Tor Browser
-brandShortName=Tor Browser
-brandFullName=Tor Browser
+brandShorterName=Tor æµè§å¨
+brandShortName=Tor æµè§å¨
+brandFullName=Tor æµè§å¨
 vendorShortName=Tor Project
 
 homePageSingleStartMain=Firefox Startï¼åç½®æç´¢åè½çå¿«éå¯å¨ä¸»é¡µ

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

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

2019-05-29 Thread translation

commit 8461f1d480dc14aa983b8479765e62cedbe6eed2
Author: Translation commit bot 
Date:   Thu May 30 01:18:47 2019 +

Update translations for torbutton-brandproperties
---
 zh-CN/brand.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zh-CN/brand.properties b/zh-CN/brand.properties
index 4804bae77..bd6b86b4a 100644
--- a/zh-CN/brand.properties
+++ b/zh-CN/brand.properties
@@ -2,9 +2,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShorterName=Tor Browser
-brandShortName=Tor Browser
-brandFullName=Tor Browser
+brandShorterName=Tor æµè§å¨
+brandShortName=Tor æµè§å¨
+brandFullName=Tor æµè§å¨
 vendorShortName=Tor Project
 
 homePageSingleStartMain=Firefox Startï¼åç½®æç´¢åè½çå¿«éå¯å¨ä¸»é¡µ

___
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-29 Thread translation

commit bb50e63ae3f266439e8a23e7d0eb61f19e3b12d9
Author: Translation commit bot 
Date:   Thu May 30 01:18:09 2019 +

Update translations for tbmanual-contentspot
---
 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 d98c2c7c5..c8336175e 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-27 08:26+CET\n"
+"POT-Creation-Date: 2019-05-29 13:31+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Chinese (China) 
(https://www.transifex.com/otf/teams/1519/zh_CN/)\n"

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

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

2019-05-29 Thread translation

commit bdd30dbee841609e3e7c32adcd798f33bafadc6b
Author: Translation commit bot 
Date:   Thu May 30 01:18:00 2019 +

Update translations for tba-torbrowserstringsdtd_completed
---
 zh-CN/torbrowser_strings.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh-CN/torbrowser_strings.dtd b/zh-CN/torbrowser_strings.dtd
index 5a45b80a9..0eaf97240 100644
--- a/zh-CN/torbrowser_strings.dtd
+++ b/zh-CN/torbrowser_strings.dtd
@@ -32,7 +32,7 @@
 
 
 
-
+
 
 
 

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

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

2019-05-29 Thread translation

commit e584795dfc5040b4d46f3fb15ba122d488fd8340
Author: Translation commit bot 
Date:   Thu May 30 01:17:37 2019 +

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

diff --git a/zh_CN/onioncircuits.pot b/zh_CN/onioncircuits.pot
index c332496c0..00e3b3bd5 100644
--- a/zh_CN/onioncircuits.pot
+++ b/zh_CN/onioncircuits.pot
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-08-03 13:00+\n"
-"PO-Revision-Date: 2019-05-30 00:46+\n"
+"PO-Revision-Date: 2019-05-30 00:48+\n"
 "Last-Translator: Yikai Yang \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -85,4 +85,4 @@ msgstr "IPï¼"
 
 #: ../onioncircuits:610
 msgid "Bandwidth:"
-msgstr "å¸¦å®½:"
+msgstr "å¸¦å®½ï¼"

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

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

2019-05-29 Thread translation

commit 9a02854bd7d4e15b1ca281e921bcdbf7102018d9
Author: Translation commit bot 
Date:   Thu May 30 01:17:03 2019 +

Update translations for tails-perl5lib
---
 zh_CN.po | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/zh_CN.po b/zh_CN.po
index ae9087ed4..8c17ca037 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # dull2wall, 2018
-# YF , 2016
+# YFdyh000 , 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2018-03-15 12:15+\n"
-"PO-Revision-Date: 2018-04-11 09:44+\n"
-"Last-Translator: dull2wall\n"
+"POT-Creation-Date: 2019-01-06 16:58+0100\n"
+"PO-Revision-Date: 2019-05-30 00:54+\n"
+"Last-Translator: Yikai Yang \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../lib/Tails/RunningSystem.pm:159
+#: ../lib/Tails/RunningSystem.pm:193
 msgid "Error"
 msgstr "éè¯¯"
 
-#: ../lib/Tails/RunningSystem.pm:161
+#: ../lib/Tails/RunningSystem.pm:195
 msgid ""
 "The device Tails is running from cannot be found. Maybe you used the 'toram'"
 " option?"
 msgstr "Tailså¯å¨æ¶çè®¾å¤å·²æ 
æ³æ¾å°ãå¯è½æ¨ä½¿ç¨äº'toram'éé¡¹ï¼"
 
-#: ../lib/Tails/RunningSystem.pm:192
+#: ../lib/Tails/RunningSystem.pm:223
 msgid ""
 "The drive Tails is running from cannot be found. Maybe you used the 'toram' "
 "option?"

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

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

2019-05-29 Thread translation

commit 5ba662244b67038e1995892570b6d36a4922435f
Author: Translation commit bot 
Date:   Thu May 30 01:17:53 2019 +

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

diff --git a/zh-CN/torbrowser_strings.dtd b/zh-CN/torbrowser_strings.dtd
index 5a45b80a9..0eaf97240 100644
--- a/zh-CN/torbrowser_strings.dtd
+++ b/zh-CN/torbrowser_strings.dtd
@@ -32,7 +32,7 @@
 
 
 
-
+
 
 
 

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

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

2019-05-29 Thread translation

commit fea14addfbef6503872583b1eeb9600786b81420
Author: Translation commit bot 
Date:   Thu May 30 01:17:08 2019 +

Update translations for tails-perl5lib_completed
---
 zh_CN.po | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/zh_CN.po b/zh_CN.po
index ae9087ed4..8c17ca037 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # dull2wall, 2018
-# YF , 2016
+# YFdyh000 , 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2018-03-15 12:15+\n"
-"PO-Revision-Date: 2018-04-11 09:44+\n"
-"Last-Translator: dull2wall\n"
+"POT-Creation-Date: 2019-01-06 16:58+0100\n"
+"PO-Revision-Date: 2019-05-30 00:54+\n"
+"Last-Translator: Yikai Yang \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../lib/Tails/RunningSystem.pm:159
+#: ../lib/Tails/RunningSystem.pm:193
 msgid "Error"
 msgstr "éè¯¯"
 
-#: ../lib/Tails/RunningSystem.pm:161
+#: ../lib/Tails/RunningSystem.pm:195
 msgid ""
 "The device Tails is running from cannot be found. Maybe you used the 'toram'"
 " option?"
 msgstr "Tailså¯å¨æ¶çè®¾å¤å·²æ 
æ³æ¾å°ãå¯è½æ¨ä½¿ç¨äº'toram'éé¡¹ï¼"
 
-#: ../lib/Tails/RunningSystem.pm:192
+#: ../lib/Tails/RunningSystem.pm:223
 msgid ""
 "The drive Tails is running from cannot be found. Maybe you used the 'toram' "
 "option?"

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

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

2019-05-29 Thread translation

commit e12fca450f6b24f1412ee39984e068a692fcf892
Author: Translation commit bot 
Date:   Thu May 30 01:17:32 2019 +

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

diff --git a/zh_CN/onioncircuits.pot b/zh_CN/onioncircuits.pot
index c332496c0..00e3b3bd5 100644
--- a/zh_CN/onioncircuits.pot
+++ b/zh_CN/onioncircuits.pot
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-08-03 13:00+\n"
-"PO-Revision-Date: 2019-05-30 00:46+\n"
+"PO-Revision-Date: 2019-05-30 00:48+\n"
 "Last-Translator: Yikai Yang \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -85,4 +85,4 @@ msgstr "IPï¼"
 
 #: ../onioncircuits:610
 msgid "Bandwidth:"
-msgstr "å¸¦å®½:"
+msgstr "å¸¦å®½ï¼"

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

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

2019-05-29 Thread translation

commit 734022c8533cf6c92ed3bb552dd4025b6208d219
Author: Translation commit bot 
Date:   Thu May 30 01:16:51 2019 +

Update translations for tails-iuk
---
 zh_CN.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zh_CN.po b/zh_CN.po
index cf9c49d6f..6d7acd741 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -5,7 +5,7 @@
 # Translators:
 # Words, 2016
 # Chi-Hsun Tsai, 2017
-# Chris Xiao, 2018
+# ef082130671b50894cb0f0340a268c8b, 2018
 # paperbag, 2016
 # ihints , 2014
 # kwh(Kim Wan-Ho), 2013
@@ -17,8 +17,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2018-12-09 13:56+0100\n"
-"PO-Revision-Date: 2018-12-15 18:21+\n"
-"Last-Translator: Chris Xiao\n"
+"PO-Revision-Date: 2019-05-30 00:53+\n"
+"Last-Translator: Yikai Yang \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2019-05-29 Thread translation

commit f4c63647726d610f193b3985e4b19cfc6742d6d0
Author: Translation commit bot 
Date:   Thu May 30 01:16:12 2019 +

Update translations for liveusb-creator
---
 zh_CN/zh_CN.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po
index bbe93d8fc..391ec3896 100644
--- a/zh_CN/zh_CN.po
+++ b/zh_CN/zh_CN.po
@@ -22,7 +22,7 @@
 # YFdyh000 , 2016
 # YFdyh000 , 2013-2015,2017
 # Joe, 2017
-# Zhui Shen <12231...@bjtu.edu.cn>, 2019
+# shenzhui007 <12231...@bjtu.edu.cn>, 2019
 # ç é² , 2009
 # ã¨ã¤ãã®è³¢ç¼ãã, 2018
 msgid ""
@@ -30,8 +30,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-13 08:42+0200\n"
-"PO-Revision-Date: 2019-04-14 07:48+\n"
-"Last-Translator: Emma Peel\n"
+"PO-Revision-Date: 2019-05-30 00:52+\n"
+"Last-Translator: Yikai Yang \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

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

2019-05-29 Thread translation

commit caa6e1781139697cf50d1784942a9d7536935aaf
Author: Translation commit bot 
Date:   Thu May 30 01:16:57 2019 +

Update translations for tails-iuk_completed
---
 zh_CN.po | 95 ++--
 1 file changed, 56 insertions(+), 39 deletions(-)

diff --git a/zh_CN.po b/zh_CN.po
index 81431d3e4..6d7acd741 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -5,19 +5,20 @@
 # Translators:
 # Words, 2016
 # Chi-Hsun Tsai, 2017
+# ef082130671b50894cb0f0340a268c8b, 2018
 # paperbag, 2016
 # ihints , 2014
-# kwh(Kim Wan-Ho) <14alp...@gmail.com>, 2013
+# kwh(Kim Wan-Ho), 2013
 # khi, 2014
-# YF , 2016
-# YF , 2013-2015
+# YFdyh000 , 2016
+# YFdyh000 , 2013-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2017-04-18 12:13+0200\n"
-"PO-Revision-Date: 2017-09-23 19:27+\n"
-"Last-Translator: Chi-Hsun Tsai\n"
+"POT-Creation-Date: 2018-12-09 13:56+0100\n"
+"PO-Revision-Date: 2019-05-30 00:53+\n"
+"Last-Translator: Yikai Yang \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,18 +26,18 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../lib/Tails/IUK/Frontend.pm:148 ../lib/Tails/IUK/Frontend.pm:524
-#: ../lib/Tails/IUK/Frontend.pm:697
+#: ../lib/Tails/IUK/Frontend.pm:147 ../lib/Tails/IUK/Frontend.pm:524
+#: ../lib/Tails/IUK/Frontend.pm:710
 msgid ""
 "For debugging information, execute the following command: sudo tails-"
 "debugging-info"
 msgstr "å¦éè°è¯ä¿¡æ¯ï¼è¯·æ§è¡å½ä»¤: sudo tails-debugging-info"
 
-#: ../lib/Tails/IUK/Frontend.pm:217
+#: ../lib/Tails/IUK/Frontend.pm:218
 msgid "Error while checking for upgrades"
 msgstr "æ£æ¥æ´æ°æ¶åçäºéè¯¯"
 
-#: ../lib/Tails/IUK/Frontend.pm:220
+#: ../lib/Tails/IUK/Frontend.pm:221
 msgid ""
 "Could not determine whether an upgrade is available from our 
website.\n"
 "\n"
@@ -45,78 +46,77 @@ msgid ""
 "If the problem persists, go to 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
 msgstr "æ 
æ³ä»æä»¬çç½ç«ä¸æ£æµæ¯å¦æåçº§å¯ç¨\n\nè¯·æ£æ¥æ¨çç½ç»è¿æ¥ï¼å¹¶ä¸éå¯Tailsç¶åéæ°å°è¯åçº§\n\nå¦æä¾æ§æè¿ä¸ªé®é¢ï¼è¯·åé
æ¬å°æä»¶ 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
 
-#: ../lib/Tails/IUK/Frontend.pm:235
+#: ../lib/Tails/IUK/Frontend.pm:236
 msgid "no automatic upgrade is available from our website for this version"
 msgstr "å¯¹æ¤çæ¬æä»¬çç½ç«æ²¡æèªå¨åçº§å¯ç¨"
 
-#: ../lib/Tails/IUK/Frontend.pm:241
+#: ../lib/Tails/IUK/Frontend.pm:242
 msgid "your device was not created using Tails Installer"
 msgstr "æ¨çè®¾å¤å¹¶æªä½¿ç¨ Tails å®è£å¨åå»º"
 
-#: ../lib/Tails/IUK/Frontend.pm:246
+#: ../lib/Tails/IUK/Frontend.pm:247
 msgid "Tails was started from a DVD or a read-only device"
 msgstr "Tails å¯å¨äºä¸ä¸ª DVD æèåªè¯»è®¾å¤"
 
-#: ../lib/Tails/IUK/Frontend.pm:251
+#: ../lib/Tails/IUK/Frontend.pm:252
 msgid "there is not enough free space on the Tails system partition"
 msgstr "Tails çç³»ç»ååºæ²¡æè¶³å¤çå¯ç¨ç©ºé´"
 
-#: ../lib/Tails/IUK/Frontend.pm:256
+#: ../lib/Tails/IUK/Frontend.pm:257
 msgid "not enough memory is available on this system"
 msgstr "å¨æ¤ç³»ç»ä¸æ²¡æè¶³å¤çå¯ç¨åå"
 
-#: ../lib/Tails/IUK/Frontend.pm:262
+#: ../lib/Tails/IUK/Frontend.pm:263
 #, perl-brace-format
 msgid "No explanation available for reason '%{reason}s'."
 msgstr "å¯¹åå  '%{reason}s' æ²¡æå¯ç¨çè¯´æã"
 
-#: ../lib/Tails/IUK/Frontend.pm:282
+#: ../lib/Tails/IUK/Frontend.pm:283
 msgid "The system is up-to-date"
 msgstr "ç³»ç»å·²æ¯ææ°"
 
-#: ../lib/Tails/IUK/Frontend.pm:287
+#: ../lib/Tails/IUK/Frontend.pm:288
 msgid "This version of Tails is outdated, and may have security issues."
 msgstr "æ¤çæ¬ç Tails å·²è¿æ¶ï¼å¯è½åå¨å®å¨æ§é®é¢ã"
 
-#: ../lib/Tails/IUK/Frontend.pm:319
+#: ../lib/Tails/IUK/Frontend.pm:320
 #, perl-brace-format
 msgid ""
 "The available incremental upgrade requires %{space_needed}s of free space on"
 " Tails system partition,  but only %{free_space}s is available."
 msgstr "å¯ç¨çå¢éåçº§ï¼éè¦å¨ Tails çç³»ç»ååºæ 
%{space_needed}s ç©ºé²ç©ºé´ï¼èç®åä»æ %{free_space}s å¯ç¨ã"
 
-#: ../lib/Tails/IUK/Frontend.pm:335
+#: ../lib/Tails/IUK/Frontend.pm:336
 #, perl-brace-format
 msgid ""
 "The available incremental upgrade requires %{memory_needed}s of free memory,"
 " but only %{free_memory}s is available."
 msgstr "å¯ç¨çå¢éåçº§ï¼éè¦æ %{memory_needed}s ç©ºé²å
åï¼èç®åä»æ %{memory_needed}s ååå¯ç¨ã"
 
-#: ../lib/Tails/IUK/Frontend.pm:357
+#: ../lib/Tails/IUK/Frontend.pm:358
 msgid ""
 "An incremental upgrade is available, but no full upgrade is.\n"
 "This should not happen. Please report a bug."

[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

2019-05-29 Thread translation

commit 7c8a4e71c0fce4e82b511d5edbb0a3c7b75fe647
Author: Translation commit bot 
Date:   Thu May 30 01:16:18 2019 +

Update translations for liveusb-creator_completed
---
 zh_CN/zh_CN.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po
index bbe93d8fc..391ec3896 100644
--- a/zh_CN/zh_CN.po
+++ b/zh_CN/zh_CN.po
@@ -22,7 +22,7 @@
 # YFdyh000 , 2016
 # YFdyh000 , 2013-2015,2017
 # Joe, 2017
-# Zhui Shen <12231...@bjtu.edu.cn>, 2019
+# shenzhui007 <12231...@bjtu.edu.cn>, 2019
 # ç é² , 2009
 # ã¨ã¤ãã®è³¢ç¼ãã, 2018
 msgid ""
@@ -30,8 +30,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-13 08:42+0200\n"
-"PO-Revision-Date: 2019-04-14 07:48+\n"
-"Last-Translator: Emma Peel\n"
+"PO-Revision-Date: 2019-05-30 00:52+\n"
+"Last-Translator: Yikai Yang \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

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

2019-05-29 Thread translation

commit 438d1a69019d29c121f7380ba345851f9a7d0f9c
Author: Translation commit bot 
Date:   Thu May 30 01:15:06 2019 +

Update translations for abouttor-homepage
---
 zh-CN/aboutTor.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/zh-CN/aboutTor.dtd b/zh-CN/aboutTor.dtd
index 8ddeb9d77..9f261601d 100644
--- a/zh-CN/aboutTor.dtd
+++ b/zh-CN/aboutTor.dtd
@@ -17,10 +17,10 @@
 https://duckduckgo.com;>
 
 
-
+
 
 
-
+
 
 
 
@@ -28,5 +28,5 @@
 
 
 
-
-
+
+

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

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

2019-05-29 Thread translation

commit dc46f45ec21c79e0bc94291f01c06e61f511a51d
Author: Translation commit bot 
Date:   Thu May 30 01:15:14 2019 +

Update translations for abouttor-homepage_completed
---
 zh-CN/aboutTor.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/zh-CN/aboutTor.dtd b/zh-CN/aboutTor.dtd
index 8ddeb9d77..9f261601d 100644
--- a/zh-CN/aboutTor.dtd
+++ b/zh-CN/aboutTor.dtd
@@ -17,10 +17,10 @@
 https://duckduckgo.com;>
 
 
-
+
 
 
-
+
 
 
 
@@ -28,5 +28,5 @@
 
 
 
-
-
+
+

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

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

2019-05-29 Thread translation

commit abfa1fd1bc7bd7616f972b56c296a00458cb0263
Author: Translation commit bot 
Date:   Thu May 30 00:47:29 2019 +

Update translations for tails-onioncircuits_completed
---
 zh_CN/onioncircuits.pot | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/zh_CN/onioncircuits.pot b/zh_CN/onioncircuits.pot
index 18139bcde..c332496c0 100644
--- a/zh_CN/onioncircuits.pot
+++ b/zh_CN/onioncircuits.pot
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Xiaolan , 2016
-# YF , 2016
+# YFdyh000 , 2016
+# Yikai Yang , 2019
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-08-03 13:00+\n"
-"PO-Revision-Date: 2017-09-23 22:22+\n"
-"Last-Translator: Chi-Hsun Tsai\n"
+"PO-Revision-Date: 2019-05-30 00:46+\n"
+"Last-Translator: Yikai Yang \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +22,7 @@ msgstr ""
 
 #: ../onioncircuits:81
 msgid "You are not connected to Tor yet..."
-msgstr "æ¨è¿æ²¡è¿æ¥å° Tor..."
+msgstr "æ¨è¿æªè¿æ¥å° Tor..."
 
 #: ../onioncircuits:95
 msgid "Onion Circuits"
@@ -50,11 +51,11 @@ msgstr "..."
 #: ../onioncircuits:343
 #, c-format
 msgid "%s: %s"
-msgstr "%s: %s"
+msgstr "%sï¼%s"
 
 #: ../onioncircuits:554
 msgid "GeoIP database unavailable. No country information will be displayed."
-msgstr "GeoIP æ°æ®åºä¸å¯ç¨ãå½å®¶/åºåä¿¡æ¯å°ä¸ä¼æ¾ç¤ºã"
+msgstr "GeoIP æ°æ®åºä¸å¯ç¨ãå½å®¶/å°åºä¿¡æ¯å°ä¸ä¼æ¾ç¤ºã"
 
 #: ../onioncircuits:585
 #, c-format
@@ -72,15 +73,15 @@ msgstr "æªç¥"
 
 #: ../onioncircuits:607
 msgid "Fingerprint:"
-msgstr "æçº¹:"
+msgstr "æçº¹ï¼"
 
 #: ../onioncircuits:608
 msgid "Published:"
-msgstr "å·²å¬å¸:"
+msgstr "å·²å¬å¸ï¼"
 
 #: ../onioncircuits:609
 msgid "IP:"
-msgstr "IP:"
+msgstr "IPï¼"
 
 #: ../onioncircuits:610
 msgid "Bandwidth:"

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

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

2019-05-29 Thread translation

commit 4326a0618c9846420d81b49393becdab956d4018
Author: Translation commit bot 
Date:   Thu May 30 00:47:23 2019 +

Update translations for tails-onioncircuits
---
 zh_CN/onioncircuits.pot | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/zh_CN/onioncircuits.pot b/zh_CN/onioncircuits.pot
index 18139bcde..c332496c0 100644
--- a/zh_CN/onioncircuits.pot
+++ b/zh_CN/onioncircuits.pot
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Xiaolan , 2016
-# YF , 2016
+# YFdyh000 , 2016
+# Yikai Yang , 2019
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-08-03 13:00+\n"
-"PO-Revision-Date: 2017-09-23 22:22+\n"
-"Last-Translator: Chi-Hsun Tsai\n"
+"PO-Revision-Date: 2019-05-30 00:46+\n"
+"Last-Translator: Yikai Yang \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +22,7 @@ msgstr ""
 
 #: ../onioncircuits:81
 msgid "You are not connected to Tor yet..."
-msgstr "æ¨è¿æ²¡è¿æ¥å° Tor..."
+msgstr "æ¨è¿æªè¿æ¥å° Tor..."
 
 #: ../onioncircuits:95
 msgid "Onion Circuits"
@@ -50,11 +51,11 @@ msgstr "..."
 #: ../onioncircuits:343
 #, c-format
 msgid "%s: %s"
-msgstr "%s: %s"
+msgstr "%sï¼%s"
 
 #: ../onioncircuits:554
 msgid "GeoIP database unavailable. No country information will be displayed."
-msgstr "GeoIP æ°æ®åºä¸å¯ç¨ãå½å®¶/åºåä¿¡æ¯å°ä¸ä¼æ¾ç¤ºã"
+msgstr "GeoIP æ°æ®åºä¸å¯ç¨ãå½å®¶/å°åºä¿¡æ¯å°ä¸ä¼æ¾ç¤ºã"
 
 #: ../onioncircuits:585
 #, c-format
@@ -72,15 +73,15 @@ msgstr "æªç¥"
 
 #: ../onioncircuits:607
 msgid "Fingerprint:"
-msgstr "æçº¹:"
+msgstr "æçº¹ï¼"
 
 #: ../onioncircuits:608
 msgid "Published:"
-msgstr "å·²å¬å¸:"
+msgstr "å·²å¬å¸ï¼"
 
 #: ../onioncircuits:609
 msgid "IP:"
-msgstr "IP:"
+msgstr "IPï¼"
 
 #: ../onioncircuits:610
 msgid "Bandwidth:"

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

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

2019-05-29 Thread translation

commit f8d6e6916223732563cfb54dec4b6f3ab9fb608c
Author: Translation commit bot 
Date:   Thu May 30 00:45:24 2019 +

Update translations for bridgedb_completed
---
 zh_CN/LC_MESSAGES/bridgedb.po | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po
index c646c8343..f55dd3447 100644
--- a/zh_CN/LC_MESSAGES/bridgedb.po
+++ b/zh_CN/LC_MESSAGES/bridgedb.po
@@ -14,13 +14,14 @@
 # Mingye Wang , 2016
 # khi, 2014-2015
 # YFdyh000 , 2014-2015
+# Yikai Yang , 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-06-10 07:15+\n"
-"Last-Translator: Colin Childs \n"
+"PO-Revision-Date: 2019-05-30 00:43+\n"
+"Last-Translator: Yikai Yang \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,7 +47,7 @@ msgstr "æ±æï¼ä½ çé®ä»¶è¯·æ±åºç°é®é¢ã"
 
 #: bridgedb/https/templates/base.html:79
 msgid "Report a Bug"
-msgstr "æ¥å Bug"
+msgstr "æ¥åæ¼æ´"
 
 #: bridgedb/https/templates/base.html:82
 msgid "Source Code"
@@ -79,7 +80,7 @@ msgstr "ç½æ¡¥äºç»´ç "
 #: bridgedb/https/templates/bridges.html:67
 #: bridgedb/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
-msgstr "åååï¼"
+msgstr "ååï¼"
 
 #: bridgedb/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
@@ -100,7 +101,7 @@ msgstr "ç°å¨æ²¡æå¯ç¨çç½æ¡¥ã"
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
-msgstr "è¯è¯ %såé%så°åä¸é¡µé¢ï¼ç¶åéæ©å
¶ä»ç±»åçç½æ¡¥ã"
+msgstr "è¯è¯ %sè¿å%så°åä¸é¡µé¢ï¼ç¶åéæ©å
¶ä»ç±»åçç½æ¡¥ã"
 
 #: bridgedb/https/templates/index.html:11
 #, python-format
@@ -120,7 +121,7 @@ msgstr "ç¬¬ %s 2 %s æ¥"
 #: bridgedb/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
-msgstr "è·å %s bridges %s"
+msgstr "è·å %s ç½æ¡¥ %s"
 
 #: bridgedb/https/templates/index.html:36
 #, python-format
@@ -197,7 +198,7 @@ msgstr "æ¬¢è¿æ¥å° BridgeDBï¼"
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
 #: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
-msgstr "ç®åå¯ç¨ç transport ç±»åï¼"
+msgstr "ç®åå¯ç¨çä¼ è¾ç±»åï¼"
 
 #: bridgedb/strings.py:56
 #, python-format
@@ -242,7 +243,7 @@ msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "å¦å¤æä¾ä¸äºIPv6æ ¼å¼çç½æ¡¥ï¼ä¸è¿æäº Pluggable 
Transports ç±»åç®åè¿ä¸æ¯æIPv6ã\n"
+msgstr "å¦å¤æä¾ä¸äºIPv6æ ¼å¼çç½æ¡¥ï¼ä¸è¿æäºå¯ææä¼ 
è¾ç±»åç®åè¿ä¸æ¯æIPv6ã\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
@@ -256,7 +257,7 @@ msgid ""
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can 
still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "æ¤å¤ï¼BridgeDB æä¾å¾å¤ %s  éPluggable Transports %s 
çæ®éç½æ¡¥ã\nè½ç¶å¬èµ·æ¥ä¸å¤é
·ï¼ä½æ¯è¿äºæ®éç½æ¡¥ä¾ç¶å¯ä»¥å¨å¾å¤æ
åµä¸å¸®å©ç»è¿å®¡æ¥ã\n"
+msgstr "æ¤å¤ï¼BridgeDB æä¾å¾å¤ %s éå¯ææä¼ è¾ %s 
çæ®éç½æ¡¥ã\nè½ç¶å¬èµ·æ¥ä¸å¤é
·ï¼ä½æ¯è¿äºæ®éç½æ¡¥ä¾ç¶å¯ä»¥å¨å¾å¤æ
åµä¸å¸®å©ç»è¿å®¡æ¥ã\n"
 
 #: bridgedb/strings.py:101
 msgid "What are bridges?"
@@ -382,7 +383,7 @@ msgstr "è¯·æ±IPv6ç½ç»ã"
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
-msgstr "æç§ç±»åè¯·æ±ä¸åç Pluggable Transport ç½æ¡¥ã"
+msgstr "æç§ç±»åè¯·æ±ä¸åçå¯ææä¼ è¾ç½æ¡¥ã"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".

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

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

2019-05-29 Thread translation

commit 5cb100e2c35b2f42ea4c56f6ad4c3be8b35a2597
Author: Translation commit bot 
Date:   Thu May 30 00:45:15 2019 +

Update translations for bridgedb
---
 zh_CN/LC_MESSAGES/bridgedb.po | 25 +
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po
index 8db95f49e..f55dd3447 100644
--- a/zh_CN/LC_MESSAGES/bridgedb.po
+++ b/zh_CN/LC_MESSAGES/bridgedb.po
@@ -13,14 +13,15 @@
 # Meng San, 2016
 # Mingye Wang , 2016
 # khi, 2014-2015
-# YF , 2014-2015
+# YFdyh000 , 2014-2015
+# Yikai Yang , 2019
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-06-10 07:14+\n"
-"Last-Translator: Colin Childs \n"
+"PO-Revision-Date: 2019-05-30 00:43+\n"
+"Last-Translator: Yikai Yang \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,7 +47,7 @@ msgstr "æ±æï¼ä½ çé®ä»¶è¯·æ±åºç°é®é¢ã"
 
 #: bridgedb/https/templates/base.html:79
 msgid "Report a Bug"
-msgstr "æ¥å Bug"
+msgstr "æ¥åæ¼æ´"
 
 #: bridgedb/https/templates/base.html:82
 msgid "Source Code"
@@ -79,7 +80,7 @@ msgstr "ç½æ¡¥äºç»´ç "
 #: bridgedb/https/templates/bridges.html:67
 #: bridgedb/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
-msgstr "åååï¼"
+msgstr "ååï¼"
 
 #: bridgedb/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
@@ -100,7 +101,7 @@ msgstr "ç°å¨æ²¡æå¯ç¨çç½æ¡¥ã"
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
-msgstr "è¯è¯ %såé%så°åä¸é¡µé¢ï¼ç¶åéæ©å
¶ä»ç±»åçç½æ¡¥ã"
+msgstr "è¯è¯ %sè¿å%så°åä¸é¡µé¢ï¼ç¶åéæ©å
¶ä»ç±»åçç½æ¡¥ã"
 
 #: bridgedb/https/templates/index.html:11
 #, python-format
@@ -120,7 +121,7 @@ msgstr "ç¬¬ %s 2 %s æ¥"
 #: bridgedb/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
-msgstr "è·å %s bridges %s"
+msgstr "è·å %s ç½æ¡¥ %s"
 
 #: bridgedb/https/templates/index.html:36
 #, python-format
@@ -197,7 +198,7 @@ msgstr "æ¬¢è¿æ¥å° BridgeDBï¼"
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
 #: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
-msgstr "ç®åå¯ç¨ç transport ç±»åï¼"
+msgstr "ç®åå¯ç¨çä¼ è¾ç±»åï¼"
 
 #: bridgedb/strings.py:56
 #, python-format
@@ -242,7 +243,7 @@ msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "å¦å¤æä¾ä¸äºIPv6æ ¼å¼çç½æ¡¥ï¼ä¸è¿æäº Pluggable 
Transports ç±»åç®åè¿ä¸æ¯æIPv6ã\n"
+msgstr "å¦å¤æä¾ä¸äºIPv6æ ¼å¼çç½æ¡¥ï¼ä¸è¿æäºå¯ææä¼ 
è¾ç±»åç®åè¿ä¸æ¯æIPv6ã\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
@@ -256,7 +257,7 @@ msgid ""
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can 
still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "æ¤å¤ï¼BridgeDB æä¾å¾å¤ %s  éPluggable Transports %s 
çæ®éç½æ¡¥ã\nè½ç¶å¬èµ·æ¥ä¸å¤é
·ï¼ä½æ¯è¿äºæ®éç½æ¡¥ä¾ç¶å¯ä»¥å¨å¾å¤æ
åµä¸å¸®å©ç»è¿å®¡æ¥ã\n"
+msgstr "æ¤å¤ï¼BridgeDB æä¾å¾å¤ %s éå¯ææä¼ è¾ %s 
çæ®éç½æ¡¥ã\nè½ç¶å¬èµ·æ¥ä¸å¤é
·ï¼ä½æ¯è¿äºæ®éç½æ¡¥ä¾ç¶å¯ä»¥å¨å¾å¤æ
åµä¸å¸®å©ç»è¿å®¡æ¥ã\n"
 
 #: bridgedb/strings.py:101
 msgid "What are bridges?"
@@ -382,7 +383,7 @@ msgstr "è¯·æ±IPv6ç½ç»ã"
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
-msgstr "æç§ç±»åè¯·æ±ä¸åç Pluggable Transport ç½æ¡¥ã"
+msgstr "æç§ç±»åè¯·æ±ä¸åçå¯ææä¼ è¾ç½æ¡¥ã"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".

___
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-29 Thread translation

commit a4896763fc6a21786e002a5903cf097165aa4605
Author: Translation commit bot 
Date:   Wed May 29 22:20:38 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 916fa0cb6..da868c858 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -338,8 +338,8 @@ msgid ""
 "and open to maximize transparency and separation."
 msgstr ""
 "DÃ¨s sa crÃ©ation dans les annÃ©esÂ 1990, le routage en oignon a Ã©tÃ© conÃ§u 
pour "
-"sâappuyer sur un rÃ©seau dÃ©centralisÃ©. Le rÃ©seau devait Ãªtre exploitÃ© 
par des"
-" entitÃ©s aux intÃ©rÃªts et aux hypothÃ¨ses de confiance divers, et le 
logiciel "
+"sâappuyer sur un rÃ©seau dÃ©centralisÃ©. Le rÃ©seau devait Ãªtre gÃ©rÃ© par 
des "
+"entitÃ©s aux intÃ©rÃªts et aux hypothÃ¨ses de confiance divers, et le 
logiciel "
 "se devait dâÃªtre gratuit et ouvert afin de maximiser transparence et "
 "sÃ©paration."
 
@@ -469,7 +469,7 @@ msgid ""
 " that keeps Tor users safe."
 msgstr ""
 "De nos jours, le rÃ©seau comprend des [milliers de "
-"relais](https://metrics.torproject.org) (site en anglais) exploitÃ©s par des "
+"relais](https://metrics.torproject.org) (site en anglais) gÃ©rÃ©s par des "
 "bÃ©nÃ©voles et des millions dâutilisateurs partout dans le monde. Cette "
 "diversitÃ© assure la sÃ©curitÃ© des utilisateurs de Tor."
 
@@ -1011,8 +1011,8 @@ msgid ""
 "known as Tor relays."
 msgstr ""
 "Votre trafic est relayÃ© et chiffrÃ© trois fois alors quâil traverse le 
rÃ©seau"
-"Â Tor. Le rÃ©seau comprend des milliers de serveurs exploitÃ©s par des "
-"bÃ©nÃ©voles, appelÃ©s relaisÂ Tor."
+"Â Tor. Le rÃ©seau comprend des milliers de serveurs gÃ©rÃ©s par des 
bÃ©nÃ©voles, "
+"appelÃ©s relaisÂ Tor."
 
 #: templates/home.html:75
 msgid "Browse Freely"
@@ -1230,7 +1230,8 @@ msgstr ""
 #: templates/thank-you.html:17
 msgid "Run a relay to make the network faster and more decentralized."
 msgstr ""
-"Exploiter un relais pour rendre le rÃ©seau plus rapide et plus 
dÃ©centralisÃ©."
+"Mettre en place un relais pour rendre le rÃ©seau plus rapide et plus "
+"dÃ©centralisÃ©."
 
 #: templates/thank-you.html:21
 msgid "Use your skills to volunteer."

___
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-29 Thread translation

commit 691c892dce40d04ee641871f5439c8e53525e61e
Author: Translation commit bot 
Date:   Wed May 29 22:20:57 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 8e898cf01..ac4683336 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -4149,7 +4149,7 @@ msgid ""
 "ordinary relays, however, they are not listed publicly, so an adversary "
 "cannot identify them easily."
 msgstr ""
-"Comme les [relais](#relais), les ponts sont exploitÃ©s par des 
bÃ©nÃ©volesâ; "
+"Comme les [relais](#relais), les ponts sont gÃ©rÃ©s par des bÃ©nÃ©volesâ; "
 "cependant, contrairement aux relais ordinaires, ils ne sont pas rÃ©pertoriÃ©s 
"
 "publiquement. Un adversaire ne peut donc pas les dÃ©couvrir facilement."
 
@@ -4845,7 +4845,7 @@ msgid ""
 "addresses of physical locations."
 msgstr ""
 "Lâadresse IP est lâadresse dâemplacement de lâappareil, semblable aux 
"
-"adresses dâemplacements physiques."
+"adresses des emplacements gÃ©ographiques."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -5775,9 +5775,9 @@ msgid ""
 msgstr ""
 "Il vous protÃ¨ge en faisant rebondir vos communications dans un rÃ©seau "
 "distribuÃ© de [relais](#relais) gÃ©rÃ©s par des bÃ©nÃ©voles du monde entierÂ 
: il "
-"empÃªche quiconque regarde votre connexion Internet de dÃ©couvrir les sites "
+"empÃªche quiconque surveille votre connexion Internet de dÃ©couvrir les sites 
"
 "que vous visitez, et empÃªche les sites que vous visitez de connaÃ®tre votre "
-"emplacement physique."
+"emplacement gÃ©ographique."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -5786,7 +5786,7 @@ msgid ""
 "software associated with this network is called Core Tor, and sometimes "
 "[\"little-t tor\"](#little-t-tor)."
 msgstr ""
-"Cet ensemble de relais exploitÃ©s par des bÃ©nÃ©voles sâappelle le rÃ©seauÂ 
Tor. "
+"Cet ensemble de relais gÃ©rÃ©s par des bÃ©nÃ©voles sâappelle le rÃ©seauÂ 
Tor. "
 "Parfois, le logiciel associÃ© Ã  ce rÃ©seau est appelÃ© noyauÂ Tor, et 
parfois "
 "encore [Â«Â little-t torÂ Â»](#little-t-tor) (tor avec un t minuscule)."
 
@@ -5824,7 +5824,7 @@ msgid ""
 msgstr ""
 "Votre activitÃ© sur Internet, y compris les noms et adresses des sites Web "
 "que vous visitez, sera invisible pour votre [fournisseur dâaccÃ¨s Ã  
Internet "
-"(FAI)](#internet-service-provider-isp) et quiconque surveille votre "
+"(FAI)](#internet-service-provider-isp) et pour quiconque surveille votre "
 "connexion localement."
 
 #: https//support.torproject.org/misc/glossary/

___
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-29 Thread translation

commit 4c461c339883b9c10d654246d740afd0ef74e9a6
Author: Translation commit bot 
Date:   Wed May 29 22:21:04 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 8e898cf01..ac4683336 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -4149,7 +4149,7 @@ msgid ""
 "ordinary relays, however, they are not listed publicly, so an adversary "
 "cannot identify them easily."
 msgstr ""
-"Comme les [relais](#relais), les ponts sont exploitÃ©s par des 
bÃ©nÃ©volesâ; "
+"Comme les [relais](#relais), les ponts sont gÃ©rÃ©s par des bÃ©nÃ©volesâ; "
 "cependant, contrairement aux relais ordinaires, ils ne sont pas rÃ©pertoriÃ©s 
"
 "publiquement. Un adversaire ne peut donc pas les dÃ©couvrir facilement."
 
@@ -4845,7 +4845,7 @@ msgid ""
 "addresses of physical locations."
 msgstr ""
 "Lâadresse IP est lâadresse dâemplacement de lâappareil, semblable aux 
"
-"adresses dâemplacements physiques."
+"adresses des emplacements gÃ©ographiques."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -5775,9 +5775,9 @@ msgid ""
 msgstr ""
 "Il vous protÃ¨ge en faisant rebondir vos communications dans un rÃ©seau "
 "distribuÃ© de [relais](#relais) gÃ©rÃ©s par des bÃ©nÃ©voles du monde entierÂ 
: il "
-"empÃªche quiconque regarde votre connexion Internet de dÃ©couvrir les sites "
+"empÃªche quiconque surveille votre connexion Internet de dÃ©couvrir les sites 
"
 "que vous visitez, et empÃªche les sites que vous visitez de connaÃ®tre votre "
-"emplacement physique."
+"emplacement gÃ©ographique."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -5786,7 +5786,7 @@ msgid ""
 "software associated with this network is called Core Tor, and sometimes "
 "[\"little-t tor\"](#little-t-tor)."
 msgstr ""
-"Cet ensemble de relais exploitÃ©s par des bÃ©nÃ©voles sâappelle le rÃ©seauÂ 
Tor. "
+"Cet ensemble de relais gÃ©rÃ©s par des bÃ©nÃ©voles sâappelle le rÃ©seauÂ 
Tor. "
 "Parfois, le logiciel associÃ© Ã  ce rÃ©seau est appelÃ© noyauÂ Tor, et 
parfois "
 "encore [Â«Â little-t torÂ Â»](#little-t-tor) (tor avec un t minuscule)."
 
@@ -5824,7 +5824,7 @@ msgid ""
 msgstr ""
 "Votre activitÃ© sur Internet, y compris les noms et adresses des sites Web "
 "que vous visitez, sera invisible pour votre [fournisseur dâaccÃ¨s Ã  
Internet "
-"(FAI)](#internet-service-provider-isp) et quiconque surveille votre "
+"(FAI)](#internet-service-provider-isp) et pour quiconque surveille votre "
 "connexion localement."
 
 #: https//support.torproject.org/misc/glossary/

___
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-29 Thread translation

commit 3bb0474fe99abbf0306951fabd7fb6421d46ba70
Author: Translation commit bot 
Date:   Wed May 29 22:20:33 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 916fa0cb6..da868c858 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -338,8 +338,8 @@ msgid ""
 "and open to maximize transparency and separation."
 msgstr ""
 "DÃ¨s sa crÃ©ation dans les annÃ©esÂ 1990, le routage en oignon a Ã©tÃ© conÃ§u 
pour "
-"sâappuyer sur un rÃ©seau dÃ©centralisÃ©. Le rÃ©seau devait Ãªtre exploitÃ© 
par des"
-" entitÃ©s aux intÃ©rÃªts et aux hypothÃ¨ses de confiance divers, et le 
logiciel "
+"sâappuyer sur un rÃ©seau dÃ©centralisÃ©. Le rÃ©seau devait Ãªtre gÃ©rÃ© par 
des "
+"entitÃ©s aux intÃ©rÃªts et aux hypothÃ¨ses de confiance divers, et le 
logiciel "
 "se devait dâÃªtre gratuit et ouvert afin de maximiser transparence et "
 "sÃ©paration."
 
@@ -469,7 +469,7 @@ msgid ""
 " that keeps Tor users safe."
 msgstr ""
 "De nos jours, le rÃ©seau comprend des [milliers de "
-"relais](https://metrics.torproject.org) (site en anglais) exploitÃ©s par des "
+"relais](https://metrics.torproject.org) (site en anglais) gÃ©rÃ©s par des "
 "bÃ©nÃ©voles et des millions dâutilisateurs partout dans le monde. Cette "
 "diversitÃ© assure la sÃ©curitÃ© des utilisateurs de Tor."
 
@@ -1011,8 +1011,8 @@ msgid ""
 "known as Tor relays."
 msgstr ""
 "Votre trafic est relayÃ© et chiffrÃ© trois fois alors quâil traverse le 
rÃ©seau"
-"Â Tor. Le rÃ©seau comprend des milliers de serveurs exploitÃ©s par des "
-"bÃ©nÃ©voles, appelÃ©s relaisÂ Tor."
+"Â Tor. Le rÃ©seau comprend des milliers de serveurs gÃ©rÃ©s par des 
bÃ©nÃ©voles, "
+"appelÃ©s relaisÂ Tor."
 
 #: templates/home.html:75
 msgid "Browse Freely"
@@ -1230,7 +1230,8 @@ msgstr ""
 #: templates/thank-you.html:17
 msgid "Run a relay to make the network faster and more decentralized."
 msgstr ""
-"Exploiter un relais pour rendre le rÃ©seau plus rapide et plus 
dÃ©centralisÃ©."
+"Mettre en place un relais pour rendre le rÃ©seau plus rapide et plus "
+"dÃ©centralisÃ©."
 
 #: templates/thank-you.html:21
 msgid "Use your skills to volunteer."

___
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-29 Thread translation

commit 9f07080ccc4db006fd70d6565a7b978ec0868d4c
Author: Translation commit bot 
Date:   Wed May 29 22:17:57 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 9c000d27e..e35a09684 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -464,8 +464,8 @@ msgid ""
 msgstr ""
 "La plupart des transports enfichables, tels "
 "quâobfs3 et obfs4, comptent sur lâutilisation de relais-ponts. Comme les "
-"relais Tor ordinaires, les ponts sont exploitÃ©s par des bÃ©nÃ©volesâ; "
-"cependant, contrairement aux relais ordinaires, ils ne sont pas rÃ©pertoriÃ©s 
"
+"relais Tor ordinaires, les ponts sont gÃ©rÃ©s par des bÃ©nÃ©volesâ; 
cependant, "
+"contrairement aux relais ordinaires, ils ne sont pas rÃ©pertoriÃ©s "
 "publiquement et un adversaire ne peut donc pas les identifier facilement. "
 "Lâutilisation de ponts combinÃ©s Ã  des transports enfichables aide Ã  
dÃ©guiser"
 " le fait que vous utilisez Tor."

___
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-29 Thread translation

commit 2d47948345f37cf0a260b88abdd3fafbc5f6bdb9
Author: Translation commit bot 
Date:   Wed May 29 22:18:04 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 9c000d27e..e35a09684 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -464,8 +464,8 @@ msgid ""
 msgstr ""
 "La plupart des transports enfichables, tels "
 "quâobfs3 et obfs4, comptent sur lâutilisation de relais-ponts. Comme les "
-"relais Tor ordinaires, les ponts sont exploitÃ©s par des bÃ©nÃ©volesâ; "
-"cependant, contrairement aux relais ordinaires, ils ne sont pas rÃ©pertoriÃ©s 
"
+"relais Tor ordinaires, les ponts sont gÃ©rÃ©s par des bÃ©nÃ©volesâ; 
cependant, "
+"contrairement aux relais ordinaires, ils ne sont pas rÃ©pertoriÃ©s "
 "publiquement et un adversaire ne peut donc pas les identifier facilement. "
 "Lâutilisation de ponts combinÃ©s Ã  des transports enfichables aide Ã  
dÃ©guiser"
 " le fait que vous utilisez Tor."

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

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

2019-05-29 Thread translation

commit 2bdfead01dcd85005681673bee4e7fbda2098fb9
Author: Translation commit bot 
Date:   Wed May 29 22:15:45 2019 +

Update translations for donatepages-messagespot_completed
---
 locale/fr/LC_MESSAGES/messages.po | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 68f286d33..05fad8333 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -224,8 +224,8 @@ msgid ""
 "We need people to run relays, write code, organize the community and spread "
 "the word about our good work."
 msgstr ""
-"Nous avons besoin de personnes pour exploiter des relais, Ã©crire du code, "
-"organiser la communautÃ© et faire connaÃ®tre notre bon travail."
+"Nous avons besoin de personnes pour mettre en place des relais, Ã©crire du "
+"code, organiser la communautÃ© et faire connaÃ®tre notre bon travail."
 
 #: 
tmp/cache_locale/df/df997ca3aa3a1f02bff7d4f32e59f3fbfbe5d29a77fa6348a08ff96869ac914c.php:159
 #: 
tmp/cache_locale/54/5420828d7720daccac45a05e74a0bdde5ef138020bd4901a7e81ad8817d3f8e8.php:129
@@ -1178,8 +1178,8 @@ msgid ""
 "world."
 msgstr ""
 "Tor vous protÃ¨ge en faisant rebondir vos communications dans le rÃ©seauÂ 
Tor, "
-"qui est un rÃ©seau distribuÃ© de relais exploitÃ©s par des bÃ©nÃ©voles dans 
le "
-"monde entier."
+"qui est un rÃ©seau distribuÃ© de relais gÃ©rÃ©s par des bÃ©nÃ©voles dans le 
monde "
+"entier."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:143
 msgid ""
@@ -1213,7 +1213,7 @@ msgid ""
 "how to run a relay."
 msgstr ""
 "Jâaimerais en savoir davantage sur le fonctionnement de Tor, ce que sont 
les"
-" services onion ou comment exploiter un relais."
+" services onion ou comment mettre en place un relais."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:158
 msgid ""
@@ -2144,7 +2144,8 @@ msgid ""
 "href=\"https://www.torproject.org/docs/faq.html.en#HowDoIDecide\;>operate a "
 "Tor relay."
 msgstr ""
-"Peut-Ãªtre que votre entreprise serait prÃªte Ã  exploiter un relaisÂ 
Tor."
+"Peut-Ãªtre que votre entreprise serait prÃªte Ã  mettre en place un relaisÂ "
+"Tor."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:604
 msgid ""

___
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-29 Thread translation

commit 35ead7592e42f9508c1dd176b05dfaa8d556187e
Author: Translation commit bot 
Date:   Wed May 29 22:15:37 2019 +

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

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 68f286d33..05fad8333 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -224,8 +224,8 @@ msgid ""
 "We need people to run relays, write code, organize the community and spread "
 "the word about our good work."
 msgstr ""
-"Nous avons besoin de personnes pour exploiter des relais, Ã©crire du code, "
-"organiser la communautÃ© et faire connaÃ®tre notre bon travail."
+"Nous avons besoin de personnes pour mettre en place des relais, Ã©crire du "
+"code, organiser la communautÃ© et faire connaÃ®tre notre bon travail."
 
 #: 
tmp/cache_locale/df/df997ca3aa3a1f02bff7d4f32e59f3fbfbe5d29a77fa6348a08ff96869ac914c.php:159
 #: 
tmp/cache_locale/54/5420828d7720daccac45a05e74a0bdde5ef138020bd4901a7e81ad8817d3f8e8.php:129
@@ -1178,8 +1178,8 @@ msgid ""
 "world."
 msgstr ""
 "Tor vous protÃ¨ge en faisant rebondir vos communications dans le rÃ©seauÂ 
Tor, "
-"qui est un rÃ©seau distribuÃ© de relais exploitÃ©s par des bÃ©nÃ©voles dans 
le "
-"monde entier."
+"qui est un rÃ©seau distribuÃ© de relais gÃ©rÃ©s par des bÃ©nÃ©voles dans le 
monde "
+"entier."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:143
 msgid ""
@@ -1213,7 +1213,7 @@ msgid ""
 "how to run a relay."
 msgstr ""
 "Jâaimerais en savoir davantage sur le fonctionnement de Tor, ce que sont 
les"
-" services onion ou comment exploiter un relais."
+" services onion ou comment mettre en place un relais."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:158
 msgid ""
@@ -2144,7 +2144,8 @@ msgid ""
 "href=\"https://www.torproject.org/docs/faq.html.en#HowDoIDecide\;>operate a "
 "Tor relay."
 msgstr ""
-"Peut-Ãªtre que votre entreprise serait prÃªte Ã  exploiter un relaisÂ 
Tor."
+"Peut-Ãªtre que votre entreprise serait prÃªte Ã  mettre en place un relaisÂ "
+"Tor."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:604
 msgid ""

___
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-29 Thread translation

commit 2c534d37ae0eb9aeedb2d2c325de0b2ae9a3ba86
Author: Translation commit bot 
Date:   Wed May 29 21:48:05 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 06d942621..9c000d27e 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -958,11 +958,11 @@ msgid ""
 "information can be tied to your identity."
 msgstr ""
 "Lâutilisation du rÃ©seauÂ Tor empÃªche ceux qui vous observent de 
dÃ©couvrir "
-"votre lieu exact et votre adresse IP, mais mÃªme sans ces renseignements, ils"
-" pourraient associer diffÃ©rents aspects de votre activitÃ©. Pour cette "
-"raison, le NavigateurÂ Tor comprend des fonctions supplÃ©mentaires qui vous "
-"aident Ã  contrÃ´ler les renseignements qui peuvent Ãªtre liÃ©s Ã  votre "
-"identitÃ©."
+"votre emplacement gÃ©ographique exact et votre adresse IP, mais mÃªme sans 
ces"
+" renseignements, ils pourraient associer diffÃ©rents aspects de votre "
+"activitÃ©. Pour cette raison, le NavigateurÂ Tor comprend des fonctions "
+"supplÃ©mentaires qui vous aident Ã  contrÃ´ler les renseignements qui peuvent 
"
+"Ãªtre liÃ©s Ã  votre identitÃ©."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1218,9 +1218,9 @@ msgid ""
 "* An onion servicesâs location and IP address are hidden, making it "
 "difficult for adversaries to censor it or identify its operators."
 msgstr ""
-"* Le lieu et lâadresse IP dâun service onion sont cachÃ©s, et il est donc 
"
-"difficile pour ses adversaires de le censurer ou dâidentifier ses "
-"opÃ©rateurs."
+"* Lâemplacement gÃ©ographique et lâadresse IP dâun service onion sont 
cachÃ©s,"
+" et il est donc difficile pour ses adversaires de le censurer ou "
+"dâidentifier ses opÃ©rateurs."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1230,7 +1230,7 @@ msgid ""
 " over HTTPS."
 msgstr ""
 "* Tout le trafic entre les utilisateurs de Tor et les services onion est "
-"chiffrÃ© de bout en bout, donc vous nâavez pas Ã  vous soucier de vous connecter par HTTPS."
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1488,7 +1488,7 @@ msgstr "Les donnÃ©es qui sont transmises."
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
 msgid "location"
-msgstr "lieu"
+msgstr "emplacement"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
@@ -1496,8 +1496,8 @@ msgid ""
 "Network location of the computer used to visit the website (the public IP "
 "address)."
 msgstr ""
-"Lâemplacement rÃ©seau de lâordinateur utilisÃ© pour visiter le site Web "
-"(lâadresse IP publique)."
+"Lâemplacement sur le rÃ©seau de lâordinateur utilisÃ© pour visiter le 
site Web"
+" (lâadresse IP publique)."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)

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

[tor-commits] [translation/tor-and-https] Update translations for tor-and-https

2019-05-29 Thread translation

commit d284f24906048ad2b85b219e65e49ba5433ba821
Author: Translation commit bot 
Date:   Wed May 29 21:48:11 2019 +

Update translations for tor-and-https
---
 fr.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fr.po b/fr.po
index 6fc89a46c..d718e86a3 100644
--- a/fr.po
+++ b/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "POT-Creation-Date: 2014-07-17 14:23+\n"
-"PO-Revision-Date: 2019-02-28 20:26+\n"
+"PO-Revision-Date: 2019-05-29 21:41+\n"
 "Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"

___
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-29 Thread translation

commit bc0830c50237d73a7a14f71dd46957d5f91f5cbb
Author: Translation commit bot 
Date:   Wed May 29 21:47:58 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 06d942621..9c000d27e 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -958,11 +958,11 @@ msgid ""
 "information can be tied to your identity."
 msgstr ""
 "Lâutilisation du rÃ©seauÂ Tor empÃªche ceux qui vous observent de 
dÃ©couvrir "
-"votre lieu exact et votre adresse IP, mais mÃªme sans ces renseignements, ils"
-" pourraient associer diffÃ©rents aspects de votre activitÃ©. Pour cette "
-"raison, le NavigateurÂ Tor comprend des fonctions supplÃ©mentaires qui vous "
-"aident Ã  contrÃ´ler les renseignements qui peuvent Ãªtre liÃ©s Ã  votre "
-"identitÃ©."
+"votre emplacement gÃ©ographique exact et votre adresse IP, mais mÃªme sans 
ces"
+" renseignements, ils pourraient associer diffÃ©rents aspects de votre "
+"activitÃ©. Pour cette raison, le NavigateurÂ Tor comprend des fonctions "
+"supplÃ©mentaires qui vous aident Ã  contrÃ´ler les renseignements qui peuvent 
"
+"Ãªtre liÃ©s Ã  votre identitÃ©."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1218,9 +1218,9 @@ msgid ""
 "* An onion servicesâs location and IP address are hidden, making it "
 "difficult for adversaries to censor it or identify its operators."
 msgstr ""
-"* Le lieu et lâadresse IP dâun service onion sont cachÃ©s, et il est donc 
"
-"difficile pour ses adversaires de le censurer ou dâidentifier ses "
-"opÃ©rateurs."
+"* Lâemplacement gÃ©ographique et lâadresse IP dâun service onion sont 
cachÃ©s,"
+" et il est donc difficile pour ses adversaires de le censurer ou "
+"dâidentifier ses opÃ©rateurs."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1230,7 +1230,7 @@ msgid ""
 " over HTTPS."
 msgstr ""
 "* Tout le trafic entre les utilisateurs de Tor et les services onion est "
-"chiffrÃ© de bout en bout, donc vous nâavez pas Ã  vous soucier de vous connecter par HTTPS."
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1488,7 +1488,7 @@ msgstr "Les donnÃ©es qui sont transmises."
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
 msgid "location"
-msgstr "lieu"
+msgstr "emplacement"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
@@ -1496,8 +1496,8 @@ msgid ""
 "Network location of the computer used to visit the website (the public IP "
 "address)."
 msgstr ""
-"Lâemplacement rÃ©seau de lâordinateur utilisÃ© pour visiter le site Web "
-"(lâadresse IP publique)."
+"Lâemplacement sur le rÃ©seau de lâordinateur utilisÃ© pour visiter le 
site Web"
+" (lâadresse IP publique)."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)

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

[tor-commits] [translation/tor-and-https_completed] Update translations for tor-and-https_completed

2019-05-29 Thread translation

commit 0f1ab11a6fdf47abc2b031e017a14696f61772e3
Author: Translation commit bot 
Date:   Wed May 29 21:48:16 2019 +

Update translations for tor-and-https_completed
---
 fr.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fr.po b/fr.po
index 6fc89a46c..d718e86a3 100644
--- a/fr.po
+++ b/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "POT-Creation-Date: 2014-07-17 14:23+\n"
-"PO-Revision-Date: 2019-02-28 20:26+\n"
+"PO-Revision-Date: 2019-05-29 21:41+\n"
 "Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"

___
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-29 Thread translation

commit 362eb70a6d4b62017b7a7d6654cf0e3d807a0798
Author: Translation commit bot 
Date:   Wed May 29 21:45:57 2019 +

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

diff --git a/de/https-everywhere.dtd b/de/https-everywhere.dtd
index f77075d1e..ed8684271 100644
--- a/de/https-everywhere.dtd
+++ b/de/https-everywhere.dtd
@@ -40,7 +40,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_completed] Update translations for https_everywhere_completed

2019-05-29 Thread translation

commit c515da735aa4b343327a6b1651d474e96dc40610
Author: Translation commit bot 
Date:   Wed May 29 21:46:07 2019 +

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

diff --git a/de/https-everywhere.dtd b/de/https-everywhere.dtd
index f77075d1e..ed8684271 100644
--- a/de/https-everywhere.dtd
+++ b/de/https-everywhere.dtd
@@ -40,7 +40,7 @@
 
 
 
-
+
 
 
 

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

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

2019-05-29 Thread translation

commit 1e09a1d163dbcf27e91ed8b400e9ee15a87a7c0b
Author: Translation commit bot 
Date:   Wed May 29 20:17:58 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 1aeaaa96c..06d942621 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1200,7 +1200,7 @@ msgid ""
 "Onion services (formerly known as âhidden servicesâ) are services (like "
 "websites) that are only accessible through the Tor network."
 msgstr ""
-"Les services onion (anciennement Â« services cachÃ©s Â») sont des services "
+"Les services onion (anciennement Â«Â services cachÃ©sÂ Â») sont des services "
 "(tels que des sites Web) qui ne sont accessibles que par le rÃ©seauÂ Tor."
 
 #: https//tb-manual.torproject.org/onion-services/

___
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-29 Thread translation

commit c3bdc50ce3d67106869b8b2881f953d26b0245a3
Author: Translation commit bot 
Date:   Wed May 29 20:17:51 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 1aeaaa96c..06d942621 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1200,7 +1200,7 @@ msgid ""
 "Onion services (formerly known as âhidden servicesâ) are services (like "
 "websites) that are only accessible through the Tor network."
 msgstr ""
-"Les services onion (anciennement Â« services cachÃ©s Â») sont des services "
+"Les services onion (anciennement Â«Â services cachÃ©sÂ Â») sont des services "
 "(tels que des sites Web) qui ne sont accessibles que par le rÃ©seauÂ Tor."
 
 #: https//tb-manual.torproject.org/onion-services/

___
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-29 Thread translation

commit a00916a7d7ab49e7d85e2035c64f4dc35615ce90
Author: Translation commit bot 
Date:   Wed May 29 19:51:10 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 926c03a3d..8e898cf01 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1698,8 +1698,8 @@ msgid ""
 "A website (bank, email provider, etc..) locks me out whenever I use Tor, "
 "what can I do?"
 msgstr ""
-"Un site Web (banque, fournisseur de services de courriel, etc.) me bloque "
-"quand jâutilise Tor. Que puis-je faireâ?"
+"Un site Web (banque, service de courriel, etc.) me bloque quand jâutilise "
+"Tor. Que puis-je faireâ?"
 
 #: https//support.torproject.org/tbb/tbb-30/
 #: (content/tbb/tbb-30/contents+en.lrquestion.description)
@@ -1716,9 +1716,9 @@ msgid ""
 "Some websites, such as banks or email providers, might interpret this as a "
 "sign that your account has been compromised, and lock you out."
 msgstr ""
-"Certains sites Web tels que les banques ou les fournisseurs de services de "
-"courriel pourraient lâinterprÃ©ter comme un signe que votre compte a Ã©tÃ© "
-"compromis et, par consÃ©quent, vous bloquer."
+"Certains sites Web tels que les banques ou les services de courriel "
+"pourraient lâinterprÃ©ter comme un signe que votre compte a Ã©tÃ© compromis 
et,"
+" par consÃ©quent, vous bloquer."
 
 #: https//support.torproject.org/tbb/tbb-30/
 #: (content/tbb/tbb-30/contents+en.lrquestion.description)
@@ -4505,8 +4505,8 @@ msgid ""
 msgstr ""
 "Le dernier [relais](#relay) dans le [circuitÂ Tor](#circuit) qui envoie le "
 "[trafic](#trafic) vers lâInternet public. Le service auquel vous vous "
-"connectez (site Web, service de clavardage, fournisseur de services de "
-"courriel, etc.) verra lâ[adresse IP](#adresse IP) du relais de sortie."
+"connectez (site Web, service de clavardage, service de courriel, etc.) verra"
+" lâ[adresse IP](#adresse IP) du relais de sortie."
 
 #: 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-29 Thread translation

commit a646fc9fccae272e15fc267033408274976bfe49
Author: Translation commit bot 
Date:   Wed May 29 19:51:03 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 926c03a3d..8e898cf01 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1698,8 +1698,8 @@ msgid ""
 "A website (bank, email provider, etc..) locks me out whenever I use Tor, "
 "what can I do?"
 msgstr ""
-"Un site Web (banque, fournisseur de services de courriel, etc.) me bloque "
-"quand jâutilise Tor. Que puis-je faireâ?"
+"Un site Web (banque, service de courriel, etc.) me bloque quand jâutilise "
+"Tor. Que puis-je faireâ?"
 
 #: https//support.torproject.org/tbb/tbb-30/
 #: (content/tbb/tbb-30/contents+en.lrquestion.description)
@@ -1716,9 +1716,9 @@ msgid ""
 "Some websites, such as banks or email providers, might interpret this as a "
 "sign that your account has been compromised, and lock you out."
 msgstr ""
-"Certains sites Web tels que les banques ou les fournisseurs de services de "
-"courriel pourraient lâinterprÃ©ter comme un signe que votre compte a Ã©tÃ© "
-"compromis et, par consÃ©quent, vous bloquer."
+"Certains sites Web tels que les banques ou les services de courriel "
+"pourraient lâinterprÃ©ter comme un signe que votre compte a Ã©tÃ© compromis 
et,"
+" par consÃ©quent, vous bloquer."
 
 #: https//support.torproject.org/tbb/tbb-30/
 #: (content/tbb/tbb-30/contents+en.lrquestion.description)
@@ -4505,8 +4505,8 @@ msgid ""
 msgstr ""
 "Le dernier [relais](#relay) dans le [circuitÂ Tor](#circuit) qui envoie le "
 "[trafic](#trafic) vers lâInternet public. Le service auquel vous vous "
-"connectez (site Web, service de clavardage, fournisseur de services de "
-"courriel, etc.) verra lâ[adresse IP](#adresse IP) du relais de sortie."
+"connectez (site Web, service de clavardage, service de courriel, etc.) verra"
+" lâ[adresse IP](#adresse IP) du relais de sortie."
 
 #: 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/tor_outreach_md_completed] Update translations for tor_outreach_md_completed

2019-05-29 Thread translation

commit 04fcb55899a6e7099259c25b16b76717ed17b82f
Author: Translation commit bot 
Date:   Wed May 29 19:50:36 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 5980d516a..f803265e4 100644
--- a/tor-outreach2019-2020-fr.md
+++ b/tor-outreach2019-2020-fr.md
@@ -68,7 +68,7 @@ Une fois arrivÃ© Ã  lâhÃ´tel, il a ouvert son ordinateur 
portable.
 
 Il Ã©tait tellement Ã©puisÃ© que lorsque le message Â«Â La connexion est 
arrivÃ©e au bout de son dÃ©laiÂ Â» est apparu pour la premiÃ¨re fois sur son 
navigateur Web, il pensa quâil avait fait une erreur.
 
-Mais aprÃ¨s avoir essayÃ© encore et encore, il sâest rendu compte quâil ne 
pouvait plus accÃ©der Ã  son fournisseur de services de courriel ni Ã  un site 
Web de nouvelles ni Ã  beaucoup dâapplis.
+Mais aprÃ¨s avoir essayÃ© encore et encore, il sâest rendu compte quâil ne 
pouvait plus accÃ©der Ã  son service de courriel ni Ã  un site Web de nouvelles 
ni Ã  beaucoup dâapplis.
 
 Il avait entendu dire que ce pays censure Internet et se demanda si câÃ©tait 
le cas.
 Comment pouvait-il contacter sa famille derriÃ¨re ce mur impÃ©nÃ©trableâ?

___
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-29 Thread translation

commit 8963cc334da6e4acd6a02e2d86c35d33b633eb6b
Author: Translation commit bot 
Date:   Wed May 29 19:50:30 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 5980d516a..f803265e4 100644
--- a/tor-outreach2019-2020-fr.md
+++ b/tor-outreach2019-2020-fr.md
@@ -68,7 +68,7 @@ Une fois arrivÃ© Ã  lâhÃ´tel, il a ouvert son ordinateur 
portable.
 
 Il Ã©tait tellement Ã©puisÃ© que lorsque le message Â«Â La connexion est 
arrivÃ©e au bout de son dÃ©laiÂ Â» est apparu pour la premiÃ¨re fois sur son 
navigateur Web, il pensa quâil avait fait une erreur.
 
-Mais aprÃ¨s avoir essayÃ© encore et encore, il sâest rendu compte quâil ne 
pouvait plus accÃ©der Ã  son fournisseur de services de courriel ni Ã  un site 
Web de nouvelles ni Ã  beaucoup dâapplis.
+Mais aprÃ¨s avoir essayÃ© encore et encore, il sâest rendu compte quâil ne 
pouvait plus accÃ©der Ã  son service de courriel ni Ã  un site Web de nouvelles 
ni Ã  beaucoup dâapplis.
 
 Il avait entendu dire que ce pays censure Internet et se demanda si câÃ©tait 
le cas.
 Comment pouvait-il contacter sa famille derriÃ¨re ce mur impÃ©nÃ©trableâ?

___
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-29 Thread translation

commit a8cf81956ec331c4d3dce232fac69f1ce71aa674
Author: Translation commit bot 
Date:   Wed May 29 19:48:06 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 6902fbf82..1aeaaa96c 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1101,10 +1101,10 @@ msgid ""
 msgstr ""
 "* Avec le NavigateurÂ Tor, votre connexion semble souvent provenir dâune "
 "partie du monde totalement diffÃ©rente. Certains sites Web tels que les "
-"banques et les fournisseurs de service de courriel pourraient 
lâinterprÃ©ter "
-"comme un signe que votre compte a Ã©tÃ© piratÃ© ou compromis et vous 
interdire "
-"lâaccÃ¨s. La seule faÃ§on de rÃ©soudre ce problÃ¨me est en suivant la 
procÃ©dure "
-"de rÃ©cupÃ©ration de compte recommandÃ©e par le site, ou en contactant les "
+"banques et les services de courriel pourraient lâinterprÃ©ter comme un 
signe "
+"que votre compte a Ã©tÃ© piratÃ© ou compromis et vous interdire lâaccÃ¨s. 
La "
+"seule faÃ§on de rÃ©soudre ce problÃ¨me est en suivant la procÃ©dure de "
+"rÃ©cupÃ©ration de compte recommandÃ©e par le site, ou en contactant les "
 "opÃ©rateurs des sites et en expliquant la situation."
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1123,13 +1123,13 @@ msgid ""
 "Tor Browser features âNew Identityâ and âNew Tor Circuit for this 
Siteâ "
 "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."
+"Le NavigateurÂ Tor propose les options Â«Â Nouvelle identitÃ©Â Â» et Â«Â 
Nouveau "
+"circuitÂ Tor pour ce site Â», situÃ©es dans le menu principalÂ â¡."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid "## New Identity"
-msgstr "# Nouvelle identitÃ©"
+msgstr "## Nouvelle identitÃ©"
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1153,7 +1153,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.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/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1634,7 +1634,7 @@ msgstr ""
 "dÃ©sactivÃ©esâ; certaines Ã©quations mathÃ©matiques pourraient ne pas 
sâafficher"
 " correctementâ; certaines fonctions de rendu des polices sont 
dÃ©sactivÃ©esâ; "
 "certains types dâimages sont dÃ©sactivÃ©sâ; et JavaScript est dÃ©sactivÃ© 
par "
-"dÃ©faut pour tous les sites non HTTPS."
+"dÃ©faut pour tous les sites non HTTPS."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
@@ -1782,7 +1782,7 @@ msgid ""
 "sites; some fonts and math symbols are disabled; audio and video (HTML5 "
 "media) are click-to-play."
 msgstr ""
-"JavaScript est dÃ©sactivÃ© sur tous les sites non HTTPSâ; certaines polices et certains symboles "
 "mathÃ©matiques sont dÃ©sactivÃ©sâ; le son et la vidÃ©o (mÃ©diasÂ HTML5) 
sont Â«Â "
 "cliquer pour lireÂ Â»."
@@ -1917,8 +1917,8 @@ msgid ""
 "information)."
 msgstr ""
 "Retirez le NavigateurÂ Tor de votre systÃ¨me en supprimant le dossier qui le "
-"contient (consultez le paragraphe DÃ©sinstallation"
-" pour plus de prÃ©cisions)."
+"contient (consultez le paragraphe DÃ©sinstallation pour plus de prÃ©cisions)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -2156,13 +2156,13 @@ msgid ""
 msgstr ""
 "Si vous ne pouvez toujours pas vous connecter, il est possible que votre "
 "fournisseur dâaccÃ¨s Ã  Internet censure les connexions vers le rÃ©seauÂ 
Tor. "
-"Lire la section Le contournement pour "
+"Lire la section Le contournement pour "
 "dÃ©couvrir des solutions possibles."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid "# Known issues"
-msgstr "# Une liste de problÃ¨mes connus."
+msgstr "# ProblÃ¨mes connus"
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2173,15 +2173,15 @@ msgid ""
 " there."
 msgstr ""
 "Le NavigateurÂ Tor Ã©volue constamment, et certains problÃ¨mes sont connus, "
-"mais nâont pas encore Ã©tÃ© corrigÃ©s. Veuillez vous rÃ©fÃ©rer Ã  la page 
Les problÃ¨mes connus pour vÃ©rifier si le problÃ¨me 
que "
-"vous rencontrez  nây est pas dÃ©jÃ  rÃ©pertoriÃ©."
+"mais nâont pas encore Ã©tÃ© corrigÃ©s. Veuillez vous rÃ©fÃ©rer Ã  la page 
ProblÃ¨mes connus pour vÃ©rifier si le 
problÃ¨me

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

2019-05-29 Thread translation

commit 1d2e82046b37ccd2dd30df708a4125420ca9945f
Author: Translation commit bot 
Date:   Wed May 29 19:47:57 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 6902fbf82..1aeaaa96c 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1101,10 +1101,10 @@ msgid ""
 msgstr ""
 "* Avec le NavigateurÂ Tor, votre connexion semble souvent provenir dâune "
 "partie du monde totalement diffÃ©rente. Certains sites Web tels que les "
-"banques et les fournisseurs de service de courriel pourraient 
lâinterprÃ©ter "
-"comme un signe que votre compte a Ã©tÃ© piratÃ© ou compromis et vous 
interdire "
-"lâaccÃ¨s. La seule faÃ§on de rÃ©soudre ce problÃ¨me est en suivant la 
procÃ©dure "
-"de rÃ©cupÃ©ration de compte recommandÃ©e par le site, ou en contactant les "
+"banques et les services de courriel pourraient lâinterprÃ©ter comme un 
signe "
+"que votre compte a Ã©tÃ© piratÃ© ou compromis et vous interdire lâaccÃ¨s. 
La "
+"seule faÃ§on de rÃ©soudre ce problÃ¨me est en suivant la procÃ©dure de "
+"rÃ©cupÃ©ration de compte recommandÃ©e par le site, ou en contactant les "
 "opÃ©rateurs des sites et en expliquant la situation."
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1123,13 +1123,13 @@ msgid ""
 "Tor Browser features âNew Identityâ and âNew Tor Circuit for this 
Siteâ "
 "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."
+"Le NavigateurÂ Tor propose les options Â«Â Nouvelle identitÃ©Â Â» et Â«Â 
Nouveau "
+"circuitÂ Tor pour ce site Â», situÃ©es dans le menu principalÂ â¡."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid "## New Identity"
-msgstr "# Nouvelle identitÃ©"
+msgstr "## Nouvelle identitÃ©"
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1153,7 +1153,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.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/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1634,7 +1634,7 @@ msgstr ""
 "dÃ©sactivÃ©esâ; certaines Ã©quations mathÃ©matiques pourraient ne pas 
sâafficher"
 " correctementâ; certaines fonctions de rendu des polices sont 
dÃ©sactivÃ©esâ; "
 "certains types dâimages sont dÃ©sactivÃ©sâ; et JavaScript est dÃ©sactivÃ© 
par "
-"dÃ©faut pour tous les sites non HTTPS."
+"dÃ©faut pour tous les sites non HTTPS."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
@@ -1782,7 +1782,7 @@ msgid ""
 "sites; some fonts and math symbols are disabled; audio and video (HTML5 "
 "media) are click-to-play."
 msgstr ""
-"JavaScript est dÃ©sactivÃ© sur tous les sites non HTTPSâ; certaines polices et certains symboles "
 "mathÃ©matiques sont dÃ©sactivÃ©sâ; le son et la vidÃ©o (mÃ©diasÂ HTML5) 
sont Â«Â "
 "cliquer pour lireÂ Â»."
@@ -1917,8 +1917,8 @@ msgid ""
 "information)."
 msgstr ""
 "Retirez le NavigateurÂ Tor de votre systÃ¨me en supprimant le dossier qui le "
-"contient (consultez le paragraphe DÃ©sinstallation"
-" pour plus de prÃ©cisions)."
+"contient (consultez le paragraphe DÃ©sinstallation pour plus de prÃ©cisions)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -2156,13 +2156,13 @@ msgid ""
 msgstr ""
 "Si vous ne pouvez toujours pas vous connecter, il est possible que votre "
 "fournisseur dâaccÃ¨s Ã  Internet censure les connexions vers le rÃ©seauÂ 
Tor. "
-"Lire la section Le contournement pour "
+"Lire la section Le contournement pour "
 "dÃ©couvrir des solutions possibles."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid "# Known issues"
-msgstr "# Une liste de problÃ¨mes connus."
+msgstr "# ProblÃ¨mes connus"
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2173,15 +2173,15 @@ msgid ""
 " there."
 msgstr ""
 "Le NavigateurÂ Tor Ã©volue constamment, et certains problÃ¨mes sont connus, "
-"mais nâont pas encore Ã©tÃ© corrigÃ©s. Veuillez vous rÃ©fÃ©rer Ã  la page 
Les problÃ¨mes connus pour vÃ©rifier si le problÃ¨me 
que "
-"vous rencontrez  nây est pas dÃ©jÃ  rÃ©pertoriÃ©."
+"mais nâont pas encore Ã©tÃ© corrigÃ©s. Veuillez vous rÃ©fÃ©rer Ã  la page 
ProblÃ¨mes connus pour vÃ©rifier si le 
problÃ¨me "
+"que

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

2019-05-29 Thread translation

commit 5163802ae875e84ed6ab2c939d3510108576eeba
Author: Translation commit bot 
Date:   Wed May 29 19:17:53 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 63149ebad..6902fbf82 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -917,8 +917,8 @@ msgid ""
 msgstr ""
 "Si vous avez essayÃ© toutes ces actions et quâaucune ne vous permet de vous 
"
 "connecter, vous devrez saisir manuellement des adresses de pont. Lisez la "
-"section Les ponts pour dÃ©couvrir ce que sont les "
-"ponts et comment en obtenir."
+"section Les ponts pour dÃ©couvrir ce que sont les"
+" ponts et comment en obtenir."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1029,8 +1029,10 @@ msgstr ""
 "nÅud de garde ne change quâaprÃ¨s 2 Ã  3 mois, contrairement aux autres 
nÅuds "
 "qui changent pour chaque nouveau domaine. Pour plus de prÃ©cisions sur les "
 "gardes, consultez la https://www.torproject.org/docs/faq#EntryGuards\;>FAQ et le https://support.torproject.org/tbb/tbb-2/\;>Portail 
dâassistance."
+"href=\"https://www.torproject.org/docs/faq#EntryGuards\;>FAQ (site en "
+"anglais) et le https://support.torproject.org/fr/tbb/tbb-2/\;>Portail "
+"dâassistance."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1164,14 +1166,14 @@ msgid ""
 " reloaded. This option does not clear any private information or unlink your"
 " activity, nor does it affect your current connections to other websites."
 msgstr ""
-"Cette option est utile si le relais de sortie que vous utilisez nâarrive pas Ã  se connecter 
"
-"au site Web dont vous avez besoin 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 fenÃªtres et onglets ouverts du mÃªme site Web "
-"utiliseront aussi le nouveau circuit quand ils seront rechargÃ©s. Cette "
-"option nâefface aucun renseignement personnel, ni ne dissocie votre "
-"activitÃ©, ni nâaffectera vos connexions actuelles Ã  dâautres sites Web."
+"Cette option est utile si le relais de "
+"sortie que vous utilisez nâarrive pas Ã  se connecter au site Web dont "
+"vous avez besoin 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 fenÃªtres et onglets ouverts du mÃªme site Web utiliseront aussi le "
+"nouveau circuit quand ils seront rechargÃ©s. Cette option nâefface aucun "
+"renseignement personnel, ni ne dissocie votre activitÃ©, ni nâaffectera vos 
"
+"connexions actuelles Ã  dâautres sites Web."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1228,8 +1230,8 @@ msgid ""
 " over HTTPS."
 msgstr ""
 "* Tout le trafic entre les utilisateurs de Tor et les services onion est "
-"chiffrÃ© de bout en bout, donc vous nâavez pas Ã  vous soucier de vous connecter par HTTPS."
+"chiffrÃ© de bout en bout, donc vous nâavez pas Ã  vous soucier de vous connecter par HTTPS."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.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_completed] Update translations for tbmanual-contentspot_completed

2019-05-29 Thread translation

commit 1fc907b266a9208bdf4a504d73c50f5de94131d4
Author: Translation commit bot 
Date:   Wed May 29 19:18:01 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 63149ebad..6902fbf82 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -917,8 +917,8 @@ msgid ""
 msgstr ""
 "Si vous avez essayÃ© toutes ces actions et quâaucune ne vous permet de vous 
"
 "connecter, vous devrez saisir manuellement des adresses de pont. Lisez la "
-"section Les ponts pour dÃ©couvrir ce que sont les "
-"ponts et comment en obtenir."
+"section Les ponts pour dÃ©couvrir ce que sont les"
+" ponts et comment en obtenir."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1029,8 +1029,10 @@ msgstr ""
 "nÅud de garde ne change quâaprÃ¨s 2 Ã  3 mois, contrairement aux autres 
nÅuds "
 "qui changent pour chaque nouveau domaine. Pour plus de prÃ©cisions sur les "
 "gardes, consultez la https://www.torproject.org/docs/faq#EntryGuards\;>FAQ et le https://support.torproject.org/tbb/tbb-2/\;>Portail 
dâassistance."
+"href=\"https://www.torproject.org/docs/faq#EntryGuards\;>FAQ (site en "
+"anglais) et le https://support.torproject.org/fr/tbb/tbb-2/\;>Portail "
+"dâassistance."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1164,14 +1166,14 @@ msgid ""
 " reloaded. This option does not clear any private information or unlink your"
 " activity, nor does it affect your current connections to other websites."
 msgstr ""
-"Cette option est utile si le relais de sortie que vous utilisez nâarrive pas Ã  se connecter 
"
-"au site Web dont vous avez besoin 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 fenÃªtres et onglets ouverts du mÃªme site Web "
-"utiliseront aussi le nouveau circuit quand ils seront rechargÃ©s. Cette "
-"option nâefface aucun renseignement personnel, ni ne dissocie votre "
-"activitÃ©, ni nâaffectera vos connexions actuelles Ã  dâautres sites Web."
+"Cette option est utile si le relais de "
+"sortie que vous utilisez nâarrive pas Ã  se connecter au site Web dont "
+"vous avez besoin 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 fenÃªtres et onglets ouverts du mÃªme site Web utiliseront aussi le "
+"nouveau circuit quand ils seront rechargÃ©s. Cette option nâefface aucun "
+"renseignement personnel, ni ne dissocie votre activitÃ©, ni nâaffectera vos 
"
+"connexions actuelles Ã  dâautres sites Web."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1228,8 +1230,8 @@ msgid ""
 " over HTTPS."
 msgstr ""
 "* Tout le trafic entre les utilisateurs de Tor et les services onion est "
-"chiffrÃ© de bout en bout, donc vous nâavez pas Ã  vous soucier de vous connecter par HTTPS."
+"chiffrÃ© de bout en bout, donc vous nâavez pas Ã  vous soucier de vous connecter par HTTPS."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)

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

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

2019-05-29 Thread translation

commit d3ad47a2d274301ab09b707439512972456bff6c
Author: Translation commit bot 
Date:   Wed May 29 18:50:29 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 5e6449a06..916fa0cb6 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -905,11 +905,11 @@ msgstr ""
 #: templates/hero-download-languages.html:2
 #: templates/hero-download-options.html:2
 msgid "DEFEND YOURSELF"
-msgstr ""
+msgstr "DÃFENDEZ-VOUS"
 
 #: templates/hero-download-tor.html:2
 msgid "GROW THE NETWORK"
-msgstr ""
+msgstr "FAITES GRANDIR LE RÃSEAU"
 
 #: templates/hero-download.html:2
 msgid "Defend yourself."

___
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-29 Thread translation

commit 06b35914c996d167abca3a649a5b8a3a062f6435
Author: Translation commit bot 
Date:   Wed May 29 18:50:23 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 5e6449a06..916fa0cb6 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -905,11 +905,11 @@ msgstr ""
 #: templates/hero-download-languages.html:2
 #: templates/hero-download-options.html:2
 msgid "DEFEND YOURSELF"
-msgstr ""
+msgstr "DÃFENDEZ-VOUS"
 
 #: templates/hero-download-tor.html:2
 msgid "GROW THE NETWORK"
-msgstr ""
+msgstr "FAITES GRANDIR LE RÃSEAU"
 
 #: templates/hero-download.html:2
 msgid "Defend yourself."

___
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-29 Thread translation

commit 7efefed13f8f995802914adab6412f4e6c628399
Author: Translation commit bot 
Date:   Wed May 29 18:47:55 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 481a50495..63149ebad 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -128,7 +128,7 @@ msgid ""
 msgstr ""
 "Par dÃ©faut, le NavigateurÂ Tor ne conserve aucun historique de navigation. "
 "Les tÃ©moins ne sont valides que pour une seule session (jusquâÃ  la 
fermeture"
-" du NavigateurÂ Tor ou si une nouvelle identitÃ© est demandÃ©e)."
 
 #: https//tb-manual.torproject.org/about/
@@ -368,8 +368,8 @@ msgstr ""
 "au rÃ©seauÂ Tor sans autre configuration. Une fois que vous aurez cliquÃ©, 
une "
 "barre dâÃ©tat apparaÃ®tra et affichera lâavancement de la connexion de 
Tor. Si"
 " votre connexion est plutÃ´t rapide, mais que la barre dâÃ©tat semble 
bloquÃ©e "
-"Ã  un certain niveau, la page DÃ©pannage 
vous"
-" aidera Ã  rÃ©gler le problÃ¨me."
+"Ã  un certain niveau, la page DÃ©pannage "
+"vous aidera Ã  rÃ©gler le problÃ¨me."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -409,7 +409,7 @@ msgstr ""
 "Â». Si vous savez que votre connexion est censurÃ©e ou si vous avez tentÃ© 
sans"
 " succÃ¨s de vous connecter au rÃ©seauÂ Tor et quâaucune autre solution 
nâa "
 "fonctionnÃ©, sÃ©lectionnez Â«Â OuiÂ Â». LâÃ©cran Contournement apparaÃ®tra alors afin que vous "
+"href=\"/fr/circumvention\">Contournement apparaÃ®tra alors afin que vous "
 "configuriez un transport enfichable."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -462,7 +462,7 @@ msgid ""
 "combination with pluggable transports helps to disguise the fact that you "
 "are using Tor."
 msgstr ""
-"La plupart des transports enfichables, tels "
+"La plupart des transports enfichables, tels "
 "quâobfs3 et obfs4, comptent sur lâutilisation de relais-ponts. Comme les "
 "relais Tor ordinaires, les ponts sont exploitÃ©s par des bÃ©nÃ©volesâ; "
 "cependant, contrairement aux relais ordinaires, ils ne sont pas rÃ©pertoriÃ©s 
"
@@ -826,8 +826,8 @@ msgstr ""
 "fournisseur dâaccÃ¨s Ã  internet ou par un gouvernement. Le NavigateurÂ Tor 
"
 "comprend des outils de contournement de ces blocages. On appelle ces outils "
 "des Â«Â transports enfichablesÂ Â». Plus de prÃ©cisions sur les types de "
-"transports proposÃ©s actuellement se trouvent sur la page Transports enfichables."
+"transports proposÃ©s actuellement se trouvent sur la page Transports enfichables."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -1083,7 +1083,7 @@ msgid ""
 "* See the  Secure Connections page for "
 "important information on how to secure your connection when logging in."
 msgstr ""
-"* Consultez la page Connexions "
+"* Consultez la page Connexions "
 "sÃ©curisÃ©es pour obtenir des renseignements importants sur la faÃ§on de "
 "sÃ©curiser votre connexion lors dâune authentification."
 

___
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-29 Thread translation

commit 5c14310bacc5155e048f968e3e2e4f14741a6534
Author: Translation commit bot 
Date:   Wed May 29 18:47:47 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 481a50495..63149ebad 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -128,7 +128,7 @@ msgid ""
 msgstr ""
 "Par dÃ©faut, le NavigateurÂ Tor ne conserve aucun historique de navigation. "
 "Les tÃ©moins ne sont valides que pour une seule session (jusquâÃ  la 
fermeture"
-" du NavigateurÂ Tor ou si une nouvelle identitÃ© est demandÃ©e)."
 
 #: https//tb-manual.torproject.org/about/
@@ -368,8 +368,8 @@ msgstr ""
 "au rÃ©seauÂ Tor sans autre configuration. Une fois que vous aurez cliquÃ©, 
une "
 "barre dâÃ©tat apparaÃ®tra et affichera lâavancement de la connexion de 
Tor. Si"
 " votre connexion est plutÃ´t rapide, mais que la barre dâÃ©tat semble 
bloquÃ©e "
-"Ã  un certain niveau, la page DÃ©pannage 
vous"
-" aidera Ã  rÃ©gler le problÃ¨me."
+"Ã  un certain niveau, la page DÃ©pannage "
+"vous aidera Ã  rÃ©gler le problÃ¨me."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -409,7 +409,7 @@ msgstr ""
 "Â». Si vous savez que votre connexion est censurÃ©e ou si vous avez tentÃ© 
sans"
 " succÃ¨s de vous connecter au rÃ©seauÂ Tor et quâaucune autre solution 
nâa "
 "fonctionnÃ©, sÃ©lectionnez Â«Â OuiÂ Â». LâÃ©cran Contournement apparaÃ®tra alors afin que vous "
+"href=\"/fr/circumvention\">Contournement apparaÃ®tra alors afin que vous "
 "configuriez un transport enfichable."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -462,7 +462,7 @@ msgid ""
 "combination with pluggable transports helps to disguise the fact that you "
 "are using Tor."
 msgstr ""
-"La plupart des transports enfichables, tels "
+"La plupart des transports enfichables, tels "
 "quâobfs3 et obfs4, comptent sur lâutilisation de relais-ponts. Comme les "
 "relais Tor ordinaires, les ponts sont exploitÃ©s par des bÃ©nÃ©volesâ; "
 "cependant, contrairement aux relais ordinaires, ils ne sont pas rÃ©pertoriÃ©s 
"
@@ -826,8 +826,8 @@ msgstr ""
 "fournisseur dâaccÃ¨s Ã  internet ou par un gouvernement. Le NavigateurÂ Tor 
"
 "comprend des outils de contournement de ces blocages. On appelle ces outils "
 "des Â«Â transports enfichablesÂ Â». Plus de prÃ©cisions sur les types de "
-"transports proposÃ©s actuellement se trouvent sur la page Transports enfichables."
+"transports proposÃ©s actuellement se trouvent sur la page Transports enfichables."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -1083,7 +1083,7 @@ msgid ""
 "* See the  Secure Connections page for "
 "important information on how to secure your connection when logging in."
 msgstr ""
-"* Consultez la page Connexions "
+"* Consultez la page Connexions "
 "sÃ©curisÃ©es pour obtenir des renseignements importants sur la faÃ§on de "
 "sÃ©curiser votre connexion lors dâune authentification."
 

___
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 30492: Switch to the OpenSSL 1.1.1 series

2019-05-29 Thread boklm

commit 2fba118f50c4bb3418787cdca5a021d5941841b6
Author: Georg Koppen 
Date:   Wed May 29 11:31:11 2019 +

Bug 30492: Switch to the OpenSSL 1.1.1 series
---
 projects/openssl/config | 4 ++--
 projects/tor/build  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/openssl/config b/projects/openssl/config
index ecb6966..318529a 100644
--- a/projects/openssl/config
+++ b/projects/openssl/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.0.2r
+version: 1.1.1b
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% 
c("var/build_id") %].tar.gz'
 
 var:
@@ -26,4 +26,4 @@ input_files:
   - name: '[% c("var/compiler") %]'
 project: '[% c("var/compiler") %]'
   - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz'
-sha256sum: ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6
+sha256sum: 5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b
diff --git a/projects/tor/build b/projects/tor/build
index a9305d6..8c8ed45 100644
--- a/projects/tor/build
+++ b/projects/tor/build
@@ -49,8 +49,8 @@ openssldir=/var/tmp/dist/openssl
 [% END -%]
 [% IF c("var/linux") %]
   mkdir -p "$distdir/Debug/Tor"
-  cp $openssldir/lib/libssl.so.1.0.0 "$distdir/Tor/"
-  cp $openssldir/lib/libcrypto.so.1.0.0 "$distdir/Tor/"
+  cp $openssldir/lib/libssl.so.1.1 "$distdir/Tor/"
+  cp $openssldir/lib/libcrypto.so.1.1 "$distdir/Tor/"
   cp $libeventdir/lib/libevent-2.1.so.6 "$distdir/Tor/"
   # We need to copy the libstdc++.so.6 for Tor Browser on older Linux distros.
   # Copying it into /Browser, which feels more natural, and amending

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

[tor-commits] [tor/master] Add a new "autostyle" make target to run all of our reformatting

2019-05-29 Thread asn

commit e2d3d444969abe2a2b802f4f42512b71a5a45468
Author: Nick Mathewson 
Date:   Mon May 20 12:08:30 2019 -0400

Add a new "autostyle" make target to run all of our reformatting

Closes ticket 30539.
---
 Makefile.am | 31 ++-
 changes/ticket30539 |  4 
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 827cf3dc9..7a0d40d6a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -334,11 +334,8 @@ coverage-html-full: all
lcov --remove "$(HTML_COVER_DIR)/lcov.tmp" --rc lcov_branch_coverage=1 
'test/*' 'ext/tinytest*' '/usr/*' --output-file "$(HTML_COVER_DIR)/lcov.info"
genhtml --branch-coverage -o "$(HTML_COVER_DIR)" 
"$(HTML_COVER_DIR)/lcov.info"
 
-# Avoid strlcpy.c, strlcat.c, aes.c, OpenBSD_malloc_Linux.c, sha256.c,
-# tinytest*.[ch]
-check-spaces:
-if USE_PERL
-   $(PERL) $(top_srcdir)/scripts/maint/checkSpace.pl -C \
+# For scripts: avoid src/ext and src/trunnel.
+OWNED_TOR_C_FILES=\
$(top_srcdir)/src/lib/*/*.[ch] \
$(top_srcdir)/src/core/*/*.[ch] \
$(top_srcdir)/src/feature/*/*.[ch] \
@@ -346,6 +343,11 @@ if USE_PERL
$(top_srcdir)/src/test/*.[ch] \
$(top_srcdir)/src/test/*/*.[ch] \
$(top_srcdir)/src/tools/*.[ch]
+
+check-spaces:
+if USE_PERL
+   $(PERL) $(top_srcdir)/scripts/maint/checkSpace.pl -C \
+   $(OWNED_TOR_C_FILES)
 endif
 
 check-includes:
@@ -456,6 +458,25 @@ version:
   (cd "$(top_srcdir)" && git rev-parse --short=16 HEAD); \
fi
 
+.PHONY: autostyle-ifdefs
+autostyle-ifdefs:
+   $(PYTHON) scripts/maint/annotate_ifdef_directives $(OWNED_TOR_C_FILES)
+
+.PHONY: autostyle-ifdefs
+autostyle-operators:
+   $(PERL) scripts/coccinelle/test-operator-cleanup $(OWNED_TOR_C_FILES)
+
+.PHONY: rectify-includes
+rectify-includes:
+   $(PYTHON) scripts/maint/rectify_include_paths.py
+
+.PHONY: update-copyright
+update-copyright:
+   $(PERL) scripts/maint/updateCopyright.pl $(OWNED_TOR_C_FILES)
+
+.PHONY: autostyle
+autostyle: update-versions rustfmt autostyle-ifdefs rectify-includes
+
 mostlyclean-local:
rm -f $(top_builddir)/src/*/*.gc{da,no} 
$(top_builddir)/src/*/*/*.gc{da,no}
rm -rf $(HTML_COVER_DIR)
diff --git a/changes/ticket30539 b/changes/ticket30539
new file mode 100644
index 0..8d105eacb
--- /dev/null
+++ b/changes/ticket30539
@@ -0,0 +1,4 @@
+  o Minor features (maintenance):
+- Add a new "make autostyle" target that developers can use to
+  apply all automatic Tor style and consistency conversions to the
+  codebase. Closes ticket 30539.



___
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 'tor-github/pr/1037'

2019-05-29 Thread asn

commit 70553a91343e242e05e569d59584674a21d09679
Merge: 650bdca97 e2d3d4449
Author: George Kadianakis 
Date:   Wed May 29 21:25:32 2019 +0300

Merge branch 'tor-github/pr/1037'

 Makefile.am|  31 +++-
 changes/ticket30539|   4 +
 scripts/maint/add_c_file.py| 251 +
 scripts/maint/rectify_include_paths.py |  13 +-
 scripts/maint/updateCopyright.pl   |   6 +-
 5 files changed, 296 insertions(+), 9 deletions(-)

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

[tor-commits] [tor/master] rectify_include_paths: warn instead of aborting on duplicate headers

2019-05-29 Thread asn

commit 2f31c8146ff12aa96a33cce47bf4b5f5eeac8a06
Author: Nick Mathewson 
Date:   Mon May 20 11:52:45 2019 -0400

rectify_include_paths: warn instead of aborting on duplicate headers

We have two sendme.h files at the moment; we should fix that, but
not in this branch.
---
 scripts/maint/add_c_file.py| 251 +
 scripts/maint/rectify_include_paths.py |  13 +-
 2 files changed, 262 insertions(+), 2 deletions(-)

diff --git a/scripts/maint/add_c_file.py b/scripts/maint/add_c_file.py
new file mode 100755
index 0..499415974
--- /dev/null
+++ b/scripts/maint/add_c_file.py
@@ -0,0 +1,251 @@
+#!/usr/bin/env python3
+
+"""
+   Add a C file with matching header to the Tor codebase.  Creates
+   both files from templates, and adds them to the right include.am file.
+
+   Example usage:
+
+   % add_c_file.py ./src/feature/dirauth/ocelot.c
+"""
+
+import os
+import re
+import time
+
+def topdir_file(name):
+"""Strip opening "src" from a filename"""
+if name.startswith("src/"):
+name = name[4:]
+return name
+
+def guard_macro(name):
+"""Return the guard macro that should be used for the header file 'name'.
+"""
+td = topdir_file(name).replace(".", "_").replace("/", "_").upper()
+return "TOR_{}".format(td)
+
+def makeext(name, new_extension):
+"""Replace the extension for the file called 'name' with 'new_extension'.
+"""
+base = os.path.splitext(name)[0]
+return base + "." + new_extension
+
+def instantiate_template(template, output_fname):
+"""
+Fill in a template with string using the fields that should be used
+for 'output_fname'.
+"""
+names = {
+# The relative location of the header file.
+'header_path' : makeext(topdir_file(output_fname), "h"),
+# The relative location of the C file file.
+'c_file_path' : makeext(topdir_file(output_fname), "c"),
+# The truncated name of the file.
+'short_name' : os.path.basename(output_fname),
+# The current year, for the copyright notice
+'this_year' : time.localtime().tm_year,
+# An appropriate guard macro, for the header.
+'guard_macro' : guard_macro(output_fname),
+}
+
+return template.format(**names)
+
+HEADER_TEMPLATE = """\
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-{this_year}, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+/**
+ * @file {short_name}
+ * @brief Header for {c_file_path}
+ **/
+
+#ifndef {guard_macro}
+#define {guard_macro}
+
+#endif /* !defined({guard_macro}) */
+"""
+
+C_FILE_TEMPLATE = """\
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-{this_year}, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+/**
+ * @file {short_name}
+ * @brief DOCDOC
+ **/
+
+#include "orconfig.h"
+#include "{header_path}"
+"""
+
+class AutomakeChunk:
+"""
+Represents part of an automake file.  If it is decorated with
+an ADD_C_FILE comment, it has a "kind" based on what to add to it.
+Otherwise, it only has a bunch of lines in it.
+"""
+pat = re.compile(r'# ADD_C_FILE: INSERT (\S*) HERE', re.I)
+
+def __init__(self):
+self.lines = []
+self.kind = ""
+
+def addLine(self, line):
+"""
+Insert a line into this chunk while parsing the automake file.
+"""
+m = self.pat.match(line)
+if m:
+if self.lines:
+raise ValueError("control line not preceded by a blank line")
+self.kind = m.group(1)
+
+self.lines.append(line)
+if line.strip() == "":
+return True
+
+return False
+
+def insertMember(self, member):
+"""
+Add a new member to this chunk.  Try to insert it in alphabetical
+order with matching indentation, but don't freak out too much if the
+source isn't consistent.
+
+Assumes that this chunk is of the form:
+   FOOBAR = \
+  X \
+  Y \
+  Z
+"""
+self.prespace = "\t"
+self.postspace = "\t\t"
+for lineno, line in enumerate(self.lines):
+m = re.match(r'(\s+)(\S+)(\s+)\\', line)
+if not m:
+continue
+prespace, fname, postspace = m.groups()
+if fname > member:
+self.insert_before(lineno, member, prespace, postspace)
+return
+self.insert_at_end(member)
+
+def insert_before(self, lineno, member, prespace, postspace):
+self.lines.insert(lineno,
+  "{}{}{}\\\n".format(prespace, member, postspace))
+
+def insert_at_end(self, member, prespace,

[tor-commits] [tor/master] updateCopyright: look at the current year.

2019-05-29 Thread asn

commit 66eb0a5a32e78e541f2b350fc814c35f17150859
Author: Nick Mathewson 
Date:   Mon May 20 12:02:20 2019 -0400

updateCopyright: look at the current year.
---
 scripts/maint/updateCopyright.pl | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/maint/updateCopyright.pl b/scripts/maint/updateCopyright.pl
index 36894b1ba..6800032f8 100755
--- a/scripts/maint/updateCopyright.pl
+++ b/scripts/maint/updateCopyright.pl
@@ -1,7 +1,9 @@
 #!/usr/bin/perl -i -w -p
 
-$NEWYEAR=2019;
+@now = gmtime();
 
-s/Copyright(.*) (201[^9]), The Tor Project/Copyright$1 $2-${NEWYEAR}, The Tor 
Project/;
+$NEWYEAR=$now[5]+1900;
+
+s/Copyright([^-]*) (20[^-]*), The Tor Project/Copyright$1 $2-${NEWYEAR}, The 
Tor Project/;
 
 s/Copyright(.*)-(20..), The Tor Project/Copyright$1-${NEWYEAR}, The Tor 
Project/;



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

[tor-commits] [tor/release-0.4.0] test: Also avoid reading the system default torrc in integration tests

2019-05-29 Thread asn

commit 12b9bfc05f3a163b44f0f8b6638f027de16e622b
Author: teor 
Date:   Wed Apr 10 19:03:43 2019 +1000

test: Also avoid reading the system default torrc in integration tests

Part of 29702.
---
 changes/ticket29702 | 6 +++---
 src/test/test_key_expiration.sh | 3 ++-
 src/test/test_keygen.sh | 3 ++-
 src/test/test_rebind.py | 6 +-
 src/test/zero_length_keys.sh| 3 ++-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/changes/ticket29702 b/changes/ticket29702
index d2cacd55d..e1cc1f867 100644
--- a/changes/ticket29702
+++ b/changes/ticket29702
@@ -1,4 +1,4 @@
   o Testing:
-- Specify torrc path (with empty file) when launching tor from
-  test_rebind.py; refrain from relying on default torrc path. Resolves
-  issue 29702.
+- Specify torrc paths (with empty files) when launching tor in
+  integration tests; refrain from reading user and system torrcs.
+  Resolves issue 29702.
diff --git a/src/test/test_key_expiration.sh b/src/test/test_key_expiration.sh
index cf6608634..347421060 100755
--- a/src/test/test_key_expiration.sh
+++ b/src/test/test_key_expiration.sh
@@ -66,10 +66,11 @@ trap "rm -rf '$DATA_DIR'" 0
 DATA_DIR=`cd "${DATA_DIR}" && pwd`
 
 touch "${DATA_DIR}/empty_torrc"
+touch "${DATA_DIR}/empty_defaults_torrc"
 
 QUIETLY="--hush"
 SILENTLY="--quiet"
-TOR="${TOR_BINARY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 
--ExitRelay 0 -f ${DATA_DIR}/empty_torrc --DataDirectory ${DATA_DIR}"
+TOR="${TOR_BINARY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 
--ExitRelay 0 --DataDirectory ${DATA_DIR} -f ${DATA_DIR}/empty_torrc 
--defaults-torrc ${DATA_DIR}/empty_defaults_torrc"
 
 # SETUP
 #
diff --git a/src/test/test_keygen.sh b/src/test/test_keygen.sh
index 455f9e7d4..7afff271c 100755
--- a/src/test/test_keygen.sh
+++ b/src/test/test_keygen.sh
@@ -83,10 +83,11 @@ trap "rm -rf '$DATA_DIR'" 0
 DATA_DIR=`cd "${DATA_DIR}" && pwd`
 
 touch "${DATA_DIR}/empty_torrc"
+touch "${DATA_DIR}/empty_defaults_torrc"
 
 QUIETLY="--hush"
 SILENTLY="--quiet"
-TOR="${TOR_BINARY} ${QUIETLY} --DisableNetwork 1 --ShutdownWaitLength 0 
--ORPort 12345 --ExitRelay 0 -f ${DATA_DIR}/empty_torrc"
+TOR="${TOR_BINARY} ${QUIETLY} --DisableNetwork 1 --ShutdownWaitLength 0 
--ORPort 12345 --ExitRelay 0 -f ${DATA_DIR}/empty_torrc --defaults-torrc 
${DATA_DIR}/empty_defaults_torrc"
 
 # SETUP
 #
diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py
index 4c41e1f43..a376e62cb 100644
--- a/src/test/test_rebind.py
+++ b/src/test/test_rebind.py
@@ -84,6 +84,8 @@ data_dir = sys.argv[2]
 
 empty_torrc_path = os.path.join(data_dir, 'empty_torrc')
 open(empty_torrc_path, 'w').close()
+empty_defaults_torrc_path = os.path.join(data_dir, 'empty_defaults_torrc')
+open(empty_defaults_torrc_path, 'w').close()
 
 tor_process = subprocess.Popen([tor_path,
'-DataDirectory', data_dir,
@@ -92,7 +94,9 @@ tor_process = subprocess.Popen([tor_path,
'-Log', 'debug stdout',
'-LogTimeGranularity', '1',
'-FetchServerDescriptors', '0',
-   '-f', empty_torrc_path],
+   '-f', empty_torrc_path,
+   '--defaults-torrc', empty_defaults_torrc_path,
+   ],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
 
diff --git a/src/test/zero_length_keys.sh b/src/test/zero_length_keys.sh
index 3c61f8d46..5635bdfd8 100755
--- a/src/test/zero_length_keys.sh
+++ b/src/test/zero_length_keys.sh
@@ -43,10 +43,11 @@ fi
 trap "rm -rf '$DATA_DIR'" 0
 
 touch "$DATA_DIR"/empty_torrc
+touch "$DATA_DIR"/empty_defaults_torrc
 
 # DisableNetwork means that the ORPort won't actually be opened.
 # 'ExitRelay 0' suppresses a warning.
-TOR="${TOR_BINARY} --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 
12345 --ExitRelay 0 -f $DATA_DIR/empty_torrc"
+TOR="${TOR_BINARY} --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 
12345 --ExitRelay 0 -f $DATA_DIR/empty_torrc --defaults-torrc 
$DATA_DIR/empty_defaults_torrc"
 
 if [ -s "$DATA_DIR"/keys/secret_id_key ] && [ -s 
"$DATA_DIR"/keys/secret_onion_key ] &&
[ -s "$DATA_DIR"/keys/secret_onion_key_ntor ]; then



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

[tor-commits] [tor/release-0.4.0] Use empty torrc file when launching tor in test_rebind.py

2019-05-29 Thread asn

commit 93dcfc659300f9ad5277ec531612013e4b8a13d3
Author: rl1987 
Date:   Wed Mar 13 17:53:51 2019 +0200

Use empty torrc file when launching tor in test_rebind.py
---
 src/test/test_rebind.py | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py
index 00e5a08be..4c41e1f43 100644
--- a/src/test/test_rebind.py
+++ b/src/test/test_rebind.py
@@ -82,13 +82,17 @@ if not os.path.exists(sys.argv[2]):
 tor_path = sys.argv[1]
 data_dir = sys.argv[2]
 
+empty_torrc_path = os.path.join(data_dir, 'empty_torrc')
+open(empty_torrc_path, 'w').close()
+
 tor_process = subprocess.Popen([tor_path,
'-DataDirectory', data_dir,
'-ControlPort', 
'127.0.0.1:{}'.format(control_port),
'-SOCKSPort', '127.0.0.1:{}'.format(socks_port),
'-Log', 'debug stdout',
'-LogTimeGranularity', '1',
-   '-FetchServerDescriptors', '0'],
+   '-FetchServerDescriptors', '0',
+   '-f', empty_torrc_path],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
 



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

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

2019-05-29 Thread asn

commit 121d271dc6db82b0c49125b7160ed320e6398682
Merge: 63e0599c5 00108b75d
Author: George Kadianakis 
Date:   Wed May 29 21:20:02 2019 +0300

Merge branch 'maint-0.4.0' into release-0.4.0

 changes/ticket29702 |  4 
 src/test/test_key_expiration.sh |  3 ++-
 src/test/test_keygen.sh |  3 ++-
 src/test/test_rebind.py | 10 +-
 src/test/zero_length_keys.sh|  3 ++-
 5 files changed, 19 insertions(+), 4 deletions(-)

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

[tor-commits] [tor/master] Add changes file

2019-05-29 Thread asn

commit acec0192c3d6400316037cdc3e4c9093c1919252
Author: rl1987 
Date:   Wed Mar 13 18:51:41 2019 +0200

Add changes file
---
 changes/ticket29702 | 4 
 1 file changed, 4 insertions(+)

diff --git a/changes/ticket29702 b/changes/ticket29702
new file mode 100644
index 0..d2cacd55d
--- /dev/null
+++ b/changes/ticket29702
@@ -0,0 +1,4 @@
+  o Testing:
+- Specify torrc path (with empty file) when launching tor from
+  test_rebind.py; refrain from relying on default torrc path. Resolves
+  issue 29702.



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

[tor-commits] [tor/master] Use empty torrc file when launching tor in test_rebind.py

2019-05-29 Thread asn

commit 93dcfc659300f9ad5277ec531612013e4b8a13d3
Author: rl1987 
Date:   Wed Mar 13 17:53:51 2019 +0200

Use empty torrc file when launching tor in test_rebind.py
---
 src/test/test_rebind.py | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py
index 00e5a08be..4c41e1f43 100644
--- a/src/test/test_rebind.py
+++ b/src/test/test_rebind.py
@@ -82,13 +82,17 @@ if not os.path.exists(sys.argv[2]):
 tor_path = sys.argv[1]
 data_dir = sys.argv[2]
 
+empty_torrc_path = os.path.join(data_dir, 'empty_torrc')
+open(empty_torrc_path, 'w').close()
+
 tor_process = subprocess.Popen([tor_path,
'-DataDirectory', data_dir,
'-ControlPort', 
'127.0.0.1:{}'.format(control_port),
'-SOCKSPort', '127.0.0.1:{}'.format(socks_port),
'-Log', 'debug stdout',
'-LogTimeGranularity', '1',
-   '-FetchServerDescriptors', '0'],
+   '-FetchServerDescriptors', '0',
+   '-f', empty_torrc_path],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
 



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

[tor-commits] [tor/release-0.4.0] Merge branch 'tor-github/pr/924' into maint-0.4.0

2019-05-29 Thread asn

commit 00108b75d4c0f02a7fa5aba240e4b60f79bf4d1d
Merge: c7f9f7e54 12b9bfc05
Author: George Kadianakis 
Date:   Wed May 29 21:19:56 2019 +0300

Merge branch 'tor-github/pr/924' into maint-0.4.0

 changes/ticket29702 |  4 
 src/test/test_key_expiration.sh |  3 ++-
 src/test/test_keygen.sh |  3 ++-
 src/test/test_rebind.py | 10 +-
 src/test/zero_length_keys.sh|  3 ++-
 5 files changed, 19 insertions(+), 4 deletions(-)




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

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

2019-05-29 Thread asn

commit 650bdca97f2bf45b27fe8ae0f9a2da5cbf36f959
Merge: 24a2352d5 00108b75d
Author: George Kadianakis 
Date:   Wed May 29 21:20:02 2019 +0300

Merge branch 'maint-0.4.0'

 changes/ticket29702 |  4 
 src/test/test_key_expiration.sh |  3 ++-
 src/test/test_keygen.sh |  3 ++-
 src/test/test_rebind.py | 10 +-
 src/test/zero_length_keys.sh|  3 ++-
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --cc src/test/test_key_expiration.sh
index 1ed81c81c,347421060..54abb4a2f
--- a/src/test/test_key_expiration.sh
+++ b/src/test/test_key_expiration.sh
@@@ -60,12 -60,13 +60,13 @@@ if [ ! -d "$DATA_DIR" ]; the
echo "Failure: mktemp invocation result doesn't point to directory" >&2
exit 3
  fi
 -trap "rm -rf '$DATA_DIR'" 0
 +trap 'rm -rf "$DATA_DIR"' 0
  
  # Use an absolute path for this or Tor will complain
 -DATA_DIR=`cd "${DATA_DIR}" && pwd`
 +DATA_DIR=$(cd "${DATA_DIR}" && pwd)
  
  touch "${DATA_DIR}/empty_torrc"
+ touch "${DATA_DIR}/empty_defaults_torrc"
  
  QUIETLY="--hush"
  SILENTLY="--quiet"
diff --cc src/test/test_keygen.sh
index 9fbf7dd57,7afff271c..cbdfd1909
--- a/src/test/test_keygen.sh
+++ b/src/test/test_keygen.sh
@@@ -77,12 -77,13 +77,13 @@@ if [ ! -d "$DATA_DIR" ]; the
echo "Failure: mktemp invocation result doesn't point to directory" >&2
exit 3
  fi
 -trap "rm -rf '$DATA_DIR'" 0
 +trap 'rm -rf "$DATA_DIR"' 0
  
  # Use an absolute path for this or Tor will complain
 -DATA_DIR=`cd "${DATA_DIR}" && pwd`
 +DATA_DIR=$(cd "${DATA_DIR}" && pwd)
  
  touch "${DATA_DIR}/empty_torrc"
+ touch "${DATA_DIR}/empty_defaults_torrc"
  
  QUIETLY="--hush"
  SILENTLY="--quiet"
diff --cc src/test/zero_length_keys.sh
index 4069148e0,5635bdfd8..1702d1124
--- a/src/test/zero_length_keys.sh
+++ b/src/test/zero_length_keys.sh
@@@ -40,9 -40,10 +40,10 @@@ if [ ! -d "$DATA_DIR" ]; the
echo "Failure: mktemp invocation result doesn't point to directory" >&2
exit 3
  fi
 -trap "rm -rf '$DATA_DIR'" 0
 +trap 'rm -rf "$DATA_DIR"' 0
  
  touch "$DATA_DIR"/empty_torrc
+ touch "$DATA_DIR"/empty_defaults_torrc
  
  # DisableNetwork means that the ORPort won't actually be opened.
  # 'ExitRelay 0' suppresses a warning.

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

[tor-commits] [tor/release-0.4.0] Add changes file

2019-05-29 Thread asn

commit acec0192c3d6400316037cdc3e4c9093c1919252
Author: rl1987 
Date:   Wed Mar 13 18:51:41 2019 +0200

Add changes file
---
 changes/ticket29702 | 4 
 1 file changed, 4 insertions(+)

diff --git a/changes/ticket29702 b/changes/ticket29702
new file mode 100644
index 0..d2cacd55d
--- /dev/null
+++ b/changes/ticket29702
@@ -0,0 +1,4 @@
+  o Testing:
+- Specify torrc path (with empty file) when launching tor from
+  test_rebind.py; refrain from relying on default torrc path. Resolves
+  issue 29702.



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

[tor-commits] [tor/maint-0.4.0] Use empty torrc file when launching tor in test_rebind.py

2019-05-29 Thread asn

commit 93dcfc659300f9ad5277ec531612013e4b8a13d3
Author: rl1987 
Date:   Wed Mar 13 17:53:51 2019 +0200

Use empty torrc file when launching tor in test_rebind.py
---
 src/test/test_rebind.py | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py
index 00e5a08be..4c41e1f43 100644
--- a/src/test/test_rebind.py
+++ b/src/test/test_rebind.py
@@ -82,13 +82,17 @@ if not os.path.exists(sys.argv[2]):
 tor_path = sys.argv[1]
 data_dir = sys.argv[2]
 
+empty_torrc_path = os.path.join(data_dir, 'empty_torrc')
+open(empty_torrc_path, 'w').close()
+
 tor_process = subprocess.Popen([tor_path,
'-DataDirectory', data_dir,
'-ControlPort', 
'127.0.0.1:{}'.format(control_port),
'-SOCKSPort', '127.0.0.1:{}'.format(socks_port),
'-Log', 'debug stdout',
'-LogTimeGranularity', '1',
-   '-FetchServerDescriptors', '0'],
+   '-FetchServerDescriptors', '0',
+   '-f', empty_torrc_path],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
 



___
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 'tor-github/pr/924' into maint-0.4.0

2019-05-29 Thread asn

commit 00108b75d4c0f02a7fa5aba240e4b60f79bf4d1d
Merge: c7f9f7e54 12b9bfc05
Author: George Kadianakis 
Date:   Wed May 29 21:19:56 2019 +0300

Merge branch 'tor-github/pr/924' into maint-0.4.0

 changes/ticket29702 |  4 
 src/test/test_key_expiration.sh |  3 ++-
 src/test/test_keygen.sh |  3 ++-
 src/test/test_rebind.py | 10 +-
 src/test/zero_length_keys.sh|  3 ++-
 5 files changed, 19 insertions(+), 4 deletions(-)




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

[tor-commits] [tor/maint-0.4.0] Merge branch 'tor-github/pr/924' into maint-0.4.0

2019-05-29 Thread asn

commit 00108b75d4c0f02a7fa5aba240e4b60f79bf4d1d
Merge: c7f9f7e54 12b9bfc05
Author: George Kadianakis 
Date:   Wed May 29 21:19:56 2019 +0300

Merge branch 'tor-github/pr/924' into maint-0.4.0

 changes/ticket29702 |  4 
 src/test/test_key_expiration.sh |  3 ++-
 src/test/test_keygen.sh |  3 ++-
 src/test/test_rebind.py | 10 +-
 src/test/zero_length_keys.sh|  3 ++-
 5 files changed, 19 insertions(+), 4 deletions(-)

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

[tor-commits] [tor/maint-0.4.0] test: Also avoid reading the system default torrc in integration tests

2019-05-29 Thread asn

commit 12b9bfc05f3a163b44f0f8b6638f027de16e622b
Author: teor 
Date:   Wed Apr 10 19:03:43 2019 +1000

test: Also avoid reading the system default torrc in integration tests

Part of 29702.
---
 changes/ticket29702 | 6 +++---
 src/test/test_key_expiration.sh | 3 ++-
 src/test/test_keygen.sh | 3 ++-
 src/test/test_rebind.py | 6 +-
 src/test/zero_length_keys.sh| 3 ++-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/changes/ticket29702 b/changes/ticket29702
index d2cacd55d..e1cc1f867 100644
--- a/changes/ticket29702
+++ b/changes/ticket29702
@@ -1,4 +1,4 @@
   o Testing:
-- Specify torrc path (with empty file) when launching tor from
-  test_rebind.py; refrain from relying on default torrc path. Resolves
-  issue 29702.
+- Specify torrc paths (with empty files) when launching tor in
+  integration tests; refrain from reading user and system torrcs.
+  Resolves issue 29702.
diff --git a/src/test/test_key_expiration.sh b/src/test/test_key_expiration.sh
index cf6608634..347421060 100755
--- a/src/test/test_key_expiration.sh
+++ b/src/test/test_key_expiration.sh
@@ -66,10 +66,11 @@ trap "rm -rf '$DATA_DIR'" 0
 DATA_DIR=`cd "${DATA_DIR}" && pwd`
 
 touch "${DATA_DIR}/empty_torrc"
+touch "${DATA_DIR}/empty_defaults_torrc"
 
 QUIETLY="--hush"
 SILENTLY="--quiet"
-TOR="${TOR_BINARY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 
--ExitRelay 0 -f ${DATA_DIR}/empty_torrc --DataDirectory ${DATA_DIR}"
+TOR="${TOR_BINARY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 
--ExitRelay 0 --DataDirectory ${DATA_DIR} -f ${DATA_DIR}/empty_torrc 
--defaults-torrc ${DATA_DIR}/empty_defaults_torrc"
 
 # SETUP
 #
diff --git a/src/test/test_keygen.sh b/src/test/test_keygen.sh
index 455f9e7d4..7afff271c 100755
--- a/src/test/test_keygen.sh
+++ b/src/test/test_keygen.sh
@@ -83,10 +83,11 @@ trap "rm -rf '$DATA_DIR'" 0
 DATA_DIR=`cd "${DATA_DIR}" && pwd`
 
 touch "${DATA_DIR}/empty_torrc"
+touch "${DATA_DIR}/empty_defaults_torrc"
 
 QUIETLY="--hush"
 SILENTLY="--quiet"
-TOR="${TOR_BINARY} ${QUIETLY} --DisableNetwork 1 --ShutdownWaitLength 0 
--ORPort 12345 --ExitRelay 0 -f ${DATA_DIR}/empty_torrc"
+TOR="${TOR_BINARY} ${QUIETLY} --DisableNetwork 1 --ShutdownWaitLength 0 
--ORPort 12345 --ExitRelay 0 -f ${DATA_DIR}/empty_torrc --defaults-torrc 
${DATA_DIR}/empty_defaults_torrc"
 
 # SETUP
 #
diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py
index 4c41e1f43..a376e62cb 100644
--- a/src/test/test_rebind.py
+++ b/src/test/test_rebind.py
@@ -84,6 +84,8 @@ data_dir = sys.argv[2]
 
 empty_torrc_path = os.path.join(data_dir, 'empty_torrc')
 open(empty_torrc_path, 'w').close()
+empty_defaults_torrc_path = os.path.join(data_dir, 'empty_defaults_torrc')
+open(empty_defaults_torrc_path, 'w').close()
 
 tor_process = subprocess.Popen([tor_path,
'-DataDirectory', data_dir,
@@ -92,7 +94,9 @@ tor_process = subprocess.Popen([tor_path,
'-Log', 'debug stdout',
'-LogTimeGranularity', '1',
'-FetchServerDescriptors', '0',
-   '-f', empty_torrc_path],
+   '-f', empty_torrc_path,
+   '--defaults-torrc', empty_defaults_torrc_path,
+   ],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
 
diff --git a/src/test/zero_length_keys.sh b/src/test/zero_length_keys.sh
index 3c61f8d46..5635bdfd8 100755
--- a/src/test/zero_length_keys.sh
+++ b/src/test/zero_length_keys.sh
@@ -43,10 +43,11 @@ fi
 trap "rm -rf '$DATA_DIR'" 0
 
 touch "$DATA_DIR"/empty_torrc
+touch "$DATA_DIR"/empty_defaults_torrc
 
 # DisableNetwork means that the ORPort won't actually be opened.
 # 'ExitRelay 0' suppresses a warning.
-TOR="${TOR_BINARY} --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 
12345 --ExitRelay 0 -f $DATA_DIR/empty_torrc"
+TOR="${TOR_BINARY} --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 
12345 --ExitRelay 0 -f $DATA_DIR/empty_torrc --defaults-torrc 
$DATA_DIR/empty_defaults_torrc"
 
 if [ -s "$DATA_DIR"/keys/secret_id_key ] && [ -s 
"$DATA_DIR"/keys/secret_onion_key ] &&
[ -s "$DATA_DIR"/keys/secret_onion_key_ntor ]; then



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

[tor-commits] [tor/maint-0.4.0] Add changes file

2019-05-29 Thread asn

commit acec0192c3d6400316037cdc3e4c9093c1919252
Author: rl1987 
Date:   Wed Mar 13 18:51:41 2019 +0200

Add changes file
---
 changes/ticket29702 | 4 
 1 file changed, 4 insertions(+)

diff --git a/changes/ticket29702 b/changes/ticket29702
new file mode 100644
index 0..d2cacd55d
--- /dev/null
+++ b/changes/ticket29702
@@ -0,0 +1,4 @@
+  o Testing:
+- Specify torrc path (with empty file) when launching tor from
+  test_rebind.py; refrain from relying on default torrc path. Resolves
+  issue 29702.



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

[tor-commits] [tor/master] test: Also avoid reading the system default torrc in integration tests

2019-05-29 Thread asn

commit 12b9bfc05f3a163b44f0f8b6638f027de16e622b
Author: teor 
Date:   Wed Apr 10 19:03:43 2019 +1000

test: Also avoid reading the system default torrc in integration tests

Part of 29702.
---
 changes/ticket29702 | 6 +++---
 src/test/test_key_expiration.sh | 3 ++-
 src/test/test_keygen.sh | 3 ++-
 src/test/test_rebind.py | 6 +-
 src/test/zero_length_keys.sh| 3 ++-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/changes/ticket29702 b/changes/ticket29702
index d2cacd55d..e1cc1f867 100644
--- a/changes/ticket29702
+++ b/changes/ticket29702
@@ -1,4 +1,4 @@
   o Testing:
-- Specify torrc path (with empty file) when launching tor from
-  test_rebind.py; refrain from relying on default torrc path. Resolves
-  issue 29702.
+- Specify torrc paths (with empty files) when launching tor in
+  integration tests; refrain from reading user and system torrcs.
+  Resolves issue 29702.
diff --git a/src/test/test_key_expiration.sh b/src/test/test_key_expiration.sh
index cf6608634..347421060 100755
--- a/src/test/test_key_expiration.sh
+++ b/src/test/test_key_expiration.sh
@@ -66,10 +66,11 @@ trap "rm -rf '$DATA_DIR'" 0
 DATA_DIR=`cd "${DATA_DIR}" && pwd`
 
 touch "${DATA_DIR}/empty_torrc"
+touch "${DATA_DIR}/empty_defaults_torrc"
 
 QUIETLY="--hush"
 SILENTLY="--quiet"
-TOR="${TOR_BINARY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 
--ExitRelay 0 -f ${DATA_DIR}/empty_torrc --DataDirectory ${DATA_DIR}"
+TOR="${TOR_BINARY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 
--ExitRelay 0 --DataDirectory ${DATA_DIR} -f ${DATA_DIR}/empty_torrc 
--defaults-torrc ${DATA_DIR}/empty_defaults_torrc"
 
 # SETUP
 #
diff --git a/src/test/test_keygen.sh b/src/test/test_keygen.sh
index 455f9e7d4..7afff271c 100755
--- a/src/test/test_keygen.sh
+++ b/src/test/test_keygen.sh
@@ -83,10 +83,11 @@ trap "rm -rf '$DATA_DIR'" 0
 DATA_DIR=`cd "${DATA_DIR}" && pwd`
 
 touch "${DATA_DIR}/empty_torrc"
+touch "${DATA_DIR}/empty_defaults_torrc"
 
 QUIETLY="--hush"
 SILENTLY="--quiet"
-TOR="${TOR_BINARY} ${QUIETLY} --DisableNetwork 1 --ShutdownWaitLength 0 
--ORPort 12345 --ExitRelay 0 -f ${DATA_DIR}/empty_torrc"
+TOR="${TOR_BINARY} ${QUIETLY} --DisableNetwork 1 --ShutdownWaitLength 0 
--ORPort 12345 --ExitRelay 0 -f ${DATA_DIR}/empty_torrc --defaults-torrc 
${DATA_DIR}/empty_defaults_torrc"
 
 # SETUP
 #
diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py
index 4c41e1f43..a376e62cb 100644
--- a/src/test/test_rebind.py
+++ b/src/test/test_rebind.py
@@ -84,6 +84,8 @@ data_dir = sys.argv[2]
 
 empty_torrc_path = os.path.join(data_dir, 'empty_torrc')
 open(empty_torrc_path, 'w').close()
+empty_defaults_torrc_path = os.path.join(data_dir, 'empty_defaults_torrc')
+open(empty_defaults_torrc_path, 'w').close()
 
 tor_process = subprocess.Popen([tor_path,
'-DataDirectory', data_dir,
@@ -92,7 +94,9 @@ tor_process = subprocess.Popen([tor_path,
'-Log', 'debug stdout',
'-LogTimeGranularity', '1',
'-FetchServerDescriptors', '0',
-   '-f', empty_torrc_path],
+   '-f', empty_torrc_path,
+   '--defaults-torrc', empty_defaults_torrc_path,
+   ],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
 
diff --git a/src/test/zero_length_keys.sh b/src/test/zero_length_keys.sh
index 3c61f8d46..5635bdfd8 100755
--- a/src/test/zero_length_keys.sh
+++ b/src/test/zero_length_keys.sh
@@ -43,10 +43,11 @@ fi
 trap "rm -rf '$DATA_DIR'" 0
 
 touch "$DATA_DIR"/empty_torrc
+touch "$DATA_DIR"/empty_defaults_torrc
 
 # DisableNetwork means that the ORPort won't actually be opened.
 # 'ExitRelay 0' suppresses a warning.
-TOR="${TOR_BINARY} --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 
12345 --ExitRelay 0 -f $DATA_DIR/empty_torrc"
+TOR="${TOR_BINARY} --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 
12345 --ExitRelay 0 -f $DATA_DIR/empty_torrc --defaults-torrc 
$DATA_DIR/empty_defaults_torrc"
 
 if [ -s "$DATA_DIR"/keys/secret_id_key ] && [ -s 
"$DATA_DIR"/keys/secret_onion_key ] &&
[ -s "$DATA_DIR"/keys/secret_onion_key_ntor ]; then



___
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-29 Thread translation

commit bfc28f2316fce2cddb5e88525449c62550e61c57
Author: Translation commit bot 
Date:   Wed May 29 18:18:19 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 8f4debbfc..481a50495 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1074,8 +1074,8 @@ msgid ""
 "When you log in to a website over Tor, there are several points you should "
 "bear in mind:"
 msgstr ""
-"En vous connectant Ã  un site Web en utilisant Tor, il y a plusieurs "
-"considÃ©rations que vous devriez garder Ã  lâespritÂ :"
+"Quand vous vous connectez Ã  un site Web en utilisant Tor, vous devriez "
+"garder Ã  lâesprit plusieurs considÃ©rationsÂ :"
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.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-29 Thread translation

commit 4952c80e59b9ce4998a4d469f20ed88a361d3835
Author: Translation commit bot 
Date:   Wed May 29 18:18:11 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 8f4debbfc..481a50495 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1074,8 +1074,8 @@ msgid ""
 "When you log in to a website over Tor, there are several points you should "
 "bear in mind:"
 msgstr ""
-"En vous connectant Ã  un site Web en utilisant Tor, il y a plusieurs "
-"considÃ©rations que vous devriez garder Ã  lâespritÂ :"
+"Quand vous vous connectez Ã  un site Web en utilisant Tor, vous devriez "
+"garder Ã  lâesprit plusieurs considÃ©rationsÂ :"
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.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_completed] Update translations for tbmanual-contentspot_completed

2019-05-29 Thread translation

commit c2349ec6720054ca35e0de2cd14e3f8abb7d65fa
Author: Translation commit bot 
Date:   Wed May 29 17:47:59 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 d13a69cf1..8f4debbfc 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-27 08:26+CET\n"
+"POT-Creation-Date: 2019-05-29 13:31+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
 "Last-Translator: AO , 2019\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
@@ -1060,10 +1060,10 @@ msgid ""
 "useful if the website you are trying to reach is censored on your network."
 msgstr ""
 "Si vous vous connectez Ã  un site Web en utilisant un navigateur ordinaire, "
-"vous divulguez aussi votre adresse IP et votre emplacement gÃ©ographique. "
-"Câest souvent aussi le cas quand vous envoyez un courriel. En vous "
+"vous divulguez aussi votre adresse IP et votre emplacement gÃ©ographique ce "
+"faisant. Câest souvent aussi le cas quand vous envoyez un courriel. En vous 
"
 "connectant Ã  vos comptes de rÃ©seautage social ou de courriel en utilisant 
le"
-" NavigateurÂ Tor vous pouvez choisir exactement les renseignements que vous "
+" NavigateurÂ Tor, vous pouvez choisir exactement les renseignements que vous "
 "divulguez aux sites Web que vous parcourez. Il est aussi utile de vous "
 "connecter avec le NavigateurÂ Tor si le site Web que vous tentez de joindre "
 "est censurÃ© sur votre rÃ©seau."

___
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-29 Thread translation

commit 86d8a1fd79309fca1e045c2d10c13de71421c747
Author: Translation commit bot 
Date:   Wed May 29 17:47:51 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 d13a69cf1..8f4debbfc 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-27 08:26+CET\n"
+"POT-Creation-Date: 2019-05-29 13:31+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
 "Last-Translator: AO , 2019\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
@@ -1060,10 +1060,10 @@ msgid ""
 "useful if the website you are trying to reach is censored on your network."
 msgstr ""
 "Si vous vous connectez Ã  un site Web en utilisant un navigateur ordinaire, "
-"vous divulguez aussi votre adresse IP et votre emplacement gÃ©ographique. "
-"Câest souvent aussi le cas quand vous envoyez un courriel. En vous "
+"vous divulguez aussi votre adresse IP et votre emplacement gÃ©ographique ce "
+"faisant. Câest souvent aussi le cas quand vous envoyez un courriel. En vous 
"
 "connectant Ã  vos comptes de rÃ©seautage social ou de courriel en utilisant 
le"
-" NavigateurÂ Tor vous pouvez choisir exactement les renseignements que vous "
+" NavigateurÂ Tor, vous pouvez choisir exactement les renseignements que vous "
 "divulguez aux sites Web que vous parcourez. Il est aussi utile de vous "
 "connecter avec le NavigateurÂ Tor si le site Web que vous tentez de joindre "
 "est censurÃ© sur votre rÃ©seau."

___
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-29 Thread translation

commit f35c91815963148ddcbc64422ee5d91c5c6c4f99
Author: Translation commit bot 
Date:   Wed May 29 16:20:50 2019 +

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

diff --git a/contents+ka.po b/contents+ka.po
index 1d676dffd..77c962b21 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -890,11 +890,11 @@ msgstr ""
 #: templates/hero-download-languages.html:2
 #: templates/hero-download-options.html:2
 msgid "DEFEND YOURSELF"
-msgstr ""
+msgstr "ááááªáááá áááá"
 
 #: templates/hero-download-tor.html:2
 msgid "GROW THE NETWORK"
-msgstr ""
+msgstr "áááá¤áá ááááá á¥á¡ááá"
 
 #: templates/hero-download.html:2
 msgid "Defend yourself."

___
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-29 Thread translation

commit 5421bc817062fd461f1460766620f2ea6b62683c
Author: Translation commit bot 
Date:   Wed May 29 16:20:44 2019 +

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

diff --git a/contents+ka.po b/contents+ka.po
index 1d676dffd..77c962b21 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -890,11 +890,11 @@ msgstr ""
 #: templates/hero-download-languages.html:2
 #: templates/hero-download-options.html:2
 msgid "DEFEND YOURSELF"
-msgstr ""
+msgstr "ááááªáááá áááá"
 
 #: templates/hero-download-tor.html:2
 msgid "GROW THE NETWORK"
-msgstr ""
+msgstr "áááá¤áá ááááá á¥á¡ááá"
 
 #: templates/hero-download.html:2
 msgid "Defend yourself."

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

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2019-05-29 Thread translation

commit d44ae1ada8972c5b3545feefd65fdc05050bfd24
Author: Translation commit bot 
Date:   Wed May 29 15:50:00 2019 +

Update translations for tor-launcher-properties
---
 ka/torlauncher.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ka/torlauncher.properties b/ka/torlauncher.properties
index 6543d6eec..271f5b5e9 100644
--- a/ka/torlauncher.properties
+++ b/ka/torlauncher.properties
@@ -65,8 +65,8 @@ torlauncher.bootstrapStatus.onehop_create=ááá¨áá¤á 
á£áá ááá
 torlauncher.bootstrapStatus.requesting_status=á¥á¡áááá¡ 
ááááááá ááááá¡ ááááááá
 torlauncher.bootstrapStatus.loading_status=á¥á¡áááá¡ 
ááááááá ááááá¡ á©áá¢ááá ááá
 torlauncher.bootstrapStatus.loading_keys=á£á¤ááááááá¡ááá 
á¡áá á¢áá¤áááá¢áááá¡ á©áá¢ááá ááá
-torlauncher.bootstrapStatus.requesting_descriptors=ááááááªáááá¡
 áááááªáááááá¡ áááá®áááá
-torlauncher.bootstrapStatus.loading_descriptors=ááááááªáááá¡ 
áááááªáááááá¡ á©áá¢ááá ááá
+torlauncher.bootstrapStatus.requesting_descriptors=ááááááªáááááá¡
 áááááªáááááá¡ áááá®áááá
+torlauncher.bootstrapStatus.loading_descriptors=ááááááªáááááá¡
 áááááªáááááá¡ á©áá¢ááá ááá
 torlauncher.bootstrapStatus.enough_dirinfo=ááááááªáááá¡ 
áááááªááááá á©ááá¢ááá áá
 torlauncher.bootstrapStatus.ap_conn_pt=á¬á áááááá¡ 
á¨áá¥ááá: á®ááááá áááááá¨áá ááá
 torlauncher.bootstrapStatus.ap_conn_done_pt=á¬á áááááá¡ 
á¨áá¥ááá: á®ááááá áááááá¨áá 
ááá£ááá

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

[tor-commits] [translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed

2019-05-29 Thread translation

commit 44aaa81419abfbbd9cd88916b99d951d9f017503
Author: Translation commit bot 
Date:   Wed May 29 15:50:07 2019 +

Update translations for tor-launcher-properties_completed
---
 ka/torlauncher.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ka/torlauncher.properties b/ka/torlauncher.properties
index 6543d6eec..271f5b5e9 100644
--- a/ka/torlauncher.properties
+++ b/ka/torlauncher.properties
@@ -65,8 +65,8 @@ torlauncher.bootstrapStatus.onehop_create=ááá¨áá¤á 
á£áá ááá
 torlauncher.bootstrapStatus.requesting_status=á¥á¡áááá¡ 
ááááááá ááááá¡ ááááááá
 torlauncher.bootstrapStatus.loading_status=á¥á¡áááá¡ 
ááááááá ááááá¡ á©áá¢ááá ááá
 torlauncher.bootstrapStatus.loading_keys=á£á¤ááááááá¡ááá 
á¡áá á¢áá¤áááá¢áááá¡ á©áá¢ááá ááá
-torlauncher.bootstrapStatus.requesting_descriptors=ááááááªáááá¡
 áááááªáááááá¡ áááá®áááá
-torlauncher.bootstrapStatus.loading_descriptors=ááááááªáááá¡ 
áááááªáááááá¡ á©áá¢ááá ááá
+torlauncher.bootstrapStatus.requesting_descriptors=ááááááªáááááá¡
 áááááªáááááá¡ áááá®áááá
+torlauncher.bootstrapStatus.loading_descriptors=ááááááªáááááá¡
 áááááªáááááá¡ á©áá¢ááá ááá
 torlauncher.bootstrapStatus.enough_dirinfo=ááááááªáááá¡ 
áááááªááááá á©ááá¢ááá áá
 torlauncher.bootstrapStatus.ap_conn_pt=á¬á áááááá¡ 
á¨áá¥ááá: á®ááááá áááááá¨áá ááá
 torlauncher.bootstrapStatus.ap_conn_done_pt=á¬á áááááá¡ 
á¨áá¥ááá: á®ááááá áááááá¨áá 
ááá£ááá

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

[tor-commits] [metrics-lib/master] Recognize bandwidth files with @type annotation.

2019-05-29 Thread karsten

commit f8afa3930d800e139b4e1ca540961ac4a097c11b
Author: Karsten Loesing 
Date:   Thu May 16 15:54:13 2019 +0200

Recognize bandwidth files with @type annotation.

Fixes part of #30525.
---
 CHANGELOG.md| 6 ++
 .../java/org/torproject/descriptor/impl/DescriptorParserImpl.java   | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e70572..d1aa923 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# Changes in version 2.6.2 - 2019-05-??
+
+ * Medium changes
+   - Recognize bandwidth files with @type annotation.
+
+
 # Changes in version 2.6.1 - 2019-05-03
 
  * Medium changes
diff --git 
a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java 
b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java
index 08ac909..ef9da56 100644
--- a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java
+++ b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java
@@ -132,7 +132,8 @@ public class DescriptorParserImpl implements 
DescriptorParser {
   sourceFile);
 } else if (fileName.contains(LogDescriptorImpl.MARKER)) {
   return LogDescriptorImpl.parse(rawDescriptorBytes, sourceFile, fileName);
-} else if (firstLines.matches("(?s)[0-9]{10}\\n.*")) {
+} else if (firstLines.startsWith("@type bandwidth-file 1.")
+|| firstLines.matches("(?s)[0-9]{10}\\n.*")) {
   /* Identifying bandwidth files by a 10-digit timestamp in the first line
* breaks with files generated before 2002 or after 2286 and when the 
next
* descriptor identifier starts with just a timestamp in the first line

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

[tor-commits] [metrics-web/master] Update CollecTor page to include bandwidth files.

2019-05-29 Thread karsten

commit d31b049cb1ae146a5bb4e418dcda91aabf0275d4
Author: Karsten Loesing 
Date:   Wed May 15 16:53:29 2019 +0200

Update CollecTor page to include bandwidth files.

Fixes #30507.
---
 src/main/resources/web/jsps/collector.jsp | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/web/jsps/collector.jsp 
b/src/main/resources/web/jsps/collector.jsp
index 1adc9b3..a05b7e0 100644
--- a/src/main/resources/web/jsps/collector.jsp
+++ b/src/main/resources/web/jsps/collector.jsp
@@ -192,8 +192,9 @@
 
 
   Bandwidth Files
-  @type bandwidth-file 1.2
-  
+  @type bandwidth-file 1.0
+   recent
+   archive
 
 
 
@@ -778,15 +779,16 @@ detail on a separate page.
 
 
 Bandwidth Files
-@type bandwidth-file 1.2
+@type bandwidth-file 1.0
+ 
recent
+ 
archive
 #
 
 
 
 Bandwidth authority metrics as defined in the https://gitweb.torproject.org/torspec.git/tree/bandwidth-file-spec.txt;>bandwidth-file-spec.
 These are available from a DirPort's
-/tor/status-vote/next/bandwidth url and CollecTor (both are
-https://trac.torproject.org/projects/tor/ticket/21377;>pending).
+/tor/status-vote/next/bandwidth url and CollecTor.
 
 
 

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

[tor-commits] [tor-browser/tor-browser-60.7.0esr-8.5-1] Bug 30541: Disable WebGL readPixel() for web content

2019-05-29 Thread gk

commit a7422f83dff4a4c58b2a763543d4960ac1b42771
Author: Georg Koppen 
Date:   Wed May 29 12:29:19 2019 +

Bug 30541: Disable WebGL readPixel() for web content
---
 dom/canvas/WebGLContextGL.cpp | 8 
 1 file changed, 8 insertions(+)

diff --git a/dom/canvas/WebGLContextGL.cpp b/dom/canvas/WebGLContextGL.cpp
index cab33ba626f2..2d4d9d8d16a4 100644
--- a/dom/canvas/WebGLContextGL.cpp
+++ b/dom/canvas/WebGLContextGL.cpp
@@ -1137,6 +1137,14 @@ bool WebGLContext::ReadPixels_SharedPrecheck(CallerType 
aCallerType,
 return false;
   }
 
+  // Security check passed, but don't let content readPixel calls through for
+  // now, if Resist Fingerprinting Mode is enabled.
+  if (nsContentUtils::ResistFingerprinting(aCallerType)) {
+GenerateWarning("readPixels: Not allowed in Resist Fingerprinting Mode");
+out_error.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+return false;
+  }
+
   return true;
 }
 

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

[tor-commits] [tor-browser/tor-browser-60.7.0esr-9.0-1] Bug 30541: Disable WebGL readPixel() for web content

2019-05-29 Thread gk

commit e462f9d9eb505b5e724ec64a52280c70210cf5eb
Author: Georg Koppen 
Date:   Wed May 29 12:29:19 2019 +

Bug 30541: Disable WebGL readPixel() for web content
---
 dom/canvas/WebGLContextGL.cpp | 8 
 1 file changed, 8 insertions(+)

diff --git a/dom/canvas/WebGLContextGL.cpp b/dom/canvas/WebGLContextGL.cpp
index cab33ba626f2..2d4d9d8d16a4 100644
--- a/dom/canvas/WebGLContextGL.cpp
+++ b/dom/canvas/WebGLContextGL.cpp
@@ -1137,6 +1137,14 @@ bool WebGLContext::ReadPixels_SharedPrecheck(CallerType 
aCallerType,
 return false;
   }
 
+  // Security check passed, but don't let content readPixel calls through for
+  // now, if Resist Fingerprinting Mode is enabled.
+  if (nsContentUtils::ResistFingerprinting(aCallerType)) {
+GenerateWarning("readPixels: Not allowed in Resist Fingerprinting Mode");
+out_error.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+return false;
+  }
+
   return true;
 }
 

___
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-29 Thread translation

commit 888dbf4365ca6734afa4fdb5a873d46550349107
Author: Translation commit bot 
Date:   Wed May 29 11:48:00 2019 +

Update translations for tbmanual-contentspot_completed
---
 contents+en.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+en.po b/contents+en.po
index 34d5460a4..04d504899 100644
--- a/contents+en.po
+++ b/contents+en.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-27 08:26+CET\n"
+"POT-Creation-Date: 2019-05-29 13:31+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"

___
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-29 Thread translation

commit 4c79a38de72e724d82600e407c95cd7d59eb0cf3
Author: Translation commit bot 
Date:   Wed May 29 11:47:52 2019 +

Update translations for tbmanual-contentspot
---
 contents+en.po | 2 +-
 contents+hr.po | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contents+en.po b/contents+en.po
index 34d5460a4..04d504899 100644
--- a/contents+en.po
+++ b/contents+en.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-27 08:26+CET\n"
+"POT-Creation-Date: 2019-05-29 13:31+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
diff --git a/contents+hr.po b/contents+hr.po
index b975ef7fa..ab57244da 100644
--- a/contents+hr.po
+++ b/contents+hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-27 08:26+CET\n"
+"POT-Creation-Date: 2019-05-29 13:31+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Croatian (https://www.transifex.com/otf/teams/1519/hr/)\n"

___
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-29 Thread translation

commit adf10ffa1ad016d6acddfd0ed953ebe521374a96
Author: Translation commit bot 
Date:   Wed May 29 10:20:49 2019 +

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

diff --git a/contents+tr.po b/contents+tr.po
index 1b956e457..f40cfb77d 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -882,11 +882,11 @@ msgstr ""
 #: templates/hero-download-languages.html:2
 #: templates/hero-download-options.html:2
 msgid "DEFEND YOURSELF"
-msgstr ""
+msgstr "KENDÄ°NÄ°ZÄ° KORUYUN"
 
 #: templates/hero-download-tor.html:2
 msgid "GROW THE NETWORK"
-msgstr ""
+msgstr "AÄI BÃYÃTÃN"
 
 #: templates/hero-download.html:2
 msgid "Defend yourself."

___
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-29 Thread translation

commit 7f991f64b059f8cd53d3d6bc3e18dac413b53239
Author: Translation commit bot 
Date:   Wed May 29 10:20:55 2019 +

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

diff --git a/contents+tr.po b/contents+tr.po
index 1b956e457..f40cfb77d 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -882,11 +882,11 @@ msgstr ""
 #: templates/hero-download-languages.html:2
 #: templates/hero-download-options.html:2
 msgid "DEFEND YOURSELF"
-msgstr ""
+msgstr "KENDÄ°NÄ°ZÄ° KORUYUN"
 
 #: templates/hero-download-tor.html:2
 msgid "GROW THE NETWORK"
-msgstr ""
+msgstr "AÄI BÃYÃTÃN"
 
 #: templates/hero-download.html:2
 msgid "Defend yourself."

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

1 2 3 >

1 - 100 of 221 matches

Mail list logo