May 2017 - tor-commits - lists.torproject.org

[stem/master] HidenServiceDescriptor creation
by atagar＠torproject.org 02 May '17

02 May '17

commit cf869a877683254ca7b262a989551bc9c6b76204 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 1 12:56:36 2017 -0700 HidenServiceDescriptor creation --- stem/descriptor/hidden_service_descriptor.py | 31 ++++++++++- test/mocking.py | 51 ------------------ test/unit/descriptor/hidden_service_descriptor.py | 65 ++++++++--------------- 3 files changed, 52 insertions(+), 95 deletions(-) diff --git a/stem/descriptor/hidden_service_descriptor.py b/stem/descriptor/hidden_service_descriptor.py index 129bc83..a3b12b5 100644 --- a/stem/descriptor/hidden_service_descriptor.py +++ b/stem/descriptor/hidden_service_descriptor.py @@ -31,8 +31,10 @@ import stem.util.connection import stem.util.str_tools from stem.descriptor import ( + CRYPTO_BLOB, PGP_BLOCK_END, Descriptor, + _descriptor_content, _descriptor_components, _read_until_keywords, _bytes_for_block, @@ -80,6 +82,20 @@ SINGLE_INTRODUCTION_POINT_FIELDS = [ BASIC_AUTH = 1 STEALTH_AUTH = 2 +HIDDEN_SERVICE_HEADER = ( + ('rendezvous-service-descriptor', 'y3olqqblqw2gbh6phimfuiroechjjafa'), + ('version', '2'), + ('permanent-key', '\n-----BEGIN RSA PUBLIC KEY-----%s-----END RSA PUBLIC KEY-----' % CRYPTO_BLOB), + ('secret-id-part', 'e24kgecavwsznj7gpbktqsiwgvngsf4e'), + ('publication-time', '2015-02-23 20:00:00'), + ('protocol-versions', '2,3'), + ('introduction-points', '\n-----BEGIN MESSAGE-----\n-----END MESSAGE-----'), +) + +HIDDEN_SERVICE_FOOTER = ( + ('signature', '\n-----BEGIN SIGNATURE-----%s-----END SIGNATURE-----' % CRYPTO_BLOB), +) + class IntroductionPoints(collections.namedtuple('IntroductionPoints', INTRODUCTION_POINTS_ATTR.keys())): """ @@ -204,6 +220,9 @@ class HiddenServiceDescriptor(Descriptor): Moved from the deprecated `pycrypto <https://www.dlitz.net/software/pycrypto/>`_ module to `cryptography <https://pypi.python.org/pypi/cryptography>`_ for validating signatures. + + .. versionchanged:: 1.6.0 + Added the **skip_crypto_validation** constructor argument. """ ATTRIBUTES = { @@ -230,7 +249,15 @@ class HiddenServiceDescriptor(Descriptor): 'signature': _parse_signature_line, } - def __init__(self, raw_contents, validate = False): + @classmethod + def content(cls, attr = None, exclude = ()): + return _descriptor_content(attr, exclude, HIDDEN_SERVICE_HEADER, HIDDEN_SERVICE_FOOTER) + + @classmethod + def create(cls, attr = None, exclude = (), validate = True): + return cls(cls.content(attr, exclude), validate = validate, skip_crypto_validation = True) + + def __init__(self, raw_contents, validate = False, skip_crypto_validation = False): super(HiddenServiceDescriptor, self).__init__(raw_contents, lazy_load = not validate) entries = _descriptor_components(raw_contents, validate, non_ascii_fields = ('introduction-points')) @@ -248,7 +275,7 @@ class HiddenServiceDescriptor(Descriptor): self._parse(entries, validate) - if stem.prereq.is_crypto_available(): + if not skip_crypto_validation and stem.prereq.is_crypto_available(): signed_digest = self._digest_for_signature(self.permanent_key, self.signature) content_digest = self._digest_for_content(b'rendezvous-service-descriptor ', b'\nsignature\n') diff --git a/test/mocking.py b/test/mocking.py index f1d859e..09d3631 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -23,17 +23,12 @@ Helper functions for creating mock objects. get_router_status_entry_v2 - RouterStatusEntryV2 get_router_status_entry_v3 - RouterStatusEntryV3 get_router_status_entry_micro_v3 - RouterStatusEntryMicroV3 - - stem.descriptor.hidden-service_descriptor - get_hidden_service_descriptor - HiddenServiceDescriptor """ -import base64 import hashlib import itertools import os import re -import textwrap import stem.descriptor.extrainfo_descriptor import stem.descriptor.hidden_service_descriptor @@ -46,12 +41,6 @@ import stem.response import stem.util.str_tools try: - # added in python 3.3 - from unittest.mock import Mock, patch -except ImportError: - from mock import Mock, patch - -try: # added in python 2.7 from collections import OrderedDict except ImportError: @@ -138,20 +127,6 @@ NETWORK_STATUS_DOCUMENT_FOOTER = ( ('directory-signature', '%s %s\n%s' % (DOC_SIG.identity, DOC_SIG.key_digest, DOC_SIG.signature)), ) -HIDDEN_SERVICE_HEADER = ( - ('rendezvous-service-descriptor', 'y3olqqblqw2gbh6phimfuiroechjjafa'), - ('version', '2'), - ('permanent-key', '\n-----BEGIN RSA PUBLIC KEY-----%s-----END RSA PUBLIC KEY-----' % CRYPTO_BLOB), - ('secret-id-part', 'e24kgecavwsznj7gpbktqsiwgvngsf4e'), - ('publication-time', '2015-02-23 20:00:00'), - ('protocol-versions', '2,3'), - ('introduction-points', '\n-----BEGIN MESSAGE-----\n-----END MESSAGE-----'), -) - -HIDDEN_SERVICE_FOOTER = ( - ('signature', '\n-----BEGIN SIGNATURE-----%s-----END SIGNATURE-----' % CRYPTO_BLOB), -) - def get_all_combinations(attr, include_empty = False): """ @@ -372,32 +347,6 @@ def get_router_status_entry_micro_v3(attr = None, exclude = (), content = False) return stem.descriptor.router_status_entry.RouterStatusEntryMicroV3(desc_content, validate = True) -def get_hidden_service_descriptor(attr = None, exclude = (), content = False, introduction_points_lines = None): - """ - Provides the descriptor content for... - stem.descriptor.hidden_service_descriptor.HidenServiceDescriptor - - :param dict attr: keyword/value mappings to be included in the descriptor - :param list exclude: mandatory keywords to exclude from the descriptor - :param bool content: provides the str content of the descriptor rather than the class if True - :param list introduction_points_lines: lines to be included in the introduction-points field - - :returns: HidenServiceDescriptor for the requested descriptor content - """ - - if (not attr or 'introduction-points' not in attr) and introduction_points_lines is not None: - encoded = base64.b64encode(introduction_points_lines('\n')) - attr['introduction-points'] = '\n-----BEGIN MESSAGE-----\n%s\n-----END MESSAGE-----' % '\n'.join(textwrap.wrap(encoded, 64)) - - desc_content = _get_descriptor_content(attr, exclude, HIDDEN_SERVICE_HEADER, HIDDEN_SERVICE_FOOTER) - - if content: - return desc_content - else: - with patch('stem.prereq.is_crypto_available', Mock(return_value = False)): - return stem.descriptor.hidden_service_descriptor.HiddenServiceDescriptor(desc_content, validate = True) - - def get_directory_authority(attr = None, exclude = (), is_vote = False, content = False): """ Provides the descriptor content for... diff --git a/test/unit/descriptor/hidden_service_descriptor.py b/test/unit/descriptor/hidden_service_descriptor.py index 6f9fb26..48f1d29 100644 --- a/test/unit/descriptor/hidden_service_descriptor.py +++ b/test/unit/descriptor/hidden_service_descriptor.py @@ -3,13 +3,12 @@ Unit tests for stem.descriptor.hidden_service_descriptor. """ import datetime +import functools import unittest import stem.descriptor import stem.prereq -from test.mocking import CRYPTO_BLOB, get_hidden_service_descriptor -from test.unit.descriptor import get_resource from test.util import require_cryptography from stem.descriptor.hidden_service_descriptor import ( @@ -18,6 +17,12 @@ from stem.descriptor.hidden_service_descriptor import ( HiddenServiceDescriptor, ) +from test.unit.descriptor import ( + get_resource, + base_expect_invalid_attr, + base_expect_invalid_attr_for_text, +) + MESSAGE_BLOCK = """ -----BEGIN MESSAGE----- %s @@ -232,6 +237,9 @@ lj/7xMZWDrfyw5H86L0QiaZnkmD+nig1+S+Rn39mmuEgl2iwZO/ihlncUJQTEULb -----END MESSAGE-----\ """ +expect_invalid_attr = functools.partial(base_expect_invalid_attr, HiddenServiceDescriptor, 'descriptor_id', 'y3olqqblqw2gbh6phimfuiroechjjafa') +expect_invalid_attr_for_text = functools.partial(base_expect_invalid_attr_for_text, HiddenServiceDescriptor, 'descriptor_id', 'y3olqqblqw2gbh6phimfuiroechjjafa') + class TestHiddenServiceDescriptor(unittest.TestCase): def test_for_duckduckgo_with_validation(self): @@ -403,18 +411,18 @@ class TestHiddenServiceDescriptor(unittest.TestCase): Basic sanity check that we can parse a hidden service descriptor with minimal attributes. """ - desc = get_hidden_service_descriptor() + desc = HiddenServiceDescriptor.create() self.assertEqual('y3olqqblqw2gbh6phimfuiroechjjafa', desc.descriptor_id) self.assertEqual(2, desc.version) - self.assertTrue(CRYPTO_BLOB in desc.permanent_key) + self.assertTrue(stem.descriptor.CRYPTO_BLOB in desc.permanent_key) self.assertEqual('e24kgecavwsznj7gpbktqsiwgvngsf4e', desc.secret_id_part) self.assertEqual(datetime.datetime(2015, 2, 23, 20, 0, 0), desc.published) self.assertEqual([2, 3], desc.protocol_versions) self.assertEqual('-----BEGIN MESSAGE-----\n-----END MESSAGE-----', desc.introduction_points_encoded) self.assertEqual([], desc.introduction_points_auth) self.assertEqual(b'', desc.introduction_points_content) - self.assertTrue(CRYPTO_BLOB in desc.signature) + self.assertTrue(stem.descriptor.CRYPTO_BLOB in desc.signature) self.assertEqual([], desc.introduction_points()) def test_unrecognized_line(self): @@ -422,7 +430,7 @@ class TestHiddenServiceDescriptor(unittest.TestCase): Includes unrecognized content in the descriptor. """ - desc = get_hidden_service_descriptor({'pepperjack': 'is oh so tasty!'}) + desc = HiddenServiceDescriptor.create({'pepperjack': 'is oh so tasty!'}) self.assertEqual(['pepperjack is oh so tasty!'], desc.get_unrecognized_lines()) def test_proceeding_line(self): @@ -430,16 +438,14 @@ class TestHiddenServiceDescriptor(unittest.TestCase): Includes a line prior to the 'rendezvous-service-descriptor' entry. """ - desc_text = b'hibernate 1\n' + get_hidden_service_descriptor(content = True) - self._expect_invalid_attr(desc_text) + expect_invalid_attr_for_text(self, b'hibernate 1\n' + HiddenServiceDescriptor.content()) def test_trailing_line(self): """ Includes a line after the 'router-signature' entry. """ - desc_text = get_hidden_service_descriptor(content = True) + b'\nhibernate 1' - self._expect_invalid_attr(desc_text) + expect_invalid_attr_for_text(self, HiddenServiceDescriptor.content() + b'\nhibernate 1') def test_required_fields(self): """ @@ -458,10 +464,10 @@ class TestHiddenServiceDescriptor(unittest.TestCase): } for line in REQUIRED_FIELDS: - desc_text = get_hidden_service_descriptor(content = True, exclude = (line,)) + desc_text = HiddenServiceDescriptor.content(exclude = (line,)) expected = [] if line == 'protocol-versions' else None - self._expect_invalid_attr(desc_text, line_to_attr[line], expected) + expect_invalid_attr_for_text(self, desc_text, line_to_attr[line], expected) def test_invalid_version(self): """ @@ -475,8 +481,7 @@ class TestHiddenServiceDescriptor(unittest.TestCase): ) for test_value in test_values: - desc_text = get_hidden_service_descriptor({'version': test_value}, content = True) - self._expect_invalid_attr(desc_text, 'version') + expect_invalid_attr(self, {'version': test_value}, 'version') def test_invalid_protocol_versions(self): """ @@ -495,8 +500,7 @@ class TestHiddenServiceDescriptor(unittest.TestCase): ) for test_value in test_values: - desc_text = get_hidden_service_descriptor({'protocol-versions': test_value}, content = True) - self._expect_invalid_attr(desc_text, 'protocol_versions', []) + expect_invalid_attr(self, {'protocol-versions': test_value}, 'protocol_versions', []) def test_introduction_points_when_empty(self): """ @@ -505,14 +509,14 @@ class TestHiddenServiceDescriptor(unittest.TestCase): are valid according to the spec. """ - missing_field_desc = get_hidden_service_descriptor(exclude = ('introduction-points',)) + missing_field_desc = HiddenServiceDescriptor.create(exclude = ('introduction-points',)) self.assertEqual(None, missing_field_desc.introduction_points_encoded) self.assertEqual([], missing_field_desc.introduction_points_auth) self.assertEqual(None, missing_field_desc.introduction_points_content) self.assertEqual([], missing_field_desc.introduction_points()) - empty_field_desc = get_hidden_service_descriptor({'introduction-points': MESSAGE_BLOCK % ''}) + empty_field_desc = HiddenServiceDescriptor.create({'introduction-points': MESSAGE_BLOCK % ''}) self.assertEqual((MESSAGE_BLOCK % '').strip(), empty_field_desc.introduction_points_encoded) self.assertEqual([], empty_field_desc.introduction_points_auth) @@ -530,30 +534,7 @@ class TestHiddenServiceDescriptor(unittest.TestCase): ) for test_value in test_values: - desc_text = get_hidden_service_descriptor({'introduction-points': test_value}, content = True) - - desc = self._expect_invalid_attr(desc_text, 'introduction_points_encoded', test_value.strip()) + desc = expect_invalid_attr(self, {'introduction-points': test_value}, 'introduction_points_encoded', test_value.strip()) self.assertEqual([], desc.introduction_points_auth) self.assertEqual(None, desc.introduction_points_content) self.assertEqual([], desc.introduction_points()) - - def _expect_invalid_attr(self, desc_text, attr = None, expected_value = None): - """ - Asserts that construction will fail due to desc_text having a malformed - attribute. If an attr is provided then we check that it matches an expected - value when we're constructed without validation. - """ - - self.assertRaises(ValueError, HiddenServiceDescriptor, desc_text, True) - desc = HiddenServiceDescriptor(desc_text, validate = False) - - if attr: - # check that the invalid attribute matches the expected value when - # constructed without validation - - self.assertEqual(expected_value, getattr(desc, attr)) - else: - # check a default attribute - self.assertEqual('y3olqqblqw2gbh6phimfuiroechjjafa', desc.descriptor_id) - - return desc

