[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] r22143: {website} new and updated translations for the website (in website/trunk: bms de docs/el docs/es docs/fr docs/pl docs/ru et fr nl no pl projects/fr ru torbutton/fr zh-cn)



Author: runa
Date: 2010-04-08 06:45:16 +0000 (Thu, 08 Apr 2010)
New Revision: 22143

Added:
   website/trunk/docs/el/tor-doc-osx.wml
   website/trunk/docs/ru/N900.wml
   website/trunk/docs/ru/debian-vidalia.wml
   website/trunk/docs/ru/debian.wml
   website/trunk/docs/ru/rpms.wml
Modified:
   website/trunk/bms/faq.wml
   website/trunk/de/sponsors.wml
   website/trunk/docs/es/tor-doc-relay.wml
   website/trunk/docs/fr/debian.wml
   website/trunk/docs/fr/tor-doc-relay.wml
   website/trunk/docs/pl/tor-doc-relay.wml
   website/trunk/docs/ru/tor-doc-relay.wml
   website/trunk/docs/ru/tor-doc-unix.wml
   website/trunk/docs/ru/tor-doc-web.wml
   website/trunk/docs/ru/tor-doc-windows.wml
   website/trunk/et/download.wml
   website/trunk/fr/download.wml
   website/trunk/fr/faq.wml
   website/trunk/fr/trademark-faq.wml
   website/trunk/fr/volunteer.wml
   website/trunk/nl/download.wml
   website/trunk/no/download.wml
   website/trunk/pl/download.wml
   website/trunk/pl/faq.wml
   website/trunk/pl/tshirt.wml
   website/trunk/projects/fr/index.wml
   website/trunk/ru/download.wml
   website/trunk/ru/faq.wml
   website/trunk/torbutton/fr/faq.wml
   website/trunk/zh-cn/download.wml
Log:
new and updated translations for the website

Modified: website/trunk/bms/faq.wml
===================================================================
--- website/trunk/bms/faq.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/bms/faq.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -733,8 +733,8 @@
 </p>
 
 <ol>
-<li><a href="https://amnesia.boum.org/";>amnesia LiveCD/USB</a> is a Live System
-aimed at preserving your privacy and anonymity:
+<li><a href="https://amnesia.boum.org/";>The (Amnesic) Incognito Live System</a>
+is a Live System aimed at preserving your privacy and anonymity:
 <ul>
 <li> All outgoing connections to the Internet are forced to go through the Tor
 network.</li>
@@ -744,12 +744,6 @@
 <li> It's based upon Debian gnu/linux and comes with the GNOME desktop
 environment.</li>
 </ul>
-<li><a href="http://incognito.anonymityanywhere.com/";>Incognito LiveCD/USB</a>
-ááá ááááááááááááááááááááááááááá(Firefox, IRC, Mail áááááááá)
-áááááááááááááááá Tor ááááááááááá áááááááááááááááááááááááááááááá
-ááááááááááááááááá áááá ááááááááááááááááá ááááááááá áááááááááááá
-ááááááááááááá ááááááááááá ááááááááááááááááááááááá ááááááááááááááá
-áááááááááááááááá ááá áááááá USB ááááááá áááááááááááááááááá TorK ááááááááááá</li>
 <li><a href="http://tork.sourceforge.net/wiki/index.php/LiveCD";>TorK LiveCD</a>
 ááá Knoppix ááááááá áááááááááá ááááááááááááááááá ááááááááááááááááááá ááá
 áááááááá ááááááááááááááááááá ááááááááá áááááááááááááááááááá ááááááá TorK áá

Modified: website/trunk/de/sponsors.wml
===================================================================
--- website/trunk/de/sponsors.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/de/sponsors.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -13,10 +13,11 @@
 <h2>Tor: Sponsoren</h2>
 <div class="underline"></div>
 <p>
-The Tor Project's <a href="<page torusers>">diversity of users</a> means we
-have a diversity of funding sources too &mdash; and we're eager to diversify
-even further! Our sponsorships are divided into levels based on total
-funding received:
+Die <a href="<page torusers>">verschiedenen Benutzergruppen</a> des Tor
+Projektes fÃhren dazu, dass wir ebenfalls ganz unterschiedliche
+Einnahmequellen haben, und es ist uns wichtig, diese weiter zu
+diversifizieren! Unsere Sponsoren kÃnnen nach der HÃhe des erhaltenen Geldes
+unterteilt werden:
 </p>
 
 <h3><i>Magnoliophyta</i> (Ãber eine Million Dollar)</h3>
@@ -61,8 +62,9 @@
   </ul>
 
 <h3>Bisherige Sponsoren</h3>
-<p>We greatly appreciate the support provided by our past sponsors in keeping
-the pre-501(c)(3) Tor Project progressing through our ambitious goals</p>
+<p>Wir sind unseren frÃheren Sponsoren wahnsinnig dankbar, dass sie das Tor
+Projekt vor dem Erhalt des 501(c)(3) Statuses fÃr unsere ambitionierten
+Ziele unterstÃtzt haben.</p>
 	<ul>
 		<li><a href="https://www.eff.org/";>Electronic Frontier Foundation</a>
 (2004-2005)</li>
@@ -75,10 +77,11 @@
 href="http://seclab.cs.rice.edu/lab/2005/08/01/seclab-awarded-grant-to-study-security-of-p2p/";>NSF
 via Rice UniversitÃt</a> (2006-2007)</li>
 	</ul>
-<p>Thank you to all the people and groups who have made Tor possible so far,
-and thank you especially to the individual volunteers who have made
-non-financial contributions: coding, testing, documenting, educating,
-researching, and running the relays that make up the Tor network.
+<p>Grosser Dank geht an alle Personen und Gruppen, die Tor bisher ermÃglicht
+haben. Ganz besonders bedanken mÃchten wir uns bei den einzelnen
+Freiwilligen, welche nicht-monetÃre UnterstÃtzung geleistet haben:
+Programmieren, Testen, Dokumentieren, Ausbildung, Forschung und Betreiben
+der Tor Knoten aus denen dieses Netzwerk besteht.
 </p>
 
 </div>

