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

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

29 Oct '13

commit aa4c71671cbe5141c885998b4c3088d94f48d9f9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 29 19:15:59 2013 +0000 Update translations for tails-greeter --- sk/sk.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sk/sk.po b/sk/sk.po index fd48f69..e18a33e 100644 --- a/sk/sk.po +++ b/sk/sk.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-05-12 19:29+0200\n" -"PO-Revision-Date: 2013-08-10 01:10+0000\n" +"PO-Revision-Date: 2013-10-29 19:00+0000\n" "Last-Translator: BudGet <budgeet(a)gmail.com>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n"

1 0

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

29 Oct '13

commit 515266d7fd684da5f46c9b4fd30cc7890ff88792 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 29 19:15:56 2013 +0000 Update translations for tails-persistence-setup --- sk/sk.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sk/sk.po b/sk/sk.po index 5a1ab1a..fa31c2c 100644 --- a/sk/sk.po +++ b/sk/sk.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-09-29 14:53+0200\n" -"PO-Revision-Date: 2013-10-29 18:40+0000\n" +"PO-Revision-Date: 2013-10-29 19:00+0000\n" "Last-Translator: Michelozzo <michalslovak2(a)hotmail.com>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n" @@ -84,11 +84,11 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "Printers" -msgstr "" +msgstr "Tlačiarne" #: ../lib/Tails/Persistence/Configuration/Presets.pm:130 msgid "Printers configuration" -msgstr "" +msgstr "Nastavenie tlačiarní" #: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "APT Packages" @@ -190,7 +190,7 @@ msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" "You may now close this application." -msgstr "" +msgstr "Akékoľvek zmeny, ktoré ste urobili, sa prejavia až po reštartovaní Tails.\n\nTeraz môžete zatvoriť túro aplikáciu." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 msgid "Persistence wizard - Persistent volume creation" @@ -222,20 +222,20 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 msgid "Passphrase:" -msgstr "Heslová fráza: " +msgstr "Heslo:" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 msgid "Verify Passphrase:" -msgstr "" +msgstr "Potvrďte heslo:" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:167 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:231 msgid "Passphrase can't be empty" -msgstr "" +msgstr "Heslo nesmie byť prázdne" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:222 msgid "Passphrases do not match" -msgstr "" +msgstr "Heslo sa nezhoduje" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 #: ../lib/Tails/Persistence/Step/Configure.pm:123 @@ -252,7 +252,7 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:296 msgid "Creating..." -msgstr "" +msgstr "Vytváram..." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:299 msgid "Creating the persistent volume..." @@ -280,7 +280,7 @@ msgstr "Uložiť" #: ../lib/Tails/Persistence/Step/Configure.pm:137 msgid "Saving..." -msgstr "" +msgstr "Ukladám..." #: ../lib/Tails/Persistence/Step/Configure.pm:140 msgid "Saving persistence configuration..." @@ -302,11 +302,11 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Delete.pm:53 msgid "Delete" -msgstr "" +msgstr "Vymazať" #: ../lib/Tails/Persistence/Step/Delete.pm:91 msgid "Deleting..." -msgstr "" +msgstr "Mažem..." #: ../lib/Tails/Persistence/Step/Delete.pm:94 msgid "Deleting the persistent volume..."

1 0

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

29 Oct '13

commit 5bc7b9b601b6ad2e5a5c252d73dbc1ed9fa62005 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 29 19:15:46 2013 +0000 Update translations for whisperback --- sk/sk.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sk/sk.po b/sk/sk.po index 975b7b2..c0d6e8c 100644 --- a/sk/sk.po +++ b/sk/sk.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2013-10-29 13:30+0000\n" +"PO-Revision-Date: 2013-10-29 19:00+0000\n" "Last-Translator: Michelozzo <michalslovak2(a)hotmail.com>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n" @@ -117,7 +117,7 @@ msgstr "" #: ../whisperBack/gui.py:393 msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" -msgstr "" +msgstr "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" #: ../whisperBack/gui.py:394 msgid "Tails developers <tails(a)boum.org>" @@ -133,11 +133,11 @@ msgstr "" #: ../data/whisperback.ui.h:1 msgid "Copyright © 2009-2012 tails(a)boum.org" -msgstr "" +msgstr "Copyright © 2009-2012 tails(a)boum.org" #: ../data/whisperback.ui.h:3 msgid "https://tails.boum.org/" -msgstr "" +msgstr "https://tails.boum.org/" #: ../data/whisperback.ui.h:4 msgid "" @@ -174,7 +174,7 @@ msgstr "Popis chyby" #: ../data/whisperback.ui.h:24 msgid "Optional email address to contact you" -msgstr "" +msgstr "Vhodná emailová adresa, na ktorej Vás môžeme kontaktovať" #: ../data/whisperback.ui.h:25 msgid "optional PGP key"

