- tor-commits - lists.torproject.org

[flashproxy/master] ChangeLog for managed flashproxy-client.
by dcf＠torproject.org 11 Nov '12

11 Nov '12

commit a42faa88672123cc174875fefaa1e73170d4b256 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Nov 10 16:03:14 2012 -0800 ChangeLog for managed flashproxy-client. --- ChangeLog | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e7033e..b104f90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,11 @@ Changes in version 0.8 + o flashproxy-client now operates as a managed proxy by default. This + means that there is no longer a need to start flashproxy-client + separately from Tor. Use a "ClientTransportPlugin websocket exec" + line as in the included torrc. To use flashproxy-client as an + external proxy (the way it worked before), use the --external + option. + o The proxy badge does more intelligent parsing of the boolean "debug" parameter. "0", "false", and other values are now interpreted as false and do not activate debug mode. Formerly any non-empty value

1 0

[flashproxy/master] Typo.
by dcf＠torproject.org 11 Nov '12

11 Nov '12

commit 6ef53ba3181d106b7428949b969aae420f1f338b Author: David Fifield <david(a)bamsoftware.com> Date: Sat Nov 10 16:03:22 2012 -0800 Typo. --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b104f90..9e2ba83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,7 +20,7 @@ Changes in version 0.8 Failed to register: [Errno 185090050] _ssl.c:340: error:0B084002:x509 certificate routines:X509_load_cert_crl_file:system lib Fixes bug 7271. Patch by Alexandre Allaire. - o Fixed an exception that heppened on Windows in flashproxy-client, + o Fixed an exception that happened on Windows in flashproxy-client, relating to the use of nonblocking sockets: Socket error writing to local: '[Errno 10035] A non-blocking socket operation could not be completed immediately' Fixed bug 7272. Patch by Alexandre Allaire.

1 0

[flashproxy/master] Show a message if running in managed mode but missing env variables.
by dcf＠torproject.org 11 Nov '12

11 Nov '12

commit 1a02a1a0c7b81809a6d9a6fa72e3a012a662a3b2 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Nov 10 15:40:53 2012 -0800 Show a message if running in managed mode but missing env variables. --- flashproxy-client | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index fb4b4f7..fded7a0 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -968,10 +968,6 @@ def pt_enverror(msg): pt_line("ENV-ERROR", msg) sys.exit(1) -def pt_versionerror(msg): - pt_line("VERSION-ERROR", msg) - sys.exit(1) - def pt_smethoderror(msg): pt_line("SMETHOD-ERROR", msg) sys.exit(1) @@ -986,12 +982,25 @@ def pt_get_client_transports(known): return result def pt_setup_managed(): - for ver in os.environ.get("TOR_PT_MANAGED_TRANSPORT_VER", "").split(","): + TOR_PT_MANAGED_TRANSPORT_VER = os.environ.get("TOR_PT_MANAGED_TRANSPORT_VER") + if TOR_PT_MANAGED_TRANSPORT_VER is None: + pt_line("VERSION-ERROR", "no-version") + print >> sys.stderr, """\ + +No TOR_PT_MANAGED_TRANSPORT_VER found in environment. +If you are running flashproxy-client from the command line and not from +a ClientTransportPlugin configuration line, you must use the --external +option.\ +""" + sys.exit(1) + + for ver in TOR_PT_MANAGED_TRANSPORT_VER.split(","): if ver == "1": pt_line("VERSION", ver) break else: - pt_versionerror("no-version") + pt_line("VERSION-ERROR", "no-version") + sys.exit(1) client_transports = pt_get_client_transports(["websocket"]) if not client_transports:

1 0

[flashproxy/master] Add pt line output functions.
by dcf＠torproject.org 11 Nov '12

11 Nov '12

commit 84afc97339a720677fbd6be5045c0e4116348f60 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Oct 22 23:29:16 2012 -0700 Add pt line output functions. --- flashproxy-client | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index 8bc3c3f..6c92c91 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -931,6 +931,36 @@ def build_register_command(method): else: raise ValueError("Unknown registration method \"%s\"" % method) +def pt_escape(s): + result = [] + for c in s: + if c == "\n": + result.append("\\n") + elif c == "\\": + result.append("\\\\") + elif 0 < ord(c) < 128: + result.append(c) + else: + result.append("\\x%02x" % ord(c)) + return "".join(result) + +def pt_line(keyword, *args): + log(keyword + " " + " ".join(pt_escape(x) for x in args)) + print keyword, " ".join(pt_escape(x) for x in args) + sys.stdout.flush() + +def pt_enverror(msg): + pt_line("ENV-ERROR", msg) + sys.exit(1) + +def pt_versionerror(msg): + pt_line("VERSION-ERROR", msg) + sys.exit(1) + +def pt_smethoderror(msg): + pt_line("SMETHOD-ERROR", msg) + sys.exit(1) + def main(): global remote_listen, local_listen global locals, remotes

