tor-commits
Threads by month
- ----- 2025 -----
- 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
June 2020
- 17 participants
- 1326 discussions

[torspec/master] Add a sentence about how the digest is calculated; closes tor#32830
by nickm@torproject.org 26 Jun '20
by nickm@torproject.org 26 Jun '20
26 Jun '20
commit 7479cd9e4e9c8110e4babd40cb1da888eb00c390
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Fri Jun 26 10:19:37 2020 -0400
Add a sentence about how the digest is calculated; closes tor#32830
---
tor-spec.txt | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tor-spec.txt b/tor-spec.txt
index 9b2c7b3..40ea4cc 100644
--- a/tor-spec.txt
+++ b/tor-spec.txt
@@ -1617,9 +1617,10 @@ see tor-design.pdf.
been destined for this hop of the circuit or originated from this hop
of the circuit, seeded from Df or Db respectively (obtained in
section 5.2 above), and including this RELAY cell's entire payload
- (taken with the digest field set to zero). If the digest
- is correct, the cell is considered "recognized" for the purposes of
- decryption (see section 5.5 above).
+ (taken with the digest field set to zero). Note that these digests
+ _do_ include the padding bytes at the end of the cell, not only those up
+ to "Len". If the digest is correct, the cell is considered "recognized"
+ for the purposes of decryption (see section 5.5 above).
(The digest does not include any bytes from relay cells that do
not start or end at this hop of the circuit. That is, it does not
1
0

[tor/master] Move remaining CodeStructure.md contents into doxygen.
by nickm@torproject.org 26 Jun '20
by nickm@torproject.org 26 Jun '20
26 Jun '20
commit 5336ac26693cdba47422771ea951d22a290f67df
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Fri Jun 26 10:11:42 2020 -0400
Move remaining CodeStructure.md contents into doxygen.
---
doc/HACKING/CodeStructure.md | 123 -------------------------------------------
doc/include.am | 1 -
src/app/app.md | 5 ++
src/feature/feature.md | 23 ++++++++
4 files changed, 28 insertions(+), 124 deletions(-)
diff --git a/doc/HACKING/CodeStructure.md b/doc/HACKING/CodeStructure.md
deleted file mode 100644
index d387018f9..000000000
--- a/doc/HACKING/CodeStructure.md
+++ /dev/null
@@ -1,123 +0,0 @@
-# Code Structure
-
-TODO: revise this to talk about how things are, rather than how things
-have changed.
-
-For quite a while now, the program *tor* has been built from source
-code in just two directories: **src/common** and **src/or**.
-
-This has become more-or-less untenable, for a few reasons -- most
-notably of which is that it has led our code to become more
-spaghetti-ish than I can endorse with a clean conscience.
-
-So to fix that, we've gone and done a huge code movement in our git
-master branch, which will land in a release once Tor `0.3.5.1-alpha` is
-out.
-
-Here's what we did:
-
- * **src/common** has been turned into a set of static libraries. These
-all live in the **src/lib/*** directories. The dependencies between
-these libraries should have no cycles. The libraries are:
-
- - **arch** -- Headers to handle architectural differences
- - **cc** -- headers to handle differences among compilers
- - **compress** -- wraps zlib, zstd, lzma
- - **container** -- high-level container types
- - **crypt_ops** -- Cryptographic operations. Planning to split this into
-a higher and lower level library
- - **ctime** -- Operations that need to run in constant-time. (Properly,
-data-invariant time)
- - **defs** -- miscelaneous definitions needed throughout Tor.
- - **encoding** -- transforming one data type into another, and various
-data types into strings.
- - **err** -- lowest-level error handling, in cases where we can't use
-the logs because something that the logging system needs has broken.
- - **evloop** -- Generic event-loop handling logic
- - **fdio** -- Low-level IO wrapper functions for file descriptors.
- - **fs** -- Operations on the filesystem
- - **intmath** -- low-level integer math and misc bit-twiddling hacks
- - **lock** -- low-level locking code
- - **log** -- Tor's logging module. This library sits roughly halfway up
-the library dependency diagram, since everything it depends on has to
-be carefully crafted to *not* log.
- - **malloc** -- Low-level wrappers for the platform memory allocation functions.
- - **math** -- Higher-level mathematical functions, and floating-point math
- - **memarea** -- An arena allocator
- - **meminfo** -- Functions for querying the current process's memory
-status and resources
- - **net** -- Networking compatibility and convenience code
- - **osinfo** -- Querying information about the operating system
- - **process** -- Launching and querying the status of other processes
- - **sandbox** -- Backend for the linux seccomp2 sandbox
- - **smartlist_core** -- The lowest-level of the smartlist_t data type.
-Separated from the rest of the containers library because the logging
-subsystem depends on it.
- - **string** -- Compatibility and convenience functions for manipulating
-C strings.
- - **term** -- Terminal-related functions (currently limited to a getpass
-function).
- - **testsupport** -- Macros for mocking, unit tests, etc.
- - **thread** -- Higher-level thread compatibility code
- - **time** -- Higher-level time management code, including format
-conversions and monotonic time
- - **tls** -- Our wrapper around our TLS library
- - **trace** -- Formerly src/trace -- a generic event tracing API
- - **wallclock** -- Low-level time code, used by the log module.
-
- * To ensure that the dependency graph in **src/common** remains under
-control, there is a tool that you can run called `make
-check-includes`. It verifies that each module in Tor only includes
-the headers that it is permitted to include, using a per-directory
-*.may_include* file.
-
- * The **src/or/or.h** header has been split into numerous smaller
-headers. Notably, many important structures are now declared in a
-header called *foo_st.h*, where "foo" is the name of the structure.
-
- * The **src/or** directory, which had most of Tor's code, had been split
-up into several directories. This is still a work in progress: This
-code has not itself been refactored, and its dependency graph is still
-a tangled web. I hope we'll be working on that over the coming
-releases, but it will take a while to do.
-
- - The new top-level source directories are:
- - **src/core** -- Code necessary to actually perform or use onion routing.
- - **src/feature** -- Code used only by some onion routing
-configurations, or only for a special purpose.
- - **src/app** -- Top-level code to run, invoke, and configure the
-lower-level code
-
- - The new second-level source directories are:
- - **src/core/crypto** -- High-level cryptographic protocols used in Tor
- - **src/core/mainloop** -- Tor's event loop, connection-handling, and
-traffic-routing code.
- - **src/core/or** -- Parts related to handling onion routing itself
- - **src/core/proto** -- support for encoding and decoding different
-wire protocols
- - **src/feature/api** -- Support for making Tor embeddable
- - **src/feature/client** -- Functionality which only Tor clients need
- - **src/feature/control** -- Controller implementation
- - **src/feature/dirauth** -- Directory authority
- - **src/feature/dircache** -- Directory cache
- - **src/feature/dirclient** -- Directory client
- - **src/feature/dircommon** -- Shared code between the other directory modules
- - **src/feature/hibernate** -- Hibernating when Tor is out of bandwidth
-or shutting down
- - **src/feature/hs** -- v3 onion service implementation
- - **src/feature/hs_common** -- shared code between both onion service
-implementations
- - **src/feature/nodelist** -- storing and accessing the list of relays on
-the network.
- - **src/feature/relay** -- code that only relay servers and exit servers need.
- - **src/feature/rend** -- v2 onion service implementation
- - **src/feature/stats** -- statistics and history
- - **src/app/config** -- configuration and state for Tor
- - **src/app/main** -- Top-level functions to invoke the rest or Tor.
-
- * The `tor` executable is now built in **src/app/tor** rather than **src/or/tor**.
-
- * There are more static libraries than before that you need to build
-into your application if you want to embed Tor. Rather than
-maintaining this list yourself, I recommend that you run `make
-show-libs` to have Tor emit a list of what you need to link.
diff --git a/doc/include.am b/doc/include.am
index 8651f845e..5e0c90b0c 100644
--- a/doc/include.am
+++ b/doc/include.am
@@ -52,7 +52,6 @@ EXTRA_DIST+= doc/asciidoc-helper.sh \
doc/HACKING/README.1st.md \
doc/HACKING/CodingStandards.md \
doc/HACKING/CodingStandardsRust.md \
- doc/HACKING/CodeStructure.md \
doc/HACKING/Fuzzing.md \
doc/HACKING/GettingStarted.md \
doc/HACKING/GettingStartedRust.md \
diff --git a/src/app/app.md b/src/app/app.md
index 138e75b12..298bde75f 100644
--- a/src/app/app.md
+++ b/src/app/app.md
@@ -4,3 +4,8 @@
The "app" directory has Tor's main entry point and configuration logic,
and is responsible for initializing and managing the other modules in
Tor.
+
+The modules in "app" are:
+
+ - \refdir{app/config} -- configuration and state for Tor
+ - \refdir{app/main} -- Top-level functions to invoke the rest or Tor.
diff --git a/src/feature/feature.md b/src/feature/feature.md
index acc3487e5..d9f7bd5c0 100644
--- a/src/feature/feature.md
+++ b/src/feature/feature.md
@@ -5,3 +5,26 @@ The "feature" directory has modules that Tor uses only for a particular
role or service, such as maintaining/using an onion service, operating as a
relay or a client, or being a directory authority.
+Current subdirectories are:
+
+ - \refdir{feature/api} -- Support for making Tor embeddable
+ - \refdir{feature/client} -- Functionality which only Tor clients need
+ - \refdir{feature/control} -- Controller implementation
+ - \refdir{feature/dirauth} -- Directory authority
+ - \refdir{feature/dircache} -- Directory cache
+ - \refdir{feature/dirclient} -- Directory client
+ - \refdir{feature/dircommon} -- Shared code between the other directory modules
+ - \refdir{feature/dirparse} -- Directory parsing code.
+ - \refdir{feature/hibernate} -- Hibernating when Tor is out of bandwidth
+ or shutting down
+ - \refdir{feature/hs} -- v3 onion service implementation
+ - \refdir{feature/hs_common} -- shared code between both onion service
+ implementations
+ - \refdir{feature/keymgt} -- shared code for key management between
+ relays and onion services.
+ - \refdir{feature/nodelist} -- storing and accessing the list of relays on
+ the network.
+ - \refdir{feature/relay} -- code that only relay servers and exit servers
+ need.
+ - \refdir{feature/rend} -- v2 onion service implementation
+ - \refdir{feature/stats} -- statistics and history
1
0

[tor/master] Remove changes files that appeared in tor 0.4.4.1-alpha.
by nickm@torproject.org 26 Jun '20
by nickm@torproject.org 26 Jun '20
26 Jun '20
commit e269e081a1c1ec3450e8b86f64aa099f51b04b84
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Fri Jun 26 09:50:57 2020 -0400
Remove changes files that appeared in tor 0.4.4.1-alpha.
---
changes/bug32588 | 4 ----
changes/bug32709 | 4 ----
changes/bug33131 | 3 ---
changes/bug33284 | 4 ----
changes/bug33285 | 3 ---
changes/bug33531 | 3 ---
changes/bug33899 | 9 ---------
changes/bug33900 | 3 ---
changes/bug33917 | 5 -----
changes/bug33977 | 4 ----
changes/bug34130 | 4 ----
changes/bug34233 | 4 ----
changes/bug34299 | 3 ---
changes/bug34303 | 5 -----
changes/bug4631 | 6 ------
changes/doc33417 | 3 ---
changes/doc34133 | 6 ------
changes/ticket24844 | 4 ----
changes/ticket28208 | 4 ----
changes/ticket28992 | 3 ---
changes/ticket31576 | 3 ---
changes/ticket31634 | 4 ----
changes/ticket32088 | 13 -------------
changes/ticket32143 | 4 ----
changes/ticket32542 | 3 ---
changes/ticket32720 | 4 ----
changes/ticket32792 | 3 ---
changes/ticket32873 | 6 ------
changes/ticket32888 | 4 ----
changes/ticket32905 | 6 ------
changes/ticket32994 | 3 ---
changes/ticket33014 | 3 ---
changes/ticket33192 | 5 -----
changes/ticket33194 | 4 ----
changes/ticket33195 | 4 ----
changes/ticket33275 | 5 -----
changes/ticket33280 | 4 ----
changes/ticket33300 | 3 ---
changes/ticket33303 | 4 ----
changes/ticket33316 | 15 ---------------
changes/ticket33334 | 5 -----
changes/ticket33339 | 3 ---
changes/ticket33349 | 4 ----
changes/ticket33366 | 3 ---
changes/ticket33368 | 3 ---
changes/ticket33369 | 4 ----
changes/ticket33370 | 3 ---
changes/ticket33400 | 3 ---
changes/ticket33436 | 4 ----
changes/ticket33451 | 3 ---
changes/ticket33458 | 4 ----
changes/ticket33633 | 6 ------
changes/ticket33642 | 4 ----
changes/ticket33679 | 4 ----
changes/ticket33778 | 3 ---
changes/ticket33779 | 3 ---
changes/ticket33788 | 4 ----
changes/ticket33789 | 4 ----
changes/ticket33817 | 12 ------------
changes/ticket33901 | 4 ----
changes/ticket33956 | 5 -----
changes/ticket34211 | 3 ---
changes/ticket34255_043 | 3 ---
63 files changed, 278 deletions(-)
diff --git a/changes/bug32588 b/changes/bug32588
deleted file mode 100644
index f31f2ce1a..000000000
--- a/changes/bug32588
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes (relays):
- - Stop advertising incorrect IPv6 ORPorts in relay and bridge descriptors,
- when the IPv6 port was configured as "auto".
- Fixes bug 32588; bugfix on 0.2.3.9-alpha
diff --git a/changes/bug32709 b/changes/bug32709
deleted file mode 100644
index d00b112be..000000000
--- a/changes/bug32709
+++ /dev/null
@@ -1,4 +0,0 @@
- o Major features (v3 onion services):
- - Allow v3 onion services to act as OnionBalance backend instances using
- the HiddenServiceOnionBalanceInstance torrc option. Closes ticket 32709.
-
diff --git a/changes/bug33131 b/changes/bug33131
deleted file mode 100644
index bc5ef7bc2..000000000
--- a/changes/bug33131
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor bugfixes (mainloop):
- - Better guard against growing a buffer past its maximum 2GB in size.
- Fixes bug 33131; bugfix on 0.3.0.4-rc.
diff --git a/changes/bug33284 b/changes/bug33284
deleted file mode 100644
index e6aed4d2d..000000000
--- a/changes/bug33284
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes (git scripts):
- - Stop executing the checked-out pre-commit hook from the pre-push hook.
- Instead, execute the copy in the user's git dir. Fixes bug 33284; bugfix
- on 0.4.1.1-alpha.
diff --git a/changes/bug33285 b/changes/bug33285
deleted file mode 100644
index a4d06a7eb..000000000
--- a/changes/bug33285
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor bugfixes (protocol versions):
- - Sort tor's supported protocol version lists, as recommended by the
- tor directory specification. Fixes bug 33285; bugfix on 0.4.0.1-alpha.
diff --git a/changes/bug33531 b/changes/bug33531
deleted file mode 100644
index c4284c55c..000000000
--- a/changes/bug33531
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor bugfixes (logs):
- - Remove surprising empty line in info-level log about circuit build
- timeout. Fixes bug 33531; bugfix on 0.3.3.1-alpha.
diff --git a/changes/bug33899 b/changes/bug33899
deleted file mode 100644
index b9b7d7cf1..000000000
--- a/changes/bug33899
+++ /dev/null
@@ -1,9 +0,0 @@
- o Minor bugfixes (IPv6, relay):
- - Consider IPv6 addresses when checking if a connection is canonical.
- In 17604, relays assumed that a remote relay could consider an IPv6
- connection canonical, but did not set the canonical flag on their side
- of the connection. Fixes bug 33899; bugfix on 0.3.1.1-alpha.
- - Log IPv6 addresses on connections where this relay is the responder.
- Previously, responding relays would replace the remote IPv6 address with
- the IPv4 address from the consensus.
- Fixes bug 33899; bugfix on 0.3.1.1-alpha.
diff --git a/changes/bug33900 b/changes/bug33900
deleted file mode 100644
index c1649d228..000000000
--- a/changes/bug33900
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor bugfixes (IPv4, relay):
- - Check for invalid zero IPv4 addresses and ports, when sending and
- receiving extend cells. Fixes bug 33900; bugfix on 0.2.4.8-alpha.
diff --git a/changes/bug33917 b/changes/bug33917
deleted file mode 100644
index 6a8daa9e2..000000000
--- a/changes/bug33917
+++ /dev/null
@@ -1,5 +0,0 @@
- o Minor bugfixes (logging, testing):
- - Make all of tor's assertion macros support the ALL_BUGS_ARE_FATAL and
- DISABLE_ASSERTS_IN_UNIT_TESTS debugging modes. Implements these modes
- for IF_BUG_ONCE(). (It used to log a non-fatal warning, regardless of
- the debugging mode.) Fixes bug 33917; bugfix on 0.2.9.1-alpha.
diff --git a/changes/bug33977 b/changes/bug33977
deleted file mode 100644
index b424a811a..000000000
--- a/changes/bug33977
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfix (refactoring):
- - Lift circuit_build_times_disabled out of circuit_expire_building loop to
- save CPU time with many circuits open. Fixes bug 33977; bugfix on
- 0.3.5.9.
diff --git a/changes/bug34130 b/changes/bug34130
deleted file mode 100644
index b1e5715fd..000000000
--- a/changes/bug34130
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes (linux seccomp sandbox nss):
- - Fix startup crash when tor is compiled with --enable-nss and
- sandbox support is enabled. Fixes bug 34130; bugfix on
- 0.3.5.1-alpha. Patch by Daniel Pinto.
diff --git a/changes/bug34233 b/changes/bug34233
deleted file mode 100644
index 24c786978..000000000
--- a/changes/bug34233
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes (portability):
- - Fix a portability error in the configure script, where we
- were using "==" instead of "=". Fixes bug 34233; bugfix on
- 0.4.3.5.
diff --git a/changes/bug34299 b/changes/bug34299
deleted file mode 100644
index 464cf0d18..000000000
--- a/changes/bug34299
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor bugfixes (man page):
- - Update the man page to reflect that MinUptimeHidServDirectoryV2
- defaults to 96 hours. Fixes bug 34299; bugfix on 0.2.6.3-alpha.
diff --git a/changes/bug34303 b/changes/bug34303
deleted file mode 100644
index dce57f464..000000000
--- a/changes/bug34303
+++ /dev/null
@@ -1,5 +0,0 @@
- o Minor bugfixes (client performance):
- - Resume being willing to use preemptively-built circuits when
- UseEntryGuards is set to 0. We accidentally disabled this feature
- with that config setting, leading to slower load times. Fixes bug
- 34303; bugfix on 0.3.3.2-alpha.
diff --git a/changes/bug4631 b/changes/bug4631
deleted file mode 100644
index be3dd2b43..000000000
--- a/changes/bug4631
+++ /dev/null
@@ -1,6 +0,0 @@
- o Minor bugfixes (directory authorities):
- - Directory authorities reject votes that arrive too late. In particular,
- once an authority has started fetching missing votes, it no longer
- accepts new votes posted by other authorities. This change helps prevent
- a consensus split, where only some authorities have the late vote.
- Fixes bug 4631; bugfix on 0.2.0.5-alpha.
diff --git a/changes/doc33417 b/changes/doc33417
deleted file mode 100644
index 0fc868fc6..000000000
--- a/changes/doc33417
+++ /dev/null
@@ -1,3 +0,0 @@
- o Documentation (manpage):
- - Refrain from mentioning nicknames in manpage section for MyFamily torrc
- option. Resolves issue 33417.
diff --git a/changes/doc34133 b/changes/doc34133
deleted file mode 100644
index abe9db614..000000000
--- a/changes/doc34133
+++ /dev/null
@@ -1,6 +0,0 @@
- o Documentation:
- - Correctly document that we search for a system torrc file before
- Document the limitations of using %include on config files with
- seccomp sandbox enabled. No new files can be added to the
- %included directories. Fixes documentation bug 34133; bugfix
- on 0.3.1.1-alpha. Patch by Daniel Pinto.
diff --git a/changes/ticket24844 b/changes/ticket24844
deleted file mode 100644
index da55b4cf6..000000000
--- a/changes/ticket24844
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor features (v3 onion servies):
- - Add v3 onion service status to the dumpstats() call which is
- triggered by a SIGUSR1 signal. Previously, we only did v2
- onion services. Closes ticket 24844. Patch by Neel Chauhan.
diff --git a/changes/ticket28208 b/changes/ticket28208
deleted file mode 100644
index 8818aad1d..000000000
--- a/changes/ticket28208
+++ /dev/null
@@ -1,4 +0,0 @@
- o Testing:
- - Use the "bridges+hs-v23" chutney network flavor in "make test-network".
- This test requires a recent version of chutney (mid-February 2020).
- Closes ticket 28208.
diff --git a/changes/ticket28992 b/changes/ticket28992
deleted file mode 100644
index 3e45d73e4..000000000
--- a/changes/ticket28992
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor bugfixes (onion service v3, client):
- - Remove a BUG() that is causing a stacktrace for a situation that very
- rarely happens but still can. Fixes bug 28992; bugfix on 0.3.2.1-alpha.
diff --git a/changes/ticket31576 b/changes/ticket31576
deleted file mode 100644
index ab984cf3d..000000000
--- a/changes/ticket31576
+++ /dev/null
@@ -1,3 +0,0 @@
- o Removed features:
- - Stop shipping contrib/dist/rc.subr file, as it is not being used on
- FreeBSD anymore. Closes issue 31576.
diff --git a/changes/ticket31634 b/changes/ticket31634
deleted file mode 100644
index 277759503..000000000
--- a/changes/ticket31634
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor features (testing, architeture):
- - Our test scripts now double-check that subsystem initialization order
- is consistent with the inter-module dependencies established by our
- .may_include files. Implements ticket 31634.
diff --git a/changes/ticket32088 b/changes/ticket32088
deleted file mode 100644
index 0d4fc7475..000000000
--- a/changes/ticket32088
+++ /dev/null
@@ -1,13 +0,0 @@
- o Major features (Proposal 310, performance + security):
- - Implements Proposal 310 - Bandaid on guard selection.
- Proposal 310 solves a load-balancing issue within Prop271 which strongly
- impact experimental research with Shadow.
- Security improvement: Proposal 310 prevents any newly Guard relay to
- have a chance to get into the primary list of older Tor clients,
- except if the N first sampled guards of these clients are unreachable.
- Implements recommendation from 32088.
-
- Proposal 310 is linked to the CLAPS project researching optimal
- client location-aware path selections. This project is a collaboration
- between the UCLouvain Crypto Group, the U.S. Naval Research Laboratory and
- Princeton University.
diff --git a/changes/ticket32143 b/changes/ticket32143
deleted file mode 100644
index 7f8a809ba..000000000
--- a/changes/ticket32143
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor features (continuous integration):
- - Run unit-test and integration test (Stem, Chutney) jobs with
- ALL_BUGS_ARE_FATAL macro being enabled on Travis and Appveyor.
- Resolves ticket 32143.
diff --git a/changes/ticket32542 b/changes/ticket32542
deleted file mode 100644
index c52335b05..000000000
--- a/changes/ticket32542
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor feature (onion service client, SOCKS5):
- - Add 3 new SocksPort ExtendedErrors (F2, F3, F7) that reports back new type
- of onion service connection failures. Closes ticket 32542.
diff --git a/changes/ticket32720 b/changes/ticket32720
deleted file mode 100644
index 87c540b7f..000000000
--- a/changes/ticket32720
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor features (directory):
- - Remember the number of bytes we have downloaded for each directory
- purpose while bootstrapping, and while fully bootstrapped. Log this
- information as part of the heartbeat message. Closes ticket 32720.
diff --git a/changes/ticket32792 b/changes/ticket32792
deleted file mode 100644
index 553cf0ca8..000000000
--- a/changes/ticket32792
+++ /dev/null
@@ -1,3 +0,0 @@
- o Testing:
- - When a Travis chutney job fails, use chutney's new "diagnostics.sh" tool
- to produce detailed diagnostic output. Closes ticket 32792.
diff --git a/changes/ticket32873 b/changes/ticket32873
deleted file mode 100644
index 65ea1f64a..000000000
--- a/changes/ticket32873
+++ /dev/null
@@ -1,6 +0,0 @@
- o Minor features (control port):
- - Return a descriptive error message from the 'GETINFO
- status/fresh-relay-descs' command on the control port.
- Previously, we returned a generic error of "Error
- generating descriptor". Closes ticket 32873. Patch by
- Neel Chauhan.
diff --git a/changes/ticket32888 b/changes/ticket32888
deleted file mode 100644
index ce7fb40b3..000000000
--- a/changes/ticket32888
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor features (logging):
- - When trying to find our own address, add debug-level logging
- to report the sources of candidate addresses. Closes ticket
- 32888.
diff --git a/changes/ticket32905 b/changes/ticket32905
deleted file mode 100644
index 6f420ec69..000000000
--- a/changes/ticket32905
+++ /dev/null
@@ -1,6 +0,0 @@
- o Removed features:
- - Remove the ClientAutoIPv6ORPort option. This option attempted
- to randomly choose between IPv4 and IPv6 for client connections,
- and isn't a true implementation of Happy Eyeballs. Often, this
- option failed on IPv4-only or IPv6-only connections. Closes
- ticket 32905. Patch by Neel Chauhan.
diff --git a/changes/ticket32994 b/changes/ticket32994
deleted file mode 100644
index 43a32afa7..000000000
--- a/changes/ticket32994
+++ /dev/null
@@ -1,3 +0,0 @@
- o Code simplification and refactoring:
- - Rewrite port_parse_config() to use the default port flags from
- port_cfg_new(). Closes ticket 32994. Patch by MrSquanchee.
diff --git a/changes/ticket33014 b/changes/ticket33014
deleted file mode 100644
index 885051d9c..000000000
--- a/changes/ticket33014
+++ /dev/null
@@ -1,3 +0,0 @@
- o Code simplification and refactoring (onion service):
- - Refactor configuration parsing to use the new config subsystem code.
- Closes ticket 33014.
diff --git a/changes/ticket33192 b/changes/ticket33192
deleted file mode 100644
index 97f976226..000000000
--- a/changes/ticket33192
+++ /dev/null
@@ -1,5 +0,0 @@
- o Minor feature (python):
- - Stop assuming that /usr/bin/python exists. Instead of using a
- hardcoded path in scripts that still use Python 2, use /usr/bin/env,
- similarly to the scripts that use Python 3. Fixes bug 33192; bugfix
- on 0.4.2.
\ No newline at end of file
diff --git a/changes/ticket33194 b/changes/ticket33194
deleted file mode 100644
index b87e55348..000000000
--- a/changes/ticket33194
+++ /dev/null
@@ -1,4 +0,0 @@
- o Testing:
- - Remove a redundant distcheck job. Closes ticket 33194.
- - Sort the Travis jobs in order of speed. Putting the slowest jobs first
- takes full advantage of Travis job concurrency. Closes ticket 33194.
diff --git a/changes/ticket33195 b/changes/ticket33195
deleted file mode 100644
index 11abd4816..000000000
--- a/changes/ticket33195
+++ /dev/null
@@ -1,4 +0,0 @@
- o Testing:
- - Stop allowing the Chutney IPv6 Travis job to fail. This job was
- previously configured to fast_finish (which requires allow_failure), to
- speed up the build. Closes ticket 33195.
diff --git a/changes/ticket33275 b/changes/ticket33275
deleted file mode 100644
index bff3a7a3a..000000000
--- a/changes/ticket33275
+++ /dev/null
@@ -1,5 +0,0 @@
- o Documentation (manpage):
- - Alphabetize the Denial of Service Mitigation Options, Directory
- Authority Server Options, Hidden Service Options, and Testing
- Network Options sections of the tor(1) manpage. Closes ticket
- 33275. Work by Swati Thacker as part of Google Season of Docs.
diff --git a/changes/ticket33280 b/changes/ticket33280
deleted file mode 100644
index b90c3086e..000000000
--- a/changes/ticket33280
+++ /dev/null
@@ -1,4 +0,0 @@
- o Testing:
- - Add test-network-ipv4 and test-network-ipv6 jobs to the Makefile.
- These jobs run the IPv4-only and dual-stack chutney flavours from
- test-network-all. Closes ticket 33280.
diff --git a/changes/ticket33300 b/changes/ticket33300
deleted file mode 100644
index 9b0bdce37..000000000
--- a/changes/ticket33300
+++ /dev/null
@@ -1,3 +0,0 @@
- o Testing:
- - Add a basic IPv6 test to "make test-network". This test only runs when
- the local machine has an IPv6 stack. Closes ticket 33300.
diff --git a/changes/ticket33303 b/changes/ticket33303
deleted file mode 100644
index b7ac7b506..000000000
--- a/changes/ticket33303
+++ /dev/null
@@ -1,4 +0,0 @@
- o Testing:
- - Run the test-network-ipv6 Makefile target in the Travis CI IPv6 chutney
- job. This job runs on macOS, so it's a bit slow.
- Closes ticket 33303.
diff --git a/changes/ticket33316 b/changes/ticket33316
deleted file mode 100644
index 25b044407..000000000
--- a/changes/ticket33316
+++ /dev/null
@@ -1,15 +0,0 @@
- o Minor bugfixes (initialization):
- - Initialize the subsystems in our code in an order more closely
- corresponding to their dependencies, so that every system is
- initialized before the ones that (theoretically) depend on it.
- Fixes bug 33316; bugfix on 0.4.0.1-alpha.
-
- o Minor features (tests):
- - Initialize all subsystems at the beginning of our unit test harness,
- to avoid crashes due to uninitialized subsystems.
- Follow-up from ticket 33316.
-
- o Code simplification and refactoring:
- - Merge the orconn and ocirc events into the "core" subsystem, which
- manages or connections and origin circuits. Previously they
- were isolated in subsystems of their own.
diff --git a/changes/ticket33334 b/changes/ticket33334
deleted file mode 100644
index ada3cb284..000000000
--- a/changes/ticket33334
+++ /dev/null
@@ -1,5 +0,0 @@
- o Testing:
- - Test v3 onion services to tor's mixed IPv4 chutney network. And add a
- mixed IPv6 chutney network. These networks are used in the
- test-network-all, test-network-ipv4, and test-network-ipv6 make targets.
- Closes ticket 33334.
diff --git a/changes/ticket33339 b/changes/ticket33339
deleted file mode 100644
index 75ccb3546..000000000
--- a/changes/ticket33339
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor feature (developer tools):
- - Add a script to help check the alphabetical ordering of option
- names in a manpage. Closes ticket 33339.
diff --git a/changes/ticket33349 b/changes/ticket33349
deleted file mode 100644
index 0458a72c8..000000000
--- a/changes/ticket33349
+++ /dev/null
@@ -1,4 +0,0 @@
- o Code simplification and refactoring:
- - Updated comments in 'scheduler.c' to reflect old code changes,
- and simplified the scheduler channel state change code. Closes
- ticket 33349.
diff --git a/changes/ticket33366 b/changes/ticket33366
deleted file mode 100644
index 1310c493c..000000000
--- a/changes/ticket33366
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor features (compilation size):
- - Most Server-side DNS code is now disabled when building without
- support for relay mode. Closes ticket 33366.
diff --git a/changes/ticket33368 b/changes/ticket33368
deleted file mode 100644
index ecc6f66f4..000000000
--- a/changes/ticket33368
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor features (client-only compilation):
- - Disable more code related to the ext_orport protocol when compiling
- without support for relay mode. Closes ticket 33368.
diff --git a/changes/ticket33369 b/changes/ticket33369
deleted file mode 100644
index c55335c5b..000000000
--- a/changes/ticket33369
+++ /dev/null
@@ -1,4 +0,0 @@
- o Documentation (manpage):
- - Add cross reference links and a table of contents to the HTML
- tor manpage. Closes ticket 33369. Work by Swati Thacker as
- part of Google Season of Docs.
diff --git a/changes/ticket33370 b/changes/ticket33370
deleted file mode 100644
index 41e03357f..000000000
--- a/changes/ticket33370
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor features (client-only compilation):
- - Disable more of our self-testing code when support for relay mode is
- disabled. Closes ticket 33370.
diff --git a/changes/ticket33400 b/changes/ticket33400
deleted file mode 100644
index 760389076..000000000
--- a/changes/ticket33400
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor feature (onion service v3):
- - Log at INFO level why the service can not upload its descriptor(s). Closes
- ticket 33400; bugfix on 0.3.2.1-alpha.
diff --git a/changes/ticket33436 b/changes/ticket33436
deleted file mode 100644
index 69b5545c6..000000000
--- a/changes/ticket33436
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor features (directory authority, shared random):
- - Refactor more authority-only parts of the shared-random scheduling code
- to reside in the dirauth module, and to be disabled when compiling with
- --disable-module-dirauth. Closes ticket 33436.
diff --git a/changes/ticket33451 b/changes/ticket33451
deleted file mode 100644
index 74dd6d1ad..000000000
--- a/changes/ticket33451
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor features (developer tools):
- - Add a script ("git-install-tools.sh") to install git hooks and helper
- scripts. Closes ticket 33451.
diff --git a/changes/ticket33458 b/changes/ticket33458
deleted file mode 100644
index 885c6dc50..000000000
--- a/changes/ticket33458
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfix (onion service v3):
- - When cleaning the client descriptor cache, an attempt at closing circuits
- for a non decrypted descriptor (lacking client authorization) lead to an
- assert(). Fixes bug 33458; bugfix on 0.4.2.1-alpha.
diff --git a/changes/ticket33633 b/changes/ticket33633
deleted file mode 100644
index de030a600..000000000
--- a/changes/ticket33633
+++ /dev/null
@@ -1,6 +0,0 @@
- o Code simplification and refactoring:
- - Move the circuit extend code to the relay module.
- Split the circuit extend function into smaller functions.
- Closes ticket 33633.
- - Move LOG_PROTOCOL_WARN to app/config.c. Resolves a dependency inversion.
- Closes ticket 33633.
diff --git a/changes/ticket33642 b/changes/ticket33642
deleted file mode 100644
index b81edf761..000000000
--- a/changes/ticket33642
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor features (developer tooling):
- - Refrain from listing all .a files that are generated by Tor build in
- .gitignore. Add a single wildcard *.a entry that covers all of them for
- present and future. Closes ticket 33642.
diff --git a/changes/ticket33679 b/changes/ticket33679
deleted file mode 100644
index d37842d06..000000000
--- a/changes/ticket33679
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor features (IPv6 Support, address.c):
- - Adds IPv6 support to tor_addr_is_valid(). Adds tests for the
- above changes and tor_addr_is_null(). Closes ticket 33679.
- Patch by MrSquanchee.
diff --git a/changes/ticket33778 b/changes/ticket33778
deleted file mode 100644
index a33c647a6..000000000
--- a/changes/ticket33778
+++ /dev/null
@@ -1,3 +0,0 @@
- o Documentation (manpage):
- - Updated the options set by TestingTorNetwork in the man page.
- Closes ticket 33778.
diff --git a/changes/ticket33779 b/changes/ticket33779
deleted file mode 100644
index d4bc769eb..000000000
--- a/changes/ticket33779
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor bugfixes (onion service, logging):
- - Typo in a log info level when PublishHidServDescriptors is set to 0.
- Fixes bug 33779; bugfix on 0.3.2.1-alpha.
diff --git a/changes/ticket33788 b/changes/ticket33788
deleted file mode 100644
index 236c05662..000000000
--- a/changes/ticket33788
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor features (code safety):
- - Check for failures of tor_inet_ntop() and tor_inet_ntoa() functions in
- DNS and IP address processing code and adjust codepaths to make them
- less likely to crash entire Tor instance. Resolves issue 33788.
diff --git a/changes/ticket33789 b/changes/ticket33789
deleted file mode 100644
index a7e69793e..000000000
--- a/changes/ticket33789
+++ /dev/null
@@ -1,4 +0,0 @@
- o Code simplification and refactoring (relay address):
- - Move a series of functions related to address resolving into their own
- files. Closes ticket 33789.
-
diff --git a/changes/ticket33817 b/changes/ticket33817
deleted file mode 100644
index 9c22d084e..000000000
--- a/changes/ticket33817
+++ /dev/null
@@ -1,12 +0,0 @@
- o Major features (IPv6, relay):
- - Relays may extend circuits over IPv6, if the relay has an IPv6 ORPort,
- and the client supplies the other relay's IPv6 ORPort in the EXTEND2
- cell. IPv6 extends will be used by the relay IPv6 ORPort self-tests in
- 33222. Closes ticket 33817.
- - Consider IPv6-only EXTEND2 cells valid on relays. Log a protocol warning
- if the IPv4 or IPv6 address is an internal address, and internal
- addresses are not allowed. But continue to use the other address, if it
- is valid. Closes ticket 33817.
- - If a relay can extend over IPv4 and IPv6, it chooses between them
- uniformly at random. Closes ticket 33817.
- - Re-use existing IPv6 connections for circuit extends. Closes ticket 33817.
diff --git a/changes/ticket33901 b/changes/ticket33901
deleted file mode 100644
index b824cc5b0..000000000
--- a/changes/ticket33901
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor features (IPv6, relay):
- - Allow clients and relays to send dual-stack and IPv6-only EXTEND2 cells.
- Parse dual-stack and IPv6-only EXTEND2 cells on relays.
- Closes ticket 33901.
diff --git a/changes/ticket33956 b/changes/ticket33956
deleted file mode 100644
index 7ad802797..000000000
--- a/changes/ticket33956
+++ /dev/null
@@ -1,5 +0,0 @@
- o Code simplification and refactoring:
- - Define and use a new constant TOR_ADDRPORT_BUF_LEN which is like
- TOR_ADDR_BUF_LEN but includes enough space for an IP address,
- brackets, seperating colon, and port number. Closes ticket 33956.
- Patch by Neel Chauhan.
diff --git a/changes/ticket34211 b/changes/ticket34211
deleted file mode 100644
index b454873ab..000000000
--- a/changes/ticket34211
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor features (windows):
- - Add support for console control signals like Ctrl+C in Windows
- Closes ticket 34211. Patch from Damon Harris (TheDcoder).
diff --git a/changes/ticket34255_043 b/changes/ticket34255_043
deleted file mode 100644
index 5cfec1d48..000000000
--- a/changes/ticket34255_043
+++ /dev/null
@@ -1,3 +0,0 @@
- o Documentation:
- - Fix several doxygen warnings related to imbalanced groups.
- Closes ticket 34255.
1
0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation@torproject.org 26 Jun '20
by translation@torproject.org 26 Jun '20
26 Jun '20
commit c2818a49d06f8eb8f2911db9275647ae71f49b8a
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Jun 26 13:46:31 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
fr.po | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/fr.po b/fr.po
index 64751cb139..4e33ac9e70 100644
--- a/fr.po
+++ b/fr.po
@@ -41,8 +41,8 @@ msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2020-06-26 13:35+0000\n"
+"Last-Translator: AO <ao(a)localizationlab.org>\n"
"Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -862,7 +862,7 @@ msgstr "Le périphérique sur lequel Tails tourne ne peut pas être trouvé. Peu
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:42
msgid "Import Failed"
-msgstr ""
+msgstr "Échec d’importation"
#. Translators: Don't translate {path} or {error},
#. they are placeholders and will be replaced.
@@ -871,13 +871,13 @@ msgstr ""
msgid ""
"Failed to import keys from {path}:\n"
"{error}"
-msgstr ""
+msgstr "Échec d’importation des clés de {path} :\n{error}"
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
msgid "Key Imported"
msgid_plural "Keys Imported"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "La clé a été importée"
+msgstr[1] "Les clés ont été importées"
#. Translators: Don't translate {uids}, it's a placeholder and
#. will be replaced.
@@ -885,8 +885,8 @@ msgstr[1] ""
#, python-brace-format
msgid "Imported a key for {uids}"
msgid_plural "Imported keys for {uids}"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Importer une clé pour {uids}"
+msgstr[1] "Importer des clés pour {uids}"
#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75
msgid "Lock screen"
1
0

[translation/tails-misc_completed] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_completed
by translation@torproject.org 26 Jun '20
by translation@torproject.org 26 Jun '20
26 Jun '20
commit cac4ff23e9ec8485312dd41c352a1077a5ef0a29
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Jun 26 13:45:49 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_completed
---
fr.po | 1718 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 1718 insertions(+)
diff --git a/fr.po b/fr.po
new file mode 100644
index 0000000000..4e33ac9e70
--- /dev/null
+++ b/fr.po
@@ -0,0 +1,1718 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# bassmax, 2014-2015
+# Alex <chioubaca(a)gmail.com>, 2014
+# tneskovic <antoine_ecuador(a)yahoo.fr>, 2014
+# AO <ao(a)localizationlab.org>, 2015,2018-2020
+# apaddlingduck, 2014
+# apaddlingduck, 2014
+# Athorcis, 2015
+# Athorcis, 2015
+# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019
+# Domiho Zannou <zannou.gery(a)gmail.com>, 2018
+# Emmanuel Simond <emmanuel.simond(a)gmail.com>, 2014
+# Emmanuel Simond <emmanuel.simond(a)gmail.com>, 2014
+# Emma Peel, 2018
+# Emma Peel, 2018
+# AO <ao(a)localizationlab.org>, 2017-2018
+# French language coordinator <french.translation(a)rbox.me>, 2015-2017
+# Gwennole Hangard <gwennole.hangard(a)gmail.com>, 2015
+# Jean-Yves Toumit <saiolar-c(a)yahoo.fr>, 2013
+# Lidija <llazic.bgd(a)gmail.com>, 2015
+# mosira <romain.moisan(a)gmail.com>, 2014
+# Onizuka, 2013
+# Onizuka, 2013
+# PoorPockets McNewHold <poorpocketsmcnewhold(a)protonmail.ch>, 2020
+# mosira <romain.moisan(a)gmail.com>, 2014
+# Sabrina Cater <sabcat(a)gmx.fr>, 2015
+# Simon-Olivier Morneau <smorn026(a)uottawa.ca>, 2018-2019
+# Thomas Chauchefoin <thomas(a)chauchefoin.fr>, 2016
+# Thomas Prévost <thomasprevost85(a)gmail.com>, 2018
+# tneskovic <antoine_ecuador(a)yahoo.fr>, 2014
+# Towinet, 2013-2016
+# AO <ao(a)localizationlab.org>, 2015
+# xin, 2019
+# xin, 2019-2020
+msgid ""
+msgstr ""
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-04 13:11+0200\n"
+"PO-Revision-Date: 2020-06-26 13:35+0000\n"
+"Last-Translator: AO <ao(a)localizationlab.org>\n"
+"Language-Team: French (http://www.transifex.com/otf/torproject/language/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"
+
+#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:42
+msgid "Tor is ready"
+msgstr "Tor est prêt"
+
+#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43
+msgid "You can now access the Internet."
+msgstr "Vous pouvez maintenant accéder à Internet."
+
+#: config/chroot_local-includes/etc/whisperback/config.py:69
+#, python-format
+msgid ""
+"<h1>Help us fix your bug!</h1>\n"
+"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
+"<p><strong>Do not include more personal information than\n"
+"needed!</strong></p>\n"
+"<h2>About giving us an email address</h2>\n"
+"<p>\n"
+"Giving us an email address allows us to contact you to clarify the problem. This\n"
+"is needed for the vast majority of the reports we receive as most reports\n"
+"without any contact information are useless. On the other hand it also provides\n"
+"an opportunity for eavesdroppers, like your email or Internet provider, to\n"
+"confirm that you are using Tails.\n"
+"</p>\n"
+msgstr "<h1>Aidez-nous à corriger votre bogue !</h1>\n<p>Lisez <a href=\"%s\">nos instructions de rapport de bogue</a>.</p>\n<p><strong>N’incluez pas plus d’informations personnelles que nécessaire !</strong></p>\n<h2>Nous donner une adresse courriel</h2>\n<p>\nEn nous donnant une adresse courriel, vous nous permettez de vous contacter pour clarifier le problème. Cela est nécessaire pour la vaste majorité des rapports que nous recevons, car la plupart des rapports sans information de contact sont inutiles. D’un autre côté, cela donne une occasion aux oreilles électroniques indiscrètes, comme votre fournisseur de service Internet ou de courriel, de confirmer que vous utilisez Tails.\n</p>\n"
+
+#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
+#: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
+msgid "Additional Software"
+msgstr "Logiciels additionnels"
+
+#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:51
+msgid ""
+"You can install additional software automatically from your persistent "
+"storage when starting Tails."
+msgstr "Vous pouvez installer des logiciels additionnels automatiquement depuis votre stockage persistant lors du démarrage de Tails."
+
+#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:77
+msgid ""
+"The following software is installed automatically from your persistent "
+"storage when starting Tails."
+msgstr "Les logiciels suivants sont installés automatiquement depuis votre stockage persistant lors du démarrage de Tails."
+
+#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:135
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:171
+msgid ""
+"To add more, install some software using <a "
+"href=\"synaptic.desktop\">Synaptic Package Manager</a> or <a "
+"href=\"org.gnome.Terminal.desktop\">APT on the command line</a>."
+msgstr "Pour en ajouter d’autres, installez des logiciels en utilisant le <a href=\"synaptic.desktop\">gestionnaire de paquets Synaptic</a> ou <a href=\"org.gnome.Terminal.desktop\">APT en ligne de commande</a>."
+
+#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:154
+msgid "_Create persistent storage"
+msgstr "_Créer stockage persistant"
+
+#: config/chroot_local-includes/usr/local/bin/electrum:62
+msgid "Persistence is disabled for Electrum"
+msgstr "La persistance est désactivée pour Electrum"
+
+#: config/chroot_local-includes/usr/local/bin/electrum:64
+msgid ""
+"When you reboot Tails, all of Electrum's data will be lost, including your Bitcoin wallet.\n"
+"It is strongly recommended to only run Electrum when its persistence feature is activated."
+msgstr "Quand vous redémarrerez Tails, toutes les données d’Electrum seront perdues, dont votre porte-monnaie Bitcoin.\nIl est fortement recommandé de n’utiliser Electrum qu’avec l’option de persistance activée."
+
+#: config/chroot_local-includes/usr/local/bin/electrum:65
+msgid "Do you want to start Electrum anyway?"
+msgstr "Voulez-vous quand même démarrer Electrum ?"
+
+#: config/chroot_local-includes/usr/local/bin/electrum:68
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+msgid "_Launch"
+msgstr "_Lancer"
+
+#: config/chroot_local-includes/usr/local/bin/electrum:69
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
+msgid "_Exit"
+msgstr "_Quitter"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:178
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:611
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:794
+msgid ""
+"For debugging information, execute the following command: sudo tails-"
+"debugging-info"
+msgstr "Pour obtenir les informations de débogage, exécutez la commande suivante : sudo tails-debugging-info"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:244
+msgid ""
+"<b>An error occured while updating the signing key.</b>\\n\\n<b>This "
+"prevents determining whether an upgrade is available from our "
+"website.</b>\\n\\nCheck your network connection, and restart Tails to try "
+"upgrading again.\\n\\nIf the problem persists, go to "
+"file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
+msgstr "<b>Une erreur est survenue pendant la mise à jour de la clé de signature.</b>\\n\\n<b>Cela empêche de déterminer si une mise à jour est disponible sur notre site web.</b>\\n\\nVérifiez votre connexion réseau et redémarrez Tails pour essayer de retenter la mise à jour.\\n\\nSi le problème persiste, consultez file:///usr/share/doc/tails/website/doc/upgrade/error/check.fr.html"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:250
+msgid "Error while updating the signing key"
+msgstr "Erreur lors de la mise à jour de la clé de signature"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:279
+msgid "Error while checking for upgrades"
+msgstr "Erreur lors de la vérification des mises à jour"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:282
+msgid ""
+"<b>Could not determine whether an upgrade is available from our website.</b>\n"
+"\n"
+"Check your network connection, and restart Tails to try upgrading again.\n"
+"\n"
+"If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
+msgstr "<b>Impossible de déterminer si une mise à jour est disponible sur notre site web.</b>\n\nVérifiez votre connexion réseau et redémarrez Tails pour essayer à nouveau de mettre à jour.\n\nSi le problème persiste, consultez file:///usr/share/doc/tails/website/doc/upgrade/error/check.fr.html"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:297
+msgid "no automatic upgrade is available from our website for this version"
+msgstr "aucune mise à jour automatique n’est disponible sur notre site web pour cette version"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:303
+msgid "your device was not created using a USB image or Tails Installer"
+msgstr "votre périphérique n’a pas été créé en utilisant une image USB ou le programme d’installation de Tails"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:308
+msgid "Tails was started from a DVD or a read-only device"
+msgstr "Tails a été démarré à partir d’un DVD ou d’un périphérique en lecture seule"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:313
+msgid "there is not enough free space on the Tails system partition"
+msgstr "il n’y a pas assez d’espace libre sur la partition système de Tails"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:318
+msgid "not enough memory is available on this system"
+msgstr "il n’y a pas assez de mémoire disponible sur ce système"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:324
+#, perl-brace-format
+msgid "No explanation available for reason '%{reason}s'."
+msgstr "Il n’y a aucune explication pour la raison '%{reason}s'."
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:346
+msgid "The system is up-to-date"
+msgstr "Le système est à jour"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:351
+msgid "This version of Tails is outdated, and may have security issues."
+msgstr "Cette version de Tails est obsolète et peut poser des problèmes de sécurité."
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:383
+#, perl-brace-format
+msgid ""
+"The available incremental upgrade requires %{space_needed}s of free space on"
+" Tails system partition, but only %{free_space}s is available."
+msgstr "La mise à jour incrémentale proposée exige %{space_needed}s d’espace libre sur la partition système de Tails, mais seulement %{free_space}s est disponible."
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:399
+#, perl-brace-format
+msgid ""
+"The available incremental upgrade requires %{memory_needed}s of free memory,"
+" but only %{free_memory}s is available."
+msgstr "La mise à jour incrémentale proposée exige %{memory_needed}s de mémoire libre, mais seulement %{free_memory}s est disponible."
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:421
+msgid ""
+"An incremental upgrade is available, but no full upgrade is.\n"
+"This should not happen. Please report a bug."
+msgstr "Une mise à jour incrémentale est disponible, mais aucune mise à jour complète ne l’est.\nCela ne devrait pas arriver. Veuillez signaler un bogue."
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:425
+msgid "Error while detecting available upgrades"
+msgstr "Erreur lors de la détection des mises à jour disponibles"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:435
+#, perl-brace-format
+msgid ""
+"<b>You should upgrade to %{name}s %{version}s.</b>\n"
+"\n"
+"For more information about this new version, go to %{details_url}s\n"
+"\n"
+"We recommend you close all other applications during the upgrade.\n"
+"Downloading the upgrade might take a long time, from several minutes to a few hours.\n"
+"\n"
+"Download size: %{size}s\n"
+"\n"
+"Do you want to upgrade now?"
+msgstr "<b>Vous devriez mettre à jour vers %{name}s %{version}s.</b>\n\nPour plus de précisions sur cette nouvelle version, visitez %{details_url}s\n\nNous vous recommandons de fermer toutes les applications pendant la mise à jour.\nLe téléchargement de la mise à jour pourrait être long, de plusieurs minutes à quelques heures.\n\nTaille du téléchargement : %{size}s\n\nVoulez-vous mettre à jour maintenant ?"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:449
+msgid "Upgrade available"
+msgstr "Une mise à jour est disponible"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:450
+msgid "Upgrade now"
+msgstr "Mettre à jour maintenant"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:451
+msgid "Upgrade later"
+msgstr "Mettre à jour plus tard"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:459
+#, perl-brace-format
+msgid ""
+"<b>You should do a manual upgrade to %{name}s %{version}s.</b>\n"
+"\n"
+"For more information about this new version, go to %{details_url}s\n"
+"\n"
+"It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n"
+"\n"
+"To learn how to do a manual upgrade, go to https://tails.boum.org/doc/upgrade/#manual"
+msgstr "<b>Vous devriez mettre à jour manuellement vers %{name}s %{version}s.</b>\n\nPour plus d’informations sur cette nouvelle version, visitez %{details_url}s.\n\nIl n’est pas possible de mettre à jour votre appareil automatiquement vers cette nouvelle version : %{explanation}s.\n\nPour apprendre à faire une mise à jour manuelle, visitez https://tails.boum.org/doc/upgrade/index.fr.html#manual"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:475
+msgid "New version available"
+msgstr "Une nouvelle version est disponible"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:556
+msgid "Downloading upgrade"
+msgstr "Téléchargement de la mise à jour"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:559
+#, perl-brace-format
+msgid "Downloading the upgrade to %{name}s %{version}s..."
+msgstr "Téléchargement de la mise à jour vers %{name}s %{version}s…"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:600
+msgid ""
+"<b>The upgrade could not be downloaded.</b>\\n\\nCheck your network "
+"connection, and restart Tails to try upgrading again.\\n\\nIf the problem "
+"persists, go to "
+"file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html"
+msgstr "<b>La mise à jour n’a pas pu être téléchargée.<b>\\n\\nVérifiez votre connexion réseau et redémarrez Tails pour retenter de mettre à jour.\\n\\nSi le problème persiste, consultez file:///usr/share/doc/tails/website/doc/upgrade/error/download.fr.html"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:616
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:635
+msgid "Error while downloading the upgrade"
+msgstr "Erreur lors du téléchargement de la mise à jour"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:628
+#, perl-brace-format
+msgid ""
+"Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file "
+"did not complain. Please report a bug."
+msgstr "Le fichier de sortie '%{output_file}s' n’existe pas, mais tails-iuk-get-target-file ne s’en est pas plaint. Veuillez signaler un bogue."
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:647
+msgid "Error while creating temporary downloading directory"
+msgstr "Erreur lors de la création du répertoire temporaire de téléchargement"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:650
+msgid "Failed to create temporary download directory"
+msgstr "Échec de création du répertoire temporaire de téléchargement"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:674
+msgid ""
+"<b>Could not choose a download server.</b>\n"
+"\n"
+"This should not happen. Please report a bug."
+msgstr "<b>Impossible de choisir un serveur de téléchargement.</b>\n\nCela ne devrait pas arriver. Veuillez signaler un bogue."
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:678
+msgid "Error while choosing a download server"
+msgstr "Erreur lors du choix d’un serveur de téléchargement"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:693
+msgid ""
+"The upgrade was successfully downloaded.\n"
+"\n"
+"The network connection will now be disabled.\n"
+"\n"
+"Please save your work and close all other applications."
+msgstr "La mise à jour a été téléchargée avec succès.\n\nLa connexion réseau va être maintenant désactivée .\n\nVeuillez enregistrer vos travaux et fermer toutes autres applications."
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:699
+msgid "Upgrade successfully downloaded"
+msgstr "La mise à jour a été téléchargée avec succès"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:701
+msgid "Apply upgrade"
+msgstr "Appliquer la mise à jour"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:708
+msgid ""
+"<b>Your Tails device was successfully upgraded.</b>\n"
+"\n"
+"Some security features were temporarily disabled.\n"
+"You should restart Tails on the new version as soon as possible.\n"
+"\n"
+"Do you want to restart now?"
+msgstr "<b>Votre périphérique Tails a été mis à jour avec succès.</b>\n\nQuelques fonctionnalités de sécurité ont été temporairement désactivées..\nVous devriez redémarrer Tails sur la nouvelle version dès que possible.\n\nVoulez-vous redémarrer maintenant ?"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:713
+msgid "Restart Tails"
+msgstr "Redémarrer Tails"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:714
+msgid "Restart now"
+msgstr "Redémarrer maintenant"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:715
+msgid "Restart later"
+msgstr "Redémarrer plus tard"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:726
+msgid "Error while restarting the system"
+msgstr "Erreur lors du redémarrage du système"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:729
+msgid "Failed to restart the system"
+msgstr "Échec de redémarrage du système"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:744
+msgid "Error while shutting down the network"
+msgstr "Erreur lors de l’arrêt du réseau"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:747
+msgid "Failed to shutdown network"
+msgstr "Échec d’arrêt du réseau"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:754
+msgid "Upgrading the system"
+msgstr "Mise à jour du système"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:756
+msgid ""
+"<b>Your Tails device is being upgraded...</b>\n"
+"\n"
+"For security reasons, the networking is now disabled."
+msgstr "<b>Votre périphérique Tails est en cours de mise à jour…</b>\n\nPour des raisons de sécurité, le réseau est actuellement désactivé."
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:789
+msgid ""
+"<b>An error occured while installing the upgrade.</b>\\n\\nYour Tails device"
+" needs to be repaired and might be unable to restart.\\n\\nPlease follow the"
+" instructions at "
+"file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html"
+msgstr "<b>Une erreur est survenue durant l’installation de la mise à jour.</b>\\n\\nVotre périphérique Tails doit être réparé et pourrait ne pas redémarrer.\\n\\nVeuillez suivre les instructions sur file:///usr/share/doc/tails/website/doc/upgrade/error/install.fr.html"
+
+#: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:799
+msgid "Error while installing the upgrade"
+msgstr "Erreur lors de l’installation de la mise à jour"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
+msgstr "Paramètres supplémentaires"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:49
+msgid "Cancel"
+msgstr "Annuler"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Ajouter"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "Précédent"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Mot de passe d’administration"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Usurpation d’adresse MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "Connexion _réseau"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Directe (par défaut)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Pont et mandataire"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Hors ligne"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Activé (par défaut)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Activé"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Désactivé"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Désactivé (par défaut)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
+msgid "Shutdown"
+msgstr "Éteindre"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
+msgid "_Start Tails"
+msgstr "_Démarrer Tails"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr "Échec de live-persist avec le code de retour {returncode}:\n{stderr}"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr "cryptsetup a échoué avec le code de retour {returncode} :\n{stdout}\n{stderr}"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr "Échec de live-persist avec le code de retour {returncode}:\n{stdout}\n{stderr}"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr "umount a échoué avec le code de retour {returncode} :\n{stdout}\n{stderr}"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Unlocking…"
+msgstr "Déverrouillage…"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
+msgid "Unlock"
+msgstr "Déverrouiller"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Cette phrase de passe ne permet pas de déverrouiller le stockage chiffré."
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+msgid "_Language"
+msgstr "_Langue"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
+msgid "_Keyboard Layout"
+msgstr "Disposition du _clavier"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
+msgid "_Formats"
+msgstr "_Formats"
+
+#: config/chroot_local-includes/usr/local/bin/keepassxc:15
+#, sh-format
+msgid ""
+"<b><big>Do you want to rename your <i>KeePassXC</i> database?</big></b>\n"
+"\n"
+"You have a <i>KeePassXC</i> database in your <i>Persistent</i> folder:\n"
+"\n"
+"<i>${filename}</i>\n"
+"\n"
+"Renaming it to <i>keepassx.kdbx</i> would allow <i>KeePassXC</i> to open it automatically in the future."
+msgstr "<b><big>Voulez-vous renommer votre base de données <i>KeePassXC</i> ?</big></b>\n\nVous avez une base de données <i>KeePassXC</i> dans votre dossier <i>Persistent</i> :\n\n<i>${filename}</i>\n\nLa renommer en <i>keepassx.kdbx</i> permettrait à <i>KeePassXC</i> de l’ouvrir automatiquement à l’avenir."
+
+#: config/chroot_local-includes/usr/local/bin/keepassxc:23
+msgid "Rename"
+msgstr "Renommer"
+
+#: config/chroot_local-includes/usr/local/bin/keepassxc:24
+msgid "Keep current name"
+msgstr "Garder le nom actuel"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:96
+msgid "Persistence wizard - Persistent volume creation"
+msgstr "Assistant de persistance – Création du volume persistant"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:99
+msgid "Choose a passphrase to protect the persistent volume"
+msgstr "Choisissez une phrase de passe pour protéger le volume persistant"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:103
+#, perl-format
+msgid ""
+"A %s persistent volume will be created on the <b>%s %s</b> device. Data on "
+"this volume will be stored in an encrypted form protected by a passphrase."
+msgstr "Un volume persistant %s sera créé sur le périphérique <b>%s %s</b>. Les données stockées sur ce volume seront chiffrées et protégées par une phrase de passe."
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:108
+msgid "Create"
+msgstr "Créer"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:151
+msgid ""
+"<b>Beware!</b> Using persistence has consequences that must be well "
+"understood. Tails can't help you if you use it wrong! See the <i>Encrypted "
+"persistence</i> page of the Tails documentation to learn more."
+msgstr "<b>Attention !</b> L’utilisation de la persistance a des conséquences qui doivent être bien comprises. Tails ne peut pas vous aider si vous l’utilisez mal ! Consultez la page <i>Persistance chiffrée</i> de la documentation de Tails pour en apprendre davantage."
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:179
+msgid "Passphrase:"
+msgstr "Phrase de passe :"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:187
+msgid "Verify Passphrase:"
+msgstr "Vérifier la phrase de passe :"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:198
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:266
+msgid "Passphrase can't be empty"
+msgstr "La phrase de passe ne peut pas être vide"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
+msgid "Show Passphrase"
+msgstr "Afficher la phrase de passe"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:257
+msgid "Passphrases do not match"
+msgstr "Les phrases de passe ne correspondent pas"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:312
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Configure.pm:181
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Delete.pm:103
+msgid "Failed"
+msgstr "Échec"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:320
+msgid "Mounting Tails persistence partition."
+msgstr "Montage de la partition persistante de Tails."
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:323
+msgid "The Tails persistence partition will be mounted."
+msgstr "La partition persistante de Tails sera montée."
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:332
+msgid "Correcting permissions of the persistent volume."
+msgstr "Correction des droits du volume persistant."
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:335
+msgid "The permissions of the persistent volume will be corrected."
+msgstr "Les droits du volume persistant seront corrigés."
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:343
+msgid "Creating default persistence configuration."
+msgstr "Création de la configuration par défaut de la persistance."
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:346
+msgid "The default persistence configuration will be created."
+msgstr "La configuration par défaut de la persistance sera créée."
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:361
+msgid "Creating..."
+msgstr "Création…"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:364
+msgid "Creating the persistent volume..."
+msgstr "Création du volume persistant…"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Configure.pm:88
+msgid "Persistence wizard - Persistent volume configuration"
+msgstr "Assistant de persistance – Configuration du volume persistant"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Configure.pm:91
+msgid "Specify the files that will be saved in the persistent volume"
+msgstr "Indiquez les fichiers à enregistrer dans le volume persistant"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Configure.pm:95
+#, perl-format
+msgid ""
+"The selected files will be stored in the encrypted partition %s (%s), on the"
+" <b>%s %s</b> device."
+msgstr "Les fichiers sélectionnés seront stockés dans la partition chiffrée %s (%s) sur le périphérique <b>%s %s</b>."
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Configure.pm:101
+msgid "Save"
+msgstr "Enregistrer"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Configure.pm:195
+msgid "Saving..."
+msgstr "Enregistrement…"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Configure.pm:198
+msgid "Saving persistence configuration..."
+msgstr "Enregistrement de la configuration de la persistance…"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Delete.pm:53
+msgid "Persistence wizard - Persistent volume deletion"
+msgstr "Assistant de persistance – Suppression du volume persistant"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Delete.pm:56
+msgid "Your persistent data will be deleted."
+msgstr "Vos données persistantes seront supprimées."
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Delete.pm:60
+#, perl-format
+msgid ""
+"The persistent volume %s (%s), on the <b>%s %s</b> device, will be deleted."
+msgstr "Le volume persistant %s (%s) du périphérique <b>%s %s</b> sera supprimé."
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Delete.pm:66
+msgid "Delete"
+msgstr "Supprimer"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Delete.pm:117
+msgid "Deleting..."
+msgstr "Suppression…"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Delete.pm:120
+msgid "Deleting the persistent volume..."
+msgstr "Suppression du volume persistant…"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:55
+msgid "Personal Data"
+msgstr "Données personnelles"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:57
+msgid "Keep files stored in the `Persistent' directory"
+msgstr "Conserver les fichiers stockés dans le répertoire `Persistent’"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
+msgid "Browser Bookmarks"
+msgstr "Marque-pages du navigateur"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
+msgid "Bookmarks saved in the Tor Browser"
+msgstr "Marque-pages enregistrés dans le Navigateur Tor"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
+msgid "Network Connections"
+msgstr "Connexions réseau"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
+msgid "Configuration of network devices and connections"
+msgstr "Configuration des périphériques du réseau et connexions"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
+msgid "Software installed when starting Tails"
+msgstr "Logiciels installés lors du démarrage de Tails"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
+msgid "Printers"
+msgstr "Imprimantes"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
+msgid "Printers configuration"
+msgstr "Configuration des imprimantes"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
+msgid "Thunderbird"
+msgstr "Thunderbird"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
+msgid "Thunderbird emails, feeds, and settings"
+msgstr "Courriels, flux et paramètres de Thunderbird"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
+msgid "GnuPG"
+msgstr "GnuPG"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
+msgid "GnuPG keyrings and configuration"
+msgstr "Trousseaux et configuration de GnuPG"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
+msgid "Bitcoin Client"
+msgstr "Client Bitcoin"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
+msgid "Electrum's bitcoin wallet and configuration"
+msgstr "Porte-monnaie Bitcoin et configuration d’Electrum"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
+msgid "Pidgin profiles and OTR keyring"
+msgstr "Profils Pidgin et trousseau OTR"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
+msgid "SSH Client"
+msgstr "Client SSH"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
+msgid "SSH keys, configuration and known hosts"
+msgstr "Clés, configuration et hôtes connus SSH"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
+msgid "Dotfiles"
+msgstr "Dotfiles"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
+msgid ""
+"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgstr "Créer un lien symbolique, dans $HOME, pour chaque fichier ou dossier qui se trouve dans le dossier `dotfiles'"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:113
+msgid "Custom"
+msgstr "Personnalisé"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:265
+msgid "Setup Tails persistent volume"
+msgstr "Configurer le volume persistant de Tails"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:343
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
+#: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
+#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
+msgid "Error"
+msgstr "Erreur"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:372
+#, perl-format
+msgid "Device %s already has a persistent volume."
+msgstr "Le périphérique %s comprend déjà un volume persistant."
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:380
+#, perl-format
+msgid "Device %s has not enough unallocated space."
+msgstr "Le périphérique %s n’a pas assez d’espace libre."
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:387
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:401
+#, perl-format
+msgid "Device %s has no persistent volume."
+msgstr "Le périphérique %s n’a pas de volume persistant."
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:393
+#, perl-format
+msgid ""
+"Cannot delete the persistent volume on %s while in use. You should restart "
+"Tails without persistence."
+msgstr "Impossible de supprimer le volume persistant sur %s pendant qu’il est utilisé. Vous devriez redémarrer Tails sans persistance."
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:407
+#, perl-format
+msgid "Persistence volume on %s is not unlocked."
+msgstr "Le volume persistant sur %s n’est pas déverrouillé."
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:412
+#, perl-format
+msgid "Persistence volume on %s is not mounted."
+msgstr "Le volume persistant sur %s n’est pas monté."
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:417
+#, perl-format
+msgid ""
+"Persistence volume on %s is not readable. Permissions or ownership problems?"
+msgstr "Le volume persistant sur %s n’est pas accessible en lecture. Problèmes de droits ou de propriété ?"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:422
+#, perl-format
+msgid "Persistence volume on %s is not writable."
+msgstr "Le volume persistant sur %s n’est pas accessible en écriture."
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:431
+#, perl-format
+msgid "Tails is running from non-USB / non-SDIO device %s."
+msgstr "Tails fonctionne à partir du périphérique non USB/non SDIO %s."
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:437
+#, perl-format
+msgid "Device %s is optical."
+msgstr "Le périphérique %s est un lecteur optique."
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:444
+#, perl-format
+msgid "Device %s was not created using a USB image or Tails Installer."
+msgstr "Le périphérique %s n’a pas été créé en utilisant une image USB ou le programme d’installation de Tails."
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:688
+msgid "Persistence wizard - Finished"
+msgstr "Assistant de persistance – Terminé"
+
+#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:691
+msgid ""
+"Any changes you have made will only take effect after restarting Tails.\n"
+"\n"
+"You may now close this application."
+msgstr "Toute modification effectuée ne prendra effet qu’après redémarrage de Tails.\n\nVous pouvez maintenant fermer cette application."
+
+#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:19
+msgid "su is disabled. Please use sudo instead."
+msgstr "su est désactivé. Merci d’utiliser sudo à la place."
+
+#: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:225
+msgid ""
+"The device Tails is running from cannot be found. Maybe you used the 'toram'"
+" option?"
+msgstr "Le périphérique sur lequel Tails tourne ne peut pas être trouvé. Peut-être avez-vous utilisé l’option 'toram' ?"
+
+#: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:253
+msgid ""
+"The drive Tails is running from cannot be found. Maybe you used the 'toram' "
+"option?"
+msgstr "Le périphérique sur lequel Tails tourne ne peut pas être trouvé. Peut-être avez-vous utilisée l’option 'toram' ?"
+
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:42
+msgid "Import Failed"
+msgstr "Échec d’importation"
+
+#. Translators: Don't translate {path} or {error},
+#. they are placeholders and will be replaced.
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:45
+#, python-brace-format
+msgid ""
+"Failed to import keys from {path}:\n"
+"{error}"
+msgstr "Échec d’importation des clés de {path} :\n{error}"
+
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
+msgid "Key Imported"
+msgid_plural "Keys Imported"
+msgstr[0] "La clé a été importée"
+msgstr[1] "Les clés ont été importées"
+
+#. Translators: Don't translate {uids}, it's a placeholder and
+#. will be replaced.
+#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
+#, python-brace-format
+msgid "Imported a key for {uids}"
+msgid_plural "Imported keys for {uids}"
+msgstr[0] "Importer une clé pour {uids}"
+msgstr[1] "Importer des clés pour {uids}"
+
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75
+msgid "Lock screen"
+msgstr "Verrouillage de l’écran"
+
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:79
+msgid "Suspend"
+msgstr "Interrompre"
+
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:83
+msgid "Restart"
+msgstr "Redémarrer"
+
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:87
+msgid "Power Off"
+msgstr "Éteindre"
+
+#: config/chroot_local-includes/usr/local/bin/tails-about:22
+#: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1
+msgid "Tails"
+msgstr "Tails"
+
+#: config/chroot_local-includes/usr/local/bin/tails-about:25
+#: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1
+msgid "About Tails"
+msgstr "À propos de Tails"
+
+#: config/chroot_local-includes/usr/local/bin/tails-about:35
+msgid "The Amnesic Incognito Live System"
+msgstr "The Amnesic Incognito Live System"
+
+#: config/chroot_local-includes/usr/local/bin/tails-about:36
+#, python-format
+msgid ""
+"Build information:\n"
+"%s"
+msgstr "Renseignements de compilation :\n%s"
+
+#: config/chroot_local-includes/usr/local/bin/tails-about:54
+msgid "not available"
+msgstr "non disponible"
+
+#. Translators: Don't translate {details}, it's a placeholder and will
+#. be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:148
+#, python-brace-format
+msgid ""
+"{details} Please check your list of additional software or read the system "
+"log to understand the problem."
+msgstr "{details} Veuillez vérifier votre liste de logiciels additionnels ou lire le journal système afin de mieux comprendre le problème."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153
+msgid ""
+"Please check your list of additional software or read the system log to "
+"understand the problem."
+msgstr "Veuillez vérifier votre liste de logiciels additionnels ou lire le journal système afin de mieux comprendre le problème."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:157
+msgid "Show Log"
+msgstr "Afficher le journal"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:157
+msgid "Configure"
+msgstr "Configurer"
+
+#. Translators: Don't translate {beginning} or {last}, they are
+#. placeholders and will be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:223
+#, python-brace-format
+msgid "{beginning} and {last}"
+msgstr "{beginning} et {last}"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:224
+msgid ", "
+msgstr ", "
+
+#. Translators: Don't translate {packages}, it's a placeholder and will
+#. be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:290
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:320
+#, python-brace-format
+msgid "Add {packages} to your additional software?"
+msgstr "Ajouter {packages} à vos logiciels additionnels ?"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:292
+msgid ""
+"To install it automatically from your persistent storage when starting "
+"Tails."
+msgstr "Pour l’installer automatiquement depuis votre stockage persistant lors du démarrage de Tails."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:294
+msgid "Install Every Time"
+msgstr "Installer à chaque fois"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:295
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:326
+msgid "Install Only Once"
+msgstr "Installer une seule fois"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:301
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:331
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:371
+msgid "The configuration of your additional software failed."
+msgstr "La configuration de votre logiciel additionnel a échoué."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:322
+msgid ""
+"To install it automatically when starting Tails, you can create a persistent"
+" storage and activate the <b>Additional Software</b> feature."
+msgstr "Pour l’installer automatiquement lors du démarrage de Tails, vous pouvez créer un stockage persistant et activer l’option <b>Logiciels additionnels</b>"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:325
+msgid "Create Persistent Storage"
+msgstr "Créer un stockage persistant"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:333
+msgid "Creating your persistent storage failed."
+msgstr "La création de votre stockage persistant a échoué."
+
+#. Translators: Don't translate {packages}, it's a placeholder and
+#. will be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:342
+#, python-brace-format
+msgid "You could install {packages} automatically when starting Tails"
+msgstr "Vous pourriez installer {packages} automatiquement lors du démarrage de Tails"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:345
+msgid "To do so, you need to run Tails from a USB stick."
+msgstr "Pour cela, vous devez lancer Tails depuis une clé USB."
+
+#. Translators: Don't translate {packages}, it's a placeholder and will be
+#. replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:359
+#, python-brace-format
+msgid "Remove {packages} from your additional software?"
+msgstr "Enlever {packages} de vos logiciels additionnels ?"
+
+#. Translators: Don't translate {packages}, it's a placeholder
+#. and will be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:363
+#, python-brace-format
+msgid "This will stop installing {packages} automatically."
+msgstr "Cela arrêtera l’installation automatique de {packages}."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:365
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:154
+msgid "Remove"
+msgstr "Enlever"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:544
+msgid "Installing your additional software from persistent storage..."
+msgstr "Installation de vos logiciels additionnels depuis le stockage persistant…"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:546
+msgid "This can take several minutes."
+msgstr "Cela peut prendre plusieurs minutes."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:559
+msgid "The installation of your additional software failed"
+msgstr "L’installation de vos logiciels additionnels a échoué"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:574
+msgid "Additional software installed successfully"
+msgstr "Logiciels additionnels installés avec succès"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:594
+msgid "The check for upgrades of your additional software failed"
+msgstr "La vérification de mise à jour de vos logiciels additionnels a échoué"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:596
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:604
+msgid ""
+"Please check your network connection, restart Tails, or read the system log "
+"to understand the problem."
+msgstr "Veuillez vérifier votre connexion réseau, essayer de redémarrer Tails, ou lire le journal système afin de mieux comprendre le problème."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:603
+msgid "The upgrade of your additional software failed"
+msgstr "La mise à jour de vos logiciels additionnels a échoué"
+
+#: config/chroot_local-includes/usr/local/lib/tails-additional-software-notify:37
+msgid "Documentation"
+msgstr "Documentation"
+
+#. Translators: Don't translate {package}, it's a placeholder and will be
+#. replaced.
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:94
+#, python-brace-format
+msgid ""
+"Remove {package} from your additional software? This will stop installing "
+"the package automatically."
+msgstr "Enlever {package} de vos logiciels additionnels ? Cela arrêtera l’installation automatique du paquet."
+
+#. Translators: Don't translate {pkg}, it's a placeholder and will be
+#. replaced.
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:105
+#, python-brace-format
+msgid "Failed to remove {pkg}"
+msgstr "Échec de la suppression de {pkg}"
+
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:122
+msgid "Failed to read additional software configuration"
+msgstr "Échec de la lecture de la configuration des logiciels additionnels"
+
+#. Translators: Don't translate {package}, it's a placeholder and will be
+#. replaced.
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:152
+#, python-brace-format
+msgid "Stop installing {package} automatically"
+msgstr "Arrêter d’installer {package} automatiquement"
+
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:178
+msgid ""
+"To do so, install some software using <a href=\"synaptic.desktop\">Synaptic "
+"Package Manager</a> or <a href=\"org.gnome.Terminal.desktop\">APT on the "
+"command line</a>."
+msgstr "Pour ce faire, installez des logiciels en utilisant le <a href=\"synaptic.desktop\">gestionnaire de paquets Synaptic</a> ou <a href=\"org.gnome.Terminal.desktop\">APT en ligne de commande</a>."
+
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:187
+msgid ""
+"To do so, unlock your persistent storage when starting Tails and install "
+"some software using <a href=\"synaptic.desktop\">Synaptic Package "
+"Manager</a> or <a href=\"org.gnome.Terminal.desktop\">APT on the command "
+"line</a>."
+msgstr "Pour ce faire, déverrouillez votre stockage persistant lors du démarrage de Tails et installez des logiciels en utilisant le <a href=\"synaptic.desktop\">gestionnaire de paquets Synaptic</a> ou <a href=\"org.gnome.Terminal.desktop\">APT en ligne de commande</a>."
+
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:197
+msgid ""
+"To do so, create a persistent storage and install some software using <a "
+"href=\"synaptic.desktop\">Synaptic Package Manager</a> or <a "
+"href=\"org.gnome.Terminal.desktop\">APT on the command line</a>."
+msgstr "Pour ce faire, créez un stockage persistant et installez des logiciels en utilisant le <a href=\"synaptic.desktop\">gestionnaire de paquets Synaptic</a> ou <a href=\"org.gnome.Terminal.desktop\">APT en ligne de commande</a>."
+
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:205
+msgid ""
+"To do so, install Tails on a USB stick and create a persistent storage."
+msgstr "Pour cela, installez Tails sur une clé USB et créez un espace de stockage persistant."
+
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:251
+msgid "[package not available]"
+msgstr "[paquet non disponible]"
+
+#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:52
+msgid "Synchronizing the system's clock"
+msgstr "Synchronisation de l’horloge système"
+
+#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:53
+msgid ""
+"Tor needs an accurate clock to work properly, especially for Hidden "
+"Services. Please wait..."
+msgstr "Tor a besoin d’une horloge bien réglée pour fonctionner correctement, en particulier pour les services cachés. Veuillez patienter…"
+
+#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:87
+msgid "Failed to synchronize the clock!"
+msgstr "Échec de synchronisation de l’horloge !"
+
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:110
+msgid "Lock Screen"
+msgstr "Verrouiller l’écran"
+
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:125
+msgid "Screen Locker"
+msgstr "Verrouillage de l’écran"
+
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:131
+msgid "Set up a password to unlock the screen."
+msgstr "Définir un mot de passe pour déverrouiller l’écran"
+
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
+msgid "Password"
+msgstr "Mot de passe"
+
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Confirmer"
+
+#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
+msgid "This version of Tails has known security issues:"
+msgstr "Cette version de Tails a des problèmes de sécurité connus :"
+
+#: config/chroot_local-includes/usr/local/bin/tails-security-check:135
+msgid "Known security issues"
+msgstr "Problèmes de sécurité connus"
+
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52
+#, sh-format
+msgid "Network card ${nic} disabled"
+msgstr "La carte réseau ${nic} est désactivée"
+
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:53
+#, sh-format
+msgid ""
+"MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n"
+"You might prefer to restart Tails and disable MAC spoofing."
+msgstr "L’usurpation d’adresse MAC a échoué pour la carte réseau ${nic_name} (${nic}), elle est donc temporairement désactivée.\nVous pourriez préférer redémarrer Tails et désactiver l’usurpation d’adresse MAC."
+
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62
+msgid "All networking disabled"
+msgstr "Tout le réseau est désactivé"
+
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:63
+#, sh-format
+msgid ""
+"MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n"
+"You might prefer to restart Tails and disable MAC spoofing."
+msgstr "L’usurpation d’adresse MAC a échoué pour la carte réseau ${nic_name} (${nic}). Le dépannage de cette erreur a également échoué, toutes les fonctions de réseau sont désactivées.\nVous pourriez préférer redémarrer Tails et désactiver l’usurpation d’adresse MAC."
+
+#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:35
+msgid ""
+"\"<b>Not enough memory available to check for upgrades.</b>\n"
+"\n"
+"Make sure this system satisfies the requirements for running Tails.\n"
+"See file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n"
+"\n"
+"Try to restart Tails to check for upgrades again.\n"
+"\n"
+"Or do a manual upgrade.\n"
+"See https://tails.boum.org/doc/first_steps/upgrade#manual\""
+msgstr "\"<b>Il n’y a pas assez de mémoire disponible pour vérifier les mises à jour.</b>\n\nAssurez-vous que cet ordinateur satisfait les conditions requises pour utiliser Tails.\nVoir file:///usr/share/doc/tails/website/doc/about/requirements.fr.html\n\nEssayez de redémarrer Tails pour vérifier à nouveau les mises à jour.\n\nOu effectuez une mise à jour manuelle.\nVoir https://tails.boum.org/doc/first_steps/upgrade/index.fr.html#manual\""
+
+#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
+msgid "error:"
+msgstr "erreur :"
+
+#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:71
+msgid "Warning: virtual machine detected!"
+msgstr "Avertissement : Une machine virtuelle a été détectée !"
+
+#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:74
+msgid "Warning: non-free virtual machine detected!"
+msgstr "Avertissement : une machine virtuelle non libre a été détectée !"
+
+#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:77
+msgid ""
+"Both the host operating system and the virtualization software are able to "
+"monitor what you are doing in Tails. Only free software can be considered "
+"trustworthy, for both the host operating system and the virtualization "
+"software."
+msgstr "Le système d’exploitation hôte et le logiciel de virtualisation peuvent tous deux surveiller ce que vous faites dans Tails. Seuls les logiciels libres peuvent être considérés de confiance, à la fois pour le système d’exploitation hôte et le logiciel de virtualisation."
+
+#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:81
+msgid "Learn more"
+msgstr "En apprendre davantage"
+
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Tor is not ready"
+msgstr "Tor n’est pas prêt"
+
+#: config/chroot_local-includes/usr/local/bin/tor-browser:47
+msgid "Tor is not ready. Start Tor Browser anyway?"
+msgstr "Tor n’est pas prêt. Démarrer le navigateur Tor quand même ?"
+
+#: config/chroot_local-includes/usr/local/bin/tor-browser:48
+msgid "Start Tor Browser"
+msgstr "Démarrer le navigateur Tor"
+
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/torstatus@tails.boum.org/extension.js:35
+msgid "Tor Status"
+msgstr "État de Tor"
+
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/torstatus@tails.boum.org/extension.js:50
+msgid "Open Onion Circuits"
+msgstr "Ouvrir Circuits onion"
+
+#. Translators: Don't translate {volume_label} or {volume_size},
+#. they are placeholders and will be replaced.
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
+#, python-brace-format
+msgid "{volume_label} ({volume_size})"
+msgstr "{volume_label} ({volume_size})"
+
+#. Translators: Don't translate {partition_name} or {partition_size},
+#. they are placeholders and will be replaced.
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
+#, python-brace-format
+msgid "{partition_name} ({partition_size})"
+msgstr "{partition_name} ({partition_size})"
+
+#. Translators: Don't translate {volume_size}, it's a placeholder
+#. and will be replaced.
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
+#, python-brace-format
+msgid "{volume_size} Volume"
+msgstr "Volume de {volume_size}"
+
+#. Translators: Don't translate {volume_name}, it's a placeholder and
+#. will be replaced.
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
+#, python-brace-format
+msgid "{volume_name} (Read-Only)"
+msgstr "{volume_name} (lecture seule)"
+
+#. Translators: Don't translate {partition_name} and {container_path}, they
+#. are placeholders and will be replaced.
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
+#, python-brace-format
+msgid "{partition_name} in {container_path}"
+msgstr "{partition_name} dans {container_path}"
+
+#. Translators: Don't translate {volume_name} and {path_to_file_container},
+#. they are placeholders and will be replaced. You should only have to
+#. translate
+#. this string if it makes sense to reverse the order of the placeholders.
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#, python-brace-format
+msgid "{volume_name} – {path_to_file_container}"
+msgstr "{volume_name} – {path_to_file_container}"
+
+#. Translators: Don't translate {partition_name} and {drive_name}, they
+#. are placeholders and will be replaced.
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
+#, python-brace-format
+msgid "{partition_name} on {drive_name}"
+msgstr "{partition_name} sur {drive_name}"
+
+#. Translators: Don't translate {volume_name} and {drive_name},
+#. they are placeholders and will be replaced. You should only have to
+#. translate
+#. this string if it makes sense to reverse the order of the placeholders.
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
+#, python-brace-format
+msgid "{volume_name} – {drive_name}"
+msgstr "{volume_name} – {drive_name}"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:229
+msgid "Wrong passphrase or parameters"
+msgstr "Mauvaise phrase de passe ou mauvais paramètres"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:231
+msgid "Error unlocking volume"
+msgstr "Erreur de déverrouillage du volume"
+
+#. Translators: Don't translate {volume_name} or {error_message},
+#. they are placeholder and will be replaced.
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:235
+#, python-brace-format
+msgid ""
+"Couldn't unlock volume {volume_name}:\n"
+"{error_message}"
+msgstr "Impossible de déverrouiller le volume {volume_name} :\n{error_message}"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:337
+msgid "One or more applications are keeping the volume busy."
+msgstr "Une ou plusieurs applications tiennent le volume occupé."
+
+#. Translators: Don't translate {volume_name} or {error_message},
+#. they are placeholder and will be replaced.
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:343
+#, python-brace-format
+msgid ""
+"Couldn't lock volume {volume_name}:\n"
+"{error_message}"
+msgstr "Impossible de verrouiller le volume {volume_name} :\n{error_message}"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:345
+msgid "Locking the volume failed"
+msgstr "Échec de verrouillage du volume"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
+msgid "No file containers added"
+msgstr "Aucun fichier conteneur ajouté"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:98
+msgid "No VeraCrypt devices detected"
+msgstr "Aucun périphérique VeraCrypt détecté"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:40
+#: ../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:1
+msgid "Unlock VeraCrypt Volumes"
+msgstr "Déverrouiller volumes VeraCrypt"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:114
+msgid "Container already added"
+msgstr "Conteneur déjà ajouté"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:115
+#, python-format
+msgid "The file container %s should already be listed."
+msgstr "Le fichier conteneur %s devrait déjà être listé."
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:131
+msgid "Container opened read-only"
+msgstr "Conteneur ouvert en lecture seule"
+
+#. Translators: Don't translate {path}, it's a placeholder and will be
+#. replaced.
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:133
+#, python-brace-format
+msgid ""
+"The file container {path} could not be opened with write access. It was opened read-only instead. You will not be able to modify the content of the container.\n"
+"{error_message}"
+msgstr "Le fichier conteneur {path} ne pouvait pas être ouvert avec des droits en écriture. À la place il a été ouvert en lecture seule. Vous ne pourrez pas modifier le contenu de ce conteneur.\n{error_message}"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:138
+msgid "Error opening file"
+msgstr "Erreur d’ouverture du fichier"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:160
+msgid "Not a VeraCrypt container"
+msgstr "Ce n’est pas un conteneur VeraCrypt"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:161
+#, python-format
+msgid "The file %s does not seem to be a VeraCrypt container."
+msgstr "Le fichier %s ne semble pas être un conteneur VeraCrypt."
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:163
+msgid "Failed to add container"
+msgstr "Échec de l’ajout du conteneur"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:164
+#, python-format
+msgid ""
+"Could not add file container %s: Timeout while waiting for loop setup.\n"
+"Please try using the <i>Disks</i> application instead."
+msgstr "Impossible d’ajouter le fichier conteneur %s : délai d’attente dépassé en attendant la configuration de la boucle.\nVeuillez essayer d’utiliser l’application <i>Disques</i> à la place."
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:209
+msgid "Choose File Container"
+msgstr "Choisir un fichier conteneur"
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+msgid "Do you really want to launch the Unsafe Browser?"
+msgstr "Voulez-vous vraiment lancer le navigateur non sécurisé ?"
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+msgid ""
+"Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
+"use the Unsafe Browser if necessary, for example\\nif you have to login or "
+"register to activate your Internet connection."
+msgstr "L’activité réseau dans le navigateur non sécurisé n’est <b>pas anonyme</b>.\\nN’utilisez le navigateur non sécurisé que si nécessaire, par exemple\\nsi vous devez vous identifier ou vous inscrire pour activer votre connexion Internet."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+msgid "Starting the Unsafe Browser..."
+msgstr "Démarrage du navigateur non sécurisé…"
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
+msgid "This may take a while, so please be patient."
+msgstr "Cela peut prendre du temps, merci de patienter."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+msgid "Shutting down the Unsafe Browser..."
+msgstr "Fermeture du navigateur non sécurisé…"
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
+msgid ""
+"This may take a while, and you may not restart the Unsafe Browser until it "
+"is properly shut down."
+msgstr "Cela peut prendre du temps et vous ne devez pas redémarrer le navigateur non sécurisé avant sa fermeture complète."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
+msgid "Failed to restart Tor."
+msgstr "Échec du redémarrage de Tor."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+msgid "Unsafe Browser"
+msgstr "Navigateur non sécurisé"
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
+msgid ""
+"Another Unsafe Browser is currently running, or being cleaned up. Please "
+"retry in a while."
+msgstr "Un autre navigateur non sécurisé est en cours d’utilisation, ou est en train d’être nettoyé. Veuillez réessayer dans un moment."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
+msgid "Failed to setup chroot."
+msgstr "Échec d’exécution de chroot."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
+msgid "Failed to configure browser."
+msgstr "Échec de configuration du navigateur."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
+msgid ""
+"No DNS server was obtained through DHCP or manually configured in "
+"NetworkManager."
+msgstr "Aucun serveur DNS n’a été obtenu par le DHCP ou n’est configuré manuellement dans le gestionnaire de réseau."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
+msgid "Failed to run browser."
+msgstr "Échec de démarrage du navigateur."
+
+#: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
+msgid "Report an error"
+msgstr "Signaler une erreur"
+
+#: ../config/chroot_local-includes/etc/skel/Desktop/tails-documentation.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:1
+msgid "Tails documentation"
+msgstr "Documentation de Tails"
+
+#: ../config/chroot_local-includes/usr/share/applications/root-terminal.desktop.in.h:1
+msgid "Root Terminal"
+msgstr "Terminal superutilisateur"
+
+#: ../config/chroot_local-includes/usr/share/applications/root-terminal.desktop.in.h:2
+msgid "Opens a terminal as the root user, using gksu to ask for the password"
+msgstr "Ouvre un terminal en tant que superutilisateur, en utilisant gksu pour demander le mot de passe"
+
+#: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:2
+msgid "Learn how to use Tails"
+msgstr "Apprendre à utiliser Tails"
+
+#: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2
+msgid "Learn more about Tails"
+msgstr "En apprendre davantage sur Tails"
+
+#: ../config/chroot_local-includes/usr/share/applications/tails-persistence-delete.desktop.in.h:1
+msgid "Delete persistent volume"
+msgstr "Supprimer le volume persistant"
+
+#: ../config/chroot_local-includes/usr/share/applications/tails-persistence-delete.desktop.in.h:2
+msgid "Delete the persistent volume and its content"
+msgstr "Supprimer le volume persistant et son contenu"
+
+#: ../config/chroot_local-includes/usr/share/applications/tails-persistence-setup.desktop.in.h:1
+msgid "Configure persistent volume"
+msgstr "Configurer le volume persistant"
+
+#: ../config/chroot_local-includes/usr/share/applications/tails-persistence-setup.desktop.in.h:2
+msgid ""
+"Configure which files and application configuration are saved between "
+"working sessions"
+msgstr "Configurer quels fichiers et configurations d’application sont enregistrés entre les sessions de travail"
+
+#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1
+msgid "Tor Browser"
+msgstr "Navigateur Tor"
+
+#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2
+msgid "Anonymous Web Browser"
+msgstr "Navigateur Web anonyme"
+
+#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2
+msgid "Browse the World Wide Web without anonymity"
+msgstr "Naviguer sur le Toile sans anonymat"
+
+#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:3
+msgid "Unsafe Web Browser"
+msgstr "Navigateur Web non sécurisé"
+
+#: ../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:2
+msgid "Mount VeraCrypt encrypted file containers and devices"
+msgstr "Monter des fichiers conteneurs et des périphériques chiffrés VeraCrypt"
+
+#: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:2
+msgid ""
+"Configure the additional software installed from your persistent storage "
+"when starting Tails"
+msgstr "Configurer les logiciels additionnels installés depuis votre stockage persistant lors du démarrage de Tails"
+
+#: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2
+msgid "Tails specific tools"
+msgstr "Outils spécifiques à Tails"
+
+#: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.root-terminal.policy.in.h:1
+msgid "To start a Root Terminal, you need to authenticate."
+msgstr "Vous devez vous authentifier pour lancer un Terminal administrateur."
+
+#: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.additional-software.policy.in.h:1
+msgid "Remove an additional software package"
+msgstr "Enlever un paquet logiciel additionnel"
+
+#: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.additional-software.policy.in.h:2
+msgid ""
+"Authentication is required to remove a package from your additional software"
+" ($(command_line))"
+msgstr "Une authentification est nécessaire pour enlever un paquet depuis vos logiciels additionnels ($(command_line))"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
+msgid "Administration Password"
+msgstr "Mot de passe d’administration"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Définir un mot de passe d’administration si vous devez effectuer des tâches administratives. Sinon, le mot de passe d’administration est désactivé pour une sécurité accrue."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Saisir un mot de passe d’administration"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Confirmer votre mot de passe d’administration"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Désactiver"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
+msgid "MAC Address Spoofing"
+msgstr "Usurpation d’adresse MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "L’usurpation d’adresse MAC dissimule au réseau local le numéro de série de votre interface réseau (Wi-Fi ou filaire). L’usurpation d’adresse MAC est généralement plus sûre, car elle vous aide à dissimuler votre position géographique. Mais elle peut aussi créer des problèmes de connectivité et sembler suspect."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Usurper toutes les adresses MAC (par défaut)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Ne pas usurper les adresses MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
+msgid "Network Configuration"
+msgstr "Configuration du réseau"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Si votre connexion Internet est censurée, filtrée ou relayée par un mandataire, vous pouvez configurer un pont Tor ou un mandataire local. Pour travailler complètement hors ligne, vous pouvez désactiver le réseau."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Se connecter directement au réseau Tor (par défaut)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configurer un pont Tor ou un mandataire local"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Désactiver le réseau"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Vous configurerez le pont Tor et le mandataire local plus tard, après vous être connecté à un réseau."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Bienvenue dans Tails !"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Langue et région"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Paramètres par défaut"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "_Stockage persistant chiffré"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Saisir votre phrase de passe pour déverrouiller le stockage persistant"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Votre stockage persistant est déverrouillé. Redémarrez Tails pour le verrouiller à nouveau."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
+msgid "_Additional Settings"
+msgstr "_Paramètres supplémentaires"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
+msgid "Add an additional setting"
+msgstr "Ajouter un paramètre supplémentaire"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Les paramètres par défaut sont sûrs dans la plupart des cas. Pour ajouter un paramètre personnalisé, appuyer sur le bouton \"+\" ci-dessous."
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
+msgid "File Containers"
+msgstr "Fichiers conteneurs"
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:80
+msgid "_Add"
+msgstr "_Ajouter"
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:86
+msgid "Add a file container"
+msgstr "Ajouter un fichier conteneur"
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:103
+msgid "Partitions and Drives"
+msgstr "Partitions et lecteurs"
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:121
+msgid ""
+"This application is not affiliated with or endorsed by the VeraCrypt project"
+" or IDRIX."
+msgstr "Cette application n’est pas liée ou approuvée par le projet VeraCrypt ou IDRIX."
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29
+msgid "_Open"
+msgstr "_Ouvrir"
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38
+msgid "Lock this volume"
+msgstr "Verrouiller ce volume"
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52
+msgid "_Unlock"
+msgstr "_Déverrouiller"
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61
+msgid "Detach this volume"
+msgstr "Détacher ce volume"
+
+#: ../config/chroot_local-includes/usr/local/share/mime/packages/unlock-veracrypt-volumes.xml.in.h:1
+msgid "TrueCrypt/VeraCrypt container"
+msgstr "Conteneur TrueCrypt/VeraCrypt"
1
0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation@torproject.org 26 Jun '20
by translation@torproject.org 26 Jun '20
26 Jun '20
commit 0212b3ce44d4f5bff58b8135aebf542323448507
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Jun 26 13:45:46 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
fr.po | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/fr.po b/fr.po
index 64751cb139..4e33ac9e70 100644
--- a/fr.po
+++ b/fr.po
@@ -41,8 +41,8 @@ msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-04 13:11+0200\n"
-"PO-Revision-Date: 2020-06-18 12:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2020-06-26 13:35+0000\n"
+"Last-Translator: AO <ao(a)localizationlab.org>\n"
"Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -862,7 +862,7 @@ msgstr "Le périphérique sur lequel Tails tourne ne peut pas être trouvé. Peu
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:42
msgid "Import Failed"
-msgstr ""
+msgstr "Échec d’importation"
#. Translators: Don't translate {path} or {error},
#. they are placeholders and will be replaced.
@@ -871,13 +871,13 @@ msgstr ""
msgid ""
"Failed to import keys from {path}:\n"
"{error}"
-msgstr ""
+msgstr "Échec d’importation des clés de {path} :\n{error}"
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
msgid "Key Imported"
msgid_plural "Keys Imported"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "La clé a été importée"
+msgstr[1] "Les clés ont été importées"
#. Translators: Don't translate {uids}, it's a placeholder and
#. will be replaced.
@@ -885,8 +885,8 @@ msgstr[1] ""
#, python-brace-format
msgid "Imported a key for {uids}"
msgid_plural "Imported keys for {uids}"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Importer une clé pour {uids}"
+msgstr[1] "Importer des clés pour {uids}"
#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75
msgid "Lock screen"
1
0

[chutney/master] wait_for_bootstrap: wait for the nodes in the current phase.
by nickm@torproject.org 26 Jun '20
by nickm@torproject.org 26 Jun '20
26 Jun '20
commit 628833311eeb70864e616cf6d008e4bb9d26995c
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Wed Jun 24 10:49:23 2020 -0400
wait_for_bootstrap: wait for the nodes in the current phase.
We want to launch phase 1, wait for it to bootstrap, then launch
phase 2, then etc.
---
lib/chutney/TorNet.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index 8e8a151..ff1e894 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -1380,9 +1380,13 @@ class LocalNodeController(NodeController):
if not consensus_member and not bridge_member:
return None
+ launch_phase = _THE_NETWORK._dfltEnv['launch_phase']
+
# at this point, consensus_member == not bridge_member
directory_files = dict()
for node in _THE_NETWORK._nodes:
+ if node._env['launch_phase'] > launch_phase:
+ continue
nick = node._env['nick']
controller = node.getController()
node_files = controller.getNodeCacheDirInfoPaths(consensus_member)
@@ -1950,6 +1954,7 @@ DEFAULTS = {
'CUR_CONFIG_PHASE': getenv_int('CHUTNEY_CONFIG_PHASE', 1),
'CUR_LAUNCH_PHASE': getenv_int('CHUTNEY_LAUNCH_PHASE', 1),
+ 'CUR_BOOTSTRAP_PHASE': getenv_int('CHUTNEY_BOOTSTRAP_PHASE', 1),
# sandbox: the Sandbox torrc option value
# defaults to 1 on Linux, and 0 otherwise
@@ -2366,8 +2371,10 @@ class Network(object):
start = time.time()
limit = start + getenv_int("CHUTNEY_START_TIME", 60)
next_print_status = start + Network.PRINT_NETWORK_STATUS_DELAY
+ bootstrap_upto = self._dfltEnv['CUR_LAUNCH_PHASE']
- controllers = [n.getController() for n in self._nodes]
+ controllers = [n.getController() for n in self._nodes
+ if n._env['launch_phase'] <= bootstrap_upto ]
min_time_list = [c.getMinStartTime() for c in controllers]
min_time = max(min_time_list)
wait_time_list = [c.getUncheckedDirInfoWaitTime() for c in controllers]
1
0

[chutney/master] Move wait_for_bootstrap call into bootstrap-network.sh
by nickm@torproject.org 26 Jun '20
by nickm@torproject.org 26 Jun '20
26 Jun '20
commit e36505fe0c6897403c1363f9562e3967c952cb0a
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Wed Jun 24 11:19:35 2020 -0400
Move wait_for_bootstrap call into bootstrap-network.sh
In order to be able to launch the network in multiple phases,
we'll need to launch, wait, launch, wait, etc.
---
tools/bootstrap-network.sh | 25 +++++++++++++++++++++++++
tools/test-network-impl.sh | 28 ----------------------------
2 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/tools/bootstrap-network.sh b/tools/bootstrap-network.sh
index a7a5dbe..fd9f7ae 100755
--- a/tools/bootstrap-network.sh
+++ b/tools/bootstrap-network.sh
@@ -91,3 +91,28 @@ if ! "$CHUTNEY" status "$CHUTNEY_NETWORK"; then
sleep 6
CHUTNEY_DEBUG=1 "$CHUTNEY" status "$CHUTNEY_NETWORK"
fi
+
+
+# We allow up to CHUTNEY_START_TIME for each bootstrap phase to
+# complete.
+export CHUTNEY_START_TIME=${CHUTNEY_START_TIME:-120}
+
+if [ "$CHUTNEY_START_TIME" -ge 0 ]; then
+ $ECHO "Waiting up to $CHUTNEY_START_TIME seconds for all nodes to bootstrap..."
+ # We require the network to bootstrap, before we verify
+ if ! "$CHUTNEY" wait_for_bootstrap "$CHUTNEY_NETWORK"; then
+ "$DIAGNOSTICS"
+ CHUTNEY_WARNINGS_IGNORE_EXPECTED=false \
+ CHUTNEY_WARNINGS_SUMMARY=false \
+ "$WARNING_COMMAND"
+ "$WARNINGS"
+ $ECHO "chutney boostrap failed (in wait_for_bootstrap)"
+ exit 1
+ fi
+else
+ $ECHO "Chutney network launched and running. To stop the network, use:"
+ $ECHO "$CHUTNEY stop $CHUTNEY_NETWORK"
+ "$DIAGNOSTICS"
+ "$WARNINGS"
+ exit 0
+fi
diff --git a/tools/test-network-impl.sh b/tools/test-network-impl.sh
index afa1c80..b58c6bd 100755
--- a/tools/test-network-impl.sh
+++ b/tools/test-network-impl.sh
@@ -16,39 +16,11 @@ if ! "$CHUTNEY_PATH/tools/bootstrap-network.sh" "$NETWORK_FLAVOUR"; then
exit 1
fi
-# chutney starts verifying after CHUTNEY_START_TIME seconds,
-# keeps on trying for CHUTNEY_BOOTSTRAP_TIME seconds,
-# and then stops after CHUTNEY_STOP_TIME seconds.
-# Even the fastest chutney networks take 5-10 seconds for their first consensus,
-# and then 10 seconds after that for relays to bootstrap and upload descriptors,
-# and then 10 seconds after that for clients and onion services to bootstrap.
-# But chutney defaults to running a bit more slowly, so it is more reliable,
-# and we allow a bit more time, in case the machine is heavily loaded.
-export CHUTNEY_START_TIME=${CHUTNEY_START_TIME:-120}
export CHUTNEY_BOOTSTRAP_TIME=${CHUTNEY_BOOTSTRAP_TIME:-60}
export CHUTNEY_STOP_TIME=${CHUTNEY_STOP_TIME:-0}
CHUTNEY="$CHUTNEY_PATH/chutney"
-if [ "$CHUTNEY_START_TIME" -ge 0 ]; then
- $ECHO "Waiting up to $CHUTNEY_START_TIME seconds for a consensus containing relays to be generated..."
- # We require the network to bootstrap, before we verify
- if ! "$CHUTNEY" wait_for_bootstrap "$CHUTNEY_NETWORK"; then
- "$DIAGNOSTICS"
- CHUTNEY_WARNINGS_IGNORE_EXPECTED=false \
- CHUTNEY_WARNINGS_SUMMARY=false \
- "$WARNING_COMMAND"
- "$WARNINGS"
- $ECHO "chutney boostrap failed (in wait_for_bootstrap)"
- exit 1
- fi
-else
- $ECHO "Chutney network launched and running. To stop the network, use:"
- $ECHO "$CHUTNEY stop $CHUTNEY_NETWORK"
- "$DIAGNOSTICS"
- "$WARNINGS"
- exit 0
-fi
if [ "$CHUTNEY_BOOTSTRAP_TIME" -ge 0 ]; then
# Chutney will try to verify for $CHUTNEY_BOOTSTRAP_TIME seconds each round
1
0

[chutney/master] Add multiple phases to single-onion-* network configurations
by nickm@torproject.org 26 Jun '20
by nickm@torproject.org 26 Jun '20
26 Jun '20
commit 37947d1db7517f8ccf202ef6c4c4d7045b86f816
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Wed Jun 24 10:48:17 2020 -0400
Add multiple phases to single-onion-* network configurations
These configurations seem to require the network to bootstrap for a
bit before we have a working setup for the single onion services to
publish. This is what our multi-phase code is for.
---
networks/single-onion-v23 | 6 +++---
networks/single-onion-v23-ipv6-md | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/networks/single-onion-v23 b/networks/single-onion-v23
index f22fec6..2f3f524 100644
--- a/networks/single-onion-v23
+++ b/networks/single-onion-v23
@@ -1,9 +1,9 @@
# By default, Authorities are not configured as exits
Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl")
-Client = Node(tag="c", client=1, torrc="client.tmpl")
-SingleOnionv2 = Node(tag="h", hs=1, torrc="single-onion.tmpl")
-SingleOnionv3 = Node(tag="h", hs=1, torrc="single-onion-v3.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl", launch_phase=2)
+SingleOnionv2 = Node(tag="h", hs=1, torrc="single-onion.tmpl", launch_phase=2)
+SingleOnionv3 = Node(tag="h", hs=1, torrc="single-onion-v3.tmpl", launch_phase=2)
# Since only 25% of relays get the guard flag,
# TestingDirAuthVoteGuard * may need to be used in small networks
diff --git a/networks/single-onion-v23-ipv6-md b/networks/single-onion-v23-ipv6-md
index dff99ab..7c7580c 100644
--- a/networks/single-onion-v23-ipv6-md
+++ b/networks/single-onion-v23-ipv6-md
@@ -9,10 +9,10 @@ NonExitRelay6 = Node(tag="r", relay=1,
ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6',
'[::1]'),
torrc="relay-orport-v6-non-exit.tmpl")
-Client = Node(tag="c", client=1, torrc="client.tmpl")
-Client6 = Node(tag="c", client=1, torrc="client-only-v6-md.tmpl")
-SingleOnionv2IPv6 = Node(tag="h", hs=1, torrc="single-onion-only-v6-md.tmpl")
-SingleOnionv3IPv6 = Node(tag="h", hs=1, torrc="single-onion-v3-only-v6-md.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl", launch_phase=2)
+Client6 = Node(tag="c", client=1, torrc="client-only-v6-md.tmpl", launch_phase=2)
+SingleOnionv2IPv6 = Node(tag="h", hs=1, torrc="single-onion-only-v6-md.tmpl",launch_phase=2)
+SingleOnionv3IPv6 = Node(tag="h", hs=1, torrc="single-onion-v3-only-v6-md.tmpl", launch_phase=2)
# Since only 25% of relays get the guard flag,
# TestingDirAuthVoteGuard * may need to be used in small networks
1
0

[chutney/master] status: only look at the nodes in the current launch phase.
by nickm@torproject.org 26 Jun '20
by nickm@torproject.org 26 Jun '20
26 Jun '20
commit fa545464cc00ea1e9ed4a4c633273ce61652484a
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Wed Jun 24 10:51:52 2020 -0400
status: only look at the nodes in the current launch phase.
---
lib/chutney/TorNet.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index ff1e894..98ccc45 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -2260,11 +2260,13 @@ class Network(object):
"""Print how many nodes are running and how many are expected, and
return True if all nodes are running.
"""
+ cur_launch = self._dfltEnv['CUR_LAUNCH_PHASE']
statuses = [n.getController().check(listNonRunning=True)
- for n in self._nodes]
+ for n in self._nodes
+ if n._env['launch_phase'] == cur_launch]
n_ok = len([x for x in statuses if x])
print("%d/%d nodes are running" % (n_ok, len(self._nodes)))
- return n_ok == len(self._nodes)
+ return n_ok == len(statuses)
def restart(self):
"""Invoked from command line: Stop and subsequently start our
@@ -2280,7 +2282,7 @@ class Network(object):
sys.stdout.flush()
rv = all([n.getController().start() for n in self._nodes
if n._env['launch_phase'] ==
- self._dfltEnv['CUR_LAUNCH_PHASE']])
+ self._dfltEnv['CUR_LAUNCH_PHASE']])
# now print a newline unconditionally - this stops poll()ing
# output from being squashed together, at the cost of a blank
# line in wait()ing output
1
0