date:20180306

[tor-commits] [tor-browser-build/master] Bump rbm (picking up fix for #25435)

2018-03-06 Thread gk

commit 058b6520125e57161753d3357fcab6ecd67496bf
Author: Georg Koppen 
Date:   Wed Mar 7 07:34:06 2018 +

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 16
--- a/rbm
+++ b/rbm
@@ -1 +1 @@
-Subproject commit b4c8c38e12d11eb232305949c5d42d5df5e8f5c8
+Subproject commit db41d8e754ed8cd6cee7bca18d76d59f8f7f369b

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

[tor-commits] [rbm/master] Bug 25435: use --no-auto-check-trustdb to avoid modifying gpg keyring files

2018-03-06 Thread gk

commit db41d8e754ed8cd6cee7bca18d76d59f8f7f369b
Author: Nicolas Vigier 
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 %] 
"\$@"

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

[tor-commits] [meek/master] Update programVersion = "0.30".

2018-03-06 Thread dcf

commit 7243a0df885dda442750836b397c2c5d1c7f3e8a
Author: David Fifield 
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

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

[tor-commits] [meek/master] Use autocert Manager.HTTPHandler (ACME HTTP-01 challenge)

2018-03-06 Thread dcf

commit cb8314e0b3a94b9d3c8ce2368ec5b461fb61d117
Author: David Fifield 
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/5a55777ed9a9c1024c00b241

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
+

[tor-commits] [meek/master] Regen man pages.

2018-03-06 Thread dcf

commit 45d17ffa0afd0aaf98051c8a3e6876365fdb99cc
Author: David Fifield 
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 
-.\"  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

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

[tor-commits] [meek/master] Minor man page enhancements.

2018-03-06 Thread dcf

commit a5aa5a284cb294f3d2d42f572b9cd574f9edad8d
Author: David Fifield 
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.
 



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

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

2018-03-06 Thread translation

commit ba69da9d385e8c27c3e33ed4f8eb3d17229f80f8
Author: Translation commit bot 
Date:   Wed Mar 7 05:46:36 2018 +

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.

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

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

2018-03-06 Thread translation

commit 6d465fe00c157c85e2d6ba9fce70646fcd906fdf
Author: Translation commit bot 
Date:   Wed Mar 7 05:46:41 2018 +

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.

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