1 0

[ooni-probe/master] Refactor reporter Object.
by art＠torproject.org 10 Nov '12

10 Nov '12

commit 572b301710f395620c557dde8ecdef0771ccbc88 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Nov 10 23:32:48 2012 +0100 Refactor reporter Object. * We now have a parent OReporter object that is subclassed by OONIBReporter for remote reporting and YAMLReporter for reporting to YAML format on file system. * Move secure YAML serialization hacks to the hacks module * Do more progress on the implementation of reporting to remote systems --- ooni/reporter.py | 282 ++++++++++++++++++++++++++------------------------- ooni/runner.py | 8 +- ooni/utils/hacks.py | 47 +++++++++ 3 files changed, 197 insertions(+), 140 deletions(-) diff --git a/ooni/reporter.py b/ooni/reporter.py index 5d29d54..b625603 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -26,6 +26,8 @@ from twisted.internet import defer, reactor from ooni.templates.httpt import BodyReceiver, StringProducer from ooni.utils import otime, log, geodata + +from ooni.utils.hacks import OSafeRepresenter, OSafeDumper from ooni import config try: @@ -38,47 +40,8 @@ except: Packet = object packet = FooClass -class OSafeRepresenter(SafeRepresenter): - """ - This is a custom YAML representer that allows us to represent reports - safely. - It extends the SafeRepresenter to be able to also represent complex numbers - """ - def represent_complex(self, data): - if data.imag == 0.0: - data = u'%r' % data.real - elif data.real == 0.0: - data = u'%rj' % data.imag - elif data.imag > 0: - data = u'%r+%rj' % (data.real, data.imag) - else: - data = u'%r%rj' % (data.real, data.imag) - return self.represent_scalar(u'tag:yaml.org,2002:python/complex', data) - -OSafeRepresenter.add_representer(complex, - OSafeRepresenter.represent_complex) - -class OSafeDumper(Emitter, Serializer, OSafeRepresenter, Resolver): - """ - This is a modification of the YAML Safe Dumper to use our own Safe - Representer that supports complex numbers. - """ - def __init__(self, stream, - default_style=None, default_flow_style=None, - canonical=None, indent=None, width=None, - allow_unicode=None, line_break=None, - encoding=None, explicit_start=None, explicit_end=None, - version=None, tags=None): - Emitter.__init__(self, stream, canonical=canonical, - indent=indent, width=width, - allow_unicode=allow_unicode, line_break=line_break) - Serializer.__init__(self, encoding=encoding, - explicit_start=explicit_start, explicit_end=explicit_end, - version=version, tags=tags) - OSafeRepresenter.__init__(self, default_style=default_style, - default_flow_style=default_flow_style) - Resolver.__init__(self) - +class NoTestIDSpecified(Exception): + pass def safe_dump(data, stream=None, **kw): """ @@ -86,42 +49,93 @@ def safe_dump(data, stream=None, **kw): """ return yaml.dump_all([data], stream, Dumper=OSafeDumper, **kw) -class OONIBReporter(object): - def __init__(self, backend_url): - from twisted.web.client import Agent - from twisted.internet import reactor +(a)defer.inlineCallbacks +def getTestDetails(options): + client_geodata = {} + + if config.privacy.includeip or \ + config.privacy.includeasn or \ + config.privacy.includecountry or \ + config.privacy.includecity: + log.msg("Running geo IP lookup via check.torproject.org") + client_ip = yield geodata.myIP() + client_location = geodata.IPToLocation(client_ip) + else: + client_ip = "127.0.0.1" + + if config.privacy.includeip: + client_geodata['ip'] = client_ip + else: + client_geodata['ip'] = "127.0.0.1" + + client_geodata['asn'] = None + client_geodata['city'] = None + client_geodata['countrycode'] = None + + if config.privacy.includeasn: + client_geodata['asn'] = client_location['asn'] + + if config.privacy.includecity: + client_geodata['city'] = client_location['city'] + + if config.privacy.includecountry: + client_geodata['countrycode'] = client_location['countrycode'] + + test_details = {'start_time': otime.utcTimeNow(), + 'probe_asn': client_geodata['asn'], + 'probe_cc': client_geodata['countrycode'], + 'probe_ip': client_geodata['ip'], + 'test_name': options['name'], + 'test_version': options['version'], + } + defer.returnValue(test_details) + + +class OReporter(object): + def createReport(options): + """ + Override this with your own logic to implement tests. + """ + raise NotImplemented - self.agent = Agent(reactor) - self.backend_url = backend_url + def writeReportEntry(self, entry): + """ + Takes as input an entry and writes a report for it. + """ + raise NotImplemented - def _newReportCreated(self, data): - log.debug("Got this as result: %s" % data) - return data + def finish(): + pass - def _processResponseBody(self, response, body_cb): - log.debug("Got response %s" % response) - done = defer.Deferred() - response.deliverBody(BodyReceiver(done)) - done.addCallback(body_cb) - return done + def testDone(self, test, test_name): + test_report = dict(test.report) - def newReport(self, test_name, test_version): - url = self.backend_url + '/new' - software_version = '0.0.1' + # XXX the scapy test has an example of how + # to do this properly. + if isinstance(test.input, packet.Packet): + test_input = repr(test.input) + else: + test_input = test.input - request = {'software_name': 'ooni-probe', - 'software_version': software_version, - 'test_name': test_name, 'test_version': test_version, - 'progress': 0} + test_started = test._start_time + test_runtime = test_started - time.time() - log.debug("Creating report via url %s" % url) - bodyProducer = StringProducer(json.dumps(request)) - d = self.agent.request("POST", url, bodyProducer=bodyProducer) - d.addCallback(self._processResponseBody, self._newReportCreated) - return d + report = {'input': test_input, + 'test_name': test_name, + 'test_started': test_started, + 'report': test_report} + self.writeReportEntry(report) + def allDone(self): + log.debug("allDone: Finished running all tests") + self.finish() + try: + reactor.stop() + except: + pass + return None -class YamlReporter(object): +class YAMLReporter(OReporter): """ These are useful functions for reporting to YAML format. """ @@ -145,91 +159,85 @@ class YamlReporter(object): self._write(safe_dump(entry)) self._write('...\n') - def finish(self): - self._stream.close() - -class OReporter(YamlReporter): - """ - This is a reporter factory. It emits new instances of Reports. It is also - responsible for writing the OONI Report headers. - """ - def writeTestsReport(self, tests): - for test in tests.values(): - self.writeReportEntry(test) - @defer.inlineCallbacks - def writeReportHeader(self, options): - self.firstrun = False + def createReport(self, options): self._writeln("###########################################") self._writeln("# OONI Probe Report for %s test" % options['name']) self._writeln("# %s" % otime.prettyDateNow()) self._writeln("###########################################") - client_geodata = {} + test_details = yield getTestDetails(options) - if config.privacy.includeip or \ - config.privacy.includeasn or \ - config.privacy.includecountry or \ - config.privacy.includecity: - log.msg("Running geo IP lookup via check.torproject.org") - client_ip = yield geodata.myIP() - client_location = geodata.IPToLocation(client_ip) - else: - client_ip = "127.0.0.1" + self.writeReportEntry(test_details) - if config.privacy.includeip: - client_geodata['ip'] = client_ip - else: - client_geodata['ip'] = "127.0.0.1" + def finish(self): + self._stream.close() - client_geodata['asn'] = None - client_geodata['city'] = None - client_geodata['countrycode'] = None +class OONIBReporter(object): + def __init__(self, backend_url): + from twisted.web.client import Agent + from twisted.internet import reactor + self.agent = Agent(reactor) + self.backend_url = backend_url - if config.privacy.includeasn: - client_geodata['asn'] = client_location['asn'] + def _newReportCreated(self, data): + log.debug("newReportCreated %s" % data) + return data - if config.privacy.includecity: - client_geodata['city'] = client_location['city'] + def _processResponseBody(self, response, body_cb): + log.debug("processResponseBody %s" % response) + done = defer.Deferred() + response.deliverBody(BodyReceiver(done)) + done.addCallback(body_cb) + return done - if config.privacy.includecountry: - client_geodata['countrycode'] = client_location['countrycode'] + def createReport(self, test_name, + test_version, report_header): + url = self.backend_url + '/new' + software_version = '0.0.1' - test_details = {'start_time': otime.utcTimeNow(), - 'probe_asn': client_geodata['asn'], - 'probe_cc': client_geodata['countrycode'], - 'probe_ip': client_geodata['ip'], - 'test_name': options['name'], - 'test_version': options['version'], - } - self.writeReportEntry(test_details) + request = {'software_name': 'ooni-probe', + 'software_version': software_version, + 'test_name': test_name, + 'test_version': test_version, + 'progress': 0, + 'content': report_header + } + def gotDetails(test_details): + log.debug("Creating report via url %s" % url) + + bodyProducer = StringProducer(json.dumps(request)) + d = self.agent.request("POST", url, + bodyProducer=bodyProducer) + d.addCallback(self._processResponseBody, + self._newReportCreated) + return d + + d = getTestDetails(options) + d.addCallback(gotDetails) + return d - def testDone(self, test, test_name): - test_report = dict(test.report) + def writeReportEntry(self, entry, test_id=None): + if not test_id: + log.err("Write report entry on OONIB requires test id") + raise NoTestIDSpecified - # XXX the scapy test has an example of how - # to do this properly. - if isinstance(test.input, packet.Packet): - test_input = repr(test.input) - else: - test_input = test.input + report = '---\n' + report += safe_dump(entry) + report += '...\n' - test_started = test._start_time - test_runtime = test_started - time.time() + url = self.backend_url + '/new' - report = {'input': test_input, - 'test_name': test_name, - 'test_started': test_started, - 'report': test_report} - self.writeReportEntry(report) + request = {'test_id': test_id, + 'content': report} + + bodyProducer = StringProducer(json.dumps(request)) + d = self.agent.request("PUT", url, + bodyProducer=bodyProducer) + + d.addCallback(self._processResponseBody, + self._newReportCreated) + return d - def allDone(self): - log.debug("allDone: Finished running all tests") - self.finish() - try: - reactor.stop() - except: - pass - return None diff --git a/ooni/runner.py b/ooni/runner.py index 1affb15..07882cf 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -194,7 +194,8 @@ def runTestWithInputUnit(test_class, for test_input in input_unit: log.debug("IU: %s" % test_input) try: - d = runTestWithInput(test_class, test_method, test_input, oreporter) + d = runTestWithInput(test_class, + test_method, test_input, oreporter) except Exception, e: print e log.debug("here y0") @@ -223,10 +224,11 @@ def runTestCases(test_cases, options, test_inputs = [None] reportFile = open(yamloo_filename, 'w+') - oreporter = reporter.OReporter(reportFile) + oreporter = reporter.YAMLReporter(reportFile) + input_unit_factory = InputUnitFactory(test_inputs) - yield oreporter.writeReportHeader(options) + yield oreporter.createReport(options) # This deferred list is a deferred list of deferred lists # it is used to store all the deferreds of the tests that # are run diff --git a/ooni/utils/hacks.py b/ooni/utils/hacks.py index 4eef366..8912bbb 100644 --- a/ooni/utils/hacks.py +++ b/ooni/utils/hacks.py @@ -8,6 +8,11 @@ # :authors: Arturo Filastò # :licence: see LICENSE +from yaml.representer import * +from yaml.emitter import * +from yaml.serializer import * +from yaml.resolver import * + import copy_reg def patched_reduce_ex(self, proto): @@ -61,3 +66,45 @@ def patched_reduce_ex(self, proto): return copy_reg._reconstructor, args, dict else: return copy_reg._reconstructor, args + +class OSafeRepresenter(SafeRepresenter): + """ + This is a custom YAML representer that allows us to represent reports + safely. + It extends the SafeRepresenter to be able to also represent complex numbers + """ + def represent_complex(self, data): + if data.imag == 0.0: + data = u'%r' % data.real + elif data.real == 0.0: + data = u'%rj' % data.imag + elif data.imag > 0: + data = u'%r+%rj' % (data.real, data.imag) + else: + data = u'%r%rj' % (data.real, data.imag) + return self.represent_scalar(u'tag:yaml.org,2002:python/complex', data) + +OSafeRepresenter.add_representer(complex, + OSafeRepresenter.represent_complex) + +class OSafeDumper(Emitter, Serializer, OSafeRepresenter, Resolver): + """ + This is a modification of the YAML Safe Dumper to use our own Safe + Representer that supports complex numbers. + """ + def __init__(self, stream, + default_style=None, default_flow_style=None, + canonical=None, indent=None, width=None, + allow_unicode=None, line_break=None, + encoding=None, explicit_start=None, explicit_end=None, + version=None, tags=None): + Emitter.__init__(self, stream, canonical=canonical, + indent=indent, width=width, + allow_unicode=allow_unicode, line_break=line_break) + Serializer.__init__(self, encoding=encoding, + explicit_start=explicit_start, explicit_end=explicit_end, + version=version, tags=tags) + OSafeRepresenter.__init__(self, default_style=default_style, + default_flow_style=default_flow_style) + Resolver.__init__(self) +