Added: website/trunk/docs/el/tor-doc-osx.wml
===================================================================
--- website/trunk/docs/el/tor-doc-osx.wml	                        (rev 0)
+++ website/trunk/docs/el/tor-doc-osx.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -0,0 +1,211 @@
+
+
+
+
+
+
+## translation metadata
+# Revision: $Revision$
+# Translation-Priority: 2-medium
+#include "head.wmi" TITLE="Tor: Mac OS X Install Instructions" CHARSET="UTF-8"
+<div class="center">
+
+<div class="main-column">
+
+<h1>ÎÎÏÎÎÎÏÎ ÏÎÏ ÏÏÎÎÏÎÎÎÎÏÎÏ-ÏÎÎÎÏÎ <a href="<page index>">Tor</a> ÏÎ Mac OS X</h1>
+<br />
+
+<p>
+<b>ÎÏÏÎÏ ÎÎ ÎÎÎÎÎÎÏ ÎÎÎÎÏÎÏÏÎÏÎÏ ÎÎÏÏ ÏÎÎÎÏÎ Tor ÎÎÎÎÎ ÎÎÎ Mac OS X.  ÎÎ
+ÎÏÎÎÏÎÎÎÏÎ ÎÎ ÎÎÎÎÎÏÎÎÎÎÎÏÎ ÏÎÎ ÎÏÎÎÎÏÎÏÎÎ ÏÎÏ ÎÎÎÏÏÎÏ ÎÎÎ ÎÎÎÎÏÏ ÏÏÏÎ ÎÎ
+ÎÎÎÏÏÏÏÎÎÎ ÏÎ ÎÎÎÏÏÎ (ÏÎÏÎÎÎÎÎÏÎÎ ÎÎ ÏÎ ÎÎÎÎÏÎ), ÎÎÎÎÎÏÏÎ ÏÎÎ ÎÎÎÎÏ <a
+href="<page docs/tordoc-relay>">ÎÏÎÎÎÎÎÎÏÎÏ ÎÎÎÎ ÎÎÎÎÎÎÎÏÎ</a>.</b>
+</p>
+
+<hr /> <a id="installing"></a>
+<h2><a class="anchor" href="#installing">ÎÎÎÎ ÎÏÏÏÎ: ÎÎÏÎ ÎÎÎ ÎÎÎÎÏÎÏÏÎÏÎ ÏÎÏ
+Tor</a></h2>
+<br />
+
+<p>
+Î ÎÎÎÎÏÎÏÏÎÏÎ ÎÎÎ Mac OS X ÏÎÏÎÎÏÎÎ ÏÎ <a href="<page index>">Tor</a>, <a
+href="<page vidalia/index>">Vidalia</a> (a graphical interface for Tor), <a
+href="<page torbutton/index>">Torbutton</a>, ÎÎÎ <a
+href="http://www.pps.jussieu.fr/~jch/software/polipo/";>Polipo</a> (ÎÎÎÏ
+ÏÎÎÏÎÎÎÏÏÎÎÏ ÎÎÎÎÎÎÎÏÏÎÏ)  ÏÎ ÎÎÎ ÏÎÎÎÏÎ ÏÏÎ ÎÏÎÎÎ ÎÎÎ ÎÎ ÏÎÏÏÎÏÎÏ ÎÏÎÏÎÎÎÎÏ
+ÎÎÎÎÎ ÏÏÎÏÏÎÎÎÏÎÎÎÎÏ ÏÏÏÎ ÎÎ ÏÏÎÎÏÎÎÎÎÎÏÎÎ.  ÎÎÏÎÎÎÏÏÎ ÎÎÏÎ ÏÎÎ <a
+href="../<package-osx-bundle-stable>">ÏÏÎÎÎÏÎ</a> Î ÏÎÎ <a
+href="../<package-osx-bundle-alpha>">ÏÎÎÏÎÎÎÏÎÎÎ</a> ÎÎÎÎÏÎ ÏÎÏ ÏÎÎÎÏÎÏ OS
+x, Î ÎÏÎÎÏÎ ÏÎÏÎÏÏÏÏÎÏÎÏ ÎÏÎÎÎÎÎÏ ÏÏÎÎ <a href="<page download>">ÏÎÎÎÎÎ
+ÎÎÏÎÏÎ</a>.
+</p>
+
+<p>ÎÏÎÎ ÏÎÏÎÎÎÎÎÏÎ ÏÎ ÎÏÏÎÎÎ dmg ÎÎÎÎÏÎ ÎÏÎ ÎÎÎÎ ÏÏÎÎ ÎÎÎÏÎÎ ÏÎÏ ÏÏÏÎ ÎÎ
+ÏÏÎÎÎÎÎÎ.  ÎÎÏÎ ÎÏÏ ÏÎÎ Finder ÏÎÏÎÎÎÎÎÎÎÏÎ ÏÏÎ ÎÎÎÎÏÎ Vidalia ÏÎ ÎÏÎÎÎ
+ÎÎÎÎÎÎÏÏÎÏÎÎ ÎÏÎÎÎÎÂ ÎÏÎÎ ÏÏÏÎÏÎ ÏÎÎ ÎÎÎÏÎÎ ÏÎÏ ÎÏÎÎÏÎÎÎÏ ÏÎÏ Vidalia ÎÎÎ
+ÎÏÎÎÎÏÏÎ ÏÎÎ ÏÏÎÎ ÎÎÏÎÎÎÎÎ Applications.  ÎÎÎÎÎÎÎÏÎÎÎ, ÎÎÎÎÏÎ ÎÎÏÎÏ ÎÎÎÎ ÏÏÎ
+ÏÎÎÎÏÎÎ "ÎÎÎÎÏÎÏÏÎÏÎ ÏÎÏ torbutton" ÎÎÎ ÎÎ ÎÎÏÏÎÎÏÏÎÎÎ ÏÎ torbutton ÏÏo
+Firefox.  ÎÏÎÏÎÏ, ÎÏÎÏÎÎÏÎ ÎÎ ÎÎÎÎÏÎ ÏÎ Torbutton ÎÏÏ ÏÎ Mozilla Add-ons
+ÎÎÎÎÎÏÏÎÏÎÏ ÎÎÎ "torbutton".</p>
+
+<p>ÎÏÎÎ ÎÎÎÎÎÎÏÏÏÎÏÎ ÏÎÎ ÎÎÎÎÏÎÏÏÎÏÎ ÎÏÎÏÎÎÏÎ ÎÎ ÎÎÎÎÎÎÏÎÏÎ ÏÎ Vidalia
+ÎÏÎÎÎÎÎÎÏÎÏ ÏÎ ÎÎÎÎÎÎÎÎÏ ÏÎÏ ÎÏÎ ÏÎÎ ÎÎÏÎÎÎÎÎ Applications.  ÎÎ ÎÎÏÏÎ
+ÎÏÎÎÏÎÎ ÎÎ ÎÎÎ ÎÏÎÎÎÎÎ Î ÏÏÎÎ ÏÎÏÎÎÏÎ ÏÏÏÏÎÎÎÏÎÏ ÏÎÎÎÎÎÎÎ ÏÏÎ ÏÎ Tor ÎÎÎ
+ÎÎÏÎÎÎÎÏÎÎ.  ÎÏÎÏÎÎÏÎ ÎÎ ÎÎÎÎÎÎÏÎÏÎ ÏÎ Tor ÎÏÎÎÎÎÎÎÏÎÏ "ÎÎÎÎÎÎÏÎ" ÎÏÏ ÏÎ
+ÎÎÎÎÏ Tor ÏÏÎ ÎÏÎÎÏ ÎÎÏÎÏ ÏÎÏ ÎÎÏÎÎÏ ÏÎÏ.
+</p>
+
+<p>ÎÏÎ ÏÎ Tor ÎÎÏÎÎÎÎÏÎÎ, ÏÎ ÎÎÎÎÎÎÎÎÎ ÏÎÏ ÏÎÏÎÎÏÎÏ ÏÏÏÏÎÎÎÏÎÏ ÏÎÏ Vidalia ÎÎ
+ÎÎÎÎÎÎÎ ÎÎ ÏÎ ÎÎÏÎÎÏÎÎ:
+</p>
+
+<p><img alt="vidalia running tor" src="../img/screenshot-osx-vidalia.png"
+border="1"/></p>
+
+<p>ÎÎ Polipo ÎÎÎÎÎÎÏÎÏÎÎ ÏÏ ÎÎÏÎÏ ÏÎÏ ÏÎÎÎÏÎÏ ÎÎÎÎÏÎÏÏÎÏÎÏ Tor.  ÎÏÎÎ
+ÎÎÎÎÏÎÏÏÎÎÎÎ ÎÎ ÎÎÎÎÎÎÎ ÎÎÎÎ ÏÎÏÎ ÏÎÏ ÎÎ ÎÎÎÎÎÎÎ Î ÏÏÎÎÎÎÎÏÏÎÏ ÏÎÏ.  ÎÎÎ
+ÏÏÎÎÎÎÎÏÎÎ ÎÎ ÏÏÎÎÎÏÎÏÎ ÏÎ Polipo ÎÎÎ ÎÎ ÏÏÎÏÎÎÎÏÎÎÎÎ ÏÎ Tor &mdash ÏÏÎÏÏÎÎ
+ÎÎÎÎÏÎÏÏÎÎÎÎÎ ÎÎÎ ÏÏÎÏÎÏÎÎÏÎÎÎÎ ÏÏÎÎÎÏÎ ÏÎÏ Polipo ÏÏ ÎÎÏÎÏ ÏÎÏ ÏÎÎÎÏÎÏ
+ÎÎÎÎÏÎÏÏÎÏÎÏ.
+</p>
+
+<hr /> <a id="using"></a>
+<h2><a class="anchor" href="#using">ÎÎÎÎ ÎÎÏÏÎÏÎ: ÎÏÎÎÎÏÏÎ ÏÎÏ ÎÏÎÏÎÎÎÎÏ ÏÎÏ
+ÏÏÏÎ ÎÎ ÏÏÎÏÎÎÎÏÎÎÎÏÎ Tor</a></h2>
+<br />
+
+<p>ÎÎÏÎ ÏÎÎ ÎÎÎÎÏÎÏÏÎÏÎ, ÏÏÎÏÎÎ ÎÎ ÏÏÎÎÎÏÎÏÎ ÏÎÏ ÎÏÎÏÎÎÎÎÏ ÏÎÏ.  ÎÎ ÏÏÏÏÎ ÎÎÎÎ
+ÎÎÎÎÎ Î ÏÏÎÎÎÏÎ ÏÎÏ ÏÎÏÎÎÎÎÏÎ ÏÎÏ.</p>
+
+<p>ÎÎÎ ÎÎÎÎÎÏÏÎÏÎ ÎÏÏÎÎÎÎÎ, ÏÏÎÏÎÎ ÎÎ ÏÏÎÏÎÎÎÏÎÎÎÎÏÎÎ ÏÎ Tor ÎÎÎÎ ÎÎ ÏÎ Firefox
+ÎÎÎ ÏÎ Torbutton.  ÎÎ Torbutton ÎÏÎÎ ÎÎÎ ÎÎÎÎÏÎÏÏÎÎÎÎ.  ÎÎÎÎÏÎ ÎÎÎÎ ÏÏÎ
+ÎÏÎÎÎÎÎ ÎÎÏÎÏÎ "ÎÏÎÎÎÏÎÎÏÎÎÎÎÎÎÎ Tor" ÎÎÎ ÎÎ ÏÎ ÎÎÎÏÎÎÏÎÎÎÏÎÏÎ ÎÎÎ ÎÎÏÏÎ
+ÎÏÎÎÎÎÎ: </p>
+
+<p><img alt="Torbutton plugin for Firefox"
+src="../img/screenshot-torbutton.png" border="1"/></p>
+
+<p>
+ÎÎ ÏÎÎÏÎÏÎÏÎ ÎÎ ÎÎÏÎÎÎÎÏÎ ÏÎÎ Firefox ÏÎ ÎÎÎÏÎÏÎÏÎÎÏ ÏÏÎÎÎÎÎÏÏÎ ÎÏÏ ÎÎÎÎÎÎÎ
+ÏÎÏ Tor, ÎÎÎÎÎÏÏÎ ÏÎ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SocksListenAddress";>FAQ
+ÎÎÎ ÏÎÎ ÎÎÏÎÎÎÏÎ ÏÎÏ Tor ÏÎ ÎÎÎÏÎÏÎÏÎÎÏ ÏÏÎÎÎÎÎÏÏÎ</a>.
+</p>
+
+<p>ÎÎÎ ÎÎ ÏÏÎÎÏÎÎÏÏÎÏÎ ÎÎ ÏÎ Tor ÎÎ ÎÎÎÎÏ ÎÏÎÏÎÎÎÎÏ ÏÎÏ ÏÏÎÏÎÎÎÏÎÎÎÏÎ
+ÏÎÎÏÎÎÎÏÏÎÎÏÏ ÎÎÎÎÎÎÎÏÏÎÏ HTTP, ÎÏÎÏÏ ÎÎÎÏÏÏÎ ÏÎÏÏ ÏÏÎ Polipo (ÎÎÎÎÎÎ, ÏÏ
+localhost ÎÏÏÎ 8118).  ÎÎÎ ÎÏÎÏÎÎÎÎÏ ÏÏÎÏÎ ÏÎÏ SOCKS (ÎÎÎ ÎÎÎÏÎ ÎÎÎÏÎÎÏÎ,
+Jabber, IRC, Î.Î.Ï.) ÎÏÎÏÎÎÏÎ ÎÎ ÎÎÎÏÏÎÏÎ ÏÎÎ ÎÏÎÏÎÎÎÎ ÏÎÏ ÎÏÎÏÎÎÎÎÏ ÏÏÎ Tor
+(localhost ÎÏÏÎ 9050), ÎÎÎÎ ÎÎÎÎÎÏÏÎ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS";>ÎÏÏÏ
+ÏÎ FAQ</a> ÎÎÎ ÏÎÏÏ ÎÏÎÎÏÏ ÏÎÏ ÎÏÏÏ ÎÎÎÎÎ ÎÏÎÎÎÎÎÏÎÎ.  ÎÎÎ ÎÏÎÏÎÎÎÎÏ ÏÎÏ ÎÎÎ
+ÏÏÎÏÏÎÏÎÎÎÏÎ ÎÏÏÎ SOCKS ÎÏÏÎ HTTP, ÎÎÎÎÎÏÏÎ ÏÎ <a
+href="http://www.taiyo.co.jp/~gotoh/ssh/connect.html";>connect</a> Î ÏÎ<a
+href="http://www.dest-unreach.org/socat/";>socat</a>.</p>
+
+<p>ÎÎÎ ÏÎÎÏÎÏÎÏÎÎÏ ÏÏÏ ÎÎ ÏÏÎÎÎÏÎÏÎ ÎÎÎÎÏ ÎÏÎÏÎÎÎÎÏ, ÎÎÎÎÎÏÏÎ ÏÎ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO";>Torify
+HOWTO</a>.
+</p>
+
+<hr /> <a id="verify"></a>
+<h2><a class="anchor" href="#verify">ÎÎÎÎ ÎÏÎÏÎ: ÎÎÎÎÎÏÎÎÎÏÎ ÏÏÎ ÎÎÏÎÎÏÎÎ</a></h2>
+<br />
+
+<p>
+ÎÏÏÎÎÎÎ ÎÎÎÎ, ÏÏÎÏÎÎÎÏÎÏÎÎÎÏÏÎ ÏÎÎ ÏÎÏÎÎÎÎÏÎ ÏÎÏ ÎÎ ÏÎ Tor ÎÎÎÎÎÏÎÎÎÏÎ ÏÏÎ Î
+ÎÎÎÏÎÏÎÏÎ ÏÎÏ ÎÎ ÎÎÎÎÎ ÎÎÏÎÏÎÎ.  ÎÎÎÎÏÎ ÎÎÎÎ ÏÏÎÎ <a
+href="https://check.torproject.org/";>ÎÎÎÏÎÎÏÏÎ Tor</a> ÎÎÎ ÎÎÎÎÎÏÎÎÎÏÎ ÏÏÎ
+ÏÏÎÎÎÎÏÎ ÏÏÎÏÎÎÎÏÎÎÎÎÏÎ ÏÎ ÎÎÎÏÏ Tor.  (ÎÎ Î ÎÏÏÏÏÎÏÎÏ ÎÎÎÎÎ ÎÎÏÏÏ
+ÎÎÎÏÎÏÏÎÎÎÏ, ÎÎÎÎÎÏÏÎ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate";>ÎÏÏÏ
+ÏÎ FAQ</a> ÎÎÎ ÏÎÏÎÏÏÏÏÎÏÎÏ ÎÏÎÎÎÎÎÏ ÎÎÎ ÏÏÏÏÎÏÏ ÎÎÎÎÏÎÏ ÏÎÏ Tor.
+</p>
+
+<p>ÎÎ ÎÏÎÏÎ ÎÎÏÎÎÎ ÏÏÎÏÏÏÎÎÏ ÏÎÎÏÎÏ ÏÏÎÏÏÎÏÎÎÏ ÏÎÏ ÏÎÏÎÎÏÎÎÎÎ ÏÎÎ ÎÏÎÎÏÏÏÎÏÎ
+ÏÏÎÎÎÏÎÏ ÏÎÏ ÏÏÎÎÎÎÎÏÏÎ ÏÎÏ, ÎÎÎÎÎÏÎÎÎÏÎ ÏÏÎ ÎÏÎÏÏÎÏÎÏÎ ÏÎÏ ÏÏÎÎÎÏÎÎÏ ÎÏÏ
+ÏÎÏ ÎÏÎÏÎÎÎÎÏ ÏÎÏ ÏÏÎÏ ÏÎÏ ÎÏÏÎÏ 8118 ÎÎÎ 9050.  ÎÎ ÏÎ ÏÎÎÏÎÏ ÏÏÎÏÏÎÏÎÎÏ
+ÎÎÏÎÎÎÎÎÎ ÏÎÏ ÎÎÎÏÏÏÎÎÎÎÏ ÏÏÎÎÎÏÎÎÏ, ÏÏÎÎÎÏÏÎ ÏÎ ÏÏÏÎ ÎÎ ÎÏÎÏÏÎÏÎÎ ÏÏÎÎÎÏÎÎÏ
+ÏÎÏÎÎÏÎÏÏÎÎ ÏÏÎÏ ÎÏÏÎÏ TCP 80 ÎÎÎ 443 ÎÎÎ ÎÏÎÎÏÎ ÎÎÎÎÎÏÏÎ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FirewalledClient";>ÎÏÏÏ
+ÏÎ FAQ</a>.
+</p>
+
+<p>ÎÎ ÎÎÎÎÎÎÎÏÎÎÎ ÎÎ ÎÎÎ ÎÎÏÎÎÏÎÎ, ÎÎÎÎÎÏÏÎ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork";>ÎÏÏÏ
+ÏÎ FAQ</a> ÎÎÎ ÏÏÎÎÎÏÎÎÏ.</p>
+
+<p>
+ÎÏÎÎ ÎÎÏÎÎÏÎÎ, ÎÎÎÎÎÏÏÎ <a href="<page download>#Warning">ÏÎ ÏÏÎÏÏÎÏÎÎ ÎÎÎ
+ÏÎ ÏÏÎ ÏÎ Tor</a>.
+</p>
+
+<hr /> <a id="server"></a> <a id="relay"></a>
+<h2><a class="anchor" href="#relay">ÎÎÎÎ ÎÎÏÎÏÏÎ: ÎÏÎÎÎÏÏÎ ÏÎ ÏÏ ÎÎÎÎÎÎÎÏÎ</a></h2>
+<br />
+
+<p>ÎÎÎ ÎÎ ÏÎÏÎÏÎÎ (ÎÎÎÎÎÏÎÎÎÏÎÎÏ) ÎÏÏÎÏ ÎÏÎÎÏ, ÏÎ ÎÎÎÏÏÎ Tor ÎÎÏÎÎÎÏÎÎ ÏÎ
+ÎÎÎÎÎÎÏÎÏ.  ÎÏÎ ÏÎÏÎÏÏÏÏÎÏÎÎ ÎÎÎÏÎÏÏÎÎÏÎ ÎÎÎÎ ÎÎÎÎÎÎÎÏÎ ÎÎÎÎÎÏÎÎÏÏÎ, ÏÏÏÎ
+ÏÎÏÏÏÎÏÎ ÎÎ ÎÎÎÎÎ ÏÎ ÎÎÎÏÏÎ Tor.  ÎÎ ÎÎÎÎÎÏÎÏÎ ÏÎÏÎÎÏÎÏÏÎÎ 20 kilobytes/sec
+ÏÏÎÏ ÎÎÎÎ ÎÎÏÎÏÎÏÎÏÎ, ÏÎÏÎÎÎÎÎÏÎÎ ÎÎÎÎÎÎÏÏÎ ÏÎ Tor ÏÏÎÎÎÎÎÎÏÎÏ ÏÎ ÏÏÏÎ ÎÎ
+ÎÎÎÏÎÏÏÎÎÎ ÎÎÎ ÏÎÎ ÎÎÎÎÎÎÎÏÎÏ.  ÎÎÎÎÎ ÏÎÏÎÎÏÎÏÎÏÏÎÎÎ ÎÎÎÎÏÎ ÏÎÏÏ ÎÎÎÎÎÎÎÏÎÏÏ
+Tor ÎÏÎÎÎÎÏÏ ÎÎÎ ÎÎÎÎÎÎÏÏ, ÏÏÏÏ ÏÎÏÎÎÏÎÏÎÏÏ ÏÏÎÎÎÏ ÎÏÏÏÎÏÎÎÎÏÏÎÏÎÏ,
+ÏÎÎÎÏÎÎÎÏ ÎÎÏÎÎÏ ÏÏÏÎ ÎÎ ÎÎÎ ÏÏÎÎÎÎÎÎÏÎ ÎÎÎÎÎÏÏÏÏÎÎÏ ÎÎÎÎÎÎÏÎÏÎÎÏÎÏÎÏ Î
+ÎÎÏÎÏÏÎÏÎÏ ÎÎÎ ÏÏÎÏÏÎÏÎÎÎ ÎÎÎ ÎÏÎÎÎÎÎÎÏ ÎÎÎÏÎÏÎÏÎÎÏ ÎÎ.</p>
+
+<p>Î ÏÏÎÏÎÎ ÎÎÎÎÎÏÎÎÎÏÏÎ ÏÎ ÏÎÎÎÎÏ ÎÎÎÏÎÏÎÏÎÎÎÏ ÏÎÏÎÎÎÏÎÎÏ ÏÏÎ ÎÎÎÎÎÎÏÏÎ ÎÎÎÎÎ
+ÎÏÏÏ ÏÎÏ ÎÎÎÎÏÏÎ ÎÏÏÎÎÎÎÏ ÏÎÏÏ ÏÏÎÏÏÎÏ Tor.  <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity";>ÎÏÎÏÎ
+ÏÎ ÎÏÎÎÏÏÏÎÏÎ ÎÎ ÎÏÎÎÎÎÎÎÎÎÏÎ ÎÎÎ ÎÎ ÎÎÎÎÎ ÎÏÏÏÏÎ ÎÎÏÎÏÎÎÎ</a>, ÎÏÎÏ ÏÎ
+sites ÎÎÎ ÎÎ ÎÎÏÏÎÎÎÏÎ ÎÎ ÎÎ ÏÏÎÎÎÏÎÎÏ ÏÏÎÎÏÏÎÎÏÎÎ ÎÏÏ ÏÎÎ ÏÏÎÎÎÎÎÏÏÎ ÏÎÏ Î
+ÎÎÎÎÎÏÎÎÎÎÎÎÏÎÎ ÎÏÏ ÎÎÎÎÏÏ.</p>
+
+<p>ÎÎÎ ÏÎÏÎÏÏÎÏÎÏÎ, ÎÎÎÎÎÏÏÎ ÏÎÎ ÎÎÎÎÏ ÎÎÏ <a href="<page
+docs/tor-doc-relay>">ÎÏÎÎÎÎÎÎÏÎÏ ÎÎÎ ÎÎÎÎÎÎÎÏÎ ÎÎÎÎÎÏÎÎÏÏÎ</a>.</p>
+
+<hr /> <a id="uninstall"></a>
+<h2><a class="anchor" href="#uninstall">ÎÏÏ ÎÎ ÎÏÎÎÎÎÏÎÏÏÎÏÏ ÏÎ Tor ÎÎÎ ÏÎ
+Privoxy</a></h2>
+<br />
+
+<p>ÎÏÎ ÏÏÏÏÎÎ ÏÏÎÏÏÎÏÎ ÎÎÎ ÏÎÎ ÎÏÎÎÎÎÏÎÏÏÎÏÎ ÏÎÏ ÏÎÎÎÏÎÏ ÎÏÏ ÏÎÎ ÏÏÎÎÎÎÎÏÏÎ
+ÏÎÏ: ÏÏÎÏÎÎÎÏÎÎÏÎÏÎÏ ÏÎ Finder Î ÏÎÎ ÎÏÎÎÎÎ ÎÎÏÎÎÎÏ Î ÏÎ ÏÏÏÎÏÎÎÎÎ
+ÎÏÎÎÎÎÏÎÏÏÎÏÎÏ ÏÎÏ ÎÎÏÎÎÎÏÎÎ ÏÏÎ ÎÎÏÎÎÏÎÎÏ.  ÎÎÎÏ ÏÏÏ:</p>
+
+<p>ÎÎÎÎÎÏÎ ÏÎÏ ÏÏÎÎÎÏÎÎÏ ÏÎÏ ÏÎÎÏÎÎÎÏÏÎÎÏ ÎÎÎÎÎÎÎÏÏÎ ÏÎÏ (proxy server) ÏÏÎÏ
+ÎÏÏÎÎÎÏ ÏÎÏÏ ÏÎÎÎÏ.  ÎÏÎÏÎÎÏÎ ÎÎ ÏÏÎÎÎÏÎÏÎÏÎ Ï' ÎÏÏÏ ÏÎ ÏÎÎÎÎÎ, ÎÎ ÎÏÎÏÏ
+ÎÎÎÎÏÎ ÎÎ ÎÎÎÎÏÏÎÏÎ ÏÎÎ ÏÏÎÏÎ ÏÎÏ Tor.</p>
+
+<p>ÎÎ ÎÏÎÎÏÎÎÎÏÎ ÎÎ ÎÏÎÎÎÎÏÏÎÎÏÎ ÎÎÎÎÎÎÏÏÏÎÎÎ ÏÎ Tor ÎÎÎ Î ÎÎÎÎÏÎÎÏÎÏÏ ÏÎÏ
+ÎÎÎÎÎÏÎÎ ÏÏÎÎÏÎÎÎ ÎÎÎÏÎÎÏÎÏÏÎ, Î ÎÎÎÎÎÎÎÏÎÎ ÎÏÎÎ ÏÏ ÎÎÎÏ:</p>
+
+<ol>
+<li>ÎÎÎÎÎÏÎ ÏÎÎ Finder ÎÎÎ ÎÎÎÎÏÎ ÎÎÎÎ ÏÏÎ Applications.</li>
+<li>ÎÏÏÎÏÎ ÏÎ /Applications/Vidalia ÏÏÎÎ ÎÎÎÎ ÎÎÎÎÏÎÎÏÏÎÏ.</li>
+<li>ÎÎÎÎÏÎÏÏÎ ÏÎÎ ÎÎÏÎÎÎÎÎ /Library/Torbutton ÎÏÏ ÏÎ ÏÏÏÏÎÎÎ ÏÎÏ.</li>
+<li>ÎÎÎÎÎÎÎÏÎ ÏÏÎÎ ÎÎÏÎÎÎÎÎ Library ÏÎÏ ÎÎÏÎÎÏÎÎÏ ÏÏÎÏÏÎ ÎÎÎ ÎÎÎÎÏÎÏÏÎ ÏÎÎ
+ÎÎÏÎÎÎÎÎ Vidalia</li>
+</ol>
+
+<p>ÎÎ Tor, Vidalia ÎÎÎ Polipo ÎÏÎÏÎ ÏÏÏÎ ÎÎÎÎÏÎÏÎÎ ÎÏÏ ÏÎ ÏÏÏÏÎÎÎ ÏÎÏ.</p>
+
+<p>ÎÎ ÎÎÏÏÎ ÎÎÎÎÎÎÎÏÎÎÎÎÎ ÎÎ ÏÎÎ ÎÏÎÎÎÎ ÎÎÏÎÎÎÏ Î ÏÎ ÎÎÏÎÎÏÎÎÏ, ÎÏÎÏÎÎÏÎ ÎÎ
+ÎÏÎÎÎÎÏÏÎÎÏÎ ÏÎ Tor ÏÎÎÏÎÎÎÎÏÎÎÎ ÏÏ ÎÎÎÏ:</p>
+<ul>
+<li>/Applications/Vidalia.app/</li>
+<li>/Library/Torbutton/</li>
+<li>~/Library/Vidalia</li>
+<li>~/.tor</li>
+</ul>
+
+<hr />
+
+<p>ÎÎ ÎÏÎÏÎ ÏÏÎÏÎÏÎÎÏ ÎÎÎÏÎÏÏÎÏ ÏÎÏ ÏÎÏÏÎÏÎÏ ÎÎÎÏÎÏÎÏ, ÏÎÏÎÎÎÎÎÏÎÎ <a
+href="<page contact>">ÎÏÎÎÎÎÎÏÎÎÏÏÎ ÎÎÎÎ ÎÎÏ</a>.  ÎÏÏÎÏÎÏÏÎÏÎÎ!</p>
+
+  </div>
+<!-- #main -->
+</div>
+
+
+#include <foot.wmi>


Property changes on: website/trunk/docs/el/tor-doc-osx.wml
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: website/trunk/docs/es/tor-doc-relay.wml
===================================================================
--- website/trunk/docs/es/tor-doc-relay.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/docs/es/tor-doc-relay.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -173,13 +173,13 @@
 que deberÃa estar comprobando, etc.
 </p>
 
-<p>Cuando decida que es accesible, subirà un "descriptor de servidor" a los
-directorios, para que los clientes conocer quà direcciÃn, puertos, llaves,
-etc usa su servidor. Puede <a
-href="http://194.109.206.212/tor/status/authority";>cargar uno de los status
-de red manualmente</a> y mirarlo entero para encontrar el nickname que
-configurÃ, para asegurarse de que està ahÃ. Es posible que tenga que esperar
-unos segundos para darle suficiente tiempo para que un directorio nuevo.</p>
+<p>When it decides that it's reachable, it will upload a "server descriptor" to
+the directories, to let clients know what address, ports, keys, etc your
+relay is using. You can <a
+href="http://194.109.206.212/tor/status-vote/current/consensus";>load one of
+the network statuses manually</a> and look through it to find the nickname
+you configured, to make sure it's there. You may need to wait a few seconds
+to give enough time for it to make a fresh directory.</p>
 
 <hr /> <a id="after"></a>
 <h2><a class="anchor" href="#after">Cuarto paso: Una vez que se estÃ

Modified: website/trunk/docs/fr/debian.wml
===================================================================
--- website/trunk/docs/fr/debian.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/docs/fr/debian.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -18,8 +18,8 @@
 <br />
 
 <p>
-Si vous utilisez Debian stable (lenny), unstable (sid) ou testing (squeeze),
-lancez simplement:<br /> <tt>apt-get install tor tor-geoipdb</tt>
+If you're using Debian stable (lenny), unstable (sid), or testing (squeeze),
+just run<br /> <tt>apt-get install tor tor-geoipdb</tt> as root.
 </p>
 
 <p>

Modified: website/trunk/docs/fr/tor-doc-relay.wml
===================================================================
--- website/trunk/docs/fr/tor-doc-relay.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/docs/fr/tor-doc-relay.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -179,14 +179,13 @@
 port que vous pensez qu'il devrait tester, etc. 
 </p>
 
-<p>Quand votre relais a dÃcidà qu'il Ãtait joignable, il envoie un Â
-descripteur de relais  aux annuaires. Ceci permettra aux clients de
-connaÃtre l' adresse, les ports, la clÃ, etc que votre relais utilise. Vous
-pouvez manuellement <a
-href="http://194.109.206.212/tor/status/authority";>tÃlÃcharger l'un des
-Ãtats du rÃseau</a> et voir si vous y trouvez le nom que vous avez
-configurÃ, pour Ãtre certain de sa prÃsence. Vous aurez probablement Ã
-attendre quelques secondes pour avoir un rafraÃchissement du rÃpertoire.</p>
+<p>When it decides that it's reachable, it will upload a "server descriptor" to
+the directories, to let clients know what address, ports, keys, etc your
+relay is using. You can <a
+href="http://194.109.206.212/tor/status-vote/current/consensus";>load one of
+the network statuses manually</a> and look through it to find the nickname
+you configured, to make sure it's there. You may need to wait a few seconds
+to give enough time for it to make a fresh directory.</p>
 
 <hr /> <a id="after"></a>
 <h2><a class="anchor" href="#after">QuatriÃme Ãtape: une fois que Ãa

Modified: website/trunk/docs/pl/tor-doc-relay.wml
===================================================================
--- website/trunk/docs/pl/tor-doc-relay.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/docs/pl/tor-doc-relay.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -174,13 +174,13 @@
 sprawdza ten IP i port, ktÃry powinien sprawdzaÄ etc.
 </p>
 
-<p>Gdy Tor stwierdzi, Åe jest osiÄgalny z zewnÄtrz, wyÅle "deskryptor serwera"
-do serwerÃw katalogowych, by daÄ znaÄ klientom, jakiego uÅywasz adresu,
-portÃw, kluczy etc. MoÅesz <a
-href="http://moria.seul.org:9032/tor/status/authority";>rÄcznie otworzyÄ
-jednÄ ze stron zawierajÄcych status sieci</a> i poszukaÄ w nim nazwy, ktÃrÄ
-skonfigurowaÅeÅ/aÅ, by upewniÄ siÄ, Åe tam jest. MoÅliwe, Åe bÄdziesz
-musiaÅ/a poczekaÄ parÄ sekund, by utworzony zostaÅ ÅwieÅy katalog serwerÃw.</p>
+<p>When it decides that it's reachable, it will upload a "server descriptor" to
+the directories, to let clients know what address, ports, keys, etc your
+relay is using. You can <a
+href="http://194.109.206.212/tor/status-vote/current/consensus";>load one of
+the network statuses manually</a> and look through it to find the nickname
+you configured, to make sure it's there. You may need to wait a few seconds
+to give enough time for it to make a fresh directory.</p>
 
 <hr /> <a id="after"></a>
 <h2><a class="anchor" href="#after">Krok 4: Gdy juÅ wszystko dziaÅa</a></h2>

Added: website/trunk/docs/ru/N900.wml
===================================================================
--- website/trunk/docs/ru/N900.wml	                        (rev 0)
+++ website/trunk/docs/ru/N900.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -0,0 +1,158 @@
+
+
+
+
+
+
+## translation metadata
+# Revision: $Revision$
+# Translation-Priority: 3-low
+#include "head.wmi" TITLE="Tor: N900 Instructions" CHARSET="UTF-8"
+<div class="center">
+
+<div class="main-column">
+
+<a id="Maemo"></a>
+<h2><a class="anchor" href="#Maemo">ÐÑÑÐÐÐÐÐÐ TOR ÐÐ Maemo</a></h2>
+<br />
+<p>
+ÐÑÐÐ Ñ ÐÐÑ ÑÐÐÐÑÐÐ Maemo ÐÐÐÐÐÐ, ÐÑÐÐÑÐÐÐ ÐÑ <a href="#N900">N900</a>, ÐÑ
+ÑÐÐÐÐÐÐÐÑÐÐ ÑÑÑÐÐÐÐÐÑÑ ÐÐÐÐÑ TOR Ñ <a
+href="http://maemo.org/packages/view/tor/";>ÐÑÑ.ÑÐÐÑÐ Maemo</a>. Tor Project
+ÐÐ ÑÐÐÐÑÐÐÑ ÐÐÐ ÑÑÐÐÐ ÐÐÐÐÑÐÐÐ, ÐÐÐ ÑÐÐÑÐÐÐÑÑÐÐÑÑÑÑ ÑÐÐÐÑÐÑÑÐÐÐ Maemo.
+</p>
+
+<a id="N900"></a>
+<h2><a class="anchor" href="#N900">ÐÑÑÐÐÐÐÐÐ Tor ÐÐ N900</a></h2>
+<br />
+<p>
+ÐÐÐÐÐÐ ÑÑÐÐÐÐÐÑÑÐÐ ÐÐÐÐÑ ÐÐÐÐÐÑÐÑÑ ÐÐÐ ÑÑÑÐÐÐÐÐÑ<a
+href="https://garage.maemo.org/projects/tor-status";>ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÑÐ
+Tor-ÐÐÐÑÐÑÐÑÐ</a> Ð ÑÐÐÑÑÐÐÐÐÐ TOR Ð ÑÐÑÐÐÑÐ ÐÐÐÐÑÐ ÐÐÑ ÑÐÐÐÑÐÐÐ N900 ÑÐÑÐÑ
+Nokia. ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÐÑ ÑÑÐ ÑÐÐÑÐÐ ÐÐ ÐÑÐÑÑÑÐÐÐÐÑÑ. ÐÑÐÑÐÐÑ ÐÑÐ
+ÐÑÐÐÐÑÐÐÐÐÐÐÐ ÑÑÐÐ ÑÐÐÑÐÐ ÐÐ ÐÐÐÐÑ ÑÑÐÐÑÑÐ ÐÐÐÐÐÐÐÐÐ Torbutton, ÐÐÑÑÐÑÑÐÐÑÐÐ
+ÑÐÐÐÐÐÐÐÑÐÑÑÑ Ð ÐÐÐÐÐÐÑÐÐ ÐÑÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐÐÐÑÑ ÑÐÐÑÐÑ Ð ÑÐÐÑÑ, ÑÑÐÐÑÑÑÐÑ
+ÐÑÑÐÐÑÑ ÑÑÐÐÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÐÑÐÐÑÑÐ ÐÐÐÑÐÐÐÐÑÐÐÑ.
+</p>
+
+<p>
+ÐÑÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑ ÐÑÐÐÐÐÐÐÐÐ: <br /> <a href="../img/N900/1_app_menu.png">
+<img border="0" alt="N900 application menu"
+src="../img/N900/1_app_menu-small.png"/> </a>
+</p>
+
+<p>
+ÐÑÐÐÐÐÑÐ ÐÐÐÑ ÐÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐÐÐÐ Ð ÐÐÑÑÑ ÑÐÑÐÐÐ: <br /> <a
+href="../img/N900/2_app_manager.png"> <img border="0" alt="N900 application
+manager" src="../img/N900/2_app_manager-small.png"/> </a>
+</p>
+
+<p>
+ÐÑÐÐÑÐÑÐ 'ÐÐÐÐÐÐÑ ÐÑÐÐÐÐÐÐÐÐ': <br /> <a
+href="../img/N900/3_app_managermenu.png"> <img border="0" alt="N900
+application catalogs" src="../img/N900/3_app_managermenu-small.png"/> </a>
+</p>
+
+<p>
+ÐÐÐÐÐÑÐ 'ÐÐÐÐÐÑÑ', ÑÑÐÐÑ ÐÐÐÐÐÐÑÑ ÐÑÑÐÑÐÐÐ ÑÐÐÑÐÐÐÑÑÐÐÐÐÑÑ ÐÐÑÑÐÐ
+ÐÐÐÐÐÐÐÑÐÐÑÐÐÐÐ ÐÐ.<br /> <small>ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÐÐ: ÐÐÐÐÑÐ ÐÑÑÐÑÐÐÐ ÑÐÐÐÑÐÐÑ
+ÐÐÐÑÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÑ, ÐÐÑÐÑÑÐ ÐÐÐÑÑ ÐÐÑÑÑÐÑÑ ÑÐÐÐÑÑ ÐÐÑÐÐÐ ÑÑÑÑÐÐÑÑÐÐ. <br
+/> ÐÐÐÐÐÐÐÑÑÐÑÑ Ñ  <a href="http://wiki.maemo.org/Extras-devel";>ÐÐÑÐÑÐÐÑÐÐÐ
+ÐÐ ÐÑÑÐÑÐÐÐÐ</a>. ÐÐÐ ÑÑÐÐÑ ÐÑÐÐÑÑÐÑÑ ÐÑÑÐÑÐÐÐ ÑÐÐÑÐÐÐÑÑÐÐÐÐÐÐÐ
+ÐÐÐÐÐÐÐÑÐÐÑÐÐÐÐ ÐÐ ÐÐÑÐÐ ÑÑÑÐÐÐÐÐÐ TOR, ÐÐÐ ÐÑÑÐÐÐÑÑ ÐÐÐ, ÐÐ ÑÐÐÐ
+ÑÐÑÐ.</small> <br /> <a href="../img/N900/4_catalog_list.png"> <img
+border="0" alt="N900 catalog list"
+src="../img/N900/4_catalog_list-small.png"/> </a>
+</p>
+
+<p>
+Enter the following information into the catalog addition screen:ÐÐÐÐÐÑÐ
+ÑÐÐÐÑÑÑÑÑ ÐÐÑÐÑÐÐÑÐÑ Ð ÑÐÑÐÑ ÐÐÐÐÐÐÐÐÐÑ ÐÐÐÐÐÐÐÑÐÐÑÐÐÐÐ ÑÐÐÐÐÐÐ:
+<p>
+<pre>
+ÐÐÐÐÐÐÐÐ ÐÐÑÐÐÐÐÐ:    Extras devel
+ÐÐÑÐÑ ÐÐÑÐÐÐÐÐ:    http://repository.maemo.org/extras-devel/
+ÐÐÑÑÑÐÐÑÑÐÐ:        fremantle
+ÐÐÐÐÐÐÐÐÑÑ:    free non-free
+</pre>
+</p>
+<br />ÐÐÐÐÐÑÐ ÐÐÑÐÑ 'ÐÐÐÐÐÐ ÐÑÐÐÑÑÑÐ', ÐÐÐÐÐÑÐ 'ÐÐÑÑÐÐÐÑÑ'. ÐÐÐÐÐÐÐÐÐÐ
+ÑÐÐÐÐÐÐÐ ÐÐÐÐÑÑ ÐÐÐÐÑÐÑÐÐ ÐÑÐÐÑ.<br /> <a
+href="../img/N900/5_new_catalog.png"> <img border="0" alt="N900 new catalog"
+src="../img/N900/5_new_catalog-small.png"/> </a>
+</p>
+
+<p>
+ÐÐÐÐÐÑÐ 'ÐÐÐÑÐÑÑ' Ð ÐÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐÐÐÐ: <br /> <a
+href="../img/N900/6_app_manager.png"> <img border="0" alt="N900 app manager"
+src="../img/N900/6_app_manager-small.png"/> </a>
+</p>
+
+<p>
+ÐÑÐÐÑÐÑÐ ÑÐÐÐÐÐ ÐÐÑÑ (ÐÐÐ ÐÐÑÐÐÐÑÐÑÐÑÐÑÑ ÐÐÐÑÐÐÐ ÐÐ ÐÐÑÑÐÐÐÐÑ ÑÐÐÐÑ TOR):
+<br /> <a href="../img/N900/7_app_categories.png"> <img border="0" alt="N900
+application categories" src="../img/N900/7_app_categories-small.png"/> </a>
+</p>
+
+<p>
+ÐÑÐÑÐÐÑÑÐÑÐ ÑÐÐÐÐÐ ÐÐÐÐÐÑÑÑÑ Ð ÐÑÐÐÑÐÑÐ 'Tor Status Area Applet': <br /> <a
+href="../img/N900/8_app_list.png"> <img border="0" alt="N900 application
+list" src="../img/N900/8_app_list-small.png"/> </a>
+</p>
+
+<p>
+ÐÐÐÐÐÐÐÑÑÐÑÑ Ñ ÑÐÐÐÐÑÐÐÐÐÐ Ð ÐÐÐÐÐÑÐ 'ÐÑÐÐÐÐÐÐÑÑ': <br /> <a
+href="../img/N900/9_disclaimer.png"> <img border="0" alt="N900 disclaimer"
+src="../img/N900/9_disclaimer-small.png"/> </a>
+</p>
+
+<p>
+ÐÐ ÐÐÐÐÑÑÐÐÐÑ ÑÑÑÐÐÐÐÐÐ ÐÑÐÐÑÑÐÑÐ ÑÐÐÐÐÐ ÑÐÐÑÐÐÐÑÑÐÐÐÐÐÐÐ ÐÐÐ.ÐÐ Ð
+ÐÐÑÐÐÐÐÑÑÐÐÑÐ ÑÑÑÑÐÐÑÑÐÐ: <br /> <a href="../img/N900/10_success.png"> <img
+border="0" alt="N900 success" src="../img/N900/10_success-small.png"/> </a>
+</p>
+
+<p>
+ÐÐÑÐÐ ÐÐÑÐÐÐÐÑÑÐÐÐ N900, ÐÑÐÑÐÐÑÐ ÐÐÐÑ ÑÐÑÑÐÑÐÐÑ: <br /> <a
+href="../img/N900/11_after_rebooting.png"> <img border="0" alt="N900 status
+menu post-reboot" src="../img/N900/11_after_rebooting-small.png"/> </a>
+</p>
+
+<p>
+ÐÑÐÐÑÐÑÐ 'The Onion Router' ÐÐ ÑÐÐÑÐÐ: <br /> <a
+href="../img/N900/12_status_menu.png"> <img border="0" alt="N900 status menu
+selection" src="../img/N900/12_status_menu-small.png"/> </a>
+</p>
+
+<p>
+ÐÐÐÑÑÐÑÐ ÑÐÑÑÑÐÐÑÑ ÐÐÑÑÑÑÑÐÐÐÑÐÑ Ð ÐÐÐÐÐÑÐ 'Save': <br /> <a
+href="../img/N900/13_enable_tor.png"> <img border="0" alt="N900 enabling
+Tor" src="../img/N900/13_enable_tor-small.png"/> </a>
+</p>
+
+<p>
+ÐÑÐÑÐÐÑÐ <a href="https://check.torproject.org/";>ÑÑÑÐÐÐÑÑ ÐÑÐÐÐÑÐÐ</a>,
+ÑÑÐÐÑ ÑÐÐÐÐÑÑÑÑ, ÑÑÐ ÐÐÑÑÑÑÑÐÐÐÑÐÑ ÐÑÐÐÐÐÐÐÐÑÑÑ ÐÐÑÑÐÐÑÐÐ: <br /> <a
+href="../img/N900/14_check_tor.png"> <img border="0" alt="N900 check Tor"
+src="../img/N900/14_check_tor-small.png"/> </a>
+</p>
+
+<p>
+ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÐÐÐÐÐÐÐÐ, ÑÑÐ Ð ÑÐÐÐÐÐÑÐÑÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐ ÐÐÑÐÐÑÑÑÑ ÐÐÑÐÐÐÐÐÐ
+ÐÐÑÑÐÐ TOR. ÐÐÐÐÐ ÐÑÐÑÐÐÑ N900 ÐÐ ÐÐÐÐÑ ÐÐÐÐÐÐÐÐÐÑ Torbutton. Ð.Ð. ÐÑÐÑÑÐ
+ÐÑÐÐÐÐÐÑÐ ÐÐÑ ÐÐÑÐÐÐ ÐÐÑÐÐÐÑÐÐÐÐ ÐÐ IP-ÐÐÑÐÑÐÐ, ÐÑÐÑÐÐÑ N900 ÐÐ
+ÑÐÐÐÐÐÐÐÑÐÑÑÑ Ð ÐÑÐÐÐÑÐÐÐÐÐÐÑ, ÐÑÐÐ ÐÐÐÑÐÐÐÐÑÐÐÐÑÐÐÑÑÑ ÐÑÐÑÐÐÑÑÐ ÑÐÐÑÐÑÑÑ
+ÐÑÐÑÐÑÐÑÐÐÐ ÑÑÐÐÐÐÐÐÐÐÐ.
+</p>
+
+<hr />
+
+<p>ÐÑÐÐ Ñ ÐÐÑ ÐÑÑÑ ÐÑÐÐÐÐÐÐÐÐÑ Ð ÐÑÐÐÐÐ ÑÑÐÐÐ ÐÐÐÑÐÐÐÑÐ, ÐÐÐÐÐÑÐÑÑÐ, <a
+href="<page contact>">ÐÑÐÑÑÐÐÐÑÐ ÐÑ ÐÐÐ</a>. ÐÐÐÑÐÐÐ!</p>
+
+  </div>
+<!-- #main -->
+</div>
+
+
+#include <foot.wmi>


Property changes on: website/trunk/docs/ru/N900.wml
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: website/trunk/docs/ru/debian-vidalia.wml
===================================================================
--- website/trunk/docs/ru/debian-vidalia.wml	                        (rev 0)
+++ website/trunk/docs/ru/debian-vidalia.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+## translation metadata
+# Revision: $Revision$
+# Translation-Priority: 3-low
+#include "head.wmi" TITLE="Vidalia: Debian/Ubuntu Instructions" CHARSET="UTF-8"
+<div class="center">
+
+<div class="main-column">
+
+<a id="debian"></a> <a id="packages"></a>
+<h2><a class="anchor" href="#debian">Vidalia ÐÐ Ubuntu ÐÐÐ Debian</a></h2>
+<br />
+
+<p>
+<b>ÐÐ ÐÑÐÐÐÑÐÑÐÑÐ ÐÐÐÐÑÑ ÐÐ ÑÐÐÐÐÐÑÐÑÐÑ Ubuntu.</b> ÐÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÑÑÑÑ Ð
+ÑÐÐÑÑÑÑÑ ÑÑÑÐÑÐÐÑÐÐÐ. ÐÑ ÐÐ ÑÐÐÐÐÑÐ ÐÐÐÑÑÐÑÑ ÐÐÐÐÑÐ ÐÐÐÐÐÐÐÐÐÑ ÐÐÐÐÐÐÐÐÑÐÐ Ð
+ÐÑÐÑÐÑÐÑÐÐÐ ÐÐÐÐÐÐÐÐÐÑ.
+</p>
+
+<p>
+ÐÐÐ ÐÐÐÐÐÐÐÐÑÑÑ ÐÐÑÑÑÐÐÑÑ ÑÐÐÐÐÐÑÐÑÐÐ Tor, ÐÑÐÐÐÐ ÑÐÐ ÐÑ ÑÐÐÐÐÑÐ ÐÐÐÑÑÐÐÑÑ
+Vidalia. ÐÑÐÐÐÐ ÐÑÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐÐÑÑÑ ÐÐÐÐÐÐÐÐ ÐÐÑÐÐÐ ÐÐÑÑÑÐÐÑÑÐÐÐ. ÐÑÐÐ Ñ
+ÐÐÑ Ubuntu 9.10, ÑÐ ÑÑÐ "karmic", 9.04 - ÑÑÐ "jaunty", 8.10 - "intrepid", Ð
+8.04 - "hardy". ÐÑÐÐ Ñ ÐÐÑ Debian Etch - ÑÑÐ "etch", Ð Debian Lenny - ÑÑÐ
+"lenny". ÐÐÐÐÐÑÑÐ ÑÐÐÐÑÑÑÑÑ ÑÑÑÐÐÑ Ð ÑÐÐÐ <tt>/etc/apt/sources.list</tt>:<br
+/>
+<pre>
+deb     http://deb.torproject.org/torproject.org &lt;ÐÐÐ_ÐÐÐÐÐÐÐÐÐÐÐÐ&gt; main
+</pre>
+ÐÐÐ ÐÑ ÐÐÐÑÑÐÐÐÑÐÑÐ ÐÐÑ ÐÐÑÑÑÐÐÑÑÐÐÐ (etch, lenny, sid, karmic, jaunty,
+intrepid, hardy) ÐÐÐÑÑÐ ÑÑÑÐÐÐ &lt;ÐÐÐ_ÐÐÐÐÐÐÐÐÐÐÐÐ&gt;.
+</p>
+
+<p>
+ÐÐÐÐÐÑÑÐ GPG-ÐÐÑÑ, ÐÑÐÐÐÑÐÑÐÐÑÐ ÐÐÑ ÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐ, Ñ ÐÐÐÐÑÑÑ ÐÐÐÐÐÐ
+<pre>
+gpg --keyserver keys.gnupg.net --recv 886DDD89
+gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
+</pre>
+ÐÐÐÐÑÑ ÐÐÐÐÐÐÑÐ ÐÑÑÐÑÐÐÐÐ Ð ÑÑÑÐÐÐÐÐÑÐ Vidalia Ñ ÐÐÐÐÑÑÑ ÐÐÐÐÐÐ
+<pre>
+apt-get update
+apt-get install vidalia 
+</pre>
+</p>
+
+<p>
+ÐÐÐÐÑÑ Vidalia ÑÑÑÐÐÐÐÐÐÐÐ Ð ÐÐÐÑÑÐÐÐ. ÐÐÐÐÐÐÐÑÑÐÑÑ ÑÐ <a href="<page
+docs/tor-doc-unix>#polipo">ÑÐÐÐÑÑÑÐÐ ÑÐÐÐÐ</a> ÑÑÐÐÐÐÐÑÑÐÐ "Vidalia ÐÐ
+Linux/Unix".
+</p>
+
+<p style="font-size: small">
+DNS-ÐÐÐÐÑÑ <code>deb.torproject.org</code> ÑÑÑÐÐÐÑÑÑ ÐÐ ÐÐÐÐÐÑÑÐÐ
+ÐÐÐÐÐÐÑÐÐÑÑ ÑÐÑÐÐÑÐÐ. ÐÑÐÐ Ñ ÐÐÑ ÐÐ ÐÐÐÑÑÐÐÑÑÑ ÐÐÐÑÑÐÑÑ ÐÐÑÑÑÐ Ð ÑÐÑÐÐÑÐÐ Ñ
+ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÑÑÐÐÐ ÐÐÐÐÐ, ÐÑ ÐÐÐÑÐ ÐÐÐÑÐÐÐÐÐÑÑ ÐÐÐÐ ÐÐ ÑÐÐÐÑÑÑÐÑ ÐÐÑÐ:
+<code>deb-master.torproject.org</code>, <code>mirror.netcologne.de</code>
+ÐÐÐ <code>vidalia.mirror.youam.de</code>.
+</p>
+
+<hr /> <a id="source"></a>
+<h2><a class="anchor" href="#source">ÐÐÐÑÐÐ ÐÐ ÐÑÑÐÐÐÑÑ ÐÐÐÐÐ</a></h2>
+<br />
+
+<p>
+ÐÑÐÐ ÐÑ ÑÐÑÐÑÐ ÑÐÐÑÐÑÑ ÑÐÐÐ ÐÐÐÐÑ ÐÐ ÐÑÑÐÐÐÑÑ ÐÐÐÐÐ, ÐÐÐ ÐÐÑÑÐÐÑÐÑÑÑ
+ÐÐÐÐÐÐÑÑ ÐÐÐÐÑÑ <tt>deb-src</tt> Ð ÑÐÐÐ <tt>sources.list</tt>.
+<pre>
+deb-src http://deb.torproject.org/torproject.org &lt;ÐÐÐ_ÐÐÐÐÐÐÐÐÐÐÐÐ&gt; main
+</pre>
+ÐÐÐ ÑÐÐÐÐ ÐÐÑÑÐÐÑÐÑÑÑ ÑÑÑÐÐÐÐÐÑÑ ÐÐÐÐÑÑ, ÐÐÐÐÑÐÐÐÐÑÐ ÐÐÑ ÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÐÑÑ
+ÐÐÐÐÑÐÐ, Ð ÑÐÐÐÐ ÐÐÐÐÑÑ, ÐÐÐÐÑÐÐÐÐÑÐ ÐÐÑ ÑÐÐÑÐÐ Vidalia:
+<pre>
+apt-get install build-essential fakeroot devscripts qt4-dev-tools qt4-designer libqt4-dev g++ cmake
+apt-get build-dep vidalia
+</pre>
+ÐÐÐÐÑÑ ÐÑ ÐÐÐÐÑÐ ÑÐÐÑÐÑÑ Vidalia Ð ~/debian-packages:
+<pre>
+mkdir ~/debian-packages; cd ~/debian-packages
+apt-get source vidalia
+cd vidalia-*
+debuild -rfakeroot -uc -us
+cd ..
+</pre>
+ÐÐÐÐÑÑ ÐÑ ÐÐÐÐÑÐ ÑÑÑÐÐÐÐÐÑÑ ÑÐÐÐÐÐÐÑÐ ÐÐÐÐÑ: 
+<pre>
+sudo dpkg -i vidalia_*.deb
+</pre>
+</p>
+
+<p>
+ÐÐÐÐÑÑ Vidalia ÑÑÑÐÐÐÐÐÐÐÐ Ð ÐÐÐÑÑÐÐÐ. ÐÐÐÐÐÐÐÑÑÐÑÑ ÑÐ <a href="<page
+docs/tor-doc-unix>#polipo">ÑÐÐÐÑÑÑÐÐ ÑÐÐÐÐ</a> ÑÑÐÐÐÐÐÑÑÐÐ "Vidalia ÐÐ
+Linux/Unix".
+</p>
+
+<hr />
+
+<p>ÐÑÐÐ Ñ ÐÐÑ ÐÑÑÑ ÐÑÐÐÐÐÐÐÐÐÑ ÐÐ ÑÐÑÑÑÐÐÐÑ ÑÑÐÐÐ ÐÐÐÑÐÐÐÑÐ, ÐÐÐÐÐÑÐÑÑÐ, <a
+href="<page contact>">ÐÐÐÐÐÐÐÑÑÐ ÐÐÑ Ñ ÐÐÐÐ</a>. ÐÐÐÑÐÐÐ!</p>
+
+  </div>
+<!-- #main -->
+</div>
+
+
+#include <foot.wmi>


Property changes on: website/trunk/docs/ru/debian-vidalia.wml
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: website/trunk/docs/ru/debian.wml
===================================================================
--- website/trunk/docs/ru/debian.wml	                        (rev 0)
+++ website/trunk/docs/ru/debian.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -0,0 +1,175 @@
+
+
+
+
+
+
+## translation metadata
+# Revision: $Revision$
+# Translation-Priority: 3-low
+#include "head.wmi" TITLE="Tor: Debian/Ubuntu Instructions" CHARSET="UTF-8"
+<div class="center">
+
+<div class="main-column">
+
+<a id="debian"></a>
+<h2><a class="anchor" href="#debian">ÐÐÑÐÐÐÑ 1: TOR ÐÐ Debian lenny, Debian sid
+ÐÐÐ Debian testing</a></h2>
+<br />
+
+<p>
+If you're using Debian stable (lenny), unstable (sid), or testing (squeeze),
+just run<br /> <tt>apt-get install tor tor-geoipdb</tt> as root.
+</p>
+
+<p>
+ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÐÐ, ÑÑÐ ÑÑÐÑ ÑÐÐÑÐÐ ÐÐ ÐÐÑÐÐÑÐÑÑÐÑ ÑÑÑÐÐÐÐÐÑ ÐÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐ
+TOR, ÐÐ Ñ ÐÐÑ ÐÑÐÐÑ ÐÐÐÐÐÐÐÐÑÑÑ ÐÐÐÑÑÐÑÑ ÐÐÐÐÑÐ ÐÐÐÐÐÐÐÐÐÑ
+ÐÐÐÐÐÐÑÐÐÑÑÐ. ÐÑÐÐÑ ÑÑÑÐÐÐÐÐÑÑ ÐÐÑÐÐÐÐÑÑ ÐÐÑÑÐÑ TOR, ÑÐ.ÐÐÑÐÐÐÑ 2 ÐÐÐÐ. 
+</p>
+
+<p>
+ÐÐÐÐÑÑ TOR ÑÑÑÐÐÐÐÐÐÐ Ð ÑÐÐÐÑÐÐÑ. ÐÐÐÐÐÐÐÑÑÐÑÑ ÑÐ <a href="<page
+docs/tor-doc-unix>#polipo">ÑÐÐÐÑÑÑÐÐ ÑÐÐÐÐÐÐÐ</a> ÑÑÐÐÐÐÐÑÑÐÐ "Tor ÐÐ
+Linux/Unix". 
+</p>
+
+<hr /> <a id="ubuntu"></a> <a id="packages"></a>
+<h2><a class="anchor" href="#ubuntu">ÐÐÑÐÐÐÑ 2: Tor ÐÐ Ubuntu ÐÐÐ Debian</a></h2>
+<br />
+
+<p>
+<b>ÐÐ ÐÑÐÐÐÑÐÑÐÑÐ ÐÐÐÐÑÑ ÐÐ ÑÐÐÐÐÐÑÐÑÐÐÐ Ubuntu.</b> ÐÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÑÑÑÑ Ð
+ÑÐÐÑÑÑÑÑ ÑÑÑÐÑÐÐÑÐÐÐ. Ð.Ð. ÐÑ ÐÐ ÑÐÐÐÐÑÐ ÐÐÐÑÑÐÑÑ ÐÐÐÐÐÐÐÐÐÑ ÐÐÐÐÐÐÐÐÑÐÐ Ð
+ÐÑÐÑÐÑÐÑÐÐÐ ÐÐÐÐÐÐÐÐÐÑ. 
+</p>
+
+<p>
+ÐÐÐ ÐÐÑÑÐÐÑÐÑÑÑ ÐÐÑÑÑÐÐÑÑ ÐÐÑ ÑÐÐÐÐÐÑÐÑÐÐ, ÐÑÐÐÐÐ ÑÐÐ ÐÑ ÑÐÐÐÐÑÐ ÑÑÑÐÐÐÐÐÑÑ
+TOR. ÐÑÐÐÐÐ ÐÑÐÐÐ ÐÐÐ ÑÐÐÐÑÐÑ ÐÐÐÑÑÐÑÑ ÐÐÑ ÐÐÑÐÐÐ ÐÐÑÑÑÐÐÑÑÐÐÐ. ÐÑÐÐ ÐÑ
+ÐÑÐÐÐÑÐÑÐÑÐ Ubuntu 9.10, ÐÐÐ ÐÐÐÑÐÐÐÑÑÑ ÂkarmicÂ, Ð Ubuntu 9.04 ÐÐÐÑÐÐÐÑÑÑ
+ÂjauntyÂ, 8.10 ÐÐÐÑÐÐÐÑÑÑ ÂinterpidÂ, Ð 8.04 ÐÐÐÑÐÐÐÑÑÑ ÂhardyÂ. ÐÑÐÐ ÐÑ
+ÐÑÐÐÐÑÐÑÐÑÐ Debian Etch, ÑÐ ÐÐÑÑÑÐÐÑÑÐÐ ÐÐÐÑÐÐÐÑÑÑ ÂetchÂ, Ð Debian Lenny
+ÐÐÐÑÐÐÐÑÑÑ ÂLennyÂ. ÐÐÐÐÐÑÑÐ ÑÐÐÐÑÑÑÑÑ ÑÑÑÐÐÑ Ð ÑÐÐÐ
+<tt>/etc/apt/sources.list</tt>:<br />
+<pre>
+deb     http://deb.torproject.org/torproject.org &lt;ÐÐÐ_ÐÐÐÐÐÐÐÐÐÐÐÐ&gt; main
+</pre>
+ÐÐÐ &lt;ÐÐÐ_ÐÐÐÐÐÐÐÐÐÐÐÐ&gt; ÑÐÐÐÑÐÑ ÐÐÐÐÐÐÑÑ ÐÐ ÐÐÑ ÐÐÑÐÐÐ ÐÐÑÑÑÐÐÑÑÐÐÐ
+(ÐÐÐÑÐÐÐÑ, etch, lenny, sid, karmic, jaunty, intrepid, hardy Ð Ñ.Ð.). 
+</p>
+
+<p>
+ÐÐÐÐÐÑÑÐ GPG-ÐÐÑÑ, ÐÑÐÐÐÑÐÑÐÐÑÐ ÐÐÑ ÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐ, Ñ ÐÐÐÐÑÑÑ ÐÐÐÐÐÐÑ 
+<pre>
+gpg --keyserver keys.gnupg.net --recv 886DDD89
+gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
+</pre>
+ÐÐÐÐÐÐÑÐ ÑÐÐÑÐÐ ÐÑÑÐÑÐÐÐÐÐ Ð ÑÑÑÐÐÐÐÐÑÐ TOR Ñ ÐÐÐÐÑÑÑ ÐÐÐÐÐÐ 
+<pre>
+apt-get update
+apt-get install tor tor-geoipdb
+</pre>
+</p>
+
+<p>
+ÐÐÐÐÑÑ TOR ÑÑÑÐÐÐÐÐÐÐ Ð ÑÐÐÐÑÐÐÑ. ÐÐÐÐÐÐÐÑÑÐÑÑ ÑÐ <a href="<page
+docs/tor-doc-unix>#polipo">ÑÐÐÐÑÑÑÐÐ ÑÐÐÐÐÐÐÐ</a> ÑÑÐÐÐÐÐÑÑÐÐ "Tor ÐÐ
+Linux/Unix". 
+</p>
+
+<p style="font-size: small">
+DNS-ÐÐÐÐÑÑ <code>deb.torproject.org</code> ÑÑÑÐÐÐÑÑÑ ÐÐ ÐÐÐÐÐÑÑÐÐ
+ÐÐÐÐÐÐÑÐÐÑÑ ÑÐÑÐÐÑÐÐ. ÐÑÐÐ Ñ ÐÐÑ ÐÐ ÐÐÐÑÑÐÐÑÑÑ ÐÐÐÑÑÐÑÑ ÐÐÑÑÑÐ Ð ÑÐÑÐÐÑÐÐ Ñ
+ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÑÑÐÐÐ ÐÐÐÐÐ, ÐÑ ÐÐÐÑÐ ÐÐÐÑÐÐÐÐÐÑÑ ÐÐÐÐ ÐÐ ÑÐÐÐÑÑÑÐÑ ÐÐÑÐ:
+<code>deb-master.torproject.org</code>, <code>mirror.netcologne.de</code>
+ÐÐÐ <code>tor.mirror.youam.de</code>.
+</p>
+
+<hr /> <a id="development"></a>
+<h2><a class="anchor" href="#development">ÐÐÑÐÐÐÑ 3: ÐÑÐÐÐÑÐÐÐÐÐÐÐ ÑÐÐÑÑÐÐ ÐÐÑÐÐ
+ÑÐÐÑÐÐÐÑÐÐ TOR ÐÐ Debian ÐÐÐ Ubuntu</a></h2>
+<br />
+
+<p>ÐÑÐÐ ÐÑ ÑÐÑÐÑÐ ÐÑÐÐÐÑÐÐÐÐÑÑ <a href="<page
+download>#packagediff">ÑÐÐÑÐÐÐÑÑÐÐÐÐÑÑ ÐÐÑÑÐÑ</a> TOR (ÐÐÐÐÐ ÑÑÐÐÑÐÐÐÐÐÑÐÑÑ,
+ÐÐ Ð ÐÐÐÐÐ ÂÑÑÑÑÑÂ), ÐÐÐ ÐÐÐÐÐÐÐÐÑÑÑ ÑÑÑÐÐÐÐÐÑÑ ÐÑÑÐÐÐ ÐÐÐÐÑ ÐÑÑÐÑÐÐÐÐÐ Ð
+ÑÐÐÐ <tt>/etc/apt/sources.list</tt>:<br />
+<pre>
+deb     http://deb.torproject.org/torproject.org &lt;ÐÐÐ_ÐÐÐÐÐÐÐÐÐÐÐÐ&gt; main
+deb     http://deb.torproject.org/torproject.org experimental-&lt;ÐÐÐ_ÐÐÐÐÐÐÐÐÐÐÐÐ&gt; main
+</pre>
+ÐÐÐ ÐÑ ÑÐÐÐÐ ÐÐÐÑÑÐÐÐÑÐÑÐ ÐÐÑ ÑÐÐÐÐÐ ÐÐÑÑÑÐÐÑÑÐÐÐ (etch, lenny, sid, karmic,
+jaunty, intrepid, hardy) ÐÐÐÑÑÐ ÑÑÑÐÐÐ &lt;ÐÐÐ_ÐÐÐÐÐÐÐÐÐÐÐÐ&gt;.
+</p>
+
+<p>
+ÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÐÐÐÐÑ 
+<pre>
+gpg --keyserver keys.gnupg.net --recv 886DDD89
+gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
+apt-get update
+apt-get install tor tor-geoipdb
+</pre>
+</p>
+
+<p>
+ÐÐÐÐÑÑ TOR ÑÑÑÐÐÐÐÐÐÐ Ð ÑÐÐÐÑÐÐÑ. ÐÐÐÐÐÐÐÑÑÐÑÑ ÑÐ <a href="<page
+docs/tor-doc-unix>#polipo">ÑÐÐÐÑÑÑÐÐ ÑÐÐÐÐÐÐÐ</a> ÑÑÐÐÐÐÐÑÑÐÐ "Tor ÐÐ
+Linux/Unix". 
+</p>
+
+<hr /> <a id="source"></a>
+<h2><a class="anchor" href="#source">ÐÐÐÑÐÐ ÐÐ ÐÑÑÐÐÐÑÑ ÐÐÐÐÐ</a></h2>
+<br />
+
+<p>
+ÐÑÐÐ ÐÑ ÑÐÑÐÑÐ ÑÐÐÑÐÑÑ ÑÐÐÐ ÐÐÐÐÑ ÐÐ ÐÑÑÐÐÐÑÑ ÐÐÐÐÐ, ÐÐÐ ÐÐÑÑÐÐÑÐÑÑÑ
+ÐÐÐÐÐÐÑÑ ÐÐÐÐÑÑ <tt>deb-src</tt> Ð ÑÐÐÐ <tt>sources.list</tt>.
+<pre>
+# For the stable version.
+# For the unstable version.
+
+deb-src http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
+
+
+deb-src http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
+deb-src http://deb.torproject.org/torproject.org experimental-&lt;DISTRIBUTION&gt; main
+</pre>
+ÐÐÐ ÑÐÐÐÐ ÐÐÑÑÐÐÑÐÑÑÑ ÑÑÑÐÐÐÐÐÑÑ ÐÐÐÐÑÑ, ÐÐÐÐÑÐÐÐÐÑÐ ÐÐÑ ÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÐÑÑ
+ÐÐÐÐÑÐÐ, Ð ÑÐÐÐÐ ÐÐÐÐÑÑ, ÐÐÐÐÑÐÐÐÐÑÐ ÐÐÑ ÑÐÐÑÐÐ TOR: 
+<pre>
+apt-get install build-essential fakeroot devscripts
+apt-get build-dep tor
+</pre>
+ÐÐÐÐÑÑ ÐÑ ÐÐÐÐÑÐ ÑÐÐÑÐÑÑ TOR Ð ~/debian-packages: 
+<pre>
+mkdir ~/debian-packages; cd ~/debian-packages
+apt-get source tor
+cd tor-*
+debuild -rfakeroot -uc -us
+cd ..
+</pre>
+ÐÐÐÐÑÑ ÐÑ ÐÐÐÐÑÐ ÑÑÑÐÐÐÐÐÑÑ ÑÐÐÑÐÐÐÑÐ ÐÐÐÐÑ: 
+<pre>
+sudo dpkg -i tor_*.deb
+</pre>
+</p>
+
+<p>
+ÐÐÐÐÑÑ TOR ÑÑÑÐÐÐÐÐÐÐ Ð ÑÐÐÐÑÐÐÑ. ÐÐÐÐÐÐÐÑÑÐÑÑ ÑÐ <a href="<page
+docs/tor-doc-unix>#polipo">ÑÐÐÐÑÑÑÐÐ ÑÐÐÐÐÐÐÐ</a> ÑÑÐÐÐÐÐÑÑÐÐ "Tor ÐÐ
+Linux/Unix". 
+</p>
+
+<hr />
+
+<p>ÐÑÐÐ Ñ ÐÐÑ ÐÑÑÑ ÐÑÐÐÐÐÐÐÐÐÑ ÐÐ ÑÐÑÑÑÐÐÐÑ ÑÑÐÐÐ ÐÐÐÑÐÐÐÑÐ, ÐÐÐÐÐÑÐÑÑÐ, <a
+href="<page contact>">ÐÐÐÐÐÐÐÑÑÐ ÐÐÑ Ñ ÐÐÐÐ</a>. ÐÐÐÑÐÐÐ!</p>
+
+  </div>
+<!-- #main -->
+</div>
+
+
+#include <foot.wmi>


