- tor-commits - lists.torproject.org

[vidalia/master] Fold in changes for 0.2.16
by chiiph＠torproject.org 24 Jan '12

24 Jan '12

commit 320457524ba90b7fdd14f09ad7cd02879f77a384 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Tue Jan 24 19:40:18 2012 -0300 Fold in changes for 0.2.16 --- CHANGELOG | 43 +++++++++++++++++++++++++++++++++++++++++++ changes/bug2319 | 2 -- changes/bug2943 | 2 -- changes/bug3463 | 3 --- changes/bug4048 | 2 -- changes/bug4290 | 3 --- changes/bug4304 | 2 -- changes/bug4379 | 1 - changes/bug4598 | 2 -- changes/bug4642 | 2 -- changes/bug4656 | 2 -- changes/bug4724 | 3 --- changes/bug4736 | 3 --- changes/bug4827 | 6 ------ changes/bug4907 | 3 --- changes/feat2163 | 2 -- changes/newBridgeLines | 3 --- 17 files changed, 43 insertions(+), 41 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 23c1c23..5c07097 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,46 @@ +0.2.16 24-Jan-2012 + o Make the default data directory in windows be located in the Local + AppData instead of the Roaming one. Fixes bug 2319. + o Do not launch Firefox with every CIRCUIT_ESTABLISHED signal, do it + only if Firefox isn't open yet. Fixes bug 2943. + o Uses TAKEOWNERSHIP and __OwningControllerProcess to avoid leaving + tor running in background if Vidalia exits unexpectedly. Fixes bug + 3463. + o Attempt to remove port.conf file before using it to avoid a race + condition between tor and Vidalia. Fixes bug 4048. + o Do not allow users to check the "My ISP blocks..." checkbox + without entering any bridges. Also updates the + documentation. Fixes bug 4290. + o Check that the authentication-cookie file length is exactly 32 + bytes long. Fixes bug 4304. + o Explicitly disable ControlPort auto. Fixes bug 4379. + o Make the non exit relay option backward compatible with Vidalia < + 0.2.14 so that it doesn't confuse users. Fixes bug 4642. + o Sets the preferred size for the GUI layout so it doesn't squeeze + widges when the size isn't big enough. Fixes bug 4656. + o Removes the option to have only HTTPProxy since it does not work + any more as it used to do with older tor versions. Users should + use HTTP/HTTPSProxy instead. Fixes bug 4724. + o Add a hidden configuration option called SkipVersionCheck so + systems like Tails can force Vidalia to skip checking tor's + version. Resolves ticket 4736. + o When Tor has cached enough information it bootstraps faster than + what takes Vidalia connect to it, so Vidalia does not see the + event to update the progress bar. Now Vidalia explicitly asks for + bootstrap-phase when it connects to Tor, and updates the progress + to what is actually happening instead of hanging in + "Authenticating to Tor". Fixes bug 4827. + o Fix size hints in the main window layout so that tilling window + managers display the window properly. Thanks to Mike Warren for + the fix. Fixes bug 4907. + o Provide a way to hide Dock or System Tray icons in OSX. Resolves + ticket 2163. + o Vidalia only validates IPv4 bridge lines. IPv6 bridges are now + available, and there will be pluggable transport bridge lines. So + the validation is now delegated to Tor through SETCONF. + o Explicitly disable SocksPort auto by setting it to its default + (9050). Fixes bug 4598. + 0.2.15 07-Oct-2011 o Draw the bandwidth graph curves based on the local maximum, not the global maximum. Fixes bug 2188. diff --git a/changes/bug2319 b/changes/bug2319 deleted file mode 100644 index fe6ee5b..0000000 --- a/changes/bug2319 +++ /dev/null @@ -1,2 +0,0 @@ - o Make the default data directory in windows be located in the Local - AppData instead of the Roaming one. Fixes bug 2319. \ No newline at end of file diff --git a/changes/bug2943 b/changes/bug2943 deleted file mode 100644 index ce1c02b..0000000 --- a/changes/bug2943 +++ /dev/null @@ -1,2 +0,0 @@ - o Do not launch Firefox with every CIRCUIT_ESTABLISHED signal, do it - only if Firefox isn't open yet. Fixes bug 2943. \ No newline at end of file diff --git a/changes/bug3463 b/changes/bug3463 deleted file mode 100644 index 3e23e08..0000000 --- a/changes/bug3463 +++ /dev/null @@ -1,3 +0,0 @@ - o Uses TAKEOWNERSHIP and __OwningControllerProcess to avoid leaving - tor running in background if Vidalia exits unexpectedly. Fixes bug - 3463. \ No newline at end of file diff --git a/changes/bug4048 b/changes/bug4048 deleted file mode 100644 index d138eb2..0000000 --- a/changes/bug4048 +++ /dev/null @@ -1,2 +0,0 @@ - o Attempt to remove port.conf file before using it to avoid a race - condition between tor and Vidalia. Fixes bug 4048. \ No newline at end of file diff --git a/changes/bug4290 b/changes/bug4290 deleted file mode 100644 index 552cf0d..0000000 --- a/changes/bug4290 +++ /dev/null @@ -1,3 +0,0 @@ - o Do not allow users to check the "My ISP blocks..." checkbox - without entering any bridges. Also updates the - documentation. Fixes bug 4290. \ No newline at end of file diff --git a/changes/bug4304 b/changes/bug4304 deleted file mode 100644 index cc48e7e..0000000 --- a/changes/bug4304 +++ /dev/null @@ -1,2 +0,0 @@ - o Check that the authentication-cookie file length is exactly 32 - bytes long. Fixes bug 4304. \ No newline at end of file diff --git a/changes/bug4379 b/changes/bug4379 deleted file mode 100644 index 6ec1b53..0000000 --- a/changes/bug4379 +++ /dev/null @@ -1 +0,0 @@ - o Explicitly disable ControlPort auto. Fixes bug 4379. \ No newline at end of file diff --git a/changes/bug4598 b/changes/bug4598 deleted file mode 100644 index 89daf1d..0000000 --- a/changes/bug4598 +++ /dev/null @@ -1,2 +0,0 @@ - o Explicitly disable SocksPort auto by setting it to its default - (9050). Fixes bug 4598. \ No newline at end of file diff --git a/changes/bug4642 b/changes/bug4642 deleted file mode 100644 index 0fc0b42..0000000 --- a/changes/bug4642 +++ /dev/null @@ -1,2 +0,0 @@ - o Make the non exit relay option backward compatible with Vidalia < - 0.2.14 so that it doesn't confuse users. Fixes bug 4642. \ No newline at end of file diff --git a/changes/bug4656 b/changes/bug4656 deleted file mode 100644 index d958b92..0000000 --- a/changes/bug4656 +++ /dev/null @@ -1,2 +0,0 @@ - o Sets the preferred size for the GUI layout so it doesn't squeeze - widges when the size isn't big enough. Fixes bug 4656. \ No newline at end of file diff --git a/changes/bug4724 b/changes/bug4724 deleted file mode 100644 index f2b3ccb..0000000 --- a/changes/bug4724 +++ /dev/null @@ -1,3 +0,0 @@ - o Removes the option to have only HTTPProxy since it does not work - any more as it used to do with older tor versions. Users should - use HTTP/HTTPSProxy instead. Fixes bug 4724. \ No newline at end of file diff --git a/changes/bug4736 b/changes/bug4736 deleted file mode 100644 index 4b517d3..0000000 --- a/changes/bug4736 +++ /dev/null @@ -1,3 +0,0 @@ - o Add a hidden configuration option called SkipVersionCheck so - systems like Tails can force Vidalia to skip checking tor's - version. Resolves ticket 4736. \ No newline at end of file diff --git a/changes/bug4827 b/changes/bug4827 deleted file mode 100644 index 799a3dc..0000000 --- a/changes/bug4827 +++ /dev/null @@ -1,6 +0,0 @@ - o When Tor has cached enough information it bootstraps faster than - what takes Vidalia connect to it, so Vidalia does not see the - event to update the progress bar. Now Vidalia explicitly asks for - bootstrap-phase when it connects to Tor, and updates the progress - to what is actually happening instead of hanging in - "Authenticating to Tor". Fixes bug 4827. \ No newline at end of file diff --git a/changes/bug4907 b/changes/bug4907 deleted file mode 100644 index f64b4e9..0000000 --- a/changes/bug4907 +++ /dev/null @@ -1,3 +0,0 @@ - o Fix size hints in the main window layout so that tilling window - managers display the window properly. Thanks to Mike Warren for - the fix. Fixes bug 4907. \ No newline at end of file diff --git a/changes/feat2163 b/changes/feat2163 deleted file mode 100644 index 058714d..0000000 --- a/changes/feat2163 +++ /dev/null @@ -1,2 +0,0 @@ - o Provide a way to hide Dock or System Tray icons in OSX. Resolves - ticket 2163. \ No newline at end of file diff --git a/changes/newBridgeLines b/changes/newBridgeLines deleted file mode 100644 index 0834912..0000000 --- a/changes/newBridgeLines +++ /dev/null @@ -1,3 +0,0 @@ - o Vidalia only validates IPv4 bridge lines. IPv6 bridges are now - available, and there will be pluggable transport bridge lines. So - the validation is now delegated to Tor through SETCONF. \ No newline at end of file

