- tor-commits - lists.torproject.org

r24517: {} add these files as well (website/trunk/include/pl)
by Runa Sandvik 31 Mar '11

31 Mar '11

Author: runa Date: 2011-03-31 11:33:20 +0000 (Thu, 31 Mar 2011) New Revision: 24517 Added: website/trunk/include/pl/head.wmi website/trunk/include/pl/side.wmi Log: add these files as well Added: website/trunk/include/pl/head.wmi =================================================================== --- website/trunk/include/pl/head.wmi (rev 0) +++ website/trunk/include/pl/head.wmi 2011-03-31 11:33:20 UTC (rev 24517) @@ -0,0 +1,142 @@ +#! /usr/bin/wml +<: use strict; :> +<: use warnings; :> +#use "perl-globals.wmi" +#use "links.wmi" +#use "versions.wmi" +#use "navigation.wmi" + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head> + <title>$(TITLE)</title> + <link rel="shortcut icon" type="image/x-icon" href="$(IMGROOT)/favicon.ico"> + <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">"> + <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">"> + <ifeq "$(ANNOUNCE_RSS)" "yes" "<link rel="alternate" title="Tor Project OR-announce" href="http://rss.gmane.org/gmane.network.onion-routing.announce" +type="application/rss+xml">"> + + # begin WML to generate css/js paths + <ifneq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/$(STYLESHEET)">"> + <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/master.css">"> + + #<link href="css/master.css" rel="stylesheet" type="text/css"> +  +  +# <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script> + # end WML to generate css/js paths + + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <meta name="author" content="The Tor Project, Inc."> + <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research"> +</head> +<body> +<div id="wrap"> + <div id="header"> + <h1 id="logo"><a href="<page index>">Tor</a></h1> + # navigation menu generation + <div id="nav"> + <ul> + <:{ + # create a hash and maintain order of keys + my %navigation; + my @keys; + while (@navigation) { + my $key = shift @navigation; + my $val = shift @navigation; + push @keys, $key; + $navigation{$key} = $val; + } + + my $page = $WML_SRC_BASENAME; + my $lang = "$(LANG)"; + + for my $key (@keys) { + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; + + # in directory of active link, set class active + my $class; + if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { + $class = 'class="active"'; + } else { + $class = ''; + } + + $dir = '.' unless defined $dir; + + # translated version + if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { + printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$navigation{$key}; + } + # english version + elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { + printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $navigation{$key}; + } + # full url + elsif ($key =~/^http/) { + printf '<li><a href="%s">%s</a></li>'."\n", $key, $navigation{$key}; + } else { + warn "$WML_SRC_FILENAME has a [page $key] (parses to +docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist."; + } + } + }:> + </ul> + </div> +  + # end navigation generation + <div id="calltoaction"> + <ul> + <:{ + my %calltoaction; + my @keys; + while (@calltoaction) { + my $key = shift @calltoaction; + my $val = shift @calltoaction; + push @keys, $key; + $calltoaction{$key} = $val; + } + + my $page = $WML_SRC_BASENAME; + my $lang = "$(LANG)"; + for my $key (@keys) { + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; + + # in directory, set active + my $class; + if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { + #if ($WML_SRC_BASENAME eq $base) { + $class = 'class="active"'; + } else { + $class = ''; + } + + $dir = '.' unless defined $dir; + # try to use a translated version + if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { + printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key}; + } + # default to english version + elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { + printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $calltoaction{$key}; + } else { + warn "$WML_SRC_FILENAME has a [page $key] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist."; + } + } + }:> + </ul> + </div> +  + </div> +  + +#<ifneq "$(REDIRECT)" "" "Redirecting to <a href="$(DOCROOT)/$(REDIRECT)">$(DOCROOT)/$(REDIRECT)</a>."> +#<ifneq "$(REDIRECT_GLOBAL)" "" "Redirecting to <a href="$(REDIRECT_GLOBAL)">$(REDIRECT_GLOBAL)</a>."> Added: website/trunk/include/pl/side.wmi =================================================================== --- website/trunk/include/pl/side.wmi (rev 0) +++ website/trunk/include/pl/side.wmi 2011-03-31 11:33:20 UTC (rev 24517) @@ -0,0 +1,91 @@ +#! /usr/bin/wml +<: use strict; :> +<: use warnings; :> +#use "perl-globals.wmi" +#use "links.wmi" +#use "versions.wmi" +#use "sidenav.wmi" +<div class="img-shadow"> + <div id="sidenav"> + <: + # recursively search menu structure to see if it contains a given page + sub containsSub($$); + sub containsSub($$) { + my ($elements, $page) = @_; + for my $ele (@{$elements}) { + if (containsSub($ele->{'subelements'},$page)){ + return 1; + } elsif ($page eq $ele->{'url'}) { + return 1; + } + + } + return 0; + } + + # generate navigation menu + sub printNavMenu($$$); + sub printNavMenu($$$) { + my ($navmenu, $page, $lang) = @_; + print '<ul>'."\n"; + for my $navmenu (@{$navmenu}) { + # this menu entry is the current (active) page + if ($navmenu->{'url'} eq $page) { + + # the current page has nested menu elements + if ($navmenu->{'subelements'}) { # menu has dropdown + printf '<li class="dropdown active"><a class="active" href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + + print '<li>'."\n"; + printNavMenu($navmenu->{'subelements'},$page,$lang); + print '</li>'."\n"; + + # the current (active) page does not have sub elements + } else { + printf '<li class="active"><a class="active" href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + } + + # a subelement of this menu item is the current (active) page + } elsif (containsSub($navmenu->{'subelements'}, $page)) { + printf '<li class="dropdown"><a class="active" href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + + print '<li>'."\n"; #encapsulate subelements + # recurse to generate the expanded menu + printNavMenu($navmenu->{'subelements'},$page,$lang); + print '</li>'."\n"; #encapsulate subelements + + # the menu entry is not active and does not enclose the active page + } else { + + # if there are subelements, set collapsed style + if ($navmenu->{'subelements'}) { + printf '<li class="dropdown"><a href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + # regular menu entry + } else { + printf '<li><a href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + } + } + } + print '</ul>'."\n"; + } + + my $lang = "$(LANG)"; + + use Cwd; + use Cwd 'abs_path'; + use File::Spec; + + # get document path from site root + my $path = File::Spec->abs2rel(getcwd(),abs_path("$(DOCROOT)")); + my $page = $WML_SRC_BASENAME; + printNavMenu($sidenav, $path.'/'.$page, $lang); + :> + </div> +  +</div> +

1 0

r24516: {website} include the polish *.wmi files in polish translations (in website/trunk: about/ar about/fr about/pl about/ru docs/ar docs/pl donate/pl download/ar download/pl download/ru getinvolved/pl pl press/pl projects/pl torbutton/pl)
by Runa Sandvik 31 Mar '11

31 Mar '11

