- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
by nickm＠torproject.org 06 Mar '11

06 Mar '11

commit ed14888e7e9ffb1877ddb7780b5033314d244fb3 Merge: 9f61450 8b01fd7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Mar 6 13:20:21 2011 -0500 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 Conflicts: src/or/policies.c changes/ipv6_crash | 3 +++ src/or/policies.c | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --combined src/or/policies.c index 38c2f7c,f8c36c7..e48f420 --- a/src/or/policies.c +++ b/src/or/policies.c @@@ -9,10 -9,6 +9,10 @@@ **/ #include "or.h" +#include "config.h" +#include "dirserv.h" +#include "policies.h" +#include "routerparse.h" #include "ht.h" /** Policy that addresses for incoming SOCKS connections must match. */ @@@ -348,8 -344,7 +348,8 @@@ validate_addr_policies(or_options_t *op *msg = NULL; if (policies_parse_exit_policy(options->ExitPolicy, &addr_policy, - options->ExitPolicyRejectPrivate, NULL)) + options->ExitPolicyRejectPrivate, NULL, + !options->BridgeRelay)) REJECT("Error in ExitPolicy entry."); /* The rest of these calls *append* to addr_policy. So don't actually @@@ -380,8 -375,14 +380,8 @@@ if (parse_addr_policy(options->ReachableDirAddresses, &addr_policy, ADDR_POLICY_ACCEPT)) REJECT("Error in ReachableDirAddresses entry."); - if (parse_addr_policy(options->AuthDirReject, &addr_policy, - ADDR_POLICY_REJECT)) - REJECT("Error in AuthDirReject entry."); - if (parse_addr_policy(options->AuthDirInvalid, &addr_policy, - ADDR_POLICY_REJECT)) - REJECT("Error in AuthDirInvalid entry."); -err: + err: addr_policy_list_free(addr_policy); return *msg ? -1 : 0; #undef REJECT @@@ -828,16 -829,14 +828,16 @@@ exit_policy_remove_redundancies(smartli "reject *:6346-6429,reject *:6699,reject *:6881-6999,accept *:*" /** Parse the exit policy <b>cfg</b> into the linked list *<b>dest</b>. If - * cfg doesn't end in an absolute accept or reject, add the default exit + * cfg doesn't end in an absolute accept or reject and if + * <b>add_default_policy</b> is true, add the default exit * policy afterwards. If <b>rejectprivate</b> is true, prepend * "reject private:*" to the policy. Return -1 if we can't parse cfg, * else return 0. */ int policies_parse_exit_policy(config_line_t *cfg, smartlist_t **dest, - int rejectprivate, const char *local_address) + int rejectprivate, const char *local_address, + int add_default_policy) { if (rejectprivate) { append_exit_policy_string(dest, "reject private:*"); @@@ -849,23 -848,13 +849,23 @@@ } if (parse_addr_policy(cfg, dest, -1)) return -1; - append_exit_policy_string(dest, DEFAULT_EXIT_POLICY); - + if (add_default_policy) + append_exit_policy_string(dest, DEFAULT_EXIT_POLICY); + else + append_exit_policy_string(dest, "reject *:*"); exit_policy_remove_redundancies(*dest); return 0; } +/** Add "reject *:*" to the end of the policy in *<b>dest</b>, allocating + * *<b>dest</b> as needed. */ +void +policies_exit_policy_append_reject_star(smartlist_t **dest) +{ + append_exit_policy_string(dest, "reject *:*"); +} + /** Replace the exit policy of <b>r</b> with reject *:*. */ void policies_set_router_exitpolicy_to_reject_all(routerinfo_t *r) @@@ -877,49 -866,6 +877,51 @@@ smartlist_add(r->exit_policy, item); } +/** Return 1 if there is at least one /8 subnet in <b>policy</b> that + * allows exiting to <b>port</b>. Otherwise, return 0. */ +static int +exit_policy_is_general_exit_helper(smartlist_t *policy, int port) +{ + uint32_t mask, ip, i; + /* Is this /8 rejected (1), or undecided (0)? */ + char subnet_status[256]; + + memset(subnet_status, 0, sizeof(subnet_status)); + SMARTLIST_FOREACH(policy, addr_policy_t *, p, { ++ if (tor_addr_family(&p->addr) != AF_INET) ++ continue; /* IPv4 only for now */ + if (p->prt_min > port || p->prt_max < port) + continue; /* Doesn't cover our port. */ + mask = 0; + tor_assert(p->maskbits <= 32); + + if (p->maskbits) + mask = UINT32_MAX<<(32-p->maskbits); + ip = tor_addr_to_ipv4h(&p->addr); + + /* Calculate the first and last subnet that this exit policy touches + * and set it as loop boundaries. */ + for (i = ((mask & ip)>>24); i <= (~((mask & ip) ^ mask)>>24); ++i) { + tor_addr_t addr; + if (subnet_status[i] != 0) + continue; /* We already reject some part of this /8 */ + tor_addr_from_ipv4h(&addr, i<<24); + if (tor_addr_is_internal(&addr, 0)) + continue; /* Local or non-routable addresses */ + if (p->policy_type == ADDR_POLICY_ACCEPT) { + if (p->maskbits > 8) + continue; /* Narrower than a /8. */ + /* We found an allowed subnet of at least size /8. Done + * for this port! */ + return 1; + } else if (p->policy_type == ADDR_POLICY_REJECT) { + subnet_status[i] = 1; + } + } + }); + return 0; +} + /** Return true iff <b>ri</b> is "useful as an exit node", meaning * it allows exit to at least one /8 address space for at least * two of ports 80, 443, and 6667. */ @@@ -933,7 -879,21 +935,7 @@@ exit_policy_is_general_exit(smartlist_ return 0; for (i = 0; i < 3; ++i) { - SMARTLIST_FOREACH(policy, addr_policy_t *, p, { - if (tor_addr_family(&p->addr) != AF_INET) - continue; /* IPv4 only for now */ - if (p->prt_min > ports[i] || p->prt_max < ports[i]) - continue; /* Doesn't cover our port. */ - if (p->maskbits > 8) - continue; /* Narrower than a /8. */ - if (tor_addr_is_loopback(&p->addr)) - continue; /* 127.x or ::1. */ - /* We have a match that is at least a /8. */ - if (p->policy_type == ADDR_POLICY_ACCEPT) { - ++n_allowed; - break; /* stop considering this port */ - } - }); + n_allowed += exit_policy_is_general_exit_helper(policy, ports[i]); } return n_allowed >= 2; } @@@ -1280,7 -1240,7 +1282,7 @@@ policy_summarize(smartlist_t *policy result = tor_malloc(final_size); tor_snprintf(result, final_size, "%s %s", prefix, shorter_str); -cleanup: + cleanup: /* cleanup */ SMARTLIST_FOREACH(summary, policy_summary_item_t *, s, tor_free(s)); smartlist_free(summary); @@@ -1300,11 -1260,9 +1302,11 @@@ * about "exit-policy/..." */ int getinfo_helper_policies(control_connection_t *conn, - const char *question, char **answer) + const char *question, char **answer, + const char **errmsg) { (void) conn; + (void) errmsg; if (!strcmp(question, "exit-policy/default")) { *answer = tor_strdup(DEFAULT_EXIT_POLICY); } @@@ -1315,8 -1273,7 +1317,8 @@@ void addr_policy_list_free(smartlist_t *lst) { - if (!lst) return; + if (!lst) + return; SMARTLIST_FOREACH(lst, addr_policy_t *, policy, addr_policy_free(policy)); smartlist_free(lst); } @@@ -1325,20 -1282,19 +1327,20 @@@ void addr_policy_free(addr_policy_t *p) { - if (p) { - if (--p->refcnt <= 0) { - if (p->is_canonical) { - policy_map_ent_t search, *found; - search.policy = p; - found = HT_REMOVE(policy_map, &policy_root, &search); - if (found) { - tor_assert(p == found->policy); - tor_free(found); - } + if (!p) + return; + + if (--p->refcnt <= 0) { + if (p->is_canonical) { + policy_map_ent_t search, *found; + search.policy = p; + found = HT_REMOVE(policy_map, &policy_root, &search); + if (found) { + tor_assert(p == found->policy); + tor_free(found); } - tor_free(p); } + tor_free(p); } }

1 0

[tor/maint-0.2.1] exit_policy_is_general_exit is IPv4 only; it should admit it.
by nickm＠torproject.org 06 Mar '11

06 Mar '11

