June 2011 - tor-commits - lists.torproject.org

[flashproxy/master] Wrap some long log output lines.
by dcf＠torproject.org 11 Jun '11

11 Jun '11

commit 2162c85c17e5f4315eb3f7027db60846586b66c4 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 11 10:18:04 2011 -0700 Wrap some long log output lines. --- facilitator.py | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/facilitator.py b/facilitator.py index 0c1e4dd..09f8a32 100755 --- a/facilitator.py +++ b/facilitator.py @@ -200,7 +200,9 @@ class RegSet(object): class Handler(BaseHTTPServer.BaseHTTPRequestHandler): def do_GET(self): - log(u"proxy %s connects" % format_addr(self.client_address)) + proxy_addr_s = format_addr(self.client_address) + + log(u"proxy %s connects" % proxy_addr_s) path = urlparse.urlsplit(self.path)[2] @@ -211,35 +213,40 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): reg = REGS.fetch() if reg: log(u"proxy %s gets %s, relay %s (now %d)" % - (format_addr(self.client_address), unicode(reg), - options.relay_spec, len(REGS))) + (proxy_addr_s, unicode(reg), options.relay_spec, len(REGS))) self.send_client(reg) else: - log(u"proxy %s gets none" % format_addr(self.client_address)) + log(u"proxy %s gets none" % proxy_addr_s) self.send_client(None) def do_POST(self): + client_addr_s = format_addr(self.client_address) + data = cgi.FieldStorage(fp = self.rfile, headers = self.headers, environ = {"REQUEST_METHOD": "POST"}) client_spec = data.getfirst("client") if client_spec is None: self.send_error(400) - log(u"client %s missing \"client\" param" % format_addr(self.client_address)) + log(u"client %s missing \"client\" param" % client_addr_s) return try: reg = Reg.parse(client_spec, self.client_address[0]) except ValueError, e: self.send_error(400) - log(u"client %s syntax error in %s: %s" % (format_addr(self.client_address), repr(client_spec), repr(str(e)))) + log(u"client %s syntax error in %s: %s" + % (client_addr_s, repr(client_spec), repr(str(e)))) return - log(u"client %s regs %s -> %s" % (format_addr(self.client_address), repr(client_spec), unicode(reg))) + log(u"client %s regs %s -> %s" + % (client_addr_s, repr(client_spec), unicode(reg))) if REGS.add(reg): - log(u"client %s %s (now %d)" % (format_addr(self.client_address), unicode(reg), len(REGS))) + log(u"client %s %s (now %d)" + % (client_addr_s, unicode(reg), len(REGS))) else: - log(u"client %s %s (already present, now %d)" % (format_addr(self.client_address), unicode(reg), len(REGS))) + log(u"client %s %s (already present, now %d)" + % (client_addr_s, unicode(reg), len(REGS))) self.send_response(200) self.end_headers() @@ -265,7 +272,8 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): def log_message(self, format, *args): msg = format % args - log(u"message from HTTP handler for %s: %s" % (format_addr(self.client_address), repr(msg))) + log(u"message from HTTP handler for %s: %s" + % (format_addr(self.client_address), repr(msg))) def send_client(self, reg): if reg:

1 0

[flashproxy/master] Use repr on a user-controlled string in a log message.
by dcf＠torproject.org 11 Jun '11

11 Jun '11

commit 8a78d7d8885543ce894d9c2489596cfb0b35f6f1 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 11 10:09:18 2011 -0700 Use repr on a user-controlled string in a log message. --- facilitator.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/facilitator.py b/facilitator.py index 801d0ad..0c1e4dd 100755 --- a/facilitator.py +++ b/facilitator.py @@ -235,7 +235,7 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): log(u"client %s syntax error in %s: %s" % (format_addr(self.client_address), repr(client_spec), repr(str(e)))) return - log(u"client %s regs %s -> %s" % (format_addr(self.client_address), client_spec, unicode(reg))) + log(u"client %s regs %s -> %s" % (format_addr(self.client_address), repr(client_spec), unicode(reg))) if REGS.add(reg): log(u"client %s %s (now %d)" % (format_addr(self.client_address), unicode(reg), len(REGS))) else:

1 0

[flashproxy/master] rm reconnector.py, not used in our model now.
by dcf＠torproject.org 11 Jun '11

11 Jun '11

