August 2014 - tor-commits - lists.torproject.org

[ooni-probe/master] Make the filename generation unittests check for the correct filename
by art＠torproject.org 07 Aug '14

07 Aug '14

commit c82f7daefe655188dc5e4831048be9f88ad199e4 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Aug 7 17:03:04 2014 +0200 Make the filename generation unittests check for the correct filename --- ooni/tests/test_utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ooni/tests/test_utils.py b/ooni/tests/test_utils.py index c17235a..5056b75 100644 --- a/ooni/tests/test_utils.py +++ b/ooni/tests/test_utils.py @@ -46,19 +46,19 @@ class TestUtils(unittest.TestCase): def test_generate_filename(self): filename = generate_filename(self.test_details) - self.assertEqual(filename, 'foo-1') + self.assertEqual(filename, 'foo-1970-01-01T000001Z') def test_generate_filename_with_extension(self): filename = generate_filename(self.test_details, extension=self.extension) - self.assertEqual(filename, 'foo-1.ext') + self.assertEqual(filename, 'foo-1970-01-01T000001Z.ext') def test_generate_filename_with_prefix(self): filename = generate_filename(self.test_details, prefix=self.prefix) - self.assertEqual(filename, 'prefix-foo-1') + self.assertEqual(filename, 'prefix-foo-1970-01-01T000001Z') def test_generate_filename_with_extension_and_prefix(self): filename = generate_filename(self.test_details, prefix=self.prefix, extension=self.extension) - self.assertEqual(filename, 'prefix-foo-1.ext') + self.assertEqual(filename, 'prefix-foo-1970-01-01T000001Z.ext') def test_generate_filename_with_filename(self): filename = generate_filename(self.test_details, filename=self.filename)

1 0

[ooni-probe/master] Fixed bug 11858: ooni might not look at requiresTor?
by art＠torproject.org 07 Aug '14

07 Aug '14

