February 2020 - tor-commits - lists.torproject.org

[sbws/master] fix: globals: Fetch descriptors early
by juga＠torproject.org 09 Feb '20

09 Feb '20

commit 02a36dbcaa673df90a485030b26f7a61c9a8a9a4 Author: juga0 <juga(a)riseup.net> Date: Sat Jun 15 14:16:51 2019 +0000 fix: globals: Fetch descriptors early and useless descriptors, so that sbws detect early changes in the relay descriptors and continue downloading them even when Tor is idle. Closes: #30733. Bugfix v0.2.0. --- sbws/globals.py | 8 ++++++++ sbws/lib/relaylist.py | 1 + 2 files changed, 9 insertions(+) diff --git a/sbws/globals.py b/sbws/globals.py index e9fd8dd..1b34730 100644 --- a/sbws/globals.py +++ b/sbws/globals.py @@ -36,6 +36,14 @@ TORRC_STARTING_POINT = { 'SafeLogging': '0', 'LogTimeGranularity': '1', 'ProtocolWarnings': '1', + # To be able to responde to MaxAdvertisedBandwidth as soon as possible. + # If ``FetchDirInfoExtraEarly` is set, but not + # `FetchDirInfoEarly`, Tor will throw this error: + # `FetchDirInfoExtraEarly requires that you also set FetchDirInfoEarly` + 'FetchDirInfoEarly': '1', + 'FetchDirInfoExtraEarly': '1', + # To make Tor keep fetching descriptors, even when idle. + 'FetchUselessDescriptors': '1' } # Options that need to be set at runtime. TORRC_RUNTIME_OPTIONS = { diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index 1fc650a..6ddf44a 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -289,6 +289,7 @@ class Relay: self.relay_recent_priority_list_count += 1 + class RelayList: ''' Keeps a list of all relays in the current Tor network and updates it transparently in the background. Provides useful interfaces for getting

1 0

[sbws/master] fix: relaylist: Update the relays' descriptors
by juga＠torproject.org 09 Feb '20

09 Feb '20

commit 5986d257ac3fceee48df503adb30228adf6d401a Author: juga0 <juga(a)riseup.net> Date: Sun Jan 26 20:48:24 2020 +0000 fix: relaylist: Update the relays' descriptors when fetching new consensuses. Part of #30733. --- sbws/lib/relaylist.py | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index 6ddf44a..6fa233c 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -288,6 +288,17 @@ class Relay: self.relay_recent_priority_list_count = 0 self.relay_recent_priority_list_count += 1 + # XXX: tech-debt: replace `_desc` attr by a a `dequee` of the last + # descriptors seen for this relay and the timestamp. + def update_server_descriptor(self, server_descriptor): + """Update this relay server descriptor (from the consensus.""" + self._desc = server_descriptor + + # XXX: tech-debt: replace `_ns` attr by a a `dequee` of the last + # router statuses seen for this relay and the timestampt. + def update_router_status(self, router_status): + """Update this relay router status (from the consensus).""" + self._ns = router_status class RelayList: @@ -427,9 +438,22 @@ class RelayList: relays = copy.deepcopy(self._relays) for r in relays: if r.fingerprint in new_relays_dict.keys(): + # If a relay in the previous consensus and is in the current + # one, update its timestamp, router status and descriptor. + fp = r.fingerprint r.update_consensus_timestamps(timestamp) - new_relays_dict.pop(r.fingerprint) + # new_relays_dict[fp] is the router status. + r.update_router_status(new_relays_dict[fp]) + try: + descriptor = c.get_server_descriptor(fp, default=None) + except (DescriptorUnavailable, ControllerError) as e: + log.exception("Exception trying to get desc %s", e) + r.update_server_descriptor(descriptor) + # Add it to the new list of relays. new_relays.append(r) + # And remove it from the new consensus dict, as it has + # already added to the new list. + new_relays_dict.pop(fp) # Add the relays that were not in the previous consensus # If there was an relay in some older previous consensus,

1 0

