- tor-commits - lists.torproject.org

[ooni-probe/master] Do some important refactoring of scapy related functionality
by art＠torproject.org 24 Nov '12

24 Nov '12

commit c44cc83cbefa9fcd6ba81bb18a6e52a1762f935f Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Nov 24 21:32:44 2012 +0100 Do some important refactoring of scapy related functionality * Move functions for detecting the default network interface into txscapy * Make sr1 follow the syntax of scapy * Add notes as to why the parasitic traceroute test does not work --- nettests/bridge_reachability/echo.py | 4 +- nettests/core/dnsspoof.py | 4 +- nettests/core/dnstamper.py | 12 ++-- nettests/core/parasitictraceroute.py | 117 ++++++++++++++++++---------------- nettests/core/tcpconnect.py | 2 +- ooni/templates/scapyt.py | 65 +++++++++++++------ ooni/utils/net.py | 42 +------------ ooni/utils/txscapy.py | 75 +++++++++++++--------- ooniprobe.conf | 4 + 9 files changed, 166 insertions(+), 159 deletions(-) diff --git a/nettests/bridge_reachability/echo.py b/nettests/bridge_reachability/echo.py index 40436e7..d4033dd 100644 --- a/nettests/bridge_reachability/echo.py +++ b/nettests/bridge_reachability/echo.py @@ -18,7 +18,7 @@ import sys from twisted.python import usage from twisted.internet import reactor, defer from ooni import nettest -from ooni.utils import log, net, Storage +from ooni.utils import log, net, Storage, txscapy try: from scapy.all import IP, ICMP @@ -66,7 +66,7 @@ class EchoTest(nettest.NetTestCase): if not self.interface: try: - iface = net.getDefaultIface() + iface = txscapy.getDefaultIface() except Exception, e: log.msg("No network interface specified!") log.err(e) diff --git a/nettests/core/dnsspoof.py b/nettests/core/dnsspoof.py index 8f3e6a2..48991ea 100644 --- a/nettests/core/dnsspoof.py +++ b/nettests/core/dnsspoof.py @@ -51,7 +51,7 @@ class DNSSpoof(scapyt.ScapyTest): question = IP(dst=self.resolverAddr)/UDP()/DNS(rd=1, qd=DNSQR(qtype="A", qclass="IN", qname=self.hostname)) log.msg("Performing query to %s with %s:%s" % (self.hostname, self.resolverAddr, self.resolverPort)) - answered, unanswered = yield self.sr1(question) + yield self.sr1(question) @defer.inlineCallbacks def test_control_a_lookup(self): @@ -59,6 +59,6 @@ class DNSSpoof(scapyt.ScapyTest): qd=DNSQR(qtype="A", qclass="IN", qname=self.hostname)) log.msg("Performing query to %s with %s:%s" % (self.hostname, self.controlResolverAddr, self.controlResolverPort)) - answered, unanswered = yield self.sr1(question) + yield self.sr1(question) diff --git a/nettests/core/dnstamper.py b/nettests/core/dnstamper.py index d007d77..967ae26 100644 --- a/nettests/core/dnstamper.py +++ b/nettests/core/dnstamper.py @@ -28,8 +28,10 @@ from ooni.utils import log class UsageOptions(usage.Options): optParameters = [['backend', 'b', '8.8.8.8:53', 'The OONI backend that runs the DNS resolver'], - ['testresolvers', 't', None, - 'file containing list of DNS resolvers to test against'] + ['testresolvers', 'T', None, + 'File containing list of DNS resolvers to test against'], + ['testresolver', 't', None, + 'Specify a single test resolver to use for testing'] ] class DNSTamperTest(dnst.DNSTest): @@ -44,12 +46,10 @@ class DNSTamperTest(dnst.DNSTest): 'Input file of list of hostnames to attempt to resolve'] usageOptions = UsageOptions - requiredOptions = ['backend', 'file', 'testresolvers'] + requiredOptions = ['backend', 'file'] def setUp(self): - if not self.localOptions['testresolvers']: - self.test_resolvers = ['8.8.8.8'] raise usage.UsageError("You did not specify a file of DNS servers to test!" "See the '--testresolvers' option.") @@ -68,7 +68,7 @@ class DNSTamperTest(dnst.DNSTest): self.report['control_resolver'] = self.control_dns_server @defer.inlineCallbacks - def test_a_queries(self): + def test_a_lookup(self): """ We perform an A lookup on the DNS test servers for the domains to be tested and an A lookup on the known good DNS server. diff --git a/nettests/core/parasitictraceroute.py b/nettests/core/parasitictraceroute.py index 8ea27bc..631c24b 100644 --- a/nettests/core/parasitictraceroute.py +++ b/nettests/core/parasitictraceroute.py @@ -13,14 +13,12 @@ from scapy.all import * from ooni.utils import log class UsageOptions(usage.Options): - optParameters = [['backend', 'b', '8.8.8.8', 'Test backend to use'], + optParameters = [['backend', 'b', 'google.com', 'Test backend to use'], ['timeout', 't', 5, 'The timeout for the traceroute test'], - ['maxttl', 'm', 30, 'The maximum value of ttl to set on packets'], + ['maxttl', 'm', 64, 'The maximum value of ttl to set on packets'], ['dstport', 'd', 80, 'Set the destination port of the traceroute test'], ['srcport', 'p', None, 'Set the source port to a specific value']] - optFlags = [['randomize','r', 'Randomize the source port']] - class ParasiticalTracerouteTest(scapyt.BaseScapyTest): name = "Parasitic TCP Traceroute Test" author = "Arturo Filastò" @@ -32,58 +30,57 @@ class ParasiticalTracerouteTest(scapyt.BaseScapyTest): def get_sport(): if self.localOptions['srcport']: return int(self.localOptions['srcport']) - elif self.localOptions['randomize']: - return random.randint(1024, 65535) else: - return 80 - + return random.randint(1024, 65535) self.get_sport = get_sport - self.dport = int(self.localOptions['dstport']) - 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 + self.dst_ip = socket.gethostbyaddr(self.localOptions['backend'])[2][0] + + self.dport = int(self.localOptions['dstport']) + self.max_ttl = int(self.localOptions['maxttl']) @defer.inlineCallbacks def test_parasitic_tcp_traceroute(self): """ - Establishes a TCP stream and send the packets inside of such stream. - Requires the backend to respond with an ACK to our SYN packet. - """ - max_ttl, timeout = self.max_ttl_and_timeout() + Establishes a TCP stream, then sequentially sends TCP packets with + increasing TTL until we reach the ttl of the destination. + + Requires the backend to respond with an ACK to our SYN packet (i.e. + the port must be open) + XXX this currently does not work properly. The problem lies in the fact + that we are currently using the scapy layer 3 socket. This socket makes + packets received be trapped by the kernel TCP stack, therefore when we + send out a SYN and get back a SYN-ACK the kernel stack will reply with + a RST because it did not send a SYN. + + The quick fix to this would be to establish a TCP stream using socket + calls and then "cannibalizing" the TCP session with scapy. + + The real fix is to make scapy use libpcap instead of raw sockets + obviously as we previously did... arg. + """ sport = self.get_sport() dport = self.dport ipid = int(RandShort()) - packet = IP(dst=self.localOptions['backend'], ttl=max_ttl, - id=ipid)/TCP(sport=sport, dport=dport, - flags="S", seq=0) + ip_layer = IP(dst=self.dst_ip, + id=ipid, ttl=self.max_ttl) - log.msg("Sending SYN towards %s" % dport) + syn = ip_layer/TCP(sport=sport, dport=dport, flags="S", seq=0) - try: - answered, unanswered = yield self.sr(packet, timeout=timeout) - except Exception, e: - log.exception(e) - except: - log.exception() + log.msg("Sending...") + syn.show2() - try: - snd, rcv = answered[0] - synack = rcv[0] + synack = yield self.sr1(syn) - except IndexError: - print answered, unanswered + log.msg("Got response...") + synack.show2() + + if not synack: log.err("Got no response. Try increasing max_ttl") return - except Exception, e: - log.exception(e) - if synack[TCP].flags == 11: log.msg("Got back a FIN ACK. The destination port is closed") return @@ -92,33 +89,41 @@ class ParasiticalTracerouteTest(scapyt.BaseScapyTest): log.msg("Got a SYN ACK. All is well.") else: log.err("Got an unexpected result") + return - self.report['hops'] = [] - for ttl in range(1, max_ttl): - log.msg("Sending ACK with ttl %s" % ttl) - # We generate an ack for the syn-ack we got with increasing ttl - packet = IP(dst=self.localOptions['backend'], - ttl=ttl, id=ipid)/TCP(sport=synack.dport, + ack = ip_layer/TCP(sport=synack.dport, dport=dport, flags="A", seq=synack.ack, ack=synack.seq + 1) - answered, unanswered = yield self.sr(packet, timeout=timeout) - try: - snd, rcv = answered[0] - except IndexError: - log.err("Got no response.") + yield self.send(ack) - try: - icmp = rcv[ICMP] + self.report['hops'] = [] + # For the time being we make the assumption that we are NATted and + # that the NAT will forward the packet to the destination even if the TTL has + for ttl in range(1, self.max_ttl): + log.msg("Sending packet with ttl of %s" % ttl) + ip_layer.ttl = ttl + empty_tcp_packet = ip_layer/TCP(sport=synack.dport, + dport=dport, flags="A", + seq=synack.ack, ack=synack.seq + 1) + + answer = yield self.sr1(empty_tcp_packet) + if not answer: + log.err("Got no response for ttl %s" % ttl) + continue - except IndexError: - report = {'ttl': snd.ttl, - 'address': rcv.src, - 'rtt': rcv.time - snd.time + try: + icmp = answer[ICMP] + report = {'ttl': empty_tcp_packet.ttl, + 'address': answer.src, + 'rtt': answer.time - empty_tcp_packet.time } - log.debug("%s: %s" % (dport, report)) + log.msg("%s: %s" % (dport, report)) self.report['hops'].append(report) - if rcv.src == self.localOptions['backend']: + + except IndexError: + if answer.src == self.dst_ip: + answer.show() log.msg("Reached the destination. We have finished the traceroute") return diff --git a/nettests/core/tcpconnect.py b/nettests/core/tcpconnect.py index b763bf8..d0a53f8 100644 --- a/nettests/core/tcpconnect.py +++ b/nettests/core/tcpconnect.py @@ -16,10 +16,10 @@ class TCPConnectTest(nettest.NetTestCase): name = "TCP Connect" author = "Arturo Filastò" version = "0.1" - inputFile = ['file', 'f', None, 'File containing the IP:PORT combinations to be tested, one per line'] + requiredOptions = ['file'] def test_connect(self): """ This test performs a TCP connection to the remote host on the specified port. diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index d1ffb36..11b4381 100644 --- a/ooni/templates/scapyt.py +++ b/ooni/templates/scapyt.py @@ -12,13 +12,11 @@ from twisted.internet import protocol, defer, threads from scapy.all import send, sr, IP, TCP, config from ooni.reporter import createPacketReport - from ooni.nettest import NetTestCase from ooni.utils import log - from ooni import config -from ooni.utils.txscapy import ScapyProtocol +from ooni.utils.txscapy import ScapyProtocol, getDefaultIface class BaseScapyTest(NetTestCase): """ @@ -35,9 +33,12 @@ class BaseScapyTest(NetTestCase): requiresRoot = True baseFlags = [ - ['ipsrc', 's', 'Does *not* check if IP src and ICMP IP citation matches when processing answers'], - ['seqack', 'k', 'Check if TCP sequence number and ACK match in the ICMP citation when processing answers'], - ['ipid', 'i', 'Check if the IPID matches when processing answers'] + ['ipsrc', 's', + 'Does *not* check if IP src and ICMP IP citation matches when processing answers'], + ['seqack', 'k', + 'Check if TCP sequence number and ACK match in the ICMP citation when processing answers'], + ['ipid', 'i', + 'Check if the IPID matches when processing answers'] ] def _setUp(self): @@ -65,15 +66,26 @@ class BaseScapyTest(NetTestCase): else: config.check_TCPerror_seqack = 0 + if config.advanced.interface == 'auto': + self.interface = getDefaultIface() + else: + self.interface = config.advanced.interface + + def reportSentPacket(self, packet): + if 'sent_packets' not in self.report: + self.report['sent_packets'] = [] + self.report['sent_packets'].append(packet) + + def reportReceivedPacket(self, packet): + if 'answered_packets' not in self.report: + self.report['answered_packets'] = [] + self.report['answered_packets'].append(packet) + def finishedSendReceive(self, packets): """ This gets called when all packets have been sent and received. """ answered, unanswered = packets - if 'answered_packets' not in self.report: - self.report['answered_packets'] = [] - if 'sent_packets' not in self.report: - self.report['sent_packets'] = [] for snd, rcv in answered: log.debug("Writing report for scapy test") @@ -86,11 +98,8 @@ class BaseScapyTest(NetTestCase): sent_packet.src = '127.0.0.1' received_packet.dst = '127.0.0.1' - #pkt_report_r = createPacketReport(received_packet) - #pkt_report_s = createPacketReport(sent_packet) - self.report['answered_packets'].append(received_packet) - self.report['sent_packets'].append(sent_packet) - log.debug("Done") + self.reportSentPacket(sent_packet) + self.reportReceivedPacket(received_packet) return packets def sr(self, packets, *arg, **kw): @@ -98,25 +107,41 @@ class BaseScapyTest(NetTestCase): Wrapper around scapy.sendrecv.sr for sending and receiving of packets at layer 3. """ - scapyProtocol = ScapyProtocol(*arg, **kw) + scapyProtocol = ScapyProtocol(interface=self.interface, *arg, **kw) d = scapyProtocol.startSending(packets) d.addCallback(self.finishedSendReceive) return d def sr1(self, packets, *arg, **kw): - scapyProtocol = ScapyProtocol(*arg, **kw) + def done(packets): + """ + We do this so that the returned value is only the one packet that + we expected a response for, identical to the scapy implementation + of sr1. + """ + try: + return packets[0][0][1] + except IndexError: + log.err("Got no response...") + return None + + scapyProtocol = ScapyProtocol(interface=self.interface, *arg, **kw) scapyProtocol.expected_answers = 1 log.debug("Running sr1") d = scapyProtocol.startSending(packets) log.debug("Started to send") d.addCallback(self.finishedSendReceive) + d.addCallback(done) return d - def send(self, pkts, *arg, **kw): + def send(self, packets, *arg, **kw): """ Wrapper around scapy.sendrecv.send for sending of packets at layer 3 """ - raise Exception("Not implemented") + scapyProtocol = ScapyProtocol(interface=self.interface, *arg, **kw) + scapyProtocol.sendPackets(packets) + scapyProtocol.stopSending() + for packet in packets: + self.reportSentPacket(packet) ScapyTest = BaseScapyTest - diff --git a/ooni/utils/net.py b/ooni/utils/net.py index 155abd2..e828977 100644 --- a/ooni/utils/net.py +++ b/ooni/utils/net.py @@ -22,13 +22,6 @@ from ooni.utils import log, txscapy #if sys.platform.system() == 'Windows': # import _winreg as winreg -PLATFORMS = {'LINUX': sys.platform.startswith("linux"), - 'OPENBSD': sys.platform.startswith("openbsd"), - 'FREEBSD': sys.platform.startswith("freebsd"), - 'NETBSD': sys.platform.startswith("netbsd"), - 'DARWIN': sys.platform.startswith("darwin"), - 'SOLARIS': sys.platform.startswith("sunos"), - 'WINDOWS': sys.platform.startswith("win32")} userAgents = [ ("Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.8.1.6) Gecko/20070725 Firefox/2.0.0.6", "Firefox 2.0, Windows XP"), @@ -44,7 +37,6 @@ userAgents = [ ("Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.5) Gecko/20060127 Netscape/8.1", "Netscape 8.1, Windows XP") ] - class UnsupportedPlatform(Exception): """Support for this platform is not currently available.""" @@ -54,7 +46,6 @@ class IfaceError(Exception): class PermissionsError(SystemExit): """This test requires admin or root privileges to run. Exiting...""" - PLATFORMS = {'LINUX': sys.platform.startswith("linux"), 'OPENBSD': sys.platform.startswith("openbsd"), 'FREEBSD': sys.platform.startswith("freebsd"), @@ -63,14 +54,6 @@ PLATFORMS = {'LINUX': sys.platform.startswith("linux"), 'SOLARIS': sys.platform.startswith("sunos"), 'WINDOWS': sys.platform.startswith("win32")} -class UnsupportedPlatform(Exception): - """Support for this platform is not currently available.""" - -class IfaceError(Exception): - """Could not find default network interface.""" - -class PermissionsError(SystemExit): - """This test requires admin or root privileges to run. Exiting...""" class StringProducer(object): implements(IBodyProducer) @@ -128,7 +111,6 @@ def getSystemResolver(): XXX implement a function that returns the resolver that is currently default on the system. """ - pass def getClientPlatform(platform_name=None): for name, test in PLATFORMS.items(): @@ -225,30 +207,8 @@ def getNonLoopbackIfaces(platform_name=None): else: return interfaces -def getNetworksFromRoutes(): - from scapy.all import conf, ltoa, read_routes - from ipaddr import IPNetwork, IPAddress - - ## Hide the 'no routes' warnings - conf.verb = 0 - - networks = [] - for nw, nm, gw, iface, addr in read_routes(): - n = IPNetwork( ltoa(nw) ) - (n.netmask, n.gateway, n.ipaddr) = [IPAddress(x) for x in [nm, gw, addr]] - n.iface = iface - if not n.compressed in networks: - networks.append(n) - - return networks - -def getDefaultIface(): - networks = getNetworksFromRoutes() - for net in networks: - if net.is_private: - return net.iface - raise IfaceError def getLocalAddress(): default_iface = getDefaultIface() return default_iface.ipaddr + diff --git a/ooni/utils/txscapy.py b/ooni/utils/txscapy.py index 4341f68..e41d649 100644 --- a/ooni/utils/txscapy.py +++ b/ooni/utils/txscapy.py @@ -17,28 +17,59 @@ from twisted.internet import reactor, threads, error from twisted.internet import defer, abstract from zope.interface import implements - from scapy.all import PcapWriter, MTU from scapy.all import BasePacketList, conf, PcapReader from scapy.all import conf, Gen, SetGen +from scapy.arch import pcapdnet from ooni.utils import log +conf.use_pcap = True +conf.use_dnet = True + +def getNetworksFromRoutes(): + from scapy.all import conf, ltoa, read_routes + from ipaddr import IPNetwork, IPAddress + + ## Hide the 'no routes' warnings + conf.verb = 0 + + networks = [] + for nw, nm, gw, iface, addr in read_routes(): + n = IPNetwork( ltoa(nw) ) + (n.netmask, n.gateway, n.ipaddr) = [IPAddress(x) for x in [nm, gw, addr]] + n.iface = iface + if not n.compressed in networks: + networks.append(n) + + return networks + +def getDefaultIface(): + networks = getNetworksFromRoutes() + for net in networks: + if net.is_private: + return net.iface + raise IfaceError + class TXPcapWriter(PcapWriter): def __init__(self, *arg, **kw): PcapWriter.__init__(self, *arg, **kw) fdesc.setNonBlocking(self.f) class ScapyProtocol(abstract.FileDescriptor): - def __init__(self, super_socket=None, - reactor=None, timeout=4, receive=True): + def __init__(self, interface, super_socket=None, timeout=5): abstract.FileDescriptor.__init__(self, reactor) # By default we use the conf.L3socket if not super_socket: - super_socket = conf.L3socket() + super_socket = pcapdnet.L3dnetSocket(iface=interface) + print super_socket + log.msg("Creating layer 3 socket with interface %s" % interface) + + #fdesc._setCloseOnExec(super_socket.ins.fileno()) self.super_socket = super_socket + self.interface = interface self.timeout = timeout # This dict is used to store the unique hashes that allow scapy to @@ -53,13 +84,8 @@ class ScapyProtocol(abstract.FileDescriptor): # This deferred will fire when we have finished sending a receiving packets. self.d = defer.Deferred() - self.debug = False + # Should we look for multiple answers for the same sent packet? self.multi = False - # XXX this needs to be implemented. It would involve keeping track of - # the state of the sending via the super socket file descriptor and - # firing the callback when we have concluded sending. Check out - # twisted.internet.udp to see how this is done. - self.receive = receive # When 0 we stop when all the packets we have sent have received an # answer @@ -85,7 +111,6 @@ class ScapyProtocol(abstract.FileDescriptor): if len(self.answered_packets) == len(self.sent_packets): log.debug("All of our questions have been answered.") - log.debug("%s" % self.__hash__) self.stopSending() return @@ -94,12 +119,11 @@ class ScapyProtocol(abstract.FileDescriptor): log.debug("Got the number of expected answers") self.stopSending() - def doRead(self): timeout = time.time() - self._start_time if self.timeout and time.time() - self._start_time > self.timeout: self.stopSending() - packet = self.super_socket.recv() + packet = self.super_socket.recv(MTU) if packet: self.processPacket(packet) # A string that has the same value for the request than for the @@ -110,7 +134,6 @@ class ScapyProtocol(abstract.FileDescriptor): self.processAnswer(packet, answer_hr) def stopSending(self): - log.debug("Stopping sending") self.stopReading() self.super_socket.close() if hasattr(self, "d"): @@ -120,20 +143,20 @@ class ScapyProtocol(abstract.FileDescriptor): def write(self, packet): """ - Write a scapy packet to the wire + Write a scapy packet to the wire. """ - hashret = packet.hashret() - if hashret in self.hr_sent_packets: - self.hr_sent_packets[hashret].append(packet) - else: - self.hr_sent_packets[hashret] = [packet] - self.sent_packets.append(packet) return self.super_socket.send(packet) def sendPackets(self, packets): if not isinstance(packets, Gen): packets = SetGen(packets) for packet in packets: + hashret = packet.hashret() + if hashret in self.hr_sent_packets: + self.hr_sent_packets[hashret].append(packet) + else: + self.hr_sent_packets[hashret] = [packet] + self.sent_packets.append(packet) self.write(packet) def startSending(self, packets): @@ -142,14 +165,4 @@ class ScapyProtocol(abstract.FileDescriptor): self.sendPackets(packets) return self.d -def sr(x, filter=None, iface=None, nofilter=0, timeout=None): - super_socket = conf.L3socket(filter=filter, iface=iface, nofilter=nofilter) - sp = ScapyProtocol(super_socket=super_socket, timeout=timeout) - return sp.startSending(x) - -def send(x, filter=None, iface=None, nofilter=0, timeout=None): - super_socket = conf.L3socket(filter=filter, iface=iface, nofilter=nofilter) - sp = ScapyProtocol(super_socket=super_socket, timeout=timeout) - return sp.startSending(x) - diff --git a/ooniprobe.conf b/ooniprobe.conf index 1998c93..e9f208f 100644 --- a/ooniprobe.conf +++ b/ooniprobe.conf @@ -25,4 +25,8 @@ advanced: debug: true threadpool_size: 10 tor_socksport: 9050 + # For auto detection + interface: auto + # Of specify a specific interface + #interface: wlan0

