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

[stem/master] Using python3's unittest.mock module when available
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit e89c829fb75331fdc0d5aa03475c751371cb6c7e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 12 16:57:50 2013 -0700 Using python3's unittest.mock module when available Guess it's been a while since I last tried to test under python3. From python 3.3 on up the Mock library is built into the unittest module. Accounting for this so we can test under python3 again. --- run_tests.py | 6 +++++- stem/prereq.py | 19 ++++++++++++++++++- test/integ/process.py | 6 +++++- test/integ/response/protocolinfo.py | 8 ++++++-- test/integ/util/system.py | 6 +++++- test/settings.cfg | 2 ++ test/unit/connection/authentication.py | 8 ++++++-- test/unit/control/controller.py | 8 ++++++-- test/unit/descriptor/export.py | 8 ++++++-- test/unit/descriptor/reader.py | 6 +++++- test/unit/descriptor/remote.py | 6 +++++- test/unit/descriptor/server_descriptor.py | 8 ++++++-- test/unit/response/events.py | 8 ++++++-- test/unit/response/protocolinfo.py | 8 ++++++-- test/unit/tutorial.py | 8 ++++++-- test/unit/util/connection.py | 8 ++++++-- test/unit/util/proc.py | 8 ++++++-- test/unit/util/system.py | 8 ++++++-- test/unit/version.py | 8 ++++++-- test/util.py | 6 +++++- 20 files changed, 122 insertions(+), 31 deletions(-) diff --git a/run_tests.py b/run_tests.py index 0b590a1..08143c1 100755 --- a/run_tests.py +++ b/run_tests.py @@ -119,7 +119,11 @@ def main(): if not stem.prereq.is_mock_available(): try: - import mock + try: + import unittest.mock + except ImportError: + import mock + println(MOCK_OUT_OF_DATE_MSG % mock.__version__) except ImportError: println(MOCK_UNAVAILABLE_MSG) diff --git a/stem/prereq.py b/stem/prereq.py index d088480..22b5819 100644 --- a/stem/prereq.py +++ b/stem/prereq.py @@ -91,12 +91,29 @@ def is_crypto_available(): @lru_cache() def is_mock_available(): """ - Checks if the mock module is available. + Checks if the mock module is available. In python 3.3 and up it is a builtin + unittest module, but before this it needed to be `installed separately + <https://pypi.python.org/pypi/mock/>`_. Imports should be as follows.... + + :: + + try: + # added in python 3.3 + from unittest.mock import Mock + except ImportError: + from mock import Mock :returns: **True** if the mock module is available and **False** otherwise """ try: + # checks for python 3.3 version + import unittest.mock + return True + except ImportError: + pass + + try: import mock # check for mock's patch.dict() which was introduced in version 0.7.0 diff --git a/test/integ/process.py b/test/integ/process.py index f6a862a..0f309c8 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -15,7 +15,11 @@ import stem.util.system import stem.version import test.runner -from mock import patch +try: + # added in python 3.3 + from unittest.mock import patch +except ImportError: + from mock import patch class TestProcess(unittest.TestCase): diff --git a/test/integ/response/protocolinfo.py b/test/integ/response/protocolinfo.py index 98f0c03..6469b8d 100644 --- a/test/integ/response/protocolinfo.py +++ b/test/integ/response/protocolinfo.py @@ -11,10 +11,14 @@ import stem.util.system import stem.version import test.runner -from mock import Mock, patch - from test.integ.util.system import filter_system_call +try: + # added in python 3.3 + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch + class TestProtocolInfo(unittest.TestCase): def test_parsing(self): diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 0694ffc..df389b1 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -12,7 +12,11 @@ import stem.util.proc import stem.util.system import test.runner -from mock import Mock, patch +try: + # added in python 3.3 + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch def filter_system_call(prefixes): diff --git a/test/settings.cfg b/test/settings.cfg index 9838012..222a7a4 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -129,9 +129,11 @@ pep8.ignore E127 # False positives from pyflakes. These are mappings between the path and the # issue. +pyflakes.ignore run_tests.py => 'unittest' imported but unused pyflakes.ignore stem/control.py => undefined name 'control' pyflakes.ignore stem/prereq.py => 'RSA' imported but unused pyflakes.ignore stem/prereq.py => 'asn1' imported but unused +pyflakes.ignore stem/prereq.py => 'unittest' imported but unused pyflakes.ignore stem/prereq.py => 'mock' imported but unused pyflakes.ignore stem/prereq.py => 'long_to_bytes' imported but unused pyflakes.ignore stem/descriptor/__init__.py => redefinition of unused 'OrderedDict' from line 62 diff --git a/test/unit/connection/authentication.py b/test/unit/connection/authentication.py index 2157a5b..4b50bcf 100644 --- a/test/unit/connection/authentication.py +++ b/test/unit/connection/authentication.py @@ -13,11 +13,15 @@ import unittest import stem.connection -from mock import Mock, patch - from stem.util import log from test import mocking +try: + # added in python 3.3 + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch + class TestAuthenticate(unittest.TestCase): @patch('stem.connection.get_protocolinfo') diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index 7095f5a..14dceea 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -12,13 +12,17 @@ import stem.socket import stem.util.system import stem.version -from mock import Mock, patch - from stem import InvalidArguments, InvalidRequest, ProtocolError, UnsatisfiableRequest from stem.control import _parse_circ_path, Controller, EventType from stem.exit_policy import ExitPolicy from test import mocking +try: + # added in python 3.3 + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch + class TestControl(unittest.TestCase): def setUp(self): diff --git a/test/unit/descriptor/export.py b/test/unit/descriptor/export.py index 32a7809..d2eeaa0 100644 --- a/test/unit/descriptor/export.py +++ b/test/unit/descriptor/export.py @@ -8,13 +8,17 @@ import unittest import stem.prereq import test.runner -from mock import Mock, patch - from stem.descriptor.export import export_csv, export_csv_file from test.mocking import get_relay_server_descriptor, \ get_bridge_server_descriptor +try: + # added in python 3.3 + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch + class TestExport(unittest.TestCase): @patch('stem.descriptor.server_descriptor.RelayDescriptor._verify_digest', Mock()) diff --git a/test/unit/descriptor/reader.py b/test/unit/descriptor/reader.py index 826f436..62b561b 100644 --- a/test/unit/descriptor/reader.py +++ b/test/unit/descriptor/reader.py @@ -7,7 +7,11 @@ import unittest import stem.descriptor.reader -from mock import patch +try: + # added in python 3.3 + from unittest.mock import patch +except ImportError: + from mock import patch class TestDescriptorReader(unittest.TestCase): diff --git a/test/unit/descriptor/remote.py b/test/unit/descriptor/remote.py index e20dd06..4eda9e8 100644 --- a/test/unit/descriptor/remote.py +++ b/test/unit/descriptor/remote.py @@ -8,7 +8,11 @@ import unittest import stem.descriptor.remote -from mock import patch +try: + # added in python 3.3 + from unittest.mock import patch +except ImportError: + from mock import patch # Output from requesting moria1's descriptor from itself... # % curl http://128.31.0.39:9131/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020C… diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index 50f27f6..b0af7cc 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -11,14 +11,18 @@ import stem.exit_policy import stem.prereq import stem.util.str_tools -from mock import Mock, patch - from stem.descriptor.server_descriptor import RelayDescriptor, BridgeDescriptor from test.mocking import get_relay_server_descriptor, \ get_bridge_server_descriptor, \ CRYPTO_BLOB +try: + # added in python 3.3 + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch + class TestServerDescriptor(unittest.TestCase): @patch('stem.descriptor.server_descriptor.RelayDescriptor._verify_digest', Mock()) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 23b7006..281dbec 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -10,11 +10,15 @@ import stem.response import stem.response.events import stem.util.log -from mock import Mock - from stem import * # enums and exceptions from test import mocking +try: + # added in python 3.3 + from unittest.mock import Mock +except ImportError: + from mock import Mock + # ADDRMAP event ADDRMAP = '650 ADDRMAP www.atagar.com 75.119.206.243 "2012-11-19 00:50:13" \ diff --git a/test/unit/response/protocolinfo.py b/test/unit/response/protocolinfo.py index 30b218d..0eed900 100644 --- a/test/unit/response/protocolinfo.py +++ b/test/unit/response/protocolinfo.py @@ -12,11 +12,15 @@ import stem.util.proc import stem.util.system import stem.version -from mock import Mock, patch - from stem.response.protocolinfo import AuthMethod from test import mocking +try: + # added in python 3.3 + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch + NO_AUTH = """250-PROTOCOLINFO 1 250-AUTH METHODS=NULL 250-VERSION Tor="0.2.1.30" diff --git a/test/unit/tutorial.py b/test/unit/tutorial.py index 7a582be..8c76de7 100644 --- a/test/unit/tutorial.py +++ b/test/unit/tutorial.py @@ -6,13 +6,17 @@ import io import StringIO import unittest -from mock import Mock, patch - from stem.control import Controller from stem.descriptor.reader import DescriptorReader from stem.descriptor.server_descriptor import RelayDescriptor from test import mocking +try: + # added in python 3.3 + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch + MIRROR_MIRROR_OUTPUT = """\ 1. speedyexit (102.13 KB/s) 2. speedyexit (102.13 KB/s) diff --git a/test/unit/util/connection.py b/test/unit/util/connection.py index 1d9e6f6..e9c8980 100644 --- a/test/unit/util/connection.py +++ b/test/unit/util/connection.py @@ -5,12 +5,16 @@ Unit tests for the stem.util.connection functions. import platform import unittest -from mock import patch - import stem.util.connection from stem.util.connection import Resolver, Connection +try: + # added in python 3.3 + from unittest.mock import patch +except ImportError: + from mock import patch + NETSTAT_OUTPUT = """\ Active Internet connections (w/o servers) Proto Recv-Q Send-Q Local Address Foreign Address State PID/Program name diff --git a/test/unit/util/proc.py b/test/unit/util/proc.py index caf9d7a..55ed9e7 100644 --- a/test/unit/util/proc.py +++ b/test/unit/util/proc.py @@ -5,11 +5,15 @@ Unit testing code for the stem.util.proc functions. import StringIO import unittest -from mock import Mock, patch - from stem.util import proc from test import mocking +try: + # added in python 3.3 + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch + class TestProc(unittest.TestCase): @patch('stem.util.proc._get_line') diff --git a/test/unit/util/system.py b/test/unit/util/system.py index 36204f6..d36546d 100644 --- a/test/unit/util/system.py +++ b/test/unit/util/system.py @@ -10,10 +10,14 @@ import ntpath import posixpath import unittest -from mock import Mock, patch - from stem.util import system +try: + # added in python 3.3 + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch + # Base responses for the get_pid_by_name tests. The 'success' and # 'multiple_results' entries are filled in by tests. diff --git a/test/unit/version.py b/test/unit/version.py index 273d3e8..77551aa 100644 --- a/test/unit/version.py +++ b/test/unit/version.py @@ -7,10 +7,14 @@ import unittest import stem.util.system import stem.version -from mock import patch - from stem.version import Version +try: + # added in python 3.3 + from unittest.mock import patch +except ImportError: + from mock import patch + TOR_VERSION_OUTPUT = """Mar 22 23:09:37.088 [notice] Tor v0.2.2.35 \ (git-73ff13ab3cc9570d). This is experimental software. Do not rely on it for \ strong anonymity. (Running on Linux i686) diff --git a/test/util.py b/test/util.py index 3746e55..fc9386e 100644 --- a/test/util.py +++ b/test/util.py @@ -380,7 +380,11 @@ def check_pycrypto_version(): def check_mock_version(): if stem.prereq.is_mock_available(): - import mock + try: + import unittest.mock as mock + except ImportError: + import mock + return mock.__version__ else: return "missing"