[sbws/master] Merge branch 'maint-1.1_bug30733_fetch_early_descriptors' into maint-1.1
by juga＠torproject.org 09 Feb '20

09 Feb '20

commit 05bb23c5718cac8bffa105f88447c6ad4e87731b Merge: f01a6fe 5986d25 Author: juga0 <juga(a)riseup.net> Date: Sun Feb 9 19:08:29 2020 +0000 Merge branch 'maint-1.1_bug30733_fetch_early_descriptors' into maint-1.1 sbws/globals.py | 8 ++++++++ sbws/lib/relaylist.py | 26 +++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --cc sbws/lib/relaylist.py index 19c5073,6fa233c..8069854 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@@ -289,11 -288,17 +289,22 @@@ class Relay self.relay_recent_priority_list_count = 0 self.relay_recent_priority_list_count += 1 + def is_old(self): + """Whether the last consensus seen for this relay is older than the + measurement period. + """ + return timestamp.is_old(self.last_consensus_timestamp) + # XXX: tech-debt: replace `_desc` attr by a a `dequee` of the last + # descriptors seen for this relay and the timestamp. + def update_server_descriptor(self, server_descriptor): + """Update this relay server descriptor (from the consensus.""" + self._desc = server_descriptor + + # XXX: tech-debt: replace `_ns` attr by a a `dequee` of the last + # router statuses seen for this relay and the timestampt. + def update_router_status(self, router_status): + """Update this relay router status (from the consensus).""" + self._ns = router_status class RelayList: @@@ -439,21 -438,27 +450,34 @@@ relays = copy.deepcopy(self._relays) for r in relays: if r.fingerprint in new_relays_dict.keys(): + # If a relay in the previous consensus and is in the current + # one, update its timestamp, router status and descriptor. + fp = r.fingerprint r.update_consensus_timestamps(timestamp) - new_relays_dict.pop(r.fingerprint) + # new_relays_dict[fp] is the router status. + r.update_router_status(new_relays_dict[fp]) + try: + descriptor = c.get_server_descriptor(fp, default=None) + except (DescriptorUnavailable, ControllerError) as e: + log.exception("Exception trying to get desc %s", e) + r.update_server_descriptor(descriptor) + # Add it to the new list of relays. new_relays.append(r) + # And remove it from the new consensus dict, as it has + # already added to the new list. + new_relays_dict.pop(fp) - # Add the relays that were not in the previous consensus - # If there was an relay in some older previous consensus, - # it won't get stored, so its previous consensuses are lost, - # but probably this is fine for now to don't make it more complicated. + # If the relay is not in the current consensus but is not "old" + # yet, add it to the new list of relays too, though its timestamp, + # router status and descriptor can't be updated. + elif not r.is_old(self._measurements_period): + new_relays.append(r) + # Otherwise, don't add it to the new list of relays. + # For debugging, count the old relays that will be discarded. + else: + num_old_relays += 1 + + # Finally, add the relays that were not in the previous consensus for fp, ns in new_relays_dict.items(): r = Relay(ns.fingerprint, c, ns=ns, timestamp=timestamp) new_relays.append(r)

1 0

[sbws/master] Merge branch 'maint-1.1'
by juga＠torproject.org 09 Feb '20

09 Feb '20

commit fe8ecfef1b8b6e6c76c91c54a80c27ad2960784b Merge: f846c5d 05bb23c Author: juga0 <juga(a)riseup.net> Date: Sun Feb 9 19:13:25 2020 +0000 Merge branch 'maint-1.1' sbws/globals.py | 8 ++++++++ sbws/lib/relaylist.py | 26 +++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-)

1 0

[sbws/maint-1.1] fix: globals: Fetch descriptors early
by juga＠torproject.org 09 Feb '20

09 Feb '20

