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

[oonib/master] update oonibackend to 1.1.0
by art＠torproject.org 02 Sep '14

02 Sep '14

commit 306bab7bf3e12b8ec5940070a2b876617957643d Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Sep 2 12:54:57 2014 +0200 update oonibackend to 1.1.0 --- ChangeLog.rst | 14 ++++++++++++++ oonib/__init__.py | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog.rst b/ChangeLog.rst index e655e27..1a3601a 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,3 +1,17 @@ +1.1.0 (Tue, 2 Sep 2014) +----------------------- + +* Make changes to the bouncer API to make it aware of the policy of collectors. + +* Improve the bouncer API to make it more RESTful. + +* Add test helper that can be used to discover the DNS resolver being used by + the probe. + +* Code coverage and unittesting improvements. + +* Fix compatibility with latest txtorcon versions. + 1.0.2 (Wed, 21 May 2014) ------------------------ diff --git a/oonib/__init__.py b/oonib/__init__.py index 25135d7..27bbfae 100644 --- a/oonib/__init__.py +++ b/oonib/__init__.py @@ -3,7 +3,7 @@ In here we shall keep track of all variables and objects that should be instantiated only once and be common to pieces of GLBackend code. """ -__version__ = '1.0.2' +__version__ = '1.1.0' __all__ = ['Storage', 'randomStr']

1 0

[oonib/master] Make oonibackend ready for being uploaded to pypi
by art＠torproject.org 02 Sep '14

02 Sep '14

commit dd8c48922c294b74ba6ec6a371e6ffbe7c0f14a1 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Sep 1 17:34:25 2014 +0200 Make oonibackend ready for being uploaded to pypi --- ChangeLog.rst | 21 +++++++++++ MANIFEST.in | 13 ++++++- data/archive/empty.txt | 2 + data/decks/README | 1 + data/reports/empty.txt | 2 + data/tor/empty.txt | 2 + setup.py | 96 ++++++++++++++++++++++++++++++++++++++++++++++-- 7 files changed, 132 insertions(+), 5 deletions(-) diff --git a/ChangeLog.rst b/ChangeLog.rst new file mode 100644 index 0000000..e655e27 --- /dev/null +++ b/ChangeLog.rst @@ -0,0 +1,21 @@ +1.0.2 (Wed, 21 May 2014) +------------------------ + +Various code improvements and fixes following the Least Authority release +engineering work. + +1.0.0 (Wed, 26 Mar 2014) +------------------------ + +First public release of oonibackend + +* Implements collector for receiver reports. + +* Implements HTTPReturnJSONHeaders HTTP helper + +* Implement DNS resolver helper + +* Implements TCP echo helper + +* Implements bouncer for directing directing probes to an adequate collector + and test helper. diff --git a/MANIFEST.in b/MANIFEST.in index 406cfc4..18db7db 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,15 @@ +include data/decks/README +include data/inputs/Makefile +include data/reports/empty.txt +include data/archive/empty.txt +include data/tor/empty.txt +include data/bouncer.yaml +include data/policy.yaml +include oonib.conf.example include requirements.txt include AUTHORS include HACKING include LICENSE -include Manifest.in -include README.md +include MANIFEST.in +include README.rst +include ChangeLog.rst diff --git a/data/archive/empty.txt b/data/archive/empty.txt new file mode 100644 index 0000000..9a166f9 --- /dev/null +++ b/data/archive/empty.txt @@ -0,0 +1,2 @@ +In here will end up the archived reports. +This file may be deleted at any time. diff --git a/data/decks/README b/data/decks/README new file mode 100644 index 0000000..619a189 --- /dev/null +++ b/data/decks/README @@ -0,0 +1 @@ +In here you shall place the decks to be served to clients. diff --git a/data/reports/empty.txt b/data/reports/empty.txt new file mode 100644 index 0000000..7e24f09 --- /dev/null +++ b/data/reports/empty.txt @@ -0,0 +1,2 @@ +In here will end up reports in progress. +This file may be deleted at any time. diff --git a/data/tor/empty.txt b/data/tor/empty.txt new file mode 100644 index 0000000..ec3be8f --- /dev/null +++ b/data/tor/empty.txt @@ -0,0 +1,2 @@ +In here will end up all tor related files. +This file may be deleted at any time. diff --git a/setup.py b/setup.py index c9a2dc4..c8d374e 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,11 @@ from __future__ import with_statement +import os +import sys from oonib import __version__ from setuptools import setup, find_packages +from setuptools.command import install + def get_requirements(): with open('requirements.txt', 'r') as f: @@ -25,16 +29,102 @@ def get_requirements(): return pypi_packages, dependency_links +usr_share_path = '/usr/share' +var_path = '/var' +etc_path = '/etc' +# If this is true then it means we are in a virtualenv +# therefore we should not place our data files inside /usr/share/ooni, but +# place them inside the virtual env system prefix. +if hasattr(sys, 'real_prefix'): + usr_share_path = os.path.abspath(os.path.join(sys.prefix, 'share')) + var_path = os.path.abspath(os.path.join(sys.prefix, 'var')) + etc_path = os.path.abspath(os.path.join(sys.prefix, 'etc')) + +data_dir = os.path.join(usr_share_path, 'ooni', 'backend') +spool_dir = os.path.join(var_path, 'spool', 'ooni', 'backend') +var_dir = os.path.join(var_path, 'spool', 'ooni', 'backend') + +def install_config_file(self): + print "Writing the default configuration file to %s" % etc_path + if not os.path.isdir(etc_path): + os.makedirs(etc_path) + import yaml + example_config = yaml.safe_load(open('oonib.conf.example')) + example_config['main']['report_dir'] = os.path.join(spool_dir, 'reports') + example_config['main']['archive_dir'] = os.path.join(spool_dir, 'archive') + example_config['main']['deck_dir'] = os.path.join(data_dir, 'decks') + example_config['main']['input_dir'] = os.path.join(data_dir, 'inputs') + example_config['main']['policy_file'] = os.path.join(var_dir, 'policy.yaml') + example_config['main']['bouncer_file'] = os.path.join(var_dir, 'bouncer.yaml') + example_config['main']['tor_datadir'] = os.path.join(var_dir, 'tor') + + with open(os.path.join(etc_path, 'oonibackend.conf'), 'w+') as fw: + yaml.dump(example_config, fw, default_flow_style=False) + +install.install.sub_commands.append(('install_config_file', install_config_file)) + +data_files = [ + (data_dir, ['oonib.conf.example']), + (os.path.join(data_dir, 'decks'), ['data/decks/README']), + (os.path.join(data_dir, 'inputs'), ['data/inputs/Makefile']), + (os.path.join(spool_dir, 'reports'), ['data/reports/empty.txt']), + (os.path.join(spool_dir, 'archive'), ['data/archive/empty.txt']), + (os.path.join(var_dir, 'tor'), ['data/tor/empty.txt']), + (var_dir, ['data/bouncer.yaml', 'data/policy.yaml']) +] + +with open('README.rst') as f: + readme = f.read() + +with open('ChangeLog.rst') as f: + changelog = f.read() + install_requires, dependency_links = get_requirements() setup( - name="oonib", + name="oonibackend", version=__version__, author="The Tor Project, Inc", url="https://ooni.torproject.org", - license="LICENSE", - description="OONI-Probe Backend", + license="BSD 2 clause", + description="Open Observatory of Network Interference Backend", + long_description=readme + '\n\n' + changelog, scripts=["bin/oonib", "bin/oonibadmin", "bin/archive_oonib_reports"], packages=find_packages(), + data_files=data_files, install_requires=install_requires, dependency_links=dependency_links, + classifiers=( + "Development Status :: 5 - Production/Stable", + "Environment :: Console", + "Framework :: Twisted", + "Intended Audience :: Developers", + "Intended Audience :: Education", + "Intended Audience :: End Users/Desktop", + "Intended Audience :: Information Technology", + "Intended Audience :: Science/Research", + "Intended Audience :: Telecommunications Industry", + "License :: OSI Approved :: BSD License" + "Programming Language :: Python", + "Programming Language :: Python :: 2", + "Programming Language :: Python :: 2 :: Only", + "Programming Language :: Python :: 2.6", + "Programming Language :: Python :: 2.7", + "Operating System :: MacOS :: MacOS X", + "Operating System :: POSIX", + "Operating System :: POSIX :: BSD", + "Operating System :: POSIX :: BSD :: BSD/OS", + "Operating System :: POSIX :: BSD :: FreeBSD", + "Operating System :: POSIX :: BSD :: NetBSD", + "Operating System :: POSIX :: BSD :: OpenBSD", + "Operating System :: POSIX :: Linux", + "Operating System :: Unix", + "Topic :: Scientific/Engineering :: Information Analysis", + "Topic :: Security", + "Topic :: Security :: Cryptography", + "Topic :: Software Development :: Libraries :: Application Frameworks", + "Topic :: Software Development :: Libraries :: Python Modules", + "Topic :: Software Development :: Testing", + "Topic :: Software Development :: Testing :: Traffic Generation", + "Topic :: System :: Networking :: Monitoring", + ) )

1 0

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

02 Sep '14

commit 52581c4d23eefaa928a310f0f58736fe0295e176 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 2 10:16:19 2014 +0000 Update translations for tor-and-https_completed --- en_GB.po | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/en_GB.po b/en_GB.po new file mode 100644 index 0000000..429c854 --- /dev/null +++ b/en_GB.po @@ -0,0 +1,136 @@ +# +# Translators: +# Andi Chandler <andi(a)gowling.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"POT-Creation-Date: 2014-07-17 14:23+0000\n" +"PO-Revision-Date: 2014-09-02 09:55+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_GB\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\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 "ltr" + +#. (itstool) path: svg/title +#: C/tor-and-https.svg:14 +#, no-wrap +msgid "Tor and HTTPS" +msgstr "Tor and 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 "Site.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 "user / pw" + +#. (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 "location" + +#. (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 "Hacker" + +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Lawyer" +msgstr "Lawyer" + +#. (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 "Police" + +#. (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 "Tor relay" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Key" +msgstr "Key" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Internet connection" +msgstr "Internet connection" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Eavesdropping" +msgstr "Eavesdropping" + +#. (itstool) path: defs/text +#: C/tor-and-https.svg:363 +#, no-wrap +msgid "Data sharing" +msgstr "Data sharing"

1 0

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

02 Sep '14

commit 377c22b30b5fb1c58be0765617ab185dc08ef9a2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 2 10:16:17 2014 +0000 Update translations for tor-and-https --- en_GB.po | 75 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/en_GB.po b/en_GB.po index f76db65..429c854 100644 --- a/en_GB.po +++ b/en_GB.po @@ -1,11 +1,12 @@ # # Translators: +# Andi Chandler <andi(a)gowling.com>, 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-09-02 09:55+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,117 +20,117 @@ msgstr "" #. languages (e.g. Arabic or Hebrew). #: C/tor-and-https.svg:3 msgid "ltr" -msgstr "" +msgstr "ltr" #. (itstool) path: svg/title #: C/tor-and-https.svg:14 #, no-wrap msgid "Tor and HTTPS" -msgstr "" +msgstr "Tor and 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 "" +msgstr "Site.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 "" +msgstr "user / pw" #. (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 "" +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 "" +msgstr "location" #. (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 "" +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 "" +msgstr "Hacker" #. (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 "" +msgstr "Lawyer" #. (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 "" +msgstr "Police" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "NSA" -msgstr "" +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 "Tor relay" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Key" -msgstr "" +msgstr "Key" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Internet connection" -msgstr "" +msgstr "Internet connection" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Eavesdropping" -msgstr "" +msgstr "Eavesdropping" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Data sharing" -msgstr "" +msgstr "Data sharing"

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 02 Sep '14

02 Sep '14

commit 65d20fc4886f987287b3226c0a3ed24a38870e37 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 2 10:16:12 2014 +0000 Update translations for tails-iuk_completed --- en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en_GB.po b/en_GB.po index 1ef77ee..10452c1 100644 --- a/en_GB.po +++ b/en_GB.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-08-31 15:23+0200\n" -"PO-Revision-Date: 2014-09-02 09:44+0000\n" +"PO-Revision-Date: 2014-09-02 09:52+0000\n" "Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 02 Sep '14

02 Sep '14

commit 2d79b98f5208e3ff1dc07055b8c2f0ad5b263b48 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 2 10:16:10 2014 +0000 Update translations for tails-iuk --- en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en_GB.po b/en_GB.po index 1ef77ee..10452c1 100644 --- a/en_GB.po +++ b/en_GB.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-08-31 15:23+0200\n" -"PO-Revision-Date: 2014-09-02 09:44+0000\n" +"PO-Revision-Date: 2014-09-02 09:52+0000\n" "Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torbutton-browserproperties_completed] Update translations for torbutton-browserproperties_completed
by translation＠torproject.org 02 Sep '14

02 Sep '14

commit e565c9a1d85d8012398ce53cb1a87016aedd171f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 2 10:16:04 2014 +0000 Update translations for torbutton-browserproperties_completed --- en_GB/browser.properties | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/en_GB/browser.properties b/en_GB/browser.properties new file mode 100644 index 0000000..f5093cd --- /dev/null +++ b/en_GB/browser.properties @@ -0,0 +1,13 @@ +# Default home page +browser.startup.homepage=about:tor + +# Spell checker dictionary +spellchecker.dictionary=en_GB + +# Default search engine +browser.search.defaultenginename=Startpage + +# Search engine order (order displayed in the search bar dropdown) +browser.search.order.1=Startpage +browser.search.order.2=DuckDuckGo +browser.search.order.3=Google

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 02 Sep '14

02 Sep '14

commit 1cc7e18988a2b57e6440b2685cbd4c8ad3e4db1d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 2 10:15:55 2014 +0000 Update translations for tails-misc_completed --- en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en_GB.po b/en_GB.po index 172bc37..4e8e125 100644 --- a/en_GB.po +++ b/en_GB.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-07-21 01:59+0200\n" -"PO-Revision-Date: 2014-09-02 09:43+0000\n" +"PO-Revision-Date: 2014-09-02 09:52+0000\n" "Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 02 Sep '14

02 Sep '14

commit 6279b0b6b00ed42a3772ce379192ba2d4bb07e55 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 2 10:15:52 2014 +0000 Update translations for tails-misc --- en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en_GB.po b/en_GB.po index 172bc37..4e8e125 100644 --- a/en_GB.po +++ b/en_GB.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-07-21 01:59+0200\n" -"PO-Revision-Date: 2014-09-02 09:43+0000\n" +"PO-Revision-Date: 2014-09-02 09:52+0000\n" "Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 02 Sep '14

02 Sep '14

commit 53b1a22ff943888c7c17a939221052209e68dd7e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 2 10:15:49 2014 +0000 Update translations for tor-launcher-network-settings_completed --- en_GB/network-settings.dtd | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/en_GB/network-settings.dtd b/en_GB/network-settings.dtd index a346274..3661088 100644 --- a/en_GB/network-settings.dtd +++ b/en_GB/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "No"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> +<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> @@ -19,9 +19,6 @@  <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> <!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> @@ -29,7 +26,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Restart Tor"> <!ENTITY torsettings.optional "Optional"> @@ -59,6 +56,7 @@ <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request.">

1 0