- tor-commits - lists.torproject.org

[torbel/master] Use UTC consistently
by sebastian＠torproject.org 04 Sep '11

04 Sep '11

commit cbc5d8c69e9386b15a3d366a1b3e9a4b379c96ba Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Sep 4 08:32:34 2011 +0200 Use UTC consistently --- bulklist.fcgi | 4 +++- checkweb.py | 3 ++- controller.py | 2 +- dnsel/dnsel.py | 5 +++-- doc/data-spec.txt | 6 +++--- query.py | 6 +++--- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/bulklist.fcgi b/bulklist.fcgi index c447903..92dfcff 100755 --- a/bulklist.fcgi +++ b/bulklist.fcgi @@ -7,6 +7,8 @@ sys.path.append('/home/torbel/torbel') import socket +from calendar import timegm + import torbel.query as query from cgi import escape from urlparse import parse_qs @@ -28,7 +30,7 @@ def update_elist(): global elist elist = query.ExitList(filename = "/home/torbel/export/torbel_export.csv", status_filename = "/home/torbel/export/torbel_export.status") - nextUpdate = math.ceil(time.mktime(elist.next_update.timetuple()) - time.time()) + nextUpdate = math.ceil(timegm(elist.next_update.timetuple()) - time.time()) if nextUpdate > 0: log.debug("Scheduling update in %d seconds.", nextUpdate) Timer(nextUpdate, update_elist, ()).start() diff --git a/checkweb.py b/checkweb.py index 85a99a5..32c6388 100755 --- a/checkweb.py +++ b/checkweb.py @@ -11,6 +11,7 @@ from logger import * from flup.server.fcgi import WSGIServer import time +from calendar import timegm from threading import Timer import math @@ -25,7 +26,7 @@ def update_elist(): global elist elist = query.ExitList(filename = "/home/torbel/export/torbel_export.csv", status_filename = "/home/torbel/export/torbel_export.status") - nextUpdate = math.ceil(time.mktime(elist.next_update.timetuple()) - time.time()) + nextUpdate = math.ceil(timegm(elist.next_update.timetuple()) - time.time()) if nextUpdate > 0: log.debug("Scheduling update in %d seconds.", nextUpdate) Timer(nextUpdate, update_elist, ()).start() diff --git a/controller.py b/controller.py index 807ce18..fe6dbf7 100644 --- a/controller.py +++ b/controller.py @@ -524,7 +524,7 @@ class Controller(TorCtl.EventHandler): # Add 30 seconds to the config.export_interval time so clients don't # try to fetch it as we're writing it. - next = datetime.now() + timedelta(0, config.export_interval * 60 + 30) + next = datetime.utcnow() + timedelta(0, config.export_interval * 60 + 30) nextstr = next.strftime("%b %d %Y %H:%M:%S") export_file_prefix = config.export_file_prefix fn = export_file_prefix + ".status" diff --git a/dnsel/dnsel.py b/dnsel/dnsel.py index 2060562..b39230a 100755 --- a/dnsel/dnsel.py +++ b/dnsel/dnsel.py @@ -6,6 +6,7 @@ # and the TorBEL query interface. import os, sys, time from datetime import datetime +from calendar import timegm from zope.interface import implements from twisted.names import server, dns, common, error @@ -32,7 +33,7 @@ class TorDNSServerFactory(server.DNSServerFactory): log.info("Export %s likely stale.", filename) # Set up updates. - nextUpdate = time.mktime(self.el.next_update.timetuple()) - time.time() + nextUpdate = timegm(self.el.next_update.timetuple()) - time.time() if nextUpdate > 0: log.debug("Scheduling first update in %.1f seconds.", nextUpdate) reactor.callLater(nextUpdate, self.update) @@ -45,7 +46,7 @@ class TorDNSServerFactory(server.DNSServerFactory): def update(self): next = self.el.update() - nextUpdate = time.mktime(next.timetuple()) - time.time() + nextUpdate = timegm(next.timetuple()) - time.time() if nextUpdate > 0: log.info("ExitList updated. Next update in %.1f seconds.", nextUpdate) reactor.callLater(nextUpdate, self.update) diff --git a/doc/data-spec.txt b/doc/data-spec.txt index 9c39d87..5d6db11 100644 --- a/doc/data-spec.txt +++ b/doc/data-spec.txt @@ -108,9 +108,9 @@ Status: Draft * NextUpdate "Datetime": The value of this key is a date-time string with strftime(3) format - "%b %d %Y %H:%M:%S". This date represents the absolute earliest time at - which a TorBEL export consumer should attempt to fetch an updated export - file. + "%b %d %Y %H:%M:%S" in UTC. This date represents the absolute earliest + time at which a TorBEL export consumer should attempt to fetch an + updated export file. An example of this key is: NextUpdate "Aug 12 16:51:04" This key must appear exactly once in the status file. diff --git a/query.py b/query.py index 16a6e7a..a5dda85 100644 --- a/query.py +++ b/query.py @@ -212,7 +212,7 @@ class ExitList: def should_update(self): """ Returns True if our updates are out of date. """ - return self.next_update and (datetime.datetime.now() > self.next_update) + return self.next_update and (datetime.datetime.utcnow() > self.next_update) def update(self, force = False): """ Read and update to the latest export and status files. @@ -232,13 +232,13 @@ class ExitList: # Import the status file, if available. if self.status_filename: self.next_update, self.export_files = self.read_status(self.status_filename) - self.stale = (datetime.datetime.now() > self.next_update) + self.stale = (datetime.datetime.utcnow() > self.next_update) else: self.next_update = None self.export_files = None # Record our last update time. - self.last_update = datetime.datetime.now() + self.last_update = datetime.datetime.utcnow() return self.next_update

