tor-commits May 2013

tor-commits@lists.torproject.org

20 participants
1497 discussions

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 05 May '13

05 May '13

commit 224e2df2120bb1a6c0685b0060d13ad20a80c84d Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 5 18:16:21 2013 +0000 Update translations for tor-launcher-progress --- lv/progress.dtd | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/lv/progress.dtd b/lv/progress.dtd new file mode 100644 index 0000000..e0dcfcc --- /dev/null +++ b/lv/progress.dtd @@ -0,0 +1,4 @@ +<!ENTITY torprogress.dialog.title ""> +<!ENTITY torprogress.openSettings ""> +<!ENTITY torprogress.heading ""> +<!ENTITY torprogress.pleaseWait "">

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 05 May '13

05 May '13

commit 41de61df87aedb0c01d67c2c2516356f5f9c9d92 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 5 18:16:18 2013 +0000 Update translations for tor-launcher-properties --- lv/torlauncher.properties | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/lv/torlauncher.properties b/lv/torlauncher.properties new file mode 100644 index 0000000..0e49bc8 --- /dev/null +++ b/lv/torlauncher.properties @@ -0,0 +1,30 @@ +### Copyright (c) 2013, The Tor Project, Inc. +### See LICENSE for licensing information. + +# torlauncher.error_title=Tor Launcher + +# torlauncher.tor_exited=Tor unexpectedly exited. +# torlauncher.tor_controlconn_failed=Could not connect to Tor control port. +# torlauncher.tor_failed_to_start=Tor failed to start. +# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S + +# torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S +# torlauncher.tor_missing=The Tor executable is missing. +# torlauncher.torrc_missing=The torrc file is missing. +# torlauncher.datadir_missing=The Tor data directory does not exist. +# torlauncher.password_hash_missing=Failed to get hashed password. + +# torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S +# torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S +# torlauncher.ensure_tor_is_running=Please ensure that Tor is running. + +# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. +# torlauncher.error_proxy_type_missing=You must select the proxy type. +# torlauncher.error_bridges_missing=You must specify one or more bridges. + +# torlauncher.connect=Connect +# torlauncher.quit=Quit +# torlauncher.quit_win=Exit +# torlauncher.done=Done + +# torlauncher.forAssistance=For assistance, contact %S

1 0

[translation-tools/master] tx-client is a system-provided tool now
by sebastian＠torproject.org 05 May '13

05 May '13

commit 20a94747e273f2c29314565d3e318e51b1e3dc68 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun May 5 20:09:36 2013 +0200 tx-client is a system-provided tool now --- config | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/config b/config index 31f2f97..c32018a 100644 --- a/config +++ b/config @@ -5,7 +5,7 @@ set -u TRANSLATION_REPO=/srv/translation.torproject.org/translations/ -TX=/srv/translation.torproject.org/transifex-client/bin/tx +TX=/usr/bin/tx PROJECTS="bridgedb bridgedb_completed gettor gettor_completed orbot orbot_completed tsum tsum_completed vidalia vidalia_completed

1 0

