January 2020 - tor-commits - lists.torproject.org

[gettor/master] Create a test database with gettor links
by cohosh＠torproject.org 23 Jan '20

23 Jan '20

commit c1672a3f8d07e105793bd0f0eb247e9474622f5f Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Jan 20 17:51:27 2020 -0500 Create a test database with gettor links --- tests/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/__init__.py b/tests/__init__.py index e69de29..f323d24 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -0,0 +1,4 @@ +import subprocess + +# Create temporary database +subprocess.run(["./scripts/add_links_to_db", "-f", "tests/gettor.db"])

1 0

[gettor/master] Update tests to load a test config
by cohosh＠torproject.org 23 Jan '20

23 Jan '20

commit 2ef6773bec29b9e671d698ec671201fbb6eb3493 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Jan 20 17:50:03 2020 -0500 Update tests to load a test config --- tests/test.conf.json | 20 ++++++++++++++++++++ tests/test_email_service.py | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/tests/test.conf.json b/tests/test.conf.json new file mode 100644 index 0000000..8f296cc --- /dev/null +++ b/tests/test.conf.json @@ -0,0 +1,20 @@ +{ + "platforms": ["linux", "osx", "windows"], + "dbname": "gettor.db", + "email_parser_logfile": "email_parser.log", + "email_requests_limit": 30, + "twitter_requests_limit": 1, + "sendmail_interval": 10, + "twitter_interval": 10, + "sendmail_addr": "gettor(a)torproject.org", + "sendmail_host": "localhost", + "sendmail_port": 587, + "consumer_key": "", + "consumer_secret": "", + "access_key": "", + "access_secret": "", + "test_hid": "80d7054da0d3826563c7babb5453e18f3e42f932e562c5ab0434aec9df7b0625", + "twitter_handle": "get_tor", + "twitter_messages_endpoint": "https://api.twitter.com/1.1/direct_messages/events/list.json", + "twitter_new_message_endpoint": "https://api.twitter.com/1.1/direct_messages/events/new.json" +} diff --git a/tests/test_email_service.py b/tests/test_email_service.py index ff364f0..187711e 100644 --- a/tests/test_email_service.py +++ b/tests/test_email_service.py @@ -13,7 +13,7 @@ class EmailServiceTests(unittest.TestCase): # Fail any tests which take longer than 15 seconds. timeout = 15 def setUp(self): - self.settings = conftests.options.parse_settings("en","./gettor.conf.json") + self.settings = conftests.options.parse_settings("en","tests/test.conf.json") self.sm_client = conftests.Sendmail(self.settings) self.locales = conftests.strings.get_locales() self.links = [

1 0

[gettor/master] Change es string test to match json file
by cohosh＠torproject.org 23 Jan '20

23 Jan '20

commit 9bbda2ab504f7ffe9c4a31c17c741379d190ddb8 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Jan 20 20:00:03 2020 -0500 Change es string test to match json file We haven't translated any es or pt strings, so use the English translation for now until we update those files. --- tests/test_locales.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_locales.py b/tests/test_locales.py index d4e52c5..54e0598 100644 --- a/tests/test_locales.py +++ b/tests/test_locales.py @@ -28,7 +28,7 @@ class LocalesTests(unittest.TestCase): def test_load_es_strings(self): conftests.strings.load_strings("es") - self.assertEqual(conftests.strings._("smtp_help_subject"), "[GetTor] Ayuda") + self.assertEqual(conftests.strings._("smtp_help_subject"), "[GetTor] Help") def test_locale_supported(self): self.assertEqual(self.locales['en']['language'], "English")

1 0

[gettor/master] Remove twitter test that requires auth
by cohosh＠torproject.org 23 Jan '20

23 Jan '20

