February 2013 - tor-commits - lists.torproject.org

r26067: {website} update vidalia bundles (website/trunk/include)
by Erinn Clark 27 Feb '13

27 Feb '13

Author: erinn Date: 2013-02-27 16:30:04 +0000 (Wed, 27 Feb 2013) New Revision: 26067 Modified: website/trunk/include/versions.wmi Log: update vidalia bundles Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2013-02-25 21:35:57 UTC (rev 26066) +++ website/trunk/include/versions.wmi 2013-02-27 16:30:04 UTC (rev 26067) @@ -2,26 +2,26 @@ <define-tag version-alpha whitespace=delete>0.2.4.10-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.4.9-alpha</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.4.10-alpha</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.4.9-alpha</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.4.10-alpha</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.4.9-alpha-<version-vidalia-stable></define-tag> -<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.4.9-alpha-<version-vidalia-stable></define-tag> -<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.4.9-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.4.10-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.4.10-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.4.10-alpha-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.4.9-alpha</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.4.10-alpha</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.4.9-alpha</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.4.10-alpha</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.4.9-alpha</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.4.10-alpha</define-tag> <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.9-alpha</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.10-alpha</define-tag> <define-tag version-torbrowserbundle whitespace=delete>2.3.25-4</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> @@ -67,36 +67,36 @@ <define-tag version-androidbundle-libevent whitespace=delete>libevent-1.4.12-stable</define-tag> <define-tag package-androidbundle-alpha whitespace=delete>dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk</define-tag> -<define-tag package-win32-stable whitespace=delete>../dist/win32/tor-<version-win32-stable>-win32-1.exe</define-tag> -<define-tag package-win32-alpha whitespace=delete>../dist/win32/tor-<version-win32-alpha>-win32.exe</define-tag> +<define-tag package-win32-stable whitespace=delete>../dist/win32/tor-<version-win32-stable>-win32-2.exe</define-tag> +<define-tag package-win32-alpha whitespace=delete>../dist/win32/tor-<version-win32-alpha>-win32-1.exe</define-tag> -<define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.21.exe</define-tag> +<define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.21-2.exe</define-tag> <define-tag package-win32-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-bundle-stable></define-tag> -<define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.21.exe</define-tag> +<define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.21-1.exe</define-tag> <define-tag package-win32-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> -<define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-stable>-0.2.21.exe</define-tag> +<define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-stable>-0.2.21-2.exe</define-tag> <define-tag package-win32-bridge-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-bridge-bundle-stable></define-tag> -<define-tag file-win32-bridge-bundle-alpha whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-alpha>-0.2.21.exe</define-tag> +<define-tag file-win32-bridge-bundle-alpha whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-alpha>-0.2.21-1.exe</define-tag> <define-tag package-win32-bridge-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-bridge-bundle-alpha></define-tag> -<define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-stable>-0.2.21.exe</define-tag> +<define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-stable>-0.2.21-2.exe</define-tag> <define-tag package-win32-relay-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-relay-bundle-stable></define-tag> -<define-tag file-win32-relay-bundle-alpha whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-alpha>-0.2.21.exe</define-tag> +<define-tag file-win32-relay-bundle-alpha whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-alpha>-0.2.21-1.exe</define-tag> <define-tag package-win32-relay-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-relay-bundle-alpha></define-tag> -<define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-stable>-0.2.21.exe</define-tag> +<define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-stable>-0.2.21-2.exe</define-tag> <define-tag package-win32-exit-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-exit-bundle-stable></define-tag> -<define-tag file-win32-exit-bundle-alpha whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-alpha>-0.2.21.exe</define-tag> +<define-tag file-win32-exit-bundle-alpha whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-alpha>-0.2.21-1.exe</define-tag> <define-tag package-win32-exit-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-exit-bundle-alpha></define-tag> -<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.21-i386.dmg</define-tag> +<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.21-i386-2.dmg</define-tag> <define-tag package-osx-x86-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-osx-x86-bundle-stable></define-tag> -<define-tag file-osx-x86-bundle-alpha whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-alpha>-0.2.21-i386.dmg</define-tag> +<define-tag file-osx-x86-bundle-alpha whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-alpha>-0.2.21-i386-1.dmg</define-tag> <define-tag package-osx-x86-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-osx-x86-bundle-alpha></define-tag> <define-tag package-osx-ppc-bundle-stable whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-stable>-0.2.21-ppc.dmg</define-tag> -<define-tag package-osx-ppc-bundle-alpha whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-alpha>-0.2.21-ppc.dmg</define-tag> +<define-tag package-osx-ppc-bundle-alpha whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-alpha>-0.2.21-ppc-1.dmg</define-tag> <define-tag package-osx-x86-stable whitespace=delete>../dist/osx-x86/Tor-<version-osx-stable>-i386-Bundle.dmg</define-tag> <define-tag package-osx-x86-alpha whitespace=delete>../dist/osx-x86/Tor-<version-osx-alpha>-i386-Bundle.dmg</define-tag>