1 0

[ooni-probe/master] Put a sane timeout default on txscapy
by art＠torproject.org 24 Nov '12

24 Nov '12

commit 144263051c84c45e29c6a4cd29e6c04e5a30ff47 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Nov 24 14:49:17 2012 +0100 Put a sane timeout default on txscapy --- ooni/utils/txscapy.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ooni/utils/txscapy.py b/ooni/utils/txscapy.py index d87a7a0..4341f68 100644 --- a/ooni/utils/txscapy.py +++ b/ooni/utils/txscapy.py @@ -32,7 +32,7 @@ class TXPcapWriter(PcapWriter): class ScapyProtocol(abstract.FileDescriptor): def __init__(self, super_socket=None, - reactor=None, timeout=None, receive=True): + reactor=None, timeout=4, receive=True): abstract.FileDescriptor.__init__(self, reactor) # By default we use the conf.L3socket if not super_socket:

1 0

[ooni-probe/master] Refactor the logic for dumping the YAML reports of packets.
by art＠torproject.org 24 Nov '12

24 Nov '12

commit 620a591c290d4b47803dc2f4cf07e343d56d3618 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Nov 24 14:24:48 2012 +0100 Refactor the logic for dumping the YAML reports of packets. * Override the yaml.representer.represent_data as a hackish quick fix to the problem. * Outline a possible long term solution to it. --- nettests/core/traceroute.py | 8 ++++- ooni/reporter.py | 78 +++++++++++++++++++++++++++++++++++++++++-- ooni/utils/hacks.py | 45 ------------------------- 3 files changed, 82 insertions(+), 49 deletions(-) diff --git a/nettests/core/traceroute.py b/nettests/core/traceroute.py index a6fc9f1..6a443d9 100644 --- a/nettests/core/traceroute.py +++ b/nettests/core/traceroute.py @@ -50,6 +50,12 @@ class TracerouteTest(scapyt.BaseScapyTest): return max_ttl, timeout + def postProcessor(self, report): + tcp_hops = report['test_tcp_traceroute'] + udp_hops = report['test_udp_traceroute'] + icmp_hops = report['test_icmp_traceroute'] + + def test_tcp_traceroute(self): """ Does a traceroute to the destination by sending TCP SYN packets @@ -126,7 +132,7 @@ class TracerouteTest(scapyt.BaseScapyTest): dl = [] max_ttl, timeout = self.max_ttl_and_timeout() packets = IP(dst=self.localOptions['backend'], - ttl=(1,max_ttl),id=RandShort())/ICMP() + ttl=(1,max_ttl), id=RandShort())/ICMP() d = self.sr(packets, timeout=timeout) d.addCallback(finished) diff --git a/ooni/reporter.py b/ooni/reporter.py index 7fc49e2..1e2924d 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -15,6 +15,13 @@ import yaml import json import traceback +from yaml.representer import * +from yaml.emitter import * +from yaml.serializer import * +from yaml.resolver import * + +from scapy.packet import Packet + from twisted.python.util import untilConcludes from twisted.trial import reporter from twisted.internet import defer, reactor @@ -23,10 +30,75 @@ from twisted.internet.error import ConnectionRefusedError from ooni.utils.net import BodyReceiver, StringProducer, userAgents from ooni.utils import otime, log, geodata -from ooni.utils.hacks import OSafeRepresenter, OSafeDumper from ooni import config -from scapy.all import packet +def createPacketReport(packet_list): + """ + Takes as input a packet a list. + + Returns a dict containing a dict with the packet + summary and the raw packet. + """ + report = [] + for packet in packet_list: + report.append({'raw_packet': str(packet), + 'summary': str(packet.summary())}) + return report + +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 and scapy packet. + """ + def represent_data(self, data): + """ + This is very hackish. There is for sure a better way either by using + the add_multi_representer or add_representer, the issue though lies in + the fact that Scapy packets are metaclasses that leads to + yaml.representer.get_classobj_bases to not be able to properly get the + base of class of a Scapy packet. + XXX fully debug this problem + """ + if isinstance(data, Packet): + data = createPacketReport(data) + return SafeRepresenter.represent_data(self, data) + + 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 @@ -103,7 +175,7 @@ class OReporter(object): log.debug("Writing report") test_report = dict(test.report) - if isinstance(test.input, packet.Packet): + if isinstance(test.input, Packet): test_input = createPacketReport(test.input) else: test_input = test.input diff --git a/ooni/utils/hacks.py b/ooni/utils/hacks.py index 8912bbb..d4e832c 100644 --- a/ooni/utils/hacks.py +++ b/ooni/utils/hacks.py @@ -8,10 +8,6 @@ # :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 @@ -67,44 +63,3 @@ def patched_reduce_ex(self, proto): 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] Update scapy test to support sr1
by art＠torproject.org 24 Nov '12