Property changes on: website/trunk/docs/ru/debian.wml
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: website/trunk/docs/ru/rpms.wml
===================================================================
--- website/trunk/docs/ru/rpms.wml	                        (rev 0)
+++ website/trunk/docs/ru/rpms.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+## translation metadata
+# Revision: $Revision$
+# Translation-Priority: 3-low
+#include "head.wmi" TITLE="Tor: CentOS/Fedora/OpenSUSE Instructions" CHARSET="UTF-8"
+<div class="center">
+
+<div class="main-column">
+
+<a id="rpms"></a>
+<h2><a class="anchor" href="#rpms">ÐÐÐÐÑÑ Tor ÐÐÑ ÐÐÑÑÑÐÐÑÑÐÐÐÐ, ÐÑÐÐÐÐÐÐÑÑ ÐÐ
+Red Hat Packages' Manager (RPM).</a></h2>
+<br />
+
+<p>ÐÐ ÐÑÐÐÐÑÐÑÐÑÐ ÐÐÐÐÑÑ Ð ÐÑÐÐÐÐÑÑ ÑÐÐÐÐÐÑÐÑÐÑÑ. ÐÐÑÐÑÑÑÑ ÐÐÐ ÑÐÐÑÑÑÑÑ
+ÑÑÑÐÑÐÐÑÐÐÐ. ÐÐ ÐÑÑÑ ÐÑ ÐÐ ÑÐÐÐÐÑÐ ÐÐÐÑÑÐÑÑ ÐÐÐÐÐÐÐÐÐÑ ÐÐÐÐÐÐÐÐÑÐÐ Ð
+ÐÑÐÑÐÑÐÑÐÐÐ ÐÐÐÐÐÐÐÐÐÑ ÐÐÐÐÐÐÑÐÐÑÑÐ.
+</p>
+
+<p>
+ÐÐÐ ÐÐÑÑÐÐÑÐÑÑÑ ÑÑÑÐÐÐÐÐÑÑ ÐÑÑÐÑÐÐÐ Tor, ÐÑÐÐÐÐ ÑÐÐ ÐÑ ÑÐÐÐÐÑÐ ÐÐÐÑÑÐÐÑÑ
+Tor. Ð ÑÐÑÑÐÐ Ñ ÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐ Yum, ÑÐÐÐÐÐÑÐ Ð ÐÐÑÐÐÐÐÐ
+/etc/yum.repos.d/ ÑÐÐÐ Ñ ÐÐÐÐÐÐ torproject.repo. ÐÐÐÐÑÐÑÐ Ð ÐÐÐÐ ÑÐÐÐÑÑÑÐÐ:
+<pre>[torproject]
+name=Tor and Vidalia
+enabled=1
+autorefresh=0
+baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/
+type=rpm-md
+gpgcheck=1
+gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org
+</pre>
+
+ÐÑÐÐ ÐÑ ÑÐÑÐÑÐ ÐÐÐÐÐÑÐÐÐÐÑÑ Tor Ð ÐÐÑÑÐÐÑÐÐÐ ÑÐÑÑÐÑÐÐÐ, ÐÐÐ ÐÐÑÑÐÐÑÐÑÑÑ
+ÐÐÐÐÐÐÑÑ ÑÑÑÐÐÑ DISTRIBUTION ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÑÑÑÐÑ: centos4, centos5, fc10,
+fc11, fc12, suse</p>
+
+<p>ÐÑÐÐ ÐÐ ÐÑ ÑÐÑÐÑÐ, ÑÑÐÐÑ Ñ ÐÐÑ ÐÑÐÐ ÑÑÑÐÐÐÐÐÐÐÐ ÑÐÐÐÑ ÐÐÑÐÐÐÐÑÑ (ÐÐÑÑÐÐÑ)
+ÐÐÑÑÐÑ Tor, ÐÐÐÐÐÐÑÐ ÑÑÑÐÐÑ DISTRIBUTION ÐÐÐÐÐ ÐÐ ÑÑÐÑ:
+centos4-experimental, centos5-experimental, fc10-experimental,
+fc11-experimental, fc12-experimental, suse-experimental</p>
+
+<p>
+ÐÐÐÐÑÑ Tor ÑÑÑÐÐÐÐÐÐÐ Ð ÐÐÐÑÑÐÐ. ÐÐÐÐÐÐÐÑÑÐÑÑ ÑÐ <a href="<page
+docs/tor-doc-unix>#polipo">ÑÐÐÐÑÑÑÐÐ ÑÐÐÐÐÐÐÐ</a> ÑÑÐÐÐÐÐÑÑÐÐ "Tor on
+Linux/Unix".
+</p>
+
+<p style="font-size: small">
+DNS-ÐÐÐÐÑÑ <code>deb.torproject.org</code> ÑÑÑÐÐÐÑÑÑ ÐÐ ÐÐÐÐÐÑÑÐÐ
+ÐÐÐÐÐÐÑÐÐÑÑ ÑÐÑÐÐÑÐÐ. ÐÑÐÐ Ñ ÐÐÑ ÐÐ ÐÐÐÑÑÐÐÑÑÑ ÐÐÐÑÑÐÑÑ ÐÐÑÑÑÐ Ð ÑÐÑÐÐÑÐÐ
+ÐÐÐÐÐÐÐÐÐÑ Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÑÑÐÐÐ ÐÐÐÐÐ, ÐÑ ÐÐÐÑÐ ÐÐÐÑÐÐÐÐÐÑÑ ÐÐÐÐ ÐÐ
+ÑÐÐÐÑÑÑÐÑ ÐÐÑÐ: <code>deb-master.torproject.org</code>,
+<code>mirror.netcologne.de</code> ÐÐÐ <code>tor.mirror.youam.de</code>.
+</p>
+
+<hr /> <hr /> <a id="source"></a>
+<h2><a class="anchor" href="#source">ÐÐÐÑÐÐ ÐÐ ÐÑÑÐÐÐÑÑ ÐÐÐÐÐ</a></h2>
+<br />
+
+<p>
+ÐÑÐÐ ÐÑ ÑÐÑÐÑÐ ÑÐÐÑÐÑÑ ÐÐÐÐÑ Ñ Tor ÐÐ ÐÑÑÐÐÐÑÑ ÐÐÐÐÐ, ÐÐÐÐÐÑÐÑÑÐ
+ÐÐÐÐÐÐÐÑÑÐÑÑ Ñ <a href="<gitblob>doc/tor-rpm-creation.txt">ÐÐÑÑÑÑÐÑÐÑÐÐ ÐÐ
+ÑÐÐÐÐÐÐÑ ÐÐÐÐÑÐ</a>.
+</p>
+
+<hr />
+
+<p>ÐÑÐÐ Ñ ÐÐÑ ÐÑÑÑ ÐÑÐÐÐÐÐÐÐÐÑ ÐÐ ÑÐÑÑÑÐÐÐÑ ÑÑÐÐÐ ÐÐÐÑÐÐÐÑÐ <a href="<page
+contact>">ÑÐÐÐÑÐÑÐ ÐÐÐ</a>. ÐÐÐÑÐÐÐ!</p>
+
+  </div>
+<!-- #main -->
+</div>
+
+#include <foot.wmi>