1 0

[ooni-probe/master] Implement basic reporting to flat files containing the report ID.
by art＠torproject.org 10 Nov '12

10 Nov '12

commit 3baf68b4df709c039d8c3d856891afebd6077949 Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Nov 11 00:40:50 2012 +0100 Implement basic reporting to flat files containing the report ID. * XXX the location of such files is not configurable, they will leave tons of crap in your cwd. --- oonib/report/api.py | 123 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 113 insertions(+), 10 deletions(-) diff --git a/oonib/report/api.py b/oonib/report/api.py index 1a4746a..489cc25 100644 --- a/oonib/report/api.py +++ b/oonib/report/api.py @@ -9,6 +9,8 @@ This is the async pcap reporting system. It requires the client to have created import random import string import json +import re +from ooni.utils import randomStr from twisted.internet import reactor, defer @@ -21,12 +23,118 @@ backend_version = '0.0.1' def updateReport(report_id, content): print "Report ID: %s" % report_id print "Content: %s" % content - return {'backend_version': backend_version, 'report_id': report_id} -class NewReportHandler(web.RequestHandler): +def generateReportID(): + return randomStr(100) + +class MissingField(Exception): + pass + +class InvalidRequestField(Exception): + pass + +def parseNewReportRequest(request): + """ + Here we parse a new report request. + """ + version_string = re.compile("[0-9A-Za-z_\-\.]+$") + name = re.compile("[a-zA-Z0-9_\- ]+$") + expected_request = {'software_name': name, + 'software_version': version_string, + 'test_name': name, + 'test_version': version_string, + 'progress': re.compile("[0-9]+$") + } + parsed_request = json.loads(request) + for k, regexp in expected_request.items(): + try: + value_to_check = parsed_request[k] + except KeyError: + raise MissingField(k) + print "Matching %s with %s | %s" % (regexp, value_to_check, k) + if re.match(regexp, str(value_to_check)): + continue + else: + raise InvalidRequestField(k) + return parsed_request + +class NewReportHandlerFile(web.RequestHandler): + """ + Responsible for creating and updating reports by writing to flat file. + """ + def post(self): + """ + Creates a new report with the input + + * Request + + {'software_name': 'XXX', + 'software_version': 'XXX', + 'test_name': 'XXX', + 'test_version': 'XXX', + 'progress': 'XXX', + 'content': 'XXX' + } + + Optional: + 'test_helper': 'XXX' + 'client_ip': 'XXX' + + * Response + + {'backend_version': 'XXX', 'report_id': 'XXX'} + + """ + # XXX here we should validate and sanitize the request + try: + report_data = parseNewReportRequest(self.request.body) + except InvalidRequestField, e: + raise web.HTTPError(400, "Invalid Request Field %s" % e) + except MissingField, e: + raise web.HTTPError(400, "Missing Request Field %s" % e) + + print "Parsed this data %s" % report_data + software_name = report_data['software_name'] + software_version = report_data['software_version'] + test_name = report_data['test_name'] + test_version = report_data['test_version'] + content = report_data['content'] + + report_id = generateReportID() + + #report_filename = '_'.join((report_id, + # report_data['software_name'], + # report_data['software_version'], + # report_data['test_name'], + # report_data['test_version'])) + + report_filename = report_id + report_filename += '.yamloo' + + response = {'backend_version': backend_version, + 'report_id': report_id + } + + fp = open(report_filename, 'w+') + fp.write(report_data['content']) + fp.close() + self.write(response) + + def put(self): + """ + Update an already existing report. + + {'report_id': 'XXX', + 'content': 'XXX' + } + """ + pass + +class NewReportHandlerDB(web.RequestHandler): """ - Responsible for creating and updating reports. + Responsible for creating and updating reports via database. + XXX this is not yet fully implemented. """ @web.asynchronous @@ -55,16 +163,11 @@ class NewReportHandler(web.RequestHandler): """ parsed_request = json.loads(self.request.body) - # XXX here we should validate and sanitize the request - report_data = parsed_request - new_report = models.Report() - print "Got %s as request" % parsed_request result = yield new_report.new(report_data) - self.write(result) self.finish() @@ -85,7 +188,7 @@ class PCAPReportHandler(web.RequestHandler): def post(self): pass -spec = [(r"/report/new", NewReportHandler), +spec = [(r"/report/new", NewReportHandlerFile), (r"/report/pcap", PCAPReportHandler)] -reportingBackend = web.Application(spec) +reportingBackend = web.Application(spec, debug=True)

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 10 Nov '12