commit 90d39dab97309e0498e447d28cef1bd0b87aad86 Author: kudrom <kudrom(a)riseup.net> Date: Thu Aug 7 00:45:44 2014 +0200 Fixed bug 11858: ooni might not look at requiresTor? --- ooni/director.py | 12 ++++--- ooni/oonicli.py | 25 +++++++------ ooni/settings.py | 82 +++++++++++++++++++++---------------------- ooni/tests/test_settings.py | 77 ++++++++++++++++++++++------------------ 4 files changed, 104 insertions(+), 92 deletions(-) diff --git a/ooni/director.py b/ooni/director.py index d48c18f..18b7cb2 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -122,11 +122,13 @@ class Director(object): def start(self, start_tor=False): self.netTests = self.getNetTests() - if config.advanced.start_tor and start_tor: - yield self.startTor() - elif config.tor.control_port: - log.msg("Connecting to Tor Control Port...") - yield self.getTorState() + if start_tor: + yield config.check_tor() + if config.advanced.start_tor: + yield self.startTor() + elif config.tor.control_port: + log.msg("Connecting to Tor Control Port...") + yield self.getTorState() if config.global_options['no-geoip']: aux = [False] diff --git a/ooni/oonicli.py b/ooni/oonicli.py index cd9f4a9..cfc7ddc 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -111,13 +111,10 @@ def runWithDirector(logging=True, start_tor=True): config.global_options = global_options config.set_paths() config.initialize_ooni_home() - d = config.read_config_file(check_incoherences=True) - - @d.addErrback - def shutdown(failure): - failure.trap(errors.ConfigFileIncoherent) - log.err("Shutting down until ooniprobe.conf is coherent.") - reactor.callWhenRunning(reactor.stop) + try: + config.read_config_file(check_incoherences=True) + except errors.ConfigFileIncoherent: + sys.exit(6) if global_options['verbose']: config.advanced.debug = True @@ -176,11 +173,11 @@ def runWithDirector(logging=True, start_tor=True): deck = Deck() deck.bouncer = global_options['bouncer'] - start_tor = deck.requiresTor + conditions_to_start_tor = [False] if global_options['bouncer']: - start_tor = True + conditions_to_start_tor.append(True) if global_options['collector']: - start_tor = True + conditions_to_start_tor.append(True) try: if global_options['testdeck']: @@ -207,6 +204,8 @@ def runWithDirector(logging=True, start_tor=True): log.err(e) sys.exit(5) + conditions_to_start_tor.append(deck.requiresTor) + start_tor = any(conditions_to_start_tor) d = director.start(start_tor=start_tor) def setup_nettest(_): @@ -223,7 +222,8 @@ def runWithDirector(logging=True, start_tor=True): errors.CouldNotFindTestHelper, errors.CouldNotFindTestCollector, errors.ProbeIPUnknown, - errors.InvalidInputFile) + errors.InvalidInputFile, + errors.ConfigFileIncoherent) if isinstance(failure.value, errors.TorNotRunning): log.err("Tor does not appear to be running") @@ -260,6 +260,9 @@ def runWithDirector(logging=True, start_tor=True): elif isinstance(failure.value, errors.InvalidInputFile): log.err("Invalid input file \"%s\"" % failure.value) + elif isinstance(failure.value, errors.ConfigFileIncoherent): + log.err("Incoherent config file") + if config.advanced.debug: log.exception(failure) diff --git a/ooni/settings.py b/ooni/settings.py index cbf96cb..6f95536 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -99,7 +99,6 @@ class OConfig(object): else: w.write(line) - @defer.inlineCallbacks def read_config_file(self, check_incoherences=False): if not os.path.exists(self.config_file): print "Configuration file does not exist." @@ -116,61 +115,60 @@ class OConfig(object): getattr(self, setting)[k] = v self.set_paths() - # The incoherent checks must be performed after OConfig is in a valid state to runWithDirector if check_incoherences: - coherent = yield self.check_incoherences(configuration) - if not coherent: - raise errors.ConfigFileIncoherent + self.check_incoherences(configuration) - @defer.inlineCallbacks def check_incoherences(self, configuration): incoherent = [] - deferreds = [] - if not configuration['advanced']['start_tor']: - if not 'socks_port' in configuration['tor']: + if configuration['advanced']['interface'] != 'auto' and configuration['advanced']['interface'] not in get_if_list(): + incoherent.append('advanced:interface') + + self.log_incoherences(incoherent) + + def log_incoherences(self, incoherences): + if len(incoherences) > 0: + if len(incoherences) > 1: + incoherent_pretty = ", ".join(incoherences[:-1]) + ' and ' + incoherences[-1] + else: + incoherent_pretty = incoherences[0] + log.err("You must set properly %s in %s." % (incoherent_pretty, self.config_file)) + raise errors.ConfigFileIncoherent + + @defer.inlineCallbacks + def check_tor(self): + """ + Called only when we must start tor by director.start + """ + incoherent = [] + d = defer.Deferred() + + if not self.advanced.start_tor: + if self.tor.socks_port is None: incoherent.append('tor:socks_port') - if not 'control_port' in configuration['tor']: + if self.tor.control_port is None: incoherent.append('tor:control_port') - if 'socks_port' in configuration['tor'] and 'control_port' in configuration['tor']: + if self.tor.socks_port is not None and self.tor.control_port is not None: # Check if tor is listening in these ports - @defer.inlineCallbacks - def cb(state): - timeout_call.cancel() - result = yield state.protocol.get_info("net/listeners/socks") - if result["net/listeners/socks"].split(':')[1] != str(configuration['tor']['socks_port']): - incoherent.append('tor:socks_port') - - def err(failure): - incoherent.append('tor:socks_port') - if timeout_call.active: - timeout_call.cancel() - def timeout(): incoherent.append('tor:control_port') if not d.called: d.errback() - connection = TCP4ClientEndpoint(reactor, "localhost", configuration['tor']['control_port']) - d = txtorcon.build_tor_connection(connection) - d.addCallback(cb) - d.addErrback(err) - deferreds.append(d) + connection = TCP4ClientEndpoint(reactor, "localhost", self.tor.control_port) timeout_call = reactor.callLater(30, timeout) - - if configuration['advanced']['interface'] != 'auto' and configuration['advanced']['interface'] not in get_if_list(): - incoherent.append('advanced:interface') - - deferred_list = defer.DeferredList(deferreds) - yield deferred_list - if len(incoherent) > 0: - if len(incoherent) > 1: - incoherent_pretty = ", ".join(incoherent[:-1]) + ' and ' + incoherent[-1] - else: - incoherent_pretty = incoherent[0] - log.err("You must set properly %s in %s." % (incoherent_pretty, self.config_file)) - defer.returnValue(False) - defer.returnValue(True) + try: + d = txtorcon.build_tor_connection(connection) + state = yield d + result = yield state.protocol.get_info("net/listeners/socks") + if result["net/listeners/socks"].split(':')[1] != str(self.tor.socks_port): + incoherent.append('tor:socks_port') + except Exception: + incoherent.append('tor:socks_port') + finally: + if timeout_call.active: + timeout_call.cancel() + self.log_incoherences(incoherent) def generate_pcap_filename(self, testDetails): test_name, start_time = testDetails['test_name'], testDetails['start_time'] diff --git a/ooni/tests/test_settings.py b/ooni/tests/test_settings.py index b28c1b2..efde7b4 100644 --- a/ooni/tests/test_settings.py +++ b/ooni/tests/test_settings.py @@ -7,10 +7,13 @@ from scapy.all import get_if_list import txtorcon from ooni.settings import OConfig +from ooni import errors +from bases import ConfigTestCase -class TestSettings(unittest.TestCase): +class TestSettings(ConfigTestCase): def setUp(self): + super(ConfigTestCase, self).setUp() self.conf = OConfig() self.configuration = {'advanced': {'interface': 'auto', 'start_tor': True}, @@ -19,6 +22,7 @@ class TestSettings(unittest.TestCase): self.tor_protocol = None def tearDown(self): + super(ConfigTestCase, self).tearDown() if self.silly_listener is not None: self.silly_listener.stopListening() @@ -29,8 +33,8 @@ class TestSettings(unittest.TestCase): print '%s %s' % (prog, summary) config = txtorcon.TorConfig() - config.SocksPort = self.configuration['tor']['socks_port'] - config.ControlPort = self.configuration['tor']['control_port'] + config.SocksPort = self.conf.tor.socks_port + config.ControlPort = self.conf.tor.control_port d = txtorcon.launch_tor(config, reactor, progress_updates=progress) return d @@ -42,33 +46,39 @@ class TestSettings(unittest.TestCase): class SillyFactory(Factory): protocol = SillyProtocol - self.silly_listener = reactor.listenTCP(self.configuration['tor']['socks_port'], SillyFactory()) + self.silly_listener = reactor.listenTCP(self.conf.tor.socks_port, SillyFactory()) - @defer.inlineCallbacks def test_vanilla_configuration(self): - ret = yield self.conf.check_incoherences(self.configuration) - self.assertEqual(ret, True) + self.conf.check_incoherences(self.configuration) @defer.inlineCallbacks - def test_check_incoherences_start_tor_missing_options(self): - self.configuration['advanced']['start_tor'] = False - ret = yield self.conf.check_incoherences(self.configuration) - self.assertEqual(ret, False) - self.configuration['tor'] = {'socks_port': 9999} - ret = yield self.conf.check_incoherences(self.configuration) - self.assertEqual(ret, False) - self.configuration['tor']['control_port'] = 9998 - ret = yield self.conf.check_incoherences(self.configuration) - self.assertEqual(ret, False) + def test_check_tor_missing_options(self): + self.conf.advanced.start_tor = False + try: + yield self.conf.check_tor() + except errors.ConfigFileIncoherent: + pass + + self.conf.tor.socks_port = 9999 + try: + yield self.conf.check_tor() + except errors.ConfigFileIncoherent: + pass + + self.conf.tor.socks_port = None + self.conf.tor.control_port = 9998 + try: + yield self.conf.check_tor() + except errors.ConfigFileIncoherent: + pass @defer.inlineCallbacks - def test_check_incoherences_start_tor_correct(self): - self.configuration['advanced']['start_tor'] = False - self.configuration['tor'] = {'socks_port': 9999} - self.configuration['tor']['control_port'] = 9998 + def test_check_tor_correct(self): + self.conf.advanced.start_tor = False + self.conf.tor.socks_port = 9999 + self.conf.tor.control_port = 9998 self.tor_process = yield self.run_tor() - ret = yield self.conf.check_incoherences(self.configuration) - self.assertEqual(ret, True) + yield self.conf.check_incoherences(self.configuration) self.tor_process.transport.signalProcess('TERM') d = defer.Deferred() @@ -76,20 +86,19 @@ class TestSettings(unittest.TestCase): yield d @defer.inlineCallbacks - def test_check_incoherences_start_tor_silly_listener(self): - self.configuration['advanced']['start_tor'] = False - self.configuration['tor'] = {'socks_port': 9999} - self.configuration['tor']['control_port'] = 9998 + def test_check_tor_silly_listener(self): + self.conf.advanced.start_tor = False + self.conf.tor.socks_port = 9999 + self.conf.tor.control_port = 9998 self.run_silly_server() - ret = yield self.conf.check_incoherences(self.configuration) - self.assertEqual(ret, False) + try: + yield self.conf.check_tor() + except errors.ConfigFileIncoherent: + pass - @defer.inlineCallbacks def test_check_incoherences_interface(self): self.configuration['advanced']['interface'] = 'funky' - ret = yield self.conf.check_incoherences(self.configuration) - self.assertEqual(ret, False) + self.assertRaises(errors.ConfigFileIncoherent, self.conf.check_incoherences, self.configuration) self.configuration['advanced']['interface'] = random.choice(get_if_list()) - ret = yield self.conf.check_incoherences(self.configuration) - self.assertEqual(ret, True) + self.conf.check_incoherences(self.configuration)