Property changes on: website/trunk/docs/ru/rpms.wml
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: website/trunk/docs/ru/tor-doc-relay.wml
===================================================================
--- website/trunk/docs/ru/tor-doc-relay.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/docs/ru/tor-doc-relay.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -180,13 +180,13 @@
 ÐÐÐÐÐÐ ÑÐ IP-ÐÐÑÐÑÐ Ð ÐÐÑÑÑ, ÐÐÑÐÑÑÐ ÐÑ ÑÐÐÐÑÐÐÐÑÑ ÑÐÑÑÐÑÐÐÐÑÑ Ð Ñ.Ð.
 </p>
 
-<p>ÐÐÐ ÑÐÐÑÐÐ ÐÐ ÐÐÑÐÐÐÐÐÑ, ÑÑÐ ÐÐÑÑÑÐÐÐ, ÐÐ ÐÑÐÑÐÐÐÑ "ÐÐÑÐÑÐÐÑÐÑ ÑÐÑÐÐÑÐ" Ð
-ÐÐÑÐÐÑÐÑÐÐ, ÑÑÐÐÑ ÑÐÑÐÑÐÑÑÑÐÐÐÑÑ ÐÐÑÐÑÐÐÑÐÑ Ð ÑÐÐÐÐ ÐÐÑÐÑÐ, ÐÐÑÑÐÑ, ÐÐÑÑÐÑ Ð
-Ñ.Ð. ÑÑÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÐÐ ÑÐÑÐ. ÐÑ ÐÐÐÐÑÐ <a
-href="http://194.109.206.212/tor/status/authority";> ÐÐÐÑÑÐÐÑÑ ÐÐÐÐ ÐÐ
-ÑÑÐÑÑÑÐÐ ÑÐÑÐ ÐÑÑÑÐÑÑ</a> Ð, ÑÐÐÐÐ ÐÐÑÐÐÐÐ, ÐÐÐÑÐ ÐÐÑÑÑÐÐÐÐÑÐ ÐÐÐÐ ÐÑÐÐÐÐÐÐÐ
-ÑÐÑÑÐÐÑÐÑÑÐÑÐ Ð ÑÐÐÐÐÑÑÑÑ, ÑÑÐ ÐÐ Ð ÑÐÑÐ. ÐÐÐÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÑÑÑ ÐÐÐÐÐÐÐÑÑ
-ÐÐÑÐÐÐÑÐÐ ÑÐÐÑÐÐ, ÑÑÐÐÑ ÐÐÑÐÐÑÐÑÐÑ ÑÑÐÐÐÐ ÐÐÐÐÐÐÑÑÑÑ.</p>
+<p>When it decides that it's reachable, it will upload a "server descriptor" to
+the directories, to let clients know what address, ports, keys, etc your
+relay is using. You can <a
+href="http://194.109.206.212/tor/status-vote/current/consensus";>load one of
+the network statuses manually</a> and look through it to find the nickname
+you configured, to make sure it's there. You may need to wait a few seconds
+to give enough time for it to make a fresh directory.</p>
 
 <hr /> <a id="after"></a>
 <h2><a class="anchor" href="#after">ÐÐÐ ÑÐÑÐÐÑÑÑÐ: ÐÐÐÐÐ ÐÑÐ ÑÐÐÐÑÐÐÑ</a></h2>

Modified: website/trunk/docs/ru/tor-doc-unix.wml
===================================================================
--- website/trunk/docs/ru/tor-doc-unix.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/docs/ru/tor-doc-unix.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -1,205 +1,194 @@
-## translation metadata
-# Based-On-Revision: 20384
-# Last-Translator: ygrekheretix/gmail/com
 
-#include "head.wmi" TITLE="Tor: ÐÑÑÐÐÐÐÐÐ ÐÐ Linux/BSD/Unix" CHARSET="UTF-8"
 
+
+
+
+
+## translation metadata
+# Revision: $Revision$
+# Translation-Priority: 3-low
+#include "head.wmi" TITLE="Tor: Linux/BSD/Unix Install Instructions" CHARSET="UTF-8"
 <div class="center">
 
 <div class="main-column">
 
-<h1>ÐÐÐÑÑÐ ÐÐÐÐÐÑÐ <a href="<page index>">Tor</a> ÐÐ Linux/BSD/Unix</h1>
+<h1>ÐÐÐÑÑÐ <a href="<page index>">Tor</a> ÐÐ Linux/BSD/Unix</h1>
 <br />
 
 <p>
-<b>ÐÐÐÐÐÐÐÐ: ÑÑÐ ÐÐÑÑÑÑÐÑÐÐ ÐÐ ÑÑÑÐÐÐÐÐÐ ÐÐÐÐÐÑÐ Tor.
-ÐÑÐÐ ÐÑ ÑÐÑÐÑÐ ÐÐÑÐÐÐÐÐÑÑ ÑÐÑÐÐÑÐÑÐ ÑÑÐÑÐÐ ÑÑÐÐÑ ÐÐÐÐÑÑ
-ÑÐÐÐÐÑÐÑÑÑÑ ÑÐÑÐ Tor (ÐÐÐÐÐÑÐÑÑÐ ÐÐÐÐÐÑÐ ÑÑÐ), ÐÑÐÑÐÑÐÐÑÐ ÐÐÑÑÑÑÐÑÐÐ ÐÐ
-<a href="<page docs/tor-doc-relay>">ÐÐÑÑÑÐÐÐÐ ÑÐÑÐÐÑÐ</a>.</b>
+<b>ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÐÐ, ÑÑÐ ÑÑÐ ÐÐÑÑÑÑÐÑÐÐ ÐÐ ÐÐÐÑÑÐÑ ÐÐÐÐÐÑÐ Tor. ÐÑÐÐ ÐÑ ÐÑ
+ÑÐÑÐÐÐ ÐÑÐÐÐÑÑÐÐÐÑÑ ÑÐÐÐ ÑÑÐÑÑÐÐ ÐÑÑÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÑÐ, ÑÑÐÐÑ ÐÐÐÐÑÑ ÑÐÑÐ Tor
+ÑÐÑÑÐ, ÐÐÐÐÐÐÐÑÑÐÑÑ Ñ ÑÑÐÐÐÐÐÑÑÐÐÐ ÐÐ <a href="<page
+docs/tor-doc-relay>">ÐÐÑÑÑÐÐÐÐ ÑÐÐÐ</a>.</b>
 </p>
 
-<hr />
-<a id="installing"></a>
-<h2><a class="anchor" href="#installing">ÐÐÐ ÐÐÑÐÑÐ: ÐÐÐÑÐÑÑ Ð ÑÑÑÐÐÐÐÐÑÑ Tor</a></h2>
+<hr /> <a id="installing"></a>
+<h2><a class="anchor" href="#installing">ÐÐÐ 1: ÐÐÐÑÑÐÐÐ Ð ÑÑÑÐÐÐÐÐÐ Tor</a></h2>
 <br />
 
 <p>
-ÐÐÑÐÐÐÐÐÐ ÑÐÐÐÐ Tor ÐÐÐÐÐ ÐÐÐÑÐ ÐÐ ÑÑÑÐÐÐÑÐ
-<a href="<page download-unix>">download</a>. ÐÑ ÐÑÐÐÐÑÑÐÐÐÑÐÐ ÐÐÐÐÑÑ ÐÐÑ Debian,
-Red Hat, Gentoo, *BSD, etc. ÐÑÐÐ ÐÑ ÐÑÐÐÐÑÐÑÐÑÐ Ubuntu, ÐÐ ÑÑÑÐÐÐÐÐÐÐÐÐÑÐ ÐÐÑÑÑÐÐÑÑÐÐÐÑÐ 
-ÐÐÐÐÑÑ; ÐÐÐÑÑÐ ÑÑÐÐÐ ÐÐÐÑÐÑÐÑÐÑÑ <a href="<page docs/debian>#ubuntu">ÐÐÑÐÐ deb ÑÐÐÐÐÐÑÐÑÐÐÐ</a>.
+ÐÐÑÐÐÐÐÑÑ ÐÐÑÑÐÑ Tor ÐÐÑÐÐÐÑÑÑ ÐÐ ÑÑÑÐÐÐÑÐ <a href="<page
+download-unix>">ÐÐÐÑÑÐÐÐ</a>, ÐÐÐ ÐÑÐÐÐÑÑÐÐÐÐÐÑ ÐÐÐÐÑÑ ÐÐÑ Debian, Red Hat,
+Gentoo, *BSD ÐÑÐ. ÐÑÐÐ ÐÑ ÐÑÐÐÐÑÐÑÐÑÐ  Ubuntu, ÐÐ ÐÑÐÐÐÑÐÑÐÑÐ ÑÑÐÐÐÐÑÑÐÑÐ
+ÑÐÐÐÐÐÑÐÑÐÐ, ÐÑÑÑÐ ÐÐÑÑÑÐÐÑÐ <a href="<page docs/debian>#ubuntu">ÐÑÑÐÑÐÐÐ
+Tor</a>.
 </p>
 