Author: runa Date: 2011-03-31 11:29:51 +0000 (Thu, 31 Mar 2011) New Revision: 24516 Modified: website/trunk/about/ar/overview.wml website/trunk/about/fr/overview.wml website/trunk/about/pl/board.wml website/trunk/about/pl/contributors.wml website/trunk/about/pl/corepeople.wml website/trunk/about/pl/financials.wml website/trunk/about/pl/gsoc.wml website/trunk/about/pl/overview.wml website/trunk/about/pl/sponsors.wml website/trunk/about/pl/torusers.wml website/trunk/about/pl/translators.wml website/trunk/about/pl/volunteers.wml website/trunk/about/ru/overview.wml website/trunk/docs/ar/bridges.wml website/trunk/docs/pl/N900.wml website/trunk/docs/pl/android.wml website/trunk/docs/pl/bridges.wml website/trunk/docs/pl/debian-vidalia.wml website/trunk/docs/pl/debian.wml website/trunk/docs/pl/documentation.wml website/trunk/docs/pl/faq-abuse.wml website/trunk/docs/pl/faq.wml website/trunk/docs/pl/hidden-services.wml website/trunk/docs/pl/installguide.wml website/trunk/docs/pl/manual.wml website/trunk/docs/pl/proxychain.wml website/trunk/docs/pl/running-a-mirror.wml website/trunk/docs/pl/tor-doc-osx.wml website/trunk/docs/pl/tor-doc-relay.wml website/trunk/docs/pl/tor-doc-unix.wml website/trunk/docs/pl/tor-doc-web.wml website/trunk/docs/pl/tor-doc-windows.wml website/trunk/docs/pl/tor-hidden-service.wml website/trunk/docs/pl/trademark-faq.wml website/trunk/docs/pl/verifying-signatures.wml website/trunk/donate/pl/become-sponsor.wml website/trunk/donate/pl/donate-hardware.wml website/trunk/donate/pl/donate-service.wml website/trunk/donate/pl/donate.wml website/trunk/donate/pl/matching-program.wml website/trunk/download/ar/download.wml website/trunk/download/pl/download-easy.wml website/trunk/download/pl/download-unix.wml website/trunk/download/pl/download.wml website/trunk/download/pl/thankyou.wml website/trunk/download/ru/download.wml website/trunk/getinvolved/pl/mirrors.wml website/trunk/getinvolved/pl/open-positions.wml website/trunk/getinvolved/pl/research.wml website/trunk/getinvolved/pl/translation-overview.wml website/trunk/getinvolved/pl/translation.wml website/trunk/getinvolved/pl/tshirt.wml website/trunk/getinvolved/pl/volunteer.wml website/trunk/pl/index.wml website/trunk/press/pl/2008-12-19-roadmap-press-release.wml website/trunk/press/pl/2010-03-25-tor-store-press-release.wml website/trunk/press/pl/press.wml website/trunk/projects/pl/arm.wml website/trunk/projects/pl/gettor.wml website/trunk/projects/pl/projects.wml website/trunk/projects/pl/puppettor.wml website/trunk/projects/pl/torbrowser-details.wml website/trunk/projects/pl/torbrowser-split.wml website/trunk/projects/pl/torbrowser.wml website/trunk/projects/pl/tordnsel.wml website/trunk/projects/pl/torweather.wml website/trunk/projects/pl/vidalia.wml website/trunk/torbutton/pl/index.wml website/trunk/torbutton/pl/torbutton-faq.wml website/trunk/torbutton/pl/torbutton-options.wml Log: include the polish *.wmi files in polish translations Modified: website/trunk/about/ar/overview.wml =================================================================== --- website/trunk/about/ar/overview.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/about/ar/overview.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -4,7 +4,7 @@ ## translation metadata -# Revision: $Revision: 24254 $ +# Revision: $Revision: 24509 $ # Translation-Priority: 2-medium #include "ar/head.wmi" TITLE="Tor Project: Overview" CHARSET="UTF-8" STYLESHEET="css/master-rtl.css" <div id="content" class="clearfix"> @@ -13,13 +13,13 @@ about/overview>">عن »</a> </div> <div id="maincol"> - <a name="لمحة عامة"></a> - <h2><a class="anchor" href="#overview">تور : لمحة عامة</a></h2> + <h2>Tor: Overview</h2>  <div class="sidebar-left"> <h3>المواضيع</h3> <ul> + <li><a href="<page about/overview>#inception">Inception</a></li> <li><a href="<page about/overview>#overview">لمحة عامة</a></li> <li><a href="<page about/overview>#whyweneedtor">لأي غرض نحتاج تور</a></li> <li><a href="<page about/overview>#thesolution">الحل</a></li> @@ -31,8 +31,21 @@  -<hr style=";text-align:right;direction:rtl"> +<hr> <a name="inception"></a> + <h3><a class="anchor" href="#inception">Inception</a></h3> + + <p> + Tor was originally designed, implemented, and deployed as a third-generation +<a href="http://www.onion-router.net/">onion routing project of the +U.S. Naval Research Laboratory</a>. It was originally developed with the +U.S. Navy in mind, for the primary purpose of protecting government +communications. Today, it is used every day for a wide variety of purposes +by normal people, the military, journalists, law enforcement officers, +activists, and many others. </p> + <a name="لمحة عامة"></a> + <h3><a class="anchor" href="#overview">Overview</a></h3> + <p> تور هو عبارة عن شبكة من الأنفاق الافتراضية التي تتيح للأفراد والجماعات التصفح بخصوصية وأمان على الإنترنت. كما أنها تمكن مطوري البرمجيات من صنع Modified: website/trunk/about/fr/overview.wml =================================================================== --- website/trunk/about/fr/overview.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/about/fr/overview.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -4,7 +4,7 @@ ## translation metadata -# Revision: $Revision: 24254 $ +# Revision: $Revision: 24509 $ # Translation-Priority: 2-medium #include "head.wmi" TITLE="Tor Project: Overview" CHARSET="UTF-8" <div id="content" class="clearfix"> @@ -13,13 +13,13 @@ propos »</a> </div> <div id="maincol"> - <a name="overview"></a> - <h2><a class="anchor" href="#overview">Tor: Overview</a></h2> + <h2>Tor: Overview</h2>  <div class="sidebar-left"> <h3>Sujets</h3> <ul> + <li><a href="<page about/overview>#inception">Inception</a></li> <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> @@ -32,8 +32,21 @@  -<hr> +<hr> <a name="inception"></a> + <h3><a class="anchor" href="#inception">Inception</a></h3> + + <p> + Tor was originally designed, implemented, and deployed as a third-generation +<a href="http://www.onion-router.net/">onion routing project of the +U.S. Naval Research Laboratory</a>. It was originally developed with the +U.S. Navy in mind, for the primary purpose of protecting government +communications. Today, it is used every day for a wide variety of purposes +by normal people, the military, journalists, law enforcement officers, +activists, and many others. </p> + <a name="overview"></a> + <h3><a class="anchor" href="#overview">Overview</a></h3> + <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 Modified: website/trunk/about/pl/board.wml =================================================================== --- website/trunk/about/pl/board.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/about/pl/board.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 23689 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Board of Directors" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Tor Project: Board of Directors" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page about/overview>">O @@ -84,8 +84,8 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  @@ -93,4 +93,4 @@ -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/about/pl/contributors.wml =================================================================== --- website/trunk/about/pl/contributors.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/about/pl/contributors.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -5,7 +5,7 @@ ## translation metadata # Revision: $Revision: 24250 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Past Contributors" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Tor Project: Past Contributors" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page about/overview>">O @@ -84,12 +84,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/about/pl/corepeople.wml =================================================================== --- website/trunk/about/pl/corepeople.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/about/pl/corepeople.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -5,7 +5,7 @@ ## translation metadata # Revision: $Revision: 24434 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Core People" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Tor Project: Core People" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page about/overview>">O @@ -151,12 +151,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/about/pl/financials.wml =================================================================== --- website/trunk/about/pl/financials.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/about/pl/financials.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -7,7 +7,7 @@ ## translation metadata # Revision: $Revision: 23764 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Financial Reports" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Project: Financial Reports" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page about/overview>">O @@ -38,12 +38,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/about/pl/gsoc.wml =================================================================== --- website/trunk/about/pl/gsoc.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/about/pl/gsoc.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24439 $ # Translation-Priority: 4-optional -#include "head.wmi" TITLE="Tor: Google Summer of Code 2010" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor: Google Summer of Code 2010" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page about/gsoc>">Google @@ -226,8 +226,8 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  @@ -235,4 +235,4 @@ -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/about/pl/overview.wml =================================================================== --- website/trunk/about/pl/overview.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/about/pl/overview.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -4,22 +4,22 @@ ## translation metadata -# Revision: $Revision: 24254 $ +# Revision: $Revision: 24509 $ # Translation-Priority: 2-medium -#include "head.wmi" TITLE="Tor Project: Overview" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Project: Overview" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page about/overview>">O Torze » </a> </div> <div id="maincol"> - <a name="overview"></a> - <h2><a class="anchor" href="#overview">Tor: Wprowadzenie</a></h2> + <h2>Tor: Overview</h2>  <div class="sidebar-left"> <h3>Tematy</h3> <ul> + <li><a href="<page about/overview>#inception">Inception</a></li> <li><a href="<page about/overview>#overview">Wprowadzenie</a></li> <li><a href="<page about/overview>#whyweneedtor">Dlaczego potrzebujemy Tora</a></li> <li><a href="<page about/overview>#thesolution">Rozwiązanie</a></li> @@ -31,8 +31,21 @@  -<hr> +<hr> <a name="inception"></a> + <h3><a class="anchor" href="#inception">Inception</a></h3> + + <p> + Tor was originally designed, implemented, and deployed as a third-generation +<a href="http://www.onion-router.net/">onion routing project of the +U.S. Naval Research Laboratory</a>. It was originally developed with the +U.S. Navy in mind, for the primary purpose of protecting government +communications. Today, it is used every day for a wide variety of purposes +by normal people, the military, journalists, law enforcement officers, +activists, and many others. </p> + <a name="overview"></a> + <h3><a class="anchor" href="#overview">Overview</a></h3> + <p> Tor jest siecią wirtualnych tuneli, które pozwalają ludziom i grupom na zwiększenie swojej prywatności i bezpieczeństwa w Internecie. System ten @@ -259,12 +272,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/about/pl/sponsors.wml =================================================================== --- website/trunk/about/pl/sponsors.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/about/pl/sponsors.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24000 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor: Sponsors" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor: Sponsors" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page about/overview>">O @@ -92,12 +92,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/about/pl/torusers.wml =================================================================== --- website/trunk/about/pl/torusers.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/about/pl/torusers.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -7,7 +7,7 @@ ## translation metadata # Revision: $Revision: 23689 $ # Translation-Priority: 2-medium -#include "head.wmi" TITLE="Who uses Tor?" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Who uses Tor?" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page about/overview>">O @@ -405,12 +405,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/about/pl/translators.wml =================================================================== --- website/trunk/about/pl/translators.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/about/pl/translators.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 23729 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Translators" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Tor Project: Translators" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page about/overview>">O @@ -33,12 +33,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/about/pl/volunteers.wml =================================================================== --- website/trunk/about/pl/volunteers.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/about/pl/volunteers.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24434 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Volunteers" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Tor Project: Volunteers" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page about/overview>">O @@ -58,12 +58,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/about/ru/overview.wml =================================================================== --- website/trunk/about/ru/overview.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/about/ru/overview.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -4,7 +4,7 @@ ## translation metadata -# Revision: $Revision: 24254 $ +# Revision: $Revision: 24509 $ # Translation-Priority: 2-medium #include "head.wmi" TITLE="Tor Project: Overview" CHARSET="UTF-8" <div id="content" class="clearfix"> @@ -13,13 +13,13 @@ about/overview>">О » </a> </div> <div id="maincol"> - <a name="overview"></a> - <h2><a class="anchor" href="#overview">Tor: Обзор</a></h2> + <h2>Tor: Overview</h2>  <div class="sidebar-left"> <h3>Темы</h3> <ul> + <li><a href="<page about/overview>#inception">Inception</a></li> <li><a href="<page about/overview>#overview">Обзор</a></li> <li><a href="<page about/overview>#whyweneedtor">Зачем нам нужен Tor</a></li> <li><a href="<page about/overview>#thesolution">Решение</a></li> @@ -31,8 +31,21 @@  -<hr> +<hr> <a name="inception"></a> + <h3><a class="anchor" href="#inception">Inception</a></h3> + + <p> + Tor was originally designed, implemented, and deployed as a third-generation +<a href="http://www.onion-router.net/">onion routing project of the +U.S. Naval Research Laboratory</a>. It was originally developed with the +U.S. Navy in mind, for the primary purpose of protecting government +communications. Today, it is used every day for a wide variety of purposes +by normal people, the military, journalists, law enforcement officers, +activists, and many others. </p> + <a name="overview"></a> + <h3><a class="anchor" href="#overview">Overview</a></h3> + <p> Tor - это сеть виртуальных туннелей, которые позволяют пользователям и группам людей улучшить свою приватность и безопасность в Интернете. Tor Modified: website/trunk/docs/ar/bridges.wml =================================================================== --- website/trunk/docs/ar/bridges.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/docs/ar/bridges.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -4,7 +4,7 @@ ## translation metadata -# Revision: $Revision: 24250 $ +# Revision: $Revision: 24504 $ # Translation-Priority: 1-high #include "ar/head.wmi" TITLE="Tor Project: Bridges" CHARSET="UTF-8" STYLESHEET="css/master-rtl.css" <div id="content" class="clearfix"> @@ -62,7 +62,7 @@ Freedom4Internet</a>. هل تعرف فيديو أفضل؟ هل لديك فيديو بلغتك؟ أبلغنا!</p> <div class="center"> - <p><video id="v1" src="http://media.torproject.org/video/2009-using-a-bridge-relay-to-access-tor.o…" autobuffer="true" controls="controls"></video></p> + <p><video id="v1" src="https://media.torproject.org/video/2009-using-a-bridge-relay-to-access-tor.…" autobuffer="true" controls="controls"></video></p> </div> <p> Modified: website/trunk/docs/pl/N900.wml =================================================================== --- website/trunk/docs/pl/N900.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/docs/pl/N900.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 23689 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: N900 Instructions" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Project: N900 Instructions" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -154,8 +154,8 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  @@ -163,4 +163,4 @@ -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/docs/pl/android.wml =================================================================== --- website/trunk/docs/pl/android.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/docs/pl/android.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24440 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Android Instructions" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Project: Android Instructions" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -158,12 +158,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/docs/pl/bridges.wml =================================================================== --- website/trunk/docs/pl/bridges.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/docs/pl/bridges.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -4,9 +4,9 @@ ## translation metadata -# Revision: $Revision: 24250 $ +# Revision: $Revision: 24504 $ # Translation-Priority: 1-high -#include "head.wmi" TITLE="Tor Project: Bridges" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Project: Bridges" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -69,7 +69,7 @@ na Twój język? Daj nam znać!</p> <div class="center"> - <p><video id="v1" src="http://media.torproject.org/video/2009-using-a-bridge-relay-to-access-tor.o…" autobuffer="true" controls="controls"></video></p> + <p><video id="v1" src="https://media.torproject.org/video/2009-using-a-bridge-relay-to-access-tor.…" autobuffer="true" controls="controls"></video></p> </div> <p> @@ -206,12 +206,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/docs/pl/debian-vidalia.wml =================================================================== --- website/trunk/docs/pl/debian-vidalia.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/docs/pl/debian-vidalia.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 23689 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Vidalia: Debian/Ubuntu Instructions" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Vidalia: Debian/Ubuntu Instructions" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -124,12 +124,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/docs/pl/debian.wml =================================================================== --- website/trunk/docs/pl/debian.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/docs/pl/debian.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24267 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Debian/Ubuntu Instructions" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Project: Debian/Ubuntu Instructions" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -187,12 +187,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/docs/pl/documentation.wml =================================================================== --- website/trunk/docs/pl/documentation.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/docs/pl/documentation.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -4,9 +4,9 @@ ## translation metadata -# Revision: $Revision: 24354 $ +# Revision: $Revision: 24501 $ # Translation-Priority: 2-medium -#include "head.wmi" TITLE="Tor: Documentation" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor: Documentation" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -178,9 +178,10 @@ <li><a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev/">Lista or-dev</a> jest tylko dla deweloperów i ma bardzo mały ruch.</li> - <li>Lista dla <a href="http://archives.seul.org/tor/mirrors/">operatorów -mirrorów</a> dla informacji o nowych mirrorach strony i wspieraniu <a -href="<page getinvolved/mirrors>">istniejących mirrorów strony</a>.</li> + <li>A list for <a +href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-mirrors">mirror +operators</a> for new website mirrors, and supporting <a href="<page +getinvolved/mirrors>">current website mirrors</a>.</li> <li>Lista z <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits/">zapisów svn i git</a> może zainteresować deweloperów.</li> @@ -283,12 +284,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/docs/pl/faq-abuse.wml =================================================================== --- website/trunk/docs/pl/faq-abuse.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/docs/pl/faq-abuse.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24197 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Abuse FAQ" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Project: Abuse FAQ" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -409,12 +409,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/docs/pl/faq.wml =================================================================== --- website/trunk/docs/pl/faq.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/docs/pl/faq.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -4,9 +4,9 @@ ## translation metadata -# Revision: $Revision: 24472 $ +# Revision: $Revision: 24503 $ # Translation-Priority: 2-medium -#include "head.wmi" TITLE="Tor Project: FAQ" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Project: FAQ" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -350,8 +350,9 @@ <ol> <li>Przeczytaj to <a href="<page docs/faq>">FAQ</a>.</li> <li>Przeczytaj <a href="<page docs/documentation>">dokumentację</a>.</li> - <li>Przeczytaj <a href="http://archives.seul.org/or/talk">Archiwa OR-TALK</a> i -sprawdź, czy na Twoje pytanie nie ma już odpowiedzi. </li> + <li>Read through the <a +href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-talk">tor-talk +archives</a> and see if your question is already answered.</li> <li>Dołącz do naszego <a href="irc://irc.oftc.net#tor">kanału irc</a>, podaj problem i czekaj na pomoc.</li> <li>Wyślie e-mail do tor-assistants małpa torproject.org. Są to ochotnicy, @@ -1285,13 +1286,13 @@ użycie procesora). Możesz powiedzieć Torowi, by używał tej implementacji malloc: <tt>./configure --enable-openbsd-malloc</tt></li> - <li>Jeśli prowadzisz szybki przekaźnik, co znaczy, że masz otwartych wiele -połączeń TLS, prawdopodobnie tracisz wiele pamięci na werwnętrzne bufory -OpenSSL (ponad 38kB na gniazdo). Załataliśmy OpenSSL, by <a -href="http://archives.seul.org/or/dev/Jun-2008/msg00001.html">bardziej -agresywnie zwalniał nieużywaną pamięć na bufory</a>. Jeśli zainstalujesz -OpenSSL 1.0.0-beta5, proces kompilacji Tora automatycznie rozpozna i -skorzysta z tej cechy.</li> + <li>If you're running a fast relay, meaning you have many TLS connections open, +you are probably losing a lot of memory to OpenSSL's internal buffers (38KB+ +per socket). We've patched OpenSSL to <a +href="https://lists.torproject.org/pipermail/tor-dev/2008-June/001519.html">release +unused buffer memory more aggressively</a>. If you update to OpenSSL +1.0.0-beta5, Tor's build process will automatically recognize and use this +feature.</li> <li>Jeśli jesteś na systemie Solaris, OpenBSD, NetBSD, lub starym FreeBSD, Tor prawdopodobnie uruchamia osobne procesy zamiast używać wątków. Rozważ zmianę @@ -1639,12 +1640,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/docs/pl/hidden-services.wml =================================================================== --- website/trunk/docs/pl/hidden-services.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/docs/pl/hidden-services.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24373 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor: Hidden Service Protocol" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor: Hidden Service Protocol" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -154,12 +154,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/docs/pl/installguide.wml =================================================================== --- website/trunk/docs/pl/installguide.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/docs/pl/installguide.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 23689 $ # Translation-Priority: 2-medium -#include "head.wmi" TITLE="Tor Project: Installtion Instructions" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Project: Installtion Instructions" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -23,12 +23,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/docs/pl/manual.wml =================================================================== --- website/trunk/docs/pl/manual.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/docs/pl/manual.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 23689 $ # Translation-Priority: 2-medium -#include "head.wmi" TITLE="Tor: Manuals" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor: Manuals" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -21,12 +21,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/docs/pl/proxychain.wml =================================================================== --- website/trunk/docs/pl/proxychain.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/docs/pl/proxychain.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24336 $ # Translation-Priority: 1-high -#include "head.wmi" TITLE="Tor Project: Configuring Tor to use a Proxy" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Project: Configuring Tor to use a Proxy" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -55,12 +55,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/docs/pl/running-a-mirror.wml =================================================================== --- website/trunk/docs/pl/running-a-mirror.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/docs/pl/running-a-mirror.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -4,9 +4,9 @@ ## translation metadata -# Revision: $Revision: 23689 $ +# Revision: $Revision: 24502 $ # Translation-Priority: 4-optional -#include "head.wmi" TITLE="Tor: Running a Mirror" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor: Running a Mirror" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -39,7 +39,7 @@ email w celach komunikacji administracyjnej, gdyby Twój serwer miał kłopoty.<br/><br/> Jest wysoce zalecane, by wszyscy operatorzy mirrorów zapisali się na <A - href="http://archives.seul.org/tor/mirrors/">listę mailingową tor-mirrors</A> gdzie powinny iść wszystkie prośby modyfikacji (ADD, CHANGE, DELETE, + href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-mirrors">listę mailingową tor-mirrors</A> gdzie powinny iść wszystkie prośby modyfikacji (ADD, CHANGE, DELETE, jakiekolwiek inne prośby/zawiadomienia). Ponadto, można tu znaleźć wsparcie w jakichkolwiek sprawach technicznych przy uruchamianiu mirrora.<br/><br/> @@ -79,8 +79,8 @@ </p> <br/> <p> - Jeśli prowadzisz mirror, proszę zapisz się na - <A href="http://archives.seul.org/tor/mirrors/">listę mailingową tor-mirrors</A>i przedstaw się tam. Dodamy Cię do listy mirrorów. Na liście można też + Jeśli prowadzisz mirror, proszę zapisz się na <A + href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-mirrors">listę mailingową tor-mirrors</A>i przedstaw się tam. Dodamy Cię do listy mirrorów. Na liście można też znaleźć pomoc w sprawach wsparcia dla mirrorów i spraw związanych z konfiguracją. </p> @@ -90,12 +90,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/docs/pl/tor-doc-osx.wml =================================================================== --- website/trunk/docs/pl/tor-doc-osx.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/docs/pl/tor-doc-osx.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24472 $ # Translation-Priority: 2-medium -#include "head.wmi" TITLE="Tor Project: Mac OS X Install Instructions" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Project: Mac OS X Install Instructions" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -192,12 +192,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/docs/pl/tor-doc-relay.wml =================================================================== --- website/trunk/docs/pl/tor-doc-relay.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/docs/pl/tor-doc-relay.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -4,9 +4,9 @@ ## translation metadata -# Revision: $Revision: 24472 $ +# Revision: $Revision: 24502 $ # Translation-Priority: 2-medium -#include "head.wmi" TITLE="Tor Project: Relay Configuration Instructions" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Project: Relay Configuration Instructions" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -136,11 +136,11 @@ docs/faq>#Logs">wypisze jakieś ostrzeżenia</a>, zajmij się nimi. </li> - <li>Zapisz się na listę mailingową <a -href="http://archives.seul.org/or/announce/">or-announce</a>. Ma ona mały -ruch, dzięki niej będziesz informowany o nowych stabilnych wydaniach. Możesz -także zapisać się na <a href="<page docs/documentation>#MailingLists">listy -Tora o większym ruchu</a>. + <li>Subscribe to the <a +href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-announce">tor-announce</a> +mailing list. It is very low volume, and it will keep you informed of new +stable releases. You might also consider subscribing to <a href="<page +docs/documentation>#MailingLists">the higher-volume Tor lists</a> too. </li> </li></ol> @@ -297,12 +297,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/docs/pl/tor-doc-unix.wml =================================================================== --- website/trunk/docs/pl/tor-doc-unix.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/docs/pl/tor-doc-unix.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24208 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor: Linux/BSD/Unix Install Instructions" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor: Linux/BSD/Unix Install Instructions" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -183,12 +183,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/docs/pl/tor-doc-web.wml =================================================================== --- website/trunk/docs/pl/tor-doc-web.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/docs/pl/tor-doc-web.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24208 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor: Configuring your browser to use Tor" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor: Configuring your browser to use Tor" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -57,12 +57,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/docs/pl/tor-doc-windows.wml =================================================================== --- website/trunk/docs/pl/tor-doc-windows.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/docs/pl/tor-doc-windows.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -4,9 +4,9 @@ ## translation metadata -# Revision: $Revision: 24208 $ +# Revision: $Revision: 24504 $ # Translation-Priority: 1-high -#include "head.wmi" TITLE="Tor Project: MS Windows Install Instructions" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Project: MS Windows Install Instructions" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -24,14 +24,14 @@ docs/tor-doc-relay>">Konfigurowaniu przekaźnika sieci Tor</a>.</b> </p> - <p>Freedom House wyprodukował film o tym, jak zainstalować Tora. Możecie -zobaczyć ten film pod adresem: <a -href="http://media.torproject.org/video/2009-install-and-use-tor.ogv">Jak -zainstalować Tora na Windows</a>. Znasz lepszy film lub taki, który jest -przetłumaczony na Twój język? Daj nam znać!</p> + <p>Freedom House has produced a video on how to install Tor. You can view it +at <a +href="https://media.torproject.org/video/2009-install-and-use-tor.ogv">How +to install Tor on Windows</a>. Know of a better video, or one translated +into your language? Let us know!</p> <div class="center"> - <p><video id="v1" src="http://media.torproject.org/video/2009-install-and-use-tor.ogv" autobuffer="true" controls="controls"></video></p> + <p><video id="v1" src="https://media.torproject.org/video/2009-install-and-use-tor.ogv" autobuffer="true" controls="controls"></video></p> </div> <hr> <a id="installing"></a> @@ -180,12 +180,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/docs/pl/tor-hidden-service.wml =================================================================== --- website/trunk/docs/pl/tor-hidden-service.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/docs/pl/tor-hidden-service.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24197 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Hidden Service Configuration Instructions" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Project: Hidden Service Configuration Instructions" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -268,12 +268,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/docs/pl/trademark-faq.wml =================================================================== --- website/trunk/docs/pl/trademark-faq.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/docs/pl/trademark-faq.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24347 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Trademark FAQ" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Project: Trademark FAQ" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -89,12 +89,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/docs/pl/verifying-signatures.wml =================================================================== --- website/trunk/docs/pl/verifying-signatures.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/docs/pl/verifying-signatures.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24262 $ # Translation-Priority: 2-medium -#include "head.wmi" TITLE="Tor Project: Verifying Signatures" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Project: Verifying Signatures" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -229,8 +229,8 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  @@ -238,4 +238,4 @@ -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/donate/pl/become-sponsor.wml =================================================================== --- website/trunk/donate/pl/become-sponsor.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/donate/pl/become-sponsor.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 23929 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Become a Sponsor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Tor Project: Become a Sponsor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -48,12 +48,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/donate/pl/donate-hardware.wml =================================================================== --- website/trunk/donate/pl/donate-hardware.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/donate/pl/donate-hardware.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 23778 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Donate Hardware to Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Tor Project: Donate Hardware to Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -34,12 +34,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/donate/pl/donate-service.wml =================================================================== --- website/trunk/donate/pl/donate-service.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/donate/pl/donate-service.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 23775 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Donate Services to Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Tor Project: Donate Services to Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -42,12 +42,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/donate/pl/donate.wml =================================================================== --- website/trunk/donate/pl/donate.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/donate/pl/donate.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24163 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -268,12 +268,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>   </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/donate/pl/matching-program.wml =================================================================== --- website/trunk/donate/pl/matching-program.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/donate/pl/matching-program.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 23712 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Matching Program" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Tor Project: Matching Program" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -24,12 +24,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/download/ar/download.wml =================================================================== --- website/trunk/download/ar/download.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/download/ar/download.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -4,7 +4,7 @@ ## translation metadata -# Revision: $Revision: 24337 $ +# Revision: $Revision: 24505 $ # Translation-Priority: 3-low #include "ar/head.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" STYLESHEET="css/master-rtl.css" <div id="content" class="clearfix"> @@ -176,8 +176,8 @@ <li>تحتوي <strong>حزمة متصفح تور</strong> كل ما تحتاج لتتصفح الإنترنت بأمان. لا تتطلب هذه الحزمة أي تثبيت ويكفي أن تستخرجها وتشعلها. <a href="<page projects/torbrowser>">تعلم المزيد «</a></li> -<li>اقرأ عن كيفية استخدام <a href="<page download/download-unix>">مستدوعاتنا -لبرمجيات تور</a>.</li> +<li>Read how to use <a href="<page download/download-unix>">our repositories for +the Tor software</a>.</li> </ul> </td> </tr> Modified: website/trunk/download/pl/download-easy.wml =================================================================== --- website/trunk/download/pl/download-easy.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/download/pl/download-easy.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -7,7 +7,7 @@ ## translation metadata # Revision: $Revision: 24336 $ # Translation-Priority: 1-high -#include "head.wmi" TITLE="Tor: Easy Download Selector" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Tor: Easy Download Selector" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> <div id="breadcrumbs"><a href="<page index>">Start » </a><a href="<page download/download-easy>">Wybór łatwego pobierania</a></div> @@ -128,4 +128,4 @@ -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/download/pl/download-unix.wml =================================================================== --- website/trunk/download/pl/download-unix.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/download/pl/download-unix.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -5,9 +5,9 @@ ## translation metadata -# Revision: $Revision: 24112 $ +# Revision: $Revision: 24504 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor: Download for Linux/Unix" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Tor: Download for Linux/Unix" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> <div id="breadcrumbs"><a href="<page index>">Start » </a><a href="<page download/download-unix>">Pobieranie</a></div> @@ -143,26 +143,19 @@ <div class="underline"></div> <div class="nb"> <p> -Aby otrzymywać informacje dotyczące bezpieczeństwa i nowych wersji -stabilnych, zapisz się na <a -href="http://archives.seul.org/or/announce/">listę mailingową -or-announce</a> (musisz potwierdzić zapisanie się przez e-mail). Możesz też -<a href="http://rss.gmane.org/gmane.network.onion-routing.announce">czytać -kanał RSS tej listy</a>. +To keep informed of security advisories and new stable releases, subscribe +to the <a +href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-announce">tor-announce +mailing list</a> (you will be asked to confirm via email). You can also <a +href="http://rss.gmane.org/gmane.network.onion-routing.announce">watch the +list's RSS feed</a>. </p> - -<form action="http://freehaven.net/cgi-bin/majordomo.cgi"> -<input type="hidden" name="mlist" value="or-announce"/> <input type="hidden" -name="subscribe" value="1"/> <input type="hidden" name="host" -value="freehaven.net"/> <input name="email" size="15"/> <input type="submit" -value="zapisz się do or-announce"/> -</form> </div> <p> -Jeśli chcielibyście badać jakieś starsze wydanie kodu źródłowego Tora lub -inne binarki, sprawdźcie <a -href="http://archive.torproject.org/">archiwum</a>. +If you would like to research any past release of Tor source, packages, or +other binaries, see <a href="https://archive.torproject.org/">the +archive</a>. </p> <div class="nb"> @@ -212,4 +205,4 @@ -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/download/pl/download.wml =================================================================== --- website/trunk/download/pl/download.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/download/pl/download.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -4,9 +4,9 @@ ## translation metadata -# Revision: $Revision: 24337 $ +# Revision: $Revision: 24505 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> <div id="breadcrumbs"><a href="<page index>">Start » </a><a href="<page download/download>">Pobieranie</a></div> @@ -185,8 +185,8 @@ potrzebujesz bo bezpiecznego przeglądania Internetu. Nie wymaga ona instalacji. Po prostu rozpakuj i uruchom. <a href="<page projects/torbrowser>">Dowiedz się więcej i sprawdź inne języki »</a></li> -<li>Przeczytaj, jak używać <a href="<page download/download-unix>">naszych -repozytoriów oprogramowania Tor.</a>.</li> +<li>Read how to use <a href="<page download/download-unix>">our repositories for +the Tor software</a>.</li> </ul> </td> </tr> @@ -395,4 +395,4 @@ -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/download/pl/thankyou.wml =================================================================== --- website/trunk/download/pl/thankyou.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/download/pl/thankyou.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -5,7 +5,7 @@ ## translation metadata # Revision: $Revision: 23689 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Thank you for downloading Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Thank you for downloading Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Home » </a> <a href="<page @@ -102,4 +102,4 @@ </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/download/ru/download.wml =================================================================== --- website/trunk/download/ru/download.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/download/ru/download.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -4,7 +4,7 @@ ## translation metadata -# Revision: $Revision: 24337 $ +# Revision: $Revision: 24505 $ # Translation-Priority: 3-low #include "head.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> @@ -188,8 +188,8 @@ <li><strong>Сборка Tor Browser</strong> содержит все необходимое для безопасной работы в Интернете. Этот пакет не требует установки. Просто распакуйте его и запустите. <a href="<page projects/torbrowser>">Узнать больше »</a></li> -<li>Узнайте, как использовать <a href="<page download/download-unix>">наши -хранилища программного обеспечения Tor.</a> .</li> +<li>Read how to use <a href="<page download/download-unix>">our repositories for +the Tor software</a>.</li> </ul> </td> </tr> Modified: website/trunk/getinvolved/pl/mirrors.wml =================================================================== --- website/trunk/getinvolved/pl/mirrors.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/getinvolved/pl/mirrors.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 23689 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Mirrors" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Project: Mirrors" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -50,12 +50,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/getinvolved/pl/open-positions.wml =================================================================== --- website/trunk/getinvolved/pl/open-positions.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/getinvolved/pl/open-positions.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 23689 $ # Translation-Priority: 4-optional -#include "head.wmi" TITLE="Tor Project: Open Positions" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Project: Open Positions" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -105,12 +105,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/getinvolved/pl/research.wml =================================================================== --- website/trunk/getinvolved/pl/research.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/getinvolved/pl/research.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24188 $ # Translation-Priority: 4-optional -#include "head.wmi" TITLE="Tor: Research" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor: Research" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -211,8 +211,8 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  @@ -220,4 +220,4 @@ -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/getinvolved/pl/translation-overview.wml =================================================================== --- website/trunk/getinvolved/pl/translation-overview.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/getinvolved/pl/translation-overview.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24032 $ # Translation-Priority: 4-optional -#include "head.wmi" TITLE="Tor Project: Translation Overview" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Project: Translation Overview" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -103,12 +103,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/getinvolved/pl/translation.wml =================================================================== --- website/trunk/getinvolved/pl/translation.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/getinvolved/pl/translation.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24025 $ # Translation-Priority: 4-optional -#include "head.wmi" TITLE="Tor Website Translation Guidelines" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Website Translation Guidelines" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -83,12 +83,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/getinvolved/pl/tshirt.wml =================================================================== --- website/trunk/getinvolved/pl/tshirt.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/getinvolved/pl/tshirt.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24169 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: T-shirt" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Project: T-shirt" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -65,12 +65,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/getinvolved/pl/volunteer.wml =================================================================== --- website/trunk/getinvolved/pl/volunteer.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/getinvolved/pl/volunteer.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -4,9 +4,9 @@ ## translation metadata -# Revision: $Revision: 24471 $ +# Revision: $Revision: 24504 $ # Translation-Priority: 4-optional -#include "head.wmi" TITLE="Tor: Volunteer" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor: Volunteer" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -58,11 +58,11 @@ <ol> <li>Stwórz prezentację, której będzie można używać na spotkaniach różnych grup na całym świecie.</li> - <li>Stwórz film o Twoim pozytywnym wykorzystaniu Tora, czym jest Tor lub jak go -używać. Kilka osób już zaczęło na <a -href="http://media.torproject.org/video/">serwerze mediów Tora</a>, <a -href="http://www.howcast.com/videos/90601-How-To-Circumvent-an-Internet-Proxy">Howcast</a> -i <a href="http://www.youtube.com/thetorproject">Youtube</a>.</li> + <li>Create a video about the positive uses of Tor, what Tor is, or how to use +it. Some have already started on <a +href="https://media.torproject.org/video/">Tor's Media server</a>, <a +href="http://www.howcast.com/videos/90601-How-To-Circumvent-an-Internet-Proxy">Howcast</a>, +and <a href="http://www.youtube.com/thetorproject">YouTube</a>.</li> <li>Stwórz plakat, lub zestaw plakatów, skupionych na jakimś motywie, np. "Tor to Wolność!"</li> <li>Stwórz projekt koszulki, który zawiera "Gratulacje! Używasz Tora!" w @@ -574,10 +574,9 @@ <a id="auditTBB"></a> <li> - <b>Audyt Paczki Tora z przeglądarką pod kątem wycieków danych</b> <br> -Priorytet: <i>Wysoki</i> <br> Poziom wysiłku: <i>Wysoki</i> <br> Poziom -umiejętności: <i>Średni</i> <br> Prawdopodobni opiekunowie: <i>Steven, -Erinn, Jacob, Andrew</i> + <b>Audit Tor Browser Bundles for data leaks</b> <br> Priority: <i>High</i> +<br> Effort Level: <i>High</i> <br> Skill Level: <i>Medium</i> <br> Likely +Mentors: <i>Erinn, Jacob, Andrew</i> <p>Paczka Tora z przeglądarką zawiera Tora, firefoksa, Polipo i interfejs użytkownika Vidalia (i opcjonalnie komunikator <a href="http://pidgin.im/">Pidgin</a>). Komponenty są prekonfigurowane do @@ -683,25 +682,24 @@ <a id="resistCensorship"></a> <li> - <b>Polepszanie zdolności Tora opierania się cenzurze</b> <br> Priorytet: -<i>Średni do wysokiego</i> <br> Poziom wysiłku: <i>Średni do wysokiego</i> -<br> Poziom umiejętności: <i>Wysoki</i> <br /> Prawdopodobni opiekunowie: -<i>Roger, Nick, Steven, Jake</i> + <b>Improving Tor's ability to resist censorship</b> <br> Priority: <i>Medium +to High</i> <br> Effort Level: <i>Medium to High</i> <br> Skill Level: +<i>High</i> <br> Likely Mentors: <i>Roger, Nick, Jake</i> <p>Wersje 0.2.1.x Tora robią <a href="<svnprojects>design-paper/blocking.html">znaczne postępy</a> w opieraniu się narodowej i firmowej cenzurze. Ale Tor ciągle potrzebuje lepszych mechanizmów w niektórych częściach projektu anty-cenzurowania.</p> - <p>Jedną z dużych kategorii jest dodawanie funkcjonalności do naszej usługi <a -href="http://gitweb.torproject.org//bridgedb.git?a=tree">bridgedb</a> -(Python). Tor chce dawać <a href="<page docs/bridges>">adresy przekaźników -mostkowych</a> użytkownikom nie mogącym bezpośrednio połączyć się z siecią -Tora, ale trwa wyścig zbrojeń między algorytmami dystrybucji adresów a -algorytmami do zbierania i blokowania adresów. Przeczytaj <a -href="<blog>bridge-distribution-strategies">nasz wpis o tym na blogu</a> -jako wprowadzenie, a potem spójrz na <a -href="http://archives.seul.org/or/dev/Dec-2009/msg00000.html">post Rogera na -or-dev</a> z grudnia, by poznać nowsze pomysły — pozostało do -zrobienia wiele pracy projektowej.</p> + <p>One huge category of work is adding features to our <a +href="https://gitweb.torproject.org/bridgedb.git?a=tree">BridgeDB</a> +service (Python). Tor aims to give out <a href="<page docs/bridges>">bridge +relay addresses</a> to users that can't reach the Tor network directly, but +there's an arms race between algorithms for distributing addresses and +algorithms for gathering and blocking them. See <a +href="<blog>bridge-distribution-strategies">our blog post on the topic</a> +as an overview, and then look at <a +href="https://lists.torproject.org/pipermail/tor-dev/2009-December/000666.html">Roger's +or-dev post</a> from December 2009 for more recent thoughts — lots of +design work remains.</p> <p>Jeśli chcesz wejść bardziej we wnętrze samego Tora (C), pomniejszym problemem, którym powinniśmy się zająć jest to, że bieżące wersje mogą nasłuchiwać połączeń tylko na jednym zestawie adres/port na raz. Istnieje <a @@ -819,9 +817,9 @@ <a id="simulateSlowConnections"></a> <li> - <b>Symulator wolnych połączeń internetowych</b> <br> Priorytet: -<i>Średni</i> <br> Poziom wysiłku: <i>Średni</i> <br> Poziom umiejętności: -<i>Średni</i> <br> Prawdopodobni opiekunowie: <i>Steven</i> + <b>Simulator for slow Internet connections</b> <br> Priority: <i>Medium</i> +<br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium</i> <br> Likely +Mentors: <i>Nick</i> <p> Wielu użytkowników Tora ma łącza internetowe niskiej jakości, dające niską przepustowość, długie czasy trwania operacji i wysoki współczynnik utraty @@ -1346,12 +1344,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/pl/index.wml =================================================================== --- website/trunk/pl/index.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/pl/index.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -7,7 +7,7 @@ ## translation metadata # Revision: $Revision: 24425 $ # Translation-Priority: 1-high -#include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="home"> <div id="content" class="clearfix"> <div id="maincol"> @@ -170,4 +170,4 @@ </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/press/pl/2008-12-19-roadmap-press-release.wml =================================================================== --- website/trunk/press/pl/2008-12-19-roadmap-press-release.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/press/pl/2008-12-19-roadmap-press-release.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 23689 $ # Translation-Priority: 4-optional -#include "head.wmi" TITLE="Tor Project: THE TOR PROJECT ANNOUNCES THREE-YEAR DEVELOPMENT ROADMAP" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Project: THE TOR PROJECT ANNOUNCES THREE-YEAR DEVELOPMENT ROADMAP" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Home » </a> <a href="<page press/press>">Prasa @@ -94,12 +94,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/press/pl/2010-03-25-tor-store-press-release.wml =================================================================== --- website/trunk/press/pl/2010-03-25-tor-store-press-release.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/press/pl/2010-03-25-tor-store-press-release.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 23689 $ # Translation-Priority: 4-optional -#include "head.wmi" TITLE="TOR PROJECT AND PRINTFECTION ANNOUNCE THE TOR STORE" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="TOR PROJECT AND PRINTFECTION ANNOUNCE THE TOR STORE" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Home » </a> <a href="<page press/press>">Prasa @@ -93,12 +93,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/press/pl/press.wml =================================================================== --- website/trunk/press/pl/press.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/press/pl/press.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24225 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Press Page" +#include "pl/head.wmi" TITLE="Tor Project: Press Page" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Home » </a> <a href="<page @@ -52,12 +52,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/projects/pl/arm.wml =================================================================== --- website/trunk/projects/pl/arm.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/projects/pl/arm.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24336 $ # Translation-Priority: 4-optional -#include "head.wmi" TITLE="Tor Project: Arm" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Tor Project: Arm" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -72,12 +72,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/projects/pl/gettor.wml =================================================================== --- website/trunk/projects/pl/gettor.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/projects/pl/gettor.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24336 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: GetTor email autoresponder" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Tor Project: GetTor email autoresponder" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -114,12 +114,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/projects/pl/projects.wml =================================================================== --- website/trunk/projects/pl/projects.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/projects/pl/projects.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24347 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Projects Overview" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Tor Project: Projects Overview" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -251,12 +251,12 @@ <div id = "sidecol"> -#include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/projects/pl/puppettor.wml =================================================================== --- website/trunk/projects/pl/puppettor.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/projects/pl/puppettor.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 23689 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Projects Overview" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Tor Project: Projects Overview" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -24,12 +24,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/projects/pl/torbrowser-details.wml =================================================================== --- website/trunk/projects/pl/torbrowser-details.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/projects/pl/torbrowser-details.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -7,7 +7,7 @@ ## translation metadata # Revision: $Revision: 23689 $ # Translation-Priority: 4-optional -#include "head.wmi" TITLE="Tor Browser Bundle: Details" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Browser Bundle: Details" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -50,12 +50,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/projects/pl/torbrowser-split.wml =================================================================== --- website/trunk/projects/pl/torbrowser-split.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/projects/pl/torbrowser-split.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -7,7 +7,7 @@ ## translation metadata # Revision: $Revision: 23689 $ # Translation-Priority: 1-high -#include "head.wmi" TITLE="Tor Browser Bundle (split edition)" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Browser Bundle (split edition)" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -181,12 +181,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/projects/pl/torbrowser.wml =================================================================== --- website/trunk/projects/pl/torbrowser.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/projects/pl/torbrowser.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -5,9 +5,9 @@ ## translation metadata -# Revision: $Revision: 24468 $ +# Revision: $Revision: 24504 $ # Translation-Priority: 1-high -#include "head.wmi" TITLE="Tor Browser Bundle" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="Tor Browser Bundle" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -45,7 +45,7 @@ lub taki, który jest przetłumaczony na Twój język? Daj nam znać!</p> <div class="center"> - <p><video id="v1" src="http://media.torproject.org/video/2009-install-and-use-tor-browser-bundle.o…" autobuffer="true" controls="controls"></video></p> + <p><video id="v1" src="https://media.torproject.org/video/2009-install-and-use-tor-browser-bundle.…" autobuffer="true" controls="controls"></video></p> </div> <a id="Download"></a> @@ -542,9 +542,10 @@ <a id="Feedback"></a> <h3><a class="anchor" href="#Feedback">Komentarze i sugestie</a></h3> - <p>Paczka Tora z przeglądarką jest w rozwoju i nie jest jeszcze ukończona. By -podyskutować o możliwych ulepszeniach i dać swój komentarz, skorzystaj z -listy wysyłkowej <a href="http://archives.seul.org/or/talk/">or-talk</a>.</p> + <p>The Tor Browser Bundle is under development and not yet complete. To +discuss improvements and submit comments, please use the <a +href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-talk">tor-talk</a> +mailing list.</p> <a id="More"></a> <h3><a class="anchor" href="#More">Więcej informacji</a></h3> @@ -575,12 +576,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/projects/pl/tordnsel.wml =================================================================== --- website/trunk/projects/pl/tordnsel.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/projects/pl/tordnsel.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 23689 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="A public TorDNSEL service" CHARSET="UTF-8" +#include "pl/head.wmi" TITLE="A public TorDNSEL service" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -97,12 +97,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/projects/pl/torweather.wml =================================================================== --- website/trunk/projects/pl/torweather.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/projects/pl/torweather.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24200 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Tor Weather" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Tor Project: Tor Weather" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -27,8 +27,8 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  @@ -36,4 +36,4 @@ -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/projects/pl/vidalia.wml =================================================================== --- website/trunk/projects/pl/vidalia.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/projects/pl/vidalia.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24289 $ # Translation-Priority: 4-optional -#include "head.wmi" TITLE="Tor Project: Vidalia" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Tor Project: Vidalia" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -149,12 +149,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/torbutton/pl/index.wml =================================================================== --- website/trunk/torbutton/pl/index.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/torbutton/pl/index.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 23793 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Torbutton" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Tor Project: Torbutton" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -125,12 +125,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/torbutton/pl/torbutton-faq.wml =================================================================== --- website/trunk/torbutton/pl/torbutton-faq.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/torbutton/pl/torbutton-faq.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 24347 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Torbutton FAQ" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Tor Project: Torbutton FAQ" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -388,12 +388,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi" Modified: website/trunk/torbutton/pl/torbutton-options.wml =================================================================== --- website/trunk/torbutton/pl/torbutton-options.wml 2011-03-31 11:17:24 UTC (rev 24515) +++ website/trunk/torbutton/pl/torbutton-options.wml 2011-03-31 11:29:51 UTC (rev 24516) @@ -6,7 +6,7 @@ ## translation metadata # Revision: $Revision: 23714 $ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Torbutton Options" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "pl/head.wmi" TITLE="Tor Project: Torbutton Options" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Start » </a> <a href="<page @@ -304,12 +304,12 @@ <div id = "sidecol"> - #include "side.wmi" -#include "info.wmi" +#include "pl/side.wmi" +#include "pl/info.wmi" </div>  </div> -#include "foot.wmi" +#include "pl/foot.wmi"