1 0

[stem/master] Fixing python3 issue related to unicode exit policies
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit d09bd8b365819f4ea0d0a7d6b782b1021dba91c1 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 12 16:37:02 2013 -0700 Fixing python3 issue related to unicode exit policies Our recent exit policy caching caused a regression under python3... Traceback (most recent call last): File "./test/data/python3/run_tests.py", line 25, in <module> import test.runner File "/home/atagar/Desktop/stem/test/data/python3/test/runner.py", line 51, in <module> import stem.connection File "/home/atagar/Desktop/stem/test/data/python3/stem/connection.py", line 109, in <module> import stem.control File "/home/atagar/Desktop/stem/test/data/python3/stem/control.py", line 145, in <module> import stem.descriptor.microdescriptor File "/home/atagar/Desktop/stem/test/data/python3/stem/descriptor/__init__.py", line 546, in <module> import stem.descriptor.server_descriptor File "/home/atagar/Desktop/stem/test/data/python3/stem/descriptor/server_descriptor.py", line 91, in <module> REJECT_ALL_POLICY = stem.exit_policy.ExitPolicy("reject *:*") File "/home/atagar/Desktop/stem/test/data/python3/stem/exit_policy.py", line 164, in __init__ self._input_rules = zlib.compress(','.join(rules)) TypeError: 'str' does not support the buffer interface --- stem/exit_policy.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index cc91124..ee13308 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -61,6 +61,7 @@ import zlib import stem.prereq import stem.util.connection import stem.util.enum +import stem.util.str_tools try: # added in python 3.2 @@ -161,7 +162,8 @@ class ExitPolicy(object): is_all_str = False if rules and is_all_str: - self._input_rules = zlib.compress(','.join(rules)) + byte_rules = [stem.util.str_tools._to_bytes(r) for r in rules] + self._input_rules = zlib.compress(b','.join(byte_rules)) else: self._input_rules = rules