24 Nov '12

commit 36e8839465032b20ded258de4460a38edf28a40c Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Nov 24 14:25:49 2012 +0100 Update scapy test to support sr1 * Refactor scapy test to avoid too much code duplication --- ooni/templates/scapyt.py | 76 ++++++++++++++++++++++++---------------------- 1 files changed, 40 insertions(+), 36 deletions(-) diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index af90260..d1ffb36 100644 --- a/ooni/templates/scapyt.py +++ b/ooni/templates/scapyt.py @@ -11,6 +11,8 @@ from twisted.internet import protocol, defer, threads from scapy.all import send, sr, IP, TCP, config +from ooni.reporter import createPacketReport + from ooni.nettest import NetTestCase from ooni.utils import log @@ -18,17 +20,6 @@ from ooni import config from ooni.utils.txscapy import ScapyProtocol -def createPacketReport(packet_list): - """ - Takes as input a packet a list containing a dict with the packet - summary and the raw packet. - """ - report = [] - for packet in packet_list: - report.append({'raw_packet': str(packet), - 'summary': str(packet.summary())}) - return report - class BaseScapyTest(NetTestCase): """ The report of a test run with scapy looks like this: @@ -74,39 +65,51 @@ class BaseScapyTest(NetTestCase): else: config.check_TCPerror_seqack = 0 + def finishedSendReceive(self, packets): + """ + This gets called when all packets have been sent and received. + """ + answered, unanswered = packets + if 'answered_packets' not in self.report: + self.report['answered_packets'] = [] + if 'sent_packets' not in self.report: + self.report['sent_packets'] = [] + + for snd, rcv in answered: + log.debug("Writing report for scapy test") + sent_packet = snd + received_packet = rcv + + if not config.privacy.includeip: + log.msg("Detected you would not like to include your ip in the report") + log.msg("Stripping source and destination IPs from the reports") + sent_packet.src = '127.0.0.1' + received_packet.dst = '127.0.0.1' + + #pkt_report_r = createPacketReport(received_packet) + #pkt_report_s = createPacketReport(sent_packet) + self.report['answered_packets'].append(received_packet) + self.report['sent_packets'].append(sent_packet) + log.debug("Done") + return packets + def sr(self, packets, *arg, **kw): """ Wrapper around scapy.sendrecv.sr for sending and receiving of packets at layer 3. """ - def finished(packets): - answered, unanswered = packets - if 'answered_packets' not in self.report: - self.report['answered_packets'] = [] - if 'sent_packets' not in self.report: - self.report['sent_packets'] = [] - - for snd, rcv in answered: - log.debug("Writing report for scapy test") - sent_packet = snd - received_packet = rcv - - if not config.privacy.includeip: - log.msg("Detected you would not like to include your ip in the report") - log.msg("Stripping source and destination IPs from the reports") - sent_packet.src = '127.0.0.1' - received_packet.dst = '127.0.0.1' - - pkt_report_r = createPacketReport(received_packet) - pkt_report_s = createPacketReport(sent_packet) - self.report['answered_packets'].append(pkt_report_r) - self.report['sent_packets'].append(pkt_report_s) - log.debug("Done") - return packets + scapyProtocol = ScapyProtocol(*arg, **kw) + d = scapyProtocol.startSending(packets) + d.addCallback(self.finishedSendReceive) + return d + def sr1(self, packets, *arg, **kw): scapyProtocol = ScapyProtocol(*arg, **kw) + scapyProtocol.expected_answers = 1 + log.debug("Running sr1") d = scapyProtocol.startSending(packets) - d.addCallback(finished) + log.debug("Started to send") + d.addCallback(self.finishedSendReceive) return d def send(self, pkts, *arg, **kw): @@ -115,4 +118,5 @@ class BaseScapyTest(NetTestCase): """ raise Exception("Not implemented") +ScapyTest = BaseScapyTest