1 0

[torbel/master] Actually start the timer for the refresh
by sebastian＠torproject.org 04 Sep '11

04 Sep '11

commit 643548bf399b363e630ba4c62e94c26517a05aec Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Sep 4 07:58:36 2011 +0200 Actually start the timer for the refresh --- bulklist.fcgi | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bulklist.fcgi b/bulklist.fcgi index 56dee21..c447903 100755 --- a/bulklist.fcgi +++ b/bulklist.fcgi @@ -31,10 +31,10 @@ def update_elist(): nextUpdate = math.ceil(time.mktime(elist.next_update.timetuple()) - time.time()) if nextUpdate > 0: log.debug("Scheduling update in %d seconds.", nextUpdate) - #Timer(nextUpdate, update_elist, ()).start() + Timer(nextUpdate, update_elist, ()).start() else: log.notice("Export file is not up-to-date. Trying again in 10 minutes.") - #Timer(10*60, update_elist, ()).start() + Timer(10*60, update_elist, ()).start() update_elist()

1 0

[torbel/master] Update the checkweb tool
by sebastian＠torproject.org 04 Sep '11

04 Sep '11

commit a6d3263bd6c0b9031ba21fca79795d3f04be3521 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Sep 4 07:57:29 2011 +0200 Update the checkweb tool --- checkweb.py | 38 +++++++++++++++++++++++++++++++------- 1 files changed, 31 insertions(+), 7 deletions(-) diff --git a/checkweb.py b/checkweb.py index 1d7d799..85a99a5 100755 --- a/checkweb.py +++ b/checkweb.py @@ -1,20 +1,46 @@ #!/usr/bin/python import sys, os -import query + +sys.path.append('/home/torbel') +sys.path.append('/home/torbel/torflow') +sys.path.append('/home/torbel/torbel') + +import torbel.query as query from cgi import escape from logger import * from flup.server.fcgi import WSGIServer -elist = query.ExitList(filename = "bel_export.csv") -port = 8000 +import time +from threading import Timer + +import math + +elist = None + +port = 80 log = get_logger("WSGITest") +def update_elist(): + global elist + elist = query.ExitList(filename = "/home/torbel/export/torbel_export.csv", + status_filename = "/home/torbel/export/torbel_export.status") + nextUpdate = math.ceil(time.mktime(elist.next_update.timetuple()) - time.time()) + if nextUpdate > 0: + log.debug("Scheduling update in %d seconds.", nextUpdate) + Timer(nextUpdate, update_elist, ()).start() + else: + log.notice("Export file is not up-to-date. Trying again in 10 minutes.") + Timer(10*60, update_elist, ()).start() + +update_elist() + def app(environ, start_response): start_response('200 OK', [('Content-Type', 'text/html')]) ipstr = environ["REMOTE_ADDR"] - ip = query.ip_from_string(environ["REMOTE_ADDR"]) - router = elist.is_tor_traffic(ip, port) + ip = query.ip_from_string(ipstr) + dest_ip = query.ip_from_string("78.47.18.106") + router = elist.tor_exit_search(ip, dest_ip, port) yield '<h1>ARE YOU FROM TOR?</h1>' yield '<blink><strong>' @@ -30,5 +56,3 @@ def app(environ, start_response): if __name__ == "__main__": log.debug("Loaded WSGI server (exit list has %d routers).", len(elist.cache_id)) WSGIServer(app).run() - -

