- tor-commits - lists.torproject.org

r25173: {website} Include links to the user manual (website/trunk/docs/en)
by Runa Sandvik 18 Oct '11

18 Oct '11

Author: runa Date: 2011-10-18 09:07:12 +0000 (Tue, 18 Oct 2011) New Revision: 25173 Modified: website/trunk/docs/en/short-user-manual.wml Log: Include links to the user manual Modified: website/trunk/docs/en/short-user-manual.wml =================================================================== --- website/trunk/docs/en/short-user-manual.wml 2011-10-18 01:18:07 UTC (rev 25172) +++ website/trunk/docs/en/short-user-manual.wml 2011-10-18 09:07:12 UTC (rev 25173) @@ -21,6 +21,9 @@ <p>The user manual is available in the following languages:</p> <ul> + <li><a href="https://torproject.org/dist/manual/short-user-manual_en.xhtml">English</a></li> + <li><a href="https://torproject.org/dist/manual/short-user-manual_hu.xhtml">Hungarian</a></li> + <li><a href="https://torproject.org/dist/manual/short-user-manual_nl.xhtml">Dutch</a></li> </ul> </div>

1 0

r25172: {website} remove torbutton as a standalone project, update torbutton p (in website/trunk: en projects/en)
by Andrew Lewman 18 Oct '11

18 Oct '11

Author: phobos Date: 2011-10-18 01:18:07 +0000 (Tue, 18 Oct 2011) New Revision: 25172 Modified: website/trunk/en/index.wml website/trunk/projects/en/projects.wml Log: remove torbutton as a standalone project, update torbutton project description to point at torbrowser. try to implement ticket 4177. Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2011-10-17 18:56:40 UTC (rev 25171) +++ website/trunk/en/index.wml 2011-10-18 01:18:07 UTC (rev 25172) @@ -105,11 +105,12 @@ <tr> <td> <div class="project"> - <a href="<page torbutton/index>"><img - src="$(IMGROOT)/icon-TorButton.jpg" alt="Torbutton Icon"></a> - <h3><a href="<page torbutton/index>">Torbutton</a></h3> - <p>Torbutton is a 1-click way for Firefox users to enable - or disable Tor in Firefox.</p> + <a href="<page projects/torbrowser>"><img + src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon"></a> + <h3><a href="<page projects/torbrowser>">Tor + Browser</a></h3> + <p>Tor Browser contains everything you need to safely + browse the Internet.</p> </div> </td> <td> @@ -130,16 +131,6 @@ <h3><a href="<page projects/vidalia>">Vidalia</a></h3> <p>Vidalia is a graphical way to control and view Tor's connections and settings.</p> - </div> - </td> - <td> - <div class="project"> - <a href="<page projects/torbrowser>"><img - src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon"></a> - <h3><a href="<page projects/torbrowser>">Tor - Browser</a></h3> - <p>Tor Browser contains everything you need to safely - browse the Internet. </p> </div> </td> </tr> Modified: website/trunk/projects/en/projects.wml =================================================================== --- website/trunk/projects/en/projects.wml 2011-10-17 18:56:40 UTC (rev 25171) +++ website/trunk/projects/en/projects.wml 2011-10-18 01:18:07 UTC (rev 25172) @@ -16,9 +16,9 @@ <tr> <td> <div class="name"><a href="<page torbutton/index>">Torbutton</a></div> -<p>Torbutton is a 1-click way for Firefox users to enable or disable -Tor in Firefox. To keep you safe, Torbutton disables many types -of active content.</p> +<p>Torbutton is integrated into <a href="<page projects/torbrowser>">Tor +Browser</a>. Torbutton disables many types of active content and threats +to your privacy when using a web browser.</p> </td> <td> <div class="name"><a href="<page projects/torbrowser>">Tor Browser Bundle</a></div>

1 0

r25171: {website} add the new cryptowars.info mirrors, update the mirrors tabl (in website/trunk: . include)
by Andrew Lewman 17 Oct '11

17 Oct '11

Author: phobos Date: 2011-10-17 18:56:40 +0000 (Mon, 17 Oct 2011) New Revision: 25171 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: add the new cryptowars.info mirrors, update the mirrors table. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2011-10-16 20:29:39 UTC (rev 25170) +++ website/trunk/include/mirrors-table.wmi 2011-10-17 18:56:40 UTC (rev 25171) @@ -52,15 +52,15 @@ <tr> - <td>EE</td> + <td>DK</td> - <td>CyberSIDE</td> + <td>Zentrum der Gesundheit</td> <td>Up to date</td> <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -103,23 +103,6 @@ <tr> - <td>DE</td> - - <td>torservers</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/dist">http</a></td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/dist">https</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>IR</td> <td>Ninjas</td> @@ -154,23 +137,6 @@ <tr> - <td>AT</td> - - <td>FoDT.IT</td> - - <td>Up to date</td> - - <td><a href="ftp://ftp.fodt.it/pub/mirror/tor/">ftp</a></td> - <td><a href="http://tor.fodt.it/dist/">http</a></td> - <td><a href="http://tor.fodt.it/">http</a></td> - <td><a href="https://tor.fodt.it/dist/">https</a></td> - <td><a href="https://tor.fodt.it/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>FR</td> <td>BarkerJr</td> @@ -224,6 +190,23 @@ <td>DE</td> + <td></td> + + <td>Up to date</td> + + <td><a href="ftp://cryptowars.info/tor/">ftp</a></td> + <td><a href="http://tor-dist.cryptowars.info/">http</a></td> + <td> - </td> + <td><a href="https://tor-dist.cryptowars.info/">https</a></td> + <td> - </td> + <td> - </td> + <td><a href="rsync://cryptowars.info/tor">rsync</a></td> +</tr> + +<tr> + + <td>DE</td> + <td>factor.cc</td> <td>Up to date</td> @@ -324,23 +307,6 @@ <tr> - <td>US</td> - - <td>AskApache</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>FR</td> <td>LazyTiger</td> @@ -392,6 +358,23 @@ <tr> + <td>EE</td> + + <td>CyberSIDE</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>NL</td> <td>Amorphis</td> @@ -409,19 +392,36 @@ <tr> - <td>DK</td> + <td>AT</td> - <td>Zentrum der Gesundheit</td> + <td>FoDT.IT</td> <td>Up to date</td> + <td><a href="ftp://ftp.fodt.it/pub/mirror/tor/">ftp</a></td> + <td><a href="http://tor.fodt.it/dist/">http</a></td> + <td><a href="http://tor.fodt.it/">http</a></td> + <td><a href="https://tor.fodt.it/dist/">https</a></td> + <td><a href="https://tor.fodt.it/">https</a></td> <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> +</tr> + +<tr> + + <td>US</td> + + <td>AskApache</td> + + <td>Up to date</td> + <td> - </td> + <td><a href="http://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> @@ -445,6 +445,23 @@ <td>DE</td> + <td>torservers</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/dist">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/dist">https</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>DE</td> + <td></td> <td>Up to date</td> @@ -545,23 +562,6 @@ <tr> - <td>US</td> - - <td>Xpdm</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://torproj.xpdm.us/dist/">http</a></td> - <td><a href="http://torproj.xpdm.us/">http</a></td> - <td><a href="https://torproj.xpdm.us/dist/">https</a></td> - <td><a href="https://torproj.xpdm.us/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>INT</td> <td>CoralCDN</td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-10-16 20:29:39 UTC (rev 25170) +++ website/trunk/update-mirrors.pl 2011-10-17 18:56:40 UTC (rev 25171) @@ -711,6 +711,24 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror046 => { + adminContact => "", + orgName => "", + isoCC => "DE", + subRegion => "", + region => "DE", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "rsync://cryptowars.info/tor", + ftpWebsiteMirror => "ftp://cryptowars.info/tor/", + httpDistMirror => "http://tor-dist.cryptowars.info/", + httpsDistMirror => "https://tor-dist.cryptowars.info/", + rsyncDistMirror => "rsync://cryptowars.info/tor-dist", + hiddenServiceMirror => "", } );

1 0

[stem/master] Integration tests / fixes for types.ControlMessage
by atagar＠torproject.org 17 Oct '11

17 Oct '11

