tor-commits
Threads by month
- ----- 2025 -----
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
November 2018
- 19 participants
- 2292 discussions

[translation/tba-torbrowserstringsdtd] Update translations for tba-torbrowserstringsdtd
by translation@torproject.org 22 Nov '18
by translation@torproject.org 22 Nov '18
22 Nov '18
commit 756678e7a13e0de2d213fe3b0f591a7b8c7c9497
Author: Translation commit bot <translation(a)torproject.org>
Date: Thu Nov 22 21:46:58 2018 +0000
Update translations for tba-torbrowserstringsdtd
---
es/android_strings.dtd | 2 +-
he/android_strings.dtd | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/es/android_strings.dtd b/es/android_strings.dtd
index 74aa78476..8f41001d9 100644
--- a/es/android_strings.dtd
+++ b/es/android_strings.dtd
@@ -22,4 +22,4 @@
<!ENTITY firstrun_onionservices_tab_title "Onions">
<!ENTITY firstrun_onionservices_title "Servicios Cebolla">
<!ENTITY firstrun_onionservices_message "Los servicios cebolla son sitios que terminan con .onion y proveen protecciones extra a editores y visitantes, incluyendo salvaguardas adicionales contra la censura. Los mismos permiten a cualquiera proveer contenido y servicios anónimamente.">
-<!ENTITY firstrun_onionservices_next "Go to explore">
+<!ENTITY firstrun_onionservices_next "Ir a explorar">
diff --git a/he/android_strings.dtd b/he/android_strings.dtd
index bfe72d0f4..53429b7b2 100644
--- a/he/android_strings.dtd
+++ b/he/android_strings.dtd
@@ -19,7 +19,7 @@
<!ENTITY firstrun_tips_title "עצות חוויה">
<!ENTITY firstrun_tips_message "עם כל המאפיינים של האבטחה והפרטיות המסופקים ע"י Tor, חוויתך בעת גלישה באינטרנט עשויה להיות מעט שונה. דברים עשויים להיות מעט איטיים יותר, ובהסתמכות על רמת האבטחה שלך, יסודות מסוימים עשויים לא לעבוד או להיטען. ייתכן שתתבקש להוכיח שאתה אנושי ולא רובוט.">
<!ENTITY firstrun_tips_next "הבא">
-<!ENTITY firstrun_onionservices_tab_title "Onions">
+<!ENTITY firstrun_onionservices_tab_title "בצלים">
<!ENTITY firstrun_onionservices_title "שירותי בצל">
<!ENTITY firstrun_onionservices_message "שירותי בצל הם אתרים המסתיימים עם .onion המספקים הגנות אקסטרה אל מפרסמים ומבקרים, כולל אמצעיי הגנה שהתווספו נגד צנזורה. שירותי בצל מתירים לכל אחד לספק תוכן ושירותים באופן אלמוני.">
-<!ENTITY firstrun_onionservices_next "Go to explore">
+<!ENTITY firstrun_onionservices_next "לך לסייר">
1
0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation@torproject.org 22 Nov '18
by translation@torproject.org 22 Nov '18
22 Nov '18
commit 9d1cf211b5a9976318ca00b254a835ca9301b79e
Author: Translation commit bot <translation(a)torproject.org>
Date: Thu Nov 22 21:45:22 2018 +0000
Update translations for donatepages-messagespot
---
locale/fr/LC_MESSAGES/messages.po | 94 +++++++++++++++++++++++----------------
1 file changed, 56 insertions(+), 38 deletions(-)
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 126d8f235..6902f8bd4 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -165,6 +165,8 @@ msgid ""
"<span class=\"bold\">The Tor Project very much appreciates all its donors. "
"Thank you for supporting Tor</span>."
msgstr ""
+"<span class=\"bold\">Le Projet Tor apprécie beaucoup tous ses donateurs. "
+"Merci de soutenir Tor</span>."
#: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:113
#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:658
@@ -176,26 +178,28 @@ msgid ""
"The European shirt fits run a little small so you might want to consider "
"sizing up."
msgstr ""
+"La chemise européenne est un peu petite, vous devriez donc envisager de la "
+"mettre à votre taille."
#: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:36
msgid "Fit"
-msgstr ""
+msgstr "Taille"
#: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:40
msgid "Select Fit"
-msgstr ""
+msgstr "Choisissez la taille"
#: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:44
msgid "Slim"
-msgstr ""
+msgstr "Slim"
#: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:48
msgid "Classic"
-msgstr ""
+msgstr "Classic"
#: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:56
msgid "European"
-msgstr ""
+msgstr "Européen"
#: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:66
msgid "Size"
@@ -239,6 +243,8 @@ msgstr "Tor : l’union fait la force"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:75
msgid "Donate to the Tor Project and protect the privacy of millions."
msgstr ""
+"Faites un don au projet Tor et protégez la vie privée de millions de "
+"personnes."
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:54
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:77
@@ -247,17 +253,19 @@ msgstr "L’anonymat est contagieux."
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:63
msgid "summary_large_image"
-msgstr ""
+msgstr "summary_large_image"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:67
msgid "@torproject"
-msgstr ""
+msgstr "@torproject"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:102
msgid ""
"This page requires Javascript to do PayPal or credit card\n"
" donations, but it appears you have Javascript disabled."
msgstr ""
+"Cette page nécessite Javascript pour faire PayPal ou carte de crédit\n"
+"mais il semble que vous ayez désactivé Javascript."
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:106
msgid ""
@@ -265,18 +273,21 @@ msgid ""
" <a href=\"https://www.torproject.org/donate/donate-options.html.en\">other "
"donations options page</a>."
msgstr ""
+"Si vous souhaitez faire un don sans activer Javascript, veuillez jeter un "
+"coup d'oeil à notre <a href=\"https://www.torproject.org/donate/donate-"
+"options.html.en\">page d'autres options de dons</a>."
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:123
msgid "Number of Donations"
-msgstr ""
+msgstr "Nombre de dons"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:139
msgid "Total Donated"
-msgstr ""
+msgstr "Total des dons"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:155
msgid "Total Raised with Mozilla's Match"
-msgstr ""
+msgstr "Total élevé avec le Match de Mozilla"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:163
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:169
@@ -294,54 +305,56 @@ msgstr "mensuel"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:178
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:331
msgid "Want to donate Bitcoin, Stock, or via snail mail?"
-msgstr ""
+msgstr "Vous voulez faire un don de Bitcoin, Stock, ou par la poste ?"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:193
msgid "invalid amount"
-msgstr ""
+msgstr "montant non valide"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:197
msgid "$2 minimum donation"
-msgstr ""
+msgstr "Don minimum de 2 $."
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:201
msgid "$ other"
-msgstr ""
+msgstr "autres ($)"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:208
msgid "Choose your gift as a token of our thanks."
-msgstr ""
+msgstr "Choisissez votre cadeau en guise de remerciement."
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:215
msgid "No thanks, I don't want a gift."
-msgstr ""
+msgstr "Non merci, je ne veux pas de cadeau."
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:217
#, php-format
msgid "I would prefer 100% of my donation to go to the Tor Project's work."
-msgstr ""
+msgstr "Je préférerais que 100% de mon don aille au travail du projet Tor."
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:228
msgid "sticker Pack"
-msgstr ""
+msgstr "Paquet d'autocollants"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:235
msgid ""
"A collection of our favorite logo stickers for decorating your stuff and "
"covering your cams."
msgstr ""
+"Une collection de nos autocollants logo préférés pour décorer vos affaires "
+"et couvrir vos caméras."
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:245
msgid "t-shirt"
-msgstr ""
+msgstr "t-shirt"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:253
msgid "Get our limited edition Tor: Strength in Numbers shirt."
-msgstr ""
+msgstr "Obtenez notre édition limitée Tor : Chemise Force en chiffres."
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:264
msgid "t-shirt pack"
-msgstr ""
+msgstr "paquet de t-shirts"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:274
msgid ""
@@ -349,42 +362,47 @@ msgid ""
"the Digital Resistance, Open Observatory of Network Interference (OONI), or "
"Tor at the Heart of Internet Freedom t-shirts."
msgstr ""
+"Notre Tor : Strength in Numbers t-shirt, plus un de nos t-shirts Tor : "
+"Powering the Digital Resistance, Open Observatory of Network Interference "
+"(OONI), ou Tor at the Heart of Internet Freedom t-shirts."
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:280
msgid "Tor at the Heart of Internet Freedom"
-msgstr ""
+msgstr "Tor at the Heart of Internet Freedom"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:284
msgid "Powering the Digital Resistance"
-msgstr ""
+msgstr "Powering the Digital Resistance"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:288
msgid "Open Observatory of Network Interference"
-msgstr ""
+msgstr "Open Observatory of Network Interference"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:299
msgid "sweatshirt"
-msgstr ""
+msgstr "sweatshirt"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:306
msgid "Your generous support of Tor gets you this high-quality zip hoodie."
msgstr ""
+"Votre généreux soutien de Tor vous permet d'obtenir ce sweat à capuche zippé"
+" de haute qualité."
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:316
msgid "how do you want to <span class=\"green\">DONATE</span>?"
-msgstr ""
+msgstr "comment voulez-vous <span class=\"green\">FAIRE UN DON</span>?"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:322
msgid "Credit Card"
-msgstr ""
+msgstr "Carte de crédit"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:338
msgid "Your Info"
-msgstr ""
+msgstr "Votre Info"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:342
msgid "* required fields"
-msgstr ""
+msgstr "* champs obligatoires"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:347
msgid "First Name"
@@ -412,7 +430,7 @@ msgstr "État"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:380
msgid "Zip"
-msgstr ""
+msgstr "POSTCODE"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:386
msgid "Enter email"
@@ -424,33 +442,33 @@ msgstr "Nous vous enverrons votre reçu par courriel"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:397
msgid "Start sending me email updates about the Tor Project!"
-msgstr ""
+msgstr "Commencez à m'envoyer des mises à jour par email sur le projet Tor !"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:404
msgid "Card Number"
-msgstr ""
+msgstr "Numéro de carte"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:411
msgid "MM"
-msgstr ""
+msgstr "MM"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:415
msgid "YY"
-msgstr ""
+msgstr "YY"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:419
msgid "CVC"
-msgstr ""
+msgstr "CVC"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:427
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:472
msgid "Choose your size and fit."
-msgstr ""
+msgstr "Choisissez votre taille et votre coupe."
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:432
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:440
msgid "T-shirt:"
-msgstr ""
+msgstr "T-shirt:"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:450
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:454
@@ -464,7 +482,7 @@ msgstr "Faites un don"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:476
msgid "T-Shirt"
-msgstr ""
+msgstr "T-Shirt"
#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:480
msgid "Choose your size and fit for each shirt."
1
0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation@torproject.org 22 Nov '18
by translation@torproject.org 22 Nov '18
22 Nov '18
commit 1cf275b3455a8b79e268c3771e85bdc65dcfe5c6
Author: Translation commit bot <translation(a)torproject.org>
Date: Thu Nov 22 21:45:03 2018 +0000
Update translations for abouttor-homepage
---
he/aboutTor.dtd | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/he/aboutTor.dtd b/he/aboutTor.dtd
index fb43a22bd..81a4386ff 100644
--- a/he/aboutTor.dtd
+++ b/he/aboutTor.dtd
@@ -35,13 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "הגן על פרטיותם של מיליונים.">
<!ENTITY aboutTor.donationBanner.line2e "שמור על Tor חזק.">
<!ENTITY aboutTor.donationBanner.line2f "אנחנו צריכים את תמיכתך!">
-<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
-<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
-<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
+<!ENTITY aboutTor.donationBanner.line2g "תמוך בחירות אינטרנט.">
+<!ENTITY aboutTor.donationBanner.line2h "הגן על הרשת הפתוחה.">
+<!ENTITY aboutTor.donationBanner.line2i "תמוך בפרטיות ובחירות באופן מקוון.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla משווה כל תרומה עד 2019.">
<!ENTITY aboutTor.donationBanner.line3 "תן היום, ו־Mozilla תשווה את תרומתך.">
-<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
+<!ENTITY aboutTor.donationBanner.line3b "תן עכשיו, והמתנה שלך הופכת לחזקה פי שניים.">
<!ENTITY aboutTor.donationBanner.buttonA "תרום עכשיו">
<!ENTITY aboutTor.donationBanner.buttonB "החשב אותי">
1
0
commit 6b9a93c0517d8b11d0e843f7c17abfc9090b7332
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Nov 22 21:31:48 2018 +0000
Revert "28051"
We are not ready for that yet.
This reverts commit 8e8445c1d47644e6e34fc1b96d6934a9aa13f58b.
---
build.gradle | 4 --
mobile/android/app/000-tor-browser-android.js | 3 ++
mobile/android/app/build.gradle | 11 -----
mobile/android/base/AndroidManifest.xml.in | 1 -
.../base/java/org/mozilla/gecko/BrowserApp.java | 53 ++++++++++++----------
.../base/java/org/mozilla/gecko/GeckoApp.java | 29 ------------
.../java/org/mozilla/gecko/GeckoApplication.java | 5 --
.../java/org/mozilla/gecko/LauncherActivity.java | 18 --------
.../gecko/notifications/NotificationClient.java | 6 +--
.../gecko/notifications/NotificationHelper.java | 5 +-
mobile/android/config/proguard/proguard.cfg | 15 ------
.../java/org/mozilla/gecko/util/ProxySelector.java | 4 +-
12 files changed, 38 insertions(+), 116 deletions(-)
diff --git a/build.gradle b/build.gradle
index 6cf2d4cc0e7a..a080e15b2fac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,10 +32,6 @@ allprojects {
url repository
}
}
- // These are needed for Orbot's dependencies
- maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" }
- maven { url 'https://jitpack.io' }
- jcenter()
}
}
diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js
index e7e337276acb..c329fcdee5f7 100644
--- a/mobile/android/app/000-tor-browser-android.js
+++ b/mobile/android/app/000-tor-browser-android.js
@@ -54,6 +54,9 @@ pref("media.realtime_decoder.enabled", false);
pref("general.useragent.updates.enabled", false);
pref("general.useragent.updates.url", "");
+// Override this because Orbot uses 9050 as the default
+pref("network.proxy.socks_port", 9050);
+
// Do not allow the user to install extensions from web
pref("xpinstall.enabled", false);
pref("extensions.enabledScopes", 1);
diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
index d0060901b6b3..7c515bbe65a7 100644
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -225,9 +225,6 @@ dependencies {
implementation "com.android.support:design:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
implementation "com.android.support:customtabs:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
implementation "com.android.support:palette-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
- implementation files('Orbot-16.0.5-RC-1-tor-0.3.4.9-fullperm-release.aar')
- implementation files('orbotservice-release.aar')
- implementation files('jsocksAndroid-release.aar')
if (mozconfig.substs.MOZ_NATIVE_DEVICES) {
implementation "com.android.support:mediarouter-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
@@ -265,14 +262,6 @@ dependencies {
// Including the Robotium JAR directly can cause issues with dexing.
androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.5.4'
-
- // Orbot
- implementation 'com.github.delight-im:Android-Languages:v1.0.1'
- implementation 'pl.bclogic:pulsator4droid:1.0.3'
-
- // Orbotservice
- implementation 'org.torproject:tor-android-binary:0.3.4.9'
- implementation 'com.jrummyapps:android-shell:1.0.1'
}
// TODO: (bug 1261486): This impl is not robust -
diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in
index 0e5f4edaf814..c4ea9a37683e 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -24,7 +24,6 @@
#include FennecManifest_permissions.xml.in
<application android:label="@string/moz_app_displayname"
- tools:replace="android:label"
android:icon="@drawable/icon"
android:logo="@drawable/logo"
android:name="@MOZ_ANDROID_APPLICATION_CLASS@"
diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
index 42b9ebd0a3f7..5efd83398775 100644
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -181,8 +181,7 @@ import org.mozilla.gecko.widget.GeckoActionProvider;
import org.mozilla.gecko.widget.SplashScreen;
import org.mozilla.geckoview.GeckoSession;
-import org.torproject.android.OrbotMainActivity;
-import org.torproject.android.service.TorServiceConstants;
+import info.guardianproject.netcipher.proxy.OrbotHelper;
import java.io.File;
import java.io.FileNotFoundException;
@@ -240,9 +239,6 @@ public class BrowserApp extends GeckoApp
public static final int ACTIVITY_REQUEST_TRIPLE_READERVIEW = 4001;
public static final int ACTIVITY_RESULT_TRIPLE_READERVIEW_ADD_BOOKMARK = 4002;
public static final int ACTIVITY_RESULT_TRIPLE_READERVIEW_IGNORE = 4003;
- public static final int ACTIVITY_RESULT_ORBOT_LAUNCH = 5001;
-
- private static boolean mOrbotRun = false;
public static final String ACTION_VIEW_MULTIPLE = AppConstants.ANDROID_PACKAGE_NAME + ".action.VIEW_MULTIPLE";
@@ -1286,26 +1282,41 @@ public class BrowserApp extends GeckoApp
@Override
public void onReceive(Context context, Intent intent) {
- if (TextUtils.equals(intent.getAction(), TorServiceConstants.ACTION_STATUS)) {
+ if (TextUtils.equals(intent.getAction(), OrbotHelper.ACTION_STATUS)) {
GeckoAppShell.setTorStatus(intent);
}
}
};
public void checkStartOrbot() {
- /* run in thread so Tor status updates will be received while the
- * Gecko event sync is blocking the main thread */
- HandlerThread handlerThread = new HandlerThread("torStatusReceiver");
- handlerThread.start();
- Looper looper = handlerThread.getLooper();
- Handler handler = new Handler(looper);
- registerReceiver(torStatusReceiver, new IntentFilter(TorServiceConstants.ACTION_STATUS),
- null, handler);
+ if (!OrbotHelper.isOrbotInstalled(this)) {
+ final Intent installOrbotIntent = OrbotHelper.getOrbotInstallIntent(this);
- if (!mOrbotRun) {
- final String orbotStartAction = "android.intent.action.MAIN";
- final Intent launchOrbot = new Intent(orbotStartAction, null, this, OrbotMainActivity.class);
- startActivityForResult(launchOrbot, ACTIVITY_RESULT_ORBOT_LAUNCH, null);
+ AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ builder.setTitle(R.string.install_orbot);
+ builder.setMessage(R.string.you_must_have_orbot);
+ builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialogInterface, int i) {
+ startActivity(installOrbotIntent);
+ }
+ });
+ builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialogInterface, int i) {
+ }
+ });
+ builder.show();
+ } else {
+ /* run in thread so Tor status updates will be received while the
+ * Gecko event sync is blocking the main thread */
+ HandlerThread handlerThread = new HandlerThread("torStatusReceiver");
+ handlerThread.start();
+ Looper looper = handlerThread.getLooper();
+ Handler handler = new Handler(looper);
+ registerReceiver(torStatusReceiver, new IntentFilter(OrbotHelper.ACTION_STATUS),
+ null, handler);
+ OrbotHelper.requestStartTor(this);
}
}
@@ -3007,12 +3018,6 @@ public class BrowserApp extends GeckoApp
TabQueueHelper.processTabQueuePromptResponse(resultCode, this);
break;
- case ACTIVITY_RESULT_ORBOT_LAUNCH:
- final SafeIntent intent = new SafeIntent(getIntent());
- Log.d(LOGTAG, "onActivityResult: ACTIVITY_RESULT_ORBOT_LAUNCH");
- mOrbotRun = true;
- break;
-
default:
for (final BrowserAppDelegate delegate : delegates) {
delegate.onActivityResult(this, requestCode, resultCode, data);
diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
index 3741c26fe0e8..802d8adafbeb 100644
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
@@ -91,8 +91,6 @@ import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
-import org.torproject.android.service.TorService;
-
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
@@ -598,9 +596,6 @@ public abstract class GeckoApp extends GeckoActivity
EventDispatcher.getInstance().dispatch("Browser:Quit", res);
- Intent torService = new Intent(this, TorService.class);
- stopService(torService);
-
// We don't call shutdown here because this creates a race condition which
// can cause the clearing of private data to fail. Instead, we shut down the
// UI only after we're done sanitizing.
@@ -1217,30 +1212,6 @@ public abstract class GeckoApp extends GeckoActivity
}
}
}
- } else if (mIsRestoringActivity) {
- /* Synchronize Tabs state with Gecko. We're restoring the Activity, this
- * mean all of the Chrome state was lost, but the previously created
- * Tabs still exist within the Android application, because those are
- * static and the application keeps track of those (and only the Activity
- * is starting, the application was never destroyed). */
- Iterable<Tab> tabs = Tabs.getInstance().getTabsInOrder();
- Tab selectedTab = Tabs.getInstance().getSelectedTab();
- for (Tab tab : tabs) {
- GeckoBundle reloadMessage = new GeckoBundle();
- reloadMessage.putString("url", tab.getURL());
- reloadMessage.putString("engine", null);
- reloadMessage.putInt("parentId", tab.getParentId());
- reloadMessage.putBoolean("userEntered", true);
- reloadMessage.putBoolean("isPrivate", tab.isPrivate());
- reloadMessage.putBoolean("pinned", false);
- reloadMessage.putBoolean("desktopMode", tab.getDesktopMode());
- reloadMessage.putString("referrerURI", null);
- reloadMessage.putInt("tabID", tab.getId());
- reloadMessage.putBoolean("newTab", true);
- reloadMessage.putBoolean("delayLoad", selectedTab != tab);
- reloadMessage.putBoolean("selected", selectedTab == tab);
- getAppEventDispatcher().dispatch("Tab:Load", reloadMessage);
- }
}
synchronized (GeckoApp.this) {
diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
index b38e7184c798..e896134e0af9 100644
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
@@ -62,8 +62,6 @@ import java.lang.reflect.Method;
import java.net.URL;
import java.util.UUID;
-import org.torproject.android.service.util.Prefs;
-
public class GeckoApplication extends Application
implements HapticFeedbackDelegate {
private static final String LOG_TAG = "GeckoApplication";
@@ -321,9 +319,6 @@ public class GeckoApplication extends Application
"Profile:Create",
null);
- // Give Orbot the base Context
- Prefs.setContext(context);
-
super.onCreate();
}
diff --git a/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java b/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java
index 4cd94ed538c7..e8f8facc24c6 100644
--- a/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java
+++ b/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java
@@ -45,9 +45,6 @@ import static org.mozilla.gecko.deeplink.DeepLinkContract.LINK_FXA_SIGNIN;
import org.mozilla.gecko.deeplink.DeepLinkContract;
-import org.torproject.android.OrbotMainActivity;
-import org.torproject.android.service.TorServiceConstants;
-
/**
* Activity that receives incoming Intents and dispatches them to the appropriate activities (e.g. browser, custom tabs, web app).
*/
@@ -70,9 +67,6 @@ public class LauncherActivity extends Activity {
} else if (isWebAppIntent(safeIntent)) {
dispatchWebAppIntent();
- } else if (TorServiceConstants.TOR_APP_USERNAME.equals(getIntent().getAction())) {
- dispatchOrbotIntent();
-
// If it's not a view intent, it won't be a custom tabs intent either. Just launch!
} else if (!isViewIntentWithURL(safeIntent)) {
dispatchNormalIntent();
@@ -122,18 +116,6 @@ public class LauncherActivity extends Activity {
startActivity(intent);
}
- private void dispatchOrbotIntent() {
- final String orbotStartAction = "android.intent.action.MAIN";
- final Intent intent = new Intent(orbotStartAction, null, this, OrbotMainActivity.class);
-
- //When we launch Orbot, we want a new task.
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
- intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
-
- startActivity(intent);
- }
-
private void dispatchUrlIntent(@NonNull String url) {
Intent intent = new Intent(getIntent());
intent.setData(Uri.parse(url));
diff --git a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java
index c66d67f32787..d8392a801e13 100644
--- a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java
+++ b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java
@@ -28,8 +28,6 @@ import org.mozilla.gecko.NotificationListener;
import org.mozilla.gecko.R;
import org.mozilla.gecko.util.BitmapUtils;
-import org.torproject.android.service.util.NotificationBuilderCompat;
-
/**
* Client for posting notifications.
*/
@@ -144,7 +142,7 @@ public final class NotificationClient implements NotificationListener {
private void add(final String name, final String imageUrl, final String host,
final String alertTitle, final String alertText,
final PendingIntent contentIntent, final PendingIntent deleteIntent) {
- final NotificationBuilderCompat builder = new NotificationBuilderCompat(mContext)
+ final NotificationCompat.Builder builder = new NotificationCompat.Builder(mContext)
.setContentTitle(alertTitle)
.setContentText(alertText)
.setSmallIcon(R.drawable.ic_status_logo)
@@ -152,7 +150,7 @@ public final class NotificationClient implements NotificationListener {
.setDeleteIntent(deleteIntent)
.setAutoCancel(true)
.setDefaults(Notification.DEFAULT_SOUND)
- .setStyle(new Notification.BigTextStyle()
+ .setStyle(new NotificationCompat.BigTextStyle()
.bigText(alertText)
.setSummaryText(host));
diff --git a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java
index 35366609da49..34ea99882d9a 100644
--- a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java
+++ b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java
@@ -32,11 +32,10 @@ import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.graphics.Bitmap;
import android.net.Uri;
+import android.support.v4.app.NotificationCompat;
import android.support.v4.util.SimpleArrayMap;
import android.util.Log;
-import org.torproject.android.service.util.NotificationBuilderCompat;
-
public final class NotificationHelper implements BundleEventListener {
public static final String HELPER_BROADCAST_ACTION = AppConstants.ANDROID_PACKAGE_NAME + ".helperBroadcastAction";
@@ -234,7 +233,7 @@ public final class NotificationHelper implements BundleEventListener {
private void showNotification(final GeckoBundle message) {
ThreadUtils.assertOnUiThread();
- final NotificationBuilderCompat builder = new NotificationBuilderCompat(mContext);
+ final NotificationCompat.Builder builder = new NotificationCompat.Builder(mContext);
// These attributes are required
final String id = message.getString(ID_ATTR);
diff --git a/mobile/android/config/proguard/proguard.cfg b/mobile/android/config/proguard/proguard.cfg
index 3d03e3107c72..0be8a745e44b 100644
--- a/mobile/android/config/proguard/proguard.cfg
+++ b/mobile/android/config/proguard/proguard.cfg
@@ -165,21 +165,6 @@
# See: http://stackoverflow.com/questions/22441366/note-android-support-v4-text-ic…
-dontnote android.support.**
-# From https://github.com/square/okhttp/blob/master/okhttp/src/main/resources/META…
-# JSR 305 annotations are for embedding nullability information.
--dontwarn javax.annotation.**
-
-# A resource is loaded with a relative path so the package of this class must be preserved.
--keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
-
-# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.
--dontwarn org.codehaus.mojo.animal_sniffer.*
-
-# OkHttp platform used only on JVM and when Conscrypt dependency is available.
--dontwarn okhttp3.internal.platform.ConscryptPlatform
-
-#-keepnames class org.torproject.*
-
-include "adjust-keeps.cfg"
-include "leakcanary-keeps.cfg"
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
index 41c2c7e705a1..f05716fe1d09 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
@@ -30,8 +30,8 @@ import java.util.List;
public class ProxySelector {
private static final String TOR_PROXY_ADDRESS = "127.0.0.1";
- private static final int TOR_SOCKS_PROXY_PORT = 9150;
- private static final int TOR_HTTP_PROXY_PORT = 8218;
+ private static final int TOR_SOCKS_PROXY_PORT = 9050;
+ private static final int TOR_HTTP_PROXY_PORT = 8118;
public static URLConnection openConnectionWithProxy(URI uri) throws IOException {
java.net.ProxySelector ps = java.net.ProxySelector.getDefault();
1
0

[translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed
by translation@torproject.org 22 Nov '18
by translation@torproject.org 22 Nov '18
22 Nov '18
commit 0fa88c941879c77b79167515fd35a577586a0b03
Author: Translation commit bot <translation(a)torproject.org>
Date: Thu Nov 22 21:17:13 2018 +0000
Update translations for tbmanual-contentspot_completed
---
contents+fr.po | 2378 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 2378 insertions(+)
diff --git a/contents+fr.po b/contents+fr.po
new file mode 100644
index 000000000..e4ba64d32
--- /dev/null
+++ b/contents+fr.po
@@ -0,0 +1,2378 @@
+# Translators:
+# AO <ao(a)localizationlab.org>, 2018
+# erinm, 2018
+# Emma Peel, 2018
+# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2018
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-11-21 11:49+CET\n"
+"PO-Revision-Date: 2018-11-14 12:31+0000\n"
+"Last-Translator: Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2018\n"
+"Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: https//tb-manual.torproject.org/en-US/
+#: (content/contents+en-US.lrshowcase.title)
+msgid "Tor Browser User Manual"
+msgstr "Le guide d’utilisation du Navigateur Tor"
+
+#: https//tb-manual.torproject.org/en-US/about/
+#: (content/about/contents+en-US.lrtopic.title)
+msgid "About Tor Browser"
+msgstr "À propos du Navigateur Tor"
+
+#: https//tb-manual.torproject.org/en-US/about/
+#: (content/about/contents+en-US.lrtopic.description)
+msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
+msgstr ""
+"Apprenez ce que le navigateur Tor peut faire pour protéger vos données "
+"personnelles et votre anonymat"
+
+#: https//tb-manual.torproject.org/en-US/about/
+#: (content/about/contents+en-US.lrtopic.body)
+msgid ""
+"Tor Browser uses the Tor network to protect your privacy and anonymity. "
+"Using the Tor network has two main properties:"
+msgstr ""
+"Le Navigateur Tor utilise le réseau Tor pour protéger vos données "
+"personnelles et votre anonymat. L’utilisation du réseau Tor présente deux "
+"atouts principaux :"
+
+#: https//tb-manual.torproject.org/en-US/about/
+#: (content/about/contents+en-US.lrtopic.body)
+msgid ""
+"* Your internet service provider, and anyone watching your connection "
+"locally, will not be able to track your internet activity, including the "
+"names and addresses of the websites you visit."
+msgstr ""
+"* Votre fournisseur de services Internet et quiconque surveille votre "
+"connexion localement ne pourra pas suivre à la trace votre activité sur "
+"Internet ni les noms et adresses des sites Web que vous visitez."
+
+#: https//tb-manual.torproject.org/en-US/about/
+#: (content/about/contents+en-US.lrtopic.body)
+msgid ""
+"* The operators of the websites and services that you use, and anyone "
+"watching them, will see a connection coming from the Tor network instead of "
+"your real Internet (IP) address, and will not know who you are unless you "
+"explicitly identify yourself."
+msgstr ""
+"* Les opérateurs des sites Web et des services que vous utilisez, et "
+"quiconque les surveille, relèveront une connexion en provenance du réseau "
+"Tor au lieu de votre adresse internet (IP) réelle, et ne saurons pas qui "
+"vous êtes à moins que vous vous identifiiez explicitement."
+
+#: https//tb-manual.torproject.org/en-US/about/
+#: (content/about/contents+en-US.lrtopic.body)
+msgid ""
+"In addition, Tor Browser is designed to prevent websites from "
+"“fingerprinting” or identifying you based on your browser configuration."
+msgstr ""
+"De plus, le Navigateur Tor est conçu pour empêcher le pistage par empreinte "
+"numérique unique ou votre identification par les sites Web d’après la "
+"configuration de votre navigateur."
+
+#: https//tb-manual.torproject.org/en-US/about/
+#: (content/about/contents+en-US.lrtopic.body)
+msgid ""
+"By default, Tor Browser does not keep any browsing history. Cookies are only"
+" valid for a single session (until Tor Browser is exited or a <a href"
+"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+msgstr ""
+"Par défaut, Tor Browser ne conserve aucun historique de navigation. Les "
+"cookies ne sont valides que pour une seule session (jusqu'à ce que Tor "
+"Browser soit quitté ou qu'une <a href=\"/managing-identities/#new-"
+"identity\">nouvelle identité</a> soit demandée)."
+
+#: https//tb-manual.torproject.org/en-US/about/
+#: (content/about/contents+en-US.lrtopic.body)
+msgid "##### How Tor works"
+msgstr "##### Comment Tor fonctionne-t-il ?"
+
+#: https//tb-manual.torproject.org/en-US/about/
+#: (content/about/contents+en-US.lrtopic.body)
+msgid ""
+"Tor is a network of virtual tunnels that allows you to improve your privacy "
+"and security on the Internet. Tor works by sending your traffic through "
+"three random servers (also known as *relays*) in the Tor network. The last "
+"relay in the circuit (the “exit relay”) then sends the traffic out onto the "
+"public Internet."
+msgstr ""
+"Tor est un réseau de tunnels virtuels qui vous permet d’améliorer la "
+"protection de vos données personnelles et votre sécurité sur Internet. Tor "
+"fonctionne en acheminant votre trafic par trois serveurs aléatoires (aussi "
+"appelés *relais*) dans le réseau Tor. Le dernier relais du circuit (le « "
+"relais de sortie ») envoie ensuite le trafic vers l’Internet public."
+
+#: https//tb-manual.torproject.org/en-US/about/
+#: (content/about/contents+en-US.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"../static/images/how-tor-works.png\" alt=\"How Tor "
+"Browser works\">"
+msgstr ""
+"<img class=\"\" src=\"../../static/images/how-tor-works.png\" alt=\"How Tor "
+"Browser works\">"
+
+#: https//tb-manual.torproject.org/en-US/about/
+#: (content/about/contents+en-US.lrtopic.body)
+msgid ""
+"The image above illustrates a user browsing to different websites over Tor. "
+"The green middle computers represent relays in the Tor network, while the "
+"three keys represent the layers of encryption between the user and each "
+"relay."
+msgstr ""
+"L’image ci-dessous illustre un utilisateur qui navigue vers différents sites"
+" Web avec Tor. Les ordinateurs verts situés au milieu représentent les "
+"relais du réseau Tor, alors que les trois clés représentent les couches de "
+"chiffrement entre l’utilisateur et chaque relais."
+
+#: https//tb-manual.torproject.org/en-US/about/
+#: (content/about/contents+en-US.lrtopic.seo_slug)
+msgid "about"
+msgstr "à propos"
+
+#: https//tb-manual.torproject.org/en-US/downloading/
+#: (content/downloading/contents+en-US.lrtopic.title)
+msgid "Downloading"
+msgstr "Téléchargement"
+
+#: https//tb-manual.torproject.org/en-US/downloading/
+#: (content/downloading/contents+en-US.lrtopic.description)
+msgid "How to download Tor Browser"
+msgstr "Comment télécharger le Navigateur Tor ?"
+
+#: https//tb-manual.torproject.org/en-US/downloading/
+#: (content/downloading/contents+en-US.lrtopic.body)
+msgid ""
+"The safest and simplest way to download Tor Browser is from the official Tor"
+" Project website at https://www.torproject.org. Your connection to the site "
+"will be secured using <a href=\"https://tb-manual.torproject.org/en-US"
+"/secure-connections.html\">HTTPS</a>, which makes it much harder for "
+"somebody to tamper with."
+msgstr ""
+"La façon la plus sûre et la plus simple de télécharger le Navigateur Tor est"
+" à partir du site Web officiel du Projet Tor https://www.torproject.org . "
+"Votre connexion au site sera sécurisée par <a href=\"secure-"
+"connections\">HTTPS</a> et il sera ainsi plus difficile pour quelqu’un de "
+"l’altérer."
+
+#: https//tb-manual.torproject.org/en-US/downloading/
+#: (content/downloading/contents+en-US.lrtopic.body)
+msgid ""
+"However, there may be times when you cannot access the Tor Project website: "
+"for example, it could be blocked on your network. If this happens, you can "
+"use one of the alternative download methods listed below."
+msgstr ""
+"Cependant, l’accès au site Web du Projet Tor pourrait parfois être "
+"impossible, par exemple s’il est bloqué sur votre réseau. Si cela se "
+"produit, vous pouvez utiliser une des méthodes de téléchargement "
+"répertoriées ci-dessous."
+
+#: https//tb-manual.torproject.org/en-US/downloading/
+#: (content/downloading/contents+en-US.lrtopic.body)
+msgid "##### Mirrors"
+msgstr "##### Miroirs"
+
+#: https//tb-manual.torproject.org/en-US/downloading/
+#: (content/downloading/contents+en-US.lrtopic.body)
+msgid ""
+"If you're unable to download Tor Browser from the official Tor Project "
+"website, you can instead try downloading it from one of our official "
+"mirrors, either through [EFF](https://tor.eff.org) or [Calyx "
+"Institute](https://tor.calyxinstitute.org)."
+msgstr ""
+"Si vous ne parvenez pas à télécharger le navigateur Tor à partir du site "
+"officiel du projet Tor, vous pouvez essayer de le télécharger à partir d'un "
+"de nos miroirs officiels, soit via [EFF] (https://tor.eff.org) ou [Calyx "
+"Institute] (https://tor.calyxinstitute.org)"
+
+#: https//tb-manual.torproject.org/en-US/downloading/
+#: (content/downloading/contents+en-US.lrtopic.body)
+msgid "##### GetTor"
+msgstr "##### GetTor"
+
+#: https//tb-manual.torproject.org/en-US/downloading/
+#: (content/downloading/contents+en-US.lrtopic.body)
+msgid ""
+"GetTor is a service that automatically responds to messages with links to "
+"the latest version of Tor Browser, hosted at a variety of locations, such as"
+" Dropbox, Google Drive and GitHub."
+msgstr ""
+"GetTor est un service qui répond automatiquement aux messages en incluant "
+"des liens vers la dernière version du Navigateur Tor, hébergée en divers "
+"endroits qui risquent moins d’être censurée, tels que Dropbox, le disque "
+"Google Drive ou GitHub."
+
+#: https//tb-manual.torproject.org/en-US/downloading/
+#: (content/downloading/contents+en-US.lrtopic.body)
+msgid "###### To use GetTor via email:"
+msgstr "###### Pour utiliser GetTor par courriel :"
+
+#: https//tb-manual.torproject.org/en-US/downloading/
+#: (content/downloading/contents+en-US.lrtopic.body)
+msgid ""
+"Send an email to gettor(a)torproject.org, and in the body of the message "
+"simply write “windows”, “osx”, or “linux”, (without quotation marks) "
+"depending on your operating system."
+msgstr ""
+"Envoyez un courriel à gettor(a)torproject.org et dans le corps du message, "
+"écrivez simplement « windows », « osx » « linux » (sans guillemet) selon "
+"votre système d’exploitation."
+
+#: https//tb-manual.torproject.org/en-US/downloading/
+#: (content/downloading/contents+en-US.lrtopic.body)
+msgid ""
+"GetTor will respond with an email containing links from which you can "
+"download the Tor Browser package, the cryptographic signature (needed for "
+"verifying the download), the fingerprint of the key used to make the "
+"signature, and the package’s checksum. You may be offered a choice of "
+"“32-bit” or “64-bit” software: this depends on the model of the computer you"
+" are using."
+msgstr ""
+"GetTor répondra par un courriel contenant des liens à partir desquels vous "
+"pourrez télécharger le paquet du Navigateur Tor, la signature "
+"cryptographique (exigée pour contrôler le téléchargement), l’empreinte de la"
+" clé utilisée pour la signature ainsi que la somme de contrôle du paquet. "
+"Selon le modèle d’ordinateur que vous utilisez, le choix entre un logiciel "
+"32 bits ou 64 bits vous sera proposé."
+
+#: https//tb-manual.torproject.org/en-US/downloading/
+#: (content/downloading/contents+en-US.lrtopic.body)
+msgid "###### To use GetTor via Twitter:"
+msgstr "###### Pour utiliser GetTor par Twitter :"
+
+#: https//tb-manual.torproject.org/en-US/downloading/
+#: (content/downloading/contents+en-US.lrtopic.body)
+msgid ""
+"To get links for downloading Tor Browser in English for OS X, send a Direct "
+"Message to @get_tor with the words \"osx en\" in it (you don't need to "
+"follow the account)."
+msgstr ""
+"Pour obtenir des liens de téléchargement du Navigateur Tor en anglais pour "
+"OS X, envoyez un message direct à @get_tor avec les mots « osx en » (vous "
+"n’avez pas à suivre le compte)."
+
+#: https//tb-manual.torproject.org/en-US/downloading/
+#: (content/downloading/contents+en-US.lrtopic.body)
+msgid "###### To use GetTor via Jabber/XMPP (Jitsi, CoyIM, etc.):"
+msgstr "###### Pour utiliser GetTor par Jabber/XMPP (Jitsi, CoyIM, etc.) :"
+
+#: https//tb-manual.torproject.org/en-US/downloading/
+#: (content/downloading/contents+en-US.lrtopic.body)
+msgid ""
+"To get links for downloading Tor Browser in Chinese for Linux, send a "
+"message to gettor(a)torproject.org with the words \"linux zh\" in it."
+msgstr ""
+"Pour obtenir des liens de téléchargement du Navigateur Tor en chinois pour "
+"Linux, envoyez un message à gettor(a)torproject.org avec les mots « linux zh "
+"»."
+
+#: https//tb-manual.torproject.org/en-US/downloading/
+#: (content/downloading/contents+en-US.lrtopic.seo_slug)
+msgid "downloading"
+msgstr "Téléchargement"
+
+#: https//tb-manual.torproject.org/en-US/running-tor-browser/
+#: (content/running-tor-browser/contents+en-US.lrtopic.title)
+msgid "Running Tor Browser for the first time"
+msgstr "Premier lancement du Navigateur Tor"
+
+#: https//tb-manual.torproject.org/en-US/running-tor-browser/
+#: (content/running-tor-browser/contents+en-US.lrtopic.description)
+msgid "Learn how to use Tor Browser for the first time"
+msgstr "Apprenez à utiliser le Navigateur Tor pour la première fois"
+
+#: https//tb-manual.torproject.org/en-US/running-tor-browser/
+#: (content/running-tor-browser/contents+en-US.lrtopic.body)
+msgid ""
+"When you run Tor Browser for the first time, you will see the Tor Network "
+"Settings window. This offers you the option to connect directly to the Tor "
+"network, or to configure Tor Browser for your connection."
+msgstr ""
+"Lors du premier lancement du navigateur, vous apercevrez la fenêtre des "
+"paramètres du réseau Tor. Elle vous proposera soit de vous connecter "
+"directement, soit de configurer le Navigateur Tor pour votre connexion."
+
+#: https//tb-manual.torproject.org/en-US/running-tor-browser/
+#: (content/running-tor-browser/contents+en-US.lrtopic.body)
+msgid "##### Connect"
+msgstr "##### Connecter"
+
+#: https//tb-manual.torproject.org/en-US/running-tor-browser/
+#: (content/running-tor-browser/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/troubleshooting/
+#: (content/troubleshooting/contents+en-US.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/connect.png\">"
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/connect.png\">"
+
+#: https//tb-manual.torproject.org/en-US/running-tor-browser/
+#: (content/running-tor-browser/contents+en-US.lrtopic.body)
+msgid ""
+"In most cases, choosing \"Connect\" will allow you to connect to the Tor "
+"network without any further configuration. Once clicked, a status bar will "
+"appear, showing Tor’s connection progress. If you are on a relatively fast "
+"connection, but this bar seems to get stuck at a certain point, see the <a "
+"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
+"problem."
+msgstr ""
+"Dans la plupart des cas, « Se connecter » vous permettra de vous connecter "
+"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 bloquer "
+"à un certain niveau, la page <a href=\"/troubleshooting\">Dépannage</a> vous"
+" aidera à régler le problème."
+
+#: https//tb-manual.torproject.org/en-US/running-tor-browser/
+#: (content/running-tor-browser/contents+en-US.lrtopic.body)
+msgid "##### Configure"
+msgstr "##### Configurer"
+
+#: https//tb-manual.torproject.org/en-US/running-tor-browser/
+#: (content/running-tor-browser/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/circumvention/
+#: (content/circumvention/contents+en-US.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/configure.png\">"
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/configure.png\">"
+
+#: https//tb-manual.torproject.org/en-US/running-tor-browser/
+#: (content/running-tor-browser/contents+en-US.lrtopic.body)
+msgid ""
+"If you know that your connection is censored, or uses a proxy, you should "
+"select this option. Tor Browser will take you through a series of "
+"configuration options."
+msgstr ""
+"Si vous savez que votre connexion est censurée ou utilise un mandataire, "
+"vous devriez sélectionner cette option. Le Navigateur Tor vous fera passer "
+"en revue une série d’options de configuration."
+
+#: https//tb-manual.torproject.org/en-US/running-tor-browser/
+#: (content/running-tor-browser/contents+en-US.lrtopic.body)
+msgid ""
+"The first screen asks if access to the Tor network is blocked or censored on"
+" your connection. If you do not believe this is the case, select “No”. If "
+"you know your connection is censored, or you have tried and failed to "
+"connect to the Tor network and no other solutions have worked, select “Yes”."
+" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
+"screen to configure a pluggable transport."
+msgstr ""
+"Le premier écran demande si l’accès au réseau Tor est bloqué ou censuré sur "
+"votre connexion. Si vous ne pensez pas que c’est le cas, sélectionnez « Non "
+"». 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 <a "
+"href=\"/circumvention\">Contournement</a> apparaîtra alors afin que vous "
+"configuriez un transport enfichable."
+
+#: https//tb-manual.torproject.org/en-US/running-tor-browser/
+#: (content/running-tor-browser/contents+en-US.lrtopic.body)
+msgid ""
+"The next screen asks if your connection uses a proxy. In most cases, this is"
+" not necessary. You will usually know if you need to answer “Yes”, as the "
+"same settings will be used for other browsers on your system. If possible, "
+"ask your network administrator for guidance. If your connection does not use"
+" a proxy, click “Continue”."
+msgstr ""
+"Le prochain écran vous demande si votre connexion utilise un serveur "
+"mandataire. Dans la plupart des cas, ce n’est pas requis. Vous saurez "
+"habituellement si vous devez répondre « Oui », car les mêmes paramètres "
+"seront utilisés pour les autres navigateurs de votre système. Si possible, "
+"posez la question à votre administrateur réseau. Si votre connexion "
+"n’utilise pas de mandataire, cliquez sur « Continuer »."
+
+#: https//tb-manual.torproject.org/en-US/running-tor-browser/
+#: (content/running-tor-browser/contents+en-US.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/proxy_question.png\">"
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/proxy_question.png\">"
+
+#: https//tb-manual.torproject.org/en-US/running-tor-browser/
+#: (content/running-tor-browser/contents+en-US.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/proxy.png\">"
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/proxy.png\">"
+
+#: https//tb-manual.torproject.org/en-US/running-tor-browser/
+#: (content/running-tor-browser/contents+en-US.lrtopic.seo_slug)
+msgid "running-tor-browser"
+msgstr "Premier-lancement-du-navigateur-Tor"
+
+#: https//tb-manual.torproject.org/en-US/bridges/
+#: (content/bridges/contents+en-US.lrtopic.title)
+msgid "Bridges"
+msgstr "Les ponts"
+
+#: https//tb-manual.torproject.org/en-US/bridges/
+#: (content/bridges/contents+en-US.lrtopic.description)
+msgid ""
+"Most Pluggable Transports, such as obfs3 and obfs4, rely on the use of "
+"“bridge” relays."
+msgstr ""
+"La plupart des transports enfichables, tels que obfs3 et obfs4, reposent sur"
+" l’utilisation de relais-ponts."
+
+#: https//tb-manual.torproject.org/en-US/bridges/
+#: (content/bridges/contents+en-US.lrtopic.body)
+msgid ""
+"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
+"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
+" are run by volunteers; unlike ordinary relays, however, they are not listed"
+" publicly, so an adversary cannot identify them easily. Using bridges in "
+"combination with pluggable transports helps to disguise the fact that you "
+"are using Tor."
+msgstr ""
+"La plupart des <a href=\"/transports\">transports enfichables</a>, tels que "
+"obfs3 et obfs4, reposent sur l’utilisation de relais-ponts. Comme les relais"
+" 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ée à des transports enfichables aide à "
+"dissimuler le fait que vous utilisez Tor."
+
+#: https//tb-manual.torproject.org/en-US/bridges/
+#: (content/bridges/contents+en-US.lrtopic.body)
+msgid ""
+"Other pluggable transports, like meek, use different anti-censorship "
+"techniques that do not rely on bridges. You do not need to obtain bridge "
+"addresses in order to use these transports."
+msgstr ""
+"D’autres transports enfichables, comme meek, utilisent différentes "
+"techniques d’anticensure qui ne reposent pas sur des ponts. Vous ne devez "
+"pas obtenir des adresses de ponts pour utiliser ces transports."
+
+#: https//tb-manual.torproject.org/en-US/bridges/
+#: (content/bridges/contents+en-US.lrtopic.body)
+msgid "##### Getting bridge addresses"
+msgstr "##### Obtenir des adresses de ponts"
+
+#: https//tb-manual.torproject.org/en-US/bridges/
+#: (content/bridges/contents+en-US.lrtopic.body)
+msgid ""
+"Because bridge addresses are not public, you will need to request them "
+"yourself. You have two options:"
+msgstr ""
+"Les adresses de ponts n’étant pas publiques, vous devrez les demander. Deux "
+"options s’offrent à vous :"
+
+#: https//tb-manual.torproject.org/en-US/bridges/
+#: (content/bridges/contents+en-US.lrtopic.body)
+msgid ""
+"* Visit https://bridges.torproject.org/ and follow the instructions, or"
+msgstr ""
+"* Visitez https://bridges.torproject.org/ et suivez les instructions, ou"
+
+#: https//tb-manual.torproject.org/en-US/bridges/
+#: (content/bridges/contents+en-US.lrtopic.body)
+msgid ""
+"* Email bridges(a)torproject.org from a Gmail, Yahoo, or Riseup email address"
+msgstr ""
+"* Envoyez un courriel à bridges(a)torproject.org à partir d'une adresse "
+"courriel Gmail, Yahoo ou Riseup."
+
+#: https//tb-manual.torproject.org/en-US/bridges/
+#: (content/bridges/contents+en-US.lrtopic.body)
+msgid "##### Entering bridge addresses"
+msgstr "##### Saisir des adresses de ponts"
+
+#: https//tb-manual.torproject.org/en-US/bridges/
+#: (content/bridges/contents+en-US.lrtopic.body)
+msgid ""
+"Once you have obtained some bridge addresses, you will need to enter them "
+"into Tor Launcher."
+msgstr ""
+"Une fois que vous aurez obtenu des adresses de ponts, vous devrez les saisir"
+" dans le lanceur Tor."
+
+#: https//tb-manual.torproject.org/en-US/bridges/
+#: (content/bridges/contents+en-US.lrtopic.body)
+msgid ""
+"If you're starting Tor Browser for the first time, click 'Configure' to open"
+" the Tor Network Settings window. Otherwise, click the Torbutton to the left"
+" of the URL bar, then select 'Tor Network Settings...' to access these "
+"options."
+msgstr ""
+"Si vous démarrez Tor Browser pour la première fois, cliquez sur 'Configurer'"
+" pour ouvrir la fenêtre Tor Network Settings. Sinon, cliquez sur le bouton "
+"Tor à gauche de la barre URL, puis sélectionnez 'Tor Network Settings...' "
+"pour accéder à ces options."
+
+#: https//tb-manual.torproject.org/en-US/bridges/
+#: (content/bridges/contents+en-US.lrtopic.body)
+msgid ""
+"In the Tor Network Settings window, select 'Tor is censored in my country.' "
+"Then, select 'Provide a bridge I know' and enter each bridge address on a "
+"separate line."
+msgstr ""
+"Dans la fenêtre Paramètres du réseau Tor, sélectionnez 'Tor est censuré dans"
+" mon pays'. Ensuite, sélectionnez 'Fournir un pont que je connais' et entrez"
+" chaque adresse de pont sur une ligne séparée."
+
+#: https//tb-manual.torproject.org/en-US/bridges/
+#: (content/bridges/contents+en-US.lrtopic.body)
+msgid ""
+"<img class=\"col-md-6\" src=\"../../static/images/tor-launcher-custom-"
+"bridges.png\">"
+msgstr ""
+"<img class=\"col-md-6\" src=\"../../static/images/tor-launcher-custom-"
+"bridges.png\">"
+
+#: https//tb-manual.torproject.org/en-US/bridges/
+#: (content/bridges/contents+en-US.lrtopic.body)
+msgid ""
+"Click “OK” to save your settings. Using bridges may slow down the connection"
+" compared to using ordinary Tor relays."
+msgstr ""
+"Cliquez sur \"OK\" pour enregistrer vos paramètres. L'utilisation de "
+"passerelles peut ralentir la connexion par rapport à l'utilisation de relays"
+" Tor ordinaires."
+
+#: https//tb-manual.torproject.org/en-US/bridges/
+#: (content/bridges/contents+en-US.lrtopic.body)
+msgid ""
+"If the connection fails, the bridges you received may be down. Please use "
+"one of the above methods to obtain more bridge addresses, and try again."
+msgstr ""
+"Si la connexion échoue, les ponts que vous avez reçus pourraient être hors "
+"service. Utilisez l'une des méthodes ci-dessus afin d'obtenir d'autres "
+"adresses de ponts et ressayez."
+
+#: https//tb-manual.torproject.org/en-US/bridges/
+#: (content/bridges/contents+en-US.lrtopic.seo_slug)
+msgid "bridges"
+msgstr "Les ponts"
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.title)
+msgid "Pluggable transports"
+msgstr "Les transports enfichables"
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.description)
+msgid ""
+"Pluggable transports are tools that Tor can use to disguise the traffic it "
+"sends out."
+msgstr ""
+"Les transports enfichables sont des outils que Tor peut utiliser pour "
+"déguiser le trafic qu’il envoie."
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.body)
+msgid ""
+"Pluggable transports are tools that Tor can use to disguise the traffic it "
+"sends out. This can be useful in situations where an Internet Service "
+"Provider or other authority is actively blocking connections to the Tor "
+"network."
+msgstr ""
+"Les transports enfichables sont des outils que Tor peut utiliser pour "
+"déguiser le trafic qu’il envoie. Ils peuvent se révéler utiles dans les cas "
+"où un fournisseur d’accès à Internet ou une autre autorité bloque activement"
+" les connexions vers le réseau Tor."
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.body)
+msgid "##### Types of pluggable transport"
+msgstr "##### Les types de transports enfichables"
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.body)
+msgid ""
+"Currently there are six pluggable transports available, but more are being "
+"developed."
+msgstr ""
+"Six transports enfichables sont proposés actuellement, mais d’autres sont en"
+" cours de développement."
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.body)
+msgid "<table>"
+msgstr "<table>"
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.body)
+msgid "<tbody>"
+msgstr "<tbody>"
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.body)
+msgid "<tr class=\"odd\">"
+msgstr "<tr class=\"odd\">"
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.body)
+msgid "<td>"
+msgstr "<td>"
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.body)
+msgid "obfs3"
+msgstr "obfs3"
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.body)
+msgid "</td>"
+msgstr "</td>"
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.body)
+msgid ""
+"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
+"any other protocol. While still included by default, it is reccomended to "
+"use obfs4 instead, as it has several security improvements over obfs3."
+msgstr ""
+"obfs3 donne l’impression que le trafic de Tor est aléatoire afin qu’il ne "
+"ressemble ni à Tor ni à n’importe quel autre protocole. Bien qu’il soit "
+"encore inclus par défaut, il est plutôt recommandé d’utiliser obfs4, car il "
+"comporte plusieurs améliorations de sécurité par rapport à obfs3."
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.body)
+msgid "</tr>"
+msgstr "</tr>"
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.body)
+msgid "<tr class=\"even\">"
+msgstr "<tr class=\"even\">"
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.body)
+msgid "obfs4"
+msgstr "obfs4"
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.body)
+msgid ""
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
+msgstr ""
+"obfs4 donne l’impression que le trafic Tor est aléatoire, comme obfs3, et "
+"empêche aussi les censeurs de trouver des ponts en balayant l’Internet. Les "
+"ponts obfs4 sont moins susceptibles d’être bloqués que les ponts obfs3."
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.body)
+msgid "FTE"
+msgstr "FTE"
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.body)
+msgid ""
+"FTE (format-transforming encryption) disguises Tor traffic as ordinary web "
+"(HTTP) traffic."
+msgstr ""
+"FTE (chiffrement par transformation du format) déguise le trafic Tor en "
+"trafic Web ordinaire (HTTP)."
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.body)
+msgid "meek"
+msgstr "meek"
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.body)
+msgid ""
+"These transports all make it look like you are browsing a major web site "
+"instead of using Tor. meek-amazon makes it look like you are using Amazon "
+"Web Services; meek-azure makes it look like you are using a Microsoft web "
+"site; and meek-google makes it look like you are using Google search."
+msgstr ""
+"Tous ces transports donnent l’impression que vous parcourez l’un des grands "
+"sites Web au lieu d’utiliser Tor. meek-amazon donne l’impression que vous "
+"utilisez les services Web d’Amazon ; meek-azure donne l’impression que vous "
+"utilisez un site Web de Microsoft ; et meek-google l’impression que vous "
+"utilisez la recherche Google."
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.body)
+msgid "Snowflake"
+msgstr "Snowflake"
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.body)
+msgid ""
+"Snowflake is an improvement upon Flashproxy. It sends your traffic through "
+"WebRTC, a peer-to-peer protocol with built-in NAT punching."
+msgstr ""
+"Snowflake est une amélioration par rapport à Flashproxy. Il transmet votre "
+"trafic par WebRTC, un protocole pair-à-pair avec perçage intégré de trous "
+"dans la traduction d’adresses de réseau."
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.body)
+msgid "</tbody>"
+msgstr "</tbody>"
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.body)
+msgid "</table>"
+msgstr "</table>"
+
+#: https//tb-manual.torproject.org/en-US/transports/
+#: (content/transports/contents+en-US.lrtopic.seo_slug)
+msgid "plugable-transports"
+msgstr "transports-enfichables"
+
+#: https//tb-manual.torproject.org/en-US/circumvention/
+#: (content/circumvention/contents+en-US.lrtopic.title)
+msgid "Circumvention"
+msgstr "Le contournement"
+
+#: https//tb-manual.torproject.org/en-US/circumvention/
+#: (content/circumvention/contents+en-US.lrtopic.description)
+msgid "What to do if the Tor network is blocked"
+msgstr "Que faire si le réseau Tor est bloqué ?"
+
+#: https//tb-manual.torproject.org/en-US/circumvention/
+#: (content/circumvention/contents+en-US.lrtopic.body)
+msgid ""
+"Direct access to the Tor network may sometimes be blocked by your Internet "
+"Service Provider or by a government. Tor Browser includes some circumvention"
+" tools for getting around these blocks. These tools are called “pluggable "
+"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
+"page for more information on the types of transport that are currently "
+"available."
+msgstr ""
+"L’accès direct au réseau Tor pourrait parfois être bloqué par votre "
+"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 ». La page <a href=\"/fr/transports\">Les "
+"transports enfichables</a> contient des informations supplémentaires sur les"
+" types de transports proposés actuellement."
+
+#: https//tb-manual.torproject.org/en-US/circumvention/
+#: (content/circumvention/contents+en-US.lrtopic.body)
+msgid "##### Using pluggable transports"
+msgstr "##### Utiliser des transports enfichables"
+
+#: https//tb-manual.torproject.org/en-US/circumvention/
+#: (content/circumvention/contents+en-US.lrtopic.body)
+msgid ""
+"To use pluggable transports, click \"Configure\" in the Tor Launcher window "
+"that appears when you first run Tor Browser."
+msgstr ""
+"Pour utiliser des transports enfichables, cliquez sur « Configurer » dans la"
+" fenêtre du lanceur Tor qui apparaît lors du premier lancement du navigateur"
+
+#: https//tb-manual.torproject.org/en-US/circumvention/
+#: (content/circumvention/contents+en-US.lrtopic.body)
+msgid ""
+"You can also configure pluggable transports while Tor Browser is running, by"
+" clicking on the green onion near your address bar and selecting “Tor "
+"Network Settings”."
+msgstr ""
+"Vous pouvez aussi configurer les transports enfichables pendant que le "
+"Navigateur Tor est en fonction en cliquant sur l’oignon vert près de votre "
+"barre d’adresse et en sélectionnant « Paramètres du réseau Tor »."
+
+#: https//tb-manual.torproject.org/en-US/circumvention/
+#: (content/circumvention/contents+en-US.lrtopic.body)
+msgid ""
+"Select “yes” when asked if your Internet Service Provider blocks connections"
+" to the Tor network."
+msgstr ""
+"Sélectionnez « Oui » quand on vous demandera si votre fournisseur d’accès à "
+"Internet bloque les connexions au réseau Tor."
+
+#: https//tb-manual.torproject.org/en-US/circumvention/
+#: (content/circumvention/contents+en-US.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/bridges.png\">"
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/bridges.png\">"
+
+#: https//tb-manual.torproject.org/en-US/circumvention/
+#: (content/circumvention/contents+en-US.lrtopic.body)
+msgid ""
+"Select “Connect with provided bridges”. Tor Browser currently has six "
+"pluggable transport options to choose from."
+msgstr ""
+"Sélectionnez « Se connecter avec les ponts fournis ». Le Navigateur Tor "
+"offre actuellement six options de transports enfichables parmi lesquelles "
+"choisir."
+
+#: https//tb-manual.torproject.org/en-US/circumvention/
+#: (content/circumvention/contents+en-US.lrtopic.body)
+msgid "##### Which transport should I use?"
+msgstr "##### Quel transport devrais-je utiliser ?"
+
+#: https//tb-manual.torproject.org/en-US/circumvention/
+#: (content/circumvention/contents+en-US.lrtopic.body)
+msgid ""
+"Each of the transports listed in Tor Launcher’s menu works in a different "
+"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
+"Transports</a> page), and their effectiveness depends on your individual "
+"circumstances."
+msgstr ""
+"Chacun des transports répertoriés dans le menu du lanceur Tor fonctionne "
+"d’une façon différente (pour davantage de détails, consulter la page <a "
+"href=\"transports\">Les transports enfichables</a>) et leur efficacité "
+"dépend de vos circonstances particulières."
+
+#: https//tb-manual.torproject.org/en-US/circumvention/
+#: (content/circumvention/contents+en-US.lrtopic.body)
+msgid ""
+"If you are trying to circumvent a blocked connection for the first time, you"
+" should try the different transports: obfs3, obfs4, fte, meek-azure and "
+"Snowflake."
+msgstr ""
+"Si vous essayer the contourner une connection bloquée pour la premier fois, "
+"vous devez essayer different transports: obfs3, obfs4, fte, meek-azure and "
+"Snowflake."
+
+#: https//tb-manual.torproject.org/en-US/circumvention/
+#: (content/circumvention/contents+en-US.lrtopic.body)
+msgid ""
+"If you try all of these options, and none of them gets you online, you will "
+"need to enter bridge addresses manually. Read the <a href=\"/en-"
+"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
+"obtain them."
+msgstr ""
+"Si vous avez essayé toutes ces actions et qu’aucune ne vous permet de vous "
+"connecter, vous devrez saisir des adresses de pont manuellement. Lisez la "
+"section <a href=\"/bridges\">Les ponts </a> pour apprendre ce que sont les "
+"ponts et comment en obtenir."
+
+#: https//tb-manual.torproject.org/en-US/circumvention/
+#: (content/circumvention/contents+en-US.lrtopic.seo_slug)
+msgid "circumvention"
+msgstr "Le contournement"
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.title)
+msgid "Managing identities"
+msgstr "La gestion des identités"
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.description)
+msgid "Learn how to control personally-identifying information in Tor Browser"
+msgstr ""
+"Apprenez à contrôler dans le Navigateur Tor les renseignements permettant "
+"d’identifier quelqu’un"
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid ""
+"When you connect to a website, it is not only the operators of that website "
+"who can record information about your visit. Most websites now use numerous "
+"third-party services, including social networking “Like” buttons, analytics "
+"trackers, and advertising beacons, all of which can link your activity "
+"across different sites."
+msgstr ""
+"Quand vous vous connectez à un site Web, les exploitants de ce site Web ne "
+"sont pas les seuls à pouvoir enregistrer les informations concernant votre "
+"visite. La plupart des sites Web utilisent maintenant de nombreux services "
+"tiers, incluant les boutons « J’aime » du réseautage social, les systèmes de"
+" suivi analytique et les balises publicitaires qui peuvent tous associer "
+"votre activité d’un site à l’autre."
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid ""
+"Using the Tor network stops observers from being able to discover your exact"
+" location and IP address, but even without this information they might be "
+"able to link different areas of your activity together. For this reason, Tor"
+" Browser includes some additional features that help you control what "
+"information can be tied to your identity."
+msgstr ""
+"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 informations, ils "
+"pourraient associer vos différentes activités. Pour cette raison, le "
+"Navigateur Tor comprend des fonctions supplémentaires qui vous aident à "
+"contrôler les informations qui peuvent être liées à votre identité."
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid "##### The URL bar"
+msgstr "##### La barre d’URL"
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid ""
+"Tor Browser centers your web experience around your relationship with the "
+"website in the URL bar. Even if you connect to two different sites that use "
+"the same third-party tracking service, Tor Browser will force the content to"
+" be served over two different Tor circuits, so the tracker will not know "
+"that both connections originate from your browser."
+msgstr ""
+"Le Navigateur Tor centre votre expérience Web sur votre relation avec le "
+"site Web dans la barre d’URL. Même si vous vous connectez à deux sites "
+"différents qui utilisent le même service tiers de suivi à la trace, le "
+"Navigateur Tor forcera que le contenu soit servi par deux circuits Tor "
+"différents, et ainsi le service de suivi ne saura pas que les deux "
+"connexions proviennent de votre navigateur."
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid ""
+"On the other hand, all connections to a single website address will be made "
+"over the same Tor circuit, meaning you can browse different pages of a "
+"single website in separate tabs or windows, without any loss of "
+"functionality."
+msgstr ""
+"Par ailleurs, toutes les connexions vers une même adresse de site Web seront"
+" acheminées par le même circuit Tor, ce qui signifie que vous pouvez "
+"parcourir différentes pages d’un même site Web dans des onglets ou des "
+"fenêtres différents sans perte de fonctionnalité."
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/circuit_full.png\">"
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/circuit_full.png\">"
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid ""
+"You can see a diagram of the circuit that Tor Browser is using for the "
+"current tab in the site information menu, in the URL bar."
+msgstr ""
+"Vous pouvez voir un diagramme du circuit que Tor Browser utilise pour "
+"l'onglet courant dans le menu des informations du site, dans la barre URL."
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid ""
+"In the circuit, the Guard or entry node is the first node and it's "
+"automatically and randomly selected by Tor. But it is different from the "
+"other nodes in the circuit. In order to avoid profiling attacks, the Guard "
+"node changes only after 2-3 months, unlike the other nodes, which change "
+"with every new domain. For more information about Guards, consult the <a "
+"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
+"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+msgstr ""
+"Dans le circuit, le nœud Garde ou nœud d'entrée est le premier nœud et il "
+"est automatiquement et aléatoirement sélectionné par Tor. Mais il est "
+"différent des autres nœuds du circuit. Afin d'éviter les attaques de "
+"profilage, le nœud Guard ne change qu'après 2-3 mois, contrairement aux "
+"autres nœuds, qui changent à chaque nouveau domaine. Pour plus "
+"d'informations sur Guards, consultez la <a "
+"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> et le <a "
+"href=\"https://support.torproject.org/tbb/tbb-2/\">Portail de support</a>."
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid "##### Logging in over Tor"
+msgstr "##### Se connecter en utilisant Tor"
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid ""
+"Although Tor Browser is designed to enable total user anonymity on the web, "
+"there may be situations in which it makes sense to use Tor with websites "
+"that require usernames, passwords, or other identifying information."
+msgstr ""
+"Bien que le Navigateur Tor est conçu pour permettre l’anonymat absolu de "
+"l’utilisateur sur le Web, certaines situations pourraient justifier "
+"d’utiliser Tor avec des sites Web qui exigent des noms d’utilisateur, des "
+"mots de passe ou d’autres informations permettant de vous identifier."
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid ""
+"If you log into a website using a regular browser, you also reveal your IP "
+"address and geographical location in the process. The same is often true "
+"when you send an email. Logging into your social networking or email "
+"accounts using Tor Browser allows you to choose exactly which information "
+"you reveal to the websites you browse. Logging in using Tor Browser is also "
+"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 révélez aussi votre adresse IP et votre emplacement géographique. 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 informations que vous révélez 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."
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+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 :"
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid ""
+"* See the <a href=\"/secure-connections\">Secure Connections</a> page for "
+"important information on how to secure your connection when logging in."
+msgstr ""
+"* Consultez la page <a href=\"secure-connections\">Les connexions "
+"sécurisées</a> pour obtenir des informations importantes sur la sécurisation"
+" de votre connexion lors d’une authentification."
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid ""
+"* Tor Browser often makes your connection appear as though it is coming from"
+" an entirely different part of the world. Some websites, such as banks or "
+"email providers, might interpret this as a sign that your account has been "
+"hacked or compromised, and lock you out. The only way to resolve this is by "
+"following the site’s recommended procedure for account recovery, or "
+"contacting the operators and explaining the situation."
+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 "
+"exploitants des sites et en expliquant la situation."
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid "##### Changing identities and circuits"
+msgstr "##### Changer d’identité et de circuit"
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/new_identity.png\">"
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/new_identity.png\">"
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+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."
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid "###### New Identity"
+msgstr "##### Nouvelle identité"
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid ""
+"This option is useful if you want to prevent your subsequent browser "
+"activity from being linkable to what you were doing before. Selecting it "
+"will close all your open tabs and windows, clear all private information "
+"such as cookies and browsing history, and use new Tor circuits for all "
+"connections. Tor Browser will warn you that all activity and downloads will "
+"be stopped, so take this into account before clicking “New Identity”."
+msgstr ""
+"Cette action est utile si vous souhaitez empêcher que l’activité ultérieure"
+" de votre navigateur ne puisse être reliée à ce que vous faisiez avant. En "
+"la sélectionnant, tous vos fenêtres et onglets ouverts seront fermés, toutes"
+" les informations confidentielles telles que les fichiers témoins et "
+"l’historique de navigation seront effacées, et de nouveaux circuits Tor "
+"seront utilisés pour toutes les connexions. Le Navigateur Tor vous avertira "
+"de l’arrêt de toutes les activités et téléchargements. Prenez-le donc en "
+"compte avant de cliquer sur « Nouvelle identité »."
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid "###### New Tor circuit for this site"
+msgstr "##### Nouveau circuit Tor pour ce site"
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid ""
+"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
+"relay</a> you are using is unable to connect to the website you require, or "
+"is not loading it properly. Selecting it will cause the currently-active tab"
+" or window to be reloaded over a new Tor circuit. Other open tabs and "
+"windows from the same website will use the new circuit as well once they are"
+" 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 <a href=\"/about-tor-browser#how-tor-"
+"works\">relais de sortie</a> ne peut pas se connecter au site Web que vous "
+"demandez, ou ne le charge pas correctement. En la sélectionnant, la fenêtre "
+"ou l’onglet actif sera rechargé sur un nouveau circuit Tor. Les autres "
+"fenêtres ou onglets ouverts à partir du même site Web utiliseront aussi le "
+"nouveau circuit après avoir été rechargés. Cette option n’efface aucune "
+"information confidentielle, ne délie pas votre activité, ni n’affecte vos "
+"connexions actuelles vers d’autres sites Web."
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid ""
+"You can also access this option in the new circuit display, in the site "
+"information menu, in the URL bar."
+msgstr ""
+"Vous pouvez également accéder à cette option dans le nouvel affichage du "
+"circuit, dans le menu des informations du site, dans la barre URL."
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.seo_slug)
+msgid "managing-identities"
+msgstr "gestion-d'identités"
+
+#: https//tb-manual.torproject.org/en-US/onion-services/
+#: (content/onion-services/contents+en-US.lrtopic.title)
+msgid "Onion Services"
+msgstr "Les services onion"
+
+#: https//tb-manual.torproject.org/en-US/onion-services/
+#: (content/onion-services/contents+en-US.lrtopic.description)
+msgid "Services that are only accessible using Tor"
+msgstr "Les services qui ne sont accessibles qu’en utilisant Tor"
+
+#: https//tb-manual.torproject.org/en-US/onion-services/
+#: (content/onion-services/contents+en-US.lrtopic.body)
+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 "
+"(tels que des sites Web) qui ne sont accessibles que par le réseau Tor."
+
+#: https//tb-manual.torproject.org/en-US/onion-services/
+#: (content/onion-services/contents+en-US.lrtopic.body)
+msgid ""
+"Onion services offer several advantages over ordinary services on the non-"
+"private web:"
+msgstr ""
+"Les services onion offrent plusieurs avantages par rapport aux services "
+"ordinaires du Web non privé :"
+
+#: https//tb-manual.torproject.org/en-US/onion-services/
+#: (content/onion-services/contents+en-US.lrtopic.body)
+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 oignon 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/en-US/onion-services/
+#: (content/onion-services/contents+en-US.lrtopic.body)
+msgid ""
+"* All traffic between Tor users and onion services is end-to-end encrypted, "
+"so you do not need to worry about <a href=\"/secure-connections\">connecting"
+" over HTTPS</a>."
+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 <a href"
+"=\"/secure-connections\">connecter par HTTPS</a>."
+
+#: https//tb-manual.torproject.org/en-US/onion-services/
+#: (content/onion-services/contents+en-US.lrtopic.body)
+msgid ""
+"* The address of an onion service is automatically generated, so the "
+"operators do not need to purchase a domain name; the .onion URL also helps "
+"Tor ensure that it is connecting to the right location and that the "
+"connection is not being tampered with."
+msgstr ""
+"* L'adresse d'un service oignon est générée automatiquement, donc les "
+"opérateurs n'ont pas à acheter un nom de domaine ; l'URL .onion aide aussi "
+"Tor à s'assurer qu'il se connecte au bon endroit et que la connexion n'a pas"
+" été altérée."
+
+#: https//tb-manual.torproject.org/en-US/onion-services/
+#: (content/onion-services/contents+en-US.lrtopic.body)
+msgid "##### How to access an onion service"
+msgstr "##### Comment accéder à un service oignon ?"
+
+#: https//tb-manual.torproject.org/en-US/onion-services/
+#: (content/onion-services/contents+en-US.lrtopic.body)
+msgid ""
+"Just like any other website, you will need to know the address of an onion "
+"service in order to connect to it. An onion address is a string of 16 (and "
+"in V3 format, 56) mostly random letters and numbers, followed by “.onion”."
+msgstr ""
+"Comme tout autre site Web, vous devrez connaître l’adresse d’un service "
+"onion afin de vous y connecter. Une adresse onion est une chaîne de 16 "
+"lettres et chiffres (ou 56 en format V3) principalement générés au hasard, "
+"suivie par « .onion »."
+
+#: https//tb-manual.torproject.org/en-US/onion-services/
+#: (content/onion-services/contents+en-US.lrtopic.body)
+msgid ""
+"When accessing a website that uses an onion service, Tor Browser will show "
+"at the URL bar an icon of a little green onion displaying the state of your "
+"connection: secure and using an onion service. 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 ""
+"Lorsque vous accédez à un site Web qui utilise un service d'onion, Tor "
+"Browser affichera dans la barre URL une icône d'un petit oignon vert "
+"affichant l'état de votre connexion : sécurisé et utilisant un service "
+"d'onion. Et si vous accédez à un site Web avec service https et onion, il "
+"affichera l'icône d'un oignon vert et un cadenas."
+
+#: https//tb-manual.torproject.org/en-US/onion-services/
+#: (content/onion-services/contents+en-US.lrtopic.body)
+msgid "##### Troubleshooting"
+msgstr "##### Dépannage"
+
+#: https//tb-manual.torproject.org/en-US/onion-services/
+#: (content/onion-services/contents+en-US.lrtopic.body)
+msgid ""
+"If you cannot reach the onion service you require, make sure that you have "
+"entered the onion address correctly: even a small mistake will stop Tor "
+"Browser from being able to reach the site."
+msgstr ""
+"Si vous ne pouvez pas atteindre le service onion dont vous avez besoin, "
+"assurez-vous d’avoir correctement saisi l’adresse onion : même une petite "
+"erreur empêchera le Navigateur Tor d’atteindre le site."
+
+#: https//tb-manual.torproject.org/en-US/onion-services/
+#: (content/onion-services/contents+en-US.lrtopic.body)
+msgid ""
+"If you are still unable to connect to the onion service, please try again "
+"later. There may be a temporary connection issue, or the site operators may "
+"have allowed it to go offline without warning."
+msgstr ""
+"Si vous n’arrivez toujours pas à vous connecter au service onion, veuillez "
+"ressayer ultérieurement. Il pourrait y avoir un problème temporaire de "
+"connexion ou les exploitants du site pourraient l’avoir désactivé sans "
+"avertissement."
+
+#: https//tb-manual.torproject.org/en-US/onion-services/
+#: (content/onion-services/contents+en-US.lrtopic.body)
+msgid ""
+"You can also ensure that you're able to access other onion services by "
+"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
+"Service</a>"
+msgstr ""
+"Vous pouvez aussi vérifier si vous arrivez à vous connecter à d’autres "
+"services onion en vous connectant au <a "
+"href=\"http://3g2upl4pq6kufc4m.onion/\">service onion de DuckDuckGo</a>."
+
+#: https//tb-manual.torproject.org/en-US/onion-services/
+#: (content/onion-services/contents+en-US.lrtopic.seo_slug)
+msgid "onion-services"
+msgstr "services-oignon"
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.title)
+msgid "Secure Connections"
+msgstr "Les connexions sécurisées"
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.description)
+msgid "Learn how to protect your data using Tor Browser and HTTPS"
+msgstr ""
+"Apprenez comment protéger vos données en utilisant le Navigateur Tor et "
+"HTTPS"
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+msgid ""
+"If personal information such as a login password travels unencrypted over "
+"the Internet, it can very easily be intercepted by an eavesdropper. If you "
+"are logging into any website, you should make sure that the site offers "
+"HTTPS encryption, which protects against this kind of eavesdropping. You can"
+" verify this in the URL bar: if your connection is encrypted, the address "
+"will begin with “https://”, rather than “http://”."
+msgstr ""
+"Si des informations personnelles telles que des mots de passe de connexion "
+"voyagent sur Internet sans chiffrement, elles pourraient facilement être "
+"interceptées par des systèmes d’écoute. Si vous vous connectez dans des "
+"sites Web, vous devriez vous assurer que ces sites offrent le chiffrement "
+"HTTPS, chiffrement qui vous protège contre ce genre d’écoute. Vous pouvez le"
+" vérifier dans la barre d’URL : si votre connexion est chiffrée, l’adresse "
+"commencera par « https:// » plutôt que par « http:// »."
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/https.png\">"
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/https.png\">"
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+msgid ""
+"The following visualization shows what information is visible to "
+"eavesdroppers with and without Tor Browser and HTTPS encryption:"
+msgstr ""
+"La visualisation suivante montre quelles informations sont visibles pour les"
+" systèmes d’écoute avec et sans le Navigateur Tor et le chiffrement HTTPS :"
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+msgid "<img class=\"\" src=\"../../static/images/tor-and-https.svg\">"
+msgstr "<img class=\"\" src=\"../../static/images/tor-and-https.svg\">"
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+msgid ""
+"* Click the “Tor” button to see what data is visible to observers when "
+"you're using Tor. The button will turn green to indicate that Tor is on."
+msgstr ""
+"* Cliquez sur le bouton « Tor » pour voir quelles données sont visibles pour"
+" les observateurs quand vous utilisez Tor. Le bouton deviendra vert pour "
+"indiquer que Tor est activé."
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+msgid ""
+"* Click the “HTTPS” button to see what data is visible to observers when "
+"you're using HTTPS. The button will turn green to indicate that HTTPS is on."
+msgstr ""
+"* Cliquez sur le bouton « HTTPS » pour voir quelles données sont visibles "
+"pour les observateurs quand vous utilisez HTTPS. Le bouton deviendra vert "
+"pour indiquer que HTTPS est activé."
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+msgid ""
+"* When both buttons are green, you see the data that is visible to observers"
+" when you are using both tools."
+msgstr ""
+"* Quand les deux boutons sont verts, vous voyez les données qui sont "
+"visibles pour les observateurs quand vous utilisez les deux outils."
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+msgid ""
+"* When both buttons are grey, you see the data that is visible to observers "
+"when you don't use either tool."
+msgstr ""
+"* Quand les deux boutons sont gris, vous voyez les données qui sont visibles"
+" pour les observateurs quand vous n’utilisez aucun des deux outils."
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+msgid "##### Potentially visible data"
+msgstr "##### Les données potentiellement visibles"
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider/
+#: (content/security-slider/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider.html
+#: (content/security-slider.html/contents+en-US.lrtopic.body)
+msgid "<dl>"
+msgstr "<dl>"
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider/
+#: (content/security-slider/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider.html
+#: (content/security-slider.html/contents+en-US.lrtopic.body)
+msgid "<dt>"
+msgstr "<dt>"
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+msgid "Site.com"
+msgstr "Site.com"
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider/
+#: (content/security-slider/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider.html
+#: (content/security-slider.html/contents+en-US.lrtopic.body)
+msgid "</dt>"
+msgstr "</dt>"
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider/
+#: (content/security-slider/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider.html
+#: (content/security-slider.html/contents+en-US.lrtopic.body)
+msgid "<dd>"
+msgstr "<dd>"
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+msgid "The site being visited."
+msgstr "Le site que vous visitez."
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider/
+#: (content/security-slider/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider.html
+#: (content/security-slider.html/contents+en-US.lrtopic.body)
+msgid "</dd>"
+msgstr "</dd>"
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+msgid "user / pw"
+msgstr "utilisat./mdp"
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+msgid "Username and password used for authentication."
+msgstr ""
+"Le nom d’utilisateur et le mot de passe utilisés pour l’authentification."
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+msgid "data"
+msgstr "données"
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+msgid "Data being transmitted."
+msgstr "Les données qui sont transmises."
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+msgid "location"
+msgstr "lieu"
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+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)."
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+msgid "Tor"
+msgstr "Tor"
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+msgid "Whether or not Tor is being used."
+msgstr "Si Tor est utilisé ou non."
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider/
+#: (content/security-slider/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider.html
+#: (content/security-slider.html/contents+en-US.lrtopic.body)
+msgid "</dl>"
+msgstr "</dl>"
+
+#: https//tb-manual.torproject.org/en-US/secure-connections/
+#: (content/secure-connections/contents+en-US.lrtopic.seo_slug)
+msgid "secure-connections"
+msgstr "connexions-sécurisées"
+
+#: https//tb-manual.torproject.org/en-US/security-slider/
+#: (content/security-slider/contents+en-US.lrtopic.title)
+#: https//tb-manual.torproject.org/en-US/security-slider.html
+#: (content/security-slider.html/contents+en-US.lrtopic.title)
+msgid "Security Slider"
+msgstr "Curseur de sécurité"
+
+#: https//tb-manual.torproject.org/en-US/security-slider/
+#: (content/security-slider/contents+en-US.lrtopic.description)
+#: https//tb-manual.torproject.org/en-US/security-slider.html
+#: (content/security-slider.html/contents+en-US.lrtopic.description)
+msgid "Configuring Tor Browser for security and usability"
+msgstr "Configurez le Navigateur Tor pour la sécurité et la facilité d’emploi"
+
+#: https//tb-manual.torproject.org/en-US/security-slider/
+#: (content/security-slider/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider.html
+#: (content/security-slider.html/contents+en-US.lrtopic.body)
+msgid ""
+"Tor Browser includes a “Security Slider” that lets you increase your "
+"security by disabling certain web features that can be used to attack your "
+"security and anonymity. Increasing Tor Browser’s security level will stop "
+"some web pages from functioning properly, so you should weigh your security "
+"needs against the degree of usability you require."
+msgstr ""
+"Le Navigateur Tor inclut un « curseur de sécurité » qui vous permet "
+"d’augmenter votre sécurité en désactivant certaines fonctions Web qui "
+"peuvent être utilisées pour attaquer votre sécurité et votre anonymat. En "
+"augmentant le niveau de sécurité du Navigateur Tor, vous empêcherez le bon "
+"fonctionnement de certaines pages Web et vous devriez prendre en "
+"considération vos besoins de sécurité ainsi que le niveau de facilité "
+"d’emploi."
+
+#: https//tb-manual.torproject.org/en-US/security-slider/
+#: (content/security-slider/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider.html
+#: (content/security-slider.html/contents+en-US.lrtopic.body)
+msgid "##### Accessing the Security Slider"
+msgstr "##### Accéder au bouton de sécurité coulissant"
+
+#: https//tb-manual.torproject.org/en-US/security-slider/
+#: (content/security-slider/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider.html
+#: (content/security-slider.html/contents+en-US.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/slider.png\">"
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/slider.png\">"
+
+#: https//tb-manual.torproject.org/en-US/security-slider/
+#: (content/security-slider/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider.html
+#: (content/security-slider.html/contents+en-US.lrtopic.body)
+msgid ""
+"The Security Slider is located in Torbutton’s “Security Settings” menu."
+msgstr ""
+"Le curseur de sécurité se trouve dans le menu « Paramètres de sécurité » du "
+"BoutonTor."
+
+#: https//tb-manual.torproject.org/en-US/security-slider/
+#: (content/security-slider/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider.html
+#: (content/security-slider.html/contents+en-US.lrtopic.body)
+msgid "##### Security Levels"
+msgstr "##### Les niveaux de sécurité"
+
+#: https//tb-manual.torproject.org/en-US/security-slider/
+#: (content/security-slider/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider.html
+#: (content/security-slider.html/contents+en-US.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/slider_window.png\">"
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/slider_window.png\">"
+
+#: https//tb-manual.torproject.org/en-US/security-slider/
+#: (content/security-slider/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider.html
+#: (content/security-slider.html/contents+en-US.lrtopic.body)
+msgid ""
+"Increasing the level of the Security Slider will disable or partially "
+"disable certain browser features to protect against possible attacks."
+msgstr ""
+"En augmentant le niveau du curseur de sécurité, vous désactiverez "
+"complètement ou partiellement certaines fonctions du navigateur afin de vous"
+" protéger contre les attaques potentielles."
+
+#: https//tb-manual.torproject.org/en-US/security-slider/
+#: (content/security-slider/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider.html
+#: (content/security-slider.html/contents+en-US.lrtopic.body)
+msgid "Safest"
+msgstr "Le plus sûr"
+
+#: https//tb-manual.torproject.org/en-US/security-slider/
+#: (content/security-slider/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider.html
+#: (content/security-slider.html/contents+en-US.lrtopic.body)
+msgid ""
+"At this level, HTML5 video and audio media become click-to-play via "
+"NoScript; all JavaScript performance optimizations are disabled; some "
+"mathematical equations may not display properly; some font rendering "
+"features are disabled; some types of image are disabled; Javascript is "
+"disabled by default on all sites; most video and audio formats are disabled;"
+" and some fonts and icons may not display correctly."
+msgstr ""
+"À ce niveau, les contenus multimédias HTML5 deviennent « cliquer pour lire »"
+" avec NoScript ; toutes les optimisations des performances JavaScript sont "
+"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 ; JavaScript est désactivé par "
+"défaut pour tous les sites ; la plupart des formats vidéo et audio sont "
+"désactivés ; et certaines polices et icônes pourraient ne pas s’afficher "
+"correctement."
+
+#: https//tb-manual.torproject.org/en-US/security-slider/
+#: (content/security-slider/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider.html
+#: (content/security-slider.html/contents+en-US.lrtopic.body)
+msgid "Safer"
+msgstr "Plus sûr"
+
+#: https//tb-manual.torproject.org/en-US/security-slider/
+#: (content/security-slider/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider.html
+#: (content/security-slider.html/contents+en-US.lrtopic.body)
+msgid ""
+"At this level, HTML5 video and audio media become click-to-play via "
+"NoScript; all JavaScript performance optimizations are disabled; some "
+"mathematical equations may not display properly; some font rendering "
+"features are disabled; some types of image are disabled; and JavaScript is "
+"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
+"sites."
+msgstr ""
+"À ce niveau, les contenus multimédias HTML5 deviennent cliquer-pour-lire "
+"avec NoScript ; toutes les optimisations des performances JavaScript sont "
+"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 <a href=\"/secure-connections\">non HTTPS</a>."
+
+#: https//tb-manual.torproject.org/en-US/security-slider/
+#: (content/security-slider/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider.html
+#: (content/security-slider.html/contents+en-US.lrtopic.body)
+msgid "Standard"
+msgstr "Normal"
+
+#: https//tb-manual.torproject.org/en-US/security-slider/
+#: (content/security-slider/contents+en-US.lrtopic.body)
+#: https//tb-manual.torproject.org/en-US/security-slider.html
+#: (content/security-slider.html/contents+en-US.lrtopic.body)
+msgid ""
+"At this level, all browser features are enabled. This is the most usable "
+"option."
+msgstr ""
+"À ce niveau, toutes les fonctions du navigateur sont activées. C’est "
+"l’option la plus facile d’emploi."
+
+#: https//tb-manual.torproject.org/en-US/security-slider/
+#: (content/security-slider/contents+en-US.lrtopic.seo_slug)
+#: https//tb-manual.torproject.org/en-US/security-slider.html
+#: (content/security-slider.html/contents+en-US.lrtopic.seo_slug)
+msgid "security-slider"
+msgstr "curseur-de-sécurité"
+
+#: https//tb-manual.torproject.org/en-US/updating/
+#: (content/updating/contents+en-US.lrtopic.title)
+msgid "Updating"
+msgstr "La mise à jour"
+
+#: https//tb-manual.torproject.org/en-US/updating/
+#: (content/updating/contents+en-US.lrtopic.description)
+msgid "How to update Tor Browser"
+msgstr "Comment mettre à jour le Navigateur Tor ?"
+
+#: https//tb-manual.torproject.org/en-US/updating/
+#: (content/updating/contents+en-US.lrtopic.body)
+msgid ""
+"Tor Browser must be kept updated at all times. If you continue to use an "
+"outdated version of the software, you may be vulnerable to serious security "
+"flaws that compromise your privacy and anonymity."
+msgstr ""
+"Le Navigateur Tor doit toujours être gardé à jour. Si vous continuez à "
+"utiliser une version désuète du logiciel, vous pourriez être vulnérable à de"
+" graves failles de sécurité qui compromettent la protection de vos données "
+"personnelles et votre anonymat."
+
+#: https//tb-manual.torproject.org/en-US/updating/
+#: (content/updating/contents+en-US.lrtopic.body)
+msgid ""
+"Tor Browser will prompt you to update the software once a new version has "
+"been released: the Torbutton icon will display a yellow triangle, and you "
+"may see a written update indicator when Tor Browser opens. You can update "
+"either automatically or manually."
+msgstr ""
+"Le Navigateur Tor vous demandera de mettre à jour le logiciel quand une "
+"nouvelle version paraîtra : l’icône du BoutonTor affichera un triangle jaune"
+" et un indicateur écrit de mise à jour pourrait apparaître lors du démarrage"
+" du Navigateur Tor. Vous pouvez mettre à jour automatiquement ou "
+"manuellement."
+
+#: https//tb-manual.torproject.org/en-US/updating/
+#: (content/updating/contents+en-US.lrtopic.body)
+msgid "##### Updating Tor Browser automatically"
+msgstr "##### La mise à jour automatique du navigateur Tor"
+
+#: https//tb-manual.torproject.org/en-US/updating/
+#: (content/updating/contents+en-US.lrtopic.body)
+msgid "<img width=\"400\" src=\"../../static/images/update1.png\" />"
+msgstr "<img width=\"400\" src=\"../../static/images/update1.png\" />"
+
+#: https//tb-manual.torproject.org/en-US/updating/
+#: (content/updating/contents+en-US.lrtopic.body)
+msgid ""
+"When you are prompted to update Tor Browser, click on the Torbutton icon, "
+"then select “Check for Tor Browser Update”."
+msgstr ""
+"Si l’on vous demande de mettre à jour le Navigateur Tor, cliquez sur l’icône"
+" du BoutonTor, puis sur « Vérifier les mises à jour du Navigateur Tor »."
+
+#: https//tb-manual.torproject.org/en-US/updating/
+#: (content/updating/contents+en-US.lrtopic.body)
+msgid "<img width=\"600\" src=\"../../static/images/update3.png\" />"
+msgstr "<img width=\"600\" src=\"../../static/images/update3.png\" />"
+
+#: https//tb-manual.torproject.org/en-US/updating/
+#: (content/updating/contents+en-US.lrtopic.body)
+msgid ""
+"When Tor Browser has finished checking for updates, click on the “Update” "
+"button."
+msgstr ""
+"Une fois que le Navigateur Tor a fini de vérifier la disponibilité des mises"
+" à jour, cliquez sur le bouton « Mise à jour »."
+
+#: https//tb-manual.torproject.org/en-US/updating/
+#: (content/updating/contents+en-US.lrtopic.body)
+msgid "<img width=\"600\" src=\"../../static/images/update4.png\" />"
+msgstr "<img width=\"600\" src=\"../../static/images/update4.png\" />"
+
+#: https//tb-manual.torproject.org/en-US/updating/
+#: (content/updating/contents+en-US.lrtopic.body)
+msgid ""
+"Wait for the update to download and install, then restart Tor Browser. You "
+"will now be running the latest version."
+msgstr ""
+"Attendez la fin du téléchargement et de l’installation, puis redémarrez le "
+"Navigateur Tor. Vous utiliserez alors la version la plus récente."
+
+#: https//tb-manual.torproject.org/en-US/updating/
+#: (content/updating/contents+en-US.lrtopic.body)
+msgid "##### Updating Tor Browser manually"
+msgstr "##### La mise à jour manuelle du navigateur Tor"
+
+#: https//tb-manual.torproject.org/en-US/updating/
+#: (content/updating/contents+en-US.lrtopic.body)
+msgid ""
+"When you are prompted to update Tor Browser, finish the browsing session and"
+" close the program."
+msgstr ""
+"Quand on vous demande de mettre à jour le Navigateur Tor, terminez la "
+"session de navigation et fermez le programme."
+
+#: https//tb-manual.torproject.org/en-US/updating/
+#: (content/updating/contents+en-US.lrtopic.body)
+msgid ""
+"Remove Tor Browser from your system by deleting the folder that contains it "
+"(see the <a href='uninstalling'>Uninstalling</a> section for more "
+"information)."
+msgstr ""
+"Retirez le Navigateur Tor de votre système en supprimant le dossier qui le "
+"contient (consultez le paragraphe <a href=\"uninstalling\">La "
+"désinstallation</a> pour plus d’informations)."
+
+#: https//tb-manual.torproject.org/en-US/updating/
+#: (content/updating/contents+en-US.lrtopic.body)
+msgid ""
+"Visit <a "
+"href=\"https://www.torproject.org/projects/torbrowser.html.en\">https://www.torproject.org/projects/torbrowser.html.en</a>"
+" and download a copy of the latest Tor Browser release, then install it as "
+"before."
+msgstr ""
+"Visitez <a "
+"href=\"https://www.torproject.org/projects/torbrowser.html.en\">https://www.torproject.org/projects/torbrowser.html</a>,"
+" téléchargez la version la plus récente du Navigateur Tor et installez-la "
+"comme avant."
+
+#: https//tb-manual.torproject.org/en-US/updating/
+#: (content/updating/contents+en-US.lrtopic.seo_slug)
+msgid "updating"
+msgstr "La mise à jour"
+
+#: https//tb-manual.torproject.org/en-US/plugins/
+#: (content/plugins/contents+en-US.lrtopic.title)
+msgid "Plugins, add-ons and JavaScript"
+msgstr "Les modules complémentaires, les greffons et JavaScript"
+
+#: https//tb-manual.torproject.org/en-US/plugins/
+#: (content/plugins/contents+en-US.lrtopic.description)
+msgid "How Tor Browser handles add-ons, plugins and JavaScript"
+msgstr ""
+"Comment le Navigateur Tor gère-t-il les modules complémentaires, les "
+"greffons et JavaScript ?"
+
+#: https//tb-manual.torproject.org/en-US/plugins/
+#: (content/plugins/contents+en-US.lrtopic.body)
+msgid "##### Flash Player"
+msgstr "##### Le lecteur Flash"
+
+#: https//tb-manual.torproject.org/en-US/plugins/
+#: (content/plugins/contents+en-US.lrtopic.body)
+msgid ""
+"Video websites, such as Vimeo make use of the Flash Player plugin to display"
+" video content. Unfortunately, this software operates independently of Tor "
+"Browser and cannot easily be made to obey Tor Browser’s proxy settings. It "
+"can therefore reveal your real location and IP address to the website "
+"operators, or to an outside observer. For this reason, Flash is disabled by "
+"default in Tor Browser, and enabling it is not recommended."
+msgstr ""
+"Les sites Web vidéo tels que Vimeo utilisent le greffon du lecteur Flash "
+"pour afficher les contenus vidéo. Malheureusement, ce logiciel fonctionne "
+"indépendamment du Navigateur Tor et il peut être difficile de le faire obéir"
+" aux paramètres de serveur mandataire du Navigateur Tor. Il peut par "
+"conséquent divulguer vos position et adresse IP réels aux exploitants du "
+"site Web ou à un observateur extérieur. C’est pour cela que Flash est "
+"désactivé par défaut dans le navigateur, et il n’est pas recommandé de "
+"l’activer."
+
+#: https//tb-manual.torproject.org/en-US/plugins/
+#: (content/plugins/contents+en-US.lrtopic.body)
+msgid ""
+"Some video websites (such as YouTube) offer alternative video delivery "
+"methods that do not use Flash. These methods may be compatible with Tor "
+"Browser."
+msgstr ""
+"Certains sites Web vidéo (comme YouTube) offrent d’autres méthodes de "
+"livraison des vidéos qui n’utilisent pas Flash. Ces méthodes pourraient être"
+" compatibles avec le Navigateur Tor."
+
+#: https//tb-manual.torproject.org/en-US/plugins/
+#: (content/plugins/contents+en-US.lrtopic.body)
+msgid "##### JavaScript"
+msgstr "##### JavaScript"
+
+#: https//tb-manual.torproject.org/en-US/plugins/
+#: (content/plugins/contents+en-US.lrtopic.body)
+msgid ""
+"JavaScript is a programming language that websites use to offer interactive "
+"elements such as video, animation, audio, and status timelines. "
+"Unfortunately, JavaScript can also enable attacks on the security of the "
+"browser, which might lead to deanonymization."
+msgstr ""
+"JavaScript est un langage de programmation que les sites Web utilisent pour "
+"offrir des éléments interactifs tels que de la vidéo, des animations, de "
+"l’audio et des états de progression. Malheureusement, JavaScript permet "
+"aussi d’attaquer la sécurité du navigateur, ce qui pourrait compromettre "
+"l’anonymisation."
+
+#: https//tb-manual.torproject.org/en-US/plugins/
+#: (content/plugins/contents+en-US.lrtopic.body)
+msgid ""
+"Tor Browser includes an add-on called NoScript, accessible through the “S” "
+"icon at the top-right of the window. NoScript allows you to control the "
+"JavaScript (and other scripts) that runs on individual web pages, or block "
+"it entirely."
+msgstr ""
+"Le Navigateur Tor comprend un module complémentaire appelé NoScript, "
+"accessible grâce à l’icône « S » en haut à droit de la fenêtre. NoScript "
+"vous permet de contrôler le JavaScript (et autres scripts) exécuté par les "
+"différentes pages Web, ou de le bloquer complètement. "
+
+#: https//tb-manual.torproject.org/en-US/plugins/
+#: (content/plugins/contents+en-US.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
+
+#: https//tb-manual.torproject.org/en-US/plugins/
+#: (content/plugins/contents+en-US.lrtopic.body)
+msgid ""
+"Users who require a high degree of security in their web browsing should set"
+" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
+"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
+"so for all websites). However, disabling JavaScript will prevent many "
+"websites from displaying correctly, so Tor Browser’s default setting is to "
+"allow all websites to run scripts in \"Standard\" mode."
+msgstr ""
+"Les utilisateurs qui exigent un niveau de sécurité élevé quand ils "
+"parcourent le Web devraient régler le curseur de sécurité du Navigateur Tor "
+"à « Plus sûr » (ce qui désactive le JavaScript pour les sites Web sans "
+"HTTPS) ou « Le plus sûr » (ce qui le fait pour tous les sites Web). "
+"Cependant, la désactivation du JavaScript empêchera de nombreux sites Web de"
+" s’afficher correctement, et c’est pourquoi les paramètres par défaut du "
+"Navigateur Tor permettent à tous les sites Web d’exécuter des scripts en "
+"mode « Normal »."
+
+#: https//tb-manual.torproject.org/en-US/plugins/
+#: (content/plugins/contents+en-US.lrtopic.body)
+msgid "##### Browser Add-ons"
+msgstr "##### Les modules complémentaires pour navigateur"
+
+#: https//tb-manual.torproject.org/en-US/plugins/
+#: (content/plugins/contents+en-US.lrtopic.body)
+msgid ""
+"Tor Browser is based on Firefox, and any browser add-ons or themes that are "
+"compatible with Firefox can also be installed in Tor Browser."
+msgstr ""
+"Le Navigateur Tor est fondé sur Firefox, et tout module complémentaire ou "
+"thème compatible avec Firefox peut aussi être installé dans le Navigateur "
+"Tor."
+
+#: https//tb-manual.torproject.org/en-US/plugins/
+#: (content/plugins/contents+en-US.lrtopic.body)
+msgid ""
+"However, the only add-ons that have been tested for use with Tor Browser are"
+" those included by default. Installing any other browser add-ons may break "
+"functionality in Tor Browser or cause more serious problems that affect your"
+" privacy and security. It is strongly discouraged to install additional add-"
+"ons, and the Tor Project will not offer support for these configurations."
+msgstr ""
+"Cependant, les seuls modules complémentaires qui ont été testés pour être "
+"utilisés avec le Navigateur Tor sont ceux inclus par défaut. L’installation "
+"de tout autre module complémentaire pourrait briser la fonctionnalité du "
+"Navigateur Tor ou poser des problèmes plus graves qui affectent la "
+"protection de vos données personnelles et la sécurité. Il est fortement "
+"déconseillé d’installer d’autres modules complémentaires, et le Projet Tor "
+"n’offrira aucun soutien pour les configurations les utilisant."
+
+#: https//tb-manual.torproject.org/en-US/plugins/
+#: (content/plugins/contents+en-US.lrtopic.seo_slug)
+msgid "plugins"
+msgstr "greffons"
+
+#: https//tb-manual.torproject.org/en-US/troubleshooting/
+#: (content/troubleshooting/contents+en-US.lrtopic.title)
+msgid "Troubleshooting"
+msgstr "Dépannage"
+
+#: https//tb-manual.torproject.org/en-US/troubleshooting/
+#: (content/troubleshooting/contents+en-US.lrtopic.description)
+msgid "What to do if Tor Browser doesn’t work"
+msgstr "Que faire si le Navigateur Tor ne fonctionne pas ?"
+
+#: https//tb-manual.torproject.org/en-US/troubleshooting/
+#: (content/troubleshooting/contents+en-US.lrtopic.body)
+msgid ""
+"You should be able to start browsing the web using Tor Browser shortly after"
+" running the program, and clicking the “Connect” button if you are using it "
+"for the first time."
+msgstr ""
+"Vous devriez pouvoir commencer à parcourir le Web avec le Navigateur Tor peu"
+" de temps après avoir lancé le programme et avoir cliqué sur le bouton « Se "
+"connecter » si vous l’utilisez pour la première fois."
+
+#: https//tb-manual.torproject.org/en-US/troubleshooting/
+#: (content/troubleshooting/contents+en-US.lrtopic.body)
+msgid "##### Quick fixes"
+msgstr "##### Solutions rapides"
+
+#: https//tb-manual.torproject.org/en-US/troubleshooting/
+#: (content/troubleshooting/contents+en-US.lrtopic.body)
+msgid ""
+"If Tor Browser doesn’t connect, there may be a simple solution. Try each of "
+"the following:"
+msgstr ""
+"Si le Navigateur Tor ne se connecte pas, il existe peut-être une solution "
+"simple. Essayez une des suivantes :"
+
+#: https//tb-manual.torproject.org/en-US/troubleshooting/
+#: (content/troubleshooting/contents+en-US.lrtopic.body)
+msgid ""
+"* Your computer’s system clock must be set correctly, or Tor will not be "
+"able to connect."
+msgstr ""
+"* L'horloge système de votre ordinateur doit être ajustée correctement ou "
+"Tor ne pourra pas se connecter."
+
+#: https//tb-manual.torproject.org/en-US/troubleshooting/
+#: (content/troubleshooting/contents+en-US.lrtopic.body)
+msgid ""
+"* Make sure another Tor Browser is not already running. If you’re not sure "
+"if Tor Browser is running, restart your computer."
+msgstr ""
+"* Assurez-vous qu'un autre navigateur Tor n'est pas déjà en cours "
+"d'exécution. Si vous n'en êtes pas certain, redémarrez votre ordinateur."
+
+#: https//tb-manual.torproject.org/en-US/troubleshooting/
+#: (content/troubleshooting/contents+en-US.lrtopic.body)
+msgid ""
+"* Make sure that any antivirus program you have installed is not preventing "
+"Tor from running. You may need to consult the documentation for your "
+"antivirus software if you do not know how to do this."
+msgstr ""
+"* Assurez-vous qu'un antivirus que vous avez installé n'empêche pas Tor de "
+"fonctionner. Si vous ne savez pas comment le faire, consultez la "
+"documentation de votre antivirus."
+
+#: https//tb-manual.torproject.org/en-US/troubleshooting/
+#: (content/troubleshooting/contents+en-US.lrtopic.body)
+msgid "* Temporarily disable your firewall."
+msgstr "* Désactivez temporairement votre pare-feu."
+
+#: https//tb-manual.torproject.org/en-US/troubleshooting/
+#: (content/troubleshooting/contents+en-US.lrtopic.body)
+msgid ""
+"* Delete Tor Browser and install it again. If updating, do not just "
+"overwrite your previous Tor Browser files; ensure they are fully deleted "
+"beforehand."
+msgstr ""
+"* Supprimez le Navigateur Tor et réinstallez-le. Si vous procédez à une mise"
+" à jour, n’écrasez pas vos anciens fichiers du Navigateur Tor ; assurez-vous"
+" de les supprimer complètement avant."
+
+#: https//tb-manual.torproject.org/en-US/troubleshooting/
+#: (content/troubleshooting/contents+en-US.lrtopic.body)
+msgid "##### Is your connection censored?"
+msgstr "##### Votre connexion est-elle censurée ?"
+
+#: https//tb-manual.torproject.org/en-US/troubleshooting/
+#: (content/troubleshooting/contents+en-US.lrtopic.body)
+msgid ""
+"If you still can’t connect, your Internet Service Provider might be "
+"censoring connections to the Tor network. Read the <a "
+"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+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 <a href=\"/circumvention\">Le contournement</a> pour "
+"découvrir des solutions possibles."
+
+#: https//tb-manual.torproject.org/en-US/troubleshooting/
+#: (content/troubleshooting/contents+en-US.lrtopic.body)
+msgid "##### Known issues"
+msgstr "##### Une liste de problèmes connus."
+
+#: https//tb-manual.torproject.org/en-US/troubleshooting/
+#: (content/troubleshooting/contents+en-US.lrtopic.body)
+msgid ""
+"Tor Browser is under constant development, and some issues are known about "
+"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
+"Issues</a> page to see if the problem you are experiencing is already listed"
+" 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 <a href"
+"=\"known-issues\">Les problèmes connus</a> pour vérifier si le problème que "
+"vous rencontrez n’y est pas déjà répertorié."
+
+#: https//tb-manual.torproject.org/en-US/troubleshooting/
+#: (content/troubleshooting/contents+en-US.lrtopic.seo_slug)
+msgid "troubleshooting"
+msgstr "Dépannage"
+
+#: https//tb-manual.torproject.org/en-US/known-issues/
+#: (content/known-issues/contents+en-US.lrtopic.title)
+#: (content/known-issues/contents+en-US.lrtopic.description)
+msgid "Known issues"
+msgstr "Les problèmes connus"
+
+#: https//tb-manual.torproject.org/en-US/known-issues/
+#: (content/known-issues/contents+en-US.lrtopic.body)
+msgid ""
+"* Tor needs your system clock (and your time zone) set to the correct time."
+msgstr ""
+"* Tor exige que votre horloge système soit réglée à l’heure juste (et que "
+"votre fuseau horaire soit bien défini)."
+
+#: https//tb-manual.torproject.org/en-US/known-issues/
+#: (content/known-issues/contents+en-US.lrtopic.body)
+msgid ""
+"* The following firewall software have been known to interfere with Tor and "
+"may need to be temporarily disabled:"
+msgstr ""
+"* Les logiciels pare-feu suivants sont reconnus pour interférer avec Tor et "
+"il pourrait être nécessaire de les désactiver temporairement :"
+
+#: https//tb-manual.torproject.org/en-US/known-issues/
+#: (content/known-issues/contents+en-US.lrtopic.body)
+msgid "* Webroot SecureAnywhere"
+msgstr "* Webroot SecureAnywhere"
+
+#: https//tb-manual.torproject.org/en-US/known-issues/
+#: (content/known-issues/contents+en-US.lrtopic.body)
+msgid "* Kaspersky Internet Security 2012"
+msgstr "* Kaspersky Internet Security 2012"
+
+#: https//tb-manual.torproject.org/en-US/known-issues/
+#: (content/known-issues/contents+en-US.lrtopic.body)
+msgid "* Sophos Antivirus for Mac"
+msgstr "* Sophos Antivirus pour Mac"
+
+#: https//tb-manual.torproject.org/en-US/known-issues/
+#: (content/known-issues/contents+en-US.lrtopic.body)
+msgid "* Microsoft Security Essentials"
+msgstr "* Microsoft Security Essentials"
+
+#: https//tb-manual.torproject.org/en-US/known-issues/
+#: (content/known-issues/contents+en-US.lrtopic.body)
+msgid ""
+"* Videos that require Adobe Flash are unavailable. Flash is disabled for "
+"security reasons."
+msgstr ""
+"* Les vidéos qui exigent Adobe Flash ne sont pas proposées. Flash ait "
+"désactivé pour des raisons de sécurité."
+
+#: https//tb-manual.torproject.org/en-US/known-issues/
+#: (content/known-issues/contents+en-US.lrtopic.body)
+msgid "* Tor can not use a bridge if a proxy is set."
+msgstr "* Tor ne peut pas utiliser un pont si un mandataire est défini."
+
+#: https//tb-manual.torproject.org/en-US/known-issues/
+#: (content/known-issues/contents+en-US.lrtopic.body)
+msgid ""
+"* The Tor Browser package is dated January 1, 2000 00:00:00 UTC. This is to "
+"ensure that each software build is exactly reproducible."
+msgstr ""
+"* Le paquet du navigateur Tor est daté janvier 1er, 2000 00:00:00 UTC, cela "
+"afin de garantir que chaque version du logiciel est exactement "
+"reproductible."
+
+#: https//tb-manual.torproject.org/en-US/known-issues/
+#: (content/known-issues/contents+en-US.lrtopic.body)
+msgid ""
+"* To run Tor Browser on Ubuntu, users need to execute a shell script. Open "
+"\"Files\" (Unity's explorer), open Preferences → Behavior Tab → Set \"Run "
+"executable text files when they are opened\" to \"Ask every time\", then "
+"click OK."
+msgstr ""
+"* Pour faire fonctionner le Navigateur Tor sur Ubuntu, les utilisateurs "
+"doivent exécuter un script en ligne de commande. Ouvrez « Fichiers » (le "
+"gestionnaire de fichiers d’Unity), puis Préférences → onglet Comportement → "
+"définissez « Fichiers texte exécutables » à « Demander quoi faire », puis "
+"fermez la fenêtre de dialogue."
+
+#: https//tb-manual.torproject.org/en-US/known-issues/
+#: (content/known-issues/contents+en-US.lrtopic.body)
+msgid ""
+"* Tor Browser can also be started from the command line by running the "
+"following command from inside the Tor Browser directory:"
+msgstr ""
+"* Le navigateur Tor peut aussi être lancé à partir de la ligne de commande "
+"en exécutant la commande suivante dans le répertoire du navigateur :"
+
+#: https//tb-manual.torproject.org/en-US/known-issues/
+#: (content/known-issues/contents+en-US.lrtopic.body)
+msgid "./start-tor-browser.desktop"
+msgstr "./start-tor-browser.desktop"
+
+#: https//tb-manual.torproject.org/en-US/known-issues/
+#: (content/known-issues/contents+en-US.lrtopic.body)
+msgid ""
+"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
+"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+msgstr ""
+"* BitTorrent en particulier <mark><a href=\"https://blog.torproject.org"
+"/bittorrent-over-tor-isnt-good-idea\">n’est pas anonyme avec Tor</a></mark>."
+
+#: https//tb-manual.torproject.org/en-US/known-issues/
+#: (content/known-issues/contents+en-US.lrtopic.seo_slug)
+#: https//tb-manual.torproject.org/en-US/uninstalling/
+#: (content/uninstalling/contents+en-US.lrtopic.seo_slug)
+msgid "uninstalling"
+msgstr "La désinstallation"
+
+#: https//tb-manual.torproject.org/en-US/uninstalling/
+#: (content/uninstalling/contents+en-US.lrtopic.title)
+msgid "Uninstalling"
+msgstr "La désinstallation"
+
+#: https//tb-manual.torproject.org/en-US/uninstalling/
+#: (content/uninstalling/contents+en-US.lrtopic.description)
+msgid "How to remove Tor Browser from your system"
+msgstr "Comment supprimer le Navigateur Tor de votre système ?"
+
+#: https//tb-manual.torproject.org/en-US/uninstalling/
+#: (content/uninstalling/contents+en-US.lrtopic.body)
+msgid ""
+"Tor Browser does not affect any of the existing software or settings on your"
+" computer. Uninstalling Tor Browser will not affect your system’s software "
+"or settings."
+msgstr ""
+"Le Navigateur Tor n’affecte aucun logiciel existant ou paramètre de votre "
+"ordinateur. La désinstallation du Navigateur Tor n’affectera ni les "
+"logiciels ni les paramètres de votre système."
+
+#: https//tb-manual.torproject.org/en-US/uninstalling/
+#: (content/uninstalling/contents+en-US.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Il est simple de supprimer le Navigateur Tor de votre système :"
+
+#: https//tb-manual.torproject.org/en-US/uninstalling/
+#: (content/uninstalling/contents+en-US.lrtopic.body)
+msgid ""
+"1. Locate your Tor Browser folder. The default location on Windows is the "
+"Desktop; on Mac OS X it is the Applications folder. On Linux, there is no "
+"default location, however the folder will be named \"tor-browser_en-US\" if "
+"you are running the English Tor Browser."
+msgstr ""
+"1. Repérez le dossier de votre Navigateur Tor. L’emplacement par défaut est "
+"le bureau sous Windows et le dossier Applications sous macOS (OS X). Sous "
+"Linux, il n’y a pas d’emplacement par défaut, cependant le dossier sera "
+"nommé « tor-browser_fr » si vous utilisez la version en français du "
+"Navigateur Tor."
+
+#: https//tb-manual.torproject.org/en-US/uninstalling/
+#: (content/uninstalling/contents+en-US.lrtopic.body)
+msgid "2. Delete the Tor Browser folder."
+msgstr "2. Supprimez le dossier du Navigateur Tor."
+
+#: https//tb-manual.torproject.org/en-US/uninstalling/
+#: (content/uninstalling/contents+en-US.lrtopic.body)
+msgid "3. Empty your Trash"
+msgstr "3. Videz votre corbeille."
+
+#: https//tb-manual.torproject.org/en-US/uninstalling/
+#: (content/uninstalling/contents+en-US.lrtopic.body)
+msgid ""
+"Note that your operating system’s standard “Uninstall” utility is not used."
+msgstr ""
+"Prenez note que javascript:;l’utilitaire habituel de désinstallation de "
+"votre système d’exploitation n’est pas utilisé."
+
+#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en-US.lrtopic.title)
+msgid "Becoming a Tor Translator"
+msgstr "Devenir traducteur de Tor"
+
+#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en-US.lrtopic.description)
+msgid "Becoming a translator for the Tor Project"
+msgstr "Devenez traducteur pour le Projet Tor"
+
+#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
+msgid ""
+"If you are interested in helping out the project by translating the manual "
+"or the Tor Browser to your language, your help would be greatly appreciated!"
+" In order to begin contributing you will have to sign up with Transifex, the"
+" third-party that faciliates our translations. Below is an outline of how to"
+" sign up and begin."
+msgstr ""
+"Si vous souhaitez aider le projet en traduisant le manuel ou le Navigateur "
+"Tor dans votre langue, nous vous serions très reconnaissants ! Avant de "
+"commencer à contribuer au projet, vous devrez vous inscrire à Transifex, la "
+"plateforme de localisation qui facilite nos traductions. Vous trouverez ci-"
+"dessous une description brève qui explique comment s’inscrire et commencer à"
+" traduire."
+
+#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
+msgid "##### Signing up on Transifex"
+msgstr "##### S’inscrire sur Transifex"
+
+#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
+msgid ""
+"* Head over to the <a href=\"https://transifex.com/signup/\">Transifex "
+"signup page</a>."
+msgstr "* Rendez-vous sur la page d'inscription de Transifex."
+
+#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
+msgid "Enter your information into the fields and click the 'Sign Up' button:"
+msgstr ""
+"Remplissez les champs avec vos renseignements et cliquez sur le bouton « "
+"S’inscrire » :"
+
+#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/tr1.png\">"
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr1.png\">"
+
+#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
+msgid ""
+"* Fill out the next page with your name and select \"Localization\" and "
+"\"Translator\" from the drop-down menus:"
+msgstr ""
+"* Remplissez la page suivante avec votre nom et choisissez « Localisation » "
+"et « Traducteur » dans les menus déroulants :"
+
+#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
+
+#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
+msgid "* On the next page, select 'Join an existing project' and continue."
+msgstr ""
+"* Sur la page suivante, sélectionnez « Se joindre à un projet existant » et "
+"poursuivez."
+
+#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
+msgid ""
+"* On the next page, select the languages you speak from the drop-down menu "
+"and continue."
+msgstr ""
+"* Sur la page suivante, sélectionnez dans le menu déroulant les langues que "
+"vous parlez et poursuivez."
+
+#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
+msgid ""
+"* You are now signed up! Go to the <a "
+"href=\"https://www.transifex.com/otf/torproject/\">Tor Transifex page</a>."
+msgstr ""
+"* Vous êtes maintenant inscrit ! Rendez-vous sur la page Transifex de Tor."
+
+#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
+msgid "* Click the blue 'Join Team' button on the far right:"
+msgstr ""
+"* Cliquez sur le bouton bleu « Se joindre à l’équipe » situé complètement à "
+"droite :"
+
+#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
+
+#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
+msgid ""
+"* Select the language you would like to translate from the dropdown menu:"
+msgstr ""
+"* Sélectionnez dans le menu déroulant la langue vers laquelle vous souhaitez"
+" traduire :"
+
+#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
+
+#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
+msgid "* A notification will now show up on the top of the page like so:"
+msgstr ""
+"* Une notification comme celle-ci apparaîtra maintenant en haut de la page "
+"comme suit :"
+
+#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
+
+#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
+msgid ""
+"After your membership is approved you can begin translating; simply navigate"
+" back to the <a href=\"https://www.transifex.com/otf/torproject/\">Tor "
+"Transifex page</a> when you are ready to begin. Thanks for your interest in "
+"helping the project!"
+msgstr ""
+"Une fois que votre adhésion sera approuvée, vous pourrez commencer à "
+"traduire ; retournez simplement vers la <a "
+"href=\"https://www.transifex.com/otf/torproject/\">page Transifex de Tor</a>"
+" quand vous serez prêt à commencer. Nous vous remercions de votre intérêt à "
+"aider le projet !"
+
+#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en-US.lrtopic.seo_slug)
+msgid "becoming-tor-translator"
+msgstr "devenir-traducteur-de-Tor"
+
+#: https//tb-manual.torproject.org/en-US/about/
+#: (content/about/contents+en-US.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"../../static/images/how-tor-works.png\" alt=\"How Tor "
+"Browser works\">"
+msgstr ""
+"<img class=\"\" src=\"../../static/images/how-tor-works.png\" alt=\"How Tor "
+"Browser works\">"
+
+#: templates/footer.html:5
+msgid "Our mission:"
+msgstr "Notre mission :"
+
+#: templates/footer.html:5
+msgid ""
+"to advance human rights and freedoms by creating and deploying free and open"
+" source anonymity and privacy technologies, supporting their unrestricted "
+"availability and use, and furthering their scientific and popular "
+"understanding."
+msgstr ""
+"pour progresser les droits de la personne et les libertés en créant et en "
+"déployant des technologies d’anonymat et de confidentialité gratuites et à "
+"code source ouvert. Nous soutenons leur disponibilité et leur utilisation "
+"sans restriction, et promouvons une meilleure compréhension scientifique et "
+"populaire."
+
+#: templates/footer.html:24
+msgid "Subscribe to our Newsletter"
+msgstr "Abonnez-vous à notre liste de diffusion"
+
+#: templates/footer.html:25
+msgid "Get monthly updates and opportunities from the Tor Project"
+msgstr "Recevez les mises à jours et opportunités mensuelles du Projet Tor"
+
+#: templates/footer.html:32
+msgid ""
+"Trademark, copyright notices, and rules for use by third parties can be "
+"found in our "
+msgstr ""
+"La marque déposée, les droits d'auteurs et de reproduction par un tiers "
+"parti peuvent être trouvés dans notre "
+
+#: templates/layout.html:7
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Tor Project | Le guide d'utilisation du navigateur Tor"
+
+#: templates/navbar.html:4
+msgid "Tor Logo"
+msgstr "Logo Tor"
+
+#: templates/navbar.html:40
+msgid "Download Tor Browser"
+msgstr "Télécharger le Navigateur Tor"
+
+#: templates/search.html:5
+msgid "Search"
+msgstr "Chercher"
+
+#: templates/sidenav.html:4 templates/sidenav.html:35
+msgid "Topics"
+msgstr "Sujets"
+
+#: templates/macros/topic.html:18
+msgid "Permalink"
+msgstr "Permalien"
1
0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation@torproject.org 22 Nov '18
by translation@torproject.org 22 Nov '18
22 Nov '18
commit 98401a251fe87726a66e1348509e926b0fe5b53b
Author: Translation commit bot <translation(a)torproject.org>
Date: Thu Nov 22 21:17:07 2018 +0000
Update translations for tbmanual-contentspot
---
contents+fr.po | 102 +++++++++++++++++++++++++++++++++++++++------------------
1 file changed, 71 insertions(+), 31 deletions(-)
diff --git a/contents+fr.po b/contents+fr.po
index 857a70f01..e4ba64d32 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -2,6 +2,7 @@
# AO <ao(a)localizationlab.org>, 2018
# erinm, 2018
# Emma Peel, 2018
+# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2018
#
msgid ""
msgstr ""
@@ -9,7 +10,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-11-21 11:49+CET\n"
"PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Emma Peel, 2018\n"
+"Last-Translator: Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2018\n"
"Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -85,6 +86,10 @@ msgid ""
" valid for a single session (until Tor Browser is exited or a <a href"
"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
msgstr ""
+"Par défaut, Tor Browser ne conserve aucun historique de navigation. Les "
+"cookies ne sont valides que pour une seule session (jusqu'à ce que Tor "
+"Browser soit quitté ou qu'une <a href=\"/managing-identities/#new-"
+"identity\">nouvelle identité</a> soit demandée)."
#: https//tb-manual.torproject.org/en-US/about/
#: (content/about/contents+en-US.lrtopic.body)
@@ -131,7 +136,7 @@ msgstr ""
#: https//tb-manual.torproject.org/en-US/about/
#: (content/about/contents+en-US.lrtopic.seo_slug)
msgid "about"
-msgstr ""
+msgstr "à propos"
#: https//tb-manual.torproject.org/en-US/downloading/
#: (content/downloading/contents+en-US.lrtopic.title)
@@ -173,7 +178,7 @@ msgstr ""
#: https//tb-manual.torproject.org/en-US/downloading/
#: (content/downloading/contents+en-US.lrtopic.body)
msgid "##### Mirrors"
-msgstr ""
+msgstr "##### Miroirs"
#: https//tb-manual.torproject.org/en-US/downloading/
#: (content/downloading/contents+en-US.lrtopic.body)
@@ -183,6 +188,10 @@ msgid ""
"mirrors, either through [EFF](https://tor.eff.org) or [Calyx "
"Institute](https://tor.calyxinstitute.org)."
msgstr ""
+"Si vous ne parvenez pas à télécharger le navigateur Tor à partir du site "
+"officiel du projet Tor, vous pouvez essayer de le télécharger à partir d'un "
+"de nos miroirs officiels, soit via [EFF] (https://tor.eff.org) ou [Calyx "
+"Institute] (https://tor.calyxinstitute.org)"
#: https//tb-manual.torproject.org/en-US/downloading/
#: (content/downloading/contents+en-US.lrtopic.body)
@@ -301,7 +310,7 @@ msgstr "##### Connecter"
#: https//tb-manual.torproject.org/en-US/troubleshooting/
#: (content/troubleshooting/contents+en-US.lrtopic.body)
msgid "<img class=\"col-md-6\" src=\"../../static/images/connect.png\">"
-msgstr ""
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/connect.png\">"
#: https//tb-manual.torproject.org/en-US/running-tor-browser/
#: (content/running-tor-browser/contents+en-US.lrtopic.body)
@@ -330,7 +339,7 @@ msgstr "##### Configurer"
#: https//tb-manual.torproject.org/en-US/circumvention/
#: (content/circumvention/contents+en-US.lrtopic.body)
msgid "<img class=\"col-md-6\" src=\"../../static/images/configure.png\">"
-msgstr ""
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/configure.png\">"
#: https//tb-manual.torproject.org/en-US/running-tor-browser/
#: (content/running-tor-browser/contents+en-US.lrtopic.body)
@@ -380,12 +389,12 @@ msgstr ""
#: https//tb-manual.torproject.org/en-US/running-tor-browser/
#: (content/running-tor-browser/contents+en-US.lrtopic.body)
msgid "<img class=\"col-md-6\" src=\"../../static/images/proxy_question.png\">"
-msgstr ""
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/proxy_question.png\">"
#: https//tb-manual.torproject.org/en-US/running-tor-browser/
#: (content/running-tor-browser/contents+en-US.lrtopic.body)
msgid "<img class=\"col-md-6\" src=\"../../static/images/proxy.png\">"
-msgstr ""
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/proxy.png\">"
#: https//tb-manual.torproject.org/en-US/running-tor-browser/
#: (content/running-tor-browser/contents+en-US.lrtopic.seo_slug)
@@ -486,6 +495,10 @@ msgid ""
" of the URL bar, then select 'Tor Network Settings...' to access these "
"options."
msgstr ""
+"Si vous démarrez Tor Browser pour la première fois, cliquez sur 'Configurer'"
+" pour ouvrir la fenêtre Tor Network Settings. Sinon, cliquez sur le bouton "
+"Tor à gauche de la barre URL, puis sélectionnez 'Tor Network Settings...' "
+"pour accéder à ces options."
#: https//tb-manual.torproject.org/en-US/bridges/
#: (content/bridges/contents+en-US.lrtopic.body)
@@ -494,6 +507,9 @@ msgid ""
"Then, select 'Provide a bridge I know' and enter each bridge address on a "
"separate line."
msgstr ""
+"Dans la fenêtre Paramètres du réseau Tor, sélectionnez 'Tor est censuré dans"
+" mon pays'. Ensuite, sélectionnez 'Fournir un pont que je connais' et entrez"
+" chaque adresse de pont sur une ligne séparée."
#: https//tb-manual.torproject.org/en-US/bridges/
#: (content/bridges/contents+en-US.lrtopic.body)
@@ -501,6 +517,8 @@ msgid ""
"<img class=\"col-md-6\" src=\"../../static/images/tor-launcher-custom-"
"bridges.png\">"
msgstr ""
+"<img class=\"col-md-6\" src=\"../../static/images/tor-launcher-custom-"
+"bridges.png\">"
#: https//tb-manual.torproject.org/en-US/bridges/
#: (content/bridges/contents+en-US.lrtopic.body)
@@ -508,6 +526,9 @@ msgid ""
"Click “OK” to save your settings. Using bridges may slow down the connection"
" compared to using ordinary Tor relays."
msgstr ""
+"Cliquez sur \"OK\" pour enregistrer vos paramètres. L'utilisation de "
+"passerelles peut ralentir la connexion par rapport à l'utilisation de relays"
+" Tor ordinaires."
#: https//tb-manual.torproject.org/en-US/bridges/
#: (content/bridges/contents+en-US.lrtopic.body)
@@ -760,7 +781,7 @@ msgstr ""
#: https//tb-manual.torproject.org/en-US/circumvention/
#: (content/circumvention/contents+en-US.lrtopic.body)
msgid "<img class=\"col-md-6\" src=\"../../static/images/bridges.png\">"
-msgstr ""
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/bridges.png\">"
#: https//tb-manual.torproject.org/en-US/circumvention/
#: (content/circumvention/contents+en-US.lrtopic.body)
@@ -899,7 +920,7 @@ msgstr ""
#: https//tb-manual.torproject.org/en-US/managing-identities/
#: (content/managing-identities/contents+en-US.lrtopic.body)
msgid "<img class=\"col-md-6\" src=\"../../static/images/circuit_full.png\">"
-msgstr ""
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/circuit_full.png\">"
#: https//tb-manual.torproject.org/en-US/managing-identities/
#: (content/managing-identities/contents+en-US.lrtopic.body)
@@ -907,6 +928,8 @@ msgid ""
"You can see a diagram of the circuit that Tor Browser is using for the "
"current tab in the site information menu, in the URL bar."
msgstr ""
+"Vous pouvez voir un diagramme du circuit que Tor Browser utilise pour "
+"l'onglet courant dans le menu des informations du site, dans la barre URL."
#: https//tb-manual.torproject.org/en-US/managing-identities/
#: (content/managing-identities/contents+en-US.lrtopic.body)
@@ -919,6 +942,14 @@ msgid ""
"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
msgstr ""
+"Dans le circuit, le nœud Garde ou nœud d'entrée est le premier nœud et il "
+"est automatiquement et aléatoirement sélectionné par Tor. Mais il est "
+"différent des autres nœuds du circuit. Afin d'éviter les attaques de "
+"profilage, le nœud Guard ne change qu'après 2-3 mois, contrairement aux "
+"autres nœuds, qui changent à chaque nouveau domaine. Pour plus "
+"d'informations sur Guards, consultez la <a "
+"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> et le <a "
+"href=\"https://support.torproject.org/tbb/tbb-2/\">Portail de support</a>."
#: https//tb-manual.torproject.org/en-US/managing-identities/
#: (content/managing-identities/contents+en-US.lrtopic.body)
@@ -1001,7 +1032,7 @@ msgstr "##### Changer d’identité et de circuit"
#: https//tb-manual.torproject.org/en-US/managing-identities/
#: (content/managing-identities/contents+en-US.lrtopic.body)
msgid "<img class=\"col-md-6\" src=\"../../static/images/new_identity.png\">"
-msgstr ""
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/new_identity.png\">"
#: https//tb-manual.torproject.org/en-US/managing-identities/
#: (content/managing-identities/contents+en-US.lrtopic.body)
@@ -1067,11 +1098,13 @@ msgid ""
"You can also access this option in the new circuit display, in the site "
"information menu, in the URL bar."
msgstr ""
+"Vous pouvez également accéder à cette option dans le nouvel affichage du "
+"circuit, dans le menu des informations du site, dans la barre URL."
#: https//tb-manual.torproject.org/en-US/managing-identities/
#: (content/managing-identities/contents+en-US.lrtopic.seo_slug)
msgid "managing-identities"
-msgstr ""
+msgstr "gestion-d'identités"
#: https//tb-manual.torproject.org/en-US/onion-services/
#: (content/onion-services/contents+en-US.lrtopic.title)
@@ -1161,6 +1194,11 @@ msgid ""
"website with https and onion service, it will show an icon of a green onion "
"and a padlock."
msgstr ""
+"Lorsque vous accédez à un site Web qui utilise un service d'onion, Tor "
+"Browser affichera dans la barre URL une icône d'un petit oignon vert "
+"affichant l'état de votre connexion : sécurisé et utilisant un service "
+"d'onion. Et si vous accédez à un site Web avec service https et onion, il "
+"affichera l'icône d'un oignon vert et un cadenas."
#: https//tb-manual.torproject.org/en-US/onion-services/
#: (content/onion-services/contents+en-US.lrtopic.body)
@@ -1239,7 +1277,7 @@ msgstr ""
#: https//tb-manual.torproject.org/en-US/secure-connections/
#: (content/secure-connections/contents+en-US.lrtopic.body)
msgid "<img class=\"col-md-6\" src=\"../../static/images/https.png\">"
-msgstr ""
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/https.png\">"
#: https//tb-manual.torproject.org/en-US/secure-connections/
#: (content/secure-connections/contents+en-US.lrtopic.body)
@@ -1253,7 +1291,7 @@ msgstr ""
#: https//tb-manual.torproject.org/en-US/secure-connections/
#: (content/secure-connections/contents+en-US.lrtopic.body)
msgid "<img class=\"\" src=\"../../static/images/tor-and-https.svg\">"
-msgstr ""
+msgstr "<img class=\"\" src=\"../../static/images/tor-and-https.svg\">"
#: https//tb-manual.torproject.org/en-US/secure-connections/
#: (content/secure-connections/contents+en-US.lrtopic.body)
@@ -1305,7 +1343,7 @@ msgstr "##### Les données potentiellement visibles"
#: https//tb-manual.torproject.org/en-US/security-slider.html
#: (content/security-slider.html/contents+en-US.lrtopic.body)
msgid "<dl>"
-msgstr ""
+msgstr "<dl>"
#: https//tb-manual.torproject.org/en-US/secure-connections/
#: (content/secure-connections/contents+en-US.lrtopic.body)
@@ -1314,7 +1352,7 @@ msgstr ""
#: https//tb-manual.torproject.org/en-US/security-slider.html
#: (content/security-slider.html/contents+en-US.lrtopic.body)
msgid "<dt>"
-msgstr ""
+msgstr "<dt>"
#: https//tb-manual.torproject.org/en-US/secure-connections/
#: (content/secure-connections/contents+en-US.lrtopic.body)
@@ -1328,7 +1366,7 @@ msgstr "Site.com"
#: https//tb-manual.torproject.org/en-US/security-slider.html
#: (content/security-slider.html/contents+en-US.lrtopic.body)
msgid "</dt>"
-msgstr ""
+msgstr "</dt>"
#: https//tb-manual.torproject.org/en-US/secure-connections/
#: (content/secure-connections/contents+en-US.lrtopic.body)
@@ -1405,12 +1443,12 @@ msgstr "Si Tor est utilisé ou non."
#: https//tb-manual.torproject.org/en-US/security-slider.html
#: (content/security-slider.html/contents+en-US.lrtopic.body)
msgid "</dl>"
-msgstr ""
+msgstr "</dl>"
#: https//tb-manual.torproject.org/en-US/secure-connections/
#: (content/secure-connections/contents+en-US.lrtopic.seo_slug)
msgid "secure-connections"
-msgstr ""
+msgstr "connexions-sécurisées"
#: https//tb-manual.torproject.org/en-US/security-slider/
#: (content/security-slider/contents+en-US.lrtopic.title)
@@ -1457,7 +1495,7 @@ msgstr "##### Accéder au bouton de sécurité coulissant"
#: https//tb-manual.torproject.org/en-US/security-slider.html
#: (content/security-slider.html/contents+en-US.lrtopic.body)
msgid "<img class=\"col-md-6\" src=\"../../static/images/slider.png\">"
-msgstr ""
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/slider.png\">"
#: https//tb-manual.torproject.org/en-US/security-slider/
#: (content/security-slider/contents+en-US.lrtopic.body)
@@ -1481,7 +1519,7 @@ msgstr "##### Les niveaux de sécurité"
#: https//tb-manual.torproject.org/en-US/security-slider.html
#: (content/security-slider.html/contents+en-US.lrtopic.body)
msgid "<img class=\"col-md-6\" src=\"../../static/images/slider_window.png\">"
-msgstr ""
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/slider_window.png\">"
#: https//tb-manual.torproject.org/en-US/security-slider/
#: (content/security-slider/contents+en-US.lrtopic.body)
@@ -1572,7 +1610,7 @@ msgstr ""
#: https//tb-manual.torproject.org/en-US/security-slider.html
#: (content/security-slider.html/contents+en-US.lrtopic.seo_slug)
msgid "security-slider"
-msgstr ""
+msgstr "curseur-de-sécurité"
#: https//tb-manual.torproject.org/en-US/updating/
#: (content/updating/contents+en-US.lrtopic.title)
@@ -1618,7 +1656,7 @@ msgstr "##### La mise à jour automatique du navigateur Tor"
#: https//tb-manual.torproject.org/en-US/updating/
#: (content/updating/contents+en-US.lrtopic.body)
msgid "<img width=\"400\" src=\"../../static/images/update1.png\" />"
-msgstr ""
+msgstr "<img width=\"400\" src=\"../../static/images/update1.png\" />"
#: https//tb-manual.torproject.org/en-US/updating/
#: (content/updating/contents+en-US.lrtopic.body)
@@ -1632,7 +1670,7 @@ msgstr ""
#: https//tb-manual.torproject.org/en-US/updating/
#: (content/updating/contents+en-US.lrtopic.body)
msgid "<img width=\"600\" src=\"../../static/images/update3.png\" />"
-msgstr ""
+msgstr "<img width=\"600\" src=\"../../static/images/update3.png\" />"
#: https//tb-manual.torproject.org/en-US/updating/
#: (content/updating/contents+en-US.lrtopic.body)
@@ -1646,7 +1684,7 @@ msgstr ""
#: https//tb-manual.torproject.org/en-US/updating/
#: (content/updating/contents+en-US.lrtopic.body)
msgid "<img width=\"600\" src=\"../../static/images/update4.png\" />"
-msgstr ""
+msgstr "<img width=\"600\" src=\"../../static/images/update4.png\" />"
#: https//tb-manual.torproject.org/en-US/updating/
#: (content/updating/contents+en-US.lrtopic.body)
@@ -1782,7 +1820,7 @@ msgstr ""
#: https//tb-manual.torproject.org/en-US/plugins/
#: (content/plugins/contents+en-US.lrtopic.body)
msgid "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
-msgstr ""
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
#: https//tb-manual.torproject.org/en-US/plugins/
#: (content/plugins/contents+en-US.lrtopic.body)
@@ -1838,7 +1876,7 @@ msgstr ""
#: https//tb-manual.torproject.org/en-US/plugins/
#: (content/plugins/contents+en-US.lrtopic.seo_slug)
msgid "plugins"
-msgstr ""
+msgstr "greffons"
#: https//tb-manual.torproject.org/en-US/troubleshooting/
#: (content/troubleshooting/contents+en-US.lrtopic.title)
@@ -2177,7 +2215,7 @@ msgstr ""
#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
msgid "<img class=\"col-md-6\" src=\"../../static/images/tr1.png\">"
-msgstr ""
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr1.png\">"
#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2191,7 +2229,7 @@ msgstr ""
#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr ""
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2227,7 +2265,7 @@ msgstr ""
#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr ""
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2240,7 +2278,7 @@ msgstr ""
#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr ""
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2252,7 +2290,7 @@ msgstr ""
#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr ""
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
#: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
#: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2279,6 +2317,8 @@ msgid ""
"<img class=\"\" src=\"../../static/images/how-tor-works.png\" alt=\"How Tor "
"Browser works\">"
msgstr ""
+"<img class=\"\" src=\"../../static/images/how-tor-works.png\" alt=\"How Tor "
+"Browser works\">"
#: templates/footer.html:5
msgid "Our mission:"
1
0
commit 8e8445c1d47644e6e34fc1b96d6934a9aa13f58b
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Nov 22 14:58:20 2018 +0000
28051
---
build.gradle | 4 ++
mobile/android/app/000-tor-browser-android.js | 3 --
mobile/android/app/build.gradle | 11 +++++
mobile/android/base/AndroidManifest.xml.in | 1 +
.../base/java/org/mozilla/gecko/BrowserApp.java | 53 ++++++++++------------
.../base/java/org/mozilla/gecko/GeckoApp.java | 29 ++++++++++++
.../java/org/mozilla/gecko/GeckoApplication.java | 5 ++
.../java/org/mozilla/gecko/LauncherActivity.java | 18 ++++++++
.../gecko/notifications/NotificationClient.java | 6 ++-
.../gecko/notifications/NotificationHelper.java | 5 +-
mobile/android/config/proguard/proguard.cfg | 15 ++++++
.../java/org/mozilla/gecko/util/ProxySelector.java | 4 +-
12 files changed, 116 insertions(+), 38 deletions(-)
diff --git a/build.gradle b/build.gradle
index a080e15b2fac..6cf2d4cc0e7a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,6 +32,10 @@ allprojects {
url repository
}
}
+ // These are needed for Orbot's dependencies
+ maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" }
+ maven { url 'https://jitpack.io' }
+ jcenter()
}
}
diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js
index c329fcdee5f7..e7e337276acb 100644
--- a/mobile/android/app/000-tor-browser-android.js
+++ b/mobile/android/app/000-tor-browser-android.js
@@ -54,9 +54,6 @@ pref("media.realtime_decoder.enabled", false);
pref("general.useragent.updates.enabled", false);
pref("general.useragent.updates.url", "");
-// Override this because Orbot uses 9050 as the default
-pref("network.proxy.socks_port", 9050);
-
// Do not allow the user to install extensions from web
pref("xpinstall.enabled", false);
pref("extensions.enabledScopes", 1);
diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
index 7c515bbe65a7..d0060901b6b3 100644
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -225,6 +225,9 @@ dependencies {
implementation "com.android.support:design:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
implementation "com.android.support:customtabs:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
implementation "com.android.support:palette-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
+ implementation files('Orbot-16.0.5-RC-1-tor-0.3.4.9-fullperm-release.aar')
+ implementation files('orbotservice-release.aar')
+ implementation files('jsocksAndroid-release.aar')
if (mozconfig.substs.MOZ_NATIVE_DEVICES) {
implementation "com.android.support:mediarouter-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
@@ -262,6 +265,14 @@ dependencies {
// Including the Robotium JAR directly can cause issues with dexing.
androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.5.4'
+
+ // Orbot
+ implementation 'com.github.delight-im:Android-Languages:v1.0.1'
+ implementation 'pl.bclogic:pulsator4droid:1.0.3'
+
+ // Orbotservice
+ implementation 'org.torproject:tor-android-binary:0.3.4.9'
+ implementation 'com.jrummyapps:android-shell:1.0.1'
}
// TODO: (bug 1261486): This impl is not robust -
diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in
index c4ea9a37683e..0e5f4edaf814 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -24,6 +24,7 @@
#include FennecManifest_permissions.xml.in
<application android:label="@string/moz_app_displayname"
+ tools:replace="android:label"
android:icon="@drawable/icon"
android:logo="@drawable/logo"
android:name="@MOZ_ANDROID_APPLICATION_CLASS@"
diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
index 5efd83398775..42b9ebd0a3f7 100644
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -181,7 +181,8 @@ import org.mozilla.gecko.widget.GeckoActionProvider;
import org.mozilla.gecko.widget.SplashScreen;
import org.mozilla.geckoview.GeckoSession;
-import info.guardianproject.netcipher.proxy.OrbotHelper;
+import org.torproject.android.OrbotMainActivity;
+import org.torproject.android.service.TorServiceConstants;
import java.io.File;
import java.io.FileNotFoundException;
@@ -239,6 +240,9 @@ public class BrowserApp extends GeckoApp
public static final int ACTIVITY_REQUEST_TRIPLE_READERVIEW = 4001;
public static final int ACTIVITY_RESULT_TRIPLE_READERVIEW_ADD_BOOKMARK = 4002;
public static final int ACTIVITY_RESULT_TRIPLE_READERVIEW_IGNORE = 4003;
+ public static final int ACTIVITY_RESULT_ORBOT_LAUNCH = 5001;
+
+ private static boolean mOrbotRun = false;
public static final String ACTION_VIEW_MULTIPLE = AppConstants.ANDROID_PACKAGE_NAME + ".action.VIEW_MULTIPLE";
@@ -1282,41 +1286,26 @@ public class BrowserApp extends GeckoApp
@Override
public void onReceive(Context context, Intent intent) {
- if (TextUtils.equals(intent.getAction(), OrbotHelper.ACTION_STATUS)) {
+ if (TextUtils.equals(intent.getAction(), TorServiceConstants.ACTION_STATUS)) {
GeckoAppShell.setTorStatus(intent);
}
}
};
public void checkStartOrbot() {
- if (!OrbotHelper.isOrbotInstalled(this)) {
- final Intent installOrbotIntent = OrbotHelper.getOrbotInstallIntent(this);
+ /* run in thread so Tor status updates will be received while the
+ * Gecko event sync is blocking the main thread */
+ HandlerThread handlerThread = new HandlerThread("torStatusReceiver");
+ handlerThread.start();
+ Looper looper = handlerThread.getLooper();
+ Handler handler = new Handler(looper);
+ registerReceiver(torStatusReceiver, new IntentFilter(TorServiceConstants.ACTION_STATUS),
+ null, handler);
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setTitle(R.string.install_orbot);
- builder.setMessage(R.string.you_must_have_orbot);
- builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialogInterface, int i) {
- startActivity(installOrbotIntent);
- }
- });
- builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialogInterface, int i) {
- }
- });
- builder.show();
- } else {
- /* run in thread so Tor status updates will be received while the
- * Gecko event sync is blocking the main thread */
- HandlerThread handlerThread = new HandlerThread("torStatusReceiver");
- handlerThread.start();
- Looper looper = handlerThread.getLooper();
- Handler handler = new Handler(looper);
- registerReceiver(torStatusReceiver, new IntentFilter(OrbotHelper.ACTION_STATUS),
- null, handler);
- OrbotHelper.requestStartTor(this);
+ if (!mOrbotRun) {
+ final String orbotStartAction = "android.intent.action.MAIN";
+ final Intent launchOrbot = new Intent(orbotStartAction, null, this, OrbotMainActivity.class);
+ startActivityForResult(launchOrbot, ACTIVITY_RESULT_ORBOT_LAUNCH, null);
}
}
@@ -3018,6 +3007,12 @@ public class BrowserApp extends GeckoApp
TabQueueHelper.processTabQueuePromptResponse(resultCode, this);
break;
+ case ACTIVITY_RESULT_ORBOT_LAUNCH:
+ final SafeIntent intent = new SafeIntent(getIntent());
+ Log.d(LOGTAG, "onActivityResult: ACTIVITY_RESULT_ORBOT_LAUNCH");
+ mOrbotRun = true;
+ break;
+
default:
for (final BrowserAppDelegate delegate : delegates) {
delegate.onActivityResult(this, requestCode, resultCode, data);
diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
index 63a136541970..ef7da17e19a1 100644
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
@@ -91,6 +91,8 @@ import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
+import org.torproject.android.service.TorService;
+
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
@@ -592,6 +594,9 @@ public abstract class GeckoApp extends GeckoActivity
EventDispatcher.getInstance().dispatch("Browser:Quit", res);
+ Intent torService = new Intent(this, TorService.class);
+ stopService(torService);
+
// We don't call shutdown here because this creates a race condition which
// can cause the clearing of private data to fail. Instead, we shut down the
// UI only after we're done sanitizing.
@@ -1201,6 +1206,30 @@ public abstract class GeckoApp extends GeckoActivity
}
}
}
+ } else if (mIsRestoringActivity) {
+ /* Synchronize Tabs state with Gecko. We're restoring the Activity, this
+ * mean all of the Chrome state was lost, but the previously created
+ * Tabs still exist within the Android application, because those are
+ * static and the application keeps track of those (and only the Activity
+ * is starting, the application was never destroyed). */
+ Iterable<Tab> tabs = Tabs.getInstance().getTabsInOrder();
+ Tab selectedTab = Tabs.getInstance().getSelectedTab();
+ for (Tab tab : tabs) {
+ GeckoBundle reloadMessage = new GeckoBundle();
+ reloadMessage.putString("url", tab.getURL());
+ reloadMessage.putString("engine", null);
+ reloadMessage.putInt("parentId", tab.getParentId());
+ reloadMessage.putBoolean("userEntered", true);
+ reloadMessage.putBoolean("isPrivate", tab.isPrivate());
+ reloadMessage.putBoolean("pinned", false);
+ reloadMessage.putBoolean("desktopMode", tab.getDesktopMode());
+ reloadMessage.putString("referrerURI", null);
+ reloadMessage.putInt("tabID", tab.getId());
+ reloadMessage.putBoolean("newTab", true);
+ reloadMessage.putBoolean("delayLoad", selectedTab != tab);
+ reloadMessage.putBoolean("selected", selectedTab == tab);
+ getAppEventDispatcher().dispatch("Tab:Load", reloadMessage);
+ }
}
synchronized (GeckoApp.this) {
diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
index e896134e0af9..b38e7184c798 100644
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
@@ -62,6 +62,8 @@ import java.lang.reflect.Method;
import java.net.URL;
import java.util.UUID;
+import org.torproject.android.service.util.Prefs;
+
public class GeckoApplication extends Application
implements HapticFeedbackDelegate {
private static final String LOG_TAG = "GeckoApplication";
@@ -319,6 +321,9 @@ public class GeckoApplication extends Application
"Profile:Create",
null);
+ // Give Orbot the base Context
+ Prefs.setContext(context);
+
super.onCreate();
}
diff --git a/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java b/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java
index e8f8facc24c6..4cd94ed538c7 100644
--- a/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java
+++ b/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java
@@ -45,6 +45,9 @@ import static org.mozilla.gecko.deeplink.DeepLinkContract.LINK_FXA_SIGNIN;
import org.mozilla.gecko.deeplink.DeepLinkContract;
+import org.torproject.android.OrbotMainActivity;
+import org.torproject.android.service.TorServiceConstants;
+
/**
* Activity that receives incoming Intents and dispatches them to the appropriate activities (e.g. browser, custom tabs, web app).
*/
@@ -67,6 +70,9 @@ public class LauncherActivity extends Activity {
} else if (isWebAppIntent(safeIntent)) {
dispatchWebAppIntent();
+ } else if (TorServiceConstants.TOR_APP_USERNAME.equals(getIntent().getAction())) {
+ dispatchOrbotIntent();
+
// If it's not a view intent, it won't be a custom tabs intent either. Just launch!
} else if (!isViewIntentWithURL(safeIntent)) {
dispatchNormalIntent();
@@ -116,6 +122,18 @@ public class LauncherActivity extends Activity {
startActivity(intent);
}
+ private void dispatchOrbotIntent() {
+ final String orbotStartAction = "android.intent.action.MAIN";
+ final Intent intent = new Intent(orbotStartAction, null, this, OrbotMainActivity.class);
+
+ //When we launch Orbot, we want a new task.
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+ intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+
+ startActivity(intent);
+ }
+
private void dispatchUrlIntent(@NonNull String url) {
Intent intent = new Intent(getIntent());
intent.setData(Uri.parse(url));
diff --git a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java
index d8392a801e13..c66d67f32787 100644
--- a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java
+++ b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java
@@ -28,6 +28,8 @@ import org.mozilla.gecko.NotificationListener;
import org.mozilla.gecko.R;
import org.mozilla.gecko.util.BitmapUtils;
+import org.torproject.android.service.util.NotificationBuilderCompat;
+
/**
* Client for posting notifications.
*/
@@ -142,7 +144,7 @@ public final class NotificationClient implements NotificationListener {
private void add(final String name, final String imageUrl, final String host,
final String alertTitle, final String alertText,
final PendingIntent contentIntent, final PendingIntent deleteIntent) {
- final NotificationCompat.Builder builder = new NotificationCompat.Builder(mContext)
+ final NotificationBuilderCompat builder = new NotificationBuilderCompat(mContext)
.setContentTitle(alertTitle)
.setContentText(alertText)
.setSmallIcon(R.drawable.ic_status_logo)
@@ -150,7 +152,7 @@ public final class NotificationClient implements NotificationListener {
.setDeleteIntent(deleteIntent)
.setAutoCancel(true)
.setDefaults(Notification.DEFAULT_SOUND)
- .setStyle(new NotificationCompat.BigTextStyle()
+ .setStyle(new Notification.BigTextStyle()
.bigText(alertText)
.setSummaryText(host));
diff --git a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java
index 34ea99882d9a..35366609da49 100644
--- a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java
+++ b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java
@@ -32,10 +32,11 @@ import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.graphics.Bitmap;
import android.net.Uri;
-import android.support.v4.app.NotificationCompat;
import android.support.v4.util.SimpleArrayMap;
import android.util.Log;
+import org.torproject.android.service.util.NotificationBuilderCompat;
+
public final class NotificationHelper implements BundleEventListener {
public static final String HELPER_BROADCAST_ACTION = AppConstants.ANDROID_PACKAGE_NAME + ".helperBroadcastAction";
@@ -233,7 +234,7 @@ public final class NotificationHelper implements BundleEventListener {
private void showNotification(final GeckoBundle message) {
ThreadUtils.assertOnUiThread();
- final NotificationCompat.Builder builder = new NotificationCompat.Builder(mContext);
+ final NotificationBuilderCompat builder = new NotificationBuilderCompat(mContext);
// These attributes are required
final String id = message.getString(ID_ATTR);
diff --git a/mobile/android/config/proguard/proguard.cfg b/mobile/android/config/proguard/proguard.cfg
index 0be8a745e44b..3d03e3107c72 100644
--- a/mobile/android/config/proguard/proguard.cfg
+++ b/mobile/android/config/proguard/proguard.cfg
@@ -165,6 +165,21 @@
# See: http://stackoverflow.com/questions/22441366/note-android-support-v4-text-ic…
-dontnote android.support.**
+# From https://github.com/square/okhttp/blob/master/okhttp/src/main/resources/META…
+# JSR 305 annotations are for embedding nullability information.
+-dontwarn javax.annotation.**
+
+# A resource is loaded with a relative path so the package of this class must be preserved.
+-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
+
+# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.
+-dontwarn org.codehaus.mojo.animal_sniffer.*
+
+# OkHttp platform used only on JVM and when Conscrypt dependency is available.
+-dontwarn okhttp3.internal.platform.ConscryptPlatform
+
+#-keepnames class org.torproject.*
+
-include "adjust-keeps.cfg"
-include "leakcanary-keeps.cfg"
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
index f05716fe1d09..41c2c7e705a1 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
@@ -30,8 +30,8 @@ import java.util.List;
public class ProxySelector {
private static final String TOR_PROXY_ADDRESS = "127.0.0.1";
- private static final int TOR_SOCKS_PROXY_PORT = 9050;
- private static final int TOR_HTTP_PROXY_PORT = 8118;
+ private static final int TOR_SOCKS_PROXY_PORT = 9150;
+ private static final int TOR_HTTP_PROXY_PORT = 8218;
public static URLConnection openConnectionWithProxy(URI uri) throws IOException {
java.net.ProxySelector ps = java.net.ProxySelector.getDefault();
1
0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28507: Parse a set of strings in Android Set Preferences
by gk@torproject.org 22 Nov '18
by gk@torproject.org 22 Nov '18
22 Nov '18
commit b03bfc5100f3d255ae0116ab18653759f87fe241
Author: Igor Oliveira <igt0(a)torproject.org>
Date: Mon Nov 19 14:25:27 2018 -0200
Bug 28507: Parse a set of strings in Android Set Preferences
Android allows a set of String values in the preferences editor.
However, the TBA distribution just supported simple scalar types.
This patch implements the code to parse complex prefs from the
distribution preference file.
---
.../gecko/preferences/DistroSharedPrefsImport.java | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/mobile/android/base/java/org/mozilla/gecko/preferences/DistroSharedPrefsImport.java b/mobile/android/base/java/org/mozilla/gecko/preferences/DistroSharedPrefsImport.java
index 13047c6f2ff4..7969aca3d2ac 100644
--- a/mobile/android/base/java/org/mozilla/gecko/preferences/DistroSharedPrefsImport.java
+++ b/mobile/android/base/java/org/mozilla/gecko/preferences/DistroSharedPrefsImport.java
@@ -11,10 +11,13 @@ import org.mozilla.gecko.distribution.Distribution;
import android.content.Context;
import android.content.SharedPreferences;
import android.util.Log;
+import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
public class DistroSharedPrefsImport {
@@ -58,7 +61,21 @@ public class DistroSharedPrefsImport {
} else if (value instanceof Long) {
sharedPreferences.putLong(GeckoPreferences.NON_PREF_PREFIX + key, (long) value);
} else {
- Log.d(LOGTAG, "Unknown preference value type whilst importing android preferences from distro file.");
+ JSONArray jsonArray = preferences.optJSONArray(key);
+ if (jsonArray != null) {
+ Set<String> prefValues = new HashSet<String>();
+ for (int i = 0; i < jsonArray.length(); i++) {
+ try {
+ prefValues.add(jsonArray.getString(i));
+ } catch (JSONException e) {
+ Log.e(LOGTAG, "Unable to parse Android Preferences.", e);
+ continue;
+ }
+ }
+ sharedPreferences.putStringSet(GeckoPreferences.NON_PREF_PREFIX + key, prefValues);
+ } else {
+ Log.d(LOGTAG, "Unknown preference value type whilst importing android preferences from distro file.");
+ }
}
}
sharedPreferences.apply();
1
0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28507: Add prefs that allow the browser to delete browsing history by default
by gk@torproject.org 22 Nov '18
by gk@torproject.org 22 Nov '18
22 Nov '18
commit 57ef4c8201764f36e50347e913825c99ba2dc8bd
Author: Igor Oliveira <igt0(a)torproject.org>
Date: Mon Nov 19 14:40:26 2018 -0200
Bug 28507: Add prefs that allow the browser to delete browsing history by default
---
.../torbrowser/assets/distribution/preferences.json | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/mobile/android/torbrowser/assets/distribution/preferences.json b/mobile/android/torbrowser/assets/distribution/preferences.json
index bebd14967d8e..0990fba37a8f 100644
--- a/mobile/android/torbrowser/assets/distribution/preferences.json
+++ b/mobile/android/torbrowser/assets/distribution/preferences.json
@@ -5,6 +5,18 @@
"AndroidPreferences": {
"homepage": "about:tor",
"startpane_enabled_after_57": true,
- "startpane_enabled": true
+ "startpane_enabled": true,
+ "history.clear_on_exit": [
+ "private.data.openTabs",
+ "private.data.history",
+ "private.data.searchHistory",
+ "private.data.formdata",
+ "private.data.cookies_sessions",
+ "private.data.cache",
+ "private.data.offlineApps",
+ "private.data.siteSettings",
+ "private.data.syncedTabs",
+ "private.data.passwords"
+ ]
}
}
1
0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28507: Implement fallback to delete private data in the browser startup
by gk@torproject.org 22 Nov '18
by gk@torproject.org 22 Nov '18
22 Nov '18
commit 977e468c7f83b78cf920a7aa4943147eda195c45
Author: Igor Oliveira <igt0(a)torproject.org>
Date: Mon Nov 19 14:58:15 2018 -0200
Bug 28507: Implement fallback to delete private data in the browser startup
When the TBA is forcefully closed, its private data is not deleted,
even if the history.clear_on_exit is set.
As fallback, this patch calls the Sanitize:ClearData event in the
browser startup to clean the private data if needed.
---
.../android/base/java/org/mozilla/gecko/GeckoApp.java | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
index ef7da17e19a1..3741c26fe0e8 100644
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
@@ -564,10 +564,7 @@ public abstract class GeckoApp extends GeckoActivity
return super.onOptionsItemSelected(item);
}
- private void quitAndClear() {
- // Make sure the Guest Browsing notification goes away when we quit.
- GuestSession.hideNotification(this);
-
+ private GeckoBundle createSanitizeData() {
final SharedPreferences prefs = getSharedPreferencesForProfile();
final Set<String> clearSet = PrefUtils.getStringSet(
prefs, ClearOnShutdownPref.PREF, new HashSet<String>());
@@ -576,7 +573,14 @@ public abstract class GeckoApp extends GeckoActivity
for (final String clear : clearSet) {
clearObj.putBoolean(clear, true);
}
+ return clearObj;
+ }
+ private void quitAndClear() {
+ // Make sure the Guest Browsing notification goes away when we quit.
+ GuestSession.hideNotification(this);
+
+ final GeckoBundle clearObj = createSanitizeData();
final GeckoBundle res = new GeckoBundle(2);
res.putBundle("sanitize", clearObj);
@@ -1135,6 +1139,13 @@ public abstract class GeckoApp extends GeckoActivity
mTextSelection.create();
final Bundle finalSavedInstanceState = savedInstanceState;
+
+ // When the browser is forcefully closed, its private data is not
+ // deleted, even if the history.clear_on_exit is set. Here we are calling
+ // the Sanitize:ClearData in the startup to make sure the private
+ // data was cleared.
+ EventDispatcher.getInstance().dispatch("Sanitize:ClearData", createSanitizeData());
+
ThreadUtils.postToBackgroundThread(new Runnable() {
@Override
public void run() {
1
0