1 0

r24515: {website} update po2wml to make things work (website/trunk)
by Runa Sandvik 31 Mar '11

31 Mar '11

Author: runa Date: 2011-03-31 11:17:24 +0000 (Thu, 31 Mar 2011) New Revision: 24515 Modified: website/trunk/po2wml.sh Log: update po2wml to make things work Modified: website/trunk/po2wml.sh =================================================================== --- website/trunk/po2wml.sh 2011-03-31 09:34:20 UTC (rev 24514) +++ website/trunk/po2wml.sh 2011-03-31 11:17:24 UTC (rev 24515) @@ -124,6 +124,65 @@ echo '#include "foot.wmi"' >> "$wmldir/$subdir/$wmlfile" fi + # If the translation is Polish, include the + # correct header, menu files and footer + if [ $subdir = "pl" ] + then + # Head + orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$wmlfile"` + new_head=`echo $orig_head | sed s@head.wmi@pl/head.wmi@` + sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$wmlfile" + + # Side (not all files include this) + orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$wmlfile"` + if [ -n "$orig_side" ] + then + new_side=`echo '#include "pl/side.wmi"'` + sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$wmlfile" + fi + + # Info (not all files include this) + orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$wmlfile"` + if [ -n "$orig_info" ] + then + new_info=`echo '#include "pl/info.wmi"'` + sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$wmlfile" + fi + + # Footer + echo '#include "pl/foot.wmi"' >> "$wmldir/$subdir/$wmlfile" + fi + + # If the translation is Arabic, include the + # correct header, css, menu files and footer + if [ $subdir = "ar" ] + then + # Head + orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$wmlfile"` + temp_head=`echo $orig_head | sed s@head.wmi@ar/head.wmi@` + new_head=`echo $temp_head 'STYLESHEET="css/master-rtl.css"'` + sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$wmlfile" + + # Side (not all files include this) + orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$wmlfile"` + if [ -n "$orig_side" ] + then + new_side=`echo '#include "ar/side.wmi"'` + sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$wmlfile" + fi + + # Info (not all files include this) + orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$wmlfile"` + if [ -n "$orig_info" ] + then + new_info=`echo '#include "ar/info.wmi"'` + sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$wmlfile" + fi + + # Footer + echo '#include "ar/foot.wmi"' >> "$wmldir/$subdir/$wmlfile" + fi + # If the directory does not include sidenav.wmi, # copy it from the English directory (only if # the English directory has this file) @@ -131,7 +190,6 @@ then cp "$wmldir/en/sidenav.wmi" "$wmldir/$subdir" fi - fi } @@ -164,6 +222,64 @@ echo '#include "foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" fi + # If the translation is Polish, include the + # correct header, menu files and footer + if [ $lang = "pl" ] + then + orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + new_head=`echo $orig_head | sed s@head.wmi@pl/head.wmi@` + sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$lang/$wmlfile" + + # Side (not all files include this) + orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + if [ -n "$orig_side" ] + then + new_side=`echo '#include "pl/side.wmi"'` + sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$lang/$wmlfile" + fi + + # Info (not all files include this) + orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + if [ -n "$orig_info" ] + then + new_info=`echo '#include "pl/info.wmi"'` + sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$lang/$wmlfile" + fi + + # Footer + echo '#include "pl/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" + fi + + # If the file is an Arabic translation, include the + # correct header, css, menu files and footer + if [ $lang = "ar" ] + then + # Head + orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + temp_head=`echo $orig_head | sed s@head.wmi@ar/head.wmi@` + new_head=`echo $temp_head 'STYLESHEET="css/master-rtl.css"'` + sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$lang/$wmlfile" + + # Side (not all files include this) + orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + if [ -n "$orig_side" ] + then + new_side=`echo '#include "ar/side.wmi"'` + sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$lang/$wmlfile" + fi + + # Info (not all files include this) + orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + if [ -n "$orig_info" ] + then + new_info=`echo '#include "ar/info.wmi"'` + sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$lang/$wmlfile" + fi + + # Footer + echo '#include "ar/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" + fi + # If the directory does not include sidenav.wmi, # copy it from the English directory (only if # the English directory has this file) @@ -204,76 +320,10 @@ then subdir="pl" nosubdir - - # If the file was written, include the right - # header, menu files and footer - if [ -e "$wmldir/$subdir/$wmlfile" ] - then - # Head - orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$wmlfile"` - new_head=`echo $orig_head | sed s@head.wmi@pl/head.wmi@` - sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$wmlfile" - - # Side (not all files include this) - orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$wmlfile"` - if [ -n "$orig_side" ] - then - new_side=`echo '#include "pl/side.wmi"'` - sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$wmlfile" - fi - - # Info (not all files include this) - orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$wmlfile"` - if [ -n "$orig_info" ] - then - new_info=`echo '#include "pl/info.wmi"'` - sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$wmlfile" - fi - - # Footer - echo '#include "pl/foot.wmi"' >> "$wmldir/$subdir/$wmlfile" - fi fi - # If the file is an Arabic translation, include - # the right header, css, menu files and footer - if [ $subdir = "ar" ] - then - # Convert the file first - nosubdir - - # If it was written, do the following - if [ -e "$wmldir/$subdir/$wmlfile" ] - then - # Head - orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$wmlfile"` - temp_head=`echo $orig_head | sed s@head.wmi@ar/head.wmi@` - new_head=`echo $temp_head 'STYLESHEET="css/master-rtl.css"'` - sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$wmlfile" - - # Side (not all files include this) - orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$wmlfile"` - if [ -n "$orig_side" ] - then - new_side=`echo '#include "ar/side.wmi"'` - sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$wmlfile" - fi - - # Info (not all files include this) - orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$wmlfile"` - if [ -n "$orig_info" ] - then - new_info=`echo '#include "ar/info.wmi"'` - sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$wmlfile" - fi - - # Footer - echo '#include "ar/foot.wmi"' >> "$wmldir/$subdir/$wmlfile" - fi - fi - # Convert everything else - if [[ $subdir != "en" && $subdir != "zh_CN" && $subdir != "nb" && $subdir != "sv" && $subdir != "ar" ]] + if [[ $subdir != "en" && $subdir != "zh_CN" && $subdir != "nb" && $subdir != "sv" && $subdir != "pl_PL" ]] then nosubdir fi @@ -304,77 +354,10 @@ then lang="pl" subdir - - # If the file was written, include the right - # header, menu files and footer - if [ -e "$wmldir/$subdir/$lang/$wmlfile" ] - then - # Head - orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` - new_head=`echo $orig_head | sed s@head.wmi@pl/head.wmi@` - sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$lang/$wmlfile" - - # Side (not all files include this) - orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` - if [ -n "$orig_side" ] - then - new_side=`echo '#include "pl/side.wmi"'` - sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$lang/$wmlfile" - fi - - # Info (not all files include this) - orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` - if [ -n "$orig_info" ] - then - new_info=`echo '#include "pl/info.wmi"'` - sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$lang/$wmlfile" - fi - - # Footer - echo '#include "pl/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" - fi - fi - # If the file is an Arabic translation, include the - # right header, css, menu files and footer - if [ $lang = "ar" ] - then - # Convert the file first - subdir - - # If it was written, do the following - if [ -e "$wmldir/$subdir/$lang/$wmlfile" ] - then - # Head - orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` - temp_head=`echo $orig_head | sed s@head.wmi@ar/head.wmi@` - new_head=`echo $temp_head 'STYLESHEET="css/master-rtl.css"'` - sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$lang/$wmlfile" - - # Side (not all files include this) - orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` - if [ -n "$orig_side" ] - then - new_side=`echo '#include "ar/side.wmi"'` - sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$lang/$wmlfile" - fi - - # Info (not all files include this) - orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` - if [ -n "$orig_info" ] - then - new_info=`echo '#include "ar/info.wmi"'` - sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$lang/$wmlfile" - fi - - # Footer - echo '#include "ar/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" - fi - fi - # Convert everything else - if [[ $lang != "en" && $lang != "zh_CN" && $lang != "nb" && $lang != "sv" && $lang != "ar" ]] + if [[ $lang != "en" && $lang != "zh_CN" && $lang != "nb" && $lang != "sv" && $lang != "pl_PL" ]] then subdir fi