1 0

[stem/master] Don't pass unsupplied optional args to wrapped file
by atagar＠torproject.org 27 Feb '13

27 Feb '13

commit ec3d0c01c9ba4aa30541ceb19e499fbe732453cb Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Feb 27 07:35:00 2013 -0800 Don't pass unsupplied optional args to wrapped file Karsten reports that the descriptor reader is failing for him with... ParsingFailure: readlines() takes exactly 1 argument (2 given) This is because to add python 3.x support we had to wrap the parse_file()'s file argument with a wrapper. In most cases this wrapper is a passthrough, but it converts the read() and readlines() output to unicode. I based the methods of the wrapper on a StringIO file object, but evidently other files (most likely the tarfile) deviate a bit. Addressing the readlines() instance and one other that might cause troubles. --- stem/descriptor/__init__.py | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 25b180b..a734950 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -331,19 +331,25 @@ class _UnicodeReader(object): def readline(self): return stem.util.str_tools.to_unicode(self.wrapped_file.readline()) - def readlines(self, sizehint = 0): + def readlines(self, sizehint = None): # being careful to do in-place conversion so we don't accidently double our # memory usage - results = self.wrapped_file.readlines(sizehint) + if sizehint is not None: + results = self.wrapped_file.readlines(sizehint) + else: + results = self.wrapped_file.readlines() for i in xrange(len(results)): results[i] = stem.util.str_tools.to_unicode(results[i]) return results - def seek(self, pos, mode = 0): - return self.wrapped_file.seek(pos, mode) + def seek(self, pos, mode = None): + if mode is not None: + return self.wrapped_file.seek(pos, mode) + else: + return self.wrapped_file.seek(pos) def tell(self): return self.wrapped_file.tell()

1 0

[stem/master] Renaming controller and socket keyword arguments
by atagar＠torproject.org 27 Feb '13

27 Feb '13