commit 02a36dbcaa673df90a485030b26f7a61c9a8a9a4 Author: juga0 <juga(a)riseup.net> Date: Sat Jun 15 14:16:51 2019 +0000 fix: globals: Fetch descriptors early and useless descriptors, so that sbws detect early changes in the relay descriptors and continue downloading them even when Tor is idle. Closes: #30733. Bugfix v0.2.0. --- sbws/globals.py | 8 ++++++++ sbws/lib/relaylist.py | 1 + 2 files changed, 9 insertions(+) diff --git a/sbws/globals.py b/sbws/globals.py index e9fd8dd..1b34730 100644 --- a/sbws/globals.py +++ b/sbws/globals.py @@ -36,6 +36,14 @@ TORRC_STARTING_POINT = { 'SafeLogging': '0', 'LogTimeGranularity': '1', 'ProtocolWarnings': '1', + # To be able to responde to MaxAdvertisedBandwidth as soon as possible. + # If ``FetchDirInfoExtraEarly` is set, but not + # `FetchDirInfoEarly`, Tor will throw this error: + # `FetchDirInfoExtraEarly requires that you also set FetchDirInfoEarly` + 'FetchDirInfoEarly': '1', + 'FetchDirInfoExtraEarly': '1', + # To make Tor keep fetching descriptors, even when idle. + 'FetchUselessDescriptors': '1' } # Options that need to be set at runtime. TORRC_RUNTIME_OPTIONS = { diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index 1fc650a..6ddf44a 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -289,6 +289,7 @@ class Relay: self.relay_recent_priority_list_count += 1 + class RelayList: ''' Keeps a list of all relays in the current Tor network and updates it transparently in the background. Provides useful interfaces for getting

1 0

[sbws/maint-1.1] fix: relaylist: Update the relays' descriptors
by juga＠torproject.org 09 Feb '20

09 Feb '20

commit 5986d257ac3fceee48df503adb30228adf6d401a Author: juga0 <juga(a)riseup.net> Date: Sun Jan 26 20:48:24 2020 +0000 fix: relaylist: Update the relays' descriptors when fetching new consensuses. Part of #30733. --- sbws/lib/relaylist.py | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index 6ddf44a..6fa233c 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -288,6 +288,17 @@ class Relay: self.relay_recent_priority_list_count = 0 self.relay_recent_priority_list_count += 1 + # XXX: tech-debt: replace `_desc` attr by a a `dequee` of the last + # descriptors seen for this relay and the timestamp. + def update_server_descriptor(self, server_descriptor): + """Update this relay server descriptor (from the consensus.""" + self._desc = server_descriptor + + # XXX: tech-debt: replace `_ns` attr by a a `dequee` of the last + # router statuses seen for this relay and the timestampt. + def update_router_status(self, router_status): + """Update this relay router status (from the consensus).""" + self._ns = router_status class RelayList: @@ -427,9 +438,22 @@ class RelayList: relays = copy.deepcopy(self._relays) for r in relays: if r.fingerprint in new_relays_dict.keys(): + # If a relay in the previous consensus and is in the current + # one, update its timestamp, router status and descriptor. + fp = r.fingerprint r.update_consensus_timestamps(timestamp) - new_relays_dict.pop(r.fingerprint) + # new_relays_dict[fp] is the router status. + r.update_router_status(new_relays_dict[fp]) + try: + descriptor = c.get_server_descriptor(fp, default=None) + except (DescriptorUnavailable, ControllerError) as e: + log.exception("Exception trying to get desc %s", e) + r.update_server_descriptor(descriptor) + # Add it to the new list of relays. new_relays.append(r) + # And remove it from the new consensus dict, as it has + # already added to the new list. + new_relays_dict.pop(fp) # Add the relays that were not in the previous consensus # If there was an relay in some older previous consensus,

1 0

[sbws/maint-1.1] Merge branch 'maint-1.1_bug30733_fetch_early_descriptors' into maint-1.1
by juga＠torproject.org 09 Feb '20

09 Feb '20