1 0

[ooni-probe/master] Make optional the execution of check_incoherences from read_config.
by art＠torproject.org 07 Aug '14

07 Aug '14

commit 94a7ee19f64bf8abe8ad5178f98d10426c10e0db Author: kudrom <kudrom(a)riseup.net> Date: Tue Jul 15 17:07:26 2014 +0200 Make optional the execution of check_incoherences from read_config. --- ooni/errors.py | 4 ++++ ooni/oonicli.py | 10 ++++++++-- ooni/settings.py | 10 ++++++---- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ooni/errors.py b/ooni/errors.py index cd71316..3c9d86f 100644 --- a/ooni/errors.py +++ b/ooni/errors.py @@ -302,6 +302,10 @@ class ReportLogExists(Exception): class InvalidConfigFile(Exception): pass +class ConfigFileIncoherent(Exception): + pass + + def get_error(error_key): if error_key == 'test-helpers-key-missing': return CouldNotFindTestHelper diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 7c3e9a2..cd9f4a9 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -4,7 +4,7 @@ import yaml from twisted.python import usage from twisted.python.util import spewer -from twisted.internet import defer +from twisted.internet import defer, reactor from ooni import errors, __version__ @@ -111,7 +111,13 @@ def runWithDirector(logging=True, start_tor=True): config.global_options = global_options config.set_paths() config.initialize_ooni_home() - config.read_config_file() + d = config.read_config_file(check_incoherences=True) + + @d.addErrback + def shutdown(failure): + failure.trap(errors.ConfigFileIncoherent) + log.err("Shutting down until ooniprobe.conf is coherent.") + reactor.callWhenRunning(reactor.stop) if global_options['verbose']: config.advanced.debug = True diff --git a/ooni/settings.py b/ooni/settings.py index 91d2f76..5bc367e 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -12,6 +12,7 @@ import txtorcon from ooni import otime, geoip from ooni.utils import Storage, log +from ooni import errors class OConfig(object): @@ -99,7 +100,7 @@ class OConfig(object): w.write(line) @defer.inlineCallbacks - def read_config_file(self): + def read_config_file(self, check_incoherences=False): if not os.path.exists(self.config_file): print "Configuration file does not exist." self._create_config_file() @@ -116,9 +117,10 @@ class OConfig(object): self.set_paths() # The incoherent checks must be performed after OConfig is in a valid state to runWithDirector - coherent = yield self.check_incoherences(configuration) - if not coherent: - sys.exit(6) + if check_incoherences: + coherent = yield self.check_incoherences(configuration) + if not coherent: + raise errors.ConfigFileIncoherent @defer.inlineCallbacks def check_incoherences(self, configuration):