1 0

r24514: {website} replace the line I changed in Makefile (website/trunk)
by Runa Sandvik 31 Mar '11

31 Mar '11

Author: runa Date: 2011-03-31 09:34:20 +0000 (Thu, 31 Mar 2011) New Revision: 24514 Modified: website/trunk/Makefile Log: replace the line I changed in Makefile Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2011-03-30 15:06:36 UTC (rev 24513) +++ website/trunk/Makefile 2011-03-31 09:34:20 UTC (rev 24514) @@ -10,7 +10,7 @@ # 4. make # 5. ./publish -export TORGIT=/home/runa/test/tor/.git +export TORGIT=/home/phobos/onionrouter/onionrouter/tor.git/.git export STABLETAG=tor-0.2.2.23-alpha export DEVTAG=tor-0.2.2.23-alpha

1 0

[torperf/master] Instantiate listener before registering events.
by karsten＠torproject.org 31 Mar '11

31 Mar '11

commit b445b050801cb085e80cd8111b4ba0ad2d5739f3 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Mar 31 09:54:28 2011 +0200 Instantiate listener before registering events. This patch avoids a race condition that occurred in 2 out of 16 cases. --- entrycons.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/entrycons.py b/entrycons.py index d1c8f34..fb89f1f 100755 --- a/entrycons.py +++ b/entrycons.py @@ -120,11 +120,11 @@ def main(): conn = TorCtl.connect(HOST, port) - conn.set_events(["NEWCONSENSUS", "NEWDESC", "NS", "GUARD"]) conn.set_option("StrictEntryNodes", "1") conn.set_option("UseEntryNodes", "1") EntryTracker(conn, speed) + conn.set_events(["NEWCONSENSUS", "NEWDESC", "NS", "GUARD"]) conn.block_until_close() if __name__ == '__main__':

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 30 Mar '11