commit 05bb23c5718cac8bffa105f88447c6ad4e87731b Merge: f01a6fe 5986d25 Author: juga0 <juga(a)riseup.net> Date: Sun Feb 9 19:08:29 2020 +0000 Merge branch 'maint-1.1_bug30733_fetch_early_descriptors' into maint-1.1 sbws/globals.py | 8 ++++++++ sbws/lib/relaylist.py | 26 +++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --cc sbws/lib/relaylist.py index 19c5073,6fa233c..8069854 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@@ -289,11 -288,17 +289,22 @@@ class Relay self.relay_recent_priority_list_count = 0 self.relay_recent_priority_list_count += 1 + def is_old(self): + """Whether the last consensus seen for this relay is older than the + measurement period. + """ + return timestamp.is_old(self.last_consensus_timestamp) + # XXX: tech-debt: replace `_desc` attr by a a `dequee` of the last + # descriptors seen for this relay and the timestamp. + def update_server_descriptor(self, server_descriptor): + """Update this relay server descriptor (from the consensus.""" + self._desc = server_descriptor + + # XXX: tech-debt: replace `_ns` attr by a a `dequee` of the last + # router statuses seen for this relay and the timestampt. + def update_router_status(self, router_status): + """Update this relay router status (from the consensus).""" + self._ns = router_status class RelayList: @@@ -439,21 -438,27 +450,34 @@@ relays = copy.deepcopy(self._relays) for r in relays: if r.fingerprint in new_relays_dict.keys(): + # If a relay in the previous consensus and is in the current + # one, update its timestamp, router status and descriptor. + fp = r.fingerprint r.update_consensus_timestamps(timestamp) - new_relays_dict.pop(r.fingerprint) + # new_relays_dict[fp] is the router status. + r.update_router_status(new_relays_dict[fp]) + try: + descriptor = c.get_server_descriptor(fp, default=None) + except (DescriptorUnavailable, ControllerError) as e: + log.exception("Exception trying to get desc %s", e) + r.update_server_descriptor(descriptor) + # Add it to the new list of relays. new_relays.append(r) + # And remove it from the new consensus dict, as it has + # already added to the new list. + new_relays_dict.pop(fp) - # Add the relays that were not in the previous consensus - # If there was an relay in some older previous consensus, - # it won't get stored, so its previous consensuses are lost, - # but probably this is fine for now to don't make it more complicated. + # If the relay is not in the current consensus but is not "old" + # yet, add it to the new list of relays too, though its timestamp, + # router status and descriptor can't be updated. + elif not r.is_old(self._measurements_period): + new_relays.append(r) + # Otherwise, don't add it to the new list of relays. + # For debugging, count the old relays that will be discarded. + else: + num_old_relays += 1 + + # Finally, add the relays that were not in the previous consensus for fp, ns in new_relays_dict.items(): r = Relay(ns.fingerprint, c, ns=ns, timestamp=timestamp) new_relays.append(r)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 09 Feb '20

09 Feb '20

commit cb8e42e97a5934235c356456704186a91d392c32 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 9 15:45:27 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+de.po | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/contents+de.po b/contents+de.po index 9493d98443..0046d140db 100644 --- a/contents+de.po +++ b/contents+de.po @@ -1239,6 +1239,11 @@ msgid "" "wiki](https://www.noisebridge.net/wiki/Noisebridge_Tor/FBI) for additional " "legal resources." msgstr "" +"Die [EFF Tor Legal F&A](/relay/community-resources/eff-tor-legal-f&a) " +"beantwortet viele häufig gestellte Fragen zum Betrieb von Relays und zum " +"Recht. Wir freuen uns auch über [Noisebridge's " +"wiki](https://www.noisebridge.net/wiki/Noisebridge_Tor/FBI) für zusätzliche " +"rechtliche Ressourcen." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1248,6 +1253,10 @@ msgid "" "operators have been harassed, or if you're the only exit relay operator in " "your region." msgstr "" +"Es ist generell eine gute Idee, einen Anwalt zu konsultieren, bevor du dich " +"für den Betrieb eines Exit-Relays entscheidest, insbesondere wenn du an " +"einem Ort lebst, an dem Exit-Relay-Betreiber belästigt wurden, oder wenn du " +"der einzige Exit-Relay-Betreiber in deiner Region bist." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1258,6 +1267,10 @@ msgid "" "EFF](https://www.eff.org/about/contact) and see if they can help connect " "you." msgstr "" +"Wende dich an deine örtliche Organisation für digitale Rechte, um zu " +"erfahren, ob sie Empfehlungen für Rechtsbeistand hat, und wenn du nicht " +"sicher bist, welche Organisationen in deiner Region arbeiten, [schreibe an " +"EFF] (https://www.eff.org/about/contact) und sieh, ob sie dir helfen können." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1267,7 +1280,7 @@ msgstr "Schau dir auch die [Tor Exit Guidelines](tor-exit-guidelines) an." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) msgid "# Responding to abuse complaints" -msgstr "" +msgstr "# Reagieren auf Missbrauchsbeschwerden" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1276,6 +1289,9 @@ msgid "" " one of many templates that Tor has created: [Tor Abuse Templates](tor-" "abuse-templates)." msgstr "" +"Die betreibenden Personen können ihre eigene Missbrauchsbeschwerde-Vorlage " +"aus einer der vielen Vorlagen zusammenstellen, die Tor erstellt hat: [Tor-" +"Missbrauch-Vorlagen](tor-abuse-templates)." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 09 Feb '20