commit 1b44b967e75b08d6f702ffa1507d8ad8c4980bda Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Oct 17 09:45:43 2011 -0700 Integration tests / fixes for types.ControlMessage Adding integration tests for basic control port communication, exercising... - connection failure - bad commands - bad getinfo queries - general getinfo queries - setevent/basic event parsing This also includes fixes for a variety of issues found while testing. --- run_tests.py | 4 +- stem/types.py | 18 ++++- stem/util/system.py | 53 ++++++++---- test/integ/message.py | 234 +++++++++++++++++++++++++++++++++++++++++++++++++ test/integ/system.py | 1 - test/runner.py | 29 ++++++- 6 files changed, 314 insertions(+), 25 deletions(-) diff --git a/run_tests.py b/run_tests.py index 6d62ab3..1741892 100755 --- a/run_tests.py +++ b/run_tests.py @@ -11,6 +11,7 @@ import unittest import test.runner import test.unit.message import test.unit.version +import test.integ.message import test.integ.system from stem.util import enum, term @@ -24,7 +25,8 @@ UNIT_TESTS = (("stem.types.ControlMessage", test.unit.message.TestMessageFunctio ("stem.types.Version", test.unit.version.TestVerionFunctions), ) -INTEG_TESTS = (("stem.util.system", test.integ.system.TestSystemFunctions), +INTEG_TESTS = (("stem.types.ControlMessage", test.integ.message.TestMessageFunctions), + ("stem.util.system", test.integ.system.TestSystemFunctions), ) # Configurations that the intergration tests can be ran with. Attributs are diff --git a/stem/types.py b/stem/types.py index 2339007..818b6d3 100644 --- a/stem/types.py +++ b/stem/types.py @@ -53,14 +53,28 @@ def read_message(control_file): while True: try: line = control_file.readline() - except socket.error, exc: raise ControlSocketClosed(exc) + except AttributeError, exc: + # if the control_file has been closed then we will receive: + # AttributeError: 'NoneType' object has no attribute 'recv' + + log.log(log.WARN, "ControlSocketClosed: socket file has been closed") + raise ControlSocketClosed("socket file has been closed") + except socket.error, exc: + log.log(log.WARN, "ControlSocketClosed: received an exception (%s)" % exc) + raise ControlSocketClosed(exc) raw_content += line # Parses the tor control lines. These are of the form... # <status code><divider><content>\r\n - if len(line) < 4: + if len(line) == 0: + # if the socket is disconnected then the readline() method will provide + # empty content + + log.log(log.WARN, "ControlSocketClosed: empty socket content") + raise ControlSocketClosed("Received empty socket content.") + elif len(line) < 4: log.log(log.WARN, "ProtocolError: line too short (%s)" % line) raise ProtocolError("Badly formatted reply line: too short") elif not re.match(r'^[a-zA-Z0-9]{3}[-+ ]', line): diff --git a/stem/util/system.py b/stem/util/system.py index 746eed4..5f7e9ca 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -3,6 +3,7 @@ Helper functions for working with the underlying system. These are mostly os dependent, only working on linux, osx, and bsd. """ +import re import os import time import subprocess @@ -123,7 +124,7 @@ def get_pid(process_name, process_port = None): try: results = call("pgrep -x %s" % process_name) - if len(results) == 1 and len(results[0].split()) == 1: + if results and len(results) == 1 and len(results[0].split()) == 1: pid = results[0].strip() if pid.isdigit(): return int(pid) except IOError: pass @@ -135,7 +136,7 @@ def get_pid(process_name, process_port = None): try: results = call("pidof %s" % process_name) - if len(results) == 1 and len(results[0].split()) == 1: + if results and len(results) == 1 and len(results[0].split()) == 1: pid = results[0].strip() if pid.isdigit(): return int(pid) except IOError: pass @@ -145,12 +146,16 @@ def get_pid(process_name, process_port = None): if process_port: try: - results = call("netstat -npl | grep 127.0.0.1:%i" % process_port) + results = call("netstat -npl") - if len(results) == 1: - results = results[0].split()[6] # process field (ex. "7184/tor") - pid = results[:results.find("/")] - if pid.isdigit(): return int(pid) + # filters to results with our port (same as "grep 127.0.0.1:<port>") + if results: + results = [r for r in results if "127.0.0.1:%i" % process_port in r] + + if len(results) == 1: + results = results[0].split()[6] # process field (ex. "7184/tor") + pid = results[:results.find("/")] + if pid.isdigit(): return int(pid) except IOError: pass # attempts to resolve using ps, failing if: @@ -160,7 +165,7 @@ def get_pid(process_name, process_port = None): try: results = call("ps -o pid -C %s" % process_name) - if len(results) == 2: + if results and len(results) == 2: pid = results[1].strip() if pid.isdigit(): return int(pid) except IOError: pass @@ -175,11 +180,15 @@ def get_pid(process_name, process_port = None): if process_port: try: - results = call("sockstat -4l -P tcp -p %i | grep %s" % (process_port, process_name)) + results = call("sockstat -4l -P tcp -p %i" % process_port) - if len(results) == 1 and len(results[0].split()) == 7: - pid = results[0].split()[2] - if pid.isdigit(): return int(pid) + # filters to results with our port (same as "grep <name>") + if results: + results = [r for r in results if process_name in r] + + if len(results) == 1 and len(results[0].split()) == 7: + pid = results[0].split()[2] + if pid.isdigit(): return int(pid) except IOError: pass # attempts to resolve via a ps command that works on mac/bsd (this and lsof @@ -188,11 +197,15 @@ def get_pid(process_name, process_port = None): # - there are multiple instances try: - results = call("ps axc | egrep \" %s$\"" % process_name) + results = call("ps axc") - if len(results) == 1 and len(results[0].split()) > 0: - pid = results[0].split()[0] - if pid.isdigit(): return int(pid) + # filters to results with our port (same as "egrep ' <name>$'") + if results: + results = [r for r in results if r.endswith(" %s" % process_name)] + + if len(results) == 1 and len(results[0].split()) > 0: + pid = results[0].split()[0] + if pid.isdigit(): return int(pid) except IOError: pass # attempts to resolve via lsof, this should work on linux, mac, and bsd @@ -202,8 +215,12 @@ def get_pid(process_name, process_port = None): # - there are multiple instances using the same port on different addresses try: - port_comp = str(process_port) if process_port else "" - results = call("lsof -wnPi | egrep \"^%s.*:%s\"" % (process_name, port_comp)) + results = call("lsof -wnPi") + + # filters to results with our port (same as "egrep '^<name>.*:<port>'") + if results: + port_comp = str(process_port) if process_port else "" + results = [r for r in results if re.match("^%s.*:%s" % (process_name, port_comp), r)] # This can result in multiple entries with the same pid (from the query # itself). Checking all lines to see if they're in agreement about the pid. diff --git a/test/integ/message.py b/test/integ/message.py new file mode 100644 index 0000000..46f20d2 --- /dev/null +++ b/test/integ/message.py @@ -0,0 +1,234 @@ +""" +Integration tests for the types.ControlMessage class. +""" + +import re +import socket +import unittest + +import stem.types +import test.runner + +class TestMessageFunctions(unittest.TestCase): + """ + Exercises the 'types.ControlMessage' class with an actual tor instance. + """ + + def test_unestablished_socket(self): + """ + Checks message parsing when we have a valid but unauthenticated socket. + """ + + control_socket, control_socket_file = self._get_control_socket(False) + + # If an unauthenticated connection gets a message besides AUTHENTICATE or + # PROTOCOLINFO then tor will give an 'Authentication required.' message and + # hang up. + + control_socket_file.write("GETINFO version\r\n") + control_socket_file.flush() + + auth_required_response = stem.types.read_message(control_socket_file) + self.assertEquals("Authentication required.", str(auth_required_response)) + self.assertEquals(["Authentication required."], list(auth_required_response)) + self.assertEquals("514 Authentication required.\r\n", auth_required_response.raw_content()) + self.assertEquals([("514", " ", "Authentication required.")], auth_required_response.content()) + + # The socket's broken but doesn't realize it yet. Send another message and + # it should fail with a closed exception. + + control_socket_file.write("GETINFO version\r\n") + control_socket_file.flush() + + self.assertRaises(stem.types.ControlSocketClosed, stem.types.read_message, control_socket_file) + + # Additional socket usage should fail, and pulling more responses will fail + # with more closed exceptions. + + control_socket_file.write("GETINFO version\r\n") + self.assertRaises(socket.error, control_socket_file.flush) + self.assertRaises(stem.types.ControlSocketClosed, stem.types.read_message, control_socket_file) + self.assertRaises(stem.types.ControlSocketClosed, stem.types.read_message, control_socket_file) + self.assertRaises(stem.types.ControlSocketClosed, stem.types.read_message, control_socket_file) + + # The socket connection is already broken so calling close shouldn't have + # an impact. + + control_socket.close() + control_socket_file.write("GETINFO version\r\n") + self.assertRaises(socket.error, control_socket_file.flush) + self.assertRaises(stem.types.ControlSocketClosed, stem.types.read_message, control_socket_file) + + # Closing the file handler, however, will cause a different type of error. + + control_socket_file.close() + control_socket_file.write("GETINFO version\r\n") + + # receives: AttributeError: 'NoneType' object has no attribute 'sendall' + self.assertRaises(AttributeError, control_socket_file.flush) + + # receives: stem.types.ControlSocketClosed: socket file has been closed + self.assertRaises(stem.types.ControlSocketClosed, stem.types.read_message, control_socket_file) + + def test_invalid_command(self): + """ + Parses the response for a command which doesn't exist. + """ + + control_socket, control_socket_file = self._get_control_socket() + + control_socket_file.write("blarg\r\n") + control_socket_file.flush() + + unrecognized_command_response = stem.types.read_message(control_socket_file) + self.assertEquals('Unrecognized command "blarg"', str(unrecognized_command_response)) + self.assertEquals(['Unrecognized command "blarg"'], list(unrecognized_command_response)) + self.assertEquals('510 Unrecognized command "blarg"\r\n', unrecognized_command_response.raw_content()) + self.assertEquals([('510', ' ', 'Unrecognized command "blarg"')], unrecognized_command_response.content()) + + control_socket.close() + control_socket_file.close() + + def test_invalid_getinfo(self): + """ + Parses the response for a GETINFO query which doesn't exist. + """ + + control_socket, control_socket_file = self._get_control_socket() + + control_socket_file.write("GETINFO blarg\r\n") + control_socket_file.flush() + + unrecognized_key_response = stem.types.read_message(control_socket_file) + self.assertEquals('Unrecognized key "blarg"', str(unrecognized_key_response)) + self.assertEquals(['Unrecognized key "blarg"'], list(unrecognized_key_response)) + self.assertEquals('552 Unrecognized key "blarg"\r\n', unrecognized_key_response.raw_content()) + self.assertEquals([('552', ' ', 'Unrecognized key "blarg"')], unrecognized_key_response.content()) + + control_socket.close() + control_socket_file.close() + + def test_getinfo_config_file(self): + """ + Parses the 'GETINFO config-file' response. + """ + + runner = test.runner.get_runner() + torrc_dst = runner.get_torrc_path() + + control_socket, control_socket_file = self._get_control_socket() + + control_socket_file.write("GETINFO config-file\r\n") + control_socket_file.flush() + + config_file_response = stem.types.read_message(control_socket_file) + self.assertEquals("config-file=%s\nOK" % torrc_dst, str(config_file_response)) + self.assertEquals(["config-file=%s" % torrc_dst, "OK"], list(config_file_response)) + self.assertEquals("250-config-file=%s\r\n250 OK\r\n" % torrc_dst, config_file_response.raw_content()) + self.assertEquals([("250", "-", "config-file=%s" % torrc_dst), ("250", " ", "OK")], config_file_response.content()) + + control_socket.close() + control_socket_file.close() + + def test_getinfo_config_text(self): + """ + Parses the 'GETINFO config-text' response. + """ + + # We can't be certain of the order, and there may be extra config-text + # entries as per... + # https://trac.torproject.org/projects/tor/ticket/2362 + # + # so we'll just check that the response is a superset of our config + + runner = test.runner.get_runner() + torrc_contents = [] + + for line in runner.get_torrc_contents().split("\n"): + line = line.strip() + + if line and not line.startswith("#"): + torrc_contents.append(line) + + control_socket, control_socket_file = self._get_control_socket() + + control_socket_file.write("GETINFO config-text\r\n") + control_socket_file.flush() + + config_text_response = stem.types.read_message(control_socket_file) + + # the response should contain two entries, the first being a data response + self.assertEqual(2, len(list(config_text_response))) + self.assertEqual("OK", list(config_text_response)[1]) + self.assertEqual(("250", " ", "OK"), config_text_response.content()[1]) + self.assertTrue(config_text_response.raw_content().startswith("250+config-text=\r\n")) + self.assertTrue(config_text_response.raw_content().endswith("\r\n.\r\n250 OK\r\n")) + self.assertTrue(str(config_text_response).startswith("config-text=\n")) + self.assertTrue(str(config_text_response).endswith("\nOK")) + + for torrc_entry in torrc_contents: + self.assertTrue("\n%s\n" % torrc_entry in str(config_text_response)) + self.assertTrue(torrc_entry in list(config_text_response)[0]) + self.assertTrue("%s\r\n" % torrc_entry in config_text_response.raw_content()) + self.assertTrue("%s" % torrc_entry in config_text_response.content()[0][2]) + + control_socket.close() + control_socket_file.close() + + def test_bw_event(self): + """ + Issues 'SETEVENTS BW' and parses a few events. + """ + + control_socket, control_socket_file = self._get_control_socket() + + control_socket_file.write("SETEVENTS BW\r\n") + control_socket_file.flush() + + setevents_response = stem.types.read_message(control_socket_file) + self.assertEquals("OK", str(setevents_response)) + self.assertEquals(["OK"], list(setevents_response)) + self.assertEquals("250 OK\r\n", setevents_response.raw_content()) + self.assertEquals([("250", " ", "OK")], setevents_response.content()) + + # Tor will emit a BW event once per second. Parsing three of them. + + for _ in range(3): + bw_event = stem.types.read_message(control_socket_file) + self.assertTrue(re.match("BW [0-9]+ [0-9]+", str(bw_event))) + self.assertTrue(re.match("650 BW [0-9]+ [0-9]+\r\n", bw_event.raw_content())) + self.assertEquals(("650", " "), bw_event.content()[0][:2]) + + control_socket.close() + control_socket_file.close() + + def _get_control_socket(self, authenticate = True): + """ + Provides a socket connected to the tor test instance's control port. + + Arguments: + authenticate (bool) - if True then the socket is authenticated + + Returns: + (socket.socket, file) tuple with the control socket and its file + """ + + runner = test.runner.get_runner() + + control_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + control_socket.connect(("127.0.0.1", runner.get_control_port())) + control_socket_file = control_socket.makefile() + + if authenticate: + control_socket_file.write("AUTHENTICATE\r\n") + control_socket_file.flush() + + authenticate_response = stem.types.read_message(control_socket_file) + + self.assertEquals("OK", str(authenticate_response)) + self.assertEquals(["OK"], list(authenticate_response)) + self.assertEquals("250 OK\r\n", authenticate_response.raw_content()) + self.assertEquals([("250", " ", "OK")], authenticate_response.content()) + + return (control_socket, control_socket_file) + diff --git a/test/integ/system.py b/test/integ/system.py index 8661660..1fcb3d2 100644 --- a/test/integ/system.py +++ b/test/integ/system.py @@ -37,7 +37,6 @@ class TestSystemFunctions(unittest.TestCase): """ runner = test.runner.get_runner() - self.assertEquals(runner.get_pid(), system.get_pid("tor")) self.assertEquals(runner.get_pid(), system.get_pid("tor", runner.get_control_port())) self.assertEquals(None, system.get_pid("blarg_and_stuff")) diff --git a/test/runner.py b/test/runner.py index b3abdfa..6f76d01 100644 --- a/test/runner.py +++ b/test/runner.py @@ -5,6 +5,7 @@ Runtime context for the integration tests. import os import sys import time +import shutil import signal import tempfile import subprocess @@ -12,10 +13,11 @@ import subprocess from stem.util import term # number of seconds before we time out our attempt to start a tor instance -TOR_INIT_TIMEOUT = 60 +TOR_INIT_TIMEOUT = 90 BASIC_TORRC = """# configuration for stem integration tests DataDirectory %s +SocksPort 0 ControlPort 1111 """ @@ -57,7 +59,7 @@ class Runner: raise exc # writes our testing torrc - torrc_dst = os.path.join(self._test_dir, "torrc") + torrc_dst = self.get_torrc_path() try: sys.stdout.write(term.format(" writing torrc (%s)... " % torrc_dst, term.Color.BLUE, term.Attr.BOLD)) @@ -93,7 +95,7 @@ class Runner: if self._tor_process: self._tor_process.kill() # double check that we have a torrc to work with - torrc_dst = os.path.join(self._test_dir, "torrc") + torrc_dst = self.get_torrc_path() if not os.path.exists(torrc_dst): raise OSError("torrc doesn't exist (%s)" % torrc_dst) @@ -139,6 +141,7 @@ class Runner: self._tor_process.kill() self._tor_process.communicate() # blocks until the process is done self._tor_process = None + shutil.rmtree(self._test_dir, ignore_errors=True) sys.stdout.write(term.format("done\n", term.Color.BLUE, term.Attr.BOLD)) def get_pid(self): @@ -164,4 +167,24 @@ class Runner: # TODO: this will be fetched from torrc contents when we use custom configs return 1111 + + def get_torrc_path(self): + """ + Provides the absolute path for where our testing torrc resides. + + Returns: + str with our torrc path + """ + + return os.path.join(self._test_dir, "torrc") + + def get_torrc_contents(self): + """ + Provides the contents of our torrc. + + Returns: + str with the contents of our torrc, lines are newline separated + """ + + return self._torrc_contents

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 17 Oct '11

17 Oct '11

commit 091f20b2b2263eec47703ddd513dc8c74477febc Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 17 16:15:54 2011 +0000 Update translations for tsum --- tl/tsum.po | 573 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 573 insertions(+), 0 deletions(-) diff --git a/tl/tsum.po b/tl/tsum.po new file mode 100644 index 0000000..68a0e1a --- /dev/null +++ b/tl/tsum.po @@ -0,0 +1,573 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR The Tor Project, Inc +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-10-17 13:23+0200\n" +"PO-Revision-Date: 2011-10-12 13:07+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tl\n" +"Plural-Forms: nplurals=2; plural=(n > 1)\n" + +#. type: Plain text +#: tsum.text:2 +msgid "# The Short User Manual" +msgstr "" + +#. type: Plain text +#: tsum.text:7 +msgid "" +"This user manual contains information about how to download Tor, how to use " +"it, and what to do if Tor is unable to connect to the network. If you can't " +"find the answer to your question in this document, email community-" +"support(a)lists.torproject.org." +msgstr "" + +#. type: Plain text +#: tsum.text:9 +#, no-wrap +msgid "" +"How Tor works\n" +"-------------\n" +msgstr "" + +#. type: Plain text +#: tsum.text:15 +msgid "" +"Tor is a network of virtual tunnels that allows you to improve your privacy " +"and security on the Internet. Tor works by sending your traffic through " +"three random servers (also known as *relays*) in the Tor network, before the" +" traffic is sent out onto the public Internet." +msgstr "" + +#. type: Plain text +#: tsum.text:17 +msgid "![How Tor Works](images/how-tor-works.png)" +msgstr "" + +#. type: Plain text +#: tsum.text:22 +msgid "" +"The image above illustrates a user browsing to the Twitter website over Tor." +" The green monitors represent relays in the Tor network, while the three " +"locks represent the layers of encryption between the user and each relay." +msgstr "" + +#. type: Plain text +#: tsum.text:27 +msgid "" +"Tor will anonymize the origin of your traffic, and it will encrypt " +"everything between you and the Tor network. Tor will also encrypt your " +"traffic inside the Tor network, but it cannot encrypt your traffic between " +"the Tor network and its final destination." +msgstr "" + +#. type: Plain text +#: tsum.text:32 +msgid "" +"If you are communicating sensitive information, for example when logging on " +"to a website with a username and password, make sure that you are using " +"HTTPS (e.g. **https**://twitter.com/, not **http**://twitter.com/)." +msgstr "" + +#. type: Plain text +#: tsum.text:34 +#, no-wrap +msgid "" +"How to download Tor\n" +"-------------------\n" +msgstr "" + +#. type: Plain text +#: tsum.text:40 +msgid "" +"The bundle we recommend to most users is the [Tor Browser " +"Bundle](https://www.torproject.org/projects/torbrowser.html). This bundle " +"contains a browser preconfigured to safely browse the Internet through Tor, " +"and requires no installation. You download the bundle, extract the archive, " +"and start Tor." +msgstr "" + +#. type: Plain text +#: tsum.text:44 +msgid "" +"There are two different ways to get hold of the Tor software. You can either" +" browse to the [Tor Project website](https://www.torproject.org/) and " +"download it there, or you can use GetTor, the email autoresponder." +msgstr "" + +#. type: Plain text +#: tsum.text:49 +msgid "" +"### How to get Tor via email To receive the English Tor Browser Bundle for " +"Windows, send an email to gettor(a)torproject.org with **windows** in the body" +" of the message. You can leave the subject blank." +msgstr "" + +#. type: Plain text +#: tsum.text:53 +msgid "" +"You can also request the Tor Browser Bundle for Mac OS X (write " +"**macos-i386**), and Linux (write **linux-i386** for 32-bit systems or " +"**linux-x86_64** for 64-bit systems)." +msgstr "" + +#. type: Plain text +#: tsum.text:57 +msgid "" +"If you want a translated version of Tor, write **help** instead. You will " +"then receive an email with instructions and a list of available languages." +msgstr "" + +#. type: Plain text +#: tsum.text:63 +#, no-wrap +msgid "" +"**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n" +"large, and you will not be able to receive any of these bundles with a\n" +"Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n" +"want, send an email to community-support(a)lists.torproject.org and we\n" +"will give you a list of website mirrors to use.\n" +msgstr "" + +#. type: Plain text +#: tsum.text:69 +msgid "" +"#### How to get Tor as several small sized packages It is possible to " +"request the Tor Browser Bundle for Windows as several small sized packages, " +"instead of one big package. This can be useful if you don't have a lot of " +"bandwidth available, or if your email provider does not allow you to receive" +" large attachments." +msgstr "" + +#. type: Plain text +#: tsum.text:72 +msgid "" +"Send an email to gettor(a)torproject.org with the following words in the body " +"of the email:" +msgstr "" + +#. type: Plain text +#: tsum.text:75 +#, no-wrap +msgid "" +"windows \n" +"split\n" +msgstr "" + +#. type: Plain text +#: tsum.text:79 +msgid "" +"It is important that you include the keyword *split* on its own line. See " +"*What to do with split packages* for information on how to unpack and re-" +"assemble the small sized packages." +msgstr "" + +#. type: Plain text +#: tsum.text:83 +msgid "" +"### How to verify that you have the right version Before running the Tor " +"Browser Bundle, you should make sure that you have the right version." +msgstr "" + +#. type: Plain text +#: tsum.text:88 +msgid "" +"The software you receive is accompanied by a file with the same name as the " +"bundle and the extension **.asc**. This .asc file is a GPG signature, and " +"will allow you to verify the file you've downloaded is exactly the one that " +"we intended you to get." +msgstr "" + +#. type: Plain text +#: tsum.text:91 +#, no-wrap +msgid "" +"Before you can verify the signature, you will have to download and\n" +"install GnuPG: \n" +msgstr "" + +#. type: Plain text +#: tsum.text:95 +#, no-wrap +msgid "" +"**Windows**: [http://gpg4win.org/download.html](http://gpg4win.org/download.html) \n" +"**Mac OS X**: [http://macgpg.sourceforge.net/](http://macgpg.sourceforge.net/) \n" +"**Linux**: Most Linux distributions come with GnuPG preinstalled.\n" +msgstr "" + +#. type: Plain text +#: tsum.text:98 +msgid "" +"Please note that you may need to edit the paths and the commands used below " +"to get it to work on your system." +msgstr "" + +#. type: Plain text +#: tsum.text:101 +msgid "" +"Erinn Clark signs the Tor Browser Bundles with key 0x63FEE659. To import " +"Erinn's key, run:" +msgstr "" + +#. type: Plain text +#: tsum.text:103 +#, no-wrap +msgid "\tgpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659\n" +msgstr "" + +#. type: Plain text +#: tsum.text:105 +msgid "After importing the key, verify that the fingerprint is correct:" +msgstr "" + +#. type: Plain text +#: tsum.text:107 +#, no-wrap +msgid "\tgpg --fingerprint 0x63FEE659\n" +msgstr "" + +#. type: Plain text +#: tsum.text:109 +msgid "You should see:" +msgstr "" + +#. type: Plain text +#: tsum.text:116 +#, no-wrap +msgid "" +"\tpub 2048R/63FEE659 2003-10-16\n" +"\t Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659\n" +"\tuid Erinn Clark <erinn(a)torproject.org>\n" +"\tuid Erinn Clark <erinn(a)debian.org>\n" +"\tuid Erinn Clark <erinn(a)double-helix.org>\n" +"\tsub 2048R/EB399FD7 2003-10-16\n" +msgstr "" + +#. type: Plain text +#: tsum.text:118 +msgid "" +"To verify the signature of the package you downloaded, run the following " +"command:" +msgstr "" + +#. type: Plain text +#: tsum.text:120 +#, no-wrap +msgid "" +"\tgpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-" +"US.exe\n" +msgstr "" + +#. type: Plain text +#: tsum.text:126 +msgid "" +"The output should say *\"Good signature\"*. A bad signature means that the " +"file may have been tampered with. If you see a bad signature, send details " +"about where you downloaded the package from, how you verified the signature," +" and the output from GnuPG in an email to community-" +"support(a)lists.torproject.org." +msgstr "" + +#. type: Plain text +#: tsum.text:133 +msgid "" +"Once you have verified the signature and seen the *\"Good signature\"* " +"output, go ahead and extract the package archive. You should then see a " +"directory similar to **tor-browser_en-US**. Inside that directory is another" +" directory called **Docs**, which contains a file called **changelog**. You " +"want to make sure that the version number on the top line of the changelog " +"file matches the version number in the filename." +msgstr "" + +#. type: Plain text +#: tsum.text:139 +msgid "" +"### How to use the Tor Browser Bundle After downloading the Tor Browser " +"Bundle and extracting the package, you should have a directory with a few " +"files in it. One of the files is an executable called \"Start Tor Browser\" " +"(or \"start-tor-browser\", depending on your operating system)." +msgstr "" + +#. type: Plain text +#: tsum.text:146 +msgid "" +"When you start the Tor Browser Bundle, you will first see Vidalia start up " +"and connect you to the Tor network. After that, you will see a browser " +"confirming that you are now using Tor. This is done by displaying " +"[https://check.torproject.org/](https://check.torproject.org/). You can now " +"browse the Internet through Tor." +msgstr "" + +#. type: Plain text +#: tsum.text:149 +#, no-wrap +msgid "" +"*Please note that it is important that you use the browser that comes\n" +"with the bundle, and not your own browser.*\n" +msgstr "" + +#. type: Plain text +#: tsum.text:155 +msgid "" +"### What to do when Tor does not connect Some users will notice that Vidalia" +" gets stuck when trying to connect to the Tor network. If this happens, make" +" sure that you are connected to the Internet. If you need to connect to a " +"proxy server, see *How to use an open proxy* below." +msgstr "" + +#. type: Plain text +#: tsum.text:160 +msgid "" +"If your normal Internet connection is working, but Tor still can't connect " +"to the network, try the following; open the Vidalia control panel, click on " +"*Message Log* and select the *Advanced* tab. It may be that Tor won't " +"connect because:" +msgstr "" + +#. type: Plain text +#: tsum.text:164 +#, no-wrap +msgid "" +"**Your system clock is off**: Make sure that the date and time on your\n" +"system is correct, and restart Tor. You may need to synchronize your\n" +"system clock with an Internet time server. \n" +msgstr "" + +#. type: Plain text +#: tsum.text:169 +#, no-wrap +msgid "" +"**You are behind a restrictive firewall**: To tell Tor to only try port\n" +"80 and port 443, open the Vidalia control panel, click on *Settings* and\n" +"*Network*, and tick the box that says *My firewall only lets me connect\n" +"to certain ports*. \n" +msgstr "" + +#. type: Plain text +#: tsum.text:173 +#, no-wrap +msgid "" +"**Your anti-virus program is blocking Tor**: Make sure that your\n" +"anti-virus program is not preventing Tor from making network\n" +"connections.\n" +msgstr "" + +#. type: Plain text +#: tsum.text:177 +msgid "" +"If Tor still doesn't work, it's likely that your Internet Service Provider " +"(ISP) is blocking Tor. Very often this can be worked around with **Tor " +"bridges**, hidden relays that aren't as easy to block." +msgstr "" + +#. type: Plain text +#: tsum.text:181 +msgid "" +"If you need help with figuring out why Tor can't connect, send an email to " +"community-support(a)lists.torproject.org and include the relevant parts from " +"the log file." +msgstr "" + +#. type: Plain text +#: tsum.text:189 +msgid "" +"### How to find a bridge To use a bridge, you will first have to locate one;" +" you can either browse to " +"[bridges.torproject.org](https://bridges.torproject.org/), or you can send " +"an email to bridges(a)torproject.org. If you do send an email, please make " +"sure that you write **get bridges** in the body of the email. Without this, " +"you will not get a reply. Note that you need to send this email from either " +"a gmail.com or a yahoo.com address." +msgstr "" + +#. type: Plain text +#: tsum.text:194 +msgid "" +"Configuring more than one bridge address will make your Tor connection more " +"stable, in case some of the bridges become unreachable. There is no " +"guarantee that the bridge you are using now will work tomorrow, so you " +"should make a habit of updating your list of bridges every so often." +msgstr "" + +#. type: Plain text +#: tsum.text:200 +msgid "" +"### How to use a bridge Once you have a set of bridges to use, open the " +"Vidalia control panel, click on *Settings*, *Network* and tick the box that " +"says *My ISP blocks connections to the Tor network*. Enter the bridges in " +"the box below, hit *OK* and start Tor again." +msgstr "" + +#. type: Plain text +#: tsum.text:206 +msgid "" +"### How to use an open proxy If using a bridge does not work, try " +"configuring Tor to use any HTTPS or SOCKS proxy to get access to the Tor " +"network. This means even if Tor is blocked by your local network, open " +"proxies can be safely used to connect to the Tor Network and on to the " +"uncensored Internet." +msgstr "" + +#. type: Plain text +#: tsum.text:209 +msgid "" +"The steps below assume you have a functional Tor/Vidalia configuration, and " +"you have found a list of HTTPS, SOCKS4, or SOCKS5 proxies." +msgstr "" + +#. type: Bullet: '1. ' +#: tsum.text:221 +msgid "Open the Vidalia control panel, click on *Settings*." +msgstr "" + +#. type: Bullet: '2. ' +#: tsum.text:221 +msgid "Click *Network*. Select *I use a proxy to access the Internet*." +msgstr "" + +#. type: Plain text +#: tsum.text:221 +#, no-wrap +msgid "" +"3. On the *Address* line, enter the open proxy address. This can be a\n" +"hostname or an IP Address.\n" +"4. Enter the port for the proxy.\n" +"5. Generally, you do not need a username and password. If you do,\n" +"enter the information in the proper fields.\n" +"6. Choose the *Type* of proxy you are using, whether HTTP/HTTPS, SOCKS4,\n" +"or SOCKS5.\n" +"7. Push the *OK* button. Vidalia and Tor are now configured to use a\n" +"proxy to access the rest of the Tor network.\n" +msgstr "" + +#. type: Plain text +#: tsum.text:226 +msgid "" +"## Frequently Asked Questions This section will answer some of the most " +"common questions. If your question is not mentioned here, please send an " +"email to community-support(a)lists.torproject.org." +msgstr "" + +#. type: Plain text +#: tsum.text:230 +msgid "" +"### Unable to extract the archive If you are using Windows and find that you" +" cannot extract the archive, download and install " +"[7-Zip](http://www.7-zip.org/)." +msgstr "" + +#. type: Plain text +#: tsum.text:237 +msgid "" +"### What to do with split packages When you request a split package, the " +"parts may arrive out of order. You need to make sure you have received all " +"the parts before you attempt to unpack them. Save all the parts into one " +"directory on your computer, unzip them, and double-click the file that ends " +"in \"..split.part01.exe\" to start the unpacking process." +msgstr "" + +#. type: Plain text +#: tsum.text:241 +msgid "" +"Once the unpacking process has completed, you should see a newly created " +"\".exe\" file in the same directory. Run this file and wait for the Tor " +"Browser Bundle to start." +msgstr "" + +#. type: Plain text +#: tsum.text:245 +msgid "" +"### Vidalia asks for a password You should not have to enter a password when" +" starting Vidalia. If you are prompted for one, you are likely affected by " +"one of these problems:" +msgstr "" + +#. type: Plain text +#: tsum.text:251 +#, no-wrap +msgid "" +"**You are already running Vidalia and Tor**:\n" +"For example, this situation can happen if you installed the Vidalia\n" +"bundle and now you're trying to run the Tor Browser Bundle. In that\n" +"case, you will need to close the old Vidalia and Tor before you can run\n" +"this one.\n" +msgstr "" + +#. type: Plain text +#: tsum.text:258 +#, no-wrap +msgid "" +"**Vidalia crashed, but left Tor running**:\n" +"If the dialog that prompts you for a control password has a Reset\n" +"button, you can click the button and Vidalia will restart Tor with a new\n" +"random control password. If you do not see a Reset button, or if Vidalia\n" +"is unable to restart Tor for you; go into your process or task manager,\n" +"and terminate the Tor process. Then use Vidalia to restart Tor.\n" +msgstr "" + +#. type: Plain text +#: tsum.text:262 +msgid "" +"For more information, see the " +"[FAQ](https://torproject.org/docs/faq.html#VidaliaPassword) on the Tor " +"Project website." +msgstr "" + +#. type: Plain text +#: tsum.text:267 +msgid "" +"### Flash does not work For security reasons, Flash, Java, and other plugins" +" are currently disabled for Tor. Plugins operate independently from Firefox " +"and can perform activity on your computer that ruins your anonymity." +msgstr "" + +#. type: Plain text +#: tsum.text:272 +msgid "" +"Most YouTube videos work with HTML5, and it is possible to view these videos" +" over Tor. You need to join the [HTML5 trial](https://www.youtube.com/html5)" +" on the YouTube website before you can use the HTML5 player." +msgstr "" + +#. type: Plain text +#: tsum.text:276 +msgid "" +"Note that the browser will not remember that you joined the trial once you " +"close it, so you will need to re-join the trial the next time you run the " +"Tor Browser Bundle." +msgstr "" + +#. type: Plain text +#: tsum.text:279 +msgid "" +"Please see the [Torbutton FAQ](https://www.torproject.org/torbutton" +"/torbutton-faq.html#noflash) for more information." +msgstr "" + +#. type: Plain text +#: tsum.text:285 +msgid "" +"### I want to use another browser For security reasons, we recommend that " +"you only browse the web through Tor using the Tor Browser Bundle. It is " +"technically possible to use Tor with other browsers, but by doing so you " +"open yourself up to potential attacks." +msgstr "" + +#. type: Plain text +#: tsum.text:289 +msgid "" +"### Why Tor is slow Tor can sometimes be a bit slower than your normal " +"Internet connection. After all, your traffic is sent through many different" +" countries, sometimes across oceans around the world!" +msgstr "" + +

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 17 Oct '11

17 Oct '11

commit 53fa37165628320cff182c7484c917113f9b51de Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 17 14:15:56 2011 +0000 Update translations for tsum --- es/tsum.po | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/es/tsum.po b/es/tsum.po index fe088f2..58f9fb1 100644 --- a/es/tsum.po +++ b/es/tsum.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-10-17 13:23+0200\n" -"PO-Revision-Date: 2011-10-17 12:57+0000\n" +"PO-Revision-Date: 2011-10-17 14:07+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" @@ -549,10 +549,6 @@ msgid "" "says *My ISP blocks connections to the Tor network*. Enter the bridges in " "the box below, hit *OK* and start Tor again." msgstr "" -"### How to use a bridge Once you have a set of bridges to use, open the " -"Vidalia control panel, click on *Settings*, *Network* and tick the box that " -"says *My ISP blocks connections to the Tor network*. Enter the bridges in " -"the box below, hit *OK* and start Tor again." #. type: Plain text #: tsum.text:206

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 17 Oct '11

17 Oct '11

commit b7c943773330b263ec5286d83f8dd30f6daec775 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 17 13:15:43 2011 +0000 Update translations for tsum --- es/tsum.po | 33 ++++++++++++++++++++++++++++++++- fa/tsum.po | 31 ++++++++++++++++++++++++++++++- fr/tsum.po | 37 ++++++++++++++++++++++++++++++++++++- hu/tsum.po | 35 ++++++++++++++++++++++++++++++++++- nl/tsum.po | 14 +++++++++++++- 5 files changed, 145 insertions(+), 5 deletions(-) diff --git a/es/tsum.po b/es/tsum.po index 1fa7c47..fe088f2 100644 --- a/es/tsum.po +++ b/es/tsum.po @@ -6,12 +6,13 @@ # <antixsuperstar(a)gmail.com>, 2011. # <guido(a)bruo.org>, 2011. # <kpplfy(a)geekmx.org>, 2011. +# <runa.sandvik(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-10-17 13:23+0200\n" -"PO-Revision-Date: 2011-10-17 12:25+0000\n" +"PO-Revision-Date: 2011-10-17 12:57+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" @@ -33,6 +34,10 @@ msgid "" "find the answer to your question in this document, email community-" "support(a)lists.torproject.org." msgstr "" +"Este manual de uso contiene información sobre cómo descargar Tor, cómo " +"usarlo y qué hacer si Tor no puede conectarse a la red. Si usted no " +"encontrara la respuesta a su pregunta en este documento, envíe un correo a " +"community-support(a)lists.torproject.org." #. type: Plain text #: tsum.text:9 @@ -141,6 +146,9 @@ msgid "" "Windows, send an email to gettor(a)torproject.org with **windows** in the body" " of the message. You can leave the subject blank." msgstr "" +"### Cómo obtener Tor vía correo electrónico Para recibir el Paquete del " +"navegador Tor en inglés para Windows, envíe un correo electrónico a " +"gettor(a)torproject.org con **windows** en el cuerpo del mensaje. Puede " #. type: Plain text #: tsum.text:53 @@ -173,6 +181,11 @@ msgid "" "want, send an email to community-support(a)lists.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" +"**Nota**: Los Paquetes del navegador Tor para Linux y Mac OS X son bastante " +"pesados y no podrá recibir ninguno de ellos con una cuenta de GMail, Hotmail" +" o Yahoo. Si usted no puede recibir el paquete que desea, envíe un correo a " +"community-support(a)lists.torproject.org y le daremos una lista de sitios web " +"allternativos donde realizar la descarga.\n" #. type: Plain text #: tsum.text:69 @@ -194,6 +207,7 @@ msgid "" "Send an email to gettor(a)torproject.org with the following words in the body " "of the email:" msgstr "" +"Envíe un correo a gettor(a)torproject.org con las siguientes palabras en el " #. type: Plain text #: tsum.text:75 @@ -347,6 +361,10 @@ msgid "" " and the output from GnuPG in an email to community-" "support(a)lists.torproject.org." msgstr "" +"La salida debe decir *\\\"Good signature\\\"* (Firma correcta). Una firma " +"incorrecta significa que el archivo pudo haber sido intervenido. Si usted ve" +" una firma errónea, envíe los detalles acerca del origen de la descarga, " +"cómo verificó la firma y la salida de GnuPG en un correo electrónico a " #. type: Plain text #: tsum.text:133 @@ -487,6 +505,9 @@ msgid "" "community-support(a)lists.torproject.org and include the relevant parts from " "the log file." msgstr "" +"Si usted necesita ayuda para saber por qué Tor no puede conectar, envíe un " +"correo a community-support(a)lists.torproject.org e incluya las partes " +"relevantes del registro de mensajes." #. type: Plain text #: tsum.text:189 @@ -499,6 +520,13 @@ msgid "" "you will not get a reply. Note that you need to send this email from either " "a gmail.com or a yahoo.com address." msgstr "" +"### Cómo encontrar un Puente Para usar un puente, usted necesita primero " +"encontrar uno; para ello puede ingresar a " +"[bridges.torproject.org](https://bridges.torproject.org/), o enviar un " +"correo a bridges(a)torproject.org. Si decide enviar un correo, asegúrese de " +"escribir **get bridges** en el cuerpo del mensaje. Sin eso no obtendrá " +"respuesta. Nota: usted necesita hacer esto desde una cuenta de correo en " +"gmail.com o yahoo.com." #. type: Plain text #: tsum.text:194 @@ -588,6 +616,9 @@ msgid "" "common questions. If your question is not mentioned here, please send an " "email to community-support(a)lists.torproject.org." msgstr "" +"## Preguntas Frecuentes Esta sección respondera algunas de las preguntas más" +" comunes. Si su duda no está respondida aquí, por favor envíe un correo a " +"community-support(a)lists.torproject.org." #. type: Plain text #: tsum.text:230 diff --git a/fa/tsum.po b/fa/tsum.po index b85b775..7c6ae79 100644 --- a/fa/tsum.po +++ b/fa/tsum.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: 2011-10-17 13:23+0200\n" -"PO-Revision-Date: 2011-10-17 12:25+0000\n" +"PO-Revision-Date: 2011-10-17 13:05+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -33,6 +33,10 @@ msgid "" "find the answer to your question in this document, email community-" "support(a)lists.torproject.org." msgstr "" +"این راهنمای کاربری حاوی اطلاعاتی است درباره دانلود تور، استفاده از آن و " +"اینکه در صورت وصل نشدن تور به شبکه باید چه کار کنید. اگر نمی‌توانید پاسخ " +"سوال خود در این راهنما پیدا کنید، به community-support(a)lists.torproject.org " +"ایمیل بزنید. " #. type: Plain text #: tsum.text:9 @@ -140,6 +144,9 @@ msgid "" "Windows, send an email to gettor(a)torproject.org with **windows** in the body" " of the message. You can leave the subject blank." msgstr "" +"### چگونه تور را از راه ایمیل دریافت کنیم برای دریافت بسته انگلیسی تور برای " +"ویندوز، ایمیلی به gettor(a)torproject.org با ذکر کلمه **windows** در درون " +"ایمیل بفرستید. می‌توانید subject را خالی بگذارید." #. type: Plain text #: tsum.text:53 @@ -172,6 +179,10 @@ msgid "" "want, send an email to community-support(a)lists.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" +"**نکته**: بسته مرورگر تور برای گنو/لینوکس و مک‌اواس‌اکس نسبتا بزرگ است،\n" +"و شما نخواهید توانست آن را به وسیله‌ی جی‌میل، هات‌میل یا یاهو دریافت کنید.\n" +"اگر شما نتوانستید بسته‌ای را که خواسته‌اید دریافت کنید، یه ایمیل به community-support(a)lists.torproject.org بفرستید\n" +"و ما لیستی از وب‌سایت‌هایی که می‌توانید از آنها دانلود کنید را برای استفاده‌تان می‌فرستیم.\n" #. type: Plain text #: tsum.text:69 @@ -194,6 +205,7 @@ msgid "" "Send an email to gettor(a)torproject.org with the following words in the body " "of the email:" msgstr "" +"یک ایمیل به gettor(a)torproject.org بزنید و در بدنه‌ی آن کلمات زیر را بنویسید:" #. type: Plain text #: tsum.text:75 @@ -346,6 +358,10 @@ msgid "" " and the output from GnuPG in an email to community-" "support(a)lists.torproject.org." msgstr "" +"خروجی باید بگوید *\"Good signature\"*. یک امضای بد یعنی فایل ممکن است " +"دستکاری شده باشد. اگر شما یه امضای بد دیدید، جزییات این که فایل را از کجا " +"دانلود کردید، چگونه امضا را بررسی کردید، و خروجی GnuPG را به نشانی " +"community-support(a)lists.torproject.org ایمیل بزنید." #. type: Plain text #: tsum.text:133 @@ -484,6 +500,9 @@ msgid "" "community-support(a)lists.torproject.org and include the relevant parts from " "the log file." msgstr "" +"اگر شما برای این که بفهمید چرا تور متصل نمی‌شود، مشکل داشتید، یک ایمیل به " +"community-support(a)lists.torproject.org بفرستید و در آن قسمت مربوطه از فایل " +"لاگ را قرار دهید." #. type: Plain text #: tsum.text:189 @@ -496,6 +515,13 @@ msgid "" "you will not get a reply. Note that you need to send this email from either " "a gmail.com or a yahoo.com address." msgstr "" +"### چگونه یک پل پیدا کنیم برای استفاده از یک پل، شما ابتدا باید یک پل را " +"مکان‌یابی کنید؛ برای این کار می‌توانید به " +"[bridges.torproject.org](https://bridges.torproject.org/) بروید یا این که یک" +" ایمیل به bridges(a)torproject.org بفرستید. اگر می‌خواهید ایمیل ارسال کنید* " +"اطمینان حاصل کنید که در قسمت بدنه‌ی ایمیل، کلمه‌ی **get bridges** را " +"نوشته‌اید. بدون این، شما پاسخی دریافت نخواهید کرد. به این نکته توجه کنید که " +"لازم است شما این ایمیل را از آدرس‌های جی‌میل یا یاهو بفرستید." #. type: Plain text #: tsum.text:194 @@ -587,6 +613,9 @@ msgid "" "common questions. If your question is not mentioned here, please send an " "email to community-support(a)lists.torproject.org." msgstr "" +"سوالات متداول. این قسمت به برخی از سوالات بسیار متداول و مشترک پاسخ خواهد " +"داد. اگر سوال شما در این جا ذکر نشده بود، لطفا به community-" +"support(a)lists.torproject.org ایمیل بزنید." #. type: Plain text #: tsum.text:230 diff --git a/fr/tsum.po b/fr/tsum.po index 7906e6a..a8944f0 100644 --- a/fr/tsum.po +++ b/fr/tsum.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-10-17 13:23+0200\n" -"PO-Revision-Date: 2011-10-17 12:25+0000\n" +"PO-Revision-Date: 2011-10-17 13:08+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -37,6 +37,11 @@ msgid "" "find the answer to your question in this document, email community-" "support(a)lists.torproject.org." msgstr "" +"Ce manuel utilisateur contient des indications pour le téléchargement de " +"Tor, son utilisation et sur ce qu'il faut faire si Tor n'est plus en mesure " +"de se connecter au réseau. Si vous ne trouvez de réponse à vos questions " +"dans ce document, alors envoyez un mail à community-" +"support(a)lists.torproject.org. " #. type: Plain text #: tsum.text:9 @@ -148,6 +153,10 @@ msgid "" "Windows, send an email to gettor(a)torproject.org with **windows** in the body" " of the message. You can leave the subject blank." msgstr "" +"### Comment obtenir Tor par email? Pour recevoir le package en langue " +"anglaise du Navigateur Tor compatible windows, il faut envoyer un email à " +"gettor(a)torproject.org avec **windows** dans le corps du message. Vous pouvez" +" laisser le sujet vide. " #. type: Plain text #: tsum.text:53 @@ -180,6 +189,11 @@ msgid "" "want, send an email to community-support(a)lists.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" +"**Note**; Les packages navigateur Tor pour Linux et Mac OS X sont assez " +"volumineux, et vous n'aurez pas la possibilité de recevoir l'archive sur un " +"compte Gmail, Hotmail ou Yahoo. SI vous ne pouvez pas recevoir le package " +"désiré, envoyez un email à community-support(a)lists.torproject.org et nous " +"vous communiquerons une liste de sites web miroirs à utiliser. \n" #. type: Plain text #: tsum.text:69 @@ -202,6 +216,8 @@ msgid "" "Send an email to gettor(a)torproject.org with the following words in the body " "of the email:" msgstr "" +"Envoyez un e-mail à gettor(a)torproject.org avec les mots suivants dans le " +"corps de l'e-mail:" #. type: Plain text #: tsum.text:75 @@ -359,6 +375,11 @@ msgid "" " and the output from GnuPG in an email to community-" "support(a)lists.torproject.org." msgstr "" +"Si tout est bon \"signature correcte\" devrait s'afficher. Une signature " +"incorrecte signifie que le fichier a peut être été falsifié ou corrompu. Si " +"vous avez une signature incorrecte, envoyez les informations concernant le " +"site de téléchargement, le méthode de vérification de la signature et le " +"résultat de GnuPG par email à community-support(a)lists.torproject.org." #. type: Plain text #: tsum.text:133 @@ -502,6 +523,9 @@ msgid "" "community-support(a)lists.torproject.org and include the relevant parts from " "the log file." msgstr "" +"Si vous avez besoin d'aide pour comprendre pourquoi Tor ne peut pas se " +"connecter, envoyez un mail à community-support(a)lists.torproject.org et " +"joignez les informations pertinentes du fichier de log" #. type: Plain text #: tsum.text:189 @@ -514,6 +538,13 @@ msgid "" "you will not get a reply. Note that you need to send this email from either " "a gmail.com or a yahoo.com address." msgstr "" +"### Comment trouver une passerelle, comment utiliser un passerelle. Vous " +"devrez tout d'abord en localiser une. Vous pouvez soit vous rendre à " +"l'adresse [bridges.torproject.org](https://bridges.torproject.org/), soit " +"envoyez un mail à bridges(a)torproject.org. Si vous envoyez un mail, assurez " +"s'il vous plait d'indiquer **get bridges** dans le corps du mail. Sans cela," +" vous n'obtiendrez pas de réponse. Notez que vous devez envoyer cet email " +"depuis une adresse gmail.com soit depuis une adresse yahoo.com." #. type: Plain text #: tsum.text:194 @@ -608,6 +639,10 @@ msgid "" "common questions. If your question is not mentioned here, please send an " "email to community-support(a)lists.torproject.org." msgstr "" +"## Questions Fréquemment Posées. Cette section vous apportera des réponses à" +" la plupart des questions habituelles. Si vous question n'est pas mentionnée" +" ici, envoyez s'il vous plait un email à community-" +"support(a)lists.torproject.org." #. type: Plain text #: tsum.text:230 diff --git a/hu/tsum.po b/hu/tsum.po index 50811b7..5c9ddb2 100644 --- a/hu/tsum.po +++ b/hu/tsum.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: 2011-10-17 13:23+0200\n" -"PO-Revision-Date: 2011-10-17 12:25+0000\n" +"PO-Revision-Date: 2011-10-17 13:12+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -31,6 +31,11 @@ msgid "" "find the answer to your question in this document, email community-" "support(a)lists.torproject.org." msgstr "" +"Ez a kézikönyv információkat nyújt a Tor letöltéséről, használatáról és " +"azokról a teendőkről, amit akkor kell végrehajtania, ha a Tor nem tud " +"csatlakozni a hálózathoz. Ha nem találja kérdésre a választ ebben a " +"dokumentumban, akkor írjon levelet a community-support(a)lists.torproject.org " +"címre." #. type: Plain text #: tsum.text:9 @@ -139,6 +144,9 @@ msgid "" "Windows, send an email to gettor(a)torproject.org with **windows** in the body" " of the message. You can leave the subject blank." msgstr "" +"### Hogyan szerezheti be a Tor-t emailben Ahhoz, hogy emailben kapja meg az " +"angol Tor Böngésző csomagot, küldjön egy emailt a gettor(a)torproject.org " +"címre **windows** szöveggel a levél törzsében. A tárgy üres maradhat." #. type: Plain text #: tsum.text:53 @@ -170,6 +178,11 @@ msgid "" "want, send an email to community-support(a)lists.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" +"**Megjegyzés**: A Tor böngésző csomag Linux és Mac OS X verziója igen nagy, " +"és nem fogja megkapni ezt Gmail, Hotmail vagy Yahoo címre. Ha nem tudja " +"beszerezni a csomagot,írjon egy emailt a community-" +"support(a)lists.torproject.org címre, és küldünk egy listát arról, hogy milyen" +" weboldal tükröket használhat.\n" #. type: Plain text #: tsum.text:69 @@ -191,6 +204,8 @@ msgid "" "Send an email to gettor(a)torproject.org with the following words in the body " "of the email:" msgstr "" +"Küldjön egy emailt a gettor(a)torproject.org címre a következő tartalommal az " +"email törzsében:" #. type: Plain text #: tsum.text:75 @@ -349,6 +364,11 @@ msgid "" " and the output from GnuPG in an email to community-" "support(a)lists.torproject.org." msgstr "" +"A kimenet azt kell mondja, hogy *\"Good signature\"* (jó aláírás). Egy hibás" +" aláírás azt jelentheti, hogy a csomag megváltoztatásra került, vagy " +"megsérült. Ha hibás aláírást lát, akkor küldje el a részleteket arról, hogy " +"honnan töltötte le a csomagot, hogyan ellenőrizte, és a kimenetét a GnuPG " +"programnak, a a community-support(a)lists.torproject.org email címre." #. type: Plain text #: tsum.text:133 @@ -488,6 +508,9 @@ msgid "" "community-support(a)lists.torproject.org and include the relevant parts from " "the log file." msgstr "" +"Ha segítségre van szüksége, hogy a Tor miért nem tud kapcsolódni, írjon egy " +"emailt a community-support(a)lists.torproject.org címre, és rakja bele a " +"lényeges részeit a levélbe a log állománynak." #. type: Plain text #: tsum.text:189 @@ -500,6 +523,13 @@ msgid "" "you will not get a reply. Note that you need to send this email from either " "a gmail.com or a yahoo.com address." msgstr "" +"### Hogyan találjon Hídkapcsolati Eloszót A Tor Hidak használatához először" +" találnia kell egyet; vagy nézze meg a " +"[bridges.torproject.org](https://bridges.torproject.org/) weboldalt, vagy " +"küldjön egy emailt a bridges(a)torproject.org. Ha email küld, legyen biztos " +"benne, hogy a levél szövege tartalmazza a **get bridges** (magyarul: hidak " +"lekérése) szöveget a levél törzsében. E nélkül nem fog választ kapni. " +"Fontos, hogy ezt az emailt gmail.com vagy yahoo.com címről kell küldenie." #. type: Plain text #: tsum.text:194 @@ -593,6 +623,9 @@ msgid "" "common questions. If your question is not mentioned here, please send an " "email to community-support(a)lists.torproject.org." msgstr "" +"## Gyakran feltett kérdések Ez a szakasz a leggyakoribb kérdések " +"tartalmazza. Ha kérdése nincs itt említve, kérjük küldjön egy emailt a " +"community-support(a)lists.torproject.org címre." #. type: Plain text #: tsum.text:230 diff --git a/nl/tsum.po b/nl/tsum.po index 6b8fc2b..2ef5290 100644 --- a/nl/tsum.po +++ b/nl/tsum.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-10-17 13:23+0200\n" -"PO-Revision-Date: 2011-10-17 12:41+0000\n" +"PO-Revision-Date: 2011-10-17 12:51+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -496,6 +496,8 @@ msgid "" "community-support(a)lists.torproject.org and include the relevant parts from " "the log file." msgstr "" +"Als je hulp nodig hebt met uitzoeken waarom Tor geen verbinding kan krijgen," +" stuur dan een e-mail naar community-support(a)lists.torproject.org en voeg " #. type: Plain text #: tsum.text:189 @@ -508,6 +510,13 @@ msgid "" "you will not get a reply. Note that you need to send this email from either " "a gmail.com or a yahoo.com address." msgstr "" +"### Hoe een bridge te vinden Om een bridge te gebruiken moet je er eerst één" +" vinden; je kunt naar " +"[bridges.torproject.org](https://bridges.torproject.org/) gaan, of je kunt " +"een email sturen naar bridges(a)torproject.org. Als je een e-mail stuurt, zorg" +" er dan voor dat je **get bridges** in de body van de e-mail zet. Zonder dit" +" krijg je geen bericht terug. Let op dat je deze e-mail van, of een " +"gmail.com adres, of een yahoo.com adres moet sturen." #. type: Plain text #: tsum.text:194 @@ -592,6 +601,9 @@ msgid "" "common questions. If your question is not mentioned here, please send an " "email to community-support(a)lists.torproject.org." msgstr "" +"## Veelgestelde vragen Dit onderdeel zal een paar van de meest gestelde " +"vragen beantwoorden. Als je vraag hier niet genoemd wordt, stuur dan een " +"e-mail naar community-support(a)lists.torproject.org." #. type: Plain text #: tsum.text:230

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 17 Oct '11

17 Oct '11

commit 240aea608045b75d98f0274e358f247204127c80 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 17 12:45:39 2011 +0000 Update translations for tsum --- ar/tsum.po | 38 +++++++++++++-------------------- cs/tsum.po | 51 ++++++++++++++------------------------------ de/tsum.po | 42 ++++++++++++++---------------------- el/tsum.po | 32 ++++++++++++++-------------- en/tsum.pot | 56 ++++++++++++++++++++++++------------------------ es/tsum.po | 62 ++++++++++++++---------------------------------------- fa/tsum.po | 62 ++++++++++++++---------------------------------------- fr/tsum.po | 67 ++++++++++++++-------------------------------------------- hu/tsum.po | 65 ++++++++++++++------------------------------------------- it/tsum.po | 30 +++++++++++++------------- nl/tsum.po | 61 +++++++++++++++++++++++------------------------------ pt/tsum.po | 42 +++++++++++++----------------------- ru/tsum.po | 30 +++++++++++++------------- zh/tsum.po | 30 +++++++++++++------------- 14 files changed, 242 insertions(+), 426 deletions(-) diff --git a/ar/tsum.po b/ar/tsum.po index b030f37..acb3616 100644 --- a/ar/tsum.po +++ b/ar/tsum.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-10-15 14:16+0200\n" -"PO-Revision-Date: 2011-10-15 13:20+0000\n" +"POT-Creation-Date: 2011-10-17 13:23+0200\n" +"PO-Revision-Date: 2011-10-17 12:25+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -29,11 +29,9 @@ msgstr "دليل المستخدم المختصر" msgid "" "This user manual contains information about how to download Tor, how to use " "it, and what to do if Tor is unable to connect to the network. If you can't " -"find the answer to your question in this document, email <community-" -"support(a)lists.torproject.org>." +"find the answer to your question in this document, email community-" +"support(a)lists.torproject.org." msgstr "" -"يتضمّن دليل المستخدم هذا على معلومات تخصّ كيفيّة تنزيل طور, كيفيّة استخدامه, وكيفيّة حلّ المشاكل المتعلّقة بالاتّصال بالشّبكة. ان لم تستطع الحصول على إجابة عاى سؤالك, إبعث بريد الكتروني على\n" -"<community-support(a)lists.torproject.org>. " #. type: Plain text #: tsum.text:9 @@ -115,12 +113,9 @@ msgstr "" #: tsum.text:49 msgid "" "### How to get Tor via email To receive the English Tor Browser Bundle for " -"Windows, send an email to <gettor(a)torproject.org> with **windows** in the " -"body of the message. You can leave the subject blank." +"Windows, send an email to gettor(a)torproject.org with **windows** in the body" +" of the message. You can leave the subject blank." msgstr "" -"### كيف تحصل على طور عبر البريد الالكتروني من أجل استلام النسخة الانجليزية " -"من حزمة متصفح طور لنظام ويندوز, ارسل بريد الى <gettor(a)torproject.org> مع " -"**windows** في نص الرسالة. يمكنك ترك الموضوع فارغاً." #. type: Plain text #: tsum.text:53 @@ -146,7 +141,7 @@ msgid "" "**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n" "large, and you will not be able to receive any of these bundles with a\n" "Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n" -"want, send an email to <community-support(a)lists.torproject.org> and we\n" +"want, send an email to community-support(a)lists.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" @@ -163,8 +158,8 @@ msgstr "" #. type: Plain text #: tsum.text:72 msgid "" -"Send an email to <gettor(a)torproject.org> with the following words in the " -"body of the email:" +"Send an email to gettor(a)torproject.org with the following words in the body " +"of the email:" msgstr "" #. type: Plain text @@ -306,8 +301,8 @@ msgid "" "The output should say *\"Good signature\"*. A bad signature means that the " "file may have been tampered with. If you see a bad signature, send details " "about where you downloaded the package from, how you verified the signature," -" and the output from GnuPG in an email to <community-" -"support(a)lists.torproject.org>." +" and the output from GnuPG in an email to community-" +"support(a)lists.torproject.org." msgstr "" #. type: Plain text @@ -415,12 +410,9 @@ msgstr "" #: tsum.text:181 msgid "" "If you need help with figuring out why Tor can't connect, send an email to " -"<community-support(a)lists.torproject.org> and include the relevant parts from" -" the log file." +"community-support(a)lists.torproject.org and include the relevant parts from " +"the log file." msgstr "" -"اذا احتجت الى مساعدة لمعرفة لماذا طور لا يستطيع الاتصال, ارسل بريد الى " -"<community-support(a)lists.torproject.org> وارفق معه الأجزاء المتعلقة من ملف " -"السجل" #. type: Plain text #: tsum.text:189 @@ -428,7 +420,7 @@ msgid "" "### How to find a bridge To use a bridge, you will first have to locate one;" " you can either browse to " "[bridges.torproject.org](https://bridges.torproject.org/), or you can send " -"an email to <bridges(a)torproject.org>. If you do send an email, please make " +"an email to bridges(a)torproject.org. If you do send an email, please make " "sure that you write **get bridges** in the body of the email. Without this, " "you will not get a reply. Note that you need to send this email from either " "a gmail.com or a yahoo.com address." @@ -499,7 +491,7 @@ msgstr "" msgid "" "## Frequently Asked Questions This section will answer some of the most " "common questions. If your question is not mentioned here, please send an " -"email to <community-support(a)lists.torproject.org>." +"email to community-support(a)lists.torproject.org." msgstr "" #. type: Plain text diff --git a/cs/tsum.po b/cs/tsum.po index 6f640b1..44c1250 100644 --- a/cs/tsum.po +++ b/cs/tsum.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-10-15 14:16+0200\n" -"PO-Revision-Date: 2011-10-16 17:10+0000\n" -"Last-Translator: Sanky <gsanky+transifex(a)gmail.com>\n" +"POT-Creation-Date: 2011-10-17 13:23+0200\n" +"PO-Revision-Date: 2011-10-17 12:25+0000\n" +"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,13 +28,9 @@ msgstr "# Krátký uživatelský manuál" msgid "" "This user manual contains information about how to download Tor, how to use " "it, and what to do if Tor is unable to connect to the network. If you can't " -"find the answer to your question in this document, email <community-" -"support(a)lists.torproject.org>." +"find the answer to your question in this document, email community-" +"support(a)lists.torproject.org." msgstr "" -"Tento uživatelský manuál obsahuje informace o stažení Toru, jeho použití, a " -"co dělat v případě, že se Toru nepodaří připojit se k síti. Pokud v tomto " -"dokumentu nenaleznete odpověď na svou otázku, napište email na <community-" -"support(a)lists.torproject.org> (anglicky)." #. type: Plain text #: tsum.text:9 @@ -138,11 +134,9 @@ msgstr "" #: tsum.text:49 msgid "" "### How to get Tor via email To receive the English Tor Browser Bundle for " -"Windows, send an email to <gettor(a)torproject.org> with **windows** in the " -"body of the message. You can leave the subject blank." +"Windows, send an email to gettor(a)torproject.org with **windows** in the body" +" of the message. You can leave the subject blank." msgstr "" -"### Jak obdržet Tor skrz email\n" -"Pro obdržení anglického Tor Browser Bundle pro Windows pošlete email na <gettor(a)torproject.org> s **windows** v tělu zprávy. Předmět může zůstat prázdný." #. type: Plain text #: tsum.text:53 @@ -171,13 +165,9 @@ msgid "" "**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n" "large, and you will not be able to receive any of these bundles with a\n" "Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n" -"want, send an email to <community-support(a)lists.torproject.org> and we\n" +"want, send an email to community-support(a)lists.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" -"**Poznámka**: Tor Browser Bundle pro Linux a Mac OS X jsou poměrně velké a " -"není možné je přijmout s účtem u Gmailu, Hotmailu či Yahoo. Pokud nemůžete " -"obdržet balíček co chcete, napište email na <community-" -"support(a)lists.torproject.org> a dáme vám seznam mirrorů.\n" #. type: Plain text #: tsum.text:69 @@ -192,8 +182,8 @@ msgstr "" #. type: Plain text #: tsum.text:72 msgid "" -"Send an email to <gettor(a)torproject.org> with the following words in the " -"body of the email:" +"Send an email to gettor(a)torproject.org with the following words in the body " +"of the email:" msgstr "" #. type: Plain text @@ -341,13 +331,9 @@ msgid "" "The output should say *\"Good signature\"*. A bad signature means that the " "file may have been tampered with. If you see a bad signature, send details " "about where you downloaded the package from, how you verified the signature," -" and the output from GnuPG in an email to <community-" -"support(a)lists.torproject.org>." +" and the output from GnuPG in an email to community-" +"support(a)lists.torproject.org." msgstr "" -"Výstup by měl ohlásit *\"Good signature\"* (podpis v pořádku). Špatný podpis" -" by mohl znamenat, že do souboru mohl někdo zasahovat. Pokud zahlédnete " -"špatný podpis, pošlete detaily o tom kde jste balík stáhli, jak jste ho " -"věřovali, a výstup GnuPG na <community-support(a)lists.torproject.org>." #. type: Plain text #: tsum.text:133 @@ -476,12 +462,9 @@ msgstr "" #: tsum.text:181 msgid "" "If you need help with figuring out why Tor can't connect, send an email to " -"<community-support(a)lists.torproject.org> and include the relevant parts from" -" the log file." +"community-support(a)lists.torproject.org and include the relevant parts from " +"the log file." msgstr "" -"Pokud potřebujete pomoc při zjišťování proč se Tor nemůže připojit, napište " -"email na <community-support(a)lists.torproject.org> a přiložte relevantní " -"části z logů." #. type: Plain text #: tsum.text:189 @@ -489,13 +472,11 @@ msgid "" "### How to find a bridge To use a bridge, you will first have to locate one;" " you can either browse to " "[bridges.torproject.org](https://bridges.torproject.org/), or you can send " -"an email to <bridges(a)torproject.org>. If you do send an email, please make " +"an email to bridges(a)torproject.org. If you do send an email, please make " "sure that you write **get bridges** in the body of the email. Without this, " "you will not get a reply. Note that you need to send this email from either " "a gmail.com or a yahoo.com address." msgstr "" -"### Jak najít most\n" -"K použití mostu je nejprve potřeba nějaký najít; můžete buď se podívat na [bridges.torproject.org](https://bridges.torproject.org/), nebo pošlete email na <bridges(a)torproject.org>. Pokud budete posílat email, ujistěte se prosím že napíšete **get bridges** do těla emailu, jinak nedostanete odpověď. Tento email je nutno poslat buď z gmail.com nebo yahoo.com adresy." #. type: Plain text #: tsum.text:194 @@ -568,7 +549,7 @@ msgstr "" msgid "" "## Frequently Asked Questions This section will answer some of the most " "common questions. If your question is not mentioned here, please send an " -"email to <community-support(a)lists.torproject.org>." +"email to community-support(a)lists.torproject.org." msgstr "" #. type: Plain text diff --git a/de/tsum.po b/de/tsum.po index 2459516..ac713a9 100644 --- a/de/tsum.po +++ b/de/tsum.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-10-15 14:16+0200\n" -"PO-Revision-Date: 2011-10-15 14:05+0000\n" -"Last-Translator: identity <eeemsi(a)googlemail.com>\n" +"POT-Creation-Date: 2011-10-17 13:23+0200\n" +"PO-Revision-Date: 2011-10-17 12:25+0000\n" +"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,14 +30,9 @@ msgstr "# Das Kurze Anwenderhandbuch" msgid "" "This user manual contains information about how to download Tor, how to use " "it, and what to do if Tor is unable to connect to the network. If you can't " -"find the answer to your question in this document, email <community-" -"support(a)lists.torproject.org>." +"find the answer to your question in this document, email community-" +"support(a)lists.torproject.org." msgstr "" -"Dieses Anwenderhandbuch enthält Informationen darüber, wie man Tor " -"herunterlädt, verwendet und was man tun kann, wenn Tor sich nicht mit den " -"Netzwerk verbinden kann. Wenn du in diesem Dokument keine Antwort auf deine " -"Frage finden kannst schicke eine E-Mail an <community-" -"support(a)lists.torproject.org>." #. type: Plain text #: tsum.text:9 @@ -143,12 +138,9 @@ msgstr "" #: tsum.text:49 msgid "" "### How to get Tor via email To receive the English Tor Browser Bundle for " -"Windows, send an email to <gettor(a)torproject.org> with **windows** in the " -"body of the message. You can leave the subject blank." +"Windows, send an email to gettor(a)torproject.org with **windows** in the body" +" of the message. You can leave the subject blank." msgstr "" -"### Wie man Tor via E-Mail das englische Tor Browser Bundle für Windows " -"erhalten kann kann. Sende eine E-Mail mit **windows** in der Mail an " -"<gettor(a)torproject.org>. Du kannst den Betreff leer lassen." #. type: Plain text #: tsum.text:53 @@ -178,7 +170,7 @@ msgid "" "**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n" "large, and you will not be able to receive any of these bundles with a\n" "Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n" -"want, send an email to <community-support(a)lists.torproject.org> and we\n" +"want, send an email to community-support(a)lists.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" @@ -195,11 +187,9 @@ msgstr "" #. type: Plain text #: tsum.text:72 msgid "" -"Send an email to <gettor(a)torproject.org> with the following words in the " -"body of the email:" +"Send an email to gettor(a)torproject.org with the following words in the body " +"of the email:" msgstr "" -"Sende eine email an <gettor(a)torproject.org>, die die folgenden Wörter " -"enthält:" #. type: Plain text #: tsum.text:75 @@ -342,8 +332,8 @@ msgid "" "The output should say *\"Good signature\"*. A bad signature means that the " "file may have been tampered with. If you see a bad signature, send details " "about where you downloaded the package from, how you verified the signature," -" and the output from GnuPG in an email to <community-" -"support(a)lists.torproject.org>." +" and the output from GnuPG in an email to community-" +"support(a)lists.torproject.org." msgstr "" #. type: Plain text @@ -450,8 +440,8 @@ msgstr "" #: tsum.text:181 msgid "" "If you need help with figuring out why Tor can't connect, send an email to " -"<community-support(a)lists.torproject.org> and include the relevant parts from" -" the log file." +"community-support(a)lists.torproject.org and include the relevant parts from " +"the log file." msgstr "" #. type: Plain text @@ -460,7 +450,7 @@ msgid "" "### How to find a bridge To use a bridge, you will first have to locate one;" " you can either browse to " "[bridges.torproject.org](https://bridges.torproject.org/), or you can send " -"an email to <bridges(a)torproject.org>. If you do send an email, please make " +"an email to bridges(a)torproject.org. If you do send an email, please make " "sure that you write **get bridges** in the body of the email. Without this, " "you will not get a reply. Note that you need to send this email from either " "a gmail.com or a yahoo.com address." @@ -531,7 +521,7 @@ msgstr "" msgid "" "## Frequently Asked Questions This section will answer some of the most " "common questions. If your question is not mentioned here, please send an " -"email to <community-support(a)lists.torproject.org>." +"email to community-support(a)lists.torproject.org." msgstr "" #. type: Plain text diff --git a/el/tsum.po b/el/tsum.po index d455f5f..4626172 100644 --- a/el/tsum.po +++ b/el/tsum.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-10-15 14:16+0200\n" -"PO-Revision-Date: 2011-10-15 13:36+0000\n" -"Last-Translator: cirrus <cirrus.spam(a)gmail.com>\n" +"POT-Creation-Date: 2011-10-17 13:23+0200\n" +"PO-Revision-Date: 2011-10-17 12:25+0000\n" +"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,8 +28,8 @@ msgstr "# Σύντομες οδηγίες χρήσης" msgid "" "This user manual contains information about how to download Tor, how to use " "it, and what to do if Tor is unable to connect to the network. If you can't " -"find the answer to your question in this document, email <community-" -"support(a)lists.torproject.org>." +"find the answer to your question in this document, email community-" +"support(a)lists.torproject.org." msgstr "" #. type: Plain text @@ -113,8 +113,8 @@ msgstr "" #: tsum.text:49 msgid "" "### How to get Tor via email To receive the English Tor Browser Bundle for " -"Windows, send an email to <gettor(a)torproject.org> with **windows** in the " -"body of the message. You can leave the subject blank." +"Windows, send an email to gettor(a)torproject.org with **windows** in the body" +" of the message. You can leave the subject blank." msgstr "" #. type: Plain text @@ -139,7 +139,7 @@ msgid "" "**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n" "large, and you will not be able to receive any of these bundles with a\n" "Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n" -"want, send an email to <community-support(a)lists.torproject.org> and we\n" +"want, send an email to community-support(a)lists.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" @@ -156,8 +156,8 @@ msgstr "" #. type: Plain text #: tsum.text:72 msgid "" -"Send an email to <gettor(a)torproject.org> with the following words in the " -"body of the email:" +"Send an email to gettor(a)torproject.org with the following words in the body " +"of the email:" msgstr "" #. type: Plain text @@ -280,8 +280,8 @@ msgid "" "The output should say *\"Good signature\"*. A bad signature means that the " "file may have been tampered with. If you see a bad signature, send details " "about where you downloaded the package from, how you verified the signature," -" and the output from GnuPG in an email to <community-" -"support(a)lists.torproject.org>." +" and the output from GnuPG in an email to community-" +"support(a)lists.torproject.org." msgstr "" #. type: Plain text @@ -380,8 +380,8 @@ msgstr "" #: tsum.text:181 msgid "" "If you need help with figuring out why Tor can't connect, send an email to " -"<community-support(a)lists.torproject.org> and include the relevant parts from" -" the log file." +"community-support(a)lists.torproject.org and include the relevant parts from " +"the log file." msgstr "" #. type: Plain text @@ -390,7 +390,7 @@ msgid "" "### How to find a bridge To use a bridge, you will first have to locate one;" " you can either browse to " "[bridges.torproject.org](https://bridges.torproject.org/), or you can send " -"an email to <bridges(a)torproject.org>. If you do send an email, please make " +"an email to bridges(a)torproject.org. If you do send an email, please make " "sure that you write **get bridges** in the body of the email. Without this, " "you will not get a reply. Note that you need to send this email from either " "a gmail.com or a yahoo.com address." @@ -461,7 +461,7 @@ msgstr "" msgid "" "## Frequently Asked Questions This section will answer some of the most " "common questions. If your question is not mentioned here, please send an " -"email to <community-support(a)lists.torproject.org>." +"email to community-support(a)lists.torproject.org." msgstr "" #. type: Plain text diff --git a/en/tsum.pot b/en/tsum.pot index 3aff65e..4bab226 100644 --- a/en/tsum.pot +++ b/en/tsum.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-10-15 14:16+0200\n" -"PO-Revision-Date: 2011-10-15 13:20+0000\n" +"POT-Creation-Date: 2011-10-17 13:23+0200\n" +"PO-Revision-Date: 2011-10-17 12:25+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -27,13 +27,13 @@ msgstr "# The Short User Manual" msgid "" "This user manual contains information about how to download Tor, how to use " "it, and what to do if Tor is unable to connect to the network. If you can't " -"find the answer to your question in this document, email <community-" -"support(a)lists.torproject.org>." +"find the answer to your question in this document, email community-" +"support(a)lists.torproject.org." msgstr "" "This user manual contains information about how to download Tor, how to use " "it, and what to do if Tor is unable to connect to the network. If you can't " -"find the answer to your question in this document, email <community-" -"support(a)lists.torproject.org>." +"find the answer to your question in this document, email community-" +"support(a)lists.torproject.org." #. type: Plain text #: tsum.text:9 @@ -138,12 +138,12 @@ msgstr "" #: tsum.text:49 msgid "" "### How to get Tor via email To receive the English Tor Browser Bundle for " -"Windows, send an email to <gettor(a)torproject.org> with **windows** in the " -"body of the message. You can leave the subject blank." +"Windows, send an email to gettor(a)torproject.org with **windows** in the body" +" of the message. You can leave the subject blank." msgstr "" "### How to get Tor via email To receive the English Tor Browser Bundle for " -"Windows, send an email to <gettor(a)torproject.org> with **windows** in the " -"body of the message. You can leave the subject blank." +"Windows, send an email to gettor(a)torproject.org with **windows** in the body" +" of the message. You can leave the subject blank." #. type: Plain text #: tsum.text:53 @@ -172,13 +172,13 @@ msgid "" "**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n" "large, and you will not be able to receive any of these bundles with a\n" "Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n" -"want, send an email to <community-support(a)lists.torproject.org> and we\n" +"want, send an email to community-support(a)lists.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" "**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n" "large, and you will not be able to receive any of these bundles with a\n" "Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n" -"want, send an email to <community-support(a)lists.torproject.org> and we\n" +"want, send an email to community-support(a)lists.torproject.org and we\n" "will give you a list of website mirrors to use.\n" #. type: Plain text @@ -199,11 +199,11 @@ msgstr "" #. type: Plain text #: tsum.text:72 msgid "" -"Send an email to <gettor(a)torproject.org> with the following words in the " -"body of the email:" +"Send an email to gettor(a)torproject.org with the following words in the body " +"of the email:" msgstr "" -"Send an email to <gettor(a)torproject.org> with the following words in the " -"body of the email:" +"Send an email to gettor(a)torproject.org with the following words in the body " +"of the email:" #. type: Plain text #: tsum.text:75 @@ -353,14 +353,14 @@ msgid "" "The output should say *\"Good signature\"*. A bad signature means that the " "file may have been tampered with. If you see a bad signature, send details " "about where you downloaded the package from, how you verified the signature," -" and the output from GnuPG in an email to <community-" -"support(a)lists.torproject.org>." +" and the output from GnuPG in an email to community-" +"support(a)lists.torproject.org." msgstr "" "The output should say *\"Good signature\"*. A bad signature means that the " "file may have been tampered with. If you see a bad signature, send details " "about where you downloaded the package from, how you verified the signature," -" and the output from GnuPG in an email to <community-" -"support(a)lists.torproject.org>." +" and the output from GnuPG in an email to community-" +"support(a)lists.torproject.org." #. type: Plain text #: tsum.text:133 @@ -496,12 +496,12 @@ msgstr "" #: tsum.text:181 msgid "" "If you need help with figuring out why Tor can't connect, send an email to " -"<community-support(a)lists.torproject.org> and include the relevant parts from" -" the log file." +"community-support(a)lists.torproject.org and include the relevant parts from " +"the log file." msgstr "" "If you need help with figuring out why Tor can't connect, send an email to " -"<community-support(a)lists.torproject.org> and include the relevant parts from" -" the log file." +"community-support(a)lists.torproject.org and include the relevant parts from " +"the log file." #. type: Plain text #: tsum.text:189 @@ -509,7 +509,7 @@ msgid "" "### How to find a bridge To use a bridge, you will first have to locate one;" " you can either browse to " "[bridges.torproject.org](https://bridges.torproject.org/), or you can send " -"an email to <bridges(a)torproject.org>. If you do send an email, please make " +"an email to bridges(a)torproject.org. If you do send an email, please make " "sure that you write **get bridges** in the body of the email. Without this, " "you will not get a reply. Note that you need to send this email from either " "a gmail.com or a yahoo.com address." @@ -517,7 +517,7 @@ msgstr "" "### How to find a bridge To use a bridge, you will first have to locate one;" " you can either browse to " "[bridges.torproject.org](https://bridges.torproject.org/), or you can send " -"an email to <bridges(a)torproject.org>. If you do send an email, please make " +"an email to bridges(a)torproject.org. If you do send an email, please make " "sure that you write **get bridges** in the body of the email. Without this, " "you will not get a reply. Note that you need to send this email from either " "a gmail.com or a yahoo.com address." @@ -611,11 +611,11 @@ msgstr "" msgid "" "## Frequently Asked Questions This section will answer some of the most " "common questions. If your question is not mentioned here, please send an " -"email to <community-support(a)lists.torproject.org>." +"email to community-support(a)lists.torproject.org." msgstr "" "## Frequently Asked Questions This section will answer some of the most " "common questions. If your question is not mentioned here, please send an " -"email to <community-support(a)lists.torproject.org>." +"email to community-support(a)lists.torproject.org." #. type: Plain text #: tsum.text:230 diff --git a/es/tsum.po b/es/tsum.po index 18cd259..1fa7c47 100644 --- a/es/tsum.po +++ b/es/tsum.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-10-15 14:16+0200\n" -"PO-Revision-Date: 2011-10-15 15:37+0000\n" -"Last-Translator: guido <guido(a)bruo.org>\n" +"POT-Creation-Date: 2011-10-17 13:23+0200\n" +"PO-Revision-Date: 2011-10-17 12:25+0000\n" +"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,13 +30,9 @@ msgstr "# Breve Manual de Usuario" msgid "" "This user manual contains information about how to download Tor, how to use " "it, and what to do if Tor is unable to connect to the network. If you can't " -"find the answer to your question in this document, email <community-" -"support(a)lists.torproject.org>." +"find the answer to your question in this document, email community-" +"support(a)lists.torproject.org." msgstr "" -"Este manual de uso contiene información sobre cómo descargar Tor, cómo " -"usarlo y qué hacer si Tor no puede conectarse a la red. Si usted no " -"encontrara la respuesta a su pregunta en este documento, envíe un correo a " -"<community-support(a)lists.torproject.org>." #. type: Plain text #: tsum.text:9 @@ -142,13 +138,9 @@ msgstr "" #: tsum.text:49 msgid "" "### How to get Tor via email To receive the English Tor Browser Bundle for " -"Windows, send an email to <gettor(a)torproject.org> with **windows** in the " -"body of the message. You can leave the subject blank." +"Windows, send an email to gettor(a)torproject.org with **windows** in the body" +" of the message. You can leave the subject blank." msgstr "" -"### Cómo obtener Tor vía correo electrónico Para recibir el Paquete del " -"navegador Tor en inglés para Windows, envíe un correo electrónico a " -"<gettor(a)torproject.org> con **windows** en el cuerpo del mensaje. Puede " -"dejar el campo de Asunto vacío." #. type: Plain text #: tsum.text:53 @@ -178,11 +170,9 @@ msgid "" "**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n" "large, and you will not be able to receive any of these bundles with a\n" "Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n" -"want, send an email to <community-support(a)lists.torproject.org> and we\n" +"want, send an email to community-support(a)lists.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" -"**Nota**: Los Paquetes del navegador Tor para Linux y Mac OS X son bastante pesados y no podrá recibir ninguno de ellos con una\n" -"cuenta de GMail, Hotmail o Yahoo. Si usted no puede recibir el paquete que desea, envíe un correo a <community-support(a)lists.torproject.org> y le daremos una lista de sitios web allternativos donde realizar la descarga.\n" #. type: Plain text #: tsum.text:69 @@ -201,11 +191,9 @@ msgstr "" #. type: Plain text #: tsum.text:72 msgid "" -"Send an email to <gettor(a)torproject.org> with the following words in the " -"body of the email:" +"Send an email to gettor(a)torproject.org with the following words in the body " +"of the email:" msgstr "" -"Envíe un correo a <gettor(a)torproject.org> con las siguientes palabras en el " -"cuerpo del mensaje:" #. type: Plain text #: tsum.text:75 @@ -356,14 +344,9 @@ msgid "" "The output should say *\"Good signature\"*. A bad signature means that the " "file may have been tampered with. If you see a bad signature, send details " "about where you downloaded the package from, how you verified the signature," -" and the output from GnuPG in an email to <community-" -"support(a)lists.torproject.org>." +" and the output from GnuPG in an email to community-" +"support(a)lists.torproject.org." msgstr "" -"La salida debe decir *\"Good signature\"* (Firma correcta). Una firma " -"incorrecta significa que el archivo pudo haber sido intervenido. Si usted ve" -" una firma errónea, envíe los detalles acerca del origen de la descarga, " -"cómo verificó la firma y la salida de GnuPG en un correo electrónico a " -"<community-support(a)lists.torproject.org>." #. type: Plain text #: tsum.text:133 @@ -501,12 +484,9 @@ msgstr "" #: tsum.text:181 msgid "" "If you need help with figuring out why Tor can't connect, send an email to " -"<community-support(a)lists.torproject.org> and include the relevant parts from" -" the log file." +"community-support(a)lists.torproject.org and include the relevant parts from " +"the log file." msgstr "" -"Si usted necesita ayuda para saber por qué Tor no puede conectar, envíe un " -"correo a <community-support(a)lists.torproject.org> e incluya las partes " -"relevantes del registro de mensajes." #. type: Plain text #: tsum.text:189 @@ -514,18 +494,11 @@ msgid "" "### How to find a bridge To use a bridge, you will first have to locate one;" " you can either browse to " "[bridges.torproject.org](https://bridges.torproject.org/), or you can send " -"an email to <bridges(a)torproject.org>. If you do send an email, please make " +"an email to bridges(a)torproject.org. If you do send an email, please make " "sure that you write **get bridges** in the body of the email. Without this, " "you will not get a reply. Note that you need to send this email from either " "a gmail.com or a yahoo.com address." msgstr "" -"### Cómo encontrar un Puente Para usar un puente, usted necesita primero " -"encontrar uno; para ello puede ingresar a " -"[bridges.torproject.org](https://bridges.torproject.org/), o enviar un " -"correo a <bridges(a)torproject.org>. Si decide enviar un correo, asegúrese de " -"escribir **get bridges** en el cuerpo del mensaje. Sin eso no obtendrá " -"respuesta. Nota: usted necesita hacer esto desde una cuenta de correo en " -"gmail.com o yahoo.com." #. type: Plain text #: tsum.text:194 @@ -613,11 +586,8 @@ msgstr "" msgid "" "## Frequently Asked Questions This section will answer some of the most " "common questions. If your question is not mentioned here, please send an " -"email to <community-support(a)lists.torproject.org>." +"email to community-support(a)lists.torproject.org." msgstr "" -"## Preguntas Frecuentes Esta sección respondera algunas de las preguntas más" -" comunes. Si su duda no está respondida aquí, por favor envíe un correo a " -"<community-support(a)lists.torproject.org>." #. type: Plain text #: tsum.text:230 diff --git a/fa/tsum.po b/fa/tsum.po index 79f6869..b85b775 100644 --- a/fa/tsum.po +++ b/fa/tsum.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-10-15 14:16+0200\n" -"PO-Revision-Date: 2011-10-15 14:08+0000\n" -"Last-Translator: hamidthegreat <hamid.azimy(a)gmail.com>\n" +"POT-Creation-Date: 2011-10-17 13:23+0200\n" +"PO-Revision-Date: 2011-10-17 12:25+0000\n" +"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,13 +30,9 @@ msgstr "# راهنمای کاربری کوتاه" msgid "" "This user manual contains information about how to download Tor, how to use " "it, and what to do if Tor is unable to connect to the network. If you can't " -"find the answer to your question in this document, email <community-" -"support(a)lists.torproject.org>." +"find the answer to your question in this document, email community-" +"support(a)lists.torproject.org." msgstr "" -"این راهنمای کاربری حاوی اطلاعاتی است درباره دانلود تور، استفاده از آن و " -"اینکه در صورت وصل نشدن تور به شبکه باید چه کار کنید. اگر نمی‌توانید پاسخ " -"سوال خود در این راهنما پیدا کنید، به <community-" -"support(a)lists.torproject.org> ایمیل بزنید. " #. type: Plain text #: tsum.text:9 @@ -141,12 +137,9 @@ msgstr "" #: tsum.text:49 msgid "" "### How to get Tor via email To receive the English Tor Browser Bundle for " -"Windows, send an email to <gettor(a)torproject.org> with **windows** in the " -"body of the message. You can leave the subject blank." +"Windows, send an email to gettor(a)torproject.org with **windows** in the body" +" of the message. You can leave the subject blank." msgstr "" -"### چگونه تور را از راه ایمیل دریافت کنیم برای دریافت بسته انگلیسی تور برای " -"ویندوز، ایمیلی به <gettor(a)torproject.org> با ذکر کلمه **windows** در درون " -"ایمیل بفرستید. می‌توانید subject را خالی بگذارید." #. type: Plain text #: tsum.text:53 @@ -176,13 +169,9 @@ msgid "" "**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n" "large, and you will not be able to receive any of these bundles with a\n" "Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n" -"want, send an email to <community-support(a)lists.torproject.org> and we\n" +"want, send an email to community-support(a)lists.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" -"**نکته**: بسته مرورگر تور برای گنو/لینوکس و مک‌اواس‌اکس نسبتا بزرگ است،\n" -"و شما نخواهید توانست آن را به وسیله‌ی جی‌میل، هات‌میل یا یاهو دریافت کنید.\n" -"اگر شما نتوانستید بسته‌ای را که خواسته‌اید دریافت کنید، یه ایمیل به <community-support(a)lists.torproject.org> بفرستید\n" -"و ما لیستی از وب‌سایت‌هایی که می‌توانید از آنها دانلود کنید را برای استفاده‌تان می‌فرستیم.\n" #. type: Plain text #: tsum.text:69 @@ -202,11 +191,9 @@ msgstr "" #. type: Plain text #: tsum.text:72 msgid "" -"Send an email to <gettor(a)torproject.org> with the following words in the " -"body of the email:" +"Send an email to gettor(a)torproject.org with the following words in the body " +"of the email:" msgstr "" -"یک ایمیل به <gettor(a)torproject.org> بزنید و در بدنه‌ی آن کلمات زیر را " -"بنویسید:" #. type: Plain text #: tsum.text:75 @@ -356,13 +343,9 @@ msgid "" "The output should say *\"Good signature\"*. A bad signature means that the " "file may have been tampered with. If you see a bad signature, send details " "about where you downloaded the package from, how you verified the signature," -" and the output from GnuPG in an email to <community-" -"support(a)lists.torproject.org>." +" and the output from GnuPG in an email to community-" +"support(a)lists.torproject.org." msgstr "" -"خروجی باید بگوید *\"Good signature\"*. یک امضای بد یعنی فایل ممکن است " -"دستکاری شده باشد. اگر شما یه امضای بد دیدید، جزییات این که فایل را از کجا " -"دانلود کردید، چگونه امضا را بررسی کردید، و خروجی GnuPG را به نشانی " -"<community-support(a)lists.torproject.org> ایمیل بزنید." #. type: Plain text #: tsum.text:133 @@ -498,12 +481,9 @@ msgstr "" #: tsum.text:181 msgid "" "If you need help with figuring out why Tor can't connect, send an email to " -"<community-support(a)lists.torproject.org> and include the relevant parts from" -" the log file." +"community-support(a)lists.torproject.org and include the relevant parts from " +"the log file." msgstr "" -"اگر شما برای این که بفهمید چرا تور متصل نمی‌شود، مشکل داشتید، یک ایمیل به " -"<community-support(a)lists.torproject.org> بفرستید و در آن قسمت مربوطه از فایل" -" لاگ را قرار دهید." #. type: Plain text #: tsum.text:189 @@ -511,18 +491,11 @@ msgid "" "### How to find a bridge To use a bridge, you will first have to locate one;" " you can either browse to " "[bridges.torproject.org](https://bridges.torproject.org/), or you can send " -"an email to <bridges(a)torproject.org>. If you do send an email, please make " +"an email to bridges(a)torproject.org. If you do send an email, please make " "sure that you write **get bridges** in the body of the email. Without this, " "you will not get a reply. Note that you need to send this email from either " "a gmail.com or a yahoo.com address." msgstr "" -"### چگونه یک پل پیدا کنیم برای استفاده از یک پل، شما ابتدا باید یک پل را " -"مکان‌یابی کنید؛ برای این کار می‌توانید به " -"[bridges.torproject.org](https://bridges.torproject.org/) بروید یا این که یک" -" ایمیل به <bridges(a)torproject.org> بفرستید. اگر می‌خواهید ایمیل ارسال کنید* " -"اطمینان حاصل کنید که در قسمت بدنه‌ی ایمیل، کلمه‌ی **get bridges** را " -"نوشته‌اید. بدون این، شما پاسخی دریافت نخواهید کرد. به این نکته توجه کنید که " -"لازم است شما این ایمیل را از آدرس‌های جی‌میل یا یاهو بفرستید." #. type: Plain text #: tsum.text:194 @@ -612,11 +585,8 @@ msgstr "" msgid "" "## Frequently Asked Questions This section will answer some of the most " "common questions. If your question is not mentioned here, please send an " -"email to <community-support(a)lists.torproject.org>." +"email to community-support(a)lists.torproject.org." msgstr "" -"سوالات متداول. این قسمت به برخی از سوالات بسیار متداول و مشترک پاسخ خواهد " -"داد. اگر سوال شما در این جا ذکر نشده بود، لطفا به <community-" -"support(a)lists.torproject.org> ایمیل بزنید." #. type: Plain text #: tsum.text:230 diff --git a/fr/tsum.po b/fr/tsum.po index d25cae2..7906e6a 100644 --- a/fr/tsum.po +++ b/fr/tsum.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-10-15 14:16+0200\n" -"PO-Revision-Date: 2011-10-15 13:50+0000\n" -"Last-Translator: Pouknouki <pouknouki(a)gmail.com>\n" +"POT-Creation-Date: 2011-10-17 13:23+0200\n" +"PO-Revision-Date: 2011-10-17 12:25+0000\n" +"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,14 +34,9 @@ msgstr "# Manuel Utilisateur Simple" msgid "" "This user manual contains information about how to download Tor, how to use " "it, and what to do if Tor is unable to connect to the network. If you can't " -"find the answer to your question in this document, email <community-" -"support(a)lists.torproject.org>." +"find the answer to your question in this document, email community-" +"support(a)lists.torproject.org." msgstr "" -"Ce manuel utilisateur contient des indications pour le téléchargement de " -"Tor, son utilisation et sur ce qu'il faut faire si Tor n'est plus en mesure " -"de se connecter au réseau. Si vous ne trouvez de réponse à vos questions " -"dans ce document, alors envoyez un mail à <-community-" -"support(a)lists.torproject.org>. " #. type: Plain text #: tsum.text:9 @@ -150,13 +145,9 @@ msgstr "" #: tsum.text:49 msgid "" "### How to get Tor via email To receive the English Tor Browser Bundle for " -"Windows, send an email to <gettor(a)torproject.org> with **windows** in the " -"body of the message. You can leave the subject blank." +"Windows, send an email to gettor(a)torproject.org with **windows** in the body" +" of the message. You can leave the subject blank." msgstr "" -"### Comment obtenir Tor par email? Pour recevoir le package en langue " -"anglaise du Navigateur Tor compatible windows, il faut envoyer un email à " -"<gettor(a)torproject.org> avec **windows** dans le corps du message. Vous " -"pouvez laisser le sujet vide. " #. type: Plain text #: tsum.text:53 @@ -186,14 +177,9 @@ msgid "" "**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n" "large, and you will not be able to receive any of these bundles with a\n" "Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n" -"want, send an email to <community-support(a)lists.torproject.org> and we\n" +"want, send an email to community-support(a)lists.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" -"**Note**; Les packages navigateur Tor pour Linux et Mac OS X sont assez " -"volumineux, et vous n'aurez pas la possibilité de recevoir l'archive sur un " -"compte Gmail, Hotmail ou Yahoo. SI vous ne pouvez pas recevoir le package " -"désiré, envoyez un email à <community-support(a)lists.torproject.org> et nous " -"vous communiquerons une liste de sites web miroirs à utiliser. \n" #. type: Plain text #: tsum.text:69 @@ -213,11 +199,9 @@ msgstr "" #. type: Plain text #: tsum.text:72 msgid "" -"Send an email to <gettor(a)torproject.org> with the following words in the " -"body of the email:" +"Send an email to gettor(a)torproject.org with the following words in the body " +"of the email:" msgstr "" -"Envoyez un e-mail à <gettor(a)torproject.org> avec les mots suivants dans le " -"corps de l'e-mail:" #. type: Plain text #: tsum.text:75 @@ -372,14 +356,9 @@ msgid "" "The output should say *\"Good signature\"*. A bad signature means that the " "file may have been tampered with. If you see a bad signature, send details " "about where you downloaded the package from, how you verified the signature," -" and the output from GnuPG in an email to <community-" -"support(a)lists.torproject.org>." +" and the output from GnuPG in an email to community-" +"support(a)lists.torproject.org." msgstr "" -"Si tout est bon \"signature correcte\" devrait s'afficher. Une signature " -"incorrecte signifie que le fichier a peut être été falsifié ou corrompu. Si " -"vous avez une signature incorrecte, envoyez les informations concernant le " -"site de téléchargement, le méthode de vérification de la signature et le " -"résultat de GnuPG par email à <community-support(a)lists.torproject.org>" #. type: Plain text #: tsum.text:133 @@ -520,12 +499,9 @@ msgstr "" #: tsum.text:181 msgid "" "If you need help with figuring out why Tor can't connect, send an email to " -"<community-support(a)lists.torproject.org> and include the relevant parts from" -" the log file." +"community-support(a)lists.torproject.org and include the relevant parts from " +"the log file." msgstr "" -"Si vous avez besoin d'aide pour comprendre pourquoi Tor ne peut pas se " -"connecter, envoyez un mail à <community-support(a)lists.torproject.org> et " -"joignez les informations pertinentes du fichier de log" #. type: Plain text #: tsum.text:189 @@ -533,18 +509,11 @@ msgid "" "### How to find a bridge To use a bridge, you will first have to locate one;" " you can either browse to " "[bridges.torproject.org](https://bridges.torproject.org/), or you can send " -"an email to <bridges(a)torproject.org>. If you do send an email, please make " +"an email to bridges(a)torproject.org. If you do send an email, please make " "sure that you write **get bridges** in the body of the email. Without this, " "you will not get a reply. Note that you need to send this email from either " "a gmail.com or a yahoo.com address." msgstr "" -"### Comment trouver une passerelle, comment utiliser un passerelle. Vous " -"devrez tout d'abord en localiser une. Vous pouvez soit vous rendre à " -"l'adresse [bridges.torproject.org](https://bridges.torproject.org/), soit " -"envoyez un mail à <bridges(a)torproject.org>. Si vous envoyez un mail, assurez" -" s'il vous plait d'indiquer **get bridges** dans le corps du mail. Sans " -"cela, vous n'obtiendrez pas de réponse. Notez que vous devez envoyer cet " -"email depuis une adresse gmail.com soit depuis une adresse yahoo.com." #. type: Plain text #: tsum.text:194 @@ -637,12 +606,8 @@ msgstr "" msgid "" "## Frequently Asked Questions This section will answer some of the most " "common questions. If your question is not mentioned here, please send an " -"email to <community-support(a)lists.torproject.org>." +"email to community-support(a)lists.torproject.org." msgstr "" -"## Questions Fréquemment Posées. Cette section vous apportera des réponses à" -" la plupart des questions habituelles. Si vous question n'est pas mentionnée" -" ici, envoyez s'il vous plait un email à <community-" -"support(a)lists.torproject.org>." #. type: Plain text #: tsum.text:230 diff --git a/hu/tsum.po b/hu/tsum.po index 787f9ca..50811b7 100644 --- a/hu/tsum.po +++ b/hu/tsum.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-10-15 14:16+0200\n" -"PO-Revision-Date: 2011-10-15 13:29+0000\n" -"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" +"POT-Creation-Date: 2011-10-17 13:23+0200\n" +"PO-Revision-Date: 2011-10-17 12:25+0000\n" +"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,14 +28,9 @@ msgstr "# Rövid Felhasználói kézikönyv" msgid "" "This user manual contains information about how to download Tor, how to use " "it, and what to do if Tor is unable to connect to the network. If you can't " -"find the answer to your question in this document, email <community-" -"support(a)lists.torproject.org>." +"find the answer to your question in this document, email community-" +"support(a)lists.torproject.org." msgstr "" -"Ez a kézikönyv információkat nyújt a Tor letöltéséről, használatáról és " -"azokról a teendőkről, amit akkor kell végrehajtania, ha a Tor nem tud " -"csatlakozni a hálózathoz. Ha nem találja kérdésre a választ ebben a " -"dokumentumban, akkor írjon levelet a <community-" -"support(a)lists.torproject.org> címre." #. type: Plain text #: tsum.text:9 @@ -141,12 +136,9 @@ msgstr "" #: tsum.text:49 msgid "" "### How to get Tor via email To receive the English Tor Browser Bundle for " -"Windows, send an email to <gettor(a)torproject.org> with **windows** in the " -"body of the message. You can leave the subject blank." +"Windows, send an email to gettor(a)torproject.org with **windows** in the body" +" of the message. You can leave the subject blank." msgstr "" -"### Hogyan szerezheti be a Tor-t emailben Ahhoz, hogy emailben kapja meg az " -"angol Tor Böngésző csomagot, küldjön egy emailt a <gettor(a)torproject.org> " -"címre **windows** szöveggel a levél törzsében. A tárgy üres maradhat." #. type: Plain text #: tsum.text:53 @@ -175,14 +167,9 @@ msgid "" "**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n" "large, and you will not be able to receive any of these bundles with a\n" "Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n" -"want, send an email to <community-support(a)lists.torproject.org> and we\n" +"want, send an email to community-support(a)lists.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" -"**Megjegyzés**: A Tor böngésző csomag Linux és Mac OS X verziója igen nagy, " -"és nem fogja megkapni ezt Gmail, Hotmail vagy Yahoo címre. Ha nem tudja " -"beszerezni a csomagot,írjon egy emailt a <community-" -"support(a)lists.torproject.org> címre, és küldünk egy listát arról, hogy " -"milyen weboldal tükröket használhat.\n" #. type: Plain text #: tsum.text:69 @@ -201,11 +188,9 @@ msgstr "" #. type: Plain text #: tsum.text:72 msgid "" -"Send an email to <gettor(a)torproject.org> with the following words in the " -"body of the email:" +"Send an email to gettor(a)torproject.org with the following words in the body " +"of the email:" msgstr "" -"Küldjön egy emailt a <gettor(a)torproject.org> címre a következő tartalommal " -"az email törzsében:" #. type: Plain text #: tsum.text:75 @@ -361,14 +346,9 @@ msgid "" "The output should say *\"Good signature\"*. A bad signature means that the " "file may have been tampered with. If you see a bad signature, send details " "about where you downloaded the package from, how you verified the signature," -" and the output from GnuPG in an email to <community-" -"support(a)lists.torproject.org>." +" and the output from GnuPG in an email to community-" +"support(a)lists.torproject.org." msgstr "" -"A kimenet azt kell mondja, hogy *\"Good signature\"* (jó aláírás). Egy hibás" -" aláírás azt jelentheti, hogy a csomag megváltoztatásra került, vagy " -"megsérült. Ha hibás aláírást lát, akkor küldje el a részleteket arról, hogy " -"honnan töltötte le a csomagot, hogyan ellenőrizte, és a kimenetét a GnuPG " -"programnak, a a <community-support(a)lists.torproject.org> email címre." #. type: Plain text #: tsum.text:133 @@ -505,12 +485,9 @@ msgstr "" #: tsum.text:181 msgid "" "If you need help with figuring out why Tor can't connect, send an email to " -"<community-support(a)lists.torproject.org> and include the relevant parts from" -" the log file." +"community-support(a)lists.torproject.org and include the relevant parts from " +"the log file." msgstr "" -"Ha segítségre van szüksége, hogy a Tor miért nem tud kapcsolódni, írjon egy " -"emailt a <community-support(a)lists.torproject.org> címre, és rakja bele a " -"lényeges részeit a levélbe a log állománynak." #. type: Plain text #: tsum.text:189 @@ -518,18 +495,11 @@ msgid "" "### How to find a bridge To use a bridge, you will first have to locate one;" " you can either browse to " "[bridges.torproject.org](https://bridges.torproject.org/), or you can send " -"an email to <bridges(a)torproject.org>. If you do send an email, please make " +"an email to bridges(a)torproject.org. If you do send an email, please make " "sure that you write **get bridges** in the body of the email. Without this, " "you will not get a reply. Note that you need to send this email from either " "a gmail.com or a yahoo.com address." msgstr "" -"### Hogyan találjon Hídkapcsolati Eloszót A Tor Hidak használatához először" -" találnia kell egyet; vagy nézze meg a " -"[bridges.torproject.org](https://bridges.torproject.org/) weboldalt, vagy " -"küldjön egy emailt a <bridges(a)torproject.org>. Ha email küld, legyen biztos " -"benne, hogy a levél szövege tartalmazza a **get bridges** (magyarul: hidak " -"lekérése) szöveget a levél törzsében. E nélkül nem fog választ kapni. " -"Fontos, hogy ezt az emailt gmail.com vagy yahoo.com címről kell küldenie." #. type: Plain text #: tsum.text:194 @@ -621,11 +591,8 @@ msgstr "" msgid "" "## Frequently Asked Questions This section will answer some of the most " "common questions. If your question is not mentioned here, please send an " -"email to <community-support(a)lists.torproject.org>." +"email to community-support(a)lists.torproject.org." msgstr "" -"## Gyakran feltett kérdések Ez a szakasz a leggyakoribb kérdések " -"tartalmazza. Ha kérdése nincs itt említve, kérjük küldjön egy emailt a " -"<community-support(a)lists.torproject.org> címre." #. type: Plain text #: tsum.text:230 diff --git a/it/tsum.po b/it/tsum.po index 504c69f..a8c8a1e 100644 --- a/it/tsum.po +++ b/it/tsum.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-10-15 14:16+0200\n" -"PO-Revision-Date: 2011-10-15 13:20+0000\n" +"POT-Creation-Date: 2011-10-17 13:23+0200\n" +"PO-Revision-Date: 2011-10-17 12:25+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" @@ -27,8 +27,8 @@ msgstr "" msgid "" "This user manual contains information about how to download Tor, how to use " "it, and what to do if Tor is unable to connect to the network. If you can't " -"find the answer to your question in this document, email <community-" -"support(a)lists.torproject.org>." +"find the answer to your question in this document, email community-" +"support(a)lists.torproject.org." msgstr "" #. type: Plain text @@ -108,8 +108,8 @@ msgstr "" #: tsum.text:49 msgid "" "### How to get Tor via email To receive the English Tor Browser Bundle for " -"Windows, send an email to <gettor(a)torproject.org> with **windows** in the " -"body of the message. You can leave the subject blank." +"Windows, send an email to gettor(a)torproject.org with **windows** in the body" +" of the message. You can leave the subject blank." msgstr "" #. type: Plain text @@ -134,7 +134,7 @@ msgid "" "**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n" "large, and you will not be able to receive any of these bundles with a\n" "Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n" -"want, send an email to <community-support(a)lists.torproject.org> and we\n" +"want, send an email to community-support(a)lists.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" @@ -151,8 +151,8 @@ msgstr "" #. type: Plain text #: tsum.text:72 msgid "" -"Send an email to <gettor(a)torproject.org> with the following words in the " -"body of the email:" +"Send an email to gettor(a)torproject.org with the following words in the body " +"of the email:" msgstr "" #. type: Plain text @@ -273,8 +273,8 @@ msgid "" "The output should say *\"Good signature\"*. A bad signature means that the " "file may have been tampered with. If you see a bad signature, send details " "about where you downloaded the package from, how you verified the signature," -" and the output from GnuPG in an email to <community-" -"support(a)lists.torproject.org>." +" and the output from GnuPG in an email to community-" +"support(a)lists.torproject.org." msgstr "" #. type: Plain text @@ -373,8 +373,8 @@ msgstr "" #: tsum.text:181 msgid "" "If you need help with figuring out why Tor can't connect, send an email to " -"<community-support(a)lists.torproject.org> and include the relevant parts from" -" the log file." +"community-support(a)lists.torproject.org and include the relevant parts from " +"the log file." msgstr "" #. type: Plain text @@ -383,7 +383,7 @@ msgid "" "### How to find a bridge To use a bridge, you will first have to locate one;" " you can either browse to " "[bridges.torproject.org](https://bridges.torproject.org/), or you can send " -"an email to <bridges(a)torproject.org>. If you do send an email, please make " +"an email to bridges(a)torproject.org. If you do send an email, please make " "sure that you write **get bridges** in the body of the email. Without this, " "you will not get a reply. Note that you need to send this email from either " "a gmail.com or a yahoo.com address." @@ -454,7 +454,7 @@ msgstr "" msgid "" "## Frequently Asked Questions This section will answer some of the most " "common questions. If your question is not mentioned here, please send an " -"email to <community-support(a)lists.torproject.org>." +"email to community-support(a)lists.torproject.org." msgstr "" #. type: Plain text diff --git a/nl/tsum.po b/nl/tsum.po index aca296c..6b8fc2b 100644 --- a/nl/tsum.po +++ b/nl/tsum.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <runa.sandvik(a)gmail.com>, 2011. # Shondoit Walker <shondoit+transifex(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-10-15 14:16+0200\n" -"PO-Revision-Date: 2011-10-15 14:00+0000\n" -"Last-Translator: Shondoit <shondoit+transifex(a)gmail.com>\n" +"POT-Creation-Date: 2011-10-17 13:23+0200\n" +"PO-Revision-Date: 2011-10-17 12:41+0000\n" +"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,13 +29,13 @@ msgstr "# De Korte Gebruikershandleiding" msgid "" "This user manual contains information about how to download Tor, how to use " "it, and what to do if Tor is unable to connect to the network. If you can't " -"find the answer to your question in this document, email <community-" -"support(a)lists.torproject.org>." +"find the answer to your question in this document, email community-" +"support(a)lists.torproject.org." msgstr "" "Deze gebruikershandleiding bevat informatie over hoe Tor te downloaden, hoe " "het te gebruiken en wat te doen als Tor geen verbinding kan maken. Als je " "geen antwoord op je vraag kunt vinden in dit document, stuur dan een e-mail " -"naar <community-support(a)lists.torproject.org>." +"naar community-support(a)lists.torproject.org." #. type: Plain text #: tsum.text:9 @@ -141,11 +142,11 @@ msgstr "" #: tsum.text:49 msgid "" "### How to get Tor via email To receive the English Tor Browser Bundle for " -"Windows, send an email to <gettor(a)torproject.org> with **windows** in the " -"body of the message. You can leave the subject blank." +"Windows, send an email to gettor(a)torproject.org with **windows** in the body" +" of the message. You can leave the subject blank." msgstr "" -"### Hoe Tor via e-mail te ontvangen\n" -"Om de Engelse Tor Browser Bundle voor Windows te ontvangen, stuur een email naar <gettor(a)torproject.org> met **windows** in de body van het bericht. Je kan het onderwerp leeg laten." +"### Hoe Tor via e-mail te ontvangen Om de Engelse Tor Browser Bundle voor " +"Windows te ontvangen, stuur een email naar gettor(a)torproject.org " #. type: Plain text #: tsum.text:53 @@ -174,13 +175,13 @@ msgid "" "**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n" "large, and you will not be able to receive any of these bundles with a\n" "Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n" -"want, send an email to <community-support(a)lists.torproject.org> and we\n" +"want, send an email to community-support(a)lists.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" "**Noot**: De Tor Browser Bundle voor Linux en Mac OS X zijn vrij groot en je" " kunt deze bundels niet ontvangen met een Gmail, Hotmail of Yahoo account. " "Als je de bundel die je wilt niet kunt ontvangen, stuur een e-mail naar " -"<community-support(a)lists.torproject.org> en we sturen je dan een lijst met " +"community-support(a)lists.torproject.org en we sturen je dan een lijst met " "website mirrors om te gebruiken.\n" #. type: Plain text @@ -198,11 +199,10 @@ msgstr "" #. type: Plain text #: tsum.text:72 msgid "" -"Send an email to <gettor(a)torproject.org> with the following words in the " -"body of the email:" +"Send an email to gettor(a)torproject.org with the following words in the body " +"of the email:" msgstr "" -"Stuur en e-mail naar <gettor(a)torproject.org> met de volgende woorden in de " -"body van de e-mail:" +"Stuur en e-mail naar gettor(a)torproject.org met de volgende woorden in de " #. type: Plain text #: tsum.text:75 @@ -354,14 +354,14 @@ msgid "" "The output should say *\"Good signature\"*. A bad signature means that the " "file may have been tampered with. If you see a bad signature, send details " "about where you downloaded the package from, how you verified the signature," -" and the output from GnuPG in an email to <community-" -"support(a)lists.torproject.org>." +" and the output from GnuPG in an email to community-" +"support(a)lists.torproject.org." msgstr "" -"De uitvoer zou *\"Good signature\"* moeten zijn. Een verkeerde handtekening " -"betekent dat er mogelijk met het bestand geknoeid is. Als je een verkeerde " -"handtekening tegenkomt, stuur dan details, waar je het pakket gedownload " -"hebt, hoe je de handtekening geverifieerd hebt en de uitvoer van GnuPG in " -"een e-mail naar <community-support(a)lists.torproject.org>." +"De uitvoer zou *\\\"Good signature\\\"* moeten zijn. Een verkeerde " +"handtekening betekent dat er mogelijk met het bestand geknoeid is. Als je " +"een verkeerde handtekening tegenkomt, stuur dan details, waar je het pakket " +"gedownload hebt, hoe je de handtekening geverifieerd hebt en de uitvoer van " +"GnuPG in een e-mail naar community-support(a)lists.torproject.org." #. type: Plain text #: tsum.text:133 @@ -493,12 +493,9 @@ msgstr "" #: tsum.text:181 msgid "" "If you need help with figuring out why Tor can't connect, send an email to " -"<community-support(a)lists.torproject.org> and include the relevant parts from" -" the log file." +"community-support(a)lists.torproject.org and include the relevant parts from " +"the log file." msgstr "" -"Als je hulp nodig hebt met uitzoeken waarom Tor geen verbinding kan krijgen," -" stuur dan een e-mail naar <community-support(a)lists.torproject.org> en voeg " -"de relevante delen van de log toe." #. type: Plain text #: tsum.text:189 @@ -506,13 +503,11 @@ msgid "" "### How to find a bridge To use a bridge, you will first have to locate one;" " you can either browse to " "[bridges.torproject.org](https://bridges.torproject.org/), or you can send " -"an email to <bridges(a)torproject.org>. If you do send an email, please make " +"an email to bridges(a)torproject.org. If you do send an email, please make " "sure that you write **get bridges** in the body of the email. Without this, " "you will not get a reply. Note that you need to send this email from either " "a gmail.com or a yahoo.com address." msgstr "" -"### Hoe een bridge te vinden\n" -"Om een bridge te gebruiken moet je er eerst één vinden; je kunt naar [bridges.torproject.org](https://bridges.torproject.org/) gaan, of je kunt een email sturen naar <bridges(a)torproject.org>. Als je een e-mail stuurt, zorg er dan voor dat je **get bridges** in de body van de e-mail zet. Zonder dit krijg je geen bericht terug. Let op dat je deze e-mail van, of een gmail.com adres, of een yahoo.com adres moet sturen." #. type: Plain text #: tsum.text:194 @@ -595,10 +590,8 @@ msgstr "" msgid "" "## Frequently Asked Questions This section will answer some of the most " "common questions. If your question is not mentioned here, please send an " -"email to <community-support(a)lists.torproject.org>." +"email to community-support(a)lists.torproject.org." msgstr "" -"## Veelgestelde vragen\n" -"Dit onderdeel zal een paar van de meest gestelde vragen beantwoorden. Als je vraag hier niet genoemd wordt, stuur dan een e-mail naar <community-support(a)lists.torproject.org>." #. type: Plain text #: tsum.text:230 diff --git a/pt/tsum.po b/pt/tsum.po index e473511..7cdc6e7 100644 --- a/pt/tsum.po +++ b/pt/tsum.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-10-15 14:16+0200\n" -"PO-Revision-Date: 2011-10-15 13:20+0000\n" +"POT-Creation-Date: 2011-10-17 13:23+0200\n" +"PO-Revision-Date: 2011-10-17 12:25+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -28,13 +28,9 @@ msgstr "# O pequeno manual do usuário" msgid "" "This user manual contains information about how to download Tor, how to use " "it, and what to do if Tor is unable to connect to the network. If you can't " -"find the answer to your question in this document, email <community-" -"support(a)lists.torproject.org>." +"find the answer to your question in this document, email community-" +"support(a)lists.torproject.org." msgstr "" -"Este manual do usuário contém informações sobre como baixar o Tor, como usá-" -"lo e o que fazer se o Tor não estiver se conectando a rede. Se você não " -"conseguir encontrar a resposta para a sua pergunta neste documento, envie um" -" e-mail para <community-support(a)lists.torproject.org>." #. type: Plain text #: tsum.text:9 @@ -139,12 +135,9 @@ msgstr "" #: tsum.text:49 msgid "" "### How to get Tor via email To receive the English Tor Browser Bundle for " -"Windows, send an email to <gettor(a)torproject.org> with **windows** in the " -"body of the message. You can leave the subject blank." +"Windows, send an email to gettor(a)torproject.org with **windows** in the body" +" of the message. You can leave the subject blank." msgstr "" -"### Como obter o Tor por e-mail para receber o Pacote de Navegação Tor " -"Inglês para Windows, envie um e-mail para <gettor(a)torproject.org> com " -"**windows** no corpo da mensagem. Você pode deixar o assunto em branco." #. type: Plain text #: tsum.text:53 @@ -174,14 +167,9 @@ msgid "" "**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n" "large, and you will not be able to receive any of these bundles with a\n" "Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n" -"want, send an email to <community-support(a)lists.torproject.org> and we\n" +"want, send an email to community-support(a)lists.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" -"**Note**: Os Pacotes de Navegação Tor para linux e Mac OS X são maiores, e " -"você não poderá receber nenhum desses pacotes com uma conta Gmail, Hotmail " -"ou do Yahoo. Se você não conseguir receber o pacote que você deseja, envie " -"um e-mail para <community-support(a)lists.torproject.org> e nós lhe daremos " -"uma liste de websites espelhos para utilizar.\n" #. type: Plain text #: tsum.text:69 @@ -196,8 +184,8 @@ msgstr "" #. type: Plain text #: tsum.text:72 msgid "" -"Send an email to <gettor(a)torproject.org> with the following words in the " -"body of the email:" +"Send an email to gettor(a)torproject.org with the following words in the body " +"of the email:" msgstr "" #. type: Plain text @@ -343,8 +331,8 @@ msgid "" "The output should say *\"Good signature\"*. A bad signature means that the " "file may have been tampered with. If you see a bad signature, send details " "about where you downloaded the package from, how you verified the signature," -" and the output from GnuPG in an email to <community-" -"support(a)lists.torproject.org>." +" and the output from GnuPG in an email to community-" +"support(a)lists.torproject.org." msgstr "" #. type: Plain text @@ -443,8 +431,8 @@ msgstr "" #: tsum.text:181 msgid "" "If you need help with figuring out why Tor can't connect, send an email to " -"<community-support(a)lists.torproject.org> and include the relevant parts from" -" the log file." +"community-support(a)lists.torproject.org and include the relevant parts from " +"the log file." msgstr "" #. type: Plain text @@ -453,7 +441,7 @@ msgid "" "### How to find a bridge To use a bridge, you will first have to locate one;" " you can either browse to " "[bridges.torproject.org](https://bridges.torproject.org/), or you can send " -"an email to <bridges(a)torproject.org>. If you do send an email, please make " +"an email to bridges(a)torproject.org. If you do send an email, please make " "sure that you write **get bridges** in the body of the email. Without this, " "you will not get a reply. Note that you need to send this email from either " "a gmail.com or a yahoo.com address." @@ -524,7 +512,7 @@ msgstr "" msgid "" "## Frequently Asked Questions This section will answer some of the most " "common questions. If your question is not mentioned here, please send an " -"email to <community-support(a)lists.torproject.org>." +"email to community-support(a)lists.torproject.org." msgstr "" #. type: Plain text diff --git a/ru/tsum.po b/ru/tsum.po index 33785a4..eefb833 100644 --- a/ru/tsum.po +++ b/ru/tsum.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-10-15 14:16+0200\n" -"PO-Revision-Date: 2011-10-15 13:20+0000\n" +"POT-Creation-Date: 2011-10-17 13:23+0200\n" +"PO-Revision-Date: 2011-10-17 12:25+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" @@ -27,8 +27,8 @@ msgstr "" msgid "" "This user manual contains information about how to download Tor, how to use " "it, and what to do if Tor is unable to connect to the network. If you can't " -"find the answer to your question in this document, email <community-" -"support(a)lists.torproject.org>." +"find the answer to your question in this document, email community-" +"support(a)lists.torproject.org." msgstr "" #. type: Plain text @@ -108,8 +108,8 @@ msgstr "" #: tsum.text:49 msgid "" "### How to get Tor via email To receive the English Tor Browser Bundle for " -"Windows, send an email to <gettor(a)torproject.org> with **windows** in the " -"body of the message. You can leave the subject blank." +"Windows, send an email to gettor(a)torproject.org with **windows** in the body" +" of the message. You can leave the subject blank." msgstr "" #. type: Plain text @@ -134,7 +134,7 @@ msgid "" "**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n" "large, and you will not be able to receive any of these bundles with a\n" "Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n" -"want, send an email to <community-support(a)lists.torproject.org> and we\n" +"want, send an email to community-support(a)lists.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" @@ -151,8 +151,8 @@ msgstr "" #. type: Plain text #: tsum.text:72 msgid "" -"Send an email to <gettor(a)torproject.org> with the following words in the " -"body of the email:" +"Send an email to gettor(a)torproject.org with the following words in the body " +"of the email:" msgstr "" #. type: Plain text @@ -273,8 +273,8 @@ msgid "" "The output should say *\"Good signature\"*. A bad signature means that the " "file may have been tampered with. If you see a bad signature, send details " "about where you downloaded the package from, how you verified the signature," -" and the output from GnuPG in an email to <community-" -"support(a)lists.torproject.org>." +" and the output from GnuPG in an email to community-" +"support(a)lists.torproject.org." msgstr "" #. type: Plain text @@ -373,8 +373,8 @@ msgstr "" #: tsum.text:181 msgid "" "If you need help with figuring out why Tor can't connect, send an email to " -"<community-support(a)lists.torproject.org> and include the relevant parts from" -" the log file." +"community-support(a)lists.torproject.org and include the relevant parts from " +"the log file." msgstr "" #. type: Plain text @@ -383,7 +383,7 @@ msgid "" "### How to find a bridge To use a bridge, you will first have to locate one;" " you can either browse to " "[bridges.torproject.org](https://bridges.torproject.org/), or you can send " -"an email to <bridges(a)torproject.org>. If you do send an email, please make " +"an email to bridges(a)torproject.org. If you do send an email, please make " "sure that you write **get bridges** in the body of the email. Without this, " "you will not get a reply. Note that you need to send this email from either " "a gmail.com or a yahoo.com address." @@ -454,7 +454,7 @@ msgstr "" msgid "" "## Frequently Asked Questions This section will answer some of the most " "common questions. If your question is not mentioned here, please send an " -"email to <community-support(a)lists.torproject.org>." +"email to community-support(a)lists.torproject.org." msgstr "" #. type: Plain text diff --git a/zh/tsum.po b/zh/tsum.po index 360105c..9d33fdc 100644 --- a/zh/tsum.po +++ b/zh/tsum.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-10-15 14:16+0200\n" -"PO-Revision-Date: 2011-10-15 13:20+0000\n" +"POT-Creation-Date: 2011-10-17 13:23+0200\n" +"PO-Revision-Date: 2011-10-17 12:25+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -28,8 +28,8 @@ msgstr "＃短的用户手册" msgid "" "This user manual contains information about how to download Tor, how to use " "it, and what to do if Tor is unable to connect to the network. If you can't " -"find the answer to your question in this document, email <community-" -"support(a)lists.torproject.org>." +"find the answer to your question in this document, email community-" +"support(a)lists.torproject.org." msgstr "" #. type: Plain text @@ -109,8 +109,8 @@ msgstr "" #: tsum.text:49 msgid "" "### How to get Tor via email To receive the English Tor Browser Bundle for " -"Windows, send an email to <gettor(a)torproject.org> with **windows** in the " -"body of the message. You can leave the subject blank." +"Windows, send an email to gettor(a)torproject.org with **windows** in the body" +" of the message. You can leave the subject blank." msgstr "" #. type: Plain text @@ -135,7 +135,7 @@ msgid "" "**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n" "large, and you will not be able to receive any of these bundles with a\n" "Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n" -"want, send an email to <community-support(a)lists.torproject.org> and we\n" +"want, send an email to community-support(a)lists.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" @@ -152,8 +152,8 @@ msgstr "" #. type: Plain text #: tsum.text:72 msgid "" -"Send an email to <gettor(a)torproject.org> with the following words in the " -"body of the email:" +"Send an email to gettor(a)torproject.org with the following words in the body " +"of the email:" msgstr "" #. type: Plain text @@ -274,8 +274,8 @@ msgid "" "The output should say *\"Good signature\"*. A bad signature means that the " "file may have been tampered with. If you see a bad signature, send details " "about where you downloaded the package from, how you verified the signature," -" and the output from GnuPG in an email to <community-" -"support(a)lists.torproject.org>." +" and the output from GnuPG in an email to community-" +"support(a)lists.torproject.org." msgstr "" #. type: Plain text @@ -374,8 +374,8 @@ msgstr "" #: tsum.text:181 msgid "" "If you need help with figuring out why Tor can't connect, send an email to " -"<community-support(a)lists.torproject.org> and include the relevant parts from" -" the log file." +"community-support(a)lists.torproject.org and include the relevant parts from " +"the log file." msgstr "" #. type: Plain text @@ -384,7 +384,7 @@ msgid "" "### How to find a bridge To use a bridge, you will first have to locate one;" " you can either browse to " "[bridges.torproject.org](https://bridges.torproject.org/), or you can send " -"an email to <bridges(a)torproject.org>. If you do send an email, please make " +"an email to bridges(a)torproject.org. If you do send an email, please make " "sure that you write **get bridges** in the body of the email. Without this, " "you will not get a reply. Note that you need to send this email from either " "a gmail.com or a yahoo.com address." @@ -455,7 +455,7 @@ msgstr "" msgid "" "## Frequently Asked Questions This section will answer some of the most " "common questions. If your question is not mentioned here, please send an " -"email to <community-support(a)lists.torproject.org>." +"email to community-support(a)lists.torproject.org." msgstr "" #. type: Plain text

1 0

[flashproxy/master] Add notes on using an SSH proxy so they don't get lost.
by dcf＠torproject.org 17 Oct '11

17 Oct '11

commit 891da0b80d5f0d35bff64ef28842ef879f10f395 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 16 21:08:41 2011 -0700 Add notes on using an SSH proxy so they don't get lost. --- notes.txt | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/notes.txt b/notes.txt index 928b921..61babdc 100644 --- a/notes.txt +++ b/notes.txt @@ -15,3 +15,13 @@ a bridge with a lifetime randomly chosen from some distribution. (For example: "simulate proxies connecting according to this Poisson distribution and staying connected according to this exponential distribution.") + +== How to use with an SSH proxy + +Start swfcat, giving it a relay parameter pointing to your SSH server. + http://example.com/swfcat.swf?facilitator=<facilitator_addr>:<facilitator_port>&relay=<ssh_addr>:<ssh_port> +Start the connector. + python connector.py -f <facilitator_addr:facilitator_port> +Start SSH, giving it a proxy command to connect through the connector. + ssh -v -N -D 1080 <ssh_addr> -p <ssh_port> \ + -o 'ProxyCommand=socat - SOCKS4A:localhost:dummy:0,socksport=9001'

1 0

[flashproxy/master] Say "output" not "logs."
by dcf＠torproject.org 17 Oct '11

17 Oct '11

commit 65dd54c4ed90480b563c3fdecdc88ca8feeb8410 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 16 21:19:23 2011 -0700 Say "output" not "logs." These commands can produce logs but here we're specifically talking about stdout. --- README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README b/README index 6db4ee0..1b616e0 100644 --- a/README +++ b/README @@ -71,7 +71,7 @@ ephemeral proxies. 2. Run Tor using the included torrc file. $ tor -f flashproxy/torrc -Watch the logs of connector.py and tor. From connector.py you are +Watch the output of connector.py and tor. From connector.py you are expecting output lines like this: Remote connection from XXX.XXX.XXX.XXX:YYYYY. Local connection from 127.0.0.1:ZZZZZ.

1 0