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

[bridgedb/develop] Merge remote-tracking branch 'rr/2015-04-30-01-misc-fixes' into develop
by isis＠torproject.org 04 Jun '15

04 Jun '15

commit be58b8f8a70b3e1e4f3cd6d3e10b6fe2a82a7998 Merge: e6e7ea1 d84d884 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 6 20:03:28 2015 +0000 Merge remote-tracking branch 'rr/2015-04-30-01-misc-fixes' into develop lib/bridgedb/bridges.py | 2 +- lib/bridgedb/parse/descriptors.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[bridgedb/develop] Merge remote-tracking branch 'rr/2015-03-23-01-fix-strip-abuse' into develop
by isis＠torproject.org 04 Jun '15

04 Jun '15

commit bd5866b65fa670b41e96672325e8540e32286012 Merge: be58b8f 4e3aa2d Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 6 20:21:17 2015 +0000 Merge remote-tracking branch 'rr/2015-03-23-01-fix-strip-abuse' into develop lib/bridgedb/Bridges.py | 3 ++- lib/bridgedb/bridges.py | 6 ++++-- lib/bridgedb/parse/addr.py | 8 ++------ lib/bridgedb/test/legacy_Tests.py | 9 ++------- lib/bridgedb/test/test_Main.py | 3 ++- lib/bridgedb/test/test_Tests.py | 3 ++- lib/bridgedb/test/test_bridgedb.py | 3 ++- lib/bridgedb/test/test_captcha.py | 7 ++++--- lib/bridgedb/test/test_configure.py | 3 ++- lib/bridgedb/test/test_crypto.py | 3 ++- lib/bridgedb/test/test_email_autoresponder.py | 3 ++- lib/bridgedb/test/test_https.py | 3 ++- lib/bridgedb/test/test_parse_addr.py | 2 +- lib/bridgedb/test/test_smtp.py | 3 ++- lib/bridgedb/util.py | 9 +++++++++ 15 files changed, 40 insertions(+), 28 deletions(-)

1 0

[bridgedb/develop] Correct a comment
by isis＠torproject.org 04 Jun '15

04 Jun '15