10 Nov '12

commit 006a6df69cb1983f263006b6945decbe6076076d Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 10 21:45:21 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 43f22c1..7f3fcdb 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-10 21:14+0000\n" +"PO-Revision-Date: 2012-11-10 21:33+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -1215,7 +1215,7 @@ msgstr "Zambia" msgctxt "CountryInfo" msgid "Zimbabwe" -msgstr "Zimbabwe" +msgstr "Zimbabue" msgctxt "CountryInfo" msgid "Zaire" @@ -1239,7 +1239,7 @@ msgstr "Bahrein" msgctxt "CountryInfo" msgid "Benin" -msgstr "Benin" +msgstr "Benín" msgctxt "CountryInfo" msgid "Ethiopia" @@ -1247,7 +1247,7 @@ msgstr "Etiopía" msgctxt "CountryInfo" msgid "Fiji" -msgstr "Fiji" +msgstr "Fiyi" msgctxt "CountryInfo" msgid "Finland" @@ -1307,11 +1307,11 @@ msgstr "Maldivas" msgctxt "CountryInfo" msgid "Mexico" -msgstr "Méjico" +msgstr "México" msgctxt "CountryInfo" msgid "Myanmar" -msgstr "Birmania" +msgstr "Myanmar (Birmania)" msgctxt "CountryInfo" msgid "Taiwan" @@ -1319,11 +1319,11 @@ msgstr "Taiwán" msgctxt "CrashReportDialog" msgid "Submit a Crash Report" -msgstr "Presentar un informe de error" +msgstr "Enviar un Informe de Error" msgctxt "CrashReportDialog" msgid "Vidalia encountered an error and needed to close" -msgstr "Vidalia ha encontrado un error y es necesario para cerrar" +msgstr "Vidalia ha encontrado un error y fue necesario cerrar" msgctxt "CrashReportDialog" msgid "Restart Vidalia" @@ -1335,13 +1335,13 @@ msgstr "No reiniciar" msgctxt "CrashReportDialog" msgid "Unable to restart Vidalia" -msgstr "No se puede reiniciar Vidalia" +msgstr "No se pudo reiniciar Vidalia" msgctxt "CrashReportDialog" msgid "" "We were unable to automatically restart Vidalia. Please restart Vidalia " "manually." -msgstr "No hemos podido reiniciar automáticamente Vidalia. Por favor, reinicia manualmente." +msgstr "No fue posible reiniciar automáticamente Vidalia. Por favor, reinicie manualmente." msgctxt "CrashReportDialog" msgid "Please fill a ticket in:" @@ -1392,7 +1392,7 @@ msgstr "Seleccione la ruta de Tor" msgctxt "GeneralPage" msgid "You must specify the name of your Tor executable." -msgstr "Debe especificar el nombre del ejecutable de Tor." +msgstr "Debe especificar el nombre de su ejecutable de Tor." msgctxt "GeneralPage" msgid "Start Vidalia when my system starts" @@ -1440,11 +1440,11 @@ msgstr "%1 GB" msgctxt "GraphFrame" msgid "Recv:" -msgstr "Recib." +msgstr "Reci:" msgctxt "GraphFrame" msgid "Sent:" -msgstr "Enviados:" +msgstr "Envi:" msgctxt "HelpBrowser" msgid "Supplied XML file is not a valid Contents document."

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 10 Nov '12

