March 2018 - tor-commits - lists.torproject.org

[tor-browser-build/master] Bump rbm (picking up fix for #25435)
by gk＠torproject.org 07 Mar '18

07 Mar '18

commit 058b6520125e57161753d3357fcab6ecd67496bf Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 7 07:34:06 2018 +0000 Bump rbm (picking up fix for #25435) --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index b4c8c38..db41d8e 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit b4c8c38e12d11eb232305949c5d42d5df5e8f5c8 +Subproject commit db41d8e754ed8cd6cee7bca18d76d59f8f7f369b

1 0

[rbm/master] Bug 25435: use --no-auto-check-trustdb to avoid modifying gpg keyring files
by gk＠torproject.org 07 Mar '18

07 Mar '18

commit db41d8e754ed8cd6cee7bca18d76d59f8f7f369b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 6 21:27:39 2018 +0100 Bug 25435: use --no-auto-check-trustdb to avoid modifying gpg keyring files By default gpg will from time to time update its trust database. When this happens it will also modify the keyring files to add some trust information. To avoid this we add the --no-auto-check-trustdb option. As we don't use the Web of Trust when we use a keyring file, we also disable it using `--trust-model always`. --- lib/RBM/DefaultConfig.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index 4121264..d758b8e 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -216,7 +216,8 @@ OPT_END export LC_ALL=C [% IF c('gpg_keyring'); - SET gpg_kr = '--keyring ' _ path(c('gpg_keyring'), path(c('gpg_keyring_dir'))) _ ' --no-default-keyring'; + SET gpg_kr = '--keyring ' _ path(c('gpg_keyring'), path(c('gpg_keyring_dir'))) + _ ' --no-default-keyring --no-auto-check-trustdb --trust-model always'; END; -%] exec [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "\$@"

1 0

[meek/master] Update programVersion = "0.30".
by dcf＠torproject.org 07 Mar '18

07 Mar '18

commit 7243a0df885dda442750836b397c2c5d1c7f3e8a Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 6 22:45:23 2018 -0800 Update programVersion = "0.30". --- meek-server/meek-server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index eef3dee..79dd80c 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -43,7 +43,7 @@ import ( ) const ( - programVersion = "0.29" + programVersion = "0.30" ptMethodName = "meek" // Reject session ids shorter than this, as a weak defense against

1 0

[meek/master] Use autocert Manager.HTTPHandler (ACME HTTP-01 challenge)
by dcf＠torproject.org 07 Mar '18

07 Mar '18

commit cb8314e0b3a94b9d3c8ce2368ec5b461fb61d117 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 6 18:39:08 2018 -0800 Use autocert Manager.HTTPHandler (ACME HTTP-01 challenge) The former TLS-SNI challenge type is gone. https://letsencrypt.status.io/pages/incident/55957a99e800baa4470002da/5a557… The new HTTP-01 challenge type requires a listener on port 80. The former TLS-SNI challenge just piggybacked on an additional HTTPS listener on port 443, if necessary. The new listener on port 80 just handles ACME business and nothing else. https://bugs.torproject.org/24928 --- doc/meek-server.1.txt | 16 +++++++++------- meek-server/README | 6 ++++-- meek-server/meek-server.go | 48 +++++++++++++++++++++++++++------------------- 3 files changed, 41 insertions(+), 29 deletions(-) diff --git a/doc/meek-server.1.txt b/doc/meek-server.1.txt index 97bfe5d..6d705e1 100644 --- a/doc/meek-server.1.txt +++ b/doc/meek-server.1.txt @@ -23,8 +23,8 @@ up certificates: * **--acme-hostnames**=__HOSTNAME__ (with optional **--acme-email**=__EMAIL__) will automatically get certificates for - __HOSTNAME__ using Let's Encrypt. This only works when meek-server is - running on port 443. + __HOSTNAME__ using Let's Encrypt. When you use this option, + meek-server will need to be able to listen on port 80. * **--cert**=__FILENAME__ and **--key**=__FILENAME__ allow use to use your own externally acquired certificate. @@ -42,7 +42,7 @@ ServerTransportListenAddr meek 0.0.0.0:8443 ServerTransportPlugin meek exec ./meek-server 8443 --cert cert.pem --key key.pem --log meek-server.log ---- -To listen on port 443 without needed to run as root, on Linux, +To listen on ports 80 and 443 without needed to run as root, on Linux, you can use the `setcap` program, part of libcap2: ---- setcap 'cap_net_bind_service=+ep' /usr/local/bin/meek-server @@ -56,10 +56,12 @@ OPTIONS **--acme-hostnames**=__HOSTNAME__[,__HOSTNAME__]...:: Comma-separated list of hostnames to honor when getting automatic - certificates from Let's Encrypt. meek-server has to be running on - port 443 in order for the **--acme-hostnames** option to work. The - certificates will be cached in the pt_state/meek-certificate-cache - directory inside tor state directory. + certificates from Let's Encrypt. meek-server will open a special + listener on port 80 in order to handle ACME messages; this listener + is separate from the one specified by `ServerTransportListenAddr`. + The certificates will be cached in the + pt_state/meek-certificate-cache directory inside tor state + directory. **--cert**=__FILENAME__:: Name of a PEM-encoded TLS certificate file. Required unless diff --git a/meek-server/README b/meek-server/README index 867816c..c4f1883 100644 --- a/meek-server/README +++ b/meek-server/README @@ -1,7 +1,9 @@ # How to run a meek-server (meek bridge): You need a server with a DNS name pointing to it. -You need to be able to run a service on port 443. +You need to be able to run a service on ports 443 and 80. +Port 443 is for receiving meek-tunneled HTTPS from the CDN; +port 80 is for automatic certificates from Let's Encrypt. Let's say the server's DNS name is meek.example.com. @@ -10,7 +12,7 @@ Let's say the server's DNS name is meek.example.com. cd meek-server go build -- Install meek-server under /usr/local/bin and give it permission to bind to port 443. +- Install meek-server under /usr/local/bin and give it permission to bind to ports 443 and 80. cp meek-server /usr/local/bin setcap 'cap_net_bind_service=+ep' /usr/local/bin/meek-server diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index 73f3f7b..eef3dee 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -13,9 +13,10 @@ // ServerTransportPlugin meek exec ./meek-server --disable-tls --log meek-server.log // // The server runs in HTTPS mode by default, getting certificates from Let's -// Encrypt automatically. The server must be listening on port 443 for the -// automatic certificates to work. If you have your own certificate, use the -// --cert and --key options. Use --disable-tls option to run with plain HTTP. +// Encrypt automatically. The server opens an auxiliary ACME listener on port 80 +// in order for the automatic certificates to work. If you have your own +// certificate, use the --cert and --key options. Use --disable-tls option to +// run with plain HTTP. package main import ( @@ -404,8 +405,9 @@ func main() { // --cert and --key together // --disable-tls // The outputs of this block of code are the disableTLS, - // need443Listener, and getCertificate variables. - var need443Listener = false + // needHTTP01Listener, certManager, and getCertificate variables. + var needHTTP01Listener = false + var certManager *autocert.Manager var getCertificate func(*tls.ClientHelloInfo) (*tls.Certificate, error) if disableTLS { if acmeEmail != "" || acmeHostnamesCommas != "" || certFilename != "" || keyFilename != "" { @@ -424,9 +426,10 @@ func main() { acmeHostnames := strings.Split(acmeHostnamesCommas, ",") log.Printf("ACME hostnames: %q", acmeHostnames) - // The ACME responder only works when it is running on port 443. - // https://letsencrypt.github.io/acme-spec/#domain-validation-with-server-name… - need443Listener = true + // The ACME HTTP-01 responder only works when it is running on + // port 80. + // https://github.com/ietf-wg-acme/acme/blob/master/draft-ietf-acme-acme.md#ht… + needHTTP01Listener = true var cache autocert.Cache cacheDir, err := getCertificateCacheDir() @@ -437,7 +440,7 @@ func main() { log.Printf("disabling ACME certificate cache: %s", err) } - certManager := &autocert.Manager{ + certManager = &autocert.Manager{ Prompt: autocert.AcceptTOS, HostPolicy: autocert.HostWhitelist(acmeHostnames...), Email: acmeEmail, @@ -450,20 +453,32 @@ func main() { log.Printf("starting version %s (%s)", programVersion, runtime.Version()) servers := make([]*http.Server, 0) - have443Listener := false for _, bindaddr := range ptInfo.Bindaddrs { if port != 0 { bindaddr.Addr.Port = port } switch bindaddr.MethodName { case ptMethodName: + if needHTTP01Listener { + needHTTP01Listener = false + addr := *bindaddr.Addr + addr.Port = 80 + log.Printf("starting HTTP-01 ACME listener on %s", addr.String()) + lnHTTP01, err := net.ListenTCP("tcp", &addr) + if err != nil { + log.Printf("error opening HTTP-01 ACME listener: %s", err) + pt.SmethodError(bindaddr.MethodName, "HTTP-01 ACME listener: "+err.Error()) + continue + } + go func() { + log.Fatal(http.Serve(lnHTTP01, certManager.HTTPHandler(nil))) + }() + } + var server *http.Server if disableTLS { server, err = startServer(bindaddr.Addr) } else { - if bindaddr.Addr.Port == 443 { - have443Listener = true - } server, err = startServerTLS(bindaddr.Addr, getCertificate) } if err != nil { @@ -478,13 +493,6 @@ func main() { } pt.SmethodsDone() - // Emit a warning if we're using ACME certificates and don't have a 443 - // listener. Don't quit, in case the user has made other provisions for - // forwarding port 443. - if need443Listener && !have443Listener { - log.Printf("warning: the --acme-hostnames option requires one of the bindaddrs to be on port 443.") - } - var numHandlers int = 0 var sig os.Signal sigChan := make(chan os.Signal, 1)

1 0

[meek/master] Minor man page enhancements.
by dcf＠torproject.org 07 Mar '18

07 Mar '18

commit a5aa5a284cb294f3d2d42f572b9cd574f9edad8d Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 6 19:17:03 2018 -0800 Minor man page enhancements. --- doc/meek-server.1.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/meek-server.1.txt b/doc/meek-server.1.txt index 4c8f174..97bfe5d 100644 --- a/doc/meek-server.1.txt +++ b/doc/meek-server.1.txt @@ -63,7 +63,7 @@ OPTIONS **--cert**=__FILENAME__:: Name of a PEM-encoded TLS certificate file. Required unless - **--disable-tls** is used. + **--acme-hostnames** or **--disable-tls** is used. **--disable-tls**: Use plain HTTP rather than HTTPS. This option is only for testing @@ -71,14 +71,14 @@ OPTIONS **--key**=__FILENAME__: Name of a PEM-encoded TLS private key file. Required unless - **--disable-tls** is used. + **--acme-hostnames** or **--disable-tls** is used. **--log**=__FILENAME__:: Name of a file to write log messages to (default stderr). **--port**=__PORT__:: - Port to listen on. Overrides the TOR_PT_SERVER_BINDADDR environment - variable set by tor. In most cases you should set the + Port to listen on. Overrides the `TOR_PT_SERVER_BINDADDR` + environment variable set by tor. In most cases you should set the **ServerTransportListenAddr** option in torrc, rather than use the **--port** option.

1 0

[meek/master] Regen man pages.
by dcf＠torproject.org 07 Mar '18

07 Mar '18

commit 45d17ffa0afd0aaf98051c8a3e6876365fdb99cc Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 6 19:18:39 2018 -0800 Regen man pages. --- doc/meek-server.1 | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/doc/meek-server.1 b/doc/meek-server.1 index 09d198c..2552dce 100644 --- a/doc/meek-server.1 +++ b/doc/meek-server.1 @@ -2,12 +2,12 @@ .\" Title: meek-server .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> -.\" Date: 04/22/2017 +.\" Date: 03/06/2018 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "MEEK\-SERVER" "1" "04/22/2017" "\ \&" "\ \&" +.TH "MEEK\-SERVER" "1" "03/06/2018" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -50,7 +50,7 @@ You will need to configure TLS certificates\&. There are two ways to set up cert (with optional \fB\-\-acme\-email\fR=\fIEMAIL\fR) will automatically get certificates for \fIHOSTNAME\fR -using Let\(cqs Encrypt\&. This only works when meek\-server is running on port 443\&. +using Let\(cqs Encrypt\&. When you use this option, meek\-server will need to be able to listen on port 80\&. .RE .sp .RS 4 @@ -95,7 +95,7 @@ ServerTransportPlugin meek exec \&./meek\-server 8443 \-\-cert cert\&.pem \-\-ke .RE .\} .sp -To listen on port 443 without needed to run as root, on Linux, you can use the setcap program, part of libcap2: +To listen on ports 80 and 443 without needed to run as root, on Linux, you can use the setcap program, part of libcap2: .sp .if n \{\ .RS 4 @@ -116,21 +116,22 @@ Optional email address to register for Let\(cqs Encrypt notifications when using .PP \fB\-\-acme\-hostnames\fR=\fIHOSTNAME\fR[,\fIHOSTNAME\fR]\&... .RS 4 -Comma\-separated list of hostnames to honor when getting automatic certificates from Let\(cqs Encrypt\&. meek\-server has to be running on port 443 in order for the -\fB\-\-acme\-hostnames\fR -option to work\&. The certificates will be cached in the pt_state/meek\-certificate\-cache directory inside tor state directory\&. +Comma\-separated list of hostnames to honor when getting automatic certificates from Let\(cqs Encrypt\&. meek\-server will open a special listener on port 80 in order to handle ACME messages; this listener is separate from the one specified by +ServerTransportListenAddr\&. The certificates will be cached in the pt_state/meek\-certificate\-cache directory inside tor state directory\&. .RE .PP \fB\-\-cert\fR=\fIFILENAME\fR .RS 4 Name of a PEM\-encoded TLS certificate file\&. Required unless +\fB\-\-acme\-hostnames\fR +or \fB\-\-disable\-tls\fR is used\&. .RE .sp \fB\-\-disable\-tls\fR: Use plain HTTP rather than HTTPS\&. This option is only for testing purposes\&. Don\(cqt use it in production\&. .sp -\fB\-\-key\fR=\fIFILENAME\fR: Name of a PEM\-encoded TLS private key file\&. Required unless \fB\-\-disable\-tls\fR is used\&. +\fB\-\-key\fR=\fIFILENAME\fR: Name of a PEM\-encoded TLS private key file\&. Required unless \fB\-\-acme\-hostnames\fR or \fB\-\-disable\-tls\fR is used\&. .PP \fB\-\-log\fR=\fIFILENAME\fR .RS 4 @@ -139,7 +140,9 @@ Name of a file to write log messages to (default stderr)\&. .PP \fB\-\-port\fR=\fIPORT\fR .RS 4 -Port to listen on\&. Overrides the TOR_PT_SERVER_BINDADDR environment variable set by tor\&. In most cases you should set the +Port to listen on\&. Overrides the +TOR_PT_SERVER_BINDADDR +environment variable set by tor\&. In most cases you should set the \fBServerTransportListenAddr\fR option in torrc, rather than use the \fB\-\-port\fR

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 07 Mar '18

07 Mar '18

commit 6d465fe00c157c85e2d6ba9fce70646fcd906fdf Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 7 05:46:41 2018 +0000 Update translations for tor-launcher-properties_completed --- fr/torlauncher.properties | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/fr/torlauncher.properties b/fr/torlauncher.properties index a30ac76ac..804dafac0 100644 --- a/fr/torlauncher.properties +++ b/fr/torlauncher.properties @@ -26,11 +26,21 @@ torlauncher.error_proxy_addr_missing=Vous devez spécifier à la fois une adress torlauncher.error_proxy_type_missing=Vous devez choisir le type de mandataire. torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs ponts. torlauncher.error_default_bridges_type_missing=Vous devez sélectionner un type de transport pour les ponts fournis. +torlauncher.error_bridgedb_bridges_missing=Veuillez demander un pont. torlauncher.error_bridge_bad_default_type=Aucun des ponts fournis n’est disponible pour le type de transport %S, Veuillez ajuster vos paramètres. torlauncher.bridge_suffix.meek-amazon=(fonctionne en Chine) torlauncher.bridge_suffix.meek-azure=(fonctionne en Chine) +torlauncher.request_a_bridge=Demander un pont… +torlauncher.request_a_new_bridge=Demander un nouveau pont… +torlauncher.contacting_bridgedb=Connexion à BridgeDB. Veuillez patienter. +torlauncher.captcha_prompt=Résoudre le CAPTCHA pour demander un pont. +torlauncher.bad_captcha_solution=La solution est erronée. Veuillez ressayer. +torlauncher.unable_to_get_bridge=Impossible d’obtenir un pont de BridgeDB.\n\n%S +torlauncher.no_meek=Ce navigateur n’est pas configuré pour meek, qui est nécessaire pour obtenir des ponts. +torlauncher.no_bridges_available=Aucun pont n’est proposé pour l'instant. Désolé. + torlauncher.connect=Se connecter torlauncher.restart_tor=Redémarrer Tor torlauncher.quit=Quitter @@ -62,3 +72,7 @@ torlauncher.bootstrapWarning.timeout=expiration du temps de connexion torlauncher.bootstrapWarning.noroute=pas de route vers l’hôte torlauncher.bootstrapWarning.ioerror=erreur de lecture/écriture torlauncher.bootstrapWarning.pt_missing=le transport enfichable manque + +torlauncher.nsresult.NS_ERROR_NET_RESET=La connexion au serveur a été perdue +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Impossible de se connecter au serveur. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Impossible de se connecter au mandataire.

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 07 Mar '18

07 Mar '18

commit ba69da9d385e8c27c3e33ed4f8eb3d17229f80f8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 7 05:46:36 2018 +0000 Update translations for tor-launcher-properties --- fr/torlauncher.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fr/torlauncher.properties b/fr/torlauncher.properties index a489b77cd..804dafac0 100644 --- a/fr/torlauncher.properties +++ b/fr/torlauncher.properties @@ -26,19 +26,19 @@ torlauncher.error_proxy_addr_missing=Vous devez spécifier à la fois une adress torlauncher.error_proxy_type_missing=Vous devez choisir le type de mandataire. torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs ponts. torlauncher.error_default_bridges_type_missing=Vous devez sélectionner un type de transport pour les ponts fournis. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Veuillez demander un pont. torlauncher.error_bridge_bad_default_type=Aucun des ponts fournis n’est disponible pour le type de transport %S, Veuillez ajuster vos paramètres. torlauncher.bridge_suffix.meek-amazon=(fonctionne en Chine) torlauncher.bridge_suffix.meek-azure=(fonctionne en Chine) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… +torlauncher.request_a_bridge=Demander un pont… +torlauncher.request_a_new_bridge=Demander un nouveau pont… torlauncher.contacting_bridgedb=Connexion à BridgeDB. Veuillez patienter. torlauncher.captcha_prompt=Résoudre le CAPTCHA pour demander un pont. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. +torlauncher.bad_captcha_solution=La solution est erronée. Veuillez ressayer. +torlauncher.unable_to_get_bridge=Impossible d’obtenir un pont de BridgeDB.\n\n%S +torlauncher.no_meek=Ce navigateur n’est pas configuré pour meek, qui est nécessaire pour obtenir des ponts. torlauncher.no_bridges_available=Aucun pont n’est proposé pour l'instant. Désolé. torlauncher.connect=Se connecter @@ -74,5 +74,5 @@ torlauncher.bootstrapWarning.ioerror=erreur de lecture/écriture torlauncher.bootstrapWarning.pt_missing=le transport enfichable manque torlauncher.nsresult.NS_ERROR_NET_RESET=La connexion au serveur a été perdue -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Impossible de se connecter au serveur. torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Impossible de se connecter au mandataire.

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 07 Mar '18

07 Mar '18

commit 2b4b25f2f81c283524fc4258ed641f70ebd42cf9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 7 05:17:03 2018 +0000 Update translations for tor-launcher-network-settings_completed --- fr/network-settings.dtd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fr/network-settings.dtd b/fr/network-settings.dtd index a45bc016b..de2afe922 100644 --- a/fr/network-settings.dtd +++ b/fr/network-settings.dtd @@ -41,6 +41,10 @@ <!ENTITY torsettings.useBridges.checkbox "Tor est censuré dans mon pays"> <!ENTITY torsettings.useBridges.default "Sélectionner un pont intégré"> <!ENTITY torsettings.useBridges.default.placeholder "Sélectionner un pont"> +<!ENTITY torsettings.useBridges.bridgeDB "Demander un pont à torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Saisir les caractères de l’image"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Obtenir un nouveau test"> +<!ENTITY torsettings.useBridges.captchaSubmit "Envoyer"> <!ENTITY torsettings.useBridges.custom "Fournir un pont que je connais"> <!ENTITY torsettings.useBridges.label "Saisir des informations de pont provenant d’une source fiable"> <!ENTITY torsettings.useBridges.placeholder "type adresse:port (un par ligne)">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 07 Mar '18

07 Mar '18

commit a83da06bbed00fe5919bbe4a837a7528103c845d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 7 05:16:58 2018 +0000 Update translations for tor-launcher-network-settings --- fr/network-settings.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr/network-settings.dtd b/fr/network-settings.dtd index 47ffdc9f8..de2afe922 100644 --- a/fr/network-settings.dtd +++ b/fr/network-settings.dtd @@ -41,9 +41,9 @@ <!ENTITY torsettings.useBridges.checkbox "Tor est censuré dans mon pays"> <!ENTITY torsettings.useBridges.default "Sélectionner un pont intégré"> <!ENTITY torsettings.useBridges.default.placeholder "Sélectionner un pont"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.bridgeDB "Demander un pont à torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Saisir les caractères de l’image"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Obtenir un nouveau test"> <!ENTITY torsettings.useBridges.captchaSubmit "Envoyer"> <!ENTITY torsettings.useBridges.custom "Fournir un pont que je connais"> <!ENTITY torsettings.useBridges.label "Saisir des informations de pont provenant d’une source fiable">

1 0