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

[oonib/master] Add support for closing ooni-probe reports
by art＠torproject.org 08 Jun '13

08 Jun '13

commit cda6cd5ec73c10067ae12d8380f3408429de3a90 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Jun 7 22:21:34 2013 +0200 Add support for closing ooni-probe reports Also supports archiving stale reports --- bin/archive_oonib_reports | 4 +-- oonib.conf.example | 2 ++ oonib/config.py | 1 + oonib/report/api.py | 1 + oonib/report/file_collector.py | 60 ++++++++++++++++++++++++++++++++++++++-- 5 files changed, 63 insertions(+), 5 deletions(-) diff --git a/bin/archive_oonib_reports b/bin/archive_oonib_reports index 0fe6c5f..3c238af 100755 --- a/bin/archive_oonib_reports +++ b/bin/archive_oonib_reports @@ -10,7 +10,7 @@ from datetime import timedelta from datetime import datetime from oonib.otime import fromTimestamp, timestamp from oonib.otime import InvalidTimestampFormat, utcDateNow -from oonib import log +from oonib import log, __version__ ############################################################################### # You can set some config options here # @@ -88,7 +88,7 @@ def get_test_name(fields): def get_target_or_fail(fields, report): # set the target filename - reportFormatVersion = fields['test_version'] + reportFormatVersion = __version__ CC = fields['probe_cc'] # XXX: wouldn't hurt to check timestamp for sanity again? dateInISO8601Format,__,__ = os.path.basename(report).split('_') diff --git a/oonib.conf.example b/oonib.conf.example index a4cb707..694296f 100644 --- a/oonib.conf.example +++ b/oonib.conf.example @@ -1,5 +1,6 @@ main: report_dir: Null + archive_dir: Null logfile: Null tor_datadir: Null database_uri: 'sqlite://oonib_test_db.db' @@ -20,6 +21,7 @@ main: no_save: true profile: Null debug: Null + stale_time: 3600 helpers: http_return_request: diff --git a/oonib/config.py b/oonib/config.py index 8bc327f..a1a5e79 100644 --- a/oonib/config.py +++ b/oonib/config.py @@ -31,6 +31,7 @@ def loadConfigFile(): main = None backend_version = __version__ +reports = {} if not main: main, helpers = loadConfigFile() diff --git a/oonib/report/api.py b/oonib/report/api.py index a451bf4..d01f47c 100644 --- a/oonib/report/api.py +++ b/oonib/report/api.py @@ -99,6 +99,7 @@ class NewReportHandlerDB(web.RequestHandler): reportingBackendAPI = [ + (r"/report/([a-zA-Z0-9_\-]+)/close", file_collector.CloseReportHandlerFile), (r"/report", file_collector.NewReportHandlerFile), (r"/pcap", file_collector.PCAPReportHandler) ] diff --git a/oonib/report/file_collector.py b/oonib/report/file_collector.py index 422c94b..193f7fd 100644 --- a/oonib/report/file_collector.py +++ b/oonib/report/file_collector.py @@ -1,11 +1,14 @@ import random import string +import time import yaml import json import re import os -from twisted.internet import fdesc +from datetime import datetime + +from twisted.internet import fdesc, reactor from cyclone import web @@ -38,8 +41,6 @@ def parseUpdateReportRequest(request): return parsed_request - - def parseNewReportRequest(request): """ Here we parse a new report request. @@ -74,6 +75,16 @@ def parseNewReportRequest(request): return parsed_request +def get_report_path(report_id): + return os.path.join(config.main.report_dir, report_id) + +def stale_check(report_id): + if (time.time() - config.reports[report_id]) > config.main.stale_time: + try: + close_report(report_id) + except ReportNotFound: + pass + class NewReportHandlerFile(web.RequestHandler): """ Responsible for creating and updating reports by writing to flat file. @@ -152,6 +163,10 @@ class NewReportHandlerFile(web.RequestHandler): 'report_id': report_id } + config.reports[report_id] = time.time() + + reactor.callLater(config.main.stale_time, stale_check, report_id) + self.writeToReport(report_filename, content) self.write(response) @@ -178,6 +193,9 @@ class NewReportHandlerFile(web.RequestHandler): report_filename = os.path.join(config.main.report_dir, report_id) + config.reports[report_id] = time.time() + reactor.callLater(config.main.stale_time, stale_check, report_id) + self.updateReport(report_filename, parsed_request['content']) def updateReport(self, report_filename, data): @@ -188,6 +206,42 @@ class NewReportHandlerFile(web.RequestHandler): except IOError as e: web.HTTPError(404, "Report not found") +class ReportNotFound(Exception): + pass + +def close_report(report_id): + report_filename = get_report_path(report_id) + try: + with open(report_filename) as fd: + yaml_data = ''.join(fd.readline() for _ in range(12)) + report_details = yaml.safe_load(yaml_data) + except IOError: + raise ReportNotFound + + timestamp = otime.timestamp(datetime.fromtimestamp(report_details['start_time'])) + dst_filename = '{test_name}-{timestamp}-{probe_asn}-probe.yamloo'.format( + timestamp=timestamp, + **report_details) + + dst_path = os.path.join(config.main.archive_dir, + report_details['probe_cc']) + + if not os.path.isdir(dst_path): + os.mkdir(dst_path) + + dst_path = os.path.join(dst_path, dst_filename) + os.rename(report_filename, dst_path) + +class CloseReportHandlerFile(web.RequestHandler): + def get(self): + pass + + def post(self, report_id): + try: + close_report(report_id) + except ReportNotFound: + web.HTTPError(404, "Report not found") + class PCAPReportHandler(web.RequestHandler): def get(self): pass