-<p>ÐÑÐÐ ÐÑ ÑÐÐÐÑÐÐÑÐ ÐÐ ÐÑÑÐÐÐÐÐÐÐ, ÑÐÐÑÐÐÐ ÑÑÑÐÐÐÐÐÑÐ
-<a href="http://www.monkey.org/~provos/libevent/";>libevent</a>,
-Ð ÑÐÐÐÐÑÐÑÑ ÑÑÐ Ñ ÐÐÑ ÐÑÑÑ openssl Ð zlib (ÐÐÐÑÑÐÑ -devel ÐÐÐÐÑÑ ÐÑÐÐ ÑÐÐÐÐ
-ÑÑÑÐÑÑÐÑÑÑ). ÐÐÑÐÐ :<br />
-<tt>tar xzf tor-<version-stable>.tar.gz; cd tor-<version-stable><br />
-./configure &amp;&amp; make</tt><br />
-ÐÐÐÐÑÑ ÐÑ ÐÐÐÐÑÐ ÐÐÐÑÑÐÐÑÑ tor ÐÐÐ <tt>src/or/tor</tt>, ÐÐÐ ÑÐÐÐÐÐ <tt>make install</tt>
-(ÐÐÐ root'ÐÐ ÐÑÐÐ ÑÑÐÐÑÐÑÑÑ) ÑÑÑÐÐÐÐÐÑÐ Ð /usr/local/, Ð ÑÐÐÐÐ ÐÐÐÐÐ ÐÐÐÑÑÐÐÑÑ ÐÐÐÐÐÑ
+<p>ÐÑÐÐ ÐÑ ÑÐÐÐÑÐÐÑÐ Tor ÐÐ ÐÑÑÐÐÐÑÑ ÐÐÐÐÐ, ÑÐÐÑÐÐÐ ÑÑÑÐÐÐÐÐÑÐ <a
+href="http://www.monkey.org/~provos/libevent/";>ÐÐÐÐÐÐÑÐÐÑ libevent</a>, Ð
+ÑÐÐÐÐ ÑÐÐÐÐÑÐÑÑ, ÑÑÐ Ñ ÐÐÑ ÑÑÑÐÐÐÐÐÐÐÑ ÐÐÐÐÐÐÑÐÐÐ openssl Ð zlib (Ð ÑÐÐ
+ÑÐÑÐÐ ÐÐÐÐÑ ÐÐÑ ÑÐÐÑÐÐÐÑÑÐÐÐÐ Ñ ÐÐÐÐÑÐÐÐÐÐ -devel). ÐÐÑÐÐ ÐÐÐÑÑÑÐÑÐ:<br />
+<tt>tar xzf tor-<version-stable>.tar.gz; cd tor-<version-stable></tt><br />
+<tt>./configure &amp;&amp; make</tt><br /> ÐÐÑÐÐ ÑÑÐÐÐ ÐÑ ÐÐÐÐÑÐ ÐÐÐÑÑÑÐÑÑ
+Tor ÐÐÐ <tt>src/or/tor</tt>, ÐÐÐ ÐÑ ÐÐÐÐÑÐ ÐÑÐÐÐÐÐÑÑ ÐÐÐÐÐÐÑ <tt>make
+install</tt> (ÐÑ ÐÐÐÐÐ ÑÑÐÐÑÐÐÐÑÐÐÐÐÑÐÐÑ root ÐÑÐ ÐÐÐÐÑÐÐÐÐÐÑÑÐ) ÐÐÑ
+ÑÑÑÐÐÐÐÐÐ Tor Ð ÐÐÐÐÑ /usr/local/, ÐÐÑÐÐ ÑÐÐÐ ÐÑ ÑÐÐÐÐÑÐ ÐÐÐÑÑÐÐÑÑ ÐÑÐÐÑÐÐÐÑ
 ÐÑÐÑÑÐ ÐÐÐÐÐÐÐÐ <tt>tor</tt>.
 </p>
 
-<p>ÐÐ ÑÐÐÐÑÐÐÐÑ Tor ÐÐÑÑÑÐÐÐ ÑÐÐÐÑÐÑÑ Ð ÐÐÑÐÑÑÐÐ ÐÐÐÐÐÑÐ. ÐÑÐÐÐÑÐÑÐÑÑÑ ÐÑÑÑÐÐÐÐÑÐ
-ÐÐÐÑÐÐÑÑÐÑÐÐÐÐÑÐ ÑÐÐÐ, Ð Ð ÐÐÐÑÑÐÐÑÑÐÐ ÑÐÑÑÐÐÐ ÐÐÐ ÐÐ ÑÑÐÐÑÐÑÑÑ ÐÐÐÐÐÑÑÑ ÐÐÐÐÐ-ÐÐÐÐ
-ÐÐÑÑÑÐÐÐÐ. ÐÑÑ, Tor ÑÑÑÐÐÐÐÐÐÐ.
+<p>ÐÐÐÐÑÐÐÑÐÐ Tor ÐÐÑÑÑÐÐÐ ÐÐÐ ÐÐÐÐÐÑ. Ð ÐÑÐÐÐÐÐÐ ÐÑÐÐÐÑÐÑÐÑÑÑ ÐÑÑÑÐÐÐÐÑÐ
+ÐÐÐÑÐÐÑÑÐÑÐÐÐÐÑÐ ÑÐÐÐ, Ð Ð ÐÐÐÑÑÐÐÑÑÐÐ ÑÐÑÑÐÐÐ ÐÐÑÐÐÐÑÑÑÐÐÐÐ Tor ÐÐ
+ÐÐÑÑÐÐÑÐÑÑÑ. ÐÐÐÐÑÑ Tor ÑÑÑÐÐÐÐÐÐÐ.
 </p>
 
-<hr />
-<a id="privoxy"></a>
-<h2><a class="anchor" href="#privoxy">ÐÐÐ ÐÑÐÑÐÐ: ÐÐÑÑÑÐÐÑÑ Privoxy ÑÑÐÐÑ ÐÑÐÐÐÑÐÐÐÐÑÑ Tor Ð ÐÑÐÑÐÐÑÐ</a></h2>
+<hr /> <a id="privoxy"></a> <a id="polipo"></a>
+<h2><a class="anchor" href="#polipo">ÐÐÐ 2: ÑÑÑÐÐÐÐÐÐ Polipo ÐÐÑ ÐÑÐÑÐÐÑÐ</a></h2>
 <br />
 
-<p>ÐÐÑÐÐ ÑÑÑÐÐÐÐÐÐ Tor, ÐÐÐÐ ÐÐÑÑÐÑÑ ÐÑÑÐÐÐ ÐÑÐÐÐÐÐÐÐÑ ÐÑÐÐÐÑÐÐÐÐÑÑ ÐÐÐ.
+<p>ÐÐÑÐÐ ÑÑÑÐÐÐÐÐÐ Tor ÐÐÐ ÐÐÑÑÐÐÑÐÑÑÑ ÐÐÑÑÑÐÐÑÑ ÐÑÐÐÐÑÐÑÐÐÑÐ ÐÐÐÐ ÐÑÐÐÐÐÐÐÐÑ
+ÐÐÑ ÑÐÐÐÑÑ Ñ ÐÑÐÐÑÐÐÐÐÐ.
 </p>
 
 <p>
-ÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐÐÐÑÐÑÑ ÐÑÐÑÐÐÑÐÐ. ÐÐÐÑÐÐÐ ÑÑÑÐÐÐÐÐÑÐ
-<a href="http://www.privoxy.org/";>Privoxy</a>: ÐÐÐÐÐÐÑÐ 'recent releases'
-Ð ÐÑÐÐÑÐÑÐ ÐÐÐÑÐÐÑÑÐÐ ÐÐÐÐÑ ÐÐÐ ÐÑÑÐÐÐÐÐÐ. Privoxy ÑÑÐ ÑÐÐÑÑÑÑÑÑÐÐ
-ÐÐÐ-ÐÑÐÐÑÐ ÐÐÑÐÑÑÐ ÑÐÑÐÑÐ ÐÐÑÐÐÑÐÑÑÐÑÑÑ Ñ Tor'ÐÐ.
+ÐÑÐÐÐÐ ÐÑÐÐÐ ÐÐÑÑÑÐÐÐÐÐÑÑÑ ÐÑÐÑÐÐÑ. ÐÐÐÑÑÐÐÑÐ <a
+href="http://www.pps.jussieu.fr/~jch/software/polipo/";>Polipo</a> Ñ ÐÐÑÐÐÐ
+ÑÐÐÐÐÐÑÐÑÐÑ. Polipo - ÐÐÑÐÑÑÑÑÐÐ ÐÑÐÐÑÐ-ÑÐÑÐÐÑ, ÐÐÑÐÑÑÐ ÐÐÐÐÑ ÑÐÑÐÐÐÐ
+ÐÐÐÐÐÐÐÐÑÑÐ ÐÐ ÑÑÐÐÐÐÐÑÐÐÐÐÐÑ HTTP-ÑÑÐÑÑÐÐÐ, ÐÐÑÑÐÐÑ ÐÐ ÑÐÐÑÐÑÑÑ ÐÐÐÑÐÐÑÑÐÐ
+ÐÐÑ ÐÑÐÐÐÑÐÐÐÐÐÐÑ Ñ Tor. ÐÐÐÐÐÑÐÑÑ, ÑÑÐ ÐÐÑÑÐÑ ÐÐÐÑÑÐÐÐÐÐÐÐ Polipo ÐÐ
+ÐÐÐÑÑÐ, ÑÐÐ 1.0.4, ÑÐÐ ÐÐÐ ÐÐÐÐÐ ÑÐÐÐÐÐ ÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÑÑ
+ÑÑÐÐÐÐÐÑÐÐÐÐÐÐ Ð SOCKS, ÑÑÐ ÐÐÐÐÑÐÐÐÐÐ ÐÐÑ ÐÑÐÐÐÑÐÐÐÐÐÐÑ Polipo Ñ Tor. ÐÐÐ
+ÐÐÑÑÐÐÑÐÑÑÑ ÑÐÐÐÐÑÑ Privoxy (ÐÐÐÑÐÐÐÑ, apt-get remove privoxy or yum remove
+privoxy) ÐÐÑ ÐÑÐÐÐÑÐÑÐÑÐÐÐÑ  ÐÐÑÐÐÐÐÑÑÐÐÐÑÑÐÐ ÐÑÐÐÑÐÐÐ.
 </p>
 
-<p>ÐÐÑÐÐ ÑÑÑÐÐÐÐÐÐ Privoxy (ÐÐ ÐÐÐÐÑÐ ÐÐÐ ÐÐ ÐÑÑÐÐÐÐÐÐÐ),
-<b>ÑÑÐÐÑÐÑÑÑ ÐÐÑÑÑÐÐÑÑ Privoxy ÐÑÐÐÐÑÐÐÐÐÑÑ Tor</b>. Ð ÐÐÑÐÑÑÐÐ ÐÑÐÐÐÑÐ ÐÐÐÐÐ ÐÑÐÐÐÑÐÐÐÐÑÑ
-<a href="https://wiki.torproject.org/noreply/TheOnionRouter/PrivoxyConfig";>ÑÑÐÑ ÐÐÐÑÐÐ
-Privoxy</a>. ÐÐÐÑÐ ÐÐÐ ÐÑÐÐÑÑÑÑ ÐÐÑÑÑÐÐÑÑ Privoxy ÐÑÑÑÐÑÑ, ÑÐÐÐÑÑ ÑÐÐÐÐÐÐÑÐ ÐÐÐÐ.
+<p>ÐÑÑÐÐÐÐÐÐ Polipo (ÐÐ ÐÐÐÐÑÐ ÐÐÐ ÐÐ ÐÑÑÐÐÐÑÑ ÐÐÐÐÐ), <b>ÐÑ ÐÐÐÐÐÑ ÐÐÑÑÑÐÐÑÑ
+Polipo ÐÐ ÑÐÐÐÑÑ Ñ Tor</b>. ÐÐÐÑÐÐÑÐ <a
+href="https://svn.torproject.org/svn/torbrowser/trunk/build-scripts/config/polipo.conf";>ÐÐÑÑÑÐÐÐÐ
+Polipo ÐÐÑ Tor</a> Ð ÐÐÑÐÐÐÐÐÑÐÑÐ ÐÐ ÐÐÐÑÐÐÑÑÐÑÐÐÐÐÑÐ ÑÐÐÐ Polipo (ÐÐÐÑÐÐÐÑ,
+/etc/polipo/config or ~/.polipo).  ÐÐÑÐÐÐÐÑÑÑÐÑÐ Polipo ÐÐÑ ÐÑÐÐÐÐÐÐÐÑ
+ÐÐÑÑÑÐÐÐ. ÐÐÐÑÐÐÐÑ:<br /> <tt>/etc/init.d/polipo restart</tt>
 </p>
 
-<p>
-ÐÑÐÑÐÐÑÐ ÐÐÐÑÐÐÑÑÐÑÐÐÐÐÑÐ ÑÐÐÐ Privoxy (ÑÐ. Ð /etc/privoxy/ ÐÐÐ /usr/local/etc/)
-Ð ÐÐÐÐÐÑÑÐ ÑÑÑÐÐÑ <br/>
-<tt>forward-socks4a / 127.0.0.1:9050 .</tt><br/>
-Ð ÐÐÑÐÐÐ ÑÐÐÐÐ. <b>ÐÐ ÐÐÐÑÐÑÑÐ ÑÐÑÐÑ Ð ÐÐÐÑÐ ÑÑÑÐÐÐ.</b>
-</p>
+<p>ÐÑÐÐ ÐÑ ÑÐÑÐÑÐ, ÐÑ ÐÐÐÐÑÐ ÐÑÐÐÐÑÐÐÐÐÑÑ Privoxy Ñ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/PrivoxyConfig";>ÐÐÐÐÑÐÐ
+ÐÐÑÑÑÐÐÐÐÐÐ</a>. ÐÐÐ ÐÐÐ ÐÐÐ ÐÑÐÐÑÐ-ÑÐÑÐÐÑÐ (Privoxy Ð Polipo) ÐÑÐÐÐÑÐÑÑÑ
+ÐÐÑÑ 8118, ÐÐ ÑÑÐÐÑ ÐÑ ÐÑÐÐÐÑÐÐÐÐÑÑ ÐÐÐÐÐÑÐÐÐÐÐÐ.</p>
 
-<p>
-Ð ÐÐÐÐÑÐÑÑÑ ÐÐÑÑÑÐÐÑÑÐÐÐÑ, localhost ÑÐÐÐÐÐÐÑÑÑ Ð IPv6 ÐÐÑÐÑ, Ð ÐÐÐÐÑÐÑÑÐ
-ÐÑÐÐÑÐÐÐÑ ÐÐÐÑÑ ÐÑÐÑÑÑÐÐÑÑ ÐÑÐÐÐÐÐÑ ÐÑÐ ÑÐÐÐÐÐÐÐÐÐ Ð Privoxy. Ð ÑÐÐÐÐ ÑÐÑÑÐÐ ÐÐÐÐÐÐÑÐ ÑÑÑÐÐÑ
+<hr /> <a id="using"></a>
+<h2><a class="anchor" href="#using">ÐÐÐ 3: ÐÐÑÑÑÐÐÑÐ ÐÐÑÐ ÐÑÐÐÐÐÐÐÐÑ ÐÐ ÑÐÐÐÑÑ Ñ
+Tor</a></h2>
 <br />
-<tt>listen-address localhost:8118</tt><br />
-ÐÐ<br />
-<tt>listen-address 127.0.0.1:8118</tt>
-</p>
 
-<p>Privoxy ÐÐÐÐÑÑÐÐÐÑ Ð ÐÐÐ-ÑÐÐÐ ÐÑÐ ÐÑÐÑÐÐÑÑÐÐ ÐÐÐÑÐÑÑ. ÐÑÐÐÑ ÐÑÐÐÑÑÐÑÑ ÑÑÐ ÐÐÐÐÐÐÐÐÐ
-ÐÐÐÐÐÐÐÐÑÐÑÑÐÑÐ ÑÑÐ ÑÑÑÐÑÐÐ Ð ÐÐÐÑÐÐÐ (ÐÑÑÐÐÐÐ ÑÐÐÐÐÐ
-\# Ð ÐÐÑÐÐÐ ÑÑÑÐÐÐ). ÐÑÐ ÑÑÐ ÑÑÑÐÐÐ ÐÑÐÐÑÐÑÑ ÑÐÐ:<br/>
-<tt>logfile logfile</tt><br/>
-Ð <br/>
-<tt>jarfile jarfile</tt><br/>
-Ð (ÐÐ ÐÐÐÐÑÐÑÑÑ ÑÐÑÑÐÐÐÑ)<br/>
-<tt>debug 1  # show each GET/POST/CONNECT request</tt><br/>
-</p>
+<p>ÐÐÑÐÐ ÑÑÑÐÐÐÐÐÐ Tor Ð Polipo, ÐÐÐ ÐÐÑÑÐÐÑÐÑÑÑ ÐÐÑÑÑÐÐÑÑ ÐÐÑÐ ÐÑÐÐÐÐÐÐÐÑ ÐÐÑ
+ÑÐÐÐÑÑ Ñ ÐÐÐÐ. ÐÑÐÐÐÐ ÐÑÐÐÐ ÑÐÐÐÑÐÑ ÐÐÑÑÑÐÐÑÑ ÐÑÐÑÐÐÑ.</p>
 
-<p>Ð ÐÐÐÐÑÐÐÐÑÑÐ ÐÑ ÑÐÐÐ ÐÐÐÐÐ Ñ ÐÐÑ ÐÐ ÑÐÐÐÑÐÐÐÑ ÐÐÑÑÑÐÐÐÐ Privoxy,
-ÐÐÐ ÐÐÐÐÑ ÐÐÐÐÐÐÐÐÑÑÑÑ ÐÑÐÐÑÑÐÑÑ <tt>enable-remote-toggle</tt>,
-<tt>enable-remote-http-toggle</tt>, Ð <tt>enable-edit-actions</tt>.
+<p>ÐÑÐ ÑÐÐÐÑÐ Ñ Tor ÑÐÐÐÐÐÐÐÑÐÑÑÑ ÐÑÐÐÐÑÐÐÐÐÑÑ ÐÑÐÑÐÐÑ Firefox Ñ ÐÐÐÐÐÐÐÐÐÐÐ
+Torbutton ÐÐÑ ÐÐÐÑÐÐÑÐÐÐÑ ÐÐÐÐÑÑÑÐÐ ÐÐÐÐÐÐÑÐÐÑÑÐ. ÐÑÐÑÑÐ ÑÑÑÐÐÐÐÐÑÐ <a
+href="https://addons.mozilla.org/firefox/2275/";>ÐÐÐÐÐÐÐÐÐÐ Torbutton</a>,
+ÐÐÑÐÐÐÐÑÑÐÐÑÐ Firefox, Ð ÐÑÐÑÐÐÑ ÐÑÐÐÑ ÐÐÑÐÐ Ð ÑÐÐÐÑÐ:
 </p>
 
-<p>ÐÐÑÐÐÐÐÑÑÑÐÑÐ Privoxy ÑÑÐÐÑ ÐÐÑÑÑÐÐÐÐ ÐÑÑÑÐÐÐÐ Ð ÑÐÐÑ.</p>
-
-<hr />
-<a id="using"></a>
-<h2><a class="anchor" href="#using">ÐÐÐ ÑÑÐÑÐÐ: ÐÐÑÑÑÐÐÑÑ ÐÑÐÐÐÐÐÐÐÑ ÐÐÑ ÐÑÐÐÐÑÐÐÐÐÐÐÑ Tor</a></h2>
-<br />
-
-<p>ÐÐÑÐÐ ÑÑÑÐÐÐÐÐÐ, ÐÑ ÐÐÐÐÐÑ ÐÐÑÑÑÐÐÑÑ ÐÑÑÐÐÑÐÑÐ ÐÑÐÐÐÐÐÐÐÑ
-ÑÑÐÐÑ ÐÐÐ ÐÑÐÐÐÑÐÐÐÐÐÐ Tor Ð Privoxy. ÐÐÑ ÐÐÑÐÐÐ ÐÐÑÑÑÐÐÐ ÐÑÐÑÐÐÑ.</p>
-
-<p>ÐÑÐÐÐÑÐÑÐÑÐ Firefox Ð Torbutton, ÐÐÑ ÐÑÑÑÐÐ ÐÐÐÐÐÐÑÐÐÑÑÐ. ÐÑÐÑÑÐ ÑÑÑÐÐÐÐÐÑÐ
-<a href="https://addons.mozilla.org/firefox/2275/";>ÐÐÐÐÐÐ Torbutton</a>,
-ÐÐÑÐÐÐÐÑÑÑÐÑÐ ÐÑÐÑÐÐÑ, Ð ÐÑÑ ÐÐÑÐÐÐ:
-</p>
-
 <img alt="Torbutton plugin for Firefox"
-src="../img/screenshot-torbutton.png"
-border="1">
+src="../img/screenshot-torbutton.png" border="1"> <br />
 
-<br />
-
 <p>
-ÐÑÐÐ ÐÑ ÑÐÐÐÑÐÐÑÐÑÑ ÐÐÐÑÑÐÐÑÑ Firefox Ð Tor ÐÐ ÑÐÐÐÑÑ ÐÐÐÐÑÑÑÐÑÐÑ, ÑÐÐÑÑÐÑÐ
-<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SocksListenAddress";>
-ÑÑÐÑ ÑÐÐÐÐÐ FAQ</a>.
+ÐÑÐÐ ÐÑ ÑÐÐÐÑÐÐÑÐÑÑ ÐÑÐÐÐÑÐÐÐÐÑÑ Firefox ÐÐ ÐÐÐÐÑÑÑÐÑÐ ÐÐÐ Tor, ÐÐÐÐÐÐÐÑÑÐÑÑ
+Ñ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SocksListenAddress";>ÑÐÑÑÑÐÐ
+ÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÑÑÐÑ Tor ÐÐ ÐÑÑÐÐÐ ÐÐÐÐÑÑÑÐÑÐ</a>.
 </p>
 
-<p>ÐÑÐÐÑ ÑÐÑÐÑÐÑÐÑÐÐÐÑÑ(Torify) ÐÑÑÐÐÐ ÐÑÐÐÐÐÐÐÐÑ ÐÐÑÐÑÑÐ ÐÐÐÐÐÑÐÐÐÐÑÑ HTTP ÐÑÐÐÑÐ,
-ÐÑÐÑÑÐ ÑÐÐÐÐÑÐ ÐÐ ÐÐ Privoxy (ÑÐ ÐÑÑÑ, localhost ÐÐÑÑ 8118). ÐÐÑ ÐÑÐÐÐÑÐÐÐÐÐÐÑ SOCKS
-ÐÐÐÑÑÐÑÑ (ÑÐÑÑÐÐ IM (ÑÐÑÑÐÐÑ ÐÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐÑÐÐÐÑÐÐ), Jabber, IRC, ÐÑÐ),
-ÑÐÐÐÐÑÐ ÐÐÑÐÑ Ð ÐÐÑÑ ÐÐÐÐÐÑÐ Tor (localhost ÐÐÑÑ 9050), ÐÐ ÐÐÐÐÐÐÐÑÑÐÑÑ
-<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS";>Ñ ÑÑÐÐ
-ÑÐÐÐÐÐÐÐ FAQ</a> ÐÐÐÑÑÐÐÑÑÐÐ ÐÐÐÐÐÐÐÐÑÐÐÑÑÑ ÑÐÐÐÐÐ ÑÐÐÑÐÐÐ. ÐÐÑ ÐÑÐÐÐÐÐÐÐÐ
-ÐÐÑÐÑÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÑÑ ÐÐ SOCKS ÐÐ HTTP, ÐÐÐÑÐÐÑÐÑÐ
-<a href="http://tsocks.sourceforge.net/";>tsocks</a> ÐÐÐ
-<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO#socat";>socat</a>.
+<p>ÐÑÐÐÑ ÐÐÐÑÐÐÐÑÑ ÑÐÑÐÐ ÑÐÑÑ Tor ÑÑÐÑÑÐÐ ÐÑÐÐÐÐÐÐÐÐ, ÐÐÐÐÐÑÐÐÐÐÑÑÐÑ ÐÐÑÑÑÐÐÐÑ
+HTTP-ÐÑÐÐÑÐ, ÑÐÐÐÐÑÐ ÐÐÑÑÑÐÐÐÐ Polipo (ÐÐ ÑÐÐÐÑÐÐÐÑ localhost ÐÐÑÑ
+8118). ÐÐÑ ÐÑÐÐÐÑÐÐÐÐÐÐÑ SOCKS5 (ÐÐÑ ÐÑÑÑÑÑÑ ÑÐÐÐÑÐÐÐÐ, ÐÐÐÐÐÑÐÐ Jabber, IRC
+ÐÑÐ), ÐÑ ÐÐÐÐÑÐ ÐÐÑÑÑÐÐÑÑ ÐÑÐÐÐÐÐÐÐÐ ÐÐÐÐÑÑÐÐÑÑÐÐÐÐÐ ÐÐ Tor (ÐÐ ÑÐÐÐÑÐÐÐÑ
+localhost ÐÐÑÑ 9050), ÐÐ ÐÐÐÐÐÐÐÑÑÐÑÑ Ñ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS";>ÑÐÑÑÑÐÐ
+ÐÐÐÑÐÑÐÐÐ</a> ÐÐ ÐÐÐÐÐÑ ÐÐÐÑÐÐÑÑÐÐ ÐÐÐÐÐÐÐ ÑÐÐÑÐÐÐ. ÐÐÑ ÐÑÐÐÐÐÐÐÐÐ ÐÐÐ
+ÐÐÐÐÐÑÐÐÐ ÐÐÑÑÑÐÐÐÐ ÐÑÐÐÑÐ-ÑÐÑÐÐÑÐÐ ÐÑÐÑÐÐÐÐÐÐ SOCKS/HTTP, ÐÑ ÐÐÐÐÑÐ
+ÐÐÑÐÐÐÑÐÐÐÐÑÑÑÑ ÐÑÐÐÐÐÐÐÐÑÐÐ <a
+href="http://tsocks.sourceforge.net/";>tsocks</a> ÐÐÐ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO#socat";>socat</a>.
 </p>
 
-<p>ÐÐÑÐÑÐÐÑÐÑ Ð ÑÐÐ ÐÐÐ ÑÐÑÐÑÐÑÐÑÐÐÐÑÑ ÐÑÑÐÐÐ ÐÑÐÐÐÐÐÐÐÑ ÐÐÐÐÐ ÐÐÐÑÐÐÑÑ Ð
-<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO";>Torify
-HOWTO</a>.
+<p>ÐÐÐÐÐÐÐÑÐÐÑÐÑÑ ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐÐÐÐÑÐÑÑ ÐÑÐÐÐÐÐÐÐÐ ÐÐÑ ÑÐÐÐÑÑ Ñ
+Tor, ÐÐÐÐÐÐÐÑÑÐÑÑ Ñ  <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO";>ÐÐÐÐÑÐ
+ÑÑÐÐÐÐÐÑÑÐÐÐ</a>.
 </p>
 
-<hr />
-<a id="verify"></a>
-<h2><a class="anchor" href="#verify">ÐÐÐ ÑÐÑÐÑÑÑÑÐ: ÐÐÐÐÐÑÐÑÑ ÑÑÐ ÐÑÑ ÑÐÐÐÑÐÐÑ</a></h2>
+<hr /> <a id="verify"></a>
+<h2><a class="anchor" href="#verify">ÐÐÐ 4: ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÑÑÐÐÑÐÐÑÑÑ ÑÐÐÐÑÑ</a></h2>
 <br />
 
 <p>
-ÐÐÐÐÐ, ÐÐÐÑÐÐÑÐÑÐ ÐÑÐÐÐÑÐÐÐÐÑÑ ÐÑÐÑÐÐÑ ÑÐÑÐÐ Tor Ð ÑÐÐÐÐÑÐÑÑ ÑÑÐ
-ÐÐÑ IP ÐÐÑÐÑ ÐÐ ÐÑÐÐÑÑÑÑ. ÐÐÑÐÑÐÑÐ
-<a href="https://check.torproject.org/";>Tor ÐÐÑÐÐÑÐÑ</a>
-Ð ÐÑÐÐÐÑÑÑÐ ÑÑÐ ÐÐ ÑÐÐÐÐÑ - ÐÑÐÐÐÑÐÑÐÑÐ ÐÑ Tor ÐÐÐ ÐÐÑ.
-(ÐÑÐÐ ÑÐÐÑ ÐÐ ÑÐÐÐÑÐÐÑ, ÐÐÑÐÐÑÑÐÑÐ
-<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate";>ÑÑÐÑ
-ÑÐÐÐÐÐ FAQ</a> Ð ÑÐÐÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÑÐÐÐÐ ÐÑÐÑÐÑÑÐÑÐÐÐÑÑ Tor.)
+<!--PO4ASHARPBEGIN<a href="http://ipchicken.com/";>
+this site</a>PO4ASHARPEND-->
+#to see what IP address it thinks you're using.
+ÐÐÐÐÑÑ ÐÐÐ ÑÐÐÐÑÐÑ ÐÐÐÑÐÐÐÐÐÑÑ ÐÐÐÑÑÑÐÑÑ ÐÑÐÑÐÐÑ Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ Tor Ð
+ÑÐÐÐÐÑÑÑÑ, ÑÑÐ ÐÐÑ IP-ÐÐÑÐÑ ÑÐÑÑÑ ÐÑ ÐÐÐÑÑÐÑÐÐÑ. ÐÐÐÐÐÑÐ ÐÐ ÑÑÑÐÐÐÑÑ  <a
+href="https://check.torproject.org/";>ÐÑÐÐÐÑÐÐ Tor</a> Ð ÐÐÑÐÐÑÑÐÑÐ, ÑÐÐÐÑÐÐÑ
+Tor ÐÐÐ ÐÐÑ.  (ÐÑÐÐ ÑÐÐÑ ÐÐ ÑÐÐÐÑÐÐÑ, ÐÐÑÐÐÑÑÐÑÐ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate";>ÑÐÑÑÑÐ
+ÐÐÐÑÐÑÑ</a> ÐÐ ÐÐÐÐÐÐÐÑÐÐÑÐÑÐ ÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑÐÐ Tor.)
 </p>
 
-<p>ÐÑÐÐ ÑÑÑÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐÐÑÐÑÐ ÑÐÐÐÑÐÐÐÐ ÐÐÑÐÑÑÐ ÐÐÑÐÐÐÑÐÐÐÐÑ ÑÐÐÑÐÐÐÐÑÑÑ ÐÐÑÐÐÐ
-ÐÐÐÐÑÑÑÐÑÐ ÐÐÐÐÐÐÑÐÑÑÑ Ð ÑÐÐÐÐÑ ÑÐÐÐ (ÐÐÐÑÐÐÐÑ ÑÑÐ SELinux ÐÐ Fedora Core 4),
-ÑÐÐÑÐÑÐÑÐ ÑÐÐÐÐÐÐÐÐÑ ÐÑ ÐÐÐÐÐÑÐÑÑ ÐÑÐÐÐÐÐÐÐÐ Ð Privoxy (ÐÐÐÐÐÑÐÑÐ ÐÐÑÑ 8118) Ð
-Tor (ÐÐÐÐÐÑÐÑÐ ÐÐÑÑ 9050). ÐÑÐÐ ÐÐÑ ÑÐÐÐÑÐÐÐÐ
-ÐÐÐÐÐÑÑÐÑ ÐÑÑÐÐÑÑÐÐ ÑÐÐÐÐÐÐÐÐÑ, ÐÑÐÑÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐ TCP ÐÐÑÑÑ
-80 Ð 443, Ð ÐÐÑÐÐ ÐÐÐÐÐÐÐÑÑÐÑÑ Ñ
-<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FirewalledClient";>
-ÑÑÐÐ ÑÐÐÐÐÐÐÐ FAQ</a>. ÐÑÐÐ ÐÐÑÑÑÐÐÐÐ SELinux ÐÐÑÐÑÑ ÐÐÑÑÐÐÑÐÐÐ ÑÐÐÐÑÐ
-tor ÐÐÐ privoxy, ÑÐÐÐÐÐÑÐ ÑÐÐÐ booleans.local Ð ÐÐÑÐÐÐÐÐ
-/etc/selinux/targeted. ÐÑÐÑÐÐÑÐ ÑÑÐÑ ÑÐÐÐ Ð ÐÑÐÐÐÐÐ ÑÐÐÑÑÐÐÐÐ ÑÐÐÐÐÑÐÑÐ Ð
-ÑÐÐÐÐÑÐ "allow_ypbind=1". ÐÐÑÐÐÐÐÑÑÑÐÑÐ ÐÐÑÐÐÑ ÐÐÑ ÐÑÐÐÑÑÐÑ ÑÑÐÑ ÐÐÑÑÑÐÐÐ.
+<p>ÐÑÐÐ Ñ ÐÐÑ ÑÑÐÐÑ ÐÑÐÐÐÐÐÑÑÑ, ÐÐÑÐÑÑÐ ÐÐÑÐÐÐÑÐÐÐÐÑ ÐÐÐÐÐÐÐÐÑÑÑ ÐÐÑ ÐÐÐÐÑÑÑÐÑÐ
+ÐÐÐÐÐÑÑÐÑÑÑÑ Ð ÑÐÐÐÐÑ ÑÐÐÐ (ÐÐÐÑÐÐÐÑ, ÑÑÐÐÑÑÐÐ ÐÐÐÐÐÐÐÐÐ SELinux ÐÐ Fedora
+Core 4), ÐÑÐÐÐÑÑÑÐ, ÑÐÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð Polipo
+(localhost, ÐÐÑÑ 8118) Ð Tor (localhost, ÐÐÑÑ 9050). ÐÑÐÐ ÐÐÑ ÐÑÐÐÐÐÐÑÑÑ
+ÐÐÑÐÐÐÑÐÐÐÐÑ ÐÑÑÐÐÑÑÐÐ ÑÐÐÐÐÐÐÐÐÑ, ÑÐÐÑÐÑÐÑÐ Tor ÐÐÐÐÐÑÑÐÑÑÑÑ ÑÐÑÑ ÐÑ Ð
+TCP-ÐÐÑÑÐÐ 80 Ð 443, Ð ÐÐÐÐÐÐÐÑÑÐÑÑ Ñ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FirewalledClient";>ÑÐÑÑÑÐÐ
+ÐÐÐÑÐÑÐÐÐ</a>. ÐÑÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐÐ SELinux ÐÐÑÑÑÐÑÑ ÑÐÐÐÑÑ tor ÐÐÐ privoxy,
+ÑÐÐÐÐÐÑÐ ÑÐÐÐ Ñ ÐÐÐÐÐÐ booleans.local Ð ÐÐÑÐÐÐÐÐ /etc/selinux/targeted.
+ÐÑÐÑÐÐÑÐ ÑÐÐÐ Ð ÑÐÐÑÑÐÐÐÐ ÑÐÐÐÐÑÐÑÐ Ð ÐÐÐÐÐÑÑÐ ÑÑÑÐÑÐÑ
+"allow_ypbind=1". ÐÐÑÐÐÐÐÑÑÐÐÑÐ ÐÐÑÐÐÑ ÐÐÑ ÐÑÐÐÐÐÐÐÐÑ ÐÐÐÐÐÐÐÐÐ.
 </p>
 
-<p>ÐÑÐÐ ÑÑÐ ÐÑÑ-ÑÐÐÐ ÐÐ ÑÑÐÐÐÑÐÐÑ, ÐÐÐÑÐÑÐ ÐÐÐÑÐÐÐÐÐ Ð <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork";>FAQ</a>.</p>
+<p>ÐÑÐÐ ÐÑÐÐÐÐÐÑ ÐÐ ÐÑÑÐÐÐÐ, ÐÐÐÐÐÐÐÑÑÐÑÑ Ñ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork";>ÑÐÑÑÑÐÐ
+ÐÐÐÑÐÑÐÐÐ</a>.</p>
 
-<hr />
-<a id="server"></a>
-<a id="relay"></a>
-<h2><a class="anchor" href="#relay">ÐÐÐ ÐÑÑÑÐ: ÐÐÑÑÑÐÐÑÐ ÑÐÑÐÐÑ</a></h2>
+<hr /> <a id="server"></a> <a id="relay"></a>
+<h2><a class="anchor" href="#relay">ÐÐÐ 5: ÐÐÑÑÑÐÐÐÐ ÑÐÐÐ</a></h2>
 <br />
 
-<p>ÐÐÑÑ Tor ÐÑÐÐÐÑÐÐÐÑÑÑ ÐÐ ÐÐÐÑÐÐÐÐÑÑÐÑ ÐÐÐÑÑÐÑÑÑ ÑÐÐÐÐ ÑÑÐÑÐÐÐÐ. ÐÐÐ ÐÐÐÑÑÐ ÐÑÐÐÐ
-ÐÐÐÑÑÐÐÑÑ ÑÐÑÐÐÑÑ, ÑÐÐ ÐÑÑÑÑÐÐ ÑÐÐÐÑÐÐÑ ÑÐÑÑ Tor. ÐÑÐÐ Ñ ÐÐÑ ÐÑÑÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐ
-20 ÐÐÐÐÐÐÐÑ/ÑÐÐ Ð ÐÐÐÐÐÐ ÐÐÐÑÐÐÐÐÐÐÐ, ÐÐÐÐÐÑÐÑÑÐ ÐÐÐÐÐÐÑÐ ÑÐÑÐ Tor ÐÐÑÑÑÐÐÐ ÑÐÐÐ
-ÑÐÑÐÐÑ. ÐÑ ÑÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐ ÑÐÐÐ ÑÑÐÐÑ ÑÐÐÐÐÑÑ ÑÐÑÐÐÑÑ Tor ÐÑÐÐÐÐÐ Ð ÑÐÐÐÐÑÐÐ
-Ð ÐÑÐÐÐÑÐÐÐÐÐÐÐ, ÐÐÐÑÑÐÑ ÐÐÑÐÐÐÑÐÐÐÐ ÑÑÐÑÐÐÐ, ÐÐÑÐÐÐÑÐÐÐÑ ÐÑÑÐÐÐ(exit policies),
-Ð ÐÐÐÐÐÑÐÐÑ ÐÐÐÐÐÐÑÐÑÐÐÑ IP.</p>
+<p>ÐÐÑÑ Tor ÐÑÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐÑÑÐÑ, ÐÐÑÐÑÑÐ ÐÑÐÐÐÑÑÐÐÐÑÑÑ ÑÑÐÑÑÐÐ
+ÐÐÐÑÐÐÐÐÑÐÐÑÐ ÑÐÑÐ. ÐÐÐ ÐÐÐÑÑÐ ÑÐÐÐÐ, ÑÐÐ ÐÑÑÑÑÐÐ ÑÐÑÑ. ÐÑÐÐ Ñ ÐÐÑ ÐÑÑÑ ÑÐÑÑ
+ÐÑ 20ÐÐ/Ñ Ð ÐÐÐ ÑÑÐÑÐÐÑ, ÐÐÐÐÐÑÐÑÑÐ, ÐÐÐÐÐÐÑÐ ÑÐÑÐ Tor - ÐÐÐÑÑÑÐÑÐ
+ÑÐÐÐ. ÐÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑÑÐÐÐÑÐÑ ÐÐÑÑÐÑÐÑÐÐ ÑÑÐÐÑÐÐ, ÐÐÑÐÑÑÐ ÐÐÐÐÑÑ ÐÐÑÑÑÐÐÐÑ
+ÑÐÐÐ Tor ÐÑÐÐÐÐ Ð ÑÐÐÐÐÐÐ ÐÐÑ ÐÐÑ, Ð ÑÐÐ ÑÐÑÐÐ ÐÐÑÐÐÐÑÐÐÐÐ ÑÐÐÑÐÑÑÐ ÐÐÐÐÐÐ,
+ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÑÐÑÐÐÑ IP-ÐÐÑÐÑÐÐ Ð ÐÐÐÐÑÐÐÐ ÐÑÑÐÐÐ, ÐÐÑÐÑÑÐ ÐÐÐÑÑ
+ÐÑÐÐÐÑÐÑÐÑÐÑÑ ÐÐÐÐÐÑ Ð ÐÐÑ ÐÐÑÐÑ.</p>
 
-<p>ÐÐÐÐÐÐÑÐÐÑÑ ÐÐÐÑÐÐÐÐÑÐÐÐÐ Tor Ð ÐÐÑÐÑÑ ÐÑÐÑÐÐÑ ÐÐÐÑÐÐÑÐÐÐÐÑÑÑ
-ÐÐÐÐÐÐ ÑÐÐÐÐÑÐÐÐÐÐ ÑÐÐÐÑ ÑÐÑÐÐÑÐÐ Tor Ð ÑÐÐÐÑÑ ÑÐÐÐÐÐÑ ÐÐÑÐÑÐÐÑÐ.
-<a href="https://wiki.torproject.org/TheOnionRouter/TorFAQ#RelayAnonymity";>ÐÑ ÑÐÐÐÐ ÐÐÐÑÑÐÐÑÐ
-ÐÐÐÐÐ ÑÐÐÑÐÑÑ ÐÐÐÐÐÐÐÐÑÑÑ ÑÐÐÐ</a>,
-ÑÐÐ ÐÐÐ ÑÑÐÑÑÐ ÑÑÐÑÐÐÑ ÐÐ ÐÐÐÑÑ ÐÐÐÑÑ ÐÑÐ ÐÐÐÑÐÐÑÐÐÐÐ ÑÐÐÐÐÐÐÐÐÑ - ÐÐÑ ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÑÑÑÐÑ
-ÐÐÐ ÐÑÑÐÐÐ ÑÐÐÑ ÑÐÑÐ Tor.</p>
+<p>ÐÐÐÐÐÑÑÐÐ ÑÐÐÐÐ Ð ÑÐÐÐÑÑ ÑÐÑÐÐÑ ÐÐÑÐÑÐÐÑÐ ÐÐÑÑ ÐÐÐÑÐÐÐÐÑÐÐÑÐ Tor
+ÐÐÐÐÐÐÑÐÐÑÑÑ Ð ÐÐÐÑÐÐÐÐÑÐÐÐÑÐÐÑÑÑ.<a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity";>ÐÑ
+ÐÐÐÐÑÐ ÐÐÐÑÑÐÑÑ ÑÑÐÐÐÐÑ ÐÐÐÐÐÐÑÐÐÑÑÐ</a>, ÑÐÐ ÐÐÐ ÐÑÐ ÐÐÐÐÑÐÐ ÑÐÐÐ ÑÐÐÐÑÐÐÑÐ
+ÑÐÑÐÐÑÑ ÐÐ ÑÐÐÐÑÑ ÐÑÐÐÑÐÑÑ ÐÐÑ ÐÐÐÑÐÑ ÐÑ ÐÐÑÐÐÐÐÑÐÐÐÐÐÐÐÐÐ Ñ ÑÐÐÐ.</p>
 
-<p>ÐÐÐÑÑÐÑÐ ÐÐÐÑÐÐÐÐÐ ÐÐÐÑÐÐÐÐ <a href="<page docs/tor-doc-relay>">ÐÐÐ ÐÐÑÑÑÐÐÑÑ ÑÐÑÐÐÑ</a>.</p>
+<p>ÐÐÐÑÐÐÐÐÑÑÐ Ð ÑÑÐÐÐÐÐÑÑÐÐ ÐÐ  <a href="<page docs/tor-doc-relay>">ÐÐÑÑÑÐÐÐÐ
+ÑÐÐÐ</a>.</p>
 
 <hr />
 
-<p>ÐÑÐÐ Ñ ÐÐÑ ÐÑÑÑ ÐÐÐÐÐÐÐÐÑ ÐÐ ÑÐÑÑÑÐÐÐÑ ÑÑÐÐÐ ÐÐÐÑÐÐÐÑÐ, ÐÐÐÐÐÑÐÑÑÐ <a
-href="<page contact>">ÐÑÐÑÑÐÐÐÑÐ ÐÑ ÐÐÐ</a>. ÐÐÐÑÐÐÐ!</p>
+<p>ÐÑÐÐ Ñ ÐÐÑ ÐÑÑÑ ÐÑÐÐÐÐÐÐÐÐÑ ÐÐ ÑÐÑÑÑÐÐÐÑ ÑÑÐÐÐ ÐÐÐÑÐÐÐÑÐ, ÐÐÐÐÐÑÐÑÑÐ, <a
+href="<page contact>">ÐÐÐÐÐÐÐÑÑÐ ÐÐÑ Ñ ÐÐÐÐ</a>. ÐÐÐÑÐÐÐ!</p>
 
-  </div><!-- #main -->
+  </div>
+<!-- #main -->
 </div>
 
+
 #include <foot.wmi>

Modified: website/trunk/docs/ru/tor-doc-web.wml
===================================================================
--- website/trunk/docs/ru/tor-doc-web.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/docs/ru/tor-doc-web.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -1,9 +1,13 @@
-## translation metadata
-# Based-On-Revision: 20028
-# Last-Translator: ygrekheretix/gmail/com
 
-#include "head.wmi" TITLE="Tor: ÐÐÑÑÑÐÐÐÐ ÐÑÐÑÐÐÑÐ" CHARSET="UTF-8"
 
+
+
+
+
+## translation metadata
+# Revision: $Revision$
+# Translation-Priority: 3-low
+#include "head.wmi" TITLE="Tor: Configuring your browser to use Tor" CHARSET="UTF-8"
 <div class="center">
 
 <div class="main-column">
@@ -11,46 +15,45 @@
 <h1>ÐÐÑÑÑÐÐÐÐ ÐÑÐÑÐÐÑÐ ÐÐÑ ÐÑÐÐÐÑÐÐÐÐÐÐÑ <a href="<page index>">Tor</a></h1>
 <br />
 
-<p>ÐÑÐÐ ÐÑ ÐÑÐÐÐÑÐÑÐÑÐ Firefox (ÐÑ ÑÐÐÐÐÐÐÐÑÐÐ), ÐÐÐ ÐÐ ÐÑÐÐÐ ÑÑÐ ÑÑÑÐÐÐÑÐ.
-ÐÑÐÑÑÐ ÑÑÑÐÐÐÐÐÑÐ
-<a href="https://addons.mozilla.org/firefox/2275/";>ÐÐÐÐÐÐ Torbutton</a>,
-ÐÐÑÐÐÐÐÑÑÑÐÑÐ ÐÑÐÑÐÐÑ, Ð ÐÑÑ ÐÐÑÐÐÐ:
+<p>ÐÑÐÐ ÐÑ ÐÑÐÐÐÑÐÑÐÑÐ Firefox (ÑÐÐÐÐÐÐÐÑÐÑÑÑ), ÐÐÐ ÐÐ ÐÐÑÑÐÐÑÐÑÑÑ ÑÑÐ
+ÑÑÐÐÐÐÐÑÑÐÐ.  ÐÑÐÑÑÐ ÑÑÑÐÐÐÐÐÑÐ <a
+href="https://addons.mozilla.org/firefox/2275/";>ÐÐÐÐÐÐÐÐÐÐ Torbutton</a>,
+ÐÐÑÐÐÐÐÑÑÑÐÑÐ ÐÑÐÑÐÐÑ, Ð ÐÐÐÐÑÐ ÐÑÐÑÑÑÐÐÑÑ Ð ÑÐÐÐÑÐ:
 </p>
 
 <img alt="ÐÐÐÐÐÐ Torbutton ÐÐÑ Firefox"
-src="../img/screenshot-torbutton.png"
-border="1"/>
+src="../img/screenshot-torbutton.png" border="1"/> <br />
 
-<br />
+<p>Ð ÐÑÑÐÐÐ ÑÐÑÑÐÐ ÐÐÐ ÐÐÑÑÐÐÑÐÑÑÑ ÐÑÑÑÐÑÑ ÐÐÐÐÑÑ ÐÐÑÑÑÐÐÐÐ ÐÑÐÐÑÐ-ÑÐÑÐÐÑÐ Ð
+ÐÐÑÐÐ ÐÑÐÑÐÐÑÐ.  <br/>ÐÐÑ Mozilla Ð Firefox ÐÐ Windows, ÑÑÐ Tools - Options
+- General - Connection Settings.  <br/>ÐÐÑ Firefox ÐÐ OS X, ÑÑÐ Firefox -
+Preferences - General - Connection Settings.  <br/>ÐÐÑ Firefox ÐÐ Linux, ÑÑÐ
+Edit - Preferences - Advanced - Proxies.  <br/>ÐÐÑ Opera ÑÑÐ Tools -
+Preferences(Advanced) - Network - Proxy servers.  <br/>ÐÑÐÑÐÐÑ IE ÐÐ
+ÑÐÐÐÐÐÐÐÑÐÑÑÑ ÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÐÑÐÐÐ ÑÐÐÐÑÑ Ð ÐÐÑÐÑÐÐÑÐ, ÐÐ ÐÐÑ ÑÑÐÑÐÐÐÐÐÐÐ
+ÐÐÐÐÐ-ÑÐÐ-ÑÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÐÑÑÐ: ÐÐÑ IE, ÑÑÐ Tools - Internet Options -
+Connections - LAN Settings - Check Proxy Server - Advanced.</p>
 
-<p>Ð ÐÑÐÑÐÐÐÐÐ ÑÐÑÑÐÐ ÐÐÐ ÐÑÐÐÑÑÑÑ ÐÑÑÑÐÑÑ ÐÐÐÐÑÑ ÐÐÑÑÑÐÐÐÐ ÐÑÐÐÑÐ Ð ÐÐÑÐÐ
-ÐÑÐÑÐÐÑÐ.
-<br/>ÐÐÑ Mozilla Ð Firefox ÐÐ Windows, ÑÑÐ Tools - Options - General - Connection Settings.
-<br/>ÐÐÑ Firefox ÐÐ OS X, ÑÑÐ Firefox - Preferences - General - Connection Settings.
-<br/>ÐÐÑ Firefox ÐÐ Linux, ÑÑÐ Edit - Preferences - Advanced - Proxies.
-<br/>ÐÐÑ Opera ÑÑÐ Tools - Preferences(Advanced) - Network - Proxy servers.
-<br/>ÐÐÑÑ ÐÑ Ð ÐÐ ÑÐÐÐÐÐÐÐÑÐÐ ÐÑÐÐÐÑÐÐÐÐÑÑ IE, ÐÐÑ ÑÑÐÑÐÐÐÐÐÐÐ
-ÐÐÐÐÐ-ÑÐÐ-ÑÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÐÑÑÐ: ÐÐÑ IE, ÑÑÐ Tools - Internet Options - Connections - LAN Settings - Check Proxy Server - Advanced.</p>
-
 <img alt="ÐÐÑÑÑÐÐÐÐ ÐÑÐÐÑÐ Ð Firefox"
 src="../img/screenshot-win32-firefox-proxies.jpg" />
 
 <p>
-ÐÑ ÐÐÐÐÐÑ ÑÐÐÐÐÑÑ "localhost" Ð "8118" ÑÑÐÐÑ ÐÐÑÐÐÐÐÑÐÐÐÑÑÑ
-ÑÐÑÑÑÐ ÑÐÐÐÐÐÐÑÑ ÐÑÐÑÐÐÐÐÐ ÐÐ Privoxy, ÐÐÐ ÐÐÐÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐ. (ÐÐÐÐ 
-ÑÑÐÑÑÐÐÑ ÑÑÐ Privoxy ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑ FTP Ð Gopher, 
-<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FtpProxy";>ÐÑ 
-ÐÐÐÐÐÑ ÑÐÐÐÐÑÑ ÐÑ Ð ÐÑÐÐÐ ÑÐÑÑÐÐ</a>.) ÐÐÐÐÐ ÐÐÐÐ ÐÐÐÐÐÐÐÑÑ ÐÐÐÐ socks Ð ÐÐÑÑÑÐÐÐÐÑ
-ÐÑÐÐÑÐ ÑÑÐÐÑ ÐÐÑÐÐÐÐÑÐÐÐÑÑÑ ÐÑÑÐÐ Ð Tor ("localhost", "9050", Ð socks5)
-ÐÑÑÐÐÑÐÑÐ ÐÑÐÑÐÐÐÐÑ, ÐÑÐÐÐ ÐÐÑÐÑÑ ÑÐÑÑÑÑÑ. ÐÐÑÐÐ ÐÐÐÑÐ "OK".</p>
+ÐÑ ÐÐÐÐÐÑ ÑÐÐÐÐÑÑ "localhost" Ð "8118" ÑÑÐÐÑ ÐÐÑÐÐÐÐÑÐÐÐÑÑÑ ÑÐÑÑÑÐ ÑÐÐÐÐÐÐÑÑ
+ÐÑÐÑÐÐÐÐÐ ÐÐ Privoxy, ÐÐÐ ÐÐÐÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐ. (ÐÐÐÐ ÑÑÐÑÑÐÐÑ ÑÑÐ Privoxy ÐÐ
+ÐÐÐÐÐÑÐÐÐÐÐÑ FTP Ð Gopher, <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FtpProxy";>ÐÑ
+ÐÐÐÐÐÑ ÑÐÐÐÐÑÑ ÐÑ Ð ÐÑÐÐÐ ÑÐÑÑÐÐ</a>.) ÐÐÐÐÐ ÐÐÐÐ ÐÐÐÐÐÐÐÑÑ ÐÐÐÐ socks Ð
+ÐÐÑÑÑÐÐÐÐÑ ÐÑÐÐÑÐ ÑÑÐÐÑ ÐÐÑÐÐÐÐÑÐÐÐÑÑÑ ÐÑÑÐÐ Ð Tor ("localhost", "9050", Ð
+socks5)  ÐÑÑÐÐÑÐÑÐ ÐÑÐÑÐÐÐÐÑ, ÐÑÐÐÐ ÐÐÑÐÑÑ ÑÐÑÑÑÑÑ. ÐÐÑÐÐ ÐÐÐÑÐ "OK".</p>
 
 <hr />
 
-<p>ÐÑÐÐ Ñ ÐÐÑ ÐÑÑÑ ÐÑÐÐÐÐÐÐÐÐÑ ÐÐ ÑÐÑÑÑÐÐÐÑ ÑÑÐÐÐ ÐÐÐÑÐÐÐÑÐ, ÐÐÐÐÐÑÐÑÑÐ
-<a href="<page contact>">ÐÑÐÑÑÐÐÐÑÐ ÐÑ ÐÐÐ</a>. ÐÐÐÑÐÐÐ!</p>
+<p>ÐÑÐÐ Ñ ÐÐÑ ÐÑÑÑ ÐÑÐÐÐÐÐÐÐÐÑ ÐÐ ÑÐÑÑÑÐÐÐÑ ÑÑÐÐÐ ÐÐÐÑÐÐÐÑÐ, ÐÐÐÐÐÑÐÑÑÐ <a
+href="<page contact>">ÐÑÐÑÑÐÐÐÑÐ ÐÑ ÐÐÐ</a>. ÐÐÐÑÐÐÐ!</p>
 
-  </div><!-- #main -->
+  </div>
+<!-- #main -->
 </div>
 
+
 #include <foot.wmi>
-

Modified: website/trunk/docs/ru/tor-doc-windows.wml
===================================================================
--- website/trunk/docs/ru/tor-doc-windows.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/docs/ru/tor-doc-windows.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -17,33 +17,32 @@
 <br />
 
 <p>
-<b>ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐ ÑÐ, ÑÑÐ Ð ÑÑÐÐ ÑÐÐÑÑÐ ÐÑÐÐÑÑÐÐÐÐÐÑ ÐÐÑÑÑÑÐÑÐÐ ÐÐ
-ÑÑÑÐÐÐÐÐÐ ÐÐÐÐÐÑÐ Tor Ð ÐÐÐÑÐÑÐÐÐÐÑÑ ÑÐÑÑÐÐÐÑ Microsoft Windows (2000, XP,
-Vista, 7, Ð ÐÐÑÐÐÑÐÑÐ ÐÐÑÑÐÐ).  ÐÑÐÐ ÐÑ ÑÐÑÐÑÐ ÑÐÑÑÐÐÑÐÐÑÐÐÐÑÑ ÑÑÐÑÐÐ ÐÐÑ
-ÐÑÑÐÐÑ Ð, ÑÐÐÐÐ ÐÐÑÐÐÐÐ, ÐÐÐÐÐÑÐÐÑÑ ÑÐÑÑ ÑÐÑÐ (ÐÐÐÐÐÑÐÑÑÐ, ÑÐÐÐÐÐÑÐ ÑÑÐ),
-ÐÑÐÑÑÐÑÐ ÑÑÐÐÐÐÐÑÑÐÐ<a href="<page docs/tor-doc-relay>">ÐÐÑÑÑÐÐÐÐ
-ÑÐÑÑÐÐÑÐÑÑÐÑÐ</a>.</b>
+<b>ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐ ÑÐ, ÑÑÐ Ð ÑÑÐÐ ÑÑÐÐÐÐÐÑÑÐÐ ÐÑÐÐÑÑÐÐÐÐÐÑ ÐÐÑÑÑÑÐÑÐÐ
+ÐÐ ÑÑÑÐÐÐÐÐÐ ÐÐÐÐÐÑÐ Tor Ð ÐÐÐÑÐÑÐÐÐÐÑÑ ÑÐÑÑÐÐÐÑ Microsoft Windows (2000,
+XP, Vista, 7 Ð ÐÐ ÑÐÑÐÐÑÐÑÑ ÑÐÑÑÐÐÐÑ).  ÐÑÐÐ ÐÑ ÑÐÑÐÑÐ ÑÐÐÐÐÑÑ ÑÐÐÐ Ð, ÑÐÐÐÐ
+ÐÐÑÐÐÐÐ, ÐÐÐÐÐÑÐÐÑÑ ÑÐÑÑ ÑÐÑÐ (ÐÐÐÐÐÑÐÑÑÐ, ÑÐÐÐÐÐÑÐ ÑÑÐ), ÐÑÐÑÑÐÑÐ
+ÑÑÐÐÐÐÐÑÑÐÐ <a href="<page docs/tor-doc-relay>">ÐÐÑÑÑÐÐÐÐ ÑÐÐÐ</a>.</b>
 </p>
 
-<p>Freedom House has produced a video on how to install Tor.  You can view it
-at <a
-href="http://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>
+<p>ÐÑÐÐÐÐÐÐÑÐÑ Freedom House (ÐÐÐ ÐÐÐÐÐÐÑ) ÑÐÐÐÐÐÐ ÐÐÐÐÐ ÑÐÐÐÐ, ÑÐÑÑÐÐÐÑÐÐÑÑÐÐ
+Ð ÑÐÐ, ÐÐÐ ÑÑÑÐÐÐÐÐÑÑ Tor. ÐÑ ÐÐÐÐÑÐ ÐÑÐÑÐÐÑÑÐÑÑ ÐÐÐ ÐÐÐÑÑ: <a
+href="http://tinyvid.tv/show/3lejztnthk2tm";>TinyVid: ÐÑÑÐÐÐÐÐÐ Tor ÐÐÐ ÐÐ
+Windows (ÐÐ ÐÐÐÐÐÐÑÐÐÐ ÑÐÑÐÐ)</a>. ÐÐÐ ÐÐÐÐÑÑÐÐ Ð ÐÐÐÐÑÐÐ ÐÐÐÐÐ ÐÐÐÐÑÐÐÐÐÐ
+ÑÐÐÐÐÐ ÐÐÐ Ð ÐÐÑÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑ ÑÐÑÐ ÐÐÑÑÐÐ? ÐÐÐÐÑÐÑÐ ÐÐÐ!</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>
 </div>
 
 <hr /> <a id="installing"></a>
-<h2><a class="anchor" href="#installing">ÐÐÐ ÐÐÑÐÑÐ: ÐÐÐÑÐÐÐÐÐÐ Ð ÐÑÑÐÐÐÐÐÐ
+<h2><a class="anchor" href="#installing">ÐÐÐ ÐÐÑÐÑÐ: ÐÐÐÑÑÐÐÐ Ð ÑÑÑÐÐÐÐÐÐ
 Tor</a></h2>
 <br />
 
 <p>
-ÐÑÑÐÐÐÐÐÑÐÑÐ ÐÐÐÐÑÑ ÐÐÑ Microsoft Windows ÑÐÐÐÑÐÐÑ <a href="<page
-index>">Tor</a>, <a href="<page vidalia/index>">Vidalia</a> (ÐÑÐÑÐÑÐÑÐÐÐ
-ÐÐÐÑÐÐÐÐÑÐÐÑÑÐÐÐ ÐÐÑÐÑÑÐÐÑ ÐÐÑ Tor), <a
+ÐÐÐÑÐÐ ÐÐÑ Microsoft Windows ÑÐÐÐÑÐÐÑ <a href="<page index>">Tor</a>, <a
+href="<page vidalia/index>">Vidalia</a> (ÐÑÐÑÐÑÐÑÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÑÑÐÐÐ
+ÐÐÑÐÑÑÐÐÑ ÐÐÑ Tor), <a
 href="https://addons.mozilla.org/firefox/2275/";>Torbutton</a> (ÐÐÐÐÐÐ ÐÐÑ
 ÐÑÐÑÐÐÑÐ Mozilla Firefox), Ð <a
 href="http://www.pps.jussieu.fr/~jch/software/polipo/";>Polipo</a> (ÐÐÐ
@@ -77,7 +76,7 @@
 
 <hr /> <a id="using"></a>
 <h2><a class="anchor" href="#using">ÐÐÐ ÐÑÐÑÐÐ: ÐÐÑÑÑÐÐÐÐ ÐÐÑÐÑ ÐÑÐÐÐÐÐÐÐÐ ÐÐ
-ÐÑÐÐÐÑÐÐÐÐÐÐÐ ÑÐÑÐÐÑÐ Tor</a></h2>
+ÐÑÐÐÐÑÐÐÐÐÐÐÐ Tor</a></h2>
 <br />
 
 <p>ÐÐÑÐÐ ÑÑÑÐÐÐÐÐÐ Tor Ð Polipo ÐÐÐ ÐÐÐÐÑÐÐÐÐÐ ÐÐÑÑÑÐÐÑÑ ÐÐÑÐ ÐÑÐÐÐÐÐÐÐÑ ÐÐ
@@ -87,7 +86,7 @@
 <p>ÐÐÐ ÑÐÐÐÑÐÑ ÐÑÐÐÐÑÐÐÐÐÑÑ Tor Ñ ÐÑÐÑÐÐÑÐÐ Firefox Ð ÐÐÐÐÐÐÐÐÐÐÐ Torbutton ÐÐÑ
 ÐÐÐÑÐÐÑÐÐÐÑ ÐÐÐÐÑÑÑÐÐ ÐÐÐÐÐÐÑÐÐÑÑÐ. ÐÐÐÐÑ ÑÑÑÐÐÐÐÐÑ ÐÐÑ ÐÐÑ <a
 href="https://addons.mozilla.org/firefox/2275/";>ÐÐÐÐÐÐ
-Torbutton</a>. ÐÐÑÐÐÐÐÑÑÑÐÑÐ ÐÐÑ ÐÑÐÑÐÐÑ Firefox, Ð ÐÑÐ ÐÐÑÑÑÐÐÐÐ:
+Torbutton</a>. ÐÐÑÐÐÐÐÑÑÑÐÑÐ ÐÐÑ ÐÑÐÑÐÐÑ Firefox, Ð ÐÑÐ ÐÑÐÐÑ ÐÐÑÑÑÐÐÐÐ:
 </p>
 
 <img alt="Torbutton plugin for Firefox"
@@ -95,23 +94,22 @@
 
 <p>
 ÐÑÐÐ ÐÑ ÐÐÐÐÐÑÑÐÑÐ ÐÑÐÐÐÑÐÐÐÐÑÑ Firefox ÐÐ ÐÐ ÑÐÐ ÐÐÐÐÑÑÑÐÑÐ, ÐÑÐÐ
-ÑÑÑÐÐÐÐÐÐÐ Tor, ÐÐÐÐÐÐÐÑÑÐÑÑ ÑÐ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SocksListenAddress";>ÐÐÐÑÐÐÐ
-ÑÐÑÑÐ ÐÐÐÐÐÐÐÐÑÑ ÐÐÐÑÐÑÐÐ ÐÐ ÐÑÐÐÐÑÐÐÐÐÐÐÑ Tor ÐÐ ÐÑÑÐÐÐ ÐÐÐÐÑÑÑÐÑÐ (FAQ for
-running Tor on a different computer)</a>.
+ÑÑÑÐÐÐÐÐÐÐ Tor, ÐÐÐÐÐÐÐÑÑÐÑÑ Ñ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SocksListenAddress";>ÑÐÑÑÑÐÐ
+ÐÐÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐÐÐÐÐÑ Tor ÐÐ ÐÑÑÐÐÐ ÐÐÐÐÑÑÑÐÑÐ (FAQ for running Tor on
+a different computer)</a>.
 </p>
 
 <p>ÐÐÑ "ÐÐÑÐÑÐÐÐÑÐÐ" ÐÑÑÐÐÑ ÐÑÐÐÐÐÐÐÐÐ, ÐÐÑÐÑÑÐ ÐÐÐÐÐÑÐÐÐÐÑÑ HTTP ÐÑÐÐÑÐ,
 ÐÑÐÑÑÐ ÑÐÐÐÐÑÐ ÐÐ ÐÐ Polipo (ÐÐÑÐÑÑÐ ÑÐÑÐÐÐÐÐÐÐ ÐÐÐÑÑ: localhost ÐÐÑÑ
 8118). ÐÑÐÐÑ ÐÑÐÐÐÑÐÐÐÐÑÑ SOCKS ÐÐÐÑÑÐÑÑ (ÐÐÑ ÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐÐ
-ÑÐÐÐÑÐÐÐÑÐÐ, Jabber, IRC, Ð Ñ.Ð.), ÐÑ ÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑÑ ÑÐÐÐ ÐÑÐÐÐÐÐÐÐÐ ÐÐ
-Tor (localhost ÐÐÑÑ 9050), ÐÐ ÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑÑÐÑÑ Ñ ÑÐÐÐÑÐÐÐÑÐ<a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS";>ÑÑÐÐÐ
-ÐÐÐÑÐÐ ÑÐÑÑÐ ÐÐÐÐÐÐÐÐÑÑ ÐÐÐÑÐÑÐÐ</a>, ÑÑÐÐÑ ÑÐÐÐÑÑ ÐÐÑÐÐÑ ÑÑÐ ÐÐÐÐÑ ÐÑÑÑ
-ÐÐÐÑÐÐ. ÐÐÑ ÐÐÑÑÑÐÐÐÐ ÐÑÐÐÐÐÐÐÐÐ, ÐÐ ÐÐÐÐÐÑÐÐÐÐÑÑÐÑ ÐÐ SOCKS ÐÐ HTTP,
-ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐÑ SocksCap Ð <a
-href="http://www.freecap.ru/";>FreeCap</a>.  (FreeCap - ÑÑÐ ÐÐÑÐÐÐÑÐÐÐ ÐÐ;
-SocksCap - ÐÐÐÑÐÐÐ.)</p>
+ÑÐÐÐÑÐÐÐÑÐÐ, Jabber, IRC, Ð Ñ.Ð.), ÐÑ ÐÐÐÐÑÐ ÐÐÑÑÑÐÐÑÑ ÑÐÐÐ ÐÑÐÐÐÐÐÐÐÐ ÐÐ
+Tor (localhost ÐÐÑÑ 9050), ÐÐ ÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑÑÐÑÑ Ñ ÑÐÐÐÑÐÐÐÑÐ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS";>ÑÐÑÑÑÑ
+ÐÐÐÑÐÑÐÐ</a>, ÑÑÐÐÑ ÑÐÐÐÑÑ ÐÐÑÐÐÑ ÑÑÐ ÐÐÐÐÑ ÐÑÑÑ ÐÐÐÑÐÐ. ÐÐÑ ÐÐÑÑÑÐÐÐÐ
+ÐÑÐÐÐÐÐÐÐÐ, ÐÐ ÐÐÐÐÐÑÐÐÐÐÑÑÐÑ ÐÐ SOCKS ÐÐ HTTP, ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐ
+ÐÑÐÐÐÐÐÐÐÑ SocksCap Ð <a href="http://www.freecap.ru/";>FreeCap</a>.
+(FreeCap - ÑÑÐ ÐÐÑÐÐÐÑÐÐÐ ÐÐ; SocksCap - ÐÐÐÑÐÐÐ).</p>
 
 <p>ÐÑÐÐÑ ÐÐÐÑÑÐÑÑ ÐÐÑÐÑÐÐÑÐÑ Ð ÑÐÐ, ÐÐÐ "ÐÐÑÐÑÐÑÐÑÐÐÐÑÑ" ÐÑÑÐÐÐ ÐÑÐÐÐÐÐÐÐÑ,
 ÐÐÐÐÐÐÐÑÑÐÑÑ Ñ <a
@@ -137,13 +135,13 @@
 
 <p>
 ÐÐÐÐÐ ÐÐÐ ÐÐÐÐÑÐÐÐÐÐ ÐÑÐÑÐÑÑÐÑÐÐÐÑÑ ÑÐÐÐÑÑ ÐÐÑÐÐÐ ÐÑÐÑÐÐÑÐ Ñ Tor Ð
-ÑÐÐÐÐÑÑÑÑ, ÑÑÐ ÐÐÑ IP-ÐÐÑÐÑ ÐÐÐÐÐÐÐÐÐÑÐÐÐÐ (Ñ.Ð. ÑÐÑÑÑ). ÐÑÐÑÐÐÑÐ ÑÑÑÐÐÐÑÑ
-<a href="https://check.torproject.org/";>ÐÐÑÐÐÑÐÑ Tor</a> Ð ÐÐÑÐÐÑÑÐÑÐ,
+ÑÐÐÐÐÑÑÑÑ, ÑÑÐ ÐÐÑ IP-ÐÐÑÐÑ ÐÑÐ ÑÐÑÑÑ. ÐÑÐÑÐÐÑÐ ÑÑÑÐÐÐÑÑ <a
+href="https://check.torproject.org/";>ÐÑÐÐÐÑÐÐ Tor</a> Ð ÐÐÑÐÐÑÑÐÑÐ,
 ÐÐÐÑÐÐÑÐÐÐÐÑÑÑ ÐÐ ÑÐÐÑÐÐ ÐÑÐÐÐÑÐÐÐÐÐÐÐ ÑÐÑÐÐÑÐ Tor. (ÐÑÐÐ ÑÐÐÑ ÐÐ ÑÐÐÐÑÐÐÑ,
 ÐÐÑÐÑÐÑÐÑÑ Ð <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate";>ÑÐÐÐÑÐÐÐÐÐÑ
-ÑÑÐÐÐ ÐÐÐÑÐÐ ÑÐÑÑÐ ÐÐÐÐÐÐÐÐÑÑ ÐÐÐÑÐÑÐÐ</a>, ÑÑÐÐÑ ÐÐÐÑÑÐÑÑ ÐÐÑÐÑÐÐÑÐÑ Ð
-ÐÑÑÐÐÑ ÐÐÑÐÐÐÑ ÑÐÑÑÐÑÐÐÐÐÐÑ ÑÐÐÐÑÑ Tor.)
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate";>ÑÐÑÑÑÐ
+ÐÐÐÑÐÑÐÐ</a>, ÑÑÐÐÑ ÐÐÐÑÑÐÑÑ ÐÐÑÐÑÐÐÑÐÑ Ð ÐÑÑÐÐÑ ÐÐÑÐÐÐÑ ÑÐÑÑÐÑÐÐÐÐÐÑ ÑÐÐÐÑÑ
+Tor.)
 </p>
 
 <p>ÐÑÐÐ Ñ ÐÐÑ ÑÑÑÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÑÑÑ, ÐÐÑÐÑÑÐ ÐÐÑÐÐÐÑÐÐÐÐÑ