commit d84d88462aae54349bf0df6a1a62080893395ed2 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Mar 28 16:57:41 2015 -0700 Correct a comment (Malice is an intent; if something is unintentional, then it's not malicious.) --- lib/bridgedb/parse/descriptors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/parse/descriptors.py b/lib/bridgedb/parse/descriptors.py index 3f8d48e..9d196b8 100644 --- a/lib/bridgedb/parse/descriptors.py +++ b/lib/bridgedb/parse/descriptors.py @@ -172,7 +172,7 @@ def deduplicate(descriptors, statistics=False): .. note:: If two descriptors for the same router are discovered, AND both descriptors have the **same** published timestamp, then the router's fingerprint WILL BE LOGGED ON PURPOSE, because we assume that router - to be malicious (deliberately, or unintentionally). + to be broken or malicious. :param list descriptors: A list of :api:`stem.descriptor.server_descriptor.RelayDescriptor`s,

1 0

[bridgedb/develop] Avoid joining, then stripping the delimiter out
by isis＠torproject.org 04 Jun '15

04 Jun '15

commit 0ba9dda5a67257c1de1d34837b928b99d8e476df Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Mar 23 11:41:54 2015 -0700 Avoid joining, then stripping the delimiter out --- lib/bridgedb/parse/addr.py | 8 ++------ lib/bridgedb/test/legacy_Tests.py | 5 +---- lib/bridgedb/test/test_parse_addr.py | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/lib/bridgedb/parse/addr.py b/lib/bridgedb/parse/addr.py index af63192..96dc21e 100644 --- a/lib/bridgedb/parse/addr.py +++ b/lib/bridgedb/parse/addr.py @@ -429,7 +429,7 @@ def isValidIP(ip): reasons.append('cannot convert to ip') if reasons: - explain = ', '.join([r for r in reasons]).strip(', ') + explain = ', '.join([r for r in reasons]) logging.debug("IP address %r is invalid! Reason(s): %s" % (ip, explain)) return False @@ -568,11 +568,7 @@ class PortList(object): def __str__(self): """Returns a pretty string representation of this PortList.""" - ret = [] - for port in self.ports: - ret.append(',%s' % port) - ret = ''.join([piece for piece in ret]) - return ret.lstrip(",") + return ','.join(['%s' % port for port in self.ports]) def __repr__(self): """Returns a raw depiction of this PortList.""" diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index d416d22..bf4cf39 100644 --- a/lib/bridgedb/test/legacy_Tests.py +++ b/lib/bridgedb/test/legacy_Tests.py @@ -85,10 +85,7 @@ def randomPortSpec(): ports.append(random.randint(1,65535)) ports.sort(reverse=True) - portspec = "" - for i in range(0,16): - portspec += "%d," % random.choice(ports) - portspec = portspec.rstrip(',') #remove trailing , + portspec = ",".join(["%d" % random.choice(ports) for i in range(0,16)]) return portspec def randomCountry(): diff --git a/lib/bridgedb/test/test_parse_addr.py b/lib/bridgedb/test/test_parse_addr.py index 55f0f60..4659efb 100644 --- a/lib/bridgedb/test/test_parse_addr.py +++ b/lib/bridgedb/test/test_parse_addr.py @@ -671,7 +671,7 @@ class PortListTest(unittest.TestCase): tooMany = addr.PortList.PORTSPEC_LEN + 1 ports = [self.getRandomPort() for x in xrange(tooMany)] log.msg("Testing addr.PortList(%s))" - % ', '.join([type('')(port) for port in ports]).strip(', ')) + % ', '.join([type('')(port) for port in ports])) portList = addr.PortList(*ports) self.assertEqual(len(portList), tooMany)

1 0

[bridgedb/develop] Remove clear abuses of str.strip() and str.rstrip()
by isis＠torproject.org 04 Jun '15

04 Jun '15

commit 4e773f346f2b442a1726af94b7b2da231b73c1d6 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Mar 23 11:24:33 2015 -0700 Remove clear abuses of str.strip() and str.rstrip() --- lib/bridgedb/Bridges.py | 3 ++- lib/bridgedb/bridges.py | 6 ++++-- lib/bridgedb/test/test_Main.py | 3 ++- lib/bridgedb/test/test_Tests.py | 3 ++- lib/bridgedb/test/test_bridgedb.py | 3 ++- lib/bridgedb/test/test_captcha.py | 7 ++++--- lib/bridgedb/test/test_configure.py | 3 ++- lib/bridgedb/test/test_crypto.py | 3 ++- lib/bridgedb/test/test_email_autoresponder.py | 3 ++- lib/bridgedb/test/test_https.py | 3 ++- lib/bridgedb/test/test_smtp.py | 3 ++- lib/bridgedb/util.py | 9 +++++++++ 12 files changed, 35 insertions(+), 14 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index bdb911a..8c05083 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -29,6 +29,7 @@ from bridgedb.parse.fingerprint import toHex from bridgedb.parse.fingerprint import fromHex from bridgedb.parse.fingerprint import isValidFingerprint from bridgedb.safelog import logSafely +from bridgedb.util import remove_prefix try: from cStringIO import StringIO @@ -692,7 +693,7 @@ class FilteredBridgeSplitter(BridgeHolder): subringName = [self.distributorName] for filterName in filterNames: if filterName != 'filterAssignBridgesToRing': - subringName.append(filterName.strip('filterBridgesBy')) + subringName.append(remove_prefix(filterName, 'filterBridgesBy')) subringName = '-'.join([x for x in subringName]) subring.setName(subringName) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 96f995e..8759473 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -38,6 +38,8 @@ from bridgedb.parse.fingerprint import isValidFingerprint from bridgedb.parse.fingerprint import toHex from bridgedb.parse.fingerprint import fromHex from bridgedb.parse.nickname import isValidRouterNickname +from bridgedb.util import remove_prefix +from bridgedb.util import remove_suffix class PluggableTransportUnavailable(Exception): @@ -1462,8 +1464,8 @@ class Bridge(BridgeBackwardsCompatibility): sequence = asn1.DerSequence() key = self.signingKey - key = key.strip(TOR_SIGNING_KEY_HEADER) - key = key.strip(TOR_SIGNING_KEY_FOOTER) + key = remove_prefix(key, TOR_SIGNING_KEY_HEADER) + key = remove_suffix(key, TOR_SIGNING_KEY_FOOTER) key = key.replace('\n', '') key = base64.b64decode(key) diff --git a/lib/bridgedb/test/test_Main.py b/lib/bridgedb/test/test_Main.py index 0b14319..688c383 100644 --- a/lib/bridgedb/test/test_Main.py +++ b/lib/bridgedb/test/test_Main.py @@ -29,13 +29,14 @@ from twisted.trial import unittest from bridgedb import Main from bridgedb.Bridges import BridgeHolder from bridgedb.parse.options import parseOptions +from bridgedb.util import remove_suffix logging.getLogger().disabled = True HERE = os.getcwd() -TOPDIR = HERE.rstrip('_trial_temp') +TOPDIR = remove_suffix(HERE, '_trial_temp') CI_RUNDIR = os.path.join(TOPDIR, 'run') # A networkstatus descriptor with two invalid ORAddress (127.0.0.1 and ::1) diff --git a/lib/bridgedb/test/test_Tests.py b/lib/bridgedb/test/test_Tests.py index e78a4c4..a46c50f 100644 --- a/lib/bridgedb/test/test_Tests.py +++ b/lib/bridgedb/test/test_Tests.py @@ -29,6 +29,7 @@ from twisted.trial import unittest from bridgedb.test import legacy_Tests as Tests from bridgedb.test import deprecated +from bridgedb.util import remove_suffix warnings.filterwarnings('ignore', module="bridgedb\.test\.legacy_Tests") @@ -191,7 +192,7 @@ class DynamicTestCaseMeta(type): origFunc = origName.split('.')[-2:] origName = '_'.join(origFunc) if origName.endswith('_py'): # this happens with doctests - origName = origName.strip('_py') + origName = remove_suffix(origName, '_py') methName = str(methodPrefix + origName).replace('.', '_') meth = testMethodFactory(test, methName) logging.debug("Set %s.%s=%r" % (cls.__name__, methName, meth)) diff --git a/lib/bridgedb/test/test_bridgedb.py b/lib/bridgedb/test/test_bridgedb.py index 70c71f0..301309a 100644 --- a/lib/bridgedb/test/test_bridgedb.py +++ b/lib/bridgedb/test/test_bridgedb.py @@ -23,6 +23,7 @@ from twisted.trial.unittest import SkipTest from bridgedb.test.util import processExists from bridgedb.test.util import getBridgeDBPID +from bridgedb.util import remove_suffix class BridgeDBCliTest(unittest.TestCase): @@ -30,7 +31,7 @@ class BridgeDBCliTest(unittest.TestCase): def setUp(self): here = os.getcwd() - topdir = here.rstrip('_trial_temp') + topdir = remove_suffix(here, '_trial_temp') self.rundir = os.path.join(topdir, 'run') self.pidfile = os.path.join(self.rundir, 'bridgedb.pid') self.pid = getBridgeDBPID(self.pidfile) diff --git a/lib/bridgedb/test/test_captcha.py b/lib/bridgedb/test/test_captcha.py index a5083d7..ea05749 100644 --- a/lib/bridgedb/test/test_captcha.py +++ b/lib/bridgedb/test/test_captcha.py @@ -23,6 +23,7 @@ from zope.interface import providedBy from bridgedb import captcha from bridgedb import crypto +from bridgedb.util import remove_suffix class CaptchaTests(unittest.TestCase): @@ -97,7 +98,7 @@ class GimpCaptchaTests(unittest.TestCase): def setUp(self): here = os.getcwd() - self.topDir = here.rstrip('_trial_temp') + self.topDir = remove_suffix(here, '_trial_temp') self.cacheDir = os.path.join(self.topDir, 'captchas') self.badCacheDir = os.path.join(here, 'capt') @@ -131,7 +132,7 @@ class GimpCaptchaTests(unittest.TestCase): """GimpCaptcha with bad cacheDir should raise GimpCaptchaError.""" self.assertRaises(captcha.GimpCaptchaError, captcha.GimpCaptcha, self.publik, self.sekrit, self.hmacKey, - self.cacheDir.rstrip('chas')) + remove_suffix(self.cacheDir, 'chas')) def test_init(self): """Test that __init__ correctly initialised all the values.""" @@ -238,7 +239,7 @@ class GimpCaptchaTests(unittest.TestCase): c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) image, challenge = c.get() - challengeBadB64 = challenge.rstrip('==') + "\x42\x42\x42" + challengeBadB64 = remove_suffix(challenge, '==') + "\x42\x42\x42" self.assertEquals( c.check(challenge, c.answer, c.secretKey, c.hmacKey), True) diff --git a/lib/bridgedb/test/test_configure.py b/lib/bridgedb/test/test_configure.py index 501ed1f..5246613 100644 --- a/lib/bridgedb/test/test_configure.py +++ b/lib/bridgedb/test/test_configure.py @@ -16,6 +16,7 @@ import os from twisted.trial import unittest from bridgedb import configure +from bridgedb.util import remove_suffix class ConfigureTests(unittest.TestCase): @@ -24,7 +25,7 @@ class ConfigureTests(unittest.TestCase): def setUp(self): """Find the config file in the top directory of this repo.""" here = os.getcwd() - topdir = here.rstrip('_trial_temp') + topdir = remove_suffix(here, '_trial_temp') self.configFilename = os.path.join(topdir, 'bridgedb.conf') def test_loadConfig_with_file(self): diff --git a/lib/bridgedb/test/test_crypto.py b/lib/bridgedb/test/test_crypto.py index c2010ca..afd63c8 100644 --- a/lib/bridgedb/test/test_crypto.py +++ b/lib/bridgedb/test/test_crypto.py @@ -33,6 +33,7 @@ from bridgedb import txrecaptcha from bridgedb.persistent import Conf from bridgedb.test.util import fileCheckDecorator from bridgedb.test.email_helpers import _createConfig +from bridgedb.util import remove_suffix logging.disable(50) @@ -98,7 +99,7 @@ class InitializeGnuPGTests(unittest.TestCase): :returns: The full path to the new gnupg home directory. """ here = os.getcwd() - topDir = here.rstrip('_trial_temp') + topDir = remove_suffix(here, '_trial_temp') gnupghome = os.path.join(topDir, '.gnupg') gnupghomeNew = os.path.join(here, '.gnupg') diff --git a/lib/bridgedb/test/test_email_autoresponder.py b/lib/bridgedb/test/test_email_autoresponder.py index 2895802..4c36be4 100644 --- a/lib/bridgedb/test/test_email_autoresponder.py +++ b/lib/bridgedb/test/test_email_autoresponder.py @@ -29,6 +29,7 @@ from bridgedb.Dist import TooSoonEmail from bridgedb.test.email_helpers import _createConfig from bridgedb.test.email_helpers import _createMailServerContext from bridgedb.test.email_helpers import DummyEmailDistributorWithState +from bridgedb.util import remove_suffix class CreateResponseBodyTests(unittest.TestCase): @@ -36,7 +37,7 @@ class CreateResponseBodyTests(unittest.TestCase): def _moveGPGTestKeyfile(self): here = os.getcwd() - topDir = here.rstrip('_trial_temp') + topDir = remove_suffix(here, '_trial_temp') self.gpgFile = os.path.join(topDir, '.gnupg', 'TESTING.subkeys.sec') self.gpgMoved = os.path.join(here, 'TESTING.subkeys.sec') shutil.copy(self.gpgFile, self.gpgMoved) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 92b07bf..bf229f8 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -36,6 +36,7 @@ from twisted.trial.unittest import SkipTest from bridgedb.test.util import processExists from bridgedb.test.util import getBridgeDBPID +from bridgedb.util import remove_suffix HTTP_ROOT = 'http://127.0.0.1:6788' CAPTCHA_RESPONSE = 'Tvx74Pmy' @@ -44,7 +45,7 @@ CAPTCHA_RESPONSE = 'Tvx74Pmy' class HTTPTests(unittest.TestCase): def setUp(self): here = os.getcwd() - topdir = here.rstrip('_trial_temp') + topdir = remove_suffix(here, '_trial_temp') self.rundir = os.path.join(topdir, 'run') self.pidfile = os.path.join(self.rundir, 'bridgedb.pid') self.pid = getBridgeDBPID(self.pidfile) diff --git a/lib/bridgedb/test/test_smtp.py b/lib/bridgedb/test/test_smtp.py index 1cbafba..b4cf8f9 100644 --- a/lib/bridgedb/test/test_smtp.py +++ b/lib/bridgedb/test/test_smtp.py @@ -17,6 +17,7 @@ from twisted.trial.unittest import SkipTest from bridgedb.test.util import processExists from bridgedb.test.util import getBridgeDBPID +from bridgedb.util import remove_suffix # ------------- SMTP Client Config SMTP_DEBUG_LEVEL = 0 # set to 1 to see SMTP message exchange @@ -118,7 +119,7 @@ class SMTPTests(unittest.TestCase): running. ''' here = os.getcwd() - topdir = here.rstrip('_trial_temp') + topdir = remove_suffix(here, '_trial_temp') self.rundir = os.path.join(topdir, 'run') self.pidfile = os.path.join(self.rundir, 'bridgedb.pid') self.pid = getBridgeDBPID(self.pidfile) diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index ca2a88f..3e1b42f 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -302,3 +302,12 @@ class mixin: expect mixin classes to end in ``'mixin'``. """ __metaclass__ = abc.ABCMeta + +def remove_prefix(s, f): + assert s.startswith(f) + return s[len(f):] + +def remove_suffix(s, f): + assert s.endswith(f) + return s[:-len(f)] +

1 0

[bridgedb/develop] Replace a for loop with a list comprehension
by isis＠torproject.org 04 Jun '15

04 Jun '15

commit 4e3aa2db2d00e7b4abded7038a091f1762483302 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Mar 23 11:43:22 2015 -0700 Replace a for loop with a list comprehension --- lib/bridgedb/test/legacy_Tests.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index bf4cf39..ddf30f3 100644 --- a/lib/bridgedb/test/legacy_Tests.py +++ b/lib/bridgedb/test/legacy_Tests.py @@ -80,9 +80,7 @@ def randomPortSpec(): """ returns a random list of ports """ - ports = [] - for i in range(0,24): - ports.append(random.randint(1,65535)) + ports = [randomPort() for i in range(0,24)] ports.sort(reverse=True) portspec = ",".join(["%d" % random.choice(ports) for i in range(0,16)])

1 0

[bridgedb/develop] Add function to HTML-encode strings
by isis＠torproject.org 04 Jun '15

04 Jun '15

commit faf4898324faaedf4ff675230e5275c264ab90b1 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Apr 30 05:17:42 2015 -0700 Add function to HTML-encode strings --- lib/bridgedb/util.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index f3d87bd..8034120 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -180,6 +180,26 @@ def levenshteinDistance(s1, s2, len1=None, len2=None, memo[key] = distance return distance +htmlify_string_map = { + '<': '<', + '>': '>', + '&': '&', + '"': '"', + "'": ''', + '\n': '<br/>' + } +def htmlify_string(s): + """Encode HTML special characters, and newlines, in s. + + >>> htmlify_string('<script>alert("badthink");</script>') + '<script>alert("badthink");</script>' + >>> htmlify_string('bridge 1\nbridge 2') + 'bridge 1<br/>bridge 2' + + :param str s: The string to encode. + """ + return ''.join(map((lambda ch: htmlify_string_map.get(ch, ch)), s)) + class JustifiedLogFormatter(logging.Formatter): """A logging formatter which pretty prints thread and calling function

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 03 Jun '15

03 Jun '15

commit 008c84e61b732b6402ffe3622d28223e1a2fa663 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 3 19:15:04 2015 +0000 Update translations for bridgedb --- vi/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vi/LC_MESSAGES/bridgedb.po b/vi/LC_MESSAGES/bridgedb.po index f69ee20..0b4d68f 100644 --- a/vi/LC_MESSAGES/bridgedb.po +++ b/vi/LC_MESSAGES/bridgedb.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-06-03 18:41+0000\n" +"PO-Revision-Date: 2015-06-03 18:47+0000\n" "Last-Translator: Tuan Duc Dang <dwayne.dang(a)yahoo.com>\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/torproject/language/vi/)\n" "MIME-Version: 1.0\n" @@ -61,7 +61,7 @@ msgstr "Chào mừng đến với BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: lib/bridgedb/strings.py:30 msgid "Currently supported transport TYPEs:" -msgstr "" +msgstr "transport TYPEs được hỗ trợ hiện thời:" #: lib/bridgedb/strings.py:31 #, python-format @@ -84,7 +84,7 @@ msgstr "Các khoá Công cộng" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "" +msgstr "Email này được tạo bởi cầu vồng, kỳ lân và ánh sáng lấp lánh cho %s vào %s lúc %s." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 03 Jun '15

03 Jun '15

commit b96328ee4423c0ad5f8023943166883b8d916592 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 3 18:45:03 2015 +0000 Update translations for bridgedb --- vi/LC_MESSAGES/bridgedb.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/vi/LC_MESSAGES/bridgedb.po b/vi/LC_MESSAGES/bridgedb.po index 62bb559..f69ee20 100644 --- a/vi/LC_MESSAGES/bridgedb.po +++ b/vi/LC_MESSAGES/bridgedb.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Tuan Duc Dang <dwayne.dang(a)yahoo.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-19 08:23+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-06-03 18:41+0000\n" +"Last-Translator: Tuan Duc Dang <dwayne.dang(a)yahoo.com>\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/torproject/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,11 +31,11 @@ msgstr "" #. "Tor Browser" #: lib/bridgedb/HTTPServer.py:107 msgid "Sorry! Something went wrong with your request." -msgstr "" +msgstr "Xin lỗi! Có vấn đề với yêu cầu của bạn." #: lib/bridgedb/strings.py:18 msgid "[This is an automated message; please do not reply.]" -msgstr "" +msgstr "[Đây là thông điệp tự động; xin đừng trả lời]" #: lib/bridgedb/strings.py:20 msgid "Here are your bridges:" @@ -55,7 +56,7 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: lib/bridgedb/strings.py:28 msgid "Welcome to BridgeDB!" -msgstr "" +msgstr "Chào mừng đến với BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: lib/bridgedb/strings.py:30 @@ -65,15 +66,15 @@ msgstr "" #: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" -msgstr "" +msgstr "Hây, %s!" #: lib/bridgedb/strings.py:32 msgid "Hello, friend!" -msgstr "" +msgstr "Chào bạn!" #: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" -msgstr "" +msgstr "Các khoá Công cộng" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles

1 0

[translation/tor_animation_completed] Update translations for tor_animation_completed
by translation＠torproject.org 02 Jun '15

02 Jun '15

commit 139239cba2634e0c7c1fd0dcf89f21d98ebd60de Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 3 02:16:27 2015 +0000 Update translations for tor_animation_completed --- en_GB.srt | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 165 insertions(+) diff --git a/en_GB.srt b/en_GB.srt new file mode 100644 index 0000000..0e6056a --- /dev/null +++ b/en_GB.srt @@ -0,0 +1,165 @@ +1 +00:00:00,660 --> 00:00:02,780 +We've gotten very used to the Internet. + +2 +00:00:03,120 --> 00:00:07,700 +We are constantly sharing information +about ourselves and our private lives: + +3 +00:00:08,000 --> 00:00:09,960 +food we eat, people we meet, + +4 +00:00:10,180 --> 00:00:12,480 +places we go, and the stuff we read. + +5 +00:00:13,280 --> 00:00:14,640 +Let me explain it better. + +6 +00:00:14,920 --> 00:00:17,740 +Right at this moment, +if someone attempts to look you up, + +7 +00:00:18,060 --> 00:00:22,480 +they'll see your real identity, +precise location, operating system, + +8 +00:00:22,800 --> 00:00:26,500 +all the sites you've visited, +the browser you use to surf the web, + +9 +00:00:26,700 --> 00:00:29,140 +and so much more information +about you and your life + +10 +00:00:29,200 --> 00:00:31,500 +which you probably didn't mean +to share with unknown strangers, + +11 +00:00:31,700 --> 00:00:34,000 +who could easily use this data +to exploit you. + +12 +00:00:34,500 --> 00:00:37,000 +But not if you're using Tor! + +13 +00:00:37,140 --> 00:00:40,840 +Tor Browser protects our privacy +and identity on the Internet. + +14 +00:00:41,560 --> 00:00:44,760 +Tor secures your connection +with three layers of encryption + +15 +00:00:44,940 --> 00:00:49,760 +and passes it through three voluntarily +operated servers around the world, + +16 +00:00:50,280 --> 00:00:53,520 +which enables us to communicate +anonymously over the Internet. + +17 +00:00:56,560 --> 00:00:58,280 +Tor also protects our data + +18 +00:00:58,400 --> 00:01:01,900 +against corporate or government targeted +and mass surveillance. + +19 +00:01:02,880 --> 00:01:07,340 +Perhaps you live in a repressive country +which tries to control and surveil the Internet. + +20 +00:01:07,900 --> 00:01:11,800 +Or perhaps you don't want big corporations +taking advantage of your personal information. + +21 +00:01:12,880 --> 00:01:15,640 +Tor makes all of its users +to look the same + +22 +00:01:15,920 --> 00:01:18,800 +which confuses the observer +and makes you anonymous. + +23 +00:01:19,500 --> 00:01:22,980 +So, the more people use the Tor network, +the stronger it gets + +24 +00:01:23,140 --> 00:01:27,800 +as it's easier to hide in a crowd +of people who look exactly the same. + +25 +00:01:28,700 --> 00:01:31,240 +You can bypass the censorship +without being worried about + +26 +00:01:31,400 --> 00:01:34,100 +the censor knowing what you do +on the Internet. + +27 +00:01:36,540 --> 00:01:39,440 +The ads won't follow you +everywhere for months, + +28 +00:01:39,640 --> 00:01:41,300 +starting when you first +clicked on a product. + +29 +00:01:43,880 --> 00:01:47,380 +By using Tor, the sites you visit +won't even know who you are, + +30 +00:01:47,540 --> 00:01:49,760 +from what part of the world +you're visiting them, + +31 +00:01:49,920 --> 00:01:51,920 +unless you login and tell them so. + +32 +00:01:54,200 --> 00:01:55,840 +By downloading and using Tor, + +33 +00:01:56,200 --> 00:01:58,560 +you can protect the people +who need anonymity, + +34 +00:01:58,880 --> 00:02:01,640 +like activists, journalists and bloggers. + +35 +00:02:02,000 --> 00:02:07,000 +Download and use Tor! Or run a relay! +

1 0