1 0

[ooni-probe/master] Bump ooni-probe to version 0.0.12
by art＠torproject.org 08 Jun '13

08 Jun '13

commit c17e69ccec16d7e99f36e9b3fd04f63a4feb59e2 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Jun 8 01:22:54 2013 +0200 Bump ooni-probe to version 0.0.12 --- ooni/__init__.py | 2 +- setup.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ooni/__init__.py b/ooni/__init__.py index cc4bf03..2e79cd5 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -9,7 +9,7 @@ from . import templates from . import utils __author__ = "Arturo Filastò" -__version__ = "0.0.11" +__version__ = "0.0.12" __all__ = ['config', 'inputunit', 'kit', 'lib', 'nettest', 'oonicli', 'reporter', diff --git a/setup.py b/setup.py index e336e08..c5329d8 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,7 @@ #!/usr/bin/env python #-*- coding: utf-8 -*- +from ooni import __version__ from setuptools import setup install_requires = [ @@ -22,7 +23,7 @@ with open('requirements.txt') as f: setup( name="ooni-probe", - version="0.0.11", + version=__version__, author="Arturo Filastò", author_email = "art(a)torproject.org", url="https://ooni.torproject.org/",

1 0

[ooni-probe/master] Merge pull request #86 from hellais/feature/close_report
by art＠torproject.org 08 Jun '13

08 Jun '13

commit 7c93d4adeb0faa1b2df245507a30be31212fa37c Merge: 7f786a6 d98ea4c Author: Arturo Filastò <hellais(a)gmail.com> Date: Fri Jun 7 15:48:08 2013 -0700 Merge pull request #86 from hellais/feature/close_report Feature/close report ooni/director.py | 9 +++++---- ooni/reporter.py | 11 ++++++++--- 2 files changed, 13 insertions(+), 7 deletions(-)

1 0

[ooni-probe/master] Add support for closing reports in ooni-probe
by art＠torproject.org 08 Jun '13

08 Jun '13

commit d98ea4c4fee6699b8be8462e71503e98be2e24d3 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Jun 7 22:13:20 2013 +0200 Add support for closing reports in ooni-probe --- ooni/director.py | 9 +++++---- ooni/reporter.py | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ooni/director.py b/ooni/director.py index 809eae4..00ec039 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -171,7 +171,7 @@ class Director(object): """ pass - def netTestDone(self, result, net_test): + def netTestDone(self, net_test): self.activeNetTests.remove(net_test) if len(self.activeNetTests) == 0: self.allTestsDone.callback(None) @@ -206,10 +206,11 @@ class Director(object): self.activeNetTests.append(net_test) - net_test.done.addBoth(report.close) - net_test.done.addBoth(self.netTestDone, net_test) - yield net_test.done + yield report.close() + + self.netTestDone(net_test) + def startSniffing(self): """ Start sniffing with Scapy. Exits if required privileges (root) are not diff --git a/ooni/reporter.py b/ooni/reporter.py index b80a2a3..38519f7 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -242,8 +242,7 @@ class OONIBReporter(OReporter): if the oonib reporter is not valid. """ regexp = '^(http|httpo):\/\/[a-zA-Z0-9\-\.]+(:\d+)?$' - if not re.match(regexp, self.collectorAddress) or \ - len(self.collectorAddress) < 30: + if not re.match(regexp, self.collectorAddress): raise errors.InvalidOONIBCollectorAddress @defer.inlineCallbacks @@ -353,9 +352,11 @@ class OONIBReporter(OReporter): self.backendVersion = parsed_response['backend_version'] log.debug("Created report with id %s" % parsed_response['report_id']) + @defer.inlineCallbacks def finish(self): url = self.collectorAddress + '/report/' + self.reportID + '/close' - response = yield self.agent.request("POST", url) + log.debug("Closing the report %s" % url) + response = yield self.agent.request("POST", str(url)) class ReportClosed(Exception): pass @@ -464,7 +465,7 @@ class Report(object): raise errors.NoMoreReporters return - def close(self, _): + def close(self): """ Close the report by calling it's finish method.

1 0

[ooni-probe/master] Add support for closing a report
by art＠torproject.org 08 Jun '13

08 Jun '13

commit 5ead2b8c42daea738d37d87571c5e0cbd37027c7 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Jun 7 00:31:23 2013 +0200 Add support for closing a report --- ooni/reporter.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ooni/reporter.py b/ooni/reporter.py index 85df36e..b80a2a3 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -353,6 +353,10 @@ class OONIBReporter(OReporter): self.backendVersion = parsed_response['backend_version'] log.debug("Created report with id %s" % parsed_response['report_id']) + def finish(self): + url = self.collectorAddress + '/report/' + self.reportID + '/close' + response = yield self.agent.request("POST", url) + class ReportClosed(Exception): pass

1 0

r26208: {website} update mirrors table. (website/trunk/include)
by Andrew Lewman 08 Jun '13

08 Jun '13

Author: phobos Date: 2013-06-07 23:17:53 +0000 (Fri, 07 Jun 2013) New Revision: 26208 Modified: website/trunk/include/mirrors-table.wmi Log: update mirrors table. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2013-06-06 10:33:44 UTC (rev 26207) +++ website/trunk/include/mirrors-table.wmi 2013-06-07 23:17:53 UTC (rev 26208) @@ -86,6 +86,23 @@ <tr> + <td>EE</td> + + <td>CyberSIDE</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IS</td> <td>torproject.is</td> @@ -239,6 +256,23 @@ <tr> + <td>DE</td> + + <td>crazyhaze.de</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.crazyhaze.de/dist/">http</a></td> + <td><a href="http://tor.crazyhaze.de/">http</a></td> + <td><a href="https://tor.crazyhaze.de/dist/">https</a></td> + <td><a href="https://tor.crazyhaze.de/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>RO</td> <td>me0w.cc</td> @@ -273,6 +307,23 @@ <tr> + <td>LT</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>DE</td> <td></td> @@ -375,23 +426,6 @@ <tr> - <td>FR</td> - - <td></td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.mirror.chekanov.net/dist/">http</a></td> - <td><a href="http://tor.mirror.chekanov.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>DE</td> <td>chaos darmstadt</td> @@ -528,6 +562,23 @@ <tr> + <td>US</td> + + <td>AskApache</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>RU</td> <td>Soviet Anonymous</td> @@ -683,62 +734,11 @@ <td>EE</td> - <td>CyberSIDE</td> - - <td>DO NOT USE. Out of date.</td> - - <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>LT</td> - <td></td> <td>DO NOT USE. Out of date.</td> <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>US</td> - - <td>AskApache</td> - - <td>DO NOT USE. Out of date.</td> - - <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>EE</td> - - <td></td> - - <td>DO NOT USE. Out of date.</td> - - <td> - </td> <td><a href="http://tor.li/dist/">http</a></td> <td><a href="http://tor.li/">http</a></td> <td><a href="https://tor.li/dist/">https</a></td> @@ -749,23 +749,6 @@ <tr> - <td>DE</td> - - <td>crazyhaze.de</td> - - <td>DO NOT USE. Out of date.</td> - - <td> - </td> - <td><a href="http://tor.crazyhaze.de/dist/">http</a></td> - <td><a href="http://tor.crazyhaze.de/">http</a></td> - <td><a href="https://tor.crazyhaze.de/dist/">https</a></td> - <td><a href="https://tor.crazyhaze.de/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>US</td> <td>searchprivate</td> @@ -885,6 +868,23 @@ <tr> + <td>FR</td> + + <td></td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://tor.mirror.chekanov.net/dist/">http</a></td> + <td><a href="http://tor.mirror.chekanov.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>NL</td> <td></td>

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 08 Jun '13

08 Jun '13

commit 6b6ab7b8999e716d7d53dfe6cc43c6024e8c53a8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 7 22:16:24 2013 +0000 Update translations for mat-gui --- fa.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fa.po b/fa.po index 8129a3e..cd7252a 100644 --- a/fa.po +++ b/fa.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-05 20:03+0100\n" -"PO-Revision-Date: 2013-05-22 12:46+0000\n" +"PO-Revision-Date: 2013-06-07 22:00+0000\n" "Last-Translator: zendegi <hamahangi(a)posteo.eu>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n" @@ -28,7 +28,7 @@ msgstr "افزودن" #: mat-gui:109 mat-gui:183 msgid "Add files" -msgstr "" +msgstr "فايل‌ها بيافزاييد" #: mat-gui:113 mat-gui:203 mat-gui:308 mat-gui:311 mat-gui:555 mat-gui:557 #: mat-gui:573 mat-gui:575 @@ -109,7 +109,7 @@ msgstr "" #: mat-gui:248 msgid "All files" -msgstr "" +msgstr "ِهمهٔ فایل‌ها" #: mat-gui:255 msgid "Supported files" @@ -133,7 +133,7 @@ msgstr "" #: mat-gui:386 msgid "Website" -msgstr "" +msgstr "پایگاه اینترنتی" #: mat-gui:461 msgid "Force Clean"

1 0

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

08 Jun '13

commit 6723e1cdbf4167e60051fff84bba0bc9708eaf09 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 7 22:16:01 2013 +0000 Update translations for whisperback --- tr/tr.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index 2e7f281..21c14c1 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -4,13 +4,14 @@ # # Translators: # sgtpepper <barlasmirc(a)gmail.com>, 2013 +# Tosbaa <conan(a)operamail.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-03-26 15:50+0100\n" -"PO-Revision-Date: 2013-06-01 13:40+0000\n" -"Last-Translator: sgtpepper <barlasmirc(a)gmail.com>\n" +"PO-Revision-Date: 2013-06-07 22:00+0000\n" +"Last-Translator: Tosbaa <conan(a)operamail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -93,7 +94,7 @@ msgstr "Şifreleme esnasında bir hata oluştu." #: ../whisperBack/gui.py:298 #, python-format msgid "Unable to save %s." -msgstr "" +msgstr "%s kaydetme başarısız." #. XXX: fix string #: ../whisperBack/gui.py:322

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 08 Jun '13

08 Jun '13

commit a2676c4d382d9704e8ed288c4942a97125e63d2a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 7 22:15:06 2013 +0000 Update translations for bridgedb_completed --- tr/bridgedb.po | 140 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 84 insertions(+), 56 deletions(-) diff --git a/tr/bridgedb.po b/tr/bridgedb.po index 5ef4bda..59eff6c 100644 --- a/tr/bridgedb.po +++ b/tr/bridgedb.po @@ -1,75 +1,103 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the BridgeDB project. # # Translators: -# <ergungorler(a)gmail.com>, 2012. -# Sercan Altundaş <>, 2012. -# Tekel Bira <psycookie(a)gmail.com>, 2012. +# Tosbaa <conan(a)operamail.com>, 2013 +# erg26 <ergungorler(a)gmail.com>, 2012 +# Sercan Altundaş <>, 2012 +# Tekel Bira <psycookie(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-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-07-19 04:47+0000\n" -"Last-Translator: erg26 <ergungorler(a)gmail.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"POT-Creation-Date: 2013-03-27 21:41+0000\n" +"PO-Revision-Date: 2013-06-07 22:00+0000\n" +"Last-Translator: Tosbaa <conan(a)operamail.com>\n" +"Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" "Language: tr\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: lib/bridgedb/I18n.py:21 -msgid "Here are your bridge relays: " -msgstr "Köprü anahtarlamalarınız şu şekildedir:" +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "Köprüler nedir?" -#: lib/bridgedb/I18n.py:23 +#: lib/bridgedb/templates/base.html:34 +#, python-format msgid "" -"Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed\n" -"in the main directory. Since there is no complete public list of them,\n" -"even if your ISP is filtering connections to all the known Tor relays,\n" -"they probably won't be able to block all the bridges." -msgstr "Köprü anahtarlamaları (yada kısaca \"köprüler\") ana dizinde listenmemiş olan Tor anahtarlamalarıdır. Bağlı bulunduğunuz ISS bilinen tüm Tor anahtarlamalarına filtre uyguluyor olsa bile umumi olarak yayınlanmış tam bir liste mevcut olmadığından büyük bir ihtimalle bütün köprüleri bloklayamayacaktır." +"%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgstr "%s Köprü aktarıcıları, sansürü aşmanızı sağlayan %s Tor aktarıcılarıdır." -#: lib/bridgedb/I18n.py:28 -msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click\n" -"\"My ISP blocks connections to the Tor network\". Then add each bridge\n" -"address one at a time." -msgstr "Yukarıdaki satırları kullanmak için Vidalia Ağ Ayarları sayfasını açın ve \"ISS Tor ağına bağlantılarımı engelliyor\" maddesine tıklayın. Sonrasında her seferinde bir tane olmak üzere köprülerinizi ekleyebilirsiniz." +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "Köprüleri edinmek için alternatif yola ihtiyacım var'" -#: lib/bridgedb/I18n.py:32 +#: lib/bridgedb/templates/base.html:40 +#, python-format msgid "" -"Configuring more than one bridge address will make your Tor connection\n" -"more stable, in case some of the bridges become unreachable." -msgstr "Birden fazla köprü adresi ayarlamak, bazı köprüler ulaşılamaz durumda olduğunda Tor bağlantınızı daha stabil hale getirir" +"Another way to find public bridge addresses is to send an email (from a %s " +"or a %s address) to %s with the line 'get bridges' by itself in the body of " +"the mail." +msgstr "Halka açık köprü adreslerini edinmenin bir yolu da, mesaj gövdesinin bir satırında \"get bridges\" yazılı bir e-postayı (Bir %s ya da %s adresinden) %s'e göndermektir." -#: lib/bridgedb/I18n.py:35 +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "Köprülerim çalışmıyor! Yardıma ihtiyacım var!" + +#: lib/bridgedb/templates/base.html:49 +#, python-format msgid "" -"Another way to find public bridge addresses is to send mail to\n" -"bridges(a)torproject.org with the line \"get bridges\" by itself in the body\n" -"of the mail. However, so we can make it harder for an attacker to learn\n" -"lots of bridge addresses, you must send this request from an email address at\n" -"one of the following domains:" -msgstr "Umumi olarak yayınlanmış olan köprü adreslerini elde etmenin bir diğer yolu da bridges(a)torproject.org mail adresine gövdesinde \"get bridges\" yazan bir mail atmaktır. Ancak herhangi bir saldırı planlayan kişinin, bu köprü adreslerini öğrenmesini zorlaştırmak amacıyla sadece aşağıda yazılı olan alan adlarına bağlı bir e-mail adresinden bu isteği göndermelisiniz:" - -#: lib/bridgedb/I18n.py:41 -msgid "[This is an automated message; please do not reply.]" -msgstr "[Bu otomatik bir mesajdır; lütfen cevaplamayınız.]" - -#: lib/bridgedb/I18n.py:43 +"If your Tor doesn't work, you should email %s. Try including as much info " +"about your case as you can, including the list of bridges you used, the " +"bundle filename/version you used, the messages that Tor gave out, etc." +msgstr "Eğer Tor çalışmıyorsa, %s 'e e-posta gönderin. Durumunuz hakkında, kullandığınız köprülerin listesi, kullandığınız paket sürümü/dosya ismi, Tor'un hata mesajları dahil olmak üzere mümkün olduğunca fazla bilgiyi ekleyin." + +#: lib/bridgedb/templates/bridges.html:10 msgid "" -"Another way to find public bridge addresses is to visit\n" -"https://bridges.torproject.org/. The answers you get from that page\n" -"will change every few days, so check back periodically if you need more\n" -"bridge addresses." -msgstr "Umumi olarak yayınlanmış köprü adreslerine ulaşmak için şu adresi ziyaret edebilirsiniz: https://bridges.torproject.org/. Buradan alacağınız köprü adresleri birkaç günde bir değişecektir. Daha fazla köprü adresine ihtiyacınız oluyor ise bu sayfayı periyodik olarak kontrol etmelisiniz." - -#: lib/bridgedb/I18n.py:48 -msgid "(no bridges currently available)" -msgstr "(uygun köprü şimdilik bulunmamaktadır)" - -#: lib/bridgedb/I18n.py:50 -msgid "(e-mail requests not currently supported)" -msgstr "(e-posta istekleri şimdilik desteklenmemektedir)" +"To use the above lines, go to Vidalia's Network settings page, and click " +"\"My ISP blocks connections to the Tor network\". Then add each bridge " +"address one at a time." +msgstr "Yukarıdaki satırları kullanmak için, Vidalia'nınağ ayarları sayfasına gidip \"Servis sağlayıcım Tor ağına erişimlerini engelliyor\"a tıklayın. Bundan sonra tüm köprüleri birer birer ekleyin. " + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "Şu an uygun köprü yok." + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "Tarayıcınızı Firefox'a güncelleyin." + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "İki kelimeyi yazın" + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "Adım 1" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "%s Tor Tarayıcı paketini edinin %s" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "Adım 2" + +#: lib/bridgedb/templates/index.html:15 +#, python-format +msgid "Get %s bridges %s" +msgstr "%s köprülerini %s edinin" + +#: lib/bridgedb/templates/index.html:19 +msgid "Step 3" +msgstr "Adım 3" + +#: lib/bridgedb/templates/index.html:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr "Şimdi %s köprüleri Tor'a ekleyin %s"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 08 Jun '13

08 Jun '13

commit 3d136fadf5d6daf9e4d124a00b768745860526a9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 7 22:15:03 2013 +0000 Update translations for bridgedb --- tr/bridgedb.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tr/bridgedb.po b/tr/bridgedb.po index 653e1de..59eff6c 100644 --- a/tr/bridgedb.po +++ b/tr/bridgedb.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-06-07 21:44+0000\n" +"PO-Revision-Date: 2013-06-07 22:00+0000\n" "Last-Translator: Tosbaa <conan(a)operamail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" @@ -42,11 +42,11 @@ msgid "" "Another way to find public bridge addresses is to send an email (from a %s " "or a %s address) to %s with the line 'get bridges' by itself in the body of " "the mail." -msgstr "" +msgstr "Halka açık köprü adreslerini edinmenin bir yolu da, mesaj gövdesinin bir satırında \"get bridges\" yazılı bir e-postayı (Bir %s ya da %s adresinden) %s'e göndermektir." #: lib/bridgedb/templates/base.html:48 msgid "My bridges don't work! I need help!" -msgstr "" +msgstr "Köprülerim çalışmıyor! Yardıma ihtiyacım var!" #: lib/bridgedb/templates/base.html:49 #, python-format @@ -54,50 +54,50 @@ msgid "" "If your Tor doesn't work, you should email %s. Try including as much info " "about your case as you can, including the list of bridges you used, the " "bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "" +msgstr "Eğer Tor çalışmıyorsa, %s 'e e-posta gönderin. Durumunuz hakkında, kullandığınız köprülerin listesi, kullandığınız paket sürümü/dosya ismi, Tor'un hata mesajları dahil olmak üzere mümkün olduğunca fazla bilgiyi ekleyin." #: lib/bridgedb/templates/bridges.html:10 msgid "" "To use the above lines, go to Vidalia's Network settings page, and click " "\"My ISP blocks connections to the Tor network\". Then add each bridge " "address one at a time." -msgstr "" +msgstr "Yukarıdaki satırları kullanmak için, Vidalia'nınağ ayarları sayfasına gidip \"Servis sağlayıcım Tor ağına erişimlerini engelliyor\"a tıklayın. Bundan sonra tüm köprüleri birer birer ekleyin. " #: lib/bridgedb/templates/bridges.html:13 msgid "No bridges currently available" -msgstr "" +msgstr "Şu an uygun köprü yok." #: lib/bridgedb/templates/captcha.html:6 msgid "Upgrade your browser to Firefox" -msgstr "" +msgstr "Tarayıcınızı Firefox'a güncelleyin." #: lib/bridgedb/templates/captcha.html:8 msgid "Type the two words" -msgstr "" +msgstr "İki kelimeyi yazın" #: lib/bridgedb/templates/index.html:6 msgid "Step 1" -msgstr "" +msgstr "Adım 1" #: lib/bridgedb/templates/index.html:8 #, python-format msgid "Get %s Tor Browser Bundle %s" -msgstr "" +msgstr "%s Tor Tarayıcı paketini edinin %s" #: lib/bridgedb/templates/index.html:13 msgid "Step 2" -msgstr "" +msgstr "Adım 2" #: lib/bridgedb/templates/index.html:15 #, python-format msgid "Get %s bridges %s" -msgstr "" +msgstr "%s köprülerini %s edinin" #: lib/bridgedb/templates/index.html:19 msgid "Step 3" -msgstr "" +msgstr "Adım 3" #: lib/bridgedb/templates/index.html:21 #, python-format msgid "Now %s add the bridges to Tor %s" -msgstr "" +msgstr "Şimdi %s köprüleri Tor'a ekleyin %s"

1 0