November 2012 - tor-commits - lists.torproject.org

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

11 Nov '12

commit d3ce9e4b06cfed96caa657a14630917b0b18589b Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 11 12:15:18 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index ba51e72..34bd7aa 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-11 03:25+0000\n" +"PO-Revision-Date: 2012-11-11 12: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" @@ -2069,7 +2069,7 @@ msgid "" "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n" "\n" "Would you like to shutdown gracefully and give clients time to find a new relay?" -msgstr "Actualmente está ejecutando un repetidor (relay). Detenerlo interrumpiría cualquier conexión abierta desde los clientes.\n\n¿Desea cerrar con un periodo de gracia para dar tiempo de encontrar un nuevo repetidor a los clientes?" +msgstr "Actualmente está ejecutando un repetidor (relay). Detenerlo interrumpiría cualquier conexión abierta desde los clientes.\n\n¿Desea cerrar con un periodo de gracia para dar tiempo a los clientes de encontrar un nuevo repetidor (relay)?" msgctxt "MainWindow" msgid ""

1 0

[ooni-probe/master] Clean up filenames of generated reports
by art＠torproject.org 11 Nov '12

11 Nov '12

commit afa72fbc40dddcc1d5ea93003f3dba1aff48e791 Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Nov 11 13:09:39 2012 +0100 Clean up filenames of generated reports * They now follow the format $testName_report_$timestamp.yamloo --- ooni/config.py | 9 +++++---- ooni/oonicli.py | 8 ++++++-- ooni/runner.py | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ooni/config.py b/ooni/config.py index a2ce917..29255c1 100644 --- a/ooni/config.py +++ b/ooni/config.py @@ -17,16 +17,17 @@ def get_root_path(): root = os.path.abspath(root) return root -def oreport_filenames(): +def oreport_filenames(file_name): """ returns the filenames for the pcap file and the yamloo report returns yamloo_filename, pcap_filename """ - base_filename = "%s_"+otime.timestamp()+".%s" - yamloo_filename = base_filename % ("report", "yamloo") - pcap_filename = base_filename % ("packets", "pcap") + test_name = '.'.join(file_name.split(".")[:-1]) + base_filename = "%s_%s_"+otime.timestamp()+".%s" + yamloo_filename = base_filename % (test_name, "report", "yamloo") + pcap_filename = base_filename % (test_name, "packets", "pcap") return yamloo_filename, pcap_filename config_file = os.path.join(get_root_path(), 'ooniprobe.conf') diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 25da8c3..9287174 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -93,7 +93,12 @@ def run(): if cmd_line_options['debug-stacktraces']: defer.setDebugging(True) - yamloo_filename, pcap_filename = config.oreport_filenames() + log.start(cmd_line_options['logfile']) + + test_file_name = os.path.basename(cmd_line_options['test']) + log.debug("Running script %s" % test_file_name) + + yamloo_filename, pcap_filename = config.oreport_filenames(test_file_name) if cmd_line_options['reportfile']: yamloo_filename = cmd_line_options['reportfile'] @@ -108,7 +113,6 @@ def run(): log.msg("Renaming it to %s" % pcap_filename+'.old') os.rename(pcap_filename, pcap_filename+'.old') - log.start(cmd_line_options['logfile']) classes = runner.findTestClassesFromConfig(cmd_line_options) test_cases, options = runner.loadTestsAndOptions(classes, cmd_line_options) if config.privacy.includepcap: diff --git a/ooni/runner.py b/ooni/runner.py index c6679c0..23ff898 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -221,7 +221,7 @@ def runTestCases(test_cases, options, log.msg("Could not find inputs!") log.msg("options[0] = %s" % first) test_inputs = [None] - + reportFile = open(yamloo_filename, 'w+') oreporter = reporter.YAMLReporter(reportFile)

1 0

[ooni-probe/master] Add software version to the report
by art＠torproject.org 11 Nov '12

11 Nov '12

commit a4708eaad29e275dc67b80ad767b3e17cc63abb8 Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Nov 11 11:51:46 2012 +0100 Add software version to the report * Cleanup some debug messages * Remove unused ooni-probe.conf config file --- ooni/__init__.py | 4 ++ ooni/inputunit.py | 2 +- ooni/ooni-probe.conf | 100 -------------------------------------------------- ooni/reporter.py | 6 ++- ooni/runner.py | 3 +- 5 files changed, 11 insertions(+), 104 deletions(-) diff --git a/ooni/__init__.py b/ooni/__init__.py index 16b20ca..2763b16 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,3 +1,4 @@ +# -*- encoding: utf-8 -*- from . import config from . import inputunit from . import kit @@ -12,3 +13,6 @@ from . import utils __all__ = ['config', 'inputunit', 'kit', 'lib', 'nettest', 'oonicli', 'reporter', 'runner', 'templates', 'utils'] + +__author__ = "Arturo Filastò" +__version__ = "0.0.7.1-alpha" diff --git a/ooni/inputunit.py b/ooni/inputunit.py index 484631b..65f6d91 100644 --- a/ooni/inputunit.py +++ b/ooni/inputunit.py @@ -6,7 +6,7 @@ # units. Input units are how the inputs to be fed to tests are # split up into. # -# :authors: Arturo Filastò, Isis Lovecruft +# :authors: Arturo Filastò # :license: see included LICENSE file diff --git a/ooni/ooni-probe.conf b/ooni/ooni-probe.conf deleted file mode 100644 index 0c68fe0..0000000 --- a/ooni/ooni-probe.conf +++ /dev/null @@ -1,100 +0,0 @@ -# ooni-probe -# -# These are the global configuration parameters necessary to -# make ooni-probe work -[main] -reportdir = reports/ -logfile = ooniprobe.log -assetdir = assets/ -testdir = oonitests/ - -loglevel = DEBUG -consoleloglevel = DEBUG -proxyaddress = 127.0.0.1:9050 - -# The following configurations are for searching for PlanetLab -# nodes, adding them to a slice, and PlanetLab general API -# authentication: -pl_username = yourusername -pl_password = yourpassword - -# These are configurations specific to the tests that should be -# run by ooni-probe -[tests] -run = dnstamper -### DNS testing related config parameters - -# This is the list of hostnames that must be looked up -dns_experiment = top-1m.txt - -# This is the dns servers to be tested -dns_experiment_dns = dns_servers.txt - -# This is the control known good DNS server -dns_control_server = 91.191.136.152 - -# Specify whether the dnstamper test should attempt to remove -# GeoIP-based false positives by doing a reverse DNS resolve -# on positive results. -dns_reverse_lookup = true - -### captiveportal testing configuration parameters - -# This is an optional list of user defined captive portal tests, -# one per line, with each line in the format: -# experiment_url, control_result, control_code -# where experiment_url is the test page to retrieve, -# control_result is some unique text found on the test page, -# and control_code is the expected HTTP status code. -captive_portal = captive_portal_tests.txt - -# The default User Agent that ooni-probe should send for -# HTTP requests (pretend we're a Windows box running FF10): -default_ua = Mozilla/5.0 (Windows NT 6.1; WOW64; rv:10.0.2) Gecko/20100101 Firefox/10.0.2 - -# Enable vendor tests for captive portals: -do_captive_portal_vendor_tests = true - -# Enable DNS-based vendor tests for captive portals: -do_captive_portal_vendor_dns_tests = true - -# Enable checking of DNS requests for tampering: -check_dns_requests = true - -### traceroute testing related config parameters - -# This is the list of ips to traceroute to -traceroute = example_exp_list.txt - -# This is the list of ports that should be used -# src_x,src_y,src_z|dst_x,dst_y,dst_z -traceroute_ports = 0,53,80,123,443|0,53,80,123,443 - -# The protocol to be used in the scan -traceroute_proto = UDP, TCP, ICMP - -### keyword injection related tests - -# List of keywords -keywords = keywordlist.txt - -# hosts -keywords_hosts = hostslist.txt - -# Methods to be used for testing -keyword_method = http,telnet - -### Tor bridge testing - -tor_bridges = bridgetests.txt -tor_bridges_timeout = 40 - -[report] -file = report.log -timestamp = true -#ssh = 127.0.0.1:22 -#ssh_user = theusername -#ssh_password = thepassword -#ssh_keyfile = ~/.ssh/mykey_rsa -#ssh_rpath = ~/ooni-probe/ -#tcp = "127.0.0.1:9088" diff --git a/ooni/reporter.py b/ooni/reporter.py index b625603..eea44c7 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -51,6 +51,8 @@ def safe_dump(data, stream=None, **kw): @defer.inlineCallbacks def getTestDetails(options): + from ooni import __version__ as software_version + client_geodata = {} if config.privacy.includeip or \ @@ -87,9 +89,11 @@ def getTestDetails(options): 'probe_ip': client_geodata['ip'], 'test_name': options['name'], 'test_version': options['version'], + 'software_name': 'ooniprobe', + 'software_version': software_version } defer.returnValue(test_details) - + class OReporter(object): def createReport(options): diff --git a/ooni/runner.py b/ooni/runner.py index 07882cf..c6679c0 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -192,13 +192,12 @@ def runTestWithInputUnit(test_class, dl = [] log.debug("input unit %s" % input_unit) for test_input in input_unit: - log.debug("IU: %s" % test_input) + log.debug("running with input: %s" % test_input) try: d = runTestWithInput(test_class, test_method, test_input, oreporter) except Exception, e: print e - log.debug("here y0") dl.append(d) return defer.DeferredList(dl)

1 0

[ooni-probe/master] Add not about the fact that tests should return a deferred.
by art＠torproject.org 11 Nov '12

11 Nov '12

commit 9235c7d2d769c70971f1622ee40f3588467aaa6b Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Nov 11 12:15:46 2012 +0100 Add not about the fact that tests should return a deferred. --- ooni/nettest.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index 896ae2a..62b3657 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -81,6 +81,9 @@ class NetTestCase(object): required for proper running of a test. * localOptions: contains the parsed command line arguments. + + Quirks: + Every class that is prefixed with test *must* return a twisted.internet.defer.Deferred. """ name = "I Did Not Change The Name" author = "Jane Doe <foo(a)example.com>"

1 0

[ooni-probe/master] Implement ICMP traceroute test
by art＠torproject.org 11 Nov '12

11 Nov '12

commit 8ede385b70a9d717572b95b2d5ab87085bb82cd7 Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Nov 11 12:55:17 2012 +0100 Implement ICMP traceroute test * parametrize max_ttl and timeout * make max_ttl and timeout be included in the report --- nettests/core/traceroute.py | 70 ++++++++++++++++++++++++++++++++++++------ ooni/templates/scapyt.py | 3 +- 2 files changed, 61 insertions(+), 12 deletions(-) diff --git a/nettests/core/traceroute.py b/nettests/core/traceroute.py index 23f124a..4317a0e 100644 --- a/nettests/core/traceroute.py +++ b/nettests/core/traceroute.py @@ -14,50 +14,100 @@ from scapy.all import * class UsageOptions(usage.Options): optParameters = [ ['backend', 'b', '8.8.8.8', 'Test backend to use'], - ['timeout', 't', 5, 'The timeout for the traceroute test'] + ['timeout', 't', 5, 'The timeout for the traceroute test'], + ['maxttl', 'm', 30, 'The maximum value of ttl to set on packets'] ] class TracerouteTest(scapyt.BaseScapyTest): name = "Multi Protocol Traceroute Test" author = "Arturo Filastò" - version = 0.1 + version = "0.1.1" usageOptions = UsageOptions dst_ports = [22, 23, 80, 123, 443] + def max_ttl_and_timeout(self): + max_ttl = int(self.localOptions['maxttl']) + timeout = int(self.localOptions['timeout']) + self.report['max_ttl'] = max_ttl + self.report['timeout'] = timeout + return max_ttl, timeout def test_tcp_traceroute(self): + """ + Does a traceroute to the destination by sending TCP SYN packets + with TTLs from 1 until max_ttl. + """ def finished(packets, port): - log.debug("Finished running TCP traceroute test" % port) + log.debug("Finished running TCP traceroute test on port %s" % port) answered, unanswered = packets self.report['hops_'+str(port)] = [] for snd, rcv in answered: - report = {'ttl': snd.ttl, 'address': rcv.src} + report = {'ttl': snd.ttl, + 'address': rcv.src, + 'rtt': rcv.time - snd.time + } + log.debug("%s: %s" % (port, report)) self.report['hops_'+str(port)].append(report) dl = [] + max_ttl, timeout = self.max_ttl_and_timeout() for port in self.dst_ports: packets = IP(dst=self.localOptions['backend'], - ttl=(1,25),id=RandShort())/TCP(flags=0x2, dport=port) - d = self.sr(packets, timeout=5) + ttl=(1,max_ttl),id=RandShort())/TCP(flags=0x2, dport=port) + d = self.sr(packets, timeout=timeout) d.addCallback(finished, port) dl.append(d) return defer.DeferredList(dl) def test_udp_traceroute(self): + """ + Does a traceroute to the destination by sending UDP packets with empty + payloads with TTLs from 1 until max_ttl. + """ def finished(packets, port): - log.debug("Finished running udp traceroute test") + log.debug("Finished running UDP traceroute test on port %s" % port) answered, unanswered = packets self.report['hops_'+str(port)] = [] for snd, rcv in answered: - report = {'ttl': snd.ttl, 'address': rcv.src} + report = {'ttl': snd.ttl, + 'address': rcv.src, + 'rtt': rcv.time - snd.time + } + log.debug("%s: %s" % (port, report)) self.report['hops_'+str(port)].append(report) dl = [] + max_ttl, timeout = self.max_ttl_and_timeout() for port in self.dst_ports: packets = IP(dst=self.localOptions['backend'], - ttl=(1,25),id=RandShort())/UDP(dport=port) - d = self.sr(packets, timeout=5) + ttl=(1,max_ttl),id=RandShort())/UDP(dport=port) + d = self.sr(packets, timeout=timeout) d.addCallback(finished, port) dl.append(d) return defer.DeferredList(dl) + def test_icmp_traceroute(self): + """ + Does a traceroute to the destination by sending ICMP echo request + packets with TTLs from 1 until max_ttl. + """ + def finished(packets): + log.debug("Finished running ICMP traceroute test") + answered, unanswered = packets + self.report['hops'] = [] + for snd, rcv in answered: + report = {'ttl': snd.ttl, + 'address': rcv.src, + 'rtt': rcv.time - snd.time + } + log.debug("%s" % (report)) + self.report['hops'].append(report) + dl = [] + max_ttl, timeout = self.max_ttl_and_timeout() + packets = IP(dst=self.localOptions['backend'], + ttl=(1,max_ttl),id=RandShort())/ICMP() + d = self.sr(packets, timeout=timeout) + d.addCallback(finished) + return d + + diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index c443610..feaf720 100644 --- a/ooni/templates/scapyt.py +++ b/ooni/templates/scapyt.py @@ -48,12 +48,11 @@ class BaseScapyTest(NetTestCase): at layer 3. """ def finished(packets): - log.debug("Got this bullshit") answered, unanswered = packets self.report['answered_packets'] = [] self.report['sent_packets'] = [] for snd, rcv in answered: - log.debug("Writing report %s" % snd) + log.debug("Writing report for scapy test") pkt_report_r = createPacketReport(rcv) pkt_report_s = createPacketReport(snd) self.report['answered_packets'].append(pkt_report_r)

1 0

[stem/master] Adding link for stem's development wiki
by atagar＠torproject.org 11 Nov '12

11 Nov '12

commit 505b5a6f82222f4d16e1e1cdac96c66096a52bf1 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 10 23:17:31 2012 -0800 Adding link for stem's development wiki We don't have anything linking stem's front page to the development wiki. In general this is ok, the dev wiki is only of interest to people wanting to hack *on* stem, not use it. However, we should have at least one link to let new contibutors find it on their own. --- docs/index.rst | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index 7dbde74..f0a6b67 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -41,6 +41,7 @@ Stem is a python controller library for `Tor <https://www.torproject.org/>`_. Li Subsections =========== +* `Development Wiki <https://trac.torproject.org/projects/tor/wiki/doc/stem>`_ * `Contact <http://www.atagar.com/contact/>`_ * :ref:`genindex` * :ref:`modindex`

1 0

r25872: {website} Adding TorBirdy to the projects table Projects table entry p (website/trunk/getinvolved/en)
by Damian Johnson 11 Nov '12

11 Nov '12

Author: atagar Date: 2012-11-11 07:12:42 +0000 (Sun, 11 Nov 2012) New Revision: 25872 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Adding TorBirdy to the projects table Projects table entry provided by Sukhbir. Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2012-11-11 04:00:10 UTC (rev 25871) +++ website/trunk/getinvolved/en/volunteer.wml 2012-11-11 07:12:42 UTC (rev 25872) @@ -166,6 +166,14 @@ </tr> <tr> + <td><a href="#project-torbirdy">TorBirdy</a></td> + <td>Browser Add-on</td> + <td>JavaScript</td> + <td>Heavy</td> + <td>Sukhbir (sukhe), ioerror</td> + </tr> + + <tr class="alt"> <td><a href="#project-obfsproxy">Obfsproxy</a></td> <td>Client Add-on</td> <td>C</td> @@ -173,7 +181,7 @@ <td>nickm, asn</td> </tr> - <tr class="alt"> + <tr> <td>*<a href="#project-thandy">Thandy</a></td> <td>Updater</td> <td>Python</td> @@ -181,7 +189,7 @@ <td>chiiph, Erinn, nickm</td> </tr> - <tr> + <tr class="alt"> <td>*<a href="#project-ooni-probe">Ooni Probe</a></td> <td>Scanner</td> <td>Python</td> @@ -189,7 +197,7 @@ <td>hellais, ioerror</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-shadow">Shadow</a></td> <td>Experimentation</td> <td>C, Python</td> @@ -197,7 +205,7 @@ <td>robgjansen</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-torctl">TorCtl</a></td> <td>Library</td> <td>Python</td> @@ -205,7 +213,7 @@ <td>aagbsn</td> </tr> - <tr class="alt"> + <tr> <td>*<a href="#project-stem">Stem</a></td> <td>Library</td> <td>Python</td> @@ -213,7 +221,7 @@ <td>atagar, neena</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-metrics">Metrics</a></td> <td>Client Service</td> <td>Java</td> @@ -221,7 +229,7 @@ <td>karsten</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-atlas">Atlas</a></td> <td>Client Service</td> <td>JavaScript</td> @@ -229,7 +237,7 @@ <td>hellais</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-torstatus">TorStatus</a></td> <td>Client Service</td> <td>Python, Django</td> @@ -237,7 +245,7 @@ <td></td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-compass">Compass</a></td> <td>Client Service</td> <td>Python</td> @@ -245,7 +253,7 @@ <td>gsathya, karsten</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-weather">Weather</a></td> <td>Client Service</td> <td>Python</td> @@ -253,7 +261,7 @@ <td>kaner</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-gettor">GetTor</a></td> <td>Client Service</td> <td>Python</td> @@ -261,7 +269,7 @@ <td>kaner</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-torcheck">TorCheck</a></td> <td>Client Service</td> <td>Python, Perl</td> @@ -269,7 +277,7 @@ <td></td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-onionoo">Onionoo</a></td> <td>Backend Service</td> <td>Java, Python</td> @@ -277,7 +285,7 @@ <td>karsten, gsathya</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-bridgedb">BridgeDB</a></td> <td>Backend Service</td> <td>Python</td> @@ -285,7 +293,7 @@ <td>kaner, nickm</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-torflow">TorFlow</a></td> <td>Backend Service</td> <td>Python</td> @@ -293,7 +301,7 @@ <td>aagbsn</td> </tr> - <tr> + <tr class="alt"> <td>*<a href="#project-torbel">TorBEL</a></td> <td>Backend Service</td> <td>Python</td> @@ -482,6 +490,21 @@ as well</a>. </p> + <a id="project-torbirdy"></a> + <h3>TorBirdy (<a + href="https://github.com/ioerror/torbirdy">code</a>, <a + href="https://trac.torproject.org/projects/tor/wiki/torbirdy/dev">bug + tracker</a>)</h3> + + <p> + TorBirdy is Torbutton for Thunderbird and related Mozilla mail clients. + </p> + + <p> + <b>Project Ideas:</b><br /> + <i><a href="#improveTorbirdy">Improving TorBirdy</a></i><br /> + </p> + <a id="project-obfsproxy"></a> <h3><a href="https://gitweb.torproject.org/obfsproxy.git/tree/HEAD:/doc">Obfsproxy</a> (<a href="https://gitweb.torproject.org/obfsproxy.git">code</a>, <a

1 0

[flashproxy/master] Use the pt_cmethods_done function in another place.
by dcf＠torproject.org 11 Nov '12

11 Nov '12

commit 823596e0dded69827c3faae2add9e71a6f142b80 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Nov 10 21:37:57 2012 -0800 Use the pt_cmethods_done function in another place. --- flashproxy-client | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index fded7a0..6a81968 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -1004,7 +1004,7 @@ option.\ client_transports = pt_get_client_transports(["websocket"]) if not client_transports: - pt_line("CMETHODS", "DONE") + pt_cmethods_done() sys.exit(1) def pt_cmethod(method_name, addr):

1 0

r25871: {website} revert last commit (website/trunk/about/en)
by Runa Sandvik 11 Nov '12

11 Nov '12

Author: runa Date: 2012-11-11 04:00:10 +0000 (Sun, 11 Nov 2012) New Revision: 25871 Modified: website/trunk/about/en/jobs-translatorsupport.wml Log: revert last commit Modified: website/trunk/about/en/jobs-translatorsupport.wml =================================================================== --- website/trunk/about/en/jobs-translatorsupport.wml 2012-11-11 02:49:14 UTC (rev 25870) +++ website/trunk/about/en/jobs-translatorsupport.wml 2012-11-11 04:00:10 UTC (rev 25871) @@ -105,8 +105,7 @@ enforcement. Tor has a staff of 14 paid developers, researchers, and advocates, plus many dozen volunteers who help out on a daily basis. Tor is funded in part by government research and development grants, and - in part by individual and corporate donations. The Tor Project is an - equal opportunity employer. + in part by individual and corporate donations. </p> </div>

1 0

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

11 Nov '12

commit 01150b035eb7fdc249e8faf188646d114bfacd75 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 11 03:45:21 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 48166c4..ba51e72 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-11 03:12+0000\n" +"PO-Revision-Date: 2012-11-11 03:25+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" @@ -2069,7 +2069,7 @@ msgid "" "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n" "\n" "Would you like to shutdown gracefully and give clients time to find a new relay?" -msgstr "Actualmente está ejecutando un repetidor. La detención del mismo interrumpiría cualesquiera conexiones que tengan abiertas los clientes.\n\n¿Podría darle tiempo a los clientes de encontrar un nuevo repetidor?" +msgstr "Actualmente está ejecutando un repetidor (relay). Detenerlo interrumpiría cualquier conexión abierta desde los clientes.\n\n¿Desea cerrar con un periodo de gracia para dar tiempo de encontrar un nuevo repetidor a los clientes?" msgctxt "MainWindow" msgid ""

1 0