1 0

[torbel/master] Remove unused time import.
by sebastian＠torproject.org 04 Sep '11

04 Sep '11

commit 406d764ecfd87ba3724c0a0e0e0dfb9f09c5bc64 Author: Harry Bock <hbock(a)ele.uri.edu> Date: Fri Sep 3 18:51:48 2010 -0400 Remove unused time import. --- query.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/query.py b/query.py index 044f521..c8d52d0 100644 --- a/query.py +++ b/query.py @@ -5,7 +5,7 @@ import csv import gzip import struct, re -import time, datetime +import datetime import ipaddr import sys from socket import inet_aton, inet_ntoa

1 0

[torbel/master] Specify and implement narrow exit policy check.
by sebastian＠torproject.org 04 Sep '11

04 Sep '11

commit c1092dcf4b4bc5e95d2d37d69feb3a2c62cd85ab Author: Harry Bock <hbock(a)ele.uri.edu> Date: Fri Sep 3 18:53:14 2010 -0400 Specify and implement narrow exit policy check. A "narrow" port is a port that a router explicitly rejects our active tester but could possibly accept other traffic; e.g., from an exit enclave. Add a NarrowPorts data field in TorBEL exports. Implement the check, export, and import functionality. --- doc/data-spec.txt | 5 ++++ query.py | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++-- router.py | 30 ++++++++++++++++++++++-- 3 files changed, 93 insertions(+), 6 deletions(-) diff --git a/doc/data-spec.txt b/doc/data-spec.txt index 58dbb7e..c5f4014 100644 --- a/doc/data-spec.txt +++ b/doc/data-spec.txt @@ -43,6 +43,11 @@ Status: Draft * FailedPorts: A list of ports that were not reachable by TorBEL, either due to its exit policy or a temporary failure, when it was last tested. + * NarrowPorts: A list of ports that were not reachable by TorBEL due to + a narrow exit policy that does not include the TorBEL + test server. Consumers should treat NarrowPorts as + working according to the currently published exit policy + for the router. The following data are supplied for convenience to the consumer: diff --git a/query.py b/query.py index 2f223d7..f1d0046 100644 --- a/query.py +++ b/query.py @@ -44,6 +44,11 @@ class Router: self.exit_policy = self._build_exit_policy(data["ExitPolicy"]) self.working_ports = data["WorkingPorts"] self.failed_ports = data["FailedPorts"] + self.narrow_ports = data["NarrowPorts"] + + @property + def exit_policy_string(self): + return "; ".join(map(str, self.exit_policy)) def _build_exit_policy(self, policy_list): return [ExitPolicyRule(line) for line in policy_list] @@ -58,7 +63,24 @@ class Router: # will be accepted." return True - def will_exit_to(self, ip, port): + def is_narrow_exit(self, ip, port): + """ Returns True if this router accepts exit traffic to port + on some IP addresses but rejects traffic to ip. This can be + used to detect exit enclaves. """ + can_accept = False + for line in self.exit_policy: + if line.reject and line.network == _nulladdr and (port >= line.port_low and port <= line.port_high): + can_accept = False + break + + if line.accept and (port >= line.port_low and port <= line.port_high): + can_accept = True + break + + match = self.exit_policy_match(ip, port) + return can_accept and not match + + def will_exit_to(self, ip, port, check_narrow_policy = True): # FIXME: In the case that TorBEL has not actually tested this exit, # we will trust the router's exit policy. This may or may not be # the Right Thing To Do. @@ -69,7 +91,7 @@ class Router: return True elif port in self.failed_ports: return False - + # Treat NarrowPorts the same as not tested. return self.exit_policy_match(ip, port) def will_exit_to_ports(self, ip, port_list): @@ -87,6 +109,7 @@ class ParseError(Exception): _exitline = re.compile(r"^(accept|reject) (.+)") _portspec = re.compile(r"^\d{1,5}|\d{1,5}-\d{1,5}$") _addrspec = re.compile(r"^\[?([\d:.]+)\]?(/[\d:.]+)?$") +_nulladdr = ipaddr.IPAddress("0.0.0.0") class ExitPolicyRule: def __init__(self, line): self.port_low, self.port_high = -1, -1 @@ -139,6 +162,31 @@ class ExitPolicyRule: return True elif self.address and ipaddr.IPAddress(ip) == self.address: return True + + def __str__(self): + # 0.0.0.0/0.0.0.0 => * + if self.network == _nulladdr:# and line.netmask == 0: + ip = "*" + else: + # ipaddr.IPv4Network always converts to CIDR. + if self.network: + ip = str(self.network) + else: + ip = str(self.address) + + # Convert 0-65535 to * + if self.port_low == 0 and self.port_high == 0xffff: + port = "*" + # Use 8 instead of 8-8 + elif self.port_low == self.port_high: + port = str(self.port_low) + else: + port = "%d-%d" % (self.port_low, self.port_high) + + if self.accept: + return "accept " + ip + ":" + port + else: + return "reject " + ip + ":" + port class ExitList: def __init__(self, filename, status_filename = None): @@ -248,7 +296,8 @@ class ExitList: "InConsensus": r[4] == "True", "ExitPolicy": r[5].split(";"), "WorkingPorts": port_list_from_string(r[6]), - "FailedPorts": port_list_from_string(r[7]) + "FailedPorts": port_list_from_string(r[7]), + "NarrowPorts": port_list_from_string(r[8]), } self.add_record(data) @@ -349,6 +398,15 @@ if __name__ == "__main__": output.close() + elif command == "test": + port = int(sys.argv[2]) + e = ExitList("torbel_export.csv") + print "start" + count = 0 + for r in e.cache_ip.itervalues(): + if r.is_narrow_exit(ipaddr.IPAddress("131.128.160.242"), port): + count += 1 + print count, r.nickname, r.exit_policy_string else: usage() sys.exit(1) diff --git a/router.py b/router.py index c77e178..bc71e86 100644 --- a/router.py +++ b/router.py @@ -16,6 +16,7 @@ class RouterRecord(_OldRouterClass): self.test_ports = set(ports) self.working_ports = set() self.failed_ports = set() + self.narrow_ports = set() self.circ_failed = False def passed(self, port): @@ -24,6 +25,9 @@ class RouterRecord(_OldRouterClass): def failed(self, port): self.failed_ports.add(port) + def narrow(self, port): + self.narrow_ports.add(port) + def start(self): self.start_time = time.time() return self @@ -33,7 +37,8 @@ class RouterRecord(_OldRouterClass): return self def is_complete(self): - return self.test_ports <= (self.working_ports | self.failed_ports) + return self.test_ports <= \ + (self.working_ports | self.failed_ports | self.narrow_ports) def __init__(self, *args, **kwargs): _OldRouterClass.__init__(self, *args, **kwargs) @@ -68,6 +73,23 @@ class RouterRecord(_OldRouterClass): return len(self.exitpolicy) == 1 and \ (ep.ip, ep.netmask, ep.port_low, ep.port_high) == (0, 0, 0, 0xffff) + def is_narrow_exit(self, ip, port): + """ Returns True if this router accepts exit traffic to port + on some IP addresses but rejects traffic to ip. This can be + used to detect exit enclaves. """ + can_accept = False + for line in self.exitpolicy: + if not line.match and line.ip == 0 and \ + (port >= line.port_low and port <= line.port_high): + can_accept = False + break + + if line.match and (port >= line.port_low and port <= line.port_high): + can_accept = True + break + + return can_accept and not self.will_exit_to(ip, port) + def should_export(self): """ Returns True if we have found working exit ports, or if we have not found working test ports, if this router has a non-reject-all @@ -171,7 +193,8 @@ class RouterRecord(_OldRouterClass): "LastTestedTimestamp": int(self.last_test.end_time), "ExitPolicy": self.exit_policy_list(), "WorkingPorts": list(self.last_test.working_ports), - "FailedPorts": list(self.last_test.failed_ports) } + "FailedPorts": list(self.last_test.failed_ports), + "NarrowPorts": list(self.last_test.narrow_ports) } def export_csv(self, out): """ Export record in CSV format, given a Python csv.writer instance. """ @@ -186,7 +209,8 @@ class RouterRecord(_OldRouterClass): not self.stale, # InConsensus self.exit_policy_string(), # ExitPolicy list(self.last_test.working_ports), # WorkingPorts - list(self.last_test.failed_ports)]) # FailedPorts + list(self.last_test.failed_ports), # FailedPorts + list(self.last_test.narrow_ports)]) # NarrowPorts def __str__(self): return "%s (%s)" % (self.idhex, self.nickname)