30 Mar '11

commit ee871e7a0e9ce9b1df8b8f4add06e8c193b9544a Merge: 18126f9 65eb0e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 30 14:55:50 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/common/compat.h src/or/circuitlist.c src/or/circuituse.c src/or/or.h src/or/rephist.c changes/cbt_hi_res | 7 +++ changes/cbt_parallel_intro | 4 ++ changes/zlib_aint_openssl | 3 + configure.in | 8 ++-- src/common/compat.h | 47 ++++++++++++++++++++--- src/or/circuitlist.c | 4 +- src/or/circuituse.c | 91 ++++++++++++++++++++++++++------------------ src/or/circuituse.h | 2 +- src/or/main.c | 4 +- 9 files changed, 119 insertions(+), 51 deletions(-) diff --cc src/common/compat.h index db352de,550c08b..6d2565a --- a/src/common/compat.h +++ b/src/common/compat.h @@@ -335,17 -333,49 +335,52 @@@ struct tm *tor_localtime_r(const time_ struct tm *tor_gmtime_r(const time_t *timep, struct tm *result); #endif - /** Return true iff the tvp is related to uvp according to the relational - * operator cmp. Recognized values for cmp are ==, <=, <, >=, and >. */ - #define tor_timercmp(tvp, uvp, cmp) \ - (((tvp)->tv_sec == (uvp)->tv_sec) ? \ - ((tvp)->tv_usec cmp (uvp)->tv_usec) : \ - ((tvp)->tv_sec cmp (uvp)->tv_sec)) + #ifndef timeradd + /** Replacement for timeradd on platforms that do not have it: sets tvout to + * the sum of tv1 and tv2. */ + #define timeradd(tv1,tv2,tvout) \ + do { \ + (tvout)->tv_sec = (tv1)->tv_sec + (tv2)->tv_sec; \ + (tvout)->tv_usec = (tv2)->tv_usec + (tv2)->tv_usec; \ + if ((tvout)->tv_usec >= 1000000) { \ + (tvout)->tv_usec -= 1000000; \ + (tvout)->tv_sec++; \ + } \ + } while (0) + #endif + + #ifndef timersub + /** Replacement for timersub on platforms that do not have it: sets tvout to + * tv1 minus tv2. */ + #define timersub(tv1,tv2,tvout) \ + do { \ + (tvout)->tv_sec = (tv1)->tv_sec - (tv2)->tv_sec; \ + (tvout)->tv_usec = (tv2)->tv_usec - (tv2)->tv_usec; \ + if ((tvout)->tv_usec < 0) { \ + (tvout)->tv_usec += 1000000; \ + (tvout)->tv_sec--; \ + } \ + } while (0) + #endif + + #ifndef timercmp + /** Replacement for timersub on platforms that do not have it: returns true + * iff the relational operator "op" makes the expression tv1 op tv2 true. + * + * Note that while this definition should work for all boolean opeators, some + * platforms' native timercmp definitions do not support >=, <=, or ==. So + * don't use those. + */ + #define timercmp(tv1,tv2,op) \ + (((tv1)->tv_sec == (tv2)->tv_sec) ? \ + ((tv1)->tv_usec op (tv2)->tv_usec) : \ + ((tv1)->tv_sec op (tv2)->tv_sec)) + #endif /* ===== File compatibility */ +int tor_open_cloexec(const char *path, int flags, unsigned mode); +FILE *tor_fopen_cloexec(const char *path, const char *mode); + int replace_file(const char *from, const char *to); int touch_file(const char *fname);

1 0

[tor/master] Use cbt to tell when to launch parallel intro circuit
by nickm＠torproject.org 30 Mar '11

30 Mar '11

commit 65eb0e41ac05fd65bf8bef87426886fec45f7ca4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 26 01:39:11 2011 -0400 Use cbt to tell when to launch parallel intro circuit Implement feature from trac #2799 --- changes/cbt_parallel_intro | 4 ++++ src/or/circuituse.c | 13 ++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/changes/cbt_parallel_intro b/changes/cbt_parallel_intro new file mode 100644 index 0000000..44e377f --- /dev/null +++ b/changes/cbt_parallel_intro @@ -0,0 +1,4 @@ + o Minor features + - Use computed circuit-build timeouts to decide when to launch + parallel introdution circuits. (Previously, we would retry + after 15 seconds.) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index ac4bba5..447ec84 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -204,7 +204,7 @@ circuit_get_best(edge_connection_t *conn, int must_be_open, uint8_t purpose, int need_uptime, int need_internal) { circuit_t *circ, *best=NULL; - time_t now = time(NULL); + struct timeval now; int intro_going_on_but_too_old = 0; tor_assert(conn); @@ -213,17 +213,16 @@ circuit_get_best(edge_connection_t *conn, int must_be_open, uint8_t purpose, purpose == CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT || purpose == CIRCUIT_PURPOSE_C_REND_JOINED); + tor_gettimeofday(&now); + for (circ=global_circuitlist;circ;circ = circ->next) { if (!circuit_is_acceptable(circ,conn,must_be_open,purpose, - need_uptime,need_internal,now)) + need_uptime,need_internal,now.tv_sec)) continue; -/* XXX022 make this 15 be a function of circuit finishing times we've - * seen lately, a la Fallon Chen's GSoC work -RD */ -#define REND_PARALLEL_INTRO_DELAY 15 if (purpose == CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT && - !must_be_open && circ->state != CIRCUIT_STATE_OPEN && - circ->timestamp_created.tv_sec + REND_PARALLEL_INTRO_DELAY < now) { + !must_be_open && circ->state != CIRCUIT_STATE_OPEN && + tv_mdiff(&now, &circ->timestamp_created) > circ_times.timeout_ms) { intro_going_on_but_too_old = 1; continue; }

1 0

[tor/master] Fix configure.in zlib package names.
by nickm＠torproject.org 30 Mar '11

30 Mar '11

commit 3a7cee9d2984126ef8378657d6200f711eb58517 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Feb 15 02:15:42 2011 +0100 Fix configure.in zlib package names. --- changes/zlib_aint_openssl | 3 +++ configure.in | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/changes/zlib_aint_openssl b/changes/zlib_aint_openssl new file mode 100644 index 0000000..dd8e10a --- /dev/null +++ b/changes/zlib_aint_openssl @@ -0,0 +1,3 @@ + o Minor bugfixes + - When warning about missing zlib development packages, give the + correct package names. Bugfix on 0.2.0.1-alpha. diff --git a/configure.in b/configure.in index 7cdb330..1fddaca 100644 --- a/configure.in +++ b/configure.in @@ -336,10 +336,10 @@ AC_SUBST(TOR_OPENSSL_LIBS) dnl ------------------------------------------------------ dnl Where do you live, zlib? And how do we call you? -tor_openssl_pkg_redhat="zlib" -tor_openssl_pkg_debian="zlib1g" -tor_openssl_devpkg_redhat="zlib-devel" -tor_openssl_devpkg_debian="zlib1g-dev" +tor_zlib_pkg_redhat="zlib" +tor_zlib_pkg_debian="zlib1g" +tor_zlib_devpkg_redhat="zlib-devel" +tor_zlib_devpkg_debian="zlib1g-dev" TOR_SEARCH_LIBRARY(zlib, $tryzlibdir, [-lz], [#include <zlib.h>],

1 0

[tor/master] Implement replacements for timer(add, cmp, sub) on platforms lacking them.
by nickm＠torproject.org 30 Mar '11

30 Mar '11

commit 5eaba5ac2128eebf095441e23b6b7516ce35dd5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 30 14:29:57 2011 -0400 Implement replacements for timer(add,cmp,sub) on platforms lacking them. --- src/common/compat.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/src/common/compat.h b/src/common/compat.h index 35829e1..550c08b 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -333,6 +333,48 @@ struct tm *tor_localtime_r(const time_t *timep, struct tm *result); struct tm *tor_gmtime_r(const time_t *timep, struct tm *result); #endif +#ifndef timeradd +/** Replacement for timeradd on platforms that do not have it: sets tvout to + * the sum of tv1 and tv2. */ +#define timeradd(tv1,tv2,tvout) \ + do { \ + (tvout)->tv_sec = (tv1)->tv_sec + (tv2)->tv_sec; \ + (tvout)->tv_usec = (tv2)->tv_usec + (tv2)->tv_usec; \ + if ((tvout)->tv_usec >= 1000000) { \ + (tvout)->tv_usec -= 1000000; \ + (tvout)->tv_sec++; \ + } \ + } while (0) +#endif + +#ifndef timersub +/** Replacement for timersub on platforms that do not have it: sets tvout to + * tv1 minus tv2. */ +#define timersub(tv1,tv2,tvout) \ + do { \ + (tvout)->tv_sec = (tv1)->tv_sec - (tv2)->tv_sec; \ + (tvout)->tv_usec = (tv2)->tv_usec - (tv2)->tv_usec; \ + if ((tvout)->tv_usec < 0) { \ + (tvout)->tv_usec += 1000000; \ + (tvout)->tv_sec--; \ + } \ + } while (0) +#endif + +#ifndef timercmp +/** Replacement for timersub on platforms that do not have it: returns true + * iff the relational operator "op" makes the expression tv1 op tv2 true. + * + * Note that while this definition should work for all boolean opeators, some + * platforms' native timercmp definitions do not support >=, <=, or ==. So + * don't use those. + */ +#define timercmp(tv1,tv2,op) \ + (((tv1)->tv_sec == (tv2)->tv_sec) ? \ + ((tv1)->tv_usec op (tv2)->tv_usec) : \ + ((tv1)->tv_sec op (tv2)->tv_sec)) +#endif + /* ===== File compatibility */ int replace_file(const char *from, const char *to); int touch_file(const char *fname);

1 0

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

30 Mar '11

commit 22f7042b9184d4463429072d788d52f4fc75e866 Merge: 4762118 3a7cee9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 28 17:49:34 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 changes/zlib_aint_openssl | 3 +++ configure.in | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-)

1 0