1 0

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

29 Oct '13

commit 413eddcf63a24f2c1f6384119373eaa94c21a6e0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 29 18:45:54 2013 +0000 Update translations for tails-persistence-setup --- sk/sk.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sk/sk.po b/sk/sk.po index 4bf2f9a..5a1ab1a 100644 --- a/sk/sk.po +++ b/sk/sk.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Michelozzo <michalslovak2(a)hotmail.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-09-29 14:53+0200\n" -"PO-Revision-Date: 2013-09-30 08:40+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-10-29 18:40+0000\n" +"Last-Translator: Michelozzo <michalslovak2(a)hotmail.com>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +20,7 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:48 msgid "Personal Data" -msgstr "" +msgstr "Súkromné údaje" #: ../lib/Tails/Persistence/Configuration/Presets.pm:50 msgid "Keep files stored in the `Persistent' directory" @@ -27,7 +28,7 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:58 msgid "GnuPG" -msgstr "" +msgstr "GnuPG" #: ../lib/Tails/Persistence/Configuration/Presets.pm:60 msgid "GnuPG keyrings and configuration" @@ -43,7 +44,7 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:78 msgid "Pidgin" -msgstr "" +msgstr "Pidgin" #: ../lib/Tails/Persistence/Configuration/Presets.pm:80 msgid "Pidgin profiles and OTR keyring" @@ -67,11 +68,11 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:108 msgid "Network Connections" -msgstr "" +msgstr "Sieťové pripojenia" #: ../lib/Tails/Persistence/Configuration/Presets.pm:110 msgid "Configuration of network devices and connections" -msgstr "" +msgstr "Nastavenia sieťových zariadení a pripojení" #: ../lib/Tails/Persistence/Configuration/Presets.pm:118 msgid "Browser bookmarks"

1 0

[ooni-probe/master] Don't look up helpers if we have already specified a helper.
by art＠torproject.org 29 Oct '13

29 Oct '13

commit 3a98d6da99cc1474854159c24baada49e65816e4 Author: aagbsn <aagbsn(a)extc.org> Date: Thu Oct 10 15:31:06 2013 +0000 Don't look up helpers if we have already specified a helper. Note: we will need to remove the default helpers in ooni's NetTests. --- ooni/deck.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ooni/deck.py b/ooni/deck.py index 98d90e0..7b8a8c4 100644 --- a/ooni/deck.py +++ b/ooni/deck.py @@ -3,7 +3,6 @@ from ooni.nettest import NetTestLoader from ooni.settings import config from ooni.utils import log -from ooni.utils.txagentwithsocks import Agent from ooni import errors as e from twisted.internet import reactor, defer @@ -167,11 +166,15 @@ class Deck(InputFile): # Only set the collector if the no collector has been specified # from the command line or via the test deck. - if not net_test_loader.requiredTestHelpers and net_test_loader in requires_collector: + if not required_test_helpers and net_test_loader in requires_collector: log.msg("Using the default collector: %s" % response['default']['collector']) net_test_loader.collector = response['default']['collector'].encode('utf-8') + continue for th in net_test_loader.requiredTestHelpers: + # Only set helpers which are not already specified + if th['name'] not in required_test_helpers: + continue test_helper = response[th['name']] log.msg("Using this helper: %s" % test_helper) th['test_class'].localOptions[th['option']] = test_helper['address']

1 0

[ooni-probe/master] Merge pull request #219 from TheTorProject/fix/default_backends_break_helper_lookup
by art＠torproject.org 29 Oct '13

29 Oct '13

commit de5dead57a79a95847a9f016b20780b46d921de2 Merge: e89163c c2047af Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Tue Oct 29 08:56:43 2013 -0700 Merge pull request #219 from TheTorProject/fix/default_backends_break_helper_lookup Fix/default backends break helper lookup ooni/deck.py | 7 +++++-- ooni/nettests/blocking/dnsconsistency.py | 2 +- ooni/nettests/manipulation/dnsspoof.py | 2 +- ooni/nettests/manipulation/http_header_field_manipulation.py | 2 +- ooni/nettests/manipulation/http_host.py | 2 +- ooni/nettests/manipulation/http_invalid_request_line.py | 2 +- ooni/nettests/manipulation/traceroute.py | 2 +- 7 files changed, 11 insertions(+), 8 deletions(-)