commit 3872befa5c62a91eb83d0d1376741b51a91acdb6 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Feb 23 16:07:19 2013 -0800 Renaming controller and socket keyword arguments Less is more. I'm not sure why I called these keyword arguments 'control_addr', 'control_port', and 'socket_path' but these will be highly used constructors. We should aim to have them be as user friendly a possible, and that means less verbose. --- stem/connection.py | 16 ++++++++-------- stem/control.py | 24 ++++++++++++------------ stem/socket.py | 14 +++++++------- test/integ/connection/authentication.py | 2 +- test/integ/connection/connect.py | 4 ++-- test/integ/control/controller.py | 2 +- test/integ/process.py | 4 ++-- test/integ/response/protocolinfo.py | 2 +- test/prompt.py | 2 +- test/runner.py | 2 +- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/stem/connection.py b/stem/connection.py index 688a8a1..952c17f 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -22,7 +22,7 @@ fine-grained control over the authentication process. For instance... import stem.socket try: - control_socket = stem.socket.ControlPort(control_port = 9051) + control_socket = stem.socket.ControlPort(port = 9051) except stem.SocketError, exc: print "Unable to connect to port 9051 (%s)" % exc sys.exit(1) @@ -125,15 +125,15 @@ CLIENT_HASH_CONSTANT = "Tor safe cookie authentication controller-to-server hash SERVER_HASH_CONSTANT = "Tor safe cookie authentication server-to-controller hash" -def connect_port(control_addr = "127.0.0.1", control_port = 9051, password = None, chroot_path = None, controller = stem.control.Controller): +def connect_port(address = "127.0.0.1", port = 9051, password = None, chroot_path = None, controller = stem.control.Controller): """ Convenience function for quickly getting a control connection. This is very handy for debugging or CLI setup, handling setup and prompting for a password if necessary (and none is provided). If any issues arise this prints a description of the problem and returns **None**. - :param str control_addr: ip address of the controller - :param int control_port: port number of the controller + :param str address: ip address of the controller + :param int port: port number of the controller :param str password: passphrase to authenticate to the socket :param str chroot_path: path prefix if in a chroot environment :param Class controller: :class:`~stem.control.BaseController` subclass to be @@ -143,7 +143,7 @@ def connect_port(control_addr = "127.0.0.1", control_port = 9051, password = Non """ try: - control_port = stem.socket.ControlPort(control_addr, control_port) + control_port = stem.socket.ControlPort(address, port) except stem.SocketError, exc: print exc return None @@ -151,12 +151,12 @@ def connect_port(control_addr = "127.0.0.1", control_port = 9051, password = Non return _connect(control_port, password, chroot_path, controller) -def connect_socket_file(socket_path = "/var/run/tor/control", password = None, chroot_path = None, controller = stem.control.Controller): +def connect_socket_file(path = "/var/run/tor/control", password = None, chroot_path = None, controller = stem.control.Controller): """ Convenience function for quickly getting a control connection. For more information see the :func:`~stem.connection.connect_port` function. - :param str socket_path: path where the control socket is located + :param str path: path where the control socket is located :param str password: passphrase to authenticate to the socket :param str chroot_path: path prefix if in a chroot environment :param Class controller: :class:`~stem.control.BaseController` subclass to be @@ -166,7 +166,7 @@ def connect_socket_file(socket_path = "/var/run/tor/control", password = None, c """ try: - control_socket = stem.socket.ControlSocketFile(socket_path) + control_socket = stem.socket.ControlSocketFile(path) except stem.SocketError, exc: print exc return None diff --git a/stem/control.py b/stem/control.py index 347dec0..6b9a7ca 100644 --- a/stem/control.py +++ b/stem/control.py @@ -618,38 +618,38 @@ class Controller(BaseController): BaseController and provides a more user friendly API for library users. """ - def from_port(control_addr = "127.0.0.1", control_port = 9051): + def from_port(address = "127.0.0.1", port = 9051): """ Constructs a :class:`~stem.socket.ControlPort` based Controller. - :param str control_addr: ip address of the controller - :param int control_port: port number of the controller + :param str address: ip address of the controller + :param int port: port number of the controller :returns: :class:`~stem.control.Controller` attached to the given port :raises: :class:`stem.SocketError` if we're unable to establish a connection """ - if not stem.util.connection.is_valid_ip_address(control_addr): - raise ValueError("Invalid IP address: %s" % control_addr) - elif not stem.util.connection.is_valid_port(control_port): - raise ValueError("Invalid port: %s" % control_port) + if not stem.util.connection.is_valid_ip_address(address): + raise ValueError("Invalid IP address: %s" % address) + elif not stem.util.connection.is_valid_port(port): + raise ValueError("Invalid port: %s" % port) - control_port = stem.socket.ControlPort(control_addr, control_port) + control_port = stem.socket.ControlPort(address, port) return Controller(control_port) - def from_socket_file(socket_path = "/var/run/tor/control"): + def from_socket_file(path = "/var/run/tor/control"): """ Constructs a :class:`~stem.socket.ControlSocketFile` based Controller. - :param str socket_path: path where the control socket is located + :param str path: path where the control socket is located :returns: :class:`~stem.control.Controller` attached to the given socket file :raises: :class:`stem.SocketError` if we're unable to establish a connection """ - control_socket = stem.socket.ControlSocketFile(socket_path) + control_socket = stem.socket.ControlSocketFile(path) return Controller(control_socket) from_port = staticmethod(from_port) @@ -1417,7 +1417,7 @@ class Controller(BaseController): def print_bw(event): print "sent: %i, received: %i" % (event.written, event.read) - with Controller.from_port(control_port = 9051) as controller: + with Controller.from_port(port = 9051) as controller: controller.authenticate() controller.add_event_listener(print_bw, EventType.BW) time.sleep(5) diff --git a/stem/socket.py b/stem/socket.py index 039a2cd..3b9498c 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -296,12 +296,12 @@ class ControlPort(ControlSocket): option. """ - def __init__(self, control_addr = "127.0.0.1", control_port = 9051, connect = True): + def __init__(self, address = "127.0.0.1", port = 9051, connect = True): """ ControlPort constructor. - :param str control_addr: ip address of the controller - :param int control_port: port number of the controller + :param str address: ip address of the controller + :param int port: port number of the controller :param bool connect: connects to the socket if True, leaves it unconnected otherwise :raises: :class:`stem.SocketError` if connect is **True** and we're @@ -309,8 +309,8 @@ class ControlPort(ControlSocket): """ super(ControlPort, self).__init__() - self._control_addr = control_addr - self._control_port = control_port + self._control_addr = address + self._control_port = port if connect: self.connect() @@ -351,7 +351,7 @@ class ControlSocketFile(ControlSocket): option. """ - def __init__(self, socket_path = "/var/run/tor/control", connect = True): + def __init__(self, path = "/var/run/tor/control", connect = True): """ ControlSocketFile constructor. @@ -363,7 +363,7 @@ class ControlSocketFile(ControlSocket): """ super(ControlSocketFile, self).__init__() - self._socket_path = socket_path + self._socket_path = path if connect: self.connect() diff --git a/test/integ/connection/authentication.py b/test/integ/connection/authentication.py index d8c0a8a..36b8af6 100644 --- a/test/integ/connection/authentication.py +++ b/test/integ/connection/authentication.py @@ -145,7 +145,7 @@ class TestAuthenticate(unittest.TestCase): tor_options = runner.get_options() try: - control_socket = stem.socket.ControlPort(control_port = test.runner.CONTROL_PORT) + control_socket = stem.socket.ControlPort(port = test.runner.CONTROL_PORT) except stem.SocketError: # assert that we didn't have a socket to connect to self.assertFalse(test.runner.Torrc.PORT in tor_options) diff --git a/test/integ/connection/connect.py b/test/integ/connection/connect.py index 9ffc215..994b777 100644 --- a/test/integ/connection/connect.py +++ b/test/integ/connection/connect.py @@ -30,7 +30,7 @@ class TestConnect(unittest.TestCase): runner = test.runner.get_runner() control_socket = stem.connection.connect_port( - control_port = test.runner.CONTROL_PORT, + port = test.runner.CONTROL_PORT, password = test.runner.CONTROL_PASSWORD, chroot_path = runner.get_chroot(), controller = None) @@ -52,7 +52,7 @@ class TestConnect(unittest.TestCase): runner = test.runner.get_runner() control_socket = stem.connection.connect_socket_file( - socket_path = test.runner.CONTROL_SOCKET_PATH, + path = test.runner.CONTROL_SOCKET_PATH, password = test.runner.CONTROL_PASSWORD, chroot_path = runner.get_chroot(), controller = None) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 3cabcd9..6d55b80 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -39,7 +39,7 @@ class TestController(unittest.TestCase): return if test.runner.Torrc.PORT in test.runner.get_runner().get_options(): - with stem.control.Controller.from_port(control_port = test.runner.CONTROL_PORT) as controller: + with stem.control.Controller.from_port(port = test.runner.CONTROL_PORT) as controller: self.assertTrue(isinstance(controller, stem.control.Controller)) else: self.assertRaises(stem.SocketError, stem.control.Controller.from_port, "127.0.0.1", test.runner.CONTROL_PORT) diff --git a/test/integ/process.py b/test/integ/process.py index a5af4c6..a65a24b 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -65,7 +65,7 @@ class TestProcess(unittest.TestCase): control_socket = None try: - control_socket = stem.socket.ControlPort(control_port = 2778) + control_socket = stem.socket.ControlPort(port = 2778) stem.connection.authenticate(control_socket, chroot_path = runner.get_chroot()) # exercises the socket @@ -173,7 +173,7 @@ class TestProcess(unittest.TestCase): # We're the controlling process. Just need to connect then disconnect. - controller = stem.control.Controller.from_port(control_port = 2778) + controller = stem.control.Controller.from_port(port = 2778) controller.authenticate() controller.close() diff --git a/test/integ/response/protocolinfo.py b/test/integ/response/protocolinfo.py index 6f3e79a..fa9e265 100644 --- a/test/integ/response/protocolinfo.py +++ b/test/integ/response/protocolinfo.py @@ -72,7 +72,7 @@ class TestProtocolInfo(unittest.TestCase): "lsof -a -p ") mocking.mock(stem.util.system.call, filter_system_call(cwd_by_port_lookup_prefixes)) - control_socket = stem.socket.ControlPort(control_port = test.runner.CONTROL_PORT) + control_socket = stem.socket.ControlPort(port = test.runner.CONTROL_PORT) else: cwd_by_socket_lookup_prefixes = ( stem.util.system.GET_PID_BY_FILE_LSOF % "", diff --git a/test/prompt.py b/test/prompt.py index c28c914..7b6fa61 100644 --- a/test/prompt.py +++ b/test/prompt.py @@ -97,6 +97,6 @@ def controller(): if not is_running(): start() - controller = stem.control.Controller.from_port(control_port = CONTROL_PORT) + controller = stem.control.Controller.from_port(port = CONTROL_PORT) controller.authenticate() return controller diff --git a/test/runner.py b/test/runner.py index e5faf1b..f94e4da 100644 --- a/test/runner.py +++ b/test/runner.py @@ -528,7 +528,7 @@ class Runner(object): """ if Torrc.PORT in self._custom_opts: - control_socket = stem.socket.ControlPort(control_port = CONTROL_PORT) + control_socket = stem.socket.ControlPort(port = CONTROL_PORT) elif Torrc.SOCKET in self._custom_opts: control_socket = stem.socket.ControlSocketFile(CONTROL_SOCKET_PATH) else:

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 27 Feb '13