1 0

[ooni-probe/master] Refactor the condition checking to not use an array
by art＠torproject.org 07 Aug '14

07 Aug '14

commit 3f98daed0f65d745f09970c28e53f168bcb6aecd Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Aug 7 17:06:45 2014 +0200 Refactor the condition checking to not use an array --- ooni/oonicli.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ooni/oonicli.py b/ooni/oonicli.py index cfc7ddc..77e0a78 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -173,11 +173,11 @@ def runWithDirector(logging=True, start_tor=True): deck = Deck() deck.bouncer = global_options['bouncer'] - conditions_to_start_tor = [False] + start_tor = False if global_options['bouncer']: - conditions_to_start_tor.append(True) + start_tor |= True if global_options['collector']: - conditions_to_start_tor.append(True) + start_tor |= True try: if global_options['testdeck']: @@ -204,8 +204,7 @@ def runWithDirector(logging=True, start_tor=True): log.err(e) sys.exit(5) - conditions_to_start_tor.append(deck.requiresTor) - start_tor = any(conditions_to_start_tor) + start_tor |= deck.requiresTor d = director.start(start_tor=start_tor) def setup_nettest(_):

1 0

[ooni-probe/master] Remove unneeded requirements
by art＠torproject.org 07 Aug '14

07 Aug '14