1 0

[torbel/master] Fix problem with reactor and LoopingCall.
by sebastian＠torproject.org 04 Sep '11

04 Sep '11

commit e668dd1997b902ffc19c165d1400a98ee2e62938 Author: Harry Bock <hbock(a)ele.uri.edu> Date: Tue Sep 7 17:09:31 2010 -0400 Fix problem with reactor and LoopingCall. Reactor would not properly schedule connectTCP calls when LoopingCall was used. Might only be an issue with older Twisted versions (from Lenny, circa 8.1.0), but replacing it with callLater seems to work for now. --- scheduler.py | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/scheduler.py b/scheduler.py index dc0d1d4..e246732 100644 --- a/scheduler.py +++ b/scheduler.py @@ -52,7 +52,6 @@ class TestScheduler: self.max_pending_circuits = int(self.max_running_circuits * max_pending_factor) self.export_interval = export_interval - self.export_task = task.LoopingCall(self.export) self.init() def init(self): @@ -64,11 +63,12 @@ class TestScheduler: """ Start the scheduler. """ # Start the export looping task, but don't run it immediately - # wait until the first export_interval (converted to seconds) to pass. - self.export_task.start(self.export_interval * 60, now = False) + reactor.callLater(self.export_interval * 60, self.export) def export(self): """ Force the controller to export all test data. """ self.controller.export() + reactor.callLater(self.export_interval * 60, self.export) def next(self): """ Return a set of routers to be tested. May block until enough routers @@ -133,9 +133,6 @@ class TestScheduler: def stop(self): """ Stop the scheduler. """ - # Stop our export task. - if self.export_task.running: - self.export_task.stop() with self.pending_circuit_cond: self.pending_circuit_cond.notify() self.terminated = True