1 0

[ooni-probe/master] Do not set default backends
by art＠torproject.org 29 Oct '13

29 Oct '13

commit c2047af6a3c28295d306dc186c7e5b2187a35b03 Author: aagbsn <aagbsn(a)extc.org> Date: Sat Oct 12 14:25:23 2013 +0000 Do not set default backends If a valid default backend is specified, the bouncer will not look up test helpers --- ooni/nettests/blocking/dnsconsistency.py | 2 +- ooni/nettests/manipulation/dnsspoof.py | 2 +- ooni/nettests/manipulation/http_header_field_manipulation.py | 2 +- ooni/nettests/manipulation/http_host.py | 2 +- ooni/nettests/manipulation/http_invalid_request_line.py | 2 +- ooni/nettests/manipulation/traceroute.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ooni/nettests/blocking/dnsconsistency.py b/ooni/nettests/blocking/dnsconsistency.py index d883434..1b11d04 100644 --- a/ooni/nettests/blocking/dnsconsistency.py +++ b/ooni/nettests/blocking/dnsconsistency.py @@ -26,7 +26,7 @@ from ooni import nettest from ooni.utils import log class UsageOptions(usage.Options): - optParameters = [['backend', 'b', '8.8.8.8:53', + optParameters = [['backend', 'b', None, 'The OONI backend that runs the DNS resolver'], ['testresolvers', 'T', None, 'File containing list of DNS resolvers to test against'], diff --git a/ooni/nettests/manipulation/dnsspoof.py b/ooni/nettests/manipulation/dnsspoof.py index 598c41f..58465d7 100644 --- a/ooni/nettests/manipulation/dnsspoof.py +++ b/ooni/nettests/manipulation/dnsspoof.py @@ -16,7 +16,7 @@ class UsageOptions(usage.Options): 'Specify the resolver that should be used for DNS queries (ip:port)'], ['hostname', 'h', None, 'Specify the hostname of a censored site'], - ['backend', 'b', '8.8.8.8:53', + ['backend', 'b', None, 'Specify the IP address of a good DNS resolver (ip:port)'] ] diff --git a/ooni/nettests/manipulation/http_header_field_manipulation.py b/ooni/nettests/manipulation/http_header_field_manipulation.py index 3423442..49566ae 100644 --- a/ooni/nettests/manipulation/http_header_field_manipulation.py +++ b/ooni/nettests/manipulation/http_header_field_manipulation.py @@ -29,7 +29,7 @@ def random_capitalization(string): class UsageOptions(usage.Options): optParameters = [ - ['backend', 'b', 'http://127.0.0.1:57001', + ['backend', 'b', None, 'URL of the backend to use for sending the requests'], ['headers', 'h', None, 'Specify a yaml formatted file from which to read the request headers to send'] diff --git a/ooni/nettests/manipulation/http_host.py b/ooni/nettests/manipulation/http_host.py index 2ec517c..41b21f1 100644 --- a/ooni/nettests/manipulation/http_host.py +++ b/ooni/nettests/manipulation/http_host.py @@ -15,7 +15,7 @@ from ooni.utils import log from ooni.templates import httpt class UsageOptions(usage.Options): - optParameters = [['backend', 'b', 'http://127.0.0.1:57001', + optParameters = [['backend', 'b', None, 'URL of the test backend to use. Should be \ listening on port 80 and be a \ HTTPReturnJSONHeadersHelper'], diff --git a/ooni/nettests/manipulation/http_invalid_request_line.py b/ooni/nettests/manipulation/http_invalid_request_line.py index 64dbcac..8ba124e 100644 --- a/ooni/nettests/manipulation/http_invalid_request_line.py +++ b/ooni/nettests/manipulation/http_invalid_request_line.py @@ -6,7 +6,7 @@ from ooni.utils import randomStr, randomSTR from ooni.templates import tcpt class UsageOptions(usage.Options): - optParameters = [['backend', 'b', '127.0.0.1', + optParameters = [['backend', 'b', None, 'The OONI backend that runs a TCP echo server'], ['backendport', 'p', 80, 'Specify the port that the TCP echo server is running (should only be set for debugging)']] diff --git a/ooni/nettests/manipulation/traceroute.py b/ooni/nettests/manipulation/traceroute.py index 2db1826..8a17213 100644 --- a/ooni/nettests/manipulation/traceroute.py +++ b/ooni/nettests/manipulation/traceroute.py @@ -14,7 +14,7 @@ from ooni.utils import log class UsageOptions(usage.Options): optParameters = [ - ['backend', 'b', '8.8.8.8', 'Test backend to use'], + ['backend', 'b', None, 'Test backend to use'], ['timeout', 't', 5, 'The timeout for the traceroute test'], ['maxttl', 'm', 30, 'The maximum value of ttl to set on packets'], ['srcport', 'p', None, 'Set the source port to a specific value (only applies to TCP and UDP)']

1 0

[ooni-probe/master] Change wget to curl.
by art＠torproject.org 29 Oct '13

29 Oct '13

commit e98e510ac7859381ea1028a20fc57c684ef08ec1 Author: anadahz <anadahz@github> Date: Fri Aug 30 03:34:51 2013 +0200 Change wget to curl. In order to resolve SSL certificate verification issues --- setup-dependencies.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup-dependencies.sh b/setup-dependencies.sh index b07a716..800d08c 100755 --- a/setup-dependencies.sh +++ b/setup-dependencies.sh @@ -421,8 +421,8 @@ if which pip >/dev/null 2>&1; then fi install_pip_securely() { - DO "wget -O ${BUILD_DIR}/${PIP_PKG} ${PIP_URL}" "0" - DO "wget -O ${BUILD_DIR}/${PIP_PKG}.asc ${PIP_SIG_URL}" "0" + DO "curl -o ${BUILD_DIR}/${PIP_PKG} ${PIP_URL}" "0" + DO "curl -o ${BUILD_DIR}/${PIP_PKG}.asc ${PIP_SIG_URL}" "0" echo "[+] Verifying PGP signature of pip" echo "${PIP_PUB_KEY}" > ${PIP_KEY_FILE}

1 0

[ooni-probe/master] Remove python-pip package.
by art＠torproject.org 29 Oct '13

29 Oct '13

commit b6df42e334a67aae7c7d06053571e69d676136cd Author: anadahz <anadahz@github> Date: Fri Aug 30 03:39:14 2013 +0200 Remove python-pip package. Various distributions offer older pip versions that do not support the version parameter --- setup-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-dependencies.sh b/setup-dependencies.sh index 800d08c..67933ab 100755 --- a/setup-dependencies.sh +++ b/setup-dependencies.sh @@ -481,7 +481,7 @@ case $DISTRO_VERSION in echo "[+] Updating OS package list..."; apt-get update 2>&1 > /dev/null; echo "[+] Installing packages for your system..."; - DO "apt-get -y install curl git-core python python-pip python-dev python-setuptools build-essential libdumbnet1 python-dumbnet python-libpcap python-pypcap python-dnspython tor tor-geoipdb" "0" + DO "apt-get -y install curl git-core python python-dev python-setuptools build-essential libdumbnet1 python-dumbnet python-libpcap python-pypcap python-dnspython tor tor-geoipdb" "0" if [ "${INSTALL_PIP}" -eq "1" ] ; then echo "[+] Installing pip securely"

1 0

[ooni-probe/master] Add missing "0"
by art＠torproject.org 29 Oct '13

29 Oct '13

commit e4845fa81b50af140d59dd50669b6949bbb39d4b Author: anadahz <anadahz@github> Date: Fri Aug 30 03:47:38 2013 +0200 Add missing "0" --- setup-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-dependencies.sh b/setup-dependencies.sh index 67933ab..af26929 100755 --- a/setup-dependencies.sh +++ b/setup-dependencies.sh @@ -490,7 +490,7 @@ case $DISTRO_VERSION in if [ "$USE_VIRTUALENV" -eq "1" ]; then echo "[+] Using virtualenvironment..." - DO "apt-get -y install python-virtualenv virtualenvwrapper" + DO "apt-get -y install python-virtualenv virtualenvwrapper" "0" if [ ! -f ~/.virtualenvs/ooniprobe/bin/activate ]; then # Set up the virtual environment DO "mkdir -p ~/.virtualenvs" "0"

1 0