1 0

r25341: {website} make it a separate block (website/trunk/donate/en)
by Andrew Lewman 24 Jan '12

24 Jan '12

Author: phobos Date: 2012-01-24 22:12:43 +0000 (Tue, 24 Jan 2012) New Revision: 25341 Modified: website/trunk/donate/en/info.wmi Log: make it a separate block Modified: website/trunk/donate/en/info.wmi =================================================================== --- website/trunk/donate/en/info.wmi 2012-01-24 22:10:28 UTC (rev 25340) +++ website/trunk/donate/en/info.wmi 2012-01-24 22:12:43 UTC (rev 25341) @@ -12,6 +12,8 @@ <p>Our <a href="<page about/financials>">financial documents</a> are available for your review.</p> </div> +</div> +<div class="img-shadow"> <div class="important-infoblock"> <h2>Mission Statement</h2> <p>The Tor Project is organized and operated exclusively for

1 0

r25340: {website} two orgs want to see our mission statement on our website, o (website/trunk/donate/en)
by Andrew Lewman 24 Jan '12

24 Jan '12

Author: phobos Date: 2012-01-24 22:10:28 +0000 (Tue, 24 Jan 2012) New Revision: 25340 Modified: website/trunk/donate/en/info.wmi Log: two orgs want to see our mission statement on our website, otherwise we just don't exist. Modified: website/trunk/donate/en/info.wmi =================================================================== --- website/trunk/donate/en/info.wmi 2012-01-24 05:06:03 UTC (rev 25339) +++ website/trunk/donate/en/info.wmi 2012-01-24 22:10:28 UTC (rev 25340) @@ -12,5 +12,19 @@ <p>Our <a href="<page about/financials>">financial documents</a> are available for your review.</p> </div> + <div class="important-infoblock"> + <h2>Mission Statement</h2> + <p>The Tor Project is organized and operated exclusively for + scientific, charitable and educational purposes within the meaning + of section 501(c)(3) of the Internal Revenue Code, including (a) + to develop, improve and distribute free, publicly available tools + and programs that promote free speech, free expression, civic + engagement and privacy rights online; (b) to conduct scientific + research regarding, and to promote the use of and knowledge about, + such tools, programs and related issues around the world; (c) to + educate the general public around the world about privacy rights + and anonymity issues connected to Internet use; and (d) to carry out + and conduct such other activities related to the stated mission.</p> + </div> </div>