27 Feb '13

commit 8ebd548e0ecc01c90d8011c79b7caad313323ec8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 27 15:16:13 2013 +0000 Update translations for liveusb-creator --- fa/fa.po | 84 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 42 insertions(+), 42 deletions(-) diff --git a/fa/fa.po b/fa/fa.po index 5cab227..6e03151 100644 --- a/fa/fa.po +++ b/fa/fa.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-02-14 16:07+0100\n" -"PO-Revision-Date: 2013-02-25 17:17+0000\n" +"PO-Revision-Date: 2013-02-27 15:15+0000\n" "Last-Translator: esmallberg <esmallberg(a)ndi.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -23,7 +23,7 @@ msgstr "" #: ../liveusb/dialog.py:150 ../liveusb/launcher_ui.py:149 #, python-format msgid "%(distribution)s LiveUSB Creator" -msgstr "" +msgstr "دریافت %(distribution)s" #: ../liveusb/gui.py:758 #, python-format @@ -33,7 +33,7 @@ msgstr "%(filename)s انتخاب شده" #: ../liveusb/creator.py:1018 #, python-format msgid "%s already bootable" -msgstr "" +msgstr "%s از پیش قابل راه‌اندازی" #: ../liveusb/launcher_ui.py:156 msgid "" @@ -90,11 +90,11 @@ msgstr "" #: ../liveusb/creator.py:1120 ../liveusb/creator.py:1383 #, python-format msgid "Calculating the SHA1 of %s" -msgstr "" +msgstr "محاسبه SHA1 از %s" #: ../liveusb/creator.py:1331 msgid "Cannot find" -msgstr "" +msgstr "یافت نمی‌شود" #: ../liveusb/creator.py:574 #, python-format @@ -106,14 +106,14 @@ msgid "" "Clone\n" "&&\n" "Install" -msgstr "" +msgstr "کپی\\n&&\\نصب" #: ../liveusb/launcher_ui.py:152 msgid "" "Clone\n" "&&\n" "Upgrade" -msgstr "" +msgstr "کپی\\n&&\\به روزرسانی" #: ../liveusb/dialog.py:165 msgid "Create Live USB" @@ -122,7 +122,7 @@ msgstr "" #: ../liveusb/creator.py:429 #, python-format msgid "Creating %sMB persistent overlay" -msgstr "" +msgstr "ایجاد %sMB پوشش پایدار" #: ../liveusb/gui.py:534 msgid "" @@ -138,7 +138,7 @@ msgstr "دستگاه خيلي كوچك است: بايد حداقل %s مگابا #: ../liveusb/dialog.py:157 #, python-format msgid "Download %(distribution)s" -msgstr "" +msgstr "دریافت %(distribution)s" #: ../liveusb/gui.py:732 msgid "Download complete!" @@ -155,11 +155,11 @@ msgstr "در حال بارگیری %s..." #: ../liveusb/creator.py:1116 msgid "Drive is a loopback, skipping MBR reset" -msgstr "" +msgstr "درایو از نوع Loopback است. راه‌اندازی دوباره \"رکورد راه‌اندازی اصلی\" MBR را رد کنید." #: ../liveusb/creator.py:1196 msgid "Error probing device" -msgstr "" +msgstr "دستگاه جستجوی خطا" #: ../liveusb/gui.py:226 msgid "" @@ -180,7 +180,7 @@ msgstr "استخراج تصویر لایو بر روی وسیله ی یو‌اس #: ../liveusb/creator.py:1061 #, python-format msgid "Formatting %(device)s as FAT32" -msgstr "" +msgstr "فرمت کردن %(device)s به صورت FAT32" #: ../liveusb/creator.py:139 msgid "ISO MD5 checksum passed" @@ -194,7 +194,7 @@ msgstr "عدم موفقیت در بازبینی کنترل ISO MD5" msgid "" "If you do not select an existing Live ISO, the selected release will be " "downloaded for you." -msgstr "" +msgstr "اگر یک Live ISO موجود را انتخاب نکنید، نسخه‌ی انتخاب‌شده برای‌تان دانلود خواهد شد" #: ../liveusb/gui.py:601 msgid "Installation complete!" @@ -211,7 +211,7 @@ msgstr "عمليات نصب به پايان رسيد. دكمه OK را براي #: ../liveusb/creator.py:913 ../liveusb/creator.py:1237 msgid "Installing bootloader..." -msgstr "" +msgstr "نصب بوت لودر..." #: ../liveusb/gui.py:281 msgid "LiveUSB creation failed!" @@ -221,7 +221,7 @@ msgstr "خطا در ساخت لایو یو‌اس بی!" msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." -msgstr "" +msgstr "پیش از اجرای این برنامه مطمئن شوید که فایل liveusb-creator را از حالت فشرده خارج کرده‌اید" #: ../liveusb/creator.py:1208 msgid "" @@ -231,7 +231,7 @@ msgstr "مطمئن شوید یو اس بی شما متصل شده و با فای #: ../liveusb/creator.py:847 #, python-format msgid "Mount %s exists after unmounting" -msgstr "" +msgstr "نصب %s بعد از حذف موجود است" #: ../liveusb/gui.py:663 ../liveusb/gui.py:680 msgid "Next" @@ -260,7 +260,7 @@ msgstr "ذخيره سازي مداوم" #: ../liveusb/dialog.py:161 msgid "Persistent Storage (0 MB)" -msgstr "" +msgstr "حافظه دائم (0 مگابایت)" #: ../liveusb/gui.py:661 ../liveusb/gui.py:678 msgid "Press 'Next' if you wish to continue." @@ -277,16 +277,16 @@ msgstr "" #: ../liveusb/creator.py:936 ../liveusb/creator.py:1255 #, python-format msgid "Removing %(file)s" -msgstr "" +msgstr "برداشتن %(file)s" #: ../liveusb/creator.py:498 msgid "Removing existing Live OS" -msgstr "" +msgstr "حذف Live OS موجود" #: ../liveusb/creator.py:1110 #, python-format msgid "Resetting Master Boot Record of %s" -msgstr "" +msgstr "بازنشانی رکورد راه‌اندازی اصلی از %s" #: ../liveusb/gui.py:743 msgid "Select Live ISO" @@ -301,7 +301,7 @@ msgstr "تنظیم فایل راه‌اندازی OLPC..." msgid "" "Some partitions of USB device %(device)s are mounted. They will be unmounted" " before starting the installation process." -msgstr "" +msgstr "تعدادی از پارتیشن‌های حافظه‌ی متصل به USB %(device)s ایجاد شده‌اند. آنها پیش از آغاز فرایند نصب، حذف خواهند شد." #: ../liveusb/creator.py:130 msgid "" @@ -310,7 +310,7 @@ msgstr "نوع منبع، عملیات بازبینی از کنترل ISO MD5 ر #: ../liveusb/creator.py:1144 msgid "Synchronizing data on disk..." -msgstr "" +msgstr "هماهنگ سازی داده‌ها بر روی دیسک..." #: ../liveusb/dialog.py:159 msgid "Target Device" @@ -326,7 +326,7 @@ msgstr "رکورد راه‌اندازی اصلی در دستگاه جانبی msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." -msgstr "" +msgstr "فایل انتخاب‌شده قابل خواندن نیست. لطفا اجازه دسترسی به آن را اصلاح کنید یا فایل دیگری را انتخاب کنید" #: ../liveusb/creator.py:366 #, python-format @@ -340,7 +340,7 @@ msgid "" "This button allows you to browse for an existing Live system ISO that you " "have previously downloaded. If you do not select one, a release will be " "downloaded for you automatically." -msgstr "" +msgstr "این دکمه به شما اجازه می‌دهد تا به دنبال یک Live system ISO موجود که پیش‌تر دانلود کرده‌اید بگردید. اگر یکی از گزینه‌ها را انتخاب نکنید، یک نسخه به صورت خودکار برای‌تان دانلود خواهد شد." #: ../liveusb/dialog.py:164 msgid "" @@ -354,7 +354,7 @@ msgstr "" msgid "" "This is the USB stick that you want to install your Live system on. This " "device must be formatted with the FAT filesystem." -msgstr "" +msgstr "این حافظه جانبی USB است که شما می‌خواهید Live system خود را روی آن نصب کنید. این حافظه می‌بایست تحت سیستم FAT فُرمَت شود." #: ../liveusb/dialog.py:163 msgid "" @@ -369,17 +369,17 @@ msgstr "" #: ../liveusb/creator.py:908 #, python-format msgid "Unable to change volume label: %(message)s" -msgstr "" +msgstr "قادر به تغییر برچسب حافظه نیست: %(message)s" #: ../liveusb/creator.py:507 ../liveusb/creator.py:518 #, python-format msgid "Unable to chmod %(file)s: %(message)s" -msgstr "" +msgstr "قادر به اجرای دستور سطح دسترسی %(file)s نیست: %(message)s" #: ../liveusb/creator.py:488 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" -msgstr "" +msgstr "قادر به کپی کردن %(infile)s به %(outfile)s نیست: %(message)s" #: ../liveusb/gui.py:414 msgid "Unable to find any USB drive" @@ -387,16 +387,16 @@ msgstr "قادر به یافتن هیچ درایو یو اس بی نیست" #: ../liveusb/creator.py:1198 msgid "Unable to find any removable device" -msgstr "" +msgstr "هیچ حافظه جانبی یافت نمی‌شود" #: ../liveusb/creator.py:1038 msgid "Unable to find partition" -msgstr "" +msgstr "قادر به پیدا کردن پارتیشن نیست." #: ../liveusb/creator.py:1278 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" -msgstr "" +msgstr "قادر به دسترسی به Win32_LogicalDisk نیست. فراخواندن win32com هیچ نتیجه‌ای را برگردان نمی‌کند" #: ../liveusb/gui.py:653 msgid "Unable to mount device" @@ -405,22 +405,22 @@ msgstr "فادر به بارگذاري دستگاه نيست." #: ../liveusb/creator.py:812 #, python-format msgid "Unable to mount device: %(message)s" -msgstr "" +msgstr "قادر به نصب حافظه نیست: %(message)s" #: ../liveusb/creator.py:523 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" -msgstr "" +msgstr "قادر به نصب حافظه نیست: %(message)s" #: ../liveusb/creator.py:511 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" -msgstr "" +msgstr "قادر به حذف فایل از LiveOS قبلی نیست: %(message)s" #: ../liveusb/creator.py:1113 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." -msgstr "" +msgstr "قادر به راه‌اندازی دوباره \"رکورد راه‌اندازی اصلی\" MBR نیست. شما احتمالا بسته \"syslinux\" را نصب نکرده‌اید." #: ../liveusb/gui.py:752 msgid "" @@ -435,12 +435,12 @@ msgstr "" #: ../liveusb/creator.py:411 msgid "Unknown ISO, skipping checksum verification" -msgstr "" +msgstr "ISO ناشناخته؛ پرش از روی بازبینی کنترل" #: ../liveusb/creator.py:808 #, python-format msgid "Unknown dbus exception while trying to mount device: %(message)s" -msgstr "" +msgstr "اسنثناء ناشاخته در dbus هنگام تلاش برای نصب دستگاه: %(message)s" #: ../liveusb/creator.py:787 ../liveusb/creator.py:887 msgid "Unknown filesystem. Your device may need to be reformatted." @@ -454,7 +454,7 @@ msgstr "انتشار ناشناس: %s" #: ../liveusb/creator.py:835 #, python-format msgid "Unmounting %(device)s" -msgstr "" +msgstr "پیاده‌سازی %(device)s" #: ../liveusb/creator.py:792 ../liveusb/creator.py:890 #, python-format @@ -466,7 +466,7 @@ msgstr "فایل سیستم های غیرقابل پشتیبانی: %s" msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." -msgstr "" +msgstr "سیستم پرونده ناشناخته: %s\\n در موردی که شما تلاش می‌کنید تا یک سیستم Tails را که به صورت دستی نصب شده، به روزرسانی کنید (منظور آن نوعی است که بدون این نصب‌کننده نصب شده باشد)، از این گزینه پشتیبانی نمی‌شود: برای شروع لازم است از نوع آن را نصب کنید، برای مثال با انتخاب عملیات جایگزین \\\"کپی Tails\\\"." #: ../liveusb/creator.py:1211 #, python-format @@ -477,7 +477,7 @@ msgstr "فایل سیستم پشتیبانی نشده: %s\nلطفا از وسی #: ../liveusb/launcher_ui.py:154 msgid "Upgrade from ISO" -msgstr "" +msgstr "به روزرسانی از ISO را انجام دهید" #: ../liveusb/dialog.py:152 msgid "Use existing Live system ISO" @@ -493,7 +493,7 @@ msgstr "تایید جمع کنترلی SHA1 تصویرِ LiveCD..." #: ../liveusb/creator.py:389 msgid "Verifying SHA256 checksum of LiveCD image..." -msgstr "" +msgstr "تایید جمع کنترلی SHA256 تصویرِ LiveCD..." #: ../liveusb/creator.py:884 ../liveusb/creator.py:1204 msgid "Verifying filesystem..." @@ -531,7 +531,7 @@ msgstr "نوشته شده بر روی دستگاه جانبی در %(speed)d م msgid "" "You are using an old version of syslinux-extlinux that does not support the " "ext4 filesystem" -msgstr "" +msgstr "شما از یک نسخه‌ی قدیمی syslinux-extlinux استفاده می‌کنید که از سیستم پرونده‌ی ext4 پشتیبانی نمی‌کند." #: ../liveusb/gui.py:737 msgid "You can try again to resume your download"

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 27 Feb '13