1 0

[translation/torbutton-browserproperties_completed] Update translations for torbutton-browserproperties_completed
by translation＠torproject.org 13 Oct '13

13 Oct '13

commit 7c926f23f186eb0099cc931e53784a545c02b4c8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 13 22:46:21 2013 +0000 Update translations for torbutton-browserproperties_completed --- ro/browser.properties | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ro/browser.properties b/ro/browser.properties new file mode 100644 index 0000000..0aec778 --- /dev/null +++ b/ro/browser.properties @@ -0,0 +1,13 @@ +# Default home page +browser.startup.homepage=despre:tor + +# Spell checker dictionary +spellchecker.dictionary=en_US + +# Default search engine +browser.search.defaultenginename=Pagină de start + +# Search engine order (order displayed in the search bar dropdown) +browser.search.order.1=Pagină de start +browser.search.order.2=DuckDuckGo +browser.search.order.3=Google

1 0

[translation/torbutton-browserproperties] Update translations for torbutton-browserproperties
by translation＠torproject.org 13 Oct '13

13 Oct '13

commit 2f7e319525a761494dbf026747ebbe5e5bfe971d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 13 22:46:19 2013 +0000 Update translations for torbutton-browserproperties --- ro/browser.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ro/browser.properties b/ro/browser.properties index f15fade..0aec778 100644 --- a/ro/browser.properties +++ b/ro/browser.properties @@ -1,5 +1,5 @@ # Default home page -# browser.startup.homepage=about:tor +browser.startup.homepage=despre:tor # Spell checker dictionary spellchecker.dictionary=en_US @@ -9,5 +9,5 @@ browser.search.defaultenginename=Pagină de start # Search engine order (order displayed in the search bar dropdown) browser.search.order.1=Pagină de start -# browser.search.order.2=DuckDuckGo -# browser.search.order.3=Google +browser.search.order.2=DuckDuckGo +browser.search.order.3=Google

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 13 Oct '13