commit 6208413a9582736325602e1900b788aff09b922b Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 11 09:53:24 2011 -0700 rm reconnector.py, not used in our model now. --- reconnector.py | 179 -------------------------------------------------------- 1 files changed, 0 insertions(+), 179 deletions(-) diff --git a/reconnector.py b/reconnector.py deleted file mode 100755 index c22bde6..0000000 --- a/reconnector.py +++ /dev/null @@ -1,179 +0,0 @@ -#!/usr/bin/env python - -import getopt -import httplib -import re -import select -import socket -import sys -import urllib - -DEFAULT_RELAY_ADDRESS = "localhost" -DEFAULT_RELAY_PORT = 9001 -DEFAULT_LISTEN_ADDRESS = "0.0.0.0" -DEFAULT_LISTEN_PORT = 9002 - -""" FIXME: update when finished with writing program. """ -def usage(f = sys.stdout): - print >> f, """ -Usage: %(progname)s -Maintains connections to multiple proxies. For any group of proxies that -serve a unique client, only one proxy of that group is "activated" at -any one time and connects to the relay. When this proxy shuts down the -client selects another proxy to use and this program will note the newly -activated proxy and connect it to the relay. - - -h, --help show help. -""" % { - "progname": sys.argv[0], -} - -def format_addr(addr): - host, port = addr - if not host: - return u":%d" % port - # Numeric IPv6 address? - try: - addrs = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM, socket.IPPROTO_TCP, socket.AI_NUMERICHOST) - af = addrs[0][0] - except socket.gaierror, e: - af = 0 - if af == socket.AF_INET6: - return u"[%s]:%d" % (host, port) - else: - return u"%s:%d" % (host, port) - -def parse_addr_spec(spec, defhost = None, defport = None): - host = None - port = None - m = None - # IPv6 syntax. - if not m: - m = re.match(ur'^\[(.+)\]:(\d+)$', spec) - if m: - host, port = m.groups() - af = socket.AF_INET6 - if not m: - m = re.match(ur'^\[(.+)\]:?$', spec) - if m: - host, = m.groups() - af = socket.AF_INET6 - # IPv4 syntax. - if not m: - m = re.match(ur'^(.+):(\d+)$', spec) - if m: - host, port = m.groups() - af = socket.AF_INET - if not m: - m = re.match(ur'^:?(\d+)$', spec) - if m: - port, = m.groups() - af = 0 - if not m: - host = spec - af = 0 - host = host or defhost - port = port or defport - if not (host and port): - raise ValueError("Bad address specification \"%s\"" % spec) - return host, int(port) - -def listen_socket(addr): - """Return a nonblocking socket listenting on the given address.""" - addrinfo = socket.getaddrinfo(addr[0], addr[1], 0, socket.SOCK_STREAM, socket.IPPROTO_TCP)[0] - s = socket.socket(addrinfo[0], addrinfo[1], addrinfo[2]) - s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - s.bind(addr) - s.listen(10) - s.setblocking(0) - return s - - -if __name__ == "__main__": - """ Parameter defaults. """ - relay_addr = (DEFAULT_RELAY_ADDRESS, DEFAULT_RELAY_PORT) - listen_addr = (DEFAULT_LISTEN_ADDRESS, DEFAULT_LISTEN_PORT) - - """ Mutual dictionaries for linking connections. """ - relay_for = {} - proxy_for = {} - - """ Parse options. """ - opts, args = getopt.gnu_getopt(sys.argv[1:], "r:l:h", ["relay", -"listen", "help"]) - for o, a in opts: - if o == "-r" or o == "--relay": - relay_addr = parse_addr_spec(a, None, DEFAULT_RELAY_PORT) - elif o == "-l" or o == "--listen": - listen_addr = parse_addr_spec(a, None, DEFAULT_LISTEN_PORT) - elif o == "-h" or o == "--help": - usage() - sys.exit() - - """ Setup listening socket for proxies. """ - listen_s = listen_socket(listen_addr) - - print "Listening on " + str(listen_addr) + " for proxy connections." - - """ Setup relay address information. """ - relay_addrinfo = socket.getaddrinfo(relay_addr[0], relay_addr[1], 0, socket.SOCK_STREAM, socket.IPPROTO_TCP)[0] - - while True: - rset = [listen_s] + relay_for.keys() + proxy_for.keys() - rset, _, _ = select.select(rset, [], [], 0) - for fd in rset: - """ Connecton on listening socket. """ - if fd == listen_s: - proxy_s, addr = fd.accept() - print "Proxy connection from %s." % format_addr(addr) - - """ New connection to relay. """ - try: - relay_s = socket.socket(relay_addrinfo[0], relay_addrinfo[1], relay_addrinfo[2]) - except socket.error, msg: - print msg - relay_s = None - - try: - relay_s.connect(relay_addrinfo[4]) - except socket.error, msg: - print msg - relay_s.close() - relay_s = None - - if relay_s is None: - print "ERROR: Could not open socket to relay " + str(relay_addr) - sys.exit(1) - - """ Pair up the sockets. """ - relay_for[proxy_s] = relay_s - proxy_for[relay_s] = proxy_s - - """ Data from a proxy. Forward to relay. """ - elif fd in relay_for: - relay = relay_for[fd] - data = fd.recv(1024) - if not data: - print "EOF from proxy %s." % format_addr(fd.getpeername()) - fd.close() - relay.close() - del relay_for[fd] - del proxy_for[relay] - else: - print "Sending " + str(len(data)) + " bytes to relay from " + format_addr(fd.getpeername()) - relay.sendall(data) - - """ Data from a relay. Forward to proxy. """ - elif fd in proxy_for: - proxy = proxy_for[fd] - data = fd.recv(1024) - if not data: - print "EOF from relay %s." % format_addr(fd.getpeername()) - fd.close() - proxy.close() - del proxy_for[fd] - del relay_for[proxy] - else: - print "Sending " + str(len(data)) + " bytes from relay to " + format_addr(proxy.getpeername()) - proxy.sendall(data) -

1 0

[vidalia/master] Fix layout to adapt to any label length
by chiiph＠torproject.org 11 Jun '11

11 Jun '11