commit 9485bd1ca91c7effaff7756269a69577ec4d3a23 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Aug 7 17:03:34 2014 +0200 Remove unneeded requirements --- requirements.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 87d736f..50259ff 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,6 +9,3 @@ parsley>=1.1 scapy-real>=2.2.0-dev pypcap>=1.1 service-identity -PyDNET -graphillion -networkx

1 0

[ooni-probe/master] Check if the configuration file is a file
by art＠torproject.org 07 Aug '14

07 Aug '14

commit 1b8b310f20ca4b9c8f65c985b6e46006021c4eaf Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Aug 7 17:10:37 2014 +0200 Check if the configuration file is a file --- ooni/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/settings.py b/ooni/settings.py index 6f95536..60d0b50 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -100,7 +100,7 @@ class OConfig(object): w.write(line) def read_config_file(self, check_incoherences=False): - if not os.path.exists(self.config_file): + if not os.path.isfile(self.config_file): print "Configuration file does not exist." self._create_config_file() self.read_config_file()

1 0

[ooni-probe/master] Throw an error if the measurement timeout is less than the bridge_reachability timeout
by art＠torproject.org 07 Aug '14

07 Aug '14

commit 003db989fbdad17d96e58a1043692cb6fc390014 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Aug 7 16:11:10 2014 +0200 Throw an error if the measurement timeout is less than the bridge_reachability timeout --- ooni/errors.py | 3 +++ ooni/nettests/blocking/bridge_reachability.py | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ooni/errors.py b/ooni/errors.py index 58e609d..cd71316 100644 --- a/ooni/errors.py +++ b/ooni/errors.py @@ -299,6 +299,9 @@ class ReportLogExists(Exception): pass +class InvalidConfigFile(Exception): + pass + def get_error(error_key): if error_key == 'test-helpers-key-missing': return CouldNotFindTestHelper diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index a70c16f..77dfce9 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ b/ooni/nettests/blocking/bridge_reachability.py @@ -7,8 +7,9 @@ from twisted.internet import reactor, error import txtorcon +from ooni.settings import config from ooni.utils import log, onion -from ooni import nettest +from ooni import nettest, errors class TorIsNotInstalled(Exception): @@ -48,6 +49,12 @@ class BridgeReachability(nettest.NetTestCase): self.tor_progress = 0 self.timeout = int(self.localOptions['timeout']) + if self.timeout > config.advanced.measurement_timeout: + log.err("The measurement timeout is less than the bridge reachability test timeout") + log.err("Adjust your ooniprobe.conf file by setting the " + "advanced: measurement_timeout: value to %d" % self.timeout) + raise errors.InvalidConfigFile("advanced->measurement_timeout < %d" % self.timeout) + self.report['error'] = None self.report['success'] = None self.report['timeout'] = self.timeout

1 0

[ooni-probe/master] Fix bug in filename generation
by art＠torproject.org 07 Aug '14

07 Aug '14