commit 8b01fd7badc893b849d4394a2b72d422eecf7913 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Mar 6 13:16:53 2011 -0500 exit_policy_is_general_exit is IPv4 only; it should admit it. --- src/or/policies.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/policies.c b/src/or/policies.c index 0a8fd73..f8c36c7 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -880,6 +880,8 @@ exit_policy_is_general_exit(smartlist_t *policy) for (i = 0; i < 3; ++i) { SMARTLIST_FOREACH(policy, addr_policy_t *, p, { + if (tor_addr_family(&p->addr) != AF_INET) + continue; /* IPv4 only for now */ if (p->prt_min > ports[i] || p->prt_max < ports[i]) continue; /* Doesn't cover our port. */ if (p->maskbits > 8)

1 0

[tor/maint-0.2.1] Changes file for ipv6 parsing issue
by nickm＠torproject.org 06 Mar '11

06 Mar '11

commit fb421c00052cfebda33c4d42346c7eeef30f865f Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Mar 6 13:15:32 2011 -0500 Changes file for ipv6 parsing issue --- changes/ipv6_crash | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/ipv6_crash b/changes/ipv6_crash new file mode 100644 index 0000000..2b04355 --- /dev/null +++ b/changes/ipv6_crash @@ -0,0 +1,3 @@ + o Major bugfixes (directory authority) + - Fix a crash in parsing router descriptors containing IPv6 + addresses. Bugfix on 0.2.1.3-alpha.

1 0

[tor/maint-0.2.1] Disallow reject6 and accept6 lines in descriptors
by nickm＠torproject.org 06 Mar '11

06 Mar '11

commit b3918b3bbbfa9097246d63746c8b540eff2ec8e8 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Mar 6 18:20:28 2011 +0100 Disallow reject6 and accept6 lines in descriptors This fixes a remotely triggerable assert on directory authorities, who don't handle descriptors with ipv6 contents well yet. We will want to revert this once we're ready to handle ipv6. Issue raised by lorth on #tor, who wasn't able to use Tor anymore. Analyzed with help from Christian Fromme. Fix suggested by arma. Bugfix on 0.2.1.3-alpha. --- src/or/routerparse.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index aa0687d..d76b006 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -222,8 +222,6 @@ typedef struct token_rule_t { static token_rule_t routerdesc_token_table[] = { T0N("reject", K_REJECT, ARGS, NO_OBJ ), T0N("accept", K_ACCEPT, ARGS, NO_OBJ ), - T0N("reject6", K_REJECT6, ARGS, NO_OBJ ), - T0N("accept6", K_ACCEPT6, ARGS, NO_OBJ ), T1_START( "router", K_ROUTER, GE(5), NO_OBJ ), T1( "signing-key", K_SIGNING_KEY, NO_ARGS, NEED_KEY_1024 ), T1( "onion-key", K_ONION_KEY, NO_ARGS, NEED_KEY_1024 ),

1 0

[weather/master] Use correct mailing list when mailing new Tor relay operators. Thanks, Michael.
by kaner＠torproject.org 06 Mar '11

06 Mar '11

commit 45a0fd1f6e05633f4f14214849c5279e16f595fc Author: Christian Fromme <kaner(a)strace.org> Date: Sun Mar 6 14:44:23 2011 +0100 Use correct mailing list when mailing new Tor relay operators. Thanks, Michael. --- weather/weatherapp/emails.py | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/weather/weatherapp/emails.py b/weather/weatherapp/emails.py index 5b8b8db..af4121f 100644 --- a/weather/weatherapp/emails.py +++ b/weather/weatherapp/emails.py @@ -119,11 +119,10 @@ _WELCOME_MAIL = "Hello and welcome to Tor!\n\n" +\ "operators. If you're interested in Tor Weather, please visit the "+\ "following link to register:\n\n"+\ "%s\n\n"+\ - "You might also be interested in the or-announce mailing list, "+\ + "You might also be interested in the tor-announce mailing list, "+\ "which is a low volume list for announcements of new releases and "+\ - "critical security updates. To join, send an e-mail message to "+\ - "majordomo(a)seul.org "+\ - "with no subject and a body of \"subscribe or-announce\". \n\n"+\ + "critical security updates. To join, visit the following address:\n\n"+\ + "https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-announce\n\n"+\ "%sThank you again for your contribution to the Tor network! "+\ "We won't send you any further emails unless you subscribe.\n\n"+\ "Disclaimer: If you have no idea why you're receiving this email, we "+\

1 0

[torsocks/master] Remove some cruft from Makefile.am
by hoganrobert＠torproject.org 05 Mar '11

05 Mar '11

commit fbe281f006d7bbab765ff3a32f005648a0dbcff1 Author: Robert Hogan <robert(a)roberthogan.net> Date: Wed Mar 2 20:28:49 2011 +0000 Remove some cruft from Makefile.am --- test/Makefile.am | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 159e3c9..c04e5ea 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,6 +1,5 @@ noinst_PROGRAMS= test_torsocks test_torsocks_SOURCES= test_torsocks.c -AM_LDFLAGS= test_torsocks_LDFLAGS= $(TESTLDFLAGS) CLEANFILES= test_torsocks

1 0

r24307: {website} Making the link from the gsoc -> projects page more prominen (website/trunk/about/en)
by Damian Johnson 04 Mar '11

04 Mar '11

Author: atagar Date: 2011-03-04 16:30:18 +0000 (Fri, 04 Mar 2011) New Revision: 24307 Modified: website/trunk/about/en/gsoc.wml Log: Making the link from the gsoc -> projects page more prominent (for students this will be the most important link on the page since it has the ideas, so we want it to stand out). Modified: website/trunk/about/en/gsoc.wml =================================================================== --- website/trunk/about/en/gsoc.wml 2011-03-04 16:12:02 UTC (rev 24306) +++ website/trunk/about/en/gsoc.wml 2011-03-04 16:30:18 UTC (rev 24307) @@ -93,8 +93,9 @@ <h2><a class="anchor" href="#Ideas">Ideas List</a></h2> <p> - This year, we started an ideas list about projects to - <a href="<page getinvolved/volunteer>#Projects">help develop Tor</a>. + To start with, please see our <b><a href="<page + getinvolved/volunteer>#Projects">projects page</a></b> and its following + ideas. </p> <p>

1 0

r24306: {translation} updated translation from transifex for the website (in translation/trunk/projects/website/po: .tx zh_CN/about)
by Runa Sandvik 04 Mar '11

04 Mar '11

Author: runa Date: 2011-03-04 16:12:02 +0000 (Fri, 04 Mar 2011) New Revision: 24306 Modified: translation/trunk/projects/website/po/.tx/config translation/trunk/projects/website/po/zh_CN/about/2-medium.overview.po Log: updated translation from transifex for the website Modified: translation/trunk/projects/website/po/.tx/config =================================================================== --- translation/trunk/projects/website/po/.tx/config 2011-03-04 13:42:46 UTC (rev 24305) +++ translation/trunk/projects/website/po/.tx/config 2011-03-04 16:12:02 UTC (rev 24306) @@ -3,6 +3,11 @@ source_file = templates/docs/1-high.bridges.pot source_lang = en +[torproject.website-docs-android-pot] +file_filter = <lang>/docs/3-low.android.po +source_file = templates/docs/3-low.android.pot +source_lang = en + [torproject.website-about-contact-pot] file_filter = <lang>/about/3-low.contact.po source_file = templates/about/3-low.contact.pot @@ -28,9 +33,9 @@ source_file = templates/about/2-medium.overview.pot source_lang = en -[torproject.website-press-inthemedia-pot] -file_filter = <lang>/press/3-low.inthemedia.po -source_file = templates/press/3-low.inthemedia.pot +[torproject.website-docs-debian-pot] +file_filter = <lang>/docs/3-low.debian.po +source_file = templates/docs/3-low.debian.pot source_lang = en [torproject.website-getinvolved-tshirt-pot] @@ -73,9 +78,9 @@ source_file = templates/about/3-low.sponsors.pot source_lang = en -[torproject.website-download-download-pot] -file_filter = <lang>/download/3-low.download.po -source_file = templates/download/3-low.download.pot +[torproject.website-docs-N900-pot] +file_filter = <lang>/docs/3-low.N900.po +source_file = templates/docs/3-low.N900.pot source_lang = en [torproject.website-projects-vidalia-pot] @@ -83,11 +88,6 @@ source_file = templates/projects/4-optional.vidalia.pot source_lang = en -[torproject.website-torbutton-torbutton-options-pot] -file_filter = <lang>/torbutton/3-low.torbutton-options.po -source_file = templates/torbutton/3-low.torbutton-options.pot -source_lang = en - [torproject.website-docs-rpms-pot] file_filter = <lang>/docs/3-low.rpms.po source_file = templates/docs/3-low.rpms.pot @@ -98,9 +98,9 @@ source_file = templates/donate/3-low.matching-program.pot source_lang = en -[torproject.website-docs-N900-pot] -file_filter = <lang>/docs/3-low.N900.po -source_file = templates/docs/3-low.N900.pot +[torproject.website-download-download-pot] +file_filter = <lang>/download/3-low.download.po +source_file = templates/download/3-low.download.pot source_lang = en [torproject.website-docs-debian-vidalia-pot] @@ -118,16 +118,11 @@ source_file = templates/torbutton/3-low.index.pot source_lang = en -[torproject.website-getinvolved-translation-overview-pot] -file_filter = <lang>/getinvolved/4-optional.translation-overview.po -source_file = templates/getinvolved/4-optional.translation-overview.pot +[torproject.website-press-inthemedia-pot] +file_filter = <lang>/press/3-low.inthemedia.po +source_file = templates/press/3-low.inthemedia.pot source_lang = en -[torproject.website-docs-debian-pot] -file_filter = <lang>/docs/3-low.debian.po -source_file = templates/docs/3-low.debian.pot -source_lang = en - [torproject.website-projects-torbrowser-pot] file_filter = <lang>/projects/1-high.torbrowser.po source_file = templates/projects/1-high.torbrowser.pot @@ -138,11 +133,6 @@ source_file = templates/torbutton/3-low.torbutton-faq.pot source_lang = en -[torproject.website-docs-highproxychain-pot] -file_filter = <lang>/docs/1-high.proxychain.po -source_file = templates/docs/1-high.proxychain.pot -source_lang = en - [torproject.website-docs-installguide-pot] file_filter = <lang>/docs/2-medium.installguide.po source_file = templates/docs/2-medium.installguide.pot @@ -191,11 +181,16 @@ source_file = templates/docs/2-medium.documentation.pot source_lang = en -[torproject.website-press-2010-03-25-press-release-pot] -file_filter = <lang>/press/4-optional.2010-03-25-tor-store-press-release.po -source_file = templates/press/4-optional.2010-03-25-tor-store-press-release.pot +[torproject.website-getinvolved-translation-overview-pot] +file_filter = <lang>/getinvolved/4-optional.translation-overview.po +source_file = templates/getinvolved/4-optional.translation-overview.pot source_lang = en +[torproject.website-docs-trademark-faq-pot] +file_filter = <lang>/docs/3-low.trademark-faq.po +source_file = templates/docs/3-low.trademark-faq.pot +source_lang = en + [torproject.website-download-download-unix-pot] file_filter = <lang>/download/3-low.download-unix.po source_file = templates/download/3-low.download-unix.pot @@ -211,11 +206,6 @@ source_file = templates/projects/3-low.gettor.pot source_lang = en -[torproject.website-projects-puppettor-pot] -file_filter = <lang>/projects/3-low.puppettor.po -source_file = templates/projects/3-low.puppettor.pot -source_lang = en - [torproject.website-docs-faq-pot] file_filter = <lang>/docs/2-medium.faq.po source_file = templates/docs/2-medium.faq.pot @@ -246,11 +236,16 @@ source_file = templates/donate/3-low.donate-hardware.pot source_lang = en -[torproject.website-docs-trademark-faq-pot] -file_filter = <lang>/docs/3-low.trademark-faq.po -source_file = templates/docs/3-low.trademark-faq.pot +[torproject.website-docs-highproxychain-pot] +file_filter = <lang>/docs/1-high.proxychain.po +source_file = templates/docs/1-high.proxychain.pot source_lang = en +[torproject.website-projects-puppettor-pot] +file_filter = <lang>/projects/3-low.puppettor.po +source_file = templates/projects/3-low.puppettor.pot +source_lang = en + [torproject.website-download-download-easy-pot] file_filter = <lang>/download/1-high.download-easy.po source_file = templates/download/1-high.download-easy.pot @@ -261,6 +256,11 @@ source_file = templates/docs/3-low.tor-doc-web.pot source_lang = en +[torproject.website-press-2010-03-25-press-release-pot] +file_filter = <lang>/press/4-optional.2010-03-25-tor-store-press-release.po +source_file = templates/press/4-optional.2010-03-25-tor-store-press-release.pot +source_lang = en + [torproject.website-getinvolved-open-positions-pot] file_filter = <lang>/getinvolved/4-optional.open-positions.po source_file = templates/getinvolved/4-optional.open-positions.pot @@ -296,9 +296,9 @@ source_file = templates/donate/3-low.donate-service.pot source_lang = en -[torproject.website-docs-android-pot] -file_filter = <lang>/docs/3-low.android.po -source_file = templates/docs/3-low.android.pot +[torproject.website-torbutton-torbutton-options-pot] +file_filter = <lang>/torbutton/3-low.torbutton-options.po +source_file = templates/torbutton/3-low.torbutton-options.pot source_lang = en [torproject.website-projects-torbrowser-split-pot] Modified: translation/trunk/projects/website/po/zh_CN/about/2-medium.overview.po =================================================================== --- translation/trunk/projects/website/po/zh_CN/about/2-medium.overview.po 2011-03-04 13:42:46 UTC (rev 24305) +++ translation/trunk/projects/website/po/zh_CN/about/2-medium.overview.po 2011-03-04 16:12:02 UTC (rev 24306) @@ -8,7 +8,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-03-01 16:37+0000\n" -"PO-Revision-Date: 2011-03-04 13:30+0000\n" +"PO-Revision-Date: 2011-03-04 16:10+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n"

1 0

r24305: {} french translation for the website as wml (website/trunk/about/fr)
by Runa Sandvik 04 Mar '11

04 Mar '11

Author: runa Date: 2011-03-04 13:42:46 +0000 (Fri, 04 Mar 2011) New Revision: 24305 Added: website/trunk/about/fr/overview.wml Log: french translation for the website as wml Added: website/trunk/about/fr/overview.wml =================================================================== --- website/trunk/about/fr/overview.wml (rev 0) +++ website/trunk/about/fr/overview.wml 2011-03-04 13:42:46 UTC (rev 24305) @@ -0,0 +1,309 @@ + + + + + +## translation metadata +# Revision: $Revision: 24254 $ +# Translation-Priority: 2-medium +#include "head.wmi" TITLE="Tor Project: Overview" CHARSET="UTF-8" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">Accueil »</a> <a href="<page about/overview>">À +propos »</a> + </div> + <div id="maincol"> + <a name="overview"></a> + <h2><a class="anchor" href="#overview">Tor: Overview</a></h2> + +  +<div class="sidebar-left"> + <h3>Sujets</h3> + <ul> + <li><a href="<page about/overview>#overview">Vue d'ensemble</a></li> + <li><a href="<page about/overview>#whyweneedtor">Pourquoi nous avons besoin de +Tor</a></li> + <li><a href="<page about/overview>#thesolution">La Solution</a></li> + <li><a href="<page about/overview>#hiddenservices">Services cachés</a></li> + <li><a href="<page about/overview>#stayinganonymous">Rester anonyme</a></li> + <li><a href="<page about/overview>#thefutureoftor">Le futur de Tor</a></li> + </ul> + </div> + + +  +<hr> + + <p> + Tor est un réseau de tunnels virtuels permettant à des personnes ou groupes +de renforcer leur confidentialité et leur vie privée sur Internet. Il permet +également aux développeurs de logiciels de créer de nouveaux outils de +communication dotés de fonctionnalités de confidentialité intégrées. Tor +pose les fondations pour un large éventail d'applications afin de permettre +aux sociétés et individus de partager des informations sur les réseaux +publics sans compromettre leur vie privée. + </p> + + <p> + Les individus utilisent Tor pour empêcher les sites web de traquer leurs +informations personnelles, ou celles des membres de leur famille, ou pour se +connecter à des sites d'information, services de messageries instantanées, +ou ce genre de services qui peuvent être bloqués par le fournisseur d'accès +local. Les <a href="<page docs/hidden-services>">services cachés</a> de Tor +permet aux utilisateurs de publier des sites web ou d'autres services sans +révéler la localisation de ces sites. Les gens utilisent également Tor pour +les communications sensibles : salons de discussion, forums, afin de se +prémunir d'éventuels harcèlements. + </p> + + <p> + Les journalistes utilisent Tor pour communiquer avec plus de sécurité avec +les dénonciateurs et dissidents. Les organisations non gouvernementales +(ONG) utilisent Tor pour permettre à leurs employés de se connecter à leur +site web depuis un pays étranger, sans indiquer à tout le monde autour +qu'ils travaillent pour cette organisation. + </p> + + <p> + Les groupes tels qu'Indymedia recommandent Tor pour protéger la vie privée +et la sécurité de leurs membres. Les groupes militants tels que l'Electronic +Frontier Foundation (EFF) recommandent Tor en tant que mécanisme de +sauvegarde des libertés individuelles sur Internet. Les sociétés utilisent +Tor comme moyen sûr d'effectuer des analyses concurrentielles, et de +protéger les habitudes d'approvisionnement sensibles des oreilles +indiscrètes. Elles l'utilisent aussi en remplacement des traditionnels VPNs, +qui révèlent la quantité et le timing exact des communications. De quelles +localisations les employés ont-ils travaillé tard ? D'où ont-elles consulté +des sites de recherche d'emploi ? Quels bureaux d'étude ont communiqué avec +les avocats en brevets de la société? + </p> + + <p> + Une branche de l'armée américaine utilise Tor pour de la collecte +d'informations sur l'open source, et une de ses équipes a utilisé Tor tandis +qu'elle était déployée au Moyen-Orient récemment. Les forces de l'ordre +l'utilisent pour visiter ou surveiller des sites web sans laisser d'adresse +IP du gouvernement dans les journaux web, et pour effectuer ces opérations +en sécurité. + </p> + + <p> + La diversité de personnes qui utilisent Tor est actuellement <a +href="http://freehaven.net/doc/fc03/econymics.pdf">part l'une des choses qui +le rend si sécurisé.</a>. Tor vous cache parmi <a href="<page +about/torusers>">les autres utilisateurs du réseau</a>, donc plus la base +d'utilisateurs sera peuplée et diversifiée, plus votre anonymat sera +protégé. + </p> + + <a name="whyweneedtor"></a> + <h3><a class="anchor" href="#whyweneedtor">Pourquoi nous avons besoin de Tor</a></h3> + + <p> + Utiliser Tor vous protège contre une certaine forme de surveillance sur +Internet, connue sous le nom d'"analyse de trafic". Cette analyse est +utilisée pour déterminer qui communique avec qui sur un réseau +public. Connaître la source et la destination de votre trafic peut permettre +à des personnes de traquer votre comportement et vos intérêts. Cela peut +impacter sur votre chéquier, par exemple si un site de e-commerce pratique +un prix différent selon votre pays ou institution d'origine. Cela peut même +menacer votre emploi ou votre sécurité physique de réféler qui et où vous +êtes. Par exemple, si vous voyagez à l'étranger et que vous vous connectez +sur les ordinateurs de votre employeur pour récupérer ou envoyer des mails, +vous pouvez révéler par inadvertance votre nationalité et votre affiliation +professionnelle à quiconque qui observerait le réseau, même si la connexion +est chiffrée. + </p> + + <p> + Comment fonctionne l'analyse de trafic ? Les paquets de données sur Internet +possèdent deux parties : une charge utile de données, et une entête, +utilisée pour l'acheminement. La charge de données contient tout ce qui est +envoyé, qu'il s'agisse d'un message e-mail, d'une page web, ou d'un fichier +audio. Même si vous chiffrez ces données ou vos communications, l'analyse de +trafic révèle tout de même une importante information au sujet de ce que +vous faites, et, potentiellement, ce que vous dites. C'est parce qu'elle se +focalise sur l'entête, qui divulgue la source, la destination, la taille, le +timing, et autres. + </p> + + <p> + Un problème fondamental pour le respect de la vie privée est que le +destinataire de vos communications peut voir que vous les avez envoyées, en +surveillant vos entêtes. C'est aussi le cas pour les intermédiaires +autorisés, comme les fournisseurs d'accès, ou même des intermédiaires +illégitimes. Une forme très simple d'analyse de trafic peut être de se poser +quelque part entre l'émetteur et le destinataire sur le réseau, et +d'observer les entêtes. + </p> + + <p> + Mais il existe des formes plus efficaces d'analyse de trafic. Certains +attaquants espionnent en de multiples points d'Internet, et utilises des +techniques de statistiques sophistiquées pour traquer les modèles d'entêtes +de sociétés ou d'individus spécifiques. Le chiffrement ne protège pas de ces +attaques, car il cache uniquement le contenu du trafic, pas ses entêtes. + </p> + + <a name="thesolution"></a> + <h3><a class="anchor" href="#thesolution">La solution: une réseau anonyme et +décentralisé</a></h3> + <img src="$(IMGROOT)/htw1.png" alt="How Tor works"> + + <p> + Tor aide à réduire les risques d'analyses de trafic simples et complexes en +distribuant vos transactions par le biais de différents endroits sur +Internet, de façon à ce qu'aucun point unique ne puisse vous relier à votre +destination. + +L'idée est similaire au parcours d'une route sinueuse, difficile à suivre, +vous permettant d'échapper à quelqu'un qui vous suivrait — tout en +effaçant vos traces au fur et à mesure. + +Au lieu de prendre une route directe de la source à la destination, les +paquets de données du réseau Tor choisissent un chemin aléatoire passant par +divers relais qui couvrent vos pas de façon à ce qu'aucun observateur à +aucun point unique ne puisse dire d'où les données proviennent, ou où elles +vont. + </p> + + <p> + Pour créer un parcours réseau privé avec Tor, le logiciel construit +incrémentalement un circuit de connexions chiffrées passant par des relais +sur le réseau. + +Le circuit passe d'un bond à l'autre, et chaque relais sur le chemin ne +connaît que le relais qui lui a transmis la connexion, et celui à qui il +doit la remettre. + +Aucun relais individuel ne connaît le chemin complet qu'emprunte une donnée. + +Le client négocie des clés de chiffrement pour chaque bond du circuit, pour +permettre à ce que chaque relais ne puisse pas tracer les connexions qui +passent par lui. + </p> + + <p><img alt="Tor circuit step two" src="$(IMGROOT)/htw2.png"></p> + + <p> + Une fois le circuit établi, bon nombre de types de données peuvent être +échangées, et différents logiciels peuvent être déployés sur le réseau Tor. + +Étant donné que chaque relais ne voit pas plus d'un bond sur le circuit, +aucune oreille indiscrète ni relais compromis ne peut utiliser l'analyse de +trafic pour déterminer la source ou la destination. + +Tor fonctionne uniquement pour les flux TCP et peut être utilisé par +n'importe quelle application dotée du support de SOCKS. + </p> + + <p> + Pour plus d'efficacité, Tor utilise le même circuit pour toutes les +connexions effectuées dans les 10 minutes. + +Les requêtes effectuées ensuite génèrent un nouveau circuit, pour empêcher +de faire le lien entre vos anciennes actions et les nouvelles. + </p> + + <p><img alt="Tor circuit step three" src="$(IMGROOT)/htw3.png"></p> + + + <a name="hiddenservices"></a> + <h3><a class="anchor" href="#hiddenservices">Services cachés</a></h3> + + <p> + Tor permet également aux utilisateurs de cacher leur localisation lorsqu'ils +offrent divers services, comme des publications web ou des serveurs de +messagerie instantanée. + +En utilisant ces "points de rendez-vous", les utilisateurs de Tor peuvent se +connecter à ces services cachés, sans que quiconque puisse connaître +l'identité des autres. + +Cette fonctionnalité de services cachés pourrait permettre à des +utilisateurs de mettre en place un site web où les gens posteraient des +informations sans se préoccuper de la censure. + +Personne ne serait capable de déterminer qui a mis en place le site, et +personne ayant mis en place un tel site ne pourrait déterminer qui poste +dessus. + +En savoir plus sur la <a href="<page docs/tor-hidden-service>">configuration +de services cachés</a> et sur le protocole des services cachés</a>. + </p> + + <a name="stayinganonymous"></a> + <h3><a class="anchor" href="#stayinganonymous">Rester Anonyme</a></h3> + + <p> + Tor ne résoud pas tous les problèmes d'anonymat. + +Il se focalise uniquement sur la protection des transports de données. + +Il vous faudra utiliser une protection supplémentaire spécifique pour chaque +protocole si vous ne voulez pas que les sites web que vous visitez puissent +voir vos informations d'identification. Par exemple, vous pouvez utiliser +des proxies web tels que Privoxy lorsque vous naviguez pour bloquer les +cookies et bloquer les informations sur votre type de navigateur. + </p> + + <p> + De plus, pour protéger votre anonymat, soyez malin. + +Ne donnez pas votre nom ou d'autres informations révélatrices dans un +formulaire de site web. + +Soyez conscient que, comme tous les réseaux d'anonymisation suffisamment +rapides pour de la navigation web, Tor ne fournit pas de protection contre +les attaques bout-à-bout temporisées: si votre attaquant peut observer le +trafic sortant de votre ordinateur, et également le trafic parvenant à votre +destination, il peut utiliser des méthodes d'analyse statistiques pour +découvrir qu'ils font partie du même circuit. + </p> + + <a name="thefutureoftor"></a> + <h3><a class="anchor" href="#thefutureoftor">Le futur de Tor</a></h3> + + <p> + Fournir un réseau d'anonymisation utilisable sur Internet aujourd'hui est un +challenge continu. Nous voulons un logiciel qui réponde aux besoins des +utilisateurs. Nous voulons également maintenir le réseau fonctionnel au +point de gérer le plus d'utilisateurs possible. La sécurité et la facilité +d'utilisation n'ont pas à être opposés: au fur et à mesure que Tor deviendra +plus utilisable, il attirera plus d'utilisateurs, ce qui augmentera les +possibles sources et destinations pour les communications, et améliorera la +sécurité de chacun. + +Nous faisons des progrès, mais nous avons besoin de votre aide. + +Veuillez penser à <a href="<page docs/tor-doc-relay>">installer un relais +Tor</a>, ou à <a href="<page getinvolved/volunteer>">participer</a> comme <a +href="<page docs/documentation>#Developers">développeur</a>. + </p> + + <p> + Les tendances actuelles dans les lois, les politiques et la technologie +menacent l'anonymat comme jamais, ébranlant notre possibilité de parler et +lire librement en ligne. Ces tendances sapent également la sécurité +nationale et les infrastructures critiques en rendant les individus, +organisations, sociétés et gouvernements plus vulnérables à +l'analyse. Chaque nouvel utilisateur et relais fournit plus de diversité à +Tor, améliorant la faculté de replacer le contrôle de votre sécurité et +votre vie privée entre vos mains. + </p> + + </div> + +  +<div id = "sidecol"> + + + #include "side.wmi" +#include "info.wmi" +</div> + + +</div> + + +#include <foot.wmi>

1 0

r24304: {translation} updated translations for the website (in translation/trunk/projects/website/po: es/about es/docs it/about it/docs ru/about ru/docs zh_CN/about)
by Runa Sandvik 04 Mar '11

04 Mar '11

Author: runa Date: 2011-03-04 13:37:52 +0000 (Fri, 04 Mar 2011) New Revision: 24304 Modified: translation/trunk/projects/website/po/es/about/3-low.corepeople.po translation/trunk/projects/website/po/es/docs/2-medium.verifying-signatures.po translation/trunk/projects/website/po/it/about/3-low.corepeople.po translation/trunk/projects/website/po/it/docs/2-medium.verifying-signatures.po translation/trunk/projects/website/po/ru/about/3-low.corepeople.po translation/trunk/projects/website/po/ru/docs/2-medium.verifying-signatures.po translation/trunk/projects/website/po/zh_CN/about/2-medium.overview.po Log: updated translations for the website Modified: translation/trunk/projects/website/po/es/about/3-low.corepeople.po =================================================================== --- translation/trunk/projects/website/po/es/about/3-low.corepeople.po 2011-03-04 13:30:21 UTC (rev 24303) +++ translation/trunk/projects/website/po/es/about/3-low.corepeople.po 2011-03-04 13:37:52 UTC (rev 24304) @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-02-12 12:19+0000\n" -"PO-Revision-Date: 2011-02-19 15:41+0000\n" +"POT-Creation-Date: 2011-03-01 16:37+0000\n" +"PO-Revision-Date: 2011-03-02 00:14+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Spanish (Castilian) <None>\n" "MIME-Version: 1.0\n" @@ -19,22 +19,33 @@ #. type: Content of: <div><div> #: /home/runa/tor/website/about/en/corepeople.wml:7 -msgid "<a href=\"<page index>\">Home » </a> <a href=\"<page about/overview>\">About » </a> <a href=\"<page about/corepeople>\">Tor People</a>" +msgid "" +"<a href=\"<page index>\">Home » </a> <a href=\"<page " +"about/overview>\">About » </a> <a href=\"<page about/corepeople>\">Tor" +" People</a>" msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/about/en/corepeople.wml:12 -msgid "The Tor Project is a 501(c)(3) non-profit based in the United States. The official address of the organization is:" +msgid "" +"The Tor Project is a 501(c)(3) non-profit based in the United States. The " +"official address of the organization is:" msgstr "" #. type: Content of: <div><div><address> #: /home/runa/tor/website/about/en/corepeople.wml:17 -msgid "The Tor Project<br> 969 Main Street, Suite 206<br> Walpole, MA 02081-2972 USA<br><br>" +msgid "" +"The Tor Project<br> 969 Main Street, Suite 206<br> Walpole, MA 02081-2972 " +"USA<br><br>" msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/about/en/corepeople.wml:22 -msgid "The organization consists of many volunteers and a few employees. Please don't contact us individually about Tor topics — if you have a problem or question, please look through the <a href=\"<page about/contact>\">contact page</a> for appropriate addresses." +msgid "" +"The organization consists of many volunteers and a few employees. Please " +"don't contact us individually about Tor topics — if you have a problem" +" or question, please look through the <a href=\"<page " +"about/contact>\">contact page</a> for appropriate addresses." msgstr "" #. type: Content of: <div><div><h1> @@ -49,7 +60,15 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:30 -msgid "Our main advocate. Speaks at conferences and gives trainings all over the world to get people excited about Tor, explain how Tor is used in real world situations, and generally explain why anonymity online matters to you. Original developer of ttdnsd, <a href=\"https://check.torproject.org/\">Tor check</a>, <a href=\"https://exitlist.torproject.org/\">Tor DNSEL</a>, and <a href=\"https://weather.torproject.org\">Tor weather</a> site. He is also a Staff Research Scientist at the University of Washington Computer Security and Privacy Research Lab." +msgid "" +"Our main advocate. Speaks at conferences and gives trainings all over the " +"world to get people excited about Tor, explain how Tor is used in real world" +" situations, and generally explain why anonymity online matters to you. " +"Original developer of ttdnsd, <a href=\"https://check.torproject.org/\">Tor " +"check</a>, <a href=\"https://exitlist.torproject.org/\">Tor DNSEL</a>, and " +"<a href=\"https://weather.torproject.org\">Tor weather</a> site. He is also " +"a Staff Research Scientist at the University of Washington Computer Security" +" and Privacy Research Lab." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -59,7 +78,12 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:41 -msgid "Erinn is tackling the growing needs for easy to install and configure packages on a variety of operating systems. Also working on automating the build system and producing nightly builds for all operating systems we support. Erinn is also doing some advocacy by talking to audiences at FSCONS, CodeBits.eu, and various European universites." +msgid "" +"Erinn is tackling the growing needs for easy to install and configure " +"packages on a variety of operating systems. Also working on automating the " +"build system and producing nightly builds for all operating systems we " +"support. Erinn is also doing some advocacy by talking to audiences at " +"FSCONS, CodeBits.eu, and various European universites." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -69,7 +93,9 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:48 -msgid "Worked during Google Summer of Code 2009 on porting Polipo to Windows. He currently helps with the libevent bufferevent code." +msgid "" +"Worked during Google Summer of Code 2009 on porting Polipo to Windows. He " +"currently helps with the libevent bufferevent code." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -79,7 +105,11 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:52 -msgid "Original developer of Tor along with Nick Mathewson and Paul Syverson. Leading researcher in the anonymous communications field. Frequent speaker at conferences to advocate Tor and explain what Tor is and can do. Helps coordinate academic researchers." +msgid "" +"Original developer of Tor along with Nick Mathewson and Paul Syverson. " +"Leading researcher in the anonymous communications field. Frequent speaker " +"at conferences to advocate Tor and explain what Tor is and can do. Helps " +"coordinate academic researchers." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -89,7 +119,9 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:58 -msgid "Lead developer for <a href=\"<page projects/vidalia>\">Vidalia</a>, a cross-platform Tor Graphical User Interface included in the bundles." +msgid "" +"Lead developer for <a href=\"<page projects/vidalia>\">Vidalia</a>, a cross-" +"platform Tor Graphical User Interface included in the bundles." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -99,7 +131,14 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:62 -msgid "The driving force behind <a href=\"https://guardianproject.info\">The Guardian Project</a> and Tor on the Android platform in the form of <a href=\"<page docs/android>\">Orbot</a>. He also works on <a href=\"https://guardianproject.info/apps/orlib/\">OrLib</a>: an Android library for Tor, and <a href=\"https://guardianproject.info/apps/orweb/\">Orweb: A privacy-enhanced mobile browser</a>." +msgid "" +"The driving force behind <a href=\"https://guardianproject.info\">The " +"Guardian Project</a> and Tor on the Android platform in the form of <a " +"href=\"<page docs/android>\">Orbot</a>. He also works on <a " +"href=\"https://guardianproject.info/apps/orlib/\">OrLib</a>: an Android " +"library for Tor, and <a " +"href=\"https://guardianproject.info/apps/orweb/\">Orweb: A privacy-enhanced " +"mobile browser</a>." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -109,7 +148,10 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:71 -msgid "Christian works on all things python for Tor. He enhanced and maintains a slew of codebases for us, such as the get-tor email auto-responder, check.torproject.org, bridge db, tor weather, tor controller, tor flow, etc." +msgid "" +"Christian works on all things python for Tor. He enhanced and maintains a " +"slew of codebases for us, such as the get-tor email auto-responder, " +"check.torproject.org, bridge db, tor weather, tor controller, tor flow, etc." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -119,7 +161,10 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:76 -msgid "With a strong background in non-profit accounting and auditing, Melissa is in charge of Tor's finances, audit compliance, and keeping Tor's financial operations moving along." +msgid "" +"With a strong background in non-profit accounting and auditing, Melissa is " +"in charge of Tor's finances, audit compliance, and keeping Tor's financial " +"operations moving along." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -129,17 +174,23 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:81 -msgid "Worked during the 2008 Google Summer of Code on a networking application to automatically carry out tests for Tor and during the 2009 Google Summer of Code on expanding our secure updater to include BitTorrent support. Manages our git repository, reviews code patches, and generally helps out a lot." +msgid "" +"Worked during the 2008 Google Summer of Code on a networking application to " +"automatically carry out tests for Tor and during the 2009 Google Summer of " +"Code on expanding our secure updater to include BitTorrent support. Manages " +"our git repository, reviews code patches, and generally helps out a lot." msgstr "" #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/corepeople.wml:86 -msgid "Tom Heydt-Benjamin, Researcher" +msgid "Thomas S. Benjamin, Researcher" msgstr "" #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:87 -msgid "Anonymous communications and bridge distribution researcher. His other work can be found on his <a href=\"http://cryptocracy.net/\">personal website</a>" +msgid "" +"Anonymous communications and bridge distribution researcher. His other work " +"can be found on his <a href=\"http://cryptocracy.net/\">personal website</a>" msgstr "" #. type: Content of: <div><div><dl><dt> @@ -149,7 +200,11 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:91 -msgid "Developer for the <a href=\"http://tork.sf.net/\">TorK</a> Tor controller, a <a href=\"http://code.google.com/p/torora/\">privacy-oriented Arora fork</a>, the <a href=\"http://code.google.com/p/torsocks/\">torsocks scripts</a>, and other useful peripheral tools." +msgid "" +"Developer for the <a href=\"http://tork.sf.net/\">TorK</a> Tor controller, a" +" <a href=\"http://code.google.com/p/torora/\">privacy-oriented Arora " +"fork</a>, the <a href=\"http://code.google.com/p/torsocks/\">torsocks " +"scripts</a>, and other useful peripheral tools." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -159,17 +214,24 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:98 -msgid "Builds <a href=\"http://atagar.com/arm\">Arm</a>, a command-line application for monitoring Tor relays and providing real-time status information such as the current configuration, bandwidth usage, message log, etc." +msgid "" +"Builds <a href=\"http://atagar.com/arm\">Arm</a>, a command-line application" +" for monitoring Tor relays and providing real-time status information such " +"as the current configuration, bandwidth usage, message log, etc." msgstr "" #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/corepeople.wml:102 -msgid "Andrew Lewman, Executive Director; Director; <a href=\"<page press/press>\">press contact</a>" +msgid "" +"Andrew Lewman, Executive Director; Director; <a href=\"<page " +"press/press>\">press contact</a>" msgstr "" #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:103 -msgid "Manages the business operations of The Tor Project, Inc. Plays roles of finance, advocacy, project management, strategy, press, and general support." +msgid "" +"Manages the business operations of The Tor Project, Inc. Plays roles of " +"finance, advocacy, project management, strategy, press, and general support." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -179,7 +241,12 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:107 -msgid "Worked during the 2007 Google Summer of Code on <a href=\"<gitblob>doc/spec/proposals/114-distributed-storage.txt\">distributing and securing the publishing and fetching of hidden service descriptors</a>. Currently the primary researcher for our National Science Foundation grant into <a href=\"http://metrics.torproject.org/\">anonymous metrics</a>." +msgid "" +"Worked during the 2007 Google Summer of Code on <a " +"href=\"<specblob>proposals/114-distributed-storage.txt\">distributing and " +"securing the publishing and fetching of hidden service descriptors</a>. " +"Currently the primary researcher for our National Science Foundation grant " +"into <a href=\"http://metrics.torproject.org/\">anonymous metrics</a>." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -189,7 +256,9 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:115 -msgid "One of the three original designers of Tor; does a lot of the ongoing design work. One of the two main developers, along with Roger." +msgid "" +"One of the three original designers of Tor; does a lot of the ongoing design" +" work. One of the two main developers, along with Roger." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -199,7 +268,12 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:119 -msgid "Researcher at the University of Cambridge, currently funded by The Tor Project to improve the security, performance, and usability of Tor. Creator of the <a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a>. You can find out more about his work on his <a href=\"http://www.cl.cam.ac.uk/~sjm217/\">professional website</a>" +msgid "" +"Researcher at the University of Cambridge, currently funded by The Tor " +"Project to improve the security, performance, and usability of Tor. Creator " +"of the <a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a>. You " +"can find out more about his work on his <a " +"href=\"http://www.cl.cam.ac.uk/~sjm217/\">professional website</a>" msgstr "" #. type: Content of: <div><div><dl><dt> @@ -209,7 +283,9 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:127 -msgid "Swedish advocate for Tor, anonymous communications research, and employee at <a href=\"http://nordu.net\">NORDUnet</a>." +msgid "" +"Swedish advocate for Tor, anonymous communications research, and employee at" +" <a href=\"http://nordu.net\">NORDUnet</a>." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -219,7 +295,9 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:131 -msgid "Manages the Debian packages, runs one of the directory authorities, runs the website and the wiki, and generally helps out a lot." +msgid "" +"Manages the Debian packages, runs one of the directory authorities, runs the" +" website and the wiki, and generally helps out a lot." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -229,7 +307,12 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:133 -msgid "Author of <a href=\"https://svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a>, a Tor controller that builds paths through the Tor network and measures various properties and behaviors. Developer and maintainer of <a href=\"<page torbutton/index>\">Torbutton</a>." +msgid "" +"Author of <a " +"href=\"https://svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a>, a " +"Tor controller that builds paths through the Tor network and measures " +"various properties and behaviors. Developer and maintainer of <a " +"href=\"<page torbutton/index>\">Torbutton</a>." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -239,7 +322,10 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:140 -msgid "Responsible for fundraising, advocacy, general marketing, policy outreach programs for Tor. She is also available to speak for audiences about the benefits of online anonymity, privacy, and Tor." +msgid "" +"Responsible for fundraising, advocacy, general marketing, policy outreach " +"programs for Tor. She is also available to speak for audiences about the " +"benefits of online anonymity, privacy, and Tor." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -249,7 +335,14 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:145 -msgid "Maintains the <a href=\"http://www.transifex.net/projects/p/torproject/\">Tor Translation Portal</a>, and works on automatically converting our website wml files to po files (and back). She also generally helps out with the <a href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/Torouter\">Torouter project</a>, bridge distribution through instant messaging, and other projects." +msgid "" +"Maintains the <a " +"href=\"http://www.transifex.net/projects/p/torproject/\">Tor Translation " +"Portal</a>, and works on automatically converting our website wml files to " +"po files (and back). She also generally helps out with the <a " +"href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/Torouter\">Torouter" +" project</a>, bridge distribution through instant messaging, and other " +"projects." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -259,7 +352,11 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:154 -msgid "Inventor of <a href=\"http://www.onion-router.net/\">Onion Routing</a>, original designer of Tor along with Roger and Nick, and project leader for original design, development, and deployment of Tor. Currently helps out with research and design." +msgid "" +"Inventor of <a href=\"http://www.onion-router.net/\">Onion Routing</a>, " +"original designer of Tor along with Roger and Nick, and project leader for " +"original design, development, and deployment of Tor. Currently helps out " +"with research and design." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -269,5 +366,8 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:160 -msgid "Works on the artwork and design for various projects, annual reports, and brochures. His other work can be found at <a href=\"http://jmtodaro.com/\">http://jmtodaro.com/</a>." +msgid "" +"Works on the artwork and design for various projects, annual reports, and " +"brochures. His other work can be found at <a " +"href=\"http://jmtodaro.com/\">http://jmtodaro.com/</a>." msgstr "" Modified: translation/trunk/projects/website/po/es/docs/2-medium.verifying-signatures.po =================================================================== --- translation/trunk/projects/website/po/es/docs/2-medium.verifying-signatures.po 2011-03-04 13:30:21 UTC (rev 24303) +++ translation/trunk/projects/website/po/es/docs/2-medium.verifying-signatures.po 2011-03-04 13:37:52 UTC (rev 24304) @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-02-12 12:20+0000\n" -"PO-Revision-Date: 2011-02-19 15:41+0000\n" +"POT-Creation-Date: 2011-03-01 16:37+0000\n" +"PO-Revision-Date: 2011-03-02 00:19+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Spanish (Castilian) <None>\n" "MIME-Version: 1.0\n" @@ -19,7 +19,9 @@ #. type: Content of: <div><div> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:8 -msgid "<a href=\"<page index>\">Home » </a> <a href=\"<page docs/verifying-signatures>\">Verifying Signatures</a>" +msgid "" +"<a href=\"<page index>\">Home » </a> <a href=\"<page docs/verifying-" +"signatures>\">Verifying Signatures</a>" msgstr "" #. type: Content of: <div><div><h1> @@ -29,19 +31,28 @@ #. type: Content of: <div><div> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:13 -#: /tmp/cQhhW5Yv14.xml:38 /tmp/cQhhW5Yv14.xml:54 /tmp/cQhhW5Yv14.xml:81 -#: /tmp/cQhhW5Yv14.xml:155 +#: /tmp/ETpEqGX4UH.xml:38 /tmp/ETpEqGX4UH.xml:54 /tmp/ETpEqGX4UH.xml:81 +#: /tmp/ETpEqGX4UH.xml:155 msgid "<hr>" msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:15 -msgid "Each file on <a href=\"<page download/download>\">our download page</a> is accompanied by a file with the same name as the package and the extension \".asc\". These .asc files are GPG signatures. They allow you to verify the file you've downloaded is exactly the one that we intended you to get. For example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by tor-browser-<version-torbrowserbundle>_en-US.exe.asc." +msgid "" +"Each file on <a href=\"<page download/download>\">our download page</a> is " +"accompanied by a file with the same name as the package and the extension " +"\".asc\". These .asc files are GPG signatures. They allow you to verify the " +"file you've downloaded is exactly the one that we intended you to get. For " +"example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by " +"tor-browser-<version-torbrowserbundle>_en-US.exe.asc." msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:22 -msgid "Of course, you'll need to have our GPG keys in your keyring: if you don't know the GPG key, you can't be sure that it was really us who signed it. The signing keys we use are:" +msgid "" +"Of course, you'll need to have our GPG keys in your keyring: if you don't " +"know the GPG key, you can't be sure that it was really us who signed it. The" +" signing keys we use are:" msgstr "" #. type: Content of: <div><div><ul><li> @@ -56,7 +67,8 @@ #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:28 -msgid "Andrew's (0x31B0974B) typically signed older packages for windows and mac." +msgid "" +"Andrew's (0x31B0974B) typically signed older packages for windows and mac." msgstr "" #. type: Content of: <div><div><ul><li> @@ -76,7 +88,9 @@ #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:32 -msgid "Erinn's (0x63FEE659) and (0xF1F5C9B5) typically signs all windows, mac, and most linux packages." +msgid "" +"Erinn's (0x63FEE659) and (0xF1F5C9B5) typically signs all windows, mac, and " +"most linux packages." msgstr "" #. type: Content of: <div><div><ul><li> @@ -101,17 +115,25 @@ #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:43 -msgid "Linux: see <a href=\"http://www.gnupg.org/download/\">http://www.gnupg.org/download/</a> or install <i>gnupg</i> from the package management system." +msgid "" +"Linux: see <a " +"href=\"http://www.gnupg.org/download/\">http://www.gnupg.org/download/</a> " +"or install <i>gnupg</i> from the package management system." msgstr "" #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:46 -msgid "Windows: see <a href=\"http://www.gnupg.org/download/\">http://www.gnupg.org/download/</a>. Look for the \"version compiled for MS-Windows\" under \"Binaries\"." +msgid "" +"Windows: see <a " +"href=\"http://www.gnupg.org/download/\">http://www.gnupg.org/download/</a>. " +"Look for the \"version compiled for MS-Windows\" under \"Binaries\"." msgstr "" #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:49 -msgid "Mac: see <a href=\"http://macgpg.sourceforge.net/\">http://macgpg.sourceforge.net/</a>." +msgid "" +"Mac: see <a " +"href=\"http://macgpg.sourceforge.net/\">http://macgpg.sourceforge.net/</a>." msgstr "" #. type: Content of: <div><div><h3> @@ -121,18 +143,26 @@ #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:55 -msgid "The next step is to import the key. This can be done directly from GnuPG. Make sure you import the correct key. For example, if you downloaded a Windows package, you will need to import Andrew's key." +msgid "" +"The next step is to import the key. This can be done directly from GnuPG. " +"Make sure you import the correct key. For example, if you downloaded a " +"Windows package, you will need to import Erinn's key." msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:59 -#: /tmp/cQhhW5Yv14.xml:84 /tmp/cQhhW5Yv14.xml:163 +#: /tmp/ETpEqGX4UH.xml:84 /tmp/ETpEqGX4UH.xml:163 msgid "<b>Windows:</b>" msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:60 -msgid "GnuPG for Windows is a command line tool, and you will need to use <i>cmd.exe</i>. Unless you edit your PATH environment variable, you will need to tell Windows the full path to the GnuPG program. If you installed GnuPG with the default values, the path should be something like this: <i>C:\\Program Files\\Gnu\\GnuPg\\gpg.exe</i>." +msgid "" +"GnuPG for Windows is a command line tool, and you will need to use " +"<i>cmd.exe</i>. Unless you edit your PATH environment variable, you will " +"need to tell Windows the full path to the GnuPG program. If you installed " +"GnuPG with the default values, the path should be something like this: " +"<i>C:\\Program Files\\Gnu\\GnuPg\\gpg.exe</i>." msgstr "" #. type: Content of: <div><div><p> @@ -143,18 +173,25 @@ #. type: Content of: <div><div><pre> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:68 #, no-wrap -msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --keyserver hkp://keys.gnupg.net --recv-keys 0x28988BF5" +msgid "" +"C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --keyserver hkp://keys.gnupg.net " +"--recv-keys 0x28988BF5" msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:70 -#: /tmp/cQhhW5Yv14.xml:87 +#: /tmp/ETpEqGX4UH.xml:87 msgid "<b>Mac and Linux</b>" msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:71 -msgid "Whether you have a Mac or you run Linux, you will need to use the terminal to run GnuPG. Mac users can find the terminal under \"Applications\". If you run Linux and use Gnome, the terminal should be under \"Applications menu\" and \"Accessories\". KDE users can find the terminal under \"Menu\" and \"System\"." +msgid "" +"Whether you have a Mac or you run Linux, you will need to use the terminal " +"to run GnuPG. Mac users can find the terminal under \"Applications\". If you" +" run Linux and use Gnome, the terminal should be under \"Applications menu\"" +" and \"Accessories\". KDE users can find the terminal under \"Menu\" and " +"\"System\"." msgstr "" #. type: Content of: <div><div><p> @@ -175,7 +212,9 @@ #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:82 -msgid "After importing the key, you will want to verify that the fingerprint is correct." +msgid "" +"After importing the key, you will want to verify that the fingerprint is " +"correct." msgstr "" #. type: Content of: <div><div><pre> @@ -268,18 +307,26 @@ #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:156 -msgid "To verify the signature of the package you downloaded, you will need to download the \".asc\" file as well." +msgid "" +"To verify the signature of the package you downloaded, you will need to " +"download the \".asc\" file as well." msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:159 -msgid "In the following examples, the user Alice downloads packages for Windows, Mac OS X and Linux and also verifies the signature of each package. All files are saved on the desktop." +msgid "" +"In the following examples, the user Alice downloads packages for Windows, " +"Mac OS X and Linux and also verifies the signature of each package. All " +"files are saved on the desktop." msgstr "" #. type: Content of: <div><div><pre> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:164 #, no-wrap -msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --verify C:\\Users\\Alice\\Desktop\\<file-win32-bundle-stable>.asc C:\\Users\\Alice\\Desktop\\<file-win32-bundle-stable>" +msgid "" +"C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --verify C:\\Users\\Alice\\Desktop" +"\\<file-win32-bundle-stable>.asc C:\\Users\\Alice\\Desktop\\<file-win32" +"-bundle-stable>" msgstr "" #. type: Content of: <div><div><p> @@ -290,7 +337,9 @@ #. type: Content of: <div><div><pre> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:167 #, no-wrap -msgid "gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc /Users/Alice/<file-osx-x86-bundle-stable>" +msgid "" +"gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc /Users/Alice" +"/<file-osx-x86-bundle-stable>" msgstr "" #. type: Content of: <div><div><p> @@ -301,12 +350,17 @@ #. type: Content of: <div><div><pre> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:170 #, no-wrap -msgid "gpg --verify /home/Alice/Desktop/<file-source-stable>.asc /home/Alice/Desktop/<file-source-stable>" +msgid "" +"gpg --verify /home/Alice/Desktop/<file-source-stable>.asc " +"/home/Alice/Desktop/<file-source-stable>" msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:173 -msgid "After verifying, GnuPG will come back saying something like \"Good signature\" or \"BAD signature\". The output should look something like this:" +msgid "" +"After verifying, GnuPG will come back saying something like \"Good " +"signature\" or \"BAD signature\". The output should look something like " +"this:" msgstr "" #. type: Content of: <div><div><pre> @@ -323,12 +377,20 @@ #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:186 -msgid "Notice that there is a warning because you haven't assigned a trust index to this person. This means that GnuPG verified that the key made that signature, but it's up to you to decide if that key really belongs to the developer. The best method is to meet the developer in person and exchange key fingerprints." +msgid "" +"Notice that there is a warning because you haven't assigned a trust index to" +" this person. This means that GnuPG verified that the key made that " +"signature, but it's up to you to decide if that key really belongs to the " +"developer. The best method is to meet the developer in person and exchange " +"key fingerprints." msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:193 -msgid "For your reference, this is an example of a <em>BAD</em> verification. It means that the signature and file contents do not match. In this case, you should not trust the file contents:" +msgid "" +"For your reference, this is an example of a <em>BAD</em> verification. It " +"means that the signature and file contents do not match. In this case, you " +"should not trust the file contents:" msgstr "" #. type: Content of: <div><div><pre> @@ -347,7 +409,9 @@ #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:203 -msgid "In order to manually verify the signatures on the RPM packages, you must use the <code>rpm</code> tool like so: <br />" +msgid "" +"In order to manually verify the signatures on the RPM packages, you must use" +" the <code>rpm</code> tool like so: <br />" msgstr "" #. type: Content of: <div><div><p><pre> @@ -363,10 +427,14 @@ #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:210 -msgid "If you are running Tor on Debian you should read the instructions on <a href=\"<page docs/debian>#packages\">importing these keys to apt</a>." +msgid "" +"If you are running Tor on Debian you should read the instructions on <a " +"href=\"<page docs/debian>#packages\">importing these keys to apt</a>." msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:213 -msgid "If you wish to learn more about GPG, see <a href=\"http://www.gnupg.org/documentation/\">http://www.gnupg.org/documentation/</a>." +msgid "" +"If you wish to learn more about GPG, see <a " +"href=\"http://www.gnupg.org/documentation/\">http://www.gnupg.org/documentation/</a>." msgstr "" Modified: translation/trunk/projects/website/po/it/about/3-low.corepeople.po =================================================================== --- translation/trunk/projects/website/po/it/about/3-low.corepeople.po 2011-03-04 13:30:21 UTC (rev 24303) +++ translation/trunk/projects/website/po/it/about/3-low.corepeople.po 2011-03-04 13:37:52 UTC (rev 24304) @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-02-12 12:19+0000\n" -"PO-Revision-Date: 2011-02-19 15:41+0000\n" +"POT-Creation-Date: 2011-03-01 16:37+0000\n" +"PO-Revision-Date: 2011-03-02 00:14+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Italian <None>\n" "MIME-Version: 1.0\n" @@ -19,22 +19,33 @@ #. type: Content of: <div><div> #: /home/runa/tor/website/about/en/corepeople.wml:7 -msgid "<a href=\"<page index>\">Home » </a> <a href=\"<page about/overview>\">About » </a> <a href=\"<page about/corepeople>\">Tor People</a>" +msgid "" +"<a href=\"<page index>\">Home » </a> <a href=\"<page " +"about/overview>\">About » </a> <a href=\"<page about/corepeople>\">Tor" +" People</a>" msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/about/en/corepeople.wml:12 -msgid "The Tor Project is a 501(c)(3) non-profit based in the United States. The official address of the organization is:" +msgid "" +"The Tor Project is a 501(c)(3) non-profit based in the United States. The " +"official address of the organization is:" msgstr "" #. type: Content of: <div><div><address> #: /home/runa/tor/website/about/en/corepeople.wml:17 -msgid "The Tor Project<br> 969 Main Street, Suite 206<br> Walpole, MA 02081-2972 USA<br><br>" +msgid "" +"The Tor Project<br> 969 Main Street, Suite 206<br> Walpole, MA 02081-2972 " +"USA<br><br>" msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/about/en/corepeople.wml:22 -msgid "The organization consists of many volunteers and a few employees. Please don't contact us individually about Tor topics — if you have a problem or question, please look through the <a href=\"<page about/contact>\">contact page</a> for appropriate addresses." +msgid "" +"The organization consists of many volunteers and a few employees. Please " +"don't contact us individually about Tor topics — if you have a problem" +" or question, please look through the <a href=\"<page " +"about/contact>\">contact page</a> for appropriate addresses." msgstr "" #. type: Content of: <div><div><h1> @@ -49,7 +60,15 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:30 -msgid "Our main advocate. Speaks at conferences and gives trainings all over the world to get people excited about Tor, explain how Tor is used in real world situations, and generally explain why anonymity online matters to you. Original developer of ttdnsd, <a href=\"https://check.torproject.org/\">Tor check</a>, <a href=\"https://exitlist.torproject.org/\">Tor DNSEL</a>, and <a href=\"https://weather.torproject.org\">Tor weather</a> site. He is also a Staff Research Scientist at the University of Washington Computer Security and Privacy Research Lab." +msgid "" +"Our main advocate. Speaks at conferences and gives trainings all over the " +"world to get people excited about Tor, explain how Tor is used in real world" +" situations, and generally explain why anonymity online matters to you. " +"Original developer of ttdnsd, <a href=\"https://check.torproject.org/\">Tor " +"check</a>, <a href=\"https://exitlist.torproject.org/\">Tor DNSEL</a>, and " +"<a href=\"https://weather.torproject.org\">Tor weather</a> site. He is also " +"a Staff Research Scientist at the University of Washington Computer Security" +" and Privacy Research Lab." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -59,7 +78,12 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:41 -msgid "Erinn is tackling the growing needs for easy to install and configure packages on a variety of operating systems. Also working on automating the build system and producing nightly builds for all operating systems we support. Erinn is also doing some advocacy by talking to audiences at FSCONS, CodeBits.eu, and various European universites." +msgid "" +"Erinn is tackling the growing needs for easy to install and configure " +"packages on a variety of operating systems. Also working on automating the " +"build system and producing nightly builds for all operating systems we " +"support. Erinn is also doing some advocacy by talking to audiences at " +"FSCONS, CodeBits.eu, and various European universites." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -69,7 +93,9 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:48 -msgid "Worked during Google Summer of Code 2009 on porting Polipo to Windows. He currently helps with the libevent bufferevent code." +msgid "" +"Worked during Google Summer of Code 2009 on porting Polipo to Windows. He " +"currently helps with the libevent bufferevent code." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -79,7 +105,11 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:52 -msgid "Original developer of Tor along with Nick Mathewson and Paul Syverson. Leading researcher in the anonymous communications field. Frequent speaker at conferences to advocate Tor and explain what Tor is and can do. Helps coordinate academic researchers." +msgid "" +"Original developer of Tor along with Nick Mathewson and Paul Syverson. " +"Leading researcher in the anonymous communications field. Frequent speaker " +"at conferences to advocate Tor and explain what Tor is and can do. Helps " +"coordinate academic researchers." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -89,7 +119,9 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:58 -msgid "Lead developer for <a href=\"<page projects/vidalia>\">Vidalia</a>, a cross-platform Tor Graphical User Interface included in the bundles." +msgid "" +"Lead developer for <a href=\"<page projects/vidalia>\">Vidalia</a>, a cross-" +"platform Tor Graphical User Interface included in the bundles." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -99,7 +131,14 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:62 -msgid "The driving force behind <a href=\"https://guardianproject.info\">The Guardian Project</a> and Tor on the Android platform in the form of <a href=\"<page docs/android>\">Orbot</a>. He also works on <a href=\"https://guardianproject.info/apps/orlib/\">OrLib</a>: an Android library for Tor, and <a href=\"https://guardianproject.info/apps/orweb/\">Orweb: A privacy-enhanced mobile browser</a>." +msgid "" +"The driving force behind <a href=\"https://guardianproject.info\">The " +"Guardian Project</a> and Tor on the Android platform in the form of <a " +"href=\"<page docs/android>\">Orbot</a>. He also works on <a " +"href=\"https://guardianproject.info/apps/orlib/\">OrLib</a>: an Android " +"library for Tor, and <a " +"href=\"https://guardianproject.info/apps/orweb/\">Orweb: A privacy-enhanced " +"mobile browser</a>." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -109,7 +148,10 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:71 -msgid "Christian works on all things python for Tor. He enhanced and maintains a slew of codebases for us, such as the get-tor email auto-responder, check.torproject.org, bridge db, tor weather, tor controller, tor flow, etc." +msgid "" +"Christian works on all things python for Tor. He enhanced and maintains a " +"slew of codebases for us, such as the get-tor email auto-responder, " +"check.torproject.org, bridge db, tor weather, tor controller, tor flow, etc." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -119,7 +161,10 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:76 -msgid "With a strong background in non-profit accounting and auditing, Melissa is in charge of Tor's finances, audit compliance, and keeping Tor's financial operations moving along." +msgid "" +"With a strong background in non-profit accounting and auditing, Melissa is " +"in charge of Tor's finances, audit compliance, and keeping Tor's financial " +"operations moving along." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -129,17 +174,23 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:81 -msgid "Worked during the 2008 Google Summer of Code on a networking application to automatically carry out tests for Tor and during the 2009 Google Summer of Code on expanding our secure updater to include BitTorrent support. Manages our git repository, reviews code patches, and generally helps out a lot." +msgid "" +"Worked during the 2008 Google Summer of Code on a networking application to " +"automatically carry out tests for Tor and during the 2009 Google Summer of " +"Code on expanding our secure updater to include BitTorrent support. Manages " +"our git repository, reviews code patches, and generally helps out a lot." msgstr "" #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/corepeople.wml:86 -msgid "Tom Heydt-Benjamin, Researcher" +msgid "Thomas S. Benjamin, Researcher" msgstr "" #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:87 -msgid "Anonymous communications and bridge distribution researcher. His other work can be found on his <a href=\"http://cryptocracy.net/\">personal website</a>" +msgid "" +"Anonymous communications and bridge distribution researcher. His other work " +"can be found on his <a href=\"http://cryptocracy.net/\">personal website</a>" msgstr "" #. type: Content of: <div><div><dl><dt> @@ -149,7 +200,11 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:91 -msgid "Developer for the <a href=\"http://tork.sf.net/\">TorK</a> Tor controller, a <a href=\"http://code.google.com/p/torora/\">privacy-oriented Arora fork</a>, the <a href=\"http://code.google.com/p/torsocks/\">torsocks scripts</a>, and other useful peripheral tools." +msgid "" +"Developer for the <a href=\"http://tork.sf.net/\">TorK</a> Tor controller, a" +" <a href=\"http://code.google.com/p/torora/\">privacy-oriented Arora " +"fork</a>, the <a href=\"http://code.google.com/p/torsocks/\">torsocks " +"scripts</a>, and other useful peripheral tools." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -159,17 +214,24 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:98 -msgid "Builds <a href=\"http://atagar.com/arm\">Arm</a>, a command-line application for monitoring Tor relays and providing real-time status information such as the current configuration, bandwidth usage, message log, etc." +msgid "" +"Builds <a href=\"http://atagar.com/arm\">Arm</a>, a command-line application" +" for monitoring Tor relays and providing real-time status information such " +"as the current configuration, bandwidth usage, message log, etc." msgstr "" #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/corepeople.wml:102 -msgid "Andrew Lewman, Executive Director; Director; <a href=\"<page press/press>\">press contact</a>" +msgid "" +"Andrew Lewman, Executive Director; Director; <a href=\"<page " +"press/press>\">press contact</a>" msgstr "" #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:103 -msgid "Manages the business operations of The Tor Project, Inc. Plays roles of finance, advocacy, project management, strategy, press, and general support." +msgid "" +"Manages the business operations of The Tor Project, Inc. Plays roles of " +"finance, advocacy, project management, strategy, press, and general support." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -179,7 +241,12 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:107 -msgid "Worked during the 2007 Google Summer of Code on <a href=\"<gitblob>doc/spec/proposals/114-distributed-storage.txt\">distributing and securing the publishing and fetching of hidden service descriptors</a>. Currently the primary researcher for our National Science Foundation grant into <a href=\"http://metrics.torproject.org/\">anonymous metrics</a>." +msgid "" +"Worked during the 2007 Google Summer of Code on <a " +"href=\"<specblob>proposals/114-distributed-storage.txt\">distributing and " +"securing the publishing and fetching of hidden service descriptors</a>. " +"Currently the primary researcher for our National Science Foundation grant " +"into <a href=\"http://metrics.torproject.org/\">anonymous metrics</a>." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -189,7 +256,9 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:115 -msgid "One of the three original designers of Tor; does a lot of the ongoing design work. One of the two main developers, along with Roger." +msgid "" +"One of the three original designers of Tor; does a lot of the ongoing design" +" work. One of the two main developers, along with Roger." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -199,7 +268,12 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:119 -msgid "Researcher at the University of Cambridge, currently funded by The Tor Project to improve the security, performance, and usability of Tor. Creator of the <a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a>. You can find out more about his work on his <a href=\"http://www.cl.cam.ac.uk/~sjm217/\">professional website</a>" +msgid "" +"Researcher at the University of Cambridge, currently funded by The Tor " +"Project to improve the security, performance, and usability of Tor. Creator " +"of the <a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a>. You " +"can find out more about his work on his <a " +"href=\"http://www.cl.cam.ac.uk/~sjm217/\">professional website</a>" msgstr "" #. type: Content of: <div><div><dl><dt> @@ -209,7 +283,9 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:127 -msgid "Swedish advocate for Tor, anonymous communications research, and employee at <a href=\"http://nordu.net\">NORDUnet</a>." +msgid "" +"Swedish advocate for Tor, anonymous communications research, and employee at" +" <a href=\"http://nordu.net\">NORDUnet</a>." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -219,7 +295,9 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:131 -msgid "Manages the Debian packages, runs one of the directory authorities, runs the website and the wiki, and generally helps out a lot." +msgid "" +"Manages the Debian packages, runs one of the directory authorities, runs the" +" website and the wiki, and generally helps out a lot." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -229,7 +307,12 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:133 -msgid "Author of <a href=\"https://svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a>, a Tor controller that builds paths through the Tor network and measures various properties and behaviors. Developer and maintainer of <a href=\"<page torbutton/index>\">Torbutton</a>." +msgid "" +"Author of <a " +"href=\"https://svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a>, a " +"Tor controller that builds paths through the Tor network and measures " +"various properties and behaviors. Developer and maintainer of <a " +"href=\"<page torbutton/index>\">Torbutton</a>." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -239,7 +322,10 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:140 -msgid "Responsible for fundraising, advocacy, general marketing, policy outreach programs for Tor. She is also available to speak for audiences about the benefits of online anonymity, privacy, and Tor." +msgid "" +"Responsible for fundraising, advocacy, general marketing, policy outreach " +"programs for Tor. She is also available to speak for audiences about the " +"benefits of online anonymity, privacy, and Tor." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -249,7 +335,14 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:145 -msgid "Maintains the <a href=\"http://www.transifex.net/projects/p/torproject/\">Tor Translation Portal</a>, and works on automatically converting our website wml files to po files (and back). She also generally helps out with the <a href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/Torouter\">Torouter project</a>, bridge distribution through instant messaging, and other projects." +msgid "" +"Maintains the <a " +"href=\"http://www.transifex.net/projects/p/torproject/\">Tor Translation " +"Portal</a>, and works on automatically converting our website wml files to " +"po files (and back). She also generally helps out with the <a " +"href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/Torouter\">Torouter" +" project</a>, bridge distribution through instant messaging, and other " +"projects." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -259,7 +352,11 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:154 -msgid "Inventor of <a href=\"http://www.onion-router.net/\">Onion Routing</a>, original designer of Tor along with Roger and Nick, and project leader for original design, development, and deployment of Tor. Currently helps out with research and design." +msgid "" +"Inventor of <a href=\"http://www.onion-router.net/\">Onion Routing</a>, " +"original designer of Tor along with Roger and Nick, and project leader for " +"original design, development, and deployment of Tor. Currently helps out " +"with research and design." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -269,5 +366,8 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:160 -msgid "Works on the artwork and design for various projects, annual reports, and brochures. His other work can be found at <a href=\"http://jmtodaro.com/\">http://jmtodaro.com/</a>." +msgid "" +"Works on the artwork and design for various projects, annual reports, and " +"brochures. His other work can be found at <a " +"href=\"http://jmtodaro.com/\">http://jmtodaro.com/</a>." msgstr "" Modified: translation/trunk/projects/website/po/it/docs/2-medium.verifying-signatures.po =================================================================== --- translation/trunk/projects/website/po/it/docs/2-medium.verifying-signatures.po 2011-03-04 13:30:21 UTC (rev 24303) +++ translation/trunk/projects/website/po/it/docs/2-medium.verifying-signatures.po 2011-03-04 13:37:52 UTC (rev 24304) @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-02-12 12:20+0000\n" -"PO-Revision-Date: 2011-02-19 15:41+0000\n" +"POT-Creation-Date: 2011-03-01 16:37+0000\n" +"PO-Revision-Date: 2011-03-02 00:19+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Italian <None>\n" "MIME-Version: 1.0\n" @@ -19,7 +19,9 @@ #. type: Content of: <div><div> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:8 -msgid "<a href=\"<page index>\">Home » </a> <a href=\"<page docs/verifying-signatures>\">Verifying Signatures</a>" +msgid "" +"<a href=\"<page index>\">Home » </a> <a href=\"<page docs/verifying-" +"signatures>\">Verifying Signatures</a>" msgstr "" #. type: Content of: <div><div><h1> @@ -29,19 +31,28 @@ #. type: Content of: <div><div> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:13 -#: /tmp/cQhhW5Yv14.xml:38 /tmp/cQhhW5Yv14.xml:54 /tmp/cQhhW5Yv14.xml:81 -#: /tmp/cQhhW5Yv14.xml:155 +#: /tmp/ETpEqGX4UH.xml:38 /tmp/ETpEqGX4UH.xml:54 /tmp/ETpEqGX4UH.xml:81 +#: /tmp/ETpEqGX4UH.xml:155 msgid "<hr>" msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:15 -msgid "Each file on <a href=\"<page download/download>\">our download page</a> is accompanied by a file with the same name as the package and the extension \".asc\". These .asc files are GPG signatures. They allow you to verify the file you've downloaded is exactly the one that we intended you to get. For example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by tor-browser-<version-torbrowserbundle>_en-US.exe.asc." +msgid "" +"Each file on <a href=\"<page download/download>\">our download page</a> is " +"accompanied by a file with the same name as the package and the extension " +"\".asc\". These .asc files are GPG signatures. They allow you to verify the " +"file you've downloaded is exactly the one that we intended you to get. For " +"example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by " +"tor-browser-<version-torbrowserbundle>_en-US.exe.asc." msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:22 -msgid "Of course, you'll need to have our GPG keys in your keyring: if you don't know the GPG key, you can't be sure that it was really us who signed it. The signing keys we use are:" +msgid "" +"Of course, you'll need to have our GPG keys in your keyring: if you don't " +"know the GPG key, you can't be sure that it was really us who signed it. The" +" signing keys we use are:" msgstr "" #. type: Content of: <div><div><ul><li> @@ -56,7 +67,8 @@ #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:28 -msgid "Andrew's (0x31B0974B) typically signed older packages for windows and mac." +msgid "" +"Andrew's (0x31B0974B) typically signed older packages for windows and mac." msgstr "" #. type: Content of: <div><div><ul><li> @@ -76,7 +88,9 @@ #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:32 -msgid "Erinn's (0x63FEE659) and (0xF1F5C9B5) typically signs all windows, mac, and most linux packages." +msgid "" +"Erinn's (0x63FEE659) and (0xF1F5C9B5) typically signs all windows, mac, and " +"most linux packages." msgstr "" #. type: Content of: <div><div><ul><li> @@ -101,17 +115,25 @@ #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:43 -msgid "Linux: see <a href=\"http://www.gnupg.org/download/\">http://www.gnupg.org/download/</a> or install <i>gnupg</i> from the package management system." +msgid "" +"Linux: see <a " +"href=\"http://www.gnupg.org/download/\">http://www.gnupg.org/download/</a> " +"or install <i>gnupg</i> from the package management system." msgstr "" #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:46 -msgid "Windows: see <a href=\"http://www.gnupg.org/download/\">http://www.gnupg.org/download/</a>. Look for the \"version compiled for MS-Windows\" under \"Binaries\"." +msgid "" +"Windows: see <a " +"href=\"http://www.gnupg.org/download/\">http://www.gnupg.org/download/</a>. " +"Look for the \"version compiled for MS-Windows\" under \"Binaries\"." msgstr "" #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:49 -msgid "Mac: see <a href=\"http://macgpg.sourceforge.net/\">http://macgpg.sourceforge.net/</a>." +msgid "" +"Mac: see <a " +"href=\"http://macgpg.sourceforge.net/\">http://macgpg.sourceforge.net/</a>." msgstr "" #. type: Content of: <div><div><h3> @@ -121,18 +143,26 @@ #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:55 -msgid "The next step is to import the key. This can be done directly from GnuPG. Make sure you import the correct key. For example, if you downloaded a Windows package, you will need to import Andrew's key." +msgid "" +"The next step is to import the key. This can be done directly from GnuPG. " +"Make sure you import the correct key. For example, if you downloaded a " +"Windows package, you will need to import Erinn's key." msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:59 -#: /tmp/cQhhW5Yv14.xml:84 /tmp/cQhhW5Yv14.xml:163 +#: /tmp/ETpEqGX4UH.xml:84 /tmp/ETpEqGX4UH.xml:163 msgid "<b>Windows:</b>" msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:60 -msgid "GnuPG for Windows is a command line tool, and you will need to use <i>cmd.exe</i>. Unless you edit your PATH environment variable, you will need to tell Windows the full path to the GnuPG program. If you installed GnuPG with the default values, the path should be something like this: <i>C:\\Program Files\\Gnu\\GnuPg\\gpg.exe</i>." +msgid "" +"GnuPG for Windows is a command line tool, and you will need to use " +"<i>cmd.exe</i>. Unless you edit your PATH environment variable, you will " +"need to tell Windows the full path to the GnuPG program. If you installed " +"GnuPG with the default values, the path should be something like this: " +"<i>C:\\Program Files\\Gnu\\GnuPg\\gpg.exe</i>." msgstr "" #. type: Content of: <div><div><p> @@ -143,18 +173,25 @@ #. type: Content of: <div><div><pre> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:68 #, no-wrap -msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --keyserver hkp://keys.gnupg.net --recv-keys 0x28988BF5" +msgid "" +"C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --keyserver hkp://keys.gnupg.net " +"--recv-keys 0x28988BF5" msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:70 -#: /tmp/cQhhW5Yv14.xml:87 +#: /tmp/ETpEqGX4UH.xml:87 msgid "<b>Mac and Linux</b>" msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:71 -msgid "Whether you have a Mac or you run Linux, you will need to use the terminal to run GnuPG. Mac users can find the terminal under \"Applications\". If you run Linux and use Gnome, the terminal should be under \"Applications menu\" and \"Accessories\". KDE users can find the terminal under \"Menu\" and \"System\"." +msgid "" +"Whether you have a Mac or you run Linux, you will need to use the terminal " +"to run GnuPG. Mac users can find the terminal under \"Applications\". If you" +" run Linux and use Gnome, the terminal should be under \"Applications menu\"" +" and \"Accessories\". KDE users can find the terminal under \"Menu\" and " +"\"System\"." msgstr "" #. type: Content of: <div><div><p> @@ -175,7 +212,9 @@ #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:82 -msgid "After importing the key, you will want to verify that the fingerprint is correct." +msgid "" +"After importing the key, you will want to verify that the fingerprint is " +"correct." msgstr "" #. type: Content of: <div><div><pre> @@ -268,18 +307,26 @@ #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:156 -msgid "To verify the signature of the package you downloaded, you will need to download the \".asc\" file as well." +msgid "" +"To verify the signature of the package you downloaded, you will need to " +"download the \".asc\" file as well." msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:159 -msgid "In the following examples, the user Alice downloads packages for Windows, Mac OS X and Linux and also verifies the signature of each package. All files are saved on the desktop." +msgid "" +"In the following examples, the user Alice downloads packages for Windows, " +"Mac OS X and Linux and also verifies the signature of each package. All " +"files are saved on the desktop." msgstr "" #. type: Content of: <div><div><pre> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:164 #, no-wrap -msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --verify C:\\Users\\Alice\\Desktop\\<file-win32-bundle-stable>.asc C:\\Users\\Alice\\Desktop\\<file-win32-bundle-stable>" +msgid "" +"C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --verify C:\\Users\\Alice\\Desktop" +"\\<file-win32-bundle-stable>.asc C:\\Users\\Alice\\Desktop\\<file-win32" +"-bundle-stable>" msgstr "" #. type: Content of: <div><div><p> @@ -290,7 +337,9 @@ #. type: Content of: <div><div><pre> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:167 #, no-wrap -msgid "gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc /Users/Alice/<file-osx-x86-bundle-stable>" +msgid "" +"gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc /Users/Alice" +"/<file-osx-x86-bundle-stable>" msgstr "" #. type: Content of: <div><div><p> @@ -301,12 +350,17 @@ #. type: Content of: <div><div><pre> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:170 #, no-wrap -msgid "gpg --verify /home/Alice/Desktop/<file-source-stable>.asc /home/Alice/Desktop/<file-source-stable>" +msgid "" +"gpg --verify /home/Alice/Desktop/<file-source-stable>.asc " +"/home/Alice/Desktop/<file-source-stable>" msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:173 -msgid "After verifying, GnuPG will come back saying something like \"Good signature\" or \"BAD signature\". The output should look something like this:" +msgid "" +"After verifying, GnuPG will come back saying something like \"Good " +"signature\" or \"BAD signature\". The output should look something like " +"this:" msgstr "" #. type: Content of: <div><div><pre> @@ -323,12 +377,20 @@ #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:186 -msgid "Notice that there is a warning because you haven't assigned a trust index to this person. This means that GnuPG verified that the key made that signature, but it's up to you to decide if that key really belongs to the developer. The best method is to meet the developer in person and exchange key fingerprints." +msgid "" +"Notice that there is a warning because you haven't assigned a trust index to" +" this person. This means that GnuPG verified that the key made that " +"signature, but it's up to you to decide if that key really belongs to the " +"developer. The best method is to meet the developer in person and exchange " +"key fingerprints." msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:193 -msgid "For your reference, this is an example of a <em>BAD</em> verification. It means that the signature and file contents do not match. In this case, you should not trust the file contents:" +msgid "" +"For your reference, this is an example of a <em>BAD</em> verification. It " +"means that the signature and file contents do not match. In this case, you " +"should not trust the file contents:" msgstr "" #. type: Content of: <div><div><pre> @@ -347,7 +409,9 @@ #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:203 -msgid "In order to manually verify the signatures on the RPM packages, you must use the <code>rpm</code> tool like so: <br />" +msgid "" +"In order to manually verify the signatures on the RPM packages, you must use" +" the <code>rpm</code> tool like so: <br />" msgstr "" #. type: Content of: <div><div><p><pre> @@ -363,10 +427,14 @@ #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:210 -msgid "If you are running Tor on Debian you should read the instructions on <a href=\"<page docs/debian>#packages\">importing these keys to apt</a>." +msgid "" +"If you are running Tor on Debian you should read the instructions on <a " +"href=\"<page docs/debian>#packages\">importing these keys to apt</a>." msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:213 -msgid "If you wish to learn more about GPG, see <a href=\"http://www.gnupg.org/documentation/\">http://www.gnupg.org/documentation/</a>." +msgid "" +"If you wish to learn more about GPG, see <a " +"href=\"http://www.gnupg.org/documentation/\">http://www.gnupg.org/documentation/</a>." msgstr "" Modified: translation/trunk/projects/website/po/ru/about/3-low.corepeople.po =================================================================== --- translation/trunk/projects/website/po/ru/about/3-low.corepeople.po 2011-03-04 13:30:21 UTC (rev 24303) +++ translation/trunk/projects/website/po/ru/about/3-low.corepeople.po 2011-03-04 13:37:52 UTC (rev 24304) @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-02-12 12:19+0000\n" -"PO-Revision-Date: 2011-02-19 15:41+0000\n" +"POT-Creation-Date: 2011-03-01 16:37+0000\n" +"PO-Revision-Date: 2011-03-02 00:14+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Russian <None>\n" "MIME-Version: 1.0\n" @@ -19,22 +19,33 @@ #. type: Content of: <div><div> #: /home/runa/tor/website/about/en/corepeople.wml:7 -msgid "<a href=\"<page index>\">Home » </a> <a href=\"<page about/overview>\">About » </a> <a href=\"<page about/corepeople>\">Tor People</a>" +msgid "" +"<a href=\"<page index>\">Home » </a> <a href=\"<page " +"about/overview>\">About » </a> <a href=\"<page about/corepeople>\">Tor" +" People</a>" msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/about/en/corepeople.wml:12 -msgid "The Tor Project is a 501(c)(3) non-profit based in the United States. The official address of the organization is:" +msgid "" +"The Tor Project is a 501(c)(3) non-profit based in the United States. The " +"official address of the organization is:" msgstr "" #. type: Content of: <div><div><address> #: /home/runa/tor/website/about/en/corepeople.wml:17 -msgid "The Tor Project<br> 969 Main Street, Suite 206<br> Walpole, MA 02081-2972 USA<br><br>" +msgid "" +"The Tor Project<br> 969 Main Street, Suite 206<br> Walpole, MA 02081-2972 " +"USA<br><br>" msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/about/en/corepeople.wml:22 -msgid "The organization consists of many volunteers and a few employees. Please don't contact us individually about Tor topics — if you have a problem or question, please look through the <a href=\"<page about/contact>\">contact page</a> for appropriate addresses." +msgid "" +"The organization consists of many volunteers and a few employees. Please " +"don't contact us individually about Tor topics — if you have a problem" +" or question, please look through the <a href=\"<page " +"about/contact>\">contact page</a> for appropriate addresses." msgstr "" #. type: Content of: <div><div><h1> @@ -49,7 +60,15 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:30 -msgid "Our main advocate. Speaks at conferences and gives trainings all over the world to get people excited about Tor, explain how Tor is used in real world situations, and generally explain why anonymity online matters to you. Original developer of ttdnsd, <a href=\"https://check.torproject.org/\">Tor check</a>, <a href=\"https://exitlist.torproject.org/\">Tor DNSEL</a>, and <a href=\"https://weather.torproject.org\">Tor weather</a> site. He is also a Staff Research Scientist at the University of Washington Computer Security and Privacy Research Lab." +msgid "" +"Our main advocate. Speaks at conferences and gives trainings all over the " +"world to get people excited about Tor, explain how Tor is used in real world" +" situations, and generally explain why anonymity online matters to you. " +"Original developer of ttdnsd, <a href=\"https://check.torproject.org/\">Tor " +"check</a>, <a href=\"https://exitlist.torproject.org/\">Tor DNSEL</a>, and " +"<a href=\"https://weather.torproject.org\">Tor weather</a> site. He is also " +"a Staff Research Scientist at the University of Washington Computer Security" +" and Privacy Research Lab." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -59,7 +78,12 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:41 -msgid "Erinn is tackling the growing needs for easy to install and configure packages on a variety of operating systems. Also working on automating the build system and producing nightly builds for all operating systems we support. Erinn is also doing some advocacy by talking to audiences at FSCONS, CodeBits.eu, and various European universites." +msgid "" +"Erinn is tackling the growing needs for easy to install and configure " +"packages on a variety of operating systems. Also working on automating the " +"build system and producing nightly builds for all operating systems we " +"support. Erinn is also doing some advocacy by talking to audiences at " +"FSCONS, CodeBits.eu, and various European universites." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -69,7 +93,9 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:48 -msgid "Worked during Google Summer of Code 2009 on porting Polipo to Windows. He currently helps with the libevent bufferevent code." +msgid "" +"Worked during Google Summer of Code 2009 on porting Polipo to Windows. He " +"currently helps with the libevent bufferevent code." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -79,7 +105,11 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:52 -msgid "Original developer of Tor along with Nick Mathewson and Paul Syverson. Leading researcher in the anonymous communications field. Frequent speaker at conferences to advocate Tor and explain what Tor is and can do. Helps coordinate academic researchers." +msgid "" +"Original developer of Tor along with Nick Mathewson and Paul Syverson. " +"Leading researcher in the anonymous communications field. Frequent speaker " +"at conferences to advocate Tor and explain what Tor is and can do. Helps " +"coordinate academic researchers." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -89,7 +119,9 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:58 -msgid "Lead developer for <a href=\"<page projects/vidalia>\">Vidalia</a>, a cross-platform Tor Graphical User Interface included in the bundles." +msgid "" +"Lead developer for <a href=\"<page projects/vidalia>\">Vidalia</a>, a cross-" +"platform Tor Graphical User Interface included in the bundles." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -99,7 +131,14 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:62 -msgid "The driving force behind <a href=\"https://guardianproject.info\">The Guardian Project</a> and Tor on the Android platform in the form of <a href=\"<page docs/android>\">Orbot</a>. He also works on <a href=\"https://guardianproject.info/apps/orlib/\">OrLib</a>: an Android library for Tor, and <a href=\"https://guardianproject.info/apps/orweb/\">Orweb: A privacy-enhanced mobile browser</a>." +msgid "" +"The driving force behind <a href=\"https://guardianproject.info\">The " +"Guardian Project</a> and Tor on the Android platform in the form of <a " +"href=\"<page docs/android>\">Orbot</a>. He also works on <a " +"href=\"https://guardianproject.info/apps/orlib/\">OrLib</a>: an Android " +"library for Tor, and <a " +"href=\"https://guardianproject.info/apps/orweb/\">Orweb: A privacy-enhanced " +"mobile browser</a>." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -109,7 +148,10 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:71 -msgid "Christian works on all things python for Tor. He enhanced and maintains a slew of codebases for us, such as the get-tor email auto-responder, check.torproject.org, bridge db, tor weather, tor controller, tor flow, etc." +msgid "" +"Christian works on all things python for Tor. He enhanced and maintains a " +"slew of codebases for us, such as the get-tor email auto-responder, " +"check.torproject.org, bridge db, tor weather, tor controller, tor flow, etc." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -119,7 +161,10 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:76 -msgid "With a strong background in non-profit accounting and auditing, Melissa is in charge of Tor's finances, audit compliance, and keeping Tor's financial operations moving along." +msgid "" +"With a strong background in non-profit accounting and auditing, Melissa is " +"in charge of Tor's finances, audit compliance, and keeping Tor's financial " +"operations moving along." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -129,17 +174,23 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:81 -msgid "Worked during the 2008 Google Summer of Code on a networking application to automatically carry out tests for Tor and during the 2009 Google Summer of Code on expanding our secure updater to include BitTorrent support. Manages our git repository, reviews code patches, and generally helps out a lot." +msgid "" +"Worked during the 2008 Google Summer of Code on a networking application to " +"automatically carry out tests for Tor and during the 2009 Google Summer of " +"Code on expanding our secure updater to include BitTorrent support. Manages " +"our git repository, reviews code patches, and generally helps out a lot." msgstr "" #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/corepeople.wml:86 -msgid "Tom Heydt-Benjamin, Researcher" +msgid "Thomas S. Benjamin, Researcher" msgstr "" #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:87 -msgid "Anonymous communications and bridge distribution researcher. His other work can be found on his <a href=\"http://cryptocracy.net/\">personal website</a>" +msgid "" +"Anonymous communications and bridge distribution researcher. His other work " +"can be found on his <a href=\"http://cryptocracy.net/\">personal website</a>" msgstr "" #. type: Content of: <div><div><dl><dt> @@ -149,7 +200,11 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:91 -msgid "Developer for the <a href=\"http://tork.sf.net/\">TorK</a> Tor controller, a <a href=\"http://code.google.com/p/torora/\">privacy-oriented Arora fork</a>, the <a href=\"http://code.google.com/p/torsocks/\">torsocks scripts</a>, and other useful peripheral tools." +msgid "" +"Developer for the <a href=\"http://tork.sf.net/\">TorK</a> Tor controller, a" +" <a href=\"http://code.google.com/p/torora/\">privacy-oriented Arora " +"fork</a>, the <a href=\"http://code.google.com/p/torsocks/\">torsocks " +"scripts</a>, and other useful peripheral tools." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -159,17 +214,24 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:98 -msgid "Builds <a href=\"http://atagar.com/arm\">Arm</a>, a command-line application for monitoring Tor relays and providing real-time status information such as the current configuration, bandwidth usage, message log, etc." +msgid "" +"Builds <a href=\"http://atagar.com/arm\">Arm</a>, a command-line application" +" for monitoring Tor relays and providing real-time status information such " +"as the current configuration, bandwidth usage, message log, etc." msgstr "" #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/corepeople.wml:102 -msgid "Andrew Lewman, Executive Director; Director; <a href=\"<page press/press>\">press contact</a>" +msgid "" +"Andrew Lewman, Executive Director; Director; <a href=\"<page " +"press/press>\">press contact</a>" msgstr "" #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:103 -msgid "Manages the business operations of The Tor Project, Inc. Plays roles of finance, advocacy, project management, strategy, press, and general support." +msgid "" +"Manages the business operations of The Tor Project, Inc. Plays roles of " +"finance, advocacy, project management, strategy, press, and general support." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -179,7 +241,12 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:107 -msgid "Worked during the 2007 Google Summer of Code on <a href=\"<gitblob>doc/spec/proposals/114-distributed-storage.txt\">distributing and securing the publishing and fetching of hidden service descriptors</a>. Currently the primary researcher for our National Science Foundation grant into <a href=\"http://metrics.torproject.org/\">anonymous metrics</a>." +msgid "" +"Worked during the 2007 Google Summer of Code on <a " +"href=\"<specblob>proposals/114-distributed-storage.txt\">distributing and " +"securing the publishing and fetching of hidden service descriptors</a>. " +"Currently the primary researcher for our National Science Foundation grant " +"into <a href=\"http://metrics.torproject.org/\">anonymous metrics</a>." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -189,7 +256,9 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:115 -msgid "One of the three original designers of Tor; does a lot of the ongoing design work. One of the two main developers, along with Roger." +msgid "" +"One of the three original designers of Tor; does a lot of the ongoing design" +" work. One of the two main developers, along with Roger." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -199,7 +268,12 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:119 -msgid "Researcher at the University of Cambridge, currently funded by The Tor Project to improve the security, performance, and usability of Tor. Creator of the <a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a>. You can find out more about his work on his <a href=\"http://www.cl.cam.ac.uk/~sjm217/\">professional website</a>" +msgid "" +"Researcher at the University of Cambridge, currently funded by The Tor " +"Project to improve the security, performance, and usability of Tor. Creator " +"of the <a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a>. You " +"can find out more about his work on his <a " +"href=\"http://www.cl.cam.ac.uk/~sjm217/\">professional website</a>" msgstr "" #. type: Content of: <div><div><dl><dt> @@ -209,7 +283,9 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:127 -msgid "Swedish advocate for Tor, anonymous communications research, and employee at <a href=\"http://nordu.net\">NORDUnet</a>." +msgid "" +"Swedish advocate for Tor, anonymous communications research, and employee at" +" <a href=\"http://nordu.net\">NORDUnet</a>." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -219,7 +295,9 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:131 -msgid "Manages the Debian packages, runs one of the directory authorities, runs the website and the wiki, and generally helps out a lot." +msgid "" +"Manages the Debian packages, runs one of the directory authorities, runs the" +" website and the wiki, and generally helps out a lot." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -229,7 +307,12 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:133 -msgid "Author of <a href=\"https://svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a>, a Tor controller that builds paths through the Tor network and measures various properties and behaviors. Developer and maintainer of <a href=\"<page torbutton/index>\">Torbutton</a>." +msgid "" +"Author of <a " +"href=\"https://svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a>, a " +"Tor controller that builds paths through the Tor network and measures " +"various properties and behaviors. Developer and maintainer of <a " +"href=\"<page torbutton/index>\">Torbutton</a>." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -239,7 +322,10 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:140 -msgid "Responsible for fundraising, advocacy, general marketing, policy outreach programs for Tor. She is also available to speak for audiences about the benefits of online anonymity, privacy, and Tor." +msgid "" +"Responsible for fundraising, advocacy, general marketing, policy outreach " +"programs for Tor. She is also available to speak for audiences about the " +"benefits of online anonymity, privacy, and Tor." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -249,7 +335,14 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:145 -msgid "Maintains the <a href=\"http://www.transifex.net/projects/p/torproject/\">Tor Translation Portal</a>, and works on automatically converting our website wml files to po files (and back). She also generally helps out with the <a href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/Torouter\">Torouter project</a>, bridge distribution through instant messaging, and other projects." +msgid "" +"Maintains the <a " +"href=\"http://www.transifex.net/projects/p/torproject/\">Tor Translation " +"Portal</a>, and works on automatically converting our website wml files to " +"po files (and back). She also generally helps out with the <a " +"href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/Torouter\">Torouter" +" project</a>, bridge distribution through instant messaging, and other " +"projects." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -259,7 +352,11 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:154 -msgid "Inventor of <a href=\"http://www.onion-router.net/\">Onion Routing</a>, original designer of Tor along with Roger and Nick, and project leader for original design, development, and deployment of Tor. Currently helps out with research and design." +msgid "" +"Inventor of <a href=\"http://www.onion-router.net/\">Onion Routing</a>, " +"original designer of Tor along with Roger and Nick, and project leader for " +"original design, development, and deployment of Tor. Currently helps out " +"with research and design." msgstr "" #. type: Content of: <div><div><dl><dt> @@ -269,5 +366,8 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:160 -msgid "Works on the artwork and design for various projects, annual reports, and brochures. His other work can be found at <a href=\"http://jmtodaro.com/\">http://jmtodaro.com/</a>." +msgid "" +"Works on the artwork and design for various projects, annual reports, and " +"brochures. His other work can be found at <a " +"href=\"http://jmtodaro.com/\">http://jmtodaro.com/</a>." msgstr "" Modified: translation/trunk/projects/website/po/ru/docs/2-medium.verifying-signatures.po =================================================================== --- translation/trunk/projects/website/po/ru/docs/2-medium.verifying-signatures.po 2011-03-04 13:30:21 UTC (rev 24303) +++ translation/trunk/projects/website/po/ru/docs/2-medium.verifying-signatures.po 2011-03-04 13:37:52 UTC (rev 24304) @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-02-12 12:20+0000\n" -"PO-Revision-Date: 2011-02-19 15:41+0000\n" +"POT-Creation-Date: 2011-03-01 16:37+0000\n" +"PO-Revision-Date: 2011-03-02 00:19+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Russian <None>\n" "MIME-Version: 1.0\n" @@ -19,7 +19,9 @@ #. type: Content of: <div><div> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:8 -msgid "<a href=\"<page index>\">Home » </a> <a href=\"<page docs/verifying-signatures>\">Verifying Signatures</a>" +msgid "" +"<a href=\"<page index>\">Home » </a> <a href=\"<page docs/verifying-" +"signatures>\">Verifying Signatures</a>" msgstr "" #. type: Content of: <div><div><h1> @@ -29,19 +31,28 @@ #. type: Content of: <div><div> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:13 -#: /tmp/cQhhW5Yv14.xml:38 /tmp/cQhhW5Yv14.xml:54 /tmp/cQhhW5Yv14.xml:81 -#: /tmp/cQhhW5Yv14.xml:155 +#: /tmp/ETpEqGX4UH.xml:38 /tmp/ETpEqGX4UH.xml:54 /tmp/ETpEqGX4UH.xml:81 +#: /tmp/ETpEqGX4UH.xml:155 msgid "<hr>" msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:15 -msgid "Each file on <a href=\"<page download/download>\">our download page</a> is accompanied by a file with the same name as the package and the extension \".asc\". These .asc files are GPG signatures. They allow you to verify the file you've downloaded is exactly the one that we intended you to get. For example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by tor-browser-<version-torbrowserbundle>_en-US.exe.asc." +msgid "" +"Each file on <a href=\"<page download/download>\">our download page</a> is " +"accompanied by a file with the same name as the package and the extension " +"\".asc\". These .asc files are GPG signatures. They allow you to verify the " +"file you've downloaded is exactly the one that we intended you to get. For " +"example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by " +"tor-browser-<version-torbrowserbundle>_en-US.exe.asc." msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:22 -msgid "Of course, you'll need to have our GPG keys in your keyring: if you don't know the GPG key, you can't be sure that it was really us who signed it. The signing keys we use are:" +msgid "" +"Of course, you'll need to have our GPG keys in your keyring: if you don't " +"know the GPG key, you can't be sure that it was really us who signed it. The" +" signing keys we use are:" msgstr "" #. type: Content of: <div><div><ul><li> @@ -56,7 +67,8 @@ #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:28 -msgid "Andrew's (0x31B0974B) typically signed older packages for windows and mac." +msgid "" +"Andrew's (0x31B0974B) typically signed older packages for windows and mac." msgstr "" #. type: Content of: <div><div><ul><li> @@ -76,7 +88,9 @@ #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:32 -msgid "Erinn's (0x63FEE659) and (0xF1F5C9B5) typically signs all windows, mac, and most linux packages." +msgid "" +"Erinn's (0x63FEE659) and (0xF1F5C9B5) typically signs all windows, mac, and " +"most linux packages." msgstr "" #. type: Content of: <div><div><ul><li> @@ -101,17 +115,25 @@ #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:43 -msgid "Linux: see <a href=\"http://www.gnupg.org/download/\">http://www.gnupg.org/download/</a> or install <i>gnupg</i> from the package management system." +msgid "" +"Linux: see <a " +"href=\"http://www.gnupg.org/download/\">http://www.gnupg.org/download/</a> " +"or install <i>gnupg</i> from the package management system." msgstr "" #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:46 -msgid "Windows: see <a href=\"http://www.gnupg.org/download/\">http://www.gnupg.org/download/</a>. Look for the \"version compiled for MS-Windows\" under \"Binaries\"." +msgid "" +"Windows: see <a " +"href=\"http://www.gnupg.org/download/\">http://www.gnupg.org/download/</a>. " +"Look for the \"version compiled for MS-Windows\" under \"Binaries\"." msgstr "" #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:49 -msgid "Mac: see <a href=\"http://macgpg.sourceforge.net/\">http://macgpg.sourceforge.net/</a>." +msgid "" +"Mac: see <a " +"href=\"http://macgpg.sourceforge.net/\">http://macgpg.sourceforge.net/</a>." msgstr "" #. type: Content of: <div><div><h3> @@ -121,18 +143,26 @@ #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:55 -msgid "The next step is to import the key. This can be done directly from GnuPG. Make sure you import the correct key. For example, if you downloaded a Windows package, you will need to import Andrew's key." +msgid "" +"The next step is to import the key. This can be done directly from GnuPG. " +"Make sure you import the correct key. For example, if you downloaded a " +"Windows package, you will need to import Erinn's key." msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:59 -#: /tmp/cQhhW5Yv14.xml:84 /tmp/cQhhW5Yv14.xml:163 +#: /tmp/ETpEqGX4UH.xml:84 /tmp/ETpEqGX4UH.xml:163 msgid "<b>Windows:</b>" msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:60 -msgid "GnuPG for Windows is a command line tool, and you will need to use <i>cmd.exe</i>. Unless you edit your PATH environment variable, you will need to tell Windows the full path to the GnuPG program. If you installed GnuPG with the default values, the path should be something like this: <i>C:\\Program Files\\Gnu\\GnuPg\\gpg.exe</i>." +msgid "" +"GnuPG for Windows is a command line tool, and you will need to use " +"<i>cmd.exe</i>. Unless you edit your PATH environment variable, you will " +"need to tell Windows the full path to the GnuPG program. If you installed " +"GnuPG with the default values, the path should be something like this: " +"<i>C:\\Program Files\\Gnu\\GnuPg\\gpg.exe</i>." msgstr "" #. type: Content of: <div><div><p> @@ -143,18 +173,25 @@ #. type: Content of: <div><div><pre> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:68 #, no-wrap -msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --keyserver hkp://keys.gnupg.net --recv-keys 0x28988BF5" +msgid "" +"C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --keyserver hkp://keys.gnupg.net " +"--recv-keys 0x28988BF5" msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:70 -#: /tmp/cQhhW5Yv14.xml:87 +#: /tmp/ETpEqGX4UH.xml:87 msgid "<b>Mac and Linux</b>" msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:71 -msgid "Whether you have a Mac or you run Linux, you will need to use the terminal to run GnuPG. Mac users can find the terminal under \"Applications\". If you run Linux and use Gnome, the terminal should be under \"Applications menu\" and \"Accessories\". KDE users can find the terminal under \"Menu\" and \"System\"." +msgid "" +"Whether you have a Mac or you run Linux, you will need to use the terminal " +"to run GnuPG. Mac users can find the terminal under \"Applications\". If you" +" run Linux and use Gnome, the terminal should be under \"Applications menu\"" +" and \"Accessories\". KDE users can find the terminal under \"Menu\" and " +"\"System\"." msgstr "" #. type: Content of: <div><div><p> @@ -175,7 +212,9 @@ #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:82 -msgid "After importing the key, you will want to verify that the fingerprint is correct." +msgid "" +"After importing the key, you will want to verify that the fingerprint is " +"correct." msgstr "" #. type: Content of: <div><div><pre> @@ -268,18 +307,26 @@ #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:156 -msgid "To verify the signature of the package you downloaded, you will need to download the \".asc\" file as well." +msgid "" +"To verify the signature of the package you downloaded, you will need to " +"download the \".asc\" file as well." msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:159 -msgid "In the following examples, the user Alice downloads packages for Windows, Mac OS X and Linux and also verifies the signature of each package. All files are saved on the desktop." +msgid "" +"In the following examples, the user Alice downloads packages for Windows, " +"Mac OS X and Linux and also verifies the signature of each package. All " +"files are saved on the desktop." msgstr "" #. type: Content of: <div><div><pre> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:164 #, no-wrap -msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --verify C:\\Users\\Alice\\Desktop\\<file-win32-bundle-stable>.asc C:\\Users\\Alice\\Desktop\\<file-win32-bundle-stable>" +msgid "" +"C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --verify C:\\Users\\Alice\\Desktop" +"\\<file-win32-bundle-stable>.asc C:\\Users\\Alice\\Desktop\\<file-win32" +"-bundle-stable>" msgstr "" #. type: Content of: <div><div><p> @@ -290,7 +337,9 @@ #. type: Content of: <div><div><pre> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:167 #, no-wrap -msgid "gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc /Users/Alice/<file-osx-x86-bundle-stable>" +msgid "" +"gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc /Users/Alice" +"/<file-osx-x86-bundle-stable>" msgstr "" #. type: Content of: <div><div><p> @@ -301,12 +350,17 @@ #. type: Content of: <div><div><pre> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:170 #, no-wrap -msgid "gpg --verify /home/Alice/Desktop/<file-source-stable>.asc /home/Alice/Desktop/<file-source-stable>" +msgid "" +"gpg --verify /home/Alice/Desktop/<file-source-stable>.asc " +"/home/Alice/Desktop/<file-source-stable>" msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:173 -msgid "After verifying, GnuPG will come back saying something like \"Good signature\" or \"BAD signature\". The output should look something like this:" +msgid "" +"After verifying, GnuPG will come back saying something like \"Good " +"signature\" or \"BAD signature\". The output should look something like " +"this:" msgstr "" #. type: Content of: <div><div><pre> @@ -323,12 +377,20 @@ #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:186 -msgid "Notice that there is a warning because you haven't assigned a trust index to this person. This means that GnuPG verified that the key made that signature, but it's up to you to decide if that key really belongs to the developer. The best method is to meet the developer in person and exchange key fingerprints." +msgid "" +"Notice that there is a warning because you haven't assigned a trust index to" +" this person. This means that GnuPG verified that the key made that " +"signature, but it's up to you to decide if that key really belongs to the " +"developer. The best method is to meet the developer in person and exchange " +"key fingerprints." msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:193 -msgid "For your reference, this is an example of a <em>BAD</em> verification. It means that the signature and file contents do not match. In this case, you should not trust the file contents:" +msgid "" +"For your reference, this is an example of a <em>BAD</em> verification. It " +"means that the signature and file contents do not match. In this case, you " +"should not trust the file contents:" msgstr "" #. type: Content of: <div><div><pre> @@ -347,7 +409,9 @@ #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:203 -msgid "In order to manually verify the signatures on the RPM packages, you must use the <code>rpm</code> tool like so: <br />" +msgid "" +"In order to manually verify the signatures on the RPM packages, you must use" +" the <code>rpm</code> tool like so: <br />" msgstr "" #. type: Content of: <div><div><p><pre> @@ -363,10 +427,14 @@ #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:210 -msgid "If you are running Tor on Debian you should read the instructions on <a href=\"<page docs/debian>#packages\">importing these keys to apt</a>." +msgid "" +"If you are running Tor on Debian you should read the instructions on <a " +"href=\"<page docs/debian>#packages\">importing these keys to apt</a>." msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:213 -msgid "If you wish to learn more about GPG, see <a href=\"http://www.gnupg.org/documentation/\">http://www.gnupg.org/documentation/</a>." +msgid "" +"If you wish to learn more about GPG, see <a " +"href=\"http://www.gnupg.org/documentation/\">http://www.gnupg.org/documentation/</a>." msgstr "" Modified: translation/trunk/projects/website/po/zh_CN/about/2-medium.overview.po =================================================================== --- translation/trunk/projects/website/po/zh_CN/about/2-medium.overview.po 2011-03-04 13:30:21 UTC (rev 24303) +++ translation/trunk/projects/website/po/zh_CN/about/2-medium.overview.po 2011-03-04 13:37:52 UTC (rev 24304) @@ -8,7 +8,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-03-01 16:37+0000\n" -"PO-Revision-Date: 2011-03-04 13:10+0000\n" +"PO-Revision-Date: 2011-03-04 13:30+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n"

1 0