- tor-commits - lists.torproject.org

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] 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] 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] 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] Use timevals, not time_t, when expiring circuits.
by nickm＠torproject.org 30 Mar '11

30 Mar '11

commit aa950e6c48471f00ff9497fa4e9fad1c71e75868 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 26 01:34:42 2011 -0400 Use timevals, not time_t, when expiring circuits. We've got millisecond timers now, we might as well use them. This change won't actually make circuits get expiered with microsecond precision, since we only call the expiry functions once per second. Still, it should avoid the situation where we have a circuit get expired too early because of rounding. A couple of the expiry functions now call tor_gettimeofday: this should be cheap since we're only doing it once per second. If it gets to be called more often, though, we should onsider having the current time be an argument again. --- changes/cbt_hi_res | 7 ++++ src/or/circuitbuild.c | 2 +- src/or/circuitlist.c | 8 ++-- src/or/circuituse.c | 81 ++++++++++++++++++++++++++++++------------------- src/or/circuituse.h | 2 +- src/or/main.c | 4 ++- src/or/or.h | 3 +- src/or/rephist.c | 4 +- 8 files changed, 69 insertions(+), 42 deletions(-) diff --git a/changes/cbt_hi_res b/changes/cbt_hi_res new file mode 100644 index 0000000..c0df118 --- /dev/null +++ b/changes/cbt_hi_res @@ -0,0 +1,7 @@ + o Minor features + - When expiring circuits, use microsecond timers rather than one-second + timers. This can avoid an unpleasant situation where a circuit is + launched near the end of one second and expired right near the + beginning of the next, and prevent fluctuations in circuit timeout + values. + diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 83ac7a5..37b761f 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2041,7 +2041,7 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) struct timeval end; long timediff; tor_gettimeofday(&end); - timediff = tv_mdiff(&circ->_base.highres_created, &end); + timediff = tv_mdiff(&circ->_base.timestamp_created, &end); /* * If the circuit build time is much greater than we would have cut diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index b4f5f45..d1fea37 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -398,8 +398,7 @@ circuit_initial_package_window(void) static void init_circuit_base(circuit_t *circ) { - circ->timestamp_created = time(NULL); - tor_gettimeofday(&circ->highres_created); + tor_gettimeofday(&circ->timestamp_created); circ->package_window = circuit_initial_package_window(); circ->deliver_window = CIRCWINDOW_START; @@ -609,9 +608,10 @@ circuit_dump_details(int severity, circuit_t *circ, int conn_array_index, const char *type, int this_circid, int other_circid) { log(severity, LD_CIRC, "Conn %d has %s circuit: circID %d (other side %d), " - "state %d (%s), born %d:", + "state %d (%s), born %ld:", conn_array_index, type, this_circid, other_circid, circ->state, - circuit_state_to_string(circ->state), (int)circ->timestamp_created); + circuit_state_to_string(circ->state), + (long)circ->timestamp_created.tv_sec); if (CIRCUIT_IS_ORIGIN(circ)) { /* circ starts at this node */ circuit_log_path(severity, LD_CIRC, TO_ORIGIN_CIRCUIT(circ)); } diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 8d9d115..ac4bba5 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -31,7 +31,7 @@ extern circuit_t *global_circuitlist; /* from circuitlist.c */ /********* END VARIABLES ************/ -static void circuit_expire_old_circuits_clientside(time_t now); +static void circuit_expire_old_circuits_clientside(void); static void circuit_increment_failure_count(void); /** Return 1 if <b>circ</b> could be returned by circuit_get_best(). @@ -162,7 +162,7 @@ circuit_is_better(circuit_t *a, circuit_t *b, uint8_t purpose) return 1; } else { if (a->timestamp_dirty || - a->timestamp_created > b->timestamp_created) + timercmp(&a->timestamp_created, &b->timestamp_created, >)) return 1; if (CIRCUIT_IS_ORIGIN(b) && TO_ORIGIN_CIRCUIT(b)->build_state->is_internal) @@ -223,7 +223,7 @@ circuit_get_best(edge_connection_t *conn, int must_be_open, uint8_t purpose, #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 + REND_PARALLEL_INTRO_DELAY < now) { + circ->timestamp_created.tv_sec + REND_PARALLEL_INTRO_DELAY < now) { intro_going_on_but_too_old = 1; continue; } @@ -275,22 +275,38 @@ circuit_conforms_to_options(const origin_circuit_t *circ, * at least CircuitBuildTimeout seconds ago. */ void -circuit_expire_building(time_t now) +circuit_expire_building(void) { circuit_t *victim, *next_circ = global_circuitlist; /* circ_times.timeout_ms and circ_times.close_ms are from * circuit_build_times_get_initial_timeout() if we haven't computed * custom timeouts yet */ - time_t general_cutoff = now - tor_lround(circ_times.timeout_ms/1000); - time_t begindir_cutoff = now - tor_lround(circ_times.timeout_ms/2000); - time_t fourhop_cutoff = now - tor_lround(4*circ_times.timeout_ms/3000); - time_t cannibalize_cutoff = now - tor_lround(circ_times.timeout_ms/2000); - time_t close_cutoff = now - tor_lround(circ_times.close_ms/1000); - time_t introcirc_cutoff = begindir_cutoff; + struct timeval general_cutoff, begindir_cutoff, fourhop_cutoff, + cannibalize_cutoff, close_cutoff, extremely_old_cutoff; + struct timeval now; + struct timeval introcirc_cutoff; cpath_build_state_t *build_state; + tor_gettimeofday(&now); +#define SET_CUTOFF(target, msec) do { \ + long ms = tor_lround(msec); \ + struct timeval diff; \ + diff.tv_sec = ms / 1000; \ + diff.tv_usec = (ms % 1000) * 1000; \ + timersub(&now, &diff, &target); \ + } while (0) + + SET_CUTOFF(general_cutoff, circ_times.timeout_ms); + SET_CUTOFF(begindir_cutoff, circ_times.timeout_ms / 2.0); + SET_CUTOFF(fourhop_cutoff, circ_times.timeout_ms * (4/3.0)); + SET_CUTOFF(cannibalize_cutoff, circ_times.timeout_ms / 2.0); + SET_CUTOFF(close_cutoff, circ_times.close_ms); + SET_CUTOFF(extremely_old_cutoff, circ_times.close_ms*2 + 1000); + + introcirc_cutoff = begindir_cutoff; + while (next_circ) { - time_t cutoff; + struct timeval cutoff; victim = next_circ; next_circ = next_circ->next; if (!CIRCUIT_IS_ORIGIN(victim) || /* didn't originate here */ @@ -312,7 +328,7 @@ circuit_expire_building(time_t now) else cutoff = general_cutoff; - if (victim->timestamp_created > cutoff) + if (timercmp(&victim->timestamp_created, &cutoff, >)) continue; /* it's still young, leave it alone */ #if 0 @@ -358,7 +374,7 @@ circuit_expire_building(time_t now) * because that's set when they switch purposes */ if (TO_ORIGIN_CIRCUIT(victim)->rend_data || - victim->timestamp_dirty > cutoff) + victim->timestamp_dirty > cutoff.tv_sec) continue; break; case CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED: @@ -367,7 +383,7 @@ circuit_expire_building(time_t now) * make an introduction attempt. so timestamp_dirty * will reflect the time since the last attempt. */ - if (victim->timestamp_dirty > cutoff) + if (victim->timestamp_dirty > cutoff.tv_sec) continue; break; } @@ -407,15 +423,15 @@ circuit_expire_building(time_t now) * it off at, we probably had a suspend event along this codepath, * and we should discard the value. */ - if (now - victim->timestamp_created > 2*circ_times.close_ms/1000+1) { + if (timercmp(&victim->timestamp_created, &extremely_old_cutoff, <)) { log_notice(LD_CIRC, "Extremely large value for circuit build timeout: %lds. " "Assuming clock jump. Purpose %d", - (long)(now - victim->timestamp_created), + (long)(now.tv_sec - victim->timestamp_created.tv_sec), victim->purpose); } else if (circuit_build_times_count_close(&circ_times, first_hop_succeeded, - victim->timestamp_created)) { + victim->timestamp_created.tv_sec)) { circuit_build_times_set_timeout(&circ_times); } } @@ -636,7 +652,7 @@ circuit_build_needed_circs(time_t now) time_to_new_circuit = now + options->NewCircuitPeriod; if (proxy_mode(get_options())) addressmap_clean(now); - circuit_expire_old_circuits_clientside(now); + circuit_expire_old_circuits_clientside(); #if 0 /* disable for now, until predict-and-launch-new can cull leftovers */ circ = circuit_get_youngest_clean_open(CIRCUIT_PURPOSE_C_GENERAL); @@ -725,17 +741,20 @@ circuit_detach_stream(circuit_t *circ, edge_connection_t *conn) * for too long and has no streams on it: mark it for close. */ static void -circuit_expire_old_circuits_clientside(time_t now) +circuit_expire_old_circuits_clientside(void) { circuit_t *circ; - time_t cutoff; + struct timeval cutoff, now; + + tor_gettimeofday(&now); + cutoff = now; if (circuit_build_times_needs_circuits(&circ_times)) { /* Circuits should be shorter lived if we need more of them * for learning a good build timeout */ - cutoff = now - IDLE_TIMEOUT_WHILE_LEARNING; + cutoff.tv_sec -= IDLE_TIMEOUT_WHILE_LEARNING; } else { - cutoff = now - get_options()->CircuitIdleTimeout; + cutoff.tv_sec -= get_options()->CircuitIdleTimeout; } for (circ = global_circuitlist; circ; circ = circ->next) { @@ -745,15 +764,15 @@ circuit_expire_old_circuits_clientside(time_t now) * on it, mark it for close. */ if (circ->timestamp_dirty && - circ->timestamp_dirty + get_options()->MaxCircuitDirtiness < now && + circ->timestamp_dirty + get_options()->MaxCircuitDirtiness < now.tv_sec && !TO_ORIGIN_CIRCUIT(circ)->p_streams /* nothing attached */ ) { - log_debug(LD_CIRC, "Closing n_circ_id %d (dirty %d secs ago, " + log_debug(LD_CIRC, "Closing n_circ_id %d (dirty %ld sec ago, " "purpose %d)", - circ->n_circ_id, (int)(now - circ->timestamp_dirty), + circ->n_circ_id, (long)(now.tv_sec - circ->timestamp_dirty), circ->purpose); circuit_mark_for_close(circ, END_CIRC_REASON_FINISHED); } else if (!circ->timestamp_dirty && circ->state == CIRCUIT_STATE_OPEN) { - if (circ->timestamp_created < cutoff) { + if (timercmp(&circ->timestamp_created, &cutoff, <)) { if (circ->purpose == CIRCUIT_PURPOSE_C_GENERAL || circ->purpose == CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT || circ->purpose == CIRCUIT_PURPOSE_S_ESTABLISH_INTRO || @@ -762,8 +781,8 @@ circuit_expire_old_circuits_clientside(time_t now) circ->purpose <= CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED) || circ->purpose == CIRCUIT_PURPOSE_S_CONNECT_REND) { log_debug(LD_CIRC, - "Closing circuit that has been unused for %ld seconds.", - (long)(now - circ->timestamp_created)); + "Closing circuit that has been unused for %ld msec.", + tv_mdiff(&circ->timestamp_created, &now)); circuit_mark_for_close(circ, END_CIRC_REASON_FINISHED); } else if (!TO_ORIGIN_CIRCUIT(circ)->is_ancient) { /* Server-side rend joined circuits can end up really old, because @@ -775,9 +794,9 @@ circuit_expire_old_circuits_clientside(time_t now) circ->purpose != CIRCUIT_PURPOSE_S_INTRO) { log_notice(LD_CIRC, "Ancient non-dirty circuit %d is still around after " - "%ld seconds. Purpose: %d", + "%ld milliseconds. Purpose: %d", TO_ORIGIN_CIRCUIT(circ)->global_identifier, - (long)(now - circ->timestamp_created), + tv_mdiff(&circ->timestamp_created, &now), circ->purpose); /* FFFF implement a new circuit_purpose_to_string() so we don't * just print out a number for circ->purpose */ @@ -1123,7 +1142,7 @@ circuit_launch_by_extend_info(uint8_t purpose, /* reset the birth date of this circ, else expire_building * will see it and think it's been trying to build since it * began. */ - circ->_base.timestamp_created = time(NULL); + tor_gettimeofday(&circ->_base.timestamp_created); switch (purpose) { case CIRCUIT_PURPOSE_C_ESTABLISH_REND: case CIRCUIT_PURPOSE_S_ESTABLISH_INTRO: diff --git a/src/or/circuituse.h b/src/or/circuituse.h index 1a604b4..a121099 100644 --- a/src/or/circuituse.h +++ b/src/or/circuituse.h @@ -12,7 +12,7 @@ #ifndef _TOR_CIRCUITUSE_H #define _TOR_CIRCUITUSE_H -void circuit_expire_building(time_t now); +void circuit_expire_building(void); void circuit_remove_handled_ports(smartlist_t *needed_ports); int circuit_stream_is_being_handled(edge_connection_t *conn, uint16_t port, int min); diff --git a/src/or/main.c b/src/or/main.c index 214a4fa..83d1e1e 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1150,7 +1150,9 @@ run_scheduled_events(time_t now) * We do this before step 4, so it can try building more if * it's not comfortable with the number of available circuits. */ - circuit_expire_building(now); + /* XXXX022 If our circuit build timeout is much lower than a second, maybe + we should do this more often? */ + circuit_expire_building(); /** 3b. Also look at pending streams and prune the ones that 'began' * a long time ago but haven't gotten a 'connected' yet. diff --git a/src/or/or.h b/src/or/or.h index e3e01cf..3cadd31 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2126,10 +2126,9 @@ typedef struct circuit_t { * length ONIONSKIN_CHALLENGE_LEN. */ char *n_conn_onionskin; - time_t timestamp_created; /**< When was this circuit created? */ + struct timeval timestamp_created; /**< When was the circuit created? */ time_t timestamp_dirty; /**< When the circuit was first used, or 0 if the * circuit is clean. */ - struct timeval highres_created; /**< When exactly was the circuit created? */ uint16_t marked_for_close; /**< Should we close this circuit at the end of * the main loop? (If true, holds the line number diff --git a/src/or/rephist.c b/src/or/rephist.c index 58e8ff0..06704cf 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2356,9 +2356,9 @@ rep_hist_buffer_stats_add_circ(circuit_t *circ, time_t end_of_interval) return; if (!circuits_for_buffer_stats) circuits_for_buffer_stats = smartlist_create(); - start_of_interval = circ->timestamp_created > + start_of_interval = circ->timestamp_created.tv_sec > start_of_buffer_stats_interval ? - circ->timestamp_created : + circ->timestamp_created.tv_sec : start_of_buffer_stats_interval; interval_length = (int) (end_of_interval - start_of_interval); stat = tor_malloc_zero(sizeof(circ_buffer_stats_t));

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