1 0

[torbel/master] Fix bugs in query driver.
by sebastian＠torproject.org 04 Sep '11

04 Sep '11

commit 003956b9fd727dd0d05d26997b3672049c969ab3 Author: Harry Bock <hbock(a)ele.uri.edu> Date: Fri Sep 3 18:52:33 2010 -0400 Fix bugs in query driver. Used older API revision. --- query.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/query.py b/query.py index c8d52d0..2f223d7 100644 --- a/query.py +++ b/query.py @@ -333,14 +333,14 @@ if __name__ == "__main__": print "Invalid port %d. Must be between 1 and 65535." % port sys.exit(1) - except ValueError, TypeError: + except (ValueError, TypeError): print "Invalid target '%s'!" % target usage() sys.exit(1) target_list.append((ipaddr.IPAddress(ip), portlist)) - exit_list = ExitList(csv_file = "bel_export.csv") + exit_list = ExitList("bel_export.csv") for ip, portlist in target_list: output = open("export-" + str(ip) + ":" + ",".join(map(str, portlist)), "w") source_list = exit_list.will_exit_to_ports(ip, portlist)

1 0

[translation-tools/master] Disable all projects other than bridgedb, orbot
by sebastian＠torproject.org 04 Sep '11

04 Sep '11

commit 0f4979d17282887000ba7a205bc2d8e3c3700364 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Sep 4 06:07:07 2011 +0200 Disable all projects other than bridgedb, orbot Transifex has issues with all the other projects, have to wait for a solution -.- --- config | 4 +++- update_translations | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config b/config index 1366e69..5ddf287 100644 --- a/config +++ b/config @@ -7,6 +7,8 @@ TRANSLATION_REPO=/srv/translation.torproject.org/translations/ TX=/srv/translation.torproject.org/transifex-client/bin/tx -PROJECTS="bridgedb gettor orbot vidalia vidalia_help vidalia_installer" +#PROJECTS="bridgedb gettor orbot vidalia vidalia_help vidalia_installer" + +PROJECTS="bridgedb orbot" PIDFILE=/srv/translation.torproject.org/run/update_translations.pid diff --git a/update_translations b/update_translations index 67683f4..79a4913 100755 --- a/update_translations +++ b/update_translations @@ -27,7 +27,7 @@ for project in $PROJECTS; do cd $project; # Fetch new translations for this project ... - $TX pull -a > /dev/null; + $TX pull -a -s > /dev/null; # ... add them to git ... git add . > /dev/null;

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 04 Sep '11