1 0

[ooni-probe/master] Take note of the fact that we need such function, specifically for the dnsspoof test
by art＠torproject.org 24 Nov '12

24 Nov '12

commit 520b8fc449585768346d4ecfc0b53b7f83ceba51 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Nov 24 14:27:34 2012 +0100 Take note of the fact that we need such function, specifically for the dnsspoof test --- ooni/utils/net.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ooni/utils/net.py b/ooni/utils/net.py index c5b01a3..155abd2 100644 --- a/ooni/utils/net.py +++ b/ooni/utils/net.py @@ -123,6 +123,12 @@ def capturePackets(pcap_filename): reactor.addSystemEventTrigger('before', 'shutdown', stopCapture) return d +def getSystemResolver(): + """ + XXX implement a function that returns the resolver that is currently + default on the system. + """ + pass def getClientPlatform(platform_name=None): for name, test in PLATFORMS.items():

1 0

[ooni-probe/master] Implement sr1 in txscapy
by art＠torproject.org 24 Nov '12

24 Nov '12

commit 39262870b9d8741f39ad10b07158020578a0cac7 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Nov 24 14:26:22 2012 +0100 Implement sr1 in txscapy --- ooni/utils/txscapy.py | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/ooni/utils/txscapy.py b/ooni/utils/txscapy.py index 2b108ca..d87a7a0 100644 --- a/ooni/utils/txscapy.py +++ b/ooni/utils/txscapy.py @@ -61,6 +61,10 @@ class ScapyProtocol(abstract.FileDescriptor): # twisted.internet.udp to see how this is done. self.receive = receive + # When 0 we stop when all the packets we have sent have received an + # answer + self.expected_answers = 0 + def fileno(self): return self.super_socket.ins.fileno() @@ -71,15 +75,25 @@ class ScapyProtocol(abstract.FileDescriptor): def processAnswer(self, packet, answer_hr): log.debug("Got a packet from %s" % packet.src) + log.debug("%s" % self.__hash__) for i in range(len(answer_hr)): if packet.answers(answer_hr[i]): self.answered_packets.append((answer_hr[i], packet)) if not self.multi: del(answer_hr[i]) break + if len(self.answered_packets) == len(self.sent_packets): - # All of our questions have been answered. + log.debug("All of our questions have been answered.") + log.debug("%s" % self.__hash__) self.stopSending() + return + + if self.expected_answers and \ + self.expected_answers == len(self.answered_packets): + log.debug("Got the number of expected answers") + self.stopSending() + def doRead(self): timeout = time.time() - self._start_time @@ -96,6 +110,7 @@ class ScapyProtocol(abstract.FileDescriptor): self.processAnswer(packet, answer_hr) def stopSending(self): + log.debug("Stopping sending") self.stopReading() self.super_socket.close() if hasattr(self, "d"):