1 0

[stem/master] Support descriptor creation
by atagar＠torproject.org 02 May '17

02 May '17

commit b2a54ada71c9ee1442780d8df4c8ffa892fd285f Merge: eb70413 5caf80b Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 2 12:52:45 2017 -0700 Support descriptor creation We've always supported descriptor creation in our tests but this turns out to be a capability others want too... https://trac.torproject.org/projects/tor/ticket/10227 This is done via a simple create() and content() static method on Descriptor classes... RelayDescriptor.create({'router': 'demo 127.0.0.1 80 0 0'}) Isis made her own library for this, which unlike us supports signing descriptors. Definitely a capability we should incorporate. :P https://pypi.python.org/pypi/leekspin https://gitweb.torproject.org/user/isis/leekspin.git/ docs/_static/example/create_descriptor.py | 9 + docs/_static/example/create_descriptor_content.py | 3 + docs/change_log.rst | 1 + docs/tutorials/mirror_mirror_on_the_wall.rst | 40 + stem/descriptor/__init__.py | 115 ++- stem/descriptor/extrainfo_descriptor.py | 32 +- stem/descriptor/hidden_service_descriptor.py | 43 +- stem/descriptor/microdescriptor.py | 14 +- stem/descriptor/networkstatus.py | 161 +++- stem/descriptor/router_status_entry.py | 32 +- stem/descriptor/server_descriptor.py | 46 +- stem/descriptor/tordnsel.py | 4 +- test/__init__.py | 3 +- test/integ/control/base_controller.py | 4 +- test/integ/control/controller.py | 10 +- test/integ/socket/control_message.py | 4 +- test/mocking.py | 814 --------------------- test/unit/connection/authentication.py | 9 +- test/unit/control/controller.py | 7 +- test/unit/descriptor/__init__.py | 25 + test/unit/descriptor/export.py | 20 +- test/unit/descriptor/extrainfo_descriptor.py | 158 ++-- test/unit/descriptor/hidden_service_descriptor.py | 65 +- test/unit/descriptor/microdescriptor.py | 41 +- .../networkstatus/directory_authority.py | 43 +- test/unit/descriptor/networkstatus/document_v2.py | 12 +- test/unit/descriptor/networkstatus/document_v3.py | 171 +++-- .../descriptor/networkstatus/key_certificate.py | 47 +- test/unit/descriptor/router_status_entry.py | 118 ++- test/unit/descriptor/server_descriptor.py | 152 ++-- test/unit/doctest.py | 3 +- test/unit/interpreter/commands.py | 11 +- test/unit/response/add_onion.py | 14 +- test/unit/response/authchallenge.py | 6 +- test/unit/response/events.py | 12 +- test/unit/response/getconf.py | 14 +- test/unit/response/getinfo.py | 16 +- test/unit/response/mapaddress.py | 14 +- test/unit/response/protocolinfo.py | 25 +- test/unit/response/singleline.py | 12 +- test/unit/tutorial.py | 23 +- test/unit/tutorial_examples.py | 37 +- test/unit/util/proc.py | 5 +- test/util.py | 120 ++- 44 files changed, 1075 insertions(+), 1440 deletions(-)