@@ -152,44 +150,41 @@
 9050. ÐÑÐÐ ÐÐÑ ÐÑÐÐÐÐÐÑÑÑ ÐÐÐÐÐÑÑÐÑ ÐÑÑÐÐÑÑÐÐ ÐÐÐÐÐÑÑÐÐÐÑ, ÐÐÐÐÐÐÑÐ
 ÐÐÑÑÑÐÐÐÐ ÑÐÐ, ÑÑÐÐÑ ÐÐ ÐÐÐ ÐÐÐÐÐÑÑÐÑÑÑÑ ÑÐÑÑ ÐÑ Ð TCP ÐÐÑÑÐÐ 80 Ð 443, Ð
 ÐÐÑÐÐ ÐÐÐÐÐÐÐÑÑÐÑÑ Ñ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FirewalledClient";>ÑÐÐÐÑÐÐÐÐÐÐ
-ÑÑÐÐÐ ÑÐÐÑÐÐ ÑÐÑÑÐ ÐÐÐÐÐÐÐÐÑÑ ÐÐÐÑÐÑÐÐ</a>.
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FirewalledClient";>ÑÐÑÑÑÐÐ
+ÐÐÐÑÐÑÐÐÐ</a>.
 </p>
 
 <p>ÐÑÐÐ ÐÐÑÐÐÐ ÐÐ ÐÑÑÐÐÐÑÐÑÐÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÐ, ÐÐÑÐÑÐÑÐÑÑ Ð <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork";>ÑÐÐÐÑÐÐÐÐÑ