commit 4b4920256fd6f06349a578d6de9a2f0b343a903f Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Aug 6 18:51:13 2014 +0200 Fix bug in filename generation --- ooni/utils/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ooni/utils/__init__.py b/ooni/utils/__init__.py index f770c02..e879d7b 100644 --- a/ooni/utils/__init__.py +++ b/ooni/utils/__init__.py @@ -3,6 +3,7 @@ import random import glob import os +from ooni import otime from ooni import errors @@ -27,7 +28,7 @@ class Storage(dict): def __getattr__(self, key): try: return self[key] - except KeyError, k: + except KeyError: return None def __setattr__(self, key, value): @@ -117,6 +118,7 @@ def generate_filename(testDetails, prefix=None, extension=None, filename=None): """ if filename is None: test_name, start_time = testDetails['test_name'], testDetails['start_time'] + start_time = otime.epochToTimestamp(start_time) suffix = "%s-%s" % (test_name, start_time) basename = '%s-%s' % (prefix, suffix) if prefix is not None else suffix final_filename = '%s.%s' % (basename, extension) if extension is not None else basename

1 0

[translation/tor-and-https_completed] Update translations for tor-and-https_completed
by translation＠torproject.org 07 Aug '14

07 Aug '14

commit f7e92859b7a514dcde57edfca08722421bf37347 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 7 09:16:08 2014 +0000 Update translations for tor-and-https_completed --- id.po | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) diff --git a/id.po b/id.po new file mode 100644 index 0000000..f2485ce --- /dev/null +++ b/id.po @@ -0,0 +1,137 @@ +# +# Translators: +# gzn <agust.andy(a)gmail.com>, 2014 +# Gregori, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"POT-Creation-Date: 2014-07-17 14:23+0000\n" +"PO-Revision-Date: 2014-08-07 09:01+0000\n" +"Last-Translator: Gregori\n" +"Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: id\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. (itstool) path: C/tor-and-https.svg/svg@direction +#. (itstool) comment: C/tor-and-https.svg/svg@direction +#. Specify "ltr" for left-to-right languages or "rtl" for right-to-left +#. languages (e.g. Arabic or Hebrew). +#: C/tor-and-https.svg:3 +msgid "ltr" +msgstr "Itr" + +#. (itstool) path: svg/title +#: C/tor-and-https.svg:14 +#, no-wrap +msgid "Tor and HTTPS" +msgstr "Tor dan HTTPS" + +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Site.com" +msgstr "Situs.com" + +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "user / pw" +msgstr "pengguna / sandi" + +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "data" +msgstr "data" + +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "location" +msgstr "lokasi" + +#. (itstool) path: defs/text +#. Keep it short: 3em max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "WiFi" +msgstr "WiFi" + +#. (itstool) path: defs/text +#. Keep it short: 4em max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "ISP" +msgstr "ISP" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Hacker" +msgstr "Peretas" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Lawyer" +msgstr "Pengacara" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Sysadmin" +msgstr "Sysadmin" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Police" +msgstr "Polisi" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "NSA" +msgstr "NSA" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Tor relay" +msgstr "Relay Tor" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Key" +msgstr "Kunci" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Internet connection" +msgstr "Sambungan internet" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Eavesdropping" +msgstr "Menguping" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Data sharing" +msgstr "Berbagi data"

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 07 Aug '14

07 Aug '14

commit 961e55d3b13bd6cbd6e3bbb6fef774f0f38c360f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 7 09:16:05 2014 +0000 Update translations for tor-and-https --- id.po | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/id.po b/id.po index 4fdb63a..f2485ce 100644 --- a/id.po +++ b/id.po @@ -1,12 +1,13 @@ # # Translators: # gzn <agust.andy(a)gmail.com>, 2014 +# Gregori, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"POT-Creation-Date: 2014-05-24 16:09+0000\n" -"PO-Revision-Date: 2014-05-25 09:55+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-07-17 14:23+0000\n" +"PO-Revision-Date: 2014-08-07 09:01+0000\n" +"Last-Translator: Gregori\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +21,7 @@ msgstr "" #. languages (e.g. Arabic or Hebrew). #: C/tor-and-https.svg:3 msgid "ltr" -msgstr "" +msgstr "Itr" #. (itstool) path: svg/title #: C/tor-and-https.svg:14 @@ -30,107 +31,107 @@ msgstr "Tor dan HTTPS" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Site.com" msgstr "Situs.com" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "user / pw" msgstr "pengguna / sandi" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "data" msgstr "data" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "location" msgstr "lokasi" #. (itstool) path: defs/text #. Keep it short: 3em max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "WiFi" -msgstr "" +msgstr "WiFi" #. (itstool) path: defs/text #. Keep it short: 4em max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "ISP" msgstr "ISP" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Hacker" msgstr "Peretas" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Lawyer" msgstr "Pengacara" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Sysadmin" -msgstr "" +msgstr "Sysadmin" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Police" msgstr "Polisi" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "NSA" msgstr "NSA" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Tor relay" -msgstr "" +msgstr "Relay Tor" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Key" msgstr "Kunci" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Internet connection" msgstr "Sambungan internet" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Eavesdropping" msgstr "Menguping" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Data sharing" msgstr "Berbagi data"

1 0