1 0

[ooni-probe/master] Implement test that detects DNS spoofing
by art＠torproject.org 24 Nov '12

24 Nov '12

commit 4208c6e963ae59380999fae45930656c287a627d Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Nov 24 14:28:10 2012 +0100 Implement test that detects DNS spoofing * To be run with a known good resolver and the default resolver of the country being tested, from inside the country with a hostname of a site that is known to be censored. --- nettests/core/dnsspoof.py | 64 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/nettests/core/dnsspoof.py b/nettests/core/dnsspoof.py new file mode 100644 index 0000000..8f3e6a2 --- /dev/null +++ b/nettests/core/dnsspoof.py @@ -0,0 +1,64 @@ +from twisted.internet import defer +from twisted.python import usage + +from scapy.all import IP, UDP, DNS, DNSQR + +from ooni.templates import scapyt +from ooni.utils import log + +class UsageOptions(usage.Options): + optParameters = [['resolver', 'r', None, + 'Specify the resolver that should be used for DNS queries (ip:port)'], + ['hostname', 'h', None, + 'Specify the hostname of a censored site'], + ['backend', 'b', '8.8.8.8:53', + 'Specify the IP address of a good DNS resolver (ip:port)'] + ] + + +class DNSSpoof(scapyt.ScapyTest): + name = "DNS Spoof" + timeout = 2 + + usageOptions = UsageOptions + + requiredOptions = ['hostname', 'resolver'] + + def setUp(self): + self.resolverAddr, self.resolverPort = self.localOptions['resolver'].split(':') + self.resolverPort = int(self.resolverPort) + + self.controlResolverAddr, self.controlResolverPort = self.localOptions['backend'].split(':') + self.controlResolverPort = int(self.controlResolverPort) + + self.hostname = self.localOptions['hostname'] + + def postProcessor(self, report): + """ + This is not tested, but the concept is that if the two responses + match up then spoofing is occuring. + """ + test_answer = report['test_a_lookup']['answered_packets'][0][1] + control_answer = report['test_control_a_lookup']['answered_packets'][0][1] + if test_answer[UDP] == control_answer[UDP]: + self.report['spoofing'] = True + else: + self.report['spoofing'] = False + return + + @defer.inlineCallbacks + def test_a_lookup(self): + question = IP(dst=self.resolverAddr)/UDP()/DNS(rd=1, + qd=DNSQR(qtype="A", qclass="IN", qname=self.hostname)) + log.msg("Performing query to %s with %s:%s" % (self.hostname, self.resolverAddr, self.resolverPort)) + answered, unanswered = yield self.sr1(question) + + @defer.inlineCallbacks + def test_control_a_lookup(self): + question = IP(dst=self.controlResolverAddr)/UDP()/DNS(rd=1, + qd=DNSQR(qtype="A", qclass="IN", qname=self.hostname)) + log.msg("Performing query to %s with %s:%s" % (self.hostname, + self.controlResolverAddr, self.controlResolverPort)) + answered, unanswered = yield self.sr1(question) + +

1 0

[ooni-probe/master] Make HTTPConnectionPool be a softer dependency
by art＠torproject.org 24 Nov '12

24 Nov '12

commit d613f21c78a75d0a4dea3639cd0eb0d8a57f49f8 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Nov 24 11:34:23 2012 +0100 Make HTTPConnectionPool be a softer dependency * Print out messages warning the user that the current version of twisted is outdated. * Update requirements.txt to require Twisted > 12.1.0 Thanks to mct for reporting the bug --- ooni/reporter.py | 2 +- ooni/utils/txagentwithsocks.py | 21 ++++++++++++++++++--- requirements.txt | 2 +- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ooni/reporter.py b/ooni/reporter.py index 8c76dc4..7fc49e2 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -20,7 +20,7 @@ from twisted.trial import reporter from twisted.internet import defer, reactor from twisted.internet.error import ConnectionRefusedError -from ooni.templates.httpt import BodyReceiver, StringProducer +from ooni.utils.net import BodyReceiver, StringProducer, userAgents from ooni.utils import otime, log, geodata from ooni.utils.hacks import OSafeRepresenter, OSafeDumper diff --git a/ooni/utils/txagentwithsocks.py b/ooni/utils/txagentwithsocks.py index 05da54f..57c27e4 100644 --- a/ooni/utils/txagentwithsocks.py +++ b/ooni/utils/txagentwithsocks.py @@ -14,6 +14,8 @@ from twisted.internet.endpoints import TCP4ClientEndpoint, SSL4ClientEndpoint, _ from twisted.internet import interfaces, defer from twisted.internet.defer import Deferred, succeed, fail, maybeDeferred +from ooni.utils import log + class SOCKSError(Exception): def __init__(self, value): Exception.__init__(self) @@ -198,15 +200,22 @@ class _HTTP11ClientFactory(client._HTTP11ClientFactory): def buildProtocol(self, addr): return HTTP11ClientProtocol(self._quiescentCallback) -class HTTPConnectionPool(client.HTTPConnectionPool): - _factory = _HTTP11ClientFactory +try: + class HTTPConnectionPool(client.HTTPConnectionPool): + _factory = _HTTP11ClientFactory +except AttributeError: + log.err("Your version of Twisted is outdated and we will not support HTTPConnectionPool") + HTTPConnectionPool = None + +class UnsupportedTwistedVersion(Exception): + pass class Agent(client.Agent): def __init__(self, reactor, contextFactory=client.WebClientContextFactory(), connectTimeout=None, bindAddress=None, pool=None, sockshost=None, socksport=None): - if pool is None: + if pool is None and HTTPConnectionPool: pool = HTTPConnectionPool(reactor, False) self._reactor = reactor self._pool = pool @@ -216,6 +225,12 @@ class Agent(client.Agent): self._sockshost = sockshost self._socksport = socksport + def request(self, method, uri, headers=None, bodyProducer=None): + if uri.startswith('shttp') or uri.startswith('httpo'): + log.err("Requests over SOCKS are supported only with versions of Twisted >= 12.1.0") + raise UnsupportedTwistedVersion + return client.Agent.request(self, method, uri, headers, bodyProducer) + def _getEndpoint(self, scheme, host, port): kwargs = {} if self._connectTimeout is not None: diff --git a/requirements.txt b/requirements.txt index 0848cca..4ddb915 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ Jinja2>=2.6 PyYAML>=3.10 Pygments>=1.5 Sphinx>=1.1.3 -Twisted>=12.0.0 +Twisted>=12.1.0 argparse>=1.2.1 distribute>=0.6.24 dnspython>=1.10.0

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 24 Nov '12

24 Nov '12