commit 3517e54ca7d79a4e2253a73d7296767e124d2474 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Jan 20 19:55:15 2020 -0500 Remove twitter test that requires auth Removes tests that require access to secrets. --- tests/test_twitter.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/test_twitter.py b/tests/test_twitter.py index a1515d0..1ad604d 100644 --- a/tests/test_twitter.py +++ b/tests/test_twitter.py @@ -18,12 +18,6 @@ class TwitterTests(unittest.TestCase): print("tearDown()") - def test_load_messages(self): - data = self.tw_client.twitter_data() - print(data) - assert data['events'] - - def test_parse_tweet(self): e = {'type': 'message_create', 'id': '1178649287208689669', 'created_timestamp': '1569846862972', 'message_create': {'target': {'recipient_id': '2514714800'}, 'sender_id': '1467062174', 'message_data': {'text': 'windows 10', 'entities': {'hashtags': [], 'symbols': [], 'user_mentions': [], 'urls': []}}}} message_id = { 'id': e['id'], 'twitter_handle': e['message_create']['sender_id'] }

1 0

[gettor/master] Slight changes to README for tests
by cohosh＠torproject.org 23 Jan '20

23 Jan '20

commit 4005315b36180649d31111d083bc419b2846c33d Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Jan 20 20:02:53 2020 -0500 Slight changes to README for tests --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a3df81b..f31d113 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ $ ./bin/gettor_service start Running tests ================= -GetTor includes PyTest unit tests. To run the tests, first install some dependencies: +GetTor includes PyTest unit tests. To run the tests, first install the dependencies above and then run: ```

1 0

[snowflake/master] Formatting improvements.
by dcf＠torproject.org 23 Jan '20

23 Jan '20

commit d6467ff5854627dcaefbef89bdd348bfe461da12 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 24 18:01:17 2019 -0700 Formatting improvements. --- client/lib/interfaces.go | 1 - client/lib/peers.go | 9 ++++----- client/lib/rendezvous.go | 8 +++----- client/snowflake.go | 22 +++++++++++----------- server/server.go | 4 ++-- 5 files changed, 20 insertions(+), 24 deletions(-) diff --git a/client/lib/interfaces.go b/client/lib/interfaces.go index 609e610..f6e8240 100644 --- a/client/lib/interfaces.go +++ b/client/lib/interfaces.go @@ -30,7 +30,6 @@ type Tongue interface { // Interface for collecting some number of Snowflakes, for passing along // ultimately to the SOCKS handler. type SnowflakeCollector interface { - // Add a Snowflake to the collection. // Implementation should decide how to connect and maintain the webRTCConn. Collect() (Snowflake, error) diff --git a/client/lib/peers.go b/client/lib/peers.go index 5493bfd..12213e1 100644 --- a/client/lib/peers.go +++ b/client/lib/peers.go @@ -44,8 +44,7 @@ func (p *Peers) Collect() (Snowflake, error) { cnt := p.Count() s := fmt.Sprintf("Currently at [%d/%d]", cnt, p.capacity) if cnt >= p.capacity { - s = fmt.Sprintf("At capacity [%d/%d]", cnt, p.capacity) - return nil, errors.New(s) + return nil, fmt.Errorf("At capacity [%d/%d]", cnt, p.capacity) } log.Println("WebRTC: Collecting a new Snowflake.", s) // Engage the Snowflake Catching interface, which must be available. @@ -68,12 +67,12 @@ func (p *Peers) Pop() Snowflake { // Blocks until an available, valid snowflake appears. var snowflake Snowflake var ok bool - for nil == snowflake { + for snowflake == nil { snowflake, ok = <-p.snowflakeChan - conn := snowflake.(*WebRTCPeer) if !ok { return nil } + conn := snowflake.(*WebRTCPeer) if conn.closed { snowflake = nil } @@ -120,5 +119,5 @@ func (p *Peers) End() { p.activePeers.Remove(e) e = next } - log.Println("WebRTC: melted all", cnt, "snowflakes.") + log.Printf("WebRTC: melted all %d snowflakes.", cnt) } diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index 0c7225b..0b15f68 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -50,13 +50,13 @@ func CreateBrokerTransport() http.RoundTripper { // to clients, and |front| is the option fronting domain. func NewBrokerChannel(broker string, front string, transport http.RoundTripper) *BrokerChannel { targetURL, err := url.Parse(broker) - if nil != err { + if err != nil { return nil } log.Println("Rendezvous using Broker at:", broker) bc := new(BrokerChannel) bc.url = targetURL - if "" != front { // Optional front domain. + if front != "" { // Optional front domain. log.Println("Domain fronting using:", front) bc.Host = bc.url.Host bc.url.Host = front @@ -109,7 +109,6 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( } answer := deserializeSessionDescription(string(body)) return answer, nil - case http.StatusServiceUnavailable: return nil, errors.New(BrokerError503) case http.StatusBadRequest: @@ -125,8 +124,7 @@ type WebRTCDialer struct { webrtcConfig *webrtc.Configuration } -func NewWebRTCDialer( - broker *BrokerChannel, iceServers []webrtc.ICEServer) *WebRTCDialer { +func NewWebRTCDialer(broker *BrokerChannel, iceServers []webrtc.ICEServer) *WebRTCDialer { var config webrtc.Configuration if iceServers != nil { config = webrtc.Configuration{ diff --git a/client/snowflake.go b/client/snowflake.go index 28bf7e9..bd53f65 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -30,9 +30,9 @@ func ConnectLoop(snowflakes sf.SnowflakeCollector) { for { // Check if ending is necessary. _, err := snowflakes.Collect() - if nil != err { - log.Println("WebRTC:", err, - " Retrying in", sf.ReconnectTimeout, "seconds...") + if err != nil { + log.Printf("WebRTC: %v Retrying in %v seconds...", + err, sf.ReconnectTimeout) } select { case <-time.After(time.Second * sf.ReconnectTimeout): @@ -52,7 +52,7 @@ func socksAcceptLoop(ln *pt.SocksListener, snowflakes sf.SnowflakeCollector) { log.Println("SOCKS listening...") conn, err := ln.AcceptSocks() if err != nil { - if e, ok := err.(net.Error); ok && e.Temporary() { + if err, ok := err.(net.Error); ok && err.Temporary() { continue } log.Printf("SOCKS accept error: %s", err) @@ -66,7 +66,7 @@ func socksAcceptLoop(ln *pt.SocksListener, snowflakes sf.SnowflakeCollector) { } } -//s is a comma-separated list of ICE server URLs +// s is a comma-separated list of ICE server URLs. func parseIceServers(s string) []webrtc.ICEServer { var servers []webrtc.ICEServer log.Println(s) @@ -98,9 +98,9 @@ func main() { log.SetFlags(log.LstdFlags | log.LUTC) - // Don't write to stderr; versions of tor earlier than about - // 0.3.5.6 do not read from the pipe, and eventually we will - // deadlock because the buffer is full. + // Don't write to stderr; versions of tor earlier than about 0.3.5.6 do + // not read from the pipe, and eventually we will deadlock because the + // buffer is full. // https://bugs.torproject.org/26360 // https://bugs.torproject.org/25600#comment:14 var logOutput = ioutil.Discard @@ -120,7 +120,7 @@ func main() { defer logFile.Close() logOutput = logFile } - //We want to send the log output through our scrubber first + // We want to send the log output through our scrubber first log.SetOutput(&safelog.LogScrubber{Output: logOutput}) log.Println("\n\n\n --- Starting Snowflake Client ---") @@ -194,10 +194,10 @@ func main() { }() } - // wait for a signal + // Wait for a signal. <-sigChan - // signal received, shut down + // Signal received, shut down. for _, ln := range listeners { ln.Close() } diff --git a/server/server.go b/server/server.go index 785b545..5ed56d3 100644 --- a/server/server.go +++ b/server/server.go @@ -345,10 +345,10 @@ func main() { }() } - // wait for a signal + // Wait for a signal. sig := <-sigChan - // signal received, shut down + // Signal received, shut down. log.Printf("caught signal %q, exiting", sig) for _, server := range servers { server.Close()

1 0

[snowflake/master] Update a comment: we no longer keep track of handlers.
by dcf＠torproject.org 23 Jan '20

23 Jan '20

commit e27709080ab423163c46e4ebf685a0b37e60862e Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 24 19:16:10 2019 -0700 Update a comment: we no longer keep track of handlers. --- client/snowflake.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/snowflake.go b/client/snowflake.go index 3c496e0..28bf7e9 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -194,7 +194,7 @@ func main() { }() } - // keep track of handlers and wait for a signal + // wait for a signal <-sigChan // signal received, shut down

1 0

[snowflake/master] Remove erroneous logging around pt.*Error calls.
by dcf＠torproject.org 23 Jan '20

23 Jan '20

commit 5ff75e1034c8d4ae4ba64f92d9aef364d09c27ac Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 20 23:57:31 2020 -0700 Remove erroneous logging around pt.*Error calls. These functions are called for their side effect of sending a PT error message on stdout; they also return a representation of the error message as an error object for the caller to use if it wishes. These functions *always* return a non-nil error object; it is not something to be logged, any more than the return value of errors.New is. The mistaken logging was added in https://bugs.torproject.org/31794 b26c7a7a7330586c3be3ece02c68999bb279ff40 3ec9dd19faa8584dd76ba3b85eb71a03b8ee25c0 ed3d42e1ec3ff852f8c4751eb4cf5e9ed4dd4a68 --- client/snowflake.go | 12 +++--------- server-webrtc/snowflake.go | 4 +--- server/server.go | 12 +++--------- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/client/snowflake.go b/client/snowflake.go index bb7de46..3c496e0 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -157,9 +157,7 @@ func main() { log.Fatal(err) } if ptInfo.ProxyURL != nil { - if err := pt.ProxyError("proxy is not supported"); err != nil { - log.Printf("call to pt.ProxyError generated error: %v", err) - } + pt.ProxyError("proxy is not supported") os.Exit(1) } listeners := make([]net.Listener, 0) @@ -169,18 +167,14 @@ func main() { // TODO: Be able to recover when SOCKS dies. ln, err := pt.ListenSocks("tcp", "127.0.0.1:0") if err != nil { - if inerr := pt.CmethodError(methodName, err.Error()); inerr != nil { - log.Printf("handling error generated by pt.ListenSocks with pt.CmethodError generated error: %v", inerr) - } + pt.CmethodError(methodName, err.Error()) break } go socksAcceptLoop(ln, snowflakes) pt.Cmethod(methodName, ln.Version(), ln.Addr()) listeners = append(listeners, ln) default: - if err := pt.CmethodError(methodName, "no such method"); err != nil { - log.Printf("calling pt.CmethodError generated error: %v", err) - } + pt.CmethodError(methodName, "no such method") } } pt.CmethodsDone() diff --git a/server-webrtc/snowflake.go b/server-webrtc/snowflake.go index d5b1604..acdf5b1 100644 --- a/server-webrtc/snowflake.go +++ b/server-webrtc/snowflake.go @@ -230,9 +230,7 @@ func main() { bindaddr.Addr.Port = 12345 // lies!!! pt.Smethod(bindaddr.MethodName, bindaddr.Addr) default: - if err := pt.SmethodError(bindaddr.MethodName, "no such method"); err != nil { - log.Printf("SmethodError returned error: %v", err) - } + pt.SmethodError(bindaddr.MethodName, "no such method") } } pt.SmethodsDone() diff --git a/server/server.go b/server/server.go index e3f4c6f..785b545 100644 --- a/server/server.go +++ b/server/server.go @@ -282,9 +282,7 @@ func main() { servers := make([]*http.Server, 0) for _, bindaddr := range ptInfo.Bindaddrs { if bindaddr.MethodName != ptMethodName { - if err = pt.SmethodError(bindaddr.MethodName, "no such method"); err != nil { - log.Printf("pt.SmethodError returned error: %v", err) - } + pt.SmethodError(bindaddr.MethodName, "no such method") continue } @@ -296,9 +294,7 @@ func main() { lnHTTP01, err = net.ListenTCP("tcp", &addr) if err != nil { log.Printf("error opening HTTP-01 ACME listener: %s", err) - if inerr := pt.SmethodError(bindaddr.MethodName, "HTTP-01 ACME listener: "+err.Error()); inerr != nil { - log.Printf("pt.SmethodError returned error: %v", inerr) - } + pt.SmethodError(bindaddr.MethodName, "HTTP-01 ACME listener: "+err.Error()) continue } server := &http.Server{ @@ -326,9 +322,7 @@ func main() { } if err != nil { log.Printf("error opening listener: %s", err) - if inerr := pt.SmethodError(bindaddr.MethodName, err.Error()); inerr != nil { - log.Printf("pt.SmethodError returned error: %v", inerr) - } + pt.SmethodError(bindaddr.MethodName, err.Error()) continue } pt.SmethodArgs(bindaddr.MethodName, bindaddr.Addr, args)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 23 Jan '20

23 Jan '20

commit fc69fc9292c4d8625645fe321462a09575f26d08 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 23 16:53:36 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fa.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contents+fa.po b/contents+fa.po index be2ae2b326..f6df8a0bd3 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -2812,6 +2812,8 @@ msgid "" "This is a known and intermittent problem; it does not mean that Google " "considers Tor to be spyware." msgstr "" +"این یک مشکل متناوب و شناخته شده است. گوگل Tor را به عنوان یک جاسوس افزار نمی" +" شناسد." #: https//support.torproject.org/tbb/tbb-44/ #: (content/tbb/tbb-44/contents+en.lrquestion.description)

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 23 Jan '20

23 Jan '20

commit 01a32b6c354a1a7544af69485d0b405c8b6fd216 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 23 16:48:32 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- fr.po | 100 +++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/fr.po b/fr.po index 469d6ea4e4..1d0c212646 100644 --- a/fr.po +++ b/fr.po @@ -41,7 +41,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-06 11:20+0100\n" -"PO-Revision-Date: 2020-01-23 16:12+0000\n" +"PO-Revision-Date: 2020-01-23 16:36+0000\n" "Last-Translator: xin\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -134,7 +134,7 @@ msgstr "_Quitter" msgid "" "For debugging information, execute the following command: sudo tails-" "debugging-info" -msgstr "" +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 "" @@ -143,15 +143,15 @@ msgid "" "website.\\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 "" +msgstr "Une erreur est survenue pendant la mise à jour de la clé de signature.\\n\\nCela empêche de déterminer si une mise à jour est disponible sur notre site web.\\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 "" +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 "" +msgstr "Erreur lors de la vérification des mises à jour" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:282 msgid "" @@ -160,11 +160,11 @@ msgid "" "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 "" +msgstr "Impossible de déterminer si une mise à jour est disponible sur notre site web.\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 "" +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" @@ -172,52 +172,52 @@ msgstr "votre périphérique n’a pas été créé en utilisant une image USB o #: 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 "" +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 "" +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 "" +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 "" +msgstr "Il n’y a aucune explication pour la raison '%{reason}s'." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:345 msgid "The system is up-to-date" -msgstr "" +msgstr "Le système est à jour" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:350 msgid "This version of Tails is outdated, and may have security issues." -msgstr "" +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:382 #, 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 "" +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:398 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." -msgstr "" +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:420 msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." -msgstr "" +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:424 msgid "Error while detecting available upgrades" -msgstr "" +msgstr "Erreur lors de la détection des mises à jour disponibles" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:434 #, perl-brace-format @@ -232,15 +232,15 @@ msgid "" "Download size: %{size}s\n" "\n" "Do you want to upgrade now?" -msgstr "" +msgstr "Vous devriez mettre à jour vers %{name}s %{version}s.\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:448 msgid "Upgrade available" -msgstr "" +msgstr "Une mise à jour est disponible" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:449 msgid "Upgrade now" -msgstr "" +msgstr "Mettre à jour maintenant" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:450 msgid "Upgrade later" @@ -256,20 +256,20 @@ msgid "" "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 "" +msgstr "Vous devriez mettre à jour manuellement vers %{name}s %{version}s.\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:474 msgid "New version available" -msgstr "" +msgstr "Une nouvelle version est disponible" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:555 msgid "Downloading upgrade" -msgstr "" +msgstr "Téléchargement de la mise à jour" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:558 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." -msgstr "" +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:599 msgid "" @@ -277,38 +277,38 @@ msgid "" "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 "" +msgstr "La mise à jour n’a pas pu être téléchargée.\\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:615 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:634 msgid "Error while downloading the upgrade" -msgstr "" +msgstr "Erreur lors du téléchargement de la mise à jour" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:627 #, 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 "" +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:646 msgid "Error while creating temporary downloading directory" -msgstr "" +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:649 msgid "Failed to create temporary download directory" -msgstr "" +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:673 msgid "" "Could not choose a download server.\n" "\n" "This should not happen. Please report a bug." -msgstr "" +msgstr "Impossible de choisir un serveur de téléchargement.\n\nCela ne devrait pas arriver. Veuillez signaler un bogue." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:677 msgid "Error while choosing a download server" -msgstr "" +msgstr "Erreur lors du choix d’un serveur de téléchargement" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:692 msgid "" @@ -317,15 +317,15 @@ msgid "" "The network connection will now be disabled.\n" "\n" "Please save your work and close all other applications." -msgstr "" +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:698 msgid "Upgrade successfully downloaded" -msgstr "" +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:700 msgid "Apply upgrade" -msgstr "" +msgstr "Appliquer la mise à jour" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:707 msgid "" @@ -335,46 +335,46 @@ msgid "" "You should restart Tails on the new version as soon as possible.\n" "\n" "Do you want to restart now?" -msgstr "" +msgstr "Votre périphérique Tails a été mis à jour avec succès.\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:712 msgid "Restart Tails" -msgstr "" +msgstr "Redémarrer Tails" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:713 msgid "Restart now" -msgstr "" +msgstr "Redémarrer maintenant" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:714 msgid "Restart later" -msgstr "" +msgstr "Redémarrer plus tard" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:725 msgid "Error while restarting the system" -msgstr "" +msgstr "Erreur lors du redémarrage du système" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:728 msgid "Failed to restart the system" -msgstr "" +msgstr "Échec de redémarrage du système" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:743 msgid "Error while shutting down the network" -msgstr "" +msgstr "Erreur lors de l’arrêt du réseau" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:746 msgid "Failed to shutdown network" -msgstr "" +msgstr "Échec d’arrêt du réseau" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:753 msgid "Upgrading the system" -msgstr "" +msgstr "Mise à jour du système" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:755 msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the networking is now disabled." -msgstr "" +msgstr "Votre périphérique Tails est en cours de mise à jour…\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:788 msgid "" @@ -382,11 +382,11 @@ msgid "" " 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 "" +msgstr "Une erreur est survenue durant l’installation de la mise à jour.\\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:798 msgid "Error while installing the upgrade" -msgstr "" +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" @@ -547,13 +547,13 @@ msgstr "Erreur" msgid "" "The device Tails is running from cannot be found. Maybe you used the 'toram'" " option?" -msgstr "" +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 "" +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/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75 msgid "Lock screen" @@ -682,7 +682,7 @@ msgstr "Vous pourriez installer {packages} automatiquement lors du démarrage de #: 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 "" +msgstr "Pour cela, vous devez lancer Tails depuis une clé USB." #. Translators: Don't translate {packages}, it's a placeholder and will be #. replaced. @@ -790,7 +790,7 @@ msgstr "Pour ce faire, créez un stockage persistant et installez des logiciels #: 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 "" +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]"

1 0