[metrics-tasks/master] Add some pgTAP unit tests (#8462)
by karsten＠torproject.org 05 May '13

05 May '13

commit 010bf6a9ac593a681ed1842547e1fe04fc32a7a9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun May 5 18:41:06 2013 +0200 Add some pgTAP unit tests (#8462) --- task-8462/README | 8 + task-8462/test-userstats.sql | 478 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 486 insertions(+), 0 deletions(-) diff --git a/task-8462/README b/task-8462/README index 9547efa..9fd3976 100644 --- a/task-8462/README +++ b/task-8462/README @@ -18,6 +18,14 @@ Create a database user and database: $ chmod 0600 ~/.pgpass $ psql -f init-userstats.sql userstats +Run unit tests using pgTAP: + + $ sudo apt-get install pgtap + $ psql -c 'CREATE SCHEMA tap;' userstats + $ PGOPTIONS=--search_path=tap psql -d userstats \ + -f /usr/share/postgresql/8.4/contrib/pgtap.sql + $ pg_prove -d userstats test-userstats.sql + Create empty bin/, lib/, in/, status/, and out/ directories. Put required .jar files into the lib/ directory. See metrics-lib.git for diff --git a/task-8462/test-userstats.sql b/task-8462/test-userstats.sql new file mode 100644 index 0000000..66f8b82 --- /dev/null +++ b/task-8462/test-userstats.sql @@ -0,0 +1,478 @@ +BEGIN; +SET search_path TO tap, public; +SELECT plan(152); +SET client_min_messages = warning; + +-- Make sure enums are as expected. +SELECT has_enum('node'); +SELECT enum_has_labels('node', ARRAY['relay', 'bridge']); +SELECT has_enum('metric'); +SELECT enum_has_labels('metric', ARRAY['responses', 'bytes', 'status']); + +-- Make sure that the imported table is exactly as the importer expects +-- it. +SELECT has_table('imported'); +SELECT has_column('imported', 'fingerprint'); +SELECT col_type_is('imported', 'fingerprint', 'CHARACTER(40)'); +SELECT col_not_null('imported', 'fingerprint'); +SELECT has_column('imported', 'node'); +SELECT col_type_is('imported', 'node', 'node'); +SELECT col_not_null('imported', 'node'); +SELECT has_column('imported', 'metric'); +SELECT col_type_is('imported', 'metric', 'metric'); +SELECT col_not_null('imported', 'metric'); +SELECT has_column('imported', 'country'); +SELECT col_type_is('imported', 'country', 'CHARACTER VARYING(2)'); +SELECT col_not_null('imported', 'country'); +SELECT has_column('imported', 'transport'); +SELECT col_type_is('imported', 'transport', 'CHARACTER VARYING(20)'); +SELECT col_not_null('imported', 'transport'); +SELECT has_column('imported', 'version'); +SELECT col_type_is('imported', 'version', 'CHARACTER VARYING(2)'); +SELECT col_not_null('imported', 'version'); +SELECT has_column('imported', 'stats_start'); +SELECT col_type_is('imported', 'stats_start', + 'TIMESTAMP WITHOUT TIME ZONE'); +SELECT col_not_null('imported', 'stats_start'); +SELECT has_column('imported', 'stats_end'); +SELECT col_type_is('imported', 'stats_end', + 'TIMESTAMP WITHOUT TIME ZONE'); +SELECT col_not_null('imported', 'stats_end'); +SELECT has_column('imported', 'val'); +SELECT col_type_is('imported', 'val', 'DOUBLE PRECISION'); +SELECT col_not_null('imported', 'val'); +SELECT hasnt_pk('imported'); + +-- Make sure that the internally-used merged table is exactly as merge() +-- expects it. +SELECT has_table('merged'); +SELECT has_column('merged', 'id'); +SELECT col_type_is('merged', 'id', 'INTEGER'); +SELECT col_is_pk('merged', 'id'); +SELECT has_column('merged', 'fingerprint'); +SELECT col_type_is('merged', 'fingerprint', 'CHARACTER(40)'); +SELECT col_not_null('merged', 'fingerprint'); +SELECT has_column('merged', 'node'); +SELECT col_type_is('merged', 'node', 'node'); +SELECT col_not_null('merged', 'node'); +SELECT has_column('merged', 'metric'); +SELECT col_type_is('merged', 'metric', 'metric'); +SELECT col_not_null('merged', 'metric'); +SELECT has_column('merged', 'country'); +SELECT col_type_is('merged', 'country', 'CHARACTER VARYING(2)'); +SELECT col_not_null('merged', 'country'); +SELECT has_column('merged', 'transport'); +SELECT col_type_is('merged', 'transport', 'CHARACTER VARYING(20)'); +SELECT col_not_null('merged', 'transport'); +SELECT has_column('merged', 'version'); +SELECT col_type_is('merged', 'version', 'CHARACTER VARYING(2)'); +SELECT col_not_null('merged', 'version'); +SELECT has_column('merged', 'stats_start'); +SELECT col_type_is('merged', 'stats_start', + 'TIMESTAMP WITHOUT TIME ZONE'); +SELECT col_not_null('merged', 'stats_start'); +SELECT has_column('merged', 'stats_end'); +SELECT col_type_is('merged', 'stats_end', + 'TIMESTAMP WITHOUT TIME ZONE'); +SELECT col_not_null('merged', 'stats_end'); +SELECT has_column('merged', 'val'); +SELECT col_type_is('merged', 'val', 'DOUBLE PRECISION'); +SELECT col_not_null('merged', 'val'); + +-- Make sure that the internally-used aggregated table is exactly as +-- aggregate() expects it. +SELECT has_table('aggregated'); +SELECT has_column('aggregated', 'date'); +SELECT col_type_is('aggregated', 'date', 'DATE'); +SELECT col_not_null('aggregated', 'date'); +SELECT has_column('aggregated', 'node'); +SELECT col_type_is('aggregated', 'node', 'node'); +SELECT col_not_null('aggregated', 'node'); +SELECT has_column('aggregated', 'country'); +SELECT col_type_is('aggregated', 'country', 'CHARACTER VARYING(2)'); +SELECT col_not_null('aggregated', 'country'); +SELECT col_default_is('aggregated', 'country', ''); +SELECT has_column('aggregated', 'transport'); +SELECT col_type_is('aggregated', 'transport', 'CHARACTER VARYING(20)'); +SELECT col_not_null('aggregated', 'transport'); +SELECT col_default_is('aggregated', 'transport', ''); +SELECT has_column('aggregated', 'version'); +SELECT col_type_is('aggregated', 'version', 'CHARACTER VARYING(2)'); +SELECT col_not_null('aggregated', 'version'); +SELECT col_default_is('aggregated', 'version', ''); +SELECT has_column('aggregated', 'rrx'); +SELECT col_type_is('aggregated', 'rrx', 'DOUBLE PRECISION'); +SELECT col_not_null('aggregated', 'rrx'); +SELECT col_default_is('aggregated', 'rrx', 0); +SELECT has_column('aggregated', 'nrx'); +SELECT col_type_is('aggregated', 'nrx', 'DOUBLE PRECISION'); +SELECT col_not_null('aggregated', 'nrx'); +SELECT col_default_is('aggregated', 'nrx', 0); +SELECT has_column('aggregated', 'hh'); +SELECT col_type_is('aggregated', 'hh', 'DOUBLE PRECISION'); +SELECT col_not_null('aggregated', 'hh'); +SELECT col_default_is('aggregated', 'hh', 0); +SELECT has_column('aggregated', 'nn'); +SELECT col_type_is('aggregated', 'nn', 'DOUBLE PRECISION'); +SELECT col_not_null('aggregated', 'nn'); +SELECT col_default_is('aggregated', 'nn', 0); +SELECT has_column('aggregated', 'hrh'); +SELECT col_type_is('aggregated', 'hrh', 'DOUBLE PRECISION'); +SELECT col_not_null('aggregated', 'hrh'); +SELECT col_default_is('aggregated', 'hrh', 0); +SELECT has_column('aggregated', 'nh'); +SELECT col_type_is('aggregated', 'nh', 'DOUBLE PRECISION'); +SELECT col_not_null('aggregated', 'nh'); +SELECT col_default_is('aggregated', 'nh', 0); +SELECT has_column('aggregated', 'nrh'); +SELECT col_type_is('aggregated', 'nrh', 'DOUBLE PRECISION'); +SELECT col_not_null('aggregated', 'nrh'); +SELECT col_default_is('aggregated', 'nrh', 0); + +-- Create temporary tables that hide the actual tables, so that we don't +-- have to care about existing data, not even in a transaction that we're +-- going to roll back. Temporarily set log level to warning to avoid +-- messages about implicitly created sequences and indexes. +CREATE TEMPORARY TABLE imported ( + fingerprint CHARACTER(40) NOT NULL, + node node NOT NULL, + metric metric NOT NULL, + country CHARACTER VARYING(2) NOT NULL, + transport CHARACTER VARYING(20) NOT NULL, + version CHARACTER VARYING(2) NOT NULL, + stats_start TIMESTAMP WITHOUT TIME ZONE NOT NULL, + stats_end TIMESTAMP WITHOUT TIME ZONE NOT NULL, + val DOUBLE PRECISION NOT NULL +); +CREATE TEMPORARY TABLE merged ( + id SERIAL PRIMARY KEY, + fingerprint CHARACTER(40) NOT NULL, + node node NOT NULL, + metric metric NOT NULL, + country CHARACTER VARYING(2) NOT NULL, + transport CHARACTER VARYING(20) NOT NULL, + version CHARACTER VARYING(2) NOT NULL, + stats_start TIMESTAMP WITHOUT TIME ZONE NOT NULL, + stats_end TIMESTAMP WITHOUT TIME ZONE NOT NULL, + val DOUBLE PRECISION NOT NULL +); +CREATE TEMPORARY TABLE aggregated ( + date DATE NOT NULL, + node node NOT NULL, + country CHARACTER VARYING(2) NOT NULL DEFAULT '', + transport CHARACTER VARYING(20) NOT NULL DEFAULT '', + version CHARACTER VARYING(2) NOT NULL DEFAULT '', + rrx DOUBLE PRECISION NOT NULL DEFAULT 0, + nrx DOUBLE PRECISION NOT NULL DEFAULT 0, + hh DOUBLE PRECISION NOT NULL DEFAULT 0, + nn DOUBLE PRECISION NOT NULL DEFAULT 0, + hrh DOUBLE PRECISION NOT NULL DEFAULT 0, + nh DOUBLE PRECISION NOT NULL DEFAULT 0, + nrh DOUBLE PRECISION NOT NULL DEFAULT 0 +); + +-- Test merging newly imported data. +PREPARE new_imported(TIMESTAMP WITHOUT TIME ZONE, + TIMESTAMP WITHOUT TIME ZONE) AS INSERT INTO imported + (fingerprint, node, metric, country, transport, version, stats_start, + stats_end, val) VALUES ('1234567890123456789012345678901234567890', + 'relay', 'status', '', '', '', $1, $2, 0); +PREPARE new_merged(TIMESTAMP WITHOUT TIME ZONE, + TIMESTAMP WITHOUT TIME ZONE) AS INSERT INTO merged + (fingerprint, node, metric, country, transport, version, stats_start, + stats_end, val) VALUES ('1234567890123456789012345678901234567890', + 'relay', 'status', '', '', '', $1, $2, 0); + +EXECUTE new_imported('2013-04-11 14:00:00', '2013-04-11 15:00:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 15:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should insert new entry into empty table as is'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_imported('2013-04-11 13:00:00', '2013-04-11 14:00:00'); +EXECUTE new_imported('2013-04-11 16:00:00', '2013-04-11 17:00:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 14:00:00'::TIMESTAMP WITHOUT TIME ZONE), + ('2013-04-11 17:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should insert two non-contiguous entries'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_imported('2013-04-11 13:00:00', '2013-04-11 15:00:00'); +EXECUTE new_imported('2013-04-11 15:00:00', '2013-04-11 17:00:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 17:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should merge two contiguous entries'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_imported('2013-04-11 13:00:00', '2013-04-11 16:00:00'); +EXECUTE new_imported('2013-04-11 14:00:00', '2013-04-11 17:00:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 16:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should skip entry that starts before and ends after the start of ' || + 'another new entry'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_imported('2013-04-11 13:00:00', '2013-04-11 15:00:00'); +EXECUTE new_imported('2013-04-11 13:00:00', '2013-04-11 16:00:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 15:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should skip entry that starts at and ends after the start of ' || + 'another new entry'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_imported('2013-04-11 13:00:00', '2013-04-11 16:00:00'); +EXECUTE new_imported('2013-04-11 14:00:00', '2013-04-11 15:00:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 16:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should skip entry that starts after another new entry starts and ' || + 'ends before that entry ends'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_imported('2013-04-11 13:00:00', '2013-04-11 16:00:00'); +EXECUTE new_imported('2013-04-11 13:00:00', '2013-04-11 16:00:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 16:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should skip entry that has same start and end as another new entry'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_imported('2013-04-11 13:00:00', '2013-04-11 16:00:00'); +EXECUTE new_imported('2013-04-11 14:00:00', '2013-04-11 16:00:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 16:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should skip entry that starts before and ends at the end of ' || + 'another new entry'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_merged('2013-04-11 16:00:00', '2013-04-11 17:00:00'); +EXECUTE new_imported('2013-04-11 14:00:00', '2013-04-11 15:00:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 15:00:00'::TIMESTAMP WITHOUT TIME ZONE), + ('2013-04-11 17:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should insert entry that ends before existing entry starts'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_merged('2013-04-11 15:00:00', '2013-04-11 16:00:00'); +EXECUTE new_imported('2013-04-11 14:00:00', '2013-04-11 15:00:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 16:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should merge entry that ends when existing entry starts'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_merged('2013-04-11 14:00:00', '2013-04-11 15:00:00'); +EXECUTE new_imported('2013-04-11 13:00:00', '2013-04-11 14:30:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_start FROM merged', + $$VALUES ('2013-04-11 14:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should skip entry that starts before but ends after existing entry ' || + 'starts'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_merged('2013-04-11 11:00:00', '2013-04-11 13:00:00'); +EXECUTE new_merged('2013-04-11 14:00:00', '2013-04-11 16:00:00'); +EXECUTE new_imported('2013-04-11 13:00:00', '2013-04-11 15:00:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 13:00:00'::TIMESTAMP WITHOUT TIME ZONE), + ('2013-04-11 16:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should skip entry that starts when existing entry ends but ' || + 'ends before another entry starts'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_merged('2013-04-11 14:00:00', '2013-04-11 17:00:00'); +EXECUTE new_imported('2013-04-11 14:00:00', '2013-04-11 15:00:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 17:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should skip entry that starts when existing entry starts'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_merged('2013-04-11 14:00:00', '2013-04-11 17:00:00'); +EXECUTE new_imported('2013-04-11 15:00:00', '2013-04-11 16:00:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 17:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should skip entry that starts after and ends before existing entry'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_merged('2013-04-11 14:00:00', '2013-04-11 17:00:00'); +EXECUTE new_imported('2013-04-11 14:00:00', '2013-04-11 17:00:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 17:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should skip entry that is already contained'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_merged('2013-04-11 14:00:00', '2013-04-11 17:00:00'); +EXECUTE new_imported('2013-04-11 16:00:00', '2013-04-11 17:00:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 17:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should skip entry that ends when existing entry ends'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_merged('2013-04-11 14:00:00', '2013-04-11 17:00:00'); +EXECUTE new_imported('2013-04-11 16:00:00', '2013-04-11 18:00:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 17:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should skip entry that starts before but ends after existing entry ' || + 'ends'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_merged('2013-04-11 14:00:00', '2013-04-11 17:00:00'); +EXECUTE new_merged('2013-04-11 18:00:00', '2013-04-11 19:00:00'); +EXECUTE new_imported('2013-04-11 16:00:00', '2013-04-11 18:00:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 17:00:00'::TIMESTAMP WITHOUT TIME ZONE), + ('2013-04-11 19:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should skip entry that starts before existing entry ends and ends ' || + 'when another entry starts'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_merged('2013-04-11 11:00:00', '2013-04-11 13:00:00'); +EXECUTE new_merged('2013-04-11 15:00:00', '2013-04-11 17:00:00'); +EXECUTE new_imported('2013-04-11 12:00:00', '2013-04-11 16:00:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 13:00:00'::TIMESTAMP WITHOUT TIME ZONE), + ('2013-04-11 17:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should skip entry that starts before existing entry ends and ends ' || + 'after another entry starts'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_merged('2013-04-11 14:00:00', '2013-04-11 15:00:00'); +EXECUTE new_imported('2013-04-11 15:00:00', '2013-04-11 16:00:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 16:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should merge entry that ends when existing entry starts'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_merged('2013-04-11 14:00:00', '2013-04-11 15:00:00'); +EXECUTE new_imported('2013-04-11 16:00:00', '2013-04-11 17:00:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 15:00:00'::TIMESTAMP WITHOUT TIME ZONE), + ('2013-04-11 17:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should insert entry that starts after existing entry ends'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_merged('2013-04-11 15:00:00', '2013-04-11 16:00:00'); +EXECUTE new_imported('2013-04-11 14:00:00', '2013-04-11 17:00:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 16:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should skip entry that starts before existing entry starts and ' || + 'ends after that entry ends'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_merged('2013-04-11 13:00:00', '2013-04-11 14:00:00'); +EXECUTE new_merged('2013-04-11 15:00:00', '2013-04-11 16:00:00'); +EXECUTE new_imported('2013-04-11 12:00:00', '2013-04-11 17:00:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 14:00:00'::TIMESTAMP WITHOUT TIME ZONE), + ('2013-04-11 16:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should skip entry that starts before and ends after multiple ' || + 'existing entries'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_imported('2013-04-11 23:00:00', '2013-04-12 00:00:00'); +EXECUTE new_imported('2013-04-12 00:00:00', '2013-04-12 01:00:00'); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-12 00:00:00'::TIMESTAMP WITHOUT TIME ZONE), + ('2013-04-12 01:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should insert two contiguous entries that end and start at midnight'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_imported('2013-04-11 12:00:00', '2013-04-11 17:00:00'); +INSERT INTO imported (fingerprint, node, metric, country, transport, + version, stats_start, stats_end, val) VALUES + ('9876543210987654321098765432109876543210', 'relay', 'status', '', '', + '', '2013-04-11 12:00:00', '2013-04-11 17:00:00', 0); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 17:00:00'::TIMESTAMP WITHOUT TIME ZONE), + ('2013-04-11 17:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should import two entries with different fingerprints and same ' || + 'start and end'); +DELETE FROM imported; +DELETE FROM merged; + +EXECUTE new_imported('2013-04-11 13:00:00', '2013-04-11 15:00:00'); +INSERT INTO imported (fingerprint, node, metric, country, transport, + version, stats_start, stats_end, val) VALUES + ('9876543210987654321098765432109876543210', 'relay', 'status', '', '', + '', '2013-04-11 14:00:00', '2013-04-11 16:00:00', 0); +SELECT merge(); +SELECT bag_eq('SELECT stats_end FROM merged', + $$VALUES ('2013-04-11 15:00:00'::TIMESTAMP WITHOUT TIME ZONE), + ('2013-04-11 16:00:00'::TIMESTAMP WITHOUT TIME ZONE)$$, + 'Should import two entries with overlapping starts and ends and ' || + 'different fingerprints'); +DELETE FROM imported; +DELETE FROM merged; + +-- TODO Test aggregating imported and merged data. + +-- Make sure that the results view has the exact definition as expected +-- for the .csv export. +SELECT has_view('estimated'); +SELECT has_column('estimated', 'date'); +SELECT col_type_is('estimated', 'date', 'DATE'); +SELECT has_column('estimated', 'node'); +SELECT col_type_is('estimated', 'node', 'node'); +SELECT has_column('estimated', 'country'); +SELECT col_type_is('estimated', 'country', 'CHARACTER VARYING(2)'); +SELECT has_column('estimated', 'transport'); +SELECT col_type_is('estimated', 'transport', 'CHARACTER VARYING(20)'); +SELECT has_column('estimated', 'version'); +SELECT col_type_is('estimated', 'version', 'CHARACTER VARYING(2)'); +SELECT has_column('estimated', 'frac'); +SELECT col_type_is('estimated', 'frac', 'INTEGER'); +SELECT has_column('estimated', 'users'); +SELECT col_type_is('estimated', 'users', 'INTEGER'); + +-- TODO Test that frac and users are computed correctly in the view. + +-- Finish tests. +SELECT * FROM finish(); +RESET client_min_messages; +ROLLBACK; +

1 0

[ooni-probe/master] Fix markup of README file
by art＠torproject.org 05 May '13

05 May '13

commit 4bcac69969d48028f59e95d675781b963e15e5d2 Author: Arturo Filastò <art(a)fuffa.org> Date: Sun May 5 16:30:14 2013 +0200 Fix markup of README file --- README.md | 115 ++++++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 76 insertions(+), 39 deletions(-) diff --git a/README.md b/README.md index 7dda15a..75095ad 100644 --- a/README.md +++ b/README.md @@ -77,8 +77,10 @@ sudo apt-get install git-core python python-pip python-dev build-essential tor t Other packages that may be of interest: - libdumbnet1 python-dumbnet python-libpcap python-pypcap python-pcapy python-dnspython - python-virtualenv virtualenvwrapper tor tor-geoipdb +``` +libdumbnet1 python-dumbnet python-libpcap python-pypcap python-pcapy python-dnspython +python-virtualenv virtualenvwrapper tor tor-geoipdb +``` The Python dependencies required for running ooniprobe are: @@ -95,7 +97,7 @@ The Python dependencies required for running ooniprobe are: Install the latest version of Tor for your platform: - https://www.torproject.org/download/download.html +[Download Tor](https://www.torproject.org/download/download.html) ## Configurating a virtual environment @@ -105,46 +107,62 @@ to install it system wide. This will require you to have installed virtualenv. - sudo apt-get install python-virtualenv virtualenvwrapper +``` +sudo apt-get install python-virtualenv virtualenvwrapper +``` To create a new virtual environment do - mkdir $HOME/.virtualenvs - mkvirtualenv ooni-probe +``` +mkdir $HOME/.virtualenvs +mkvirtualenv ooni-probe +``` You will automatically enter the environment. To re-enter this environment in the future, type: - workon ooni-probe +``` +workon ooni-probe +``` For convenience, you may want to add the following to your .bashrc: - if [ -e ~/ooni-probe/bin ]; then - export PATH=~/ooni-probe/bin:$PATH - fi - if [ -e ~/ooni-probe ]; then - export PYTHONPATH=$PYTHONPATH:~/ooni-probe - fi +``` +if [ -e ~/ooni-probe/bin ]; then + export PATH=~/ooni-probe/bin:$PATH +fi +if [ -e ~/ooni-probe ]; then + export PYTHONPATH=$PYTHONPATH:~/ooni-probe +fi +``` Add the following to $HOME/.virtualenvs/ooni-probe/bin/postactivate to automatically cd into the working directory upon activation. - if [ -e ~/ooni-probe ] ; then - cd ~/ooni-probe - fi +``` +if [ -e ~/ooni-probe ] ; then + cd ~/ooni-probe +fi +``` ## Installing ooni-probe Clone the ooniprobe repository: - git clone https://git.torproject.org/ooni-probe.git - cd ooni-probe +``` +git clone https://git.torproject.org/ooni-probe.git +cd ooni-probe +``` Then install OONI with: - pip install -r requirements.txt +``` +pip install -r requirements.txt +``` If you are not in a virtualenv you will have to run the above command as root: - sudo pip install -r requirements.txt +``` +sudo pip install -r requirements.txt +``` ## Install libdnet and pypcap python bindings @@ -156,25 +174,31 @@ libdnet-1.12 and pypcap 1.1, any other version should be considered untested. If you don't already have Subversion installed: - sudo apt-get install subversion +``` +sudo apt-get install subversion +``` For libdnet: - wget https://libdnet.googlecode.com/files/libdnet-1.12.tgz - tar xzf libdnet-1.12.tgz - cd libdnet-1.12 - ./configure && make - cd python/ - python setup.py install - cd ../../ && rm -rf libdnet-1.12* +``` +wget https://libdnet.googlecode.com/files/libdnet-1.12.tgz +tar xzf libdnet-1.12.tgz +cd libdnet-1.12 +./configure && make +cd python/ +python setup.py install +cd ../../ && rm -rf libdnet-1.12* +``` For pypcap: - git clone https://github.com/hellais/pypcap - cd pypcap/ - pip install pyrex - make && make install - cd ../ && rm -rf pypcap-read-only +``` +git clone https://github.com/hellais/pypcap +cd pypcap/ +pip install pyrex +make && make install +cd ../ && rm -rf pypcap-read-only +``` ## Including your geo data in the test report @@ -185,28 +209,38 @@ inside of ooniprobe.conf If you wish to include geografical data in the test report, you will have to go to the data/ directory and run: - make geoip +``` +make geoip +``` Then edit your ooniprobe.conf to point to the absolute path of where the data/ directory is located for example: - geoip_data_dir: /home/your_user/ooni-probe/data/ +``` +geoip_data_dir: /home/your_user/ooni-probe/data/ +``` ## Running some tests To see the possible command line options run: - ./bin/ooniprobe --help +``` +./bin/ooniprobe --help +``` For interesting tests to run look in the nettests/core/ directory. To run a test you can do so with: - ./bin/ooniprobe -o report_file_name path/to/test.py +``` +./bin/ooniprobe -o report_file_name path/to/test.py +``` Normally tests take options, you can see them with: - ./bin/ooniprobe -o report_file_name path/to/test.py --help +``` +./bin/ooniprobe -o report_file_name path/to/test.py --help +``` ## Configuration @@ -218,4 +252,7 @@ editing your ooniprobe.conf configuration file. If your distributation supports capabilities you can avoid needing to run OONI as root: - setcap cap_net_admin,cap_net_raw+eip /path/to/your/virtualenv's/python +``` +setcap cap_net_admin,cap_net_raw+eip /path/to/your/virtualenv's/python +``` +

1 0

[ooni-probe/master] Have some slightly saner defaults for the config file
by art＠torproject.org 05 May '13

05 May '13

commit 982cc75d654414471bd7a4e38ceb14b572442354 Author: Arturo Filastò <art(a)fuffa.org> Date: Sun May 5 16:30:34 2013 +0200 Have some slightly saner defaults for the config file --- ooni/director.py | 11 ++++++++--- ooniprobe.conf.sample | 6 +++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ooni/director.py b/ooni/director.py index 7ad99a9..c796d6e 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -298,9 +298,14 @@ class Director(object): log.debug("Setting control port as %s" % tor_config.ControlPort) log.debug("Setting SOCKS port as %s" % tor_config.SocksPort) - d = launch_tor(tor_config, reactor, - tor_binary=config.advanced.tor_binary, - progress_updates=updates) + if config.advanced.tor_binary: + d = launch_tor(tor_config, reactor, + tor_binary=config.advanced.tor_binary, + progress_updates=updates) + else: + d = launch_tor(tor_config, reactor, + progress_updates=updates) + d.addCallback(setup_complete) d.addErrback(setup_failed) return d diff --git a/ooniprobe.conf.sample b/ooniprobe.conf.sample index 27a4fb3..53e7ac7 100644 --- a/ooniprobe.conf.sample +++ b/ooniprobe.conf.sample @@ -25,14 +25,14 @@ advanced: # /path/to/ooni-probe/data/ geoip_data_dir: /usr/share/GeoIP/ debug: true - tor_binary: '/usr/sbin/tor' + # tor_binary: '/usr/sbin/tor' # For auto detection interface: auto # Of specify a specific interface #interface: wlan0 # If you do not specify start_tor, you will have to have Tor running and # explicitly set the control port and SOCKS port - start_tor: true + start_tor: false # After how many seconds we should give up on a particular measurement measurement_timeout: 30 # After how many retries we should give up on a measurement @@ -46,7 +46,7 @@ advanced: # How many reports to perform concurrently reporting_concurrency: 20 tor: - #socks_port: 9050 + socks_port: 9050 #control_port: 9051 # Specify the absolute path to the Tor bridges to use for testing bridges: bridges.list

1 0

[ooni-probe/master] Fix markup of code
by art＠torproject.org 05 May '13

05 May '13

commit 79a538eff2acd272c02a04c252c4dafab4799c03 Author: Arturo Filastò <hellais(a)gmail.com> Date: Sun May 5 03:09:20 2013 +0300 Fix markup of code --- README.md | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 576dd85..7dda15a 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,11 @@ network data that will assist you with your endeavors! ## Getting started with ooniprobe is easy 0) Open your favorite terminal + 1) Grab the source and install the dependencies + 2) Run ooniprobe! + 3) ... There is no step three ... ## The easy way to prep your system for running ooniprobe @@ -29,17 +32,21 @@ We believe that ooniprobe runs reasonably well on Debian GNU/Linux wheezy as well as versions of Ubuntu such as natty and later releases. Running ooniprobe without installing it is supported with the following commands: - git clone https://git.torproject.org/ooni-probe.git - cd ooni-probe - ./setup-dependencies.sh - ./bin/ooniprobe --asciilulz +``` +git clone https://git.torproject.org/ooni-probe.git +cd ooni-probe +./setup-dependencies.sh +./bin/ooniprobe --asciilulz +``` ## Your first network test We run ooniprobe with a test deck - this is a collection of tests in a single file that tells ooniprobe how to run and what data to check or process: - ./bin/ooniprobe -i decks/before_i_commit.testdeck +``` +./bin/ooniprobe -i decks/before_i_commit.testdeck +``` The report output files from the above command will be located in the reports/ directory of the source code checkout. The report output ends with the .yamloo @@ -64,7 +71,9 @@ Basic system requirements: On Debian or Ubuntu GNU/Linux based systems these can be installed with: - sudo apt-get install git-core python python-pip python-dev build-essential tor tor-geoipdb tcpdump +``` +sudo apt-get install git-core python python-pip python-dev build-essential tor tor-geoipdb tcpdump +``` Other packages that may be of interest:

1 0

[ooni-probe/master] Implement Vagrant file for running ooniprobe on any platform
by art＠torproject.org 05 May '13

05 May '13

commit 5782f32621369af476657ab128d1f63ad9b8e06a Author: Arturo Filastò <art(a)fuffa.org> Date: Sun May 5 17:28:31 2013 +0200 Implement Vagrant file for running ooniprobe on any platform * Update setup.py and README.md to work with Vagrant * Update inputs makefile to fetch from ooni.tpo/inputs --- README.md | 33 +++++++++--- Vagrantfile | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ inputs/Makefile | 3 +- setup.py | 4 +- 4 files changed, 180 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 75095ad..eb9ab68 100644 --- a/README.md +++ b/README.md @@ -16,15 +16,30 @@ with others, so that you and others may better understand your network? If so, please read this document and we hope ooniprobe will help you to gather network data that will assist you with your endeavors! -## Getting started with ooniprobe is easy - - 0) Open your favorite terminal - - 1) Grab the source and install the dependencies - - 2) Run ooniprobe! - - 3) ... There is no step three ... +## Getting started with ooniprobe is easy (with Vagrant) + +0) [Install Vagrant](http://downloads.vagrantup.com/) + +1) Open a Terminal and run: + +``` +vagrant up +``` + +2) Login to the box with: + +``` +vagrant ssh +``` + +ooniprobe will be installed in `/data/ooniprobe`. + +3) You can run tests with: + +``` +cd /data/ooniprobe/ +./bin/ooniprobe nettests/blocking/http_requests.py -f /data/ooniprobe/inputs/input-pack/alexa-top-1k.txt +``` ## The easy way to prep your system for running ooniprobe diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 0000000..52107e8 --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,153 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +Vagrant.configure("2") do |config| + # All Vagrant configuration is done here. The most common configuration + # options are documented and commented below. For a complete reference, + # please see the online documentation at vagrantup.com. + + # Every Vagrant virtual environment requires a box to build off of. + config.vm.box = "precise32" + + # The url from where the 'config.vm.box' box will be fetched if it + # doesn't already exist on the user's system. + config.vm.box_url = "http://files.vagrantup.com/precise32.box" + + # Create a forwarded port mapping which allows access to a specific port + # within the machine from a port on the host machine. In the example below, + # accessing "localhost:8080" will access port 80 on the guest machine. + # config.vm.network :forwarded_port, guest: 80, host: 8080 + + # Create a private network, which allows host-only access to the machine + # using a specific IP. + # config.vm.network :private_network, ip: "192.168.33.10" + + # Create a public network, which generally matched to bridged network. + # Bridged networks make the machine appear as another physical device on + # your network. + # config.vm.network :public_network + + # Share an additional folder to the guest VM. The first argument is + # the path on the host to the actual folder. The second argument is + # the path on the guest to mount the folder. And the optional third + # argument is a set of non-required options. + config.vm.synced_folder ".", "/data/ooniprobe" + + # Provider-specific configuration so you can fine-tune various + # backing providers for Vagrant. These expose provider-specific options. + # Example for VirtualBox: + # + # config.vm.provider :virtualbox do |vb| + # # Don't boot with headless mode + # vb.gui = true + # + # # Use VBoxManage to customize the VM. For example to change memory: + # vb.customize ["modifyvm", :id, "--memory", "1024"] + # end + # + # View the documentation for the provider you're using for more + # information on available options. + + # Enable provisioning with Puppet stand alone. Puppet manifests + # are contained in a directory path relative to this Vagrantfile. + # You will need to create the manifests directory and a manifest in + # the file base.pp in the manifests_path directory. + # + # An example Puppet manifest to provision the message of the day: + # + # # group { "puppet": + # # ensure => "present", + # # } + # # + # # File { owner => 0, group => 0, mode => 0644 } + # # + # # file { '/etc/motd': + # # content => "Welcome to your Vagrant-built virtual machine! + # # Managed by Puppet.\n" + # # } + # + # config.vm.provision :puppet do |puppet| + # puppet.manifests_path = "manifests" + # puppet.manifest_file = "init.pp" + # end + + # Enable provisioning with chef solo, specifying a cookbooks path, roles + # path, and data_bags path (all relative to this Vagrantfile), and adding + # some recipes and/or roles. + # + # config.vm.provision :chef_solo do |chef| + # chef.cookbooks_path = "../my-recipes/cookbooks" + # chef.roles_path = "../my-recipes/roles" + # chef.data_bags_path = "../my-recipes/data_bags" + # chef.add_recipe "mysql" + # chef.add_role "web" + # + # # You may also specify custom JSON attributes: + # chef.json = { :mysql_password => "foo" } + # end + + # Enable provisioning with chef server, specifying the chef server URL, + # and the path to the validation key (relative to this Vagrantfile). + # + # The Opscode Platform uses HTTPS. Substitute your organization for + # ORGNAME in the URL and validation key. + # + # If you have your own Chef Server, use the appropriate URL, which may be + # HTTP instead of HTTPS depending on your configuration. Also change the + # validation key to validation.pem. + # + # config.vm.provision :chef_client do |chef| + # chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME" + # chef.validation_key_path = "ORGNAME-validator.pem" + # end + # + # If you're using the Opscode platform, your validator client is + # ORGNAME-validator, replacing ORGNAME with your organization name. + # + # If you have your own Chef Server, the default validation client name is + # chef-validator, unless you changed the configuration. + # + # chef.validation_client_name = "ORGNAME-validator" +end + +$script = <<SCRIPT +apt-get -y install curl python-setuptools python-dev + +echo "Updating to the latest version of PIP" +cd /tmp/ + +curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py +python ./get-pip.py ## pip (>=1.3.0) is recommended for security reasons + +sudo update-alternatives --install /usr/bin/pip pip /usr/local/bin/pip 0 + +echo "Installing Tor..." + +echo "deb http://deb.torproject.org/torproject.org precise main" >> /etc/apt/source.list + +gpg --keyserver keys.gnupg.net --recv 886DDD89 +gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add - + +apt-get update +apt-get -y install deb.torproject.org-keyring tor tor-geoipdb + +apt-get -y install git-core python python-pip python-dev build-essential libdumbnet1 python-dumbnet python-libpcap python-pypcap python-dnspython python-virtualenv virtualenvwrapper tor tor-geoipdb libpcap-dev + +cd /data/ooniprobe + +echo "Installing dependencies" +pip install pyrex +pip install -r requirements.txt + +echo "Installing ooniprobe" +python setup.py install + +echo "Fetching all inputs" +cd /data/ooniprobe/inputs +make lists + +SCRIPT + +Vagrant.configure("2") do |config| + config.vm.provision :shell, :inline => $script +end diff --git a/inputs/Makefile b/inputs/Makefile index 42ae1f6..015a991 100644 --- a/inputs/Makefile +++ b/inputs/Makefile @@ -2,7 +2,8 @@ all: whatheaders lists lists: - git clone https://github.com/hellais/ooni-inputs.git ooni-inputs + curl -O https://ooni.torproject.org/inputs/input-pack.tar.gz + tar xzf input-pack.tar.gz whatheaders: wget http://s3.amazonaws.com/data.whatheaders.com/whatheaders-latest.xml.zip diff --git a/setup.py b/setup.py index 41b9050..e336e08 100644 --- a/setup.py +++ b/setup.py @@ -8,12 +8,10 @@ install_requires = [ 'scapy>=2.2.0', 'dnspython>=1.10.0', 'parsley>1.0', - 'pypcap>=1.1.1' ] dependency_links = [ - 'https://people.torproject.org/~ioerror/src/mirrors/ooniprobe', - 'https://github.com/hellais/pypcap/archive/v1.1.1.tar.gz#egg=pypcap-1.1.1' + 'https://people.torproject.org/~ioerror/src/mirrors/ooniprobe' ] with open('requirements.txt') as f:

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 05 May '13

05 May '13

commit 3fa31dfb18fed0d860e855933f3d5201a1b0ba08 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 5 13:16:36 2013 +0000 Update translations for mat-gui_completed --- it.po | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 179 insertions(+), 0 deletions(-) diff --git a/it.po b/it.po new file mode 100644 index 0000000..eafb0af --- /dev/null +++ b/it.po @@ -0,0 +1,179 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Maijin <maijin21(a)gmail.com>, 2013 +# Random_R <rand(a)yopmail.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-01-05 20:03+0100\n" +"PO-Revision-Date: 2013-05-05 13:03+0000\n" +"Last-Translator: Random_R <rand(a)yopmail.com>\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: it\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: mat-gui:95 mat-gui:563 mat-gui:579 +msgid "Ready" +msgstr "Pronto" + +#: mat-gui:107 +msgid "Add" +msgstr "Aggiungi" + +#: mat-gui:109 mat-gui:183 +msgid "Add files" +msgstr "Aggiungi file" + +#: mat-gui:113 mat-gui:203 mat-gui:308 mat-gui:311 mat-gui:555 mat-gui:557 +#: mat-gui:573 mat-gui:575 +msgid "Clean" +msgstr "Pulisci" + +#: mat-gui:115 +msgid "Clean selected files" +msgstr "Pulisci file selezionati" + +#: mat-gui:119 mat-gui:214 +msgid "Check" +msgstr "Controlla" + +#: mat-gui:121 +msgid "Check selected files for harmful meta" +msgstr "Controlla file selezionati per meta nocivi" + +#: mat-gui:125 mat-gui:185 +msgid "Quit" +msgstr "Esci" + +#: mat-gui:137 +msgid "Path" +msgstr "Percorso" + +#: mat-gui:137 mat-gui:363 +msgid "Filename" +msgstr "Nome file" + +#: mat-gui:137 mat-gui:365 +msgid "Mimetype" +msgstr "Tipo Mime" + +#: mat-gui:137 +msgid "State" +msgstr "Stato" + +#: mat-gui:138 +msgid "Cleaned file" +msgstr "File pulito" + +#: mat-gui:182 +msgid "Files" +msgstr "File" + +#: mat-gui:188 +msgid "Edit" +msgstr "Modifica" + +#: mat-gui:189 +msgid "Clear the filelist" +msgstr "Svuota la lista file" + +#: mat-gui:192 mat-gui:447 +msgid "Preferences" +msgstr "Preferenze" + +#: mat-gui:195 +msgid "Process" +msgstr "Processo" + +#: mat-gui:218 +msgid "Help" +msgstr "Aiuto" + +#: mat-gui:219 mat-gui:395 +msgid "Supported formats" +msgstr "Formati supportati" + +#: mat-gui:220 +msgid "About" +msgstr "Info" + +#: mat-gui:241 +msgid "Choose files" +msgstr "Scegli i file" + +#: mat-gui:248 +msgid "All files" +msgstr "Tutti i file" + +#: mat-gui:255 +msgid "Supported files" +msgstr "File supportati" + +#: mat-gui:297 +msgid "unknow" +msgstr "sconosciuto" + +#: mat-gui:313 mat-gui:559 +msgid "Dirty" +msgstr "Sporco" + +#: mat-gui:343 +msgid "Not-supported" +msgstr "Non-supportato" + +#: mat-gui:381 +msgid "This software was coded during the GSoC 2011" +msgstr "Questo software è stato scritto durante il GSoC 2011" + +#: mat-gui:386 +msgid "Website" +msgstr "Sito" + +#: mat-gui:461 +msgid "Force Clean" +msgstr "Forza Pulitura" + +#: mat-gui:464 +msgid "Do not check if already clean before cleaning" +msgstr "Non controllare se già pulito prima della pulitura" + +#: mat-gui:468 +msgid "Backup" +msgstr "Backup" + +#: mat-gui:471 +msgid "Keep a backup copy" +msgstr "Tieni una copia di backup" + +#: mat-gui:474 +msgid "Reduce PDF quality" +msgstr "Riduci qualità PDF" + +#: mat-gui:477 +msgid "Reduce the produced PDF size and quality" +msgstr "Riduci la dimensione e qualità prodotte del PDF" + +#: mat-gui:480 +msgid "Add unsupported file to archives" +msgstr "Aggiungi file non supportato agli achivi" + +#: mat-gui:484 +msgid "Add non-supported (and so non-anonymised) file to output archive" +msgstr "Aggiungi file non-supportato (e quindi non-anonimo) all'archivio di destinazione" + +#: mat-gui:554 +#, python-format +msgid "Checking %s..." +msgstr "Controllo %s..." + +#: mat-gui:572 +#, python-format +msgid "Cleaning %s..." +msgstr "Pulitura %s..."

1 0

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

05 May '13

commit 08d196a3d3129ed329ef314b801a415b033899cd Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 5 13:16:30 2013 +0000 Update translations for mat-gui --- it.po | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/it.po b/it.po index 773a0db..eafb0af 100644 --- a/it.po +++ b/it.po @@ -10,8 +10,8 @@ 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-04-26 13:18+0000\n" -"Last-Translator: Maijin <maijin21(a)gmail.com>\n" +"PO-Revision-Date: 2013-05-05 13:03+0000\n" +"Last-Translator: Random_R <rand(a)yopmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,11 +34,11 @@ msgstr "Aggiungi file" #: mat-gui:113 mat-gui:203 mat-gui:308 mat-gui:311 mat-gui:555 mat-gui:557 #: mat-gui:573 mat-gui:575 msgid "Clean" -msgstr "" +msgstr "Pulisci" #: mat-gui:115 msgid "Clean selected files" -msgstr "" +msgstr "Pulisci file selezionati" #: mat-gui:119 mat-gui:214 msgid "Check" @@ -46,7 +46,7 @@ msgstr "Controlla" #: mat-gui:121 msgid "Check selected files for harmful meta" -msgstr "" +msgstr "Controlla file selezionati per meta nocivi" #: mat-gui:125 mat-gui:185 msgid "Quit" @@ -70,7 +70,7 @@ msgstr "Stato" #: mat-gui:138 msgid "Cleaned file" -msgstr "" +msgstr "File pulito" #: mat-gui:182 msgid "Files" @@ -90,7 +90,7 @@ msgstr "Preferenze" #: mat-gui:195 msgid "Process" -msgstr "" +msgstr "Processo" #: mat-gui:218 msgid "Help" @@ -122,7 +122,7 @@ msgstr "sconosciuto" #: mat-gui:313 mat-gui:559 msgid "Dirty" -msgstr "" +msgstr "Sporco" #: mat-gui:343 msgid "Not-supported" @@ -138,11 +138,11 @@ msgstr "Sito" #: mat-gui:461 msgid "Force Clean" -msgstr "" +msgstr "Forza Pulitura" #: mat-gui:464 msgid "Do not check if already clean before cleaning" -msgstr "" +msgstr "Non controllare se già pulito prima della pulitura" #: mat-gui:468 msgid "Backup" @@ -176,4 +176,4 @@ msgstr "Controllo %s..." #: mat-gui:572 #, python-format msgid "Cleaning %s..." -msgstr "" +msgstr "Pulitura %s..."

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2013