1 0

[stem/master] Including the test type or target with errors
by atagar＠torproject.org 24 Jan '12

24 Jan '12

commit bda94c4dffa97f9cc915cddb45d90aab51e8e5b5 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 23 19:11:07 2012 -0800 Including the test type or target with errors When we have a failed test run with numerous targets we know at the end that an error occured and what it is, but not what target it occured under. It's a pita to scroll back looking for a stacktrace so including this with the footer's error information. --- run_tests.py | 2 ++ test/output.py | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/run_tests.py b/run_tests.py index e3a9bbf..9e9eb00 100755 --- a/run_tests.py +++ b/run_tests.py @@ -229,6 +229,7 @@ if __name__ == '__main__': if CONFIG["argument.unit"]: test.output.print_divider("UNIT TESTS", True) + error_tracker.set_category("UNIT TEST") for test_class in UNIT_TESTS: test.output.print_divider(test_class.__module__) @@ -284,6 +285,7 @@ if __name__ == '__main__': for target in integ_run_targets: if target in skip_targets: continue + error_tracker.set_category(target) try: # converts the 'target.torrc' csv into a list of test.runner.Torrc enums diff --git a/test/output.py b/test/output.py index 5ba9ca4..76156b9 100644 --- a/test/output.py +++ b/test/output.py @@ -164,6 +164,22 @@ class ErrorTracker: def __init__(self): self._errors = [] + self._category = None + + def set_category(self, category): + """ + Optional label that will be presented with testing failures until another + category is specified. If set to None then no category labels are included. + + For tests with a lot of output this is intended to help narrow the haystack + in which the user needs to look for failures. In practice this is mostly + used to specify the integ target we're running under. + + Arguments: + category (str) - category to label errors as being under + """ + + self._category = category def has_error_occured(self): return bool(self._errors) @@ -171,6 +187,9 @@ class ErrorTracker: def get_filter(self): def _error_tracker(line_type, line_content): if line_type in (LineType.FAIL, LineType.ERROR): + if self._category: + line_content = "[%s] %s" % (self._category, line_content) + self._errors.append(line_content) return line_content

1 0

[stem/master] Config support for multi-line entries
by atagar＠torproject.org 24 Jan '12

24 Jan '12

commit 1f5b05766ce0c2533d8bd2861d142cc6523e4410 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 24 09:26:59 2012 -0800 Config support for multi-line entries Adding support for multi-line values in the configuration files. I've wanted this for a while, mostly for user facing messages. This still needs an integ test. --- run_tests.py | 19 ++----------------- stem/util/conf.py | 25 ++++++++++++++++++++++++- test/settings.cfg | 16 ++++++++++++++++ 3 files changed, 42 insertions(+), 18 deletions(-) diff --git a/run_tests.py b/run_tests.py index 9e9eb00..6972e16 100755 --- a/run_tests.py +++ b/run_tests.py @@ -43,6 +43,7 @@ CONFIG = { "argument.log": None, "argument.tor": "tor", "argument.no_color": False, + "msg.help": "", "target.config": {}, "target.description": {}, "target.prereq": {}, @@ -91,22 +92,6 @@ INTEG_TESTS = ( test.integ.connection.connect.TestConnect, ) -# TODO: move into settings.cfg when we have multi-line options -HELP_MSG = """Usage runTests.py [OPTION] -Runs tests for the stem library. - - -u, --unit runs unit tests - -i, --integ runs integration tests - -c, --config PATH path to a custom test configuration - -t, --target TARGET comma separated list of extra targets for integ tests - -l, --log RUNLEVEL includes logging output with test results, runlevels: - TRACE, DEBUG, INFO, NOTICE, WARN, ERROR - --tor PATH custom tor binary to run testing against - --no-color displays testing output without color - -h, --help presents this help - - Integration targets:""" - def load_user_configuration(test_config): """ Parses our commandline arguments, loading our custom test configuration if @@ -155,7 +140,7 @@ def load_user_configuration(test_config): # Prints usage information and quits. This includes a listing of the # valid integration targets. - print HELP_MSG + print CONFIG["msg.help"] # gets the longest target length so we can show the entries in columns target_name_length = max(map(len, Target)) diff --git a/stem/util/conf.py b/stem/util/conf.py index 8a1fcfc..67bd253 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -11,6 +11,13 @@ ignored. For instance: blankEntry.example would be loaded as four entries, the last one's value being an empty string. +Mulit-line entries can be defined my providing an entry followed by lines with +a '|' prefix. For instance... + + msg.greeting + |This is a multi-line message + |exclaiming about the wonders + |and awe that is pepperjack! get_config - Singleton for getting configurations Config - Custom configuration. @@ -173,8 +180,11 @@ class Config(): self._contents_lock.acquire() self._raw_contents = read_contents + remainder = list(self._raw_contents) - for line in self._raw_contents: + while remainder: + line = remainder.pop(0) + # strips any commenting or excess whitespace comment_start = line.find("#") if comment_start != -1: line = line[:comment_start] @@ -189,6 +199,19 @@ class Config(): log.debug("Config entry '%s' is expected to be of the format 'Key Value', defaulting to '%s' -> ''" % (line, line)) key, value = line, "" + if not value: + # this might be a multi-line entry, try processing it as such + multiline_buffer = [] + + while remainder and remainder[0].lstrip().startswith("|"): + content = remainder.pop(0).lstrip()[1:] # removes '\s+|' prefix + content = content.rstrip("\n") # trailing newline + multiline_buffer.append(content) + + if multiline_buffer: + self.set(key, "\n".join(multiline_buffer), False) + continue + self.set(key, value, False) self._path = path diff --git a/test/settings.cfg b/test/settings.cfg index 19f5187..e004a98 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -6,6 +6,22 @@ # target.* - Attributes of the integration testing targets. This helps # determine what is ran when the user runs with '--target'. +msg.help +|Usage runTests.py [OPTION] +|Runs tests for the stem library. +| +| -u, --unit runs unit tests +| -i, --integ runs integration tests +| -c, --config PATH path to a custom test configuration +| -t, --target TARGET comma separated list of extra targets for integ tests +| -l, --log RUNLEVEL includes logging output with test results, runlevels: +| TRACE, DEBUG, INFO, NOTICE, WARN, ERROR +| --tor PATH custom tor binary to run testing against +| --no-color displays testing output without color +| -h, --help presents this help +| +| Integration targets: + ################## # CATEGORY: TARGET # ##################