[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

2018-03-06 Thread translation

commit 2b4b25f2f81c283524fc4258ed641f70ebd42cf9
Author: Translation commit bot 
Date:   Wed Mar 7 05:17:03 2018 +

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 @@
 
 
 
+
+
+
+
 
 
 

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

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

2018-03-06 Thread translation

commit 50f21ba40bd0eb1b95ac1bdf8ffb0eee720f2c8d
Author: Translation commit bot 
Date:   Wed Mar 7 05:16:36 2018 +

Update translations for tor-launcher-properties
---
 fr/torlauncher.properties | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fr/torlauncher.properties b/fr/torlauncher.properties
index 69e597c90..a489b77cd 100644
--- a/fr/torlauncher.properties
+++ b/fr/torlauncher.properties
@@ -34,12 +34,12 @@ 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.contacting_bridgedb=Contacting BridgeDB. Please wait.
-torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge.
+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.no_bridges_available=No bridges are available at this time. Sorry.
+torlauncher.no_bridges_available=Aucun pont nâest proposÃ© pour l'instant. 
DÃ©solÃ©.
 
 torlauncher.connect=Se connecter
 torlauncher.restart_tor=RedÃ©marrer Tor
@@ -73,6 +73,6 @@ 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=The connection to the server was lost.
+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_PROXY_CONNECTION_REFUSED=Could not connect to 
the proxy.
+torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Impossible de se 
connecter au mandataire.

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

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2018-03-06 Thread translation

commit a83da06bbed00fe5919bbe4a837a7528103c845d
Author: Translation commit bot 
Date:   Wed Mar 7 05:16:58 2018 +

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 @@
 
 
 
-
-
-
+
+
+
 
 
 

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

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

2018-03-06 Thread translation

commit 518991dcbaebe8aca287251c5de149f11616d063
Author: Translation commit bot 
Date:   Tue Mar 6 19:18:45 2018 +

Update translations for torbutton-abouttorproperties
---
 ja/abouttor.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ja/abouttor.properties b/ja/abouttor.properties
index 6fdf98409..848d0dcef 100644
--- a/ja/abouttor.properties
+++ b/ja/abouttor.properties
@@ -8,13 +8,13 @@ 
aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
 
-aboutTor.donationBanner.donate=Donate Now!
+aboutTor.donationBanner.donate=ä»ããå¯ä»é¡ãã¾ãï¼
 
 aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance
 aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift!
 
 aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & 
Activists Since 2006
 aboutTor.donationBanner.tagline2=Networking Freedom Worldwide
-aboutTor.donationBanner.tagline3=Freedom Online
+aboutTor.donationBanner.tagline3=ããªã¼ãã ãªã³ã©ã¤ã³
 aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide
-aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day
+aboutTor.donationBanner.tagline5=æ°ç¾ä¸ä»¶ä»¥ä¸ã®ãã©ã¤ãã·ã¼ãæ¯æ¥ä¿è·ãã¦ãã¾ãã

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

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

2018-03-06 Thread translation

commit 3090cf90c3b57daf2c4c3e47a8b3c77c73d3e98f
Author: Translation commit bot 
Date:   Tue Mar 6 13:16:48 2018 +

Update translations for tor-launcher-properties_completed
---
 zh_CN/torlauncher.properties | 14 ++
 1 file changed, 14 insertions(+)

diff --git a/zh_CN/torlauncher.properties b/zh_CN/torlauncher.properties
index aaec8e5f3..3c425e2be 100644
--- a/zh_CN/torlauncher.properties
+++ b/zh_CN/torlauncher.properties
@@ -26,11 +26,21 @@ torlauncher.error_proxy_addr_missing=ä¸ºäºå° Tor é
ç½®ä¸ºä½¿ç¨ä»£çè®¿é®
 torlauncher.error_proxy_type_missing=å¿é¡»éæ©ä»£çç±»åã
 torlauncher.error_bridges_missing=å¿é¡»æå®ä¸ä¸ªæå¤ä¸ªç½æ¡¥ã
 torlauncher.error_default_bridges_type_missing=å¿é¡»æå®ç½æ¡¥çä¼ 
è¾ç±»åã
+torlauncher.error_bridgedb_bridges_missing=è¯·è·åä¸ä¸ªç½æ¡¥ã
 torlauncher.error_bridge_bad_default_type=æ²¡æä¼ è¾ç±»åä¸º %S 
çå¯ç¨ç½æ¡¥ãè¯·è°æ´è®¾ç½®ã
 
 torlauncher.bridge_suffix.meek-amazon=ï¼ä¸å½å¯ç¨ï¼
 torlauncher.bridge_suffix.meek-azure=ï¼ä¸å½å¯ç¨ï¼
 
+torlauncher.request_a_bridge=æ£å¨è¯·æ±ç½æ¡¥â¦â¦
+torlauncher.request_a_new_bridge=æ£å¨è¯·æ±æ°ç½æ¡¥â¦â¦
+torlauncher.contacting_bridgedb=æ£å¨è¿æ¥å°BridgeDB,è¯·çå¾ã
+torlauncher.captcha_prompt=è¯·è¾å¥éªè¯ç ä»¥è·åç½æ¡¥ã
+torlauncher.bad_captcha_solution=ç»æå¹¶ä¸æ£ç¡®ï¼è¯·éè¯ã
+torlauncher.unable_to_get_bridge=æ æ³ä»BridgeDBè·åç½æ¡¥ã\n\n%S
+torlauncher.no_meek=è¿ä¸ªæµè§å¨æªè¢«é
ç½®ä¸ºå¯ä»¥ä½¿ç¨meekï¼è·åç½æ¡¥éè¦è¿ä¸ªåè½ã
+torlauncher.no_bridges_available=æ±æï¼ç®åæ²¡æå¯ä¾ä½¿ç¨çç½æ¡¥ã
+
 torlauncher.connect=è¿æ¥
 torlauncher.restart_tor=éæ°å¯å¨ Tor
 torlauncher.quit=éåº
@@ -62,3 +72,7 @@ torlauncher.bootstrapWarning.timeout=è¿æ¥è¶æ¶
 torlauncher.bootstrapWarning.noroute=æ²¡æå¯ç¨é¾è·¯
 torlauncher.bootstrapWarning.ioerror=è¯»åéè¯¯
 torlauncher.bootstrapWarning.pt_missing=ç¼ºå° pluggable ä¼ è¾ç±»åç½æ¡¥
+
+torlauncher.nsresult.NS_ERROR_NET_RESET=ä¸æå¡å¨çè¿æ¥å·²ä¸¢å¤±...
+torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=æ æ³è¿æ¥å°æå¡å¨ã
+torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=æ æ³è¿æ¥å°ä»£çã

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

[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

2018-03-06 Thread translation

commit 1d723282ec204cb99640d68986d3e0b3016d6df1
Author: Translation commit bot 
Date:   Tue Mar 6 13:17:09 2018 +

Update translations for tor-launcher-network-settings_completed
---
 zh_CN/network-settings.dtd | 4 
 1 file changed, 4 insertions(+)

diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd
index 046d26d37..1f4130482 100644
--- a/zh_CN/network-settings.dtd
+++ b/zh_CN/network-settings.dtd
@@ -41,6 +41,10 @@
 
 
 
+
+
+
+
 
 
 

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

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2018-03-06 Thread translation

commit 0a66533b11c0f2fed8a9731b922eec00d7172349
Author: Translation commit bot 
Date:   Tue Mar 6 13:17:03 2018 +

Update translations for tor-launcher-network-settings
---
 zh_CN/network-settings.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd
index 06ff17beb..1f4130482 100644
--- a/zh_CN/network-settings.dtd
+++ b/zh_CN/network-settings.dtd
@@ -41,9 +41,9 @@
 
 
 
-
-
-
+
+
+
 
 
 

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

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

2018-03-06 Thread translation

commit 279f90aabfb4b861d66ea8ff7689b8d6360ea048
Author: Translation commit bot 
Date:   Tue Mar 6 13:16:40 2018 +

Update translations for tor-launcher-properties
---
 zh_CN/torlauncher.properties | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/zh_CN/torlauncher.properties b/zh_CN/torlauncher.properties
index 8fa96e0b2..3c425e2be 100644
--- a/zh_CN/torlauncher.properties
+++ b/zh_CN/torlauncher.properties
@@ -26,7 +26,7 @@ torlauncher.error_proxy_addr_missing=ä¸ºäºå° Tor é
ç½®ä¸ºä½¿ç¨ä»£çè®¿é®
 torlauncher.error_proxy_type_missing=å¿é¡»éæ©ä»£çç±»åã
 torlauncher.error_bridges_missing=å¿é¡»æå®ä¸ä¸ªæå¤ä¸ªç½æ¡¥ã
 torlauncher.error_default_bridges_type_missing=å¿é¡»æå®ç½æ¡¥çä¼ 
è¾ç±»åã
-torlauncher.error_bridgedb_bridges_missing=Please request a bridge.
+torlauncher.error_bridgedb_bridges_missing=è¯·è·åä¸ä¸ªç½æ¡¥ã
 torlauncher.error_bridge_bad_default_type=æ²¡æä¼ è¾ç±»åä¸º %S 
çå¯ç¨ç½æ¡¥ãè¯·è°æ´è®¾ç½®ã
 
 torlauncher.bridge_suffix.meek-amazon=ï¼ä¸å½å¯ç¨ï¼
@@ -36,9 +36,9 @@ torlauncher.request_a_bridge=æ£å¨è¯·æ±ç½æ¡¥â¦â¦
 torlauncher.request_a_new_bridge=æ£å¨è¯·æ±æ°ç½æ¡¥â¦â¦
 torlauncher.contacting_bridgedb=æ£å¨è¿æ¥å°BridgeDB,è¯·çå¾ã
 torlauncher.captcha_prompt=è¯·è¾å¥éªè¯ç ä»¥è·åç½æ¡¥ã
-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=ç»æå¹¶ä¸æ£ç¡®ï¼è¯·éè¯ã
+torlauncher.unable_to_get_bridge=æ æ³ä»BridgeDBè·åç½æ¡¥ã\n\n%S
+torlauncher.no_meek=è¿ä¸ªæµè§å¨æªè¢«é
ç½®ä¸ºå¯ä»¥ä½¿ç¨meekï¼è·åç½æ¡¥éè¦è¿ä¸ªåè½ã
 torlauncher.no_bridges_available=æ±æï¼ç®åæ²¡æå¯ä¾ä½¿ç¨çç½æ¡¥ã
 
 torlauncher.connect=è¿æ¥
@@ -74,5 +74,5 @@ torlauncher.bootstrapWarning.ioerror=è¯»åéè¯¯
 torlauncher.bootstrapWarning.pt_missing=ç¼ºå° pluggable ä¼ è¾ç±»åç½æ¡¥
 
 torlauncher.nsresult.NS_ERROR_NET_RESET=ä¸æå¡å¨çè¿æ¥å·²ä¸¢å¤±...
-torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the 
server.
+torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=æ æ³è¿æ¥å°æå¡å¨ã
 torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=æ æ³è¿æ¥å°ä»£çã

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

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

2018-03-06 Thread translation

commit 27b3528ec900a2c0d1bea6567d9f0626ea89cd3d
Author: Translation commit bot 
Date:   Tue Mar 6 12:47:07 2018 +

Update translations for tails-misc
---
 zh_CN.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/zh_CN.po b/zh_CN.po
index 511818c17..e79a38ec9 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -20,8 +20,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-01 16:34+0100\n"
-"PO-Revision-Date: 2018-03-02 01:37+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2018-03-06 12:42+\n"
+"Last-Translator: Lafrenze Laurant\n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,7 +86,7 @@ msgstr "éæ°å¯å¨"
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:78
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:147
 msgid "Lock screen"
-msgstr ""
+msgstr "å±å¹éå®"
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:81
 msgid "Power Off"
@@ -209,7 +209,7 @@ msgstr "MAC æ¬ºéªå¯¹ ${nic_name} (${nic}) 
å¤±è´¥ãéè¯¯æ¢å¤ä¹ä¸åå¤±è´¥
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:109
 msgid "Set up a password to unlock the screen"
-msgstr ""
+msgstr "è®¾å®è§£éå±å¹çå¯ç "
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:115
 msgid "Password"
@@ -235,7 +235,7 @@ msgid ""
 "\n"
 "Or do a manual upgrade.\n"
 "See https://tails.boum.org/doc/first_steps/upgrade#manual\";
-msgstr ""
+msgstr "ååä¸è¶³ï¼æ æ³æ£æµæ´æ°ã\n\nè¯·ç¡®ä¿ç³»ç»æ»¡è¶³ 
Tails çæä½è¿è¡è¦æ±ãåé
æä»¶ï¼file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\néå¯åæ¬¡æ£æµæ´æ°ã\n\næè
æå¨æ´æ°ã\nåé
ï¼https://tails.boum.org/doc/first_steps/upgrade#manual;
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:72
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27

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

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

2018-03-06 Thread translation

commit 9ac7b260279eb2d50df19a0dd17bc233f837f851
Author: Translation commit bot 
Date:   Tue Mar 6 12:47:12 2018 +

Update translations for tails-misc_completed
---
 zh_CN.po | 146 ---
 1 file changed, 93 insertions(+), 53 deletions(-)

diff --git a/zh_CN.po b/zh_CN.po
index 05f5f0621..e79a38ec9 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -6,8 +6,9 @@
 # khi, 2013
 # Chi-Hsun Tsai, 2017
 # bnw, 2014
+# Lafrenze Laurant, 2018
 # Meng San, 2014
-# Lafrenze Laurant , 2018
+# Lafrenze Laurant, 2018
 # leungsookfan , 2014
 # Sanya chang <408070...@qq.com>, 2013
 # khi, 2014
@@ -18,9 +19,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-13 20:10+0200\n"
-"PO-Revision-Date: 2018-01-11 09:21+\n"
-"Last-Translator: Lafrenze Laurant \n"
+"POT-Creation-Date: 2018-03-01 16:34+0100\n"
+"PO-Revision-Date: 2018-03-06 12:42+\n"
+"Last-Translator: Lafrenze Laurant\n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,36 +54,41 @@ msgid ""
 "\n"
 msgstr "å¸®å©æä»¬ä¿®å¤æ¨ç bugï¼\néè¯»æä»¬ç bug æ¥åæåã\nä¸è¦å
å«ä»»ä½ä¸å¿è¦çä¸ªäººä¿¡æ¯ï¼\nå
³äºç»æä»¬ä¸ä¸ªçµåé®ä»¶å°å\n\nç»æä»¬ä¸ä¸ªçµåé®ä»¶å°åè½å
è®¸æä»¬èç³»æ¨ä»¥æ¾æ¸
é®é¢ãè¿å¯¹ç»å¤§å¤æ°æ¥åé½æ¯éè¦çï¼æä»¬æ¶å°çè®¸å¤æ¥åé½å
 ä¸ºæ²¡æèç³»ä¿¡æ¯èæ 
ç¨ãä½å¨å¦ä¸æ¹é¢ï¼å®ä¹æä¾äºä¸ä¸ªçª¥æ¢çæºä¼ï¼åæ¯æ¨ççµåé®ä»¶æè
äºèç½æä¾åï¼ä»¥æ¤ç¡®è®¤æ¨æ£å¨ä½¿ç¨ Tailsã\n\n"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:17
+#: config/chroot_local-includes/usr/local/bin/electrum:57
 msgid "Persistence is disabled for Electrum"
 msgstr "Electrum çæä¹åå·²ç¦ç¨"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:19
+#: config/chroot_local-includes/usr/local/bin/electrum:59
 msgid ""
 "When you reboot Tails, all of Electrum's data will be lost, including your "
 "Bitcoin wallet. It is strongly recommended to only run Electrum when its "
 "persistence feature is activated."
 msgstr "å¨æ¨éæ°å¯å¨ Tails æ¶ï¼Electrum 
çæææ°æ®é½å°ä¸¢å¤±ï¼åæ¬æ¨çæ¯ç¹å¸é±å
ãå¼ºçå»ºè®®æ¨åªå¨æä¹ååè½å·²å¯ç¨æ¶è¿è¡ Electrumã"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:21
+#: config/chroot_local-includes/usr/local/bin/electrum:60
 msgid "Do you want to start Electrum anyway?"
 msgstr "æ¨æ è®ºå¦ä½é½è¦å¯å¨ Electrum åï¼"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:23
+#: config/chroot_local-includes/usr/local/bin/electrum:63
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "å¯å¨(_L)"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:24
+#: config/chroot_local-includes/usr/local/bin/electrum:64
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "éåº(_E)"
 
-#: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-hel...@tails.boum.org/extension.js:71
+#: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:75
 msgid "Restart"
 msgstr "éæ°å¯å¨"
 
-#: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-hel...@tails.boum.org/extension.js:74
+#: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:78
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:147
+msgid "Lock screen"
+msgstr "å±å¹éå®"
+
+#: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:81
 msgid "Power Off"
 msgstr "å³æº"
 
@@ -111,24 +117,51 @@ msgstr "çæä¿¡æ¯ï¼\n%s"
 msgid "not available"
 msgstr "ä¸å¯ç¨"
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:147
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:162
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:166
-msgid "Your additional software"
-msgstr "éå è½¯ä»¶"
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:170
+msgid "Your additional software installation failed"
+msgstr "æ¨çéå è½¯ä»¶å®è£å¤±è´¥ã"
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:148
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:167
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:171
+msgid ""
+"The installation failed. Please check your additional software "
+"configuration, or read the system log to understand better the problem."
+msgstr "å®è£å¤±è´¥ãè¯·æ£æ¥æ¨çéå è½¯ä»¶çé

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

2018-03-06 Thread translation

commit 8ce04f187c24f414d6d874b093c5e392c018dffd
Author: Translation commit bot 
Date:   Tue Mar 6 12:46:37 2018 +

Update translations for tor-launcher-properties
---
 zh_CN/torlauncher.properties | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/zh_CN/torlauncher.properties b/zh_CN/torlauncher.properties
index 6e890d694..8fa96e0b2 100644
--- a/zh_CN/torlauncher.properties
+++ b/zh_CN/torlauncher.properties
@@ -32,14 +32,14 @@ torlauncher.error_bridge_bad_default_type=æ²¡æä¼ 
è¾ç±»åä¸º %S çå¯ç¨ç½
 torlauncher.bridge_suffix.meek-amazon=ï¼ä¸å½å¯ç¨ï¼
 torlauncher.bridge_suffix.meek-azure=ï¼ä¸å½å¯ç¨ï¼
 
-torlauncher.request_a_bridge=Request a Bridgeâ¦
-torlauncher.request_a_new_bridge=Request a New Bridgeâ¦
-torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait.
-torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge.
+torlauncher.request_a_bridge=æ£å¨è¯·æ±ç½æ¡¥â¦â¦
+torlauncher.request_a_new_bridge=æ£å¨è¯·æ±æ°ç½æ¡¥â¦â¦
+torlauncher.contacting_bridgedb=æ£å¨è¿æ¥å°BridgeDB,è¯·çå¾ã
+torlauncher.captcha_prompt=è¯·è¾å¥éªè¯ç ä»¥è·åç½æ¡¥ã
 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.no_bridges_available=No bridges are available at this time. Sorry.
+torlauncher.no_bridges_available=æ±æï¼ç®åæ²¡æå¯ä¾ä½¿ç¨çç½æ¡¥ã
 
 torlauncher.connect=è¿æ¥
 torlauncher.restart_tor=éæ°å¯å¨ Tor
@@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=æ²¡æå¯ç¨é¾è·¯
 torlauncher.bootstrapWarning.ioerror=è¯»åéè¯¯
 torlauncher.bootstrapWarning.pt_missing=ç¼ºå° pluggable ä¼ è¾ç±»åç½æ¡¥
 
-torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost.
+torlauncher.nsresult.NS_ERROR_NET_RESET=ä¸æå¡å¨çè¿æ¥å·²ä¸¢å¤±...
 torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the 
server.
-torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to 
the proxy.
+torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=æ æ³è¿æ¥å°ä»£çã

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

[tor-commits] [tor-browser-build/master] Bump rbm (picking up fix for #25422)

2018-03-06 Thread gk

commit 5ab5b08179208d0fc4f38dd76686bf1df65a7389
Author: Georg Koppen 
Date:   Tue Mar 6 12:27:21 2018 +

Bump rbm (picking up fix for #25422)
---
 rbm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rbm b/rbm
index 7494edc..b4c8c38 16
--- a/rbm
+++ b/rbm
@@ -1 +1 @@
-Subproject commit 7494edc6d2556c511c213823a6549410ba75f73b
+Subproject commit b4c8c38e12d11eb232305949c5d42d5df5e8f5c8

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

[tor-commits] [rbm/master] Bug 25422: Give more details in "Cannot checkout" errors

2018-03-06 Thread gk

commit b4c8c38e12d11eb232305949c5d42d5df5e8f5c8
Author: Nicolas Vigier 
Date:   Mon Mar 5 14:47:03 2018 +0100

Bug 25422: Give more details in "Cannot checkout" errors

Print stderr from the git/hg command if the checkout failed.
---
 lib/RBM.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/RBM.pm b/lib/RBM.pm
index 3b19ca9..f987130 100644
--- a/lib/RBM.pm
+++ b/lib/RBM.pm
@@ -472,7 +472,7 @@ sub execute {
 git_clone_fetch_chdir($project, $options);
 my ($stdout, $stderr, $success, $exit_code)
 = capture_exec('git', 'checkout', $git_hash);
-exit_error "Cannot checkout $git_hash" unless $success;
+exit_error "Cannot checkout $git_hash:\n$stderr" unless $success;
 if (project_config($project, 'git_submodule', $options)) {
 ($stdout, $stderr, $success, $exit_code)
 = capture_exec('git', 'submodule', 'update', '--init');
@@ -485,7 +485,7 @@ sub execute {
 hg_clone_fetch_chdir($project, $options);
 my ($stdout, $stderr, $success, $exit_code)
 = capture_exec('hg', 'update', '-C', $hg_hash);
-exit_error "Cannot checkout $hg_hash" unless $success;
+exit_error "Cannot checkout $hg_hash:\n$stderr" unless $success;
 }
 my ($stdout, $stderr, $success, $exit_code)
 = run_script($project, $cmd, \_exec);

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

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

2018-03-06 Thread translation

commit f6682d01f6ffdcf15b72bed79f324bcefe952a28
Author: Translation commit bot 
Date:   Tue Mar 6 12:17:28 2018 +

Update translations for torbutton-brandproperties
---
 mr/brand.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mr/brand.properties b/mr/brand.properties
index 732c15741..5c2953446 100644
--- a/mr/brand.properties
+++ b/mr/brand.properties
@@ -8,9 +8,9 @@ brandFullName=Tor Browser
 vendorShortName=Tor Project
 
 homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageImport=% S à¤µà¤°à¥à¤¨ à¤à¤ªà¤²à¥ à¤®à¥à¤à¥à¤¯à¤ªà¥à¤·à¥à¤  
à¤à¤¯à¤¾à¤¤ à¤à¤°à¤¾
 
-homePageMigrationPageTitle=Home Page Selection
+homePageMigrationPageTitle=à¤®à¥à¤à¥à¤¯ à¤ªà¥à¤·à¥à¤  à¤¨à¤¿à¤µà¤¡
 homePageMigrationDescription=Please select the home page you wish to use:
 
 syncBrandShortName=Sync

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

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

2018-03-06 Thread translation

commit 2f2da22ecb46a1b85108cd2d9e8cf9b51257efa5
Author: Translation commit bot 
Date:   Tue Mar 6 12:15:38 2018 +

Update translations for https_everywhere
---
 mr/https-everywhere.properties | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mr/https-everywhere.properties b/mr/https-everywhere.properties
index c12fb3e37..d6288704c 100644
--- a/mr/https-everywhere.properties
+++ b/mr/https-everywhere.properties
@@ -1,8 +1,8 @@
 https-everywhere.menu.globalEnable = à¤¸à¤°à¥à¤µà¤¤à¥à¤° HTTPS 
à¤¸à¤à¥à¤·à¤® à¤à¤°à¤¾
 https-everywhere.menu.globalDisable = à¤¸à¤°à¥à¤µà¤¤à¥à¤° HTTPS à¤
à¤à¥à¤·à¤® à¤à¤°à¤¾
-https-everywhere.menu.enableDisable = Enable / Disable Rules
-https-everywhere.menu.noRules = (No Rules for This Page)
-https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
+https-everywhere.menu.enableDisable = à¤¸à¤à¥à¤·à¤® / à¤à¤à¥à¤·à¤® 
à¤à¤°à¤£à¥à¤¯à¤¾à¤à¥ à¤¨à¤¿à¤¯à¤®
+https-everywhere.menu.noRules = (à¤¯à¤¾ à¤ªà¥à¤·à¥à¤ à¤¾à¤¸à¤¾à¤ à¥ 
à¤à¥à¤£à¤¤à¥à¤¹à¥ à¤¨à¤¿à¤¯à¤® à¤¨à¤¾à¤¹à¥à¤¤)
+https-everywhere.menu.unknownRules = (à¤¯à¤¾ à¤ªà¥à¤·à¥à¤ à¤¾à¤¸à¤¾à¤ 
à¥à¤à¥ à¤¨à¤¿à¤¯à¤® à¤à¤à¥à¤à¤¾à¤¤)
 https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle 
it on a site-by-site basis by clicking the icon in the address bar.
 https-everywhere.migration.notification0 = In order to implement a crucial 
fix, this update resets your HTTPS Everywhere rule preferences to their default 
values.
-https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests
+https-everywhere.menu.ruleset-tests = HTTPS à¤¨à¥ à¤¸à¤°à¥à¤µà¤¤à¥à¤° 
à¤¨à¤¿à¤¯à¤®à¤ªà¤¤à¥à¤°à¥ à¤à¤¾à¤²à¤µà¤¾

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

[tor-commits] [tor-browser-build/master] Bump rbm (picking up fix for #25435)

[tor-commits] [rbm/master] Bug 25435: use --no-auto-check-trustdb to avoid modifying gpg keyring files

[tor-commits] [meek/master] Update programVersion = "0.30".

[tor-commits] [meek/master] Use autocert Manager.HTTPHandler (ACME HTTP-01 challenge)

[tor-commits] [meek/master] Regen man pages.

[tor-commits] [meek/master] Minor man page enhancements.

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

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

[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

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

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

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

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

[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

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

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

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

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

[tor-commits] [tor-browser-build/master] Bump rbm (picking up fix for #25422)

[tor-commits] [rbm/master] Bug 25422: Give more details in "Cannot checkout" errors

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

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

23 matches

Site Navigation

Mail list logo

Footer information