10 Nov '12

commit 6b787ac9f6ae4d3287ae55bf9a867384f07eedaa Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 10 21:45:18 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 43f22c1..7f3fcdb 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-10 21:14+0000\n" +"PO-Revision-Date: 2012-11-10 21:33+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -1215,7 +1215,7 @@ msgstr "Zambia" msgctxt "CountryInfo" msgid "Zimbabwe" -msgstr "Zimbabwe" +msgstr "Zimbabue" msgctxt "CountryInfo" msgid "Zaire" @@ -1239,7 +1239,7 @@ msgstr "Bahrein" msgctxt "CountryInfo" msgid "Benin" -msgstr "Benin" +msgstr "Benín" msgctxt "CountryInfo" msgid "Ethiopia" @@ -1247,7 +1247,7 @@ msgstr "Etiopía" msgctxt "CountryInfo" msgid "Fiji" -msgstr "Fiji" +msgstr "Fiyi" msgctxt "CountryInfo" msgid "Finland" @@ -1307,11 +1307,11 @@ msgstr "Maldivas" msgctxt "CountryInfo" msgid "Mexico" -msgstr "Méjico" +msgstr "México" msgctxt "CountryInfo" msgid "Myanmar" -msgstr "Birmania" +msgstr "Myanmar (Birmania)" msgctxt "CountryInfo" msgid "Taiwan" @@ -1319,11 +1319,11 @@ msgstr "Taiwán" msgctxt "CrashReportDialog" msgid "Submit a Crash Report" -msgstr "Presentar un informe de error" +msgstr "Enviar un Informe de Error" msgctxt "CrashReportDialog" msgid "Vidalia encountered an error and needed to close" -msgstr "Vidalia ha encontrado un error y es necesario para cerrar" +msgstr "Vidalia ha encontrado un error y fue necesario cerrar" msgctxt "CrashReportDialog" msgid "Restart Vidalia" @@ -1335,13 +1335,13 @@ msgstr "No reiniciar" msgctxt "CrashReportDialog" msgid "Unable to restart Vidalia" -msgstr "No se puede reiniciar Vidalia" +msgstr "No se pudo reiniciar Vidalia" msgctxt "CrashReportDialog" msgid "" "We were unable to automatically restart Vidalia. Please restart Vidalia " "manually." -msgstr "No hemos podido reiniciar automáticamente Vidalia. Por favor, reinicia manualmente." +msgstr "No fue posible reiniciar automáticamente Vidalia. Por favor, reinicie manualmente." msgctxt "CrashReportDialog" msgid "Please fill a ticket in:" @@ -1392,7 +1392,7 @@ msgstr "Seleccione la ruta de Tor" msgctxt "GeneralPage" msgid "You must specify the name of your Tor executable." -msgstr "Debe especificar el nombre del ejecutable de Tor." +msgstr "Debe especificar el nombre de su ejecutable de Tor." msgctxt "GeneralPage" msgid "Start Vidalia when my system starts" @@ -1440,11 +1440,11 @@ msgstr "%1 GB" msgctxt "GraphFrame" msgid "Recv:" -msgstr "Recib." +msgstr "Reci:" msgctxt "GraphFrame" msgid "Sent:" -msgstr "Enviados:" +msgstr "Envi:" msgctxt "HelpBrowser" msgid "Supplied XML file is not a valid Contents document."

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 10 Nov '12