commit 6b5b962442e64bfe5edc9b139778c3ba8e14c637 Author: Tomas Touceda <chiiph(a)torproject.org> Date: Sat Jun 11 13:05:24 2011 -0300 Fix layout to adapt to any label length Fixes bug 2500. --- src/vidalia/bwgraph/BandwidthGraph.ui | 658 ++++++++++++++------------------- 1 files changed, 276 insertions(+), 382 deletions(-) diff --git a/src/vidalia/bwgraph/BandwidthGraph.ui b/src/vidalia/bwgraph/BandwidthGraph.ui index 173168c..fb7fc94 100644 --- a/src/vidalia/bwgraph/BandwidthGraph.ui +++ b/src/vidalia/bwgraph/BandwidthGraph.ui @@ -1,55 +1,45 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>BandwidthGraph</class> - <widget class="QMainWindow" name="BandwidthGraph" > - <property name="geometry" > + <widget class="QMainWindow" name="BandwidthGraph"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>283</width> - <height>138</height> + <width>553</width> + <height>381</height> </rect> </property> - <property name="contextMenuPolicy" > + <property name="contextMenuPolicy"> <enum>Qt::NoContextMenu</enum> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Tor Bandwidth Usage</string> </property> - <property name="windowIcon" > - <iconset resource="../res/vidalia_common.qrc" >:/images/32x32/utilities-system-monitor.png</iconset> + <property name="windowIcon"> + <iconset> + <normaloff>:/images/32x32/utilities-system-monitor.png</normaloff>:/images/32x32/utilities-system-monitor.png</iconset> </property> - <widget class="QWidget" name="centralwidget" > - <layout class="QGridLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item row="1" column="0" > - <layout class="QHBoxLayout" > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > - <number>6</number> - </property> + <widget class="QWidget" name="centralwidget"> + <layout class="QGridLayout"> + <item row="1" column="0"> + <layout class="QHBoxLayout"> <item> - <widget class="QPushButton" name="btnToggleSettings" > - <property name="text" > + <widget class="QPushButton" name="btnToggleSettings"> + <property name="text"> <string>Show Settings</string> </property> - <property name="checkable" > + <property name="checkable"> <bool>true</bool> </property> </widget> </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>21</width> <height>20</height> @@ -58,428 +48,332 @@ </spacer> </item> <item> - <widget class="QPushButton" name="btnReset" > - <property name="text" > + <widget class="QPushButton" name="btnReset"> + <property name="text"> <string>Reset</string> </property> </widget> </item> </layout> </item> - <item row="0" column="0" > - <widget class="GraphFrame" name="frmGraph" > - <property name="minimumSize" > + <item row="0" column="0"> + <widget class="GraphFrame" name="frmGraph"> + <property name="minimumSize"> <size> <width>120</width> <height>80</height> </size> </property> - <property name="font" > + <property name="font"> <pointsize>10</pointsize> </property> - <property name="contextMenuPolicy" > + <property name="contextMenuPolicy"> <enum>Qt::NoContextMenu</enum> </property> - <property name="frameShape" > + <property name="frameShape"> <enum>QFrame::Box</enum> </property> - <property name="frameShadow" > + <property name="frameShadow"> <enum>QFrame::Plain</enum> </property> </widget> </item> - <item row="2" column="0" > - <widget class="QFrame" name="frmSettings" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>0</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize" > - <size> - <width>355</width> - <height>85</height> - </size> + <item row="0" column="1"> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> </property> - <property name="maximumSize" > + <property name="sizeHint" stdset="0"> <size> - <width>355</width> - <height>82</height> + <width>0</width> + <height>100</height> </size> </property> - <property name="contextMenuPolicy" > - <enum>Qt::NoContextMenu</enum> - </property> - <property name="frameShape" > + </spacer> + </item> + <item row="2" column="0"> + <widget class="QFrame" name="frmSettings"> + <property name="frameShape"> <enum>QFrame::StyledPanel</enum> </property> - <property name="frameShadow" > + <property name="frameShadow"> <enum>QFrame::Raised</enum> </property> - <layout class="QHBoxLayout" > - <property name="margin" > - <number>9</number> + <layout class="QGridLayout" name="gridLayout_2"> + <property name="sizeConstraint"> + <enum>QLayout::SetDefaultConstraint</enum> + </property> + <property name="horizontalSpacing"> + <number>10</number> + </property> + <property name="verticalSpacing"> + <number>0</number> </property> - <property name="spacing" > - <number>6</number> + <property name="margin"> + <number>5</number> </property> - <item> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>3</number> + <item row="0" column="0"> + <widget class="QCheckBox" name="chkReceiveRate"> + <property name="contextMenuPolicy"> + <enum>Qt::NoContextMenu</enum> </property> - <property name="spacing" > - <number>6</number> + <property name="toolTip"> + <string/> </property> - <item> - <widget class="QCheckBox" name="chkReceiveRate" > - <property name="contextMenuPolicy" > - <enum>Qt::NoContextMenu</enum> - </property> - <property name="toolTip" > - <string/> - </property> - <property name="layoutDirection" > - <enum>Qt::RightToLeft</enum> - </property> - <property name="text" > - <string>Receive Rate</string> - </property> - <property name="checked" > - <bool>false</bool> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="chkSendRate" > - <property name="contextMenuPolicy" > - <enum>Qt::NoContextMenu</enum> - </property> - <property name="toolTip" > - <string/> - </property> - <property name="layoutDirection" > - <enum>Qt::RightToLeft</enum> - </property> - <property name="text" > - <string>Send Rate</string> - </property> - <property name="checked" > - <bool>false</bool> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="chkAlwaysOnTop" > - <property name="layoutDirection" > - <enum>Qt::RightToLeft</enum> - </property> - <property name="text" > - <string>Always on Top</string> - </property> - </widget> - </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>21</height> - </size> - </property> - </spacer> - </item> - </layout> + <property name="layoutDirection"> + <enum>Qt::RightToLeft</enum> + </property> + <property name="text"> + <string>Receive Rate</string> + </property> + <property name="checked"> + <bool>false</bool> + </property> + </widget> </item> - <item> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>0</number> + <item row="2" column="0"> + <widget class="QCheckBox" name="chkSendRate"> + <property name="contextMenuPolicy"> + <enum>Qt::NoContextMenu</enum> </property> - <property name="spacing" > - <number>1</number> + <property name="toolTip"> + <string/> </property> + <property name="layoutDirection"> + <enum>Qt::RightToLeft</enum> + </property> + <property name="text"> + <string>Send Rate</string> + </property> + <property name="checked"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QCheckBox" name="chkAlwaysOnTop"> + <property name="layoutDirection"> + <enum>Qt::RightToLeft</enum> + </property> + <property name="text"> + <string>Always on Top</string> + </property> + </widget> + </item> + <item row="0" column="1" colspan="3"> + <widget class="QLabel" name="lblGraphStyle"> + <property name="text"> + <string>Style</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + </item> + <item row="0" column="4"> + <widget class="QComboBox" name="cmbGraphStyle"> <item> - <layout class="QHBoxLayout" > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QLabel" name="lblGraphStyle" > - <property name="text" > - <string>Style</string> - </property> - </widget> - </item> - <item> - <widget class="QComboBox" name="cmbGraphStyle" > - <item> - <property name="text" > - <string/> - </property> - <property name="icon" > - <iconset resource="../res/vidalia_common.qrc" >:/images/16x16/graph-line.png</iconset> - </property> - </item> - <item> - <property name="text" > - <string/> - </property> - <property name="icon" > - <iconset resource="../res/vidalia_common.qrc" >:/images/16x16/graph-area.png</iconset> - </property> - </item> - </widget> - </item> - </layout> - </item> - <item> - <widget class="QFrame" name="frmOpacity" > - <property name="contextMenuPolicy" > - <enum>Qt::NoContextMenu</enum> - </property> - <property name="frameShape" > - <enum>QFrame::NoFrame</enum> - </property> - <property name="frameShadow" > - <enum>QFrame::Plain</enum> - </property> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > - <number>3</number> - </property> - <item> - <widget class="QSlider" name="sldrOpacity" > - <property name="contextMenuPolicy" > - <enum>Qt::NoContextMenu</enum> - </property> - <property name="toolTip" > - <string>Changes the transparency of the Bandwidth Graph</string> - </property> - <property name="minimum" > - <number>30</number> - </property> - <property name="maximum" > - <number>100</number> - </property> - <property name="value" > - <number>100</number> - </property> - <property name="sliderPosition" > - <number>100</number> - </property> - <property name="tracking" > - <bool>false</bool> - </property> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="invertedAppearance" > - <bool>false</bool> - </property> - <property name="tickPosition" > - <enum>QSlider::NoTicks</enum> - </property> - <property name="tickInterval" > - <number>10</number> - </property> - </widget> - </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <layout class="QHBoxLayout" > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > - <number>0</number> - </property> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" > - <size> - <width>21</width> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QLabel" name="lblPercentOpacity" > - <property name="minimumSize" > - <size> - <width>25</width> - <height>0</height> - </size> - </property> - <property name="font" > - - <pointsize>10</pointsize> - - </property> - <property name="contextMenuPolicy" > - <enum>Qt::NoContextMenu</enum> - </property> - <property name="layoutDirection" > - <enum>Qt::RightToLeft</enum> - </property> - <property name="text" > - <string>100</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="label" > - <property name="font" > - - <pointsize>10</pointsize> - - </property> - <property name="contextMenuPolicy" > - <enum>Qt::NoContextMenu</enum> - </property> - <property name="text" > - <string>% Opaque</string> - </property> - </widget> - </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" > - <size> - <width>21</width> - </size> - </property> - </spacer> - </item> - </layout> - </item> - </layout> - </widget> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset> + <normaloff>:/images/16x16/graph-line.png</normaloff>:/images/16x16/graph-line.png</iconset> + </property> </item> <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>21</width> - <height>20</height> - </size> - </property> - </spacer> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset> + <normaloff>:/images/16x16/graph-area.png</normaloff>:/images/16x16/graph-area.png</iconset> + </property> </item> - </layout> + </widget> + </item> + <item row="3" column="6"> + <widget class="QPushButton" name="btnCancelSettings"> + <property name="text"> + <string>Cancel</string> + </property> + </widget> </item> - <item> - <spacer> - <property name="orientation" > + <item row="2" column="6"> + <widget class="QPushButton" name="btnSaveSettings"> + <property name="text"> + <string>Save</string> + </property> + </widget> + </item> + <item row="2" column="5"> + <spacer name="horizontalSpacer"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> - <width>21</width> + <width>40</width> <height>20</height> </size> </property> </spacer> </item> - <item> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>0</number> + <item row="2" column="1" rowspan="2" colspan="4"> + <widget class="QFrame" name="frmOpacity"> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> </property> - <property name="spacing" > - <number>1</number> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> </property> - <item> - <widget class="QPushButton" name="btnSaveSettings" > - <property name="text" > - <string>Save</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="btnCancelSettings" > - <property name="text" > - <string>Cancel</string> - </property> - </widget> - </item> - </layout> + <property name="lineWidth"> + <number>0</number> + </property> + <layout class="QGridLayout" name="gridLayout3"> + <property name="margin"> + <number>0</number> + </property> + <property name="spacing"> + <number>-1</number> + </property> + <item row="0" column="0" colspan="4"> + <widget class="QSlider" name="sldrOpacity"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="contextMenuPolicy"> + <enum>Qt::NoContextMenu</enum> + </property> + <property name="toolTip"> + <string>Changes the transparency of the Bandwidth Graph</string> + </property> + <property name="minimum"> + <number>30</number> + </property> + <property name="maximum"> + <number>100</number> + </property> + <property name="value"> + <number>100</number> + </property> + <property name="sliderPosition"> + <number>100</number> + </property> + <property name="tracking"> + <bool>false</bool> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="invertedAppearance"> + <bool>false</bool> + </property> + <property name="tickPosition"> + <enum>QSlider::NoTicks</enum> + </property> + <property name="tickInterval"> + <number>10</number> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLabel" name="lblPercentOpacity"> + <property name="minimumSize"> + <size> + <width>25</width> + <height>0</height> + </size> + </property> + <property name="font"> + + <pointsize>10</pointsize> + + </property> + <property name="contextMenuPolicy"> + <enum>Qt::NoContextMenu</enum> + </property> + <property name="layoutDirection"> + <enum>Qt::RightToLeft</enum> + </property> + <property name="text"> + <string>100</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QLabel" name="label"> + <property name="font"> + + <pointsize>10</pointsize> + + </property> + <property name="contextMenuPolicy"> + <enum>Qt::NoContextMenu</enum> + </property> + <property name="text"> + <string>% Opaque</string> + </property> + </widget> + </item> + <item row="1" column="3"> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0"> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> </item> </layout> </widget> </item> </layout> </widget> - <widget class="QStatusBar" name="statusbar" /> + <widget class="QStatusBar" name="statusbar"/> </widget> <customwidgets> <customwidget> <class>GraphFrame</class> <extends>QFrame</extends> <header>bwgraph/GraphFrame.h</header> + <container>1</container> </customwidget> </customwidgets> - <resources> - <include location="../res/vidalia_common.qrc" /> - </resources> <tabstops> <tabstop>btnToggleSettings</tabstop> <tabstop>btnReset</tabstop> - <tabstop>chkReceiveRate</tabstop> - <tabstop>chkSendRate</tabstop> - <tabstop>chkAlwaysOnTop</tabstop> - <tabstop>cmbGraphStyle</tabstop> - <tabstop>sldrOpacity</tabstop> - <tabstop>btnSaveSettings</tabstop> - <tabstop>btnCancelSettings</tabstop> </tabstops> + <resources> + <include location="../res/vidalia_common.qrc"/> + </resources> <connections/> </ui>