09 Feb '20

commit 77f2f3f0b0360a57633effb0de735ca31fea3763 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 9 15:15:32 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+de.po | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/contents+de.po b/contents+de.po index 1b3cc8ba5d..9493d98443 100644 --- a/contents+de.po +++ b/contents+de.po @@ -8,8 +8,8 @@ # Philipp Winter, 2019 # Ettore Atalan <atalanttore(a)googlemail.com>, 2019 # Philipp . <Kuschat(a)gmx.de>, 2019 -# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2020 # Emma Peel, 2020 +# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2020 # msgid "" msgstr "" @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-11 12:15+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: Emma Peel, 2020\n" +"Last-Translator: Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2020\n" "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1139,6 +1139,9 @@ msgid "" "transports.html.en), a special kind of bridge, address this by adding an " "additional layer of obfuscation." msgstr "" +"[Austauschbare Übertragungsarten](https://2019.www.torproject.org/docs" +"/pluggable-transports.html.en), eine spezielle Art von Brücke, mit der eine " +"zusätzliche Schicht der Verschleierung hinzugefügt wird." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -1146,6 +1149,8 @@ msgid "" "Bridges are relatively easy, low-risk and low bandwidth Tor nodes to " "operate, but they have a big impact on users." msgstr "" +"Brücken sind relativ einfach, risikoarm und mit geringer Bandbreite zu " +"betreibende Tor-Knoten, aber sie haben einen großen Effekt auf die Benutzer." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -1154,6 +1159,9 @@ msgid "" " not listed in the public consensus, they are unlikely to be blocked by " "popular services." msgstr "" +"Eine Brücke wird wahrscheinlich keine Missbrauchsbeschwerden erhalten, und " +"da Brücken nicht im öffentlichen Diskurs aufgelistet sind, ist es " +"unwahrscheinlich, dass sie von öffentlichen Diensten blockiert werden." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -1162,11 +1170,15 @@ msgid "" "network, have only one static IP, and don't have a huge amount of bandwidth " "to donate -- we recommend giving your bridge at least 1 Mbit/sec." msgstr "" +"Bridges sind eine großartige Option, wenn du einen Tor-Knoten nur von deinem" +" Heimnetzwerk aus betreiben kannst, nur eine statische IP und keine große " +"Menge an Bandbreite zur Verfügung hast - wir empfehlen, deiner Bridge " +"mindestens 1 Mbit/sec zu geben." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.title) msgid "Community and legal resources" -msgstr "" +msgstr "Community- und rechtliche Ressourcen" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.subtitle) @@ -1175,6 +1187,9 @@ msgid "" "responding to abuse complaints, and how to start an organization dedicated " "to relay operation." msgstr "" +"Wie man sich in die Community der Tor-Relay-Betreiber einbringt, wie man auf" +" Missbrauchsbeschwerden reagiert und wie man eine Organisation startet, die " +"sich dem Relay-Betrieb widmet." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1187,6 +1202,8 @@ msgid "" "Exit relay operators should understand the potential risks associated with " "running an exit relay." msgstr "" +"Betreiber von Exit-Relays sollten die potenziellen Risiken verstehen, die " +"mit dem Betrieb eines Exit-Relays verbunden sind." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1194,6 +1211,8 @@ msgid "" "For the majority of operators in most countries, bridges and guard/middle " "relays are very low risk." msgstr "" +"Für die Mehrheit der Betreiber in den meisten Ländern sind Brücken und " +"Schutz-/Mittel-Relays ein sehr geringes Risiko." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1204,6 +1223,12 @@ msgid "" " reading through some of the legal resources that Tor-supportive lawyers " "have put together." msgstr "" +"Die Exits sind diejenigen, die einige rechtliche Bedenken aufwerfen, aber " +"die betreibenden Personen werden unter den meisten Umständen in der Lage " +"sein, rechtliche Angelegenheiten zu handhaben, indem sie ein " +"Antwortschreiben auf den Missbrauch haben, den Ausgang von einem Ort aus " +"betreiben, der nicht ihr Zuhause ist, und einige der rechtlichen Ressourcen " +"studieren, die von den Tor unterstützenden Anwälten zusammengestellt wurden." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body)

