date:20181111

[tor-commits] [stem/master] Add a descriptor type_annotation method

2018-11-11 Thread atagar

commit 1fa75186657a6b5f1f839314ed666ccf618abc7a
Author: Damian Johnson 
Date:   Sun Nov 11 17:11:38 2018 -0800

Add a descriptor type_annotation method

Interesting feature request from irl...

  https://trac.torproject.org/projects/tor/ticket/28397

We can't knowledgeably provide a version number (those come from CollecTor,
for instance to specify which bridge scrubbing specification metrics used). 
But
we can certainly provide a valid annotation.
---
 docs/change_log.rst|  1 +
 stem/descriptor/__init__.py| 59 ++
 stem/descriptor/extrainfo_descriptor.py|  4 ++
 stem/descriptor/hidden_service_descriptor.py   |  2 +
 stem/descriptor/microdescriptor.py |  2 +
 stem/descriptor/networkstatus.py   | 17 +++
 stem/descriptor/server_descriptor.py   |  4 ++
 stem/descriptor/tordnsel.py|  2 +
 test/unit/descriptor/extrainfo_descriptor.py   |  4 ++
 test/unit/descriptor/hidden_service_descriptor.py  |  1 +
 test/unit/descriptor/microdescriptor.py|  2 +
 .../descriptor/networkstatus/bridge_document.py|  1 +
 test/unit/descriptor/networkstatus/document_v2.py  |  1 +
 test/unit/descriptor/networkstatus/document_v3.py  |  4 ++
 .../descriptor/networkstatus/key_certificate.py|  1 +
 test/unit/descriptor/server_descriptor.py  |  2 +
 test/unit/descriptor/tordnsel.py   |  2 +
 17 files changed, 99 insertions(+), 10 deletions(-)

diff --git a/docs/change_log.rst b/docs/change_log.rst
index 01f3f2a4..f8db0b52 100644
--- a/docs/change_log.rst
+++ b/docs/change_log.rst
@@ -51,6 +51,7 @@ The following are only available within Stem's `git repository
 
  * **Descriptors**
 
+  * Added :func:`~stem.descriptor.Descriptor.type_annotation` method 
(:trac:`28397`)
   * DescriptorDownloader crashed if **use_mirrors** is set (:trac:`28393`)
   * Don't download from Serge, a bridge authority that frequently timeout
 
diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py
index a9860140..13c69f11 100644
--- a/stem/descriptor/__init__.py
+++ b/stem/descriptor/__init__.py
@@ -125,6 +125,24 @@ DocumentHandler = stem.util.enum.UppercaseEnum(
 )
 
 