04 Sep '11

commit 4ac0e76af958833d2194c59c060b85fa84e83953 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 4 03:45:11 2011 +0000 Update translations for orbot --- templates/strings.pot | 581 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 581 insertions(+), 0 deletions(-) diff --git a/templates/strings.pot b/templates/strings.pot index e69de29..39ba837 100644 --- a/templates/strings.pot +++ b/templates/strings.pot @@ -0,0 +1,581 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR The Tor Project, Inc. +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2011-05-02 15:49+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. type: Content of: <resources><string> +#: strings.xml:3 +#, no-wrap +msgid "Orbot" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:4 +#, no-wrap +msgid "1.0.5-dev" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:6 +#, no-wrap +msgid "http://orbot/" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:7 +#, no-wrap +msgid "http://check.torproject.org" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:8 +#, no-wrap +msgid "https://check.torproject.org" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:9 +#, no-wrap +msgid "https://check.torproject.org/?TorButton=true" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:10 +#, no-wrap +msgid "start and stop Tor" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:11 +#, no-wrap +msgid "torproxyservice" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:13 +#, no-wrap +msgid "Orbot is starting..." +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:14 +#, no-wrap +msgid "Connected to the Tor network" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:15 +#, no-wrap +msgid "\"Orbot is Deactivated" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:16 +#, no-wrap +msgid "Orbot is shutting down" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:18 +#, no-wrap +msgid "Starting Tor..." +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:19 +#, no-wrap +msgid "Setting up control..." +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:20 +#, no-wrap +msgid "complete." +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:21 +#, no-wrap +msgid "waiting." +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:23 +#, no-wrap +msgid "" +"WARNING: Your traffic is not anonymous yet! Please configure your " +"applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy " +"127.0.0.1:9050" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:24 +#, no-wrap +msgid "Home" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:25 +#, no-wrap +msgid "Browse" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:26 +#, no-wrap +msgid "Settings" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:27 +#, no-wrap +msgid "Log" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:28 strings.xml:37 +#, no-wrap +msgid "Help" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:29 +#, no-wrap +msgid "Apps" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:30 +#, no-wrap +msgid "Start" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:31 +#, no-wrap +msgid "Stop" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:33 strings.xml:39 +#, no-wrap +msgid "About" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:34 +#, no-wrap +msgid "Wizard" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:38 +#, no-wrap +msgid "Close" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:41 +#, no-wrap +msgid "Clear Log" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:44 +#, no-wrap +msgid "Check" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:45 +#, no-wrap +msgid "Exit" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:46 +#, no-wrap +msgid "powered by the Tor Project" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:47 +#, no-wrap +msgid "- long press to start -" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:49 +#, no-wrap +msgid "Transparent Proxying (Requires Root)" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:50 +#, no-wrap +msgid "Transparent Proxying" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:51 +#, no-wrap +msgid "Automatic Torifying of Apps" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:53 +#, no-wrap +msgid "Tor Everything" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:54 +#, no-wrap +msgid "Proxy traffic for all apps through Tor" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:56 +#, no-wrap +msgid "Port Proxy Fallback" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:57 +#, no-wrap +msgid "" +"WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \\'All\\' or " +"\\'App\\' mode doesn\\'t work." +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:59 +#, no-wrap +msgid "Port List" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:60 +#, no-wrap +msgid "" +"List of ports to proxy. *USE ONLY* if \\'All\\' or \\'App\\' mode doesn\\'t " +"work" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:61 +#, no-wrap +msgid "Enter ports to proxy" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:63 +#, no-wrap +msgid "Request Root Access" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:64 +#, no-wrap +msgid "Request root access for transparent proxying" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:66 +#, no-wrap +msgid "Tor binaries successfully installed!" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:67 +#, no-wrap +msgid "" +"The Tor binary files were unable to be installed. Please check the log and " +"notify tor-assistants(a)torproject.org" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:69 +#, no-wrap +msgid "Application Error" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:71 +#, no-wrap +msgid "Welcome to Orbot" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:73 +#, no-wrap +msgid "About Orbot" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:74 +#, no-wrap +msgid "Next" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:75 +#, no-wrap +msgid "Back" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:76 +#, no-wrap +msgid "Finish" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:78 +#, no-wrap +msgid "Okay" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:79 +#, no-wrap +msgid "Cancel" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:83 +#, no-wrap +msgid "" +"Orbot brings Tor to Android. Tor is free software and an open network that " +"helps you defend against a form of network surveillance that threatens " +"personal freedom and privacy, confidential business activities and " +"relationships, and state security known as traffic analysis.\\n\\n*WARNING:* " +"Simply installing Orbot will _not_ magically anonymize your mobile traffic! " +"This wizard will help you get started." +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:84 +#, no-wrap +msgid "Some Orbot Details" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:85 +#, no-wrap +msgid "" +"Orbot is an open-source application that contains Tor, LibEvent and " +"Privoxy. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into " +"the Tor network. Orbot also has the ability, on rooted device, to send all " +"internet traffic through Tor." +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:86 +#, no-wrap +msgid "Permission Granted" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:87 +#, no-wrap +msgid "Orbot Permissions" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:88 +#, no-wrap +msgid "" +"Excellent! We\\'ve detected that you have root permissions enabled for " +"Orbot. We will use this power wisely." +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:89 +#, no-wrap +msgid "" +" While it is not required, Orbot can become a more powerful tool if your " +"device has root access. Use the button below to grant Orbot superpowers! " +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:91 +#, no-wrap +msgid "" +"If you don\\'t have root access or have no idea what we\\'re talking about, " +"just be sure to use apps made to work with Orbot." +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:92 +#, no-wrap +msgid "I understand and would like to continue without root" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:94 +#, no-wrap +msgid "Grant Root for Orbot" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:95 +#, no-wrap +msgid "Configure Torification" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:96 +#, no-wrap +msgid "" +"Orbot gives you the option to route all application traffic through Tor OR " +"to choose your applications individually." +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:97 +#, no-wrap +msgid "Proxy All Apps Through Tor" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:98 +#, no-wrap +msgid "Select Individual Apps for Tor" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:101 +#, no-wrap +msgid "Orbot-enabled Apps" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:102 +#, no-wrap +msgid "" +"We encourage you to download & use apps that know how to connect " +"directly to Orbot. Click on the buttons below to install." +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:103 +#, no-wrap +msgid "Gibberbot - Secure instant messaging client for Android" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:104 +#, no-wrap +msgid "ORWEB (Android 1.x Only) - Browser designed for privacy & for Orbot" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:105 +#, no-wrap +msgid "Proxy Settings - Learn how to configure apps to work with Orbot" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:107 +#, no-wrap +msgid "Proxy Settings" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:108 +#, no-wrap +msgid "" +"If the Android app you are using can support the use of an HTTP or SOCKS " +"proxy, then you can configure it to connect to Orbot and use Tor.\\n\\n\n" +" The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port " +"setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or " +"SOCKS5 if possible.\n" +" \\n\\n\n" +" You can learn more about proxying on Android via the FAQ at: " +"http://tinyurl.com/proxyandroid\n" +" " +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:114 +#, no-wrap +msgid "Orbot is ready!" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:115 +#, no-wrap +msgid "" +"Hundreds of thousands of people around the world use Tor for a wide variety " +"of reasons: journalists and bloggers, human rights workers, law enforcement " +"officers, soldiers, corporations, citizens of repressive regimes, and just " +"ordinary citizens... and now you are ready to, as well!" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:117 +#, no-wrap +msgid "market://search?q=pname:info.guardianproject.otr.app.im" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:118 +#, no-wrap +msgid "market://search?q=pname:nfo.guardianproject.browser" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:122 +#, no-wrap +msgid "" +" You\\'ve successfully connected to the Tor network - but this does NOT mean " +"your device is secure. You can use the \\'Check\\' option from the menu to " +"test your browser. \\n\\nVisit us at https://guardianproject.info/apps/orbot " +"or send an email to help(a)guardianproject.info to learn more." +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:124 +#, no-wrap +msgid "" +"This will open your default web browser to https://check.torproject.org in " +"order to see if Orbot is probably configured and you are connected to Tor." +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:127 +#, no-wrap +msgid "Hidden Services" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:129 +#, no-wrap +msgid "General" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:130 +#, no-wrap +msgid "Start Orbot on Boot" +msgstr "" + +#. type: Content of: <resources><string> +#: strings.xml:131 +#, no-wrap +msgid "Automatically start Orbot and connect Tor when your Android device boots" +msgstr ""

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 04 Sep '11