-ÑÑÐÐÐ ÐÐÐÑÐÐ ÑÐÑÑÐ ÐÐÐÐÐÐÐÐÑÑ ÐÐÐÑÐÑÐÐ</a> ÐÐÑ ÐÐÐÑÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐÐÑÐÐÐ
-ÐÐÑÐÑÐÐÑÐÐ.</p>
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork";>ÑÐÑÑÑÐ
+ÐÐÐÑÐÑÐÐ</a> ÐÐÑ ÐÐÐÑÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐÐÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐ.</p>
 
 <p>
 ÐÐÐÐÐ ÐÑÐ ÐÐÑÐÐÐÑÐÐÐ, ÑÐÐÐÐÑÐ ÐÐÐÑÑÐ Ð ÑÐÐ <a href="<page
-download>#Warning">ÑÑÐ ÐÑÐÐÐÐÐÐÐÑ, Ð ÑÑÐ ÐÐ ÐÑÐÐÐÐÐÐÐÑ ÑÐÑÐÐÑ Tor </a>.
+download>#Warning">ÑÑÐ ÐÐÑÑ Ð ÐÐ ÐÐÑÑ ÑÐÑÐÐÑ Tor </a>.
 </p>
 
 <hr /> <a id="server"></a> <a id="relay"></a>
-<h2><a class="anchor" href="#relay">ÐÐÐ ÑÐÑÐÐÑÑÑÐ: ÐÐÑÑÑÐÐÑÐ ÑÐÑÑÐÐÑÐÑÑÐÑ
-Tor</a></h2>
+<h2><a class="anchor" href="#relay">ÐÐÐ ÑÐÑÐÐÑÑÑÐ: ÐÐÑÑÑÐÐÑÐ ÑÐÐÐ Tor</a></h2>
 <br />
 
-<p>ÐÐÑÑ Tor ÐÐÐÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐÐÑÐÑÐÐ, ÐÑÐÐÐÑÑÐÐÐÑÑÑÐÑ ÐÑÐÐÑÑÐÐÑÑ ÑÐÐÑÐÐÐÐÑÑÑ
-ÑÐÐÐÑ ÐÐÐÐÑÑÑÐÑÐÐ. ÐÐÐ ÐÐÐÑÑÐ ÐÑÐÐÐ ÐÑÐÐÐÑÑÐÐÐÑÑÑ ÑÐÑÑÐÐÑÐÑÑÐÑÑ, ÑÐÐ ÐÑÑÑÑÐÐ
-ÐÑÐÐÑ ÑÐÐÐÑÐÑÑ ÑÐÑÑ Tor. ÐÑÐÐ Ñ ÐÐÑ ÐÑÑÑ ÐÐÐ ÐÐÐÐÐÑÐ 20ÐÐ/ÑÐÐ. Ð ÐÐÐÐÑ
-ÐÐÐÑÐÐÐÐÐÐÑÑ, ÐÐÐÐÐÑÐÑÑÐ ÐÐÐÐÐÑÐÐÑÐ Tor, ÐÐÑÑÑÐÐÐ ÑÐÑÑÐÐÑÐÑÑÐÑ Tor. ÐÑ
-ÑÐÐÐÐÐÐ ÐÐÐÐÐÑÑÐÐ ÐÐÐÐÐÐÐÐÑÑÐÐ, ÐÐÐÐÑÑÐÑ ÑÐÑÑÐÐÑÐÑÑÐÑÑ Tor ÐÑÐÑÑÑÐÐ Ð
-ÑÐÐÐÐÑÐÐ, ÐÐÐÑÑÐÑ ÐÐÑÐÐÐÑÐÐÐÐ ÐÑÐÐÐÑÑÐÐÐÑÐÐÐÐ ÐÑÐÐÑÑÐÐÐÐ ÑÐÐÑÐÐÐÐÑÑÐ,
-ÐÑÐÐÐÐÐ ÐÑÐÐÐÐ (Ñ ÑÐÐ ÑÑÐÐÑ ÐÑ ÐÐÐÐÐ ÐÐÑÐÐÐÑÐÑÑ ÐÐÑÑ ÐÐÐÐÑÐÑÐÐÐÐÑÑÑ Ð
-ÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐ), Ð ÐÐÐÐÐÑÐÐÑ ÐÐÐÐÐÐÑÐÑÐÐÑ IP-ÐÐÑÐÑÐÐ.</p>
+<p>ÐÐÑÑ Tor ÐÐÐÐÐÐÐÑÑÑ ÐÐ ÐÐÐÑÐÐÐÐÑÑÐÐ, ÐÑÐÐÐÑÑÐÐÐÑÑÑÐÑ ÐÑÐÐÑÑÐÐÑÑ ÑÐÐÑÐÐÐÐÑÑÑ
+ÑÐÐÐÑ ÐÐÐÐÑÑÑÐÑÐÐ. ÐÐÐ ÐÐÐÑÑÐ ÐÑÐÐÐ ÑÐÐÐÐÑÑ ÑÐÐÑ, ÑÐÐ ÐÑÑÑÑÐÐ ÐÑÐÐÑ ÑÐÐÐÑÐÑÑ
+ÑÐÑÑ Tor. ÐÑÐÐ Ñ ÐÐÑ ÐÑÑÑ ÐÐÐ ÐÐÐÐÐÑÐ 20ÐÐ/ÑÐÐ. Ð ÐÐÐÐÑ ÐÐÐÑÐÐÐÐÐÐÑÑ,
+ÐÐÐÐÐÑÐÑÑÐ ÐÐÐÐÐÑÐÐÑÐ Tor, ÐÐÑÑÑÐÐÐ ÑÐÐÐ Tor. ÐÑ ÑÐÐÐÐÐÐ ÐÐÐÐÐÑÑÐÐ
+ÐÐÐÐÐÐÐÐÑÑÐÐ, ÐÐÐÐÑÑÐÑ ÑÐÐÐÐÐÐÐ ÑÐÐÐÐ Tor ÐÑÐÑÑÑÐ Ð ÑÐÐÐÐÑÐ, ÐÐÐÑÑÐÑ
+ÐÐÑÐÐÐÑÐÐÐÐ ÐÑÐÐÐÑÑÐÐÐÑÐÐÐÐ ÐÑÐÐÑÑÐÐÐÐ ÑÐÐÑÐÐÐÐÑÑÐ, ÐÑÐÐÐÐÐ ÐÑÐÐÐÐ (Ñ ÑÐÐ
+ÑÑÐÐÑ ÐÑ ÐÐÐÐÐ ÐÐÑÐÐÐÑÐÑÑ ÐÐÑÑ ÐÐÐÐÑÐÑÐÐÐÐÑÑÑ Ð ÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐ), Ð
+ÐÐÐÐÐÑÐÐÑ ÐÐÐÐÐÐÑÐÑÐÐÑ IP-ÐÐÑÐÑÐÐ.</p>
 
-<p>ÐÐÐÐÑÐÐ ÑÐÑÑÐÐÑÐÑÑÐÑÐÐ Ð ÑÐÐÐÑÑ ÑÐÐÐÐÐÑ ÑÐÑÐ ÐÐÑÐÑÐÐÑ - ÑÑÐ ÑÐ, ÑÑÐ
-ÐÐÐÑÐÐÑÐÐÐÐÑ ÐÐÐÐÐÐÑÐÐÑÑÑ ÐÐÐÑÐÐÐÐÑÐÐÐÐ Tor. <a
+<p>ÐÐÐÐÑÐÐ ÑÐÐÐÐ Ð ÑÐÐÐÑÑ ÑÐÐÐÐÐÑ ÑÐÑÐ ÐÐÑÐÑÐÐÑ - ÑÑÐ ÑÐ, ÑÑÐ ÐÐÐÑÐÐÑÐÐÐÐÑ
+ÐÐÐÐÐÐÑÐÐÑÑÑ ÐÐÐÑÐÐÐÐÑÐÐÐÐ Tor. <a
 href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity";>ÐÐÐÐÐÐÐÑ
-ÑÐÑÑÐÐÑÐÑÑÐÑ ÐÑ ÐÐÐÐÑÐ ÑÐÑÑÑÐÑÑ ÑÐÐÑ ÑÐÐÑÑÐÐÐÐÑÑ ÐÐÐÐÐÐÐÐÑÑÑ</a>, ÑÐÐ ÐÐÐ
-ÑÐÐÐÐÐÐÑÐ ÑÐÐÑÑ ÐÐ ÐÐÐÑÑ ÑÑÑÐÐÐÐÐÑÑ ÐÑÐÐÑÑÐÐÐÐÐÐÐ ÐÐÐÑÐÑÐ, ÐÐÐÑ ÐÐ ÐÐÐÐÑ
-ÐÑÑÐÐÐÑÑ ÐÐÐ ÐÑ ÐÐÑ, ÑÐÐ Ð ÐÑ ÐÑÑÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÐÐ ÑÐÑÐ Tor, ÐÑÐÐÐÑÐÑÑÑÐÑ
-ÐÐÑ ÑÐÑÑÐÐÑÐÑÑÐÑ.</p>
+ÑÐÐÐ, ÐÑ ÐÐÐÐÑÐ ÑÐÑÑÑÐÑÑ ÑÐÐÑ ÑÐÐÑÑÐÐÐÐÑÑ ÐÐÐÐÐÐÐÐÑÑÑ</a>, ÑÐÐ ÐÐÐ ÑÐÐÐÐÐÐÑÐ
+ÑÐÐÑÑ ÐÐ ÐÐÐÑÑ ÑÑÑÐÐÐÐÐÑÑ ÐÑÐÐÑÑÐÐÐÐÐÐÐ ÐÐÐÑÐÑÐ, ÐÐÐÑ ÐÐ ÐÐÐÐÑ ÐÑÑÐÐÐÑÑ ÐÐÐ
+ÐÑ ÐÐÑ, ÑÐÐ Ð ÐÑ ÐÑÑÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÐÐ ÑÐÑÐ Tor, ÐÑÐÐÐÑÐÑÑÑÐÑ ÐÐÑ ÑÐÐÐ.</p>
 
 <p>ÐÐÐÑÑÐ ÐÐÑÐÑÐÐÑÐÐ ÐÐ ÑÑÑ ÑÐÐÑ ÐÐÐÐÐ ÐÐÐÑÑÐÑÑ ÐÐ ÑÑÐÐÐÐÐÑÑÐÐ <a href="<page
-docs/tor-doc-relay>">ÐÐÑÑÑÐÐÐÐ ÑÐÑÑÐÐÑÐÑÑÐÑÐ</a>.</p>
+docs/tor-doc-relay>">ÐÐÑÑÑÐÐÐÐ ÑÐÐÐ</a>.</p>
 
 <hr />
 

Modified: website/trunk/et/download.wml
===================================================================
--- website/trunk/et/download.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/et/download.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -350,8 +350,8 @@
 
 <tr bgcolor="#e5e5e5">
   <td>