27 Feb '13

commit 30edce0d3cfbe8d978cd166bfc7d13a2c3434fc3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 27 14:46:24 2013 +0000 Update translations for tails-greeter_completed --- fa/fa.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fa/fa.po b/fa/fa.po index 1c2f62d..d8a9377 100644 --- a/fa/fa.po +++ b/fa/fa.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-06-01 15:10+0200\n" -"PO-Revision-Date: 2013-02-25 12:49+0000\n" +"PO-Revision-Date: 2013-02-27 14:19+0000\n" "Last-Translator: zendegi <hamahangi(a)posteo.eu>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgstr "رمز عبور مديريت" msgid "" "Enter an administration password in case you need to perform administration tasks.\n" "Otherwise it will be disabled for better security." -msgstr "لطفاً رمز عبور مديريتى واردكنيد، در صورتى كه لازم‌است كارهاى مديريت انجام بدهيد.\\n\nوگرنه، اين گزينه براى امنيت بيشتر غيرفعال مى‌شود." +msgstr "لطفاً رمز عبور مديريتى واردكنيد، در صورتى كه لازم‌است كارهاى مديريت انجام بدهيد.\nوگرنه، اين گزينه براى امنيت بيشتر غيرفعال مى‌شود." #: ../glade/optionswindow.glade.h:6 msgid "Password:"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 27 Feb '13

