December 2016 - tor-commits - lists.torproject.org

[stem/master] Support protocols with commas
by atagar＠torproject.org 25 Dec '16

25 Dec '16

commit 3356279c284bdf9c2611708cf61b621f4cac72b0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 25 10:19:19 2016 -0800 Support protocols with commas Oops! Thought all protocols were contiguous ranges. Turns out they can have commas... MyProtocol=1,3 If that's the case then a dictionary of lists makes more sense than the class we had. With this protocol checks can be done like... if 4 in desc.protocols.get('MyProtocol', []): --- stem/descriptor/__init__.py | 93 ++++++----------------- stem/descriptor/microdescriptor.py | 4 +- stem/descriptor/networkstatus.py | 20 ++--- stem/descriptor/router_status_entry.py | 14 +++- stem/descriptor/server_descriptor.py | 2 +- test/settings.cfg | 1 - test/unit/descriptor/microdescriptor.py | 5 +- test/unit/descriptor/networkstatus/document_v3.py | 16 ++-- test/unit/descriptor/protocol.py | 46 ----------- test/unit/descriptor/router_status_entry.py | 3 +- test/unit/descriptor/server_descriptor.py | 25 +++++- 11 files changed, 80 insertions(+), 149 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 208741a..d7b1aea 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -38,7 +38,6 @@ Package for parsing and processing descriptor data. import base64 import codecs -import collections import copy import hashlib import os @@ -87,72 +86,6 @@ DocumentHandler = stem.util.enum.UppercaseEnum( ) -class ProtocolSupport(object): - """ - Protocols supported by a relay. - - .. versionadded:: 1.6.0 - """ - - def __init__(self, keyword, value): - # parses 'protocol' entries like: Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 - - self._entries = OrderedDict() - - for entry in value.split(): - if '=' not in entry: - raise ValueError("Protocol entires are expected to be a series of 'key=value' pairs but was: %s %s" % (keyword, value)) - - k, v = entry.split('=', 1) - - if '-' in v: - min_value, max_value = v.split('-', 1) - else: - min_value = max_value = v - - if not min_value.isdigit() or not max_value.isdigit(): - raise ValueError('Protocol values should be a number or number range, but was: %s %s' % (keyword, value)) - - self._entries[k] = Protocol(k, int(min_value), int(max_value)) - - def is_supported(self, protocol, version = None): - """ - Checks if the given protocol is supported. - - :param str protocol: protocol to check support of (DirCache, HSDir, etc) - :param int version: protocol version to check support of - - :returns: **True** if the protocol is supported, **False** otherwise - """ - - supported = self._entries.get(protocol) - - if not supported: - return False - elif version and version < supported.min_version: - return False - elif version and version > supported.max_version: - return False - else: - return True - - def __iter__(self): - for protocol in self._entries.values(): - yield protocol - - -class Protocol(collections.namedtuple('Protocol', ['name', 'min_version', 'max_version'])): - """ - Individual protocol range supported by a relay. - - .. versionadded:: 1.6.0 - - :var str name: protocol name (ex. DirCache, HSDir, etc) - :var int min_version: minimum protocol supported - :var int max_version: maximum protocol supported - """ - - def parse_file(descriptor_file, descriptor_type = None, validate = False, document_handler = DocumentHandler.ENTRIES, normalize_newlines = None, **kwargs): """ Simple function to read the descriptor contents from a file, providing an @@ -458,8 +391,32 @@ def _parse_forty_character_hex(keyword, attribute): def _parse_protocol_line(keyword, attribute): def _parse(descriptor, entries): + # parses 'protocol' entries like: Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 + value = _value(keyword, entries) - setattr(descriptor, attribute, ProtocolSupport(keyword, value)) + protocols = OrderedDict() + + for entry in value.split(): + if '=' not in entry: + raise ValueError("Protocol entires are expected to be a series of 'key=value' pairs but was: %s %s" % (keyword, value)) + + k, v = entry.split('=', 1) + versions = [] + + for subentry in v.split(','): + if '-' in subentry: + min_value, max_value = subentry.split('-', 1) + else: + min_value = max_value = subentry + + if not min_value.isdigit() or not max_value.isdigit(): + raise ValueError('Protocol values should be a number or number range, but was: %s %s' % (keyword, value)) + + versions += range(int(min_value), int(max_value) + 1) + + protocols[k] = versions + + setattr(descriptor, attribute, protocols) return _parse diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py index e1bab9c..0f1a015 100644 --- a/stem/descriptor/microdescriptor.py +++ b/stem/descriptor/microdescriptor.py @@ -211,7 +211,7 @@ class Microdescriptor(Descriptor): :var hash identifiers: mapping of key types (like rsa1024 or ed25519) to their base64 encoded identity, this is only used for collision prevention (:trac:`11743`) - :var stem.descriptor.ProtocolSupport protocols: supported protocols + :var dict protocols: mapping of protocols to their supported versions :var str identifier: base64 encoded identity digest (**deprecated**, use identifiers instead) @@ -241,7 +241,7 @@ class Microdescriptor(Descriptor): 'identifier_type': (None, _parse_id_line), # deprecated in favor of identifiers 'identifier': (None, _parse_id_line), # deprecated in favor of identifiers 'identifiers': ({}, _parse_id_line), - 'protocols': (None, _parse_pr_line), + 'protocols': ({}, _parse_pr_line), 'digest': (None, _parse_digest), } diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 75ec459..4e97d67 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -821,14 +821,10 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): :var str shared_randomness_current_value: base64 encoded current shared random value - :var stem.descriptor.ProtocolSupport recommended_client_protocols: recommended - protocols for clients - :var stem.descriptor.ProtocolSupport recommended_relay_protocols: recommended - protocols for relays - :var stem.descriptor.ProtocolSupport required_client_protocols: required - protocols for clients - :var stem.descriptor.ProtocolSupport required_relay_protocols: required - protocols for relays + :var dict recommended_client_protocols: recommended protocols for clients + :var dict recommended_relay_protocols: recommended protocols for relays + :var dict required_client_protocols: required protocols for clients + :var dict required_relay_protocols: required protocols for relays **\*** attribute is either required when we're parsed with validation or has a default value, others are left as None if undefined @@ -873,10 +869,10 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): 'shared_randomness_previous_value': (None, _parse_shared_rand_previous_value), 'shared_randomness_current_reveal_count': (None, _parse_shared_rand_current_value), 'shared_randomness_current_value': (None, _parse_shared_rand_current_value), - 'recommended_client_protocols': (None, _parse_recommended_client_protocols_line), - 'recommended_relay_protocols': (None, _parse_recommended_relay_protocols_line), - 'required_client_protocols': (None, _parse_required_client_protocols_line), - 'required_relay_protocols': (None, _parse_required_relay_protocols_line), + 'recommended_client_protocols': ({}, _parse_recommended_client_protocols_line), + 'recommended_relay_protocols': ({}, _parse_recommended_relay_protocols_line), + 'required_client_protocols': ({}, _parse_required_client_protocols_line), + 'required_relay_protocols': ({}, _parse_required_relay_protocols_line), 'params': ({}, _parse_header_parameters_line), 'signatures': ([], _parse_footer_directory_signature_line), diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index abdefa2..98fc042 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -563,7 +563,7 @@ class RouterStatusEntryV3(RouterStatusEntry): information that isn't yet recognized :var stem.exit_policy.MicroExitPolicy exit_policy: router's exit policy - :var stem.descriptor.ProtocolSupport protocols: supported protocols + :var dict protocols: mapping of protocols to their supported versions :var list microdescriptor_hashes: **\*** tuples of two values, the list of consensus methods for generating a set of digests and the 'algorithm => @@ -591,7 +591,7 @@ class RouterStatusEntryV3(RouterStatusEntry): 'unrecognized_bandwidth_entries': ([], _parse_w_line), 'exit_policy': (None, _parse_p_line), - 'pr': (None, _parse_pr_line), + 'protocols': ({}, _parse_pr_line), 'microdescriptor_hashes': ([], _parse_m_line), }) @@ -611,7 +611,7 @@ class RouterStatusEntryV3(RouterStatusEntry): return ('r', 's') def _single_fields(self): - return ('r', 's', 'v', 'w', 'p') + return ('r', 's', 'v', 'w', 'p', 'pr') def _compare(self, other, method): if not isinstance(other, RouterStatusEntryV3): @@ -646,9 +646,13 @@ class RouterStatusEntryMicroV3(RouterStatusEntry): measurements :var list unrecognized_bandwidth_entries: **\*** bandwidth weighting information that isn't yet recognized + :var dict protocols: mapping of protocols to their supported versions :var str digest: **\*** router's hex encoded digest of our corresponding microdescriptor + .. versionchanged:: 1.6.0 + Added the protocols attribute. + **\*** attribute is either required when we're parsed with validation or has a default value, others are left as **None** if undefined """ @@ -658,6 +662,7 @@ class RouterStatusEntryMicroV3(RouterStatusEntry): 'measured': (None, _parse_w_line), 'is_unmeasured': (False, _parse_w_line), 'unrecognized_bandwidth_entries': ([], _parse_w_line), + 'protocols': ({}, _parse_pr_line), 'digest': (None, _parse_microdescriptor_m_line), }) @@ -665,6 +670,7 @@ class RouterStatusEntryMicroV3(RouterStatusEntry): PARSER_FOR_LINE = dict(RouterStatusEntry.PARSER_FOR_LINE, **{ 'w': _parse_w_line, 'm': _parse_microdescriptor_m_line, + 'pr': _parse_pr_line, }) def _name(self, is_plural = False): @@ -674,7 +680,7 @@ class RouterStatusEntryMicroV3(RouterStatusEntry): return ('r', 's', 'm') def _single_fields(self): - return ('r', 's', 'v', 'w', 'm') + return ('r', 's', 'v', 'w', 'm', 'pr') def _compare(self, other, method): if not isinstance(other, RouterStatusEntryMicroV3): diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index ffd0183..0ba28b3 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -450,7 +450,7 @@ class ServerDescriptor(Descriptor): :var list or_addresses: **\*** alternative for our address/or_port attributes, each entry is a tuple of the form (address (**str**), port (**int**), is_ipv6 (**bool**)) - :var stem.descriptor.ProtocolSupport protocols: supported protocols + :var dict protocols: mapping of protocols to their supported versions **Deprecated**, moved to extra-info descriptor... diff --git a/test/settings.cfg b/test/settings.cfg index 627c270..4913202 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -179,7 +179,6 @@ test.unit_tests |test.unit.descriptor.export.TestExport |test.unit.descriptor.reader.TestDescriptorReader |test.unit.descriptor.remote.TestDescriptorDownloader -|test.unit.descriptor.protocol.TestProtocol |test.unit.descriptor.server_descriptor.TestServerDescriptor |test.unit.descriptor.extrainfo_descriptor.TestExtraInfoDescriptor |test.unit.descriptor.microdescriptor.TestMicrodescriptor diff --git a/test/unit/descriptor/microdescriptor.py b/test/unit/descriptor/microdescriptor.py index 9d4d4fc..9b3fb2d 100644 --- a/test/unit/descriptor/microdescriptor.py +++ b/test/unit/descriptor/microdescriptor.py @@ -98,7 +98,7 @@ class TestMicrodescriptor(unittest.TestCase): self.assertEqual({}, desc.identifiers) self.assertEqual(None, desc.identifier_type) self.assertEqual(None, desc.identifier) - self.assertEqual(None, desc.protocols) + self.assertEqual({}, desc.protocols) self.assertEqual([], desc.get_unrecognized_lines()) def test_unrecognized_line(self): @@ -172,8 +172,7 @@ class TestMicrodescriptor(unittest.TestCase): """ desc = get_microdescriptor({'pr': 'Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 Link=1-4 LinkAuth=1 Microdesc=1 Relay=1-2'}) - self.assertEqual(10, len(list(desc.protocols))) - self.assertTrue(desc.protocols.is_supported('Desc')) + self.assertEqual(10, len(desc.protocols)) def test_identifier(self): """ diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index 09faf43..8203e4e 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -343,10 +343,10 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= self.assertEqual(None, document.shared_randomness_previous_value) self.assertEqual(None, document.shared_randomness_current_reveal_count) self.assertEqual(None, document.shared_randomness_current_value) - self.assertEqual(None, document.recommended_client_protocols) - self.assertEqual(None, document.recommended_relay_protocols) - self.assertEqual(None, document.required_client_protocols) - self.assertEqual(None, document.required_relay_protocols) + self.assertEqual({}, document.recommended_client_protocols) + self.assertEqual({}, document.recommended_relay_protocols) + self.assertEqual({}, document.required_client_protocols) + self.assertEqual({}, document.required_relay_protocols) self.assertEqual(DEFAULT_PARAMS, document.params) self.assertEqual((), document.directory_authorities) self.assertEqual({}, document.bandwidth_weights) @@ -943,10 +943,10 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= ('required-relay-protocols', 'DirCache=1'), ])) - self.assertEqual(2, len(list(document.recommended_client_protocols))) - self.assertEqual(2, len(list(document.recommended_relay_protocols))) - self.assertEqual(4, len(list(document.required_client_protocols))) - self.assertEqual(1, len(list(document.required_relay_protocols))) + self.assertEqual(2, len(document.recommended_client_protocols)) + self.assertEqual(2, len(document.recommended_relay_protocols)) + self.assertEqual(4, len(document.required_client_protocols)) + self.assertEqual(1, len(document.required_relay_protocols)) def test_params(self): """ diff --git a/test/unit/descriptor/protocol.py b/test/unit/descriptor/protocol.py deleted file mode 100644 index a47d7c6..0000000 --- a/test/unit/descriptor/protocol.py +++ /dev/null @@ -1,46 +0,0 @@ -""" -Unit tessts for the stem.descriptor.ProtocolSupport class. -""" - -import unittest - -from stem.descriptor import Protocol, ProtocolSupport - - -class TestProtocol(unittest.TestCase): - def test_parsing(self): - expected = [ - Protocol(name = 'Desc', min_version = 1, max_version = 1), - Protocol(name = 'Link', min_version = 1, max_version = 4), - Protocol(name = 'Microdesc', min_version = 1, max_version = 1), - Protocol(name = 'Relay', min_version = 1, max_version = 2), - ] - - self.assertEqual(expected, list(ProtocolSupport('pr', 'Desc=1 Link=1-4 Microdesc=1 Relay=1-2'))) - - def test_parse_with_no_mapping(self): - try: - ProtocolSupport('pr', 'Desc Link=1-4') - self.fail('Did not raise expected exception') - except ValueError as exc: - self.assertEqual("Protocol entires are expected to be a series of 'key=value' pairs but was: pr Desc Link=1-4", str(exc)) - - def test_parse_with_non_int_version(self): - try: - ProtocolSupport('pr', 'Desc=hi Link=1-4') - self.fail('Did not raise expected exception') - except ValueError as exc: - self.assertEqual('Protocol values should be a number or number range, but was: pr Desc=hi Link=1-4', str(exc)) - - def test_is_supported(self): - protocol = ProtocolSupport('pr', 'Desc=1 Link=2-4 Microdesc=1 Relay=1-2') - self.assertFalse(protocol.is_supported('NoSuchProtocol')) - self.assertFalse(protocol.is_supported('Desc', 2)) - self.assertTrue(protocol.is_supported('Desc')) - self.assertTrue(protocol.is_supported('Desc', 1)) - - self.assertFalse(protocol.is_supported('Link', 1)) - self.assertTrue(protocol.is_supported('Link', 2)) - self.assertTrue(protocol.is_supported('Link', 3)) - self.assertTrue(protocol.is_supported('Link', 4)) - self.assertFalse(protocol.is_supported('Link', 5)) diff --git a/test/unit/descriptor/router_status_entry.py b/test/unit/descriptor/router_status_entry.py index b8597be..fc02539 100644 --- a/test/unit/descriptor/router_status_entry.py +++ b/test/unit/descriptor/router_status_entry.py @@ -484,8 +484,7 @@ class TestRouterStatusEntry(unittest.TestCase): def test_protocols(self): desc = get_router_status_entry_v3({'pr': 'Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 Link=1-4 LinkAuth=1 Microdesc=1 Relay=1-2'}) - self.assertEqual(10, len(list(desc.protocols))) - self.assertTrue(desc.protocols.is_supported('Desc')) + self.assertEqual(10, len(desc.protocols)) def test_versions(self): """ diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index d84ad48..ba8271d 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -663,8 +663,29 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= """ desc = get_relay_server_descriptor({'proto': 'Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 Link=1-4 LinkAuth=1 Microdesc=1 Relay=1-2'}) - self.assertEqual(10, len(list(desc.protocols))) - self.assertTrue(desc.protocols.is_supported('Desc')) + self.assertEqual({'Cons': [1], 'Desc': [1], 'DirCache': [1], 'HSDir': [1], 'HSIntro': [3], 'HSRend': [1], 'Link': [1, 2, 3, 4], 'LinkAuth': [1], 'Microdesc': [1], 'Relay': [1, 2]}, desc.protocols) + + def test_protocols_with_no_mapping(self): + """ + Checks a 'proto' line when it's not key=value pairs. + """ + + try: + get_relay_server_descriptor({'proto': 'Desc Link=1-4'}) + self.fail('Did not raise expected exception') + except ValueError as exc: + self.assertEqual("Protocol entires are expected to be a series of 'key=value' pairs but was: proto Desc Link=1-4", str(exc)) + + def test_parse_with_non_int_version(self): + """ + Checks a 'proto' line with non-numeric content. + """ + + try: + get_relay_server_descriptor({'proto': 'Desc=hi Link=1-4'}) + self.fail('Did not raise expected exception') + except ValueError as exc: + self.assertEqual('Protocol values should be a number or number range, but was: proto Desc=hi Link=1-4', str(exc)) def test_ntor_onion_key(self): """

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 24 Dec '16

24 Dec '16

commit c1646125a9b4288addebd64fb4ce6653da5e698e Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 24 18:48:18 2016 +0000 Update translations for tor-browser-manual --- ca/ca.po | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/ca/ca.po b/ca/ca.po index 3769202..206b825 100644 --- a/ca/ca.po +++ b/ca/ca.po @@ -185,16 +185,19 @@ msgid "" "Email bridges(a)torproject.org from a Gmail, Yahoo, or Riseup email address, " "or" msgstr "" +"Correu electrònic bridges(a)torproject.org des de Gmail, Yahoo, o Riseup o" #: bridges.page:51 msgid "Entering bridge addresses" -msgstr "" +msgstr "Entri la direcció pont" #: bridges.page:52 msgid "" "Once you have obtained some bridge addresses, you will need to enter them " "into Tor Launcher." msgstr "" +"Un cop s'hagi obtingut alguna direcció pont, l'haurà d'introduir en el Tor " +"Launcher." #: bridges.page:57 msgid "" @@ -202,6 +205,9 @@ msgid "" " to the Tor network. Select “Use custom bridges” and enter each bridge " "address on a separate line." msgstr "" +"Esculli \"si\" quan sigui preguntat si el seu proveïdor d'Internet bloqueja " +"les connexions a la xarxa Tor. Seleccioni \"Utilització de ponts " +"personalitzat\" i introdueixi en linines separades les direccions pont." #. 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 @@ -213,6 +219,8 @@ msgid "" "external ref='media/tor-launcher-custom-bridges_en-US.png' " "md5='93365c2aa3fb4d627497e83f28a39b7e'" msgstr "" +"Extern ref='media/tor-launcher-custom-bridges_en-US.png' " +"md5='93365c2aa3fb4d627497e83f28a39b7e'" #: bridges.page:65 msgid "" @@ -221,14 +229,18 @@ msgid "" " may be down. Please use one of the above methods to obtain more bridge " "addresses, and try again." msgstr "" +"Faci clic en \"Connectar\". La utilització de ponts pot alentir la connexió " +"comparat amb l'ús de relés estàndard Tor. Si la connexió falla, el ponts " +"obtingut haurà caigut. Si us plau, utilitzi un del mencionats a sobre per " +"obtindre més direccions ponts, i provi-ho posteriorment." #: circumvention.page:6 msgid "What to do if the Tor network is blocked" -msgstr "" +msgstr "Que fer si la xarxa Tor està bloquejada" #: circumvention.page:10 msgid "Circumvention" -msgstr "" +msgstr "Elusió" #: circumvention.page:12 msgid ""

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 24 Dec '16

24 Dec '16

commit d5430dc415ab41ae09005b88ad0c8f09da772863 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 24 18:18:20 2016 +0000 Update translations for tor-browser-manual --- ca/ca.po | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ca/ca.po b/ca/ca.po index 0928b71..3769202 100644 --- a/ca/ca.po +++ b/ca/ca.po @@ -155,16 +155,20 @@ msgid "" "techniques that do not rely on bridges. You do not need to obtain bridge " "addresses in order to use these transports." msgstr "" +"Altres transports connectors, com Meek, utilitzant altres tècniques anit-" +"censura sense ponts. No es precisen l'obtenció de direccions ponts." #: bridges.page:28 msgid "Getting bridge addresses" -msgstr "" +msgstr "Obtenció de direcció pont" #: bridges.page:29 msgid "" "Because bridge addresses are not public, you will need to request them " "yourself. You have two options:" msgstr "" +"Com que les direccions ponts no són públiques, s'hauran de demanar en " +"l'instant. Existeixen dos opcions:" #: bridges.page:36 msgid "" @@ -172,6 +176,9 @@ msgid "" "href=\"https://bridges.torproject.org/\">https://bridges.torproject.org/</link>" " and follow the instructions, or" msgstr "" +"Visita <link " +"href=\"https://bridges.torproject.org/\">https://bridges.torproject.org/</link>" +" i segueixi les instruccions, o" #: bridges.page:42 msgid ""

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 24 Dec '16

24 Dec '16

commit 35ecd3771d56406efd75ef238913e84fc19465b3 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 24 14:48:28 2016 +0000 Update translations for tor-browser-manual --- de/de.po | 71 ++++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 26 deletions(-) diff --git a/de/de.po b/de/de.po index 4040473..591ae24 100644 --- a/de/de.po +++ b/de/de.po @@ -4,7 +4,6 @@ # Ettore Atalan <atalanttore(a)googlemail.com>, 2016 # Christian Kaindl <crisscross.kaindl(a)outlook.de>, 2016 # Sacro <Scion(a)T-Online.de>, 2016 -# freedompenguin <sebastian(a)urbach.org>, 2016 # D P <m(a)slugline.de>, 2016 # gregweb <gregweb(a)web.de>, 2016 # runasand <inactive+runasand(a)transifex.com>, 2016 @@ -30,8 +29,8 @@ msgstr "Wir danken allen freiwilligen Übersetzern dieser Software!" #: about-tor-browser.page:7 msgid "Learn what Tor Browser can do to protect your privacy and anonymity" msgstr "" -"Erfahre, wie der Tor Browser deine Privatsfähre und deine Anonymität " -"schützen kann" +"Erfahren Sie, was der Tor-Browser tun kann, um Ihre Privatsphäre und " +"Anonymität zu schützen" #: about-tor-browser.page:10 msgid "About Tor Browser" @@ -100,12 +99,11 @@ msgid "" " last relay in the circuit (the “exit relay”) then sends the traffic out " "onto the public Internet." msgstr "" -"Tor ist ein Netzwerk aus virtuellen Tunneln, die es dier erlauben, deine " +"Tor ist ein Netzwerk aus virtuellen Tunneln, die es Ihnen erlauben, Ihre " "Privatsphäre und Sicherheit im Internet zu verbessern. Tor funktioniert, " -"indem es deinen Verkehr über drei zufällige Server (auch bekannt als " -"<em>relays</em>) im Tor Netzwerk sendet. Dann sendet das letzte relay in der" -" Schaltung (das \"Ausgangs-relay\"/the \"exit relay\") den Verkehr in das " -"öffentliche Internet." +"indem es Ihren Verkehr über drei zufällige Server (auch bekannt als " +"<em>Relais</em>) im Tor-Netzwerk sendet. Das letzte Relais im Kanal (das " +"\"Ausgangsrelais\") sendet dann den Verkehr in das öffentliche Internet." #. 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 @@ -127,9 +125,9 @@ msgid "" "relay." msgstr "" "Das Bild oben stellt einen Nutzer dar, der verschiedene Webseiten über Tor " -"besucht. Die grünen Computer in der Mitte stellen die relays im Tor Netzwerk" -" dar, während die 3 Schlüssel die Verschlüsselungs-Schichten zwischen dem " -"Benutzer und jedem Relay Server darstellen." +"besucht. Die grünen Computer in der Mitte stellen die Relais im Tor-Netzwerk" +" dar, während die drei Schlüssel die Verschlüsselungsschichten zwischen dem " +"Benutzer und jedem Relaisserver darstellen." #: bridges.page:6 msgid "Learn what bridges are and how to get them" @@ -137,7 +135,7 @@ msgstr "Erfahre, was Brücken sind und wie man sie bekommt" #: bridges.page:10 msgid "Bridges" -msgstr "Bridges" +msgstr "Brücken" #: bridges.page:12 msgid "" @@ -174,17 +172,17 @@ msgid "" "href=\"https://bridges.torproject.org/\">https://bridges.torproject.org/</link>" " and follow the instructions, or" msgstr "" -"Besuche <link " +"Besuchen Sie <link " "href=\"https://bridges.torproject.org/\">https://bridges.torproject.org/</link>" -" und folge den Anweisungen, oder" +" und folgen Sie den Anweisungen oder" #: bridges.page:42 msgid "" "Email bridges(a)torproject.org from a Gmail, Yahoo, or Riseup email address, " "or" msgstr "" -"Schreibe eine E-Mail an bridges(a)torproject.org von einer Gmail, Yahoo, oder" -" Riseup Adresse, oder" +"Schreiben Sie eine E-Mail an bridges(a)torproject.org von einer Gmail-, " +"Yahoo- oder Riseup-E-Mail-Adresse oder" #: bridges.page:51 msgid "Entering bridge addresses" @@ -225,11 +223,12 @@ msgid "" " may be down. Please use one of the above methods to obtain more bridge " "addresses, and try again." msgstr "" -"Klicke auf \"Verbinden\". Das Benutzen von Brücken kann deine " -"Internetverbindung, im vergleich zum Benutzen von normalen Tor Relays, " -"verlangsamen. Wenn die verbindung fehlschlägt, kann es daran liegen, dass " -"die Brücken nicht mehr aktiv sind. Bitte benutze eine der obigen Methoden um" -" mehr Brücken Adressen zu erhalten und versuche es noch mal." +"Klicken Sie auf \"Verbinden\". Das Benutzen von Brücken kann Ihre " +"Internetverbindung, im Vergleich zur Verwendung normaler Tor-Relais, " +"verlangsamen. Wenn die Verbindung fehlschlägt, kann es daran liegen, dass " +"die Brücken nicht mehr aktiv sind. Bitte verwenden Sie eine der obigen " +"Methoden, um mehr Brückenadressen zu erhalten und versuchen Sie es noch " +"einmal." #: circumvention.page:6 msgid "What to do if the Tor network is blocked" @@ -453,7 +452,7 @@ msgstr "" #: first-time.page:7 msgid "Learn how to use Tor Browser for the first time" -msgstr "" +msgstr "Erfahren Sie, wie Sie den Tor-Browser zum ersten Mal verwenden" #: first-time.page:10 msgid "Running Tor Browser for the first time" @@ -560,6 +559,8 @@ msgstr "Bekannte Probleme" msgid "" "Tor needs your system clock (and your time zone) set to the correct time." msgstr "" +"Tor braucht Ihre auf die richtige Uhrzeit eingestellte Systemuhr (und Ihre " +"Zeitzone)." #: known-issues.page:19 msgid "" @@ -588,6 +589,8 @@ msgid "" "Videos that require Adobe Flash are unavailable. Flash is disabled for " "security reasons." msgstr "" +"Videos, die Adobe Flash benötigen, sind nicht verfügbar. Flash ist aus " +"Sicherheitsgründen deaktiviert." #: known-issues.page:43 msgid "Tor can not use a bridge if a proxy is set." @@ -961,6 +964,8 @@ msgstr "" #: secure-connections.page:8 msgid "Learn how to protect your data using Tor Browser and HTTPS" msgstr "" +"Erfahren Sie, wie Sie Ihre Daten mithilfe des Tor-Browsers und HTTPS " +"schützen" #: secure-connections.page:12 msgid "Secure Connections" @@ -1041,7 +1046,7 @@ msgstr "" #: secure-connections.page:115 msgid "Whether or not Tor is being used." -msgstr "" +msgstr "Ob Tor verwendet wird oder nicht." #: security-slider.page:6 msgid "Configuring Tor Browser for security and usability" @@ -1080,6 +1085,8 @@ msgid "" "The Security Slider is located in Torbutton’s “Privacy and Security " "Settings” menu." msgstr "" +"Der Sicherheitsschieber befindet sich im Menü \"Privatsphäre und " +"Sicherheitseinstellungen\" von Torbutton." #: security-slider.page:32 msgid "Security Levels" @@ -1101,6 +1108,9 @@ msgid "" "Increasing the level of the Security Slider will disable or partially " "disable certain browser features to protect against possible attacks." msgstr "" +"Durch das Erhöhen der Stufe des Sicherheitsschiebereglers werden bestimmte " +"Browserfunktionen deaktiviert oder teilweise deaktiviert, um Sie vor " +"möglichen Angriffen zu schützen." #: security-slider.page:42 msgid "High" @@ -1151,6 +1161,8 @@ msgid "" "At this level, all browser features are enabled. This is the most usable " "option." msgstr "" +"Auf dieser Stufe sind alle Browserfunktionen aktiviert. Dies ist die am " +"meisten brauchbare Option." #: transports.page:6 transports.page:20 msgid "Types of pluggable transport" @@ -1197,11 +1209,12 @@ msgstr "" #: transports.page:56 msgid "Scramblesuit" -msgstr "" +msgstr "Scramblesuit" #: transports.page:61 msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges." msgstr "" +"ScrambleSuit ist ähnlich wie obfs4, aber hat einen anderen Satz an Brücken." #: transports.page:69 msgid "FTE" @@ -1229,7 +1242,7 @@ msgstr "" #: troubleshooting.page:6 msgid "What to do if Tor Browser doesn’t work" -msgstr "" +msgstr "Was tun, wenn der Tor-Browser nicht funktioniert?" #: troubleshooting.page:12 msgid "" @@ -1247,12 +1260,16 @@ msgid "" "If Tor Browser doesn’t connect, there may be a simple solution. Try each of " "the following:" msgstr "" +"Wenn der Tor-Browser keine Verbindung herstellt, könnte es eine einfache " +"Lösung geben. Probieren Sie Folgendes aus:" #: troubleshooting.page:29 msgid "" "Your computer’s system clock must be set correctly, or Tor will not be able " "to connect." msgstr "" +"Die Systemuhr Ihres Computers muss richtig eingestellt sein oder Tor kann " +"keine Verbindung herstellen." #: troubleshooting.page:35 msgid "" @@ -1317,7 +1334,7 @@ msgstr "" #: uninstalling.page:18 msgid "Removing Tor Browser from your system is simple:" -msgstr "" +msgstr "Entfernen des Tor-Browsers von Ihrem System ist einfach:" #: uninstalling.page:24 msgid "" @@ -1339,6 +1356,8 @@ msgstr "Leeren Sie Ihren Papierkorb" msgid "" "Note that your operating system’s standard “Uninstall” utility is not used." msgstr "" +"Beachten Sie, dass das standardmäßige Dienstprogramm \"Uninstall\" Ihres " +"Betriebssystems nicht verwendet wird." #: updating.page:6 msgid "How to update Tor Browser"

1 0

[translation/exoneratorproperties_completed] Update translations for exoneratorproperties_completed
by translation＠torproject.org 24 Dec '16

24 Dec '16

commit 0476955afc73efe498ee4d14541fd1feb37289be Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 24 14:48:24 2016 +0000 Update translations for exoneratorproperties_completed --- de/exonerator.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/de/exonerator.properties b/de/exonerator.properties index b551ced..b6338b5 100644 --- a/de/exonerator.properties +++ b/de/exonerator.properties @@ -34,7 +34,7 @@ technicaldetails.colheader.timestamp=Datum/Uhrzeit (UTC) technicaldetails.colheader.ip=IP-Adresse(n) technicaldetails.colheader.fingerprint=Identitätsschlüssel technicaldetails.colheader.nickname=Spitzname -technicaldetails.colheader.exit=Exit-Server +technicaldetails.colheader.exit=Ausgangsserver technicaldetails.nickname.unknown=Unbekannt technicaldetails.exit.unknown=Unbekannt technicaldetails.exit.yes=Ja @@ -46,7 +46,7 @@ footer.abouttor.body.link1=Datenpakete verschlüsselt und über eine Reihe von S footer.abouttor.body.link2=hier footer.abouttor.body.link3=Fragen footer.aboutexonerator.heading=Über ExoneraTor -footer.aboutexonerator.body=Der Dienst ExoneraTor verwaltet eine Datenbank von IP-Idressen, die Teil des Tor-Netzwerks waren. Er gibt darüber Auskunft, ob an dem bestimmten Datum auf der bestimmen IP-Adresse eine Tor-Relaisstation lief. ExoneraTor kann mehr als eine IP-Adresse pro Relaisstation speichern, wenn die Relaisstation eine andere IP-Adresse für die Verbindung ins Internet als für die Anmeldung im Tor-Netzwerk verwendet hat. Außerdem speichert er, ob die Relaisstation zu dieser Zeit die Weiterleitung des Tor-Verkehrs ins Internet gestattet hat. +footer.aboutexonerator.body=Der Dienst ExoneraTor verwaltet eine Datenbank von IP-Adressen, die Teil des Tor-Netzwerks waren. Er gibt darüber Auskunft, ob an dem bestimmten Datum auf der bestimmen IP-Adresse eine Tor-Relaisstation lief. ExoneraTor kann mehr als eine IP-Adresse pro Relaisstation speichern, wenn die Relaisstation eine andere IP-Adresse für die Verbindung ins Internet als für die Anmeldung im Tor-Netzwerk verwendet hat. Außerdem speichert er, ob die Relaisstation zu dieser Zeit die Weiterleitung des Tor-Verkehrs ins Internet gestattet hat. footer.trademark.text="Tor" und das "Onion Logo" sind %s von The Tor Project, Inc. footer.trademark.link=eingetragene Warenzeichen

1 0

[translation/exoneratorproperties] Update translations for exoneratorproperties
by translation＠torproject.org 24 Dec '16

24 Dec '16

commit a41f052895f7f9b16da8f14529ae9d214ca79505 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 24 14:48:21 2016 +0000 Update translations for exoneratorproperties --- de/exonerator.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/de/exonerator.properties b/de/exonerator.properties index b551ced..b6338b5 100644 --- a/de/exonerator.properties +++ b/de/exonerator.properties @@ -34,7 +34,7 @@ technicaldetails.colheader.timestamp=Datum/Uhrzeit (UTC) technicaldetails.colheader.ip=IP-Adresse(n) technicaldetails.colheader.fingerprint=Identitätsschlüssel technicaldetails.colheader.nickname=Spitzname -technicaldetails.colheader.exit=Exit-Server +technicaldetails.colheader.exit=Ausgangsserver technicaldetails.nickname.unknown=Unbekannt technicaldetails.exit.unknown=Unbekannt technicaldetails.exit.yes=Ja @@ -46,7 +46,7 @@ footer.abouttor.body.link1=Datenpakete verschlüsselt und über eine Reihe von S footer.abouttor.body.link2=hier footer.abouttor.body.link3=Fragen footer.aboutexonerator.heading=Über ExoneraTor -footer.aboutexonerator.body=Der Dienst ExoneraTor verwaltet eine Datenbank von IP-Idressen, die Teil des Tor-Netzwerks waren. Er gibt darüber Auskunft, ob an dem bestimmten Datum auf der bestimmen IP-Adresse eine Tor-Relaisstation lief. ExoneraTor kann mehr als eine IP-Adresse pro Relaisstation speichern, wenn die Relaisstation eine andere IP-Adresse für die Verbindung ins Internet als für die Anmeldung im Tor-Netzwerk verwendet hat. Außerdem speichert er, ob die Relaisstation zu dieser Zeit die Weiterleitung des Tor-Verkehrs ins Internet gestattet hat. +footer.aboutexonerator.body=Der Dienst ExoneraTor verwaltet eine Datenbank von IP-Adressen, die Teil des Tor-Netzwerks waren. Er gibt darüber Auskunft, ob an dem bestimmten Datum auf der bestimmen IP-Adresse eine Tor-Relaisstation lief. ExoneraTor kann mehr als eine IP-Adresse pro Relaisstation speichern, wenn die Relaisstation eine andere IP-Adresse für die Verbindung ins Internet als für die Anmeldung im Tor-Netzwerk verwendet hat. Außerdem speichert er, ob die Relaisstation zu dieser Zeit die Weiterleitung des Tor-Verkehrs ins Internet gestattet hat. footer.trademark.text="Tor" und das "Onion Logo" sind %s von The Tor Project, Inc. footer.trademark.link=eingetragene Warenzeichen

1 0

[translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
by translation＠torproject.org 24 Dec '16

24 Dec '16

commit e3e22fb7226ff3d252b3be661e78cadcf2894eeb Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 24 14:47:30 2016 +0000 Update translations for tails-onioncircuits_completed --- de/onioncircuits.pot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/de/onioncircuits.pot b/de/onioncircuits.pot index 5d84364..9b4688c 100644 --- a/de/onioncircuits.pot +++ b/de/onioncircuits.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-31 14:42+0200\n" -"PO-Revision-Date: 2016-06-08 15:35+0000\n" +"PO-Revision-Date: 2016-12-24 14:42+0000\n" "Last-Translator: Ettore Atalan <atalanttore(a)googlemail.com>\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" @@ -24,7 +24,7 @@ msgstr "Sie sind noch nicht mit Tor verbunden..." #: ../onioncircuits:95 msgid "Onion Circuits" -msgstr "Onion Circuits" +msgstr "Onion-Kanäle" #: ../onioncircuits:125 msgid "Circuit" @@ -36,7 +36,7 @@ msgstr "Status" #: ../onioncircuits:142 msgid "Click on a circuit for more detail about its Tor relays." -msgstr "Klicken Sie auf einen Kanal für mehr Details über seine Relays." +msgstr "Klicken Sie auf einen Kanal für mehr Details über seine Relais." #: ../onioncircuits:221 msgid "The connection to Tor was lost..."

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 24 Dec '16

24 Dec '16

commit 03b5a4e377ee7641e8610e2f7a191e5a462eba4d Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 24 14:47:27 2016 +0000 Update translations for tails-onioncircuits --- de/onioncircuits.pot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/de/onioncircuits.pot b/de/onioncircuits.pot index 5d84364..9b4688c 100644 --- a/de/onioncircuits.pot +++ b/de/onioncircuits.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-31 14:42+0200\n" -"PO-Revision-Date: 2016-06-08 15:35+0000\n" +"PO-Revision-Date: 2016-12-24 14:42+0000\n" "Last-Translator: Ettore Atalan <atalanttore(a)googlemail.com>\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" @@ -24,7 +24,7 @@ msgstr "Sie sind noch nicht mit Tor verbunden..." #: ../onioncircuits:95 msgid "Onion Circuits" -msgstr "Onion Circuits" +msgstr "Onion-Kanäle" #: ../onioncircuits:125 msgid "Circuit" @@ -36,7 +36,7 @@ msgstr "Status" #: ../onioncircuits:142 msgid "Click on a circuit for more detail about its Tor relays." -msgstr "Klicken Sie auf einen Kanal für mehr Details über seine Relays." +msgstr "Klicken Sie auf einen Kanal für mehr Details über seine Relais." #: ../onioncircuits:221 msgid "The connection to Tor was lost..."

1 0

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation＠torproject.org 24 Dec '16

24 Dec '16

commit 3f50a4e2795654b421e569afcc87c46a67376160 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 24 14:47:13 2016 +0000 Update translations for torbutton-abouttorproperties_completed --- de/abouttor.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/abouttor.properties b/de/abouttor.properties index 3c47ca8..e8f60bc 100644 --- a/de/abouttor.properties +++ b/de/abouttor.properties @@ -16,7 +16,7 @@ aboutTor.searchDC.search.link=https://search.disconnect.me/ aboutTor.donationBanner.donate=Bitte spenden Sie! aboutTor.donationBanner.heart=Tor ist am Herz der Internetfreiheit -aboutTor.donationBanner.tagline1=Millionen von Menschen verlassen sich auf Tor für Sicherheit & Datenschutz im Netz +aboutTor.donationBanner.tagline1=Millionen von Menschen verlassen sich auf Tor für Sicherheit & Privatsphäre im Netz aboutTor.donationBanner.tagline2=Ein Netzwerk von Menschen, die Menschen schützen aboutTor.donationBanner.tagline3=Überwachung = Unterdrückung aboutTor.donationBanner.tagline4=Schutz von Journalisten, Aktivisten und Hinweisgebern seit 2006

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 24 Dec '16

24 Dec '16

commit de4792a95967472c08f30cbe93a4b2d48fd0a0c3 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 24 14:47:09 2016 +0000 Update translations for torbutton-abouttorproperties --- de/abouttor.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/abouttor.properties b/de/abouttor.properties index 3c47ca8..e8f60bc 100644 --- a/de/abouttor.properties +++ b/de/abouttor.properties @@ -16,7 +16,7 @@ aboutTor.searchDC.search.link=https://search.disconnect.me/ aboutTor.donationBanner.donate=Bitte spenden Sie! aboutTor.donationBanner.heart=Tor ist am Herz der Internetfreiheit -aboutTor.donationBanner.tagline1=Millionen von Menschen verlassen sich auf Tor für Sicherheit & Datenschutz im Netz +aboutTor.donationBanner.tagline1=Millionen von Menschen verlassen sich auf Tor für Sicherheit & Privatsphäre im Netz aboutTor.donationBanner.tagline2=Ein Netzwerk von Menschen, die Menschen schützen aboutTor.donationBanner.tagline3=Überwachung = Unterdrückung aboutTor.donationBanner.tagline4=Schutz von Journalisten, Aktivisten und Hinweisgebern seit 2006

1 0