1 0

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 09 Feb '20

09 Feb '20

commit 7eb2af10398b1dfd18e6a3f5f824975ab11d1524 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 9 15:15:24 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- de/LC_MESSAGES/bridgedb.po | 59 ++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/de/LC_MESSAGES/bridgedb.po b/de/LC_MESSAGES/bridgedb.po index 50597b8aae..686cc763d7 100644 --- a/de/LC_MESSAGES/bridgedb.po +++ b/de/LC_MESSAGES/bridgedb.po @@ -1,10 +1,11 @@ # Translations template for bridgedb. -# Copyright (C) 2019 'The Tor Project, Inc.' +# Copyright (C) 2020 'The Tor Project, Inc.' # This file is distributed under the same license as the bridgedb project. # # Translators: # Christian Kaindl <crisscross.kaindl(a)outlook.de>, 2015 # trantor <clucko3(a)gmail.com>, 2014 +# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2020 # Emma Peel, 2019 # Ettore Atalan <atalanttore(a)googlemail.com>, 2014 # jschfr <hello(a)janschoefer.com>, 2015 @@ -26,9 +27,9 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2019-10-19 14:51-0700\n" -"PO-Revision-Date: 2019-11-04 17:01+0000\n" -"Last-Translator: John Dee <Dr_Dee(a)gmx.de>\n" +"POT-Creation-Date: 2020-02-04 10:59-0800\n" +"PO-Revision-Date: 2020-02-09 14:49+0000\n" +"Last-Translator: Curtis Baltimore <curtisbaltimore(a)protonmail.com>\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -301,62 +302,64 @@ msgstr "%s Brücken-Server %s sind Tor-Relais, die Ihnen dabei helfen, die Zensu msgid "I need an alternative way of getting bridges!" msgstr "Ich brauche einen anderen Weg, um Adressen von Brücken-Servern zu erhalten." -#: bridgedb/strings.py:108 +#. TRANSLATORS: Please DO NOT translate "get transport obfs4". +#: bridgedb/strings.py:109 #, python-format msgid "" -"Another way to get bridges is to send an email to %s. Please note that you must\n" -"send the email using an address from one of the following email providers:\n" -"%s or %s." -msgstr "Eine weitere Möglichkeit, um Brücken zu erhalten, ist eine E-Mail an %s zu senden. \nBitte beachte Sie, dass Sie die E-Mail von einem der folgenden E-Mail-Anbieter versenden: %s oder %s." +"Another way to get bridges is to send an email to %s. Leave the email subject\n" +"empty and write \"get transport obfs4\" in the email's message body. Please note\n" +"that you must send the email using an address from one of the following email\n" +"providers: %s or %s." +msgstr "" -#: bridgedb/strings.py:115 +#: bridgedb/strings.py:117 msgid "My bridges don't work! I need help!" msgstr "Meine Brücken-Server funktionieren nicht! Ich brauche Hilfe!" #. TRANSLATORS: Please DO NOT translate "Tor Browser". #. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and #. "Support Portal", respectively. -#: bridgedb/strings.py:119 +#: bridgedb/strings.py:121 #, python-format msgid "" "If your Tor Browser cannot connect, please take a look at the %s and our %s." msgstr "" -#: bridgedb/strings.py:123 +#: bridgedb/strings.py:125 msgid "Here are your bridge lines:" msgstr "Hier sind Ihre Brückenadressen:" -#: bridgedb/strings.py:124 +#: bridgedb/strings.py:126 msgid "Get Bridges!" msgstr "Erhalten Sie Adressen von Brücken-Servern!" -#: bridgedb/strings.py:128 +#: bridgedb/strings.py:130 msgid "Please select options for bridge type:" msgstr "Bitte wählen Sie die Optionen für den Brückentyp aus:" -#: bridgedb/strings.py:129 +#: bridgedb/strings.py:131 msgid "Do you need IPv6 addresses?" msgstr "Benötigen Sie IPv6-Adressen?" -#: bridgedb/strings.py:130 +#: bridgedb/strings.py:132 #, python-format msgid "Do you need a %s?" msgstr "Benötigen Sie eine %s?" -#: bridgedb/strings.py:134 +#: bridgedb/strings.py:136 msgid "Your browser is not displaying images properly." msgstr "Bilder werden in Ihrem Browser nicht korrekt dargestellt." -#: bridgedb/strings.py:135 +#: bridgedb/strings.py:137 msgid "Enter the characters from the image above..." msgstr "Bitte geben Sie die Zeichen aus dem oberen Bild ein." -#: bridgedb/strings.py:139 +#: bridgedb/strings.py:141 msgid "How to start using your bridges" msgstr "So starten Sie die Benutzung Ihrer Brücken" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: bridgedb/strings.py:141 +#: bridgedb/strings.py:143 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -365,21 +368,21 @@ msgid "" msgstr "Um Brücken in Tor Browser einzugeben, gehe erst auf die %s Tor Browser Downloadseite %s und folge dort den Anweisungen zum Download und Starten von Tor Browser." #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:146 +#: bridgedb/strings.py:148 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "Wenn der Dialog mit den »Tor-Netzwerkeinstellungen« erscheint, \nklicken Sie auf »Konfigurieren« und folgen den Anweisungen des Assistenten: " #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:150 +#: bridgedb/strings.py:152 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "Blockiert oder zensiert Ihr Internetanbieter (ISP) die Verbindungen zum Tor-Netzwerk?" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:154 +#: bridgedb/strings.py:156 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -387,28 +390,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "Wählen Sie »Ja« und klicken dann auf »Weiter«. Um Ihre neuen Brücken zu konfigurieren, kopieren Sie die \nZeilen mit den Adressen der Brücken und fügen sie in das Texteingabefeld ein. Zum Schluss klicken Sie auf \n»Verbinden« und Sie können loslegen! Falls Sie Schwierigkeiten haben, \nversuchen Sie bitte auf den »Hilfe«-Knopf im Assistenten der »Tor- Netzwerkeinstellungen« zu klicken, \num weitere Hilfe zu erhalten." -#: bridgedb/strings.py:162 +#: bridgedb/strings.py:164 msgid "Displays this message." msgstr "Diese Nachricht anzeigen." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: bridgedb/strings.py:166 +#: bridgedb/strings.py:168 msgid "Request vanilla bridges." msgstr "Standard-Brücken anfordern." -#: bridgedb/strings.py:167 +#: bridgedb/strings.py:169 msgid "Request IPv6 bridges." msgstr "IPv6-Brücken anfordern." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: bridgedb/strings.py:169 +#: bridgedb/strings.py:171 msgid "Request a Pluggable Transport by TYPE." msgstr "Einen Pluggable Transport des TYPEs anfordern." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: bridgedb/strings.py:172 +#: bridgedb/strings.py:174 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Eine Kopie des öffentlichen GnuPG-Schlüssels der Brückendatenbank erhalten."

1 0