27 Feb '13

commit ecc3f313267d02bc76748800ced6f3cb05aeba5c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 27 14:46:22 2013 +0000 Update translations for tails-greeter --- fa/fa.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fa/fa.po b/fa/fa.po index 1c2f62d..d8a9377 100644 --- a/fa/fa.po +++ b/fa/fa.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-06-01 15:10+0200\n" -"PO-Revision-Date: 2013-02-25 12:49+0000\n" +"PO-Revision-Date: 2013-02-27 14:19+0000\n" "Last-Translator: zendegi <hamahangi(a)posteo.eu>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgstr "رمز عبور مديريت" msgid "" "Enter an administration password in case you need to perform administration tasks.\n" "Otherwise it will be disabled for better security." -msgstr "لطفاً رمز عبور مديريتى واردكنيد، در صورتى كه لازم‌است كارهاى مديريت انجام بدهيد.\\n\nوگرنه، اين گزينه براى امنيت بيشتر غيرفعال مى‌شود." +msgstr "لطفاً رمز عبور مديريتى واردكنيد، در صورتى كه لازم‌است كارهاى مديريت انجام بدهيد.\nوگرنه، اين گزينه براى امنيت بيشتر غيرفعال مى‌شود." #: ../glade/optionswindow.glade.h:6 msgid "Password:"

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 27 Feb '13