13 Oct '13

commit 829646e5f8562432381f49709b85f9eb785e7806 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 13 22:46:12 2013 +0000 Update translations for abouttor-homepage --- ro/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ro/aboutTor.dtd b/ro/aboutTor.dtd index cbeba61..ee8d9a8 100644 --- a/ro/aboutTor.dtd +++ b/ro/aboutTor.dtd @@ -45,7 +45,7 @@ <!ENTITY aboutTor.searchSP.search.beforeLink.label ""> <!ENTITY aboutTor.searchDDG.search.beforeLink.label ""> <!ENTITY aboutTor.searchSP.search.label "Pagină de start"> -<!ENTITY aboutTor.searchDDG.search.label ""> +<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> <!ENTITY aboutTor.searchSP.search.link ""> <!ENTITY aboutTor.searchDDG.search.link ""> <!ENTITY aboutTor.searchSP.search.afterLink.label "">

1 0

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

13 Oct '13

commit 4062ee1ed41f60622aee6019fb24311d56abe775 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 13 22:45:53 2013 +0000 Update translations for tails-persistence-setup --- ro/ro.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ro/ro.po b/ro/ro.po index f61664a..1b02828 100644 --- a/ro/ro.po +++ b/ro/ro.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# adraga, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-09-29 14:53+0200\n" -"PO-Revision-Date: 2013-09-30 08:40+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-10-13 22:40+0000\n" +"Last-Translator: adraga\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,7 +44,7 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:78 msgid "Pidgin" -msgstr "" +msgstr "Pidgin" #: ../lib/Tails/Persistence/Configuration/Presets.pm:80 msgid "Pidgin profiles and OTR keyring" @@ -83,11 +84,11 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "Printers" -msgstr "" +msgstr "Imprimante" #: ../lib/Tails/Persistence/Configuration/Presets.pm:130 msgid "Printers configuration" -msgstr "" +msgstr "Configurarea imprimantelor" #: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "APT Packages" @@ -209,7 +210,7 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 msgid "Create" -msgstr "" +msgstr "Creați" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:110 msgid "" @@ -291,7 +292,7 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Delete.pm:43 msgid "Your persistent data will be deleted." -msgstr "" +msgstr "Datele persistente ale dumneavoastră vor fi șterse." #: ../lib/Tails/Persistence/Step/Delete.pm:47 #, perl-format

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 13 Oct '13

13 Oct '13