-    <img src="images/ico-osx-uni.png" /> Mac (Sisaldab ainult Tori)<br />
-<small><em>Intel ainult</em></small>
+    <img src="images/ico-osx-uni.png" /> Mac (Contains only Tor)<br />
+<small><em>Intel Only, no Snow Leopard (10.6) support</em></small>
   </td>
   <td>
     <a href="<package-osx-stable>"><version-osx-stable></a> (<a

Modified: website/trunk/fr/download.wml
===================================================================
--- website/trunk/fr/download.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/fr/download.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -364,8 +364,8 @@
 
 <tr bgcolor="#e5e5e5">
   <td>
-    <img src="images/ico-osx-uni.png" /> Mac (Contient seulement Tor)<br />
-<small><em>uniquement pour Intel</em></small>
+    <img src="images/ico-osx-uni.png" /> Mac (Contains only Tor)<br />
+<small><em>Intel Only, no Snow Leopard (10.6) support</em></small>
   </td>
   <td>
     <a href="<package-osx-stable>"><version-osx-stable></a> (<a

Modified: website/trunk/fr/faq.wml
===================================================================
--- website/trunk/fr/faq.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/fr/faq.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -698,8 +698,8 @@
 </p>
 
 <ol>
-<li><a href="https://amnesia.boum.org/";>amnesia LiveCD/USB</a> est un systÃme
-Live destinà à prÃserver votre vie privÃe et votre anonymat:
+<li><a href="https://amnesia.boum.org/";>The (Amnesic) Incognito Live System</a>
+is a Live System aimed at preserving your privacy and anonymity:
 <ul>
 <li> Toutes les connexions sortantes vers Internet passent forcÃment à travers le
 rÃseau Tor.</li>
@@ -710,12 +710,6 @@
 <li> Il est basà sur Debian Gnu/linux et fonctionne sous l'environnement de
 bureau GNOME.</li>
 </ul>
-<li><a href="http://incognito.anonymityanywhere.com/";>Incognito LiveCD/USB</a>
-est un CD de boot sur lequel vous trouverez plusieurs applications Internet
-(Firefox, IRC, eMail, etc...), prÃ-configurÃes pour utiliser Tor. Pour la
-majorità des ordinateurs, tout est configurà automatiquement et le CD est
-prÃt à Ãtre utilisÃ. Vous pouvez Ãgalement copier le CD vers un disque-dur
-USB. Inclus TorK.</li>
 <li><a href="http://tork.sourceforge.net/wiki/index.php/LiveCD";>TorK LiveCD</a>
 est basà sur Knoppix et orientà vers la facilità d'utilisation. Vous pouvez
 travailler de maniÃre anonyme ou non tout en Ãtant informà par TorK des

Modified: website/trunk/fr/trademark-faq.wml
===================================================================
--- website/trunk/fr/trademark-faq.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/fr/trademark-faq.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -79,7 +79,7 @@
 <p>Oui.  Quelques projets open source, non-commerciaux utilisent les marques
 Tor sous licence:</p>
 <ul>
-<li><a href="http://anonymityanywhere.com/incognito/";>Incognito</a></li>
+<li><a href="https://amnesia.boum.org/";>The (Amnesic) Incognito Live System</a></li>
 <li><a href="http://portabletor.sourceforge.net/";>Portable Tor</a></li>
 <li><a href="http://torstatus.kgprog.com/";>Kprog Tor Status</a></li>
 <li><a href="http://www.vidalia-project.net/";>Vidalia</a></li>

Modified: website/trunk/fr/volunteer.wml
===================================================================
--- website/trunk/fr/volunteer.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/fr/volunteer.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -542,47 +542,40 @@
 </li>
 
 <li>
-<b>AmÃliorer la mise en paquets de Tor et Vidalia sur Debian/Ubuntu</b> <br
-/> PrioritÃ: <i>Moyenne</i> <br /> Effort à fournir: <i>Moyen</i> <br />
-CompÃtences requises: <i>Moyennes</i> <br /> Tuteurs potentiels: <i>Erinn,
-Peter</i> <br />Vidalia ne fonctionne pas correctement sous Debian et Ubuntu
-avec les paquets par dÃfaut de Tor. Les paquets Tor actuels lancement
-automatiquement Tor en tant que dÃmon sous le compte utilisateur debian-tor
-et (visiblement) n'ont pas de directive <a
-href="<gitblob>doc/spec/control-spec.txt">ControlPort</a> dÃfinie dans le
-fichier de configuration torrc par dÃfaut. En consÃquence, Vidalia tente de
-dÃmarrer sont propre processus Tor Ãtant donnà qu'il ne peut se connecter au
-Tor existant; à la suite de quoi , le processus Tor lancà par Vidalia gÃnÃre
-un message d'erreur peu comprÃhensible indiquant que Tor ne peut pas
-utiliser ses ports d'Ãcoute &mdash; ils sont dÃjà utilisà par le dÃmon Tor
-initial.  <br /> La solution implique soit d'indiquer à l'utilisateur
-d'arrÃter le dÃmon existant et de laisser Vidalia dÃmarrer son propre
-processus Tor soit d'expliquer à l'utilisateur comment configurer un port de
-contrÃle et un mot de passe dans son torrc. Une meilleure solution pour
-Debian serait d'utiliser la directive ControlSocket qui permet à Vidalia de
-communiquer avec Tor via une socket Unix et cela pourrait Ãtre activà par
-dÃfaut dans les paquets Debian de Tor. Vidalia peut ensuite s'authentifier
-sur Tor en utilisant l'authentification du systÃme de fichier (cookie) si
-l'utilisateur qui a lancà Vidalia est Ãgalement dans le groupe debian-tor.
-<br /> Ce projet implique d'abord le support de la directive ControlSocket
-dans Vidalia. L'Ãtudiant dÃveloppera et testera alors les paquets Vidalia
-pour Debian et Ubuntu de maniÃre conforme aux standards d'empaquetage de
-Debian et s'assurera qu'ils fonctionnent correctement avec les paquets Tor
-existant. Nous pouvons aussi mettre en place un dÃpÃt pour hÃberger les
-nouveaux paquets Vidalia.  <br /> Le dÃfi qui suit consiste à trouver un
-moyen efficace pour Vidalia de pouvoir modifier la configuration de Tor
-(torrc) mÃme si celle-ci est situÃe dans <code>/etc/tor/torrc</code> et
-reste immuable. La meilleure idÃe que nous avons trouvÃe jusqu'Ã prÃsent est
-de faire passer cette configuration par le ControlSocket lorsque Vidalia
-dÃmarre mais c'est une mÃthode discutable car Tor se lance à chaque
-dÃmarrage avec une configuration diffÃrente de celle que dÃsire
-l'utilisateur. La deuxiÃme idÃe consiste à faire Ãcrire à Vidalia un fichier
-temporaire torrc et demander à l'utilisateur de le dÃplacer manuellement
-dans <code>/etc/tor/torrc</code> mais c'est Ãgalement discutable car les
-utilisateurs ne devraient pas gÃrer ces fichiers directement.  <br />Une
-personne intÃressÃe par ce projet doit disposer d'une certaine connaissance
-des rÃgles d'empaquetage dans Debian et avoir une expÃrience en C++. Des
-compÃtences en QT seraient un vrai plus.
+<b>Improvements for Tor+Vidalia interaction on Linux/Unix platforms</b> <br
+/> Priority: <i>Medium</i> <br /> Effort Level: <i>Medium</i> <br /> Skill
+Level: <i>Medium</i> <br /> Likely Mentors: <i>Erinn, Peter</i> <br />
+Vidalia currently doesn't play nicely with Tor on Linux and Unix platforms.
+Currently, on Debian and Ubuntu, there is a configuration mechanism which
+allows Vidalia to override Tor's ability to start on boot (by sourcing
+<code>/etc/default/tor.vidalia</code> which sets <code>RUN_DAEMON=no</code>
+at the user's request), but full implementation of <a
+href="<gitblob>doc/spec/control-spec.txt">ControlPort</a> communication is
+still required.  <br /> A better solution on Linux and Unix platforms would
+be to use Tor's ControlSocket, which allows Vidalia to talk to Tor via a
+Unix domain socket, and could possibly be enabled by default in Tor's
+distribution packages.  Vidalia can then authenticate to Tor using
+filesystem-based (cookie)  authentication if the user running Vidalia is
+also in the distribution-specific tor group.  <br /> This project will first
+involve adding support for Tor's ControlSocket to Vidalia. The student will
+then develop and test this support on various distributions to make sure it
+behaves in a predictable and consistent manner on all of them.  <br /> The
+next challenge would be to find an intuitive and usable way for Vidalia to
+be able to change Tor's configuration (torrc) even though it is located in
+<code>/etc/tor/torrc</code> and thus immutable. In Debian and Ubuntu we
+handle this with the aforementioned <code>/etc/default/tor.vidalia</code>
+but this functionality could (or should) be less distribution-specific.  <br
+/> The best idea we've come up with so far is to feed Tor a new
+configuration via the ControlSocket when Vidalia starts, but that's bad
+because if the user is not using the latest Debian/Ubuntu packages, they may
+not have disabled Tor's ability to run on boot and will end up with a
+configuration that is different from what they want. The second best idea
+we've come up with is for Vidalia to write out a temporary torrc file and
+ask the user to manually move it to <code>/etc/tor/torrc</code>, but that's
+bad because users shouldn't have to mess with files directly.  <br /> A
+person undertaking this project should have prior knowledge of various Linux
+distributions and their packaging mechanisms as well as some C++ development
+experience. Previous experience with Qt is helpful, but not required.
 </li>
 
 
@@ -805,11 +798,9 @@
 regÃnÃrer les images en plusieurs langues lorsque nous construisons le site
 web.</li>
 
-<li>Comment pouvons-nous maintenir, amÃliorer et documenter plus facilement les
-diffÃrents systÃmes LiveCD/USB ? <a href="http://amnesia.boum.org/";>Le
-LiveCD/USB amnesia</a>et <a
-href="http://anonymityanywhere.com/incognito/";>le LiveCD Incognito</a> sont
-quelques exemples.
+<li>How can we make the various LiveCD/USB systems easier to maintain, improve,
+and document? One example is <a href="https://amnesia.boum.org/";>The
+(Amnesic) Incognito Live System</a>.
 </li>
 
 <li>

Modified: website/trunk/nl/download.wml
===================================================================
--- website/trunk/nl/download.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/nl/download.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -354,8 +354,8 @@
 
 <tr bgcolor="#e5e5e5">
   <td>
-    <img src="images/ico-osx-uni.png" /> Mac (Bevat alleen Tor)<br />
-<small><em>Alleen Intel</em></small>
+    <img src="images/ico-osx-uni.png" /> Mac (Contains only Tor)<br />
+<small><em>Intel Only, no Snow Leopard (10.6) support</em></small>
   </td>
   <td>
     <a href="<package-osx-stable>"><version-osx-stable></a> (<a

Modified: website/trunk/no/download.wml
===================================================================
--- website/trunk/no/download.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/no/download.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -351,8 +351,8 @@
 
 <tr bgcolor="#e5e5e5">
   <td>
-    <img src="images/ico-osx-uni.png" /> Mac (Inneholder bare Tor)<br />
-<small><em>Kun Intel</em></small>
+    <img src="images/ico-osx-uni.png" /> Mac (Contains only Tor)<br />
+<small><em>Intel Only, no Snow Leopard (10.6) support</em></small>
   </td>
   <td>
     <a href="<package-osx-stable>"><version-osx-stable></a> (<a

Modified: website/trunk/pl/download.wml
===================================================================
--- website/trunk/pl/download.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/pl/download.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -359,8 +359,8 @@
 
 <tr bgcolor="#e5e5e5">
   <td>
-    <img src="images/ico-osx-uni.png" /> Mac (Zawiera tylko Tora)<br />
-<small><em>Tylko Intel</em></small>
+    <img src="images/ico-osx-uni.png" /> Mac (Contains only Tor)<br />
+<small><em>Intel Only, no Snow Leopard (10.6) support</em></small>
   </td>
   <td>
     <a href="<package-osx-stable>"><version-osx-stable></a> (<a

Modified: website/trunk/pl/faq.wml
===================================================================
--- website/trunk/pl/faq.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/pl/faq.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -664,8 +664,8 @@
 </p>
 
 <ol>
-<li><a href="https://amnesia.boum.org/";>amnesia LiveCD/USB</a> jest systemem
-typu Live, ktÃrego celem jest zachowanie Twojej prywatnoÅci i anonimowoÅci:
+<li><a href="https://amnesia.boum.org/";>The (Amnesic) Incognito Live System</a>
+is a Live System aimed at preserving your privacy and anonymity:
 <ul>
 <li> Wszystkie wychodzÄce poÅÄczenia do Internetu sÄ zmuszane do przechodzenia
 przez sieÄ Tora.</li>
@@ -675,12 +675,6 @@
 program do rozmÃw Pidgin i mnÃstwo innego oprogramowania.</li>
 <li> Opiera siÄ na systemie Debian GNU/Linux i zawiera Årodowisko pulpitu GNOME.</li>
 </ul>
-<li><a href="http://incognito.anonymityanywhere.com/";>Incognito LiveCD/USB</a>
-to pÅyta, z ktÃrej moÅna uruchomiÄ komputer, posiadajÄca kilka aplikacji
-internetowych (Firefox, IRC, poczta, itp.) prekonfigurowanych do korzystania
-z Tora. Dla wiÄkszoÅci komputerÃw wszystko jest automatycznie skonfigurowane
-i moÅesz od razu uÅywaÄ. MoÅesz nawet skopiowaÄ pÅytÄ na dysk USB. Zawiera
-TorK.</li>
 <li><a href="http://tork.sourceforge.net/wiki/index.php/LiveCD";>TorK LiveCD</a>
 jest oparta na Knoppiksie z naciskiem na przyjaznoÅÄ dla uÅytkownika. MoÅesz
 pracowaÄ anonimowo lub nie-anonimowo, podczas gdy TorK prÃbuje ciÄgle CiÄ

Modified: website/trunk/pl/tshirt.wml
===================================================================
--- website/trunk/pl/tshirt.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/pl/tshirt.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -1,53 +1,61 @@
+
+
+
+
+
+
 ## translation metadata
-# Based-On-Revision: 18608
+# Revision: $Revision$
 # Translation-Priority: 3-low
-# Last-Translator: bogdandr_at_op . pl
-
-#include "head.wmi" TITLE="Tor: Koszulka" CHARSET="UTF-8"
-
+#include "head.wmi" TITLE="Tor: T-shirt" CHARSET="UTF-8"
 <div class="main-column">
 
 <h2>Tor: Koszulka za wkÅad do projektu</h2>
 <hr />
 
-<p>MoÅesz otrzymaÄ jednÄ z tych ÅÄdnych koszulek Tora za wkÅad do projektu.
-SÄ trzy podstawowe sposoby wnoszenia wkÅadu:</p>
+<p>You can get one of these fine Tor T-shirts for contributing to the Tor
+project. There are three primary ways of contributing:</p>
 
 <ol>
-<li>WystarczajÄco duÅa (65 USD lub wiÄcej) <a href="<page donate>">dotacja</a> na Projekt Tor.</li>
-<li>Prowadzenie szybkiego <a href="<page docs/tor-doc-relay>">przekaÅnika sieci Tor</a>,
-ktÃry dziaÅaÅ przez ostatnie 2 miesiÄce: kwalifikujesz siÄ, jeÅli pozwalasz na
-wyjÅcie na port 80 i masz ÅredniÄ szybkoÅÄ transferu 100 KB/s, lub jeÅli nie prowadzisz
-wÄzÅa wyjÅciowego, lecz masz ÅredniÄ szybkoÅÄ transferu 500 KB/s.</li>
-<li>Pomaganie na <a href="<page volunteer>">inne sposoby</a>. <a href="<page translation>">Prowadzenie
-tÅumaczenia strony Tora</a>. Napisanie dobrego <a
+<li>WystarczajÄco duÅa (65 USD lub wiÄcej) <a href="<page donate>">dotacja</a>
+na Projekt Tor.</li>
+<li>Prowadzenie szybkiego <a href="<page docs/tor-doc-relay>">przekaÅnika sieci
+Tor</a>, ktÃry dziaÅaÅ przez ostatnie 2 miesiÄce: kwalifikujesz siÄ, jeÅli
+pozwalasz na wyjÅcie na port 80 i masz ÅredniÄ szybkoÅÄ transferu 100 KB/s,
+lub jeÅli nie prowadzisz wÄzÅa wyjÅciowego, lecz masz ÅredniÄ szybkoÅÄ
+transferu 500 KB/s.</li>
+<li>Pomaganie na <a href="<page volunteer>">inne sposoby</a>. <a href="<page
+translation>">Prowadzenie tÅumaczenia strony Tora</a>. Napisanie dobrego <a
 href="https://wiki.torproject.org/noreply/TheOnionRouter/SupportPrograms";>programu
 wspierajacego, ktÃrego uÅywaÅoby wielu ludzi</a>. Przeprowadzenie badaÅ nad
-Torem i anonimowoÅciÄ, usuniÄcie paru <a href="https://bugs.torproject.org/";>naszych
-bÅÄdÃw</a> lub rozgÅaszanie informacji o Torze.
+Torem i anonimowoÅciÄ, usuniÄcie paru <a
+href="https://bugs.torproject.org/";>naszych bÅÄdÃw</a> lub rozgÅaszanie
+informacji o Torze.
 </li>
 </ol>
 
 <p>
-JeÅli kwalifikujesz siÄ, wyÅlij list na adres donations maÅpa torproject kropka org
-z krÃtkim uzasadnieniem. PamiÄtaj podaÄ preferencje co do koloru,
-rozmiar (S/M/L/XL/XXL), zapasowy rozmiar
-jeÅli pierwszy jest niedostÄpny i adres pocztowy, pod ktÃry koszulka ma byÄ dostarczona.
+JeÅli kwalifikujesz siÄ, wyÅlij list na adres donations maÅpa torproject
+kropka org z krÃtkim uzasadnieniem. PamiÄtaj podaÄ preferencje co do koloru,
+rozmiar (S/M/L/XL/XXL), zapasowy rozmiar jeÅli pierwszy jest niedostÄpny i
+adres pocztowy, pod ktÃry koszulka ma byÄ dostarczona.
 </p>
 
 <p>
-MoÅesz wybraÄ miÄdzy tradycyjnym czarnym a zachÄcajÄcym do rozmowy jasnozielonym kolorem.
-MoÅesz takÅe zobaczyÄ koszulki
-<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorShirt";>w
+MoÅesz wybraÄ miÄdzy tradycyjnym czarnym a zachÄcajÄcym do rozmowy
+jasnozielonym kolorem.  MoÅesz takÅe zobaczyÄ koszulki <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorShirt";>w
 akcji</a> &mdash; dodaj tu takÅe swoje zdjÄcia.
 </p>
 
 <div style="text-align: center">
-<a href="tshirt/black-tor-tshirt.png"><img src="tshirt/black-tor-tshirt.png" /></a>
-<a href="tshirt/green-tor-tshirt.png"><img src="tshirt/green-tor-tshirt.png" /></a>
+<a href="tshirt/black-tor-tshirt.png"><img src="tshirt/black-tor-tshirt.png"
+/></a> <a href="tshirt/green-tor-tshirt.png"><img
+src="tshirt/green-tor-tshirt.png" /></a>
 </div>
 
-  </div><!-- #main -->
+  </div>
 
+
+
 #include <foot.wmi>
-

Modified: website/trunk/projects/fr/index.wml
===================================================================
--- website/trunk/projects/fr/index.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/projects/fr/index.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -90,8 +90,8 @@
 <li>osx image</li>
 <li>torvm</li>
 <li>orbot</li>
-<li>livecd's: incognito, <a href="https://amnesia.boum.org/";>amnesia</a>, tor
-ramdisk</li>
+<li>livecd's: <a href="https://amnesia.boum.org/";>The (Amnesic)  Incognito Live
+System</a>, tor ramdisk</li>
 </ul>
 
 <a id="Implementations"></a>

Modified: website/trunk/ru/download.wml
===================================================================
--- website/trunk/ru/download.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/ru/download.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -364,8 +364,8 @@
 
 <tr bgcolor="#e5e5e5">
   <td>
-    <img src="images/ico-osx-uni.png" /> Mac (ÑÐÐÐÑÐÐÑ ÑÐÐÑÐÐ Tor)<br />
-<small><em>ÐÐÐÑÐÐ ÐÐÑ Intel</em></small>
+    <img src="images/ico-osx-uni.png" /> Mac (Contains only Tor)<br />
+<small><em>Intel Only, no Snow Leopard (10.6) support</em></small>
   </td>
   <td>
     <a href="<package-osx-stable>"><version-osx-stable></a> (<a

Modified: website/trunk/ru/faq.wml
===================================================================
--- website/trunk/ru/faq.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/ru/faq.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -723,8 +723,8 @@
 </p>
 
 <ol>
-<li><a href="https://amnesia.boum.org/";>amnesia LiveCD/USB</a> ÑÑÐ Live System
-ÐÐÐÑÐÐÐÐÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÐÑÐÐÑÑÐ Ð ÐÐÐÐÐÐÐÐÑÑÐ:
+<li><a href="https://amnesia.boum.org/";>The (Amnesic) Incognito Live System</a>
+is a Live System aimed at preserving your privacy and anonymity:
 <ul>
 <li> ÐÑÐ ÐÑÑÐÐÑÑÐÐ ÐÐÐÐÐÑÑÐÐÐÑ Ð ÐÐÑÐÑÐÐÑÑ, ÐÑÐÑÐÐÐÐÑ ÐÑÐÑÐÐÐÑÑ ÑÐÑÐÐ ÑÐÑÑ Tor.</li>
 <li> ÐÐ ÐÑÑÐÐÐÑÑ Ð ÑÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÑÑ ÑÑÑÑÐÐÑÑÐÐÑ ÑÑÐÐÐÐÐÑ, ÐÑÐÐ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐÐ.</li>
@@ -733,13 +733,6 @@
 ÐÑÑÐÐÐ ÐÑÐÐÑÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐÐ.</li>
 <li> ÐÐ ÐÑÐÐÐÐÐ ÐÐ Debian GNU / Linux Ð ÐÐÑÑÐÐÐÑÐÑÑÑ Ñ ÑÐÐÐÑÐÐÐ ÐÐÑÑÐÐÐÐÑ GNOME.</li>
 </ul>
-<li><a href="http://incognito.anonymityanywhere.com/";>Incognito LiveCD/USB</a>
-(ÐÐÐÐÐÐÐÑÐ LiveCD/USB) â ÑÑÐ CD ÐÐÑÐ, Ñ ÐÐÑÐÑÐÐÐ ÐÑ ÐÐÐÐÑÐ ÐÐÐÑÑÐÐÑÑÑÑ, Ð
-ÐÐÑÐÑÑÐ ÐÐÐÐÑ ÐÐÑÐÐÐÑÐÐ ÐÐÑÐÑÐÐÑ ÐÑÐÐÐÐÐÐÐÐ (Firefox, IRC, ÐÐÑÑÐÐÑÐ ÐÐÐÐÐÑ Ð
-Ñ.Ð.), ÐÐÑÐÐÐÐ ÐÐÑÑÑÐÐÐÐÑÑ ÐÐ ÐÑÐÐÐÑÐÐÐÐÐÐÐ Tor. ÐÐÑ ÐÐÐÑÑÐÐÑÑÐÐ ÐÐÐÐÑÑÑÐÑÐÐ
-ÐÑÐ ÐÐÑÑÑÐÐÐÐÐÑÑÑ ÐÐÑÐÐÐÑÐÑÐÑÐÐ, ÑÐÐÐÐ ÐÐÑÐÐÐÐ, ÐÑ ÐÐÐÐÑÐ ÑÑÐÐÑ ÐÐÑÐÐÐÑÑ
-ÑÐÐÐÑÑ. ÐÑ ÐÐÐÐ ÐÐÐÐÑÐ ÑÐÐÐÐÑÐÐÐÑÑ CD ÐÐÑÐ ÐÐ USB ÐÐÑÐ (ÑÐÐÑ
-ÐÐÐÐÐÐÑÐÐÑ). ÐÑÐÐÐÑÐÐ ÐÐÐÐÑ ÑÐÑÐÐÑÑ TorK.</li>
 <li><a href="http://tork.sourceforge.net/wiki/index.php/LiveCD";>TorK LiveCD</a>
 ÐÑÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐ Knoppix. ÐÑÐ ÐÐÐ ÑÐÐÐÐÐÐÐ ÐÑÐÐÑÐ ÑÐÐÑ ÐÐÐÐÐÑÑ ÐÐ ÑÐÐÐÑÑÐÐ
 ÐÑÐÐÐÑÐÐÐÐÐÐÑ. ÐÑ ÐÐÐÐÑÐ ÑÐÐÐÑÐÑÑ ÐÐÐ ÐÐÐÐÐÐÐÐ, ÑÐÐ Ð ÐÐÐÐÐÐÐÐÐÐ, ÐÑÐ ÑÑÐÐ

Modified: website/trunk/torbutton/fr/faq.wml
===================================================================
--- website/trunk/torbutton/fr/faq.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/torbutton/fr/faq.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -89,42 +89,39 @@
 
 <p>
 
-Youtube et les sites semblables nÃcessitent l'utilisation de plugin comme
-Flash.  Les plugins fonctionnent indÃpendamment de Firefox et sont
-susceptibles d'effectuer des actions sensibles pour la prÃservation de votre
-anonymat. Par exemple, ils peuvent <a href="http://decloak.net";>passer outre
-la configuration du proxy</a>, trouver <a
-href="http://forums.sun.com/thread.jspa?threadID=5162138&amp;messageID=9618376";>votre
-adresse IP locale</a> et <a
-href="http://epic.org/privacy/cookies/flash.html";>stocker leurs propres
-cookies</a>. Il est possible d'utiliser un LiveCD ou une solution à base de
-machine virtuelle comme <a href="<page torvm/index>">Tor VM</a> ou <a
-href="http://anonymityanywhere.com/incognito/";>Incognito</a> qui mettent en
-place un proxy transparent vous mettant à l'abri de tout dÃbordement de
-proxy. A noter toutefois, que la dÃcouverte de l'adresse IP locale et les
-cookies Flash ne sont pas rÃglÃs par cette mÃthode.  </p>
+YouTube and similar sites require third party browser plugins such as
+Flash.  Plugins operate independently from Firefox and can perform activity
+on your computer that ruins your anonymity. This includes but is not limited
+to: <a href="http://decloak.net";>completely disregarding proxy settings</a>,
+querying your <a
+href="http://forums.sun.com/thread.jspa?threadID=5162138&amp;messageID=9618376";>local
+IP address</a>, and <a
+href="http://epic.org/privacy/cookies/flash.html";>storing their own
+cookies</a>. It is possible to use a LiveCD or VMWare-based solution such as
+<a href="<page torvm/index>">Tor VM</a> or <a
+href="https://amnesia.boum.org/";>The (Amnesic) Incognito Live System</a>
+that creates a secure, transparent proxy to protect you from proxy bypass,
+however issues with local IP address discovery and Flash cookies still
+remain.  </p>
 
 <p>
 
-Si vous ne vous sentez pas concernà par le fait que ces sites vous pistent
-(et par les sites qui tentent de vous dÃmasquer en se faisant passer pour
-d'autres) ni par le fait que ces censeurs locaux prennent connaissance de
-vos visites, vous pouvez activer ces plugins en allant dans les prÃfÃrences
-de Torbutton-&gt;ParamÃtres de SÃcuritÃ-&gt;onglet Contenu Dynamique et
-dÃcocher la case "DÃsactiver les plugins pendant l'utilisation de Tor". Si
-vous faÃtes cela sans TorVM, Incognito ou des rÃgles de pare-feux adaptÃes,
-nous vous encourageons à utiliser au minimum <a
-href="https://addons.mozilla.org/en-US/firefox/addon/722";>NoScript</a> pour
-<a href="http://noscript.net/features#contentblocking";>bloquer les
-plugins</a>. Vous n'avez pas besoin d'utiliser les permissions par domaine
-de NoScript si vous vÃrifiez l'option <b>Appliquer Ãgalement ces
-restrictions aux sites de confiance</b> dans l'onglet des prÃfÃrences de
-Plugin de NoScript. En fait, avec cette configuration, vous pouvez mÃme
-permettre à NoScript d'activer Javascript de maniÃre globale tout en
-bloquant tous les plugins jusqu'Ã ce que vous les activiez directement sur
-la page. Nous vous recommandons Ãgalement dans ce cas <a
+If you are not concerned about being tracked by these sites (and sites that
+try to unmask you by pretending to be them), and are unconcerned about your
+local censors potentially noticing you visit them, you can enable plugins by
+going into the Torbutton Preferences-&gt;Security Settings-&gt;Dynamic
+Content tab and unchecking "Disable plugins during Tor usage" box. If you do
+this without Tor VM, The (Amnesic) Incognito Live System or appropriate
+firewall rules, we strongly suggest you at least use <a
+href="https://addons.mozilla.org/en-US/firefox/addon/722";>NoScript</a> to <a
+href="http://noscript.net/features#contentblocking";>block plugins</a>. You
+do not need to use the NoScript per-domain permissions if you check the
+<b>Apply these restrictions to trusted sites too</b> option under the
+NoScript Plugins preference tab. In fact, with this setting you can even
+have NoScript allow Javascript globally, but still block all plugins until
+you click on their placeholders in a page. We also recommend <a
 href="https://addons.mozilla.org/en-US/firefox/addon/6623";>Better
-Privacy</a> pour vous aider à supprimer les cookies Flash.
+Privacy</a> in this case to help you clear your Flash cookies.
 
 </p>
 

Modified: website/trunk/zh-cn/download.wml
===================================================================
--- website/trunk/zh-cn/download.wml	2010-04-08 06:18:52 UTC (rev 22142)
+++ website/trunk/zh-cn/download.wml	2010-04-08 06:45:16 UTC (rev 22143)
@@ -317,8 +317,8 @@
 
 <tr bgcolor="#e5e5e5">
   <td>
-    <img src="images/ico-osx-uni.png" /> Macïäåå Torï<br /> <small><em>Intel
-Only</em></small>
+    <img src="images/ico-osx-uni.png" /> Mac (Contains only Tor)<br />
+<small><em>Intel Only, no Snow Leopard (10.6) support</em></small>
   </td>
   <td>
     <a href="<package-osx-stable>"><version-osx-stable></a> (<a