27 Feb '13

commit 6fc1d94181e9d49fe9c5634e62e63870be5c773c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 27 14:46:20 2013 +0000 Update translations for tails-persistence-setup_completed --- fa/fa.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fa/fa.po b/fa/fa.po index 3b66a69..a6f5efd 100644 --- a/fa/fa.po +++ b/fa/fa.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2013-02-25 12:41+0000\n" +"PO-Revision-Date: 2013-02-27 14:24+0000\n" "Last-Translator: zendegi <hamahangi(a)posteo.eu>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -186,7 +186,7 @@ msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" "You may now close this application." -msgstr "تغييرات فقط بعد از بازآغازى تيلز فعال خواهد شد.\\n\nحالا مى‌توانيد اين برنامه‌را ببنديد." +msgstr "تغييرات فقط بعد از بازآغازى تيلز فعال خواهد شد.\n\nحالا مى‌توانيد اين برنامه‌را ببنديد." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 msgid "Persistence wizard - Persistent volume creation"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 27 Feb '13

27 Feb '13

commit daf712e92a83bc68301c6dc74efb3dd23795a56a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 27 14:46:18 2013 +0000 Update translations for tails-persistence-setup --- fa/fa.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fa/fa.po b/fa/fa.po index 3b66a69..a6f5efd 100644 --- a/fa/fa.po +++ b/fa/fa.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2013-02-25 12:41+0000\n" +"PO-Revision-Date: 2013-02-27 14:24+0000\n" "Last-Translator: zendegi <hamahangi(a)posteo.eu>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -186,7 +186,7 @@ msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" "You may now close this application." -msgstr "تغييرات فقط بعد از بازآغازى تيلز فعال خواهد شد.\\n\nحالا مى‌توانيد اين برنامه‌را ببنديد." +msgstr "تغييرات فقط بعد از بازآغازى تيلز فعال خواهد شد.\n\nحالا مى‌توانيد اين برنامه‌را ببنديد." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 msgid "Persistence wizard - Persistent volume creation"