1 0

[stem/master] Integ RUN_NONE target wasn't runnable
by atagar＠torproject.org 24 Jan '12

24 Jan '12

commit 1b71039087a0420e4138e4eb61291f6b6a752dd6 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 23 09:48:05 2012 -0800 Integ RUN_NONE target wasn't runnable The RUN_NONE target wasn't being included among the runnable integration targets because it had an empty torrc which failed a check that should have been for the attribute's existance instead. Also correcting the case of the 'TARGETS' enum. While it is a contant, I've been going with class case contentions for enumerations. --- run_tests.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/run_tests.py b/run_tests.py index acb229b..e3a9bbf 100755 --- a/run_tests.py +++ b/run_tests.py @@ -49,7 +49,7 @@ CONFIG = { "target.torrc": {}, } -TARGETS = stem.util.enum.Enum(*[(v, v) for v in ( +Target = stem.util.enum.Enum(*[(v, v) for v in ( "ONLINE", "RELATIVE", "RUN_NONE", @@ -63,7 +63,7 @@ TARGETS = stem.util.enum.Enum(*[(v, v) for v in ( "RUN_ALL", )]) -DEFAULT_RUN_TARGET = TARGETS.RUN_OPEN +DEFAULT_RUN_TARGET = Target.RUN_OPEN # Tests are ordered by the dependencies so the lowest level tests come first. # This is because a problem in say, controller message parsing, will cause all @@ -139,7 +139,7 @@ def load_user_configuration(test_config): sys.exit(1) for target in integ_targets: - if not target in TARGETS: + if not target in Target: print "Invalid integration target: %s" % target sys.exit(1) else: @@ -158,10 +158,10 @@ def load_user_configuration(test_config): print HELP_MSG # gets the longest target length so we can show the entries in columns - target_name_length = max(map(len, TARGETS)) + target_name_length = max(map(len, Target)) description_format = " %%-%is - %%s" % target_name_length - for target in TARGETS: + for target in Target: print description_format % (target, CONFIG["target.description"].get(target, "")) print @@ -250,7 +250,7 @@ if __name__ == '__main__': # Queue up all the targets with torrc options we want to run against. integ_run_targets = [] - all_run_targets = [t for t in TARGETS if CONFIG["target.torrc"].get(t)] + all_run_targets = [t for t in Target if CONFIG["target.torrc"].get(t) != None] if test_config.get("integ.target.run.all", False): # test against everything with torrc options

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 24 Jan '12

24 Jan '12

commit e7f30a6849c07069060dc64932105d85f7e5c408 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 24 15:15:05 2012 +0000 Update translations for gettor --- pt/gettor.po | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pt/gettor.po b/pt/gettor.po index 6aa01ae..f724868 100644 --- a/pt/gettor.po +++ b/pt/gettor.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-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-01-24 14:44+0000\n" +"PO-Revision-Date: 2012-01-24 14:58+0000\n" "Last-Translator: Zeca Gatilho <paulo.mosh(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -76,6 +76,8 @@ msgid "" "Please reply to this mail, and tell me a single package name anywhere \n" "in the body of your email." msgstr "" +"Por favor responda a este mail e escreva um nome do pacote algures no corpo " +"do seu email." #: lib/gettor/i18n.py:59 msgid "" @@ -248,6 +250,9 @@ msgid "" "\n" " gpg: Good signature from 'Erinn Clark <...>'" msgstr "" +"A saída deverá parecer-se com:\n" +"\n" +" gpg: Boa assinatura de 'Erinn Clark <...>'" #: lib/gettor/i18n.py:147 msgid "" @@ -288,6 +293,8 @@ msgid "" "It is also possible to fetch bridges with a web browser at the following\n" "url: https://bridges.torproject.org/" msgstr "" +"É também possível buscar as pontes com um browser web no seguinte endereço: " +"https://bridges.torproject.org/" #: lib/gettor/i18n.py:170 msgid "" @@ -395,24 +402,32 @@ msgid "" "linux-i386:\n" "The Tor Browser Bundle package for Linux, 32bit versions." msgstr "" +"linux-i386:\n" +"O pacote do Browser Tor para Linux, versões de 32 bits." #: lib/gettor/i18n.py:229 msgid "" "Note that this package is rather large and needs your email provider to \n" "allow for attachments of about 30MB in size." msgstr "" +"Note que este pacote é bastante grande e requer que o seu fornecedor de " +"email aceite anexos de cerca de 30MB de tamanho." #: lib/gettor/i18n.py:232 msgid "" "linux-x86_64:\n" "The Tor Browser Bundle package for Linux, 64bit versions." msgstr "" +"linux-x86_64:\n" +"O pacote do Browser Tor para Linux, versões de 64 bits." #: lib/gettor/i18n.py:235 msgid "" "source:\n" "The Tor source code, for experts. Most users do not want this package." msgstr "" +"código fonte:\n" +"O código fonte do Tor, para utilizadores avançados. A maioria dos utilizadores não precisa deste pacote." #: lib/gettor/i18n.py:238 msgid "" @@ -445,7 +460,7 @@ msgstr "" #: lib/gettor/i18n.py:255 msgid "What is the Tor Browser Bundle?" -msgstr "" +msgstr "O que é o pacote do Browser Tor?" #: lib/gettor/i18n.py:257 msgid ""

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 24 Jan '12

24 Jan '12

commit 53ccfc8d0d6f3c01aa1197e30c666f10c4e74fca Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 24 14:45:21 2012 +0000 Update translations for vidalia_help --- id_ID/links.po | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/id_ID/links.po b/id_ID/links.po new file mode 100644 index 0000000..bee92dd --- /dev/null +++ b/id_ID/links.po @@ -0,0 +1,81 @@ +# +# 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-05-05 20:21+0200\n" +"PO-Revision-Date: 2010-11-30 05:02+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: id_ID\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#. type: Content of: <html><body><h1> +#: links.html:16 +msgid "Helpful Links" +msgstr "" + +#. type: Content of: <html><body><h3> +#: links.html:19 +msgid "Vidalia" +msgstr "" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57 +msgid "   " +msgstr "" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:23 links.html:43 +msgid "Homepage" +msgstr "" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:25 +msgid "" +"<a href=\"https://www.torproject.org/vidalia/\"> " +"https://www.torproject.org/vidalia/</a>" +msgstr "" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:31 links.html:58 +msgid "Wiki and Bugtracker" +msgstr "" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:33 +msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>" +msgstr "" + +#. type: Content of: <html><body><h3> +#: links.html:39 +msgid "Tor" +msgstr "" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:45 +msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>" +msgstr "" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:50 +msgid "FAQ" +msgstr "" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:52 +msgid "" +"<a href=\"https://www.torproject.org/docs/faq.html\"> " +"https://www.torproject.org/docs/faq.html</a>" +msgstr "" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:60 +msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>" +msgstr "" + +

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 24 Jan '12

24 Jan '12

commit 7a98e828898a205aa2ae41a8331925fb8e559854 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 24 14:45:03 2012 +0000 Update translations for gettor --- pt/gettor.po | 498 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 498 insertions(+), 0 deletions(-) diff --git a/pt/gettor.po b/pt/gettor.po new file mode 100644 index 0000000..6aa01ae --- /dev/null +++ b/pt/gettor.po @@ -0,0 +1,498 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. +# Zeca Gatilho <paulo.mosh(a)gmail.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2012-01-24 14:44+0000\n" +"Last-Translator: Zeca Gatilho <paulo.mosh(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" +"Content-Transfer-Encoding: 8bit\n" +"Language: pt\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#: lib/gettor/i18n.py:27 +msgid "Hello, This is the \"GetTor\" robot." +msgstr "Olá, Isto é o robot \"GetTor\"." + +#: lib/gettor/i18n.py:29 +msgid "Thank you for your request." +msgstr "Obrigado pelo seu pedido." + +#: lib/gettor/i18n.py:31 +msgid "" +"Unfortunately, we won't answer you at this address. You should make\n" +"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" +"one of those." +msgstr "" + +#: lib/gettor/i18n.py:35 +msgid "" +"We only process requests from email services that support \"DKIM\",\n" +"which is an email feature that lets us verify that the address in the\n" +"\"From\" line is actually the one who sent the mail." +msgstr "" +"Apenas processamos pedidos de serviços de email que suportam \"DKIM\",\n" +"que é uma funcionalidade de email que nos deixa verificar que o endereço \"De\" é realmente o que enviou o mail. " + +#: lib/gettor/i18n.py:39 +msgid "" +"(We apologize if you didn't ask for this mail. Since your email is from\n" +"a service that doesn't use DKIM, we're sending a short explanation,\n" +"and then we'll ignore this email address for the next day or so.)" +msgstr "" +"(Pedimos desculpa caso não tenha pedido este mail. Como o seu email é de um serviço que não usa DKIM, estamos a enviar uma breve explicação,\n" +"e iremos ignorar este email durante um dia ou dois.)" + +#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 +msgid "" +"If you have any questions or it doesn't work, you can contact a\n" +"human at this support email address: help(a)rt.torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:46 +msgid "" +"I will mail you a Tor package, if you tell me which one you want.\n" +"Please select one of the following package names:\n" +"\n" +" windows\n" +" macos-i386\n" +" macos-ppc\n" +" linux-i386\n" +" linux-x86_64\n" +" source" +msgstr "" + +#: lib/gettor/i18n.py:56 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere \n" +"in the body of your email." +msgstr "" + +#: lib/gettor/i18n.py:59 +msgid "" +"OBTAINING LOCALIZED VERSIONS OF TOR\n" +"===================================" +msgstr "" +"OBTENDO VERSÕES TRADUZIDAS DO TOR\n" +"==================================" + +#: lib/gettor/i18n.py:62 +msgid "" +"To get a version of Tor translated into your language, specify the\n" +"language you want in the address you send the mail to:\n" +"\n" +" gettor+fa(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:67 +msgid "" +"This example will give you the requested package in a localized\n" +"version for Farsi (Persian). Check below for a list of supported language\n" +"codes. " +msgstr "" + +#: lib/gettor/i18n.py:71 +msgid " List of supported locales:" +msgstr "Lista dos idiomas suportados:" + +#: lib/gettor/i18n.py:73 +msgid "Here is a list of all available languages:" +msgstr "Aqui está uma lista de todos os idiomas disponíveis:" + +#: lib/gettor/i18n.py:75 +msgid "" +" gettor+ar(a)torproject.org: Arabic\n" +" gettor+de(a)torproject.org: German\n" +" gettor+en(a)torproject.org: English\n" +" gettor+es(a)torproject.org: Spanish\n" +" gettor+fa(a)torproject.org: Farsi (Iran)\n" +" gettor+fr(a)torproject.org: French\n" +" gettor+it(a)torproject.org: Italian\n" +" gettor+nl(a)torproject.org: Dutch\n" +" gettor+pl(a)torproject.org: Polish\n" +" gettor+ru(a)torproject.org: Russian\n" +" gettor+zh(a)torproject.org: Chinese" +msgstr "" +" gettor+ar(a)torproject.org: Arábico\n" +" gettor+de(a)torproject.org: Alemão\n" +" gettor+en(a)torproject.org: Inglês\n" +" gettor+es(a)torproject.org: Espanhol\n" +" gettor+fa(a)torproject.org: Farsi (Irão)\n" +" gettor+fr(a)torproject.org: Francês\n" +" gettor+it(a)torproject.org: Italiano\n" +" gettor+nl(a)torproject.org: Holandês\n" +" gettor+pl(a)torproject.org: Polaco\n" +" gettor+ru(a)torproject.org: Russo\n" +" gettor+zh(a)torproject.org: Chinês" + +#: lib/gettor/i18n.py:87 +msgid "If you select no language, you will receive the English version." +msgstr "Se não selecionar um idioma, receberá a versão em Inglês." + +#: lib/gettor/i18n.py:89 +msgid "" +"SMALLER SIZED PACKAGES\n" +"======================" +msgstr "" +"PACOTES DE TAMANHO MENOR\n" +"=========================" + +#: lib/gettor/i18n.py:92 +msgid "" +"If your bandwith is low or your provider doesn't allow you to\n" +"receive large attachments in your email, GetTor can send you several\n" +"small packages instead of one big one." +msgstr "" + +#: lib/gettor/i18n.py:96 +msgid "" +"Simply include the keyword 'split' in a new line on its own (this part\n" +"is important!) like so: \n" +" \n" +" windows\n" +" split" +msgstr "" + +#: lib/gettor/i18n.py:102 +msgid "" +"Sending this text in an email to GetTor will cause it to send you \n" +"the Tor Browser Bundle in a number of 1,4MB attachments." +msgstr "" +"Enviar este texto num email para o GetTor causará o envio para si\n" +"do Pacote com o Browser Tor em vários anexos de 1,4MB." + +#: lib/gettor/i18n.py:105 +msgid "" +"After having received all parts, you need to re-assemble them to \n" +"one package again. This is done as follows:" +msgstr "" +"Após receber todas as partes, precisará de os juntar num pacote novamente. " +"Isto é feito da seguinte forma:" + +#: lib/gettor/i18n.py:108 +msgid "1.) Save all received attachments into one folder on your disk." +msgstr "1.) Gravar todos os anexos recebidos numa pasta do seu disco." + +#: lib/gettor/i18n.py:110 +msgid "" +"2.) Unzip all files ending in \".z\". If you saved all attachments to\n" +"a fresh folder before, simply unzip all files in that folder. If you don't\n" +"know how to unzip the .z files, please see the UNPACKING THE FILES section." +msgstr "" + +#: lib/gettor/i18n.py:114 +msgid "" +"3.) Verify all files as described in the mail you received with \n" +"each package. (gpg --verify)" +msgstr "" +"3.) Verificar todos os ficheiros como descrito no mail recebido com cada " +"pacote. (gpg --verify)" + +#: lib/gettor/i18n.py:117 +msgid "" +"4.) Now unpack the multi-volume archive into one file by double-\n" +"clicking the file ending in \"..split.part01.exe\". This should start the \n" +"process automatically." +msgstr "" + +#: lib/gettor/i18n.py:121 +msgid "" +"5.) After unpacking is finished, you should find a newly created \n" +"\".exe\" file in your destination folder. Simply doubleclick\n" +"that and Tor Browser Bundle should start within a few seconds." +msgstr "" +"5.) Após a extração ser concluida, deverá encontrar o ficheiro \".exe\" na " +"pasta de destino. Simplesmente, faça um duplo clique no ficheiro e o Browser" +" Tor iniciará em poucos segundos." + +#: lib/gettor/i18n.py:125 +msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" +msgstr "6.) É isso. Está feito. Obrigado por usar o Tor e divirta-se!" + +#: lib/gettor/i18n.py:127 +msgid "" +"SUPPORT\n" +"=======" +msgstr "" +"SUPORTE\n" +"=======" + +#: lib/gettor/i18n.py:133 +msgid "" +"Here's your requested software as a zip file. Please unzip the\n" +"package and verify the signature." +msgstr "" + +#: lib/gettor/i18n.py:136 +msgid "" +"VERIFY SIGNATURE\n" +"================\n" +"If your computer has GnuPG installed, use the gpg commandline \n" +"tool as follows after unpacking the zip file:\n" +"\n" +" gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" +msgstr "" + +#: lib/gettor/i18n.py:143 +msgid "" +"The output should look somewhat like this:\n" +"\n" +" gpg: Good signature from 'Erinn Clark <...>'" +msgstr "" + +#: lib/gettor/i18n.py:147 +msgid "" +"If you're not familiar with commandline tools, try looking for\n" +"a graphical user interface for GnuPG on this website:\n" +"\n" +" http://www.gnupg.org/related_software/frontends.html" +msgstr "" + +#: lib/gettor/i18n.py:152 +msgid "" +"BLOCKED ACCESS / CENSORSHIP\n" +"===========================" +msgstr "" +"ACESSO BLOQUEADO / CENSURA\n" +"===========================" + +#: lib/gettor/i18n.py:155 +msgid "" +"If your Internet connection blocks access to the Tor network, you\n" +"may need a bridge relay. Bridge relays (or \"bridges\" for short)\n" +"are Tor relays that aren't listed in the main directory. Since there\n" +"is no complete public list of them, even if your ISP is filtering\n" +"connections to all the known Tor relays, they probably won't be able\n" +"to block all the bridges." +msgstr "" + +#: lib/gettor/i18n.py:162 +msgid "" +"You can acquire a bridge by sending an email that contains \"get bridges\"\n" +"in the body of the email to the following email address:\n" +"\n" +" bridges(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:167 +msgid "" +"It is also possible to fetch bridges with a web browser at the following\n" +"url: https://bridges.torproject.org/" +msgstr "" + +#: lib/gettor/i18n.py:170 +msgid "" +"IMPORTANT NOTE:\n" +"Since this is part of a split-file request, you need to wait for\n" +"all split files to be received by you before you can save them all\n" +"into the same directory and unpack them by double-clicking the\n" +"first file." +msgstr "" + +#: lib/gettor/i18n.py:176 +msgid "" +"Packages might arrive out of order! Please make sure you received\n" +"all packages before you attempt to unpack them!" +msgstr "" + +#: lib/gettor/i18n.py:179 +#, python-format +msgid "" +"It was successfully understood. Your request is currently being processed.\n" +"Your package (%s) should arrive within the next ten minutes." +msgstr "" + +#: lib/gettor/i18n.py:182 +msgid "" +"If it doesn't arrive, the package might be too big for your mail provider.\n" +"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account." +msgstr "" + +#: lib/gettor/i18n.py:185 +msgid "" +"Unfortunately we are currently experiencing problems and we can't fulfill\n" +"your request right now. Please be patient as we try to resolve this issue." +msgstr "" + +#: lib/gettor/i18n.py:188 +msgid "" +"Unfortunately there is no split package available for the package you\n" +"requested. Please send us another package name or request the same package \n" +"again, but remove the 'split' keyword. In that case we'll send you the whole \n" +"package. Make sure this is what you want." +msgstr "" + +#: lib/gettor/i18n.py:193 +msgid "" +"UNPACKING THE FILES\n" +"===================" +msgstr "" +"EXTRAINDO OS FICHEIROS\n" +"=====================" + +#: lib/gettor/i18n.py:196 +msgid "" +"The easiest way to unpack the files you received is to install 7-Zip,\n" +"a free file compression/uncompression tool. If it isn't installed on\n" +"your computer yet, you can download it here:\n" +"\n" +" http://www.7-zip.org/" +msgstr "" + +#: lib/gettor/i18n.py:202 +msgid "" +"When 7-Zip is installed, you can open the .z archive you received from\n" +"us by double-clicking on it." +msgstr "" + +#: lib/gettor/i18n.py:205 +msgid "" +"An alternative way to get the .z files extraced is to rename them to\n" +".zip. For example, if you recevied a file called \"windows.z\", rename it to \n" +"\"windows.zip\". You should then be able to extract the archive with common \n" +"file archiver programs that probably are already installed on your computer." +msgstr "" + +#: lib/gettor/i18n.py:210 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere\n" +"in your reply. Here's a short explanation of what these packages are:" +msgstr "" + +#: lib/gettor/i18n.py:213 +msgid "" +"windows:\n" +"The Tor Browser Bundle package for Windows operating systems. If you're \n" +"running some version of Windows, like Windows XP, Windows Vista or \n" +"Windows 7, this is the package you should get." +msgstr "" + +#: lib/gettor/i18n.py:218 +msgid "" +"macos-i386:\n" +"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n" +"general, newer Mac hardware will require you to use this package." +msgstr "" + +#: lib/gettor/i18n.py:222 +msgid "" +"macos-ppc:\n" +"This is an older installer (the \"Vidalia bundle\") for older Macs running\n" +"OS X on PowerPC CPUs. Note that this package will be deprecated soon." +msgstr "" + +#: lib/gettor/i18n.py:226 +msgid "" +"linux-i386:\n" +"The Tor Browser Bundle package for Linux, 32bit versions." +msgstr "" + +#: lib/gettor/i18n.py:229 +msgid "" +"Note that this package is rather large and needs your email provider to \n" +"allow for attachments of about 30MB in size." +msgstr "" + +#: lib/gettor/i18n.py:232 +msgid "" +"linux-x86_64:\n" +"The Tor Browser Bundle package for Linux, 64bit versions." +msgstr "" + +#: lib/gettor/i18n.py:235 +msgid "" +"source:\n" +"The Tor source code, for experts. Most users do not want this package." +msgstr "" + +#: lib/gettor/i18n.py:238 +msgid "" +"FREQUENTLY ASKED QUESTIONS\n" +"==========================" +msgstr "" +"PERGUNTAS MAIS FREQUENTES\n" +"==========================" + +#: lib/gettor/i18n.py:241 +msgid "What is Tor?" +msgstr "O que é o Tor?" + +#: lib/gettor/i18n.py:243 +msgid "The name \"Tor\" can refer to several different components." +msgstr "O nome \"Tor\" pode referir-se a diferentes componentes." + +#: lib/gettor/i18n.py:245 +msgid "" +"The Tor software is a program you can run on your computer that helps \n" +"keep you safe on the Internet. Tor protects you by bouncing your \n" +"communications around a distributed network of relays run by volunteers \n" +"all around the world: it prevents somebody watching your Internet connection \n" +"from learning what sites you visit, and it prevents the sites you visit from \n" +"learning your physical location. This set of volunteer relays is called the \n" +"Tor network. You can read more about how Tor works here:\n" +"\n" +" https://www.torproject.org/about/overview.html.en" +msgstr "" + +#: lib/gettor/i18n.py:255 +msgid "What is the Tor Browser Bundle?" +msgstr "" + +#: lib/gettor/i18n.py:257 +msgid "" +"The Browser Bundle (TBB) is the package we recommend to most users. \n" +"The bundle comes with everything you need to safely browse the Internet.\n" +"Just extract it and run." +msgstr "" + +#: lib/gettor/i18n.py:261 +msgid "What package should I request?" +msgstr "Que pacote devo pedir?" + +#: lib/gettor/i18n.py:263 +msgid "" +"This depends on the operating system you use. For instance, if your\n" +"operating system is Microsoft Windows, you should request \"windows\". Here\n" +"is a short explanation of all packages to request and what operating \n" +"systems there are suitable for:" +msgstr "" + +#: lib/gettor/i18n.py:268 +msgid "How do I extract the file(s) you sent me?" +msgstr "Como extrair o(s) ficheiro(s) que me enviou?" + +#: lib/gettor/i18n.py:270 +msgid "QUESTION:" +msgstr "PERGUNTA:" + +#: lib/gettor/i18n.py:272 +msgid "ANSWER:" +msgstr "RESPOSTA:" + +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr "" +"Desculpe, mas o pacote que pediu (%s) é demasiado grande para que o seu fornecedor o aceite como anexo. Tente usar outro fornecedor que aceite anexos de email maiores. Ou tente um dos seguintes mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" + +

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 24 Jan '12

24 Jan '12

commit 92276edd0caf72164cd75026eda8f7d17b4231ec Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 24 12:45:25 2012 +0000 Update translations for vidalia_help --- pl/links.po | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pl/links.po b/pl/links.po index 6e3b864..279b82a 100644 --- a/pl/links.po +++ b/pl/links.po @@ -1,13 +1,14 @@ # # Translators: +# <brosper(a)gmail.com>, 2012. # runasand <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-05-05 20:21+0200\n" -"PO-Revision-Date: 2010-11-30 05:02+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-01-24 12:36+0000\n" +"Last-Translator: Brosper <brosper(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" @@ -47,12 +48,12 @@ msgstr "" #. type: Content of: <html><body><table><tr><td> #: links.html:31 links.html:58 msgid "Wiki and Bugtracker" -msgstr "" +msgstr "Wiki i Bugtracker" #. type: Content of: <html><body><table><tr><td> #: links.html:33 msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>" -msgstr "" +msgstr "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>" #. type: Content of: <html><body><h3> #: links.html:39 @@ -75,10 +76,13 @@ msgid "" "<a href=\"https://www.torproject.org/docs/faq.html\"> " "https://www.torproject.org/docs/faq.html</a>" msgstr "" +"<a href=\"https://www.torproject.org/docs/faq.html\"> " +"https://www.torproject.org/docs/faq.html</a>" #. type: Content of: <html><body><table><tr><td> #: links.html:60 msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>" msgstr "" +"<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"

1 0