commit e8d379afb35dc3df01b59e850a105ee99d9e3702 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 24 09:16:25 2012 +0000 Update translations for torbirdy_completed --- templates/torbirdy.dtd | 2 ++ templates/torbirdy.properties | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/templates/torbirdy.dtd b/templates/torbirdy.dtd index 0bd8cca..3b1148f 100644 --- a/templates/torbirdy.dtd +++ b/templates/torbirdy.dtd @@ -33,6 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key "i"> <!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled, will select Local Folders]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]"> +<!ENTITY torbirdy.prefs.timezone.key "z"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Put the recipient key IDs into encrypted messages [default: do not put]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "Account-Specific"> diff --git a/templates/torbirdy.properties b/templates/torbirdy.properties index 39f7489..3c24326 100644 --- a/templates/torbirdy.properties +++ b/templates/torbirdy.properties @@ -11,3 +11,5 @@ torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wiz torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing. torbirdy.email.advanced.nextwarning=Show this warning next time torbirdy.email.advanced.title=TorBirdy Advanced Settings + +torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again.

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 24 Nov '12

24 Nov '12

commit c0ae1e77bcb4513723cb66a4d7d96cb725b551bb Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 24 09:16:21 2012 +0000 Update translations for torbirdy --- ar/torbirdy.dtd | 2 ++ de/torbirdy.dtd | 2 ++ de/torbirdy.properties | 2 ++ el/torbirdy.dtd | 2 ++ el/torbirdy.properties | 2 ++ es/torbirdy.dtd | 2 ++ es/torbirdy.properties | 2 ++ eu/torbirdy.dtd | 2 ++ eu/torbirdy.properties | 2 ++ fr/torbirdy.dtd | 2 ++ fr/torbirdy.properties | 2 ++ he/torbirdy.dtd | 2 ++ he/torbirdy.properties | 2 ++ hu/torbirdy.dtd | 2 ++ hu/torbirdy.properties | 2 ++ it/torbirdy.dtd | 2 ++ it/torbirdy.properties | 2 ++ lv/torbirdy.dtd | 2 ++ lv/torbirdy.properties | 2 ++ nl/torbirdy.dtd | 2 ++ nl/torbirdy.properties | 2 ++ pa/torbirdy.dtd | 2 ++ pa/torbirdy.properties | 2 ++ pl/torbirdy.dtd | 2 ++ pl/torbirdy.properties | 2 ++ ru/torbirdy.dtd | 2 ++ ru/torbirdy.properties | 2 ++ sk/torbirdy.properties | 2 ++ sr/torbirdy.dtd | 2 ++ sr/torbirdy.properties | 2 ++ templates/torbirdy.dtd | 2 ++ templates/torbirdy.properties | 2 ++ zh_CN/torbirdy.dtd | 2 ++ zh_CN/torbirdy.properties | 2 ++ 34 files changed, 68 insertions(+), 0 deletions(-) diff --git a/ar/torbirdy.dtd b/ar/torbirdy.dtd index 4f77df6..e6216dc 100644 --- a/ar/torbirdy.dtd +++ b/ar/torbirdy.dtd @@ -33,6 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key ""> <!ENTITY torbirdy.prefs.startup_folder.label ""> <!ENTITY torbirdy.prefs.startup_folder.key ""> +<!ENTITY torbirdy.prefs.timezone.label ""> +<!ENTITY torbirdy.prefs.timezone.key ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key ""> <!ENTITY torbirdy.prefs.account_specific ""> diff --git a/de/torbirdy.dtd b/de/torbirdy.dtd index 69cc77f..af3f422 100644 --- a/de/torbirdy.dtd +++ b/de/torbirdy.dtd @@ -33,6 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key "i"> <!ENTITY torbirdy.prefs.startup_folder.label "Beim Start zum zuletzt aktiven Mail-Ordner wechseln [default: Lokale Ordner wird gewählt]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label ""> +<!ENTITY torbirdy.prefs.timezone.key ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Deaktiviere GPG '--throw-keyids' [default: aktiviert]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "Konten-spezifisch"> diff --git a/de/torbirdy.properties b/de/torbirdy.properties index dd935ea..f275556 100644 --- a/de/torbirdy.properties +++ b/de/torbirdy.properties @@ -11,3 +11,5 @@ torbirdy.email.prompt=TorBirdy hat den Assistenten für die Kontenerstellung dea torbirdy.email.advanced=Es wird NICHT empfohlen, die erweiterten Einstellungen von TorBirdy zu ändern.\n\nSie sollten nur fortfahren, wenn Sie genau wissen, was Sie tun. torbirdy.email.advanced.nextwarning=Zeige diese Warnung weiterhin an torbirdy.email.advanced.title=TorBirdy Erweiterte Einstellungen + +# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. diff --git a/el/torbirdy.dtd b/el/torbirdy.dtd index 14fa698..4ffb9c5 100644 --- a/el/torbirdy.dtd +++ b/el/torbirdy.dtd @@ -33,6 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key "i"> <!ENTITY torbirdy.prefs.startup_folder.label "Επιλογή τελευταίου προσβάσιμου φακέλου e-mail κατά την εκκίνηση [προεπιλογή: απενεργοποιημένο, θα επιλεγούν τοπικοί φάκελοι]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label ""> +<!ENTITY torbirdy.prefs.timezone.key ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Απενεργοποίηση GPG '--throw-keyids' [προεπιλογή: ενεργοποιημένο]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "Ειδικός λογαριασμός"> diff --git a/el/torbirdy.properties b/el/torbirdy.properties index ecfdfe6..8a5f79b 100644 --- a/el/torbirdy.properties +++ b/el/torbirdy.properties @@ -11,3 +11,5 @@ torbirdy.email.prompt=Το TorBirdy έχει απενεργοποιήσει το torbirdy.email.advanced=Παρακαλώ σημειώστε ότι αλλάζοντας τις ρυθμίσεις για προχωρημένους στο TorBirdy ΔΕΝ συνιστάται.\n\nΝα συνεχίσετε μόνο αν γνωρίζετε πολύ καλά τι κάνετε. torbirdy.email.advanced.nextwarning=Δείξε μου αυτή την ειδοποίηση την επόμενη φορά torbirdy.email.advanced.title=TorBirdy: Ρυθμίσεις για προχωρημένους + +# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. diff --git a/es/torbirdy.dtd b/es/torbirdy.dtd index b84849a..7f872e7 100644 --- a/es/torbirdy.dtd +++ b/es/torbirdy.dtd @@ -33,6 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key "i"> <!ENTITY torbirdy.prefs.startup_folder.label "Seleccionar al iniciar el último directorio de correo utilizado [por defecto: deshabilitado, se seleccionará Carpetas locales]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label ""> +<!ENTITY torbirdy.prefs.timezone.key ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Deshabilitar GPG '--throw-keyids' [por defecto: habilitado]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "Configuración específica de la cuenta"> diff --git a/es/torbirdy.properties b/es/torbirdy.properties index 568015c..28619e1 100644 --- a/es/torbirdy.properties +++ b/es/torbirdy.properties @@ -11,3 +11,5 @@ torbirdy.email.prompt=TorBirdy ha deshabilitado el asistente de auto-configuraci torbirdy.email.advanced=Por favor, ten en cuenta que recomendamos NO cambiar la configuración avanzada de TorBirdy.⏎ ⏎ Debes continuar sólo si estás seguro/a de lo que estás haciendo. torbirdy.email.advanced.nextwarning=Mostrar una advertencia la próxima vez torbirdy.email.advanced.title=Configuración avanzada de TorBirdy + +# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. diff --git a/eu/torbirdy.dtd b/eu/torbirdy.dtd index 09014fe..16c9d93 100644 --- a/eu/torbirdy.dtd +++ b/eu/torbirdy.dtd @@ -33,6 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key "i"> <!ENTITY torbirdy.prefs.startup_folder.label "Abioan azkenengoz erabilitako karpeta aukeratu [lehenetsia: ezgaituta, karpeta lokalak aukeratuko dira]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label ""> +<!ENTITY torbirdy.prefs.timezone.key ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Ezgaitu GPG '--throw-keyids' [lehenetsia: gaituta]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "Kontuaren araberakoa"> diff --git a/eu/torbirdy.properties b/eu/torbirdy.properties index 8e5628a..4c680f1 100644 --- a/eu/torbirdy.properties +++ b/eu/torbirdy.properties @@ -11,3 +11,5 @@ torbirdy.email.prompt=TorBirdyk Thunderbirden autokonfigurazio morroia ezgaitu d torbirdy.email.advanced=Mesedez jakin ezazu TorBirdyren ezarpen aurreratuak aldatzea gomendatuta EZ dagoela.\n\nZer egiten ari zaren argi badaukazu bakarrik jarraitu beharko zenuke. torbirdy.email.advanced.nextwarning=Abisu hau hurrengo aldian erakutsi torbirdy.email.advanced.title=TorBirdy ezarpen aurreratuak + +# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. diff --git a/fr/torbirdy.dtd b/fr/torbirdy.dtd index 07d13c0..a559e03 100644 --- a/fr/torbirdy.dtd +++ b/fr/torbirdy.dtd @@ -33,6 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key "i"> <!ENTITY torbirdy.prefs.startup_folder.label "Selectionner comme dossier d'acceuil le dernier dossier email visité [default: désactivé, votre dossier local sera séléctionné]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label ""> +<!ENTITY torbirdy.prefs.timezone.key ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Désactiver le GPG '--throw-keyids' [default: activé]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "Compte-spécifique"> diff --git a/fr/torbirdy.properties b/fr/torbirdy.properties index 27ae7ca..00de8f4 100644 --- a/fr/torbirdy.properties +++ b/fr/torbirdy.properties @@ -11,3 +11,5 @@ torbirdy.email.prompt=TorBirdy a désactivé la configration automatique de Thun torbirdy.email.advanced=Veuiller noter qu'il n'est PAS recommandé de modifier les paramètres avancés de TorBirdy.\n\nVous pouvez continuer si vous êtes sur de ce que vous faites. torbirdy.email.advanced.nextwarning=Afficher cet avertissement la prochaine fois torbirdy.email.advanced.title=Paramètres Avancés de TorBirdy + +# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. diff --git a/he/torbirdy.dtd b/he/torbirdy.dtd index 9695d91..b21206a 100644 --- a/he/torbirdy.dtd +++ b/he/torbirdy.dtd @@ -33,6 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key "i"> <!ENTITY torbirdy.prefs.startup_folder.label "בעת הפעלה, בחר בתיקיית הדואר שנפתחה אחרונה [ברירת מחדל: מנוטרל]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label ""> +<!ENTITY torbirdy.prefs.timezone.key ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "בעת שליחת דואר מוצפן, אל תצרף את זהות המקבל. [ברירת המחדל: מופעל]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "חשבון ספציפי"> diff --git a/he/torbirdy.properties b/he/torbirdy.properties index 4dda14a..7b055b9 100644 --- a/he/torbirdy.properties +++ b/he/torbirdy.properties @@ -11,3 +11,5 @@ torbirdy.email.prompt=TorBirdy מנעה את הפעלת אשף ההגדרות ה torbirdy.email.advanced=לתשומת לבך, לא מומלץ לשנות את ההגדרות המקדמות של TorBirdy. \nהמשך רק במידה והינך בטוח שברצונך לעשות כן. torbirdy.email.advanced.nextwarning=הצג אזהרה זו בפעם הבאה torbirdy.email.advanced.title=הגדרות מתקדמות עבור TorBirdy + +# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. diff --git a/hu/torbirdy.dtd b/hu/torbirdy.dtd index 7ba5e7a..e70055d 100644 --- a/hu/torbirdy.dtd +++ b/hu/torbirdy.dtd @@ -33,6 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key "i"> <!ENTITY torbirdy.prefs.startup_folder.label "A legutolsó mail mappa használata indításkor (alapértelmezett: kikapcoslva, csak a helyi mappákat válassza ki)"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label ""> +<!ENTITY torbirdy.prefs.timezone.key ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "A GPG '--throw-keyids' kikapcsolása [alapértelmezett: bekapcsolva]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "Fiók-specifikus"> diff --git a/hu/torbirdy.properties b/hu/torbirdy.properties index af218f8..5146bad 100644 --- a/hu/torbirdy.properties +++ b/hu/torbirdy.properties @@ -11,3 +11,5 @@ torbirdy.email.prompt=A TorBirdy kikapcoslta a Thunderbird automatikus konfigur torbirdy.email.advanced=Kérjük jegyezze meg, hogy a TorBirdy Speciális beállításainak átállítása NEM ajánlott.\n\nCsak akkor szabad folytatnia, ha tudja mit csinál. torbirdy.email.advanced.nextwarning=A figyelmeztetés mutatása legközelebb is. torbirdy.email.advanced.title=TorBirdy Speciális beállítások + +# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. diff --git a/it/torbirdy.dtd b/it/torbirdy.dtd index 4490083..124623f 100644 --- a/it/torbirdy.dtd +++ b/it/torbirdy.dtd @@ -33,6 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key "i"> <!ENTITY torbirdy.prefs.startup_folder.label "Seleziona l'ultima casella di posta all'avvio [default: disabilitato, verrà selezionato Local Folders]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label ""> +<!ENTITY torbirdy.prefs.timezone.key ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Disabilita GPG '--throw-keyids' [default: abilitato]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "Specifico Account"> diff --git a/it/torbirdy.properties b/it/torbirdy.properties index 6b0b1f4..b309b59 100644 --- a/it/torbirdy.properties +++ b/it/torbirdy.properties @@ -11,3 +11,5 @@ torbirdy.email.prompt=TorBirdy ha disabilitato la configurazione automatica di T torbirdy.email.advanced=Attenzione! Non è consigliato modificare le impostazioni di TorBirdy.\n\nContinua solo se sei sicuro di quel che stai facendo. torbirdy.email.advanced.nextwarning=Mostra questo avviso la prossima volta torbirdy.email.advanced.title=Impostazioni avanzate di Torbirdy + +# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. diff --git a/lv/torbirdy.dtd b/lv/torbirdy.dtd index 68695dd..f5b8583 100644 --- a/lv/torbirdy.dtd +++ b/lv/torbirdy.dtd @@ -33,6 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key "i"> <!ENTITY torbirdy.prefs.startup_folder.label "Sākot darbu, izvēlēties pēdējo apmeklēto pasta mapi [noklusēti: atspējots, izvēlēsies Vietējās mapes]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label ""> +<!ENTITY torbirdy.prefs.timezone.key ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Likt saņēmēju atslēgu identifikatorus iekš kriptētiem ziņojumiem [noklusēti: nelikt]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "Kontam-specifisks"> diff --git a/lv/torbirdy.properties b/lv/torbirdy.properties index 101d1f8..9866709 100644 --- a/lv/torbirdy.properties +++ b/lv/torbirdy.properties @@ -11,3 +11,5 @@ torbirdy.email.prompt=TorBirdy atspējojā Thunderbird auto-konfigurācijas vedn torbirdy.email.advanced=Lūdzu ņemt vērā, ka mainīt lietpratīgos uzstādījumus TorBirdy NAV ieteicams.⏎ ⏎ Jums vajadzētu turpināt tikai tad, ja jūs zināt, ko darāt. torbirdy.email.advanced.nextwarning=Rādīt šo brīdinājumu nākošreiz torbirdy.email.advanced.title=TorBirdy Lietpratīgie uzstādījumi + +# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. diff --git a/nl/torbirdy.dtd b/nl/torbirdy.dtd index ad5ff83..dfd2121 100644 --- a/nl/torbirdy.dtd +++ b/nl/torbirdy.dtd @@ -33,6 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key "i"> <!ENTITY torbirdy.prefs.startup_folder.label "Bij opstarten direct naar de laatst bekeken map gaan [standaard: uitgeschakeld, lokale map wordt geselecteerd]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label ""> +<!ENTITY torbirdy.prefs.timezone.key ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Uitschakelen GPG '--throw-keyids' [standaard: ingeschakeld]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "Account-specifiek"> diff --git a/nl/torbirdy.properties b/nl/torbirdy.properties index a731baf..a38e199 100644 --- a/nl/torbirdy.properties +++ b/nl/torbirdy.properties @@ -11,3 +11,5 @@ torbirdy.email.prompt=TorBirdy heeft Thunderbird's automatische configuratiehulp torbirdy.email.advanced=Hou er rekening mee dat het aanpassen van de geavanceerde instellingen van TorBirdy wordt AFGERADEN.\n\nGa hier alleen mee verder als u weet wat u doet. torbirdy.email.advanced.nextwarning=Toon deze waarschuwing ook in de toekomst torbirdy.email.advanced.title=TorBirdy geavanceerde instellingen + +# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. diff --git a/pa/torbirdy.dtd b/pa/torbirdy.dtd index 539ab21..851b72c 100644 --- a/pa/torbirdy.dtd +++ b/pa/torbirdy.dtd @@ -33,6 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key "i"> <!ENTITY torbirdy.prefs.startup_folder.label "ਸ਼ੁਰੂ ਹੋਣ ਤੇ ਆਖਰੀ ਈਮੇਲ ਫੋਲਡਰ ਚੋਣਵਾਂ ਕਰੋ"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label ""> +<!ENTITY torbirdy.prefs.timezone.key ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "GPG '--throw-keyids' ਰੱਦ ਕਰੋ"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "ਅਕਾਊਂਟ-ਵਿਸ਼ਿਸ਼ਟ"> diff --git a/pa/torbirdy.properties b/pa/torbirdy.properties index 1af3491..3181e4c 100644 --- a/pa/torbirdy.properties +++ b/pa/torbirdy.properties @@ -11,3 +11,5 @@ torbirdy.email.prompt=ਤੁਹਾਨੂੰ ਗੁਪਤ ਰਖਣ ਵਾਸਤ torbirdy.email.advanced=ਧਿਆਨ ਨਾਲ! ਟੌਰਬਰਡੀ ਦੀ ਤਕਨੀਕੀ ਸੈਟਿੰਗ ਨੂੰ ਛੇੜਨਾ ਨਹੀਂ ਚਾਹਿਦਾ | \n\n ਅਗੇ ਤਾਂ ਹੀ ਵਧੋ ਜੇ ਤੁਹਾਨੂੰ ਪਤਾ ਹੇ ਕਿ ਤੁਸੀਂ ਕੀ ਕਰ ਰਹੇ ਹੋ | torbirdy.email.advanced.nextwarning=ਇਹ ਚੇਤਾਵਨੀ ਫੇਰ ਵਿਖਾਓ torbirdy.email.advanced.title=ਟੌਰਬਰਡੀ ਤਕਨੀਕੀ ਸੈਟਿੰਗ + +# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. diff --git a/pl/torbirdy.dtd b/pl/torbirdy.dtd index 7e0d560..6c58ac5 100644 --- a/pl/torbirdy.dtd +++ b/pl/torbirdy.dtd @@ -33,6 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key "e"> <!ENTITY torbirdy.prefs.startup_folder.label "Przejdź do ostatniego folderu pocztowego przy uruchomieniu [domyślne: wyłączone, wybierze Foldery Lokalne]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label ""> +<!ENTITY torbirdy.prefs.timezone.key ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Wyłącz GPG '--throw-keyids' [domyślne: włączone]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "Specyficzne dla konta"> diff --git a/pl/torbirdy.properties b/pl/torbirdy.properties index 54c1c97..0077b36 100644 --- a/pl/torbirdy.properties +++ b/pl/torbirdy.properties @@ -11,3 +11,5 @@ torbirdy.email.prompt=TorBirdy wyłączył kreatora auto-konfiguracji Thunderbir torbirdy.email.advanced=Zmiana ustawień zaawansowanych TorBirdy NIE jest zalecana.\n\nKontynuuj tylko jeśli wiesz, co robisz. torbirdy.email.advanced.nextwarning=Pokaż to ostrzeżenie następnym razem torbirdy.email.advanced.title=Zaawansowane Ustawienia TorBirdy + +# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. diff --git a/ru/torbirdy.dtd b/ru/torbirdy.dtd index 37903f7..facba2d 100644 --- a/ru/torbirdy.dtd +++ b/ru/torbirdy.dtd @@ -33,6 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key ""> <!ENTITY torbirdy.prefs.startup_folder.label ""> <!ENTITY torbirdy.prefs.startup_folder.key ""> +<!ENTITY torbirdy.prefs.timezone.label ""> +<!ENTITY torbirdy.prefs.timezone.key ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key ""> <!ENTITY torbirdy.prefs.account_specific ""> diff --git a/ru/torbirdy.properties b/ru/torbirdy.properties index 5c07aa4..9b80a82 100644 --- a/ru/torbirdy.properties +++ b/ru/torbirdy.properties @@ -11,3 +11,5 @@ torbirdy.disabled=TorBirdy: Отключено! # torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing. torbirdy.email.advanced.nextwarning=Показывать это предупреждение в следующий раз torbirdy.email.advanced.title=TorBirdy расширенные настройки + +# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. diff --git a/sk/torbirdy.properties b/sk/torbirdy.properties index da1c690..928c6c2 100644 --- a/sk/torbirdy.properties +++ b/sk/torbirdy.properties @@ -11,3 +11,5 @@ torbirdy.disabled=TorBirdy: Zakázaný! # torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing. # torbirdy.email.advanced.nextwarning=Show this warning next time # torbirdy.email.advanced.title=TorBirdy Advanced Settings + +# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. diff --git a/sr/torbirdy.dtd b/sr/torbirdy.dtd index ef4ad87..6be4e46 100644 --- a/sr/torbirdy.dtd +++ b/sr/torbirdy.dtd @@ -33,6 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key "i"> <!ENTITY torbirdy.prefs.startup_folder.label "Селектуј последњу фасциклу којој је приступљено након покретања [стандардно: искључено, биће селектован локални фолдер]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label ""> +<!ENTITY torbirdy.prefs.timezone.key ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Искључи GPG '--throw-keyids' [стандардно: укључено]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "Специјално-за налог"> diff --git a/sr/torbirdy.properties b/sr/torbirdy.properties index 5069747..943058d 100644 --- a/sr/torbirdy.properties +++ b/sr/torbirdy.properties @@ -11,3 +11,5 @@ torbirdy.email.prompt=TorBirdy је искључио аутоматско под torbirdy.email.advanced=Упозорићемо вас да напредна подешавања Tor-a није препоручено мијењати ако сте просјечан корисник.\n\nНаставите само ако сте сигурни у то што радите. torbirdy.email.advanced.nextwarning=Покажи ово упозорење при следежем покретању torbirdy.email.advanced.title=TorBirdy Напредна подешавања + +# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. diff --git a/templates/torbirdy.dtd b/templates/torbirdy.dtd index 0bd8cca..3b1148f 100644 --- a/templates/torbirdy.dtd +++ b/templates/torbirdy.dtd @@ -33,6 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key "i"> <!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled, will select Local Folders]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]"> +<!ENTITY torbirdy.prefs.timezone.key "z"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Put the recipient key IDs into encrypted messages [default: do not put]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "Account-Specific"> diff --git a/templates/torbirdy.properties b/templates/torbirdy.properties index 39f7489..3c24326 100644 --- a/templates/torbirdy.properties +++ b/templates/torbirdy.properties @@ -11,3 +11,5 @@ torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wiz torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing. torbirdy.email.advanced.nextwarning=Show this warning next time torbirdy.email.advanced.title=TorBirdy Advanced Settings + +torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. diff --git a/zh_CN/torbirdy.dtd b/zh_CN/torbirdy.dtd index b8e4a08..13a8952 100644 --- a/zh_CN/torbirdy.dtd +++ b/zh_CN/torbirdy.dtd @@ -33,6 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key "i"> <!ENTITY torbirdy.prefs.startup_folder.label "启动时选择最后访问的邮件文件夹[默认：禁用，选择本地文件夹]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label ""> +<!ENTITY torbirdy.prefs.timezone.key ""> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "将收件人 key ID 放入加密邮件（默认：不放入）"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "指定帐户"> diff --git a/zh_CN/torbirdy.properties b/zh_CN/torbirdy.properties index 0e8b29a..10b1a57 100644 --- a/zh_CN/torbirdy.properties +++ b/zh_CN/torbirdy.properties @@ -11,3 +11,5 @@ torbirdy.email.prompt=TorBirdy 已禁用 Thunderbird's 自动配置向导以保 torbirdy.email.advanced=请注意，不推荐您更改高级设置！\n\n如果您知道在做什么就请继续。 torbirdy.email.advanced.nextwarning=下次显示此警告 torbirdy.email.advanced.title=TorBirdy 高级设置 + +# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again.

1 0