04 Sep '11

commit 210d4168443d3748b41c299ecb53505ade52a8f6 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 4 03:45:04 2011 +0000 Update translations for bridgedb --- templates/bridgedb.pot | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/templates/bridgedb.pot b/templates/bridgedb.pot index e69de29..34d0510 100644 --- a/templates/bridgedb.pot +++ b/templates/bridgedb.pot @@ -0,0 +1,73 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Christian Fromme <kaner(a)strace.org>, 2010 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-01-01 07:48-0800\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: lib/bridgedb/I18n.py:21 +msgid "Here are your bridge relays: " +msgstr "" + +#: lib/bridgedb/I18n.py:23 +msgid "" +"Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed\n" +"in the main directory. Since there is no complete public list of them,\n" +"even if your ISP is filtering connections to all the known Tor relays,\n" +"they probably won't be able to block all the bridges." +msgstr "" + +#: lib/bridgedb/I18n.py:28 +msgid "" +"To use the above lines, go to Vidalia's Network settings page, and click\n" +"\"My ISP blocks connections to the Tor network\". Then add each bridge\n" +"address one at a time." +msgstr "" + +#: lib/bridgedb/I18n.py:32 +msgid "" +"Configuring more than one bridge address will make your Tor connection\n" +"more stable, in case some of the bridges become unreachable." +msgstr "" + +#: lib/bridgedb/I18n.py:35 +msgid "" +"Another way to find public bridge addresses is to send mail to\n" +"bridges(a)torproject.org with the line \"get bridges\" by itself in the body\n" +"of the mail. However, so we can make it harder for an attacker to learn\n" +"lots of bridge addresses, you must send this request from an email address " +"at\n" +"one of the following domains:" +msgstr "" + +#: lib/bridgedb/I18n.py:41 +msgid "[This is an automated message; please do not reply.]" +msgstr "" + +#: lib/bridgedb/I18n.py:43 +msgid "" +"Another way to find public bridge addresses is to visit\n" +"https://bridges.torproject.org/. The answers you get from that page\n" +"will change every few days, so check back periodically if you need more\n" +"bridge addresses." +msgstr "" + +#: lib/bridgedb/I18n.py:48 +msgid "(no bridges currently available)" +msgstr "" + +#: lib/bridgedb/I18n.py:50 +msgid "(e-mail requests not currently supported)" +msgstr ""

1 0