10 Nov '12

commit 10840a851dc2caaa28ac67a83177706cbc19e860 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 10 21:15:23 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 1d2e38c..43f22c1 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-10 20:14+0000\n" +"PO-Revision-Date: 2012-11-10 21:14+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -803,7 +803,7 @@ msgstr "Jordania" msgctxt "CountryInfo" msgid "Kazakhstan" -msgstr "Kazajstán" +msgstr "Kazajistán" msgctxt "CountryInfo" msgid "Kenya" @@ -819,7 +819,7 @@ msgstr "Kuwait" msgctxt "CountryInfo" msgid "Kyrgyzstan" -msgstr "Kirguistán" +msgstr "Kirguizistán" msgctxt "CountryInfo" msgid "Laos" @@ -835,7 +835,7 @@ msgstr "Líbano" msgctxt "CountryInfo" msgid "Lesotho" -msgstr "Lesotho" +msgstr "Lesoto" msgctxt "CountryInfo" msgid "Liberia" @@ -871,7 +871,7 @@ msgstr "Malasia" msgctxt "CountryInfo" msgid "Mali" -msgstr "Mali" +msgstr "Malí" msgctxt "CountryInfo" msgid "Malta" @@ -947,7 +947,7 @@ msgstr "Níger" msgctxt "CountryInfo" msgid "Nigeria" -msgstr "Níger" +msgstr "Nigeria" msgctxt "CountryInfo" msgid "Norway" @@ -975,7 +975,7 @@ msgstr "Panamá" msgctxt "CountryInfo" msgid "Papua New Guinea" -msgstr "Papúa y Nueva Guinea" +msgstr "Papúa Nueva Guinea" msgctxt "CountryInfo" msgid "Paraguay" @@ -999,7 +999,7 @@ msgstr "Portugal" msgctxt "CountryInfo" msgid "Qatar" -msgstr "Qatar" +msgstr "Catar (Qatar)" msgctxt "CountryInfo" msgid "Romania" @@ -1023,7 +1023,7 @@ msgstr "Santa Lucía" msgctxt "CountryInfo" msgid "Saint Vincent & the Grenadines" -msgstr "San Vicente y las Granadinas" +msgstr "San Vicente y Granadinas" msgctxt "CountryInfo" msgid "Samoa" @@ -1035,7 +1035,7 @@ msgstr "San Marino" msgctxt "CountryInfo" msgid "Sao Tome & Principe" -msgstr "Sao Tomé y Príncipe" +msgstr "Santo Tomé y Príncipe" msgctxt "CountryInfo" msgid "Saudi Arabia" @@ -1115,7 +1115,7 @@ msgstr "Siria" msgctxt "CountryInfo" msgid "Tajikistan" -msgstr "Tazhdikistán" +msgstr "Tayikistán" msgctxt "CountryInfo" msgid "Tanzania" @@ -1127,7 +1127,7 @@ msgstr "Tailandia" msgctxt "CountryInfo" msgid "Timor-Leste (East Timor)" -msgstr "Timor Leste" +msgstr "Timor Oriental" msgctxt "CountryInfo" msgid "Togo" @@ -1207,7 +1207,7 @@ msgstr "Sahara Occidental" msgctxt "CountryInfo" msgid "Yemen" -msgstr "Yemén" +msgstr "Yemen" msgctxt "CountryInfo" msgid "Zambia"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 10 Nov '12