1 0

[vidalia/master] Add more changes to the changelog
by chiiph＠torproject.org 11 Jun '11

11 Jun '11

commit fe821ad3fdf146b74a928a379a1d40b012adbda1 Author: Tomas Touceda <chiiph(a)torproject.org> Date: Sat Jun 11 14:10:56 2011 -0300 Add more changes to the changelog --- CHANGELOG | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 109e8df..2eb169f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -22,6 +22,8 @@ o Make the fact that bridges don't need a DirPort setting more clear by removing the content of the field when disabling it. Fixes bug 3119. o Improve command line parameter handling. Resolves bug 2965. + o Fix layout in BandwidthGraph to display correctly everything with every + language. Fixes bug 2500. 0.2.12 10-Apr-2011 o Vidalia's SVN repository has been migrated to Git. All branches but

1 0

[vidalia/master] Merge remote-tracking branch 'erinn/no-remote'
by chiiph＠torproject.org 11 Jun '11

11 Jun '11

commit a47326a1312268babfa121504fe85a4d6e85af62 Merge: d5ed906 8b5a3bd Author: Tomas Touceda <chiiph(a)torproject.org> Date: Sat Jun 11 03:18:34 2011 -0300 Merge remote-tracking branch 'erinn/no-remote' src/vidalia/MainWindow.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[vidalia/master] Vidalia: Improved Parameter Handling (#2965)
by chiiph＠torproject.org 11 Jun '11

11 Jun '11

commit d532d66ed34a837b0f3950f5a7a2bc889b08a0ce Author: Jason Klein <trac.torproject.org(a)my.jrklein.com> Date: Wed Apr 20 16:55:29 2011 -0500 Vidalia: Improved Parameter Handling (#2965) Vidalia ignores parameters and values that are separated by an equal sign. (ie: Vidalia --datadir=data --logfile=log) Attached patch updates parseArguments() to support keys and values separated by equal sign. Vidalia does not reject parameters that should include a value. (ie: Vidalia --datadir --logfile) Attached patch calls argNeedsValue() from validateArguments() to determine if value is required. Vidalia notifies user if required parameter value is missing. NOTE: validateArguments() was static, so could not call argNeedsValue(). No longer static. If function needs to be static, could pass an instance of Vidalia as a function parameter instead. --- src/vidalia/Vidalia.cpp | 16 ++++++++++++++++ src/vidalia/Vidalia.h | 2 +- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/src/vidalia/Vidalia.cpp b/src/vidalia/Vidalia.cpp index c763fac..53b41c9 100644 --- a/src/vidalia/Vidalia.cpp +++ b/src/vidalia/Vidalia.cpp @@ -252,6 +252,12 @@ Vidalia::parseArguments(QStringList args) if (arg.startsWith("-")) { arg = arg.mid((arg.startsWith("--") ? 2 : 1)); } + /* Argument names do not include equal sign. Assume value follows. */ + if (arg.indexOf("=") > -1) { + value = arg.right(arg.length() - (arg.indexOf("=")+1)); + arg = arg.left(arg.indexOf("=")); + } + else /* Check if it takes a value and there is one on the command-line */ if (i < args.size()-1 && argNeedsValue(arg)) { value = args.at(++i); @@ -265,6 +271,16 @@ Vidalia::parseArguments(QStringList args) bool Vidalia::validateArguments(QString &errmsg) { + /* Check for missing parameter values */ + QMapIterator<QString, QString> _i(_args); + QString tmp; + while(_i.hasNext()) { + _i.next(); + if(argNeedsValue(_i.key()) && (_i.value() == "")) { + errmsg = tr("Value required for parameter :") + _i.key(); + return false; + } + } /* Check for a language that Vidalia recognizes. */ if (_args.contains(ARG_LANGUAGE) && !LanguageSupport::isValidLanguageCode(_args.value(ARG_LANGUAGE))) { diff --git a/src/vidalia/Vidalia.h b/src/vidalia/Vidalia.h index 421ae68..b7d09f4 100644 --- a/src/vidalia/Vidalia.h +++ b/src/vidalia/Vidalia.h @@ -54,7 +54,7 @@ public: ~Vidalia(); /** Validates that all arguments were well-formed. */ - static bool validateArguments(QString &errmsg); + bool validateArguments(QString &errmsg); /** Displays usage information for command-line args. */ static void showUsageMessageBox(); /** Returns true if the user wants to see usage information. */

1 0

[vidalia/master] Edit changelog for 0.2.13 release
by chiiph＠torproject.org 11 Jun '11

11 Jun '11

commit 5a492134d67a116d843cf3f762dac1f36d87a878 Author: Tomas Touceda <chiiph(a)torproject.org> Date: Sat Jun 11 12:12:02 2011 -0300 Edit changelog for 0.2.13 release --- CHANGELOG | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 64c301f..109e8df 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,28 @@ +0.2.13 11-Jun-2011 + o Add a way to bootstrap Tor's torrc file (copy the torrc to a given + directory before Vidalia starts) so that packages such as + Bridge-by-default portable bundles for OSX don't violate the directory + structure of the operative system. Fixes bug 2821. + o Add the proper CA Certificates so that the "Find Bridges" button works + again. Fixes bug 2835. + o Update the useful links help page. Fixes bug 2809. + o Reintegrate Breakpad, and make it available in other platforms other + than Windows. Resolves bug 2105. + o Fix bandwidth assigned to relays on the Network Map. A lot of relays are + displaying an erroneous bandwidth and since they are ordered by that + value in the Network Map, it leads to confusion. Vidalia now specifies + the bandwidth as the minimum of the three possible values (burst, + average and observed). Fixes bug 2744. + o Fix layouts in the configuration panel to make them look seamlessly + across all platforms. + o Add -no-remote parameter to Firefox so it allows another instance of + non-TBB Firefox. Fixes bug 2254. + o Add the possibility of changing the torrc path while Tor hasn't + started. Fixes bug 3109. + o Make the fact that bridges don't need a DirPort setting more clear by + removing the content of the field when disabling it. Fixes bug 3119. + o Improve command line parameter handling. Resolves bug 2965. + 0.2.12 10-Apr-2011 o Vidalia's SVN repository has been migrated to Git. All branches but master have been archived for later review, since SVN trunk had changed

1 0

[vidalia/master] Merge remote-tracking branch 'runa/master'
by chiiph＠torproject.org 11 Jun '11

11 Jun '11

commit cefbb262a07316e9c41cc65a1f53945dede90421 Merge: d532d66 2033185 Author: Tomas Touceda <chiiph(a)torproject.org> Date: Sat Jun 11 11:50:39 2011 -0300 Merge remote-tracking branch 'runa/master' pkg/win32/po/af/vidalia_af.po | 4 +- pkg/win32/po/ak/vidalia_ak.po | 4 +- pkg/win32/po/am/vidalia_am.po | 4 +- pkg/win32/po/ar/vidalia_ar.po | 5 +- pkg/win32/po/arn/vidalia_arn.po | 4 +- pkg/win32/po/ast/vidalia_ast.po | 4 +- pkg/win32/po/az/vidalia_az.po | 6 +- pkg/win32/po/bg/vidalia_bg.po | 4 +- pkg/win32/po/bn_IN/vidalia_bn_IN.po | 4 +- pkg/win32/po/ca/vidalia_ca.po | 5 +- pkg/win32/po/cs/vidalia_cs.po | 5 +- pkg/win32/po/csb/vidalia_csb.po | 4 +- pkg/win32/po/cy/vidalia_cy.po | 49 ++- pkg/win32/po/de/vidalia_de.po | 5 +- pkg/win32/po/de_CH/vidalia_de_CH.po | 4 +- pkg/win32/po/dz/vidalia_dz.po | 4 +- pkg/win32/po/el/vidalia_el.po | 4 + pkg/win32/po/eo/vidalia_eo.po | 4 +- pkg/win32/po/es/vidalia_es.po | 5 +- pkg/win32/po/et/vidalia_et.po | 5 +- pkg/win32/po/eu/vidalia_eu.po | 4 +- pkg/win32/po/fil/vidalia_fil.po | 4 +- pkg/win32/po/fur/vidalia_fur.po | 4 +- pkg/win32/po/ga/vidalia_ga.po | 4 +- pkg/win32/po/gl/vidalia_gl.po | 4 +- pkg/win32/po/gu/vidalia_gu.po | 4 +- pkg/win32/po/gun/vidalia_gun.po | 4 +- pkg/win32/po/ha/vidalia_ha.po | 4 +- pkg/win32/po/he/vidalia_he.po | 5 +- pkg/win32/po/hi/vidalia_hi.po | 4 +- pkg/win32/po/hr/vidalia_hr.po | 4 +- pkg/win32/po/ht/vidalia_ht.po | 4 +- pkg/win32/po/hu/vidalia_hu.po | 4 +- pkg/win32/po/id/vidalia_id.po | 5 +- pkg/win32/po/is/vidalia_is.po | 4 +- pkg/win32/po/it/vidalia_it.po | 5 +- pkg/win32/po/kn/vidalia_kn.po | 4 +- pkg/win32/po/lb/vidalia_lb.po | 4 +- pkg/win32/po/ln/vidalia_ln.po | 4 +- pkg/win32/po/lo/vidalia_lo.po | 4 +- pkg/win32/po/lt/vidalia_lt.po | 4 +- pkg/win32/po/lv/vidalia_lv.po | 4 +- pkg/win32/po/mg/vidalia_mg.po | 4 +- pkg/win32/po/mi/vidalia_mi.po | 4 +- pkg/win32/po/mk/vidalia_mk.po | 4 +- pkg/win32/po/ml/vidalia_ml.po | 4 +- pkg/win32/po/mn/vidalia_mn.po | 4 +- pkg/win32/po/mr/vidalia_mr.po | 4 +- pkg/win32/po/ms/vidalia_ms.po | 4 +- pkg/win32/po/mt/vidalia_mt.po | 4 +- pkg/win32/po/my/vidalia_my.po | 5 +- pkg/win32/po/nah/vidalia_nah.po | 4 +- pkg/win32/po/nap/vidalia_nap.po | 4 +- pkg/win32/po/nb/vidalia_nb.po | 5 +- pkg/win32/po/ne/vidalia_ne.po | 4 +- pkg/win32/po/nl/vidalia_nl.po | 5 +- pkg/win32/po/nn/vidalia_nn.po | 4 +- pkg/win32/po/nso/vidalia_nso.po | 4 +- pkg/win32/po/oc/vidalia_oc.po | 4 +- pkg/win32/po/pa/vidalia_pa.po | 4 +- pkg/win32/po/pap/vidalia_pap.po | 4 +- pkg/win32/po/pl/vidalia_pl.po | 5 +- pkg/win32/po/pms/vidalia_pms.po | 4 +- pkg/win32/po/ps/vidalia_ps.po | 4 +- pkg/win32/po/pt/vidalia_pt.po | 5 +- pkg/win32/po/pt_BR/vidalia_pt_BR.po | 4 +- pkg/win32/po/ru/vidalia_ru.po | 5 + pkg/win32/po/sco/vidalia_sco.po | 4 +- pkg/win32/po/son/vidalia_son.po | 4 +- pkg/win32/po/su/vidalia_su.po | 4 +- pkg/win32/po/sw/vidalia_sw.po | 4 +- pkg/win32/po/ta/vidalia_ta.po | 4 +- pkg/win32/po/te/vidalia_te.po | 4 +- pkg/win32/po/tg/vidalia_tg.po | 4 +- pkg/win32/po/th/vidalia_th.po | 5 +- pkg/win32/po/ti/vidalia_ti.po | 4 +- pkg/win32/po/tk/vidalia_tk.po | 4 +- pkg/win32/po/tr/vidalia_tr.po | 5 +- pkg/win32/po/ur/vidalia_ur.po | 4 +- pkg/win32/po/ve/vidalia_ve.po | 4 +- pkg/win32/po/vi/vidalia_vi.po | 5 +- pkg/win32/po/zh_CN/vidalia_zh_CN.po | 5 +- pkg/win32/po/zh_HK/vidalia_zh_HK.po | 4 +- pkg/win32/po/zu/vidalia_zu.po | 4 +- src/vidalia/help/content/cs/bridges.html | 71 +++ src/vidalia/help/content/cs/config.html | 185 ++++++ src/vidalia/help/content/cs/index.html | 41 ++ src/vidalia/help/content/cs/links.html | 67 ++ src/vidalia/help/content/cs/log.html | 102 ++++ src/vidalia/help/content/cs/netview.html | 174 ++++++ src/vidalia/help/content/cs/running.html | 105 ++++ src/vidalia/help/content/cs/server.html | 238 ++++++++ src/vidalia/help/content/cs/services.html | 138 +++++ src/vidalia/help/content/cs/troubleshooting.html | 155 +++++ src/vidalia/help/content/eo/bridges.html | 71 +++ src/vidalia/help/content/eo/config.html | 185 ++++++ src/vidalia/help/content/eo/index.html | 41 ++ src/vidalia/help/content/eo/links.html | 67 ++ src/vidalia/help/content/eo/log.html | 102 ++++ src/vidalia/help/content/eo/netview.html | 174 ++++++ src/vidalia/help/content/eo/running.html | 105 ++++ src/vidalia/help/content/eo/server.html | 238 ++++++++ src/vidalia/help/content/eo/services.html | 138 +++++ src/vidalia/help/content/eo/troubleshooting.html | 155 +++++ src/vidalia/help/content/eu/bridges.html | 71 +++ src/vidalia/help/content/eu/config.html | 185 ++++++ src/vidalia/help/content/eu/index.html | 41 ++ src/vidalia/help/content/eu/links.html | 67 ++ src/vidalia/help/content/eu/log.html | 102 ++++ src/vidalia/help/content/eu/netview.html | 174 ++++++ src/vidalia/help/content/eu/running.html | 105 ++++ src/vidalia/help/content/eu/server.html | 238 ++++++++ src/vidalia/help/content/eu/services.html | 138 +++++ src/vidalia/help/content/eu/troubleshooting.html | 155 +++++ src/vidalia/help/content/fo/bridges.html | 71 +++ src/vidalia/help/content/fo/log.html | 102 ++++ src/vidalia/help/content/fo/netview.html | 174 ++++++ src/vidalia/help/content/fo/running.html | 105 ++++ src/vidalia/help/content/fo/services.html | 138 +++++ src/vidalia/help/content/fo/troubleshooting.html | 155 +++++ src/vidalia/help/content/he/bridges.html | 71 +++ src/vidalia/help/content/he/config.html | 185 ++++++ src/vidalia/help/content/he/index.html | 41 ++ src/vidalia/help/content/he/links.html | 67 ++ src/vidalia/help/content/he/log.html | 102 ++++ src/vidalia/help/content/he/netview.html | 174 ++++++ src/vidalia/help/content/he/running.html | 105 ++++ src/vidalia/help/content/he/server.html | 238 ++++++++ src/vidalia/help/content/he/services.html | 138 +++++ src/vidalia/help/content/he/troubleshooting.html | 155 +++++ src/vidalia/help/content/ka/bridges.html | 71 +++ src/vidalia/help/content/ka/config.html | 185 ++++++ src/vidalia/help/content/ka/index.html | 41 ++ src/vidalia/help/content/ka/links.html | 67 ++ src/vidalia/help/content/ka/log.html | 102 ++++ src/vidalia/help/content/ka/netview.html | 174 ++++++ src/vidalia/help/content/ka/running.html | 105 ++++ src/vidalia/help/content/ka/server.html | 238 ++++++++ src/vidalia/help/content/ka/services.html | 138 +++++ src/vidalia/help/content/ka/troubleshooting.html | 155 +++++ src/vidalia/help/content/nap/bridges.html | 71 +++ src/vidalia/help/content/nap/config.html | 185 ++++++ src/vidalia/help/content/nap/index.html | 41 ++ src/vidalia/help/content/nap/links.html | 67 ++ src/vidalia/help/content/nap/log.html | 102 ++++ src/vidalia/help/content/nap/netview.html | 174 ++++++ src/vidalia/help/content/nap/running.html | 105 ++++ src/vidalia/help/content/nap/server.html | 238 ++++++++ src/vidalia/help/content/nap/services.html | 138 +++++ src/vidalia/help/content/nap/troubleshooting.html | 155 +++++ src/vidalia/help/content/po/af/netview.po | 4 +- src/vidalia/help/content/po/ak/netview.po | 4 +- src/vidalia/help/content/po/am/netview.po | 4 +- src/vidalia/help/content/po/ar/netview.po | 5 +- src/vidalia/help/content/po/arn/netview.po | 4 +- src/vidalia/help/content/po/ast/netview.po | 4 +- src/vidalia/help/content/po/az/netview.po | 4 +- src/vidalia/help/content/po/be/netview.po | 4 +- src/vidalia/help/content/po/bg/netview.po | 4 +- src/vidalia/help/content/po/bn/netview.po | 4 +- src/vidalia/help/content/po/bn_IN/netview.po | 4 +- src/vidalia/help/content/po/ca/netview.po | 4 +- src/vidalia/help/content/po/cs/netview.po | 4 +- src/vidalia/help/content/po/csb/netview.po | 4 +- src/vidalia/help/content/po/cy/netview.po | 15 +- src/vidalia/help/content/po/dz/netview.po | 4 +- src/vidalia/help/content/po/el/netview.po | 4 +- src/vidalia/help/content/po/eo/netview.po | 4 +- src/vidalia/help/content/po/es/netview.po | 4 +- src/vidalia/help/content/po/et/netview.po | 4 +- src/vidalia/help/content/po/eu/netview.po | 4 +- src/vidalia/help/content/po/fil/netview.po | 4 +- src/vidalia/help/content/po/fr/netview.po | 5 +- src/vidalia/help/content/po/fur/netview.po | 4 +- src/vidalia/help/content/po/ga/netview.po | 4 +- src/vidalia/help/content/po/gl/netview.po | 4 +- src/vidalia/help/content/po/gu/netview.po | 4 +- src/vidalia/help/content/po/gun/netview.po | 4 +- src/vidalia/help/content/po/ha/netview.po | 4 +- src/vidalia/help/content/po/he/netview.po | 4 +- src/vidalia/help/content/po/hi/netview.po | 4 +- src/vidalia/help/content/po/hr/netview.po | 4 +- src/vidalia/help/content/po/ht/netview.po | 4 +- src/vidalia/help/content/po/hu/netview.po | 4 +- src/vidalia/help/content/po/id/netview.po | 4 +- src/vidalia/help/content/po/is/netview.po | 4 +- src/vidalia/help/content/po/it/netview.po | 4 +- src/vidalia/help/content/po/kn/netview.po | 4 +- src/vidalia/help/content/po/kw/netview.po | 4 +- src/vidalia/help/content/po/lb/netview.po | 4 +- src/vidalia/help/content/po/ln/netview.po | 4 +- src/vidalia/help/content/po/lo/netview.po | 4 +- src/vidalia/help/content/po/lt/netview.po | 4 +- src/vidalia/help/content/po/lv/netview.po | 4 +- src/vidalia/help/content/po/mg/netview.po | 4 +- src/vidalia/help/content/po/mi/netview.po | 4 +- src/vidalia/help/content/po/mk/netview.po | 4 +- src/vidalia/help/content/po/ml/netview.po | 4 +- src/vidalia/help/content/po/mn/netview.po | 4 +- src/vidalia/help/content/po/mr/netview.po | 4 +- src/vidalia/help/content/po/ms/netview.po | 4 +- src/vidalia/help/content/po/mt/netview.po | 4 +- src/vidalia/help/content/po/my/netview.po | 5 +- src/vidalia/help/content/po/nap/netview.po | 4 +- src/vidalia/help/content/po/nb/netview.po | 4 +- src/vidalia/help/content/po/ne/netview.po | 4 +- src/vidalia/help/content/po/nl/netview.po | 4 +- src/vidalia/help/content/po/nn/netview.po | 4 +- src/vidalia/help/content/po/nso/netview.po | 4 +- src/vidalia/help/content/po/oc/netview.po | 4 +- src/vidalia/help/content/po/pa/netview.po | 4 +- src/vidalia/help/content/po/pap/netview.po | 4 +- src/vidalia/help/content/po/pl/netview.po | 4 +- src/vidalia/help/content/po/pms/netview.po | 4 +- src/vidalia/help/content/po/ps/netview.po | 4 +- src/vidalia/help/content/po/pt/netview.po | 4 +- src/vidalia/help/content/po/pt_BR/netview.po | 4 +- src/vidalia/help/content/po/ro/netview.po | 4 +- src/vidalia/help/content/po/ru/netview.po | 5 +- src/vidalia/help/content/po/sco/netview.po | 4 +- src/vidalia/help/content/po/son/netview.po | 4 +- src/vidalia/help/content/po/su/netview.po | 4 +- src/vidalia/help/content/po/sw/netview.po | 4 +- src/vidalia/help/content/po/ta/netview.po | 4 +- src/vidalia/help/content/po/te/netview.po | 4 +- src/vidalia/help/content/po/tg/netview.po | 4 +- src/vidalia/help/content/po/th/netview.po | 4 +- src/vidalia/help/content/po/ti/netview.po | 4 +- src/vidalia/help/content/po/tk/netview.po | 4 +- src/vidalia/help/content/po/tr/netview.po | 4 +- src/vidalia/help/content/po/uk/netview.po | 4 +- src/vidalia/help/content/po/ur/netview.po | 4 +- src/vidalia/help/content/po/ve/netview.po | 4 +- src/vidalia/help/content/po/vi/netview.po | 4 +- src/vidalia/help/content/po/wa/netview.po | 4 +- src/vidalia/help/content/po/zh_CN/netview.po | 4 +- src/vidalia/help/content/po/zh_HK/netview.po | 4 +- src/vidalia/help/content/po/zh_TW/netview.po | 4 +- src/vidalia/help/content/po/zu/netview.po | 4 +- src/vidalia/i18n/po/af/vidalia_af.po | 4 +- src/vidalia/i18n/po/ak/vidalia_ak.po | 4 +- src/vidalia/i18n/po/am/vidalia_am.po | 4 +- src/vidalia/i18n/po/ar/vidalia_ar.po | 5 + src/vidalia/i18n/po/arn/vidalia_arn.po | 4 +- src/vidalia/i18n/po/ast/vidalia_ast.po | 4 +- src/vidalia/i18n/po/az/vidalia_az.po | 4 +- src/vidalia/i18n/po/bg/vidalia_bg.po | 3 + src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po | 4 +- src/vidalia/i18n/po/ca/vidalia_ca.po | 4 +- src/vidalia/i18n/po/cs/vidalia_cs.po | 3 + src/vidalia/i18n/po/csb/vidalia_csb.po | 4 +- src/vidalia/i18n/po/cy/vidalia_cy.po | 445 +++++++------- src/vidalia/i18n/po/de/vidalia_de.po | 6 + src/vidalia/i18n/po/de_CH/vidalia_de_CH.po | 4 +- src/vidalia/i18n/po/dz/vidalia_dz.po | 4 +- src/vidalia/i18n/po/el/vidalia_el.po | 4 + src/vidalia/i18n/po/eo/vidalia_eo.po | 3 + src/vidalia/i18n/po/es/vidalia_es.po | 4 + src/vidalia/i18n/po/et/vidalia_et.po | 4 +- src/vidalia/i18n/po/eu/vidalia_eu.po | 4 +- src/vidalia/i18n/po/fil/vidalia_fil.po | 4 +- src/vidalia/i18n/po/fur/vidalia_fur.po | 4 +- src/vidalia/i18n/po/ga/vidalia_ga.po | 4 +- src/vidalia/i18n/po/gl/vidalia_gl.po | 4 +- src/vidalia/i18n/po/gu/vidalia_gu.po | 3 + src/vidalia/i18n/po/gun/vidalia_gun.po | 4 +- src/vidalia/i18n/po/ha/vidalia_ha.po | 4 +- src/vidalia/i18n/po/he/vidalia_he.po | 3 + src/vidalia/i18n/po/hi/vidalia_hi.po | 3 + src/vidalia/i18n/po/hr/vidalia_hr.po | 4 +- src/vidalia/i18n/po/ht/vidalia_ht.po | 4 +- src/vidalia/i18n/po/hu/vidalia_hu.po | 3 + src/vidalia/i18n/po/id/vidalia_id.po | 3 + src/vidalia/i18n/po/is/vidalia_is.po | 3 + src/vidalia/i18n/po/it/vidalia_it.po | 3 + src/vidalia/i18n/po/kn/vidalia_kn.po | 4 +- src/vidalia/i18n/po/lb/vidalia_lb.po | 4 +- src/vidalia/i18n/po/ln/vidalia_ln.po | 4 +- src/vidalia/i18n/po/lo/vidalia_lo.po | 4 +- src/vidalia/i18n/po/lt/vidalia_lt.po | 4 +- src/vidalia/i18n/po/lv/vidalia_lv.po | 4 +- src/vidalia/i18n/po/mg/vidalia_mg.po | 4 +- src/vidalia/i18n/po/mi/vidalia_mi.po | 4 +- src/vidalia/i18n/po/mk/vidalia_mk.po | 4 +- src/vidalia/i18n/po/ml/vidalia_ml.po | 4 +- src/vidalia/i18n/po/mn/vidalia_mn.po | 4 +- src/vidalia/i18n/po/mr/vidalia_mr.po | 4 +- src/vidalia/i18n/po/ms/vidalia_ms.po | 4 +- src/vidalia/i18n/po/mt/vidalia_mt.po | 4 +- src/vidalia/i18n/po/my/vidalia_my.po | 3 + src/vidalia/i18n/po/nah/vidalia_nah.po | 4 +- src/vidalia/i18n/po/nap/vidalia_nap.po | 4 +- src/vidalia/i18n/po/nb/vidalia_nb.po | 3 + src/vidalia/i18n/po/ne/vidalia_ne.po | 4 +- src/vidalia/i18n/po/nl/vidalia_nl.po | 3 + src/vidalia/i18n/po/nn/vidalia_nn.po | 4 +- src/vidalia/i18n/po/nso/vidalia_nso.po | 4 +- src/vidalia/i18n/po/oc/vidalia_oc.po | 4 +- src/vidalia/i18n/po/pa/vidalia_pa.po | 4 +- src/vidalia/i18n/po/pap/vidalia_pap.po | 4 +- src/vidalia/i18n/po/pl/vidalia_pl.po | 3 + src/vidalia/i18n/po/pms/vidalia_pms.po | 4 +- src/vidalia/i18n/po/ps/vidalia_ps.po | 4 +- src/vidalia/i18n/po/pt/vidalia_pt.po | 672 ++++++++++++--------- src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po | 3 + src/vidalia/i18n/po/ru/vidalia_ru.po | 6 +- src/vidalia/i18n/po/sco/vidalia_sco.po | 4 +- src/vidalia/i18n/po/son/vidalia_son.po | 4 +- src/vidalia/i18n/po/su/vidalia_su.po | 4 +- src/vidalia/i18n/po/sw/vidalia_sw.po | 4 +- src/vidalia/i18n/po/ta/vidalia_ta.po | 4 +- src/vidalia/i18n/po/te/vidalia_te.po | 4 +- src/vidalia/i18n/po/tg/vidalia_tg.po | 4 +- src/vidalia/i18n/po/th/vidalia_th.po | 3 + src/vidalia/i18n/po/ti/vidalia_ti.po | 4 +- src/vidalia/i18n/po/tk/vidalia_tk.po | 4 +- src/vidalia/i18n/po/tr/vidalia_tr.po | 3 + src/vidalia/i18n/po/ur/vidalia_ur.po | 4 +- src/vidalia/i18n/po/ve/vidalia_ve.po | 4 +- src/vidalia/i18n/po/vi/vidalia_vi.po | 3 + src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po | 3 + src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po | 4 +- src/vidalia/i18n/po/zu/vidalia_zu.po | 4 +- 323 files changed, 9851 insertions(+), 754 deletions(-)

1 0

[vidalia/master] Merge branch 'bug3119_dirport'
by chiiph＠torproject.org 11 Jun '11

11 Jun '11

commit e7396c5bc6acb5d100f20b6355dcc4488ff79368 Merge: 8528f79 81f6d57 Author: Tomas Touceda <chiiph(a)torproject.org> Date: Sat Jun 11 03:24:26 2011 -0300 Merge branch 'bug3119_dirport' src/vidalia/config/ServerPage.cpp | 20 +++++++++++++++++++- src/vidalia/config/ServerPage.h | 6 ++++++ 2 files changed, 25 insertions(+), 1 deletions(-)

1 0