+class TypeAnnotation(collections.namedtuple('TypeAnnotation', ['name', 
'major_version', 'minor_version'])):
+  """
+  `Tor metrics type annotation
+  `_. The
+  string representation is the header annotation, for example "@type
+  server-descriptor 1.0".
+
+  .. versionadded:: 1.8.0
+
+  :var str name: name of the descriptor type
+  :var int major_version: major version number
+  :var int minor_version: minor version number
+  """
+
+  def __str__(self):
+return '@type %s %s.%s' % (self.name, self.major_version, 
self.minor_version)
+
+
 class SigningKey(collections.namedtuple('SigningKey', ['private', 'public', 
'public_digest'])):
   """
   Key used by relays to sign their server and extrainfo descriptors.
@@ -333,30 +351,30 @@ def _parse_metrics_file(descriptor_type, major_version, 
minor_version, descripto
   # Parses descriptor files from metrics, yielding individual descriptors. This
   # throws a TypeError if the descriptor_type or version isn't recognized.
 
-  if descriptor_type == 'server-descriptor' and major_version == 1:
+  if descriptor_type == 
stem.descriptor.server_descriptor.RelayDescriptor.TYPE_ANNOTATION_NAME and 
major_version == 1:
 for desc in stem.descriptor.server_descriptor._parse_file(descriptor_file, 
is_bridge = False, validate = validate, **kwargs):
   yield desc
-  elif descriptor_type == 'bridge-server-descriptor' and major_version == 1:
+  elif descriptor_type == 
stem.descriptor.server_descriptor.BridgeDescriptor.TYPE_ANNOTATION_NAME and 
major_version == 1:
 for desc in stem.descriptor.server_descriptor._parse_file(descriptor_file, 
is_bridge = True, validate = validate, **kwargs):
   yield desc
-  elif descriptor_type == 'extra-info' and major_version == 1:
+  elif descriptor_type == 
stem.descriptor.extrainfo_descriptor.RelayExtraInfoDescriptor.TYPE_ANNOTATION_NAME
 and major_version == 1:
 for desc in 
stem.descriptor.extrainfo_descriptor._parse_file(descriptor_file, is_bridge = 
False, validate = validate, **kwargs):
   yield desc
-  elif descriptor_type == 'microdescriptor' and major_version == 1:
+  elif descriptor_type == 
stem.descriptor.microdescriptor.Microdescriptor.TYPE_ANNOTATION_NAME and 
major_version == 1:
 for desc in stem.descriptor.microdescriptor._parse_file(descriptor_file, 
validate = validate, **kwargs):
   yield desc
-  elif descriptor_type == 'bridge-extra-info' and major_version == 1:
+  elif descriptor_type == 
stem.descriptor.extrainfo_descriptor.BridgeExtraInfoDescriptor.TYPE_ANNOTATION_NAME
 and major_version == 1:
 # version 1.1 introduced a 'transport' field...
 #

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5

2018-11-11 Thread nickm

commit 896d0ebb994cc0b1df2c9497fcf3afe55654d01f
Merge: 76ed869ff 1fce9d129
Author: Nick Mathewson 
Date:   Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

 src/lib/tls/tortls_openssl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc src/lib/tls/tortls_openssl.c
index 235620714,0..63f6259a6
mode 100644,00..100644
--- a/src/lib/tls/tortls_openssl.c
+++ b/src/lib/tls/tortls_openssl.c
@@@ -1,1751 -1,0 +1,1751 @@@
 +/* Copyright (c) 2003, Roger Dingledine.
 + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
 + * Copyright (c) 2007-2018, The Tor Project, Inc. */
 +/* See LICENSE for licensing information */
 +
 +/**
 + * \file tortls.c
 + * \brief Wrapper functions to present a consistent interface to
 + * TLS, SSL, and X.509 functions from OpenSSL.
 + **/
 +
 +/* (Unlike other tor functions, these
 + * are prefixed with tor_ in order to avoid conflicting with OpenSSL
 + * functions and variables.)
 + */
 +
 +#include "orconfig.h"
 +
 +#define TORTLS_PRIVATE
 +#define TORTLS_OPENSSL_PRIVATE
 +#define TOR_X509_PRIVATE
 +
 +#ifdef _WIN32
 +  /* We need to include these here, or else the dtls1.h header will include
 +   *  and mess things up, in at least some openssl versions. */
 +  #include 
 +  #include 
 +#endif
 +
 +#include "lib/crypt_ops/crypto_cipher.h"
 +#include "lib/crypt_ops/crypto_rand.h"
 +#include "lib/crypt_ops/crypto_dh.h"
 +#include "lib/crypt_ops/crypto_util.h"
 +#include "lib/crypt_ops/compat_openssl.h"
 +#include "lib/tls/x509.h"
 +#include "lib/tls/x509_internal.h"
 +
 +/* Some versions of OpenSSL declare SSL_get_selected_srtp_profile twice in
 + * srtp.h. Suppress the GCC warning so we can build with -Wredundant-decl. */
 +DISABLE_GCC_WARNING(redundant-decls)
 +
 +#include 
 +
 +#ifdef OPENSSL_NO_EC
 +#error "We require OpenSSL with ECC support"
 +#endif
 +
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +
 +ENABLE_GCC_WARNING(redundant-decls)
 +
 +#include "lib/tls/tortls.h"
 +#include "lib/tls/tortls_st.h"
 +#include "lib/tls/tortls_internal.h"
 +#include "lib/log/log.h"
 +#include "lib/log/util_bug.h"
 +#include "lib/container/smartlist.h"
 +#include "lib/string/compat_string.h"
 +#include "lib/string/printf.h"
 +#include "lib/net/socket.h"
 +#include "lib/intmath/cmp.h"
 +#include "lib/ctime/di_ops.h"
 +#include "lib/encoding/time_fmt.h"
 +
 +#include 
 +#include 
 +
 +#include "lib/arch/bytes.h"
 +
 +/* Copied from or.h */
 +#define LEGAL_NICKNAME_CHARACTERS \
 +  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 +
 +#define ADDR(tls) (((tls) && (tls)->address) ? tls->address : "peer")
 +
 +#if OPENSSL_VERSION_NUMBER <  OPENSSL_V(1,0,0,'f')
 +/* This is a version of OpenSSL before 1.0.0f. It does not have
 + * the CVE-2011-4576 fix, and as such it can't use RELEASE_BUFFERS and
 + * SSL3 safely at the same time.
 + */
 +#define DISABLE_SSL3_HANDSHAKE
 +#endif /* OPENSSL_VERSION_NUMBER <  OPENSSL_V(1,0,0,'f') */
 +
 +/* We redefine these so that we can run correctly even if the vendor gives us
 + * a version of OpenSSL that does not match its header files.  (Apple: I am
 + * looking at you.)
 + */
 +#ifndef SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION
 +#define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0004L
 +#endif
 +#ifndef SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION
 +#define SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0010
 +#endif
 +
 +/** Return values for tor_tls_classify_client_ciphers.
 + *
 + * @{
 + */
 +/** An error occurred when examining the client ciphers */
 +#define CIPHERS_ERR -1
 +/** The client cipher list indicates that a v1 handshake was in use. */
 +#define CIPHERS_V1 1
 +/** The client cipher list indicates that the client is using the v2 or the
 + * v3 handshake, but that it is (probably!) lying about what ciphers it
 + * supports */
 +#define CIPHERS_V2 2
 +/** The client cipher list indicates that the client is using the v2 or the
 + * v3 handshake, and that it is telling the truth about what ciphers it
 + * supports */
 +#define CIPHERS_UNRESTRICTED 3
 +/** @} */
 +
 +/** The ex_data index in which we store a pointer to an SSL object's
 + * corresponding tor_tls_t object. */
 +STATIC int tor_tls_object_ex_data_index = -1;
 +
 +/** Helper: Allocate tor_tls_object_ex_data_index. */
 +void
 +tor_tls_allocate_tor_tls_object_ex_data_index(void)
 +{
 +  if (tor_tls_object_ex_data_index == -1) {
 +tor_tls_object_ex_data_index =
 +  SSL_get_ex_new_index(0, NULL, NULL, NULL, NULL);
 +tor_assert(tor_tls_object_ex_data_index != -1);
 +  }
 +}
 +
 +/** Helper: given a SSL* pointer, return the tor_tls_t object using that
 + * pointer. */
 +tor_tls_t *
 +tor_tls_get_by_ssl(const SSL *ssl)
 +{
 +  tor_tls_t *result = SSL_get_ex_data(ssl, tor_tls_object_ex_data_index);
 +  if (result)
 +tor_assert(result->magic == TOR_TLS_MAGIC);
 +  return result;
 +}
 +
 +/** True iff tor_tls_init() has been called. */
 +static int

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-11-11 Thread nickm

commit 1fce9d129604ea25db4a697218e961c0dadf0133
Merge: 6b2ff4fff 93b6d4137
Author: Nick Mathewson 
Date:   Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)




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

[tor-commits] [tor/release-0.3.5] Fix a bug in usage of SSL_set1_groups_list()

2018-11-11 Thread nickm

commit 46796623f995c5b63d5cfbda1a038d9f6158ec90
Author: Nick Mathewson 
Date:   Sun Nov 11 18:03:50 2018 -0500

Fix a bug in usage of SSL_set1_groups_list()

Apparently, even though the manpage says it returns an int, it
can return a long instead and cause a warning.

Bug not in any released Tor.  Part of #28399
---
 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 7c50f8711..1fbe3c663 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1228,7 +1228,7 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int 
key_lifetime,
   list = "P-256:P-224";
 else
   list = "P-256:P-224";
-int r = SSL_CTX_set1_groups_list(result->ctx, list);
+int r = (int) SSL_CTX_set1_groups_list(result->ctx, list);
 if (r < 0)
   goto error;
   }



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

[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4

2018-11-11 Thread nickm

commit 73378e9ac1039539d7c510a22aa839f399ee5603
Merge: 8714e98e8 1fce9d129
Author: Nick Mathewson 
Date:   Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.3.4' into release-0.3.4

 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.3

2018-11-11 Thread nickm

commit 93b6d4137491cffc906e34dcd3cd4d284ad89e2f
Merge: d0c3723c3 46796623f
Author: Nick Mathewson 
Date:   Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)




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

[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-11-11 Thread nickm

commit 1fce9d129604ea25db4a697218e961c0dadf0133
Merge: 6b2ff4fff 93b6d4137
Author: Nick Mathewson 
Date:   Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)




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

[tor-commits] [tor/release-0.3.4] Fix a bug in usage of SSL_set1_groups_list()

2018-11-11 Thread nickm

commit 46796623f995c5b63d5cfbda1a038d9f6158ec90
Author: Nick Mathewson 
Date:   Sun Nov 11 18:03:50 2018 -0500

Fix a bug in usage of SSL_set1_groups_list()

Apparently, even though the manpage says it returns an int, it
can return a long instead and cause a warning.

Bug not in any released Tor.  Part of #28399
---
 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 7c50f8711..1fbe3c663 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1228,7 +1228,7 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int 
key_lifetime,
   list = "P-256:P-224";
 else
   list = "P-256:P-224";
-int r = SSL_CTX_set1_groups_list(result->ctx, list);
+int r = (int) SSL_CTX_set1_groups_list(result->ctx, list);
 if (r < 0)
   goto error;
   }



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

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

2018-11-11 Thread nickm

commit c97c2c690e6c96291882ff1a5826020d82719419
Merge: 9617b596b 896d0ebb9
Author: Nick Mathewson 
Date:   Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

 src/lib/tls/tortls_openssl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5

2018-11-11 Thread nickm

commit 896d0ebb994cc0b1df2c9497fcf3afe55654d01f
Merge: 76ed869ff 1fce9d129
Author: Nick Mathewson 
Date:   Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

 src/lib/tls/tortls_openssl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc src/lib/tls/tortls_openssl.c
index 235620714,0..63f6259a6
mode 100644,00..100644
--- a/src/lib/tls/tortls_openssl.c
+++ b/src/lib/tls/tortls_openssl.c
@@@ -1,1751 -1,0 +1,1751 @@@
 +/* Copyright (c) 2003, Roger Dingledine.
 + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
 + * Copyright (c) 2007-2018, The Tor Project, Inc. */
 +/* See LICENSE for licensing information */
 +
 +/**
 + * \file tortls.c
 + * \brief Wrapper functions to present a consistent interface to
 + * TLS, SSL, and X.509 functions from OpenSSL.
 + **/
 +
 +/* (Unlike other tor functions, these
 + * are prefixed with tor_ in order to avoid conflicting with OpenSSL
 + * functions and variables.)
 + */
 +
 +#include "orconfig.h"
 +
 +#define TORTLS_PRIVATE
 +#define TORTLS_OPENSSL_PRIVATE
 +#define TOR_X509_PRIVATE
 +
 +#ifdef _WIN32
 +  /* We need to include these here, or else the dtls1.h header will include
 +   *  and mess things up, in at least some openssl versions. */
 +  #include 
 +  #include 
 +#endif
 +
 +#include "lib/crypt_ops/crypto_cipher.h"
 +#include "lib/crypt_ops/crypto_rand.h"
 +#include "lib/crypt_ops/crypto_dh.h"
 +#include "lib/crypt_ops/crypto_util.h"
 +#include "lib/crypt_ops/compat_openssl.h"
 +#include "lib/tls/x509.h"
 +#include "lib/tls/x509_internal.h"
 +
 +/* Some versions of OpenSSL declare SSL_get_selected_srtp_profile twice in
 + * srtp.h. Suppress the GCC warning so we can build with -Wredundant-decl. */
 +DISABLE_GCC_WARNING(redundant-decls)
 +
 +#include 
 +
 +#ifdef OPENSSL_NO_EC
 +#error "We require OpenSSL with ECC support"
 +#endif
 +
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +
 +ENABLE_GCC_WARNING(redundant-decls)
 +
 +#include "lib/tls/tortls.h"
 +#include "lib/tls/tortls_st.h"
 +#include "lib/tls/tortls_internal.h"
 +#include "lib/log/log.h"
 +#include "lib/log/util_bug.h"
 +#include "lib/container/smartlist.h"
 +#include "lib/string/compat_string.h"
 +#include "lib/string/printf.h"
 +#include "lib/net/socket.h"
 +#include "lib/intmath/cmp.h"
 +#include "lib/ctime/di_ops.h"
 +#include "lib/encoding/time_fmt.h"
 +
 +#include 
 +#include 
 +
 +#include "lib/arch/bytes.h"
 +
 +/* Copied from or.h */
 +#define LEGAL_NICKNAME_CHARACTERS \
 +  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 +
 +#define ADDR(tls) (((tls) && (tls)->address) ? tls->address : "peer")
 +
 +#if OPENSSL_VERSION_NUMBER <  OPENSSL_V(1,0,0,'f')
 +/* This is a version of OpenSSL before 1.0.0f. It does not have
 + * the CVE-2011-4576 fix, and as such it can't use RELEASE_BUFFERS and
 + * SSL3 safely at the same time.
 + */
 +#define DISABLE_SSL3_HANDSHAKE
 +#endif /* OPENSSL_VERSION_NUMBER <  OPENSSL_V(1,0,0,'f') */
 +
 +/* We redefine these so that we can run correctly even if the vendor gives us
 + * a version of OpenSSL that does not match its header files.  (Apple: I am
 + * looking at you.)
 + */
 +#ifndef SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION
 +#define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0004L
 +#endif
 +#ifndef SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION
 +#define SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0010
 +#endif
 +
 +/** Return values for tor_tls_classify_client_ciphers.
 + *
 + * @{
 + */
 +/** An error occurred when examining the client ciphers */
 +#define CIPHERS_ERR -1
 +/** The client cipher list indicates that a v1 handshake was in use. */
 +#define CIPHERS_V1 1
 +/** The client cipher list indicates that the client is using the v2 or the
 + * v3 handshake, but that it is (probably!) lying about what ciphers it
 + * supports */
 +#define CIPHERS_V2 2
 +/** The client cipher list indicates that the client is using the v2 or the
 + * v3 handshake, and that it is telling the truth about what ciphers it
 + * supports */
 +#define CIPHERS_UNRESTRICTED 3
 +/** @} */
 +
 +/** The ex_data index in which we store a pointer to an SSL object's
 + * corresponding tor_tls_t object. */
 +STATIC int tor_tls_object_ex_data_index = -1;
 +
 +/** Helper: Allocate tor_tls_object_ex_data_index. */
 +void
 +tor_tls_allocate_tor_tls_object_ex_data_index(void)
 +{
 +  if (tor_tls_object_ex_data_index == -1) {
 +tor_tls_object_ex_data_index =
 +  SSL_get_ex_new_index(0, NULL, NULL, NULL, NULL);
 +tor_assert(tor_tls_object_ex_data_index != -1);
 +  }
 +}
 +
 +/** Helper: given a SSL* pointer, return the tor_tls_t object using that
 + * pointer. */
 +tor_tls_t *
 +tor_tls_get_by_ssl(const SSL *ssl)
 +{
 +  tor_tls_t *result = SSL_get_ex_data(ssl, tor_tls_object_ex_data_index);
 +  if (result)
 +tor_assert(result->magic == TOR_TLS_MAGIC);
 +  return result;
 +}
 +
 +/** True iff tor_tls_init() has been called. */
 +static int

[tor-commits] [tor/release-0.2.9] Fix a bug in usage of SSL_set1_groups_list()

2018-11-11 Thread nickm

commit 46796623f995c5b63d5cfbda1a038d9f6158ec90
Author: Nick Mathewson 
Date:   Sun Nov 11 18:03:50 2018 -0500

Fix a bug in usage of SSL_set1_groups_list()

Apparently, even though the manpage says it returns an int, it
can return a long instead and cause a warning.

Bug not in any released Tor.  Part of #28399
---
 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 7c50f8711..1fbe3c663 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1228,7 +1228,7 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int 
key_lifetime,
   list = "P-256:P-224";
 else
   list = "P-256:P-224";
-int r = SSL_CTX_set1_groups_list(result->ctx, list);
+int r = (int) SSL_CTX_set1_groups_list(result->ctx, list);
 if (r < 0)
   goto error;
   }



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

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.3

2018-11-11 Thread nickm

commit 93b6d4137491cffc906e34dcd3cd4d284ad89e2f
Merge: d0c3723c3 46796623f
Author: Nick Mathewson 
Date:   Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)




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

[tor-commits] [tor/master] Fix a bug in usage of SSL_set1_groups_list()

2018-11-11 Thread nickm

commit 46796623f995c5b63d5cfbda1a038d9f6158ec90
Author: Nick Mathewson 
Date:   Sun Nov 11 18:03:50 2018 -0500

Fix a bug in usage of SSL_set1_groups_list()

Apparently, even though the manpage says it returns an int, it
can return a long instead and cause a warning.

Bug not in any released Tor.  Part of #28399
---
 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 7c50f8711..1fbe3c663 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1228,7 +1228,7 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int 
key_lifetime,
   list = "P-256:P-224";
 else
   list = "P-256:P-224";
-int r = SSL_CTX_set1_groups_list(result->ctx, list);
+int r = (int) SSL_CTX_set1_groups_list(result->ctx, list);
 if (r < 0)
   goto error;
   }



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

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

2018-11-11 Thread nickm

commit 93b6d4137491cffc906e34dcd3cd4d284ad89e2f
Merge: d0c3723c3 46796623f
Author: Nick Mathewson 
Date:   Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)




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

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3

2018-11-11 Thread nickm

commit 93b6d4137491cffc906e34dcd3cd4d284ad89e2f
Merge: d0c3723c3 46796623f
Author: Nick Mathewson 
Date:   Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)




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

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-11-11 Thread nickm

commit c079be8c7d73110577ef5d16cc7e40d9789627ef
Merge: c15a556a9 93b6d4137
Author: Nick Mathewson 
Date:   Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3

2018-11-11 Thread nickm

commit 93b6d4137491cffc906e34dcd3cd4d284ad89e2f
Merge: d0c3723c3 46796623f
Author: Nick Mathewson 
Date:   Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)




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

[tor-commits] [tor/maint-0.3.4] Fix a bug in usage of SSL_set1_groups_list()

2018-11-11 Thread nickm

commit 46796623f995c5b63d5cfbda1a038d9f6158ec90
Author: Nick Mathewson 
Date:   Sun Nov 11 18:03:50 2018 -0500

Fix a bug in usage of SSL_set1_groups_list()

Apparently, even though the manpage says it returns an int, it
can return a long instead and cause a warning.

Bug not in any released Tor.  Part of #28399
---
 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 7c50f8711..1fbe3c663 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1228,7 +1228,7 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int 
key_lifetime,
   list = "P-256:P-224";
 else
   list = "P-256:P-224";
-int r = SSL_CTX_set1_groups_list(result->ctx, list);
+int r = (int) SSL_CTX_set1_groups_list(result->ctx, list);
 if (r < 0)
   goto error;
   }



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

[tor-commits] [tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5

2018-11-11 Thread nickm

commit 896d0ebb994cc0b1df2c9497fcf3afe55654d01f
Merge: 76ed869ff 1fce9d129
Author: Nick Mathewson 
Date:   Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

 src/lib/tls/tortls_openssl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc src/lib/tls/tortls_openssl.c
index 235620714,0..63f6259a6
mode 100644,00..100644
--- a/src/lib/tls/tortls_openssl.c
+++ b/src/lib/tls/tortls_openssl.c
@@@ -1,1751 -1,0 +1,1751 @@@
 +/* Copyright (c) 2003, Roger Dingledine.
 + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
 + * Copyright (c) 2007-2018, The Tor Project, Inc. */
 +/* See LICENSE for licensing information */
 +
 +/**
 + * \file tortls.c
 + * \brief Wrapper functions to present a consistent interface to
 + * TLS, SSL, and X.509 functions from OpenSSL.
 + **/
 +
 +/* (Unlike other tor functions, these
 + * are prefixed with tor_ in order to avoid conflicting with OpenSSL
 + * functions and variables.)
 + */
 +
 +#include "orconfig.h"
 +
 +#define TORTLS_PRIVATE
 +#define TORTLS_OPENSSL_PRIVATE
 +#define TOR_X509_PRIVATE
 +
 +#ifdef _WIN32
 +  /* We need to include these here, or else the dtls1.h header will include
 +   *  and mess things up, in at least some openssl versions. */
 +  #include 
 +  #include 
 +#endif
 +
 +#include "lib/crypt_ops/crypto_cipher.h"
 +#include "lib/crypt_ops/crypto_rand.h"
 +#include "lib/crypt_ops/crypto_dh.h"
 +#include "lib/crypt_ops/crypto_util.h"
 +#include "lib/crypt_ops/compat_openssl.h"
 +#include "lib/tls/x509.h"
 +#include "lib/tls/x509_internal.h"
 +
 +/* Some versions of OpenSSL declare SSL_get_selected_srtp_profile twice in
 + * srtp.h. Suppress the GCC warning so we can build with -Wredundant-decl. */
 +DISABLE_GCC_WARNING(redundant-decls)
 +
 +#include 
 +
 +#ifdef OPENSSL_NO_EC
 +#error "We require OpenSSL with ECC support"
 +#endif
 +
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +
 +ENABLE_GCC_WARNING(redundant-decls)
 +
 +#include "lib/tls/tortls.h"
 +#include "lib/tls/tortls_st.h"
 +#include "lib/tls/tortls_internal.h"
 +#include "lib/log/log.h"
 +#include "lib/log/util_bug.h"
 +#include "lib/container/smartlist.h"
 +#include "lib/string/compat_string.h"
 +#include "lib/string/printf.h"
 +#include "lib/net/socket.h"
 +#include "lib/intmath/cmp.h"
 +#include "lib/ctime/di_ops.h"
 +#include "lib/encoding/time_fmt.h"
 +
 +#include 
 +#include 
 +
 +#include "lib/arch/bytes.h"
 +
 +/* Copied from or.h */
 +#define LEGAL_NICKNAME_CHARACTERS \
 +  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 +
 +#define ADDR(tls) (((tls) && (tls)->address) ? tls->address : "peer")
 +
 +#if OPENSSL_VERSION_NUMBER <  OPENSSL_V(1,0,0,'f')
 +/* This is a version of OpenSSL before 1.0.0f. It does not have
 + * the CVE-2011-4576 fix, and as such it can't use RELEASE_BUFFERS and
 + * SSL3 safely at the same time.
 + */
 +#define DISABLE_SSL3_HANDSHAKE
 +#endif /* OPENSSL_VERSION_NUMBER <  OPENSSL_V(1,0,0,'f') */
 +
 +/* We redefine these so that we can run correctly even if the vendor gives us
 + * a version of OpenSSL that does not match its header files.  (Apple: I am
 + * looking at you.)
 + */
 +#ifndef SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION
 +#define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0004L
 +#endif
 +#ifndef SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION
 +#define SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0010
 +#endif
 +
 +/** Return values for tor_tls_classify_client_ciphers.
 + *
 + * @{
 + */
 +/** An error occurred when examining the client ciphers */
 +#define CIPHERS_ERR -1
 +/** The client cipher list indicates that a v1 handshake was in use. */
 +#define CIPHERS_V1 1
 +/** The client cipher list indicates that the client is using the v2 or the
 + * v3 handshake, but that it is (probably!) lying about what ciphers it
 + * supports */
 +#define CIPHERS_V2 2
 +/** The client cipher list indicates that the client is using the v2 or the
 + * v3 handshake, and that it is telling the truth about what ciphers it
 + * supports */
 +#define CIPHERS_UNRESTRICTED 3
 +/** @} */
 +
 +/** The ex_data index in which we store a pointer to an SSL object's
 + * corresponding tor_tls_t object. */
 +STATIC int tor_tls_object_ex_data_index = -1;
 +
 +/** Helper: Allocate tor_tls_object_ex_data_index. */
 +void
 +tor_tls_allocate_tor_tls_object_ex_data_index(void)
 +{
 +  if (tor_tls_object_ex_data_index == -1) {
 +tor_tls_object_ex_data_index =
 +  SSL_get_ex_new_index(0, NULL, NULL, NULL, NULL);
 +tor_assert(tor_tls_object_ex_data_index != -1);
 +  }
 +}
 +
 +/** Helper: given a SSL* pointer, return the tor_tls_t object using that
 + * pointer. */
 +tor_tls_t *
 +tor_tls_get_by_ssl(const SSL *ssl)
 +{
 +  tor_tls_t *result = SSL_get_ex_data(ssl, tor_tls_object_ex_data_index);
 +  if (result)
 +tor_assert(result->magic == TOR_TLS_MAGIC);
 +  return result;
 +}
 +
 +/** True iff tor_tls_init() has been called. */
 +static int

[tor-commits] [tor/release-0.3.3] Fix a bug in usage of SSL_set1_groups_list()

2018-11-11 Thread nickm

commit 46796623f995c5b63d5cfbda1a038d9f6158ec90
Author: Nick Mathewson 
Date:   Sun Nov 11 18:03:50 2018 -0500

Fix a bug in usage of SSL_set1_groups_list()

Apparently, even though the manpage says it returns an int, it
can return a long instead and cause a warning.

Bug not in any released Tor.  Part of #28399
---
 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 7c50f8711..1fbe3c663 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1228,7 +1228,7 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int 
key_lifetime,
   list = "P-256:P-224";
 else
   list = "P-256:P-224";
-int r = SSL_CTX_set1_groups_list(result->ctx, list);
+int r = (int) SSL_CTX_set1_groups_list(result->ctx, list);
 if (r < 0)
   goto error;
   }



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

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-11-11 Thread nickm

commit 1fce9d129604ea25db4a697218e961c0dadf0133
Merge: 6b2ff4fff 93b6d4137
Author: Nick Mathewson 
Date:   Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)




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

[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

2018-11-11 Thread nickm

commit d1e9285b1de1f6ec94494196c6e2daf4e5c615c0
Merge: e27dff08a 896d0ebb9
Author: Nick Mathewson 
Date:   Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.3.5'

 src/lib/tls/tortls_openssl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.3

2018-11-11 Thread nickm

commit 93b6d4137491cffc906e34dcd3cd4d284ad89e2f
Merge: d0c3723c3 46796623f
Author: Nick Mathewson 
Date:   Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2018-11-11 Thread nickm

commit 79443fd82e560e89c8ee60746ea6f130ec63ce7a
Merge: 65d4551a3 46796623f
Author: Nick Mathewson 
Date:   Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-11-11 Thread nickm

commit 1fce9d129604ea25db4a697218e961c0dadf0133
Merge: 6b2ff4fff 93b6d4137
Author: Nick Mathewson 
Date:   Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)




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

[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-11-11 Thread nickm

commit 1fce9d129604ea25db4a697218e961c0dadf0133
Merge: 6b2ff4fff 93b6d4137
Author: Nick Mathewson 
Date:   Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[tor-commits] [tor/maint-0.2.9] Fix a bug in usage of SSL_set1_groups_list()

2018-11-11 Thread nickm

commit 46796623f995c5b63d5cfbda1a038d9f6158ec90
Author: Nick Mathewson 
Date:   Sun Nov 11 18:03:50 2018 -0500

Fix a bug in usage of SSL_set1_groups_list()

Apparently, even though the manpage says it returns an int, it
can return a long instead and cause a warning.

Bug not in any released Tor.  Part of #28399
---
 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 7c50f8711..1fbe3c663 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1228,7 +1228,7 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int 
key_lifetime,
   list = "P-256:P-224";
 else
   list = "P-256:P-224";
-int r = SSL_CTX_set1_groups_list(result->ctx, list);
+int r = (int) SSL_CTX_set1_groups_list(result->ctx, list);
 if (r < 0)
   goto error;
   }

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

[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.3

2018-11-11 Thread nickm

commit 93b6d4137491cffc906e34dcd3cd4d284ad89e2f
Merge: d0c3723c3 46796623f
Author: Nick Mathewson 
Date:   Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)




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

[tor-commits] [tor/maint-0.3.3] Fix a bug in usage of SSL_set1_groups_list()

2018-11-11 Thread nickm

commit 46796623f995c5b63d5cfbda1a038d9f6158ec90
Author: Nick Mathewson 
Date:   Sun Nov 11 18:03:50 2018 -0500

Fix a bug in usage of SSL_set1_groups_list()

Apparently, even though the manpage says it returns an int, it
can return a long instead and cause a warning.

Bug not in any released Tor.  Part of #28399
---
 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 7c50f8711..1fbe3c663 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1228,7 +1228,7 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int 
key_lifetime,
   list = "P-256:P-224";
 else
   list = "P-256:P-224";
-int r = SSL_CTX_set1_groups_list(result->ctx, list);
+int r = (int) SSL_CTX_set1_groups_list(result->ctx, list);
 if (r < 0)
   goto error;
   }



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

[tor-commits] [tor/maint-0.3.5] Fix a bug in usage of SSL_set1_groups_list()

2018-11-11 Thread nickm

commit 46796623f995c5b63d5cfbda1a038d9f6158ec90
Author: Nick Mathewson 
Date:   Sun Nov 11 18:03:50 2018 -0500

Fix a bug in usage of SSL_set1_groups_list()

Apparently, even though the manpage says it returns an int, it
can return a long instead and cause a warning.

Bug not in any released Tor.  Part of #28399
---
 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 7c50f8711..1fbe3c663 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1228,7 +1228,7 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int 
key_lifetime,
   list = "P-256:P-224";
 else
   list = "P-256:P-224";
-int r = SSL_CTX_set1_groups_list(result->ctx, list);
+int r = (int) SSL_CTX_set1_groups_list(result->ctx, list);
 if (r < 0)
   goto error;
   }



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

[tor-commits] [translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed

2018-11-11 Thread translation

commit c08f5a38a650b75b002dec96b0e39b3bd0215f8e
Author: Translation commit bot 
Date:   Sun Nov 11 21:46:41 2018 +

Update translations for tails-openpgp-applet_completed
---
 es/openpgp-applet.pot | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/es/openpgp-applet.pot b/es/openpgp-applet.pot
index f9a08baf6..f958fa0a5 100644
--- a/es/openpgp-applet.pot
+++ b/es/openpgp-applet.pot
@@ -7,11 +7,11 @@
 # strel, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2018-04-12 19:13+\n"
-"Last-Translator: IDRASSI Mounir \n"
+"PO-Revision-Date: 2018-11-11 21:20+\n"
+"Last-Translator: Zuhualime Akoochimoya\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet

2018-11-11 Thread translation

commit 20b1f80b3735b38f714e54604bdecb905e80404f
Author: Translation commit bot 
Date:   Sun Nov 11 21:46:33 2018 +

Update translations for tails-openpgp-applet
---
 es/openpgp-applet.pot | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/es/openpgp-applet.pot b/es/openpgp-applet.pot
index f9a08baf6..f958fa0a5 100644
--- a/es/openpgp-applet.pot
+++ b/es/openpgp-applet.pot
@@ -7,11 +7,11 @@
 # strel, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2018-04-12 19:13+\n"
-"Last-Translator: IDRASSI Mounir \n"
+"PO-Revision-Date: 2018-11-11 21:20+\n"
+"Last-Translator: Zuhualime Akoochimoya\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-11-11 Thread nickm

commit 6b2ff4fff8d33acd44cacf8e4907a6382c40e216
Merge: 591a189fa d0c3723c3
Author: Nick Mathewson 
Date:   Sun Nov 11 11:57:53 2018 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/geoip-2018-11-06 | 4 +
 src/config/geoip | 22164 +++--
 src/config/geoip6|  2572 --
 3 files changed, 13068 insertions(+), 11672 deletions(-)



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

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3

2018-11-11 Thread nickm

commit d0c3723c38e0dba2ec1474c1c3ed75c6d0a7099f
Merge: c06b7f090 5ba3d09a8
Author: Nick Mathewson 
Date:   Sun Nov 11 11:57:52 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2018-11-06 | 4 +
 src/config/geoip | 22164 +++--
 src/config/geoip6|  2572 --
 3 files changed, 13068 insertions(+), 11672 deletions(-)



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

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-11-11 Thread nickm

commit 6b2ff4fff8d33acd44cacf8e4907a6382c40e216
Merge: 591a189fa d0c3723c3
Author: Nick Mathewson 
Date:   Sun Nov 11 11:57:53 2018 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/geoip-2018-11-06 | 4 +
 src/config/geoip | 22164 +++--
 src/config/geoip6|  2572 --
 3 files changed, 13068 insertions(+), 11672 deletions(-)



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

[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4

2018-11-11 Thread nickm

commit 8714e98e88627cda6bbbfa6103147373695c91f9
Merge: 3ce2d8c4a 6b2ff4fff
Author: Nick Mathewson 
Date:   Sun Nov 11 11:57:53 2018 -0500

Merge branch 'maint-0.3.4' into release-0.3.4

 changes/geoip-2018-11-06 | 4 +
 src/config/geoip | 22164 +++--
 src/config/geoip6|  2572 --
 3 files changed, 13068 insertions(+), 11672 deletions(-)

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

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5

2018-11-11 Thread nickm

commit 76ed869ff9b1e0b33b31ec22c6fd2957edb1ae45
Merge: 2ac2d0a42 6b2ff4fff
Author: Nick Mathewson 
Date:   Sun Nov 11 11:57:53 2018 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

 changes/geoip-2018-11-06 | 4 +
 src/config/geoip | 22164 +++--
 src/config/geoip6|  2572 --
 3 files changed, 13068 insertions(+), 11672 deletions(-)



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

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

2018-11-11 Thread nickm

commit 9617b596ba9c88d0f6f687439bf0059323e22c1d
Merge: 78b85f760 76ed869ff
Author: Nick Mathewson 
Date:   Sun Nov 11 11:57:54 2018 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

 changes/geoip-2018-11-06 | 4 +
 src/config/geoip | 22164 +++--
 src/config/geoip6|  2572 --
 3 files changed, 13068 insertions(+), 11672 deletions(-)

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

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2018-11-11 Thread nickm

commit 65d4551a3fe7143a5ce82888542209dfb3390e60
Merge: 5689caeda 5ba3d09a8
Author: Nick Mathewson 
Date:   Sun Nov 11 11:57:52 2018 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2018-11-06 | 4 +
 src/config/geoip | 22164 +++--
 src/config/geoip6|  2572 --
 3 files changed, 13068 insertions(+), 11672 deletions(-)

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

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.3

2018-11-11 Thread nickm

commit d0c3723c38e0dba2ec1474c1c3ed75c6d0a7099f
Merge: c06b7f090 5ba3d09a8
Author: Nick Mathewson 
Date:   Sun Nov 11 11:57:52 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2018-11-06 | 4 +
 src/config/geoip | 22164 +++--
 src/config/geoip6|  2572 --
 3 files changed, 13068 insertions(+), 11672 deletions(-)



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

[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.3

2018-11-11 Thread nickm

commit d0c3723c38e0dba2ec1474c1c3ed75c6d0a7099f
Merge: c06b7f090 5ba3d09a8
Author: Nick Mathewson 
Date:   Sun Nov 11 11:57:52 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2018-11-06 | 4 +
 src/config/geoip | 22164 +++--
 src/config/geoip6|  2572 --
 3 files changed, 13068 insertions(+), 11672 deletions(-)



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

[tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5

2018-11-11 Thread nickm

commit 76ed869ff9b1e0b33b31ec22c6fd2957edb1ae45
Merge: 2ac2d0a42 6b2ff4fff
Author: Nick Mathewson 
Date:   Sun Nov 11 11:57:53 2018 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

 changes/geoip-2018-11-06 | 4 +
 src/config/geoip | 22164 +++--
 src/config/geoip6|  2572 --
 3 files changed, 13068 insertions(+), 11672 deletions(-)

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

[tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-11-11 Thread nickm

commit 6b2ff4fff8d33acd44cacf8e4907a6382c40e216
Merge: 591a189fa d0c3723c3
Author: Nick Mathewson 
Date:   Sun Nov 11 11:57:53 2018 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/geoip-2018-11-06 | 4 +
 src/config/geoip | 22164 +++--
 src/config/geoip6|  2572 --
 3 files changed, 13068 insertions(+), 11672 deletions(-)



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

[tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3

2018-11-11 Thread nickm

commit d0c3723c38e0dba2ec1474c1c3ed75c6d0a7099f
Merge: c06b7f090 5ba3d09a8
Author: Nick Mathewson 
Date:   Sun Nov 11 11:57:52 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2018-11-06 | 4 +
 src/config/geoip | 22164 +++--
 src/config/geoip6|  2572 --
 3 files changed, 13068 insertions(+), 11672 deletions(-)



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

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-11-11 Thread nickm

commit c15a556a98f368794041b2efe89808908b818f6b
Merge: 93cf98cbb d0c3723c3
Author: Nick Mathewson 
Date:   Sun Nov 11 11:57:52 2018 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/geoip-2018-11-06 | 4 +
 src/config/geoip | 22164 +++--
 src/config/geoip6|  2572 --
 3 files changed, 13068 insertions(+), 11672 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

2018-11-11 Thread nickm

commit d0c3723c38e0dba2ec1474c1c3ed75c6d0a7099f
Merge: c06b7f090 5ba3d09a8
Author: Nick Mathewson 
Date:   Sun Nov 11 11:57:52 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2018-11-06 | 4 +
 src/config/geoip | 22164 +++--
 src/config/geoip6|  2572 --
 3 files changed, 13068 insertions(+), 11672 deletions(-)



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

[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-11-11 Thread nickm

commit 6b2ff4fff8d33acd44cacf8e4907a6382c40e216
Merge: 591a189fa d0c3723c3
Author: Nick Mathewson 
Date:   Sun Nov 11 11:57:53 2018 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/geoip-2018-11-06 | 4 +
 src/config/geoip | 22164 +++--
 src/config/geoip6|  2572 --
 3 files changed, 13068 insertions(+), 11672 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

2018-11-11 Thread nickm

commit e27dff08a344fdd31ac0ab6827deb5b501093bce
Merge: 91355c0fa 76ed869ff
Author: Nick Mathewson 
Date:   Sun Nov 11 11:57:54 2018 -0500

Merge branch 'maint-0.3.5'

 changes/geoip-2018-11-06 | 4 +
 src/config/geoip | 22164 +++--
 src/config/geoip6|  2572 --
 3 files changed, 13068 insertions(+), 11672 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5

2018-11-11 Thread nickm

commit 76ed869ff9b1e0b33b31ec22c6fd2957edb1ae45
Merge: 2ac2d0a42 6b2ff4fff
Author: Nick Mathewson 
Date:   Sun Nov 11 11:57:53 2018 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

 changes/geoip-2018-11-06 | 4 +
 src/config/geoip | 22164 +++--
 src/config/geoip6|  2572 --
 3 files changed, 13068 insertions(+), 11672 deletions(-)



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

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.3

2018-11-11 Thread nickm

commit d0c3723c38e0dba2ec1474c1c3ed75c6d0a7099f
Merge: c06b7f090 5ba3d09a8
Author: Nick Mathewson 
Date:   Sun Nov 11 11:57:52 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2018-11-06 | 4 +
 src/config/geoip | 22164 +++--
 src/config/geoip6|  2572 --
 3 files changed, 13068 insertions(+), 11672 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-11-11 Thread nickm

commit 6b2ff4fff8d33acd44cacf8e4907a6382c40e216
Merge: 591a189fa d0c3723c3
Author: Nick Mathewson 
Date:   Sun Nov 11 11:57:53 2018 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/geoip-2018-11-06 | 4 +
 src/config/geoip | 22164 +++--
 src/config/geoip6|  2572 --
 3 files changed, 13068 insertions(+), 11672 deletions(-)



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

[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.3

2018-11-11 Thread nickm

commit d0c3723c38e0dba2ec1474c1c3ed75c6d0a7099f
Merge: c06b7f090 5ba3d09a8
Author: Nick Mathewson 
Date:   Sun Nov 11 11:57:52 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2018-11-06 | 4 +
 src/config/geoip | 22164 +++--
 src/config/geoip6|  2572 --
 3 files changed, 13068 insertions(+), 11672 deletions(-)



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

[tor-commits] [translation/mat-gui] Update translations for mat-gui

2018-11-11 Thread translation

commit 491dfacab63f765be4d251c7425bb9eff64f5fde
Author: Translation commit bot 
Date:   Sun Nov 11 15:15:58 2018 +

Update translations for mat-gui
---
 ka.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ka.po b/ka.po
index e39df831d..c432d3e22 100644
--- a/ka.po
+++ b/ka.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# A. C. , 2018
+# A. C., 2018
 # George Salukvadze , 2015
 # Kristina Tyskiewicz , 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-10 23:06+0100\n"
-"PO-Revision-Date: 2018-09-30 00:09+\n"
-"Last-Translator: A. C. \n"
+"PO-Revision-Date: 2018-11-11 14:47+\n"
+"Last-Translator: A. C.\n"
 "Language-Team: Georgian 
(http://www.transifex.com/otf/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

[tor-commits] [translation/mat-gui_completed] Update translations for mat-gui_completed

2018-11-11 Thread translation

commit 3d42dbc7a9272d8ee942348de61a39a20c634612
Author: Translation commit bot 
Date:   Sun Nov 11 15:16:03 2018 +

Update translations for mat-gui_completed
---
 ka.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ka.po b/ka.po
index e39df831d..c432d3e22 100644
--- a/ka.po
+++ b/ka.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# A. C. , 2018
+# A. C., 2018
 # George Salukvadze , 2015
 # Kristina Tyskiewicz , 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-10 23:06+0100\n"
-"PO-Revision-Date: 2018-09-30 00:09+\n"
-"Last-Translator: A. C. \n"
+"PO-Revision-Date: 2018-11-11 14:47+\n"
+"Last-Translator: A. C.\n"
 "Language-Team: Georgian 
(http://www.transifex.com/otf/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2018-11-11 Thread translation

commit 6e3f81815e59cfdeb5084e229fb34195efbf6d57
Author: Translation commit bot 
Date:   Sun Nov 11 15:15:20 2018 +

Update translations for donatepages-messagespot
---
 locale/ka/LC_MESSAGES/messages.po | 83 ---
 1 file changed, 43 insertions(+), 40 deletions(-)

diff --git a/locale/ka/LC_MESSAGES/messages.po 
b/locale/ka/LC_MESSAGES/messages.po
index f5199ccd5..6fa9599f9 100644
--- a/locale/ka/LC_MESSAGES/messages.po
+++ b/locale/ka/LC_MESSAGES/messages.po
@@ -303,7 +303,7 @@ msgstr "áááá¡á£á á"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:253
 msgid "Get our limited edition Tor: Strength in Numbers shirt."
-msgstr ""
+msgstr "áááá¦áá Tor-áá¡ á¨ááá¦á£áá£áá 
ááááá¨áááá: áááá¡á£á á á¡áá«áááá á 
áªáá¤á ááá¨á."
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:264
 msgid "t-shirt pack"
@@ -339,34 +339,35 @@ msgstr ""
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:316
 msgid "how do you want to DONATE?"
 msgstr ""
+"ááá á©ááá, áá£ á ááá áá¡á£á á 
áááááááá á¨áááá¬áá 
á£áááá?"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:322
 msgid "Credit Card"
-msgstr ""
+msgstr "á¡ááá áááá¢á ááá ááá"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:338
 msgid "Your Info"
-msgstr ""
+msgstr "áá¥áááá áááááªááááá"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:342
 msgid "* required fields"
-msgstr ""
+msgstr "* áá£áªááááááá áááááá"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:347
 msgid "First Name"
-msgstr ""
+msgstr "á¡áá®ááá"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:351
 msgid "Last Name"
-msgstr ""
+msgstr "áááá á"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:357
 msgid "Street Address"
-msgstr ""
+msgstr "ááá¡áááá áá"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:361
 msgid "Apt."
-msgstr ""
+msgstr "áááá"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:371
 msgid "City"
@@ -374,15 +375,15 @@ msgstr "á¥áááá¥á"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:375
 msgid "State"
-msgstr "ááááááá áááá"
+msgstr "á áááááá"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:380
 msgid "Zip"
-msgstr ""
+msgstr "Zip-áááá"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:386
 msgid "Enter email"
-msgstr ""
+msgstr "ááá£ááááá ááá¤áá¡á¢á"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:390
 msgid "Well email you your receipt"
@@ -394,19 +395,19 @@ msgstr ""
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:404
 msgid "Card Number"
-msgstr ""
+msgstr "ááá áááá¡ ááááá á"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:411
 msgid "MM"
-msgstr ""
+msgstr "MM"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:415
 msgid "YY"
-msgstr ""
+msgstr "YY"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:419
 msgid "CVC"
-msgstr ""
+msgstr "CVC"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:427
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:472
@@ -416,7 +417,7 @@ msgstr ""
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:432
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:440
 msgid "T-shirt:"
-msgstr ""
+msgstr "áááá¡á£á á:"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:450
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:454
@@ -430,7 +431,7 @@ msgstr "áááá¦áá á¨áááá¬áá 
á£áááá"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:476
 msgid "T-Shirt"
-msgstr ""
+msgstr "áááá¡á£á á"
 
 #:

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2018-11-11 Thread translation

commit 18260c3a22aba424b6ba19d0b1df5d14781cf948
Author: Translation commit bot 
Date:   Sun Nov 11 14:45:21 2018 +

Update translations for donatepages-messagespot
---
 locale/ka/LC_MESSAGES/messages.po | 63 ++-
 1 file changed, 36 insertions(+), 27 deletions(-)

diff --git a/locale/ka/LC_MESSAGES/messages.po 
b/locale/ka/LC_MESSAGES/messages.po
index 4d2b0d296..f5199ccd5 100644
--- a/locale/ka/LC_MESSAGES/messages.po
+++ b/locale/ka/LC_MESSAGES/messages.po
@@ -13,7 +13,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:34
 msgid "Tor Privacy Policy"
-msgstr ""
+msgstr "Tor-áá¡ ááá ááá áááááªáááááá¡ 
áááªááá¡ áááá£áááá"
 
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:44
 msgid "Donor privacy policy"
@@ -160,11 +160,11 @@ msgstr "áááá"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:70
 msgid "Select Size"
-msgstr ""
+msgstr "ááááá¡ á¨áá á©ááá"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:74
 msgid "S"
-msgstr "á£"
+msgstr "S"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:78
 msgid "M"
@@ -172,19 +172,19 @@ msgstr "M"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:82
 msgid "L"
-msgstr ""
+msgstr "L"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:86
 msgid "XL"
-msgstr ""
+msgstr "XL"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:90
 msgid "XXL"
-msgstr ""
+msgstr "XXL"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:35
 msgid "Support the Tor Project Today!"
-msgstr ""
+msgstr "áá®áá á ááá£ááá áá Tor-áá ááá¥á¢á¡ 
áá¦áá¡áá!"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:48
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:71
@@ -196,6 +196,8 @@ msgstr "Tor: á¡áá«áááá á áªáá¤á 
ááá¨á"
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:75
 msgid "Donate to the Tor Project and protect the privacy of millions."
 msgstr ""
+"áááá¦áá á¨áááá¬áá á£áááá Tor-áá 
ááá¥á¢áá¡áááá¡ áá á£áá á£ááááá§áááá 
áááááááááá ááááááááá¡ "
+"ááá ááá áááááªáááááá¡ á£á¡áá¤á 
áá®áááá."
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:54
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:77
@@ -204,17 +206,19 @@ msgstr "áááááááá¡ 
ááááá¦ááááááá¡ááá 
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:63
 msgid "summary_large_image"
-msgstr ""
+msgstr "á¨áá¯ááááá_áááá_á¡á£á ááá"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:67
 msgid "@torproject"
-msgstr ""
+msgstr "@torproject"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:102
 msgid ""
 "This page requires Javascript to do PayPal or credit card\n"
 "  donations, but it appears you have Javascript disabled."
 msgstr ""
+"áááá áá Javascript-á¡ á¡áááá áááá¡ PayPal-áá 
áá á¡ááá áááá¢á ááá áááá\n"
+"  áááá®áá¡ á¨áá¡áá¢áááá, áááá áá á 
áááá áª á©ááá¡, Javascript ááááá¨á£áá 
ááá¥áá."
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:106
 msgid ""
@@ -222,14 +226,17 @@ msgid ""
 " https://www.torproject.org/donate/donate-options.html.en\;>other "
 "donations options page."
 msgstr ""
+"áá£ áá¡á£á á áááá®áá¡ á¨áááá¬áá áá 
Javascript-áá¡ á©áá áááá¡ ááá áá¨á, ááá®ááá 
áá®áááá https://www.torproject.org/donate/donate-;
+"options.html.en\">á¨áááá¬áá á£ááááá¡ á¡á®áá 
ááááá."
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:123
 msgid "Number of Donations"
-msgstr ""
+msgstr "á¨áááá¬áá á£ááááááá¡ á 
áááááááá"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:139
 msgid "Total Donated"
-msgstr ""
+msgstr "á¨áááá¬áá

[tor-commits] [tor-browser-build/master] Bug 28260: Use Rust 1.28.0 to build Tor

2018-11-11 Thread gk

commit 0a633e6289822f316b838b32fe0135d5b7c9967d
Author: Nicolas Vigier 
Date:   Wed Oct 31 11:04:03 2018 +0100

Bug 28260: Use Rust 1.28.0 to build Tor

As rbm currently does not do deep merge of options hashes (bug 26185) we
cannot modify var/* options from the input_files section (or we lose all
the other var/* options). As a workaround we move the two options we
need to modify under input_file_var/ instead of var/.
---
 projects/rust/build  |  4 ++--
 projects/rust/config | 11 +--
 projects/tor/config  |  5 +
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/projects/rust/build b/projects/rust/build
index 5f421c7..7ae3073 100644
--- a/projects/rust/build
+++ b/projects/rust/build
@@ -2,7 +2,7 @@
 [% c('var/setarch') %]
 [% c("var/set_default_env") -%]
 distdir=/var/tmp/dist/[% project %]
-mkdir -p /var/tmp/dist
+mkdir -p $distdir
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %]
 export PATH="/var/tmp/dist/cmake/bin:$PATH"
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/prev_rust') %]
@@ -32,7 +32,7 @@ export PATH="$distdir-rust-old/bin:$PATH"
   done
   cd ..
   ln -s x86_64-apple-darwin11 x86_64-apple-darwin
-  mkdir -p $distdir/helper
+  mkdir $distdir/helper
 
   # We need to adapt our CFLAGS and make sure our flags are passed down to all
   # dependencies. Using `CFLAGS_x86_apple-darwin` did not do the trick, so 
resort
diff --git a/projects/rust/config b/projects/rust/config
index d3f9c40..83ae690 100644
--- a/projects/rust/config
+++ b/projects/rust/config
@@ -1,8 +1,15 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% 
c("var/build_id") %].tar.gz'
-version: 1.26.1
-var:
+version: '[% c("input_file_var/rust_version") %]'
+
+# those values can be changed from the input_files section of other
+# projects. See projects/tor/config and bug 28260.
+input_file_var:
+  rust_version: 1.26.1
   prev_version: 1.25.0
+
+var:
+  prev_version: '[% c("input_file_var/prev_version") %]'
   rust_arch: '[% c("arch") %]'
   container:
 use_container: 1
diff --git a/projects/tor/config b/projects/tor/config
index bb743ca..cc6df23 100644
--- a/projects/tor/config
+++ b/projects/tor/config
@@ -60,4 +60,9 @@ input_files:
 project: '[% c("var/compiler") %]'
   - name: rust
 project: rust
+# Tor needs rust >= 1.28.0
+# See bug 28260
+input_file_var:
+  rust_version: 1.28.0
+  prev_version: 1.27.2
 enable: '[% c("var/linux") && c("var/nightly") %]'

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

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

2018-11-11 Thread translation

commit 650132a4d532d9aaffb87297ab09047fd497bc7c
Author: Translation commit bot 
Date:   Sun Nov 11 13:48:36 2018 +

Update translations for torbutton-abouttbupdatedtd
---
 ja/abouttbupdate.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ja/abouttbupdate.dtd b/ja/abouttbupdate.dtd
index 4ded2bf71..8be08aa44 100644
--- a/ja/abouttbupdate.dtd
+++ b/ja/abouttbupdate.dtd
@@ -7,4 +7,4 @@
 
 
 
-
+

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

[tor-commits] [translation/tba-android_stringsdtd] Update translations for tba-android_stringsdtd

2018-11-11 Thread translation

commit 8e43b81b199701482570db753b96ff6edf5ffa58
Author: Translation commit bot 
Date:   Sun Nov 11 13:47:08 2018 +

Update translations for tba-android_stringsdtd
---
 ja/android_strings.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ja/android_strings.dtd b/ja/android_strings.dtd
index 55c9c16c4..9f246da89 100644
--- a/ja/android_strings.dtd
+++ b/ja/android_strings.dtd
@@ -667,7 +667,7 @@ just addresses the organization to follow, e.g. "This site 
is run by " -->
 
 
 
-
+
 
 
 

___
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-11-11 Thread translation

commit 68232a450102270d41b45335087f4c71cb6b5bea
Author: Translation commit bot 
Date:   Sun Nov 11 13:45:39 2018 +

Update translations for https_everywhere
---
 ja/https-everywhere.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ja/https-everywhere.dtd b/ja/https-everywhere.dtd
index ff64fe4a0..cee0c64eb 100644
--- a/ja/https-everywhere.dtd
+++ b/ja/https-everywhere.dtd
@@ -18,15 +18,15 @@
 
 
 
-
+
 
 
 
-
+
 
 
 
-
+
 
 
 

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

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2018-11-11 Thread translation

commit 9284e325189efcd18f9bfde9b9f1798fcf4df0df
Author: Translation commit bot 
Date:   Sun Nov 11 13:16:58 2018 +

Update translations for tails-persistence-setup
---
 ja/ja.po | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ja/ja.po b/ja/ja.po
index 7ae7c8fbd..7e7bf95ab 100644
--- a/ja/ja.po
+++ b/ja/ja.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2018-11-01 12:21+0100\n"
-"PO-Revision-Date: 2018-11-11 12:39+\n"
+"PO-Revision-Date: 2018-11-11 13:16+\n"
 "Last-Translator: unknown\n"
 "Language-Team: Japanese 
(http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -53,28 +53,28 @@ msgstr "ããã¤ã¹ %s ã«ã¯æ°¸ç¶çããªã¥ã¼ã 
ãããã¾ããã"
 msgid ""
 "Cannot delete the persistent volume on %s while in use. You should restart "
 "Tails without persistence."
-msgstr ""
+msgstr "ä½¿ç¨ä¸ã®éã¯æ°¸ç¶çããªã¥ã¼ã  %s 
ãåé¤åºæ¥ã¾ãããæ°¸ç¶ããªãã«ãã¦Tailsãåèµ·åãã¹ãã§ãã"
 
 #: ../lib/Tails/Persistence/Setup.pm:407
 #, perl-format
 msgid "Persistence volume on %s is not unlocked."
-msgstr ""
+msgstr "æ°¸ç¶çããªã¥ã¼ã  %s ãã¢ã³ããã¯ããã¦ãã¾ããã"
 
 #: ../lib/Tails/Persistence/Setup.pm:412
 #, perl-format
 msgid "Persistence volume on %s is not mounted."
-msgstr ""
+msgstr "æ°¸ç¶çããªã¥ã¼ã  %s ããã¦ã³ãããã¦ãã¾ããã"
 
 #: ../lib/Tails/Persistence/Setup.pm:417
 #, perl-format
 msgid ""
 "Persistence volume on %s is not readable. Permissions or ownership problems?"
-msgstr ""
+msgstr "æ°¸ç¶çããªã¥ã¼ã  %s 
ãèªã¿è¾¼ã¿å¯è½ã§ã¯ããã¾ããããã¼ããã·ã§ã³ãæææ¨©ã«åé¡ãããããããã¾ããã"
 
 #: ../lib/Tails/Persistence/Setup.pm:422
 #, perl-format
 msgid "Persistence volume on %s is not writable."
-msgstr ""
+msgstr "æ°¸ç¶çããªã¥ã¼ã  %s 
ãæ¸ãè¾¼ã¿å¯è½ã§ã¯ããã¾ããã"
 
 #: ../lib/Tails/Persistence/Setup.pm:431
 #, perl-format
@@ -132,7 +132,7 @@ msgstr "ãããã¯ã¼ã¯ããã¤ã¹ã¨æ¥ç¶ã®è¨å®"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:101
 msgid "Additional Software"
-msgstr ""
+msgstr "è¿½å ã½ããã¦ã§ã¢"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:103
 msgid "Software installed when starting Tails"
@@ -152,7 +152,7 @@ msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:138
 msgid "Thunderbird emails, feeds, and settings"
-msgstr ""
+msgstr "Thunderbird ã®ã¡ã¼ã«ããã£ã¼ããè¨å®"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:151
 msgid "GnuPG"

___
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-11-11 Thread translation

commit 007284eecaba804376f2716cb747e590edadccfd
Author: Translation commit bot 
Date:   Sun Nov 11 13:16:09 2018 +

Update translations for tails-misc
---
 ja.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ja.po b/ja.po
index 683ed27e2..8b694d507 100644
--- a/ja.po
+++ b/ja.po
@@ -22,7 +22,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-31 16:04+0100\n"
-"PO-Revision-Date: 2018-11-11 12:44+\n"
+"PO-Revision-Date: 2018-11-11 13:05+\n"
 "Last-Translator: unknown\n"
 "Language-Team: Japanese 
(http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -740,7 +740,7 @@ msgstr ""
 
 #: 
../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
-msgstr ""
+msgstr "è¿½å ã½ããã¦ã§ã¢"
 
 #: 
../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:2
 msgid ""

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

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2018-11-11 Thread translation

commit 3e366b8092f9f02cf3be194cac1d2b3d87ae1c01
Author: Translation commit bot 
Date:   Sun Nov 11 13:15:05 2018 +

Update translations for abouttor-homepage
---
 ja/aboutTor.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ja/aboutTor.dtd b/ja/aboutTor.dtd
index c25c878a5..19a54e77c 100644
--- a/ja/aboutTor.dtd
+++ b/ja/aboutTor.dtd
@@ -6,8 +6,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -31,10 +31,10 @@
 
 
 
-
+
 
 
-
+
 
 
 

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

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

2018-11-11 Thread translation

commit 67fe9257208c0bf27b3fa321973d4dfb109f612e
Author: Translation commit bot 
Date:   Sun Nov 11 12:48:46 2018 +

Update translations for torbutton-browseronboardingproperties
---
 ja/browserOnboarding.properties | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ja/browserOnboarding.properties b/ja/browserOnboarding.properties
index 2261c993f..e3f09909a 100644
--- a/ja/browserOnboarding.properties
+++ b/ja/browserOnboarding.properties
@@ -5,14 +5,14 @@
 onboarding.tour-tor-welcome=ãããã
 onboarding.tour-tor-welcome.title=Youâre ready.
 onboarding.tour-tor-welcome.description=Tor Browser offers the highest 
standard of privacy and security while browsing the web. Youâre now protected 
against tracking, surveillance, and censorship. This quick onboarding will show 
you how.
-onboarding.tour-tor-welcome.button=Start Now
+onboarding.tour-tor-welcome.button=ä»ããéå§
 
 onboarding.tour-tor-privacy=ãã©ã¤ãã·ã¼
 onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
 onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and 
deletes your browser history after your session. These modifications ensure 
your privacy and security are protected in the browser. Click âTor Networkâ 
to learn how we protect you on the network level.
 onboarding.tour-tor-privacy.button=Go to Tor Network
 
-onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network=Torãããã¯ã¼ã¯
 onboarding.tour-tor-network.title=Travel a decentralized network.
 onboarding.tour-tor-network.description=Tor Browser connects you to the Tor 
network run by thousands of volunteers around the world. Unlike a VPN, 
thereâs no one point of failure or centralized entity you need to trust in 
order to enjoy the internet privately.
 onboarding.tour-tor-network.button=Go to Circuit Display
@@ -30,7 +30,7 @@ onboarding.tour-tor-security.button=Review Settings
 onboarding.tour-tor-expect-differences=Experience Tips
 onboarding.tour-tor-expect-differences.title=Expect some differences.
 onboarding.tour-tor-expect-differences.description=With all the security and 
privacy features provided by Tor, your experience while browsing the internet 
may be a little different. Things may be a bit slower, and depending on your 
security level, some elements may not work or load. You may also be asked to 
prove you are a human and not a robot.
-onboarding.tour-tor-expect-differences.button=See FAQs
+onboarding.tour-tor-expect-differences.button=ããããè³ªåãè¦ã
 
 onboarding.tour-tor-onion-services=Onion Services
 onboarding.tour-tor-onion-services.title=Be extra protected.
@@ -50,5 +50,5 @@ onboarding.tor-circuit-display.intro.msg=Circuits are made up 
of randomly assign
 onboarding.tor-circuit-display.diagram.title=Circuit Display
 onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that 
make up the circuit for this website. To prevent linking of activity across 
different sites, each website gets a different circuit.
 
-onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.title=æ°ãããµã¼ããããå¿
è¦ã§ãã?
 onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect 
to the website youâre trying to visit or it is not loading properly, then you 
can use this button to reload the site with a new circuit.

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

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2018-11-11 Thread translation

commit 16d8add482374557a30e05a260cbdbd365ca2b3c
Author: Translation commit bot 
Date:   Sun Nov 11 12:46:59 2018 +

Update translations for tails-persistence-setup
---
 ja/ja.po | 41 +
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/ja/ja.po b/ja/ja.po
index d3f357a78..7ae7c8fbd 100644
--- a/ja/ja.po
+++ b/ja/ja.po
@@ -10,13 +10,14 @@
 # Kota Ura, 2017
 # Masaki Saito , 2013
 # Tokumei Nanashi, 2015
+# unknown, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2018-08-16 11:14+0200\n"
-"PO-Revision-Date: 2018-10-04 00:59+\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2018-11-01 12:21+0100\n"
+"PO-Revision-Date: 2018-11-11 12:39+\n"
+"Last-Translator: unknown\n"
 "Language-Team: Japanese 
(http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -115,7 +116,7 @@ msgstr 
"`æ°¸ç¶ç'ãã£ã¬ã¯ããªã«ä¿ç®¡ããããã¡ã¤ã«ãä¿ã¤"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:71
 msgid "Browser Bookmarks"
-msgstr ""
+msgstr "ãã©ã¦ã¶ã®ããã¯ãã¼ã¯"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:73
 msgid "Bookmarks saved in the Tor Browser"
@@ -163,7 +164,7 @@ msgstr "GnuPGã®ãã¼ãã«ãã¼ã¨è¨å®"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:166
 msgid "Bitcoin Client"
-msgstr ""
+msgstr "Bitcoin ã¯ã©ã¤ã¢ã³ã"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:168
 msgid "Electrum's bitcoin wallet and configuration"
@@ -214,65 +215,65 @@ msgstr "%sã®æ°¸ç¶çããªã¥ã¼ã ã¯%s 
%sä¸ã«ä½æããã¾ãã
 msgid "Create"
 msgstr "ä½æ"
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:141
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:142
 msgid ""
 "Beware! Using persistence has consequences that must be well "
 "understood. Tails can't help you if you use it wrong! See the Encrypted "
 "persistence page of the Tails documentation to learn more."
 msgstr ""
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:169
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:170
 msgid "Passphrase:"
 msgstr "ãã¹ãã¬ã¼ãº:"
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:177
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:178
 msgid "Verify Passphrase:"
 msgstr "ãã¹ãã¬ã¼ãºç¢ºèª:"
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:188
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:244
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:189
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:245
 msgid "Passphrase can't be empty"
 msgstr "ãã¹ãã¬ã¼ãºã¯ç©ºã«åºæ¥ã¾ãã"
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:235
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:236
 msgid "Passphrases do not match"
 msgstr "ãã¹ãã¬ã¼ãºãä¸è´ãã¾ãã"
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:284
 #: ../lib/Tails/Persistence/Step/Delete.pm:103
 #: ../lib/Tails/Persistence/Step/Configure.pm:181
 msgid "Failed"
 msgstr "å¤±æãã¾ãã"
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:291
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:292
 msgid "Mounting Tails persistence partition."
 msgstr "Tailsæ°¸ç¶çãã¼ãã£ã·ã§ã³ããã¦ã³ãä¸"
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:294
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:295
 msgid "The Tails persistence partition will be mounted."
 msgstr "Tailsæ°¸ç¶çãã¼ãã£ã·ã§ã³ããã¦ã³ãããã¾ãã"
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:303
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:304
 msgid "Correcting permissions of the persistent volume."
 msgstr "æ°¸ç¶çããªã¥ã¼ã ã®ãã¼ããã·ã§ã³ã®ä¿®æ£"
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:306
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:307
 msgid "The permissions of the persistent volume will be corrected."
 msgstr "æ°¸ç¶çããªã¥ã¼ã 
ã®ãã¼ããã·ã§ã³ã¯ä¿®æ£ããã¾ãã"
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:314
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:315
 msgid "Creating default persistence configuration."
 msgstr ""
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:317
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:318
 msgid "The default persistence configuration will be created."
 msgstr ""
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:332
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:333
 msgid "Creating..."
 msgstr "ä½æä¸..."
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:335
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:336
 msgid "Creating the persistent volume..."
 msgstr "æ°¸ç¶çããªã¥ã¼ã ãä½æä¸..."
 

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

[tor-commits] [translation/tails-greeter-2] Update translations for tails-greeter-2

2018-11-11 Thread translation

commit cbfc8ce2315fe253ba6e8cf89b23458ed527e56c
Author: Translation commit bot 
Date:   Sun Nov 11 12:46:33 2018 +

Update translations for tails-greeter-2
---
 ja/ja.po | 24 
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/ja/ja.po b/ja/ja.po
index 1a1f2ccee..c74102e84 100644
--- a/ja/ja.po
+++ b/ja/ja.po
@@ -3,14 +3,30 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR , YEAR.
 # 
+# Translators:
+# nord stream , 2016
+# runasand , 2016
+# brt <8...@itokei.info>, 2016
+# Tokumei Nanashi, 2016
+# ã¿ã«ãã· , 2016
+# Hussein Hassan , 2017
+# daisuke osada (daiskeh) , 2017
+# Tsuyoshi CHO , 2018
+# Naofumi , 2018
+# Sebastien G. , 2018
+# anon owl , 2018
+# TEN CO , 2018
+# ishikawa satoru , 2018
+# unknown, 2018
+# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-04 09:46+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: ishikawa satoru , 2018\n"
+"PO-Revision-Date: 2016-11-18 21:29+\n"
+"Last-Translator: unknown, 2018\n"
 "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -207,7 +223,7 @@ msgstr ""
 
 #: ../data/greeter.ui.h:46
 msgid "Off (default)"
-msgstr ""
+msgstr "ãªãï¼ããã©ã«ãï¼"
 
 #: ../data/greeter.ui.h:47
 msgid "_MAC Address Spoofing"
@@ -215,7 +231,7 @@ msgstr ""
 
 #: ../data/greeter.ui.h:48
 msgid "On (default)"
-msgstr ""
+msgstr "ãªã³ï¼ããã©ã«ãï¼"
 
 #: ../data/greeter.ui.h:49
 msgid "_Network Connection"

___
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-11-11 Thread translation

commit 81a89f6403bd62d7c0beb3ff4bedb62d1c19fa0d
Author: Translation commit bot 
Date:   Sun Nov 11 12:46:08 2018 +

Update translations for tails-misc
---
 ja.po | 95 ++-
 1 file changed, 48 insertions(+), 47 deletions(-)

diff --git a/ja.po b/ja.po
index 1171b72c1..683ed27e2 100644
--- a/ja.po
+++ b/ja.po
@@ -15,14 +15,15 @@
 # nord stream , 2016
 # Ippei Shinozaki , 2015
 # Tokumei Nanashi, 2015,2018
+# unknown, 2018
 # è¤åãç² , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-15 14:47+0200\n"
-"PO-Revision-Date: 2018-10-15 14:43+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2018-10-31 16:04+0100\n"
+"PO-Revision-Date: 2018-11-11 12:44+\n"
+"Last-Translator: unknown\n"
 "Language-Team: Japanese 
(http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -157,91 +158,91 @@ msgstr "ãã«ãæå ±:\n%s"
 msgid "not available"
 msgstr "å©ç¨ä¸å¯"
 
-#. Translators: Don't translate {details}, it's a placeholder and will be
-#. replaced.
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:144
+#. Translators: Don't translate {details}, it's a placeholder and will
+#. be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:147
 #, python-brace-format
 msgid ""
 "{details} Please check your list of additional software or read the system "
 "log to understand the problem."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:149
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:152
 msgid ""
 "Please check your list of additional software or read the system log to "
 "understand the problem."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:156
 msgid "Show Log"
 msgstr "ãã°ã®è¡¨ç¤º"
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:156
 msgid "Configure"
 msgstr "è¨å®"
 
-#. Translators: Don't translate {beginning} or {last}, they are placeholders
-#. and will be replaced.
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:218
+#. Translators: Don't translate {beginning} or {last}, they are
+#. placeholders and will be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:222
 #, python-brace-format
 msgid "{beginning} and {last}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:219
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:223
 msgid ", "
 msgstr ""
 
-#. Translators: Don't translate {packages}, it's a placeholder and will be
-#. replaced.
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:284
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:313
+#. Translators: Don't translate {packages}, it's a placeholder and will
+#. be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:289
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:319
 #, python-brace-format
 msgid "Add {packages} to your additional software?"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:286
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:291
 msgid ""
 "To install it automatically from your persistent storage when starting "
 "Tails."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:288
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:293
 msgid "Install Every Time"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:289
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:319
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:294
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:325
 msgid "Install Only Once"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:295
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:324
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:362
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:300
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:330
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:371
 msgid "The configuration of your additional software failed."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:315
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:321
 msgid ""
 "To

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2018-11-11 Thread translation

commit 7e04a6b1ab58ecdb8092137a74fd0e24b5c69df5
Author: Translation commit bot 
Date:   Sun Nov 11 12:45:49 2018 +

Update translations for liveusb-creator
---
 ja/ja.po | 91 
 1 file changed, 46 insertions(+), 45 deletions(-)

diff --git a/ja/ja.po b/ja/ja.po
index e0b8a0670..8bd130f32 100644
--- a/ja/ja.po
+++ b/ja/ja.po
@@ -13,14 +13,15 @@
 # taka F , 2013
 # TEN CO , 2018
 # Tokumei Nanashi, 2015
+# unknown, 2018
 # è¤åãç² , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-17 13:11+0200\n"
-"PO-Revision-Date: 2018-10-17 14:51+\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2018-10-20 12:34+0200\n"
+"PO-Revision-Date: 2018-11-11 12:20+\n"
+"Last-Translator: unknown\n"
 "Language-Team: Japanese 
(http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,194 +88,194 @@ msgstr 
"%(outfile)sã%(infile)sã«ã³ãã¼ã§ãã¾ãã: %(message)s"
 msgid "Removing existing Live OS"
 msgstr "æ¢åã® LiveOS ãåé¤ä¸"
 
-#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:456
+#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:457
 #, python-format
 msgid "Unable to chmod %(file)s: %(message)s"
 msgstr "%(file)sãchmodã§ãã¾ãã: %(message)s"
 
-#: ../tails_installer/creator.py:449
+#: ../tails_installer/creator.py:450
 #, python-format
 msgid "Unable to remove file from previous LiveOS: %(message)s"
 msgstr "ä»¥åã® LiveOSãããã¡ã¤ã«ãåé¤ã§ãã¾ãã: 
%(message)s"
 
-#: ../tails_installer/creator.py:462
+#: ../tails_installer/creator.py:464
 #, python-format
 msgid "Unable to remove directory from previous LiveOS: %(message)s"
 msgstr "ä»¥åã® LiveOSãããã£ã¬ã¯ããª ãåé¤ã§ãã¾ãã: 
%(message)s"
 
-#: ../tails_installer/creator.py:510
+#: ../tails_installer/creator.py:512
 #, python-format
 msgid "Cannot find device %s"
 msgstr "ããã¤ã¹ %s ãè¦ã¤ããã¾ãã"
 
-#: ../tails_installer/creator.py:711
+#: ../tails_installer/creator.py:713
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "%(device)sã«æ¸ãè¾¼ãã¾ãããã¹ããããã¾ã"
 
-#: ../tails_installer/creator.py:741
+#: ../tails_installer/creator.py:743
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "ã¿ã¼ã²ããã®ããã¤ã¹ %(device)s 
ã®ãã¼ãã£ã·ã§ã³ã®ããã¤ãããã¦ã³ãããã¾ãããã¤ã³ã¹ãã¼ã«ããã»ã¹ãéå§ããåã«ãããã¯ã¢ã³ãã¦ã³ãããã¾ãã"
 
-#: ../tails_installer/creator.py:784 ../tails_installer/creator.py:1008
+#: ../tails_installer/creator.py:786 ../tails_installer/creator.py:1010
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "ä¸æãªãã¡ã¤ã«ã·ã¹ãã 
ããããã¤ã¹ãåãã©ã¼ãããããå¿
è¦ãããããããã¾ããã"
 
-#: ../tails_installer/creator.py:787 ../tails_installer/creator.py:1011
+#: ../tails_installer/creator.py:789 ../tails_installer/creator.py:1013
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "ãµãã¼ããã¦ããªããã¡ã¤ã«ã·ã¹ãã : %s"
 
-#: ../tails_installer/creator.py:805
+#: ../tails_installer/creator.py:807
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr ""
 
-#: ../tails_installer/creator.py:810
+#: ../tails_installer/creator.py:812
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "ããã¤ã¹ããã¦ã³ãã§ãã¾ãã: %(message)s"
 
-#: ../tails_installer/creator.py:815
+#: ../tails_installer/creator.py:817
 msgid "No mount points found"
 msgstr "ãã¦ã³ããã¤ã³ããã¿ã¤ããã¾ãã"
 
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:828
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "'%(device)s'ã« unmount_device ãå¥åä¸"
 
-#: ../tails_installer/creator.py:836
+#: ../tails_installer/creator.py:838
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "%(device)sä¸ã«ãã¦ã³ãããããã¡ã¤ã«ã·ã¹ãã 
ã®ãã¦ã³ããè§£é¤ä¸"
 
-#: ../tails_installer/creator.py:840
+#: ../tails_installer/creator.py:842
 #, python-format
 msgid "Unmounting '%(udi)s' on '%(device)s'"
 msgstr "%(device)sä¸ã®'%(udi)s'ã®ãã¦ã³ããè§£é¤ä¸"
 
-#: ../tails_installer/creator.py:851
+#: ../tails_installer/creator.py:853
 #, python-format
 msgid "Mount %s exists after unmounting"
 msgstr "ã¢ã³ãã¦ã³ãå¾%sã®å®ä½ããã¦ã³ã"
 
-#: ../tails_installer/creator.py:864
+#: ../tails_installer/creator.py:866
 #, python-format
 msgid "Partitioning device %(device)s"
 msgstr "ããã¤ã¹ %(device)s

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2018-11-11 Thread translation

commit d0d083526cfa309baf1e68d6095edb2399975ac3
Author: Translation commit bot 
Date:   Sun Nov 11 12:45:04 2018 +

Update translations for abouttor-homepage
---
 ja/aboutTor.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ja/aboutTor.dtd b/ja/aboutTor.dtd
index 8c573564e..c25c878a5 100644
--- a/ja/aboutTor.dtd
+++ b/ja/aboutTor.dtd
@@ -11,14 +11,14 @@
 
 
 
-
+
 https://duckduckgo.com;>
 
 
 
 
 
-
+
 
 
 
@@ -38,5 +38,5 @@
 
 
 
-
+
 

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

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

2018-11-11 Thread translation

commit 3176478f9a549d427f3b55dfc4de31b45c688d61
Author: Translation commit bot 
Date:   Sun Nov 11 12:18:53 2018 +

Update translations for whisperback
---
 ja/ja.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ja/ja.po b/ja/ja.po
index 4de3058aa..7ec63d16d 100644
--- a/ja/ja.po
+++ b/ja/ja.po
@@ -6,13 +6,14 @@
 # brt <8...@itokei.info>, 2013
 # daisuke osada (daiskeh) , 2017
 # ã¿ã«ãã· , 2013
+# unknown, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-11 17:17+0200\n"
-"PO-Revision-Date: 2018-08-07 08:48+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2018-11-11 12:17+\n"
+"Last-Translator: unknown\n"
 "Language-Team: Japanese 
(http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -190,7 +191,7 @@ msgstr "ãã°ã®èª¬æ"
 
 #: ../data/whisperback.ui.h:24
 msgid "Help:"
-msgstr ""
+msgstr "ãã«ã:"
 
 #: ../data/whisperback.ui.h:25
 msgid "Read our bug reporting guidelines."

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

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2018-11-11 Thread translation

commit 8d769ffddb40f136c1a3dca4e63f62e8bde7092c
Author: Translation commit bot 
Date:   Sun Nov 11 11:17:30 2018 +

Update translations for tor-browser-manual
---
 cs/cs.po | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/cs/cs.po b/cs/cs.po
index 8b71e028d..efeaaf32d 100644
--- a/cs/cs.po
+++ b/cs/cs.po
@@ -6,15 +6,15 @@
 # JiÅÃ VÃrava , 2017
 # Michal VaÅ¡ÃÄek , 2017
 # J. Podhorecky , 2018
-# Michal Stanke , 2018
 # MikulÃ¡Å¡ Vrba , 2018
+# Michal Stanke , 2018
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2018-09-07 16:48-0500\n"
 "PO-Revision-Date: 2016-12-07 01:01+\n"
-"Last-Translator: MikulÃ¡Å¡ Vrba , 2018\n"
+"Last-Translator: Michal Stanke , 2018\n"
 "Language-Team: Czech (https://www.transifex.com/otf/teams/1519/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -527,7 +527,7 @@ msgid ""
 "configuration options."
 msgstr ""
 "Pokud vÃte, Å¾e je vaÅ¡e pÅipojenÃ cenzurovanÃ© nebo pouÅ¾ÃvÃ¡ proxy, 
zvolte tuto"
-" moÅ¾nost. Tor vÃ¡s provede sÃ©riÃ konfiguraÄnÃch nastvenÃ."
+" moÅ¾nost. Tor vÃ¡s provede sÃ©riÃ konfiguraÄnÃch nastavenÃ."
 
 #: first-time.page:44
 msgid ""
@@ -550,7 +550,9 @@ msgid ""
 msgstr ""
 "DalÅ¡Ã obrazovka se ptÃ¡, jestli vaÅ¡e pÅipojenÃ pouÅ¾ÃvÃ¡ proxy. Ve 
vÄtÅ¡inÄ "
 "pÅÃpadÅ¯ to nenÃ nutnÃ©. Obvykle vÃte, zda mÃ¡te zvolit \"Ano\", protoÅ¾e 
stejnÃ¡"
-" nastavenÃ budou pouÅ¾Ãvat i ostatnÃ prohlÃÅ¾eÄe na vaÅ¡em systÃ©mu."
+" nastavenÃ budou pouÅ¾Ãvat i ostatnÃ prohlÃÅ¾eÄe na vaÅ¡em systÃ©mu. 
Pokud je to"
+" moÅ¾nÃ©, zeptejte se sprÃ¡vce vaÅ¡Ã sÃtÄ. Pokud vaÅ¡e pÅipojenÃ proxy 
nepouÅ¾ÃvÃ¡,"
+" kliknÄte na \"PokraÄovat\"."
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to

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

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2018-11-11 Thread translation

commit d4361adc59d5d50a353d39fb15f1663ba501afa3
Author: Translation commit bot 
Date:   Sun Nov 11 11:15:45 2018 +

Update translations for liveusb-creator
---
 cs/cs.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cs/cs.po b/cs/cs.po
index e5303467f..061324bdb 100644
--- a/cs/cs.po
+++ b/cs/cs.po
@@ -22,8 +22,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-20 12:34+0200\n"
-"PO-Revision-Date: 2018-11-01 10:27+\n"
-"Last-Translator: JiÅÃ VÃrava \n"
+"PO-Revision-Date: 2018-11-11 10:52+\n"
+"Last-Translator: Michal Stanke \n"
 "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2018-11-11 Thread translation

commit 1d764da846980c112b561e3fecbc9539c8c96a82
Author: Translation commit bot 
Date:   Sun Nov 11 10:15:20 2018 +

Update translations for donatepages-messagespot
---
 locale/de/LC_MESSAGES/messages.po | 32 ++--
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/locale/de/LC_MESSAGES/messages.po 
b/locale/de/LC_MESSAGES/messages.po
index 4ec74f7d0..4a8656afe 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -370,6 +370,9 @@ msgid ""
 "the Digital Resistance, Open Observatory of Network Interference (OONI), or "
 "Tor at the Heart of Internet Freedom t-shirts."
 msgstr ""
+"Unser Tor: Anzahl T-Shirt, plus eines von entweder Unser Tor: Powering the "
+"Digital Resistance, Open Observatory of Network Interference (OONI), oder "
+"Tor at the Heart of Internet Freedom T-Shirts."
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:280
 msgid "Tor at the Heart of Internet Freedom"
@@ -390,6 +393,8 @@ msgstr "Sweatshirt"
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:306
 msgid "Your generous support of Tor gets you this high-quality zip hoodie."
 msgstr ""
+"Deine groÃzÃ¼gige UnterstÃ¼tzung von Tor bringt dir diesen hochwertigen Zip-"
+"Hoodie."
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:316
 msgid "how do you want to DONATE?"
@@ -498,6 +503,8 @@ msgid ""
 "Tor at the Heart of Internet, Powering Digital Resistance or Open "
 "Observvatory of Network Interference (OONI) T-Shirt"
 msgstr ""
+"Tor at the Heart of Internet, Powering Digital Resistance oder Open "
+"Observatory of Network Interference (OONI) T-Shirt."
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:488
 msgid "Strength in Numbers T-Shirt"
@@ -551,10 +558,12 @@ msgid ""
 "Stand up for the universal human rights to privacy and freedom and help keep"
 " Tor independent, robust, and secure."
 msgstr ""
+"Setz dich fÃ¼r die universellen Menschenrechte auf PrivatsphÃ¤re und Freiheit 
"
+"ein, und hilf, Tor unabhÃ¤ngig, robust und sicher zu halten."
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:627
 msgid "Mozilla will match your gift and double your impact."
-msgstr ""
+msgstr "Mozilla trÃ¤gt zu deinem Geschenk bei und verdoppelt deine Wirkung."
 
 #: 
tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:34
 msgid "Tor Thanks You"
@@ -567,10 +576,11 @@ msgstr "Vielen Dank!"
 #: 
tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:48
 msgid "Thank you for supporting Tor's Strength in Numbers campaign."
 msgstr ""
+"Vielen Dank fÃ¼r deine UnterstÃ¼tzung der Tor's Strength in Numbers-Kampagne."
 
 #: 
tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:50
 msgid "You should receive an email receipt shortly."
-msgstr ""
+msgstr "Du solltest in KÃ¼rze per Email eine BestÃ¤tigung erhalten."
 
 #: 
tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:52
 msgid ""
@@ -579,18 +589,26 @@ msgid ""
 "privacy-enhancing browser for mobile devices and making it easier for third-"
 "party developers to integrate Tor into their applications."
 msgstr ""
+"Mit deiner UnterstÃ¼tzung und den groÃzÃ¼gigen UnterstÃ¼tzungsmitteln von "
+"Mozilla kÃ¶nnen wir ehrgeizige Projekte in Angriff nehmen, wie z.B. die "
+"Entwicklung eines sichereren, privateren Browsers fÃ¼r mobile GerÃ¤te und die 
"
+"Erleichterung der Integration von Tor in ihre Anwendungen fÃ¼r Drittanbieter."
 
 #: 
tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:56
 msgid ""
 "It's an incredible time to stand up for world-leading security and privacy "
 "software."
 msgstr ""
+"Es ist eine unglaubliche Zeit, um sich fÃ¼r eine weltweit fÃ¼hrende "
+"Sicherheits- und Datenschutzsoftware einzusetzen."
 
 #: 
tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:58
 msgid ""
 "Tell family, friends, and colleagues that you're supporting privacy and "
 "security with Tor!"
 msgstr ""
+"Sag Familie, Freunden und Kollegen, dass du mit Tor PrivatsphÃ¤re und "
+"Sicherheit unterstÃ¼tzt."
 
 #: 
tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:62
 msgid "SHARE THE TOR PROJECT"
@@ -609,10 +627,12 @@ msgid ""
 "We need people to run relays, write code, organize the community and spread "
 "the word about our good work."
 msgstr ""
+"Wir brauchen Leute, die Relays betreiben, Code schreiben, die Community "
+"organisieren und Ã¼ber unsere gute Arbeit berichten."
 
 #: 
tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:102
 msgid "Learn how you can help."
-msgstr ""
+msgstr "Finde heraus, wie du helfen

[tor-commits] [translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed

2018-11-11 Thread translation

commit cc4a8adfabea0eb614f0f61dafd83b8b8fcb9731
Author: Translation commit bot 
Date:   Sun Nov 11 10:15:27 2018 +

Update translations for donatepages-messagespot_completed
---
 locale/de/LC_MESSAGES/messages.po | 775 +++---
 1 file changed, 380 insertions(+), 395 deletions(-)

diff --git a/locale/de/LC_MESSAGES/messages.po 
b/locale/de/LC_MESSAGES/messages.po
index 9492a199d..4a8656afe 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -1,16 +1,19 @@
 # Translators:
 # Diapolo, 2018
-# Ettore Atalan , 2018
 # Adam Lynn , 2018
 # Giovanni Pellerano , 2018
-# erinm, 2018
 # RiseT, 2018
-# Curtis Baltimore , 2018
 # Traumschule Riebau , 2018
+# Ettore Atalan , 2018
+# erinm, 2018
+# cy Berta , 2018
 # Felix W , 2018
+# Emma Peel, 2018
+# Curtis Baltimore , 2018
+# 
 msgid ""
 msgstr ""
-"Last-Translator: Felix W , 2018\n"
+"Last-Translator: Curtis Baltimore , 2018\n"
 "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -171,8 +174,8 @@ msgstr ""
 "Das Tor Projekt freut sich Ã¼ber jede Spende und bedankt"
 " sich bei allen seinen Spendern. Danke, dass Sie Tor unterstÃ¼tzen."
 
-#: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:114
-#: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:655
+#: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:113
+#: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:658
 msgid "Back to Donate Page"
 msgstr "ZurÃ¼ck zur Spendenseite"
 
@@ -200,35 +203,35 @@ msgstr "schlank"
 msgid "Classic"
 msgstr "klassisch"
 
-#: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:55
+#: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:56
 msgid "European"
 msgstr "europÃ¤isch"
 
-#: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:65
+#: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:66
 msgid "Size"
 msgstr "GrÃ¶sse"
 
-#: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:69
+#: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:70
 msgid "Select Size"
 msgstr "WÃ¤hle eine GrÃ¶Ãe"
 
-#: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:73
+#: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:74
 msgid "S"
 msgstr "S"
 
-#: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:77
+#: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:78
 msgid "M"
 msgstr "M"
 
-#: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:81
+#: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:82
 msgid "L"
 msgstr "L"
 
-#: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:85
+#: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:86
 msgid "XL"
 msgstr "XL"
 
-#: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:89
+#: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:90
 msgid "XXL"
 msgstr "XXL"
 
@@ -236,33 +239,33 @@ msgstr "XXL"
 msgid "Support the Tor Project Today!"
 msgstr "UnterstÃ¼tzt das Tor Project Heute!"
 
-#: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:43
-msgid "https://donate.torproject.org/pdr;
-msgstr "https://donate.torproject.org/pdr;
-
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:48
-#: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:66
-msgid "Powering Digital Resistance with Tor"
-msgstr "Tor: Digitalen Widerstand stÃ¤rken"
+#: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:71
+#: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:621
+msgid "Tor: Strength in Numbers"
+msgstr "Tor: StÃ¤rke in Zahlen"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:52
-#: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:70
-msgid ""
-"Donate to the Tor Project today! Take a stand against surveillance and "
-"censorship. Protect activists worldwide."
+#: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:75
+msgid "Donate to the Tor Project and protect the privacy of millions."
 msgstr ""
-"Spenden Sie noch heute!

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

2018-11-11 Thread translation

commit f614847c67c75bf94dff24d3d87ba9417f9c5ae8
Author: Translation commit bot 
Date:   Sun Nov 11 09:48:35 2018 +

Update translations for torbutton-abouttbupdatedtd
---
 ady/abouttbupdate.dtd   |  6 --
 ak/abouttbupdate.dtd| 10 --
 am_ET/abouttbupdate.dtd |  6 --
 ar/abouttbupdate.dtd|  2 +-
 ar_AA/abouttbupdate.dtd |  6 --
 ba/abouttbupdate.dtd|  6 --
 bal/abouttbupdate.dtd   |  6 --
 bn_IN/abouttbupdate.dtd |  6 --
 brx/abouttbupdate.dtd   | 10 --
 ceb/abouttbupdate.dtd   |  6 --
 co/abouttbupdate.dtd|  6 --
 cs_CZ/abouttbupdate.dtd |  6 --
 csb/abouttbupdate.dtd   | 10 --
 cv/abouttbupdate.dtd| 10 --
 cy_GB/abouttbupdate.dtd |  6 --
 da_DK/abouttbupdate.dtd |  6 --
 fr_CA/abouttbupdate.dtd |  6 --
 gun/abouttbupdate.dtd   | 10 --
 ha/abouttbupdate.dtd| 10 --
 hy_AM/abouttbupdate.dtd |  6 --
 jbo/abouttbupdate.dtd   |  6 --
 kw/abouttbupdate.dtd| 10 --
 nds/abouttbupdate.dtd   |  6 --
 sa/abouttbupdate.dtd|  6 --
 scn/abouttbupdate.dtd   |  6 --
 si/abouttbupdate.dtd|  6 --
 sq_AL/abouttbupdate.dtd |  6 --
 su/abouttbupdate.dtd| 10 --
 sw/abouttbupdate.dtd| 10 --
 szl/abouttbupdate.dtd   |  6 --
 te_IN/abouttbupdate.dtd |  6 --
 tl_PH/abouttbupdate.dtd |  6 --
 tzm/abouttbupdate.dtd   |  6 --
 ve/abouttbupdate.dtd| 10 --
 wa/abouttbupdate.dtd| 10 --
 wo/abouttbupdate.dtd| 10 --
 yo/abouttbupdate.dtd|  6 --
 zu/abouttbupdate.dtd| 10 --
 38 files changed, 1 insertion(+), 275 deletions(-)

diff --git a/ady/abouttbupdate.dtd b/ady/abouttbupdate.dtd
deleted file mode 100644
index 37567bd7e..0
--- a/ady/abouttbupdate.dtd
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/ak/abouttbupdate.dtd b/ak/abouttbupdate.dtd
deleted file mode 100644
index f7b3f2ed8..0
--- a/ak/abouttbupdate.dtd
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/am_ET/abouttbupdate.dtd b/am_ET/abouttbupdate.dtd
deleted file mode 100644
index 37567bd7e..0
--- a/am_ET/abouttbupdate.dtd
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/ar/abouttbupdate.dtd b/ar/abouttbupdate.dtd
index eee3db56d..0c25a117e 100644
--- a/ar/abouttbupdate.dtd
+++ b/ar/abouttbupdate.dtd
@@ -6,5 +6,5 @@
 
 
 
-
+
 
diff --git a/ar_AA/abouttbupdate.dtd b/ar_AA/abouttbupdate.dtd
deleted file mode 100644
index 37567bd7e..0
--- a/ar_AA/abouttbupdate.dtd
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/ba/abouttbupdate.dtd b/ba/abouttbupdate.dtd
deleted file mode 100644
index 37567bd7e..0
--- a/ba/abouttbupdate.dtd
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/bal/abouttbupdate.dtd b/bal/abouttbupdate.dtd
deleted file mode 100644
index 37567bd7e..0
--- a/bal/abouttbupdate.dtd
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/bn_IN/abouttbupdate.dtd b/bn_IN/abouttbupdate.dtd
deleted file mode 100644
index 37567bd7e..0
--- a/bn_IN/abouttbupdate.dtd
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/brx/abouttbupdate.dtd b/brx/abouttbupdate.dtd
deleted file mode 100644
index f7b3f2ed8..0
--- a/brx/abouttbupdate.dtd
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/ceb/abouttbupdate.dtd b/ceb/abouttbupdate.dtd
deleted file mode 100644
index 37567bd7e..0
--- a/ceb/abouttbupdate.dtd
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/co/abouttbupdate.dtd b/co/abouttbupdate.dtd
deleted file mode 100644
index 37567bd7e..0
--- a/co/abouttbupdate.dtd
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/cs_CZ/abouttbupdate.dtd b/cs_CZ/abouttbupdate.dtd
deleted file mode 100644
index 37567bd7e..0
--- a/cs_CZ/abouttbupdate.dtd
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/csb/abouttbupdate.dtd b/csb/abouttbupdate.dtd
deleted file mode 100644
index f7b3f2ed8..0
--- a/csb/abouttbupdate.dtd
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/cv/abouttbupdate.dtd b/cv/abouttbupdate.dtd
deleted file mode 100644
index f7b3f2ed8..0
--- a/cv/abouttbupdate.dtd
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/cy_GB/abouttbupdate.dtd b/cy_GB/abouttbupdate.dtd
deleted file mode 100644
index 37567bd7e..0
--- a/cy_GB/abouttbupdate.dtd
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/da_DK/abouttbupdate.dtd b/da_DK/abouttbupdate.dtd
deleted file mode 100644
index 37567bd7e..0
--- a/da_DK/abouttbupdate.dtd
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/fr_CA/abouttbupdate.dtd b/fr_CA/abouttbupdate.dtd
deleted file mode 100644
index fc83797ab..0
--- a/fr_CA/abouttbupdate.dtd
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/gun/abouttbupdate.dtd b/gun/abouttbupdate.dtd
deleted file mode 100644
index f7b3f2ed8..0
--- a/gun/abouttbupdate.dtd
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2018-11-11 Thread translation

commit a3ee6122d9a584c77405b081325f30f8190108dd
Author: Translation commit bot 
Date:   Sun Nov 11 09:45:24 2018 +

Update translations for donatepages-messagespot
---
 locale/de/LC_MESSAGES/messages.po | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/locale/de/LC_MESSAGES/messages.po 
b/locale/de/LC_MESSAGES/messages.po
index 53e1035d0..4ec74f7d0 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -7,13 +7,13 @@
 # Ettore Atalan , 2018
 # erinm, 2018
 # cy Berta , 2018
-# Curtis Baltimore , 2018
 # Felix W , 2018
 # Emma Peel, 2018
+# Curtis Baltimore , 2018
 # 
 msgid ""
 msgstr ""
-"Last-Translator: Emma Peel, 2018\n"
+"Last-Translator: Curtis Baltimore , 2018\n"
 "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -249,6 +249,8 @@ msgstr "Tor: StÃ¤rke in Zahlen"
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:75
 msgid "Donate to the Tor Project and protect the privacy of millions."
 msgstr ""
+"Spende fÃ¼r das Tor-Projekt und schÃ¼tze die PrivatsphÃ¤re von Millionen "
+"Menschen."
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:54
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:77
@@ -283,15 +285,15 @@ msgstr ""
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:123
 msgid "Number of Donations"
-msgstr ""
+msgstr "Anzahl der Spenden."
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:139
 msgid "Total Donated"
-msgstr ""
+msgstr "Total gespendet."
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:155
 msgid "Total Raised with Mozilla's Match"
-msgstr ""
+msgstr "Insgesamt aufgewendet mit Mozilla's Match"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:163
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:169

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

[tor-commits] [metrics-web/master] Use ipv6servers' CSV files instead of servers.csv.

2018-11-11 Thread karsten

commit 28d42211d333d954a846f0885ebe1e4933bef366
Author: Karsten Loesing 
Date:   Sun Nov 11 10:15:57 2018 +0100

Use ipv6servers' CSV files instead of servers.csv.
---
 build.xml | 10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/build.xml b/build.xml
index b498ea8..b95550d 100644
--- a/build.xml
+++ b/build.xml
@@ -369,14 +369,6 @@
 
-  
-  
-  
-
-
-
   
   
   
@@ -515,7 +507,7 @@
   
   
-  
+  
   
   
 

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

77 matches

Mail list logo