10 Nov '12

commit 5e4204dced086a6c2e4ea78da9124b33ff21b13e Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 10 21:15:20 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 1d2e38c..43f22c1 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-10 20:14+0000\n" +"PO-Revision-Date: 2012-11-10 21:14+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -803,7 +803,7 @@ msgstr "Jordania" msgctxt "CountryInfo" msgid "Kazakhstan" -msgstr "Kazajstán" +msgstr "Kazajistán" msgctxt "CountryInfo" msgid "Kenya" @@ -819,7 +819,7 @@ msgstr "Kuwait" msgctxt "CountryInfo" msgid "Kyrgyzstan" -msgstr "Kirguistán" +msgstr "Kirguizistán" msgctxt "CountryInfo" msgid "Laos" @@ -835,7 +835,7 @@ msgstr "Líbano" msgctxt "CountryInfo" msgid "Lesotho" -msgstr "Lesotho" +msgstr "Lesoto" msgctxt "CountryInfo" msgid "Liberia" @@ -871,7 +871,7 @@ msgstr "Malasia" msgctxt "CountryInfo" msgid "Mali" -msgstr "Mali" +msgstr "Malí" msgctxt "CountryInfo" msgid "Malta" @@ -947,7 +947,7 @@ msgstr "Níger" msgctxt "CountryInfo" msgid "Nigeria" -msgstr "Níger" +msgstr "Nigeria" msgctxt "CountryInfo" msgid "Norway" @@ -975,7 +975,7 @@ msgstr "Panamá" msgctxt "CountryInfo" msgid "Papua New Guinea" -msgstr "Papúa y Nueva Guinea" +msgstr "Papúa Nueva Guinea" msgctxt "CountryInfo" msgid "Paraguay" @@ -999,7 +999,7 @@ msgstr "Portugal" msgctxt "CountryInfo" msgid "Qatar" -msgstr "Qatar" +msgstr "Catar (Qatar)" msgctxt "CountryInfo" msgid "Romania" @@ -1023,7 +1023,7 @@ msgstr "Santa Lucía" msgctxt "CountryInfo" msgid "Saint Vincent & the Grenadines" -msgstr "San Vicente y las Granadinas" +msgstr "San Vicente y Granadinas" msgctxt "CountryInfo" msgid "Samoa" @@ -1035,7 +1035,7 @@ msgstr "San Marino" msgctxt "CountryInfo" msgid "Sao Tome & Principe" -msgstr "Sao Tomé y Príncipe" +msgstr "Santo Tomé y Príncipe" msgctxt "CountryInfo" msgid "Saudi Arabia" @@ -1115,7 +1115,7 @@ msgstr "Siria" msgctxt "CountryInfo" msgid "Tajikistan" -msgstr "Tazhdikistán" +msgstr "Tayikistán" msgctxt "CountryInfo" msgid "Tanzania" @@ -1127,7 +1127,7 @@ msgstr "Tailandia" msgctxt "CountryInfo" msgid "Timor-Leste (East Timor)" -msgstr "Timor Leste" +msgstr "Timor Oriental" msgctxt "CountryInfo" msgid "Togo" @@ -1207,7 +1207,7 @@ msgstr "Sahara Occidental" msgctxt "CountryInfo" msgid "Yemen" -msgstr "Yemén" +msgstr "Yemen" msgctxt "CountryInfo" msgid "Zambia"

1 0