1 0

[ooni-probe/master] Order matters for little ol pip
by ioerror＠torproject.org 27 Feb '13

27 Feb '13

commit 6f16d8caaddb2192cb5a87f7e1db6698550ce894 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Feb 26 18:51:48 2013 -0800 Order matters for little ol pip --- requirements.txt | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3a3e9bd..0583467 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ PyYAML>=3.10 -Twisted==12.2.0 +Twisted>=12.2.0 argparse>=1.2.1 distribute>=0.6.24 docutils>=0.9.1 @@ -15,6 +15,11 @@ Pyrex # # This is a Tor Project mirror with valid SSL/TLS certs that is stable and fast # +# Originally fetched from LaunchPad: +# https://launchpad.net/parsley/trunk/1.1pre1/+download/Parsley-1.1pre1.tar.gz +# Mirrored on Tor's webserver: +https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/Parsley-1.1pre1.tar.gz +# # Originally fetched from the hg repo on secdev.org: # https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy # Mirrored on Tor's webserver: @@ -23,10 +28,6 @@ https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/scapy-02-25-20… # https://github.com/hellais/txsocksx/archive/master.zip # Mirrored on Tor's webserver: https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/hellais-txsock… -# Originally fetched from LaunchPad: -# https://launchpad.net/parsley/trunk/1.1pre1/+download/Parsley-1.1pre1.tar.gz -# Mirrored on Tor's webserver: -https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/Parsley-1.1pre1.tar.gz # This was 'dnspython>=1.10.0' above until it failed to download many times. # Originally fetched from dnspython but it timed out often: # http://www.dnspython.org/kits/1.10.0/dnspython-1.10.0.zip

1 0

[ooni-probe/master] Do not swallow errors in HTTP test template
by art＠torproject.org 26 Feb '13

26 Feb '13

commit 0bbd9a1e0c2f3f04120264fddabc3020692e4c01 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Feb 8 20:22:57 2013 +0100 Do not swallow errors in HTTP test template --- ooni/templates/httpt.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py index f7d5441..d9a1a33 100644 --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@ -305,7 +305,7 @@ class HTTPTest(NetTestCase): failure_string = handleAllFailures(failure) log.err("Error performing %s" % request) self.addToReport(request, failure_string=failure_string) - return + return failure d = agent.request(request['method'], request['url'], headers, body_producer)

1 0