commit 89c5394c26d38ae2065244552e639408fa34fe3e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 13 15:15:53 2013 +0000 Update translations for whisperback_completed --- pt_BR/pt_BR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 3a7d30b..f4e2867 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.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: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2013-10-13 14:30+0000\n" +"PO-Revision-Date: 2013-10-13 15:00+0000\n" "Last-Translator: ncaio <caiogore(a)gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -37,7 +37,7 @@ msgstr "Key OpenPGP de contato inválida: %s" #: ../whisperBack/whisperback.py:82 msgid "Invalid contact OpenPGP public key block" -msgstr "Invalid contact OpenPGP public key block" +msgstr "Bloco de contato da chave pública OpenPGP inválida" #: ../whisperBack/exceptions.py:41 #, python-format @@ -122,7 +122,7 @@ msgstr "Enviar feedback em um e-mail criptografado." #: ../whisperBack/gui.py:393 msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" -msgstr "Copyright © 2009-2012 Tails developers (tails(a)boum.org)" +msgstr "Copyright © 2009-2012 Desenvolvedores Tails (tails(a)boum.org)" #: ../whisperBack/gui.py:394 msgid "Tails developers <tails(a)boum.org>"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 13 Oct '13

13 Oct '13

commit 0762c0a57590472968796295905958ff40ffc8c5 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 13 15:15:50 2013 +0000 Update translations for whisperback --- pt_BR/pt_BR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 3a7d30b..f4e2867 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.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: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2013-10-13 14:30+0000\n" +"PO-Revision-Date: 2013-10-13 15:00+0000\n" "Last-Translator: ncaio <caiogore(a)gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -37,7 +37,7 @@ msgstr "Key OpenPGP de contato inválida: %s" #: ../whisperBack/whisperback.py:82 msgid "Invalid contact OpenPGP public key block" -msgstr "Invalid contact OpenPGP public key block" +msgstr "Bloco de contato da chave pública OpenPGP inválida" #: ../whisperBack/exceptions.py:41 #, python-format @@ -122,7 +122,7 @@ msgstr "Enviar feedback em um e-mail criptografado." #: ../whisperBack/gui.py:393 msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" -msgstr "Copyright © 2009-2012 Tails developers (tails(a)boum.org)" +msgstr "Copyright © 2009-2012 Desenvolvedores Tails (tails(a)boum.org)" #: ../whisperBack/gui.py:394 msgid "Tails developers <tails(a)boum.org>"

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 13 Oct '13

13 Oct '13

commit 7006b763069664f05e07e23f94b1f94c0bee056a Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 13 14:45:51 2013 +0000 Update translations for whisperback_completed --- pt_BR/pt_BR.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 0adeaa5..3a7d30b 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -9,13 +9,14 @@ # betodso <beto.cpv(a)gmail.com>, 2013 # jkaizer <jkck2010(a)hotmail.com>, 2013 # Snake Plissken <>, 2012 +# ncaio <caiogore(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2013-10-06 19:50+0000\n" -"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" +"PO-Revision-Date: 2013-10-13 14:30+0000\n" +"Last-Translator: ncaio <caiogore(a)gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,7 +37,7 @@ msgstr "Key OpenPGP de contato inválida: %s" #: ../whisperBack/whisperback.py:82 msgid "Invalid contact OpenPGP public key block" -msgstr "Bloco de chave pública OpenPGP de contato inválida" +msgstr "Invalid contact OpenPGP public key block" #: ../whisperBack/exceptions.py:41 #, python-format

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 13 Oct '13

13 Oct '13

commit 40ce40a8a48942eccc70f158dd5bd2e9d7801707 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 13 14:45:46 2013 +0000 Update translations for whisperback --- pt_BR/pt_BR.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 0adeaa5..3a7d30b 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -9,13 +9,14 @@ # betodso <beto.cpv(a)gmail.com>, 2013 # jkaizer <jkck2010(a)hotmail.com>, 2013 # Snake Plissken <>, 2012 +# ncaio <caiogore(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2013-10-06 19:50+0000\n" -"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" +"PO-Revision-Date: 2013-10-13 14:30+0000\n" +"Last-Translator: ncaio <caiogore(a)gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,7 +37,7 @@ msgstr "Key OpenPGP de contato inválida: %s" #: ../whisperBack/whisperback.py:82 msgid "Invalid contact OpenPGP public key block" -msgstr "Bloco de chave pública OpenPGP de contato inválida" +msgstr "Invalid contact OpenPGP public key block" #: ../whisperBack/exceptions.py:41 #, python-format

1 0