1 0

[stem/master] Note how to get hidden service descriptors
by atagar＠torproject.org 02 May '17

02 May '17

commit 5681ad9fc5af54b23aa6227d4688e1ab183ddaa4 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 1 12:37:47 2017 -0700 Note how to get hidden service descriptors --- stem/descriptor/hidden_service_descriptor.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stem/descriptor/hidden_service_descriptor.py b/stem/descriptor/hidden_service_descriptor.py index fb88368..129bc83 100644 --- a/stem/descriptor/hidden_service_descriptor.py +++ b/stem/descriptor/hidden_service_descriptor.py @@ -9,6 +9,9 @@ Unlike other descriptor types these describe a hidden service rather than a relay. They're created by the service, and can only be fetched via relays with the HSDir flag. +These are only available through the Controller's +:func:`~stem.control.get_hidden_service_descriptor` method. + **Module Overview:** :: @@ -18,9 +21,6 @@ the HSDir flag. .. versionadded:: 1.4.0 """ -# TODO: Add a description for how to retrieve them when tor supports that -# (#14847) and then update #15009. - import base64 import binascii import collections

1 0

[translation/tor-messenger-uiproperties] Update translations for tor-messenger-uiproperties
by translation＠torproject.org 02 May '17

02 May '17

commit b78783b7e2b2ed1be77d70162087d441a2a29e1f Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 2 19:18:04 2017 +0000 Update translations for tor-messenger-uiproperties --- es_AR/ui.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es_AR/ui.properties b/es_AR/ui.properties index c6aa7d0..e7b3eba 100644 --- a/es_AR/ui.properties +++ b/es_AR/ui.properties @@ -8,7 +8,7 @@ auth.error=An error occurred while verifying your contact's identity. auth.success=Verifying your contact's identity completed successfully. auth.successThem=Your contact has successfully verified your identity. You may want to verify their identity as well by asking your own question. auth.fail=Failed to verify your contact's identity. -auth.waiting=Waiting for contact ... +auth.waiting=Esperando contacto ... reauth.label=Reverify your contact's identity prefs.label=Preferencias de OTR alert.start=Attempting to start a private conversation with %S.

1 0

[translation/tor-messenger-authproperties] Update translations for tor-messenger-authproperties
by translation＠torproject.org 02 May '17

02 May '17

commit c68ea5c4bba09b22f23967379c53eae21406fea6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 2 19:17:34 2017 +0000 Update translations for tor-messenger-authproperties --- es_AR/auth.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es_AR/auth.properties b/es_AR/auth.properties index 17410b1..013bd7d 100644 --- a/es_AR/auth.properties +++ b/es_AR/auth.properties @@ -4,4 +4,4 @@ auth.theirFingerprint=Purported fingerprint for %S:\n%S auth.help=Verifying a contact's identity helps ensure that the person you are talking to is who they claim to be. auth.helpTitle=Verification help auth.question=This is the question asked by your contact:\n\n%S\n\nEnter secret answer here (case sensitive): -auth.secret=Enter secret here: +auth.secret=Escriba el secreto aquí:

1 0

[translation/tor-messenger-authdtd_completed] Update translations for tor-messenger-authdtd_completed
by translation＠torproject.org 02 May '17

02 May '17

commit 34095b3e393e10e164e3381c2aa6d2340a1626f7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 2 19:17:28 2017 +0000 Update translations for tor-messenger-authdtd_completed --- es_AR/auth.dtd | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/es_AR/auth.dtd b/es_AR/auth.dtd new file mode 100644 index 0000000..76fa59a --- /dev/null +++ b/es_AR/auth.dtd @@ -0,0 +1,21 @@ +<!ENTITY authDialog.title "Comprobación de identidad de contactos"> +<!ENTITY authDialog.authenticate "Verificar"> +<!ENTITY authDialog.cancel "Cancelar"> +<!ENTITY authDialog.help "Ayuda"> +<!ENTITY authDialog.yes "Si"> +<!ENTITY authDialog.no "No"> +<!ENTITY authDialog.verified "He verificado que esta es la huella correcta."> +<!ENTITY authDialog.yourFingerprint "Su huella"> +<!ENTITY authDialog.theirFingerprint "Su supuesta huella dactilar"> +<!ENTITY authDialog.manualVerification "Verificación manual de la huella"> +<!ENTITY authDialog.questionAndAnswer "Preguntas y respuestas"> +<!ENTITY authDialog.sharedSecret "Secreto compartido"> +<!ENTITY authDialog.manualInstruction "Para verificar la huella digital, póngase en contacto con su amigo a través de algún otro canal autenticado, como el teléfono o el correo electrónico firmado por GPG. Cada uno de ustedes debe informar su huella digital a la otra. Si todo coincide, debe indicarlo en el cuadro de diálogo siguiente, que ha verificado la huella digital."> +<!ENTITY authDialog.choose "Seleccione"> +<!ENTITY authDialog.how "¿Cómo desea verificar la identidad de su contacto?"> +<!ENTITY authDialog.qaInstruction "Para verificar su identidad, escoja una pregunta cuya respuesta sólo sea conocida por usted y su contacto. Ingrese esa pregunta y su respuesta, luego espere a que su contacto ingrese la respuesta también. Si las respuestas no coinciden, entonces usted puede estar hablando con un impostor."> +<!ENTITY authDialog.secretInstruction "Para verificar su identidad, elija un secreto conocido únicamente por usted y su contacto. Introduzca este secreto, luego espere a que su contacto lo introduzca también. Si los secretos no coinciden, entonces usted puede estar hablando con un impostor."> +<!ENTITY authDialog.question "Escriba la pregunta aquí:"> +<!ENTITY authDialog.answer "Introduzca la respuesta secreta aquí (sensible a mayúsculas):"> +<!ENTITY authDialog.secret "Escriba el secreto aquí:"> +<!ENTITY authDialog.waiting "Esperando contacto ..."> \ No newline at end of file

1 0

[translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
by translation＠torproject.org 02 May '17

02 May '17

commit 5637845730b2441f791804cd30e5dbd527e69372 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 2 19:17:25 2017 +0000 Update translations for tor-messenger-authdtd --- es_AR/auth.dtd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/es_AR/auth.dtd b/es_AR/auth.dtd index 5e4dfd8..76fa59a 100644 --- a/es_AR/auth.dtd +++ b/es_AR/auth.dtd @@ -1,4 +1,4 @@ -<!ENTITY authDialog.title "Verify contact's identity"> +<!ENTITY authDialog.title "Comprobación de identidad de contactos"> <!ENTITY authDialog.authenticate "Verificar"> <!ENTITY authDialog.cancel "Cancelar"> <!ENTITY authDialog.help "Ayuda"> @@ -14,8 +14,8 @@ <!ENTITY authDialog.choose "Seleccione"> <!ENTITY authDialog.how "¿Cómo desea verificar la identidad de su contacto?"> <!ENTITY authDialog.qaInstruction "Para verificar su identidad, escoja una pregunta cuya respuesta sólo sea conocida por usted y su contacto. Ingrese esa pregunta y su respuesta, luego espere a que su contacto ingrese la respuesta también. Si las respuestas no coinciden, entonces usted puede estar hablando con un impostor."> -<!ENTITY authDialog.secretInstruction "To verify their identity, pick a secret known only to you and your contact. Enter this secret, then wait for your contact to enter it as well. If the secrets do not match, then you may be talking to an imposter."> -<!ENTITY authDialog.question "Enter question here:"> -<!ENTITY authDialog.answer "Enter secret answer here (case sensitive):"> -<!ENTITY authDialog.secret "Enter secret here:"> -<!ENTITY authDialog.waiting "Waiting for contact ..."> \ No newline at end of file +<!ENTITY authDialog.secretInstruction "Para verificar su identidad, elija un secreto conocido únicamente por usted y su contacto. Introduzca este secreto, luego espere a que su contacto lo introduzca también. Si los secretos no coinciden, entonces usted puede estar hablando con un impostor."> +<!ENTITY authDialog.question "Escriba la pregunta aquí:"> +<!ENTITY authDialog.answer "Introduzca la respuesta secreta aquí (sensible a mayúsculas):"> +<!ENTITY authDialog.secret "Escriba el secreto aquí:"> +<!ENTITY authDialog.waiting "Esperando contacto ..."> \ No newline at end of file

1 0

[translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
by translation＠torproject.org 02 May '17

02 May '17

commit f20cc2c97b897981980a045baa28dbb887b44e7a Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 2 18:47:25 2017 +0000 Update translations for tor-messenger-authdtd --- es_AR/auth.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es_AR/auth.dtd b/es_AR/auth.dtd index c5b3cd0..5e4dfd8 100644 --- a/es_AR/auth.dtd +++ b/es_AR/auth.dtd @@ -10,10 +10,10 @@ <!ENTITY authDialog.manualVerification "Verificación manual de la huella"> <!ENTITY authDialog.questionAndAnswer "Preguntas y respuestas"> <!ENTITY authDialog.sharedSecret "Secreto compartido"> -<!ENTITY authDialog.manualInstruction "To verify the fingerprint, contact your buddy via some other authenticated channel, such as the telephone or GPG-signed email. Each of you should tell your fingerprint to the other. If everything matches up, you should indicate in the dialog below that you have verified the fingerprint."> +<!ENTITY authDialog.manualInstruction "Para verificar la huella digital, póngase en contacto con su amigo a través de algún otro canal autenticado, como el teléfono o el correo electrónico firmado por GPG. Cada uno de ustedes debe informar su huella digital a la otra. Si todo coincide, debe indicarlo en el cuadro de diálogo siguiente, que ha verificado la huella digital."> <!ENTITY authDialog.choose "Seleccione"> -<!ENTITY authDialog.how "How would you like to verify your contact's identity?"> -<!ENTITY authDialog.qaInstruction "To verify their identity, pick a question whose answer is known only to you and your contact. Enter this question and answer, then wait for your contact to enter the answer as well. If the answers do not match, then you may be talking to an imposter."> +<!ENTITY authDialog.how "¿Cómo desea verificar la identidad de su contacto?"> +<!ENTITY authDialog.qaInstruction "Para verificar su identidad, escoja una pregunta cuya respuesta sólo sea conocida por usted y su contacto. Ingrese esa pregunta y su respuesta, luego espere a que su contacto ingrese la respuesta también. Si las respuestas no coinciden, entonces usted puede estar hablando con un impostor."> <!ENTITY authDialog.secretInstruction "To verify their identity, pick a secret known only to you and your contact. Enter this secret, then wait for your contact to enter it as well. If the secrets do not match, then you may be talking to an imposter."> <!ENTITY authDialog.question "Enter question here:"> <!ENTITY authDialog.answer "Enter secret answer here (case sensitive):">

1 0

[translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
by translation＠torproject.org 02 May '17

02 May '17

commit ad123b915a797f815fa0971f7e745617d581409e Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 2 18:17:26 2017 +0000 Update translations for tor-messenger-authdtd --- es_AR/auth.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es_AR/auth.dtd b/es_AR/auth.dtd index e44e309..c5b3cd0 100644 --- a/es_AR/auth.dtd +++ b/es_AR/auth.dtd @@ -6,12 +6,12 @@ <!ENTITY authDialog.no "No"> <!ENTITY authDialog.verified "He verificado que esta es la huella correcta."> <!ENTITY authDialog.yourFingerprint "Su huella"> -<!ENTITY authDialog.theirFingerprint "Their purported fingerprint"> +<!ENTITY authDialog.theirFingerprint "Su supuesta huella dactilar"> <!ENTITY authDialog.manualVerification "Verificación manual de la huella"> <!ENTITY authDialog.questionAndAnswer "Preguntas y respuestas"> -<!ENTITY authDialog.sharedSecret "Shared secret"> +<!ENTITY authDialog.sharedSecret "Secreto compartido"> <!ENTITY authDialog.manualInstruction "To verify the fingerprint, contact your buddy via some other authenticated channel, such as the telephone or GPG-signed email. Each of you should tell your fingerprint to the other. If everything matches up, you should indicate in the dialog below that you have verified the fingerprint."> -<!ENTITY authDialog.choose "Choose"> +<!ENTITY authDialog.choose "Seleccione"> <!ENTITY authDialog.how "How would you like to verify your contact's identity?"> <!ENTITY authDialog.qaInstruction "To verify their identity, pick a question whose answer is known only to you and your contact. Enter this question and answer, then wait for your contact to enter the answer as well. If the answers do not match, then you may be talking to an imposter."> <!ENTITY authDialog.secretInstruction "To verify their identity, pick a secret known only to you and your contact. Enter this secret, then wait for your contact to enter it as well. If the secrets do not match, then you may be talking to an imposter.">

1 0

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 02 May '17

02 May '17

commit 42e1e4748799db2d5d371244a6e64f3e18a4278a Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 2 16:48:19 2017 +0000 Update translations for tails-greeter-2_completed --- zh_CN/zh_CN.po | 86 +++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 34 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index 5f2b4a9..0991959 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-31 10:47+0100\n" +"POT-Creation-Date: 2017-03-20 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Chi-Hsun Tsai <chihsun.tsai(a)gmail.com>, 2016\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" @@ -84,7 +84,7 @@ msgstr "欺骗所有 MAC 地址（默认）" msgid "Don't spoof MAC addresses" msgstr "不欺骗任何 MAC 地址" -#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514 +#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:529 msgid "Cannot unlock encrypted storage with this passphrase." msgstr "无法用此密码解锁加密的存储。" @@ -118,24 +118,24 @@ msgid "Save Language & Region Settings" msgstr "保存语言和区域设置" #: ../data/greeter.ui.h:25 -msgid "Language" -msgstr "语言" +msgid "_Language" +msgstr "语言(_L)" #: ../data/greeter.ui.h:26 -msgid "Keyboard Layout" -msgstr "键盘布局" +msgid "_Keyboard Layout" +msgstr "键盘布局(_K)" #: ../data/greeter.ui.h:27 -msgid "Formats" -msgstr "格式" +msgid "_Formats" +msgstr "格式(_F)" #: ../data/greeter.ui.h:28 -msgid "Time Zone" -msgstr "时区" +msgid "_Time Zone" +msgstr "时区(_T)" #: ../data/greeter.ui.h:29 -msgid "Encrypted Persistent Storage" -msgstr "加密持久存储" +msgid "Encrypted _Persistent Storage" +msgstr "加密的持久存储(_P)" #: ../data/greeter.ui.h:30 msgid "Show Passphrase" @@ -149,8 +149,8 @@ msgstr "配置持久存储" msgid "Enter your passphrase to unlock the persistent storage" msgstr "请输入您的密码以解锁持久存储" -#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460 -#: ../tailsgreeter/gui.py:510 +#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:475 +#: ../tailsgreeter/gui.py:525 msgid "Unlock" msgstr "解锁" @@ -162,9 +162,9 @@ msgstr "重新锁定持久存储" msgid "Your persistent storage is unlocked. Restart Tails to lock it again." msgstr "您的持久存储已解锁。重启 Tails 以再次锁定它。" -#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554 -msgid "Additional Settings" -msgstr "额外设置" +#: ../data/greeter.ui.h:36 +msgid "_Additional Settings" +msgstr "额外设置(_A)" #: ../data/greeter.ui.h:37 msgid "Save Additional Settings" @@ -204,58 +204,76 @@ msgid "" msgstr "默认设置在大多数情况下是安全的。要添加自定义设置，点击下面的 + 按钮。" #: ../data/greeter.ui.h:45 +msgid "_Administration Password" +msgstr "管理密码(_A)" + +#: ../data/greeter.ui.h:46 msgid "Off (default)" msgstr "关闭（默认）" -#: ../data/greeter.ui.h:46 +#: ../data/greeter.ui.h:47 +msgid "_MAC Address Spoofing" +msgstr "MAC 地址欺骗(_M)" + +#: ../data/greeter.ui.h:48 msgid "On (default)" msgstr "开启（默认）" -#: ../data/greeter.ui.h:47 -msgid "Network Connection" -msgstr "网络连接" +#: ../data/greeter.ui.h:49 +msgid "_Network Connection" +msgstr "网络连接(_N)" -#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367 +#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:382 msgid "Direct (default)" msgstr "直接（默认）" -#: ../tailsgreeter/gui.py:373 +#: ../data/greeter.ui.h:51 +msgid "_Windows Camouflage" +msgstr "伪装 Windows(_W)" + +#: ../tailsgreeter/gui.py:388 msgid "Bridge & Proxy" msgstr "网桥和代理" -#: ../tailsgreeter/gui.py:379 +#: ../tailsgreeter/gui.py:394 msgid "Offline" msgstr "离线" -#: ../tailsgreeter/gui.py:463 +#: ../tailsgreeter/gui.py:478 msgid "Failed to relock persistent storage." msgstr "重新锁定持久存储失败。" -#: ../tailsgreeter/gui.py:481 +#: ../tailsgreeter/gui.py:496 msgid "Unlocking…" msgstr "正在解锁…" -#: ../tailsgreeter/gui.py:562 +#: ../tailsgreeter/gui.py:591 +msgid "Additional Settings" +msgstr "额外设置" + +#: ../tailsgreeter/gui.py:599 msgid "Cancel" msgstr "取消" -#: ../tailsgreeter/gui.py:566 +#: ../tailsgreeter/gui.py:605 msgid "Add" msgstr "添加" -#: ../tailsgreeter/gui.py:572 +#: ../tailsgreeter/gui.py:613 msgid "Back" msgstr "上一步" -#: ../tailsgreeter/gui.py:658 +#: ../tailsgreeter/gui.py:716 msgid "Shutdown" msgstr "关闭" -#: ../tailsgreeter/gui.py:664 -msgid "Start Tails" -msgstr "启动 Tails" +#: ../tailsgreeter/gui.py:721 +msgid "_Start Tails" +msgstr "启动 Tails(_S)" -#: ../tailsgreeter/language.py:119 +#. Translators: translate to default:RTL if your language +#. is written from right to left +#: ../tailsgreeter/language.py:133 msgid "default:LTR" msgstr "默认:LTR"

1 0