[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] r25128: {translation} pulled website translations from transifex for the last time (in translation/trunk/projects/website/po: ar/about ar/docs ar/donate ar/download ar/getinvolved ar/press ar/projects ar/torbutton de/about de/docs de/getinvolved el/about es/about es/docs es/press fa/about fa/docs fr/about fr/docs fr/donate fr/download fr/projects hu/about hu/projects it/about it/docs it/press my nl/getinvolved pl_PL/about pl_PL/docs pt_BR/about pt_PT/docs ru/about ru/docs ru/press vi/docs vi/download zh_CN zh_CN/about zh_CN/docs zh_CN/download)

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] r25128: {translation} pulled website translations from transifex for the last time (in translation/trunk/projects/website/po: ar/about ar/docs ar/donate ar/download ar/getinvolved ar/press ar/projects ar/torbutton de/about de/docs de/getinvolved el/about es/about es/docs es/press fa/about fa/docs fr/about fr/docs fr/donate fr/download fr/projects hu/about hu/projects it/about it/docs it/press my nl/getinvolved pl_PL/about pl_PL/docs pt_BR/about pt_PT/docs ru/about ru/docs ru/press vi/docs vi/download zh_CN zh_CN/about zh_CN/docs zh_CN/download)
From: Runa Sandvik <runa.sandvik@xxxxxxxxx>
Date: Wed, 28 Sep 2011 09:14:46 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 28 Sep 2011 05:16:24 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: code repository commits <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Sender: tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx
Author: runa
Date: 2011-09-28 09:14:44 +0000 (Wed, 28 Sep 2011)
New Revision: 25128

Added:
   translation/trunk/projects/website/po/de/getinvolved/4-optional.translation.po
   translation/trunk/projects/website/po/de/getinvolved/4-optional.volunteer.po
   translation/trunk/projects/website/po/nl/getinvolved/4-optional.volunteer.po
   translation/trunk/projects/website/po/pl_PL/docs/4-optional.signing-keys.po
   translation/trunk/projects/website/po/zh_CN/about/3-low.contributors.po
   translation/trunk/projects/website/po/zh_CN/docs/
   translation/trunk/projects/website/po/zh_CN/docs/1-high.tor-doc-windows.po
   translation/trunk/projects/website/po/zh_CN/docs/2-medium.documentation.po
Modified:
   translation/trunk/projects/website/po/ar/about/3-low.board.po
   translation/trunk/projects/website/po/ar/about/3-low.contact.po
   translation/trunk/projects/website/po/ar/about/3-low.corepeople.po
   translation/trunk/projects/website/po/ar/about/3-low.financials.po
   translation/trunk/projects/website/po/ar/about/3-low.sponsors.po
   translation/trunk/projects/website/po/ar/about/3-low.volunteers.po
   translation/trunk/projects/website/po/ar/about/4-optional.gsoc.po
   translation/trunk/projects/website/po/ar/docs/2-medium.documentation.po
   translation/trunk/projects/website/po/ar/docs/2-medium.faq.po
   translation/trunk/projects/website/po/ar/docs/2-medium.tor-doc-osx.po
   translation/trunk/projects/website/po/ar/docs/2-medium.tor-doc-relay.po
   translation/trunk/projects/website/po/ar/docs/2-medium.verifying-signatures.po
   translation/trunk/projects/website/po/ar/docs/3-low.N900.po
   translation/trunk/projects/website/po/ar/docs/3-low.android.po
   translation/trunk/projects/website/po/ar/docs/3-low.debian-vidalia.po
   translation/trunk/projects/website/po/ar/docs/3-low.rpms.po
   translation/trunk/projects/website/po/ar/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/po/ar/docs/3-low.tor-doc-web.po
   translation/trunk/projects/website/po/ar/docs/3-low.tor-hidden-service.po
   translation/trunk/projects/website/po/ar/docs/3-low.trademark-faq.po
   translation/trunk/projects/website/po/ar/docs/4-optional.running-a-mirror.po
   translation/trunk/projects/website/po/ar/donate/3-low.become-sponsor.po
   translation/trunk/projects/website/po/ar/donate/3-low.donate-hardware.po
   translation/trunk/projects/website/po/ar/donate/3-low.donate-service.po
   translation/trunk/projects/website/po/ar/download/3-low.download-unix.po
   translation/trunk/projects/website/po/ar/getinvolved/3-low.tshirt.po
   translation/trunk/projects/website/po/ar/getinvolved/4-optional.open-positions.po
   translation/trunk/projects/website/po/ar/getinvolved/4-optional.research.po
   translation/trunk/projects/website/po/ar/getinvolved/4-optional.translation-overview.po
   translation/trunk/projects/website/po/ar/getinvolved/4-optional.translation.po
   translation/trunk/projects/website/po/ar/getinvolved/4-optional.volunteer.po
   translation/trunk/projects/website/po/ar/press/3-low.inthemedia.po
   translation/trunk/projects/website/po/ar/press/3-low.press.po
   translation/trunk/projects/website/po/ar/press/4-optional.2008-12-19-roadmap-press-release.po
   translation/trunk/projects/website/po/ar/press/4-optional.2010-03-25-tor-store-press-release.po
   translation/trunk/projects/website/po/ar/projects/1-high.torbrowser-split.po
   translation/trunk/projects/website/po/ar/projects/3-low.gettor.po
   translation/trunk/projects/website/po/ar/projects/3-low.projects.po
   translation/trunk/projects/website/po/ar/projects/3-low.tordnsel.po
   translation/trunk/projects/website/po/ar/projects/4-optional.arm.po
   translation/trunk/projects/website/po/ar/projects/4-optional.torbrowser-details.po
   translation/trunk/projects/website/po/ar/torbutton/3-low.index.po
   translation/trunk/projects/website/po/ar/torbutton/3-low.torbutton-faq.po
   translation/trunk/projects/website/po/ar/torbutton/3-low.torbutton-options.po
   translation/trunk/projects/website/po/de/about/3-low.board.po
   translation/trunk/projects/website/po/de/about/3-low.contact.po
   translation/trunk/projects/website/po/de/docs/2-medium.faq.po
   translation/trunk/projects/website/po/el/about/3-low.translators.po
   translation/trunk/projects/website/po/es/about/3-low.contact.po
   translation/trunk/projects/website/po/es/about/3-low.financials.po
   translation/trunk/projects/website/po/es/docs/2-medium.faq.po
   translation/trunk/projects/website/po/es/docs/2-medium.tor-doc-relay.po
   translation/trunk/projects/website/po/es/docs/2-medium.verifying-signatures.po
   translation/trunk/projects/website/po/es/docs/3-low.rpms.po
   translation/trunk/projects/website/po/es/press/4-optional.2010-03-25-tor-store-press-release.po
   translation/trunk/projects/website/po/fa/about/2-medium.torusers.po
   translation/trunk/projects/website/po/fa/about/3-low.board.po
   translation/trunk/projects/website/po/fa/about/3-low.contact.po
   translation/trunk/projects/website/po/fa/about/3-low.corepeople.po
   translation/trunk/projects/website/po/fa/about/3-low.financials.po
   translation/trunk/projects/website/po/fa/about/3-low.translators.po
   translation/trunk/projects/website/po/fa/docs/2-medium.faq.po
   translation/trunk/projects/website/po/fa/docs/2-medium.tor-doc-relay.po
   translation/trunk/projects/website/po/fa/docs/2-medium.verifying-signatures.po
   translation/trunk/projects/website/po/fa/docs/3-low.rpms.po
   translation/trunk/projects/website/po/fr/about/3-low.contact.po
   translation/trunk/projects/website/po/fr/docs/1-high.bridges.po
   translation/trunk/projects/website/po/fr/docs/2-medium.faq.po
   translation/trunk/projects/website/po/fr/docs/3-low.tor-doc-web.po
   translation/trunk/projects/website/po/fr/donate/3-low.donate.po
   translation/trunk/projects/website/po/fr/download/3-low.download.po
   translation/trunk/projects/website/po/fr/projects/3-low.torweather.po
   translation/trunk/projects/website/po/hu/about/3-low.contact.po
   translation/trunk/projects/website/po/hu/projects/3-low.tordnsel.po
   translation/trunk/projects/website/po/it/about/3-low.contact.po
   translation/trunk/projects/website/po/it/about/3-low.financials.po
   translation/trunk/projects/website/po/it/docs/2-medium.faq.po
   translation/trunk/projects/website/po/it/docs/2-medium.tor-doc-relay.po
   translation/trunk/projects/website/po/it/docs/2-medium.verifying-signatures.po
   translation/trunk/projects/website/po/it/docs/3-low.rpms.po
   translation/trunk/projects/website/po/it/press/4-optional.2010-03-25-tor-store-press-release.po
   translation/trunk/projects/website/po/my/1-high.index.po
   translation/trunk/projects/website/po/pl_PL/about/3-low.contact.po
   translation/trunk/projects/website/po/pl_PL/about/3-low.financials.po
   translation/trunk/projects/website/po/pl_PL/docs/2-medium.faq.po
   translation/trunk/projects/website/po/pl_PL/docs/2-medium.tor-doc-relay.po
   translation/trunk/projects/website/po/pl_PL/docs/2-medium.verifying-signatures.po
   translation/trunk/projects/website/po/pl_PL/docs/3-low.rpms.po
   translation/trunk/projects/website/po/pt_BR/about/3-low.contact.po
   translation/trunk/projects/website/po/pt_PT/docs/2-medium.installguide.po
   translation/trunk/projects/website/po/ru/about/3-low.contact.po
   translation/trunk/projects/website/po/ru/about/3-low.financials.po
   translation/trunk/projects/website/po/ru/docs/2-medium.faq.po
   translation/trunk/projects/website/po/ru/docs/2-medium.tor-doc-relay.po
   translation/trunk/projects/website/po/ru/docs/2-medium.verifying-signatures.po
   translation/trunk/projects/website/po/ru/docs/3-low.rpms.po
   translation/trunk/projects/website/po/ru/press/4-optional.2010-03-25-tor-store-press-release.po
   translation/trunk/projects/website/po/vi/docs/2-medium.verifying-signatures.po
   translation/trunk/projects/website/po/vi/download/3-low.download.po
   translation/trunk/projects/website/po/zh_CN/1-high.index.po
   translation/trunk/projects/website/po/zh_CN/about/2-medium.overview.po
   translation/trunk/projects/website/po/zh_CN/download/3-low.download.po
Log:
pulled website translations from transifex for the last time

Modified: translation/trunk/projects/website/po/ar/about/3-low.board.po
===================================================================
--- translation/trunk/projects/website/po/ar/about/3-low.board.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/about/3-low.board.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-06-21 08:19+0200\n"
-"PO-Revision-Date: 2011-09-21 19:51+0000\n"
+"PO-Revision-Date: 2011-09-28 09:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/about/3-low.contact.po
===================================================================
--- translation/trunk/projects/website/po/ar/about/3-low.contact.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/about/3-low.contact.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-07-08 08:44+0200\n"
-"PO-Revision-Date: 2011-07-09 01:09+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 00:57+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -50,20 +50,27 @@
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/about/en/contact.wml:24
 msgid ""
+"<i>community-support at lists.torproject.org</i> is for volunteers helping "
+"people with questions about using or configuring Tor."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/contact.wml:27
+msgid ""
 "<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page "
 "getinvolved/translation>\">website translations</a> into place, and help "
 "answer questions about existing and new translations."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:27
+#: /home/runa/tor/website/about/en/contact.wml:30
 msgid ""
 "<i>tordnsel at torproject.org</i> is the alias for the people responsible "
 "for the tordns exitlist."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:29
+#: /home/runa/tor/website/about/en/contact.wml:32
 msgid ""
 "<i>donations at torproject.org</i> is for questions and comments about <a "
 "href=\"<page donate/donate>\">getting money to the developers</a>. More "
@@ -72,7 +79,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:34
+#: /home/runa/tor/website/about/en/contact.wml:37
 msgid ""
 "<i>execdir at torproject.org</i> is for press/media, questions and comments "
 "about Tor the non-profit corporation: trademark questions, affiliation and "
@@ -81,43 +88,43 @@
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:40
+#: /home/runa/tor/website/about/en/contact.wml:43
 msgid "Identi.ca"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:41
+#: /home/runa/tor/website/about/en/contact.wml:44
 msgid ""
 "<a id=\"identica\"></a> Contact us via our microblogging Identi.ca account "
 "at <a href=\"https://identi.ca/torproject\";>torproject</a>."
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:45
+#: /home/runa/tor/website/about/en/contact.wml:48
 msgid "IRC"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:46
+#: /home/runa/tor/website/about/en/contact.wml:49
 msgid "<a id=\"irc\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:47
+#: /home/runa/tor/website/about/en/contact.wml:50
 msgid ""
 "Tor users and developers can also be found in the following channels on <a "
 "href=\"http://www.oftc.net/oftc/\";>OFTC</a>:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:51
+#: /home/runa/tor/website/about/en/contact.wml:54
 msgid ""
 "<i>#tor</i> - User and relay operation discussions. Having trouble running "
 "Tor or a question for other Tor users? Then this is the spot for you."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:54
+#: /home/runa/tor/website/about/en/contact.wml:57
 msgid ""
 "<i>#tor-dev</i> - Channel for people who want to do development.  "
 "Discussions about Tor-related coding, protocols, and <a href=\"<page "
@@ -125,27 +132,28 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:57
+#: /home/runa/tor/website/about/en/contact.wml:60
 msgid ""
 "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that "
 "is not related to Tor."
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:61
+#: /home/runa/tor/website/about/en/contact.wml:64
 msgid "Telephone"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:62
+#: /home/runa/tor/website/about/en/contact.wml:65
 msgid "<a id=\"phone\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:63
+#: /home/runa/tor/website/about/en/contact.wml:66
 msgid ""
 "If none of the above appeal to you, calling +1-781-352-0568 will reach the "
-"Tor office.  Should there be no answer, please leave a message."
+"Tor office.  Should there be no answer, please leave a message with a way to"
+" reach you."
 msgstr ""
 
 

Modified: translation/trunk/projects/website/po/ar/about/3-low.corepeople.po
===================================================================
--- translation/trunk/projects/website/po/ar/about/3-low.corepeople.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/about/3-low.corepeople.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-08-30 08:50+0200\n"
-"PO-Revision-Date: 2011-09-21 19:49+0000\n"
+"PO-Revision-Date: 2011-09-28 08:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/about/3-low.financials.po
===================================================================
--- translation/trunk/projects/website/po/ar/about/3-low.financials.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/about/3-low.financials.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-09-21 19:48+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-28 08:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/about/en/financials.wml:9
+#: /home/runa/tor/website/about/en/financials.wml:9
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "about/overview>\">About &raquo; </a> <a href=\"<page "
@@ -26,66 +26,79 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/transifex/website/about/en/financials.wml:14
+#: /home/runa/tor/website/about/en/financials.wml:14
 msgid "Tor: Financial Reports"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/financials.wml:16
+#: /home/runa/tor/website/about/en/financials.wml:16
+msgid "Fiscal Year 2010"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/financials.wml:17
+msgid ""
+"<a href=\"findoc/2010-TorProject-combined-"
+"Form990_PC_Audit_Results.pdf\">2010 IRS Form 990, State of MA Form PC, and "
+"Independent Audit Results</a>"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/financials.wml:18
 msgid "Fiscal Year 2009"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:17
+#: /home/runa/tor/website/about/en/financials.wml:19
 msgid ""
 "<a href=\"findoc/2009-TorProject-Annual-Report.pdf\">2009 Annual Report</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:18
+#: /home/runa/tor/website/about/en/financials.wml:20
 msgid ""
 "<a href=\"findoc/2009-TorProject-Form990andPC.pdf\">2009 IRS Form 990 and "
 "State of MA Form PC</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:19
+#: /home/runa/tor/website/about/en/financials.wml:21
 msgid ""
 "<a href=\"findoc/2009-TorProject-FinancialStatements.pdf\">2009 Financial "
 "Statements and Audit results</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:20
+#: /home/runa/tor/website/about/en/financials.wml:22
 msgid ""
 "<a href=\"findoc/2009-TorProject-DCF.pdf\">2009 Dept of Commerce Data "
 "Collection Form</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/financials.wml:21
+#: /home/runa/tor/website/about/en/financials.wml:23
 msgid "Fiscal Year 2008"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:22
+#: /home/runa/tor/website/about/en/financials.wml:24
 msgid "<a href=\"findoc/2008-TorProject-Form990.pdf\">2008 IRS Form 990</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:23
+#: /home/runa/tor/website/about/en/financials.wml:25
 msgid ""
 "<a href=\"findoc/2008-TorProject-FinancialStatements.pdf\">2008 Financial "
 "Statements and Audit Results</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/financials.wml:24
+#: /home/runa/tor/website/about/en/financials.wml:26
 msgid "Fiscal Year 2007"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:25
+#: /home/runa/tor/website/about/en/financials.wml:27
 msgid "<a href=\"findoc/2007-TorProject-Form990.pdf\">2007 IRS Form 990</a>"
 msgstr ""
 

Modified: translation/trunk/projects/website/po/ar/about/3-low.sponsors.po
===================================================================
--- translation/trunk/projects/website/po/ar/about/3-low.sponsors.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/about/3-low.sponsors.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-06-29 20:42+0200\n"
-"PO-Revision-Date: 2011-09-21 19:54+0000\n"
+"PO-Revision-Date: 2011-09-28 09:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/about/3-low.volunteers.po
===================================================================
--- translation/trunk/projects/website/po/ar/about/3-low.volunteers.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/about/3-low.volunteers.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-09-05 00:00+0200\n"
-"PO-Revision-Date: 2011-09-21 19:51+0000\n"
+"PO-Revision-Date: 2011-09-28 09:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/about/4-optional.gsoc.po
===================================================================
--- translation/trunk/projects/website/po/ar/about/4-optional.gsoc.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/about/4-optional.gsoc.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-05-23 17:02+0200\n"
-"PO-Revision-Date: 2011-09-21 19:38+0000\n"
+"PO-Revision-Date: 2011-09-28 08:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/docs/2-medium.documentation.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/2-medium.documentation.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/docs/2-medium.documentation.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-06-29 20:41+0200\n"
-"PO-Revision-Date: 2011-09-21 19:37+0000\n"
+"PO-Revision-Date: 2011-09-28 08:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/docs/2-medium.faq.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/2-medium.faq.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/docs/2-medium.faq.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-08-30 08:50+0200\n"
-"PO-Revision-Date: 2011-08-31 01:41+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 00:59+0000\n"
 "Last-Translator: OsamaK <osamak@xxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@
 msgstr "ØØØÙØ ØÙØ ØÙÙØÙØØØ"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/NhlG8k8BI3.xml:1669
+#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/mo95NMnX36.xml:1670
 msgid "<hr>"
 msgstr "<hr>"
 
@@ -1238,17 +1238,19 @@
 "Some government or corporate firewalls censor connections to Tor's website. "
 "In those cases, you have three options. First, get it from a friend &mdash; "
 "the <a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a> fits "
-"nicely on a USB key. Second, find the google cache for the <a href=\"<page "
-"getinvolved/mirrors>\">Tor mirrors</a> page and see if any of those copies "
-"of our website work for you. Third, you can download Tor via email: log in "
-"to your Gmail account and mail '<tt>gettor AT torproject.org</tt>'. If you "
-"include the word 'help' in the body of the email, it will reply with "
-"instructions. Note that only a few webmail providers are supported, since "
-"they need to be able to receive very large attachments."
+"nicely on a USB key. Second, find the <a "
+"href=\"https://encrypted.google.com/search?q=tor+mirrors\";>google cache</a> "
+"for the <a href=\"<page getinvolved/mirrors>\">Tor mirrors</a> page and see "
+"if any of those copies of our website work for you. Third, you can download "
+"Tor via email: log in to your Gmail account and mail '<tt>gettor AT "
+"torproject.org</tt>'. If you include the word 'help' in the body of the "
+"email, it will reply with instructions. Note that only a few webmail "
+"providers are supported, since they need to be able to receive very large "
+"attachments."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:669
+#: /home/runa/tor/website/docs/en/faq.wml:670
 msgid ""
 "Be sure to <a href=\"<page docs/verifying-signatures>\">verify the "
 "signature</a> of any package you download, especially when you get it from "
@@ -1256,12 +1258,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:674
+#: /home/runa/tor/website/docs/en/faq.wml:675
 msgid "<hr> <a id=\"CompileTorWindows\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:677
+#: /home/runa/tor/website/docs/en/faq.wml:678
 msgid ""
 "<a class=\"anchor\" href=\"#CompileTorWindows\">How do I compile Tor under "
 "Windows?</a>"
@@ -1270,7 +1272,7 @@
 "ÙÙÙØÙØØ</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:680
+#: /home/runa/tor/website/docs/en/faq.wml:681
 msgid ""
 "Try following the steps at <a href=\"<gitblob>doc/tor-win32-mingw-"
 "creation.txt\"> tor-win32-mingw-creation.txt</a>."
@@ -1279,7 +1281,7 @@
 "creation.txt\"> tor-win32-mingw-creation.txt</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:685
+#: /home/runa/tor/website/docs/en/faq.wml:686
 msgid ""
 "(Note that you don't need to compile Tor yourself in order to use it. Most "
 "people just use the packages available on the <a href=\"<page "
@@ -1287,12 +1289,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:690
+#: /home/runa/tor/website/docs/en/faq.wml:691
 msgid "<hr> <a id=\"VirusFalsePositives\"></a>"
 msgstr "<hr> <a id=\"VirusFalsePositives\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:693
+#: /home/runa/tor/website/docs/en/faq.wml:694
 msgid ""
 "<a class=\"anchor\" href=\"#VirusFalsePositives\">Why does my Tor executable"
 " appear to have a virus or spyware?</a>"
@@ -1301,7 +1303,7 @@
 "ØÙØÙÙÙØÙØ ÙÙÙØÙØ ØÙ ØØÙØÙØ ØØØØØ</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:696
+#: /home/runa/tor/website/docs/en/faq.wml:697
 msgid ""
 "Sometimes, overzealous Windows virus and spyware detectors trigger on some "
 "parts of the Tor Windows binary. Our best guess is that these are false "
@@ -1316,7 +1318,7 @@
 "ØØÙØÙØÙ ÙØÙØØ ÙÙ ØÙØØØØ ØÙ ØØØØ ØØØØÙØ ØÙØÙ."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:704
+#: /home/runa/tor/website/docs/en/faq.wml:705
 msgid ""
 "In the meantime, we encourage you to not just take our word for it. Our job "
 "is to provide the source; if you're concerned, please do <a "
@@ -1327,12 +1329,12 @@
 "ØÙÙØÙ</a>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:709
+#: /home/runa/tor/website/docs/en/faq.wml:710
 msgid "<hr> <a id=\"LiveCD\"></a>"
 msgstr "<hr> <a id=\"LiveCD\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:712
+#: /home/runa/tor/website/docs/en/faq.wml:713
 msgid ""
 "<a class=\"anchor\" href=\"#LiveCD\">Is there a LiveCD or other bundle that "
 "includes Tor?</a>"
@@ -1341,7 +1343,7 @@
 "ØØØÙ ØØØÙÙ ØÙØØ</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:715
+#: /home/runa/tor/website/docs/en/faq.wml:716
 msgid ""
 "Yes.  Use <a href=\"https://tails.boum.org/\";>The Amnesic Incognito Live "
 "System</a> or <a href=\"<page projects/torbrowser>\">the Tor Browser "
@@ -1349,19 +1351,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:720
+#: /home/runa/tor/website/docs/en/faq.wml:721
 msgid "<hr> <a id=\"torrc\"></a>"
 msgstr "<hr> <a id=\"torrc\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:723
+#: /home/runa/tor/website/docs/en/faq.wml:724
 msgid ""
 "<a class=\"anchor\" href=\"#torrc\">I'm supposed to \"edit my torrc\". What "
 "does that mean?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:726
+#: /home/runa/tor/website/docs/en/faq.wml:727
 msgid ""
 "Tor installs a text file called torrc that contains configuration "
 "instructions for how your Tor program should behave. The default "
@@ -1371,12 +1373,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:734
+#: /home/runa/tor/website/docs/en/faq.wml:735
 msgid "The location of your torrc file depends on the way you installed Tor:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:738
+#: /home/runa/tor/website/docs/en/faq.wml:739
 msgid ""
 "On Windows, if you installed a Tor bundle with Vidalia, you can find your "
 "torrc file in the Start menu under Programs -&gt; Vidalia Bundle -&gt; Tor, "
@@ -1389,14 +1391,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:747
+#: /home/runa/tor/website/docs/en/faq.wml:748
 msgid ""
 "On OS X, if you use Vidalia, edit <code>~/.vidalia/torrc</code>. Otherwise, "
 "open your favorite text editor and load <code>/Library/Tor/torrc</code>."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:751
+#: /home/runa/tor/website/docs/en/faq.wml:752
 msgid ""
 "On Unix, if you installed a pre-built package, look for "
 "<code>/etc/tor/torrc</code> or <code>/etc/torrc</code> or consult your "
@@ -1404,7 +1406,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:755
+#: /home/runa/tor/website/docs/en/faq.wml:756
 msgid ""
 "Finally, if you installed from source, you may not have a torrc installed "
 "yet: look in <code>/usr/local/etc/</code> and note that you may need to "
@@ -1412,14 +1414,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:762
+#: /home/runa/tor/website/docs/en/faq.wml:763
 msgid ""
 "If you use Vidalia, be sure to exit both Tor and Vidalia before you edit "
 "your torrc file. Otherwise Vidalia might overwrite your changes."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:767
+#: /home/runa/tor/website/docs/en/faq.wml:768
 msgid ""
 "Once you've changed your torrc, you will need to restart Tor for the changes"
 " to take effect. (For advanced users on OS X and Unix, note that you "
@@ -1427,7 +1429,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:773
+#: /home/runa/tor/website/docs/en/faq.wml:774
 msgid ""
 "For other configuration options you can use, look at the <a href=\"<page "
 "docs/tor-manual>\">Tor manual page</a>. Remember, all lines beginning with #"
@@ -1435,19 +1437,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:779
+#: /home/runa/tor/website/docs/en/faq.wml:780
 msgid "<hr> <a id=\"Logs\"></a>"
 msgstr "<hr> <a id=\"Logs\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:782
+#: /home/runa/tor/website/docs/en/faq.wml:783
 msgid ""
 "<a class=\"anchor\" href=\"#Logs\">How do I set up logging, or see Tor's "
 "logs?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:785
+#: /home/runa/tor/website/docs/en/faq.wml:786
 msgid ""
 "If you installed a Tor bundle that includes Vidalia, then Vidalia has a "
 "window called \"Message Log\" that will show you Tor's log messages. You can"
@@ -1456,19 +1458,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:792
+#: /home/runa/tor/website/docs/en/faq.wml:793
 msgid ""
 "If you're not using Vidalia, you'll have to go find the log files by hand. "
 "Here are some likely places for your logs to be:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:797
+#: /home/runa/tor/website/docs/en/faq.wml:798
 msgid "On OS X, Debian, Red Hat, etc, the logs are in /var/log/tor/"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:799
+#: /home/runa/tor/website/docs/en/faq.wml:800
 msgid ""
 "On Windows, there are no default log files currently. If you enable logs in "
 "your torrc file, they default to <code>\\username\\Application "
@@ -1476,7 +1478,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:803
+#: /home/runa/tor/website/docs/en/faq.wml:804
 msgid ""
 "If you compiled Tor from source, by default your Tor logs to <a "
 "href=\"http://en.wikipedia.org/wiki/Standard_streams\";>\"stdout\"</a> at "
@@ -1485,7 +1487,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:811
+#: /home/runa/tor/website/docs/en/faq.wml:812
 msgid ""
 "To change your logging setup by hand, <a href=\"#torrc\">edit your torrc</a>"
 " and find the section (near the top of the file) which contains the "
@@ -1493,7 +1495,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:817
+#: /home/runa/tor/website/docs/en/faq.wml:818
 #, no-wrap
 msgid ""
 "\\## Logs go to stdout at level \"notice\" unless redirected by something\n"
@@ -1501,7 +1503,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:822
+#: /home/runa/tor/website/docs/en/faq.wml:823
 msgid ""
 "For example, if you want Tor to send complete debug, info, notice, warn, and"
 " err level messages to a file, append the following line to the end of the "
@@ -1509,32 +1511,32 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:828
+#: /home/runa/tor/website/docs/en/faq.wml:829
 #, no-wrap
 msgid "Log debug file c:/program files/tor/debug.log\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:832
+#: /home/runa/tor/website/docs/en/faq.wml:833
 msgid ""
 "Replace <code>c:/program files/tor/debug.log</code> with a directory and "
 "filename for your Tor log."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:836
+#: /home/runa/tor/website/docs/en/faq.wml:837
 msgid "<hr> <a id=\"DoesntWork\"></a>"
 msgstr "<hr> <a id=\"DoesntWork\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:839
+#: /home/runa/tor/website/docs/en/faq.wml:840
 msgid ""
 "<a class=\"anchor\" href=\"#DoesntWork\">I installed Tor and Polipo but it's"
 " not working.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:842
+#: /home/runa/tor/website/docs/en/faq.wml:843
 msgid ""
 "Once you've installed the Tor bundle, there are two questions to ask: first,"
 " is your Tor able to establish a circuit? Second, is your Firefox correctly "
@@ -1542,7 +1544,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:847
+#: /home/runa/tor/website/docs/en/faq.wml:848
 msgid ""
 "If Tor can establish a circuit, the onion icon in Vidalia will turn green. "
 "You can also check in the Vidalia Control Panel to make sure it says "
@@ -1552,19 +1554,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:857
+#: /home/runa/tor/website/docs/en/faq.wml:858
 msgid "If Tor can't establish a circuit, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:861
+#: /home/runa/tor/website/docs/en/faq.wml:862
 msgid ""
 "Are you sure Tor is running? If you're using Vidalia, you may have to click "
 "on the onion and select \"Start\" to launch Tor."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:863
+#: /home/runa/tor/website/docs/en/faq.wml:864
 msgid ""
 "Check your system clock. If it's more than a few hours off, Tor will refuse "
 "to build circuits. For XP users, synchronize your clock under the clock "
@@ -1573,7 +1575,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:867
+#: /home/runa/tor/website/docs/en/faq.wml:868
 msgid ""
 "Is your Internet connection <a href=\"#FirewallPorts\">firewalled by "
 "port</a>, or do you normally need to use a <a "
@@ -1581,7 +1583,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:872
+#: /home/runa/tor/website/docs/en/faq.wml:873
 msgid ""
 "Are you running programs like Norton Internet Security or SELinux that block"
 " certain connections, even though you don't realize they do? They could be "
@@ -1589,7 +1591,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:875
+#: /home/runa/tor/website/docs/en/faq.wml:876
 msgid ""
 "Are you in China, or behind a restrictive corporate network firewall that "
 "blocks the public Tor relays? If so, you should learn about <a href=\"<page "
@@ -1597,14 +1599,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:878
+#: /home/runa/tor/website/docs/en/faq.wml:879
 msgid ""
 "Check your <a href=\"#Logs\">Tor logs</a>. Do they give you any hints about "
 "what's going wrong?"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:883
+#: /home/runa/tor/website/docs/en/faq.wml:884
 msgid ""
 "Step two is to confirm that Firefox is correctly configured to send its "
 "traffic through Tor. Try the <a href=\"https://check.torproject.org/\";>Tor "
@@ -1614,12 +1616,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:891
+#: /home/runa/tor/website/docs/en/faq.wml:892
 msgid "If it thinks you're not using Tor, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:895
+#: /home/runa/tor/website/docs/en/faq.wml:896
 msgid ""
 "Did you install the Torbutton extension for Firefox? The installation "
 "bundles include it, but sometimes people forget to install it. Make sure it "
@@ -1628,7 +1630,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:900
+#: /home/runa/tor/website/docs/en/faq.wml:901
 msgid ""
 "Do you have incompatible Firefox extensions like FoxyProxy installed? If so,"
 " uninstall them. (Note that using FoxyProxy is NOT a sufficient substitute "
@@ -1640,7 +1642,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:907
+#: /home/runa/tor/website/docs/en/faq.wml:908
 msgid ""
 "If your browser says \"The proxy server is refusing connections.\", check "
 "that Polipo (the http proxy that passes traffic between Firefox and Tor) is "
@@ -1650,7 +1652,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:912
+#: /home/runa/tor/website/docs/en/faq.wml:913
 msgid ""
 "If you're upgrading from OS X, some of the earlier OS X installers were "
 "broken in really unfortunate ways. You may find that <a href=\"<page docs"
@@ -1660,14 +1662,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:917
+#: /home/runa/tor/website/docs/en/faq.wml:918
 msgid ""
 "If you're on Linux, make sure Privoxy isn't running, since it will conflict "
 "with the port that our Polipo configuration file picks."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:919
+#: /home/runa/tor/website/docs/en/faq.wml:920
 msgid ""
 "If you installed Polipo yourself (not from a bundle), did you edit the "
 "config file as described? Did you restart Polipo after this change? Are you "
@@ -1675,7 +1677,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:922
+#: /home/runa/tor/website/docs/en/faq.wml:923
 msgid ""
 "For Red Hat Linux and related systems, do you have SELinux enabled? If so, "
 "it might be preventing Polipo from talking to Tor. We also run across BSD "
@@ -1684,19 +1686,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:928
+#: /home/runa/tor/website/docs/en/faq.wml:929
 msgid "<hr /> <a id=\"VidaliaPassword\"></a>"
 msgstr "<hr /> <a id=\"VidaliaPassword\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:931
+#: /home/runa/tor/website/docs/en/faq.wml:932
 msgid ""
 "<a class=\"anchor\" href=\"#VidaliaPassword\">Tor/Vidalia prompts for a "
 "password at start.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:934
+#: /home/runa/tor/website/docs/en/faq.wml:935
 msgid ""
 "Vidalia interacts with the Tor software via Tor's \"control port\". The "
 "control port lets Vidalia receive status updates from Tor, request a new "
@@ -1711,7 +1713,7 @@
 "ØÙØØØÙÙØØ ØÙØØØÙ ÙÙ ØÙØØØØÙ ØÙÙÙØ ØÙØØÙÙ ÙØÙØØØÙ ÙÙ ØØÙØÙ."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:943
+#: /home/runa/tor/website/docs/en/faq.wml:944
 msgid ""
 "Usually this process of generating and setting a random control password "
 "happens in the background. There are three common situations, though, where "
@@ -1721,7 +1723,7 @@
 " ÙÙÙÙ ØÙ ÙØÙØ ÙÙÙØ ÙÙØØÙÙØ ÙÙÙ ØØØØÙ ÙÙÙØ ØØ:"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:949
+#: /home/runa/tor/website/docs/en/faq.wml:950
 msgid ""
 "You're already running Vidalia and Tor. For example, this situation can "
 "happen if you installed the Vidalia bundle and now you're trying to run the "
@@ -1733,7 +1735,7 @@
 "ØÙÙØÙÙÙÙ ÙØÙ ØØØÙÙ ØÙØØÙØ ØÙØØÙØØ."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:954
+#: /home/runa/tor/website/docs/en/faq.wml:955
 msgid ""
 "Vidalia crashed, but left Tor running with the last known random password. "
 "After you restart Vidalia, it generates a new random password, but Vidalia "
@@ -1755,7 +1757,7 @@
 " ÙØÙÙ ÙØÙÙ ÙØØØÙØ."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:967
+#: /home/runa/tor/website/docs/en/faq.wml:968
 msgid ""
 "You had previously set Tor to run as a Windows NT service. When Tor is set "
 "to run as a service, it starts up when the system boots. If you configured "
@@ -1770,12 +1772,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:982
+#: /home/runa/tor/website/docs/en/faq.wml:983
 msgid "<hr> <a id=\"ChooseEntryExit\"></a>"
 msgstr "<hr> <a id=\"ChooseEntryExit\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:985
+#: /home/runa/tor/website/docs/en/faq.wml:986
 msgid ""
 "<a class=\"anchor\" href=\"#ChooseEntryExit\">Can I control which nodes (or "
 "country) are used for entry/exit?</a>"
@@ -1784,7 +1786,7 @@
 "ØÙØÙÙ) ØÙØÙ ØØØØØÙ ØÙÙØØÙ/ØÙÙØØØØ</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:988
+#: /home/runa/tor/website/docs/en/faq.wml:989
 msgid ""
 "Yes. You can set preferred entry and exit nodes as well as inform Tor which "
 "nodes you do not want to use.  The following options can be added to your "
@@ -1793,46 +1795,46 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:994
+#: /home/runa/tor/website/docs/en/faq.wml:995
 msgid "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>"
 msgstr "<tt>EntryNodes $ØØÙØ_ØÙØØØØ,$ØØÙØ_ØÙØØØØ,...</tt>"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:995
+#: /home/runa/tor/website/docs/en/faq.wml:996
 msgid ""
 "A list of preferred nodes to use for the first hop in the circuit, if "
 "possible."
 msgstr "ÙØØÙØ ØØÙØÙØ ØÙÙÙØÙ ØØØØØØÙÙØ ÙØØÙ ØÙÙ ÙÙ ØÙØÙÙØ ÙØ ØÙÙÙÙ ØÙÙ."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:997
+#: /home/runa/tor/website/docs/en/faq.wml:998
 msgid "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr "<tt>ExitNodes $ØØÙØ_ØÙØØØØ,$ØØÙØ_ØÙØØØØ,...</tt>"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:998
+#: /home/runa/tor/website/docs/en/faq.wml:999
 msgid ""
 "A list of preferred nodes to use for the last hop in the circuit, if "
 "possible."
 msgstr "ÙØØÙØ ØØÙØÙØ ØÙÙÙØÙ ØØØØØØÙÙØ ÙØØÙ ØØÙØ ÙÙ ØÙØÙÙØ ÙØ ØÙÙÙÙ ØÙÙ."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:1000
+#: /home/runa/tor/website/docs/en/faq.wml:1001
 msgid "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>"
 msgstr "<tt>ExcludeNodes $ØØÙØ_ØÙØØØØ,$ØØÙØ_ØÙØØØØ,...</tt>"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:1001
+#: /home/runa/tor/website/docs/en/faq.wml:1002
 msgid "A list of nodes to never use when building a circuit."
 msgstr "ÙØØÙØ ØØÙØÙØ ØÙØÙ ÙØ ØØÙØ ØØØØØØÙÙØ ØØØÙØ ØÙØ ØÙØØ ØÙÙØ."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:1003
+#: /home/runa/tor/website/docs/en/faq.wml:1004
 msgid "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr "<tt>ExcludeExitNodes $ØØÙØ_ØÙØØØØ,$ØØÙØ_ØÙØØØØ,...</tt>"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:1004
+#: /home/runa/tor/website/docs/en/faq.wml:1005
 msgid ""
 "A list of nodes to never use when picking an exit.  Nodes listed in "
 "<tt>ExcludeNodes</tt> are automatically in this list."
@@ -1841,7 +1843,7 @@
 "<tt>ExcludeNodes</tt> ØØØÙ ØÙÙØØÙÙØ ØÙÙ ÙØÙ ØÙÙØØÙØ."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1009
+#: /home/runa/tor/website/docs/en/faq.wml:1010
 msgid ""
 "<em>We recommend you do not use these</em> &mdash; they are intended for "
 "testing and may disappear in future versions.  You get the best security "
@@ -1855,7 +1857,7 @@
 "ØØØÙØÙ ØÙÙ ÙØÙ ÙØ ÙØ ÙØØÙÙ."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1016
+#: /home/runa/tor/website/docs/en/faq.wml:1017
 msgid ""
 "The <tt>EntryNodes</tt> and <tt>ExitNodes</tt> config options are treated as"
 " a request, meaning if the nodes are down or seem slow, Tor will still avoid"
@@ -1867,7 +1869,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1026
+#: /home/runa/tor/website/docs/en/faq.wml:1027
 msgid ""
 "Instead of <tt>$fingerprint</tt> you can also specify a 2 letter ISO3166 "
 "country code in curly braces (for example {de}), or an ip address pattern "
@@ -1876,7 +1878,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1032
+#: /home/runa/tor/website/docs/en/faq.wml:1033
 msgid ""
 "If you want to access a service directly through Tor's SOCKS interface (eg. "
 "using ssh via connect.c), another option is to set up an internal mapping in"
@@ -1888,26 +1890,26 @@
 "ØØØØØØØÙ <tt>MapAddress</tt>. ØØØØ ØÙØØ ØÙØÙÙÙ ØÙÙØØÙÙØ ÙÙØÙØ ÙÙ ØÙÙØÙÙÙØØ."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1038
+#: /home/runa/tor/website/docs/en/faq.wml:1039
 msgid "<hr> <a id=\"GoogleCaptcha\"></a>"
 msgstr "<hr> <a id=\"GoogleCaptcha\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1041
+#: /home/runa/tor/website/docs/en/faq.wml:1042
 msgid ""
 "<a class=\"anchor\" href=\"#GoogleCaptcha\">Google makes me solve a Captcha "
 "or tells me I have spyware installed.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1044
+#: /home/runa/tor/website/docs/en/faq.wml:1045
 msgid ""
 "This is a known and intermittent problem; it does not mean that Google "
 "considers Tor to be spyware."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1049
+#: /home/runa/tor/website/docs/en/faq.wml:1050
 msgid ""
 "When you use Tor, you are sending queries through exit relays that are also "
 "shared by thousands of other users. Tor users typically see this message "
@@ -1918,7 +1920,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1057
+#: /home/runa/tor/website/docs/en/faq.wml:1058
 msgid ""
 "An alternate explanation is that Google tries to detect certain kinds of "
 "spyware or viruses that send distinctive queries to Google Search. It notes "
@@ -1928,7 +1930,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1066
+#: /home/runa/tor/website/docs/en/faq.wml:1067
 msgid ""
 "To our knowledge, Google is not doing anything intentionally specifically to"
 " deter or block Tor use. The error message about an infected machine should "
@@ -1936,7 +1938,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1072
+#: /home/runa/tor/website/docs/en/faq.wml:1073
 msgid ""
 "Torbutton 1.2.5 (released in mid 2010) detects Google captchas and can "
 "automatically redirect you to a more Tor-friendly search engine such as "
@@ -1944,19 +1946,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1077
+#: /home/runa/tor/website/docs/en/faq.wml:1078
 msgid "<hr /> <a id=\"GmailWarning\"></a>"
 msgstr "<hr /> <a id=\"GmailWarning\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1080
+#: /home/runa/tor/website/docs/en/faq.wml:1081
 msgid ""
 "<a class=\"anchor\" href=\"#GmailWarning\">Gmail warns me that my account "
 "may have been compromised.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1083
+#: /home/runa/tor/website/docs/en/faq.wml:1084
 msgid ""
 "Sometimes, after you've used Gmail over Tor, Google presents a pop-up "
 "notification that your account may have been compromised.  The notification "
@@ -1965,7 +1967,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1090
+#: /home/runa/tor/website/docs/en/faq.wml:1091
 msgid ""
 "In general this is a false alarm: Google saw a bunch of logins from "
 "different places, as a result of running the service via Tor, and decided it"
@@ -1974,7 +1976,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1097
+#: /home/runa/tor/website/docs/en/faq.wml:1098
 msgid ""
 "Even though this may be a biproduct of using the service via tor, that "
 "doesn't mean you can entirely ignore the warning. It is <i>probably</i> a "
@@ -1983,7 +1985,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1104
+#: /home/runa/tor/website/docs/en/faq.wml:1105
 msgid ""
 "Cookie hijacking is possible by either physical access to your computer or "
 "by watching your network traffic.  In theory only physical access should "
@@ -1994,7 +1996,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1113
+#: /home/runa/tor/website/docs/en/faq.wml:1114
 msgid ""
 "And if somebody <i>did</i> steal your google cookie, they might end up "
 "logging in from unusual places (though of course they also might not). So "
@@ -2006,19 +2008,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1122
+#: /home/runa/tor/website/docs/en/faq.wml:1123
 msgid "<hr> <a id=\"FirewallPorts\"></a>"
 msgstr "<hr> <a id=\"FirewallPorts\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1125
+#: /home/runa/tor/website/docs/en/faq.wml:1126
 msgid ""
 "<a class=\"anchor\" href=\"#FirewallPorts\">My firewall only allows a few "
 "outgoing ports.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1128
+#: /home/runa/tor/website/docs/en/faq.wml:1129
 msgid ""
 "If your firewall works by blocking ports, then you can tell Tor to only use "
 "the ports that your firewall permits by adding \"FascistFirewall 1\" to your"
@@ -2028,7 +2030,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1136
+#: /home/runa/tor/website/docs/en/faq.wml:1137
 msgid ""
 "By default, when you set this Tor assumes that your firewall allows only "
 "port 80 and port 443 (HTTP and HTTPS respectively). You can select a "
@@ -2036,14 +2038,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1142
+#: /home/runa/tor/website/docs/en/faq.wml:1143
 msgid ""
 "If you want to be more fine-grained with your controls, you can also use the"
 " ReachableAddresses config options, e.g.:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1147
+#: /home/runa/tor/website/docs/en/faq.wml:1148
 #, no-wrap
 msgid ""
 "  ReachableDirAddresses *:80\n"
@@ -2051,12 +2053,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1151
+#: /home/runa/tor/website/docs/en/faq.wml:1152
 msgid "<hr> <a id=\"RelayFlexible\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1154
+#: /home/runa/tor/website/docs/en/faq.wml:1155
 msgid ""
 "<a class=\"anchor\" href=\"#RelayFlexible\">How stable does my relay need to"
 " be?</a>"
@@ -2065,12 +2067,12 @@
 "ØÙÙÙ ØØÙÙÙØÙØ</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1157
+#: /home/runa/tor/website/docs/en/faq.wml:1158
 msgid "We aim to make setting up a Tor relay easy and convenient:"
 msgstr "ØÙÙØ ÙØØÙ ØÙÙ ØÙ ÙÙÙÙ ØØÙÙØ ØÙØØÙÙÙØ ØÙÙÙØ ÙØÙÙÙÙØ:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1161
+#: /home/runa/tor/website/docs/en/faq.wml:1162
 msgid ""
 "Tor has built-in support for <a "
 "href=\"<wikifaq>#WhatbandwidthshapingoptionsareavailabletoTorrelays\"> rate "
@@ -2081,7 +2083,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1169
+#: /home/runa/tor/website/docs/en/faq.wml:1170
 msgid ""
 "Each Tor relay has an <a href=\"#ExitPolicies\">exit policy</a> that "
 "specifies what sort of outbound connections are allowed or refused from that"
@@ -2093,7 +2095,7 @@
 "ÙÙÙØØ ØØÙØØÙØ ÙÙ ØØÙÙÙØÙØ ÙØØÙÙØÙÙ ØØØÙØ ÙÙØØØØÙ ØØØÙÙÙØØ ØÙØ ØÙØØØÙ ÙÙØ."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1174
+#: /home/runa/tor/website/docs/en/faq.wml:1175
 msgid ""
 "It's fine if the relay goes offline sometimes. The directories notice this "
 "quickly and stop advertising the relay. Just try to make sure it's not too "
@@ -2104,7 +2106,7 @@
 "ØØÙÙÙØÙ ÙØÙ ØÙÙØØØÙØ ØÙÙ ØØÙØ."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1179
+#: /home/runa/tor/website/docs/en/faq.wml:1180
 msgid ""
 "We can handle relays with dynamic IPs just fine &mdash; simply leave the "
 "Address config option blank, and Tor will try to guess."
@@ -2113,7 +2115,7 @@
 "ÙÙÙ ØÙØØØØØ Address ÙØØØÙØ ÙØÙÙ ÙØØÙÙ ØÙØ ØÙ ÙØÙÙ."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1182
+#: /home/runa/tor/website/docs/en/faq.wml:1183
 msgid ""
 "If your relay is behind a NAT and it doesn't know its public IP (e.g. it has"
 " an IP of 192.168.x.y), you'll need to set up port forwarding. Forwarding "
@@ -2123,7 +2125,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1188
+#: /home/runa/tor/website/docs/en/faq.wml:1189
 msgid ""
 "Your relay will passively estimate and advertise its recent bandwidth "
 "capacity, so high-bandwidth relays will attract more users than low-"
@@ -2134,12 +2136,12 @@
 "ØØÙÙÙØØ ØØØ ÙØØÙ ÙÙØÙØ ÙÙÙØ ØÙØÙØ."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1194
+#: /home/runa/tor/website/docs/en/faq.wml:1195
 msgid "<hr> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1198
+#: /home/runa/tor/website/docs/en/faq.wml:1199
 msgid ""
 "<a class=\"anchor\" href=\"#ExitPolicies\">I'd run a relay, but I don't want"
 " to deal with abuse issues.</a>"
@@ -2148,12 +2150,12 @@
 "ØÙ ØØØÙ ØØØØØ ØÙØØØØØØÙ.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1201
+#: /home/runa/tor/website/docs/en/faq.wml:1202
 msgid "Great. That's exactly why we implemented exit policies."
 msgstr "ØØØØ. ÙØØ ØØØÙØÙØ ØØØ ØØØÙÙÙØ ÙØÙØØØØ ØÙÙØØØ."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1205
+#: /home/runa/tor/website/docs/en/faq.wml:1206
 msgid ""
 "Each Tor relay has an exit policy that specifies what sort of outbound "
 "connections are allowed or refused from that relay. The exit policies are "
@@ -2169,7 +2171,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1219
+#: /home/runa/tor/website/docs/en/faq.wml:1220
 msgid ""
 "The default exit policy allows access to many popular services (e.g. web "
 "browsing), but <a "
@@ -2185,7 +2187,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1233
+#: /home/runa/tor/website/docs/en/faq.wml:1234
 msgid ""
 "If you do allow any exit connections, make sure name resolution works (that "
 "is, your computer can resolve Internet addresses correctly).  If there are "
@@ -2200,12 +2202,12 @@
 "ÙØØØØ ÙØØØØÙÙ ØÙØ."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1241
+#: /home/runa/tor/website/docs/en/faq.wml:1242
 msgid "<hr> <a id=\"RelayOrBridge\"></a>"
 msgstr "<hr> <a id=\"RelayOrBridge\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1244
+#: /home/runa/tor/website/docs/en/faq.wml:1245
 msgid ""
 "<a class=\"anchor\" href=\"#RelayOrBridge\">Should I be a normal relay or "
 "bridge relay?</a>"
@@ -2214,7 +2216,7 @@
 "ØØÙÙÙØ ØØØÙØØ</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1246
+#: /home/runa/tor/website/docs/en/faq.wml:1247
 msgid ""
 "<a href=\"<page docs/bridges>\">Bridge relays</a> (or \"bridges\" for short)"
 "  are <a href=\"<page docs/tor-doc-relay>\">Tor relays</a> that aren't "
@@ -2224,7 +2226,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1253
+#: /home/runa/tor/website/docs/en/faq.wml:1254
 msgid ""
 "Being a normal relay vs being a bridge relay is almost the same "
 "configuration: it's just a matter of whether your relay is listed publically"
@@ -2234,7 +2236,7 @@
 "ØØØ ØØÙÙÙØÙ ØÙÙÙÙØ ØÙ ØØÙ ØØØÙØ."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1258
+#: /home/runa/tor/website/docs/en/faq.wml:1259
 msgid ""
 "Right now, China is the main place in the world that filters connections to "
 "the Tor network. So bridges are useful a) for users in China, b) as a backup"
@@ -2244,7 +2246,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1266
+#: /home/runa/tor/website/docs/en/faq.wml:1267
 msgid ""
 "So should you run a normal relay or bridge relay? If you have lots of "
 "bandwidth, you should definitely run a normal relay &mdash; the average "
@@ -2255,19 +2257,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1275
+#: /home/runa/tor/website/docs/en/faq.wml:1276
 msgid "<hr> <a id=\"MultipleRelays\"></a>"
 msgstr "<hr> <a id=\"MultipleRelays\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1278
+#: /home/runa/tor/website/docs/en/faq.wml:1279
 msgid ""
 "<a class=\"anchor\" href=\"#MultipleRelays\">I want to run more than one "
 "relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1281
+#: /home/runa/tor/website/docs/en/faq.wml:1282
 msgid ""
 "Great. If you want to run several relays to donate more to the network, "
 "we're happy with that. But please don't run more than a few dozen on the "
@@ -2276,7 +2278,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1288
+#: /home/runa/tor/website/docs/en/faq.wml:1289
 msgid ""
 "If you do decide to run more than one relay, please set the \"MyFamily\" "
 "config option in the <a href=\"#torrc\">torrc</a> of each relay, listing all"
@@ -2284,13 +2286,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1294
+#: /home/runa/tor/website/docs/en/faq.wml:1295
 #, no-wrap
 msgid "    MyFamily $fingerprint1,$fingerprint2,$fingerprint3\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1298
+#: /home/runa/tor/website/docs/en/faq.wml:1299
 msgid ""
 "where each fingerprint is the 40 character identity fingerprint (without "
 "spaces). You can also list them by nickname, but fingerprint is safer. Be "
@@ -2299,7 +2301,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1305
+#: /home/runa/tor/website/docs/en/faq.wml:1306
 msgid ""
 "That way clients will know to avoid using more than one of your relays in a "
 "single circuit. You should set MyFamily if you have administrative control "
@@ -2308,12 +2310,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1311
+#: /home/runa/tor/website/docs/en/faq.wml:1312
 msgid "<hr> <a id=\"RelayMemory\"></a>"
 msgstr "<hr> <a id=\"RelayMemory\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1314
+#: /home/runa/tor/website/docs/en/faq.wml:1315
 msgid ""
 "<a class=\"anchor\" href=\"#RelayMemory\">Why is my Tor relay using so much "
 "memory?</a>"
@@ -2322,7 +2324,7 @@
 "ÙÙ ØÙØØÙØØØ</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1316
+#: /home/runa/tor/website/docs/en/faq.wml:1317
 msgid ""
 "If your Tor relay is using more memory than you'd like, here are some tips "
 "for reducing its footprint:"
@@ -2331,7 +2333,7 @@
 "ØÙÙ:"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1321
+#: /home/runa/tor/website/docs/en/faq.wml:1322
 msgid ""
 "If you're on Linux, you may be encountering memory fragmentation bugs in "
 "glibc's malloc implementation. That is, when Tor releases memory back to the"
@@ -2348,7 +2350,7 @@
 "ÙÙ ØÙØ ØØØØØØÙ ØÙÙ ØÙØÙÙÙØ ØØØ: <tt>./configure --enable-openbsd-malloc</tt>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1329
+#: /home/runa/tor/website/docs/en/faq.wml:1330
 msgid ""
 "If you're running a fast relay, meaning you have many TLS connections open, "
 "you are probably losing a lot of memory to OpenSSL's internal buffers (38KB+"
@@ -2360,7 +2362,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1337
+#: /home/runa/tor/website/docs/en/faq.wml:1338
 msgid ""
 "If you're running on Solaris, OpenBSD, NetBSD, or old FreeBSD, Tor is "
 "probably forking separate processes rather than using threads. Consider "
@@ -2370,7 +2372,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1343
+#: /home/runa/tor/website/docs/en/faq.wml:1344
 msgid ""
 "If you still can't handle the memory load, consider reducing the amount of "
 "bandwidth your relay advertises. Advertising less bandwidth means you will "
@@ -2382,7 +2384,7 @@
 "ØÙØØÙ ØÙØØÙÙÙØ. ØØØØ ØÙØÙØØ <tt>MaxAdvertisedBandwidth</tt>  ÙÙ ØÙØØ ØÙØÙÙÙ."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1352
+#: /home/runa/tor/website/docs/en/faq.wml:1353
 msgid ""
 "All of this said, fast Tor relays do use a lot of ram. It is not unusual for"
 " a fast exit relay to use 500-1000 MB of memory."
@@ -2391,24 +2393,24 @@
 "ØØÙØÙØ ØÙ ØØØÙÙÙ ØØÙÙÙØ ØØÙØ 500-1000 Ù.Ø ÙÙ ØÙØØÙØØ."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1356
+#: /home/runa/tor/website/docs/en/faq.wml:1357
 msgid "<hr> <a id=\"WhyNotNamed\"></a>"
 msgstr "<hr> <a id=\"WhyNotNamed\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1359
+#: /home/runa/tor/website/docs/en/faq.wml:1360
 msgid "<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr "<a class=\"anchor\" href=\"#WhyNotNamed\">ÙÙØØØ ØØÙÙÙØÙ ÙØÙØ ØÙØ ÙØÙØØØ</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1362
+#: /home/runa/tor/website/docs/en/faq.wml:1363
 msgid ""
 "We currently use these metrics to determine if your relay should be "
 "named:<br>"
 msgstr "ÙØØÙØ ØØÙÙØ ØÙÙ ØÙÙØØÙÙØ ØÙØØÙÙØ ÙØØØÙØ ØØÙØØ ØØÙÙØ ØØÙÙÙØÙ:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1365
+#: /home/runa/tor/website/docs/en/faq.wml:1366
 msgid ""
 "The name is not currently mapped to a different key. Existing mappings are "
 "removed after 6 months of inactivity from a relay."
@@ -2417,22 +2419,22 @@
 "ÙÙ ØØÙ ÙØØØ ØÙØØÙÙÙØ."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1367
+#: /home/runa/tor/website/docs/en/faq.wml:1368
 msgid "The relay must have been around for at least two weeks."
 msgstr "ÙØØ ØÙ ØØÙØØØ ØÙØØÙÙÙØ ÙØØØÙØÙÙ ØÙÙ ØÙØÙÙ."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1368
+#: /home/runa/tor/website/docs/en/faq.wml:1369
 msgid "No other router may have wanted the same name in the past month."
 msgstr "ÙØØ ØÙØ ÙÙÙÙ ØÙ ÙÙÙØÙÙÙ ØÙØ ÙÙØ ØÙØØÙ ØÙØÙ ØÙØÙØ ØÙÙØØÙ."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1371
+#: /home/runa/tor/website/docs/en/faq.wml:1372
 msgid "<hr> <a id=\"KeyManagement\"></a>"
 msgstr "<hr> <a id=\"KeyManagement\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1374
+#: /home/runa/tor/website/docs/en/faq.wml:1375
 msgid ""
 "<a class=\"anchor\" href=\"#KeyManagement\">Tell me about all the keys Tor "
 "uses.</a>"
@@ -2441,7 +2443,7 @@
 "ÙØØØØÙÙØ ØÙØ.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1377
+#: /home/runa/tor/website/docs/en/faq.wml:1378
 msgid ""
 "Tor uses a variety of different keys, with three goals in mind: 1)  "
 "encryption to ensure privacy of data within the Tor network, 2)  "
@@ -2454,7 +2456,7 @@
 " Ù(3) ÙÙØÙÙÙØ ÙÙØØÙØ ÙÙ ØÙ ÙÙ ØÙØÙÙØØ ÙØØÙÙÙ ÙÙØ ØÙØØÙÙÙØØ."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1385
+#: /home/runa/tor/website/docs/en/faq.wml:1386
 msgid ""
 "<b>Encryption</b>: first, all connections in Tor use TLS link encryption, so"
 " observers can't look inside to see which circuit a given cell is intended "
@@ -2470,7 +2472,7 @@
 "ØØØ ØØØÙÙ ØÙØÙØÙØØ ØÙ ØØØØØÙ ØÙØØÙÙÙØ ÙØØØØØØÙ ØÙÙÙØØØ ÙÙÙ ØÙØÙØÙØØ."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1395
+#: /home/runa/tor/website/docs/en/faq.wml:1396
 msgid ""
 "<b>Authentication</b>: Every Tor relay has a public decryption key called "
 "the \"onion key\".  When the Tor client establishes circuits, at each step "
@@ -2486,7 +2488,7 @@
 "ØÙØØØÙ ØÙÙØ ØÙÙØØØ. ØÙØÙÙØ ÙÙ ØØÙÙÙØ ÙÙØØØÙØ ØÙØØÙÙ ÙØØ ÙÙ ØØØÙØ."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1405
+#: /home/runa/tor/website/docs/en/faq.wml:1406
 msgid ""
 "<b>Coordination</b>: How do clients know what the relays are, and how do "
 "they know that they have the right keys for them? Each relay has a long-term"
@@ -2501,7 +2503,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1419
+#: /home/runa/tor/website/docs/en/faq.wml:1420
 msgid ""
 "How do clients know what the directory authorities are? The Tor software "
 "comes with a built-in list of location and public key for each directory "
@@ -2514,7 +2516,7 @@
 "ØÙØØÙØÙØ."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1426
+#: /home/runa/tor/website/docs/en/faq.wml:1427
 msgid ""
 "How do users know they've got the right software? When we distribute the "
 "source code or a package, we digitally sign it with <a "
@@ -2524,7 +2526,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1434
+#: /home/runa/tor/website/docs/en/faq.wml:1435
 msgid ""
 "In order to be certain that it's really signed by us, you need to have met "
 "us in person and gotten a copy of our GPG key fingerprint, or you need to "
@@ -2537,17 +2539,17 @@
 "ØÙÙ ØÙÙØØÙÙØ ÙØÙÙØ ÙÙØÙÙ ØØÙ ØÙØØØ ÙÙ ØÙÙØØÙØ ØÙØÙÙ ÙØÙ ØØØØ ÙÙØØÙØ ØÙØØØØØ."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1441
+#: /home/runa/tor/website/docs/en/faq.wml:1442
 msgid "<hr> <a id=\"EntryGuards\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1444
+#: /home/runa/tor/website/docs/en/faq.wml:1445
 msgid "<a class=\"anchor\" href=\"#EntryGuards\">What are Entry Guards?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1447
+#: /home/runa/tor/website/docs/en/faq.wml:1448
 msgid ""
 "Tor (like all current practical low-latency anonymity designs) fails when "
 "the attacker can see both ends of the communications channel. For example, "
@@ -2559,7 +2561,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1457
+#: /home/runa/tor/website/docs/en/faq.wml:1458
 msgid ""
 "So, what should we do? Suppose the attacker controls, or can observe, "
 "<i>C</i> relays. Suppose there are <i>N</i> relays total. If you select new "
@@ -2573,7 +2575,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1469
+#: /home/runa/tor/website/docs/en/faq.wml:1470
 msgid ""
 "The solution is \"entry guards\": each Tor client selects a few relays at "
 "random to use as entry points, and uses only those relays for her first hop."
@@ -2586,7 +2588,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1480
+#: /home/runa/tor/website/docs/en/faq.wml:1481
 msgid ""
 "You can read more at <a href=\"http://freehaven.net/anonbib/#wright02\";>An "
 "Analysis of the Degradation of Anonymous Protocols</a>, <a "
@@ -2597,7 +2599,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1489
+#: /home/runa/tor/website/docs/en/faq.wml:1490
 msgid ""
 "Restricting your entry nodes may also help against attackers who want to run"
 " a few Tor nodes and easily enumerate all of the Tor user IP addresses. "
@@ -2608,12 +2610,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1497
+#: /home/runa/tor/website/docs/en/faq.wml:1498
 msgid "<hr> <a id=\"EverybodyARelay\"></a>"
 msgstr "<hr> <a id=\"EverybodyARelay\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1500
+#: /home/runa/tor/website/docs/en/faq.wml:1501
 msgid ""
 "<a class=\"anchor\" href=\"#EverybodyARelay\">You should make every Tor user"
 " be a relay.</a>"
@@ -2622,7 +2624,7 @@
 " ØØÙÙÙØ.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1503
+#: /home/runa/tor/website/docs/en/faq.wml:1504
 msgid ""
 "Requiring every Tor user to be a relay would help with scaling the network "
 "to handle all our users, and <a "
@@ -2637,7 +2639,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1516
+#: /home/runa/tor/website/docs/en/faq.wml:1517
 msgid ""
 "That said, we do want to encourage Tor users to run relays, so what we "
 "really want to do is simplify the process of setting up and maintaining a "
@@ -2653,12 +2655,12 @@
 "ÙÙÙÙ ØÙØÙÙÙ."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1525
+#: /home/runa/tor/website/docs/en/faq.wml:1526
 msgid "There are five steps we need to address before we can do this though:"
 msgstr "ØÙØØ ØÙØ ØØÙØØ ÙØÙ ØØØØØ ØÙÙ ÙØØÙØØÙØ ÙØÙ ØÙ ÙØÙÙÙ ÙÙ ØÙÙÙØÙ ØØÙÙ:"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1529
+#: /home/runa/tor/website/docs/en/faq.wml:1530
 msgid ""
 "First, we need to make Tor stable as a relay on all common operating "
 "systems. The main remaining platform is Windows, and we plan to finally "
@@ -2672,7 +2674,7 @@
 "release\">ØØØØØ ØÙØØÙÙØ</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1537
+#: /home/runa/tor/website/docs/en/faq.wml:1538
 msgid ""
 "Second, we still need to get better at automatically estimating the right "
 "amount of bandwidth to allow. See item #7 on the <a href=\"<page "
@@ -2684,7 +2686,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1548
+#: /home/runa/tor/website/docs/en/faq.wml:1549
 msgid ""
 "Third, we need to work on scalability, both of the network (how to stop "
 "requiring that all Tor relays be able to connect to all Tor relays) and of "
@@ -2702,7 +2704,7 @@
 "ØÙØÙØØÙÙ. ÙØØ ØØØÙØ ÙÙÙÙ ØÙ ÙÙÙØ ÙØÙØØ UDP ÙÙØ ØÙØÙØ."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1558
+#: /home/runa/tor/website/docs/en/faq.wml:1559
 msgid ""
 "Fourth, we need to better understand the risks from letting the attacker "
 "send traffic through your relay while you're also initiating your own "
@@ -2720,7 +2722,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1574
+#: /home/runa/tor/website/docs/en/faq.wml:1575
 msgid ""
 "Fifth, we might need some sort of incentive scheme to encourage people to "
 "relay traffic for others, and/or to become exit nodes. Here are our <a "
@@ -2732,24 +2734,24 @@
 "ØÙØØÙÙØ ÙØØÙÙØØØ ØÙØ</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1581
+#: /home/runa/tor/website/docs/en/faq.wml:1582
 msgid "Please help on all of these!"
 msgstr "ØØØØÙØ ØÙÙ ØÙÙÙØÙ ØÙÙ ØÙÙ!"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1584
+#: /home/runa/tor/website/docs/en/faq.wml:1585
 msgid "<hr> <a id=\"TransportIPnotTCP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1587
+#: /home/runa/tor/website/docs/en/faq.wml:1588
 msgid ""
 "<a class=\"anchor\" href=\"#TransportIPnotTCP\">You should transport all IP "
 "packets, not just TCP packets.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1590
+#: /home/runa/tor/website/docs/en/faq.wml:1591
 msgid ""
 "This would be handy, because it would make Tor better able to handle new "
 "protocols like VoIP, it could solve the whole need to socksify applications,"
@@ -2758,7 +2760,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1597
+#: /home/runa/tor/website/docs/en/faq.wml:1598
 msgid ""
 "We're heading in this direction: see <a "
 "href=\"https://trac.torproject.org/projects/tor/ticket/1855\";>this trac "
@@ -2767,7 +2769,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1604
+#: /home/runa/tor/website/docs/en/faq.wml:1605
 msgid ""
 "IP packets reveal OS characteristics. We would still need to do IP-level "
 "packet normalization, to stop things like TCP fingerprinting attacks. Given "
@@ -2778,7 +2780,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1611
+#: /home/runa/tor/website/docs/en/faq.wml:1612
 msgid ""
 "Application-level streams still need scrubbing. We will still need user-side"
 " applications like Torbutton. So it won't become just a matter of capturing "
@@ -2786,7 +2788,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1615
+#: /home/runa/tor/website/docs/en/faq.wml:1616
 msgid ""
 "Certain protocols will still leak information. For example, we must rewrite "
 "DNS requests so they are delivered to an unlinkable DNS server rather than "
@@ -2795,7 +2797,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1620
+#: /home/runa/tor/website/docs/en/faq.wml:1621
 msgid ""
 "<a "
 "href=\"http://crypto.stanford.edu/~nagendra/projects/dtls/dtls.html\";>DTLS</a>"
@@ -2806,7 +2808,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1627
+#: /home/runa/tor/website/docs/en/faq.wml:1628
 msgid ""
 "Exit policies for arbitrary IP packets mean building a secure IDS. Our node "
 "operators tell us that exit policies are one of the main reasons they're "
@@ -2824,7 +2826,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1641
+#: /home/runa/tor/website/docs/en/faq.wml:1642
 msgid ""
 "The Tor-internal name spaces would need to be redesigned. We support hidden "
 "service \".onion\" addresses by intercepting the addresses when they are "
@@ -2833,12 +2835,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1648
+#: /home/runa/tor/website/docs/en/faq.wml:1649
 msgid "<hr> <a id=\"Criminals\"></a>"
 msgstr "<hr> <a id=\"Criminals\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1651
+#: /home/runa/tor/website/docs/en/faq.wml:1652
 msgid ""
 "<a class=\"anchor\" href=\"#Criminals\">Doesn't Tor enable criminals to do "
 "bad things?</a>"
@@ -2847,19 +2849,19 @@
 "ØÙØØØ</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1654
+#: /home/runa/tor/website/docs/en/faq.wml:1655
 msgid ""
 "For the answer to this question and others, please see our <a href=\"<page "
 "docs/faq-abuse>\">Tor Abuse FAQ</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1658
+#: /home/runa/tor/website/docs/en/faq.wml:1659
 msgid "<hr> <a id=\"RespondISP\"></a>"
 msgstr "<hr> <a id=\"RespondISP\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1661
+#: /home/runa/tor/website/docs/en/faq.wml:1662
 msgid ""
 "<a class=\"anchor\" href=\"#RespondISP\">How do I respond to my ISP about my"
 " exit relay?</a>"
@@ -2868,7 +2870,7 @@
 "ØØØÙØ ØØÙÙÙØ ØÙÙØØØØ</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1664
+#: /home/runa/tor/website/docs/en/faq.wml:1665
 msgid ""
 "A collection of templates for successfully responding to ISPs is <a "
 "href=\"<wiki>doc/TorAbuseTemplates\">collected here</a>."

Modified: translation/trunk/projects/website/po/ar/docs/2-medium.tor-doc-osx.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/2-medium.tor-doc-osx.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/docs/2-medium.tor-doc-osx.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-06-21 08:18+0200\n"
-"PO-Revision-Date: 2011-09-21 19:43+0000\n"
+"PO-Revision-Date: 2011-09-28 08:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/docs/2-medium.tor-doc-relay.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/2-medium.tor-doc-relay.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/docs/2-medium.tor-doc-relay.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-06-21 08:19+0200\n"
-"PO-Revision-Date: 2011-09-21 19:52+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-28 09:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:16 /tmp/F5o0tOMw8z.xml:281
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:16 /tmp/A18i3Pxv3V.xml:282
 msgid "<hr>"
 msgstr ""
 
@@ -66,8 +66,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37 /tmp/F5o0tOMw8z.xml:52
-#: /tmp/F5o0tOMw8z.xml:147 /tmp/F5o0tOMw8z.xml:171
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37 /tmp/A18i3Pxv3V.xml:52
+#: /tmp/A18i3Pxv3V.xml:147 /tmp/A18i3Pxv3V.xml:171
 msgid "<br>"
 msgstr ""
 
@@ -404,11 +404,12 @@
 "add a line like \"toruser hard nofile 8192\" to your "
 "/etc/security/limits.conf file (where toruser is the user that runs the Tor "
 "process), and then restart Tor if it's installed as a package (or log out "
-"and log back in if you run it yourself)."
+"and log back in if you run it yourself). The Debian/Ubuntu package does this"
+" step for you."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:266
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:267
 msgid ""
 "15. If you installed Tor via some package or installer, it probably starts "
 "Tor for you automatically on boot. But if you installed from source, you may"
@@ -416,7 +417,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:272
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:273
 msgid ""
 "When you change your Tor configuration, remember to verify that your relay "
 "still works correctly after the change. Be sure to set your \"ContactInfo\" "
@@ -428,7 +429,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:283
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:284
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "about/contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/po/ar/docs/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/2-medium.verifying-signatures.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/docs/2-medium.verifying-signatures.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-09-05 00:00+0200\n"
-"PO-Revision-Date: 2011-09-21 19:54+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-28 09:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -31,166 +31,88 @@
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:13
-#: /tmp/w7jGkC8yXE.xml:43 /tmp/w7jGkC8yXE.xml:59 /tmp/w7jGkC8yXE.xml:86
-#: /tmp/w7jGkC8yXE.xml:186
+#: /tmp/kzjpFaPDWT.xml:16 /tmp/kzjpFaPDWT.xml:60 /tmp/kzjpFaPDWT.xml:120
+#: /tmp/kzjpFaPDWT.xml:176
 msgid "<hr>"
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><h3>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:15
-msgid ""
-"Each file on <a href=\"<page download/download>\">our download page</a> is "
-"accompanied by a file with the same name as the package and the extension "
-"\".asc\". These .asc files are GPG signatures. They allow you to verify the "
-"file you've downloaded is exactly the one that we intended you to get. For "
-"example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by "
-"tor-browser-<version-torbrowserbundle>_en-US.exe.asc."
+msgid "What is a signature and why should I check it?"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:22
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:18
 msgid ""
-"Of course, you'll need to have our GPG keys in your keyring: if you don't "
-"know the GPG key, you can't be sure that it was really us who signed it. The"
-" signing keys we use are:"
+"How do you know that the Tor program you have is really the one we made? "
+"Many Tor users have very real adversaries who might try to give them a fake "
+"version of Tor &mdash; and it doesn't matter how secure and anonymous Tor is"
+" if you're not running the real Tor."
 msgstr ""
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:26
-msgid "Roger's (0x28988BF5) typically signs the source code file."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:27
-msgid "Nick's (0x165733EA, or its subkey 0x8D29319A)."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:28
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:23
 msgid ""
-"Andrew's (0x31B0974B) typically signed older packages for windows and mac."
+"An attacker could try a variety of attacks to get you to download a fake "
+"Tor. For example, he could trick you into thinking some other website is a "
+"great place to download Tor. That's why you should always download Tor from "
+"<b>https</b>://www.torproject.org/. The https part means there's encryption "
+"and authentication between your browser and the website, making it much "
+"harder for the attacker to modify your download. But it's not perfect. Some "
+"places in the world block the Tor website, making users try <a href=\"<page "
+"docs/faq>#GetTor\">somewhere else</a>. Large companies sometimes force "
+"employees to use a modified browser, so the company can listen in on all "
+"their browsing. We've even <a href=\"https://blog.torproject.org/blog";
+"/diginotar-debacle-and-what-you-should-do-about-it\">seen</a> attackers who "
+"have the ability to trick your browser into thinking you're talking to the "
+"Tor website with https when you're not."
 msgstr ""
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:29
-msgid "Peter's (0xC82E0039, or its subkey 0xE1DEC577)."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:30
-msgid "TomÃs's (0x9A753A6B) signs current Vidalia release tarballs and tags."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:31
-msgid "Matt's (0x5FA14861) signed older Vidalia release tarballs."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:32
-msgid "Damian's (0x9ABBEEC6) signs Arm releases"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:33
-msgid "Jacob's (0xE012B42D)."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:34
-msgid ""
-"Erinn's (0x63FEE659) and (0xF1F5C9B5) typically signs all windows, mac, and "
-"most linux packages."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:35
-msgid "Mike's (0xDDC6C0AD) signs the Torbutton xpi."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:36
-msgid "Karsten's (0xF7C11265) signs the metrics archives and tools."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:37
-msgid "Robert Hogan's (0x22F6856F) signs torsocks release tarballs and tags."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
+#. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:38
-msgid "Nathan's (0xB374CBD2) signs the Android APK file for Orbot."
-msgstr ""
-
-#. type: Content of: <div><div><ul>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:38
-msgid "."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:39
 msgid ""
-"Tor Project Archive (0x886DDD89) signs the deb.torproject.org repositories "
-"and archives"
+"Some software sites list <a "
+"href=\"http://en.wikipedia.org/wiki/Cryptographic_hash_function\";>sha1 "
+"hashes</a> alongside the software on their website, so users can verify that"
+" they downloaded the file without any errors. These \"checksums\" help you "
+"answer the question \"Did I download this file correctly from whoever sent "
+"it to me?\" They do a good job at making sure you didn't have any random "
+"errors in your download, but they don't help you figure out whether you were"
+" downloading it from the attacker. The better question to answer is: \"Is "
+"this file that I just downloaded the file that Tor intended me to get?\""
 msgstr ""
 
-#. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:42
-msgid "Step Zero: Install GnuPG"
-msgstr ""
-
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:44
-msgid "You need to have GnuPG installed before you can verify signatures."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:48
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:49
 msgid ""
-"Linux: see <a "
-"href=\"http://www.gnupg.org/download/\";>http://www.gnupg.org/download/</a> "
-"or install <i>gnupg</i> from the package management system."
+"Each file on <a href=\"<page download/download>\">our download page</a> is "
+"accompanied by a file with the same name as the package and the extension "
+"\".asc\". These .asc files are GPG signatures. They allow you to verify the "
+"file you've downloaded is exactly the one that we intended you to get. For "
+"example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by "
+"tor-browser-<version-torbrowserbundle>_en-US.exe.asc. For a list of which "
+"developer signs which package, see our <a href=\"<page docs/signing-"
+"keys>\">signing keys</a> page."
 msgstr ""
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:51
-msgid ""
-"Windows: see <a "
-"href=\"http://www.gnupg.org/download/\";>http://www.gnupg.org/download/</a>. "
-"Look for the \"version compiled for MS-Windows\" under \"Binaries\"."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:54
-msgid ""
-"Mac: see <a "
-"href=\"http://macgpg.sourceforge.net/\";>http://macgpg.sourceforge.net/</a>."
-msgstr ""
-
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:58
-msgid "Step One: Import the keys"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:59
+msgid "Windows"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:60
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:62
 msgid ""
-"The next step is to import the key. This can be done directly from GnuPG. "
-"Make sure you import the correct key. For example, if you downloaded a "
-"Windows package, you will need to import Erinn's key."
+"You need to have GnuPG installed before you can verify signatures. Download "
+"it from <a "
+"href=\"http://gpg4win.org/download.html\";>http://gpg4win.org/download.html</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:64
-#: /tmp/w7jGkC8yXE.xml:89 /tmp/w7jGkC8yXE.xml:194
-msgid "<b>Windows:</b>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:65
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:66
 msgid ""
-"GnuPG for Windows is a command line tool, and you will need to use "
+"Once it's installed, use GnuPG to import the key that signed your package. "
+"Since GnuPG for Windows is a command-line tool, you will need to use "
 "<i>cmd.exe</i>. Unless you edit your PATH environment variable, you will "
 "need to tell Windows the full path to the GnuPG program. If you installed "
 "GnuPG with the default values, the path should be something like this: "
@@ -198,303 +120,191 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:71
-msgid "To import the key 0x28988BF5, start <i>cmd.exe</i> and type:"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:73
+msgid ""
+"Erinn Clark signs the Tor Browser Bundles. Import her key (0x63FEE659) by "
+"starting <i>cmd.exe</i> and typing:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:73
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:76
 #, no-wrap
 msgid ""
 "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --keyserver hkp://keys.gnupg.net "
-"--recv-keys 0x28988BF5"
+"--recv-keys 0x63FEE659"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:75
-#: /tmp/w7jGkC8yXE.xml:92
-msgid "<b>Mac and Linux</b>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:76
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:78
+#: /tmp/kzjpFaPDWT.xml:134
 msgid ""
-"Whether you have a Mac or you run Linux, you will need to use the terminal "
-"to run GnuPG. Mac users can find the terminal under \"Applications\". If you"
-" run Linux and use Gnome, the terminal should be under \"Applications menu\""
-" and \"Accessories\". KDE users can find the terminal under \"Menu\" and "
-"\"System\"."
+"After importing the key, you can verify that the fingerprint is correct:"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:81
-msgid "To import the key 0x28988BF5, start the terminal and type:"
-msgstr ""
-
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:83
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:81
 #, no-wrap
-msgid "gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x28988BF5"
+msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --fingerprint 0x63FEE659"
 msgstr ""
 
-#. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:85
-msgid "Step Two: Verify the fingerprints"
-msgstr ""
-
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:87
-msgid ""
-"After importing the key, you will want to verify that the fingerprint is "
-"correct."
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:83
+#: /tmp/kzjpFaPDWT.xml:139
+msgid "You should see:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:90
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:85
 #, no-wrap
-msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --fingerprint (insert keyid here)"
-msgstr ""
-
-#. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:93
-#, no-wrap
-msgid "gpg --fingerprint (insert keyid here)"
-msgstr ""
-
-#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:95
-msgid "The fingerprints for the keys should be:"
-msgstr ""
-
-#. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:98
-#, no-wrap
 msgid ""
-"    pub   1024D/28988BF5 2000-02-27\n"
-"          Key fingerprint = B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
-"    uid                  Roger Dingledine &lt;arma@xxxxxxx&gt;\n"
-"\n"
-"    pub   3072R/165733EA 2004-07-03\n"
-"          Key fingerprint = B35B F85B F194 89D0 4E28  C33C 2119 4EBB 1657 33EA\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxxx&gt;\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxx&gt;\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxxxx&gt;\n"
-"\n"
-"    pub  1024D/31B0974B 2003-07-17\n"
-"         Key fingerprint = 0295 9AA7 190A B9E9 027E  0736 3B9D 093F 31B0 974B\n"
-"    uid                  Andrew Lewman (phobos) &lt;phobos@xxxxxxxxxx&gt;\n"
-"    uid                  Andrew Lewman &lt;andrew@xxxxxxxxxx&gt;\n"
-"    uid                  Andrew Lewman &lt;andrew@xxxxxxxxxxxxxx&gt;\n"
-"    sub   4096g/B77F95F7 2003-07-17\n"
-"\n"
-"    pub   4096R/C82E0039 2003-03-24\n"
-"          Key fingerprint = 25FC 1614 B8F8 7B52 FF2F  99B9 62AF 4031 C82E 0039\n"
-"    uid                  Peter Palfrader\n"
-"    uid                  Peter Palfrader &lt;peter@xxxxxxxxxxxxx&gt;\n"
-"    uid                  Peter Palfrader &lt;weasel@xxxxxxxxxx&gt;\n"
-"\n"
-"    pub   1024D/9A753A6B 2009-09-11\n"
-"          Key fingerprint = 553D 7C2C 626E F16F 27F3  30BC 95E3 881D 9A75 3A6B\n"
-"    uid                  TomÃs Touceda &lt;chiiph@xxxxxxxxx&gt;\n"
-"    sub   1024g/33BE0E5B 2009-09-11\n"
-"\n"
-"    pub   1024D/5FA14861 2005-08-17\n"
-"          Key fingerprint = 9467 294A 9985 3C9C 65CB  141D AF7E 0E43 5FA1 4861\n"
-"    uid                  Matt Edman &lt;edmanm@xxxxxxx&gt;\n"
-"    uid                  Matt Edman &lt;Matt_Edman@xxxxxxxxxx&gt;\n"
-"    uid                  Matt Edman &lt;edmanm2@xxxxxxxxxx&gt;\n"
-"    sub   4096g/EA654E59 2005-08-17\n"
-"\n"
-"    pub   1024D/9ABBEEC6 2009-06-17\n"
-"          Key fingerprint = 6827 8CC5 DD2D 1E85 C4E4  5AD9 0445 B7AB 9ABB EEC6\n"
-"    uid                  Damian Johnson (www.atagar.com) &lt;atagar1@xxxxxxxxx&gt;\n"
-"    uid                  Damian Johnson &lt;atagar@xxxxxxxxxxxxxx&gt;\n"
-"    sub   2048g/146276B2 2009-06-17\n"
-"    sub   2048R/87F30690 2010-08-07\n"
-"\n"
-"    pub   4096R/E012B42D 2010-05-07\n"
-"          Key fingerprint = D8C9 AF51 CAA9 CAEA D3D8  9C9E A34F A745 E012 B42D\n"
-"    uid                  Jacob Appelbaum &lt;jacob@xxxxxxxxxxxxx&gt;\n"
-"    uid                  Jacob Appelbaum &lt;jacob@xxxxxxxxxxxxxx&gt;\n"
-"    sub   4096R/7CA91A52 2010-05-07 [expires: 2011-05-07]\n"
-"\n"
 "    pub   2048R/63FEE659 2003-10-16\n"
 "          Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\n"
 "    sub   2048R/EB399FD7 2003-10-16\n"
-"\n"
-"    pub   1024D/F1F5C9B5 2010-02-03\n"
-"          Key fingerprint = C2E3 4CFC 13C6 2BD9 2C75  79B5 6B8A AEB1 F1F5 C9B5\n"
-"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
-"    sub   1024g/7828F26A 2010-02-03\n"
-"\n"
-"    pub   1024D/DDC6C0AD 2006-07-26\n"
-"          Key fingerprint = BECD 90ED D1EE 8736 7980  ECF8 1B0C A30C DDC6 C0AD\n"
-"    uid                  Mike Perry &lt;mikeperry@xxxxxxxxxx&gt;\n"
-"    uid                  Mike Perry &lt;mikepery@xxxxxxxxxx&gt;\n"
-"    sub   4096g/AF0A91D7 2006-07-26\n"
-"\n"
-"    pub   1024D/F7C11265 2007-03-09 [expires: 2012-03-01]\n"
-"          Key fingerprint = FC8A EEF1 792E EE71 D721  7D47 D0CF 963D F7C1 1265\n"
-"    uid                  Karsten Loesing &lt;karsten.loesing@xxxxxxx&gt;\n"
-"    sub   2048g/75D85E4B 2007-03-09 [expires: 2012-03-01]\n"
-"\n"
-"    pub   1024D/22F6856F 2006-08-19\n"
-"          Key fingerprint = DDB4 6B5B 7950 CD47 E59B  5189 4C09 25CF 22F6 856F\n"
-"    uid                  Robert Hogan &lt;robert@xxxxxxxxxxxxxxx&gt;\n"
-"    sub   1024g/FC4A9460 2006-08-19\n"
-"\n"
-"    pub   3072D/B374CBD2 2010-06-09 [expires: 2011-06-09]\n"
-"   \t  Key fingerprint = B92B CA64 72F7 C6F0 8D47  8503 D2AC D203 B374 CBD2\n"
-"    uid                  Nathan of Guardian &lt;nathan@xxxxxxxxxxxxxxxxxxxx&gt;\n"
-"    sub   4096g/B5878C3B 2010-06-09 [expires: 2011-06-09]\n"
-"\n"
-"    pub   2048R/886DDD89 2009-09-04 [expires: 2014-09-03]\n"
-"      Key fingerprint = A3C4 F0F9 79CA A22C DBA8  F512 EE8C BC9E 886D DD89\n"
-"    uid                  deb.torproject.org archive signing key\n"
-"    sub   2048R/219EC810 2009-09-04 [expires: 2012-09-03]\n"
-"    "
 msgstr ""
 
-#. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:185
-msgid "Step Three: Verify the downloaded package"
-msgstr ""
-
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:187
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:93
+#: /tmp/kzjpFaPDWT.xml:149
 msgid ""
 "To verify the signature of the package you downloaded, you will need to "
-"download the \".asc\" file as well."
+"download the \".asc\" file as well. Assuming you downloaded the package and "
+"its signature to your Desktop, run:"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:190
-msgid ""
-"In the following examples, the user Alice downloads packages for Windows, "
-"Mac OS X and Linux and also verifies the signature of each package. All "
-"files are saved on the desktop."
-msgstr ""
-
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:195
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:97
 #, no-wrap
 msgid ""
 "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --verify C:\\Users\\Alice\\Desktop"
-"\\<file-win32-bundle-stable>.asc C:\\Users\\Alice\\Desktop\\<file-win32"
-"-bundle-stable>"
+"\\<file-win32-bundle-stable>.asc"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:197
-msgid "<b>Mac:</b>"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:99
+#: /tmp/kzjpFaPDWT.xml:155
+msgid "The output should say \"Good signature\":"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:198
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:102
+#: /tmp/kzjpFaPDWT.xml:158
 #, no-wrap
 msgid ""
-"gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc /Users/Alice"
-"/<file-osx-x86-bundle-stable>"
+"    gpg: Signature made Wed 31 Aug 2011 06:37:01 PM EDT using RSA key ID 63FEE659\n"
+"    gpg: Good signature from \"Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\"\n"
+"    gpg:                 aka \"Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\"\n"
+"    gpg:                 aka \"Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\"\n"
+"    gpg: WARNING: This key is not certified with a trusted signature!\n"
+"    gpg:          There is no indication that the signature belongs to the owner.\n"
+"    Primary key fingerprint: 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
+"    "
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:200
-msgid "<b>Linux</b>"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:112
+#: /tmp/kzjpFaPDWT.xml:168
+msgid ""
+"Notice that there is a warning because you haven't assigned a trust index to"
+" this person. This means that GnuPG verified that the key made that "
+"signature, but it's up to you to decide if that key really belongs to the "
+"developer. The best method is to meet the developer in person and exchange "
+"key fingerprints."
 msgstr ""
 
-#. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:201
-#, no-wrap
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:119
+msgid "Mac OS X"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:122
 msgid ""
-"gpg --verify /home/Alice/Desktop/<file-source-stable>.asc "
-"/home/Alice/Desktop/<file-source-stable>"
+"You need to have GnuPG installed before you can verify signatures. You can "
+"install it from <a "
+"href=\"http://macgpg.sourceforge.net/\";>http://macgpg.sourceforge.net/</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:204
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:127
 msgid ""
-"After verifying, GnuPG will come back saying something like \"Good "
-"signature\" or \"BAD signature\". The output should look something like "
-"this:"
+"Once it's installed, use GnuPG to import the key that signed your package. "
+"Erinn Clark signs the Tor Browser Bundles. Import her key (0x63FEE659) by "
+"starting the terminal (under \"Applications\")  and typing:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:209
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:132
 #, no-wrap
-msgid ""
-"    gpg: Signature made Tue 16 Mar 2010 05:55:17 AM CET using DSA key ID 28988BF5\n"
-"    gpg: Good signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
-"    gpg: WARNING: This key is not certified with a trusted signature!\n"
-"    gpg:          There is no indication that the signature belongs to the owner.\n"
-"    Primary key fingerprint: B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
-"    "
+msgid "gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:217
-msgid ""
-"Notice that there is a warning because you haven't assigned a trust index to"
-" this person. This means that GnuPG verified that the key made that "
-"signature, but it's up to you to decide if that key really belongs to the "
-"developer. The best method is to meet the developer in person and exchange "
-"key fingerprints."
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:137
+#, no-wrap
+msgid "gpg --fingerprint 0x63FEE659"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:224
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:141
+#, no-wrap
 msgid ""
-"For your reference, this is an example of a <em>BAD</em> verification. It "
-"means that the signature and file contents do not match. In this case, you "
-"should not trust the file contents:"
+"    pub   2048R/63FEE659 2003-10-16\n"
+"          Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\n"
+"    sub   2048R/EB399FD7 2003-10-16\n"
+"    "
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:229
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:153
 #, no-wrap
+msgid "gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:175
+msgid "Linux"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:178
 msgid ""
-"    gpg: Signature made Tue 20 Apr 2010 12:22:32 PM CEST using DSA key ID 28988BF5\n"
-"    gpg: BAD signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
-"    "
+"Most Linux distributions come with gpg preinstalled, so users who want to "
+"verify the Tor Browser Bundle for Linux (or the source tarball) can just "
+"follow along with the instructions above for \"Mac OS X\"."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:233
-msgid "<b>RPM-based distributions :</b>"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:183
+msgid ""
+"If you're using the <b>Debian</b> packages, you should read the instructions"
+" on <a href=\"<page docs/debian>#packages\">importing these keys to apt</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:234
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:187
 msgid ""
-"In order to manually verify the signatures on the RPM packages, you must use"
-" the <code>rpm</code> tool like so: <br />"
+"If you're using the <b>RPMs</b>, you can manually verify the signatures on "
+"the RPM packages by"
 msgstr ""
 
 #. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:237
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:188
 #, no-wrap
 msgid "rpm -K filename.rpm"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:240
-msgid "<b>Debian:</b>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:241
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:190
 msgid ""
-"If you are running Tor on Debian you should read the instructions on <a "
-"href=\"<page docs/debian>#packages\">importing these keys to apt</a>."
+"See <a "
+"href=\"http://www.gnupg.org/documentation/\";>http://www.gnupg.org/documentation/</a>"
+" to learn more about GPG."
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:244
-msgid ""
-"If you wish to learn more about GPG, see <a "
-"href=\"http://www.gnupg.org/documentation/\";>http://www.gnupg.org/documentation/</a>."
-msgstr ""
 
-

Modified: translation/trunk/projects/website/po/ar/docs/3-low.N900.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/3-low.N900.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/docs/3-low.N900.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-12-05 19:13+0000\n"
-"PO-Revision-Date: 2011-09-21 19:41+0000\n"
+"PO-Revision-Date: 2011-09-28 08:57+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/docs/3-low.android.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/3-low.android.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/docs/3-low.android.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-08-10 08:19+0200\n"
-"PO-Revision-Date: 2011-09-21 19:47+0000\n"
+"PO-Revision-Date: 2011-09-28 08:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/docs/3-low.debian-vidalia.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/3-low.debian-vidalia.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/docs/3-low.debian-vidalia.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-08-10 08:19+0200\n"
-"PO-Revision-Date: 2011-09-21 19:52+0000\n"
+"PO-Revision-Date: 2011-09-28 09:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/docs/3-low.rpms.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/3-low.rpms.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/docs/3-low.rpms.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-08-10 08:19+0200\n"
-"PO-Revision-Date: 2011-09-21 19:37+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-28 08:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/rpms.wml:16 /tmp/Xp_xTVMYLa.xml:70
+#: /home/runa/tor/website/docs/en/rpms.wml:16 /tmp/qK7cG0J74c.xml:71
 msgid "<br>"
 msgstr ""
 
@@ -76,11 +76,12 @@
 #: /home/runa/tor/website/docs/en/rpms.wml:36
 msgid ""
 "If you wish to track the stable releases of Tor, you should substitute "
-"DISTRIBUTION with one of the following: centos4, centos5, fc13, fc14, suse"
+"DISTRIBUTION with one of the following: centos4, centos5, fc13, fc14, fc15, "
+"suse"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:39
+#: /home/runa/tor/website/docs/en/rpms.wml:40
 msgid ""
 "To track experimental releases, substitute DISTRIBUTION with one of these: "
 "centos4-experimental, centos5-experimental, fc13-experimental, "
@@ -88,25 +89,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:44
+#: /home/runa/tor/website/docs/en/rpms.wml:45
 msgid "Then install Tor by running:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/rpms.wml:46
+#: /home/runa/tor/website/docs/en/rpms.wml:47
 #, no-wrap
 msgid "yum install tor"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:49
+#: /home/runa/tor/website/docs/en/rpms.wml:50
 msgid ""
 "Now Tor is installed and running. Move on to <a href=\"<page docs/tor-doc-"
 "unix>#using\">step two</a> of the \"Tor on Linux/Unix\" instructions."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:55
+#: /home/runa/tor/website/docs/en/rpms.wml:56
 msgid ""
 "The DNS name <code>deb.torproject.org</code> is actually a set of "
 "independent servers in a DNS round-robin configuration.  If for some reason "
@@ -116,29 +117,29 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/rpms.wml:64
+#: /home/runa/tor/website/docs/en/rpms.wml:65
 msgid "<hr> <hr> <a id=\"source\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/rpms.wml:69
+#: /home/runa/tor/website/docs/en/rpms.wml:70
 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:73
+#: /home/runa/tor/website/docs/en/rpms.wml:74
 msgid ""
 "If you'd like to build from source, please follow the <a href=\"<gitblob>doc"
 "/tor-rpm-creation.txt\">RPM creation instructions</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/rpms.wml:77
+#: /home/runa/tor/website/docs/en/rpms.wml:78
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:79
+#: /home/runa/tor/website/docs/en/rpms.wml:80
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "about/contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/po/ar/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/3-low.tor-doc-unix.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/docs/3-low.tor-doc-unix.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-08-10 08:19+0200\n"
-"PO-Revision-Date: 2011-09-21 19:49+0000\n"
+"PO-Revision-Date: 2011-09-28 08:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/docs/3-low.tor-doc-web.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/3-low.tor-doc-web.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/docs/3-low.tor-doc-web.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-02-12 12:20+0000\n"
-"PO-Revision-Date: 2011-09-21 19:42+0000\n"
+"PO-Revision-Date: 2011-09-28 08:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/docs/3-low.tor-hidden-service.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/3-low.tor-hidden-service.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/docs/3-low.tor-hidden-service.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-02-12 12:20+0000\n"
-"PO-Revision-Date: 2011-09-21 19:39+0000\n"
+"PO-Revision-Date: 2011-09-28 08:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/docs/3-low.trademark-faq.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/3-low.trademark-faq.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/docs/3-low.trademark-faq.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-03-17 18:04+0000\n"
-"PO-Revision-Date: 2011-09-21 19:52+0000\n"
+"PO-Revision-Date: 2011-09-28 09:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/docs/4-optional.running-a-mirror.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/4-optional.running-a-mirror.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/docs/4-optional.running-a-mirror.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-12-05 19:13+0000\n"
-"PO-Revision-Date: 2011-09-21 19:50+0000\n"
+"PO-Revision-Date: 2011-09-28 09:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/donate/3-low.become-sponsor.po
===================================================================
--- translation/trunk/projects/website/po/ar/donate/3-low.become-sponsor.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/donate/3-low.become-sponsor.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-09-21 19:51+0000\n"
+"PO-Revision-Date: 2011-09-28 09:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/donate/3-low.donate-hardware.po
===================================================================
--- translation/trunk/projects/website/po/ar/donate/3-low.donate-hardware.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/donate/3-low.donate-hardware.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-09-21 19:54+0000\n"
+"PO-Revision-Date: 2011-09-28 09:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/donate/3-low.donate-service.po
===================================================================
--- translation/trunk/projects/website/po/ar/donate/3-low.donate-service.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/donate/3-low.donate-service.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-09-21 19:53+0000\n"
+"PO-Revision-Date: 2011-09-28 09:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/download/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/po/ar/download/3-low.download-unix.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/download/3-low.download-unix.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-06-21 08:18+0200\n"
-"PO-Revision-Date: 2011-09-21 19:49+0000\n"
+"PO-Revision-Date: 2011-09-28 08:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/getinvolved/3-low.tshirt.po
===================================================================
--- translation/trunk/projects/website/po/ar/getinvolved/3-low.tshirt.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/getinvolved/3-low.tshirt.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-06-21 08:19+0200\n"
-"PO-Revision-Date: 2011-09-21 19:52+0000\n"
+"PO-Revision-Date: 2011-09-28 09:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/getinvolved/4-optional.open-positions.po
===================================================================
--- translation/trunk/projects/website/po/ar/getinvolved/4-optional.open-positions.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/getinvolved/4-optional.open-positions.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-06-21 08:19+0200\n"
-"PO-Revision-Date: 2011-09-21 19:51+0000\n"
+"PO-Revision-Date: 2011-09-28 09:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/getinvolved/4-optional.research.po
===================================================================
--- translation/trunk/projects/website/po/ar/getinvolved/4-optional.research.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/getinvolved/4-optional.research.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-08-30 08:50+0200\n"
-"PO-Revision-Date: 2011-09-21 19:53+0000\n"
+"PO-Revision-Date: 2011-09-28 09:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/getinvolved/4-optional.translation-overview.po
===================================================================
--- translation/trunk/projects/website/po/ar/getinvolved/4-optional.translation-overview.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/getinvolved/4-optional.translation-overview.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-01-03 15:54+0000\n"
-"PO-Revision-Date: 2011-09-21 19:43+0000\n"
+"PO-Revision-Date: 2011-09-28 08:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/getinvolved/4-optional.translation.po
===================================================================
--- translation/trunk/projects/website/po/ar/getinvolved/4-optional.translation.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/getinvolved/4-optional.translation.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-01-03 14:40+0000\n"
-"PO-Revision-Date: 2011-09-21 19:51+0000\n"
+"PO-Revision-Date: 2011-09-28 09:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/getinvolved/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/po/ar/getinvolved/4-optional.volunteer.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/getinvolved/4-optional.volunteer.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-08-30 08:50+0200\n"
-"PO-Revision-Date: 2011-09-21 19:44+0000\n"
+"PO-Revision-Date: 2011-09-28 08:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/press/3-low.inthemedia.po
===================================================================
--- translation/trunk/projects/website/po/ar/press/3-low.inthemedia.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/press/3-low.inthemedia.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-08-30 08:50+0200\n"
-"PO-Revision-Date: 2011-09-21 19:40+0000\n"
+"PO-Revision-Date: 2011-09-28 08:57+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/press/3-low.press.po
===================================================================
--- translation/trunk/projects/website/po/ar/press/3-low.press.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/press/3-low.press.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-08-30 08:50+0200\n"
-"PO-Revision-Date: 2011-09-21 19:45+0000\n"
+"PO-Revision-Date: 2011-09-28 08:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/press/4-optional.2008-12-19-roadmap-press-release.po
===================================================================
--- translation/trunk/projects/website/po/ar/press/4-optional.2008-12-19-roadmap-press-release.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/press/4-optional.2008-12-19-roadmap-press-release.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-05-02 17:00+0200\n"
-"PO-Revision-Date: 2011-09-21 19:39+0000\n"
+"PO-Revision-Date: 2011-09-28 08:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/press/4-optional.2010-03-25-tor-store-press-release.po
===================================================================
--- translation/trunk/projects/website/po/ar/press/4-optional.2010-03-25-tor-store-press-release.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/press/4-optional.2010-03-25-tor-store-press-release.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-05-02 17:00+0200\n"
-"PO-Revision-Date: 2011-09-21 19:51+0000\n"
+"PO-Revision-Date: 2011-09-28 09:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/projects/1-high.torbrowser-split.po
===================================================================
--- translation/trunk/projects/website/po/ar/projects/1-high.torbrowser-split.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/projects/1-high.torbrowser-split.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-08-30 08:50+0200\n"
-"PO-Revision-Date: 2011-09-21 19:52+0000\n"
+"PO-Revision-Date: 2011-09-28 09:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/projects/3-low.gettor.po
===================================================================
--- translation/trunk/projects/website/po/ar/projects/3-low.gettor.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/projects/3-low.gettor.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-09-05 00:00+0200\n"
-"PO-Revision-Date: 2011-09-21 19:43+0000\n"
+"PO-Revision-Date: 2011-09-28 08:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/projects/3-low.projects.po
===================================================================
--- translation/trunk/projects/website/po/ar/projects/3-low.projects.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/projects/3-low.projects.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-03-17 18:05+0000\n"
-"PO-Revision-Date: 2011-09-21 19:54+0000\n"
+"PO-Revision-Date: 2011-09-28 09:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/projects/3-low.tordnsel.po
===================================================================
--- translation/trunk/projects/website/po/ar/projects/3-low.tordnsel.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/projects/3-low.tordnsel.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-09-21 19:38+0000\n"
+"PO-Revision-Date: 2011-09-28 08:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/projects/4-optional.arm.po
===================================================================
--- translation/trunk/projects/website/po/ar/projects/4-optional.arm.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/projects/4-optional.arm.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-09-21 19:53+0000\n"
+"PO-Revision-Date: 2011-09-28 09:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/projects/4-optional.torbrowser-details.po
===================================================================
--- translation/trunk/projects/website/po/ar/projects/4-optional.torbrowser-details.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/projects/4-optional.torbrowser-details.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-09-05 00:00+0200\n"
-"PO-Revision-Date: 2011-09-21 19:44+0000\n"
+"PO-Revision-Date: 2011-09-28 08:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/torbutton/3-low.index.po
===================================================================
--- translation/trunk/projects/website/po/ar/torbutton/3-low.index.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/torbutton/3-low.index.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-08-30 08:51+0200\n"
-"PO-Revision-Date: 2011-09-21 19:48+0000\n"
+"PO-Revision-Date: 2011-09-28 08:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/torbutton/3-low.torbutton-faq.po
===================================================================
--- translation/trunk/projects/website/po/ar/torbutton/3-low.torbutton-faq.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/torbutton/3-low.torbutton-faq.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-03-17 18:05+0000\n"
-"PO-Revision-Date: 2011-09-21 19:50+0000\n"
+"PO-Revision-Date: 2011-09-28 09:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/torbutton/3-low.torbutton-options.po
===================================================================
--- translation/trunk/projects/website/po/ar/torbutton/3-low.torbutton-options.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ar/torbutton/3-low.torbutton-options.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-09-21 19:50+0000\n"
+"PO-Revision-Date: 2011-09-28 09:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/de/about/3-low.board.po
===================================================================
--- translation/trunk/projects/website/po/de/about/3-low.board.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/de/about/3-low.board.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-06-21 08:19+0200\n"
-"PO-Revision-Date: 2011-09-21 19:51+0000\n"
+"PO-Revision-Date: 2011-09-28 09:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/de/about/3-low.contact.po
===================================================================
--- translation/trunk/projects/website/po/de/about/3-low.contact.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/de/about/3-low.contact.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-07-08 08:44+0200\n"
-"PO-Revision-Date: 2011-09-20 04:56+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-24 01:19+0000\n"
 "Last-Translator: Sacro <Scion@xxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -55,6 +55,16 @@
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/about/en/contact.wml:24
 msgid ""
+"<i>community-support at lists.torproject.org</i> is for volunteers helping "
+"people with questions about using or configuring Tor."
+msgstr ""
+"<i>community-support at lists.torproject.org</i> ist fÃr Freiwillige, die "
+"anderen Menschen bei Fragen Ãber die Konfiguration und Nutzung von Tor "
+"helfen wollen."
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/contact.wml:27
+msgid ""
 "<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page "
 "getinvolved/translation>\">website translations</a> into place, and help "
 "answer questions about existing and new translations."
@@ -65,7 +75,7 @@
 "beantworten."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:27
+#: /home/runa/tor/website/about/en/contact.wml:30
 msgid ""
 "<i>tordnsel at torproject.org</i> is the alias for the people responsible "
 "for the tordns exitlist."
@@ -74,7 +84,7 @@
 "tordns exitlist verantwortlich sind."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:29
+#: /home/runa/tor/website/about/en/contact.wml:32
 msgid ""
 "<i>donations at torproject.org</i> is for questions and comments about <a "
 "href=\"<page donate/donate>\">getting money to the developers</a>. More "
@@ -87,7 +97,7 @@
 "Wir freuen uns dir dabei zu helfen, dein Engagement kreativ zu gestalten."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:34
+#: /home/runa/tor/website/about/en/contact.wml:37
 msgid ""
 "<i>execdir at torproject.org</i> is for press/media, questions and comments "
 "about Tor the non-profit corporation: trademark questions, affiliation and "
@@ -100,12 +110,12 @@
 " und Zertifikation, etc."
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:40
+#: /home/runa/tor/website/about/en/contact.wml:43
 msgid "Identi.ca"
 msgstr "Identi.ca"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:41
+#: /home/runa/tor/website/about/en/contact.wml:44
 msgid ""
 "<a id=\"identica\"></a> Contact us via our microblogging Identi.ca account "
 "at <a href=\"https://identi.ca/torproject\";>torproject</a>."
@@ -114,17 +124,17 @@
 " Account auf <a href=\"https://identi.ca/torproject\";>torproject</a>."
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:45
+#: /home/runa/tor/website/about/en/contact.wml:48
 msgid "IRC"
 msgstr "IRC"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:46
+#: /home/runa/tor/website/about/en/contact.wml:49
 msgid "<a id=\"irc\"></a>"
 msgstr "<a id=\"irc\"></a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:47
+#: /home/runa/tor/website/about/en/contact.wml:50
 msgid ""
 "Tor users and developers can also be found in the following channels on <a "
 "href=\"http://www.oftc.net/oftc/\";>OFTC</a>:"
@@ -133,7 +143,7 @@
 "href=\"http://www.oftc.net/oftc/\";>OFTC</a> gefunden werden:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:51
+#: /home/runa/tor/website/about/en/contact.wml:54
 msgid ""
 "<i>#tor</i> - User and relay operation discussions. Having trouble running "
 "Tor or a question for other Tor users? Then this is the spot for you."
@@ -143,7 +153,7 @@
 "genau das richtige fÃr dich."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:54
+#: /home/runa/tor/website/about/en/contact.wml:57
 msgid ""
 "<i>#tor-dev</i> - Channel for people who want to do development.  "
 "Discussions about Tor-related coding, protocols, and <a href=\"<page "
@@ -155,7 +165,7 @@
 "willkommen."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:57
+#: /home/runa/tor/website/about/en/contact.wml:60
 msgid ""
 "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that "
 "is not related to Tor."
@@ -164,23 +174,24 @@
 " mit Tor zu tun haben."
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:61
+#: /home/runa/tor/website/about/en/contact.wml:64
 msgid "Telephone"
 msgstr "Telefon"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:62
+#: /home/runa/tor/website/about/en/contact.wml:65
 msgid "<a id=\"phone\"></a>"
 msgstr "<a id=\"phone\"></a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:63
+#: /home/runa/tor/website/about/en/contact.wml:66
 msgid ""
 "If none of the above appeal to you, calling +1-781-352-0568 will reach the "
-"Tor office.  Should there be no answer, please leave a message."
+"Tor office.  Should there be no answer, please leave a message with a way to"
+" reach you."
 msgstr ""
-"Sollte dich keine der oben genannten Methoden ansprechen, kannst du mit der "
-"Telefonnummer +1-781-352-0568 das Tor-BÃro erreichen.  Sollte niemand "
-"abheben, hinterlasse bitte eine Nachricht."
+"Sollte keine der oberen dich ansprechen, kannst du +1-781-352-0568 anrufen, "
+"um das Tor-BÃro zu erreichen.  Sollte niemand rangehen, hinterlasse bitte "
+"eine Nachricht und einen Weg dich zu kontaktieren."
 
 

Modified: translation/trunk/projects/website/po/de/docs/2-medium.faq.po
===================================================================
--- translation/trunk/projects/website/po/de/docs/2-medium.faq.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/de/docs/2-medium.faq.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-08-30 08:50+0200\n"
-"PO-Revision-Date: 2011-09-21 19:38+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-28 08:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/NhlG8k8BI3.xml:1669
+#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/mo95NMnX36.xml:1670
 msgid "<hr>"
 msgstr ""
 
@@ -1088,17 +1088,19 @@
 "Some government or corporate firewalls censor connections to Tor's website. "
 "In those cases, you have three options. First, get it from a friend &mdash; "
 "the <a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a> fits "
-"nicely on a USB key. Second, find the google cache for the <a href=\"<page "
-"getinvolved/mirrors>\">Tor mirrors</a> page and see if any of those copies "
-"of our website work for you. Third, you can download Tor via email: log in "
-"to your Gmail account and mail '<tt>gettor AT torproject.org</tt>'. If you "
-"include the word 'help' in the body of the email, it will reply with "
-"instructions. Note that only a few webmail providers are supported, since "
-"they need to be able to receive very large attachments."
+"nicely on a USB key. Second, find the <a "
+"href=\"https://encrypted.google.com/search?q=tor+mirrors\";>google cache</a> "
+"for the <a href=\"<page getinvolved/mirrors>\">Tor mirrors</a> page and see "
+"if any of those copies of our website work for you. Third, you can download "
+"Tor via email: log in to your Gmail account and mail '<tt>gettor AT "
+"torproject.org</tt>'. If you include the word 'help' in the body of the "
+"email, it will reply with instructions. Note that only a few webmail "
+"providers are supported, since they need to be able to receive very large "
+"attachments."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:669
+#: /home/runa/tor/website/docs/en/faq.wml:670
 msgid ""
 "Be sure to <a href=\"<page docs/verifying-signatures>\">verify the "
 "signature</a> of any package you download, especially when you get it from "
@@ -1106,26 +1108,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:674
+#: /home/runa/tor/website/docs/en/faq.wml:675
 msgid "<hr> <a id=\"CompileTorWindows\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:677
+#: /home/runa/tor/website/docs/en/faq.wml:678
 msgid ""
 "<a class=\"anchor\" href=\"#CompileTorWindows\">How do I compile Tor under "
 "Windows?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:680
+#: /home/runa/tor/website/docs/en/faq.wml:681
 msgid ""
 "Try following the steps at <a href=\"<gitblob>doc/tor-win32-mingw-"
 "creation.txt\"> tor-win32-mingw-creation.txt</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:685
+#: /home/runa/tor/website/docs/en/faq.wml:686
 msgid ""
 "(Note that you don't need to compile Tor yourself in order to use it. Most "
 "people just use the packages available on the <a href=\"<page "
@@ -1133,19 +1135,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:690
+#: /home/runa/tor/website/docs/en/faq.wml:691
 msgid "<hr> <a id=\"VirusFalsePositives\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:693
+#: /home/runa/tor/website/docs/en/faq.wml:694
 msgid ""
 "<a class=\"anchor\" href=\"#VirusFalsePositives\">Why does my Tor executable"
 " appear to have a virus or spyware?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:696
+#: /home/runa/tor/website/docs/en/faq.wml:697
 msgid ""
 "Sometimes, overzealous Windows virus and spyware detectors trigger on some "
 "parts of the Tor Windows binary. Our best guess is that these are false "
@@ -1156,7 +1158,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:704
+#: /home/runa/tor/website/docs/en/faq.wml:705
 msgid ""
 "In the meantime, we encourage you to not just take our word for it. Our job "
 "is to provide the source; if you're concerned, please do <a "
@@ -1164,19 +1166,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:709
+#: /home/runa/tor/website/docs/en/faq.wml:710
 msgid "<hr> <a id=\"LiveCD\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:712
+#: /home/runa/tor/website/docs/en/faq.wml:713
 msgid ""
 "<a class=\"anchor\" href=\"#LiveCD\">Is there a LiveCD or other bundle that "
 "includes Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:715
+#: /home/runa/tor/website/docs/en/faq.wml:716
 msgid ""
 "Yes.  Use <a href=\"https://tails.boum.org/\";>The Amnesic Incognito Live "
 "System</a> or <a href=\"<page projects/torbrowser>\">the Tor Browser "
@@ -1184,19 +1186,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:720
+#: /home/runa/tor/website/docs/en/faq.wml:721
 msgid "<hr> <a id=\"torrc\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:723
+#: /home/runa/tor/website/docs/en/faq.wml:724
 msgid ""
 "<a class=\"anchor\" href=\"#torrc\">I'm supposed to \"edit my torrc\". What "
 "does that mean?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:726
+#: /home/runa/tor/website/docs/en/faq.wml:727
 msgid ""
 "Tor installs a text file called torrc that contains configuration "
 "instructions for how your Tor program should behave. The default "
@@ -1206,12 +1208,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:734
+#: /home/runa/tor/website/docs/en/faq.wml:735
 msgid "The location of your torrc file depends on the way you installed Tor:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:738
+#: /home/runa/tor/website/docs/en/faq.wml:739
 msgid ""
 "On Windows, if you installed a Tor bundle with Vidalia, you can find your "
 "torrc file in the Start menu under Programs -&gt; Vidalia Bundle -&gt; Tor, "
@@ -1224,14 +1226,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:747
+#: /home/runa/tor/website/docs/en/faq.wml:748
 msgid ""
 "On OS X, if you use Vidalia, edit <code>~/.vidalia/torrc</code>. Otherwise, "
 "open your favorite text editor and load <code>/Library/Tor/torrc</code>."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:751
+#: /home/runa/tor/website/docs/en/faq.wml:752
 msgid ""
 "On Unix, if you installed a pre-built package, look for "
 "<code>/etc/tor/torrc</code> or <code>/etc/torrc</code> or consult your "
@@ -1239,7 +1241,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:755
+#: /home/runa/tor/website/docs/en/faq.wml:756
 msgid ""
 "Finally, if you installed from source, you may not have a torrc installed "
 "yet: look in <code>/usr/local/etc/</code> and note that you may need to "
@@ -1247,14 +1249,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:762
+#: /home/runa/tor/website/docs/en/faq.wml:763
 msgid ""
 "If you use Vidalia, be sure to exit both Tor and Vidalia before you edit "
 "your torrc file. Otherwise Vidalia might overwrite your changes."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:767
+#: /home/runa/tor/website/docs/en/faq.wml:768
 msgid ""
 "Once you've changed your torrc, you will need to restart Tor for the changes"
 " to take effect. (For advanced users on OS X and Unix, note that you "
@@ -1262,7 +1264,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:773
+#: /home/runa/tor/website/docs/en/faq.wml:774
 msgid ""
 "For other configuration options you can use, look at the <a href=\"<page "
 "docs/tor-manual>\">Tor manual page</a>. Remember, all lines beginning with #"
@@ -1270,19 +1272,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:779
+#: /home/runa/tor/website/docs/en/faq.wml:780
 msgid "<hr> <a id=\"Logs\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:782
+#: /home/runa/tor/website/docs/en/faq.wml:783
 msgid ""
 "<a class=\"anchor\" href=\"#Logs\">How do I set up logging, or see Tor's "
 "logs?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:785
+#: /home/runa/tor/website/docs/en/faq.wml:786
 msgid ""
 "If you installed a Tor bundle that includes Vidalia, then Vidalia has a "
 "window called \"Message Log\" that will show you Tor's log messages. You can"
@@ -1291,19 +1293,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:792
+#: /home/runa/tor/website/docs/en/faq.wml:793
 msgid ""
 "If you're not using Vidalia, you'll have to go find the log files by hand. "
 "Here are some likely places for your logs to be:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:797
+#: /home/runa/tor/website/docs/en/faq.wml:798
 msgid "On OS X, Debian, Red Hat, etc, the logs are in /var/log/tor/"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:799
+#: /home/runa/tor/website/docs/en/faq.wml:800
 msgid ""
 "On Windows, there are no default log files currently. If you enable logs in "
 "your torrc file, they default to <code>\\username\\Application "
@@ -1311,7 +1313,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:803
+#: /home/runa/tor/website/docs/en/faq.wml:804
 msgid ""
 "If you compiled Tor from source, by default your Tor logs to <a "
 "href=\"http://en.wikipedia.org/wiki/Standard_streams\";>\"stdout\"</a> at "
@@ -1320,7 +1322,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:811
+#: /home/runa/tor/website/docs/en/faq.wml:812
 msgid ""
 "To change your logging setup by hand, <a href=\"#torrc\">edit your torrc</a>"
 " and find the section (near the top of the file) which contains the "
@@ -1328,7 +1330,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:817
+#: /home/runa/tor/website/docs/en/faq.wml:818
 #, no-wrap
 msgid ""
 "\\## Logs go to stdout at level \"notice\" unless redirected by something\n"
@@ -1336,7 +1338,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:822
+#: /home/runa/tor/website/docs/en/faq.wml:823
 msgid ""
 "For example, if you want Tor to send complete debug, info, notice, warn, and"
 " err level messages to a file, append the following line to the end of the "
@@ -1344,32 +1346,32 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:828
+#: /home/runa/tor/website/docs/en/faq.wml:829
 #, no-wrap
 msgid "Log debug file c:/program files/tor/debug.log\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:832
+#: /home/runa/tor/website/docs/en/faq.wml:833
 msgid ""
 "Replace <code>c:/program files/tor/debug.log</code> with a directory and "
 "filename for your Tor log."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:836
+#: /home/runa/tor/website/docs/en/faq.wml:837
 msgid "<hr> <a id=\"DoesntWork\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:839
+#: /home/runa/tor/website/docs/en/faq.wml:840
 msgid ""
 "<a class=\"anchor\" href=\"#DoesntWork\">I installed Tor and Polipo but it's"
 " not working.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:842
+#: /home/runa/tor/website/docs/en/faq.wml:843
 msgid ""
 "Once you've installed the Tor bundle, there are two questions to ask: first,"
 " is your Tor able to establish a circuit? Second, is your Firefox correctly "
@@ -1377,7 +1379,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:847
+#: /home/runa/tor/website/docs/en/faq.wml:848
 msgid ""
 "If Tor can establish a circuit, the onion icon in Vidalia will turn green. "
 "You can also check in the Vidalia Control Panel to make sure it says "
@@ -1387,19 +1389,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:857
+#: /home/runa/tor/website/docs/en/faq.wml:858
 msgid "If Tor can't establish a circuit, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:861
+#: /home/runa/tor/website/docs/en/faq.wml:862
 msgid ""
 "Are you sure Tor is running? If you're using Vidalia, you may have to click "
 "on the onion and select \"Start\" to launch Tor."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:863
+#: /home/runa/tor/website/docs/en/faq.wml:864
 msgid ""
 "Check your system clock. If it's more than a few hours off, Tor will refuse "
 "to build circuits. For XP users, synchronize your clock under the clock "
@@ -1408,7 +1410,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:867
+#: /home/runa/tor/website/docs/en/faq.wml:868
 msgid ""
 "Is your Internet connection <a href=\"#FirewallPorts\">firewalled by "
 "port</a>, or do you normally need to use a <a "
@@ -1416,7 +1418,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:872
+#: /home/runa/tor/website/docs/en/faq.wml:873
 msgid ""
 "Are you running programs like Norton Internet Security or SELinux that block"
 " certain connections, even though you don't realize they do? They could be "
@@ -1424,7 +1426,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:875
+#: /home/runa/tor/website/docs/en/faq.wml:876
 msgid ""
 "Are you in China, or behind a restrictive corporate network firewall that "
 "blocks the public Tor relays? If so, you should learn about <a href=\"<page "
@@ -1432,14 +1434,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:878
+#: /home/runa/tor/website/docs/en/faq.wml:879
 msgid ""
 "Check your <a href=\"#Logs\">Tor logs</a>. Do they give you any hints about "
 "what's going wrong?"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:883
+#: /home/runa/tor/website/docs/en/faq.wml:884
 msgid ""
 "Step two is to confirm that Firefox is correctly configured to send its "
 "traffic through Tor. Try the <a href=\"https://check.torproject.org/\";>Tor "
@@ -1449,12 +1451,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:891
+#: /home/runa/tor/website/docs/en/faq.wml:892
 msgid "If it thinks you're not using Tor, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:895
+#: /home/runa/tor/website/docs/en/faq.wml:896
 msgid ""
 "Did you install the Torbutton extension for Firefox? The installation "
 "bundles include it, but sometimes people forget to install it. Make sure it "
@@ -1463,7 +1465,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:900
+#: /home/runa/tor/website/docs/en/faq.wml:901
 msgid ""
 "Do you have incompatible Firefox extensions like FoxyProxy installed? If so,"
 " uninstall them. (Note that using FoxyProxy is NOT a sufficient substitute "
@@ -1475,7 +1477,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:907
+#: /home/runa/tor/website/docs/en/faq.wml:908
 msgid ""
 "If your browser says \"The proxy server is refusing connections.\", check "
 "that Polipo (the http proxy that passes traffic between Firefox and Tor) is "
@@ -1485,7 +1487,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:912
+#: /home/runa/tor/website/docs/en/faq.wml:913
 msgid ""
 "If you're upgrading from OS X, some of the earlier OS X installers were "
 "broken in really unfortunate ways. You may find that <a href=\"<page docs"
@@ -1495,14 +1497,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:917
+#: /home/runa/tor/website/docs/en/faq.wml:918
 msgid ""
 "If you're on Linux, make sure Privoxy isn't running, since it will conflict "
 "with the port that our Polipo configuration file picks."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:919
+#: /home/runa/tor/website/docs/en/faq.wml:920
 msgid ""
 "If you installed Polipo yourself (not from a bundle), did you edit the "
 "config file as described? Did you restart Polipo after this change? Are you "
@@ -1510,7 +1512,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:922
+#: /home/runa/tor/website/docs/en/faq.wml:923
 msgid ""
 "For Red Hat Linux and related systems, do you have SELinux enabled? If so, "
 "it might be preventing Polipo from talking to Tor. We also run across BSD "
@@ -1519,19 +1521,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:928
+#: /home/runa/tor/website/docs/en/faq.wml:929
 msgid "<hr /> <a id=\"VidaliaPassword\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:931
+#: /home/runa/tor/website/docs/en/faq.wml:932
 msgid ""
 "<a class=\"anchor\" href=\"#VidaliaPassword\">Tor/Vidalia prompts for a "
 "password at start.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:934
+#: /home/runa/tor/website/docs/en/faq.wml:935
 msgid ""
 "Vidalia interacts with the Tor software via Tor's \"control port\". The "
 "control port lets Vidalia receive status updates from Tor, request a new "
@@ -1542,7 +1544,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:943
+#: /home/runa/tor/website/docs/en/faq.wml:944
 msgid ""
 "Usually this process of generating and setting a random control password "
 "happens in the background. There are three common situations, though, where "
@@ -1550,7 +1552,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:949
+#: /home/runa/tor/website/docs/en/faq.wml:950
 msgid ""
 "You're already running Vidalia and Tor. For example, this situation can "
 "happen if you installed the Vidalia bundle and now you're trying to run the "
@@ -1559,7 +1561,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:954
+#: /home/runa/tor/website/docs/en/faq.wml:955
 msgid ""
 "Vidalia crashed, but left Tor running with the last known random password. "
 "After you restart Vidalia, it generates a new random password, but Vidalia "
@@ -1573,7 +1575,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:967
+#: /home/runa/tor/website/docs/en/faq.wml:968
 msgid ""
 "You had previously set Tor to run as a Windows NT service. When Tor is set "
 "to run as a service, it starts up when the system boots. If you configured "
@@ -1588,19 +1590,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:982
+#: /home/runa/tor/website/docs/en/faq.wml:983
 msgid "<hr> <a id=\"ChooseEntryExit\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:985
+#: /home/runa/tor/website/docs/en/faq.wml:986
 msgid ""
 "<a class=\"anchor\" href=\"#ChooseEntryExit\">Can I control which nodes (or "
 "country) are used for entry/exit?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:988
+#: /home/runa/tor/website/docs/en/faq.wml:989
 msgid ""
 "Yes. You can set preferred entry and exit nodes as well as inform Tor which "
 "nodes you do not want to use.  The following options can be added to your "
@@ -1609,53 +1611,53 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:994
+#: /home/runa/tor/website/docs/en/faq.wml:995
 msgid "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:995
+#: /home/runa/tor/website/docs/en/faq.wml:996
 msgid ""
 "A list of preferred nodes to use for the first hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:997
+#: /home/runa/tor/website/docs/en/faq.wml:998
 msgid "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:998
+#: /home/runa/tor/website/docs/en/faq.wml:999
 msgid ""
 "A list of preferred nodes to use for the last hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:1000
+#: /home/runa/tor/website/docs/en/faq.wml:1001
 msgid "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:1001
+#: /home/runa/tor/website/docs/en/faq.wml:1002
 msgid "A list of nodes to never use when building a circuit."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:1003
+#: /home/runa/tor/website/docs/en/faq.wml:1004
 msgid "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:1004
+#: /home/runa/tor/website/docs/en/faq.wml:1005
 msgid ""
 "A list of nodes to never use when picking an exit.  Nodes listed in "
 "<tt>ExcludeNodes</tt> are automatically in this list."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1009
+#: /home/runa/tor/website/docs/en/faq.wml:1010
 msgid ""
 "<em>We recommend you do not use these</em> &mdash; they are intended for "
 "testing and may disappear in future versions.  You get the best security "
@@ -1665,7 +1667,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1016
+#: /home/runa/tor/website/docs/en/faq.wml:1017
 msgid ""
 "The <tt>EntryNodes</tt> and <tt>ExitNodes</tt> config options are treated as"
 " a request, meaning if the nodes are down or seem slow, Tor will still avoid"
@@ -1677,7 +1679,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1026
+#: /home/runa/tor/website/docs/en/faq.wml:1027
 msgid ""
 "Instead of <tt>$fingerprint</tt> you can also specify a 2 letter ISO3166 "
 "country code in curly braces (for example {de}), or an ip address pattern "
@@ -1686,7 +1688,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1032
+#: /home/runa/tor/website/docs/en/faq.wml:1033
 msgid ""
 "If you want to access a service directly through Tor's SOCKS interface (eg. "
 "using ssh via connect.c), another option is to set up an internal mapping in"
@@ -1695,26 +1697,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1038
+#: /home/runa/tor/website/docs/en/faq.wml:1039
 msgid "<hr> <a id=\"GoogleCaptcha\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1041
+#: /home/runa/tor/website/docs/en/faq.wml:1042
 msgid ""
 "<a class=\"anchor\" href=\"#GoogleCaptcha\">Google makes me solve a Captcha "
 "or tells me I have spyware installed.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1044
+#: /home/runa/tor/website/docs/en/faq.wml:1045
 msgid ""
 "This is a known and intermittent problem; it does not mean that Google "
 "considers Tor to be spyware."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1049
+#: /home/runa/tor/website/docs/en/faq.wml:1050
 msgid ""
 "When you use Tor, you are sending queries through exit relays that are also "
 "shared by thousands of other users. Tor users typically see this message "
@@ -1725,7 +1727,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1057
+#: /home/runa/tor/website/docs/en/faq.wml:1058
 msgid ""
 "An alternate explanation is that Google tries to detect certain kinds of "
 "spyware or viruses that send distinctive queries to Google Search. It notes "
@@ -1735,7 +1737,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1066
+#: /home/runa/tor/website/docs/en/faq.wml:1067
 msgid ""
 "To our knowledge, Google is not doing anything intentionally specifically to"
 " deter or block Tor use. The error message about an infected machine should "
@@ -1743,7 +1745,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1072
+#: /home/runa/tor/website/docs/en/faq.wml:1073
 msgid ""
 "Torbutton 1.2.5 (released in mid 2010) detects Google captchas and can "
 "automatically redirect you to a more Tor-friendly search engine such as "
@@ -1751,19 +1753,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1077
+#: /home/runa/tor/website/docs/en/faq.wml:1078
 msgid "<hr /> <a id=\"GmailWarning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1080
+#: /home/runa/tor/website/docs/en/faq.wml:1081
 msgid ""
 "<a class=\"anchor\" href=\"#GmailWarning\">Gmail warns me that my account "
 "may have been compromised.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1083
+#: /home/runa/tor/website/docs/en/faq.wml:1084
 msgid ""
 "Sometimes, after you've used Gmail over Tor, Google presents a pop-up "
 "notification that your account may have been compromised.  The notification "
@@ -1772,7 +1774,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1090
+#: /home/runa/tor/website/docs/en/faq.wml:1091
 msgid ""
 "In general this is a false alarm: Google saw a bunch of logins from "
 "different places, as a result of running the service via Tor, and decided it"
@@ -1781,7 +1783,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1097
+#: /home/runa/tor/website/docs/en/faq.wml:1098
 msgid ""
 "Even though this may be a biproduct of using the service via tor, that "
 "doesn't mean you can entirely ignore the warning. It is <i>probably</i> a "
@@ -1790,7 +1792,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1104
+#: /home/runa/tor/website/docs/en/faq.wml:1105
 msgid ""
 "Cookie hijacking is possible by either physical access to your computer or "
 "by watching your network traffic.  In theory only physical access should "
@@ -1801,7 +1803,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1113
+#: /home/runa/tor/website/docs/en/faq.wml:1114
 msgid ""
 "And if somebody <i>did</i> steal your google cookie, they might end up "
 "logging in from unusual places (though of course they also might not). So "
@@ -1813,19 +1815,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1122
+#: /home/runa/tor/website/docs/en/faq.wml:1123
 msgid "<hr> <a id=\"FirewallPorts\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1125
+#: /home/runa/tor/website/docs/en/faq.wml:1126
 msgid ""
 "<a class=\"anchor\" href=\"#FirewallPorts\">My firewall only allows a few "
 "outgoing ports.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1128
+#: /home/runa/tor/website/docs/en/faq.wml:1129
 msgid ""
 "If your firewall works by blocking ports, then you can tell Tor to only use "
 "the ports that your firewall permits by adding \"FascistFirewall 1\" to your"
@@ -1835,7 +1837,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1136
+#: /home/runa/tor/website/docs/en/faq.wml:1137
 msgid ""
 "By default, when you set this Tor assumes that your firewall allows only "
 "port 80 and port 443 (HTTP and HTTPS respectively). You can select a "
@@ -1843,14 +1845,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1142
+#: /home/runa/tor/website/docs/en/faq.wml:1143
 msgid ""
 "If you want to be more fine-grained with your controls, you can also use the"
 " ReachableAddresses config options, e.g.:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1147
+#: /home/runa/tor/website/docs/en/faq.wml:1148
 #, no-wrap
 msgid ""
 "  ReachableDirAddresses *:80\n"
@@ -1858,24 +1860,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1151
+#: /home/runa/tor/website/docs/en/faq.wml:1152
 msgid "<hr> <a id=\"RelayFlexible\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1154
+#: /home/runa/tor/website/docs/en/faq.wml:1155
 msgid ""
 "<a class=\"anchor\" href=\"#RelayFlexible\">How stable does my relay need to"
 " be?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1157
+#: /home/runa/tor/website/docs/en/faq.wml:1158
 msgid "We aim to make setting up a Tor relay easy and convenient:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1161
+#: /home/runa/tor/website/docs/en/faq.wml:1162
 msgid ""
 "Tor has built-in support for <a "
 "href=\"<wikifaq>#WhatbandwidthshapingoptionsareavailabletoTorrelays\"> rate "
@@ -1886,7 +1888,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1169
+#: /home/runa/tor/website/docs/en/faq.wml:1170
 msgid ""
 "Each Tor relay has an <a href=\"#ExitPolicies\">exit policy</a> that "
 "specifies what sort of outbound connections are allowed or refused from that"
@@ -1895,7 +1897,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1174
+#: /home/runa/tor/website/docs/en/faq.wml:1175
 msgid ""
 "It's fine if the relay goes offline sometimes. The directories notice this "
 "quickly and stop advertising the relay. Just try to make sure it's not too "
@@ -1903,14 +1905,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1179
+#: /home/runa/tor/website/docs/en/faq.wml:1180
 msgid ""
 "We can handle relays with dynamic IPs just fine &mdash; simply leave the "
 "Address config option blank, and Tor will try to guess."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1182
+#: /home/runa/tor/website/docs/en/faq.wml:1183
 msgid ""
 "If your relay is behind a NAT and it doesn't know its public IP (e.g. it has"
 " an IP of 192.168.x.y), you'll need to set up port forwarding. Forwarding "
@@ -1920,7 +1922,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1188
+#: /home/runa/tor/website/docs/en/faq.wml:1189
 msgid ""
 "Your relay will passively estimate and advertise its recent bandwidth "
 "capacity, so high-bandwidth relays will attract more users than low-"
@@ -1928,24 +1930,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1194
+#: /home/runa/tor/website/docs/en/faq.wml:1195
 msgid "<hr> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1198
+#: /home/runa/tor/website/docs/en/faq.wml:1199
 msgid ""
 "<a class=\"anchor\" href=\"#ExitPolicies\">I'd run a relay, but I don't want"
 " to deal with abuse issues.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1201
+#: /home/runa/tor/website/docs/en/faq.wml:1202
 msgid "Great. That's exactly why we implemented exit policies."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1205
+#: /home/runa/tor/website/docs/en/faq.wml:1206
 msgid ""
 "Each Tor relay has an exit policy that specifies what sort of outbound "
 "connections are allowed or refused from that relay. The exit policies are "
@@ -1961,7 +1963,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1219
+#: /home/runa/tor/website/docs/en/faq.wml:1220
 msgid ""
 "The default exit policy allows access to many popular services (e.g. web "
 "browsing), but <a "
@@ -1977,7 +1979,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1233
+#: /home/runa/tor/website/docs/en/faq.wml:1234
 msgid ""
 "If you do allow any exit connections, make sure name resolution works (that "
 "is, your computer can resolve Internet addresses correctly).  If there are "
@@ -1987,19 +1989,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1241
+#: /home/runa/tor/website/docs/en/faq.wml:1242
 msgid "<hr> <a id=\"RelayOrBridge\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1244
+#: /home/runa/tor/website/docs/en/faq.wml:1245
 msgid ""
 "<a class=\"anchor\" href=\"#RelayOrBridge\">Should I be a normal relay or "
 "bridge relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1246
+#: /home/runa/tor/website/docs/en/faq.wml:1247
 msgid ""
 "<a href=\"<page docs/bridges>\">Bridge relays</a> (or \"bridges\" for short)"
 "  are <a href=\"<page docs/tor-doc-relay>\">Tor relays</a> that aren't "
@@ -2009,7 +2011,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1253
+#: /home/runa/tor/website/docs/en/faq.wml:1254
 msgid ""
 "Being a normal relay vs being a bridge relay is almost the same "
 "configuration: it's just a matter of whether your relay is listed publically"
@@ -2017,7 +2019,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1258
+#: /home/runa/tor/website/docs/en/faq.wml:1259
 msgid ""
 "Right now, China is the main place in the world that filters connections to "
 "the Tor network. So bridges are useful a) for users in China, b) as a backup"
@@ -2027,7 +2029,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1266
+#: /home/runa/tor/website/docs/en/faq.wml:1267
 msgid ""
 "So should you run a normal relay or bridge relay? If you have lots of "
 "bandwidth, you should definitely run a normal relay &mdash; the average "
@@ -2038,19 +2040,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1275
+#: /home/runa/tor/website/docs/en/faq.wml:1276
 msgid "<hr> <a id=\"MultipleRelays\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1278
+#: /home/runa/tor/website/docs/en/faq.wml:1279
 msgid ""
 "<a class=\"anchor\" href=\"#MultipleRelays\">I want to run more than one "
 "relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1281
+#: /home/runa/tor/website/docs/en/faq.wml:1282
 msgid ""
 "Great. If you want to run several relays to donate more to the network, "
 "we're happy with that. But please don't run more than a few dozen on the "
@@ -2059,7 +2061,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1288
+#: /home/runa/tor/website/docs/en/faq.wml:1289
 msgid ""
 "If you do decide to run more than one relay, please set the \"MyFamily\" "
 "config option in the <a href=\"#torrc\">torrc</a> of each relay, listing all"
@@ -2067,13 +2069,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1294
+#: /home/runa/tor/website/docs/en/faq.wml:1295
 #, no-wrap
 msgid "    MyFamily $fingerprint1,$fingerprint2,$fingerprint3\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1298
+#: /home/runa/tor/website/docs/en/faq.wml:1299
 msgid ""
 "where each fingerprint is the 40 character identity fingerprint (without "
 "spaces). You can also list them by nickname, but fingerprint is safer. Be "
@@ -2082,7 +2084,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1305
+#: /home/runa/tor/website/docs/en/faq.wml:1306
 msgid ""
 "That way clients will know to avoid using more than one of your relays in a "
 "single circuit. You should set MyFamily if you have administrative control "
@@ -2091,26 +2093,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1311
+#: /home/runa/tor/website/docs/en/faq.wml:1312
 msgid "<hr> <a id=\"RelayMemory\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1314
+#: /home/runa/tor/website/docs/en/faq.wml:1315
 msgid ""
 "<a class=\"anchor\" href=\"#RelayMemory\">Why is my Tor relay using so much "
 "memory?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1316
+#: /home/runa/tor/website/docs/en/faq.wml:1317
 msgid ""
 "If your Tor relay is using more memory than you'd like, here are some tips "
 "for reducing its footprint:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1321
+#: /home/runa/tor/website/docs/en/faq.wml:1322
 msgid ""
 "If you're on Linux, you may be encountering memory fragmentation bugs in "
 "glibc's malloc implementation. That is, when Tor releases memory back to the"
@@ -2122,7 +2124,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1329
+#: /home/runa/tor/website/docs/en/faq.wml:1330
 msgid ""
 "If you're running a fast relay, meaning you have many TLS connections open, "
 "you are probably losing a lot of memory to OpenSSL's internal buffers (38KB+"
@@ -2134,7 +2136,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1337
+#: /home/runa/tor/website/docs/en/faq.wml:1338
 msgid ""
 "If you're running on Solaris, OpenBSD, NetBSD, or old FreeBSD, Tor is "
 "probably forking separate processes rather than using threads. Consider "
@@ -2144,7 +2146,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1343
+#: /home/runa/tor/website/docs/en/faq.wml:1344
 msgid ""
 "If you still can't handle the memory load, consider reducing the amount of "
 "bandwidth your relay advertises. Advertising less bandwidth means you will "
@@ -2153,60 +2155,60 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1352
+#: /home/runa/tor/website/docs/en/faq.wml:1353
 msgid ""
 "All of this said, fast Tor relays do use a lot of ram. It is not unusual for"
 " a fast exit relay to use 500-1000 MB of memory."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1356
+#: /home/runa/tor/website/docs/en/faq.wml:1357
 msgid "<hr> <a id=\"WhyNotNamed\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1359
+#: /home/runa/tor/website/docs/en/faq.wml:1360
 msgid "<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1362
+#: /home/runa/tor/website/docs/en/faq.wml:1363
 msgid ""
 "We currently use these metrics to determine if your relay should be "
 "named:<br>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1365
+#: /home/runa/tor/website/docs/en/faq.wml:1366
 msgid ""
 "The name is not currently mapped to a different key. Existing mappings are "
 "removed after 6 months of inactivity from a relay."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1367
+#: /home/runa/tor/website/docs/en/faq.wml:1368
 msgid "The relay must have been around for at least two weeks."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1368
+#: /home/runa/tor/website/docs/en/faq.wml:1369
 msgid "No other router may have wanted the same name in the past month."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1371
+#: /home/runa/tor/website/docs/en/faq.wml:1372
 msgid "<hr> <a id=\"KeyManagement\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1374
+#: /home/runa/tor/website/docs/en/faq.wml:1375
 msgid ""
 "<a class=\"anchor\" href=\"#KeyManagement\">Tell me about all the keys Tor "
 "uses.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1377
+#: /home/runa/tor/website/docs/en/faq.wml:1378
 msgid ""
 "Tor uses a variety of different keys, with three goals in mind: 1)  "
 "encryption to ensure privacy of data within the Tor network, 2)  "
@@ -2216,7 +2218,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1385
+#: /home/runa/tor/website/docs/en/faq.wml:1386
 msgid ""
 "<b>Encryption</b>: first, all connections in Tor use TLS link encryption, so"
 " observers can't look inside to see which circuit a given cell is intended "
@@ -2227,7 +2229,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1395
+#: /home/runa/tor/website/docs/en/faq.wml:1396
 msgid ""
 "<b>Authentication</b>: Every Tor relay has a public decryption key called "
 "the \"onion key\".  When the Tor client establishes circuits, at each step "
@@ -2238,7 +2240,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1405
+#: /home/runa/tor/website/docs/en/faq.wml:1406
 msgid ""
 "<b>Coordination</b>: How do clients know what the relays are, and how do "
 "they know that they have the right keys for them? Each relay has a long-term"
@@ -2253,7 +2255,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1419
+#: /home/runa/tor/website/docs/en/faq.wml:1420
 msgid ""
 "How do clients know what the directory authorities are? The Tor software "
 "comes with a built-in list of location and public key for each directory "
@@ -2262,7 +2264,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1426
+#: /home/runa/tor/website/docs/en/faq.wml:1427
 msgid ""
 "How do users know they've got the right software? When we distribute the "
 "source code or a package, we digitally sign it with <a "
@@ -2272,7 +2274,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1434
+#: /home/runa/tor/website/docs/en/faq.wml:1435
 msgid ""
 "In order to be certain that it's really signed by us, you need to have met "
 "us in person and gotten a copy of our GPG key fingerprint, or you need to "
@@ -2282,17 +2284,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1441
+#: /home/runa/tor/website/docs/en/faq.wml:1442
 msgid "<hr> <a id=\"EntryGuards\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1444
+#: /home/runa/tor/website/docs/en/faq.wml:1445
 msgid "<a class=\"anchor\" href=\"#EntryGuards\">What are Entry Guards?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1447
+#: /home/runa/tor/website/docs/en/faq.wml:1448
 msgid ""
 "Tor (like all current practical low-latency anonymity designs) fails when "
 "the attacker can see both ends of the communications channel. For example, "
@@ -2304,7 +2306,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1457
+#: /home/runa/tor/website/docs/en/faq.wml:1458
 msgid ""
 "So, what should we do? Suppose the attacker controls, or can observe, "
 "<i>C</i> relays. Suppose there are <i>N</i> relays total. If you select new "
@@ -2318,7 +2320,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1469
+#: /home/runa/tor/website/docs/en/faq.wml:1470
 msgid ""
 "The solution is \"entry guards\": each Tor client selects a few relays at "
 "random to use as entry points, and uses only those relays for her first hop."
@@ -2331,7 +2333,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1480
+#: /home/runa/tor/website/docs/en/faq.wml:1481
 msgid ""
 "You can read more at <a href=\"http://freehaven.net/anonbib/#wright02\";>An "
 "Analysis of the Degradation of Anonymous Protocols</a>, <a "
@@ -2342,7 +2344,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1489
+#: /home/runa/tor/website/docs/en/faq.wml:1490
 msgid ""
 "Restricting your entry nodes may also help against attackers who want to run"
 " a few Tor nodes and easily enumerate all of the Tor user IP addresses. "
@@ -2353,19 +2355,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1497
+#: /home/runa/tor/website/docs/en/faq.wml:1498
 msgid "<hr> <a id=\"EverybodyARelay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1500
+#: /home/runa/tor/website/docs/en/faq.wml:1501
 msgid ""
 "<a class=\"anchor\" href=\"#EverybodyARelay\">You should make every Tor user"
 " be a relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1503
+#: /home/runa/tor/website/docs/en/faq.wml:1504
 msgid ""
 "Requiring every Tor user to be a relay would help with scaling the network "
 "to handle all our users, and <a "
@@ -2380,7 +2382,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1516
+#: /home/runa/tor/website/docs/en/faq.wml:1517
 msgid ""
 "That said, we do want to encourage Tor users to run relays, so what we "
 "really want to do is simplify the process of setting up and maintaining a "
@@ -2391,12 +2393,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1525
+#: /home/runa/tor/website/docs/en/faq.wml:1526
 msgid "There are five steps we need to address before we can do this though:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1529
+#: /home/runa/tor/website/docs/en/faq.wml:1530
 msgid ""
 "First, we need to make Tor stable as a relay on all common operating "
 "systems. The main remaining platform is Windows, and we plan to finally "
@@ -2406,7 +2408,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1537
+#: /home/runa/tor/website/docs/en/faq.wml:1538
 msgid ""
 "Second, we still need to get better at automatically estimating the right "
 "amount of bandwidth to allow. See item #7 on the <a href=\"<page "
@@ -2418,7 +2420,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1548
+#: /home/runa/tor/website/docs/en/faq.wml:1549
 msgid ""
 "Third, we need to work on scalability, both of the network (how to stop "
 "requiring that all Tor relays be able to connect to all Tor relays) and of "
@@ -2430,7 +2432,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1558
+#: /home/runa/tor/website/docs/en/faq.wml:1559
 msgid ""
 "Fourth, we need to better understand the risks from letting the attacker "
 "send traffic through your relay while you're also initiating your own "
@@ -2448,7 +2450,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1574
+#: /home/runa/tor/website/docs/en/faq.wml:1575
 msgid ""
 "Fifth, we might need some sort of incentive scheme to encourage people to "
 "relay traffic for others, and/or to become exit nodes. Here are our <a "
@@ -2457,24 +2459,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1581
+#: /home/runa/tor/website/docs/en/faq.wml:1582
 msgid "Please help on all of these!"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1584
+#: /home/runa/tor/website/docs/en/faq.wml:1585
 msgid "<hr> <a id=\"TransportIPnotTCP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1587
+#: /home/runa/tor/website/docs/en/faq.wml:1588
 msgid ""
 "<a class=\"anchor\" href=\"#TransportIPnotTCP\">You should transport all IP "
 "packets, not just TCP packets.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1590
+#: /home/runa/tor/website/docs/en/faq.wml:1591
 msgid ""
 "This would be handy, because it would make Tor better able to handle new "
 "protocols like VoIP, it could solve the whole need to socksify applications,"
@@ -2483,7 +2485,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1597
+#: /home/runa/tor/website/docs/en/faq.wml:1598
 msgid ""
 "We're heading in this direction: see <a "
 "href=\"https://trac.torproject.org/projects/tor/ticket/1855\";>this trac "
@@ -2492,7 +2494,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1604
+#: /home/runa/tor/website/docs/en/faq.wml:1605
 msgid ""
 "IP packets reveal OS characteristics. We would still need to do IP-level "
 "packet normalization, to stop things like TCP fingerprinting attacks. Given "
@@ -2503,7 +2505,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1611
+#: /home/runa/tor/website/docs/en/faq.wml:1612
 msgid ""
 "Application-level streams still need scrubbing. We will still need user-side"
 " applications like Torbutton. So it won't become just a matter of capturing "
@@ -2511,7 +2513,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1615
+#: /home/runa/tor/website/docs/en/faq.wml:1616
 msgid ""
 "Certain protocols will still leak information. For example, we must rewrite "
 "DNS requests so they are delivered to an unlinkable DNS server rather than "
@@ -2520,7 +2522,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1620
+#: /home/runa/tor/website/docs/en/faq.wml:1621
 msgid ""
 "<a "
 "href=\"http://crypto.stanford.edu/~nagendra/projects/dtls/dtls.html\";>DTLS</a>"
@@ -2531,7 +2533,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1627
+#: /home/runa/tor/website/docs/en/faq.wml:1628
 msgid ""
 "Exit policies for arbitrary IP packets mean building a secure IDS. Our node "
 "operators tell us that exit policies are one of the main reasons they're "
@@ -2549,7 +2551,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1641
+#: /home/runa/tor/website/docs/en/faq.wml:1642
 msgid ""
 "The Tor-internal name spaces would need to be redesigned. We support hidden "
 "service \".onion\" addresses by intercepting the addresses when they are "
@@ -2558,38 +2560,38 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1648
+#: /home/runa/tor/website/docs/en/faq.wml:1649
 msgid "<hr> <a id=\"Criminals\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1651
+#: /home/runa/tor/website/docs/en/faq.wml:1652
 msgid ""
 "<a class=\"anchor\" href=\"#Criminals\">Doesn't Tor enable criminals to do "
 "bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1654
+#: /home/runa/tor/website/docs/en/faq.wml:1655
 msgid ""
 "For the answer to this question and others, please see our <a href=\"<page "
 "docs/faq-abuse>\">Tor Abuse FAQ</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1658
+#: /home/runa/tor/website/docs/en/faq.wml:1659
 msgid "<hr> <a id=\"RespondISP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1661
+#: /home/runa/tor/website/docs/en/faq.wml:1662
 msgid ""
 "<a class=\"anchor\" href=\"#RespondISP\">How do I respond to my ISP about my"
 " exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1664
+#: /home/runa/tor/website/docs/en/faq.wml:1665
 msgid ""
 "A collection of templates for successfully responding to ISPs is <a "
 "href=\"<wiki>doc/TorAbuseTemplates\">collected here</a>."

Added: translation/trunk/projects/website/po/de/getinvolved/4-optional.translation.po
===================================================================
--- translation/trunk/projects/website/po/de/getinvolved/4-optional.translation.po	                        (rev 0)
+++ translation/trunk/projects/website/po/de/getinvolved/4-optional.translation.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -0,0 +1,145 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <benni@xxxxxxxxxxxxxxxx>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-01-03 14:40+0000\n"
+"PO-Revision-Date: 2011-09-22 18:27+0000\n"
+"Last-Translator: cyberfork <benni@xxxxxxxxxxxxxxxx>\n"
+"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/translation.wml:8
+msgid ""
+"<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
+"getinvolved/volunteer>\">Get Involved &raquo; </a> <a href=\"<page "
+"getinvolved/translation>\">Translation Guidelines</a>"
+msgstr ""
+"<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
+"getinvolved/volunteer>\">Beteilige dich &raquo; </a> <a href=\"<page "
+"getinvolved/translation>\">Ãbersetzungsrichtlinien</a>"
+
+#. type: Content of: <div><div><h1>
+#: /home/runa/tor/website/getinvolved/en/translation.wml:13
+msgid "Tor Website Translation Guidelines"
+msgstr "Richtlinien fÃr die Ãbersetzung der Tor Website"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/translation.wml:14
+msgid "<hr>"
+msgstr "<hr>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/translation.wml:17
+msgid ""
+"If you want to help translate the Tor website and documentation into other "
+"languages, here are some guidelines to help you do this as efficiently as "
+"possible."
+msgstr ""
+"Hier sind einige Richtlinien wenn du die Tor Website in andere Sprachen "
+"Ãbersetzen mÃchtest, die dabei helfen dies so effizient wie mÃglich zu tun."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/translation.wml:23
+msgid ""
+"If you would like to help translate other Tor project related information, "
+"please visit our <a href=\"<page getinvolved/translation-"
+"overview>\">Translation Overview</a> for a clear overview of what needs "
+"translation help. If you're stuck, please contact us via email: <tt>tor-"
+"translation AT torproject.org</tt>."
+msgstr ""
+"Wenn du dabei helfen mÃchtest andere Informationen die das Tor Projekt "
+"betreffen, zu Ãbersetzen, besuche bitte unsere <a href=\"<page getinvolved"
+"/translation-overview>\">ÃbersetzungsÃbersicht</a> um einen Ãberblick davon "
+"zu erhalten was eine Ãbersetzung benÃtigt.  Solltest du Probleme haben "
+"kontaktiere uns bitte per Email: <tt>tor-translation AT torproject.org</tt>."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/translation.wml:30
+msgid ""
+"Note that even if you can't translate many pages for your language, a few "
+"pages will still be helpful.  Also, rather than just translating each page "
+"word by word, please try to translate the ideas so they make the most sense "
+"in your language."
+msgstr ""
+"Selbst wenn du nicht so viele Seiten in deine Sprache Ãbersetzen kannst, "
+"sind ein paar schon sehr hilfreich."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/translation.wml:37
+msgid ""
+"We would like to have translations for the files that contain the header, "
+"footer, menu and navigation for the website. The .wmi files can be located "
+"in the following directories in the SVN repository for the website: <a "
+"href=\"https://svn.torproject.org/svn/website/trunk/about/en/\";>about/en</a>,"
+" <a "
+"href=\"https://svn.torproject.org/svn/website/trunk/docs/en/\";>docs/en</a>, "
+"<a "
+"href=\"https://svn.torproject.org/svn/website/trunk/donate/en/\";>donate/en</a>,"
+" <a href=\"https://svn.torproject.org/svn/website/trunk/en/\";>en</a>, <a "
+"href=\"https://svn.torproject.org/svn/website/trunk/getinvolved/en/\";>getinvolved/en</a>,"
+" <a "
+"href=\"https://svn.torproject.org/svn/website/trunk/include/\";>include</a>, "
+"<a "
+"href=\"https://svn.torproject.org/svn/website/trunk/press/en/\";>press/en</a>,"
+" <a "
+"href=\"https://svn.torproject.org/svn/website/trunk/projects/en/\";>projects/en</a>"
+" and <a "
+"href=\"https://svn.torproject.org/svn/website/trunk/torbutton/en/\";>torbutton/en</a>."
+msgstr ""
+"Wir hÃtten gerne Ãbersetzungen fÃr die Dateien die, die Kopfzeile, FuÃzeile, MenÃs und Navigation enthalten. Die .wmi Dateien kÃnnen in den folgenden Ordnern des SVN Repositorys fÃr diese Website abgelegt werden:\n"
+"<a href=\"https://svn.torproject.org/svn/website/trunk/about/en/\";>about/en</a>, <a href=\"https://svn.torproject.org/svn/website/trunk/docs/en/\";>docs/en</a>, <a href=\"https://svn.torproject.org/svn/website/trunk/donate/en/\";>donate/en</a>, <a href=\"https://svn.torproject.org/svn/website/trunk/en/\";>en</a>, <a href=\"https://svn.torproject.org/svn/website/trunk/getinvolved/en/\";>getinvolved/en</a>, <a href=\"https://svn.torproject.org/svn/website/trunk/include/\";>include</a>, <a href=\"https://svn.torproject.org/svn/website/trunk/press/en/\";>press/en</a>, <a href=\"https://svn.torproject.org/svn/website/trunk/projects/en/\";>projects/en</a> and <a href=\"https://svn.torproject.org/svn/website/trunk/torbutton/en/\";>torbutton/en</a>."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/translation.wml:52
+msgid ""
+"We would also like some translations for the diagrams on <a href=\"<page "
+"about/overview>\">the overview page</a>. You can just send us the text that "
+"should go in the diagrams, and we'll take care of making new versions of the"
+" pictures."
+msgstr ""
+"Wir hÃtten auÃerdem gerne ein paar Ãbersetzungen fÃr die Diagramme auf  <a "
+"href=\"<page about/overview>\">der Ãbersichtsseite</a>. Du kannst uns denn "
+"Text senden der in die Diagramme gehÃrt und wir werden uns um neue Versionen"
+" dieser Bilder kÃmmern"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/translation.wml:59
+msgid ""
+"When you have some translations ready, send them to the <tt>tor-"
+"translation</tt> alias on the <a href=\"<page about/contact>\">contact "
+"page</a>.  (If you have changes to existing pages, please use the diff tool "
+"to generate patch files, if possible.)  If you plan to stick around and keep"
+" maintaining them, let us know and we'll be happy to give you an SVN account"
+" to manage them directly."
+msgstr ""
+"Hast eine eine Ãbersetzung fertig, kannst du diese an <tt>tor-"
+"translation</tt> Alias auf der <a href=\"<page "
+"about/contact>\">Kontaktseite</a> senden. Benutze bitte das diff Programm um"
+" Patch-Dateien fÃr Ãnderungen an bereits bestehenden Seiten zu erstellen. "
+"MÃchtest du dabei bleiben und diese erhalten kontaktiere uns Bitte wir wÃren"
+" sehr glÃcklich wenn wir dir einen SVN Account fÃr das Verwalten dieser "
+"Seiten geben kÃnnten."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/translation.wml:67
+msgid ""
+"Other projects related to Tor also need translators. Please see our "
+"translation portal for <a href=\"<page getinvolved/translation-"
+"overview>\">translating other useful and related software</a>."
+msgstr ""
+"Andere Ãhnliche Projekte benÃtigen auch Ãbersetzer. Bitte schaue dir unser "
+"Ãbersetzungsportal an <a href=\"<page getinvolved/translation-overview>\"> "
+"um andere nÃtzliche  Software zu Ãbersetzen. "
+
+

Added: translation/trunk/projects/website/po/de/getinvolved/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/po/de/getinvolved/4-optional.volunteer.po	                        (rev 0)
+++ translation/trunk/projects/website/po/de/getinvolved/4-optional.volunteer.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -0,0 +1,2246 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <benni@xxxxxxxxxxxxxxxx>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-08-30 08:50+0200\n"
+"PO-Revision-Date: 2011-09-22 18:33+0000\n"
+"Last-Translator: cyberfork <benni@xxxxxxxxxxxxxxxx>\n"
+"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:8
+msgid ""
+"<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
+"getinvolved/volunteer>\">Volunteer</a>"
+msgstr ""
+
+#. type: Content of: <div><div><h1>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:13
+msgid "A few things everyone can do now:"
+msgstr "Einige Dinge die jeder sofort tun kann:"
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:15
+msgid ""
+"Please consider <a href=\"<page docs/tor-doc-relay>\">running a relay</a> to"
+" help the Tor network grow."
+msgstr ""
+"Bitte denke darÃber nach ein  <a href=\"<page docs/tor-doc-"
+"relay>\">Relay</a> zu betreiben um dem Tor Netzwerk beim wachsen zu helfen."
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:17
+msgid ""
+"Tell your friends! Get them to run relays. Get them to run hidden services. "
+"Get them to tell their friends."
+msgstr ""
+"ErzÃhl es deinen Freunden! Ãberzeuge sie davon ein Relay zu betreiben. "
+"Ãberzeuge sie davon hidden services anzubieten. Ãberzeuge sie davon ihren "
+"Freunden von Tor zu erzÃhlen."
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:19
+msgid ""
+"If you like Tor's goals, please <a href=\"<page donate/donate>\">take a "
+"moment to donate to support further Tor development</a>. We're also looking "
+"for more sponsors &mdash; if you know any companies, NGOs, agencies, or "
+"other organizations that want anonymity / privacy / communications security,"
+" let them know about us."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:24
+msgid ""
+"We're looking for more <a href=\"<page about/torusers>\">good examples of "
+"Tor users and Tor use cases</a>. If you use Tor for a scenario or purpose "
+"not yet described on that page, and you're comfortable sharing it with us, "
+"we'd love to hear from you."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:30
+msgid "<a id=\"Documentation\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:31
+msgid "<a class=\"anchor\" href=\"#Documentation\">Documentation</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:33
+msgid ""
+"Help translate the web page and documentation into other languages. See the "
+"<a href=\"<page getinvolved/translation>\">translation guidelines</a> if you"
+" want to help out. We especially need Arabic or Farsi translations, for the "
+"many Tor users in censored areas."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:37
+msgid ""
+"Evaluate and document <a href=\"<wiki>doc/TorifyHOWTO\">our list of "
+"programs</a> that can be configured to use Tor."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:40
+msgid ""
+"We have a huge list of <a href=\"<wiki>doc/SupportPrograms\">potentially "
+"useful programs that interface to Tor</a>. Which ones are useful in which "
+"situations? Please help us test them out and document your results."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:46
+msgid "<a id=\"Advocacy\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:47
+msgid "<a class=\"anchor\" href=\"#Advocacy\">Advocacy</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:49
+msgid ""
+"Create a presentation that can be used for various user group meetings "
+"around the world."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:51
+msgid ""
+"Create a video about the positive uses of Tor, what Tor is, or how to use "
+"it.  Some have already started on <a "
+"href=\"https://media.torproject.org/video/\";>Tor's Media server</a>, <a "
+"href=\"http://www.howcast.com/videos/90601-How-To-Circumvent-an-Internet-";
+"Proxy\">Howcast</a>, and <a "
+"href=\"http://www.youtube.com/thetorproject\";>YouTube</a>."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:57
+msgid ""
+"Create a poster, or a set of posters, around a theme, such as \"Tor for "
+"Freedom!\"."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:59
+msgid ""
+"Create a t-shirt design that incorporates \"Congratulations! You are using "
+"Tor!\" in any language."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:63
+msgid "<a id=\"Projects\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:64
+msgid "<a class=\"anchor\" href=\"#Projects\">Projects</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:67
+msgid ""
+"Below are a list of Tor related projects we're developing and/or "
+"maintaining. Most discussions happen on IRC so if you're interested in any "
+"of these (or you have a project idea of your own), then please <a "
+"href=\"<page about/contact>#irc\">join us in #tor-dev</a>. Don't be shy to "
+"ask questions, and don't hesitate to ask even if the main contributors "
+"aren't active at that moment."
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><th>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:77
+msgid "Name"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><th>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:78
+msgid "Category"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><th>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:79
+msgid "Language"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><th>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:80
+msgid "Activity"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><th>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:81
+msgid "Contributors"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:85
+msgid "<a href=\"#project-tor\">Tor</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:86
+#: /tmp/KLdohZNkms.xml:94
+msgid "Core"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:87
+#: /tmp/KLdohZNkms.xml:119
+msgid "C"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:88
+#: /tmp/KLdohZNkms.xml:112 /tmp/KLdohZNkms.xml:144 /tmp/KLdohZNkms.xml:184
+msgid "Heavy"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:89
+msgid "nickm, arma, Sebastian"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:93
+msgid "*<a href=\"#project-jtor\">JTor</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:95
+#: /tmp/KLdohZNkms.xml:151 /tmp/KLdohZNkms.xml:183
+msgid "Java"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:96
+#: /tmp/KLdohZNkms.xml:192 /tmp/KLdohZNkms.xml:216 /tmp/KLdohZNkms.xml:240
+msgid "None"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:101
+msgid "<a href=\"#project-tbb\">TBB</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:102
+#: /tmp/KLdohZNkms.xml:110 /tmp/KLdohZNkms.xml:118 /tmp/KLdohZNkms.xml:126
+msgid "Usability"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:103
+#: /tmp/KLdohZNkms.xml:111 /tmp/KLdohZNkms.xml:127
+msgid "Sys Admin"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:104
+#: /tmp/KLdohZNkms.xml:152 /tmp/KLdohZNkms.xml:160 /tmp/KLdohZNkms.xml:224
+msgid "Moderate"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:105
+msgid "Erinn"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:109
+msgid "<a href=\"#project-tails\">Tails</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:113
+msgid "<a href=\"https://tails.boum.org/chat/\";>#tails</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:117
+msgid "<a href=\"#project-torsocks\">Torsocks</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:120
+#: /tmp/KLdohZNkms.xml:128 /tmp/KLdohZNkms.xml:136 /tmp/KLdohZNkms.xml:168
+#: /tmp/KLdohZNkms.xml:176 /tmp/KLdohZNkms.xml:200 /tmp/KLdohZNkms.xml:208
+#: /tmp/KLdohZNkms.xml:232
+msgid "Light"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:121
+msgid "mwenge"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:125
+msgid "*<a href=\"#project-torouter\">Torouter</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:129
+msgid "ioerror, Runa"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:133
+msgid "<a href=\"#project-vidalia\">Vidalia</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:134
+#: /tmp/KLdohZNkms.xml:142 /tmp/KLdohZNkms.xml:150
+msgid "User Interface"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:135
+msgid "C++, Qt"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:137
+msgid "chiiph"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:141
+msgid "<a href=\"#project-arm\">Arm</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:143
+msgid "Python, Curses"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:145
+msgid "atagar"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:149
+msgid "<a href=\"#project-orbot\">Orbot</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:153
+msgid "n8fr8"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:157
+msgid "<a href=\"#project-torbutton\">Torbutton</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:158
+msgid "Browser Add-on"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:159
+msgid "Javascript"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:161
+#: /tmp/KLdohZNkms.xml:177 /tmp/KLdohZNkms.xml:233
+msgid "mikeperry"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:165
+msgid "*<a href=\"#project-thandy\">Thandy</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:166
+msgid "Updater"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:167
+#: /tmp/KLdohZNkms.xml:175 /tmp/KLdohZNkms.xml:199 /tmp/KLdohZNkms.xml:207
+#: /tmp/KLdohZNkms.xml:223 /tmp/KLdohZNkms.xml:231 /tmp/KLdohZNkms.xml:239
+msgid "Python"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:169
+msgid "chiiph, Erinn, nickm"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:173
+msgid "<a href=\"#project-torctl\">TorCtl</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:174
+msgid "Library"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:181
+msgid "<a href=\"#project-metrics\">Metrics</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:182
+#: /tmp/KLdohZNkms.xml:190 /tmp/KLdohZNkms.xml:198 /tmp/KLdohZNkms.xml:206
+#: /tmp/KLdohZNkms.xml:214
+msgid "Client Service"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:185
+msgid "karsten"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:189
+msgid "<a href=\"#project-torstatus\">TorStatus</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:191
+msgid "PHP"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:197
+msgid "<a href=\"#project-weather\">Weather</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:201
+#: /tmp/KLdohZNkms.xml:209
+msgid "kaner"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:205
+msgid "<a href=\"#project-gettor\">GetTor</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:213
+msgid "<a href=\"#project-torcheck\">TorCheck</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:215
+msgid "Python, Perl"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:221
+msgid "<a href=\"#project-bridgedb\">BridgeDB</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:222
+#: /tmp/KLdohZNkms.xml:230 /tmp/KLdohZNkms.xml:238
+msgid "Backend Service"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:225
+msgid "kaner, nickm"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:229
+msgid "<a href=\"#project-torflow\">TorFlow</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:237
+msgid "*<a href=\"#project-torbel\">TorBEL</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:241
+msgid "Sebastian"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:245
+msgid ""
+"<sub> * Project is still in an alpha state.  </sub> <br /><br /> <a id"
+"=\"project-tor\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:252
+msgid ""
+"Tor (<a href=\"https://gitweb.torproject.org/tor.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Tor+Client&component=Tor+Relay&component=vidalia&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:257
+msgid ""
+"Central project, providing the core software for using and participating in "
+"the Tor network. Numerous people contribute to the project to varying "
+"extents, but the chief architects are Nick Mathewson and Roger Dingledine."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:263
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a href=\"#resistCensorship\">Improving Tor's"
+" ability to resist censorship</a></i><br /> <i><a "
+"href=\"#unitTesting\">Improve our unit testing process</a></i><br /> <i><a "
+"href=\"#simulateSlowConnections\">Simulator for slow Internet "
+"connections</a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:270
+msgid "<a id=\"project-jtor\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:271
+msgid ""
+"<a href=\"https://github.com/brl/JTor/wiki\";>JTor</a> (<a "
+"href=\"https://github.com/brl/JTor\";>code</a>, <a "
+"href=\"https://github.com/brl/JTor/issues\";>bug tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:277
+msgid ""
+"Java implementation of Tor and successor to <a "
+"href=\"http://onioncoffee.sourceforge.net/\";>OnionCoffee</a>. This project "
+"isn't yet complete, and has been inactive since Fall 2010."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:282
+msgid "<a id=\"project-tbb\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:283
+msgid ""
+"<a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a> (<a "
+"href=\"https://gitweb.torproject.org/torbrowser.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Tor+bundles/installation&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:289
+msgid ""
+"The Tor Browser Bundle is an easy-to-use portable package of Tor, Vidalia, "
+"and Firefox preconfigured to work together out of the box. This is actively "
+"being worked on by Erinn Clark."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:295
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a href=\"#auditTBB\">Audit Tor Browser "
+"Bundles for data leaks</a></i><br /> <i><a "
+"href=\"#usabilityTesting\">Usability testing of Tor</a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:300
+msgid "<a id=\"project-tails\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:301
+msgid ""
+"<a href=\"https://tails.boum.org/\";>The Amnesic Incognito Live System</a> "
+"(<a href=\"http://git.immerda.ch/?p=amnesia.git;a=summary\";>code</a>, <a "
+"href=\"https://tails.boum.org/bugs/\";>bug tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:307
+msgid ""
+"The Amnesic Incognito Live System is a live CD/USB distribution "
+"preconfigured so that everything is safely routed through Tor and leaves no "
+"trace on the local system. This is a merger of the Amnesia and <a "
+"href=\"http://www.anonymityanywhere.com/incognito/\";>Incognito</a> projects,"
+" and still under very active development."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:315
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a href=\"#tailsStartMenu\">Custom GDM3 "
+"startup menu, aka.  tails-greeter</a></i><br /> <i><a "
+"href=\"#tailsMetadataAnonymizing\">Meta-data anonymizing toolkit for file "
+"publication</a></i><br /> <i><a href=\"#tailsDebianLive\">Improve Debian "
+"Live support for persistence</a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:324
+msgid "<a id=\"project-torsocks\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:325
+msgid ""
+"<a href=\"http://code.google.com/p/torsocks/\";>Torsocks</a> (<a "
+"href=\"https://gitweb.torproject.org/torsocks.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torify&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:331
+msgid ""
+"Utility for adapting other applications to work with Tor. Development has "
+"slowed and compatibility issues remain with some platforms, but it's "
+"otherwise feature complete."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:337
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a href=\"#torsocksForOSX\">Make "
+"torsocks/dsocks work on OS X</a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:341
+msgid "<a id=\"project-torouter\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:342
+msgid ""
+"<a href=\"<wiki>doc/Torouter\">Torouter</a> (<a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torouter&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:348
+msgid ""
+"Project to provide an easy-to-use, embedded Tor instance for routers. This "
+"had high activity in late 2010, but has since been rather quiet."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:352
+msgid "<a id=\"project-vidalia\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:353
+msgid ""
+"<a href=\"<page projects/vidalia>\">Vidalia</a> (<a "
+"href=\"https://gitweb.torproject.org/vidalia.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Vidalia&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:359
+msgid ""
+"The most commonly used user interface for Tor. Matt Edman started the "
+"project in 2006 and brought it to its current stable state. Development "
+"slowed for several years, though TomÃs Touceda has since taken a lead with "
+"pushing the project forward."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:366
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a href=\"#vidaliaStatusEventInterface\">Tor "
+"Controller Status Event Interface for Vidalia</a></i><br /> <i><a "
+"href=\"#vidaliaNetworkMap\">An Improved and More Usable Network Map in "
+"Vidalia</a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:371
+msgid "<a id=\"project-arm\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:372
+msgid ""
+"<a href=\"http://www.atagar.com/arm/\";>Arm</a> (<a "
+"href=\"https://gitweb.torproject.org/arm.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=arm&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:378
+msgid ""
+"Command-line monitor for Tor. This has been under very active development by"
+" its author, Damian Johnson, since early 2009 to make it a better general-"
+"purpose controller for *nix environments."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:384
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a href=\"#armClientMode\">Client Mode Use "
+"Cases for Arm</a></i><br /> <i><a href=\"#armGui\">GUI for Arm</a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:389
+msgid "<a id=\"project-orbot\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:390
+msgid ""
+"<a href=\"https://guardianproject.info/apps/orbot/\";>Orbot</a> (<a "
+"href=\"https://gitweb.torproject.org/orbot.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Orbot&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:396
+msgid ""
+"Provides Tor on the Android platform. This was under very active development"
+" up through Fall 2010, after which things have been quiet."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:401
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a href=\"#orbot-torbutton\">TorButton for "
+"Mobile Firefox 4 or Custom Browser on Android</a></i><br /> <i><a href"
+"=\"#orbot-userInterface\">Build a better user interface for Orbot</a></i><br"
+" /> <i><a href=\"#orbot-optimisation\">Core Tor mobile "
+"optimisation</a></i><br /> <i><a href=\"#orbot-orlibAndOutreach\">Orbot "
+"integration library and community outreach</a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:408
+msgid "<a id=\"project-torbutton\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:409
+msgid ""
+"<a href=\"<page torbutton/index>\">Torbutton</a> (<a "
+"href=\"https://gitweb.torproject.org/torbutton.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torbutton&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:415
+msgid ""
+"Firefox addon that addresses many of the client-side threats to browsing the"
+" Internet anonymously. Mike has since continued to adapt it to new threats, "
+"updated versions of Firefox, and possibly <a "
+"href=\"https://blog.torproject.org/blog/google-chrome-incognito-mode-tor-";
+"and-fingerprinting\">Chrome as well</a>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:423
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a "
+"href=\"#torbuttonForThunderbird\">Torbutton equivalent for "
+"Thunderbird</a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:427
+msgid "<a id=\"project-thandy\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:428
+msgid "Thandy (<a href=\"https://gitweb.torproject.org/thandy.git\";>code</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:432
+msgid ""
+"Updater for Tor. The project began in the Summer of 2008 but wasn't "
+"completed. Recently interest in it has been rekindled and many aspects of "
+"its design (including the language it'll be in) are currently in flux."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:437
+msgid "<a id=\"project-torctl\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:438
+msgid ""
+"TorCtl (<a href=\"https://gitweb.torproject.org/pytorctl.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torctl&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:444
+msgid ""
+"Python bindings and utilities for using the Tor control port. It has been "
+"stable for several years, with only minor revisions."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:448
+msgid "<a id=\"project-metrics\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:449
+msgid ""
+"<a href=\"https://metrics.torproject.org/\";>Metrics</a> (code: <a "
+"href=\"https://gitweb.torproject.org/metrics-db.git\";>db</a>, <a "
+"href=\"https://gitweb.torproject.org/metrics-utils.git\";>utils</a>, <a "
+"href=\"https://gitweb.torproject.org/metrics-web.git\";>web</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Metrics&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:457
+msgid ""
+"Processing and analytics of consensus data, provided to users via the "
+"metrics portal. This has been under active development for several years by "
+"Karsten Loesing."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:462
+msgid "<a id=\"project-torstatus\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:463
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorStatus\";>TorStatus</a>"
+" (<a href=\"https://svn.torproject.org/svn/torstatus/trunk/\";>code</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:467
+msgid ""
+"Portal providing an overview of the Tor network, and details on any of its "
+"current relays. Though very actively used, this project has been "
+"unmaintained for a long while."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:472
+msgid "<a id=\"project-weather\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:473
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/wiki/projects/Weather\";>Weather</a>"
+" (<a href=\"https://gitweb.torproject.org/weather.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Tor+Weather&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:479
+msgid ""
+"Provides automatic notification to subscribed relay operators when their "
+"relay's unreachable. This underwent a rewrite by the <a "
+"href=\"http://hfoss.wesleyan.edu/\";>Wesleyan HFOSS team</a>, which went live"
+" in early 2011."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:485
+msgid "<a id=\"project-gettor\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:486
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/wiki/projects/EmailAutoResponder\";>GetTor</a>"
+" (<a href=\"https://gitweb.torproject.org/gettor.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=GetTor&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:492
+msgid ""
+"E-mail autoresponder providing Tor's packages over SMTP. This has been "
+"relatively unchanged for quite a while."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:496
+msgid "<a id=\"project-torcheck\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:497
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorCheck\";>TorCheck</a>"
+" (<a href=\"https://svn.torproject.org/svn/check/trunk/\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Tor+Check&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:503
+msgid ""
+"Provides a simple site for determining if the visitor is using Tor or not.  "
+"This has been relatively unchanged for quite a while."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:507
+msgid "<a id=\"project-bridgedb\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:508
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/wiki/projects/BridgeDB\";>BridgeDB</a>"
+" (<a href=\"https://gitweb.torproject.org/bridgedb.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=BridgeDB&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:514
+msgid ""
+"Backend bridge distributor, handling the various pools they're distributed "
+"in. This was actively developed until Fall of 2010."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:518
+msgid "<a id=\"project-torflow\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:519
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorFlow\";>TorFlow</a>"
+" (<a href=\"https://gitweb.torproject.org/torflow.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torflow&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:525
+msgid ""
+"Library and collection of services for actively monitoring the Tor network."
+"  These include the Bandwidth Scanners (measuring throughput of relays) and "
+"SoaT (scans for malicious or misconfigured exit nodes). SoaT was last "
+"actively developed in the Summer of 2010, and the Bandwidth Scanners a few "
+"months later. Both have been under active use since then, but development "
+"has stopped."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:533
+msgid "<a id=\"project-torbel\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:534
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorBulkExitlist\";>TorBEL</a>"
+" (<a href=\"https://gitweb.torproject.org/tordnsel.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=TorDNSEL/TorBEL&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:541
+msgid ""
+"The Tor Bulk Exitlist provides a method of identifying if IPs belong to exit"
+" nodes or not. This is a replacement for TorDNSEL which is a stable (though "
+"unmaintained) Haskell application for this purpose. The initial version of "
+"TorBEL was started in GSOC 2010 but since then the project has been "
+"inactive."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:548
+msgid "<a id=\"Coding\"></a> <a id=\"Summer\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:550
+msgid "<a class=\"anchor\" href=\"#Coding\">Project Ideas</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:553
+msgid ""
+"You may find some of these projects to be good <a href=\"<page "
+"about/gsoc>\">Google Summer of Code 2011</a> ideas. We have labelled each "
+"idea with how useful it would be to the overall Tor project (priority), how "
+"much work we expect it would be (effort level), how much clue you should "
+"start with (skill level), and which of our <a href=\"<page "
+"about/corepeople>\">core developers</a> would be good mentors.  If one or "
+"more of these ideas looks promising to you, please <a href=\"<page "
+"about/contact>\">contact us</a> to discuss your plans rather than sending "
+"blind applications. You may also want to propose your own project idea "
+"&mdash; which often results in the best applications."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:567
+msgid "<a id=\"auditTBB\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:569
+msgid ""
+"<b>Audit Tor Browser Bundles for data leaks</b> <br> Priority: <i>High</i> "
+"<br> Effort Level: <i>High</i> <br> Skill Level: <i>Medium</i> <br> Likely "
+"Mentors: <i>Erinn, Jacob, Andrew</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:578
+msgid ""
+"The Tor Browser Bundle incorporates Tor, Firefox, Polipo, and the Vidalia "
+"user interface (and optionally the <a href=\"http://pidgin.im/\";>Pidgin</a> "
+"Instant Messaging client). Components are pre-configured to operate in a "
+"secure way, and it has very few dependencies on the installed operating "
+"system. It has therefore become one of the most easy to use, and popular, "
+"ways to use Tor on Windows."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:584
+msgid ""
+"This project is to identify all of the traces left behind by using a Tor "
+"Browser Bundle on Windows, Mac OS X, or Linux.  Developing ways to stop, "
+"counter, or remove these traces is a final step."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:587
+msgid ""
+"Students should be familiar with operating system analysis, application "
+"development on one or preferably all of Windows, Linux, and Mac OS X, and be"
+" comfortable with C/C++ and shell scripting."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:590
+msgid ""
+"If you would like to help extend or do security auditing for TBB, please "
+"contact Erinn."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:594
+msgid "<a id=\"firewallProbeTool\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:596
+msgid ""
+"<b>Develop a fully automatic firewall-probing system</b> <br> Priority: "
+"<i>High</i> <br> Effort Level: <i>Medium to High</i> <br> Skill Level: "
+"<i>High</i> <br> Likely Mentors: <i>Robert Ransom, Nick, Jacob</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:605
+msgid ""
+"We would like to have a fully automatic firewall-probing system for blocking"
+" systems with no long-term state (i.e. firewalls that can examine each "
+"connection, but do not change their behaviour for future connections based "
+"on the traffic they have seen)."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:609
+msgid ""
+"Ideally, volunteers would only need to set up one or more test servers, and "
+"run the probe client program on a publicly accessible computer behind the "
+"firewall."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:612
+msgid "The test tool should:"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><ul><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:614
+msgid ""
+"generate packet captures on both ends (and send them out to the extent "
+"possible),"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><ul><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:616
+msgid ""
+"cycle through all the SSL configurations we might want to test through a "
+"censorship device, and"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><ul><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:618
+msgid ""
+"also test some other protocols to see whether they are allowed through the "
+"firewall (IMAP and other mail protocols, BitTorrent, DTLS, etc.)."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:624
+msgid "<a id=\"tailsStartMenu\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:626
+msgid ""
+"<b>Custom GDM3 startup menu, aka. tails-greeter</b> <br> Priority: "
+"<i>High</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium to "
+"High</i> <br> Likely Mentors: <i>intrigeri, anonym</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:635
+msgid ""
+"Several major upcoming Tails features need to gather user input at startup "
+"time: bridges support, persistence, MAC address anonymization, etc."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:638
+msgid ""
+"Existing boot menus lack the graphical widgets and generally user-"
+"friendliness needed. Hence it was decided to implement Tails startup menu in"
+" GDM3: GDM3's default login/password prompt needs to be replaced with a "
+"custom GTK+ application hereby named tails-greeter that allows the user to "
+"provide any input necessary."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:643
+msgid ""
+"Anyone undertaking this project should be familiar with GNU/Linux and "
+"application development; no other skill is required, apart of the ability to"
+" quickly find practical answers in APIs and documentation for many "
+"technologies she knows nothing about: this challenging coding project will "
+"indeed involve getting familiar with some modern GNU/Linux Desktop "
+"technologies such as D-Bus, GNOME and GConf. Python/GTK+ is probably the "
+"best suited language for the task."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:650
+msgid ""
+"For more information see <a "
+"href=\"https://tails.boum.org/todo/boot_menu/\";>https://tails.boum.org/todo/boot_menu/</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:653
+msgid "<a id=\"orbot-torbutton\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:655
+msgid ""
+"<b>TorButton for Mobile Firefox 4 or Custom Browser on Android</b> <br> "
+"Priority: <i>High</i> <br> Effort Level: <i>High</i> <br> Skill Level: "
+"<i>High</i> <br> Likely Mentors: <i>Nathan (n8fr8), Jake, Mike Perry</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:664
+msgid ""
+"Initial work has been done on implementing a proxy-setting add-on for "
+"Firefox on Android (see <a "
+"href=\"https://github.com/guardianproject/ProxyMob\";>ProxyMob</a>), but a "
+"full port of TorButton needs to be done (dependent upon Firefox 4 port of "
+"TorButton). The other approach is to implement a custom &quot;Tor "
+"Browser&quot; based on Firefox or Webkit browser. See <a "
+"href=\"http://code.google.com/p/torora/wiki/Android\";>Torora</a> for "
+"progress on this so far."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:674
+msgid "<a id=\"orbot-userInterface\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:676
+msgid ""
+"<b>Build a better user interface for Orbot</b> <br> Priority: <i>High</i> "
+"<br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium</i> <br> Likely"
+" Mentors: <i>Nathan (n8fr8), Jake</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:685
+msgid ""
+"Improved home screen to show confirmation of connection (via a TorCheck API "
+"call), better statistics about data transferred (up/down), number of "
+"circuits connected, quality of connection and so on. The &quot;Tether "
+"Wifi&quot; Android application is a good model to follow in how it shows a "
+"realtime count of bytes transferred as well as notifications when wifi "
+"clients connect. In addition, better handling of Tor system and error "
+"messages would also be very helpful, include use of standard Android "
+"operating systems notifications. The addition of a wizard or tutorial "
+"walkthrough for novice users to explain to them exactly what is and what is "
+"not anonymized or protected would greatly improve the likelihood they will "
+"use Orbot correctly. All of this should work on the range of screens and "
+"device types now offered for Android, from 2&quot; phone to 10&quot; Tablet."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:700
+msgid "<a id=\"resistCensorship\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:702
+msgid ""
+"<b>Improving Tor's ability to resist censorship</b> <br> Priority: <i>Medium"
+" to High</i> <br> Effort Level: <i>Medium to High</i> <br> Skill Level: "
+"<i>High</i> <br> Likely Mentors: <i>Roger, Nick, Jake, Thomas</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:711
+msgid ""
+"The Tor 0.2.1.x series makes <a href=\"<svnprojects>design-"
+"paper/blocking.html\">significant improvements</a> in resisting national and"
+" organizational censorship.  But Tor still needs better mechanisms for some "
+"parts of its anti-censorship design."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:716
+msgid ""
+"One huge category of work is adding features to our <a "
+"href=\"https://gitweb.torproject.org/bridgedb.git?a=tree\";>BridgeDB</a> "
+"service (Python). Tor aims to give out <a href=\"<page "
+"docs/bridges>\">bridge relay addresses</a> to users that can't reach the Tor"
+" network directly, but there's an arms race between algorithms for "
+"distributing addresses and algorithms for gathering and blocking them. See "
+"<a href=\"<blog>bridge-distribution-strategies\">our blog post on the "
+"topic</a> as an overview, and then look at <a "
+"href=\"https://lists.torproject.org/pipermail/tor-";
+"dev/2009-December/000666.html\">Roger's or-dev post</a> from December 2009 "
+"for more recent thoughts &mdash; lots of design work remains."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:727
+msgid ""
+"If you want to get more into the guts of Tor itself (C), a more minor "
+"problem we should address is that current Tors can only listen on a single "
+"address/port combination at a time. There's <a "
+"href=\"<specblob>proposals/118-multiple-orports.txt\">a proposal to address "
+"this limitation</a> and allow clients to connect to any given Tor on "
+"multiple addresses and ports, but it needs more work."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:734
+msgid ""
+"This project could involve a lot of research and design. One of the big "
+"challenges will be identifying and crafting approaches that can still resist"
+" an adversary even after the adversary knows the design, and then trading "
+"off censorship resistance with usability and robustness."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:741
+msgid "<a id=\"geoIPUpgrade\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:743
+msgid ""
+"<b>Improve our GeoIP file format</b> <br> Priority: <i>Medium</i> <br> "
+"Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium to High</i> <br> "
+"Likely Mentors: <i>Robert Ransom</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:752
+msgid ""
+"Currently, Tor bridges and relays read an entire IP->country database into "
+"memory from a text file during startup.  We would like to distribute this "
+"database and store it on disk in a much more compact form, and perform "
+"IP->country lookups on it in its on-disk format if possible."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:757
+msgid ""
+"We have <a href='https://trac.torproject.org/projects/tor/ticket/2506'>a "
+"sketch of a design</a> for a moderately optimized format for IPv4 GeoIP "
+"data; this project will involve both implementing the IPv4 format and "
+"designing and implementing a format for IPv6 GeoIP data."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:766
+msgid "<a id=\"armClientMode\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:768
+msgid ""
+"<b>Client Mode Use Cases for Arm</b> <br> Priority: <i>Medium</i> <br> "
+"Effort Level: <i>High</i> <br> Skill Level: <i>Medium</i> <br> Likely "
+"Mentors: <i>Damian (atagar)</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:777
+msgid ""
+"<a href=\"<page projects/arm>\">Arm</a> is a Tor command line status monitor"
+" on *nix environments (Linux, Mac, and BSD). It functions much like top "
+"does, giving a CLI overlay of Tor's bandwidth usage, connections, "
+"configuration, log, etc. Thus far its design has been geared for Tor relay "
+"operators. However, this doesn't need to be the case. This project would be "
+"to expand and simplify arm to make it useful for Tor's client users too."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:785
+msgid ""
+"This would include UI design, experimenting, and a lot of python hacking. "
+"Here's some ideas for client functionality arm could provide:"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><ul><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:789
+msgid ""
+"A panel for client connections, showing each hop of the user's circuits with"
+" the ISP, country, and jurisdiction where those relays reside. Other "
+"interesting information would be the circuit's latency, how long its been "
+"around, and its possible exit ports. Some of this will be pretty tricky and "
+"require some experimentation to figure out what information can be fetched "
+"safely (for instance, scraping rdns and whois lookups could give hints about"
+" a relay's ISP, but we'd need to do it on all Tor relays to avoid leaking "
+"our connections to the resolver)."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><ul><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:798
+msgid ""
+"Options to let the user request new circuits (the &quot;New Identity&quot; "
+"feature in Vidalia), select the exit country, etc."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><ul><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:801
+msgid ""
+"A panel showing Internet application and if their connections are being "
+"routed through Tor or not (giving a warning if there's leaks)."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><ul><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:804
+msgid ""
+"The status of the bridges we're configured to use (ie, are they up?).  This "
+"would include adding control port functionality to Tor for <a "
+"href=\"https://trac.torproject.org/projects/tor/ticket/2068\";>ticket "
+"2068</a>."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><ul><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:809
+msgid ""
+"A one click option to set Tor to be a client, relay, or bridge. The goal "
+"would be to make it trivial for users to voluntarily contribute to the Tor "
+"network."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><ul><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:813
+msgid ""
+"Menus as an alternative to hotkeys to make the interface more intuitive and "
+"usable for beginners (<a "
+"href=\"http://gnosis.cx/publish/programming/charming_python_6.html\";>example</a>)."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><ul><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:817
+msgid ""
+"Look at Vidalia and TorK for ideas and solicit input from the Tor community."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:821
+msgid ""
+"More information is available in the following sections of arm's dev notes: "
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/wiki/projects/arm#ConnectionListingExpansion\";>Connection"
+" Listing Expansion</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/wiki/projects/arm#CircuitDetails\";>Circuit"
+" Details</a>, and <a "
+"href=\"https://trac.torproject.org/projects/tor/wiki/projects/arm#ClientModeUseCases\";>Client"
+" Mode Use Cases</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:825
+msgid "<a id=\"unitTesting\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:827
+msgid ""
+"<b>Improve our unit testing process</b> <br> Priority: <i>Medium</i> <br> "
+"Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium</i> <br> Likely "
+"Mentors: <i>Nick, Erinn</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:836
+msgid ""
+"Tor needs to be tested far more thoroughly. This is a multi-part effort. To "
+"start with, our unit test coverage should rise substantially, especially in "
+"the areas outside the utility functions. This will require significant "
+"refactoring of some parts of Tor, in order to dissociate as much logic as "
+"possible from globals."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:842
+msgid ""
+"Additionally, we need to automate our performance testing. We've got "
+"buildbot to automate our regular integration and compile testing already "
+"(though we need somebody to set it up on Windows), but we need to get our "
+"network simulation tests (as built in <a "
+"href=\"https://svn.torproject.org/svn/torflow/trunk/README\";>TorFlow</a>)  "
+"updated for more recent versions of Tor, and designed to launch a test "
+"network either on a single machine, or across several, so we can test "
+"changes in performance on machines in different roles automatically."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:852
+msgid "<a id=\"simulateSlowConnections\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:854
+msgid ""
+"<b>Simulator for slow Internet connections</b> <br> Priority: <i>Medium</i> "
+"<br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium</i> <br> Likely"
+" Mentors: <i>Nick</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:864
+msgid ""
+"Many users of Tor have poor-quality Internet connections, giving low "
+"bandwidth, high latency, and high packet loss/re-ordering. User experience "
+"is that Tor reacts badly to these conditions, but it is difficult to improve"
+" the situation without being able to repeat the problems in the lab."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:872
+msgid ""
+"This project would be to build a simulation environment which replicates the"
+" poor connectivity so that the effect on Tor performance can be measured. "
+"Other components would be a testing utility to establish what are the "
+"properties of connections available, and to measure the effect of "
+"performance-improving modifications to Tor."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:880
+msgid ""
+"The tools used would be up to the student, but dummynet (for FreeBSD)  and "
+"nistnet (for Linux) are two potential components on which this project could"
+" be built. Students should be experienced with network programming/debugging"
+" and TCP/IP, and preferably familiar with C and a scripting language."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:888
+msgid "<a id=\"torbuttonForThunderbird\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:890
+msgid ""
+"<b>Torbutton equivalent for Thunderbird</b> <br> Priority: <i>Medium</i> "
+"<br> Effort Level: <i>High</i> <br> Skill Level: <i>High</i> <br> Likely "
+"Mentors: <i>Mike</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:900
+msgid ""
+"We're hearing from an increasing number of users that they want to use "
+"Thunderbird with Tor. However, there are plenty of application-level "
+"concerns, for example, by default Thunderbird will put your hostname in the "
+"outgoing mail that it sends. At some point we should start a new push to "
+"build a Thunderbird extension similar to Torbutton."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:908
+msgid "<a id=\"usabilityTesting\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:910
+msgid ""
+"<b>Usability testing of Tor</b> <br> Priority: <i>Medium</i> <br> Effort "
+"Level: <i>Medium</i> <br> Skill Level: <i>Low to Medium</i> <br> Likely "
+"Mentors: <i>Andrew</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:920
+msgid ""
+"Especially the browser bundle, ideally amongst our target demographic.  That"
+" would help a lot in knowing what needs to be done in terms of bug fixes or "
+"new features. We get this informally at the moment, but a more structured "
+"process would be better."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:927
+msgid ""
+"Please note that since this isn't a coding project, it isn't suitable for "
+"Google Summer of Code."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:932
+msgid "<a id=\"tailsMetadataAnonymizing\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:934
+msgid ""
+"<b>Meta-data anonymizing toolkit for file publication</b> <br> Priority: "
+"<i>Medium</i> <br> Effort Level: <i>Low to Medium</i> <br> Skill Level: "
+"<i>Low to Medium</i> <br> Likely Mentors: <i>intrigeri, anonym</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:943
+msgid ""
+"Tor helps greatly in publishing files anonymously. However, much personal "
+"information can be enclosed *inside* such published files' meta-data: GPS "
+"coordinates, author's name and so on. Anyone who wants to anonymously "
+"publish a file can thus far too easily de-anonymize herself."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:947
+msgid ""
+"A set of tools allowing users to easily inspect and clean up meta-data in "
+"files would benefit Tor users, and would e.g. be shipped in Tails."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:949
+msgid ""
+"A graphical user interface is a must, but library and command-line "
+"interfaces are most welcome so that future work can add support for cleaning"
+" published files to various publishing tools, such as desktop social "
+"networking clients and Web content management systems."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:953
+msgid ""
+"This project mostly consists of writing glue between the many existing tools"
+" and libraries that provide read/write access to files' meta-data. An "
+"extensible program design would probably be the best bet, so that support "
+"for other kinds of files can easily be added later."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:957
+msgid ""
+"The meta-data cleaning toolkit would run at least on GNU/Linux; additional "
+"Windows and/or Mac OS X support would be welcome. The tools used would be up"
+" to the students. The detailed specification is ready and will be published "
+"soon."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:963
+msgid "<a id=\"tailsDebianLive\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:965
+msgid ""
+"<b>Improve Debian Live support for persistence</b> <br> Priority: "
+"<i>Medium</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Low to "
+"Medium</i> <br> Likely Mentors: <i>intrigeri, anonym</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:974
+msgid ""
+"Data persistence is a somewhat tricky topic in a Live system context, "
+"especially one such as Tails, which is explicitly designed to avoid leaving "
+"any trace of its use."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:977
+msgid ""
+"Some real-life use cases, however, require some kind of data persistence. To"
+" start with, Tails should (carefully) support persistence of application-"
+"specific configurations (e.g. GnuPG keyring) and of a user arbitrary data "
+"store. Note that persistence in Tails will always be opt-in and require "
+"encrypted storage."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:982
+msgid ""
+"The backend work consists of improving Debian Live's existing persistence "
+"features to make them suit the specific context of Tails. A trust "
+"relationship is already established with upstream who is happy to merge our "
+"changes. The codebase is not that small and much refactoring is needed, so "
+"this really is a programming project rather than a fire'n'forget shell "
+"script hack contest."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:988
+msgid ""
+"Anyone undertaking this project must be familiar with GNU/Linux, and "
+"preferably with Debian. Being able to (quickly learn to) write clean and "
+"safe programs in shell is also needed."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:991
+msgid ""
+"For more information, see <a "
+"href=\"https://tails.boum.org/todo/persistence/\";>https://tails.boum.org/todo/persistence/</a>."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:994
+msgid "<a id=\"torsocksForOSX\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:996
+msgid ""
+"<b>Make torsocks/dsocks work on OS X</b> <br> Priority: <i>Medium</i> <br> "
+"Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium</i> <br> Likely "
+"Mentors: <i>Robert Hogan</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1006
+msgid ""
+"<a href=\"https://code.google.com/p/torsocks/\";>Torsocks</a> and <a "
+"href=\"https://code.google.com/p/dsocks/\";>dsocks</a> are wrappers that will"
+" run applications, intercept their outgoing network connections, and push "
+"those connections through Tor. The goal is to handle applications that don't"
+" support proxies (or don't supporting them well). To get it right, they need"
+" to intercept many system calls. The syscalls you need to intercept on Linux"
+" differ dramatically from those on BSD. So Torsocks works fine on Linux, "
+"dsocks works ok on BSD (though it may be less maintained and thus might miss"
+" more syscalls), and nothing works well on both. First, we should patch "
+"dsocks to use Tor's <i>mapaddress</i> commands from the controller "
+"interface, so we don't waste a whole round-trip inside Tor doing the resolve"
+" before connecting. Second, we should make our <i>torify</i> script detect "
+"which of torsocks or dsocks is installed, and call them appropriately. This "
+"probably means unifying their interfaces, and might involve sharing code "
+"between them or discarding one entirely."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1025
+msgid "<a id=\"vidaliaStatusEventInterface\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1027
+msgid ""
+"<b>Tor Controller Status Event Interface for Vidalia</b> <br> Priority: "
+"<i>Medium</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Low to "
+"Medium</i> <br> Likely Mentors: <i>TomÃs</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1036
+msgid ""
+"There are a number of status changes inside Tor of which the user may need "
+"to be informed. For example, if the user is trying to set up his Tor as a "
+"relay and Tor decides that its ports are not reachable from outside the "
+"user's network, we should alert the user. Currently, all the user gets is a "
+"couple of log messages in Vidalia's 'message log' window, which they likely "
+"never see since they don't receive a notification that something has gone "
+"wrong. Even if the user does actually look at the message log, most of the "
+"messages make little sense to the novice user."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1044
+msgid ""
+"Tor has the ability to inform Vidalia of many such status changes, and we "
+"recently implemented support for a couple of these events. Still, there are "
+"many more status events which the user should be informed of, and we need a "
+"better UI for actually displaying them to the user."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1049
+msgid ""
+"The goal of this project then is to design and implement a UI for displaying"
+" Tor status events to the user. For example, we might put a little badge on "
+"Vidalia's tray icon that alerts the user to new status events they should "
+"look at. Double-clicking the icon could bring up a dialog that summarizes "
+"recent status events in simple terms and maybe suggests a remedy for any "
+"negative events if they can be corrected by the user. Of course, this is "
+"just an example and one is free to suggest another approach."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1057
+msgid ""
+"A person undertaking this project should have good UI design and layout "
+"skills and some C++ development experience. Previous experience with Qt and "
+"Qt's Designer will be very helpful, but are not required. Some English "
+"writing ability will also be useful, since this project will likely involve "
+"writing small amounts of help documentation that should be understandable by"
+" non-technical users. Bonus points for some graphic design/Photoshop fu, "
+"since we might want/need some shiny new icons too."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1066
+msgid "<a id=\"orbot-optimisation\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1068
+msgid ""
+"<b>Core Tor mobile optimisation</b> <br> Priority: <i>Medium</i> <br> Effort"
+" Level: <i>Medium</i> <br> Skill Level: <i>High</i> <br> Likely Mentors: "
+"<i>Nathan (n8fr8), Jake</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1078
+msgid ""
+"The existing port of Tor to Android is basically a straight cross-compile to"
+" Linux ARM. There has been no work done in looking at possible optimizations"
+" of Tor within a mobile hardware environment or on mobile networks. In "
+"addition, a number of additional Android OS APIs are available (such as "
+"wireless network status) that could be taken advantage of."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1087
+msgid ""
+"It should be noted, that even without optimisation, Tor is handling the "
+"mobile network environment very well, automatically detecting change in IP "
+"addresses, opening circuits, etc, as the device switches from no coverage to"
+" 2G, 3G or Wifi constantly as it changes position. However, this observation"
+" of &quot;very well&quot;, is just based on user experience, and not any "
+"detailed study of what exactly is happening, and what threats might exist "
+"because of this constantly changing network state."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1097
+msgid ""
+"Finally, the build process needs to be moved to the Android NDK from the "
+"custom GCC toolchain we are now using, and compatibility with Android 2.3 "
+"and 3.x Honeycomb OS need to be verified."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1103
+msgid ""
+"For more information see the <a "
+"href=\"https://svn.torproject.org/svn/projects/android/trunk/Orbot/BUILD\";>Orbot"
+" build documentation</a>."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1109
+msgid "<a id=\"orbot-orlibAndOutreach\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1111
+msgid ""
+"<b>Orbot integration library and community outreach</b> <br> Priority: "
+"<i>Medium</i> <br> Effort Level: <i>Low</i> <br> Skill Level: <i>Medium</i> "
+"<br> Likely Mentors: <i>Nathan (n8fr8)</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1121
+msgid ""
+"We need additional work on <a "
+"href=\"https://github.com/guardianproject/orlib\";>ORLib</a>, our library for"
+" use with third-party application to easily enable them to support "
+"&quot;Torification&quot; on non-rooted devices (i.e. w/o transparent "
+"proxying). This library includes a SOCKS client, a wrapper for the Apache "
+"HTTPClient library, a utility class for detecting the state of Orbot "
+"connectivity, and other relevant/useful things an Android app might need to "
+"anonymize itself. This work would includes direct development of the "
+"library, documentation, and sample code. Outreach or effort to implement the"
+" library within other open-source apps is also needed."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1134
+msgid "<a id=\"vidaliaNetworkMap\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1136
+msgid ""
+"<b>An Improved and More Usable Network Map in Vidalia</b> <br> Priority: "
+"<i>Low to Medium</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: "
+"<i>Medium</i> <br> Likely Mentors: <i>TomÃs</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1146
+msgid ""
+"One of Vidalia's existing features is a network map that shows the user the "
+"approximate geographic location of relays in the Tor network and plots the "
+"paths the user's traffic takes as it is tunneled through the Tor network. "
+"The map is currently not very interactive and has rather poor graphics. "
+"Instead, we implemented KDE's Marble widget such that it gives us a better "
+"quality map and enables improved interactivity, such as allowing the user to"
+" click on individual relays or circuits to display additional information. "
+"We want to add the ability for users to click on a particular relay or a "
+"country containing one or more Tor exit relays and say, \"I want my "
+"connections to exit from here.\""
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1160
+msgid ""
+"This project will first involve getting familiar with Vidalia and the Marble"
+" widget's API. One will then integrate the widget into Vidalia and customize"
+" Marble to be better suited for our application, such as making circuits "
+"clickable, storing cached map data in Vidalia's own data directory, and "
+"customizing some of the widget's dialogs."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1168
+msgid ""
+"A person undertaking this project should have good C++ development "
+"experience. Previous experience with Qt and CMake is helpful, but not "
+"required."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1174
+msgid "<a id=\"armGui\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1176
+msgid ""
+"<b>GUI for Arm</b> <br> Priority: <i>Low</i> <br> Effort Level: <i>High</i> "
+"<br> Skill Level: <i>Medium</i> <br> Likely Mentors: <i>Damian (atagar)</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1186
+msgid ""
+"Arm has several unique features, some of the most interesting being its "
+"connection listing (correlating netstat results against the Tor consensus)  "
+"and configuration editor (a quick method for editing Tor's config, with "
+"information pulled from the control port and man page). However, since arm "
+"is a command line controller it's of limited appeal to certain sets of "
+"users. This project would be to build a GTK or Qt frontend for the "
+"controller, providing similar features set but with a windowed interface."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1196
+msgid ""
+"The vast majority of arm's more interesting functionality lies in its "
+"backend <a "
+"href=\"https://gitweb.torproject.org/arm.git/tree/HEAD:/src/util\";>utilities</a>,"
+" so there should be little to no work decoupling the CLI from its backend.  "
+"Instead, this project would mostly be UI hacking and experimentation, trying"
+" different interfaces to find something that's elegant and simple, but "
+"matches the information found in the current terminal application."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1206
+msgid ""
+"<b>Bring up new ideas!</b> <br> Don't like any of these? Look at the <a "
+"href=\"/press/presskit/2008-12-19-roadmap-full.pdf\">Tor development "
+"roadmap</a> for more ideas, or just try out Tor, Vidalia, and Torbutton, and"
+" find out what you think needs fixing.  Some of the <a "
+"href=\"<spectree>proposals\">current proposals</a> might also be short on "
+"developers."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1218
+msgid "<a id=\"OtherCoding\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1219
+msgid ""
+"<a class=\"anchor\" href=\"#OtherCoding\">Other Coding and Design related "
+"ideas</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1221
+msgid ""
+"Tor relays don't work well on Windows XP. On Windows, Tor uses the standard "
+"<tt>select()</tt> system call, which uses space in the non-page pool. This "
+"means that a medium sized Tor relay will empty the non-page pool, <a "
+"href=\"<wiki>doc/WindowsBufferProblems\">causing havoc and system "
+"crashes</a>. We should probably be using overlapped IO instead. One solution"
+" would be to teach <a "
+"href=\"http://www.monkey.org/~provos/libevent/\";>libevent</a> how to use "
+"overlapped IO rather than select() on Windows, and then adapt Tor to the new"
+" libevent interface. Christian King made a <a "
+"href=\"https://svn.torproject.org/svn/libevent-urz/trunk/\";>good start</a> "
+"on this in the summer of 2007."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1234
+msgid ""
+"We need to actually start building our <a href=\"<page "
+"docs/documentation>#DesignDoc\">blocking-resistance design</a>. This "
+"involves fleshing out the design, modifying many different pieces of Tor, "
+"adapting <a href=\"<page projects/vidalia>\">Vidalia</a> so it supports the "
+"new features, and planning for deployment."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1240
+msgid ""
+"We need a flexible simulator framework for studying end-to-end traffic "
+"confirmation attacks. Many researchers have whipped up ad hoc simulators to "
+"support their intuition either that the attacks work really well or that "
+"some defense works great. Can we build a simulator that's clearly documented"
+" and open enough that everybody knows it's giving a reasonable answer? This "
+"will spur a lot of new research.  See the entry <a "
+"href=\"#Research\">below</a> on confirmation attacks for details on the "
+"research side of this task &mdash; who knows, when it's done maybe you can "
+"help write a paper or three also."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1250
+msgid ""
+"Tor 0.1.1.x and later include support for hardware crypto accelerators via "
+"OpenSSL. It has been lightly tested and is possibly very buggy.  We're "
+"looking for more rigorous testing, performance analysis, and optimally, code"
+" fixes to OpenSSL and Tor if needed."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1256
+msgid ""
+"Perform a security analysis of Tor with <a "
+"href=\"https://secure.wikimedia.org/wikipedia/en/wiki/Fuzz_testing\";>\"fuzz\"</a>."
+" Determine if there are good fuzzing libraries out there for what we want. "
+"Win fame by getting credit when we put out a new release because of you!"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1261
+msgid ""
+"Tor uses TCP for transport and TLS for link encryption. This is nice and "
+"simple, but it means all cells on a link are delayed when a single packet "
+"gets dropped, and it means we can only reasonably support TCP streams. We "
+"have a <a href=\"<page docs/faq>#TransportIPnotTCP\">list of reasons why we "
+"haven't shifted to UDP transport</a>, but it would be great to see that list"
+" get shorter. We also have a proposed <a href=\"<specblob>proposals/100-tor-"
+"spec-udp.txt\">specification for Tor and UDP</a> &mdash; please let us know "
+"what's wrong with it."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1272
+msgid ""
+"We're not that far from having IPv6 support for destination addresses (at "
+"exit nodes). If you care strongly about IPv6, that's probably the first "
+"place to start."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1276
+msgid ""
+"We need a way to generate the website diagrams (for example, the \"How Tor "
+"Works\" pictures on the <a href=\"<page about/overview>\">overview page</a> "
+"from source, so we can translate them as UTF-8 text rather than edit them by"
+" hand with Gimp. We might want to integrate this as an wml file so "
+"translations are easy and images are generated in multiple languages "
+"whenever we build the website."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1283
+msgid ""
+"How can we make the various LiveCD/USB systems easier to maintain, improve, "
+"and document? One example is <a href=\"https://tails.boum.org/\";>The Amnesic"
+" Incognito Live System</a>."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1290
+msgid ""
+"Another anti-censorship project is to try to make Tor more scanning-"
+"resistant.  Right now, an adversary can identify <a "
+"href=\"<specblob>proposals/125-bridges.txt\">Tor bridges</a> just by trying "
+"to connect to them, following the Tor protocol, and seeing if they respond."
+"  To solve this, bridges could <a href=\"<svnprojects>design-"
+"paper/blocking.html#tth_sEc9.3\">act like webservers</a> (HTTP or HTTPS) "
+"when contacted by port-scanning tools, and not act like bridges until the "
+"user provides a bridge-specific key.  To start, check out Shane Pope's <a "
+"href=\"http://dl.dropbox.com/u/37735/index.html\";>thesis and prototype</a>."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1304
+msgid "<a id=\"Research\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1305
+msgid "<a class=\"anchor\" href=\"#Research\">Research</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1307
+msgid ""
+"The \"end-to-end traffic confirmation attack\": by watching traffic at Alice"
+" and at Bob, we can <a "
+"href=\"http://freehaven.net/anonbib/#danezis:pet2004\";>compare traffic "
+"signatures and become convinced that we're watching the same stream</a>. So "
+"far Tor accepts this as a fact of life and assumes this attack is trivial in"
+" all cases. First of all, is that actually true? How much traffic of what "
+"sort of distribution is needed before the adversary is confident he has won?"
+" Are there scenarios (e.g. not transmitting much)  that slow down the "
+"attack? Do some traffic padding or traffic shaping schemes work better than "
+"others?"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1317
+msgid ""
+"A related question is: Does running a relay/bridge provide additional "
+"protection against these timing attacks? Can an external adversary that "
+"can't see inside TLS links still recognize individual streams reliably? Does"
+" the amount of traffic carried degrade this ability any? What if the client-"
+"relay deliberately delayed upstream relayed traffic to create a queue that "
+"could be used to mimic timings of client downstream traffic to make it look "
+"like it was also relayed? This same queue could also be used for masking "
+"timings in client upstream traffic with the techniques from <a "
+"href=\"http://www.freehaven.net/anonbib/#ShWa-Timing06\";>adaptive "
+"padding</a>, but without the need for additional traffic. Would such an "
+"interleaving of client upstream traffic obscure timings for external "
+"adversaries? Would the strategies need to be adjusted for asymmetric links? "
+"For example, on asymmetric links, is it actually possible to differentiate "
+"client traffic from natural bursts due to their asymmetric capacity? Or is "
+"it easier than symmetric links for some other reason?"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1332
+msgid ""
+"Repeat Murdoch and Danezis's <a "
+"href=\"http://www.cl.cam.ac.uk/~sjm217/projects/anon/#torta\";>attack from "
+"Oakland 05</a> on the current Tor network. See if you can learn why it works"
+" well on some nodes and not well on others. (My theory is that the fast "
+"nodes with spare capacity resist the attack better.) If that's true, then "
+"experiment with the RelayBandwidthRate and RelayBandwidthBurst options to "
+"run a relay that is used as a client while relaying the attacker's traffic: "
+"as we crank down the RelayBandwidthRate, does the attack get harder? What's "
+"the right ratio of RelayBandwidthRate to actually capacity? Or is it a ratio"
+" at all? While we're at it, does a much larger set of candidate relays "
+"increase the false positive rate or other complexity for the attack? (The "
+"Tor network is now almost two orders of magnitude larger than it was when "
+"they wrote their paper.) Be sure to read <a "
+"href=\"http://freehaven.net/anonbib/#clog-the-queue\";>Don't Clog the "
+"Queue</a> too."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1347
+msgid ""
+"The \"routing zones attack\": most of the literature thinks of the network "
+"path between Alice and her entry node (and between the exit node and Bob) as"
+" a single link on some graph. In practice, though, the path traverses many "
+"autonomous systems (ASes), and <a "
+"href=\"http://freehaven.net/anonbib/#feamster:wpes2004\";>it's not uncommon "
+"that the same AS appears on both the entry path and the exit path</a>.  "
+"Unfortunately, to accurately predict whether a given Alice, entry, exit, Bob"
+" quad will be dangerous, we need to download an entire Internet routing zone"
+" and perform expensive operations on it. Are there practical approximations,"
+" such as avoiding IP addresses in the same /8 network?"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1357
+msgid ""
+"Other research questions regarding geographic diversity consider the "
+"tradeoff between choosing an efficient circuit and choosing a random "
+"circuit. Look at Stephen Rollyson's <a "
+"href=\"http://swiki.cc.gatech.edu:8080/ugResearch/uploads/7/ImprovingTor.pdf\";>position"
+" paper</a> on how to discard particularly slow choices without hurting "
+"anonymity \"too much\". This line of reasoning needs more work and more "
+"thinking, but it looks very promising."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1364
+msgid ""
+"Tor doesn't work very well when relays have asymmetric bandwidth (e.g. cable"
+" or DSL). Because Tor has separate TCP connections between each hop, if the "
+"incoming bytes are arriving just fine and the outgoing bytes are all getting"
+" dropped on the floor, the TCP push-back mechanisms don't really transmit "
+"this information back to the incoming streams.  Perhaps Tor should detect "
+"when it's dropping a lot of outgoing packets, and rate-limit incoming "
+"streams to regulate this itself? I can imagine a build-up and drop-off "
+"scheme where we pick a conservative rate-limit, slowly increase it until we "
+"get lost packets, back off, repeat. We need somebody who's good with "
+"networks to simulate this and help design solutions; and/or we need to "
+"understand the extent of the performance degradation, and use this as "
+"motivation to reconsider UDP transport."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1376
+msgid ""
+"A related topic is congestion control. Is our current design sufficient once"
+" we have heavy use? Maybe we should experiment with variable-sized windows "
+"rather than fixed-size windows? That seemed to go well in an <a "
+"href=\"http://www.psc.edu/networking/projects/hpn-ssh/theory.php\";>ssh "
+"throughput experiment</a>. We'll need to measure and tweak, and maybe "
+"overhaul if the results are good."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1383
+msgid ""
+"Our censorship-resistance goals include preventing an attacker who's looking"
+" at Tor traffic on the wire from <a href=\"<svnprojects>design-"
+"paper/blocking.html#sec:network-fingerprint\">distinguishing it from normal "
+"SSL traffic</a>. Obviously we can't achieve perfect steganography and still "
+"remain usable, but for a first step we'd like to block any attacks that can "
+"win by observing only a few packets. One of the remaining attacks we haven't"
+" examined much is that Tor cells are 512 bytes, so the traffic on the wire "
+"may well be a multiple of 512 bytes.  How much does the batching and "
+"overhead in TLS records blur this on the wire? Do different buffer flushing "
+"strategies in Tor affect this? Could a bit of padding help a lot, or is this"
+" an attack we must accept?"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1394
+msgid ""
+"Tor circuits are built one hop at a time, so in theory we have the ability "
+"to make some streams exit from the second hop, some from the third, and so "
+"on. This seems nice because it breaks up the set of exiting streams that a "
+"given relay can see. But if we want each stream to be safe, the \"shortest\""
+" path should be at least 3 hops long by our current logic, so the rest will "
+"be even longer. We need to examine this performance / security tradeoff."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1401
+msgid ""
+"It's not that hard to DoS Tor relays or directory authorities. Are client "
+"puzzles the right answer? What other practical approaches are there? Bonus "
+"if they're backward-compatible with the current Tor protocol."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1404
+msgid ""
+"Programs like <a href=\"<page torbutton/index>\">Torbutton</a> aim to hide "
+"your browser's UserAgent string by replacing it with a uniform answer for "
+"every Tor user. That way the attacker can't splinter Tor's anonymity set by "
+"looking at that header. It tries to pick a string that is commonly used by "
+"non-Tor users too, so it doesn't stand out. Question one: how badly do we "
+"hurt ourselves by periodically updating the version of Firefox that "
+"Torbutton claims to be? If we update it too often, we splinter the anonymity"
+" sets ourselves. If we don't update it often enough, then all the Tor users "
+"stand out because they claim to be running a quite old version of Firefox. "
+"The answer here probably depends on the Firefox versions seen in the wild. "
+"Question two: periodically people ask us to cycle through N UserAgent "
+"strings rather than stick with one. Does this approach help, hurt, or not "
+"matter? Consider: cookies and recognizing Torbutton users by their rotating "
+"UserAgents; malicious websites who only attack certain browsers; and whether"
+" the answers to question one impact this answer."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1421
+msgid ""
+"How many bridge relays do you need to know to maintain reachability? We "
+"should measure the churn in our bridges. If there is lots of churn, are "
+"there ways to keep bridge users more likely to stay connected?"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1429
+msgid ""
+"<a href=\"<page about/contact>\">Let us know</a> if you've made progress on "
+"any of these!"
+msgstr ""
+
+

Modified: translation/trunk/projects/website/po/el/about/3-low.translators.po
===================================================================
--- translation/trunk/projects/website/po/el/about/3-low.translators.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/el/about/3-low.translators.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-09-21 19:54+0000\n"
+"PO-Revision-Date: 2011-09-28 09:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/es/about/3-low.contact.po
===================================================================
--- translation/trunk/projects/website/po/es/about/3-low.contact.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/es/about/3-low.contact.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-07-08 08:44+0200\n"
-"PO-Revision-Date: 2011-07-09 01:09+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 00:57+0000\n"
 "Last-Translator: NinjaTuna <nort0ngh0st@xxxxxxxxxxx>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
 "MIME-Version: 1.0\n"
@@ -47,20 +47,27 @@
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/about/en/contact.wml:24
 msgid ""
+"<i>community-support at lists.torproject.org</i> is for volunteers helping "
+"people with questions about using or configuring Tor."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/contact.wml:27
+msgid ""
 "<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page "
 "getinvolved/translation>\">website translations</a> into place, and help "
 "answer questions about existing and new translations."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:27
+#: /home/runa/tor/website/about/en/contact.wml:30
 msgid ""
 "<i>tordnsel at torproject.org</i> is the alias for the people responsible "
 "for the tordns exitlist."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:29
+#: /home/runa/tor/website/about/en/contact.wml:32
 msgid ""
 "<i>donations at torproject.org</i> is for questions and comments about <a "
 "href=\"<page donate/donate>\">getting money to the developers</a>. More "
@@ -69,7 +76,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:34
+#: /home/runa/tor/website/about/en/contact.wml:37
 msgid ""
 "<i>execdir at torproject.org</i> is for press/media, questions and comments "
 "about Tor the non-profit corporation: trademark questions, affiliation and "
@@ -78,43 +85,43 @@
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:40
+#: /home/runa/tor/website/about/en/contact.wml:43
 msgid "Identi.ca"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:41
+#: /home/runa/tor/website/about/en/contact.wml:44
 msgid ""
 "<a id=\"identica\"></a> Contact us via our microblogging Identi.ca account "
 "at <a href=\"https://identi.ca/torproject\";>torproject</a>."
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:45
+#: /home/runa/tor/website/about/en/contact.wml:48
 msgid "IRC"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:46
+#: /home/runa/tor/website/about/en/contact.wml:49
 msgid "<a id=\"irc\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:47
+#: /home/runa/tor/website/about/en/contact.wml:50
 msgid ""
 "Tor users and developers can also be found in the following channels on <a "
 "href=\"http://www.oftc.net/oftc/\";>OFTC</a>:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:51
+#: /home/runa/tor/website/about/en/contact.wml:54
 msgid ""
 "<i>#tor</i> - User and relay operation discussions. Having trouble running "
 "Tor or a question for other Tor users? Then this is the spot for you."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:54
+#: /home/runa/tor/website/about/en/contact.wml:57
 msgid ""
 "<i>#tor-dev</i> - Channel for people who want to do development.  "
 "Discussions about Tor-related coding, protocols, and <a href=\"<page "
@@ -122,27 +129,28 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:57
+#: /home/runa/tor/website/about/en/contact.wml:60
 msgid ""
 "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that "
 "is not related to Tor."
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:61
+#: /home/runa/tor/website/about/en/contact.wml:64
 msgid "Telephone"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:62
+#: /home/runa/tor/website/about/en/contact.wml:65
 msgid "<a id=\"phone\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:63
+#: /home/runa/tor/website/about/en/contact.wml:66
 msgid ""
 "If none of the above appeal to you, calling +1-781-352-0568 will reach the "
-"Tor office.  Should there be no answer, please leave a message."
+"Tor office.  Should there be no answer, please leave a message with a way to"
+" reach you."
 msgstr ""
 
 

Modified: translation/trunk/projects/website/po/es/about/3-low.financials.po
===================================================================
--- translation/trunk/projects/website/po/es/about/3-low.financials.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/es/about/3-low.financials.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-22 16:20+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 00:58+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/about/en/financials.wml:9
+#: /home/runa/tor/website/about/en/financials.wml:9
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "about/overview>\">About &raquo; </a> <a href=\"<page "
@@ -26,66 +26,79 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/transifex/website/about/en/financials.wml:14
+#: /home/runa/tor/website/about/en/financials.wml:14
 msgid "Tor: Financial Reports"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/financials.wml:16
+#: /home/runa/tor/website/about/en/financials.wml:16
+msgid "Fiscal Year 2010"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/financials.wml:17
+msgid ""
+"<a href=\"findoc/2010-TorProject-combined-"
+"Form990_PC_Audit_Results.pdf\">2010 IRS Form 990, State of MA Form PC, and "
+"Independent Audit Results</a>"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/financials.wml:18
 msgid "Fiscal Year 2009"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:17
+#: /home/runa/tor/website/about/en/financials.wml:19
 msgid ""
 "<a href=\"findoc/2009-TorProject-Annual-Report.pdf\">2009 Annual Report</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:18
+#: /home/runa/tor/website/about/en/financials.wml:20
 msgid ""
 "<a href=\"findoc/2009-TorProject-Form990andPC.pdf\">2009 IRS Form 990 and "
 "State of MA Form PC</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:19
+#: /home/runa/tor/website/about/en/financials.wml:21
 msgid ""
 "<a href=\"findoc/2009-TorProject-FinancialStatements.pdf\">2009 Financial "
 "Statements and Audit results</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:20
+#: /home/runa/tor/website/about/en/financials.wml:22
 msgid ""
 "<a href=\"findoc/2009-TorProject-DCF.pdf\">2009 Dept of Commerce Data "
 "Collection Form</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/financials.wml:21
+#: /home/runa/tor/website/about/en/financials.wml:23
 msgid "Fiscal Year 2008"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:22
+#: /home/runa/tor/website/about/en/financials.wml:24
 msgid "<a href=\"findoc/2008-TorProject-Form990.pdf\">2008 IRS Form 990</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:23
+#: /home/runa/tor/website/about/en/financials.wml:25
 msgid ""
 "<a href=\"findoc/2008-TorProject-FinancialStatements.pdf\">2008 Financial "
 "Statements and Audit Results</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/financials.wml:24
+#: /home/runa/tor/website/about/en/financials.wml:26
 msgid "Fiscal Year 2007"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:25
+#: /home/runa/tor/website/about/en/financials.wml:27
 msgid "<a href=\"findoc/2007-TorProject-Form990.pdf\">2007 IRS Form 990</a>"
 msgstr ""
 

Modified: translation/trunk/projects/website/po/es/docs/2-medium.faq.po
===================================================================
--- translation/trunk/projects/website/po/es/docs/2-medium.faq.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/es/docs/2-medium.faq.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Genaro DÃaz <genarodiazchourio@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-08-30 08:50+0200\n"
-"PO-Revision-Date: 2011-08-31 01:41+0000\n"
-"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 17:58+0000\n"
+"Last-Translator: Genaro <genarodiazchourio@xxxxxxxxx>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,58 +29,64 @@
 #. type: Content of: <div><div><h1>
 #: /home/runa/tor/website/docs/en/faq.wml:14
 msgid "Tor FAQ"
-msgstr ""
+msgstr "Preguntas frecuentes de Tor"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/NhlG8k8BI3.xml:1669
+#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/mo95NMnX36.xml:1670
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/faq.wml:17
 msgid "General questions:"
-msgstr ""
+msgstr "Preguntas generales:"
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/docs/en/faq.wml:19
 msgid "<a href=\"#WhatIsTor\">What is Tor?</a>"
-msgstr ""
+msgstr "<a href=\"#WhatIsTor\">ÂQuÃ es Tor?</a>"
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/docs/en/faq.wml:20
 msgid "<a href=\"#Torisdifferent\">How is Tor different from other proxies?</a>"
-msgstr ""
+msgstr "<a href=\"#Torisdifferent\">ÂQuÃ diferencia a Tor de otros proxys?</a>"
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/docs/en/faq.wml:21
 msgid "<a href=\"#CompatibleApplications\">What programs can I use with Tor?</a>"
 msgstr ""
+"<a href=\"#CompatibleApplications\">ÂPuedo utilizar Tor con quÃ "
+"programas?</a>"
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/docs/en/faq.wml:23
 msgid "<a href=\"#WhyCalledTor\">Why is it called Tor?</a>"
-msgstr ""
+msgstr "<a href=\"#WhyCalledTor\">ÂPor quÃ se llama Tor?</a>"
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/docs/en/faq.wml:24
 msgid "<a href=\"#Backdoor\">Is there a backdoor in Tor?</a>"
-msgstr ""
+msgstr "<a href=\"#Backdoor\">ÂHay una puerta trasera en Tor?</a>"
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/docs/en/faq.wml:25
 msgid "<a href=\"#DistributingTor\">Can I distribute Tor on my magazine's CD?</a>"
 msgstr ""
+"<a href=\"#DistributingTor\">ÂPuedo distribuir Tor en los CDs de mi "
+"revista?</a>"
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/docs/en/faq.wml:27
 msgid ""
 "<a href=\"#SupportMail\">How can I get an answer to my Tor support mail?</a>"
 msgstr ""
+"<a href=\"#DistributingTor\">ÂCÃmo logro que alguien responda mi correo "
+"electrÃnico de soporte?</a>"
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/docs/en/faq.wml:29
 msgid "<a href=\"#WhySlow\">Why is Tor so slow?</a>"
-msgstr ""
+msgstr "<a href=\"#DistributingTor\">ÂPor quÃ Tor es tan lento?</a>"
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/docs/en/faq.wml:30
@@ -1088,17 +1095,19 @@
 "Some government or corporate firewalls censor connections to Tor's website. "
 "In those cases, you have three options. First, get it from a friend &mdash; "
 "the <a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a> fits "
-"nicely on a USB key. Second, find the google cache for the <a href=\"<page "
-"getinvolved/mirrors>\">Tor mirrors</a> page and see if any of those copies "
-"of our website work for you. Third, you can download Tor via email: log in "
-"to your Gmail account and mail '<tt>gettor AT torproject.org</tt>'. If you "
-"include the word 'help' in the body of the email, it will reply with "
-"instructions. Note that only a few webmail providers are supported, since "
-"they need to be able to receive very large attachments."
+"nicely on a USB key. Second, find the <a "
+"href=\"https://encrypted.google.com/search?q=tor+mirrors\";>google cache</a> "
+"for the <a href=\"<page getinvolved/mirrors>\">Tor mirrors</a> page and see "
+"if any of those copies of our website work for you. Third, you can download "
+"Tor via email: log in to your Gmail account and mail '<tt>gettor AT "
+"torproject.org</tt>'. If you include the word 'help' in the body of the "
+"email, it will reply with instructions. Note that only a few webmail "
+"providers are supported, since they need to be able to receive very large "
+"attachments."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:669
+#: /home/runa/tor/website/docs/en/faq.wml:670
 msgid ""
 "Be sure to <a href=\"<page docs/verifying-signatures>\">verify the "
 "signature</a> of any package you download, especially when you get it from "
@@ -1106,26 +1115,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:674
+#: /home/runa/tor/website/docs/en/faq.wml:675
 msgid "<hr> <a id=\"CompileTorWindows\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:677
+#: /home/runa/tor/website/docs/en/faq.wml:678
 msgid ""
 "<a class=\"anchor\" href=\"#CompileTorWindows\">How do I compile Tor under "
 "Windows?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:680
+#: /home/runa/tor/website/docs/en/faq.wml:681
 msgid ""
 "Try following the steps at <a href=\"<gitblob>doc/tor-win32-mingw-"
 "creation.txt\"> tor-win32-mingw-creation.txt</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:685
+#: /home/runa/tor/website/docs/en/faq.wml:686
 msgid ""
 "(Note that you don't need to compile Tor yourself in order to use it. Most "
 "people just use the packages available on the <a href=\"<page "
@@ -1133,19 +1142,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:690
+#: /home/runa/tor/website/docs/en/faq.wml:691
 msgid "<hr> <a id=\"VirusFalsePositives\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:693
+#: /home/runa/tor/website/docs/en/faq.wml:694
 msgid ""
 "<a class=\"anchor\" href=\"#VirusFalsePositives\">Why does my Tor executable"
 " appear to have a virus or spyware?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:696
+#: /home/runa/tor/website/docs/en/faq.wml:697
 msgid ""
 "Sometimes, overzealous Windows virus and spyware detectors trigger on some "
 "parts of the Tor Windows binary. Our best guess is that these are false "
@@ -1156,7 +1165,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:704
+#: /home/runa/tor/website/docs/en/faq.wml:705
 msgid ""
 "In the meantime, we encourage you to not just take our word for it. Our job "
 "is to provide the source; if you're concerned, please do <a "
@@ -1164,19 +1173,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:709
+#: /home/runa/tor/website/docs/en/faq.wml:710
 msgid "<hr> <a id=\"LiveCD\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:712
+#: /home/runa/tor/website/docs/en/faq.wml:713
 msgid ""
 "<a class=\"anchor\" href=\"#LiveCD\">Is there a LiveCD or other bundle that "
 "includes Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:715
+#: /home/runa/tor/website/docs/en/faq.wml:716
 msgid ""
 "Yes.  Use <a href=\"https://tails.boum.org/\";>The Amnesic Incognito Live "
 "System</a> or <a href=\"<page projects/torbrowser>\">the Tor Browser "
@@ -1184,19 +1193,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:720
+#: /home/runa/tor/website/docs/en/faq.wml:721
 msgid "<hr> <a id=\"torrc\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:723
+#: /home/runa/tor/website/docs/en/faq.wml:724
 msgid ""
 "<a class=\"anchor\" href=\"#torrc\">I'm supposed to \"edit my torrc\". What "
 "does that mean?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:726
+#: /home/runa/tor/website/docs/en/faq.wml:727
 msgid ""
 "Tor installs a text file called torrc that contains configuration "
 "instructions for how your Tor program should behave. The default "
@@ -1206,12 +1215,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:734
+#: /home/runa/tor/website/docs/en/faq.wml:735
 msgid "The location of your torrc file depends on the way you installed Tor:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:738
+#: /home/runa/tor/website/docs/en/faq.wml:739
 msgid ""
 "On Windows, if you installed a Tor bundle with Vidalia, you can find your "
 "torrc file in the Start menu under Programs -&gt; Vidalia Bundle -&gt; Tor, "
@@ -1224,14 +1233,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:747
+#: /home/runa/tor/website/docs/en/faq.wml:748
 msgid ""
 "On OS X, if you use Vidalia, edit <code>~/.vidalia/torrc</code>. Otherwise, "
 "open your favorite text editor and load <code>/Library/Tor/torrc</code>."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:751
+#: /home/runa/tor/website/docs/en/faq.wml:752
 msgid ""
 "On Unix, if you installed a pre-built package, look for "
 "<code>/etc/tor/torrc</code> or <code>/etc/torrc</code> or consult your "
@@ -1239,7 +1248,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:755
+#: /home/runa/tor/website/docs/en/faq.wml:756
 msgid ""
 "Finally, if you installed from source, you may not have a torrc installed "
 "yet: look in <code>/usr/local/etc/</code> and note that you may need to "
@@ -1247,14 +1256,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:762
+#: /home/runa/tor/website/docs/en/faq.wml:763
 msgid ""
 "If you use Vidalia, be sure to exit both Tor and Vidalia before you edit "
 "your torrc file. Otherwise Vidalia might overwrite your changes."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:767
+#: /home/runa/tor/website/docs/en/faq.wml:768
 msgid ""
 "Once you've changed your torrc, you will need to restart Tor for the changes"
 " to take effect. (For advanced users on OS X and Unix, note that you "
@@ -1262,7 +1271,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:773
+#: /home/runa/tor/website/docs/en/faq.wml:774
 msgid ""
 "For other configuration options you can use, look at the <a href=\"<page "
 "docs/tor-manual>\">Tor manual page</a>. Remember, all lines beginning with #"
@@ -1270,19 +1279,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:779
+#: /home/runa/tor/website/docs/en/faq.wml:780
 msgid "<hr> <a id=\"Logs\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:782
+#: /home/runa/tor/website/docs/en/faq.wml:783
 msgid ""
 "<a class=\"anchor\" href=\"#Logs\">How do I set up logging, or see Tor's "
 "logs?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:785
+#: /home/runa/tor/website/docs/en/faq.wml:786
 msgid ""
 "If you installed a Tor bundle that includes Vidalia, then Vidalia has a "
 "window called \"Message Log\" that will show you Tor's log messages. You can"
@@ -1291,19 +1300,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:792
+#: /home/runa/tor/website/docs/en/faq.wml:793
 msgid ""
 "If you're not using Vidalia, you'll have to go find the log files by hand. "
 "Here are some likely places for your logs to be:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:797
+#: /home/runa/tor/website/docs/en/faq.wml:798
 msgid "On OS X, Debian, Red Hat, etc, the logs are in /var/log/tor/"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:799
+#: /home/runa/tor/website/docs/en/faq.wml:800
 msgid ""
 "On Windows, there are no default log files currently. If you enable logs in "
 "your torrc file, they default to <code>\\username\\Application "
@@ -1311,7 +1320,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:803
+#: /home/runa/tor/website/docs/en/faq.wml:804
 msgid ""
 "If you compiled Tor from source, by default your Tor logs to <a "
 "href=\"http://en.wikipedia.org/wiki/Standard_streams\";>\"stdout\"</a> at "
@@ -1320,7 +1329,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:811
+#: /home/runa/tor/website/docs/en/faq.wml:812
 msgid ""
 "To change your logging setup by hand, <a href=\"#torrc\">edit your torrc</a>"
 " and find the section (near the top of the file) which contains the "
@@ -1328,7 +1337,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:817
+#: /home/runa/tor/website/docs/en/faq.wml:818
 #, no-wrap
 msgid ""
 "\\## Logs go to stdout at level \"notice\" unless redirected by something\n"
@@ -1336,7 +1345,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:822
+#: /home/runa/tor/website/docs/en/faq.wml:823
 msgid ""
 "For example, if you want Tor to send complete debug, info, notice, warn, and"
 " err level messages to a file, append the following line to the end of the "
@@ -1344,32 +1353,32 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:828
+#: /home/runa/tor/website/docs/en/faq.wml:829
 #, no-wrap
 msgid "Log debug file c:/program files/tor/debug.log\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:832
+#: /home/runa/tor/website/docs/en/faq.wml:833
 msgid ""
 "Replace <code>c:/program files/tor/debug.log</code> with a directory and "
 "filename for your Tor log."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:836
+#: /home/runa/tor/website/docs/en/faq.wml:837
 msgid "<hr> <a id=\"DoesntWork\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:839
+#: /home/runa/tor/website/docs/en/faq.wml:840
 msgid ""
 "<a class=\"anchor\" href=\"#DoesntWork\">I installed Tor and Polipo but it's"
 " not working.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:842
+#: /home/runa/tor/website/docs/en/faq.wml:843
 msgid ""
 "Once you've installed the Tor bundle, there are two questions to ask: first,"
 " is your Tor able to establish a circuit? Second, is your Firefox correctly "
@@ -1377,7 +1386,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:847
+#: /home/runa/tor/website/docs/en/faq.wml:848
 msgid ""
 "If Tor can establish a circuit, the onion icon in Vidalia will turn green. "
 "You can also check in the Vidalia Control Panel to make sure it says "
@@ -1387,19 +1396,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:857
+#: /home/runa/tor/website/docs/en/faq.wml:858
 msgid "If Tor can't establish a circuit, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:861
+#: /home/runa/tor/website/docs/en/faq.wml:862
 msgid ""
 "Are you sure Tor is running? If you're using Vidalia, you may have to click "
 "on the onion and select \"Start\" to launch Tor."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:863
+#: /home/runa/tor/website/docs/en/faq.wml:864
 msgid ""
 "Check your system clock. If it's more than a few hours off, Tor will refuse "
 "to build circuits. For XP users, synchronize your clock under the clock "
@@ -1408,7 +1417,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:867
+#: /home/runa/tor/website/docs/en/faq.wml:868
 msgid ""
 "Is your Internet connection <a href=\"#FirewallPorts\">firewalled by "
 "port</a>, or do you normally need to use a <a "
@@ -1416,7 +1425,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:872
+#: /home/runa/tor/website/docs/en/faq.wml:873
 msgid ""
 "Are you running programs like Norton Internet Security or SELinux that block"
 " certain connections, even though you don't realize they do? They could be "
@@ -1424,7 +1433,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:875
+#: /home/runa/tor/website/docs/en/faq.wml:876
 msgid ""
 "Are you in China, or behind a restrictive corporate network firewall that "
 "blocks the public Tor relays? If so, you should learn about <a href=\"<page "
@@ -1432,14 +1441,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:878
+#: /home/runa/tor/website/docs/en/faq.wml:879
 msgid ""
 "Check your <a href=\"#Logs\">Tor logs</a>. Do they give you any hints about "
 "what's going wrong?"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:883
+#: /home/runa/tor/website/docs/en/faq.wml:884
 msgid ""
 "Step two is to confirm that Firefox is correctly configured to send its "
 "traffic through Tor. Try the <a href=\"https://check.torproject.org/\";>Tor "
@@ -1449,12 +1458,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:891
+#: /home/runa/tor/website/docs/en/faq.wml:892
 msgid "If it thinks you're not using Tor, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:895
+#: /home/runa/tor/website/docs/en/faq.wml:896
 msgid ""
 "Did you install the Torbutton extension for Firefox? The installation "
 "bundles include it, but sometimes people forget to install it. Make sure it "
@@ -1463,7 +1472,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:900
+#: /home/runa/tor/website/docs/en/faq.wml:901
 msgid ""
 "Do you have incompatible Firefox extensions like FoxyProxy installed? If so,"
 " uninstall them. (Note that using FoxyProxy is NOT a sufficient substitute "
@@ -1475,7 +1484,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:907
+#: /home/runa/tor/website/docs/en/faq.wml:908
 msgid ""
 "If your browser says \"The proxy server is refusing connections.\", check "
 "that Polipo (the http proxy that passes traffic between Firefox and Tor) is "
@@ -1485,7 +1494,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:912
+#: /home/runa/tor/website/docs/en/faq.wml:913
 msgid ""
 "If you're upgrading from OS X, some of the earlier OS X installers were "
 "broken in really unfortunate ways. You may find that <a href=\"<page docs"
@@ -1495,14 +1504,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:917
+#: /home/runa/tor/website/docs/en/faq.wml:918
 msgid ""
 "If you're on Linux, make sure Privoxy isn't running, since it will conflict "
 "with the port that our Polipo configuration file picks."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:919
+#: /home/runa/tor/website/docs/en/faq.wml:920
 msgid ""
 "If you installed Polipo yourself (not from a bundle), did you edit the "
 "config file as described? Did you restart Polipo after this change? Are you "
@@ -1510,7 +1519,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:922
+#: /home/runa/tor/website/docs/en/faq.wml:923
 msgid ""
 "For Red Hat Linux and related systems, do you have SELinux enabled? If so, "
 "it might be preventing Polipo from talking to Tor. We also run across BSD "
@@ -1519,19 +1528,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:928
+#: /home/runa/tor/website/docs/en/faq.wml:929
 msgid "<hr /> <a id=\"VidaliaPassword\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:931
+#: /home/runa/tor/website/docs/en/faq.wml:932
 msgid ""
 "<a class=\"anchor\" href=\"#VidaliaPassword\">Tor/Vidalia prompts for a "
 "password at start.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:934
+#: /home/runa/tor/website/docs/en/faq.wml:935
 msgid ""
 "Vidalia interacts with the Tor software via Tor's \"control port\". The "
 "control port lets Vidalia receive status updates from Tor, request a new "
@@ -1542,7 +1551,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:943
+#: /home/runa/tor/website/docs/en/faq.wml:944
 msgid ""
 "Usually this process of generating and setting a random control password "
 "happens in the background. There are three common situations, though, where "
@@ -1550,7 +1559,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:949
+#: /home/runa/tor/website/docs/en/faq.wml:950
 msgid ""
 "You're already running Vidalia and Tor. For example, this situation can "
 "happen if you installed the Vidalia bundle and now you're trying to run the "
@@ -1559,7 +1568,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:954
+#: /home/runa/tor/website/docs/en/faq.wml:955
 msgid ""
 "Vidalia crashed, but left Tor running with the last known random password. "
 "After you restart Vidalia, it generates a new random password, but Vidalia "
@@ -1573,7 +1582,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:967
+#: /home/runa/tor/website/docs/en/faq.wml:968
 msgid ""
 "You had previously set Tor to run as a Windows NT service. When Tor is set "
 "to run as a service, it starts up when the system boots. If you configured "
@@ -1588,19 +1597,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:982
+#: /home/runa/tor/website/docs/en/faq.wml:983
 msgid "<hr> <a id=\"ChooseEntryExit\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:985
+#: /home/runa/tor/website/docs/en/faq.wml:986
 msgid ""
 "<a class=\"anchor\" href=\"#ChooseEntryExit\">Can I control which nodes (or "
 "country) are used for entry/exit?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:988
+#: /home/runa/tor/website/docs/en/faq.wml:989
 msgid ""
 "Yes. You can set preferred entry and exit nodes as well as inform Tor which "
 "nodes you do not want to use.  The following options can be added to your "
@@ -1609,53 +1618,53 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:994
+#: /home/runa/tor/website/docs/en/faq.wml:995
 msgid "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:995
+#: /home/runa/tor/website/docs/en/faq.wml:996
 msgid ""
 "A list of preferred nodes to use for the first hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:997
+#: /home/runa/tor/website/docs/en/faq.wml:998
 msgid "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:998
+#: /home/runa/tor/website/docs/en/faq.wml:999
 msgid ""
 "A list of preferred nodes to use for the last hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:1000
+#: /home/runa/tor/website/docs/en/faq.wml:1001
 msgid "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:1001
+#: /home/runa/tor/website/docs/en/faq.wml:1002
 msgid "A list of nodes to never use when building a circuit."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:1003
+#: /home/runa/tor/website/docs/en/faq.wml:1004
 msgid "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:1004
+#: /home/runa/tor/website/docs/en/faq.wml:1005
 msgid ""
 "A list of nodes to never use when picking an exit.  Nodes listed in "
 "<tt>ExcludeNodes</tt> are automatically in this list."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1009
+#: /home/runa/tor/website/docs/en/faq.wml:1010
 msgid ""
 "<em>We recommend you do not use these</em> &mdash; they are intended for "
 "testing and may disappear in future versions.  You get the best security "
@@ -1665,7 +1674,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1016
+#: /home/runa/tor/website/docs/en/faq.wml:1017
 msgid ""
 "The <tt>EntryNodes</tt> and <tt>ExitNodes</tt> config options are treated as"
 " a request, meaning if the nodes are down or seem slow, Tor will still avoid"
@@ -1677,7 +1686,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1026
+#: /home/runa/tor/website/docs/en/faq.wml:1027
 msgid ""
 "Instead of <tt>$fingerprint</tt> you can also specify a 2 letter ISO3166 "
 "country code in curly braces (for example {de}), or an ip address pattern "
@@ -1686,7 +1695,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1032
+#: /home/runa/tor/website/docs/en/faq.wml:1033
 msgid ""
 "If you want to access a service directly through Tor's SOCKS interface (eg. "
 "using ssh via connect.c), another option is to set up an internal mapping in"
@@ -1695,26 +1704,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1038
+#: /home/runa/tor/website/docs/en/faq.wml:1039
 msgid "<hr> <a id=\"GoogleCaptcha\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1041
+#: /home/runa/tor/website/docs/en/faq.wml:1042
 msgid ""
 "<a class=\"anchor\" href=\"#GoogleCaptcha\">Google makes me solve a Captcha "
 "or tells me I have spyware installed.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1044
+#: /home/runa/tor/website/docs/en/faq.wml:1045
 msgid ""
 "This is a known and intermittent problem; it does not mean that Google "
 "considers Tor to be spyware."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1049
+#: /home/runa/tor/website/docs/en/faq.wml:1050
 msgid ""
 "When you use Tor, you are sending queries through exit relays that are also "
 "shared by thousands of other users. Tor users typically see this message "
@@ -1725,7 +1734,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1057
+#: /home/runa/tor/website/docs/en/faq.wml:1058
 msgid ""
 "An alternate explanation is that Google tries to detect certain kinds of "
 "spyware or viruses that send distinctive queries to Google Search. It notes "
@@ -1735,7 +1744,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1066
+#: /home/runa/tor/website/docs/en/faq.wml:1067
 msgid ""
 "To our knowledge, Google is not doing anything intentionally specifically to"
 " deter or block Tor use. The error message about an infected machine should "
@@ -1743,7 +1752,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1072
+#: /home/runa/tor/website/docs/en/faq.wml:1073
 msgid ""
 "Torbutton 1.2.5 (released in mid 2010) detects Google captchas and can "
 "automatically redirect you to a more Tor-friendly search engine such as "
@@ -1751,19 +1760,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1077
+#: /home/runa/tor/website/docs/en/faq.wml:1078
 msgid "<hr /> <a id=\"GmailWarning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1080
+#: /home/runa/tor/website/docs/en/faq.wml:1081
 msgid ""
 "<a class=\"anchor\" href=\"#GmailWarning\">Gmail warns me that my account "
 "may have been compromised.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1083
+#: /home/runa/tor/website/docs/en/faq.wml:1084
 msgid ""
 "Sometimes, after you've used Gmail over Tor, Google presents a pop-up "
 "notification that your account may have been compromised.  The notification "
@@ -1772,7 +1781,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1090
+#: /home/runa/tor/website/docs/en/faq.wml:1091
 msgid ""
 "In general this is a false alarm: Google saw a bunch of logins from "
 "different places, as a result of running the service via Tor, and decided it"
@@ -1781,7 +1790,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1097
+#: /home/runa/tor/website/docs/en/faq.wml:1098
 msgid ""
 "Even though this may be a biproduct of using the service via tor, that "
 "doesn't mean you can entirely ignore the warning. It is <i>probably</i> a "
@@ -1790,7 +1799,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1104
+#: /home/runa/tor/website/docs/en/faq.wml:1105
 msgid ""
 "Cookie hijacking is possible by either physical access to your computer or "
 "by watching your network traffic.  In theory only physical access should "
@@ -1801,7 +1810,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1113
+#: /home/runa/tor/website/docs/en/faq.wml:1114
 msgid ""
 "And if somebody <i>did</i> steal your google cookie, they might end up "
 "logging in from unusual places (though of course they also might not). So "
@@ -1813,19 +1822,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1122
+#: /home/runa/tor/website/docs/en/faq.wml:1123
 msgid "<hr> <a id=\"FirewallPorts\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1125
+#: /home/runa/tor/website/docs/en/faq.wml:1126
 msgid ""
 "<a class=\"anchor\" href=\"#FirewallPorts\">My firewall only allows a few "
 "outgoing ports.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1128
+#: /home/runa/tor/website/docs/en/faq.wml:1129
 msgid ""
 "If your firewall works by blocking ports, then you can tell Tor to only use "
 "the ports that your firewall permits by adding \"FascistFirewall 1\" to your"
@@ -1835,7 +1844,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1136
+#: /home/runa/tor/website/docs/en/faq.wml:1137
 msgid ""
 "By default, when you set this Tor assumes that your firewall allows only "
 "port 80 and port 443 (HTTP and HTTPS respectively). You can select a "
@@ -1843,14 +1852,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1142
+#: /home/runa/tor/website/docs/en/faq.wml:1143
 msgid ""
 "If you want to be more fine-grained with your controls, you can also use the"
 " ReachableAddresses config options, e.g.:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1147
+#: /home/runa/tor/website/docs/en/faq.wml:1148
 #, no-wrap
 msgid ""
 "  ReachableDirAddresses *:80\n"
@@ -1858,24 +1867,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1151
+#: /home/runa/tor/website/docs/en/faq.wml:1152
 msgid "<hr> <a id=\"RelayFlexible\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1154
+#: /home/runa/tor/website/docs/en/faq.wml:1155
 msgid ""
 "<a class=\"anchor\" href=\"#RelayFlexible\">How stable does my relay need to"
 " be?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1157
+#: /home/runa/tor/website/docs/en/faq.wml:1158
 msgid "We aim to make setting up a Tor relay easy and convenient:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1161
+#: /home/runa/tor/website/docs/en/faq.wml:1162
 msgid ""
 "Tor has built-in support for <a "
 "href=\"<wikifaq>#WhatbandwidthshapingoptionsareavailabletoTorrelays\"> rate "
@@ -1886,7 +1895,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1169
+#: /home/runa/tor/website/docs/en/faq.wml:1170
 msgid ""
 "Each Tor relay has an <a href=\"#ExitPolicies\">exit policy</a> that "
 "specifies what sort of outbound connections are allowed or refused from that"
@@ -1895,7 +1904,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1174
+#: /home/runa/tor/website/docs/en/faq.wml:1175
 msgid ""
 "It's fine if the relay goes offline sometimes. The directories notice this "
 "quickly and stop advertising the relay. Just try to make sure it's not too "
@@ -1903,14 +1912,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1179
+#: /home/runa/tor/website/docs/en/faq.wml:1180
 msgid ""
 "We can handle relays with dynamic IPs just fine &mdash; simply leave the "
 "Address config option blank, and Tor will try to guess."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1182
+#: /home/runa/tor/website/docs/en/faq.wml:1183
 msgid ""
 "If your relay is behind a NAT and it doesn't know its public IP (e.g. it has"
 " an IP of 192.168.x.y), you'll need to set up port forwarding. Forwarding "
@@ -1920,7 +1929,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1188
+#: /home/runa/tor/website/docs/en/faq.wml:1189
 msgid ""
 "Your relay will passively estimate and advertise its recent bandwidth "
 "capacity, so high-bandwidth relays will attract more users than low-"
@@ -1928,24 +1937,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1194
+#: /home/runa/tor/website/docs/en/faq.wml:1195
 msgid "<hr> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1198
+#: /home/runa/tor/website/docs/en/faq.wml:1199
 msgid ""
 "<a class=\"anchor\" href=\"#ExitPolicies\">I'd run a relay, but I don't want"
 " to deal with abuse issues.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1201
+#: /home/runa/tor/website/docs/en/faq.wml:1202
 msgid "Great. That's exactly why we implemented exit policies."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1205
+#: /home/runa/tor/website/docs/en/faq.wml:1206
 msgid ""
 "Each Tor relay has an exit policy that specifies what sort of outbound "
 "connections are allowed or refused from that relay. The exit policies are "
@@ -1961,7 +1970,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1219
+#: /home/runa/tor/website/docs/en/faq.wml:1220
 msgid ""
 "The default exit policy allows access to many popular services (e.g. web "
 "browsing), but <a "
@@ -1977,7 +1986,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1233
+#: /home/runa/tor/website/docs/en/faq.wml:1234
 msgid ""
 "If you do allow any exit connections, make sure name resolution works (that "
 "is, your computer can resolve Internet addresses correctly).  If there are "
@@ -1987,19 +1996,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1241
+#: /home/runa/tor/website/docs/en/faq.wml:1242
 msgid "<hr> <a id=\"RelayOrBridge\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1244
+#: /home/runa/tor/website/docs/en/faq.wml:1245
 msgid ""
 "<a class=\"anchor\" href=\"#RelayOrBridge\">Should I be a normal relay or "
 "bridge relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1246
+#: /home/runa/tor/website/docs/en/faq.wml:1247
 msgid ""
 "<a href=\"<page docs/bridges>\">Bridge relays</a> (or \"bridges\" for short)"
 "  are <a href=\"<page docs/tor-doc-relay>\">Tor relays</a> that aren't "
@@ -2009,7 +2018,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1253
+#: /home/runa/tor/website/docs/en/faq.wml:1254
 msgid ""
 "Being a normal relay vs being a bridge relay is almost the same "
 "configuration: it's just a matter of whether your relay is listed publically"
@@ -2017,7 +2026,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1258
+#: /home/runa/tor/website/docs/en/faq.wml:1259
 msgid ""
 "Right now, China is the main place in the world that filters connections to "
 "the Tor network. So bridges are useful a) for users in China, b) as a backup"
@@ -2027,7 +2036,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1266
+#: /home/runa/tor/website/docs/en/faq.wml:1267
 msgid ""
 "So should you run a normal relay or bridge relay? If you have lots of "
 "bandwidth, you should definitely run a normal relay &mdash; the average "
@@ -2038,19 +2047,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1275
+#: /home/runa/tor/website/docs/en/faq.wml:1276
 msgid "<hr> <a id=\"MultipleRelays\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1278
+#: /home/runa/tor/website/docs/en/faq.wml:1279
 msgid ""
 "<a class=\"anchor\" href=\"#MultipleRelays\">I want to run more than one "
 "relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1281
+#: /home/runa/tor/website/docs/en/faq.wml:1282
 msgid ""
 "Great. If you want to run several relays to donate more to the network, "
 "we're happy with that. But please don't run more than a few dozen on the "
@@ -2059,7 +2068,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1288
+#: /home/runa/tor/website/docs/en/faq.wml:1289
 msgid ""
 "If you do decide to run more than one relay, please set the \"MyFamily\" "
 "config option in the <a href=\"#torrc\">torrc</a> of each relay, listing all"
@@ -2067,13 +2076,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1294
+#: /home/runa/tor/website/docs/en/faq.wml:1295
 #, no-wrap
 msgid "    MyFamily $fingerprint1,$fingerprint2,$fingerprint3\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1298
+#: /home/runa/tor/website/docs/en/faq.wml:1299
 msgid ""
 "where each fingerprint is the 40 character identity fingerprint (without "
 "spaces). You can also list them by nickname, but fingerprint is safer. Be "
@@ -2082,7 +2091,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1305
+#: /home/runa/tor/website/docs/en/faq.wml:1306
 msgid ""
 "That way clients will know to avoid using more than one of your relays in a "
 "single circuit. You should set MyFamily if you have administrative control "
@@ -2091,26 +2100,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1311
+#: /home/runa/tor/website/docs/en/faq.wml:1312
 msgid "<hr> <a id=\"RelayMemory\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1314
+#: /home/runa/tor/website/docs/en/faq.wml:1315
 msgid ""
 "<a class=\"anchor\" href=\"#RelayMemory\">Why is my Tor relay using so much "
 "memory?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1316
+#: /home/runa/tor/website/docs/en/faq.wml:1317
 msgid ""
 "If your Tor relay is using more memory than you'd like, here are some tips "
 "for reducing its footprint:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1321
+#: /home/runa/tor/website/docs/en/faq.wml:1322
 msgid ""
 "If you're on Linux, you may be encountering memory fragmentation bugs in "
 "glibc's malloc implementation. That is, when Tor releases memory back to the"
@@ -2122,7 +2131,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1329
+#: /home/runa/tor/website/docs/en/faq.wml:1330
 msgid ""
 "If you're running a fast relay, meaning you have many TLS connections open, "
 "you are probably losing a lot of memory to OpenSSL's internal buffers (38KB+"
@@ -2134,7 +2143,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1337
+#: /home/runa/tor/website/docs/en/faq.wml:1338
 msgid ""
 "If you're running on Solaris, OpenBSD, NetBSD, or old FreeBSD, Tor is "
 "probably forking separate processes rather than using threads. Consider "
@@ -2144,7 +2153,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1343
+#: /home/runa/tor/website/docs/en/faq.wml:1344
 msgid ""
 "If you still can't handle the memory load, consider reducing the amount of "
 "bandwidth your relay advertises. Advertising less bandwidth means you will "
@@ -2153,60 +2162,60 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1352
+#: /home/runa/tor/website/docs/en/faq.wml:1353
 msgid ""
 "All of this said, fast Tor relays do use a lot of ram. It is not unusual for"
 " a fast exit relay to use 500-1000 MB of memory."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1356
+#: /home/runa/tor/website/docs/en/faq.wml:1357
 msgid "<hr> <a id=\"WhyNotNamed\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1359
+#: /home/runa/tor/website/docs/en/faq.wml:1360
 msgid "<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1362
+#: /home/runa/tor/website/docs/en/faq.wml:1363
 msgid ""
 "We currently use these metrics to determine if your relay should be "
 "named:<br>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1365
+#: /home/runa/tor/website/docs/en/faq.wml:1366
 msgid ""
 "The name is not currently mapped to a different key. Existing mappings are "
 "removed after 6 months of inactivity from a relay."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1367
+#: /home/runa/tor/website/docs/en/faq.wml:1368
 msgid "The relay must have been around for at least two weeks."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1368
+#: /home/runa/tor/website/docs/en/faq.wml:1369
 msgid "No other router may have wanted the same name in the past month."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1371
+#: /home/runa/tor/website/docs/en/faq.wml:1372
 msgid "<hr> <a id=\"KeyManagement\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1374
+#: /home/runa/tor/website/docs/en/faq.wml:1375
 msgid ""
 "<a class=\"anchor\" href=\"#KeyManagement\">Tell me about all the keys Tor "
 "uses.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1377
+#: /home/runa/tor/website/docs/en/faq.wml:1378
 msgid ""
 "Tor uses a variety of different keys, with three goals in mind: 1)  "
 "encryption to ensure privacy of data within the Tor network, 2)  "
@@ -2216,7 +2225,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1385
+#: /home/runa/tor/website/docs/en/faq.wml:1386
 msgid ""
 "<b>Encryption</b>: first, all connections in Tor use TLS link encryption, so"
 " observers can't look inside to see which circuit a given cell is intended "
@@ -2227,7 +2236,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1395
+#: /home/runa/tor/website/docs/en/faq.wml:1396
 msgid ""
 "<b>Authentication</b>: Every Tor relay has a public decryption key called "
 "the \"onion key\".  When the Tor client establishes circuits, at each step "
@@ -2238,7 +2247,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1405
+#: /home/runa/tor/website/docs/en/faq.wml:1406
 msgid ""
 "<b>Coordination</b>: How do clients know what the relays are, and how do "
 "they know that they have the right keys for them? Each relay has a long-term"
@@ -2253,7 +2262,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1419
+#: /home/runa/tor/website/docs/en/faq.wml:1420
 msgid ""
 "How do clients know what the directory authorities are? The Tor software "
 "comes with a built-in list of location and public key for each directory "
@@ -2262,7 +2271,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1426
+#: /home/runa/tor/website/docs/en/faq.wml:1427
 msgid ""
 "How do users know they've got the right software? When we distribute the "
 "source code or a package, we digitally sign it with <a "
@@ -2272,7 +2281,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1434
+#: /home/runa/tor/website/docs/en/faq.wml:1435
 msgid ""
 "In order to be certain that it's really signed by us, you need to have met "
 "us in person and gotten a copy of our GPG key fingerprint, or you need to "
@@ -2282,17 +2291,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1441
+#: /home/runa/tor/website/docs/en/faq.wml:1442
 msgid "<hr> <a id=\"EntryGuards\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1444
+#: /home/runa/tor/website/docs/en/faq.wml:1445
 msgid "<a class=\"anchor\" href=\"#EntryGuards\">What are Entry Guards?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1447
+#: /home/runa/tor/website/docs/en/faq.wml:1448
 msgid ""
 "Tor (like all current practical low-latency anonymity designs) fails when "
 "the attacker can see both ends of the communications channel. For example, "
@@ -2304,7 +2313,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1457
+#: /home/runa/tor/website/docs/en/faq.wml:1458
 msgid ""
 "So, what should we do? Suppose the attacker controls, or can observe, "
 "<i>C</i> relays. Suppose there are <i>N</i> relays total. If you select new "
@@ -2318,7 +2327,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1469
+#: /home/runa/tor/website/docs/en/faq.wml:1470
 msgid ""
 "The solution is \"entry guards\": each Tor client selects a few relays at "
 "random to use as entry points, and uses only those relays for her first hop."
@@ -2331,7 +2340,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1480
+#: /home/runa/tor/website/docs/en/faq.wml:1481
 msgid ""
 "You can read more at <a href=\"http://freehaven.net/anonbib/#wright02\";>An "
 "Analysis of the Degradation of Anonymous Protocols</a>, <a "
@@ -2342,7 +2351,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1489
+#: /home/runa/tor/website/docs/en/faq.wml:1490
 msgid ""
 "Restricting your entry nodes may also help against attackers who want to run"
 " a few Tor nodes and easily enumerate all of the Tor user IP addresses. "
@@ -2353,19 +2362,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1497
+#: /home/runa/tor/website/docs/en/faq.wml:1498
 msgid "<hr> <a id=\"EverybodyARelay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1500
+#: /home/runa/tor/website/docs/en/faq.wml:1501
 msgid ""
 "<a class=\"anchor\" href=\"#EverybodyARelay\">You should make every Tor user"
 " be a relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1503
+#: /home/runa/tor/website/docs/en/faq.wml:1504
 msgid ""
 "Requiring every Tor user to be a relay would help with scaling the network "
 "to handle all our users, and <a "
@@ -2380,7 +2389,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1516
+#: /home/runa/tor/website/docs/en/faq.wml:1517
 msgid ""
 "That said, we do want to encourage Tor users to run relays, so what we "
 "really want to do is simplify the process of setting up and maintaining a "
@@ -2391,12 +2400,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1525
+#: /home/runa/tor/website/docs/en/faq.wml:1526
 msgid "There are five steps we need to address before we can do this though:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1529
+#: /home/runa/tor/website/docs/en/faq.wml:1530
 msgid ""
 "First, we need to make Tor stable as a relay on all common operating "
 "systems. The main remaining platform is Windows, and we plan to finally "
@@ -2406,7 +2415,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1537
+#: /home/runa/tor/website/docs/en/faq.wml:1538
 msgid ""
 "Second, we still need to get better at automatically estimating the right "
 "amount of bandwidth to allow. See item #7 on the <a href=\"<page "
@@ -2418,7 +2427,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1548
+#: /home/runa/tor/website/docs/en/faq.wml:1549
 msgid ""
 "Third, we need to work on scalability, both of the network (how to stop "
 "requiring that all Tor relays be able to connect to all Tor relays) and of "
@@ -2430,7 +2439,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1558
+#: /home/runa/tor/website/docs/en/faq.wml:1559
 msgid ""
 "Fourth, we need to better understand the risks from letting the attacker "
 "send traffic through your relay while you're also initiating your own "
@@ -2448,7 +2457,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1574
+#: /home/runa/tor/website/docs/en/faq.wml:1575
 msgid ""
 "Fifth, we might need some sort of incentive scheme to encourage people to "
 "relay traffic for others, and/or to become exit nodes. Here are our <a "
@@ -2457,24 +2466,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1581
+#: /home/runa/tor/website/docs/en/faq.wml:1582
 msgid "Please help on all of these!"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1584
+#: /home/runa/tor/website/docs/en/faq.wml:1585
 msgid "<hr> <a id=\"TransportIPnotTCP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1587
+#: /home/runa/tor/website/docs/en/faq.wml:1588
 msgid ""
 "<a class=\"anchor\" href=\"#TransportIPnotTCP\">You should transport all IP "
 "packets, not just TCP packets.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1590
+#: /home/runa/tor/website/docs/en/faq.wml:1591
 msgid ""
 "This would be handy, because it would make Tor better able to handle new "
 "protocols like VoIP, it could solve the whole need to socksify applications,"
@@ -2483,7 +2492,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1597
+#: /home/runa/tor/website/docs/en/faq.wml:1598
 msgid ""
 "We're heading in this direction: see <a "
 "href=\"https://trac.torproject.org/projects/tor/ticket/1855\";>this trac "
@@ -2492,7 +2501,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1604
+#: /home/runa/tor/website/docs/en/faq.wml:1605
 msgid ""
 "IP packets reveal OS characteristics. We would still need to do IP-level "
 "packet normalization, to stop things like TCP fingerprinting attacks. Given "
@@ -2503,7 +2512,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1611
+#: /home/runa/tor/website/docs/en/faq.wml:1612
 msgid ""
 "Application-level streams still need scrubbing. We will still need user-side"
 " applications like Torbutton. So it won't become just a matter of capturing "
@@ -2511,7 +2520,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1615
+#: /home/runa/tor/website/docs/en/faq.wml:1616
 msgid ""
 "Certain protocols will still leak information. For example, we must rewrite "
 "DNS requests so they are delivered to an unlinkable DNS server rather than "
@@ -2520,7 +2529,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1620
+#: /home/runa/tor/website/docs/en/faq.wml:1621
 msgid ""
 "<a "
 "href=\"http://crypto.stanford.edu/~nagendra/projects/dtls/dtls.html\";>DTLS</a>"
@@ -2531,7 +2540,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1627
+#: /home/runa/tor/website/docs/en/faq.wml:1628
 msgid ""
 "Exit policies for arbitrary IP packets mean building a secure IDS. Our node "
 "operators tell us that exit policies are one of the main reasons they're "
@@ -2549,7 +2558,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1641
+#: /home/runa/tor/website/docs/en/faq.wml:1642
 msgid ""
 "The Tor-internal name spaces would need to be redesigned. We support hidden "
 "service \".onion\" addresses by intercepting the addresses when they are "
@@ -2558,38 +2567,38 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1648
+#: /home/runa/tor/website/docs/en/faq.wml:1649
 msgid "<hr> <a id=\"Criminals\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1651
+#: /home/runa/tor/website/docs/en/faq.wml:1652
 msgid ""
 "<a class=\"anchor\" href=\"#Criminals\">Doesn't Tor enable criminals to do "
 "bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1654
+#: /home/runa/tor/website/docs/en/faq.wml:1655
 msgid ""
 "For the answer to this question and others, please see our <a href=\"<page "
 "docs/faq-abuse>\">Tor Abuse FAQ</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1658
+#: /home/runa/tor/website/docs/en/faq.wml:1659
 msgid "<hr> <a id=\"RespondISP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1661
+#: /home/runa/tor/website/docs/en/faq.wml:1662
 msgid ""
 "<a class=\"anchor\" href=\"#RespondISP\">How do I respond to my ISP about my"
 " exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1664
+#: /home/runa/tor/website/docs/en/faq.wml:1665
 msgid ""
 "A collection of templates for successfully responding to ISPs is <a "
 "href=\"<wiki>doc/TorAbuseTemplates\">collected here</a>."

Modified: translation/trunk/projects/website/po/es/docs/2-medium.tor-doc-relay.po
===================================================================
--- translation/trunk/projects/website/po/es/docs/2-medium.tor-doc-relay.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/es/docs/2-medium.tor-doc-relay.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-06-21 08:19+0200\n"
-"PO-Revision-Date: 2011-06-22 00:52+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 01:01+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:16 /tmp/F5o0tOMw8z.xml:281
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:16 /tmp/A18i3Pxv3V.xml:282
 msgid "<hr>"
 msgstr ""
 
@@ -66,8 +66,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37 /tmp/F5o0tOMw8z.xml:52
-#: /tmp/F5o0tOMw8z.xml:147 /tmp/F5o0tOMw8z.xml:171
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37 /tmp/A18i3Pxv3V.xml:52
+#: /tmp/A18i3Pxv3V.xml:147 /tmp/A18i3Pxv3V.xml:171
 msgid "<br>"
 msgstr ""
 
@@ -404,11 +404,12 @@
 "add a line like \"toruser hard nofile 8192\" to your "
 "/etc/security/limits.conf file (where toruser is the user that runs the Tor "
 "process), and then restart Tor if it's installed as a package (or log out "
-"and log back in if you run it yourself)."
+"and log back in if you run it yourself). The Debian/Ubuntu package does this"
+" step for you."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:266
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:267
 msgid ""
 "15. If you installed Tor via some package or installer, it probably starts "
 "Tor for you automatically on boot. But if you installed from source, you may"
@@ -416,7 +417,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:272
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:273
 msgid ""
 "When you change your Tor configuration, remember to verify that your relay "
 "still works correctly after the change. Be sure to set your \"ContactInfo\" "
@@ -428,7 +429,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:283
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:284
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "about/contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/po/es/docs/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/po/es/docs/2-medium.verifying-signatures.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/es/docs/2-medium.verifying-signatures.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-09-05 00:00+0200\n"
-"PO-Revision-Date: 2011-09-05 00:55+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 01:02+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
 "MIME-Version: 1.0\n"
@@ -31,166 +31,88 @@
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:13
-#: /tmp/w7jGkC8yXE.xml:43 /tmp/w7jGkC8yXE.xml:59 /tmp/w7jGkC8yXE.xml:86
-#: /tmp/w7jGkC8yXE.xml:186
+#: /tmp/kzjpFaPDWT.xml:16 /tmp/kzjpFaPDWT.xml:60 /tmp/kzjpFaPDWT.xml:120
+#: /tmp/kzjpFaPDWT.xml:176
 msgid "<hr>"
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><h3>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:15
-msgid ""
-"Each file on <a href=\"<page download/download>\">our download page</a> is "
-"accompanied by a file with the same name as the package and the extension "
-"\".asc\". These .asc files are GPG signatures. They allow you to verify the "
-"file you've downloaded is exactly the one that we intended you to get. For "
-"example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by "
-"tor-browser-<version-torbrowserbundle>_en-US.exe.asc."
+msgid "What is a signature and why should I check it?"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:22
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:18
 msgid ""
-"Of course, you'll need to have our GPG keys in your keyring: if you don't "
-"know the GPG key, you can't be sure that it was really us who signed it. The"
-" signing keys we use are:"
+"How do you know that the Tor program you have is really the one we made? "
+"Many Tor users have very real adversaries who might try to give them a fake "
+"version of Tor &mdash; and it doesn't matter how secure and anonymous Tor is"
+" if you're not running the real Tor."
 msgstr ""
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:26
-msgid "Roger's (0x28988BF5) typically signs the source code file."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:27
-msgid "Nick's (0x165733EA, or its subkey 0x8D29319A)."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:28
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:23
 msgid ""
-"Andrew's (0x31B0974B) typically signed older packages for windows and mac."
+"An attacker could try a variety of attacks to get you to download a fake "
+"Tor. For example, he could trick you into thinking some other website is a "
+"great place to download Tor. That's why you should always download Tor from "
+"<b>https</b>://www.torproject.org/. The https part means there's encryption "
+"and authentication between your browser and the website, making it much "
+"harder for the attacker to modify your download. But it's not perfect. Some "
+"places in the world block the Tor website, making users try <a href=\"<page "
+"docs/faq>#GetTor\">somewhere else</a>. Large companies sometimes force "
+"employees to use a modified browser, so the company can listen in on all "
+"their browsing. We've even <a href=\"https://blog.torproject.org/blog";
+"/diginotar-debacle-and-what-you-should-do-about-it\">seen</a> attackers who "
+"have the ability to trick your browser into thinking you're talking to the "
+"Tor website with https when you're not."
 msgstr ""
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:29
-msgid "Peter's (0xC82E0039, or its subkey 0xE1DEC577)."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:30
-msgid "TomÃs's (0x9A753A6B) signs current Vidalia release tarballs and tags."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:31
-msgid "Matt's (0x5FA14861) signed older Vidalia release tarballs."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:32
-msgid "Damian's (0x9ABBEEC6) signs Arm releases"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:33
-msgid "Jacob's (0xE012B42D)."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:34
-msgid ""
-"Erinn's (0x63FEE659) and (0xF1F5C9B5) typically signs all windows, mac, and "
-"most linux packages."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:35
-msgid "Mike's (0xDDC6C0AD) signs the Torbutton xpi."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:36
-msgid "Karsten's (0xF7C11265) signs the metrics archives and tools."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:37
-msgid "Robert Hogan's (0x22F6856F) signs torsocks release tarballs and tags."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
+#. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:38
-msgid "Nathan's (0xB374CBD2) signs the Android APK file for Orbot."
-msgstr ""
-
-#. type: Content of: <div><div><ul>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:38
-msgid "."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:39
 msgid ""
-"Tor Project Archive (0x886DDD89) signs the deb.torproject.org repositories "
-"and archives"
+"Some software sites list <a "
+"href=\"http://en.wikipedia.org/wiki/Cryptographic_hash_function\";>sha1 "
+"hashes</a> alongside the software on their website, so users can verify that"
+" they downloaded the file without any errors. These \"checksums\" help you "
+"answer the question \"Did I download this file correctly from whoever sent "
+"it to me?\" They do a good job at making sure you didn't have any random "
+"errors in your download, but they don't help you figure out whether you were"
+" downloading it from the attacker. The better question to answer is: \"Is "
+"this file that I just downloaded the file that Tor intended me to get?\""
 msgstr ""
 
-#. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:42
-msgid "Step Zero: Install GnuPG"
-msgstr ""
-
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:44
-msgid "You need to have GnuPG installed before you can verify signatures."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:48
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:49
 msgid ""
-"Linux: see <a "
-"href=\"http://www.gnupg.org/download/\";>http://www.gnupg.org/download/</a> "
-"or install <i>gnupg</i> from the package management system."
+"Each file on <a href=\"<page download/download>\">our download page</a> is "
+"accompanied by a file with the same name as the package and the extension "
+"\".asc\". These .asc files are GPG signatures. They allow you to verify the "
+"file you've downloaded is exactly the one that we intended you to get. For "
+"example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by "
+"tor-browser-<version-torbrowserbundle>_en-US.exe.asc. For a list of which "
+"developer signs which package, see our <a href=\"<page docs/signing-"
+"keys>\">signing keys</a> page."
 msgstr ""
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:51
-msgid ""
-"Windows: see <a "
-"href=\"http://www.gnupg.org/download/\";>http://www.gnupg.org/download/</a>. "
-"Look for the \"version compiled for MS-Windows\" under \"Binaries\"."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:54
-msgid ""
-"Mac: see <a "
-"href=\"http://macgpg.sourceforge.net/\";>http://macgpg.sourceforge.net/</a>."
-msgstr ""
-
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:58
-msgid "Step One: Import the keys"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:59
+msgid "Windows"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:60
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:62
 msgid ""
-"The next step is to import the key. This can be done directly from GnuPG. "
-"Make sure you import the correct key. For example, if you downloaded a "
-"Windows package, you will need to import Erinn's key."
+"You need to have GnuPG installed before you can verify signatures. Download "
+"it from <a "
+"href=\"http://gpg4win.org/download.html\";>http://gpg4win.org/download.html</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:64
-#: /tmp/w7jGkC8yXE.xml:89 /tmp/w7jGkC8yXE.xml:194
-msgid "<b>Windows:</b>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:65
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:66
 msgid ""
-"GnuPG for Windows is a command line tool, and you will need to use "
+"Once it's installed, use GnuPG to import the key that signed your package. "
+"Since GnuPG for Windows is a command-line tool, you will need to use "
 "<i>cmd.exe</i>. Unless you edit your PATH environment variable, you will "
 "need to tell Windows the full path to the GnuPG program. If you installed "
 "GnuPG with the default values, the path should be something like this: "
@@ -198,303 +120,191 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:71
-msgid "To import the key 0x28988BF5, start <i>cmd.exe</i> and type:"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:73
+msgid ""
+"Erinn Clark signs the Tor Browser Bundles. Import her key (0x63FEE659) by "
+"starting <i>cmd.exe</i> and typing:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:73
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:76
 #, no-wrap
 msgid ""
 "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --keyserver hkp://keys.gnupg.net "
-"--recv-keys 0x28988BF5"
+"--recv-keys 0x63FEE659"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:75
-#: /tmp/w7jGkC8yXE.xml:92
-msgid "<b>Mac and Linux</b>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:76
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:78
+#: /tmp/kzjpFaPDWT.xml:134
 msgid ""
-"Whether you have a Mac or you run Linux, you will need to use the terminal "
-"to run GnuPG. Mac users can find the terminal under \"Applications\". If you"
-" run Linux and use Gnome, the terminal should be under \"Applications menu\""
-" and \"Accessories\". KDE users can find the terminal under \"Menu\" and "
-"\"System\"."
+"After importing the key, you can verify that the fingerprint is correct:"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:81
-msgid "To import the key 0x28988BF5, start the terminal and type:"
-msgstr ""
-
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:83
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:81
 #, no-wrap
-msgid "gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x28988BF5"
+msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --fingerprint 0x63FEE659"
 msgstr ""
 
-#. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:85
-msgid "Step Two: Verify the fingerprints"
-msgstr ""
-
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:87
-msgid ""
-"After importing the key, you will want to verify that the fingerprint is "
-"correct."
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:83
+#: /tmp/kzjpFaPDWT.xml:139
+msgid "You should see:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:90
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:85
 #, no-wrap
-msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --fingerprint (insert keyid here)"
-msgstr ""
-
-#. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:93
-#, no-wrap
-msgid "gpg --fingerprint (insert keyid here)"
-msgstr ""
-
-#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:95
-msgid "The fingerprints for the keys should be:"
-msgstr ""
-
-#. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:98
-#, no-wrap
 msgid ""
-"    pub   1024D/28988BF5 2000-02-27\n"
-"          Key fingerprint = B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
-"    uid                  Roger Dingledine &lt;arma@xxxxxxx&gt;\n"
-"\n"
-"    pub   3072R/165733EA 2004-07-03\n"
-"          Key fingerprint = B35B F85B F194 89D0 4E28  C33C 2119 4EBB 1657 33EA\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxxx&gt;\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxx&gt;\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxxxx&gt;\n"
-"\n"
-"    pub  1024D/31B0974B 2003-07-17\n"
-"         Key fingerprint = 0295 9AA7 190A B9E9 027E  0736 3B9D 093F 31B0 974B\n"
-"    uid                  Andrew Lewman (phobos) &lt;phobos@xxxxxxxxxx&gt;\n"
-"    uid                  Andrew Lewman &lt;andrew@xxxxxxxxxx&gt;\n"
-"    uid                  Andrew Lewman &lt;andrew@xxxxxxxxxxxxxx&gt;\n"
-"    sub   4096g/B77F95F7 2003-07-17\n"
-"\n"
-"    pub   4096R/C82E0039 2003-03-24\n"
-"          Key fingerprint = 25FC 1614 B8F8 7B52 FF2F  99B9 62AF 4031 C82E 0039\n"
-"    uid                  Peter Palfrader\n"
-"    uid                  Peter Palfrader &lt;peter@xxxxxxxxxxxxx&gt;\n"
-"    uid                  Peter Palfrader &lt;weasel@xxxxxxxxxx&gt;\n"
-"\n"
-"    pub   1024D/9A753A6B 2009-09-11\n"
-"          Key fingerprint = 553D 7C2C 626E F16F 27F3  30BC 95E3 881D 9A75 3A6B\n"
-"    uid                  TomÃs Touceda &lt;chiiph@xxxxxxxxx&gt;\n"
-"    sub   1024g/33BE0E5B 2009-09-11\n"
-"\n"
-"    pub   1024D/5FA14861 2005-08-17\n"
-"          Key fingerprint = 9467 294A 9985 3C9C 65CB  141D AF7E 0E43 5FA1 4861\n"
-"    uid                  Matt Edman &lt;edmanm@xxxxxxx&gt;\n"
-"    uid                  Matt Edman &lt;Matt_Edman@xxxxxxxxxx&gt;\n"
-"    uid                  Matt Edman &lt;edmanm2@xxxxxxxxxx&gt;\n"
-"    sub   4096g/EA654E59 2005-08-17\n"
-"\n"
-"    pub   1024D/9ABBEEC6 2009-06-17\n"
-"          Key fingerprint = 6827 8CC5 DD2D 1E85 C4E4  5AD9 0445 B7AB 9ABB EEC6\n"
-"    uid                  Damian Johnson (www.atagar.com) &lt;atagar1@xxxxxxxxx&gt;\n"
-"    uid                  Damian Johnson &lt;atagar@xxxxxxxxxxxxxx&gt;\n"
-"    sub   2048g/146276B2 2009-06-17\n"
-"    sub   2048R/87F30690 2010-08-07\n"
-"\n"
-"    pub   4096R/E012B42D 2010-05-07\n"
-"          Key fingerprint = D8C9 AF51 CAA9 CAEA D3D8  9C9E A34F A745 E012 B42D\n"
-"    uid                  Jacob Appelbaum &lt;jacob@xxxxxxxxxxxxx&gt;\n"
-"    uid                  Jacob Appelbaum &lt;jacob@xxxxxxxxxxxxxx&gt;\n"
-"    sub   4096R/7CA91A52 2010-05-07 [expires: 2011-05-07]\n"
-"\n"
 "    pub   2048R/63FEE659 2003-10-16\n"
 "          Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\n"
 "    sub   2048R/EB399FD7 2003-10-16\n"
-"\n"
-"    pub   1024D/F1F5C9B5 2010-02-03\n"
-"          Key fingerprint = C2E3 4CFC 13C6 2BD9 2C75  79B5 6B8A AEB1 F1F5 C9B5\n"
-"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
-"    sub   1024g/7828F26A 2010-02-03\n"
-"\n"
-"    pub   1024D/DDC6C0AD 2006-07-26\n"
-"          Key fingerprint = BECD 90ED D1EE 8736 7980  ECF8 1B0C A30C DDC6 C0AD\n"
-"    uid                  Mike Perry &lt;mikeperry@xxxxxxxxxx&gt;\n"
-"    uid                  Mike Perry &lt;mikepery@xxxxxxxxxx&gt;\n"
-"    sub   4096g/AF0A91D7 2006-07-26\n"
-"\n"
-"    pub   1024D/F7C11265 2007-03-09 [expires: 2012-03-01]\n"
-"          Key fingerprint = FC8A EEF1 792E EE71 D721  7D47 D0CF 963D F7C1 1265\n"
-"    uid                  Karsten Loesing &lt;karsten.loesing@xxxxxxx&gt;\n"
-"    sub   2048g/75D85E4B 2007-03-09 [expires: 2012-03-01]\n"
-"\n"
-"    pub   1024D/22F6856F 2006-08-19\n"
-"          Key fingerprint = DDB4 6B5B 7950 CD47 E59B  5189 4C09 25CF 22F6 856F\n"
-"    uid                  Robert Hogan &lt;robert@xxxxxxxxxxxxxxx&gt;\n"
-"    sub   1024g/FC4A9460 2006-08-19\n"
-"\n"
-"    pub   3072D/B374CBD2 2010-06-09 [expires: 2011-06-09]\n"
-"   \t  Key fingerprint = B92B CA64 72F7 C6F0 8D47  8503 D2AC D203 B374 CBD2\n"
-"    uid                  Nathan of Guardian &lt;nathan@xxxxxxxxxxxxxxxxxxxx&gt;\n"
-"    sub   4096g/B5878C3B 2010-06-09 [expires: 2011-06-09]\n"
-"\n"
-"    pub   2048R/886DDD89 2009-09-04 [expires: 2014-09-03]\n"
-"      Key fingerprint = A3C4 F0F9 79CA A22C DBA8  F512 EE8C BC9E 886D DD89\n"
-"    uid                  deb.torproject.org archive signing key\n"
-"    sub   2048R/219EC810 2009-09-04 [expires: 2012-09-03]\n"
-"    "
 msgstr ""
 
-#. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:185
-msgid "Step Three: Verify the downloaded package"
-msgstr ""
-
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:187
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:93
+#: /tmp/kzjpFaPDWT.xml:149
 msgid ""
 "To verify the signature of the package you downloaded, you will need to "
-"download the \".asc\" file as well."
+"download the \".asc\" file as well. Assuming you downloaded the package and "
+"its signature to your Desktop, run:"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:190
-msgid ""
-"In the following examples, the user Alice downloads packages for Windows, "
-"Mac OS X and Linux and also verifies the signature of each package. All "
-"files are saved on the desktop."
-msgstr ""
-
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:195
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:97
 #, no-wrap
 msgid ""
 "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --verify C:\\Users\\Alice\\Desktop"
-"\\<file-win32-bundle-stable>.asc C:\\Users\\Alice\\Desktop\\<file-win32"
-"-bundle-stable>"
+"\\<file-win32-bundle-stable>.asc"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:197
-msgid "<b>Mac:</b>"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:99
+#: /tmp/kzjpFaPDWT.xml:155
+msgid "The output should say \"Good signature\":"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:198
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:102
+#: /tmp/kzjpFaPDWT.xml:158
 #, no-wrap
 msgid ""
-"gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc /Users/Alice"
-"/<file-osx-x86-bundle-stable>"
+"    gpg: Signature made Wed 31 Aug 2011 06:37:01 PM EDT using RSA key ID 63FEE659\n"
+"    gpg: Good signature from \"Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\"\n"
+"    gpg:                 aka \"Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\"\n"
+"    gpg:                 aka \"Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\"\n"
+"    gpg: WARNING: This key is not certified with a trusted signature!\n"
+"    gpg:          There is no indication that the signature belongs to the owner.\n"
+"    Primary key fingerprint: 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
+"    "
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:200
-msgid "<b>Linux</b>"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:112
+#: /tmp/kzjpFaPDWT.xml:168
+msgid ""
+"Notice that there is a warning because you haven't assigned a trust index to"
+" this person. This means that GnuPG verified that the key made that "
+"signature, but it's up to you to decide if that key really belongs to the "
+"developer. The best method is to meet the developer in person and exchange "
+"key fingerprints."
 msgstr ""
 
-#. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:201
-#, no-wrap
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:119
+msgid "Mac OS X"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:122
 msgid ""
-"gpg --verify /home/Alice/Desktop/<file-source-stable>.asc "
-"/home/Alice/Desktop/<file-source-stable>"
+"You need to have GnuPG installed before you can verify signatures. You can "
+"install it from <a "
+"href=\"http://macgpg.sourceforge.net/\";>http://macgpg.sourceforge.net/</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:204
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:127
 msgid ""
-"After verifying, GnuPG will come back saying something like \"Good "
-"signature\" or \"BAD signature\". The output should look something like "
-"this:"
+"Once it's installed, use GnuPG to import the key that signed your package. "
+"Erinn Clark signs the Tor Browser Bundles. Import her key (0x63FEE659) by "
+"starting the terminal (under \"Applications\")  and typing:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:209
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:132
 #, no-wrap
-msgid ""
-"    gpg: Signature made Tue 16 Mar 2010 05:55:17 AM CET using DSA key ID 28988BF5\n"
-"    gpg: Good signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
-"    gpg: WARNING: This key is not certified with a trusted signature!\n"
-"    gpg:          There is no indication that the signature belongs to the owner.\n"
-"    Primary key fingerprint: B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
-"    "
+msgid "gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:217
-msgid ""
-"Notice that there is a warning because you haven't assigned a trust index to"
-" this person. This means that GnuPG verified that the key made that "
-"signature, but it's up to you to decide if that key really belongs to the "
-"developer. The best method is to meet the developer in person and exchange "
-"key fingerprints."
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:137
+#, no-wrap
+msgid "gpg --fingerprint 0x63FEE659"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:224
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:141
+#, no-wrap
 msgid ""
-"For your reference, this is an example of a <em>BAD</em> verification. It "
-"means that the signature and file contents do not match. In this case, you "
-"should not trust the file contents:"
+"    pub   2048R/63FEE659 2003-10-16\n"
+"          Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\n"
+"    sub   2048R/EB399FD7 2003-10-16\n"
+"    "
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:229
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:153
 #, no-wrap
+msgid "gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:175
+msgid "Linux"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:178
 msgid ""
-"    gpg: Signature made Tue 20 Apr 2010 12:22:32 PM CEST using DSA key ID 28988BF5\n"
-"    gpg: BAD signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
-"    "
+"Most Linux distributions come with gpg preinstalled, so users who want to "
+"verify the Tor Browser Bundle for Linux (or the source tarball) can just "
+"follow along with the instructions above for \"Mac OS X\"."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:233
-msgid "<b>RPM-based distributions :</b>"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:183
+msgid ""
+"If you're using the <b>Debian</b> packages, you should read the instructions"
+" on <a href=\"<page docs/debian>#packages\">importing these keys to apt</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:234
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:187
 msgid ""
-"In order to manually verify the signatures on the RPM packages, you must use"
-" the <code>rpm</code> tool like so: <br />"
+"If you're using the <b>RPMs</b>, you can manually verify the signatures on "
+"the RPM packages by"
 msgstr ""
 
 #. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:237
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:188
 #, no-wrap
 msgid "rpm -K filename.rpm"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:240
-msgid "<b>Debian:</b>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:241
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:190
 msgid ""
-"If you are running Tor on Debian you should read the instructions on <a "
-"href=\"<page docs/debian>#packages\">importing these keys to apt</a>."
+"See <a "
+"href=\"http://www.gnupg.org/documentation/\";>http://www.gnupg.org/documentation/</a>"
+" to learn more about GPG."
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:244
-msgid ""
-"If you wish to learn more about GPG, see <a "
-"href=\"http://www.gnupg.org/documentation/\";>http://www.gnupg.org/documentation/</a>."
-msgstr ""
 
-

Modified: translation/trunk/projects/website/po/es/docs/3-low.rpms.po
===================================================================
--- translation/trunk/projects/website/po/es/docs/3-low.rpms.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/es/docs/3-low.rpms.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-08-10 08:19+0200\n"
-"PO-Revision-Date: 2011-08-11 01:04+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 01:04+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/rpms.wml:16 /tmp/Xp_xTVMYLa.xml:70
+#: /home/runa/tor/website/docs/en/rpms.wml:16 /tmp/qK7cG0J74c.xml:71
 msgid "<br>"
 msgstr ""
 
@@ -76,11 +76,12 @@
 #: /home/runa/tor/website/docs/en/rpms.wml:36
 msgid ""
 "If you wish to track the stable releases of Tor, you should substitute "
-"DISTRIBUTION with one of the following: centos4, centos5, fc13, fc14, suse"
+"DISTRIBUTION with one of the following: centos4, centos5, fc13, fc14, fc15, "
+"suse"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:39
+#: /home/runa/tor/website/docs/en/rpms.wml:40
 msgid ""
 "To track experimental releases, substitute DISTRIBUTION with one of these: "
 "centos4-experimental, centos5-experimental, fc13-experimental, "
@@ -88,25 +89,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:44
+#: /home/runa/tor/website/docs/en/rpms.wml:45
 msgid "Then install Tor by running:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/rpms.wml:46
+#: /home/runa/tor/website/docs/en/rpms.wml:47
 #, no-wrap
 msgid "yum install tor"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:49
+#: /home/runa/tor/website/docs/en/rpms.wml:50
 msgid ""
 "Now Tor is installed and running. Move on to <a href=\"<page docs/tor-doc-"
 "unix>#using\">step two</a> of the \"Tor on Linux/Unix\" instructions."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:55
+#: /home/runa/tor/website/docs/en/rpms.wml:56
 msgid ""
 "The DNS name <code>deb.torproject.org</code> is actually a set of "
 "independent servers in a DNS round-robin configuration.  If for some reason "
@@ -116,29 +117,29 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/rpms.wml:64
+#: /home/runa/tor/website/docs/en/rpms.wml:65
 msgid "<hr> <hr> <a id=\"source\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/rpms.wml:69
+#: /home/runa/tor/website/docs/en/rpms.wml:70
 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:73
+#: /home/runa/tor/website/docs/en/rpms.wml:74
 msgid ""
 "If you'd like to build from source, please follow the <a href=\"<gitblob>doc"
 "/tor-rpm-creation.txt\">RPM creation instructions</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/rpms.wml:77
+#: /home/runa/tor/website/docs/en/rpms.wml:78
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:79
+#: /home/runa/tor/website/docs/en/rpms.wml:80
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "about/contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/po/es/press/4-optional.2010-03-25-tor-store-press-release.po
===================================================================
--- translation/trunk/projects/website/po/es/press/4-optional.2010-03-25-tor-store-press-release.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/es/press/4-optional.2010-03-25-tor-store-press-release.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-05-02 17:00+0200\n"
-"PO-Revision-Date: 2011-09-21 19:51+0000\n"
+"PO-Revision-Date: 2011-09-28 09:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/fa/about/2-medium.torusers.po
===================================================================
--- translation/trunk/projects/website/po/fa/about/2-medium.torusers.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/fa/about/2-medium.torusers.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-08-30 08:50+0200\n"
-"PO-Revision-Date: 2011-09-21 19:43+0000\n"
+"PO-Revision-Date: 2011-09-28 08:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/fa/about/3-low.board.po
===================================================================
--- translation/trunk/projects/website/po/fa/about/3-low.board.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/fa/about/3-low.board.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-06-21 08:19+0200\n"
-"PO-Revision-Date: 2011-09-21 19:51+0000\n"
+"PO-Revision-Date: 2011-09-28 09:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/fa/about/3-low.contact.po
===================================================================
--- translation/trunk/projects/website/po/fa/about/3-low.contact.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/fa/about/3-low.contact.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-07-08 08:44+0200\n"
-"PO-Revision-Date: 2011-09-21 19:38+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-28 08:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -46,20 +46,27 @@
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/about/en/contact.wml:24
 msgid ""
+"<i>community-support at lists.torproject.org</i> is for volunteers helping "
+"people with questions about using or configuring Tor."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/contact.wml:27
+msgid ""
 "<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page "
 "getinvolved/translation>\">website translations</a> into place, and help "
 "answer questions about existing and new translations."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:27
+#: /home/runa/tor/website/about/en/contact.wml:30
 msgid ""
 "<i>tordnsel at torproject.org</i> is the alias for the people responsible "
 "for the tordns exitlist."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:29
+#: /home/runa/tor/website/about/en/contact.wml:32
 msgid ""
 "<i>donations at torproject.org</i> is for questions and comments about <a "
 "href=\"<page donate/donate>\">getting money to the developers</a>. More "
@@ -68,7 +75,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:34
+#: /home/runa/tor/website/about/en/contact.wml:37
 msgid ""
 "<i>execdir at torproject.org</i> is for press/media, questions and comments "
 "about Tor the non-profit corporation: trademark questions, affiliation and "
@@ -77,43 +84,43 @@
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:40
+#: /home/runa/tor/website/about/en/contact.wml:43
 msgid "Identi.ca"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:41
+#: /home/runa/tor/website/about/en/contact.wml:44
 msgid ""
 "<a id=\"identica\"></a> Contact us via our microblogging Identi.ca account "
 "at <a href=\"https://identi.ca/torproject\";>torproject</a>."
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:45
+#: /home/runa/tor/website/about/en/contact.wml:48
 msgid "IRC"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:46
+#: /home/runa/tor/website/about/en/contact.wml:49
 msgid "<a id=\"irc\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:47
+#: /home/runa/tor/website/about/en/contact.wml:50
 msgid ""
 "Tor users and developers can also be found in the following channels on <a "
 "href=\"http://www.oftc.net/oftc/\";>OFTC</a>:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:51
+#: /home/runa/tor/website/about/en/contact.wml:54
 msgid ""
 "<i>#tor</i> - User and relay operation discussions. Having trouble running "
 "Tor or a question for other Tor users? Then this is the spot for you."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:54
+#: /home/runa/tor/website/about/en/contact.wml:57
 msgid ""
 "<i>#tor-dev</i> - Channel for people who want to do development.  "
 "Discussions about Tor-related coding, protocols, and <a href=\"<page "
@@ -121,27 +128,28 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:57
+#: /home/runa/tor/website/about/en/contact.wml:60
 msgid ""
 "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that "
 "is not related to Tor."
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:61
+#: /home/runa/tor/website/about/en/contact.wml:64
 msgid "Telephone"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:62
+#: /home/runa/tor/website/about/en/contact.wml:65
 msgid "<a id=\"phone\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:63
+#: /home/runa/tor/website/about/en/contact.wml:66
 msgid ""
 "If none of the above appeal to you, calling +1-781-352-0568 will reach the "
-"Tor office.  Should there be no answer, please leave a message."
+"Tor office.  Should there be no answer, please leave a message with a way to"
+" reach you."
 msgstr ""
 
 

Modified: translation/trunk/projects/website/po/fa/about/3-low.corepeople.po
===================================================================
--- translation/trunk/projects/website/po/fa/about/3-low.corepeople.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/fa/about/3-low.corepeople.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-08-30 08:50+0200\n"
-"PO-Revision-Date: 2011-09-21 19:49+0000\n"
+"PO-Revision-Date: 2011-09-28 08:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/fa/about/3-low.financials.po
===================================================================
--- translation/trunk/projects/website/po/fa/about/3-low.financials.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/fa/about/3-low.financials.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-09-21 19:48+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-28 08:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/about/en/financials.wml:9
+#: /home/runa/tor/website/about/en/financials.wml:9
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "about/overview>\">About &raquo; </a> <a href=\"<page "
@@ -26,66 +26,79 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/transifex/website/about/en/financials.wml:14
+#: /home/runa/tor/website/about/en/financials.wml:14
 msgid "Tor: Financial Reports"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/financials.wml:16
+#: /home/runa/tor/website/about/en/financials.wml:16
+msgid "Fiscal Year 2010"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/financials.wml:17
+msgid ""
+"<a href=\"findoc/2010-TorProject-combined-"
+"Form990_PC_Audit_Results.pdf\">2010 IRS Form 990, State of MA Form PC, and "
+"Independent Audit Results</a>"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/financials.wml:18
 msgid "Fiscal Year 2009"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:17
+#: /home/runa/tor/website/about/en/financials.wml:19
 msgid ""
 "<a href=\"findoc/2009-TorProject-Annual-Report.pdf\">2009 Annual Report</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:18
+#: /home/runa/tor/website/about/en/financials.wml:20
 msgid ""
 "<a href=\"findoc/2009-TorProject-Form990andPC.pdf\">2009 IRS Form 990 and "
 "State of MA Form PC</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:19
+#: /home/runa/tor/website/about/en/financials.wml:21
 msgid ""
 "<a href=\"findoc/2009-TorProject-FinancialStatements.pdf\">2009 Financial "
 "Statements and Audit results</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:20
+#: /home/runa/tor/website/about/en/financials.wml:22
 msgid ""
 "<a href=\"findoc/2009-TorProject-DCF.pdf\">2009 Dept of Commerce Data "
 "Collection Form</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/financials.wml:21
+#: /home/runa/tor/website/about/en/financials.wml:23
 msgid "Fiscal Year 2008"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:22
+#: /home/runa/tor/website/about/en/financials.wml:24
 msgid "<a href=\"findoc/2008-TorProject-Form990.pdf\">2008 IRS Form 990</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:23
+#: /home/runa/tor/website/about/en/financials.wml:25
 msgid ""
 "<a href=\"findoc/2008-TorProject-FinancialStatements.pdf\">2008 Financial "
 "Statements and Audit Results</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/financials.wml:24
+#: /home/runa/tor/website/about/en/financials.wml:26
 msgid "Fiscal Year 2007"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:25
+#: /home/runa/tor/website/about/en/financials.wml:27
 msgid "<a href=\"findoc/2007-TorProject-Form990.pdf\">2007 IRS Form 990</a>"
 msgstr ""
 

Modified: translation/trunk/projects/website/po/fa/about/3-low.translators.po
===================================================================
--- translation/trunk/projects/website/po/fa/about/3-low.translators.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/fa/about/3-low.translators.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-09-21 19:54+0000\n"
+"PO-Revision-Date: 2011-09-28 09:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/fa/docs/2-medium.faq.po
===================================================================
--- translation/trunk/projects/website/po/fa/docs/2-medium.faq.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/fa/docs/2-medium.faq.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-08-30 08:50+0200\n"
-"PO-Revision-Date: 2011-08-31 01:41+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 00:59+0000\n"
 "Last-Translator: behravan <behravanhamed@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@
 msgstr "ØÙØÙÙØÛ ØØÛØ"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/NhlG8k8BI3.xml:1669
+#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/mo95NMnX36.xml:1670
 msgid "<hr>"
 msgstr "<hr>"
 
@@ -1230,17 +1230,19 @@
 "Some government or corporate firewalls censor connections to Tor's website. "
 "In those cases, you have three options. First, get it from a friend &mdash; "
 "the <a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a> fits "
-"nicely on a USB key. Second, find the google cache for the <a href=\"<page "
-"getinvolved/mirrors>\">Tor mirrors</a> page and see if any of those copies "
-"of our website work for you. Third, you can download Tor via email: log in "
-"to your Gmail account and mail '<tt>gettor AT torproject.org</tt>'. If you "
-"include the word 'help' in the body of the email, it will reply with "
-"instructions. Note that only a few webmail providers are supported, since "
-"they need to be able to receive very large attachments."
+"nicely on a USB key. Second, find the <a "
+"href=\"https://encrypted.google.com/search?q=tor+mirrors\";>google cache</a> "
+"for the <a href=\"<page getinvolved/mirrors>\">Tor mirrors</a> page and see "
+"if any of those copies of our website work for you. Third, you can download "
+"Tor via email: log in to your Gmail account and mail '<tt>gettor AT "
+"torproject.org</tt>'. If you include the word 'help' in the body of the "
+"email, it will reply with instructions. Note that only a few webmail "
+"providers are supported, since they need to be able to receive very large "
+"attachments."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:669
+#: /home/runa/tor/website/docs/en/faq.wml:670
 msgid ""
 "Be sure to <a href=\"<page docs/verifying-signatures>\">verify the "
 "signature</a> of any package you download, especially when you get it from "
@@ -1248,26 +1250,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:674
+#: /home/runa/tor/website/docs/en/faq.wml:675
 msgid "<hr> <a id=\"CompileTorWindows\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:677
+#: /home/runa/tor/website/docs/en/faq.wml:678
 msgid ""
 "<a class=\"anchor\" href=\"#CompileTorWindows\">How do I compile Tor under "
 "Windows?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:680
+#: /home/runa/tor/website/docs/en/faq.wml:681
 msgid ""
 "Try following the steps at <a href=\"<gitblob>doc/tor-win32-mingw-"
 "creation.txt\"> tor-win32-mingw-creation.txt</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:685
+#: /home/runa/tor/website/docs/en/faq.wml:686
 msgid ""
 "(Note that you don't need to compile Tor yourself in order to use it. Most "
 "people just use the packages available on the <a href=\"<page "
@@ -1275,19 +1277,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:690
+#: /home/runa/tor/website/docs/en/faq.wml:691
 msgid "<hr> <a id=\"VirusFalsePositives\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:693
+#: /home/runa/tor/website/docs/en/faq.wml:694
 msgid ""
 "<a class=\"anchor\" href=\"#VirusFalsePositives\">Why does my Tor executable"
 " appear to have a virus or spyware?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:696
+#: /home/runa/tor/website/docs/en/faq.wml:697
 msgid ""
 "Sometimes, overzealous Windows virus and spyware detectors trigger on some "
 "parts of the Tor Windows binary. Our best guess is that these are false "
@@ -1298,7 +1300,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:704
+#: /home/runa/tor/website/docs/en/faq.wml:705
 msgid ""
 "In the meantime, we encourage you to not just take our word for it. Our job "
 "is to provide the source; if you're concerned, please do <a "
@@ -1306,19 +1308,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:709
+#: /home/runa/tor/website/docs/en/faq.wml:710
 msgid "<hr> <a id=\"LiveCD\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:712
+#: /home/runa/tor/website/docs/en/faq.wml:713
 msgid ""
 "<a class=\"anchor\" href=\"#LiveCD\">Is there a LiveCD or other bundle that "
 "includes Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:715
+#: /home/runa/tor/website/docs/en/faq.wml:716
 msgid ""
 "Yes.  Use <a href=\"https://tails.boum.org/\";>The Amnesic Incognito Live "
 "System</a> or <a href=\"<page projects/torbrowser>\">the Tor Browser "
@@ -1326,19 +1328,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:720
+#: /home/runa/tor/website/docs/en/faq.wml:721
 msgid "<hr> <a id=\"torrc\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:723
+#: /home/runa/tor/website/docs/en/faq.wml:724
 msgid ""
 "<a class=\"anchor\" href=\"#torrc\">I'm supposed to \"edit my torrc\". What "
 "does that mean?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:726
+#: /home/runa/tor/website/docs/en/faq.wml:727
 msgid ""
 "Tor installs a text file called torrc that contains configuration "
 "instructions for how your Tor program should behave. The default "
@@ -1348,12 +1350,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:734
+#: /home/runa/tor/website/docs/en/faq.wml:735
 msgid "The location of your torrc file depends on the way you installed Tor:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:738
+#: /home/runa/tor/website/docs/en/faq.wml:739
 msgid ""
 "On Windows, if you installed a Tor bundle with Vidalia, you can find your "
 "torrc file in the Start menu under Programs -&gt; Vidalia Bundle -&gt; Tor, "
@@ -1366,14 +1368,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:747
+#: /home/runa/tor/website/docs/en/faq.wml:748
 msgid ""
 "On OS X, if you use Vidalia, edit <code>~/.vidalia/torrc</code>. Otherwise, "
 "open your favorite text editor and load <code>/Library/Tor/torrc</code>."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:751
+#: /home/runa/tor/website/docs/en/faq.wml:752
 msgid ""
 "On Unix, if you installed a pre-built package, look for "
 "<code>/etc/tor/torrc</code> or <code>/etc/torrc</code> or consult your "
@@ -1381,7 +1383,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:755
+#: /home/runa/tor/website/docs/en/faq.wml:756
 msgid ""
 "Finally, if you installed from source, you may not have a torrc installed "
 "yet: look in <code>/usr/local/etc/</code> and note that you may need to "
@@ -1389,14 +1391,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:762
+#: /home/runa/tor/website/docs/en/faq.wml:763
 msgid ""
 "If you use Vidalia, be sure to exit both Tor and Vidalia before you edit "
 "your torrc file. Otherwise Vidalia might overwrite your changes."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:767
+#: /home/runa/tor/website/docs/en/faq.wml:768
 msgid ""
 "Once you've changed your torrc, you will need to restart Tor for the changes"
 " to take effect. (For advanced users on OS X and Unix, note that you "
@@ -1404,7 +1406,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:773
+#: /home/runa/tor/website/docs/en/faq.wml:774
 msgid ""
 "For other configuration options you can use, look at the <a href=\"<page "
 "docs/tor-manual>\">Tor manual page</a>. Remember, all lines beginning with #"
@@ -1412,19 +1414,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:779
+#: /home/runa/tor/website/docs/en/faq.wml:780
 msgid "<hr> <a id=\"Logs\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:782
+#: /home/runa/tor/website/docs/en/faq.wml:783
 msgid ""
 "<a class=\"anchor\" href=\"#Logs\">How do I set up logging, or see Tor's "
 "logs?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:785
+#: /home/runa/tor/website/docs/en/faq.wml:786
 msgid ""
 "If you installed a Tor bundle that includes Vidalia, then Vidalia has a "
 "window called \"Message Log\" that will show you Tor's log messages. You can"
@@ -1433,19 +1435,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:792
+#: /home/runa/tor/website/docs/en/faq.wml:793
 msgid ""
 "If you're not using Vidalia, you'll have to go find the log files by hand. "
 "Here are some likely places for your logs to be:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:797
+#: /home/runa/tor/website/docs/en/faq.wml:798
 msgid "On OS X, Debian, Red Hat, etc, the logs are in /var/log/tor/"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:799
+#: /home/runa/tor/website/docs/en/faq.wml:800
 msgid ""
 "On Windows, there are no default log files currently. If you enable logs in "
 "your torrc file, they default to <code>\\username\\Application "
@@ -1453,7 +1455,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:803
+#: /home/runa/tor/website/docs/en/faq.wml:804
 msgid ""
 "If you compiled Tor from source, by default your Tor logs to <a "
 "href=\"http://en.wikipedia.org/wiki/Standard_streams\";>\"stdout\"</a> at "
@@ -1462,7 +1464,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:811
+#: /home/runa/tor/website/docs/en/faq.wml:812
 msgid ""
 "To change your logging setup by hand, <a href=\"#torrc\">edit your torrc</a>"
 " and find the section (near the top of the file) which contains the "
@@ -1470,7 +1472,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:817
+#: /home/runa/tor/website/docs/en/faq.wml:818
 #, no-wrap
 msgid ""
 "\\## Logs go to stdout at level \"notice\" unless redirected by something\n"
@@ -1478,7 +1480,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:822
+#: /home/runa/tor/website/docs/en/faq.wml:823
 msgid ""
 "For example, if you want Tor to send complete debug, info, notice, warn, and"
 " err level messages to a file, append the following line to the end of the "
@@ -1486,32 +1488,32 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:828
+#: /home/runa/tor/website/docs/en/faq.wml:829
 #, no-wrap
 msgid "Log debug file c:/program files/tor/debug.log\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:832
+#: /home/runa/tor/website/docs/en/faq.wml:833
 msgid ""
 "Replace <code>c:/program files/tor/debug.log</code> with a directory and "
 "filename for your Tor log."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:836
+#: /home/runa/tor/website/docs/en/faq.wml:837
 msgid "<hr> <a id=\"DoesntWork\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:839
+#: /home/runa/tor/website/docs/en/faq.wml:840
 msgid ""
 "<a class=\"anchor\" href=\"#DoesntWork\">I installed Tor and Polipo but it's"
 " not working.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:842
+#: /home/runa/tor/website/docs/en/faq.wml:843
 msgid ""
 "Once you've installed the Tor bundle, there are two questions to ask: first,"
 " is your Tor able to establish a circuit? Second, is your Firefox correctly "
@@ -1519,7 +1521,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:847
+#: /home/runa/tor/website/docs/en/faq.wml:848
 msgid ""
 "If Tor can establish a circuit, the onion icon in Vidalia will turn green. "
 "You can also check in the Vidalia Control Panel to make sure it says "
@@ -1529,19 +1531,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:857
+#: /home/runa/tor/website/docs/en/faq.wml:858
 msgid "If Tor can't establish a circuit, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:861
+#: /home/runa/tor/website/docs/en/faq.wml:862
 msgid ""
 "Are you sure Tor is running? If you're using Vidalia, you may have to click "
 "on the onion and select \"Start\" to launch Tor."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:863
+#: /home/runa/tor/website/docs/en/faq.wml:864
 msgid ""
 "Check your system clock. If it's more than a few hours off, Tor will refuse "
 "to build circuits. For XP users, synchronize your clock under the clock "
@@ -1550,7 +1552,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:867
+#: /home/runa/tor/website/docs/en/faq.wml:868
 msgid ""
 "Is your Internet connection <a href=\"#FirewallPorts\">firewalled by "
 "port</a>, or do you normally need to use a <a "
@@ -1558,7 +1560,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:872
+#: /home/runa/tor/website/docs/en/faq.wml:873
 msgid ""
 "Are you running programs like Norton Internet Security or SELinux that block"
 " certain connections, even though you don't realize they do? They could be "
@@ -1566,7 +1568,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:875
+#: /home/runa/tor/website/docs/en/faq.wml:876
 msgid ""
 "Are you in China, or behind a restrictive corporate network firewall that "
 "blocks the public Tor relays? If so, you should learn about <a href=\"<page "
@@ -1574,14 +1576,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:878
+#: /home/runa/tor/website/docs/en/faq.wml:879
 msgid ""
 "Check your <a href=\"#Logs\">Tor logs</a>. Do they give you any hints about "
 "what's going wrong?"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:883
+#: /home/runa/tor/website/docs/en/faq.wml:884
 msgid ""
 "Step two is to confirm that Firefox is correctly configured to send its "
 "traffic through Tor. Try the <a href=\"https://check.torproject.org/\";>Tor "
@@ -1591,12 +1593,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:891
+#: /home/runa/tor/website/docs/en/faq.wml:892
 msgid "If it thinks you're not using Tor, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:895
+#: /home/runa/tor/website/docs/en/faq.wml:896
 msgid ""
 "Did you install the Torbutton extension for Firefox? The installation "
 "bundles include it, but sometimes people forget to install it. Make sure it "
@@ -1605,7 +1607,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:900
+#: /home/runa/tor/website/docs/en/faq.wml:901
 msgid ""
 "Do you have incompatible Firefox extensions like FoxyProxy installed? If so,"
 " uninstall them. (Note that using FoxyProxy is NOT a sufficient substitute "
@@ -1617,7 +1619,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:907
+#: /home/runa/tor/website/docs/en/faq.wml:908
 msgid ""
 "If your browser says \"The proxy server is refusing connections.\", check "
 "that Polipo (the http proxy that passes traffic between Firefox and Tor) is "
@@ -1627,7 +1629,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:912
+#: /home/runa/tor/website/docs/en/faq.wml:913
 msgid ""
 "If you're upgrading from OS X, some of the earlier OS X installers were "
 "broken in really unfortunate ways. You may find that <a href=\"<page docs"
@@ -1637,14 +1639,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:917
+#: /home/runa/tor/website/docs/en/faq.wml:918
 msgid ""
 "If you're on Linux, make sure Privoxy isn't running, since it will conflict "
 "with the port that our Polipo configuration file picks."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:919
+#: /home/runa/tor/website/docs/en/faq.wml:920
 msgid ""
 "If you installed Polipo yourself (not from a bundle), did you edit the "
 "config file as described? Did you restart Polipo after this change? Are you "
@@ -1652,7 +1654,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:922
+#: /home/runa/tor/website/docs/en/faq.wml:923
 msgid ""
 "For Red Hat Linux and related systems, do you have SELinux enabled? If so, "
 "it might be preventing Polipo from talking to Tor. We also run across BSD "
@@ -1661,19 +1663,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:928
+#: /home/runa/tor/website/docs/en/faq.wml:929
 msgid "<hr /> <a id=\"VidaliaPassword\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:931
+#: /home/runa/tor/website/docs/en/faq.wml:932
 msgid ""
 "<a class=\"anchor\" href=\"#VidaliaPassword\">Tor/Vidalia prompts for a "
 "password at start.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:934
+#: /home/runa/tor/website/docs/en/faq.wml:935
 msgid ""
 "Vidalia interacts with the Tor software via Tor's \"control port\". The "
 "control port lets Vidalia receive status updates from Tor, request a new "
@@ -1684,7 +1686,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:943
+#: /home/runa/tor/website/docs/en/faq.wml:944
 msgid ""
 "Usually this process of generating and setting a random control password "
 "happens in the background. There are three common situations, though, where "
@@ -1692,7 +1694,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:949
+#: /home/runa/tor/website/docs/en/faq.wml:950
 msgid ""
 "You're already running Vidalia and Tor. For example, this situation can "
 "happen if you installed the Vidalia bundle and now you're trying to run the "
@@ -1701,7 +1703,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:954
+#: /home/runa/tor/website/docs/en/faq.wml:955
 msgid ""
 "Vidalia crashed, but left Tor running with the last known random password. "
 "After you restart Vidalia, it generates a new random password, but Vidalia "
@@ -1715,7 +1717,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:967
+#: /home/runa/tor/website/docs/en/faq.wml:968
 msgid ""
 "You had previously set Tor to run as a Windows NT service. When Tor is set "
 "to run as a service, it starts up when the system boots. If you configured "
@@ -1730,19 +1732,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:982
+#: /home/runa/tor/website/docs/en/faq.wml:983
 msgid "<hr> <a id=\"ChooseEntryExit\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:985
+#: /home/runa/tor/website/docs/en/faq.wml:986
 msgid ""
 "<a class=\"anchor\" href=\"#ChooseEntryExit\">Can I control which nodes (or "
 "country) are used for entry/exit?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:988
+#: /home/runa/tor/website/docs/en/faq.wml:989
 msgid ""
 "Yes. You can set preferred entry and exit nodes as well as inform Tor which "
 "nodes you do not want to use.  The following options can be added to your "
@@ -1751,53 +1753,53 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:994
+#: /home/runa/tor/website/docs/en/faq.wml:995
 msgid "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:995
+#: /home/runa/tor/website/docs/en/faq.wml:996
 msgid ""
 "A list of preferred nodes to use for the first hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:997
+#: /home/runa/tor/website/docs/en/faq.wml:998
 msgid "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:998
+#: /home/runa/tor/website/docs/en/faq.wml:999
 msgid ""
 "A list of preferred nodes to use for the last hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:1000
+#: /home/runa/tor/website/docs/en/faq.wml:1001
 msgid "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:1001
+#: /home/runa/tor/website/docs/en/faq.wml:1002
 msgid "A list of nodes to never use when building a circuit."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:1003
+#: /home/runa/tor/website/docs/en/faq.wml:1004
 msgid "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:1004
+#: /home/runa/tor/website/docs/en/faq.wml:1005
 msgid ""
 "A list of nodes to never use when picking an exit.  Nodes listed in "
 "<tt>ExcludeNodes</tt> are automatically in this list."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1009
+#: /home/runa/tor/website/docs/en/faq.wml:1010
 msgid ""
 "<em>We recommend you do not use these</em> &mdash; they are intended for "
 "testing and may disappear in future versions.  You get the best security "
@@ -1807,7 +1809,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1016
+#: /home/runa/tor/website/docs/en/faq.wml:1017
 msgid ""
 "The <tt>EntryNodes</tt> and <tt>ExitNodes</tt> config options are treated as"
 " a request, meaning if the nodes are down or seem slow, Tor will still avoid"
@@ -1819,7 +1821,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1026
+#: /home/runa/tor/website/docs/en/faq.wml:1027
 msgid ""
 "Instead of <tt>$fingerprint</tt> you can also specify a 2 letter ISO3166 "
 "country code in curly braces (for example {de}), or an ip address pattern "
@@ -1828,7 +1830,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1032
+#: /home/runa/tor/website/docs/en/faq.wml:1033
 msgid ""
 "If you want to access a service directly through Tor's SOCKS interface (eg. "
 "using ssh via connect.c), another option is to set up an internal mapping in"
@@ -1837,26 +1839,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1038
+#: /home/runa/tor/website/docs/en/faq.wml:1039
 msgid "<hr> <a id=\"GoogleCaptcha\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1041
+#: /home/runa/tor/website/docs/en/faq.wml:1042
 msgid ""
 "<a class=\"anchor\" href=\"#GoogleCaptcha\">Google makes me solve a Captcha "
 "or tells me I have spyware installed.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1044
+#: /home/runa/tor/website/docs/en/faq.wml:1045
 msgid ""
 "This is a known and intermittent problem; it does not mean that Google "
 "considers Tor to be spyware."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1049
+#: /home/runa/tor/website/docs/en/faq.wml:1050
 msgid ""
 "When you use Tor, you are sending queries through exit relays that are also "
 "shared by thousands of other users. Tor users typically see this message "
@@ -1867,7 +1869,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1057
+#: /home/runa/tor/website/docs/en/faq.wml:1058
 msgid ""
 "An alternate explanation is that Google tries to detect certain kinds of "
 "spyware or viruses that send distinctive queries to Google Search. It notes "
@@ -1877,7 +1879,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1066
+#: /home/runa/tor/website/docs/en/faq.wml:1067
 msgid ""
 "To our knowledge, Google is not doing anything intentionally specifically to"
 " deter or block Tor use. The error message about an infected machine should "
@@ -1885,7 +1887,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1072
+#: /home/runa/tor/website/docs/en/faq.wml:1073
 msgid ""
 "Torbutton 1.2.5 (released in mid 2010) detects Google captchas and can "
 "automatically redirect you to a more Tor-friendly search engine such as "
@@ -1893,19 +1895,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1077
+#: /home/runa/tor/website/docs/en/faq.wml:1078
 msgid "<hr /> <a id=\"GmailWarning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1080
+#: /home/runa/tor/website/docs/en/faq.wml:1081
 msgid ""
 "<a class=\"anchor\" href=\"#GmailWarning\">Gmail warns me that my account "
 "may have been compromised.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1083
+#: /home/runa/tor/website/docs/en/faq.wml:1084
 msgid ""
 "Sometimes, after you've used Gmail over Tor, Google presents a pop-up "
 "notification that your account may have been compromised.  The notification "
@@ -1914,7 +1916,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1090
+#: /home/runa/tor/website/docs/en/faq.wml:1091
 msgid ""
 "In general this is a false alarm: Google saw a bunch of logins from "
 "different places, as a result of running the service via Tor, and decided it"
@@ -1923,7 +1925,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1097
+#: /home/runa/tor/website/docs/en/faq.wml:1098
 msgid ""
 "Even though this may be a biproduct of using the service via tor, that "
 "doesn't mean you can entirely ignore the warning. It is <i>probably</i> a "
@@ -1932,7 +1934,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1104
+#: /home/runa/tor/website/docs/en/faq.wml:1105
 msgid ""
 "Cookie hijacking is possible by either physical access to your computer or "
 "by watching your network traffic.  In theory only physical access should "
@@ -1943,7 +1945,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1113
+#: /home/runa/tor/website/docs/en/faq.wml:1114
 msgid ""
 "And if somebody <i>did</i> steal your google cookie, they might end up "
 "logging in from unusual places (though of course they also might not). So "
@@ -1955,19 +1957,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1122
+#: /home/runa/tor/website/docs/en/faq.wml:1123
 msgid "<hr> <a id=\"FirewallPorts\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1125
+#: /home/runa/tor/website/docs/en/faq.wml:1126
 msgid ""
 "<a class=\"anchor\" href=\"#FirewallPorts\">My firewall only allows a few "
 "outgoing ports.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1128
+#: /home/runa/tor/website/docs/en/faq.wml:1129
 msgid ""
 "If your firewall works by blocking ports, then you can tell Tor to only use "
 "the ports that your firewall permits by adding \"FascistFirewall 1\" to your"
@@ -1977,7 +1979,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1136
+#: /home/runa/tor/website/docs/en/faq.wml:1137
 msgid ""
 "By default, when you set this Tor assumes that your firewall allows only "
 "port 80 and port 443 (HTTP and HTTPS respectively). You can select a "
@@ -1985,14 +1987,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1142
+#: /home/runa/tor/website/docs/en/faq.wml:1143
 msgid ""
 "If you want to be more fine-grained with your controls, you can also use the"
 " ReachableAddresses config options, e.g.:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1147
+#: /home/runa/tor/website/docs/en/faq.wml:1148
 #, no-wrap
 msgid ""
 "  ReachableDirAddresses *:80\n"
@@ -2000,24 +2002,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1151
+#: /home/runa/tor/website/docs/en/faq.wml:1152
 msgid "<hr> <a id=\"RelayFlexible\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1154
+#: /home/runa/tor/website/docs/en/faq.wml:1155
 msgid ""
 "<a class=\"anchor\" href=\"#RelayFlexible\">How stable does my relay need to"
 " be?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1157
+#: /home/runa/tor/website/docs/en/faq.wml:1158
 msgid "We aim to make setting up a Tor relay easy and convenient:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1161
+#: /home/runa/tor/website/docs/en/faq.wml:1162
 msgid ""
 "Tor has built-in support for <a "
 "href=\"<wikifaq>#WhatbandwidthshapingoptionsareavailabletoTorrelays\"> rate "
@@ -2028,7 +2030,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1169
+#: /home/runa/tor/website/docs/en/faq.wml:1170
 msgid ""
 "Each Tor relay has an <a href=\"#ExitPolicies\">exit policy</a> that "
 "specifies what sort of outbound connections are allowed or refused from that"
@@ -2037,7 +2039,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1174
+#: /home/runa/tor/website/docs/en/faq.wml:1175
 msgid ""
 "It's fine if the relay goes offline sometimes. The directories notice this "
 "quickly and stop advertising the relay. Just try to make sure it's not too "
@@ -2045,14 +2047,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1179
+#: /home/runa/tor/website/docs/en/faq.wml:1180
 msgid ""
 "We can handle relays with dynamic IPs just fine &mdash; simply leave the "
 "Address config option blank, and Tor will try to guess."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1182
+#: /home/runa/tor/website/docs/en/faq.wml:1183
 msgid ""
 "If your relay is behind a NAT and it doesn't know its public IP (e.g. it has"
 " an IP of 192.168.x.y), you'll need to set up port forwarding. Forwarding "
@@ -2062,7 +2064,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1188
+#: /home/runa/tor/website/docs/en/faq.wml:1189
 msgid ""
 "Your relay will passively estimate and advertise its recent bandwidth "
 "capacity, so high-bandwidth relays will attract more users than low-"
@@ -2070,24 +2072,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1194
+#: /home/runa/tor/website/docs/en/faq.wml:1195
 msgid "<hr> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1198
+#: /home/runa/tor/website/docs/en/faq.wml:1199
 msgid ""
 "<a class=\"anchor\" href=\"#ExitPolicies\">I'd run a relay, but I don't want"
 " to deal with abuse issues.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1201
+#: /home/runa/tor/website/docs/en/faq.wml:1202
 msgid "Great. That's exactly why we implemented exit policies."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1205
+#: /home/runa/tor/website/docs/en/faq.wml:1206
 msgid ""
 "Each Tor relay has an exit policy that specifies what sort of outbound "
 "connections are allowed or refused from that relay. The exit policies are "
@@ -2103,7 +2105,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1219
+#: /home/runa/tor/website/docs/en/faq.wml:1220
 msgid ""
 "The default exit policy allows access to many popular services (e.g. web "
 "browsing), but <a "
@@ -2119,7 +2121,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1233
+#: /home/runa/tor/website/docs/en/faq.wml:1234
 msgid ""
 "If you do allow any exit connections, make sure name resolution works (that "
 "is, your computer can resolve Internet addresses correctly).  If there are "
@@ -2129,19 +2131,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1241
+#: /home/runa/tor/website/docs/en/faq.wml:1242
 msgid "<hr> <a id=\"RelayOrBridge\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1244
+#: /home/runa/tor/website/docs/en/faq.wml:1245
 msgid ""
 "<a class=\"anchor\" href=\"#RelayOrBridge\">Should I be a normal relay or "
 "bridge relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1246
+#: /home/runa/tor/website/docs/en/faq.wml:1247
 msgid ""
 "<a href=\"<page docs/bridges>\">Bridge relays</a> (or \"bridges\" for short)"
 "  are <a href=\"<page docs/tor-doc-relay>\">Tor relays</a> that aren't "
@@ -2151,7 +2153,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1253
+#: /home/runa/tor/website/docs/en/faq.wml:1254
 msgid ""
 "Being a normal relay vs being a bridge relay is almost the same "
 "configuration: it's just a matter of whether your relay is listed publically"
@@ -2159,7 +2161,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1258
+#: /home/runa/tor/website/docs/en/faq.wml:1259
 msgid ""
 "Right now, China is the main place in the world that filters connections to "
 "the Tor network. So bridges are useful a) for users in China, b) as a backup"
@@ -2169,7 +2171,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1266
+#: /home/runa/tor/website/docs/en/faq.wml:1267
 msgid ""
 "So should you run a normal relay or bridge relay? If you have lots of "
 "bandwidth, you should definitely run a normal relay &mdash; the average "
@@ -2180,19 +2182,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1275
+#: /home/runa/tor/website/docs/en/faq.wml:1276
 msgid "<hr> <a id=\"MultipleRelays\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1278
+#: /home/runa/tor/website/docs/en/faq.wml:1279
 msgid ""
 "<a class=\"anchor\" href=\"#MultipleRelays\">I want to run more than one "
 "relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1281
+#: /home/runa/tor/website/docs/en/faq.wml:1282
 msgid ""
 "Great. If you want to run several relays to donate more to the network, "
 "we're happy with that. But please don't run more than a few dozen on the "
@@ -2201,7 +2203,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1288
+#: /home/runa/tor/website/docs/en/faq.wml:1289
 msgid ""
 "If you do decide to run more than one relay, please set the \"MyFamily\" "
 "config option in the <a href=\"#torrc\">torrc</a> of each relay, listing all"
@@ -2209,13 +2211,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1294
+#: /home/runa/tor/website/docs/en/faq.wml:1295
 #, no-wrap
 msgid "    MyFamily $fingerprint1,$fingerprint2,$fingerprint3\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1298
+#: /home/runa/tor/website/docs/en/faq.wml:1299
 msgid ""
 "where each fingerprint is the 40 character identity fingerprint (without "
 "spaces). You can also list them by nickname, but fingerprint is safer. Be "
@@ -2224,7 +2226,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1305
+#: /home/runa/tor/website/docs/en/faq.wml:1306
 msgid ""
 "That way clients will know to avoid using more than one of your relays in a "
 "single circuit. You should set MyFamily if you have administrative control "
@@ -2233,26 +2235,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1311
+#: /home/runa/tor/website/docs/en/faq.wml:1312
 msgid "<hr> <a id=\"RelayMemory\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1314
+#: /home/runa/tor/website/docs/en/faq.wml:1315
 msgid ""
 "<a class=\"anchor\" href=\"#RelayMemory\">Why is my Tor relay using so much "
 "memory?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1316
+#: /home/runa/tor/website/docs/en/faq.wml:1317
 msgid ""
 "If your Tor relay is using more memory than you'd like, here are some tips "
 "for reducing its footprint:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1321
+#: /home/runa/tor/website/docs/en/faq.wml:1322
 msgid ""
 "If you're on Linux, you may be encountering memory fragmentation bugs in "
 "glibc's malloc implementation. That is, when Tor releases memory back to the"
@@ -2264,7 +2266,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1329
+#: /home/runa/tor/website/docs/en/faq.wml:1330
 msgid ""
 "If you're running a fast relay, meaning you have many TLS connections open, "
 "you are probably losing a lot of memory to OpenSSL's internal buffers (38KB+"
@@ -2276,7 +2278,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1337
+#: /home/runa/tor/website/docs/en/faq.wml:1338
 msgid ""
 "If you're running on Solaris, OpenBSD, NetBSD, or old FreeBSD, Tor is "
 "probably forking separate processes rather than using threads. Consider "
@@ -2286,7 +2288,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1343
+#: /home/runa/tor/website/docs/en/faq.wml:1344
 msgid ""
 "If you still can't handle the memory load, consider reducing the amount of "
 "bandwidth your relay advertises. Advertising less bandwidth means you will "
@@ -2295,60 +2297,60 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1352
+#: /home/runa/tor/website/docs/en/faq.wml:1353
 msgid ""
 "All of this said, fast Tor relays do use a lot of ram. It is not unusual for"
 " a fast exit relay to use 500-1000 MB of memory."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1356
+#: /home/runa/tor/website/docs/en/faq.wml:1357
 msgid "<hr> <a id=\"WhyNotNamed\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1359
+#: /home/runa/tor/website/docs/en/faq.wml:1360
 msgid "<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1362
+#: /home/runa/tor/website/docs/en/faq.wml:1363
 msgid ""
 "We currently use these metrics to determine if your relay should be "
 "named:<br>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1365
+#: /home/runa/tor/website/docs/en/faq.wml:1366
 msgid ""
 "The name is not currently mapped to a different key. Existing mappings are "
 "removed after 6 months of inactivity from a relay."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1367
+#: /home/runa/tor/website/docs/en/faq.wml:1368
 msgid "The relay must have been around for at least two weeks."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1368
+#: /home/runa/tor/website/docs/en/faq.wml:1369
 msgid "No other router may have wanted the same name in the past month."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1371
+#: /home/runa/tor/website/docs/en/faq.wml:1372
 msgid "<hr> <a id=\"KeyManagement\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1374
+#: /home/runa/tor/website/docs/en/faq.wml:1375
 msgid ""
 "<a class=\"anchor\" href=\"#KeyManagement\">Tell me about all the keys Tor "
 "uses.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1377
+#: /home/runa/tor/website/docs/en/faq.wml:1378
 msgid ""
 "Tor uses a variety of different keys, with three goals in mind: 1)  "
 "encryption to ensure privacy of data within the Tor network, 2)  "
@@ -2358,7 +2360,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1385
+#: /home/runa/tor/website/docs/en/faq.wml:1386
 msgid ""
 "<b>Encryption</b>: first, all connections in Tor use TLS link encryption, so"
 " observers can't look inside to see which circuit a given cell is intended "
@@ -2369,7 +2371,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1395
+#: /home/runa/tor/website/docs/en/faq.wml:1396
 msgid ""
 "<b>Authentication</b>: Every Tor relay has a public decryption key called "
 "the \"onion key\".  When the Tor client establishes circuits, at each step "
@@ -2380,7 +2382,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1405
+#: /home/runa/tor/website/docs/en/faq.wml:1406
 msgid ""
 "<b>Coordination</b>: How do clients know what the relays are, and how do "
 "they know that they have the right keys for them? Each relay has a long-term"
@@ -2395,7 +2397,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1419
+#: /home/runa/tor/website/docs/en/faq.wml:1420
 msgid ""
 "How do clients know what the directory authorities are? The Tor software "
 "comes with a built-in list of location and public key for each directory "
@@ -2404,7 +2406,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1426
+#: /home/runa/tor/website/docs/en/faq.wml:1427
 msgid ""
 "How do users know they've got the right software? When we distribute the "
 "source code or a package, we digitally sign it with <a "
@@ -2414,7 +2416,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1434
+#: /home/runa/tor/website/docs/en/faq.wml:1435
 msgid ""
 "In order to be certain that it's really signed by us, you need to have met "
 "us in person and gotten a copy of our GPG key fingerprint, or you need to "
@@ -2424,17 +2426,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1441
+#: /home/runa/tor/website/docs/en/faq.wml:1442
 msgid "<hr> <a id=\"EntryGuards\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1444
+#: /home/runa/tor/website/docs/en/faq.wml:1445
 msgid "<a class=\"anchor\" href=\"#EntryGuards\">What are Entry Guards?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1447
+#: /home/runa/tor/website/docs/en/faq.wml:1448
 msgid ""
 "Tor (like all current practical low-latency anonymity designs) fails when "
 "the attacker can see both ends of the communications channel. For example, "
@@ -2446,7 +2448,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1457
+#: /home/runa/tor/website/docs/en/faq.wml:1458
 msgid ""
 "So, what should we do? Suppose the attacker controls, or can observe, "
 "<i>C</i> relays. Suppose there are <i>N</i> relays total. If you select new "
@@ -2460,7 +2462,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1469
+#: /home/runa/tor/website/docs/en/faq.wml:1470
 msgid ""
 "The solution is \"entry guards\": each Tor client selects a few relays at "
 "random to use as entry points, and uses only those relays for her first hop."
@@ -2473,7 +2475,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1480
+#: /home/runa/tor/website/docs/en/faq.wml:1481
 msgid ""
 "You can read more at <a href=\"http://freehaven.net/anonbib/#wright02\";>An "
 "Analysis of the Degradation of Anonymous Protocols</a>, <a "
@@ -2484,7 +2486,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1489
+#: /home/runa/tor/website/docs/en/faq.wml:1490
 msgid ""
 "Restricting your entry nodes may also help against attackers who want to run"
 " a few Tor nodes and easily enumerate all of the Tor user IP addresses. "
@@ -2495,19 +2497,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1497
+#: /home/runa/tor/website/docs/en/faq.wml:1498
 msgid "<hr> <a id=\"EverybodyARelay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1500
+#: /home/runa/tor/website/docs/en/faq.wml:1501
 msgid ""
 "<a class=\"anchor\" href=\"#EverybodyARelay\">You should make every Tor user"
 " be a relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1503
+#: /home/runa/tor/website/docs/en/faq.wml:1504
 msgid ""
 "Requiring every Tor user to be a relay would help with scaling the network "
 "to handle all our users, and <a "
@@ -2522,7 +2524,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1516
+#: /home/runa/tor/website/docs/en/faq.wml:1517
 msgid ""
 "That said, we do want to encourage Tor users to run relays, so what we "
 "really want to do is simplify the process of setting up and maintaining a "
@@ -2533,12 +2535,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1525
+#: /home/runa/tor/website/docs/en/faq.wml:1526
 msgid "There are five steps we need to address before we can do this though:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1529
+#: /home/runa/tor/website/docs/en/faq.wml:1530
 msgid ""
 "First, we need to make Tor stable as a relay on all common operating "
 "systems. The main remaining platform is Windows, and we plan to finally "
@@ -2548,7 +2550,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1537
+#: /home/runa/tor/website/docs/en/faq.wml:1538
 msgid ""
 "Second, we still need to get better at automatically estimating the right "
 "amount of bandwidth to allow. See item #7 on the <a href=\"<page "
@@ -2560,7 +2562,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1548
+#: /home/runa/tor/website/docs/en/faq.wml:1549
 msgid ""
 "Third, we need to work on scalability, both of the network (how to stop "
 "requiring that all Tor relays be able to connect to all Tor relays) and of "
@@ -2572,7 +2574,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1558
+#: /home/runa/tor/website/docs/en/faq.wml:1559
 msgid ""
 "Fourth, we need to better understand the risks from letting the attacker "
 "send traffic through your relay while you're also initiating your own "
@@ -2590,7 +2592,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1574
+#: /home/runa/tor/website/docs/en/faq.wml:1575
 msgid ""
 "Fifth, we might need some sort of incentive scheme to encourage people to "
 "relay traffic for others, and/or to become exit nodes. Here are our <a "
@@ -2599,24 +2601,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1581
+#: /home/runa/tor/website/docs/en/faq.wml:1582
 msgid "Please help on all of these!"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1584
+#: /home/runa/tor/website/docs/en/faq.wml:1585
 msgid "<hr> <a id=\"TransportIPnotTCP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1587
+#: /home/runa/tor/website/docs/en/faq.wml:1588
 msgid ""
 "<a class=\"anchor\" href=\"#TransportIPnotTCP\">You should transport all IP "
 "packets, not just TCP packets.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1590
+#: /home/runa/tor/website/docs/en/faq.wml:1591
 msgid ""
 "This would be handy, because it would make Tor better able to handle new "
 "protocols like VoIP, it could solve the whole need to socksify applications,"
@@ -2625,7 +2627,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1597
+#: /home/runa/tor/website/docs/en/faq.wml:1598
 msgid ""
 "We're heading in this direction: see <a "
 "href=\"https://trac.torproject.org/projects/tor/ticket/1855\";>this trac "
@@ -2634,7 +2636,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1604
+#: /home/runa/tor/website/docs/en/faq.wml:1605
 msgid ""
 "IP packets reveal OS characteristics. We would still need to do IP-level "
 "packet normalization, to stop things like TCP fingerprinting attacks. Given "
@@ -2645,7 +2647,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1611
+#: /home/runa/tor/website/docs/en/faq.wml:1612
 msgid ""
 "Application-level streams still need scrubbing. We will still need user-side"
 " applications like Torbutton. So it won't become just a matter of capturing "
@@ -2653,7 +2655,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1615
+#: /home/runa/tor/website/docs/en/faq.wml:1616
 msgid ""
 "Certain protocols will still leak information. For example, we must rewrite "
 "DNS requests so they are delivered to an unlinkable DNS server rather than "
@@ -2662,7 +2664,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1620
+#: /home/runa/tor/website/docs/en/faq.wml:1621
 msgid ""
 "<a "
 "href=\"http://crypto.stanford.edu/~nagendra/projects/dtls/dtls.html\";>DTLS</a>"
@@ -2673,7 +2675,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1627
+#: /home/runa/tor/website/docs/en/faq.wml:1628
 msgid ""
 "Exit policies for arbitrary IP packets mean building a secure IDS. Our node "
 "operators tell us that exit policies are one of the main reasons they're "
@@ -2691,7 +2693,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1641
+#: /home/runa/tor/website/docs/en/faq.wml:1642
 msgid ""
 "The Tor-internal name spaces would need to be redesigned. We support hidden "
 "service \".onion\" addresses by intercepting the addresses when they are "
@@ -2700,38 +2702,38 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1648
+#: /home/runa/tor/website/docs/en/faq.wml:1649
 msgid "<hr> <a id=\"Criminals\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1651
+#: /home/runa/tor/website/docs/en/faq.wml:1652
 msgid ""
 "<a class=\"anchor\" href=\"#Criminals\">Doesn't Tor enable criminals to do "
 "bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1654
+#: /home/runa/tor/website/docs/en/faq.wml:1655
 msgid ""
 "For the answer to this question and others, please see our <a href=\"<page "
 "docs/faq-abuse>\">Tor Abuse FAQ</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1658
+#: /home/runa/tor/website/docs/en/faq.wml:1659
 msgid "<hr> <a id=\"RespondISP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1661
+#: /home/runa/tor/website/docs/en/faq.wml:1662
 msgid ""
 "<a class=\"anchor\" href=\"#RespondISP\">How do I respond to my ISP about my"
 " exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1664
+#: /home/runa/tor/website/docs/en/faq.wml:1665
 msgid ""
 "A collection of templates for successfully responding to ISPs is <a "
 "href=\"<wiki>doc/TorAbuseTemplates\">collected here</a>."

Modified: translation/trunk/projects/website/po/fa/docs/2-medium.tor-doc-relay.po
===================================================================
--- translation/trunk/projects/website/po/fa/docs/2-medium.tor-doc-relay.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/fa/docs/2-medium.tor-doc-relay.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-06-21 08:19+0200\n"
-"PO-Revision-Date: 2011-06-29 15:08+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 01:01+0000\n"
 "Last-Translator: behravan <behravanhamed@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:16 /tmp/F5o0tOMw8z.xml:281
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:16 /tmp/A18i3Pxv3V.xml:282
 msgid "<hr>"
 msgstr "<hr>"
 
@@ -67,8 +67,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37 /tmp/F5o0tOMw8z.xml:52
-#: /tmp/F5o0tOMw8z.xml:147 /tmp/F5o0tOMw8z.xml:171
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37 /tmp/A18i3Pxv3V.xml:52
+#: /tmp/A18i3Pxv3V.xml:147 /tmp/A18i3Pxv3V.xml:171
 msgid "<br>"
 msgstr ""
 
@@ -405,11 +405,12 @@
 "add a line like \"toruser hard nofile 8192\" to your "
 "/etc/security/limits.conf file (where toruser is the user that runs the Tor "
 "process), and then restart Tor if it's installed as a package (or log out "
-"and log back in if you run it yourself)."
+"and log back in if you run it yourself). The Debian/Ubuntu package does this"
+" step for you."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:266
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:267
 msgid ""
 "15. If you installed Tor via some package or installer, it probably starts "
 "Tor for you automatically on boot. But if you installed from source, you may"
@@ -417,7 +418,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:272
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:273
 msgid ""
 "When you change your Tor configuration, remember to verify that your relay "
 "still works correctly after the change. Be sure to set your \"ContactInfo\" "
@@ -429,7 +430,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:283
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:284
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "about/contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/po/fa/docs/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/po/fa/docs/2-medium.verifying-signatures.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/fa/docs/2-medium.verifying-signatures.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-09-05 00:00+0200\n"
-"PO-Revision-Date: 2011-09-05 00:55+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 01:02+0000\n"
 "Last-Translator: behravan <behravanhamed@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -32,166 +32,88 @@
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:13
-#: /tmp/w7jGkC8yXE.xml:43 /tmp/w7jGkC8yXE.xml:59 /tmp/w7jGkC8yXE.xml:86
-#: /tmp/w7jGkC8yXE.xml:186
+#: /tmp/kzjpFaPDWT.xml:16 /tmp/kzjpFaPDWT.xml:60 /tmp/kzjpFaPDWT.xml:120
+#: /tmp/kzjpFaPDWT.xml:176
 msgid "<hr>"
 msgstr "<hr>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><h3>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:15
-msgid ""
-"Each file on <a href=\"<page download/download>\">our download page</a> is "
-"accompanied by a file with the same name as the package and the extension "
-"\".asc\". These .asc files are GPG signatures. They allow you to verify the "
-"file you've downloaded is exactly the one that we intended you to get. For "
-"example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by "
-"tor-browser-<version-torbrowserbundle>_en-US.exe.asc."
+msgid "What is a signature and why should I check it?"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:22
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:18
 msgid ""
-"Of course, you'll need to have our GPG keys in your keyring: if you don't "
-"know the GPG key, you can't be sure that it was really us who signed it. The"
-" signing keys we use are:"
+"How do you know that the Tor program you have is really the one we made? "
+"Many Tor users have very real adversaries who might try to give them a fake "
+"version of Tor &mdash; and it doesn't matter how secure and anonymous Tor is"
+" if you're not running the real Tor."
 msgstr ""
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:26
-msgid "Roger's (0x28988BF5) typically signs the source code file."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:27
-msgid "Nick's (0x165733EA, or its subkey 0x8D29319A)."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:28
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:23
 msgid ""
-"Andrew's (0x31B0974B) typically signed older packages for windows and mac."
+"An attacker could try a variety of attacks to get you to download a fake "
+"Tor. For example, he could trick you into thinking some other website is a "
+"great place to download Tor. That's why you should always download Tor from "
+"<b>https</b>://www.torproject.org/. The https part means there's encryption "
+"and authentication between your browser and the website, making it much "
+"harder for the attacker to modify your download. But it's not perfect. Some "
+"places in the world block the Tor website, making users try <a href=\"<page "
+"docs/faq>#GetTor\">somewhere else</a>. Large companies sometimes force "
+"employees to use a modified browser, so the company can listen in on all "
+"their browsing. We've even <a href=\"https://blog.torproject.org/blog";
+"/diginotar-debacle-and-what-you-should-do-about-it\">seen</a> attackers who "
+"have the ability to trick your browser into thinking you're talking to the "
+"Tor website with https when you're not."
 msgstr ""
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:29
-msgid "Peter's (0xC82E0039, or its subkey 0xE1DEC577)."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:30
-msgid "TomÃs's (0x9A753A6B) signs current Vidalia release tarballs and tags."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:31
-msgid "Matt's (0x5FA14861) signed older Vidalia release tarballs."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:32
-msgid "Damian's (0x9ABBEEC6) signs Arm releases"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:33
-msgid "Jacob's (0xE012B42D)."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:34
-msgid ""
-"Erinn's (0x63FEE659) and (0xF1F5C9B5) typically signs all windows, mac, and "
-"most linux packages."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:35
-msgid "Mike's (0xDDC6C0AD) signs the Torbutton xpi."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:36
-msgid "Karsten's (0xF7C11265) signs the metrics archives and tools."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:37
-msgid "Robert Hogan's (0x22F6856F) signs torsocks release tarballs and tags."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
+#. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:38
-msgid "Nathan's (0xB374CBD2) signs the Android APK file for Orbot."
-msgstr ""
-
-#. type: Content of: <div><div><ul>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:38
-msgid "."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:39
 msgid ""
-"Tor Project Archive (0x886DDD89) signs the deb.torproject.org repositories "
-"and archives"
+"Some software sites list <a "
+"href=\"http://en.wikipedia.org/wiki/Cryptographic_hash_function\";>sha1 "
+"hashes</a> alongside the software on their website, so users can verify that"
+" they downloaded the file without any errors. These \"checksums\" help you "
+"answer the question \"Did I download this file correctly from whoever sent "
+"it to me?\" They do a good job at making sure you didn't have any random "
+"errors in your download, but they don't help you figure out whether you were"
+" downloading it from the attacker. The better question to answer is: \"Is "
+"this file that I just downloaded the file that Tor intended me to get?\""
 msgstr ""
 
-#. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:42
-msgid "Step Zero: Install GnuPG"
-msgstr ""
-
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:44
-msgid "You need to have GnuPG installed before you can verify signatures."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:48
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:49
 msgid ""
-"Linux: see <a "
-"href=\"http://www.gnupg.org/download/\";>http://www.gnupg.org/download/</a> "
-"or install <i>gnupg</i> from the package management system."
+"Each file on <a href=\"<page download/download>\">our download page</a> is "
+"accompanied by a file with the same name as the package and the extension "
+"\".asc\". These .asc files are GPG signatures. They allow you to verify the "
+"file you've downloaded is exactly the one that we intended you to get. For "
+"example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by "
+"tor-browser-<version-torbrowserbundle>_en-US.exe.asc. For a list of which "
+"developer signs which package, see our <a href=\"<page docs/signing-"
+"keys>\">signing keys</a> page."
 msgstr ""
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:51
-msgid ""
-"Windows: see <a "
-"href=\"http://www.gnupg.org/download/\";>http://www.gnupg.org/download/</a>. "
-"Look for the \"version compiled for MS-Windows\" under \"Binaries\"."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:54
-msgid ""
-"Mac: see <a "
-"href=\"http://macgpg.sourceforge.net/\";>http://macgpg.sourceforge.net/</a>."
-msgstr ""
-
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:58
-msgid "Step One: Import the keys"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:59
+msgid "Windows"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:60
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:62
 msgid ""
-"The next step is to import the key. This can be done directly from GnuPG. "
-"Make sure you import the correct key. For example, if you downloaded a "
-"Windows package, you will need to import Erinn's key."
+"You need to have GnuPG installed before you can verify signatures. Download "
+"it from <a "
+"href=\"http://gpg4win.org/download.html\";>http://gpg4win.org/download.html</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:64
-#: /tmp/w7jGkC8yXE.xml:89 /tmp/w7jGkC8yXE.xml:194
-msgid "<b>Windows:</b>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:65
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:66
 msgid ""
-"GnuPG for Windows is a command line tool, and you will need to use "
+"Once it's installed, use GnuPG to import the key that signed your package. "
+"Since GnuPG for Windows is a command-line tool, you will need to use "
 "<i>cmd.exe</i>. Unless you edit your PATH environment variable, you will "
 "need to tell Windows the full path to the GnuPG program. If you installed "
 "GnuPG with the default values, the path should be something like this: "
@@ -199,303 +121,191 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:71
-msgid "To import the key 0x28988BF5, start <i>cmd.exe</i> and type:"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:73
+msgid ""
+"Erinn Clark signs the Tor Browser Bundles. Import her key (0x63FEE659) by "
+"starting <i>cmd.exe</i> and typing:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:73
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:76
 #, no-wrap
 msgid ""
 "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --keyserver hkp://keys.gnupg.net "
-"--recv-keys 0x28988BF5"
+"--recv-keys 0x63FEE659"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:75
-#: /tmp/w7jGkC8yXE.xml:92
-msgid "<b>Mac and Linux</b>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:76
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:78
+#: /tmp/kzjpFaPDWT.xml:134
 msgid ""
-"Whether you have a Mac or you run Linux, you will need to use the terminal "
-"to run GnuPG. Mac users can find the terminal under \"Applications\". If you"
-" run Linux and use Gnome, the terminal should be under \"Applications menu\""
-" and \"Accessories\". KDE users can find the terminal under \"Menu\" and "
-"\"System\"."
+"After importing the key, you can verify that the fingerprint is correct:"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:81
-msgid "To import the key 0x28988BF5, start the terminal and type:"
-msgstr ""
-
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:83
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:81
 #, no-wrap
-msgid "gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x28988BF5"
+msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --fingerprint 0x63FEE659"
 msgstr ""
 
-#. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:85
-msgid "Step Two: Verify the fingerprints"
-msgstr ""
-
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:87
-msgid ""
-"After importing the key, you will want to verify that the fingerprint is "
-"correct."
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:83
+#: /tmp/kzjpFaPDWT.xml:139
+msgid "You should see:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:90
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:85
 #, no-wrap
-msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --fingerprint (insert keyid here)"
-msgstr ""
-
-#. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:93
-#, no-wrap
-msgid "gpg --fingerprint (insert keyid here)"
-msgstr ""
-
-#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:95
-msgid "The fingerprints for the keys should be:"
-msgstr ""
-
-#. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:98
-#, no-wrap
 msgid ""
-"    pub   1024D/28988BF5 2000-02-27\n"
-"          Key fingerprint = B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
-"    uid                  Roger Dingledine &lt;arma@xxxxxxx&gt;\n"
-"\n"
-"    pub   3072R/165733EA 2004-07-03\n"
-"          Key fingerprint = B35B F85B F194 89D0 4E28  C33C 2119 4EBB 1657 33EA\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxxx&gt;\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxx&gt;\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxxxx&gt;\n"
-"\n"
-"    pub  1024D/31B0974B 2003-07-17\n"
-"         Key fingerprint = 0295 9AA7 190A B9E9 027E  0736 3B9D 093F 31B0 974B\n"
-"    uid                  Andrew Lewman (phobos) &lt;phobos@xxxxxxxxxx&gt;\n"
-"    uid                  Andrew Lewman &lt;andrew@xxxxxxxxxx&gt;\n"
-"    uid                  Andrew Lewman &lt;andrew@xxxxxxxxxxxxxx&gt;\n"
-"    sub   4096g/B77F95F7 2003-07-17\n"
-"\n"
-"    pub   4096R/C82E0039 2003-03-24\n"
-"          Key fingerprint = 25FC 1614 B8F8 7B52 FF2F  99B9 62AF 4031 C82E 0039\n"
-"    uid                  Peter Palfrader\n"
-"    uid                  Peter Palfrader &lt;peter@xxxxxxxxxxxxx&gt;\n"
-"    uid                  Peter Palfrader &lt;weasel@xxxxxxxxxx&gt;\n"
-"\n"
-"    pub   1024D/9A753A6B 2009-09-11\n"
-"          Key fingerprint = 553D 7C2C 626E F16F 27F3  30BC 95E3 881D 9A75 3A6B\n"
-"    uid                  TomÃs Touceda &lt;chiiph@xxxxxxxxx&gt;\n"
-"    sub   1024g/33BE0E5B 2009-09-11\n"
-"\n"
-"    pub   1024D/5FA14861 2005-08-17\n"
-"          Key fingerprint = 9467 294A 9985 3C9C 65CB  141D AF7E 0E43 5FA1 4861\n"
-"    uid                  Matt Edman &lt;edmanm@xxxxxxx&gt;\n"
-"    uid                  Matt Edman &lt;Matt_Edman@xxxxxxxxxx&gt;\n"
-"    uid                  Matt Edman &lt;edmanm2@xxxxxxxxxx&gt;\n"
-"    sub   4096g/EA654E59 2005-08-17\n"
-"\n"
-"    pub   1024D/9ABBEEC6 2009-06-17\n"
-"          Key fingerprint = 6827 8CC5 DD2D 1E85 C4E4  5AD9 0445 B7AB 9ABB EEC6\n"
-"    uid                  Damian Johnson (www.atagar.com) &lt;atagar1@xxxxxxxxx&gt;\n"
-"    uid                  Damian Johnson &lt;atagar@xxxxxxxxxxxxxx&gt;\n"
-"    sub   2048g/146276B2 2009-06-17\n"
-"    sub   2048R/87F30690 2010-08-07\n"
-"\n"
-"    pub   4096R/E012B42D 2010-05-07\n"
-"          Key fingerprint = D8C9 AF51 CAA9 CAEA D3D8  9C9E A34F A745 E012 B42D\n"
-"    uid                  Jacob Appelbaum &lt;jacob@xxxxxxxxxxxxx&gt;\n"
-"    uid                  Jacob Appelbaum &lt;jacob@xxxxxxxxxxxxxx&gt;\n"
-"    sub   4096R/7CA91A52 2010-05-07 [expires: 2011-05-07]\n"
-"\n"
 "    pub   2048R/63FEE659 2003-10-16\n"
 "          Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\n"
 "    sub   2048R/EB399FD7 2003-10-16\n"
-"\n"
-"    pub   1024D/F1F5C9B5 2010-02-03\n"
-"          Key fingerprint = C2E3 4CFC 13C6 2BD9 2C75  79B5 6B8A AEB1 F1F5 C9B5\n"
-"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
-"    sub   1024g/7828F26A 2010-02-03\n"
-"\n"
-"    pub   1024D/DDC6C0AD 2006-07-26\n"
-"          Key fingerprint = BECD 90ED D1EE 8736 7980  ECF8 1B0C A30C DDC6 C0AD\n"
-"    uid                  Mike Perry &lt;mikeperry@xxxxxxxxxx&gt;\n"
-"    uid                  Mike Perry &lt;mikepery@xxxxxxxxxx&gt;\n"
-"    sub   4096g/AF0A91D7 2006-07-26\n"
-"\n"
-"    pub   1024D/F7C11265 2007-03-09 [expires: 2012-03-01]\n"
-"          Key fingerprint = FC8A EEF1 792E EE71 D721  7D47 D0CF 963D F7C1 1265\n"
-"    uid                  Karsten Loesing &lt;karsten.loesing@xxxxxxx&gt;\n"
-"    sub   2048g/75D85E4B 2007-03-09 [expires: 2012-03-01]\n"
-"\n"
-"    pub   1024D/22F6856F 2006-08-19\n"
-"          Key fingerprint = DDB4 6B5B 7950 CD47 E59B  5189 4C09 25CF 22F6 856F\n"
-"    uid                  Robert Hogan &lt;robert@xxxxxxxxxxxxxxx&gt;\n"
-"    sub   1024g/FC4A9460 2006-08-19\n"
-"\n"
-"    pub   3072D/B374CBD2 2010-06-09 [expires: 2011-06-09]\n"
-"   \t  Key fingerprint = B92B CA64 72F7 C6F0 8D47  8503 D2AC D203 B374 CBD2\n"
-"    uid                  Nathan of Guardian &lt;nathan@xxxxxxxxxxxxxxxxxxxx&gt;\n"
-"    sub   4096g/B5878C3B 2010-06-09 [expires: 2011-06-09]\n"
-"\n"
-"    pub   2048R/886DDD89 2009-09-04 [expires: 2014-09-03]\n"
-"      Key fingerprint = A3C4 F0F9 79CA A22C DBA8  F512 EE8C BC9E 886D DD89\n"
-"    uid                  deb.torproject.org archive signing key\n"
-"    sub   2048R/219EC810 2009-09-04 [expires: 2012-09-03]\n"
-"    "
 msgstr ""
 
-#. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:185
-msgid "Step Three: Verify the downloaded package"
-msgstr ""
-
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:187
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:93
+#: /tmp/kzjpFaPDWT.xml:149
 msgid ""
 "To verify the signature of the package you downloaded, you will need to "
-"download the \".asc\" file as well."
+"download the \".asc\" file as well. Assuming you downloaded the package and "
+"its signature to your Desktop, run:"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:190
-msgid ""
-"In the following examples, the user Alice downloads packages for Windows, "
-"Mac OS X and Linux and also verifies the signature of each package. All "
-"files are saved on the desktop."
-msgstr ""
-
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:195
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:97
 #, no-wrap
 msgid ""
 "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --verify C:\\Users\\Alice\\Desktop"
-"\\<file-win32-bundle-stable>.asc C:\\Users\\Alice\\Desktop\\<file-win32"
-"-bundle-stable>"
+"\\<file-win32-bundle-stable>.asc"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:197
-msgid "<b>Mac:</b>"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:99
+#: /tmp/kzjpFaPDWT.xml:155
+msgid "The output should say \"Good signature\":"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:198
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:102
+#: /tmp/kzjpFaPDWT.xml:158
 #, no-wrap
 msgid ""
-"gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc /Users/Alice"
-"/<file-osx-x86-bundle-stable>"
+"    gpg: Signature made Wed 31 Aug 2011 06:37:01 PM EDT using RSA key ID 63FEE659\n"
+"    gpg: Good signature from \"Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\"\n"
+"    gpg:                 aka \"Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\"\n"
+"    gpg:                 aka \"Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\"\n"
+"    gpg: WARNING: This key is not certified with a trusted signature!\n"
+"    gpg:          There is no indication that the signature belongs to the owner.\n"
+"    Primary key fingerprint: 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
+"    "
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:200
-msgid "<b>Linux</b>"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:112
+#: /tmp/kzjpFaPDWT.xml:168
+msgid ""
+"Notice that there is a warning because you haven't assigned a trust index to"
+" this person. This means that GnuPG verified that the key made that "
+"signature, but it's up to you to decide if that key really belongs to the "
+"developer. The best method is to meet the developer in person and exchange "
+"key fingerprints."
 msgstr ""
 
-#. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:201
-#, no-wrap
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:119
+msgid "Mac OS X"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:122
 msgid ""
-"gpg --verify /home/Alice/Desktop/<file-source-stable>.asc "
-"/home/Alice/Desktop/<file-source-stable>"
+"You need to have GnuPG installed before you can verify signatures. You can "
+"install it from <a "
+"href=\"http://macgpg.sourceforge.net/\";>http://macgpg.sourceforge.net/</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:204
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:127
 msgid ""
-"After verifying, GnuPG will come back saying something like \"Good "
-"signature\" or \"BAD signature\". The output should look something like "
-"this:"
+"Once it's installed, use GnuPG to import the key that signed your package. "
+"Erinn Clark signs the Tor Browser Bundles. Import her key (0x63FEE659) by "
+"starting the terminal (under \"Applications\")  and typing:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:209
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:132
 #, no-wrap
-msgid ""
-"    gpg: Signature made Tue 16 Mar 2010 05:55:17 AM CET using DSA key ID 28988BF5\n"
-"    gpg: Good signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
-"    gpg: WARNING: This key is not certified with a trusted signature!\n"
-"    gpg:          There is no indication that the signature belongs to the owner.\n"
-"    Primary key fingerprint: B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
-"    "
+msgid "gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:217
-msgid ""
-"Notice that there is a warning because you haven't assigned a trust index to"
-" this person. This means that GnuPG verified that the key made that "
-"signature, but it's up to you to decide if that key really belongs to the "
-"developer. The best method is to meet the developer in person and exchange "
-"key fingerprints."
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:137
+#, no-wrap
+msgid "gpg --fingerprint 0x63FEE659"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:224
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:141
+#, no-wrap
 msgid ""
-"For your reference, this is an example of a <em>BAD</em> verification. It "
-"means that the signature and file contents do not match. In this case, you "
-"should not trust the file contents:"
+"    pub   2048R/63FEE659 2003-10-16\n"
+"          Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\n"
+"    sub   2048R/EB399FD7 2003-10-16\n"
+"    "
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:229
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:153
 #, no-wrap
+msgid "gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:175
+msgid "Linux"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:178
 msgid ""
-"    gpg: Signature made Tue 20 Apr 2010 12:22:32 PM CEST using DSA key ID 28988BF5\n"
-"    gpg: BAD signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
-"    "
+"Most Linux distributions come with gpg preinstalled, so users who want to "
+"verify the Tor Browser Bundle for Linux (or the source tarball) can just "
+"follow along with the instructions above for \"Mac OS X\"."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:233
-msgid "<b>RPM-based distributions :</b>"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:183
+msgid ""
+"If you're using the <b>Debian</b> packages, you should read the instructions"
+" on <a href=\"<page docs/debian>#packages\">importing these keys to apt</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:234
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:187
 msgid ""
-"In order to manually verify the signatures on the RPM packages, you must use"
-" the <code>rpm</code> tool like so: <br />"
+"If you're using the <b>RPMs</b>, you can manually verify the signatures on "
+"the RPM packages by"
 msgstr ""
 
 #. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:237
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:188
 #, no-wrap
 msgid "rpm -K filename.rpm"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:240
-msgid "<b>Debian:</b>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:241
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:190
 msgid ""
-"If you are running Tor on Debian you should read the instructions on <a "
-"href=\"<page docs/debian>#packages\">importing these keys to apt</a>."
+"See <a "
+"href=\"http://www.gnupg.org/documentation/\";>http://www.gnupg.org/documentation/</a>"
+" to learn more about GPG."
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:244
-msgid ""
-"If you wish to learn more about GPG, see <a "
-"href=\"http://www.gnupg.org/documentation/\";>http://www.gnupg.org/documentation/</a>."
-msgstr ""
 
-

Modified: translation/trunk/projects/website/po/fa/docs/3-low.rpms.po
===================================================================
--- translation/trunk/projects/website/po/fa/docs/3-low.rpms.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/fa/docs/3-low.rpms.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-08-10 08:19+0200\n"
-"PO-Revision-Date: 2011-08-11 01:04+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 01:04+0000\n"
 "Last-Translator: behravan <behravanhamed@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/rpms.wml:16 /tmp/Xp_xTVMYLa.xml:70
+#: /home/runa/tor/website/docs/en/rpms.wml:16 /tmp/qK7cG0J74c.xml:71
 msgid "<br>"
 msgstr "<br>"
 
@@ -77,11 +77,12 @@
 #: /home/runa/tor/website/docs/en/rpms.wml:36
 msgid ""
 "If you wish to track the stable releases of Tor, you should substitute "
-"DISTRIBUTION with one of the following: centos4, centos5, fc13, fc14, suse"
+"DISTRIBUTION with one of the following: centos4, centos5, fc13, fc14, fc15, "
+"suse"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:39
+#: /home/runa/tor/website/docs/en/rpms.wml:40
 msgid ""
 "To track experimental releases, substitute DISTRIBUTION with one of these: "
 "centos4-experimental, centos5-experimental, fc13-experimental, "
@@ -89,25 +90,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:44
+#: /home/runa/tor/website/docs/en/rpms.wml:45
 msgid "Then install Tor by running:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/rpms.wml:46
+#: /home/runa/tor/website/docs/en/rpms.wml:47
 #, no-wrap
 msgid "yum install tor"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:49
+#: /home/runa/tor/website/docs/en/rpms.wml:50
 msgid ""
 "Now Tor is installed and running. Move on to <a href=\"<page docs/tor-doc-"
 "unix>#using\">step two</a> of the \"Tor on Linux/Unix\" instructions."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:55
+#: /home/runa/tor/website/docs/en/rpms.wml:56
 msgid ""
 "The DNS name <code>deb.torproject.org</code> is actually a set of "
 "independent servers in a DNS round-robin configuration.  If for some reason "
@@ -117,29 +118,29 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/rpms.wml:64
+#: /home/runa/tor/website/docs/en/rpms.wml:65
 msgid "<hr> <hr> <a id=\"source\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/rpms.wml:69
+#: /home/runa/tor/website/docs/en/rpms.wml:70
 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:73
+#: /home/runa/tor/website/docs/en/rpms.wml:74
 msgid ""
 "If you'd like to build from source, please follow the <a href=\"<gitblob>doc"
 "/tor-rpm-creation.txt\">RPM creation instructions</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/rpms.wml:77
+#: /home/runa/tor/website/docs/en/rpms.wml:78
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:79
+#: /home/runa/tor/website/docs/en/rpms.wml:80
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "about/contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/po/fr/about/3-low.contact.po
===================================================================
--- translation/trunk/projects/website/po/fr/about/3-low.contact.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/fr/about/3-low.contact.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-07-08 08:44+0200\n"
-"PO-Revision-Date: 2011-07-09 01:09+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 00:57+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -48,20 +48,27 @@
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/about/en/contact.wml:24
 msgid ""
+"<i>community-support at lists.torproject.org</i> is for volunteers helping "
+"people with questions about using or configuring Tor."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/contact.wml:27
+msgid ""
 "<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page "
 "getinvolved/translation>\">website translations</a> into place, and help "
 "answer questions about existing and new translations."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:27
+#: /home/runa/tor/website/about/en/contact.wml:30
 msgid ""
 "<i>tordnsel at torproject.org</i> is the alias for the people responsible "
 "for the tordns exitlist."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:29
+#: /home/runa/tor/website/about/en/contact.wml:32
 msgid ""
 "<i>donations at torproject.org</i> is for questions and comments about <a "
 "href=\"<page donate/donate>\">getting money to the developers</a>. More "
@@ -70,7 +77,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:34
+#: /home/runa/tor/website/about/en/contact.wml:37
 msgid ""
 "<i>execdir at torproject.org</i> is for press/media, questions and comments "
 "about Tor the non-profit corporation: trademark questions, affiliation and "
@@ -79,43 +86,43 @@
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:40
+#: /home/runa/tor/website/about/en/contact.wml:43
 msgid "Identi.ca"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:41
+#: /home/runa/tor/website/about/en/contact.wml:44
 msgid ""
 "<a id=\"identica\"></a> Contact us via our microblogging Identi.ca account "
 "at <a href=\"https://identi.ca/torproject\";>torproject</a>."
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:45
+#: /home/runa/tor/website/about/en/contact.wml:48
 msgid "IRC"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:46
+#: /home/runa/tor/website/about/en/contact.wml:49
 msgid "<a id=\"irc\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:47
+#: /home/runa/tor/website/about/en/contact.wml:50
 msgid ""
 "Tor users and developers can also be found in the following channels on <a "
 "href=\"http://www.oftc.net/oftc/\";>OFTC</a>:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:51
+#: /home/runa/tor/website/about/en/contact.wml:54
 msgid ""
 "<i>#tor</i> - User and relay operation discussions. Having trouble running "
 "Tor or a question for other Tor users? Then this is the spot for you."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:54
+#: /home/runa/tor/website/about/en/contact.wml:57
 msgid ""
 "<i>#tor-dev</i> - Channel for people who want to do development.  "
 "Discussions about Tor-related coding, protocols, and <a href=\"<page "
@@ -123,27 +130,28 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:57
+#: /home/runa/tor/website/about/en/contact.wml:60
 msgid ""
 "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that "
 "is not related to Tor."
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:61
+#: /home/runa/tor/website/about/en/contact.wml:64
 msgid "Telephone"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:62
+#: /home/runa/tor/website/about/en/contact.wml:65
 msgid "<a id=\"phone\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:63
+#: /home/runa/tor/website/about/en/contact.wml:66
 msgid ""
 "If none of the above appeal to you, calling +1-781-352-0568 will reach the "
-"Tor office.  Should there be no answer, please leave a message."
+"Tor office.  Should there be no answer, please leave a message with a way to"
+" reach you."
 msgstr ""
 
 

Modified: translation/trunk/projects/website/po/fr/docs/1-high.bridges.po
===================================================================
--- translation/trunk/projects/website/po/fr/docs/1-high.bridges.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/fr/docs/1-high.bridges.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # mehditaileb <mehditaileb@xxxxxxxxxxxxxxxx>, 2011.
+# Pierre Antoine <pierre.antoine@xxxxxxxx>, 2011.
 #   <tpweb1780@xxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-08-30 08:50+0200\n"
-"PO-Revision-Date: 2011-08-31 01:39+0000\n"
-"Last-Translator: tux007 <tpweb1780@xxxxxxxx>\n"
+"PO-Revision-Date: 2011-09-28 02:47+0000\n"
+"Last-Translator: pigati <pierre.antoine@xxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -264,10 +265,11 @@
 msgstr ""
 "Une autre faÃon de trouver des adresses de ponts publics est d'envoyer un "
 "mail Ã bridges@xxxxxxxxxxxxxx avec la ligne \"get bridges\" seule dans le "
-"corps de l'e-mail. Vous aurez besoin d'envoyer cette demande Ã partir d'un "
+"corps du courriel. Vous aurez besoin d'envoyer cette demande Ã partir d'un "
 "compte Gmail, faute de quoi cela serait trop facile pour un attaquant de "
-"crÃer un grand nombre d'adresses e-mail pour en savoir davantage sur tous "
-"les ponts. Presque instantanÃment, vous recevrez une rÃponse qui comprend:"
+"crÃer un grand nombre d'adresses de courriel pour collecter les informations"
+" sur tous les ponts.  Presque instantanÃment, vous recevrez une rÃponse qui "
+"comprend :"
 
 #. type: Content of: <div><div><pre>
 #: /home/runa/tor/website/docs/en/bridges.wml:136
@@ -281,7 +283,7 @@
 "\n"
 "    "
 msgstr ""
-"    Voici votre pont:\n"
+"    Voici vos relais ponts :\n"
 "\n"
 "    Pont 60.16.182.53:9001\n"
 "    Pont 87.237.118.139:444\n"
@@ -295,8 +297,8 @@
 "Once you've received the email with bridge information, you can continue the"
 " Vidalia configuration steps outlined <a href=\"#UsingBridges\">above</a>."
 msgstr ""
-"Une fois que vous avez reÃu l'e-mail avec les informations sur les ponts, "
-"vous pouvez poursuivre les Ãtapes de configuration de Vidalia dÃcrites <a "
+"Une fois que vous avez reÃu le courriel avec les informations sur les ponts,"
+" vous pouvez poursuivre les Ãtapes de configuration de Vidalia dÃcrites <a "
 "href=\"#UsingBridges\">ci-dessus</a> ."
 
 #. type: Content of: <div><div>
@@ -317,6 +319,10 @@
 "or a bridge relay</a>. You can configure your bridge either manually or "
 "graphically:"
 msgstr ""
+"Si vous voulez contribuer, vous pouvez <a href=\"<page "
+"docs/faq>#RelayOrBridge\">dÃcider si vous voulez exÃcuter un relais Tor "
+"classique ou un relais pont</a>. Vous pouvez configurer votre pont "
+"manuellement ou graphiquement :"
 
 #. type: Content of: <div><div><p><ul><li>
 #: /home/runa/tor/website/docs/en/bridges.wml:157
@@ -325,7 +331,7 @@
 "just these four lines:<br>"
 msgstr ""
 "<a href=\"<page docs/faq>#torrc\">modifiez votre fichier torrc</a> "
-"manuellement pour avoir seulement ces quatre lignes: <br>"
+"manuellement pour avoir seulement ces quatre lignes : <br>"
 
 #. type: Content of: <div><div><p><ul><li><pre>
 #: /home/runa/tor/website/docs/en/bridges.wml:159
@@ -367,10 +373,10 @@
 msgstr ""
 "Si vous obtenez l'erreur \"Impossible de se connecter Ã 0.0.0.0:443: "
 "Permission refusÃe\" au dÃmarrage, vous aurez besoin de choisir une plus "
-"grande valeur d'ORPort (par exemple 8080) ou de mettre en place <a "
+"grande valeur pour  ORPort (par exemple 8080) ou de mettre en place <a "
 "href=\"<page "
 "docs/faq>#HowcanImakemyrelayaccessibletopeoplestuckbehindrestrictivefirewalls\">des"
-" redirections complexes de ports</a> ."
+" redirections de ports complexes </a>."
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/bridges.wml:178
@@ -393,14 +399,14 @@
 "your Tor log files or in <tt>/var/lib/tor/fingerprint</tt> depending on your"
 " platform)."
 msgstr ""
-"Votre pont va automatiquement publier son adresse Ã l'administrateur des "
-"ponts, qui va le distribuer via https ou e-mail comme indiquÃ ci-dessus. "
-"Vous pouvez aussi donner Ã un utilisateur l'adresse de votre pont: si vous "
-"utilisez Vidalia, vous pouvez copier-coller l'adresse de la passerelle dans "
-"la fenÃtre ParamÃtres. Si vous Ãtes sous Linux ou BSD, vous pouvez "
-"construire l'adresse de la passerelle manuellement en utilisant le <a "
-"href=\"#Understanding\">le format ci-dessus</a> (vous pouvez trouver "
-"l'empreinte dans vos fichiers journaux ou dans "
+"Votre pont relais va automatiquement publier son adresse Ã l'autoritÃ "
+"administrative des ponts, qui va la distribuer via https ou courriel comme "
+"indiquÃ ci-dessus. Vous pouvez aussi donner Ã un utilisateur l'adresse de "
+"votre pont : si vous utilisez Vidalia, vous pouvez copier-coller l'adresse "
+"du pont dans la fenÃtre ParamÃtres. Si vous Ãtes sous Linux ou BSD, vous "
+"pouvez construire l'adresse de la passerelle manuellement en utilisant le <a"
+" href=\"#Understanding\">le format ci-dessus</a> (vous pouvez trouver "
+"l'empreinte dans vos fichiers journaux de Tor ou dans "
 "<tt>/var/lib/tor/fingerprint</tt> selon votre plate-forme)."
 
 #. type: Content of: <div><div><p>
@@ -411,10 +417,10 @@
 "bridges specification</a>. If you're interested in running an unpublished "
 "bridge or other non-standard uses, please do read the specification."
 msgstr ""
-"Si vous souhaitez en savoir plus sur notre conception des ponts d'un point "
-"de vue technique, vous pouvez lire les <a href=\"<specblob>bridges-"
-"spec.txt\">spÃcifications des Ponts Tor</a>. Si vous envisagez de faire "
-"tourner un pont inÃdit ou d'autres utilisations non-standard, merci de lire "
-"le cahier des charges."
+"Si vous souhaitez en savoir plus sur la conception des ponts d'un point de "
+"vue technique, vous pouvez lire les <a href=\"<specblob>bridges-"
+"spec.txt\">spÃcifications des ponts Tor</a>. Si vous envisagez de faire "
+"tourner un pont non publicisÃ ou d'autres utilisations non-standards, merci "
+"de lire les spÃcifications."
 
 

Modified: translation/trunk/projects/website/po/fr/docs/2-medium.faq.po
===================================================================
--- translation/trunk/projects/website/po/fr/docs/2-medium.faq.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/fr/docs/2-medium.faq.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-08-30 08:50+0200\n"
-"PO-Revision-Date: 2011-09-20 13:09+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 00:59+0000\n"
 "Last-Translator: LittleMissGeek <clbaldock@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@
 msgstr "Foire aux Questions Tor"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/NhlG8k8BI3.xml:1669
+#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/mo95NMnX36.xml:1670
 msgid "<hr>"
 msgstr "<hr>"
 
@@ -1093,17 +1093,19 @@
 "Some government or corporate firewalls censor connections to Tor's website. "
 "In those cases, you have three options. First, get it from a friend &mdash; "
 "the <a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a> fits "
-"nicely on a USB key. Second, find the google cache for the <a href=\"<page "
-"getinvolved/mirrors>\">Tor mirrors</a> page and see if any of those copies "
-"of our website work for you. Third, you can download Tor via email: log in "
-"to your Gmail account and mail '<tt>gettor AT torproject.org</tt>'. If you "
-"include the word 'help' in the body of the email, it will reply with "
-"instructions. Note that only a few webmail providers are supported, since "
-"they need to be able to receive very large attachments."
+"nicely on a USB key. Second, find the <a "
+"href=\"https://encrypted.google.com/search?q=tor+mirrors\";>google cache</a> "
+"for the <a href=\"<page getinvolved/mirrors>\">Tor mirrors</a> page and see "
+"if any of those copies of our website work for you. Third, you can download "
+"Tor via email: log in to your Gmail account and mail '<tt>gettor AT "
+"torproject.org</tt>'. If you include the word 'help' in the body of the "
+"email, it will reply with instructions. Note that only a few webmail "
+"providers are supported, since they need to be able to receive very large "
+"attachments."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:669
+#: /home/runa/tor/website/docs/en/faq.wml:670
 msgid ""
 "Be sure to <a href=\"<page docs/verifying-signatures>\">verify the "
 "signature</a> of any package you download, especially when you get it from "
@@ -1111,26 +1113,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:674
+#: /home/runa/tor/website/docs/en/faq.wml:675
 msgid "<hr> <a id=\"CompileTorWindows\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:677
+#: /home/runa/tor/website/docs/en/faq.wml:678
 msgid ""
 "<a class=\"anchor\" href=\"#CompileTorWindows\">How do I compile Tor under "
 "Windows?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:680
+#: /home/runa/tor/website/docs/en/faq.wml:681
 msgid ""
 "Try following the steps at <a href=\"<gitblob>doc/tor-win32-mingw-"
 "creation.txt\"> tor-win32-mingw-creation.txt</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:685
+#: /home/runa/tor/website/docs/en/faq.wml:686
 msgid ""
 "(Note that you don't need to compile Tor yourself in order to use it. Most "
 "people just use the packages available on the <a href=\"<page "
@@ -1138,19 +1140,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:690
+#: /home/runa/tor/website/docs/en/faq.wml:691
 msgid "<hr> <a id=\"VirusFalsePositives\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:693
+#: /home/runa/tor/website/docs/en/faq.wml:694
 msgid ""
 "<a class=\"anchor\" href=\"#VirusFalsePositives\">Why does my Tor executable"
 " appear to have a virus or spyware?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:696
+#: /home/runa/tor/website/docs/en/faq.wml:697
 msgid ""
 "Sometimes, overzealous Windows virus and spyware detectors trigger on some "
 "parts of the Tor Windows binary. Our best guess is that these are false "
@@ -1161,7 +1163,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:704
+#: /home/runa/tor/website/docs/en/faq.wml:705
 msgid ""
 "In the meantime, we encourage you to not just take our word for it. Our job "
 "is to provide the source; if you're concerned, please do <a "
@@ -1169,19 +1171,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:709
+#: /home/runa/tor/website/docs/en/faq.wml:710
 msgid "<hr> <a id=\"LiveCD\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:712
+#: /home/runa/tor/website/docs/en/faq.wml:713
 msgid ""
 "<a class=\"anchor\" href=\"#LiveCD\">Is there a LiveCD or other bundle that "
 "includes Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:715
+#: /home/runa/tor/website/docs/en/faq.wml:716
 msgid ""
 "Yes.  Use <a href=\"https://tails.boum.org/\";>The Amnesic Incognito Live "
 "System</a> or <a href=\"<page projects/torbrowser>\">the Tor Browser "
@@ -1189,19 +1191,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:720
+#: /home/runa/tor/website/docs/en/faq.wml:721
 msgid "<hr> <a id=\"torrc\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:723
+#: /home/runa/tor/website/docs/en/faq.wml:724
 msgid ""
 "<a class=\"anchor\" href=\"#torrc\">I'm supposed to \"edit my torrc\". What "
 "does that mean?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:726
+#: /home/runa/tor/website/docs/en/faq.wml:727
 msgid ""
 "Tor installs a text file called torrc that contains configuration "
 "instructions for how your Tor program should behave. The default "
@@ -1211,12 +1213,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:734
+#: /home/runa/tor/website/docs/en/faq.wml:735
 msgid "The location of your torrc file depends on the way you installed Tor:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:738
+#: /home/runa/tor/website/docs/en/faq.wml:739
 msgid ""
 "On Windows, if you installed a Tor bundle with Vidalia, you can find your "
 "torrc file in the Start menu under Programs -&gt; Vidalia Bundle -&gt; Tor, "
@@ -1229,14 +1231,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:747
+#: /home/runa/tor/website/docs/en/faq.wml:748
 msgid ""
 "On OS X, if you use Vidalia, edit <code>~/.vidalia/torrc</code>. Otherwise, "
 "open your favorite text editor and load <code>/Library/Tor/torrc</code>."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:751
+#: /home/runa/tor/website/docs/en/faq.wml:752
 msgid ""
 "On Unix, if you installed a pre-built package, look for "
 "<code>/etc/tor/torrc</code> or <code>/etc/torrc</code> or consult your "
@@ -1244,7 +1246,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:755
+#: /home/runa/tor/website/docs/en/faq.wml:756
 msgid ""
 "Finally, if you installed from source, you may not have a torrc installed "
 "yet: look in <code>/usr/local/etc/</code> and note that you may need to "
@@ -1252,14 +1254,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:762
+#: /home/runa/tor/website/docs/en/faq.wml:763
 msgid ""
 "If you use Vidalia, be sure to exit both Tor and Vidalia before you edit "
 "your torrc file. Otherwise Vidalia might overwrite your changes."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:767
+#: /home/runa/tor/website/docs/en/faq.wml:768
 msgid ""
 "Once you've changed your torrc, you will need to restart Tor for the changes"
 " to take effect. (For advanced users on OS X and Unix, note that you "
@@ -1267,7 +1269,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:773
+#: /home/runa/tor/website/docs/en/faq.wml:774
 msgid ""
 "For other configuration options you can use, look at the <a href=\"<page "
 "docs/tor-manual>\">Tor manual page</a>. Remember, all lines beginning with #"
@@ -1275,19 +1277,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:779
+#: /home/runa/tor/website/docs/en/faq.wml:780
 msgid "<hr> <a id=\"Logs\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:782
+#: /home/runa/tor/website/docs/en/faq.wml:783
 msgid ""
 "<a class=\"anchor\" href=\"#Logs\">How do I set up logging, or see Tor's "
 "logs?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:785
+#: /home/runa/tor/website/docs/en/faq.wml:786
 msgid ""
 "If you installed a Tor bundle that includes Vidalia, then Vidalia has a "
 "window called \"Message Log\" that will show you Tor's log messages. You can"
@@ -1296,19 +1298,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:792
+#: /home/runa/tor/website/docs/en/faq.wml:793
 msgid ""
 "If you're not using Vidalia, you'll have to go find the log files by hand. "
 "Here are some likely places for your logs to be:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:797
+#: /home/runa/tor/website/docs/en/faq.wml:798
 msgid "On OS X, Debian, Red Hat, etc, the logs are in /var/log/tor/"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:799
+#: /home/runa/tor/website/docs/en/faq.wml:800
 msgid ""
 "On Windows, there are no default log files currently. If you enable logs in "
 "your torrc file, they default to <code>\\username\\Application "
@@ -1316,7 +1318,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:803
+#: /home/runa/tor/website/docs/en/faq.wml:804
 msgid ""
 "If you compiled Tor from source, by default your Tor logs to <a "
 "href=\"http://en.wikipedia.org/wiki/Standard_streams\";>\"stdout\"</a> at "
@@ -1325,7 +1327,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:811
+#: /home/runa/tor/website/docs/en/faq.wml:812
 msgid ""
 "To change your logging setup by hand, <a href=\"#torrc\">edit your torrc</a>"
 " and find the section (near the top of the file) which contains the "
@@ -1333,7 +1335,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:817
+#: /home/runa/tor/website/docs/en/faq.wml:818
 #, no-wrap
 msgid ""
 "\\## Logs go to stdout at level \"notice\" unless redirected by something\n"
@@ -1341,7 +1343,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:822
+#: /home/runa/tor/website/docs/en/faq.wml:823
 msgid ""
 "For example, if you want Tor to send complete debug, info, notice, warn, and"
 " err level messages to a file, append the following line to the end of the "
@@ -1349,32 +1351,32 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:828
+#: /home/runa/tor/website/docs/en/faq.wml:829
 #, no-wrap
 msgid "Log debug file c:/program files/tor/debug.log\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:832
+#: /home/runa/tor/website/docs/en/faq.wml:833
 msgid ""
 "Replace <code>c:/program files/tor/debug.log</code> with a directory and "
 "filename for your Tor log."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:836
+#: /home/runa/tor/website/docs/en/faq.wml:837
 msgid "<hr> <a id=\"DoesntWork\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:839
+#: /home/runa/tor/website/docs/en/faq.wml:840
 msgid ""
 "<a class=\"anchor\" href=\"#DoesntWork\">I installed Tor and Polipo but it's"
 " not working.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:842
+#: /home/runa/tor/website/docs/en/faq.wml:843
 msgid ""
 "Once you've installed the Tor bundle, there are two questions to ask: first,"
 " is your Tor able to establish a circuit? Second, is your Firefox correctly "
@@ -1382,7 +1384,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:847
+#: /home/runa/tor/website/docs/en/faq.wml:848
 msgid ""
 "If Tor can establish a circuit, the onion icon in Vidalia will turn green. "
 "You can also check in the Vidalia Control Panel to make sure it says "
@@ -1392,19 +1394,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:857
+#: /home/runa/tor/website/docs/en/faq.wml:858
 msgid "If Tor can't establish a circuit, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:861
+#: /home/runa/tor/website/docs/en/faq.wml:862
 msgid ""
 "Are you sure Tor is running? If you're using Vidalia, you may have to click "
 "on the onion and select \"Start\" to launch Tor."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:863
+#: /home/runa/tor/website/docs/en/faq.wml:864
 msgid ""
 "Check your system clock. If it's more than a few hours off, Tor will refuse "
 "to build circuits. For XP users, synchronize your clock under the clock "
@@ -1413,7 +1415,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:867
+#: /home/runa/tor/website/docs/en/faq.wml:868
 msgid ""
 "Is your Internet connection <a href=\"#FirewallPorts\">firewalled by "
 "port</a>, or do you normally need to use a <a "
@@ -1421,7 +1423,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:872
+#: /home/runa/tor/website/docs/en/faq.wml:873
 msgid ""
 "Are you running programs like Norton Internet Security or SELinux that block"
 " certain connections, even though you don't realize they do? They could be "
@@ -1429,7 +1431,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:875
+#: /home/runa/tor/website/docs/en/faq.wml:876
 msgid ""
 "Are you in China, or behind a restrictive corporate network firewall that "
 "blocks the public Tor relays? If so, you should learn about <a href=\"<page "
@@ -1437,14 +1439,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:878
+#: /home/runa/tor/website/docs/en/faq.wml:879
 msgid ""
 "Check your <a href=\"#Logs\">Tor logs</a>. Do they give you any hints about "
 "what's going wrong?"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:883
+#: /home/runa/tor/website/docs/en/faq.wml:884
 msgid ""
 "Step two is to confirm that Firefox is correctly configured to send its "
 "traffic through Tor. Try the <a href=\"https://check.torproject.org/\";>Tor "
@@ -1454,12 +1456,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:891
+#: /home/runa/tor/website/docs/en/faq.wml:892
 msgid "If it thinks you're not using Tor, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:895
+#: /home/runa/tor/website/docs/en/faq.wml:896
 msgid ""
 "Did you install the Torbutton extension for Firefox? The installation "
 "bundles include it, but sometimes people forget to install it. Make sure it "
@@ -1468,7 +1470,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:900
+#: /home/runa/tor/website/docs/en/faq.wml:901
 msgid ""
 "Do you have incompatible Firefox extensions like FoxyProxy installed? If so,"
 " uninstall them. (Note that using FoxyProxy is NOT a sufficient substitute "
@@ -1480,7 +1482,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:907
+#: /home/runa/tor/website/docs/en/faq.wml:908
 msgid ""
 "If your browser says \"The proxy server is refusing connections.\", check "
 "that Polipo (the http proxy that passes traffic between Firefox and Tor) is "
@@ -1490,7 +1492,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:912
+#: /home/runa/tor/website/docs/en/faq.wml:913
 msgid ""
 "If you're upgrading from OS X, some of the earlier OS X installers were "
 "broken in really unfortunate ways. You may find that <a href=\"<page docs"
@@ -1500,14 +1502,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:917
+#: /home/runa/tor/website/docs/en/faq.wml:918
 msgid ""
 "If you're on Linux, make sure Privoxy isn't running, since it will conflict "
 "with the port that our Polipo configuration file picks."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:919
+#: /home/runa/tor/website/docs/en/faq.wml:920
 msgid ""
 "If you installed Polipo yourself (not from a bundle), did you edit the "
 "config file as described? Did you restart Polipo after this change? Are you "
@@ -1515,7 +1517,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:922
+#: /home/runa/tor/website/docs/en/faq.wml:923
 msgid ""
 "For Red Hat Linux and related systems, do you have SELinux enabled? If so, "
 "it might be preventing Polipo from talking to Tor. We also run across BSD "
@@ -1524,19 +1526,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:928
+#: /home/runa/tor/website/docs/en/faq.wml:929
 msgid "<hr /> <a id=\"VidaliaPassword\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:931
+#: /home/runa/tor/website/docs/en/faq.wml:932
 msgid ""
 "<a class=\"anchor\" href=\"#VidaliaPassword\">Tor/Vidalia prompts for a "
 "password at start.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:934
+#: /home/runa/tor/website/docs/en/faq.wml:935
 msgid ""
 "Vidalia interacts with the Tor software via Tor's \"control port\". The "
 "control port lets Vidalia receive status updates from Tor, request a new "
@@ -1547,7 +1549,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:943
+#: /home/runa/tor/website/docs/en/faq.wml:944
 msgid ""
 "Usually this process of generating and setting a random control password "
 "happens in the background. There are three common situations, though, where "
@@ -1555,7 +1557,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:949
+#: /home/runa/tor/website/docs/en/faq.wml:950
 msgid ""
 "You're already running Vidalia and Tor. For example, this situation can "
 "happen if you installed the Vidalia bundle and now you're trying to run the "
@@ -1564,7 +1566,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:954
+#: /home/runa/tor/website/docs/en/faq.wml:955
 msgid ""
 "Vidalia crashed, but left Tor running with the last known random password. "
 "After you restart Vidalia, it generates a new random password, but Vidalia "
@@ -1578,7 +1580,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:967
+#: /home/runa/tor/website/docs/en/faq.wml:968
 msgid ""
 "You had previously set Tor to run as a Windows NT service. When Tor is set "
 "to run as a service, it starts up when the system boots. If you configured "
@@ -1593,19 +1595,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:982
+#: /home/runa/tor/website/docs/en/faq.wml:983
 msgid "<hr> <a id=\"ChooseEntryExit\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:985
+#: /home/runa/tor/website/docs/en/faq.wml:986
 msgid ""
 "<a class=\"anchor\" href=\"#ChooseEntryExit\">Can I control which nodes (or "
 "country) are used for entry/exit?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:988
+#: /home/runa/tor/website/docs/en/faq.wml:989
 msgid ""
 "Yes. You can set preferred entry and exit nodes as well as inform Tor which "
 "nodes you do not want to use.  The following options can be added to your "
@@ -1614,53 +1616,53 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:994
+#: /home/runa/tor/website/docs/en/faq.wml:995
 msgid "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:995
+#: /home/runa/tor/website/docs/en/faq.wml:996
 msgid ""
 "A list of preferred nodes to use for the first hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:997
+#: /home/runa/tor/website/docs/en/faq.wml:998
 msgid "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:998
+#: /home/runa/tor/website/docs/en/faq.wml:999
 msgid ""
 "A list of preferred nodes to use for the last hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:1000
+#: /home/runa/tor/website/docs/en/faq.wml:1001
 msgid "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:1001
+#: /home/runa/tor/website/docs/en/faq.wml:1002
 msgid "A list of nodes to never use when building a circuit."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:1003
+#: /home/runa/tor/website/docs/en/faq.wml:1004
 msgid "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:1004
+#: /home/runa/tor/website/docs/en/faq.wml:1005
 msgid ""
 "A list of nodes to never use when picking an exit.  Nodes listed in "
 "<tt>ExcludeNodes</tt> are automatically in this list."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1009
+#: /home/runa/tor/website/docs/en/faq.wml:1010
 msgid ""
 "<em>We recommend you do not use these</em> &mdash; they are intended for "
 "testing and may disappear in future versions.  You get the best security "
@@ -1670,7 +1672,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1016
+#: /home/runa/tor/website/docs/en/faq.wml:1017
 msgid ""
 "The <tt>EntryNodes</tt> and <tt>ExitNodes</tt> config options are treated as"
 " a request, meaning if the nodes are down or seem slow, Tor will still avoid"
@@ -1682,7 +1684,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1026
+#: /home/runa/tor/website/docs/en/faq.wml:1027
 msgid ""
 "Instead of <tt>$fingerprint</tt> you can also specify a 2 letter ISO3166 "
 "country code in curly braces (for example {de}), or an ip address pattern "
@@ -1691,7 +1693,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1032
+#: /home/runa/tor/website/docs/en/faq.wml:1033
 msgid ""
 "If you want to access a service directly through Tor's SOCKS interface (eg. "
 "using ssh via connect.c), another option is to set up an internal mapping in"
@@ -1700,26 +1702,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1038
+#: /home/runa/tor/website/docs/en/faq.wml:1039
 msgid "<hr> <a id=\"GoogleCaptcha\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1041
+#: /home/runa/tor/website/docs/en/faq.wml:1042
 msgid ""
 "<a class=\"anchor\" href=\"#GoogleCaptcha\">Google makes me solve a Captcha "
 "or tells me I have spyware installed.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1044
+#: /home/runa/tor/website/docs/en/faq.wml:1045
 msgid ""
 "This is a known and intermittent problem; it does not mean that Google "
 "considers Tor to be spyware."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1049
+#: /home/runa/tor/website/docs/en/faq.wml:1050
 msgid ""
 "When you use Tor, you are sending queries through exit relays that are also "
 "shared by thousands of other users. Tor users typically see this message "
@@ -1730,7 +1732,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1057
+#: /home/runa/tor/website/docs/en/faq.wml:1058
 msgid ""
 "An alternate explanation is that Google tries to detect certain kinds of "
 "spyware or viruses that send distinctive queries to Google Search. It notes "
@@ -1740,7 +1742,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1066
+#: /home/runa/tor/website/docs/en/faq.wml:1067
 msgid ""
 "To our knowledge, Google is not doing anything intentionally specifically to"
 " deter or block Tor use. The error message about an infected machine should "
@@ -1748,7 +1750,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1072
+#: /home/runa/tor/website/docs/en/faq.wml:1073
 msgid ""
 "Torbutton 1.2.5 (released in mid 2010) detects Google captchas and can "
 "automatically redirect you to a more Tor-friendly search engine such as "
@@ -1756,19 +1758,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1077
+#: /home/runa/tor/website/docs/en/faq.wml:1078
 msgid "<hr /> <a id=\"GmailWarning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1080
+#: /home/runa/tor/website/docs/en/faq.wml:1081
 msgid ""
 "<a class=\"anchor\" href=\"#GmailWarning\">Gmail warns me that my account "
 "may have been compromised.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1083
+#: /home/runa/tor/website/docs/en/faq.wml:1084
 msgid ""
 "Sometimes, after you've used Gmail over Tor, Google presents a pop-up "
 "notification that your account may have been compromised.  The notification "
@@ -1777,7 +1779,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1090
+#: /home/runa/tor/website/docs/en/faq.wml:1091
 msgid ""
 "In general this is a false alarm: Google saw a bunch of logins from "
 "different places, as a result of running the service via Tor, and decided it"
@@ -1786,7 +1788,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1097
+#: /home/runa/tor/website/docs/en/faq.wml:1098
 msgid ""
 "Even though this may be a biproduct of using the service via tor, that "
 "doesn't mean you can entirely ignore the warning. It is <i>probably</i> a "
@@ -1795,7 +1797,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1104
+#: /home/runa/tor/website/docs/en/faq.wml:1105
 msgid ""
 "Cookie hijacking is possible by either physical access to your computer or "
 "by watching your network traffic.  In theory only physical access should "
@@ -1806,7 +1808,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1113
+#: /home/runa/tor/website/docs/en/faq.wml:1114
 msgid ""
 "And if somebody <i>did</i> steal your google cookie, they might end up "
 "logging in from unusual places (though of course they also might not). So "
@@ -1818,19 +1820,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1122
+#: /home/runa/tor/website/docs/en/faq.wml:1123
 msgid "<hr> <a id=\"FirewallPorts\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1125
+#: /home/runa/tor/website/docs/en/faq.wml:1126
 msgid ""
 "<a class=\"anchor\" href=\"#FirewallPorts\">My firewall only allows a few "
 "outgoing ports.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1128
+#: /home/runa/tor/website/docs/en/faq.wml:1129
 msgid ""
 "If your firewall works by blocking ports, then you can tell Tor to only use "
 "the ports that your firewall permits by adding \"FascistFirewall 1\" to your"
@@ -1840,7 +1842,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1136
+#: /home/runa/tor/website/docs/en/faq.wml:1137
 msgid ""
 "By default, when you set this Tor assumes that your firewall allows only "
 "port 80 and port 443 (HTTP and HTTPS respectively). You can select a "
@@ -1848,14 +1850,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1142
+#: /home/runa/tor/website/docs/en/faq.wml:1143
 msgid ""
 "If you want to be more fine-grained with your controls, you can also use the"
 " ReachableAddresses config options, e.g.:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1147
+#: /home/runa/tor/website/docs/en/faq.wml:1148
 #, no-wrap
 msgid ""
 "  ReachableDirAddresses *:80\n"
@@ -1863,24 +1865,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1151
+#: /home/runa/tor/website/docs/en/faq.wml:1152
 msgid "<hr> <a id=\"RelayFlexible\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1154
+#: /home/runa/tor/website/docs/en/faq.wml:1155
 msgid ""
 "<a class=\"anchor\" href=\"#RelayFlexible\">How stable does my relay need to"
 " be?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1157
+#: /home/runa/tor/website/docs/en/faq.wml:1158
 msgid "We aim to make setting up a Tor relay easy and convenient:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1161
+#: /home/runa/tor/website/docs/en/faq.wml:1162
 msgid ""
 "Tor has built-in support for <a "
 "href=\"<wikifaq>#WhatbandwidthshapingoptionsareavailabletoTorrelays\"> rate "
@@ -1891,7 +1893,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1169
+#: /home/runa/tor/website/docs/en/faq.wml:1170
 msgid ""
 "Each Tor relay has an <a href=\"#ExitPolicies\">exit policy</a> that "
 "specifies what sort of outbound connections are allowed or refused from that"
@@ -1900,7 +1902,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1174
+#: /home/runa/tor/website/docs/en/faq.wml:1175
 msgid ""
 "It's fine if the relay goes offline sometimes. The directories notice this "
 "quickly and stop advertising the relay. Just try to make sure it's not too "
@@ -1908,14 +1910,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1179
+#: /home/runa/tor/website/docs/en/faq.wml:1180
 msgid ""
 "We can handle relays with dynamic IPs just fine &mdash; simply leave the "
 "Address config option blank, and Tor will try to guess."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1182
+#: /home/runa/tor/website/docs/en/faq.wml:1183
 msgid ""
 "If your relay is behind a NAT and it doesn't know its public IP (e.g. it has"
 " an IP of 192.168.x.y), you'll need to set up port forwarding. Forwarding "
@@ -1925,7 +1927,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1188
+#: /home/runa/tor/website/docs/en/faq.wml:1189
 msgid ""
 "Your relay will passively estimate and advertise its recent bandwidth "
 "capacity, so high-bandwidth relays will attract more users than low-"
@@ -1933,24 +1935,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1194
+#: /home/runa/tor/website/docs/en/faq.wml:1195
 msgid "<hr> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1198
+#: /home/runa/tor/website/docs/en/faq.wml:1199
 msgid ""
 "<a class=\"anchor\" href=\"#ExitPolicies\">I'd run a relay, but I don't want"
 " to deal with abuse issues.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1201
+#: /home/runa/tor/website/docs/en/faq.wml:1202
 msgid "Great. That's exactly why we implemented exit policies."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1205
+#: /home/runa/tor/website/docs/en/faq.wml:1206
 msgid ""
 "Each Tor relay has an exit policy that specifies what sort of outbound "
 "connections are allowed or refused from that relay. The exit policies are "
@@ -1966,7 +1968,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1219
+#: /home/runa/tor/website/docs/en/faq.wml:1220
 msgid ""
 "The default exit policy allows access to many popular services (e.g. web "
 "browsing), but <a "
@@ -1982,7 +1984,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1233
+#: /home/runa/tor/website/docs/en/faq.wml:1234
 msgid ""
 "If you do allow any exit connections, make sure name resolution works (that "
 "is, your computer can resolve Internet addresses correctly).  If there are "
@@ -1992,19 +1994,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1241
+#: /home/runa/tor/website/docs/en/faq.wml:1242
 msgid "<hr> <a id=\"RelayOrBridge\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1244
+#: /home/runa/tor/website/docs/en/faq.wml:1245
 msgid ""
 "<a class=\"anchor\" href=\"#RelayOrBridge\">Should I be a normal relay or "
 "bridge relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1246
+#: /home/runa/tor/website/docs/en/faq.wml:1247
 msgid ""
 "<a href=\"<page docs/bridges>\">Bridge relays</a> (or \"bridges\" for short)"
 "  are <a href=\"<page docs/tor-doc-relay>\">Tor relays</a> that aren't "
@@ -2014,7 +2016,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1253
+#: /home/runa/tor/website/docs/en/faq.wml:1254
 msgid ""
 "Being a normal relay vs being a bridge relay is almost the same "
 "configuration: it's just a matter of whether your relay is listed publically"
@@ -2022,7 +2024,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1258
+#: /home/runa/tor/website/docs/en/faq.wml:1259
 msgid ""
 "Right now, China is the main place in the world that filters connections to "
 "the Tor network. So bridges are useful a) for users in China, b) as a backup"
@@ -2032,7 +2034,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1266
+#: /home/runa/tor/website/docs/en/faq.wml:1267
 msgid ""
 "So should you run a normal relay or bridge relay? If you have lots of "
 "bandwidth, you should definitely run a normal relay &mdash; the average "
@@ -2043,19 +2045,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1275
+#: /home/runa/tor/website/docs/en/faq.wml:1276
 msgid "<hr> <a id=\"MultipleRelays\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1278
+#: /home/runa/tor/website/docs/en/faq.wml:1279
 msgid ""
 "<a class=\"anchor\" href=\"#MultipleRelays\">I want to run more than one "
 "relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1281
+#: /home/runa/tor/website/docs/en/faq.wml:1282
 msgid ""
 "Great. If you want to run several relays to donate more to the network, "
 "we're happy with that. But please don't run more than a few dozen on the "
@@ -2064,7 +2066,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1288
+#: /home/runa/tor/website/docs/en/faq.wml:1289
 msgid ""
 "If you do decide to run more than one relay, please set the \"MyFamily\" "
 "config option in the <a href=\"#torrc\">torrc</a> of each relay, listing all"
@@ -2072,13 +2074,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1294
+#: /home/runa/tor/website/docs/en/faq.wml:1295
 #, no-wrap
 msgid "    MyFamily $fingerprint1,$fingerprint2,$fingerprint3\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1298
+#: /home/runa/tor/website/docs/en/faq.wml:1299
 msgid ""
 "where each fingerprint is the 40 character identity fingerprint (without "
 "spaces). You can also list them by nickname, but fingerprint is safer. Be "
@@ -2087,7 +2089,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1305
+#: /home/runa/tor/website/docs/en/faq.wml:1306
 msgid ""
 "That way clients will know to avoid using more than one of your relays in a "
 "single circuit. You should set MyFamily if you have administrative control "
@@ -2096,26 +2098,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1311
+#: /home/runa/tor/website/docs/en/faq.wml:1312
 msgid "<hr> <a id=\"RelayMemory\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1314
+#: /home/runa/tor/website/docs/en/faq.wml:1315
 msgid ""
 "<a class=\"anchor\" href=\"#RelayMemory\">Why is my Tor relay using so much "
 "memory?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1316
+#: /home/runa/tor/website/docs/en/faq.wml:1317
 msgid ""
 "If your Tor relay is using more memory than you'd like, here are some tips "
 "for reducing its footprint:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1321
+#: /home/runa/tor/website/docs/en/faq.wml:1322
 msgid ""
 "If you're on Linux, you may be encountering memory fragmentation bugs in "
 "glibc's malloc implementation. That is, when Tor releases memory back to the"
@@ -2127,7 +2129,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1329
+#: /home/runa/tor/website/docs/en/faq.wml:1330
 msgid ""
 "If you're running a fast relay, meaning you have many TLS connections open, "
 "you are probably losing a lot of memory to OpenSSL's internal buffers (38KB+"
@@ -2139,7 +2141,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1337
+#: /home/runa/tor/website/docs/en/faq.wml:1338
 msgid ""
 "If you're running on Solaris, OpenBSD, NetBSD, or old FreeBSD, Tor is "
 "probably forking separate processes rather than using threads. Consider "
@@ -2149,7 +2151,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1343
+#: /home/runa/tor/website/docs/en/faq.wml:1344
 msgid ""
 "If you still can't handle the memory load, consider reducing the amount of "
 "bandwidth your relay advertises. Advertising less bandwidth means you will "
@@ -2158,60 +2160,60 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1352
+#: /home/runa/tor/website/docs/en/faq.wml:1353
 msgid ""
 "All of this said, fast Tor relays do use a lot of ram. It is not unusual for"
 " a fast exit relay to use 500-1000 MB of memory."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1356
+#: /home/runa/tor/website/docs/en/faq.wml:1357
 msgid "<hr> <a id=\"WhyNotNamed\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1359
+#: /home/runa/tor/website/docs/en/faq.wml:1360
 msgid "<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1362
+#: /home/runa/tor/website/docs/en/faq.wml:1363
 msgid ""
 "We currently use these metrics to determine if your relay should be "
 "named:<br>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1365
+#: /home/runa/tor/website/docs/en/faq.wml:1366
 msgid ""
 "The name is not currently mapped to a different key. Existing mappings are "
 "removed after 6 months of inactivity from a relay."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1367
+#: /home/runa/tor/website/docs/en/faq.wml:1368
 msgid "The relay must have been around for at least two weeks."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1368
+#: /home/runa/tor/website/docs/en/faq.wml:1369
 msgid "No other router may have wanted the same name in the past month."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1371
+#: /home/runa/tor/website/docs/en/faq.wml:1372
 msgid "<hr> <a id=\"KeyManagement\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1374
+#: /home/runa/tor/website/docs/en/faq.wml:1375
 msgid ""
 "<a class=\"anchor\" href=\"#KeyManagement\">Tell me about all the keys Tor "
 "uses.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1377
+#: /home/runa/tor/website/docs/en/faq.wml:1378
 msgid ""
 "Tor uses a variety of different keys, with three goals in mind: 1)  "
 "encryption to ensure privacy of data within the Tor network, 2)  "
@@ -2221,7 +2223,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1385
+#: /home/runa/tor/website/docs/en/faq.wml:1386
 msgid ""
 "<b>Encryption</b>: first, all connections in Tor use TLS link encryption, so"
 " observers can't look inside to see which circuit a given cell is intended "
@@ -2232,7 +2234,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1395
+#: /home/runa/tor/website/docs/en/faq.wml:1396
 msgid ""
 "<b>Authentication</b>: Every Tor relay has a public decryption key called "
 "the \"onion key\".  When the Tor client establishes circuits, at each step "
@@ -2243,7 +2245,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1405
+#: /home/runa/tor/website/docs/en/faq.wml:1406
 msgid ""
 "<b>Coordination</b>: How do clients know what the relays are, and how do "
 "they know that they have the right keys for them? Each relay has a long-term"
@@ -2258,7 +2260,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1419
+#: /home/runa/tor/website/docs/en/faq.wml:1420
 msgid ""
 "How do clients know what the directory authorities are? The Tor software "
 "comes with a built-in list of location and public key for each directory "
@@ -2267,7 +2269,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1426
+#: /home/runa/tor/website/docs/en/faq.wml:1427
 msgid ""
 "How do users know they've got the right software? When we distribute the "
 "source code or a package, we digitally sign it with <a "
@@ -2277,7 +2279,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1434
+#: /home/runa/tor/website/docs/en/faq.wml:1435
 msgid ""
 "In order to be certain that it's really signed by us, you need to have met "
 "us in person and gotten a copy of our GPG key fingerprint, or you need to "
@@ -2287,17 +2289,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1441
+#: /home/runa/tor/website/docs/en/faq.wml:1442
 msgid "<hr> <a id=\"EntryGuards\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1444
+#: /home/runa/tor/website/docs/en/faq.wml:1445
 msgid "<a class=\"anchor\" href=\"#EntryGuards\">What are Entry Guards?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1447
+#: /home/runa/tor/website/docs/en/faq.wml:1448
 msgid ""
 "Tor (like all current practical low-latency anonymity designs) fails when "
 "the attacker can see both ends of the communications channel. For example, "
@@ -2309,7 +2311,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1457
+#: /home/runa/tor/website/docs/en/faq.wml:1458
 msgid ""
 "So, what should we do? Suppose the attacker controls, or can observe, "
 "<i>C</i> relays. Suppose there are <i>N</i> relays total. If you select new "
@@ -2323,7 +2325,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1469
+#: /home/runa/tor/website/docs/en/faq.wml:1470
 msgid ""
 "The solution is \"entry guards\": each Tor client selects a few relays at "
 "random to use as entry points, and uses only those relays for her first hop."
@@ -2336,7 +2338,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1480
+#: /home/runa/tor/website/docs/en/faq.wml:1481
 msgid ""
 "You can read more at <a href=\"http://freehaven.net/anonbib/#wright02\";>An "
 "Analysis of the Degradation of Anonymous Protocols</a>, <a "
@@ -2347,7 +2349,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1489
+#: /home/runa/tor/website/docs/en/faq.wml:1490
 msgid ""
 "Restricting your entry nodes may also help against attackers who want to run"
 " a few Tor nodes and easily enumerate all of the Tor user IP addresses. "
@@ -2358,19 +2360,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1497
+#: /home/runa/tor/website/docs/en/faq.wml:1498
 msgid "<hr> <a id=\"EverybodyARelay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1500
+#: /home/runa/tor/website/docs/en/faq.wml:1501
 msgid ""
 "<a class=\"anchor\" href=\"#EverybodyARelay\">You should make every Tor user"
 " be a relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1503
+#: /home/runa/tor/website/docs/en/faq.wml:1504
 msgid ""
 "Requiring every Tor user to be a relay would help with scaling the network "
 "to handle all our users, and <a "
@@ -2385,7 +2387,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1516
+#: /home/runa/tor/website/docs/en/faq.wml:1517
 msgid ""
 "That said, we do want to encourage Tor users to run relays, so what we "
 "really want to do is simplify the process of setting up and maintaining a "
@@ -2396,12 +2398,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1525
+#: /home/runa/tor/website/docs/en/faq.wml:1526
 msgid "There are five steps we need to address before we can do this though:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1529
+#: /home/runa/tor/website/docs/en/faq.wml:1530
 msgid ""
 "First, we need to make Tor stable as a relay on all common operating "
 "systems. The main remaining platform is Windows, and we plan to finally "
@@ -2411,7 +2413,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1537
+#: /home/runa/tor/website/docs/en/faq.wml:1538
 msgid ""
 "Second, we still need to get better at automatically estimating the right "
 "amount of bandwidth to allow. See item #7 on the <a href=\"<page "
@@ -2423,7 +2425,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1548
+#: /home/runa/tor/website/docs/en/faq.wml:1549
 msgid ""
 "Third, we need to work on scalability, both of the network (how to stop "
 "requiring that all Tor relays be able to connect to all Tor relays) and of "
@@ -2435,7 +2437,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1558
+#: /home/runa/tor/website/docs/en/faq.wml:1559
 msgid ""
 "Fourth, we need to better understand the risks from letting the attacker "
 "send traffic through your relay while you're also initiating your own "
@@ -2453,7 +2455,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1574
+#: /home/runa/tor/website/docs/en/faq.wml:1575
 msgid ""
 "Fifth, we might need some sort of incentive scheme to encourage people to "
 "relay traffic for others, and/or to become exit nodes. Here are our <a "
@@ -2462,24 +2464,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1581
+#: /home/runa/tor/website/docs/en/faq.wml:1582
 msgid "Please help on all of these!"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1584
+#: /home/runa/tor/website/docs/en/faq.wml:1585
 msgid "<hr> <a id=\"TransportIPnotTCP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1587
+#: /home/runa/tor/website/docs/en/faq.wml:1588
 msgid ""
 "<a class=\"anchor\" href=\"#TransportIPnotTCP\">You should transport all IP "
 "packets, not just TCP packets.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1590
+#: /home/runa/tor/website/docs/en/faq.wml:1591
 msgid ""
 "This would be handy, because it would make Tor better able to handle new "
 "protocols like VoIP, it could solve the whole need to socksify applications,"
@@ -2488,7 +2490,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1597
+#: /home/runa/tor/website/docs/en/faq.wml:1598
 msgid ""
 "We're heading in this direction: see <a "
 "href=\"https://trac.torproject.org/projects/tor/ticket/1855\";>this trac "
@@ -2497,7 +2499,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1604
+#: /home/runa/tor/website/docs/en/faq.wml:1605
 msgid ""
 "IP packets reveal OS characteristics. We would still need to do IP-level "
 "packet normalization, to stop things like TCP fingerprinting attacks. Given "
@@ -2508,7 +2510,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1611
+#: /home/runa/tor/website/docs/en/faq.wml:1612
 msgid ""
 "Application-level streams still need scrubbing. We will still need user-side"
 " applications like Torbutton. So it won't become just a matter of capturing "
@@ -2516,7 +2518,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1615
+#: /home/runa/tor/website/docs/en/faq.wml:1616
 msgid ""
 "Certain protocols will still leak information. For example, we must rewrite "
 "DNS requests so they are delivered to an unlinkable DNS server rather than "
@@ -2525,7 +2527,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1620
+#: /home/runa/tor/website/docs/en/faq.wml:1621
 msgid ""
 "<a "
 "href=\"http://crypto.stanford.edu/~nagendra/projects/dtls/dtls.html\";>DTLS</a>"
@@ -2536,7 +2538,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1627
+#: /home/runa/tor/website/docs/en/faq.wml:1628
 msgid ""
 "Exit policies for arbitrary IP packets mean building a secure IDS. Our node "
 "operators tell us that exit policies are one of the main reasons they're "
@@ -2554,7 +2556,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1641
+#: /home/runa/tor/website/docs/en/faq.wml:1642
 msgid ""
 "The Tor-internal name spaces would need to be redesigned. We support hidden "
 "service \".onion\" addresses by intercepting the addresses when they are "
@@ -2563,38 +2565,38 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1648
+#: /home/runa/tor/website/docs/en/faq.wml:1649
 msgid "<hr> <a id=\"Criminals\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1651
+#: /home/runa/tor/website/docs/en/faq.wml:1652
 msgid ""
 "<a class=\"anchor\" href=\"#Criminals\">Doesn't Tor enable criminals to do "
 "bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1654
+#: /home/runa/tor/website/docs/en/faq.wml:1655
 msgid ""
 "For the answer to this question and others, please see our <a href=\"<page "
 "docs/faq-abuse>\">Tor Abuse FAQ</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1658
+#: /home/runa/tor/website/docs/en/faq.wml:1659
 msgid "<hr> <a id=\"RespondISP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1661
+#: /home/runa/tor/website/docs/en/faq.wml:1662
 msgid ""
 "<a class=\"anchor\" href=\"#RespondISP\">How do I respond to my ISP about my"
 " exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1664
+#: /home/runa/tor/website/docs/en/faq.wml:1665
 msgid ""
 "A collection of templates for successfully responding to ISPs is <a "
 "href=\"<wiki>doc/TorAbuseTemplates\">collected here</a>."

Modified: translation/trunk/projects/website/po/fr/docs/3-low.tor-doc-web.po
===================================================================
--- translation/trunk/projects/website/po/fr/docs/3-low.tor-doc-web.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/fr/docs/3-low.tor-doc-web.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pierre Antoine <pierre.antoine@xxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-02-12 12:20+0000\n"
-"PO-Revision-Date: 2011-03-22 16:34+0000\n"
-"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
+"PO-Revision-Date: 2011-09-28 02:32+0000\n"
+"Last-Translator: pigati <pierre.antoine@xxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,6 +47,10 @@
 " install the <a href=\"<page torbutton/index>\">Torbutton plugin</a>, "
 "restart your Firefox, and you're all set:"
 msgstr ""
+"Si vous utilisez Firefox (nous le recommandons), vous n'avez pas besoin des "
+"informations de cette page.  Il suffit d'installer le <a href=\"<page "
+"torbutton/index>\">plugin Torbutton</a>, de redÃmarrer Firefox et c'est tout"
+" :"
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-web.wml:22

Modified: translation/trunk/projects/website/po/fr/donate/3-low.donate.po
===================================================================
--- translation/trunk/projects/website/po/fr/donate/3-low.donate.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/fr/donate/3-low.donate.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-08-30 08:50+0200\n"
-"PO-Revision-Date: 2011-09-21 19:54+0000\n"
+"PO-Revision-Date: 2011-09-28 09:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/fr/download/3-low.download.po
===================================================================
--- translation/trunk/projects/website/po/fr/download/3-low.download.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/fr/download/3-low.download.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -11,7 +11,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-09-05 00:00+0200\n"
-"PO-Revision-Date: 2011-09-20 13:46+0000\n"
+"PO-Revision-Date: 2011-09-23 07:34+0000\n"
 "Last-Translator: LittleMissGeek <clbaldock@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -499,7 +499,7 @@
 #. type: Content of: <div><div><div><div><p>
 #: /home/runa/tor/website/download/en/download.wml:220
 msgid "For iPhone, iPod Touch, and iPad."
-msgstr ""
+msgstr "Pour iPhone; iPod Touch, et iPad."
 
 #. type: Content of: <div><div><div><div><div>
 #: /home/runa/tor/website/download/en/download.wml:225
@@ -516,7 +516,7 @@
 #. type: Content of: <div><div><div>
 #: /home/runa/tor/website/download/en/download.wml:234
 msgid "<span class=\"sourcecode24\">Source Code</span>"
-msgstr ""
+msgstr "<span class=\"sourcecode24\">Code Source</span>"
 
 #. type: Content of: <div><div><div><div><div>
 #: /home/runa/tor/website/download/en/download.wml:239
@@ -787,6 +787,8 @@
 "'); } } $(function(){ $(\"#amount\").change(displayVals); "
 "$(\"#t3\").change(displayVals); displayVals(); });"
 msgstr ""
+"'); } } $(function(){ $(\"#amount\").change(displayVals); "
+"$(\"#t3\").change(displayVals); displayVals(); });"
 
 #. type: Content of: <div><div><form><h2>
 #: /home/runa/tor/website/download/en/download.wml:379
@@ -860,6 +862,17 @@
 "type=\"hidden\" name=\"cancel_return\" "
 "value=\"https://www.torproject.org/download/download.html\";>"
 msgstr ""
+"<input type=\"hidden\" id=\"p3\" name=\"p3\" value=\"1\"> <input "
+"type=\"hidden\" name=\"sra\" value=\"1\"> <input type=\"hidden\" "
+"name=\"src\" value=\"1\"> <input type=\"hidden\" name=\"no_shipping\" "
+"value=\"1\"> <input type=\"hidden\" name=\"no_note\" value=\"1\"> <input "
+"type=\"hidden\" id=\"cmd\" name=\"cmd\" value=\"_donations\"> <input "
+"type=\"hidden\" name=\"business\" value=\"donations@xxxxxxxxxxxxxx\"> <input"
+" type=\"hidden\" id=\"item_name\" name=\"item_name\" value=\"Donation to the"
+" Tor Project\"> <input type=\"hidden\" name=\"return\" "
+"value=\"https://www.torproject.org/donate/thankyou.html\";> <input "
+"type=\"hidden\" name=\"cancel_return\" "
+"value=\"https://www.torproject.org/download/download.html\";>"
 
 #. type: Content of: <div><div><form><p>
 #: /home/runa/tor/website/download/en/download.wml:410

Modified: translation/trunk/projects/website/po/fr/projects/3-low.torweather.po
===================================================================
--- translation/trunk/projects/website/po/fr/projects/3-low.torweather.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/fr/projects/3-low.torweather.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-02-12 12:19+0000\n"
-"PO-Revision-Date: 2011-09-21 19:53+0000\n"
+"PO-Revision-Date: 2011-09-28 09:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/hu/about/3-low.contact.po
===================================================================
--- translation/trunk/projects/website/po/hu/about/3-low.contact.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/hu/about/3-low.contact.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-07-08 08:44+0200\n"
-"PO-Revision-Date: 2011-08-10 07:52+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 00:57+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -52,6 +52,13 @@
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/about/en/contact.wml:24
 msgid ""
+"<i>community-support at lists.torproject.org</i> is for volunteers helping "
+"people with questions about using or configuring Tor."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/contact.wml:27
+msgid ""
 "<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page "
 "getinvolved/translation>\">website translations</a> into place, and help "
 "answer questions about existing and new translations."
@@ -62,7 +69,7 @@
 "kÃrdÃsekre"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:27
+#: /home/runa/tor/website/about/en/contact.wml:30
 msgid ""
 "<i>tordnsel at torproject.org</i> is the alias for the people responsible "
 "for the tordns exitlist."
@@ -71,7 +78,7 @@
 "exitlist mÃgÃtt."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:29
+#: /home/runa/tor/website/about/en/contact.wml:32
 msgid ""
 "<i>donations at torproject.org</i> is for questions and comments about <a "
 "href=\"<page donate/donate>\">getting money to the developers</a>. More "
@@ -85,7 +92,7 @@
 "szeretnÃ."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:34
+#: /home/runa/tor/website/about/en/contact.wml:37
 msgid ""
 "<i>execdir at torproject.org</i> is for press/media, questions and comments "
 "about Tor the non-profit corporation: trademark questions, affiliation and "
@@ -98,12 +105,12 @@
 "szerzÅdÃskÃtÃsi igÃnyek, linceszelÃs, tanÃsÃtÃs, stb."
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:40
+#: /home/runa/tor/website/about/en/contact.wml:43
 msgid "Identi.ca"
 msgstr "Identi.ca"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:41
+#: /home/runa/tor/website/about/en/contact.wml:44
 msgid ""
 "<a id=\"identica\"></a> Contact us via our microblogging Identi.ca account "
 "at <a href=\"https://identi.ca/torproject\";>torproject</a>."
@@ -113,17 +120,17 @@
 "href=\"https://identi.ca/torproject\";>torproject</a>."
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:45
+#: /home/runa/tor/website/about/en/contact.wml:48
 msgid "IRC"
 msgstr "IRC"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:46
+#: /home/runa/tor/website/about/en/contact.wml:49
 msgid "<a id=\"irc\"></a>"
 msgstr "<a id=\"irc\"></a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:47
+#: /home/runa/tor/website/about/en/contact.wml:50
 msgid ""
 "Tor users and developers can also be found in the following channels on <a "
 "href=\"http://www.oftc.net/oftc/\";>OFTC</a>:"
@@ -132,7 +139,7 @@
 "szerveren: <a href=\"http://www.oftc.net/oftc/\";>OFTC</a>:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:51
+#: /home/runa/tor/website/about/en/contact.wml:54
 msgid ""
 "<i>#tor</i> - User and relay operation discussions. Having trouble running "
 "Tor or a question for other Tor users? Then this is the spot for you."
@@ -142,7 +149,7 @@
 "keres. (Lehet, hogy angol nyelvÅ a tartalom.)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:54
+#: /home/runa/tor/website/about/en/contact.wml:57
 msgid ""
 "<i>#tor-dev</i> - Channel for people who want to do development.  "
 "Discussions about Tor-related coding, protocols, and <a href=\"<page "
@@ -154,7 +161,7 @@
 " itt."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:57
+#: /home/runa/tor/website/about/en/contact.wml:60
 msgid ""
 "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that "
 "is not related to Tor."
@@ -164,22 +171,21 @@
 "tartalom.)"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:61
+#: /home/runa/tor/website/about/en/contact.wml:64
 msgid "Telephone"
 msgstr "Telefon"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:62
+#: /home/runa/tor/website/about/en/contact.wml:65
 msgid "<a id=\"phone\"></a>"
 msgstr "<a id=\"phone\"></a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:63
+#: /home/runa/tor/website/about/en/contact.wml:66
 msgid ""
 "If none of the above appeal to you, calling +1-781-352-0568 will reach the "
-"Tor office.  Should there be no answer, please leave a message."
+"Tor office.  Should there be no answer, please leave a message with a way to"
+" reach you."
 msgstr ""
-"Ha semelyik fenti nem felel meg Ãnnek a +1-781-352-0568 telefonszÃmon elÃri "
-"a Tor irodÃt. Ha nem veszi fel senki, kÃrjÃk hagyjon Ãzenetet."
 
 

Modified: translation/trunk/projects/website/po/hu/projects/3-low.tordnsel.po
===================================================================
--- translation/trunk/projects/website/po/hu/projects/3-low.tordnsel.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/hu/projects/3-low.tordnsel.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-09-21 19:38+0000\n"
+"PO-Revision-Date: 2011-09-28 08:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/it/about/3-low.contact.po
===================================================================
--- translation/trunk/projects/website/po/it/about/3-low.contact.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/it/about/3-low.contact.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-07-08 08:44+0200\n"
-"PO-Revision-Date: 2011-07-09 01:09+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 00:57+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
 "MIME-Version: 1.0\n"
@@ -46,20 +46,27 @@
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/about/en/contact.wml:24
 msgid ""
+"<i>community-support at lists.torproject.org</i> is for volunteers helping "
+"people with questions about using or configuring Tor."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/contact.wml:27
+msgid ""
 "<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page "
 "getinvolved/translation>\">website translations</a> into place, and help "
 "answer questions about existing and new translations."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:27
+#: /home/runa/tor/website/about/en/contact.wml:30
 msgid ""
 "<i>tordnsel at torproject.org</i> is the alias for the people responsible "
 "for the tordns exitlist."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:29
+#: /home/runa/tor/website/about/en/contact.wml:32
 msgid ""
 "<i>donations at torproject.org</i> is for questions and comments about <a "
 "href=\"<page donate/donate>\">getting money to the developers</a>. More "
@@ -68,7 +75,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:34
+#: /home/runa/tor/website/about/en/contact.wml:37
 msgid ""
 "<i>execdir at torproject.org</i> is for press/media, questions and comments "
 "about Tor the non-profit corporation: trademark questions, affiliation and "
@@ -77,43 +84,43 @@
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:40
+#: /home/runa/tor/website/about/en/contact.wml:43
 msgid "Identi.ca"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:41
+#: /home/runa/tor/website/about/en/contact.wml:44
 msgid ""
 "<a id=\"identica\"></a> Contact us via our microblogging Identi.ca account "
 "at <a href=\"https://identi.ca/torproject\";>torproject</a>."
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:45
+#: /home/runa/tor/website/about/en/contact.wml:48
 msgid "IRC"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:46
+#: /home/runa/tor/website/about/en/contact.wml:49
 msgid "<a id=\"irc\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:47
+#: /home/runa/tor/website/about/en/contact.wml:50
 msgid ""
 "Tor users and developers can also be found in the following channels on <a "
 "href=\"http://www.oftc.net/oftc/\";>OFTC</a>:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:51
+#: /home/runa/tor/website/about/en/contact.wml:54
 msgid ""
 "<i>#tor</i> - User and relay operation discussions. Having trouble running "
 "Tor or a question for other Tor users? Then this is the spot for you."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:54
+#: /home/runa/tor/website/about/en/contact.wml:57
 msgid ""
 "<i>#tor-dev</i> - Channel for people who want to do development.  "
 "Discussions about Tor-related coding, protocols, and <a href=\"<page "
@@ -121,27 +128,28 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:57
+#: /home/runa/tor/website/about/en/contact.wml:60
 msgid ""
 "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that "
 "is not related to Tor."
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:61
+#: /home/runa/tor/website/about/en/contact.wml:64
 msgid "Telephone"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:62
+#: /home/runa/tor/website/about/en/contact.wml:65
 msgid "<a id=\"phone\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:63
+#: /home/runa/tor/website/about/en/contact.wml:66
 msgid ""
 "If none of the above appeal to you, calling +1-781-352-0568 will reach the "
-"Tor office.  Should there be no answer, please leave a message."
+"Tor office.  Should there be no answer, please leave a message with a way to"
+" reach you."
 msgstr ""
 
 

Modified: translation/trunk/projects/website/po/it/about/3-low.financials.po
===================================================================
--- translation/trunk/projects/website/po/it/about/3-low.financials.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/it/about/3-low.financials.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-22 16:20+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 00:58+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/about/en/financials.wml:9
+#: /home/runa/tor/website/about/en/financials.wml:9
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "about/overview>\">About &raquo; </a> <a href=\"<page "
@@ -26,66 +26,79 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/transifex/website/about/en/financials.wml:14
+#: /home/runa/tor/website/about/en/financials.wml:14
 msgid "Tor: Financial Reports"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/financials.wml:16
+#: /home/runa/tor/website/about/en/financials.wml:16
+msgid "Fiscal Year 2010"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/financials.wml:17
+msgid ""
+"<a href=\"findoc/2010-TorProject-combined-"
+"Form990_PC_Audit_Results.pdf\">2010 IRS Form 990, State of MA Form PC, and "
+"Independent Audit Results</a>"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/financials.wml:18
 msgid "Fiscal Year 2009"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:17
+#: /home/runa/tor/website/about/en/financials.wml:19
 msgid ""
 "<a href=\"findoc/2009-TorProject-Annual-Report.pdf\">2009 Annual Report</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:18
+#: /home/runa/tor/website/about/en/financials.wml:20
 msgid ""
 "<a href=\"findoc/2009-TorProject-Form990andPC.pdf\">2009 IRS Form 990 and "
 "State of MA Form PC</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:19
+#: /home/runa/tor/website/about/en/financials.wml:21
 msgid ""
 "<a href=\"findoc/2009-TorProject-FinancialStatements.pdf\">2009 Financial "
 "Statements and Audit results</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:20
+#: /home/runa/tor/website/about/en/financials.wml:22
 msgid ""
 "<a href=\"findoc/2009-TorProject-DCF.pdf\">2009 Dept of Commerce Data "
 "Collection Form</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/financials.wml:21
+#: /home/runa/tor/website/about/en/financials.wml:23
 msgid "Fiscal Year 2008"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:22
+#: /home/runa/tor/website/about/en/financials.wml:24
 msgid "<a href=\"findoc/2008-TorProject-Form990.pdf\">2008 IRS Form 990</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:23
+#: /home/runa/tor/website/about/en/financials.wml:25
 msgid ""
 "<a href=\"findoc/2008-TorProject-FinancialStatements.pdf\">2008 Financial "
 "Statements and Audit Results</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/financials.wml:24
+#: /home/runa/tor/website/about/en/financials.wml:26
 msgid "Fiscal Year 2007"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:25
+#: /home/runa/tor/website/about/en/financials.wml:27
 msgid "<a href=\"findoc/2007-TorProject-Form990.pdf\">2007 IRS Form 990</a>"
 msgstr ""
 

Modified: translation/trunk/projects/website/po/it/docs/2-medium.faq.po
===================================================================
--- translation/trunk/projects/website/po/it/docs/2-medium.faq.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/it/docs/2-medium.faq.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-08-30 08:50+0200\n"
-"PO-Revision-Date: 2011-08-31 01:41+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 00:59+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/NhlG8k8BI3.xml:1669
+#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/mo95NMnX36.xml:1670
 msgid "<hr>"
 msgstr ""
 
@@ -1088,17 +1088,19 @@
 "Some government or corporate firewalls censor connections to Tor's website. "
 "In those cases, you have three options. First, get it from a friend &mdash; "
 "the <a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a> fits "
-"nicely on a USB key. Second, find the google cache for the <a href=\"<page "
-"getinvolved/mirrors>\">Tor mirrors</a> page and see if any of those copies "
-"of our website work for you. Third, you can download Tor via email: log in "
-"to your Gmail account and mail '<tt>gettor AT torproject.org</tt>'. If you "
-"include the word 'help' in the body of the email, it will reply with "
-"instructions. Note that only a few webmail providers are supported, since "
-"they need to be able to receive very large attachments."
+"nicely on a USB key. Second, find the <a "
+"href=\"https://encrypted.google.com/search?q=tor+mirrors\";>google cache</a> "
+"for the <a href=\"<page getinvolved/mirrors>\">Tor mirrors</a> page and see "
+"if any of those copies of our website work for you. Third, you can download "
+"Tor via email: log in to your Gmail account and mail '<tt>gettor AT "
+"torproject.org</tt>'. If you include the word 'help' in the body of the "
+"email, it will reply with instructions. Note that only a few webmail "
+"providers are supported, since they need to be able to receive very large "
+"attachments."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:669
+#: /home/runa/tor/website/docs/en/faq.wml:670
 msgid ""
 "Be sure to <a href=\"<page docs/verifying-signatures>\">verify the "
 "signature</a> of any package you download, especially when you get it from "
@@ -1106,26 +1108,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:674
+#: /home/runa/tor/website/docs/en/faq.wml:675
 msgid "<hr> <a id=\"CompileTorWindows\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:677
+#: /home/runa/tor/website/docs/en/faq.wml:678
 msgid ""
 "<a class=\"anchor\" href=\"#CompileTorWindows\">How do I compile Tor under "
 "Windows?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:680
+#: /home/runa/tor/website/docs/en/faq.wml:681
 msgid ""
 "Try following the steps at <a href=\"<gitblob>doc/tor-win32-mingw-"
 "creation.txt\"> tor-win32-mingw-creation.txt</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:685
+#: /home/runa/tor/website/docs/en/faq.wml:686
 msgid ""
 "(Note that you don't need to compile Tor yourself in order to use it. Most "
 "people just use the packages available on the <a href=\"<page "
@@ -1133,19 +1135,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:690
+#: /home/runa/tor/website/docs/en/faq.wml:691
 msgid "<hr> <a id=\"VirusFalsePositives\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:693
+#: /home/runa/tor/website/docs/en/faq.wml:694
 msgid ""
 "<a class=\"anchor\" href=\"#VirusFalsePositives\">Why does my Tor executable"
 " appear to have a virus or spyware?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:696
+#: /home/runa/tor/website/docs/en/faq.wml:697
 msgid ""
 "Sometimes, overzealous Windows virus and spyware detectors trigger on some "
 "parts of the Tor Windows binary. Our best guess is that these are false "
@@ -1156,7 +1158,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:704
+#: /home/runa/tor/website/docs/en/faq.wml:705
 msgid ""
 "In the meantime, we encourage you to not just take our word for it. Our job "
 "is to provide the source; if you're concerned, please do <a "
@@ -1164,19 +1166,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:709
+#: /home/runa/tor/website/docs/en/faq.wml:710
 msgid "<hr> <a id=\"LiveCD\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:712
+#: /home/runa/tor/website/docs/en/faq.wml:713
 msgid ""
 "<a class=\"anchor\" href=\"#LiveCD\">Is there a LiveCD or other bundle that "
 "includes Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:715
+#: /home/runa/tor/website/docs/en/faq.wml:716
 msgid ""
 "Yes.  Use <a href=\"https://tails.boum.org/\";>The Amnesic Incognito Live "
 "System</a> or <a href=\"<page projects/torbrowser>\">the Tor Browser "
@@ -1184,19 +1186,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:720
+#: /home/runa/tor/website/docs/en/faq.wml:721
 msgid "<hr> <a id=\"torrc\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:723
+#: /home/runa/tor/website/docs/en/faq.wml:724
 msgid ""
 "<a class=\"anchor\" href=\"#torrc\">I'm supposed to \"edit my torrc\". What "
 "does that mean?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:726
+#: /home/runa/tor/website/docs/en/faq.wml:727
 msgid ""
 "Tor installs a text file called torrc that contains configuration "
 "instructions for how your Tor program should behave. The default "
@@ -1206,12 +1208,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:734
+#: /home/runa/tor/website/docs/en/faq.wml:735
 msgid "The location of your torrc file depends on the way you installed Tor:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:738
+#: /home/runa/tor/website/docs/en/faq.wml:739
 msgid ""
 "On Windows, if you installed a Tor bundle with Vidalia, you can find your "
 "torrc file in the Start menu under Programs -&gt; Vidalia Bundle -&gt; Tor, "
@@ -1224,14 +1226,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:747
+#: /home/runa/tor/website/docs/en/faq.wml:748
 msgid ""
 "On OS X, if you use Vidalia, edit <code>~/.vidalia/torrc</code>. Otherwise, "
 "open your favorite text editor and load <code>/Library/Tor/torrc</code>."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:751
+#: /home/runa/tor/website/docs/en/faq.wml:752
 msgid ""
 "On Unix, if you installed a pre-built package, look for "
 "<code>/etc/tor/torrc</code> or <code>/etc/torrc</code> or consult your "
@@ -1239,7 +1241,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:755
+#: /home/runa/tor/website/docs/en/faq.wml:756
 msgid ""
 "Finally, if you installed from source, you may not have a torrc installed "
 "yet: look in <code>/usr/local/etc/</code> and note that you may need to "
@@ -1247,14 +1249,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:762
+#: /home/runa/tor/website/docs/en/faq.wml:763
 msgid ""
 "If you use Vidalia, be sure to exit both Tor and Vidalia before you edit "
 "your torrc file. Otherwise Vidalia might overwrite your changes."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:767
+#: /home/runa/tor/website/docs/en/faq.wml:768
 msgid ""
 "Once you've changed your torrc, you will need to restart Tor for the changes"
 " to take effect. (For advanced users on OS X and Unix, note that you "
@@ -1262,7 +1264,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:773
+#: /home/runa/tor/website/docs/en/faq.wml:774
 msgid ""
 "For other configuration options you can use, look at the <a href=\"<page "
 "docs/tor-manual>\">Tor manual page</a>. Remember, all lines beginning with #"
@@ -1270,19 +1272,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:779
+#: /home/runa/tor/website/docs/en/faq.wml:780
 msgid "<hr> <a id=\"Logs\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:782
+#: /home/runa/tor/website/docs/en/faq.wml:783
 msgid ""
 "<a class=\"anchor\" href=\"#Logs\">How do I set up logging, or see Tor's "
 "logs?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:785
+#: /home/runa/tor/website/docs/en/faq.wml:786
 msgid ""
 "If you installed a Tor bundle that includes Vidalia, then Vidalia has a "
 "window called \"Message Log\" that will show you Tor's log messages. You can"
@@ -1291,19 +1293,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:792
+#: /home/runa/tor/website/docs/en/faq.wml:793
 msgid ""
 "If you're not using Vidalia, you'll have to go find the log files by hand. "
 "Here are some likely places for your logs to be:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:797
+#: /home/runa/tor/website/docs/en/faq.wml:798
 msgid "On OS X, Debian, Red Hat, etc, the logs are in /var/log/tor/"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:799
+#: /home/runa/tor/website/docs/en/faq.wml:800
 msgid ""
 "On Windows, there are no default log files currently. If you enable logs in "
 "your torrc file, they default to <code>\\username\\Application "
@@ -1311,7 +1313,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:803
+#: /home/runa/tor/website/docs/en/faq.wml:804
 msgid ""
 "If you compiled Tor from source, by default your Tor logs to <a "
 "href=\"http://en.wikipedia.org/wiki/Standard_streams\";>\"stdout\"</a> at "
@@ -1320,7 +1322,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:811
+#: /home/runa/tor/website/docs/en/faq.wml:812
 msgid ""
 "To change your logging setup by hand, <a href=\"#torrc\">edit your torrc</a>"
 " and find the section (near the top of the file) which contains the "
@@ -1328,7 +1330,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:817
+#: /home/runa/tor/website/docs/en/faq.wml:818
 #, no-wrap
 msgid ""
 "\\## Logs go to stdout at level \"notice\" unless redirected by something\n"
@@ -1336,7 +1338,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:822
+#: /home/runa/tor/website/docs/en/faq.wml:823
 msgid ""
 "For example, if you want Tor to send complete debug, info, notice, warn, and"
 " err level messages to a file, append the following line to the end of the "
@@ -1344,32 +1346,32 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:828
+#: /home/runa/tor/website/docs/en/faq.wml:829
 #, no-wrap
 msgid "Log debug file c:/program files/tor/debug.log\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:832
+#: /home/runa/tor/website/docs/en/faq.wml:833
 msgid ""
 "Replace <code>c:/program files/tor/debug.log</code> with a directory and "
 "filename for your Tor log."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:836
+#: /home/runa/tor/website/docs/en/faq.wml:837
 msgid "<hr> <a id=\"DoesntWork\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:839
+#: /home/runa/tor/website/docs/en/faq.wml:840
 msgid ""
 "<a class=\"anchor\" href=\"#DoesntWork\">I installed Tor and Polipo but it's"
 " not working.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:842
+#: /home/runa/tor/website/docs/en/faq.wml:843
 msgid ""
 "Once you've installed the Tor bundle, there are two questions to ask: first,"
 " is your Tor able to establish a circuit? Second, is your Firefox correctly "
@@ -1377,7 +1379,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:847
+#: /home/runa/tor/website/docs/en/faq.wml:848
 msgid ""
 "If Tor can establish a circuit, the onion icon in Vidalia will turn green. "
 "You can also check in the Vidalia Control Panel to make sure it says "
@@ -1387,19 +1389,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:857
+#: /home/runa/tor/website/docs/en/faq.wml:858
 msgid "If Tor can't establish a circuit, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:861
+#: /home/runa/tor/website/docs/en/faq.wml:862
 msgid ""
 "Are you sure Tor is running? If you're using Vidalia, you may have to click "
 "on the onion and select \"Start\" to launch Tor."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:863
+#: /home/runa/tor/website/docs/en/faq.wml:864
 msgid ""
 "Check your system clock. If it's more than a few hours off, Tor will refuse "
 "to build circuits. For XP users, synchronize your clock under the clock "
@@ -1408,7 +1410,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:867
+#: /home/runa/tor/website/docs/en/faq.wml:868
 msgid ""
 "Is your Internet connection <a href=\"#FirewallPorts\">firewalled by "
 "port</a>, or do you normally need to use a <a "
@@ -1416,7 +1418,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:872
+#: /home/runa/tor/website/docs/en/faq.wml:873
 msgid ""
 "Are you running programs like Norton Internet Security or SELinux that block"
 " certain connections, even though you don't realize they do? They could be "
@@ -1424,7 +1426,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:875
+#: /home/runa/tor/website/docs/en/faq.wml:876
 msgid ""
 "Are you in China, or behind a restrictive corporate network firewall that "
 "blocks the public Tor relays? If so, you should learn about <a href=\"<page "
@@ -1432,14 +1434,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:878
+#: /home/runa/tor/website/docs/en/faq.wml:879
 msgid ""
 "Check your <a href=\"#Logs\">Tor logs</a>. Do they give you any hints about "
 "what's going wrong?"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:883
+#: /home/runa/tor/website/docs/en/faq.wml:884
 msgid ""
 "Step two is to confirm that Firefox is correctly configured to send its "
 "traffic through Tor. Try the <a href=\"https://check.torproject.org/\";>Tor "
@@ -1449,12 +1451,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:891
+#: /home/runa/tor/website/docs/en/faq.wml:892
 msgid "If it thinks you're not using Tor, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:895
+#: /home/runa/tor/website/docs/en/faq.wml:896
 msgid ""
 "Did you install the Torbutton extension for Firefox? The installation "
 "bundles include it, but sometimes people forget to install it. Make sure it "
@@ -1463,7 +1465,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:900
+#: /home/runa/tor/website/docs/en/faq.wml:901
 msgid ""
 "Do you have incompatible Firefox extensions like FoxyProxy installed? If so,"
 " uninstall them. (Note that using FoxyProxy is NOT a sufficient substitute "
@@ -1475,7 +1477,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:907
+#: /home/runa/tor/website/docs/en/faq.wml:908
 msgid ""
 "If your browser says \"The proxy server is refusing connections.\", check "
 "that Polipo (the http proxy that passes traffic between Firefox and Tor) is "
@@ -1485,7 +1487,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:912
+#: /home/runa/tor/website/docs/en/faq.wml:913
 msgid ""
 "If you're upgrading from OS X, some of the earlier OS X installers were "
 "broken in really unfortunate ways. You may find that <a href=\"<page docs"
@@ -1495,14 +1497,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:917
+#: /home/runa/tor/website/docs/en/faq.wml:918
 msgid ""
 "If you're on Linux, make sure Privoxy isn't running, since it will conflict "
 "with the port that our Polipo configuration file picks."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:919
+#: /home/runa/tor/website/docs/en/faq.wml:920
 msgid ""
 "If you installed Polipo yourself (not from a bundle), did you edit the "
 "config file as described? Did you restart Polipo after this change? Are you "
@@ -1510,7 +1512,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:922
+#: /home/runa/tor/website/docs/en/faq.wml:923
 msgid ""
 "For Red Hat Linux and related systems, do you have SELinux enabled? If so, "
 "it might be preventing Polipo from talking to Tor. We also run across BSD "
@@ -1519,19 +1521,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:928
+#: /home/runa/tor/website/docs/en/faq.wml:929
 msgid "<hr /> <a id=\"VidaliaPassword\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:931
+#: /home/runa/tor/website/docs/en/faq.wml:932
 msgid ""
 "<a class=\"anchor\" href=\"#VidaliaPassword\">Tor/Vidalia prompts for a "
 "password at start.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:934
+#: /home/runa/tor/website/docs/en/faq.wml:935
 msgid ""
 "Vidalia interacts with the Tor software via Tor's \"control port\". The "
 "control port lets Vidalia receive status updates from Tor, request a new "
@@ -1542,7 +1544,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:943
+#: /home/runa/tor/website/docs/en/faq.wml:944
 msgid ""
 "Usually this process of generating and setting a random control password "
 "happens in the background. There are three common situations, though, where "
@@ -1550,7 +1552,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:949
+#: /home/runa/tor/website/docs/en/faq.wml:950
 msgid ""
 "You're already running Vidalia and Tor. For example, this situation can "
 "happen if you installed the Vidalia bundle and now you're trying to run the "
@@ -1559,7 +1561,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:954
+#: /home/runa/tor/website/docs/en/faq.wml:955
 msgid ""
 "Vidalia crashed, but left Tor running with the last known random password. "
 "After you restart Vidalia, it generates a new random password, but Vidalia "
@@ -1573,7 +1575,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:967
+#: /home/runa/tor/website/docs/en/faq.wml:968
 msgid ""
 "You had previously set Tor to run as a Windows NT service. When Tor is set "
 "to run as a service, it starts up when the system boots. If you configured "
@@ -1588,19 +1590,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:982
+#: /home/runa/tor/website/docs/en/faq.wml:983
 msgid "<hr> <a id=\"ChooseEntryExit\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:985
+#: /home/runa/tor/website/docs/en/faq.wml:986
 msgid ""
 "<a class=\"anchor\" href=\"#ChooseEntryExit\">Can I control which nodes (or "
 "country) are used for entry/exit?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:988
+#: /home/runa/tor/website/docs/en/faq.wml:989
 msgid ""
 "Yes. You can set preferred entry and exit nodes as well as inform Tor which "
 "nodes you do not want to use.  The following options can be added to your "
@@ -1609,53 +1611,53 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:994
+#: /home/runa/tor/website/docs/en/faq.wml:995
 msgid "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:995
+#: /home/runa/tor/website/docs/en/faq.wml:996
 msgid ""
 "A list of preferred nodes to use for the first hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:997
+#: /home/runa/tor/website/docs/en/faq.wml:998
 msgid "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:998
+#: /home/runa/tor/website/docs/en/faq.wml:999
 msgid ""
 "A list of preferred nodes to use for the last hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:1000
+#: /home/runa/tor/website/docs/en/faq.wml:1001
 msgid "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:1001
+#: /home/runa/tor/website/docs/en/faq.wml:1002
 msgid "A list of nodes to never use when building a circuit."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:1003
+#: /home/runa/tor/website/docs/en/faq.wml:1004
 msgid "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:1004
+#: /home/runa/tor/website/docs/en/faq.wml:1005
 msgid ""
 "A list of nodes to never use when picking an exit.  Nodes listed in "
 "<tt>ExcludeNodes</tt> are automatically in this list."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1009
+#: /home/runa/tor/website/docs/en/faq.wml:1010
 msgid ""
 "<em>We recommend you do not use these</em> &mdash; they are intended for "
 "testing and may disappear in future versions.  You get the best security "
@@ -1665,7 +1667,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1016
+#: /home/runa/tor/website/docs/en/faq.wml:1017
 msgid ""
 "The <tt>EntryNodes</tt> and <tt>ExitNodes</tt> config options are treated as"
 " a request, meaning if the nodes are down or seem slow, Tor will still avoid"
@@ -1677,7 +1679,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1026
+#: /home/runa/tor/website/docs/en/faq.wml:1027
 msgid ""
 "Instead of <tt>$fingerprint</tt> you can also specify a 2 letter ISO3166 "
 "country code in curly braces (for example {de}), or an ip address pattern "
@@ -1686,7 +1688,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1032
+#: /home/runa/tor/website/docs/en/faq.wml:1033
 msgid ""
 "If you want to access a service directly through Tor's SOCKS interface (eg. "
 "using ssh via connect.c), another option is to set up an internal mapping in"
@@ -1695,26 +1697,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1038
+#: /home/runa/tor/website/docs/en/faq.wml:1039
 msgid "<hr> <a id=\"GoogleCaptcha\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1041
+#: /home/runa/tor/website/docs/en/faq.wml:1042
 msgid ""
 "<a class=\"anchor\" href=\"#GoogleCaptcha\">Google makes me solve a Captcha "
 "or tells me I have spyware installed.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1044
+#: /home/runa/tor/website/docs/en/faq.wml:1045
 msgid ""
 "This is a known and intermittent problem; it does not mean that Google "
 "considers Tor to be spyware."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1049
+#: /home/runa/tor/website/docs/en/faq.wml:1050
 msgid ""
 "When you use Tor, you are sending queries through exit relays that are also "
 "shared by thousands of other users. Tor users typically see this message "
@@ -1725,7 +1727,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1057
+#: /home/runa/tor/website/docs/en/faq.wml:1058
 msgid ""
 "An alternate explanation is that Google tries to detect certain kinds of "
 "spyware or viruses that send distinctive queries to Google Search. It notes "
@@ -1735,7 +1737,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1066
+#: /home/runa/tor/website/docs/en/faq.wml:1067
 msgid ""
 "To our knowledge, Google is not doing anything intentionally specifically to"
 " deter or block Tor use. The error message about an infected machine should "
@@ -1743,7 +1745,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1072
+#: /home/runa/tor/website/docs/en/faq.wml:1073
 msgid ""
 "Torbutton 1.2.5 (released in mid 2010) detects Google captchas and can "
 "automatically redirect you to a more Tor-friendly search engine such as "
@@ -1751,19 +1753,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1077
+#: /home/runa/tor/website/docs/en/faq.wml:1078
 msgid "<hr /> <a id=\"GmailWarning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1080
+#: /home/runa/tor/website/docs/en/faq.wml:1081
 msgid ""
 "<a class=\"anchor\" href=\"#GmailWarning\">Gmail warns me that my account "
 "may have been compromised.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1083
+#: /home/runa/tor/website/docs/en/faq.wml:1084
 msgid ""
 "Sometimes, after you've used Gmail over Tor, Google presents a pop-up "
 "notification that your account may have been compromised.  The notification "
@@ -1772,7 +1774,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1090
+#: /home/runa/tor/website/docs/en/faq.wml:1091
 msgid ""
 "In general this is a false alarm: Google saw a bunch of logins from "
 "different places, as a result of running the service via Tor, and decided it"
@@ -1781,7 +1783,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1097
+#: /home/runa/tor/website/docs/en/faq.wml:1098
 msgid ""
 "Even though this may be a biproduct of using the service via tor, that "
 "doesn't mean you can entirely ignore the warning. It is <i>probably</i> a "
@@ -1790,7 +1792,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1104
+#: /home/runa/tor/website/docs/en/faq.wml:1105
 msgid ""
 "Cookie hijacking is possible by either physical access to your computer or "
 "by watching your network traffic.  In theory only physical access should "
@@ -1801,7 +1803,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1113
+#: /home/runa/tor/website/docs/en/faq.wml:1114
 msgid ""
 "And if somebody <i>did</i> steal your google cookie, they might end up "
 "logging in from unusual places (though of course they also might not). So "
@@ -1813,19 +1815,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1122
+#: /home/runa/tor/website/docs/en/faq.wml:1123
 msgid "<hr> <a id=\"FirewallPorts\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1125
+#: /home/runa/tor/website/docs/en/faq.wml:1126
 msgid ""
 "<a class=\"anchor\" href=\"#FirewallPorts\">My firewall only allows a few "
 "outgoing ports.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1128
+#: /home/runa/tor/website/docs/en/faq.wml:1129
 msgid ""
 "If your firewall works by blocking ports, then you can tell Tor to only use "
 "the ports that your firewall permits by adding \"FascistFirewall 1\" to your"
@@ -1835,7 +1837,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1136
+#: /home/runa/tor/website/docs/en/faq.wml:1137
 msgid ""
 "By default, when you set this Tor assumes that your firewall allows only "
 "port 80 and port 443 (HTTP and HTTPS respectively). You can select a "
@@ -1843,14 +1845,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1142
+#: /home/runa/tor/website/docs/en/faq.wml:1143
 msgid ""
 "If you want to be more fine-grained with your controls, you can also use the"
 " ReachableAddresses config options, e.g.:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1147
+#: /home/runa/tor/website/docs/en/faq.wml:1148
 #, no-wrap
 msgid ""
 "  ReachableDirAddresses *:80\n"
@@ -1858,24 +1860,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1151
+#: /home/runa/tor/website/docs/en/faq.wml:1152
 msgid "<hr> <a id=\"RelayFlexible\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1154
+#: /home/runa/tor/website/docs/en/faq.wml:1155
 msgid ""
 "<a class=\"anchor\" href=\"#RelayFlexible\">How stable does my relay need to"
 " be?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1157
+#: /home/runa/tor/website/docs/en/faq.wml:1158
 msgid "We aim to make setting up a Tor relay easy and convenient:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1161
+#: /home/runa/tor/website/docs/en/faq.wml:1162
 msgid ""
 "Tor has built-in support for <a "
 "href=\"<wikifaq>#WhatbandwidthshapingoptionsareavailabletoTorrelays\"> rate "
@@ -1886,7 +1888,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1169
+#: /home/runa/tor/website/docs/en/faq.wml:1170
 msgid ""
 "Each Tor relay has an <a href=\"#ExitPolicies\">exit policy</a> that "
 "specifies what sort of outbound connections are allowed or refused from that"
@@ -1895,7 +1897,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1174
+#: /home/runa/tor/website/docs/en/faq.wml:1175
 msgid ""
 "It's fine if the relay goes offline sometimes. The directories notice this "
 "quickly and stop advertising the relay. Just try to make sure it's not too "
@@ -1903,14 +1905,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1179
+#: /home/runa/tor/website/docs/en/faq.wml:1180
 msgid ""
 "We can handle relays with dynamic IPs just fine &mdash; simply leave the "
 "Address config option blank, and Tor will try to guess."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1182
+#: /home/runa/tor/website/docs/en/faq.wml:1183
 msgid ""
 "If your relay is behind a NAT and it doesn't know its public IP (e.g. it has"
 " an IP of 192.168.x.y), you'll need to set up port forwarding. Forwarding "
@@ -1920,7 +1922,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1188
+#: /home/runa/tor/website/docs/en/faq.wml:1189
 msgid ""
 "Your relay will passively estimate and advertise its recent bandwidth "
 "capacity, so high-bandwidth relays will attract more users than low-"
@@ -1928,24 +1930,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1194
+#: /home/runa/tor/website/docs/en/faq.wml:1195
 msgid "<hr> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1198
+#: /home/runa/tor/website/docs/en/faq.wml:1199
 msgid ""
 "<a class=\"anchor\" href=\"#ExitPolicies\">I'd run a relay, but I don't want"
 " to deal with abuse issues.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1201
+#: /home/runa/tor/website/docs/en/faq.wml:1202
 msgid "Great. That's exactly why we implemented exit policies."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1205
+#: /home/runa/tor/website/docs/en/faq.wml:1206
 msgid ""
 "Each Tor relay has an exit policy that specifies what sort of outbound "
 "connections are allowed or refused from that relay. The exit policies are "
@@ -1961,7 +1963,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1219
+#: /home/runa/tor/website/docs/en/faq.wml:1220
 msgid ""
 "The default exit policy allows access to many popular services (e.g. web "
 "browsing), but <a "
@@ -1977,7 +1979,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1233
+#: /home/runa/tor/website/docs/en/faq.wml:1234
 msgid ""
 "If you do allow any exit connections, make sure name resolution works (that "
 "is, your computer can resolve Internet addresses correctly).  If there are "
@@ -1987,19 +1989,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1241
+#: /home/runa/tor/website/docs/en/faq.wml:1242
 msgid "<hr> <a id=\"RelayOrBridge\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1244
+#: /home/runa/tor/website/docs/en/faq.wml:1245
 msgid ""
 "<a class=\"anchor\" href=\"#RelayOrBridge\">Should I be a normal relay or "
 "bridge relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1246
+#: /home/runa/tor/website/docs/en/faq.wml:1247
 msgid ""
 "<a href=\"<page docs/bridges>\">Bridge relays</a> (or \"bridges\" for short)"
 "  are <a href=\"<page docs/tor-doc-relay>\">Tor relays</a> that aren't "
@@ -2009,7 +2011,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1253
+#: /home/runa/tor/website/docs/en/faq.wml:1254
 msgid ""
 "Being a normal relay vs being a bridge relay is almost the same "
 "configuration: it's just a matter of whether your relay is listed publically"
@@ -2017,7 +2019,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1258
+#: /home/runa/tor/website/docs/en/faq.wml:1259
 msgid ""
 "Right now, China is the main place in the world that filters connections to "
 "the Tor network. So bridges are useful a) for users in China, b) as a backup"
@@ -2027,7 +2029,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1266
+#: /home/runa/tor/website/docs/en/faq.wml:1267
 msgid ""
 "So should you run a normal relay or bridge relay? If you have lots of "
 "bandwidth, you should definitely run a normal relay &mdash; the average "
@@ -2038,19 +2040,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1275
+#: /home/runa/tor/website/docs/en/faq.wml:1276
 msgid "<hr> <a id=\"MultipleRelays\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1278
+#: /home/runa/tor/website/docs/en/faq.wml:1279
 msgid ""
 "<a class=\"anchor\" href=\"#MultipleRelays\">I want to run more than one "
 "relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1281
+#: /home/runa/tor/website/docs/en/faq.wml:1282
 msgid ""
 "Great. If you want to run several relays to donate more to the network, "
 "we're happy with that. But please don't run more than a few dozen on the "
@@ -2059,7 +2061,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1288
+#: /home/runa/tor/website/docs/en/faq.wml:1289
 msgid ""
 "If you do decide to run more than one relay, please set the \"MyFamily\" "
 "config option in the <a href=\"#torrc\">torrc</a> of each relay, listing all"
@@ -2067,13 +2069,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1294
+#: /home/runa/tor/website/docs/en/faq.wml:1295
 #, no-wrap
 msgid "    MyFamily $fingerprint1,$fingerprint2,$fingerprint3\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1298
+#: /home/runa/tor/website/docs/en/faq.wml:1299
 msgid ""
 "where each fingerprint is the 40 character identity fingerprint (without "
 "spaces). You can also list them by nickname, but fingerprint is safer. Be "
@@ -2082,7 +2084,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1305
+#: /home/runa/tor/website/docs/en/faq.wml:1306
 msgid ""
 "That way clients will know to avoid using more than one of your relays in a "
 "single circuit. You should set MyFamily if you have administrative control "
@@ -2091,26 +2093,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1311
+#: /home/runa/tor/website/docs/en/faq.wml:1312
 msgid "<hr> <a id=\"RelayMemory\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1314
+#: /home/runa/tor/website/docs/en/faq.wml:1315
 msgid ""
 "<a class=\"anchor\" href=\"#RelayMemory\">Why is my Tor relay using so much "
 "memory?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1316
+#: /home/runa/tor/website/docs/en/faq.wml:1317
 msgid ""
 "If your Tor relay is using more memory than you'd like, here are some tips "
 "for reducing its footprint:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1321
+#: /home/runa/tor/website/docs/en/faq.wml:1322
 msgid ""
 "If you're on Linux, you may be encountering memory fragmentation bugs in "
 "glibc's malloc implementation. That is, when Tor releases memory back to the"
@@ -2122,7 +2124,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1329
+#: /home/runa/tor/website/docs/en/faq.wml:1330
 msgid ""
 "If you're running a fast relay, meaning you have many TLS connections open, "
 "you are probably losing a lot of memory to OpenSSL's internal buffers (38KB+"
@@ -2134,7 +2136,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1337
+#: /home/runa/tor/website/docs/en/faq.wml:1338
 msgid ""
 "If you're running on Solaris, OpenBSD, NetBSD, or old FreeBSD, Tor is "
 "probably forking separate processes rather than using threads. Consider "
@@ -2144,7 +2146,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1343
+#: /home/runa/tor/website/docs/en/faq.wml:1344
 msgid ""
 "If you still can't handle the memory load, consider reducing the amount of "
 "bandwidth your relay advertises. Advertising less bandwidth means you will "
@@ -2153,60 +2155,60 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1352
+#: /home/runa/tor/website/docs/en/faq.wml:1353
 msgid ""
 "All of this said, fast Tor relays do use a lot of ram. It is not unusual for"
 " a fast exit relay to use 500-1000 MB of memory."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1356
+#: /home/runa/tor/website/docs/en/faq.wml:1357
 msgid "<hr> <a id=\"WhyNotNamed\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1359
+#: /home/runa/tor/website/docs/en/faq.wml:1360
 msgid "<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1362
+#: /home/runa/tor/website/docs/en/faq.wml:1363
 msgid ""
 "We currently use these metrics to determine if your relay should be "
 "named:<br>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1365
+#: /home/runa/tor/website/docs/en/faq.wml:1366
 msgid ""
 "The name is not currently mapped to a different key. Existing mappings are "
 "removed after 6 months of inactivity from a relay."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1367
+#: /home/runa/tor/website/docs/en/faq.wml:1368
 msgid "The relay must have been around for at least two weeks."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1368
+#: /home/runa/tor/website/docs/en/faq.wml:1369
 msgid "No other router may have wanted the same name in the past month."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1371
+#: /home/runa/tor/website/docs/en/faq.wml:1372
 msgid "<hr> <a id=\"KeyManagement\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1374
+#: /home/runa/tor/website/docs/en/faq.wml:1375
 msgid ""
 "<a class=\"anchor\" href=\"#KeyManagement\">Tell me about all the keys Tor "
 "uses.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1377
+#: /home/runa/tor/website/docs/en/faq.wml:1378
 msgid ""
 "Tor uses a variety of different keys, with three goals in mind: 1)  "
 "encryption to ensure privacy of data within the Tor network, 2)  "
@@ -2216,7 +2218,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1385
+#: /home/runa/tor/website/docs/en/faq.wml:1386
 msgid ""
 "<b>Encryption</b>: first, all connections in Tor use TLS link encryption, so"
 " observers can't look inside to see which circuit a given cell is intended "
@@ -2227,7 +2229,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1395
+#: /home/runa/tor/website/docs/en/faq.wml:1396
 msgid ""
 "<b>Authentication</b>: Every Tor relay has a public decryption key called "
 "the \"onion key\".  When the Tor client establishes circuits, at each step "
@@ -2238,7 +2240,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1405
+#: /home/runa/tor/website/docs/en/faq.wml:1406
 msgid ""
 "<b>Coordination</b>: How do clients know what the relays are, and how do "
 "they know that they have the right keys for them? Each relay has a long-term"
@@ -2253,7 +2255,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1419
+#: /home/runa/tor/website/docs/en/faq.wml:1420
 msgid ""
 "How do clients know what the directory authorities are? The Tor software "
 "comes with a built-in list of location and public key for each directory "
@@ -2262,7 +2264,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1426
+#: /home/runa/tor/website/docs/en/faq.wml:1427
 msgid ""
 "How do users know they've got the right software? When we distribute the "
 "source code or a package, we digitally sign it with <a "
@@ -2272,7 +2274,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1434
+#: /home/runa/tor/website/docs/en/faq.wml:1435
 msgid ""
 "In order to be certain that it's really signed by us, you need to have met "
 "us in person and gotten a copy of our GPG key fingerprint, or you need to "
@@ -2282,17 +2284,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1441
+#: /home/runa/tor/website/docs/en/faq.wml:1442
 msgid "<hr> <a id=\"EntryGuards\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1444
+#: /home/runa/tor/website/docs/en/faq.wml:1445
 msgid "<a class=\"anchor\" href=\"#EntryGuards\">What are Entry Guards?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1447
+#: /home/runa/tor/website/docs/en/faq.wml:1448
 msgid ""
 "Tor (like all current practical low-latency anonymity designs) fails when "
 "the attacker can see both ends of the communications channel. For example, "
@@ -2304,7 +2306,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1457
+#: /home/runa/tor/website/docs/en/faq.wml:1458
 msgid ""
 "So, what should we do? Suppose the attacker controls, or can observe, "
 "<i>C</i> relays. Suppose there are <i>N</i> relays total. If you select new "
@@ -2318,7 +2320,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1469
+#: /home/runa/tor/website/docs/en/faq.wml:1470
 msgid ""
 "The solution is \"entry guards\": each Tor client selects a few relays at "
 "random to use as entry points, and uses only those relays for her first hop."
@@ -2331,7 +2333,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1480
+#: /home/runa/tor/website/docs/en/faq.wml:1481
 msgid ""
 "You can read more at <a href=\"http://freehaven.net/anonbib/#wright02\";>An "
 "Analysis of the Degradation of Anonymous Protocols</a>, <a "
@@ -2342,7 +2344,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1489
+#: /home/runa/tor/website/docs/en/faq.wml:1490
 msgid ""
 "Restricting your entry nodes may also help against attackers who want to run"
 " a few Tor nodes and easily enumerate all of the Tor user IP addresses. "
@@ -2353,19 +2355,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1497
+#: /home/runa/tor/website/docs/en/faq.wml:1498
 msgid "<hr> <a id=\"EverybodyARelay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1500
+#: /home/runa/tor/website/docs/en/faq.wml:1501
 msgid ""
 "<a class=\"anchor\" href=\"#EverybodyARelay\">You should make every Tor user"
 " be a relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1503
+#: /home/runa/tor/website/docs/en/faq.wml:1504
 msgid ""
 "Requiring every Tor user to be a relay would help with scaling the network "
 "to handle all our users, and <a "
@@ -2380,7 +2382,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1516
+#: /home/runa/tor/website/docs/en/faq.wml:1517
 msgid ""
 "That said, we do want to encourage Tor users to run relays, so what we "
 "really want to do is simplify the process of setting up and maintaining a "
@@ -2391,12 +2393,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1525
+#: /home/runa/tor/website/docs/en/faq.wml:1526
 msgid "There are five steps we need to address before we can do this though:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1529
+#: /home/runa/tor/website/docs/en/faq.wml:1530
 msgid ""
 "First, we need to make Tor stable as a relay on all common operating "
 "systems. The main remaining platform is Windows, and we plan to finally "
@@ -2406,7 +2408,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1537
+#: /home/runa/tor/website/docs/en/faq.wml:1538
 msgid ""
 "Second, we still need to get better at automatically estimating the right "
 "amount of bandwidth to allow. See item #7 on the <a href=\"<page "
@@ -2418,7 +2420,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1548
+#: /home/runa/tor/website/docs/en/faq.wml:1549
 msgid ""
 "Third, we need to work on scalability, both of the network (how to stop "
 "requiring that all Tor relays be able to connect to all Tor relays) and of "
@@ -2430,7 +2432,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1558
+#: /home/runa/tor/website/docs/en/faq.wml:1559
 msgid ""
 "Fourth, we need to better understand the risks from letting the attacker "
 "send traffic through your relay while you're also initiating your own "
@@ -2448,7 +2450,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1574
+#: /home/runa/tor/website/docs/en/faq.wml:1575
 msgid ""
 "Fifth, we might need some sort of incentive scheme to encourage people to "
 "relay traffic for others, and/or to become exit nodes. Here are our <a "
@@ -2457,24 +2459,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1581
+#: /home/runa/tor/website/docs/en/faq.wml:1582
 msgid "Please help on all of these!"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1584
+#: /home/runa/tor/website/docs/en/faq.wml:1585
 msgid "<hr> <a id=\"TransportIPnotTCP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1587
+#: /home/runa/tor/website/docs/en/faq.wml:1588
 msgid ""
 "<a class=\"anchor\" href=\"#TransportIPnotTCP\">You should transport all IP "
 "packets, not just TCP packets.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1590
+#: /home/runa/tor/website/docs/en/faq.wml:1591
 msgid ""
 "This would be handy, because it would make Tor better able to handle new "
 "protocols like VoIP, it could solve the whole need to socksify applications,"
@@ -2483,7 +2485,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1597
+#: /home/runa/tor/website/docs/en/faq.wml:1598
 msgid ""
 "We're heading in this direction: see <a "
 "href=\"https://trac.torproject.org/projects/tor/ticket/1855\";>this trac "
@@ -2492,7 +2494,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1604
+#: /home/runa/tor/website/docs/en/faq.wml:1605
 msgid ""
 "IP packets reveal OS characteristics. We would still need to do IP-level "
 "packet normalization, to stop things like TCP fingerprinting attacks. Given "
@@ -2503,7 +2505,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1611
+#: /home/runa/tor/website/docs/en/faq.wml:1612
 msgid ""
 "Application-level streams still need scrubbing. We will still need user-side"
 " applications like Torbutton. So it won't become just a matter of capturing "
@@ -2511,7 +2513,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1615
+#: /home/runa/tor/website/docs/en/faq.wml:1616
 msgid ""
 "Certain protocols will still leak information. For example, we must rewrite "
 "DNS requests so they are delivered to an unlinkable DNS server rather than "
@@ -2520,7 +2522,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1620
+#: /home/runa/tor/website/docs/en/faq.wml:1621
 msgid ""
 "<a "
 "href=\"http://crypto.stanford.edu/~nagendra/projects/dtls/dtls.html\";>DTLS</a>"
@@ -2531,7 +2533,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1627
+#: /home/runa/tor/website/docs/en/faq.wml:1628
 msgid ""
 "Exit policies for arbitrary IP packets mean building a secure IDS. Our node "
 "operators tell us that exit policies are one of the main reasons they're "
@@ -2549,7 +2551,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1641
+#: /home/runa/tor/website/docs/en/faq.wml:1642
 msgid ""
 "The Tor-internal name spaces would need to be redesigned. We support hidden "
 "service \".onion\" addresses by intercepting the addresses when they are "
@@ -2558,38 +2560,38 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1648
+#: /home/runa/tor/website/docs/en/faq.wml:1649
 msgid "<hr> <a id=\"Criminals\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1651
+#: /home/runa/tor/website/docs/en/faq.wml:1652
 msgid ""
 "<a class=\"anchor\" href=\"#Criminals\">Doesn't Tor enable criminals to do "
 "bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1654
+#: /home/runa/tor/website/docs/en/faq.wml:1655
 msgid ""
 "For the answer to this question and others, please see our <a href=\"<page "
 "docs/faq-abuse>\">Tor Abuse FAQ</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1658
+#: /home/runa/tor/website/docs/en/faq.wml:1659
 msgid "<hr> <a id=\"RespondISP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1661
+#: /home/runa/tor/website/docs/en/faq.wml:1662
 msgid ""
 "<a class=\"anchor\" href=\"#RespondISP\">How do I respond to my ISP about my"
 " exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1664
+#: /home/runa/tor/website/docs/en/faq.wml:1665
 msgid ""
 "A collection of templates for successfully responding to ISPs is <a "
 "href=\"<wiki>doc/TorAbuseTemplates\">collected here</a>."

Modified: translation/trunk/projects/website/po/it/docs/2-medium.tor-doc-relay.po
===================================================================
--- translation/trunk/projects/website/po/it/docs/2-medium.tor-doc-relay.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/it/docs/2-medium.tor-doc-relay.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-06-21 08:19+0200\n"
-"PO-Revision-Date: 2011-06-22 00:52+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 01:01+0000\n"
 "Last-Translator: Frate <gigibotti@xxxxxxxx>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
 "MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@
 msgstr "Configurare un relay Tor"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:16 /tmp/F5o0tOMw8z.xml:281
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:16 /tmp/A18i3Pxv3V.xml:282
 msgid "<hr>"
 msgstr "<hr>"
 
@@ -77,8 +77,8 @@
 msgstr "<a class=\"anchor\" href=\"#install\">Fase uno: Scarica e installa Tor</a>"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37 /tmp/F5o0tOMw8z.xml:52
-#: /tmp/F5o0tOMw8z.xml:147 /tmp/F5o0tOMw8z.xml:171
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37 /tmp/A18i3Pxv3V.xml:52
+#: /tmp/A18i3Pxv3V.xml:147 /tmp/A18i3Pxv3V.xml:171
 msgid "<br>"
 msgstr "<br>"
 
@@ -529,18 +529,12 @@
 "add a line like \"toruser hard nofile 8192\" to your "
 "/etc/security/limits.conf file (where toruser is the user that runs the Tor "
 "process), and then restart Tor if it's installed as a package (or log out "
-"and log back in if you run it yourself)."
+"and log back in if you run it yourself). The Debian/Ubuntu package does this"
+" step for you."
 msgstr ""
-"14. (Solo per Unix.) Il tuo sistema operativo probabilmente limita il numero"
-" dei file descriptor aperti per ogni processo a 1024 (o anche meno). Se si "
-"prevede di essere in esecuzione un exit node veloce, questo probabilmente "
-"non basta. Su Linux, si dovrebbe aggiungere una riga come \"toruser hard "
-"nofile 8192\" al file / etc / security / limits.conf (dove toruser Ã "
-"l'utente che esegue il processo Tor), poi riavvia Tor se Ã stato installato "
-"da un pacchetto ( o logout e login se lo avvii tu stesso)."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:266
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:267
 msgid ""
 "15. If you installed Tor via some package or installer, it probably starts "
 "Tor for you automatically on boot. But if you installed from source, you may"
@@ -552,7 +546,7 @@
 "utile."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:272
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:273
 msgid ""
 "When you change your Tor configuration, remember to verify that your relay "
 "still works correctly after the change. Be sure to set your \"ContactInfo\" "
@@ -572,7 +566,7 @@
 "contribuito a far crescere la rete Tor!"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:283
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:284
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "about/contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/po/it/docs/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/po/it/docs/2-medium.verifying-signatures.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/it/docs/2-medium.verifying-signatures.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-09-05 00:00+0200\n"
-"PO-Revision-Date: 2011-09-05 00:55+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 01:02+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
 "MIME-Version: 1.0\n"
@@ -31,166 +31,88 @@
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:13
-#: /tmp/w7jGkC8yXE.xml:43 /tmp/w7jGkC8yXE.xml:59 /tmp/w7jGkC8yXE.xml:86
-#: /tmp/w7jGkC8yXE.xml:186
+#: /tmp/kzjpFaPDWT.xml:16 /tmp/kzjpFaPDWT.xml:60 /tmp/kzjpFaPDWT.xml:120
+#: /tmp/kzjpFaPDWT.xml:176
 msgid "<hr>"
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><h3>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:15
-msgid ""
-"Each file on <a href=\"<page download/download>\">our download page</a> is "
-"accompanied by a file with the same name as the package and the extension "
-"\".asc\". These .asc files are GPG signatures. They allow you to verify the "
-"file you've downloaded is exactly the one that we intended you to get. For "
-"example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by "
-"tor-browser-<version-torbrowserbundle>_en-US.exe.asc."
+msgid "What is a signature and why should I check it?"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:22
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:18
 msgid ""
-"Of course, you'll need to have our GPG keys in your keyring: if you don't "
-"know the GPG key, you can't be sure that it was really us who signed it. The"
-" signing keys we use are:"
+"How do you know that the Tor program you have is really the one we made? "
+"Many Tor users have very real adversaries who might try to give them a fake "
+"version of Tor &mdash; and it doesn't matter how secure and anonymous Tor is"
+" if you're not running the real Tor."
 msgstr ""
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:26
-msgid "Roger's (0x28988BF5) typically signs the source code file."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:27
-msgid "Nick's (0x165733EA, or its subkey 0x8D29319A)."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:28
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:23
 msgid ""
-"Andrew's (0x31B0974B) typically signed older packages for windows and mac."
+"An attacker could try a variety of attacks to get you to download a fake "
+"Tor. For example, he could trick you into thinking some other website is a "
+"great place to download Tor. That's why you should always download Tor from "
+"<b>https</b>://www.torproject.org/. The https part means there's encryption "
+"and authentication between your browser and the website, making it much "
+"harder for the attacker to modify your download. But it's not perfect. Some "
+"places in the world block the Tor website, making users try <a href=\"<page "
+"docs/faq>#GetTor\">somewhere else</a>. Large companies sometimes force "
+"employees to use a modified browser, so the company can listen in on all "
+"their browsing. We've even <a href=\"https://blog.torproject.org/blog";
+"/diginotar-debacle-and-what-you-should-do-about-it\">seen</a> attackers who "
+"have the ability to trick your browser into thinking you're talking to the "
+"Tor website with https when you're not."
 msgstr ""
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:29
-msgid "Peter's (0xC82E0039, or its subkey 0xE1DEC577)."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:30
-msgid "TomÃs's (0x9A753A6B) signs current Vidalia release tarballs and tags."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:31
-msgid "Matt's (0x5FA14861) signed older Vidalia release tarballs."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:32
-msgid "Damian's (0x9ABBEEC6) signs Arm releases"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:33
-msgid "Jacob's (0xE012B42D)."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:34
-msgid ""
-"Erinn's (0x63FEE659) and (0xF1F5C9B5) typically signs all windows, mac, and "
-"most linux packages."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:35
-msgid "Mike's (0xDDC6C0AD) signs the Torbutton xpi."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:36
-msgid "Karsten's (0xF7C11265) signs the metrics archives and tools."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:37
-msgid "Robert Hogan's (0x22F6856F) signs torsocks release tarballs and tags."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
+#. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:38
-msgid "Nathan's (0xB374CBD2) signs the Android APK file for Orbot."
-msgstr ""
-
-#. type: Content of: <div><div><ul>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:38
-msgid "."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:39
 msgid ""
-"Tor Project Archive (0x886DDD89) signs the deb.torproject.org repositories "
-"and archives"
+"Some software sites list <a "
+"href=\"http://en.wikipedia.org/wiki/Cryptographic_hash_function\";>sha1 "
+"hashes</a> alongside the software on their website, so users can verify that"
+" they downloaded the file without any errors. These \"checksums\" help you "
+"answer the question \"Did I download this file correctly from whoever sent "
+"it to me?\" They do a good job at making sure you didn't have any random "
+"errors in your download, but they don't help you figure out whether you were"
+" downloading it from the attacker. The better question to answer is: \"Is "
+"this file that I just downloaded the file that Tor intended me to get?\""
 msgstr ""
 
-#. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:42
-msgid "Step Zero: Install GnuPG"
-msgstr ""
-
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:44
-msgid "You need to have GnuPG installed before you can verify signatures."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:48
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:49
 msgid ""
-"Linux: see <a "
-"href=\"http://www.gnupg.org/download/\";>http://www.gnupg.org/download/</a> "
-"or install <i>gnupg</i> from the package management system."
+"Each file on <a href=\"<page download/download>\">our download page</a> is "
+"accompanied by a file with the same name as the package and the extension "
+"\".asc\". These .asc files are GPG signatures. They allow you to verify the "
+"file you've downloaded is exactly the one that we intended you to get. For "
+"example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by "
+"tor-browser-<version-torbrowserbundle>_en-US.exe.asc. For a list of which "
+"developer signs which package, see our <a href=\"<page docs/signing-"
+"keys>\">signing keys</a> page."
 msgstr ""
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:51
-msgid ""
-"Windows: see <a "
-"href=\"http://www.gnupg.org/download/\";>http://www.gnupg.org/download/</a>. "
-"Look for the \"version compiled for MS-Windows\" under \"Binaries\"."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:54
-msgid ""
-"Mac: see <a "
-"href=\"http://macgpg.sourceforge.net/\";>http://macgpg.sourceforge.net/</a>."
-msgstr ""
-
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:58
-msgid "Step One: Import the keys"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:59
+msgid "Windows"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:60
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:62
 msgid ""
-"The next step is to import the key. This can be done directly from GnuPG. "
-"Make sure you import the correct key. For example, if you downloaded a "
-"Windows package, you will need to import Erinn's key."
+"You need to have GnuPG installed before you can verify signatures. Download "
+"it from <a "
+"href=\"http://gpg4win.org/download.html\";>http://gpg4win.org/download.html</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:64
-#: /tmp/w7jGkC8yXE.xml:89 /tmp/w7jGkC8yXE.xml:194
-msgid "<b>Windows:</b>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:65
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:66
 msgid ""
-"GnuPG for Windows is a command line tool, and you will need to use "
+"Once it's installed, use GnuPG to import the key that signed your package. "
+"Since GnuPG for Windows is a command-line tool, you will need to use "
 "<i>cmd.exe</i>. Unless you edit your PATH environment variable, you will "
 "need to tell Windows the full path to the GnuPG program. If you installed "
 "GnuPG with the default values, the path should be something like this: "
@@ -198,303 +120,191 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:71
-msgid "To import the key 0x28988BF5, start <i>cmd.exe</i> and type:"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:73
+msgid ""
+"Erinn Clark signs the Tor Browser Bundles. Import her key (0x63FEE659) by "
+"starting <i>cmd.exe</i> and typing:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:73
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:76
 #, no-wrap
 msgid ""
 "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --keyserver hkp://keys.gnupg.net "
-"--recv-keys 0x28988BF5"
+"--recv-keys 0x63FEE659"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:75
-#: /tmp/w7jGkC8yXE.xml:92
-msgid "<b>Mac and Linux</b>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:76
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:78
+#: /tmp/kzjpFaPDWT.xml:134
 msgid ""
-"Whether you have a Mac or you run Linux, you will need to use the terminal "
-"to run GnuPG. Mac users can find the terminal under \"Applications\". If you"
-" run Linux and use Gnome, the terminal should be under \"Applications menu\""
-" and \"Accessories\". KDE users can find the terminal under \"Menu\" and "
-"\"System\"."
+"After importing the key, you can verify that the fingerprint is correct:"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:81
-msgid "To import the key 0x28988BF5, start the terminal and type:"
-msgstr ""
-
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:83
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:81
 #, no-wrap
-msgid "gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x28988BF5"
+msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --fingerprint 0x63FEE659"
 msgstr ""
 
-#. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:85
-msgid "Step Two: Verify the fingerprints"
-msgstr ""
-
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:87
-msgid ""
-"After importing the key, you will want to verify that the fingerprint is "
-"correct."
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:83
+#: /tmp/kzjpFaPDWT.xml:139
+msgid "You should see:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:90
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:85
 #, no-wrap
-msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --fingerprint (insert keyid here)"
-msgstr ""
-
-#. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:93
-#, no-wrap
-msgid "gpg --fingerprint (insert keyid here)"
-msgstr ""
-
-#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:95
-msgid "The fingerprints for the keys should be:"
-msgstr ""
-
-#. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:98
-#, no-wrap
 msgid ""
-"    pub   1024D/28988BF5 2000-02-27\n"
-"          Key fingerprint = B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
-"    uid                  Roger Dingledine &lt;arma@xxxxxxx&gt;\n"
-"\n"
-"    pub   3072R/165733EA 2004-07-03\n"
-"          Key fingerprint = B35B F85B F194 89D0 4E28  C33C 2119 4EBB 1657 33EA\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxxx&gt;\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxx&gt;\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxxxx&gt;\n"
-"\n"
-"    pub  1024D/31B0974B 2003-07-17\n"
-"         Key fingerprint = 0295 9AA7 190A B9E9 027E  0736 3B9D 093F 31B0 974B\n"
-"    uid                  Andrew Lewman (phobos) &lt;phobos@xxxxxxxxxx&gt;\n"
-"    uid                  Andrew Lewman &lt;andrew@xxxxxxxxxx&gt;\n"
-"    uid                  Andrew Lewman &lt;andrew@xxxxxxxxxxxxxx&gt;\n"
-"    sub   4096g/B77F95F7 2003-07-17\n"
-"\n"
-"    pub   4096R/C82E0039 2003-03-24\n"
-"          Key fingerprint = 25FC 1614 B8F8 7B52 FF2F  99B9 62AF 4031 C82E 0039\n"
-"    uid                  Peter Palfrader\n"
-"    uid                  Peter Palfrader &lt;peter@xxxxxxxxxxxxx&gt;\n"
-"    uid                  Peter Palfrader &lt;weasel@xxxxxxxxxx&gt;\n"
-"\n"
-"    pub   1024D/9A753A6B 2009-09-11\n"
-"          Key fingerprint = 553D 7C2C 626E F16F 27F3  30BC 95E3 881D 9A75 3A6B\n"
-"    uid                  TomÃs Touceda &lt;chiiph@xxxxxxxxx&gt;\n"
-"    sub   1024g/33BE0E5B 2009-09-11\n"
-"\n"
-"    pub   1024D/5FA14861 2005-08-17\n"
-"          Key fingerprint = 9467 294A 9985 3C9C 65CB  141D AF7E 0E43 5FA1 4861\n"
-"    uid                  Matt Edman &lt;edmanm@xxxxxxx&gt;\n"
-"    uid                  Matt Edman &lt;Matt_Edman@xxxxxxxxxx&gt;\n"
-"    uid                  Matt Edman &lt;edmanm2@xxxxxxxxxx&gt;\n"
-"    sub   4096g/EA654E59 2005-08-17\n"
-"\n"
-"    pub   1024D/9ABBEEC6 2009-06-17\n"
-"          Key fingerprint = 6827 8CC5 DD2D 1E85 C4E4  5AD9 0445 B7AB 9ABB EEC6\n"
-"    uid                  Damian Johnson (www.atagar.com) &lt;atagar1@xxxxxxxxx&gt;\n"
-"    uid                  Damian Johnson &lt;atagar@xxxxxxxxxxxxxx&gt;\n"
-"    sub   2048g/146276B2 2009-06-17\n"
-"    sub   2048R/87F30690 2010-08-07\n"
-"\n"
-"    pub   4096R/E012B42D 2010-05-07\n"
-"          Key fingerprint = D8C9 AF51 CAA9 CAEA D3D8  9C9E A34F A745 E012 B42D\n"
-"    uid                  Jacob Appelbaum &lt;jacob@xxxxxxxxxxxxx&gt;\n"
-"    uid                  Jacob Appelbaum &lt;jacob@xxxxxxxxxxxxxx&gt;\n"
-"    sub   4096R/7CA91A52 2010-05-07 [expires: 2011-05-07]\n"
-"\n"
 "    pub   2048R/63FEE659 2003-10-16\n"
 "          Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\n"
 "    sub   2048R/EB399FD7 2003-10-16\n"
-"\n"
-"    pub   1024D/F1F5C9B5 2010-02-03\n"
-"          Key fingerprint = C2E3 4CFC 13C6 2BD9 2C75  79B5 6B8A AEB1 F1F5 C9B5\n"
-"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
-"    sub   1024g/7828F26A 2010-02-03\n"
-"\n"
-"    pub   1024D/DDC6C0AD 2006-07-26\n"
-"          Key fingerprint = BECD 90ED D1EE 8736 7980  ECF8 1B0C A30C DDC6 C0AD\n"
-"    uid                  Mike Perry &lt;mikeperry@xxxxxxxxxx&gt;\n"
-"    uid                  Mike Perry &lt;mikepery@xxxxxxxxxx&gt;\n"
-"    sub   4096g/AF0A91D7 2006-07-26\n"
-"\n"
-"    pub   1024D/F7C11265 2007-03-09 [expires: 2012-03-01]\n"
-"          Key fingerprint = FC8A EEF1 792E EE71 D721  7D47 D0CF 963D F7C1 1265\n"
-"    uid                  Karsten Loesing &lt;karsten.loesing@xxxxxxx&gt;\n"
-"    sub   2048g/75D85E4B 2007-03-09 [expires: 2012-03-01]\n"
-"\n"
-"    pub   1024D/22F6856F 2006-08-19\n"
-"          Key fingerprint = DDB4 6B5B 7950 CD47 E59B  5189 4C09 25CF 22F6 856F\n"
-"    uid                  Robert Hogan &lt;robert@xxxxxxxxxxxxxxx&gt;\n"
-"    sub   1024g/FC4A9460 2006-08-19\n"
-"\n"
-"    pub   3072D/B374CBD2 2010-06-09 [expires: 2011-06-09]\n"
-"   \t  Key fingerprint = B92B CA64 72F7 C6F0 8D47  8503 D2AC D203 B374 CBD2\n"
-"    uid                  Nathan of Guardian &lt;nathan@xxxxxxxxxxxxxxxxxxxx&gt;\n"
-"    sub   4096g/B5878C3B 2010-06-09 [expires: 2011-06-09]\n"
-"\n"
-"    pub   2048R/886DDD89 2009-09-04 [expires: 2014-09-03]\n"
-"      Key fingerprint = A3C4 F0F9 79CA A22C DBA8  F512 EE8C BC9E 886D DD89\n"
-"    uid                  deb.torproject.org archive signing key\n"
-"    sub   2048R/219EC810 2009-09-04 [expires: 2012-09-03]\n"
-"    "
 msgstr ""
 
-#. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:185
-msgid "Step Three: Verify the downloaded package"
-msgstr ""
-
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:187
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:93
+#: /tmp/kzjpFaPDWT.xml:149
 msgid ""
 "To verify the signature of the package you downloaded, you will need to "
-"download the \".asc\" file as well."
+"download the \".asc\" file as well. Assuming you downloaded the package and "
+"its signature to your Desktop, run:"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:190
-msgid ""
-"In the following examples, the user Alice downloads packages for Windows, "
-"Mac OS X and Linux and also verifies the signature of each package. All "
-"files are saved on the desktop."
-msgstr ""
-
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:195
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:97
 #, no-wrap
 msgid ""
 "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --verify C:\\Users\\Alice\\Desktop"
-"\\<file-win32-bundle-stable>.asc C:\\Users\\Alice\\Desktop\\<file-win32"
-"-bundle-stable>"
+"\\<file-win32-bundle-stable>.asc"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:197
-msgid "<b>Mac:</b>"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:99
+#: /tmp/kzjpFaPDWT.xml:155
+msgid "The output should say \"Good signature\":"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:198
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:102
+#: /tmp/kzjpFaPDWT.xml:158
 #, no-wrap
 msgid ""
-"gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc /Users/Alice"
-"/<file-osx-x86-bundle-stable>"
+"    gpg: Signature made Wed 31 Aug 2011 06:37:01 PM EDT using RSA key ID 63FEE659\n"
+"    gpg: Good signature from \"Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\"\n"
+"    gpg:                 aka \"Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\"\n"
+"    gpg:                 aka \"Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\"\n"
+"    gpg: WARNING: This key is not certified with a trusted signature!\n"
+"    gpg:          There is no indication that the signature belongs to the owner.\n"
+"    Primary key fingerprint: 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
+"    "
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:200
-msgid "<b>Linux</b>"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:112
+#: /tmp/kzjpFaPDWT.xml:168
+msgid ""
+"Notice that there is a warning because you haven't assigned a trust index to"
+" this person. This means that GnuPG verified that the key made that "
+"signature, but it's up to you to decide if that key really belongs to the "
+"developer. The best method is to meet the developer in person and exchange "
+"key fingerprints."
 msgstr ""
 
-#. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:201
-#, no-wrap
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:119
+msgid "Mac OS X"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:122
 msgid ""
-"gpg --verify /home/Alice/Desktop/<file-source-stable>.asc "
-"/home/Alice/Desktop/<file-source-stable>"
+"You need to have GnuPG installed before you can verify signatures. You can "
+"install it from <a "
+"href=\"http://macgpg.sourceforge.net/\";>http://macgpg.sourceforge.net/</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:204
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:127
 msgid ""
-"After verifying, GnuPG will come back saying something like \"Good "
-"signature\" or \"BAD signature\". The output should look something like "
-"this:"
+"Once it's installed, use GnuPG to import the key that signed your package. "
+"Erinn Clark signs the Tor Browser Bundles. Import her key (0x63FEE659) by "
+"starting the terminal (under \"Applications\")  and typing:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:209
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:132
 #, no-wrap
-msgid ""
-"    gpg: Signature made Tue 16 Mar 2010 05:55:17 AM CET using DSA key ID 28988BF5\n"
-"    gpg: Good signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
-"    gpg: WARNING: This key is not certified with a trusted signature!\n"
-"    gpg:          There is no indication that the signature belongs to the owner.\n"
-"    Primary key fingerprint: B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
-"    "
+msgid "gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:217
-msgid ""
-"Notice that there is a warning because you haven't assigned a trust index to"
-" this person. This means that GnuPG verified that the key made that "
-"signature, but it's up to you to decide if that key really belongs to the "
-"developer. The best method is to meet the developer in person and exchange "
-"key fingerprints."
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:137
+#, no-wrap
+msgid "gpg --fingerprint 0x63FEE659"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:224
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:141
+#, no-wrap
 msgid ""
-"For your reference, this is an example of a <em>BAD</em> verification. It "
-"means that the signature and file contents do not match. In this case, you "
-"should not trust the file contents:"
+"    pub   2048R/63FEE659 2003-10-16\n"
+"          Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\n"
+"    sub   2048R/EB399FD7 2003-10-16\n"
+"    "
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:229
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:153
 #, no-wrap
+msgid "gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:175
+msgid "Linux"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:178
 msgid ""
-"    gpg: Signature made Tue 20 Apr 2010 12:22:32 PM CEST using DSA key ID 28988BF5\n"
-"    gpg: BAD signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
-"    "
+"Most Linux distributions come with gpg preinstalled, so users who want to "
+"verify the Tor Browser Bundle for Linux (or the source tarball) can just "
+"follow along with the instructions above for \"Mac OS X\"."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:233
-msgid "<b>RPM-based distributions :</b>"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:183
+msgid ""
+"If you're using the <b>Debian</b> packages, you should read the instructions"
+" on <a href=\"<page docs/debian>#packages\">importing these keys to apt</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:234
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:187
 msgid ""
-"In order to manually verify the signatures on the RPM packages, you must use"
-" the <code>rpm</code> tool like so: <br />"
+"If you're using the <b>RPMs</b>, you can manually verify the signatures on "
+"the RPM packages by"
 msgstr ""
 
 #. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:237
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:188
 #, no-wrap
 msgid "rpm -K filename.rpm"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:240
-msgid "<b>Debian:</b>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:241
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:190
 msgid ""
-"If you are running Tor on Debian you should read the instructions on <a "
-"href=\"<page docs/debian>#packages\">importing these keys to apt</a>."
+"See <a "
+"href=\"http://www.gnupg.org/documentation/\";>http://www.gnupg.org/documentation/</a>"
+" to learn more about GPG."
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:244
-msgid ""
-"If you wish to learn more about GPG, see <a "
-"href=\"http://www.gnupg.org/documentation/\";>http://www.gnupg.org/documentation/</a>."
-msgstr ""
 
-

Modified: translation/trunk/projects/website/po/it/docs/3-low.rpms.po
===================================================================
--- translation/trunk/projects/website/po/it/docs/3-low.rpms.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/it/docs/3-low.rpms.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-08-10 08:19+0200\n"
-"PO-Revision-Date: 2011-08-11 01:04+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 01:04+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/rpms.wml:16 /tmp/Xp_xTVMYLa.xml:70
+#: /home/runa/tor/website/docs/en/rpms.wml:16 /tmp/qK7cG0J74c.xml:71
 msgid "<br>"
 msgstr ""
 
@@ -76,11 +76,12 @@
 #: /home/runa/tor/website/docs/en/rpms.wml:36
 msgid ""
 "If you wish to track the stable releases of Tor, you should substitute "
-"DISTRIBUTION with one of the following: centos4, centos5, fc13, fc14, suse"
+"DISTRIBUTION with one of the following: centos4, centos5, fc13, fc14, fc15, "
+"suse"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:39
+#: /home/runa/tor/website/docs/en/rpms.wml:40
 msgid ""
 "To track experimental releases, substitute DISTRIBUTION with one of these: "
 "centos4-experimental, centos5-experimental, fc13-experimental, "
@@ -88,25 +89,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:44
+#: /home/runa/tor/website/docs/en/rpms.wml:45
 msgid "Then install Tor by running:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/rpms.wml:46
+#: /home/runa/tor/website/docs/en/rpms.wml:47
 #, no-wrap
 msgid "yum install tor"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:49
+#: /home/runa/tor/website/docs/en/rpms.wml:50
 msgid ""
 "Now Tor is installed and running. Move on to <a href=\"<page docs/tor-doc-"
 "unix>#using\">step two</a> of the \"Tor on Linux/Unix\" instructions."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:55
+#: /home/runa/tor/website/docs/en/rpms.wml:56
 msgid ""
 "The DNS name <code>deb.torproject.org</code> is actually a set of "
 "independent servers in a DNS round-robin configuration.  If for some reason "
@@ -116,29 +117,29 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/rpms.wml:64
+#: /home/runa/tor/website/docs/en/rpms.wml:65
 msgid "<hr> <hr> <a id=\"source\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/rpms.wml:69
+#: /home/runa/tor/website/docs/en/rpms.wml:70
 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:73
+#: /home/runa/tor/website/docs/en/rpms.wml:74
 msgid ""
 "If you'd like to build from source, please follow the <a href=\"<gitblob>doc"
 "/tor-rpm-creation.txt\">RPM creation instructions</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/rpms.wml:77
+#: /home/runa/tor/website/docs/en/rpms.wml:78
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:79
+#: /home/runa/tor/website/docs/en/rpms.wml:80
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "about/contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/po/it/press/4-optional.2010-03-25-tor-store-press-release.po
===================================================================
--- translation/trunk/projects/website/po/it/press/4-optional.2010-03-25-tor-store-press-release.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/it/press/4-optional.2010-03-25-tor-store-press-release.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-05-02 17:00+0200\n"
-"PO-Revision-Date: 2011-09-21 19:51+0000\n"
+"PO-Revision-Date: 2011-09-28 09:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/my/1-high.index.po
===================================================================
--- translation/trunk/projects/website/po/my/1-high.index.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/my/1-high.index.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-09-05 00:00+0200\n"
-"PO-Revision-Date: 2011-09-21 19:51+0000\n"
+"PO-Revision-Date: 2011-09-28 09:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Added: translation/trunk/projects/website/po/nl/getinvolved/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/po/nl/getinvolved/4-optional.volunteer.po	                        (rev 0)
+++ translation/trunk/projects/website/po/nl/getinvolved/4-optional.volunteer.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -0,0 +1,2240 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-08-30 08:50+0200\n"
+"PO-Revision-Date: 2011-09-28 08:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:8
+msgid ""
+"<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
+"getinvolved/volunteer>\">Volunteer</a>"
+msgstr ""
+
+#. type: Content of: <div><div><h1>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:13
+msgid "A few things everyone can do now:"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:15
+msgid ""
+"Please consider <a href=\"<page docs/tor-doc-relay>\">running a relay</a> to"
+" help the Tor network grow."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:17
+msgid ""
+"Tell your friends! Get them to run relays. Get them to run hidden services. "
+"Get them to tell their friends."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:19
+msgid ""
+"If you like Tor's goals, please <a href=\"<page donate/donate>\">take a "
+"moment to donate to support further Tor development</a>. We're also looking "
+"for more sponsors &mdash; if you know any companies, NGOs, agencies, or "
+"other organizations that want anonymity / privacy / communications security,"
+" let them know about us."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:24
+msgid ""
+"We're looking for more <a href=\"<page about/torusers>\">good examples of "
+"Tor users and Tor use cases</a>. If you use Tor for a scenario or purpose "
+"not yet described on that page, and you're comfortable sharing it with us, "
+"we'd love to hear from you."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:30
+msgid "<a id=\"Documentation\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:31
+msgid "<a class=\"anchor\" href=\"#Documentation\">Documentation</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:33
+msgid ""
+"Help translate the web page and documentation into other languages. See the "
+"<a href=\"<page getinvolved/translation>\">translation guidelines</a> if you"
+" want to help out. We especially need Arabic or Farsi translations, for the "
+"many Tor users in censored areas."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:37
+msgid ""
+"Evaluate and document <a href=\"<wiki>doc/TorifyHOWTO\">our list of "
+"programs</a> that can be configured to use Tor."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:40
+msgid ""
+"We have a huge list of <a href=\"<wiki>doc/SupportPrograms\">potentially "
+"useful programs that interface to Tor</a>. Which ones are useful in which "
+"situations? Please help us test them out and document your results."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:46
+msgid "<a id=\"Advocacy\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:47
+msgid "<a class=\"anchor\" href=\"#Advocacy\">Advocacy</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:49
+msgid ""
+"Create a presentation that can be used for various user group meetings "
+"around the world."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:51
+msgid ""
+"Create a video about the positive uses of Tor, what Tor is, or how to use "
+"it.  Some have already started on <a "
+"href=\"https://media.torproject.org/video/\";>Tor's Media server</a>, <a "
+"href=\"http://www.howcast.com/videos/90601-How-To-Circumvent-an-Internet-";
+"Proxy\">Howcast</a>, and <a "
+"href=\"http://www.youtube.com/thetorproject\";>YouTube</a>."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:57
+msgid ""
+"Create a poster, or a set of posters, around a theme, such as \"Tor for "
+"Freedom!\"."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:59
+msgid ""
+"Create a t-shirt design that incorporates \"Congratulations! You are using "
+"Tor!\" in any language."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:63
+msgid "<a id=\"Projects\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:64
+msgid "<a class=\"anchor\" href=\"#Projects\">Projects</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:67
+msgid ""
+"Below are a list of Tor related projects we're developing and/or "
+"maintaining. Most discussions happen on IRC so if you're interested in any "
+"of these (or you have a project idea of your own), then please <a "
+"href=\"<page about/contact>#irc\">join us in #tor-dev</a>. Don't be shy to "
+"ask questions, and don't hesitate to ask even if the main contributors "
+"aren't active at that moment."
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><th>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:77
+msgid "Name"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><th>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:78
+msgid "Category"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><th>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:79
+msgid "Language"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><th>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:80
+msgid "Activity"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><th>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:81
+msgid "Contributors"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:85
+msgid "<a href=\"#project-tor\">Tor</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:86
+#: /tmp/KLdohZNkms.xml:94
+msgid "Core"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:87
+#: /tmp/KLdohZNkms.xml:119
+msgid "C"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:88
+#: /tmp/KLdohZNkms.xml:112 /tmp/KLdohZNkms.xml:144 /tmp/KLdohZNkms.xml:184
+msgid "Heavy"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:89
+msgid "nickm, arma, Sebastian"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:93
+msgid "*<a href=\"#project-jtor\">JTor</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:95
+#: /tmp/KLdohZNkms.xml:151 /tmp/KLdohZNkms.xml:183
+msgid "Java"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:96
+#: /tmp/KLdohZNkms.xml:192 /tmp/KLdohZNkms.xml:216 /tmp/KLdohZNkms.xml:240
+msgid "None"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:101
+msgid "<a href=\"#project-tbb\">TBB</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:102
+#: /tmp/KLdohZNkms.xml:110 /tmp/KLdohZNkms.xml:118 /tmp/KLdohZNkms.xml:126
+msgid "Usability"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:103
+#: /tmp/KLdohZNkms.xml:111 /tmp/KLdohZNkms.xml:127
+msgid "Sys Admin"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:104
+#: /tmp/KLdohZNkms.xml:152 /tmp/KLdohZNkms.xml:160 /tmp/KLdohZNkms.xml:224
+msgid "Moderate"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:105
+msgid "Erinn"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:109
+msgid "<a href=\"#project-tails\">Tails</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:113
+msgid "<a href=\"https://tails.boum.org/chat/\";>#tails</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:117
+msgid "<a href=\"#project-torsocks\">Torsocks</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:120
+#: /tmp/KLdohZNkms.xml:128 /tmp/KLdohZNkms.xml:136 /tmp/KLdohZNkms.xml:168
+#: /tmp/KLdohZNkms.xml:176 /tmp/KLdohZNkms.xml:200 /tmp/KLdohZNkms.xml:208
+#: /tmp/KLdohZNkms.xml:232
+msgid "Light"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:121
+msgid "mwenge"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:125
+msgid "*<a href=\"#project-torouter\">Torouter</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:129
+msgid "ioerror, Runa"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:133
+msgid "<a href=\"#project-vidalia\">Vidalia</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:134
+#: /tmp/KLdohZNkms.xml:142 /tmp/KLdohZNkms.xml:150
+msgid "User Interface"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:135
+msgid "C++, Qt"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:137
+msgid "chiiph"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:141
+msgid "<a href=\"#project-arm\">Arm</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:143
+msgid "Python, Curses"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:145
+msgid "atagar"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:149
+msgid "<a href=\"#project-orbot\">Orbot</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:153
+msgid "n8fr8"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:157
+msgid "<a href=\"#project-torbutton\">Torbutton</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:158
+msgid "Browser Add-on"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:159
+msgid "Javascript"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:161
+#: /tmp/KLdohZNkms.xml:177 /tmp/KLdohZNkms.xml:233
+msgid "mikeperry"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:165
+msgid "*<a href=\"#project-thandy\">Thandy</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:166
+msgid "Updater"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:167
+#: /tmp/KLdohZNkms.xml:175 /tmp/KLdohZNkms.xml:199 /tmp/KLdohZNkms.xml:207
+#: /tmp/KLdohZNkms.xml:223 /tmp/KLdohZNkms.xml:231 /tmp/KLdohZNkms.xml:239
+msgid "Python"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:169
+msgid "chiiph, Erinn, nickm"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:173
+msgid "<a href=\"#project-torctl\">TorCtl</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:174
+msgid "Library"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:181
+msgid "<a href=\"#project-metrics\">Metrics</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:182
+#: /tmp/KLdohZNkms.xml:190 /tmp/KLdohZNkms.xml:198 /tmp/KLdohZNkms.xml:206
+#: /tmp/KLdohZNkms.xml:214
+msgid "Client Service"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:185
+msgid "karsten"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:189
+msgid "<a href=\"#project-torstatus\">TorStatus</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:191
+msgid "PHP"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:197
+msgid "<a href=\"#project-weather\">Weather</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:201
+#: /tmp/KLdohZNkms.xml:209
+msgid "kaner"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:205
+msgid "<a href=\"#project-gettor\">GetTor</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:213
+msgid "<a href=\"#project-torcheck\">TorCheck</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:215
+msgid "Python, Perl"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:221
+msgid "<a href=\"#project-bridgedb\">BridgeDB</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:222
+#: /tmp/KLdohZNkms.xml:230 /tmp/KLdohZNkms.xml:238
+msgid "Backend Service"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:225
+msgid "kaner, nickm"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:229
+msgid "<a href=\"#project-torflow\">TorFlow</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:237
+msgid "*<a href=\"#project-torbel\">TorBEL</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:241
+msgid "Sebastian"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:245
+msgid ""
+"<sub> * Project is still in an alpha state.  </sub> <br /><br /> <a id"
+"=\"project-tor\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:252
+msgid ""
+"Tor (<a href=\"https://gitweb.torproject.org/tor.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Tor+Client&component=Tor+Relay&component=vidalia&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:257
+msgid ""
+"Central project, providing the core software for using and participating in "
+"the Tor network. Numerous people contribute to the project to varying "
+"extents, but the chief architects are Nick Mathewson and Roger Dingledine."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:263
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a href=\"#resistCensorship\">Improving Tor's"
+" ability to resist censorship</a></i><br /> <i><a "
+"href=\"#unitTesting\">Improve our unit testing process</a></i><br /> <i><a "
+"href=\"#simulateSlowConnections\">Simulator for slow Internet "
+"connections</a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:270
+msgid "<a id=\"project-jtor\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:271
+msgid ""
+"<a href=\"https://github.com/brl/JTor/wiki\";>JTor</a> (<a "
+"href=\"https://github.com/brl/JTor\";>code</a>, <a "
+"href=\"https://github.com/brl/JTor/issues\";>bug tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:277
+msgid ""
+"Java implementation of Tor and successor to <a "
+"href=\"http://onioncoffee.sourceforge.net/\";>OnionCoffee</a>. This project "
+"isn't yet complete, and has been inactive since Fall 2010."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:282
+msgid "<a id=\"project-tbb\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:283
+msgid ""
+"<a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a> (<a "
+"href=\"https://gitweb.torproject.org/torbrowser.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Tor+bundles/installation&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:289
+msgid ""
+"The Tor Browser Bundle is an easy-to-use portable package of Tor, Vidalia, "
+"and Firefox preconfigured to work together out of the box. This is actively "
+"being worked on by Erinn Clark."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:295
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a href=\"#auditTBB\">Audit Tor Browser "
+"Bundles for data leaks</a></i><br /> <i><a "
+"href=\"#usabilityTesting\">Usability testing of Tor</a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:300
+msgid "<a id=\"project-tails\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:301
+msgid ""
+"<a href=\"https://tails.boum.org/\";>The Amnesic Incognito Live System</a> "
+"(<a href=\"http://git.immerda.ch/?p=amnesia.git;a=summary\";>code</a>, <a "
+"href=\"https://tails.boum.org/bugs/\";>bug tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:307
+msgid ""
+"The Amnesic Incognito Live System is a live CD/USB distribution "
+"preconfigured so that everything is safely routed through Tor and leaves no "
+"trace on the local system. This is a merger of the Amnesia and <a "
+"href=\"http://www.anonymityanywhere.com/incognito/\";>Incognito</a> projects,"
+" and still under very active development."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:315
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a href=\"#tailsStartMenu\">Custom GDM3 "
+"startup menu, aka.  tails-greeter</a></i><br /> <i><a "
+"href=\"#tailsMetadataAnonymizing\">Meta-data anonymizing toolkit for file "
+"publication</a></i><br /> <i><a href=\"#tailsDebianLive\">Improve Debian "
+"Live support for persistence</a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:324
+msgid "<a id=\"project-torsocks\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:325
+msgid ""
+"<a href=\"http://code.google.com/p/torsocks/\";>Torsocks</a> (<a "
+"href=\"https://gitweb.torproject.org/torsocks.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torify&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:331
+msgid ""
+"Utility for adapting other applications to work with Tor. Development has "
+"slowed and compatibility issues remain with some platforms, but it's "
+"otherwise feature complete."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:337
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a href=\"#torsocksForOSX\">Make "
+"torsocks/dsocks work on OS X</a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:341
+msgid "<a id=\"project-torouter\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:342
+msgid ""
+"<a href=\"<wiki>doc/Torouter\">Torouter</a> (<a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torouter&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:348
+msgid ""
+"Project to provide an easy-to-use, embedded Tor instance for routers. This "
+"had high activity in late 2010, but has since been rather quiet."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:352
+msgid "<a id=\"project-vidalia\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:353
+msgid ""
+"<a href=\"<page projects/vidalia>\">Vidalia</a> (<a "
+"href=\"https://gitweb.torproject.org/vidalia.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Vidalia&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:359
+msgid ""
+"The most commonly used user interface for Tor. Matt Edman started the "
+"project in 2006 and brought it to its current stable state. Development "
+"slowed for several years, though TomÃs Touceda has since taken a lead with "
+"pushing the project forward."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:366
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a href=\"#vidaliaStatusEventInterface\">Tor "
+"Controller Status Event Interface for Vidalia</a></i><br /> <i><a "
+"href=\"#vidaliaNetworkMap\">An Improved and More Usable Network Map in "
+"Vidalia</a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:371
+msgid "<a id=\"project-arm\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:372
+msgid ""
+"<a href=\"http://www.atagar.com/arm/\";>Arm</a> (<a "
+"href=\"https://gitweb.torproject.org/arm.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=arm&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:378
+msgid ""
+"Command-line monitor for Tor. This has been under very active development by"
+" its author, Damian Johnson, since early 2009 to make it a better general-"
+"purpose controller for *nix environments."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:384
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a href=\"#armClientMode\">Client Mode Use "
+"Cases for Arm</a></i><br /> <i><a href=\"#armGui\">GUI for Arm</a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:389
+msgid "<a id=\"project-orbot\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:390
+msgid ""
+"<a href=\"https://guardianproject.info/apps/orbot/\";>Orbot</a> (<a "
+"href=\"https://gitweb.torproject.org/orbot.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Orbot&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:396
+msgid ""
+"Provides Tor on the Android platform. This was under very active development"
+" up through Fall 2010, after which things have been quiet."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:401
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a href=\"#orbot-torbutton\">TorButton for "
+"Mobile Firefox 4 or Custom Browser on Android</a></i><br /> <i><a href"
+"=\"#orbot-userInterface\">Build a better user interface for Orbot</a></i><br"
+" /> <i><a href=\"#orbot-optimisation\">Core Tor mobile "
+"optimisation</a></i><br /> <i><a href=\"#orbot-orlibAndOutreach\">Orbot "
+"integration library and community outreach</a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:408
+msgid "<a id=\"project-torbutton\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:409
+msgid ""
+"<a href=\"<page torbutton/index>\">Torbutton</a> (<a "
+"href=\"https://gitweb.torproject.org/torbutton.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torbutton&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:415
+msgid ""
+"Firefox addon that addresses many of the client-side threats to browsing the"
+" Internet anonymously. Mike has since continued to adapt it to new threats, "
+"updated versions of Firefox, and possibly <a "
+"href=\"https://blog.torproject.org/blog/google-chrome-incognito-mode-tor-";
+"and-fingerprinting\">Chrome as well</a>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:423
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a "
+"href=\"#torbuttonForThunderbird\">Torbutton equivalent for "
+"Thunderbird</a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:427
+msgid "<a id=\"project-thandy\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:428
+msgid "Thandy (<a href=\"https://gitweb.torproject.org/thandy.git\";>code</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:432
+msgid ""
+"Updater for Tor. The project began in the Summer of 2008 but wasn't "
+"completed. Recently interest in it has been rekindled and many aspects of "
+"its design (including the language it'll be in) are currently in flux."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:437
+msgid "<a id=\"project-torctl\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:438
+msgid ""
+"TorCtl (<a href=\"https://gitweb.torproject.org/pytorctl.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torctl&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:444
+msgid ""
+"Python bindings and utilities for using the Tor control port. It has been "
+"stable for several years, with only minor revisions."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:448
+msgid "<a id=\"project-metrics\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:449
+msgid ""
+"<a href=\"https://metrics.torproject.org/\";>Metrics</a> (code: <a "
+"href=\"https://gitweb.torproject.org/metrics-db.git\";>db</a>, <a "
+"href=\"https://gitweb.torproject.org/metrics-utils.git\";>utils</a>, <a "
+"href=\"https://gitweb.torproject.org/metrics-web.git\";>web</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Metrics&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:457
+msgid ""
+"Processing and analytics of consensus data, provided to users via the "
+"metrics portal. This has been under active development for several years by "
+"Karsten Loesing."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:462
+msgid "<a id=\"project-torstatus\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:463
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorStatus\";>TorStatus</a>"
+" (<a href=\"https://svn.torproject.org/svn/torstatus/trunk/\";>code</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:467
+msgid ""
+"Portal providing an overview of the Tor network, and details on any of its "
+"current relays. Though very actively used, this project has been "
+"unmaintained for a long while."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:472
+msgid "<a id=\"project-weather\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:473
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/wiki/projects/Weather\";>Weather</a>"
+" (<a href=\"https://gitweb.torproject.org/weather.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Tor+Weather&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:479
+msgid ""
+"Provides automatic notification to subscribed relay operators when their "
+"relay's unreachable. This underwent a rewrite by the <a "
+"href=\"http://hfoss.wesleyan.edu/\";>Wesleyan HFOSS team</a>, which went live"
+" in early 2011."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:485
+msgid "<a id=\"project-gettor\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:486
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/wiki/projects/EmailAutoResponder\";>GetTor</a>"
+" (<a href=\"https://gitweb.torproject.org/gettor.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=GetTor&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:492
+msgid ""
+"E-mail autoresponder providing Tor's packages over SMTP. This has been "
+"relatively unchanged for quite a while."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:496
+msgid "<a id=\"project-torcheck\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:497
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorCheck\";>TorCheck</a>"
+" (<a href=\"https://svn.torproject.org/svn/check/trunk/\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Tor+Check&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:503
+msgid ""
+"Provides a simple site for determining if the visitor is using Tor or not.  "
+"This has been relatively unchanged for quite a while."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:507
+msgid "<a id=\"project-bridgedb\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:508
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/wiki/projects/BridgeDB\";>BridgeDB</a>"
+" (<a href=\"https://gitweb.torproject.org/bridgedb.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=BridgeDB&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:514
+msgid ""
+"Backend bridge distributor, handling the various pools they're distributed "
+"in. This was actively developed until Fall of 2010."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:518
+msgid "<a id=\"project-torflow\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:519
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorFlow\";>TorFlow</a>"
+" (<a href=\"https://gitweb.torproject.org/torflow.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torflow&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:525
+msgid ""
+"Library and collection of services for actively monitoring the Tor network."
+"  These include the Bandwidth Scanners (measuring throughput of relays) and "
+"SoaT (scans for malicious or misconfigured exit nodes). SoaT was last "
+"actively developed in the Summer of 2010, and the Bandwidth Scanners a few "
+"months later. Both have been under active use since then, but development "
+"has stopped."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:533
+msgid "<a id=\"project-torbel\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:534
+msgid ""
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorBulkExitlist\";>TorBEL</a>"
+" (<a href=\"https://gitweb.torproject.org/tordnsel.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=TorDNSEL/TorBEL&order=priority\";>bug"
+" tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:541
+msgid ""
+"The Tor Bulk Exitlist provides a method of identifying if IPs belong to exit"
+" nodes or not. This is a replacement for TorDNSEL which is a stable (though "
+"unmaintained) Haskell application for this purpose. The initial version of "
+"TorBEL was started in GSOC 2010 but since then the project has been "
+"inactive."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:548
+msgid "<a id=\"Coding\"></a> <a id=\"Summer\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:550
+msgid "<a class=\"anchor\" href=\"#Coding\">Project Ideas</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:553
+msgid ""
+"You may find some of these projects to be good <a href=\"<page "
+"about/gsoc>\">Google Summer of Code 2011</a> ideas. We have labelled each "
+"idea with how useful it would be to the overall Tor project (priority), how "
+"much work we expect it would be (effort level), how much clue you should "
+"start with (skill level), and which of our <a href=\"<page "
+"about/corepeople>\">core developers</a> would be good mentors.  If one or "
+"more of these ideas looks promising to you, please <a href=\"<page "
+"about/contact>\">contact us</a> to discuss your plans rather than sending "
+"blind applications. You may also want to propose your own project idea "
+"&mdash; which often results in the best applications."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:567
+msgid "<a id=\"auditTBB\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:569
+msgid ""
+"<b>Audit Tor Browser Bundles for data leaks</b> <br> Priority: <i>High</i> "
+"<br> Effort Level: <i>High</i> <br> Skill Level: <i>Medium</i> <br> Likely "
+"Mentors: <i>Erinn, Jacob, Andrew</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:578
+msgid ""
+"The Tor Browser Bundle incorporates Tor, Firefox, Polipo, and the Vidalia "
+"user interface (and optionally the <a href=\"http://pidgin.im/\";>Pidgin</a> "
+"Instant Messaging client). Components are pre-configured to operate in a "
+"secure way, and it has very few dependencies on the installed operating "
+"system. It has therefore become one of the most easy to use, and popular, "
+"ways to use Tor on Windows."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:584
+msgid ""
+"This project is to identify all of the traces left behind by using a Tor "
+"Browser Bundle on Windows, Mac OS X, or Linux.  Developing ways to stop, "
+"counter, or remove these traces is a final step."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:587
+msgid ""
+"Students should be familiar with operating system analysis, application "
+"development on one or preferably all of Windows, Linux, and Mac OS X, and be"
+" comfortable with C/C++ and shell scripting."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:590
+msgid ""
+"If you would like to help extend or do security auditing for TBB, please "
+"contact Erinn."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:594
+msgid "<a id=\"firewallProbeTool\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:596
+msgid ""
+"<b>Develop a fully automatic firewall-probing system</b> <br> Priority: "
+"<i>High</i> <br> Effort Level: <i>Medium to High</i> <br> Skill Level: "
+"<i>High</i> <br> Likely Mentors: <i>Robert Ransom, Nick, Jacob</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:605
+msgid ""
+"We would like to have a fully automatic firewall-probing system for blocking"
+" systems with no long-term state (i.e. firewalls that can examine each "
+"connection, but do not change their behaviour for future connections based "
+"on the traffic they have seen)."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:609
+msgid ""
+"Ideally, volunteers would only need to set up one or more test servers, and "
+"run the probe client program on a publicly accessible computer behind the "
+"firewall."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:612
+msgid "The test tool should:"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><ul><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:614
+msgid ""
+"generate packet captures on both ends (and send them out to the extent "
+"possible),"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><ul><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:616
+msgid ""
+"cycle through all the SSL configurations we might want to test through a "
+"censorship device, and"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><ul><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:618
+msgid ""
+"also test some other protocols to see whether they are allowed through the "
+"firewall (IMAP and other mail protocols, BitTorrent, DTLS, etc.)."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:624
+msgid "<a id=\"tailsStartMenu\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:626
+msgid ""
+"<b>Custom GDM3 startup menu, aka. tails-greeter</b> <br> Priority: "
+"<i>High</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium to "
+"High</i> <br> Likely Mentors: <i>intrigeri, anonym</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:635
+msgid ""
+"Several major upcoming Tails features need to gather user input at startup "
+"time: bridges support, persistence, MAC address anonymization, etc."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:638
+msgid ""
+"Existing boot menus lack the graphical widgets and generally user-"
+"friendliness needed. Hence it was decided to implement Tails startup menu in"
+" GDM3: GDM3's default login/password prompt needs to be replaced with a "
+"custom GTK+ application hereby named tails-greeter that allows the user to "
+"provide any input necessary."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:643
+msgid ""
+"Anyone undertaking this project should be familiar with GNU/Linux and "
+"application development; no other skill is required, apart of the ability to"
+" quickly find practical answers in APIs and documentation for many "
+"technologies she knows nothing about: this challenging coding project will "
+"indeed involve getting familiar with some modern GNU/Linux Desktop "
+"technologies such as D-Bus, GNOME and GConf. Python/GTK+ is probably the "
+"best suited language for the task."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:650
+msgid ""
+"For more information see <a "
+"href=\"https://tails.boum.org/todo/boot_menu/\";>https://tails.boum.org/todo/boot_menu/</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:653
+msgid "<a id=\"orbot-torbutton\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:655
+msgid ""
+"<b>TorButton for Mobile Firefox 4 or Custom Browser on Android</b> <br> "
+"Priority: <i>High</i> <br> Effort Level: <i>High</i> <br> Skill Level: "
+"<i>High</i> <br> Likely Mentors: <i>Nathan (n8fr8), Jake, Mike Perry</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:664
+msgid ""
+"Initial work has been done on implementing a proxy-setting add-on for "
+"Firefox on Android (see <a "
+"href=\"https://github.com/guardianproject/ProxyMob\";>ProxyMob</a>), but a "
+"full port of TorButton needs to be done (dependent upon Firefox 4 port of "
+"TorButton). The other approach is to implement a custom &quot;Tor "
+"Browser&quot; based on Firefox or Webkit browser. See <a "
+"href=\"http://code.google.com/p/torora/wiki/Android\";>Torora</a> for "
+"progress on this so far."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:674
+msgid "<a id=\"orbot-userInterface\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:676
+msgid ""
+"<b>Build a better user interface for Orbot</b> <br> Priority: <i>High</i> "
+"<br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium</i> <br> Likely"
+" Mentors: <i>Nathan (n8fr8), Jake</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:685
+msgid ""
+"Improved home screen to show confirmation of connection (via a TorCheck API "
+"call), better statistics about data transferred (up/down), number of "
+"circuits connected, quality of connection and so on. The &quot;Tether "
+"Wifi&quot; Android application is a good model to follow in how it shows a "
+"realtime count of bytes transferred as well as notifications when wifi "
+"clients connect. In addition, better handling of Tor system and error "
+"messages would also be very helpful, include use of standard Android "
+"operating systems notifications. The addition of a wizard or tutorial "
+"walkthrough for novice users to explain to them exactly what is and what is "
+"not anonymized or protected would greatly improve the likelihood they will "
+"use Orbot correctly. All of this should work on the range of screens and "
+"device types now offered for Android, from 2&quot; phone to 10&quot; Tablet."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:700
+msgid "<a id=\"resistCensorship\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:702
+msgid ""
+"<b>Improving Tor's ability to resist censorship</b> <br> Priority: <i>Medium"
+" to High</i> <br> Effort Level: <i>Medium to High</i> <br> Skill Level: "
+"<i>High</i> <br> Likely Mentors: <i>Roger, Nick, Jake, Thomas</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:711
+msgid ""
+"The Tor 0.2.1.x series makes <a href=\"<svnprojects>design-"
+"paper/blocking.html\">significant improvements</a> in resisting national and"
+" organizational censorship.  But Tor still needs better mechanisms for some "
+"parts of its anti-censorship design."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:716
+msgid ""
+"One huge category of work is adding features to our <a "
+"href=\"https://gitweb.torproject.org/bridgedb.git?a=tree\";>BridgeDB</a> "
+"service (Python). Tor aims to give out <a href=\"<page "
+"docs/bridges>\">bridge relay addresses</a> to users that can't reach the Tor"
+" network directly, but there's an arms race between algorithms for "
+"distributing addresses and algorithms for gathering and blocking them. See "
+"<a href=\"<blog>bridge-distribution-strategies\">our blog post on the "
+"topic</a> as an overview, and then look at <a "
+"href=\"https://lists.torproject.org/pipermail/tor-";
+"dev/2009-December/000666.html\">Roger's or-dev post</a> from December 2009 "
+"for more recent thoughts &mdash; lots of design work remains."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:727
+msgid ""
+"If you want to get more into the guts of Tor itself (C), a more minor "
+"problem we should address is that current Tors can only listen on a single "
+"address/port combination at a time. There's <a "
+"href=\"<specblob>proposals/118-multiple-orports.txt\">a proposal to address "
+"this limitation</a> and allow clients to connect to any given Tor on "
+"multiple addresses and ports, but it needs more work."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:734
+msgid ""
+"This project could involve a lot of research and design. One of the big "
+"challenges will be identifying and crafting approaches that can still resist"
+" an adversary even after the adversary knows the design, and then trading "
+"off censorship resistance with usability and robustness."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:741
+msgid "<a id=\"geoIPUpgrade\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:743
+msgid ""
+"<b>Improve our GeoIP file format</b> <br> Priority: <i>Medium</i> <br> "
+"Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium to High</i> <br> "
+"Likely Mentors: <i>Robert Ransom</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:752
+msgid ""
+"Currently, Tor bridges and relays read an entire IP->country database into "
+"memory from a text file during startup.  We would like to distribute this "
+"database and store it on disk in a much more compact form, and perform "
+"IP->country lookups on it in its on-disk format if possible."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:757
+msgid ""
+"We have <a href='https://trac.torproject.org/projects/tor/ticket/2506'>a "
+"sketch of a design</a> for a moderately optimized format for IPv4 GeoIP "
+"data; this project will involve both implementing the IPv4 format and "
+"designing and implementing a format for IPv6 GeoIP data."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:766
+msgid "<a id=\"armClientMode\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:768
+msgid ""
+"<b>Client Mode Use Cases for Arm</b> <br> Priority: <i>Medium</i> <br> "
+"Effort Level: <i>High</i> <br> Skill Level: <i>Medium</i> <br> Likely "
+"Mentors: <i>Damian (atagar)</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:777
+msgid ""
+"<a href=\"<page projects/arm>\">Arm</a> is a Tor command line status monitor"
+" on *nix environments (Linux, Mac, and BSD). It functions much like top "
+"does, giving a CLI overlay of Tor's bandwidth usage, connections, "
+"configuration, log, etc. Thus far its design has been geared for Tor relay "
+"operators. However, this doesn't need to be the case. This project would be "
+"to expand and simplify arm to make it useful for Tor's client users too."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:785
+msgid ""
+"This would include UI design, experimenting, and a lot of python hacking. "
+"Here's some ideas for client functionality arm could provide:"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><ul><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:789
+msgid ""
+"A panel for client connections, showing each hop of the user's circuits with"
+" the ISP, country, and jurisdiction where those relays reside. Other "
+"interesting information would be the circuit's latency, how long its been "
+"around, and its possible exit ports. Some of this will be pretty tricky and "
+"require some experimentation to figure out what information can be fetched "
+"safely (for instance, scraping rdns and whois lookups could give hints about"
+" a relay's ISP, but we'd need to do it on all Tor relays to avoid leaking "
+"our connections to the resolver)."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><ul><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:798
+msgid ""
+"Options to let the user request new circuits (the &quot;New Identity&quot; "
+"feature in Vidalia), select the exit country, etc."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><ul><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:801
+msgid ""
+"A panel showing Internet application and if their connections are being "
+"routed through Tor or not (giving a warning if there's leaks)."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><ul><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:804
+msgid ""
+"The status of the bridges we're configured to use (ie, are they up?).  This "
+"would include adding control port functionality to Tor for <a "
+"href=\"https://trac.torproject.org/projects/tor/ticket/2068\";>ticket "
+"2068</a>."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><ul><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:809
+msgid ""
+"A one click option to set Tor to be a client, relay, or bridge. The goal "
+"would be to make it trivial for users to voluntarily contribute to the Tor "
+"network."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><ul><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:813
+msgid ""
+"Menus as an alternative to hotkeys to make the interface more intuitive and "
+"usable for beginners (<a "
+"href=\"http://gnosis.cx/publish/programming/charming_python_6.html\";>example</a>)."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><ul><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:817
+msgid ""
+"Look at Vidalia and TorK for ideas and solicit input from the Tor community."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:821
+msgid ""
+"More information is available in the following sections of arm's dev notes: "
+"<a "
+"href=\"https://trac.torproject.org/projects/tor/wiki/projects/arm#ConnectionListingExpansion\";>Connection"
+" Listing Expansion</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/wiki/projects/arm#CircuitDetails\";>Circuit"
+" Details</a>, and <a "
+"href=\"https://trac.torproject.org/projects/tor/wiki/projects/arm#ClientModeUseCases\";>Client"
+" Mode Use Cases</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:825
+msgid "<a id=\"unitTesting\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:827
+msgid ""
+"<b>Improve our unit testing process</b> <br> Priority: <i>Medium</i> <br> "
+"Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium</i> <br> Likely "
+"Mentors: <i>Nick, Erinn</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:836
+msgid ""
+"Tor needs to be tested far more thoroughly. This is a multi-part effort. To "
+"start with, our unit test coverage should rise substantially, especially in "
+"the areas outside the utility functions. This will require significant "
+"refactoring of some parts of Tor, in order to dissociate as much logic as "
+"possible from globals."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:842
+msgid ""
+"Additionally, we need to automate our performance testing. We've got "
+"buildbot to automate our regular integration and compile testing already "
+"(though we need somebody to set it up on Windows), but we need to get our "
+"network simulation tests (as built in <a "
+"href=\"https://svn.torproject.org/svn/torflow/trunk/README\";>TorFlow</a>)  "
+"updated for more recent versions of Tor, and designed to launch a test "
+"network either on a single machine, or across several, so we can test "
+"changes in performance on machines in different roles automatically."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:852
+msgid "<a id=\"simulateSlowConnections\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:854
+msgid ""
+"<b>Simulator for slow Internet connections</b> <br> Priority: <i>Medium</i> "
+"<br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium</i> <br> Likely"
+" Mentors: <i>Nick</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:864
+msgid ""
+"Many users of Tor have poor-quality Internet connections, giving low "
+"bandwidth, high latency, and high packet loss/re-ordering. User experience "
+"is that Tor reacts badly to these conditions, but it is difficult to improve"
+" the situation without being able to repeat the problems in the lab."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:872
+msgid ""
+"This project would be to build a simulation environment which replicates the"
+" poor connectivity so that the effect on Tor performance can be measured. "
+"Other components would be a testing utility to establish what are the "
+"properties of connections available, and to measure the effect of "
+"performance-improving modifications to Tor."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:880
+msgid ""
+"The tools used would be up to the student, but dummynet (for FreeBSD)  and "
+"nistnet (for Linux) are two potential components on which this project could"
+" be built. Students should be experienced with network programming/debugging"
+" and TCP/IP, and preferably familiar with C and a scripting language."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:888
+msgid "<a id=\"torbuttonForThunderbird\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:890
+msgid ""
+"<b>Torbutton equivalent for Thunderbird</b> <br> Priority: <i>Medium</i> "
+"<br> Effort Level: <i>High</i> <br> Skill Level: <i>High</i> <br> Likely "
+"Mentors: <i>Mike</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:900
+msgid ""
+"We're hearing from an increasing number of users that they want to use "
+"Thunderbird with Tor. However, there are plenty of application-level "
+"concerns, for example, by default Thunderbird will put your hostname in the "
+"outgoing mail that it sends. At some point we should start a new push to "
+"build a Thunderbird extension similar to Torbutton."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:908
+msgid "<a id=\"usabilityTesting\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:910
+msgid ""
+"<b>Usability testing of Tor</b> <br> Priority: <i>Medium</i> <br> Effort "
+"Level: <i>Medium</i> <br> Skill Level: <i>Low to Medium</i> <br> Likely "
+"Mentors: <i>Andrew</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:920
+msgid ""
+"Especially the browser bundle, ideally amongst our target demographic.  That"
+" would help a lot in knowing what needs to be done in terms of bug fixes or "
+"new features. We get this informally at the moment, but a more structured "
+"process would be better."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:927
+msgid ""
+"Please note that since this isn't a coding project, it isn't suitable for "
+"Google Summer of Code."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:932
+msgid "<a id=\"tailsMetadataAnonymizing\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:934
+msgid ""
+"<b>Meta-data anonymizing toolkit for file publication</b> <br> Priority: "
+"<i>Medium</i> <br> Effort Level: <i>Low to Medium</i> <br> Skill Level: "
+"<i>Low to Medium</i> <br> Likely Mentors: <i>intrigeri, anonym</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:943
+msgid ""
+"Tor helps greatly in publishing files anonymously. However, much personal "
+"information can be enclosed *inside* such published files' meta-data: GPS "
+"coordinates, author's name and so on. Anyone who wants to anonymously "
+"publish a file can thus far too easily de-anonymize herself."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:947
+msgid ""
+"A set of tools allowing users to easily inspect and clean up meta-data in "
+"files would benefit Tor users, and would e.g. be shipped in Tails."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:949
+msgid ""
+"A graphical user interface is a must, but library and command-line "
+"interfaces are most welcome so that future work can add support for cleaning"
+" published files to various publishing tools, such as desktop social "
+"networking clients and Web content management systems."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:953
+msgid ""
+"This project mostly consists of writing glue between the many existing tools"
+" and libraries that provide read/write access to files' meta-data. An "
+"extensible program design would probably be the best bet, so that support "
+"for other kinds of files can easily be added later."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:957
+msgid ""
+"The meta-data cleaning toolkit would run at least on GNU/Linux; additional "
+"Windows and/or Mac OS X support would be welcome. The tools used would be up"
+" to the students. The detailed specification is ready and will be published "
+"soon."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:963
+msgid "<a id=\"tailsDebianLive\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:965
+msgid ""
+"<b>Improve Debian Live support for persistence</b> <br> Priority: "
+"<i>Medium</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Low to "
+"Medium</i> <br> Likely Mentors: <i>intrigeri, anonym</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:974
+msgid ""
+"Data persistence is a somewhat tricky topic in a Live system context, "
+"especially one such as Tails, which is explicitly designed to avoid leaving "
+"any trace of its use."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:977
+msgid ""
+"Some real-life use cases, however, require some kind of data persistence. To"
+" start with, Tails should (carefully) support persistence of application-"
+"specific configurations (e.g. GnuPG keyring) and of a user arbitrary data "
+"store. Note that persistence in Tails will always be opt-in and require "
+"encrypted storage."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:982
+msgid ""
+"The backend work consists of improving Debian Live's existing persistence "
+"features to make them suit the specific context of Tails. A trust "
+"relationship is already established with upstream who is happy to merge our "
+"changes. The codebase is not that small and much refactoring is needed, so "
+"this really is a programming project rather than a fire'n'forget shell "
+"script hack contest."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:988
+msgid ""
+"Anyone undertaking this project must be familiar with GNU/Linux, and "
+"preferably with Debian. Being able to (quickly learn to) write clean and "
+"safe programs in shell is also needed."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:991
+msgid ""
+"For more information, see <a "
+"href=\"https://tails.boum.org/todo/persistence/\";>https://tails.boum.org/todo/persistence/</a>."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:994
+msgid "<a id=\"torsocksForOSX\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:996
+msgid ""
+"<b>Make torsocks/dsocks work on OS X</b> <br> Priority: <i>Medium</i> <br> "
+"Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium</i> <br> Likely "
+"Mentors: <i>Robert Hogan</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1006
+msgid ""
+"<a href=\"https://code.google.com/p/torsocks/\";>Torsocks</a> and <a "
+"href=\"https://code.google.com/p/dsocks/\";>dsocks</a> are wrappers that will"
+" run applications, intercept their outgoing network connections, and push "
+"those connections through Tor. The goal is to handle applications that don't"
+" support proxies (or don't supporting them well). To get it right, they need"
+" to intercept many system calls. The syscalls you need to intercept on Linux"
+" differ dramatically from those on BSD. So Torsocks works fine on Linux, "
+"dsocks works ok on BSD (though it may be less maintained and thus might miss"
+" more syscalls), and nothing works well on both. First, we should patch "
+"dsocks to use Tor's <i>mapaddress</i> commands from the controller "
+"interface, so we don't waste a whole round-trip inside Tor doing the resolve"
+" before connecting. Second, we should make our <i>torify</i> script detect "
+"which of torsocks or dsocks is installed, and call them appropriately. This "
+"probably means unifying their interfaces, and might involve sharing code "
+"between them or discarding one entirely."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1025
+msgid "<a id=\"vidaliaStatusEventInterface\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1027
+msgid ""
+"<b>Tor Controller Status Event Interface for Vidalia</b> <br> Priority: "
+"<i>Medium</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Low to "
+"Medium</i> <br> Likely Mentors: <i>TomÃs</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1036
+msgid ""
+"There are a number of status changes inside Tor of which the user may need "
+"to be informed. For example, if the user is trying to set up his Tor as a "
+"relay and Tor decides that its ports are not reachable from outside the "
+"user's network, we should alert the user. Currently, all the user gets is a "
+"couple of log messages in Vidalia's 'message log' window, which they likely "
+"never see since they don't receive a notification that something has gone "
+"wrong. Even if the user does actually look at the message log, most of the "
+"messages make little sense to the novice user."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1044
+msgid ""
+"Tor has the ability to inform Vidalia of many such status changes, and we "
+"recently implemented support for a couple of these events. Still, there are "
+"many more status events which the user should be informed of, and we need a "
+"better UI for actually displaying them to the user."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1049
+msgid ""
+"The goal of this project then is to design and implement a UI for displaying"
+" Tor status events to the user. For example, we might put a little badge on "
+"Vidalia's tray icon that alerts the user to new status events they should "
+"look at. Double-clicking the icon could bring up a dialog that summarizes "
+"recent status events in simple terms and maybe suggests a remedy for any "
+"negative events if they can be corrected by the user. Of course, this is "
+"just an example and one is free to suggest another approach."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1057
+msgid ""
+"A person undertaking this project should have good UI design and layout "
+"skills and some C++ development experience. Previous experience with Qt and "
+"Qt's Designer will be very helpful, but are not required. Some English "
+"writing ability will also be useful, since this project will likely involve "
+"writing small amounts of help documentation that should be understandable by"
+" non-technical users. Bonus points for some graphic design/Photoshop fu, "
+"since we might want/need some shiny new icons too."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1066
+msgid "<a id=\"orbot-optimisation\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1068
+msgid ""
+"<b>Core Tor mobile optimisation</b> <br> Priority: <i>Medium</i> <br> Effort"
+" Level: <i>Medium</i> <br> Skill Level: <i>High</i> <br> Likely Mentors: "
+"<i>Nathan (n8fr8), Jake</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1078
+msgid ""
+"The existing port of Tor to Android is basically a straight cross-compile to"
+" Linux ARM. There has been no work done in looking at possible optimizations"
+" of Tor within a mobile hardware environment or on mobile networks. In "
+"addition, a number of additional Android OS APIs are available (such as "
+"wireless network status) that could be taken advantage of."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1087
+msgid ""
+"It should be noted, that even without optimisation, Tor is handling the "
+"mobile network environment very well, automatically detecting change in IP "
+"addresses, opening circuits, etc, as the device switches from no coverage to"
+" 2G, 3G or Wifi constantly as it changes position. However, this observation"
+" of &quot;very well&quot;, is just based on user experience, and not any "
+"detailed study of what exactly is happening, and what threats might exist "
+"because of this constantly changing network state."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1097
+msgid ""
+"Finally, the build process needs to be moved to the Android NDK from the "
+"custom GCC toolchain we are now using, and compatibility with Android 2.3 "
+"and 3.x Honeycomb OS need to be verified."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1103
+msgid ""
+"For more information see the <a "
+"href=\"https://svn.torproject.org/svn/projects/android/trunk/Orbot/BUILD\";>Orbot"
+" build documentation</a>."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1109
+msgid "<a id=\"orbot-orlibAndOutreach\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1111
+msgid ""
+"<b>Orbot integration library and community outreach</b> <br> Priority: "
+"<i>Medium</i> <br> Effort Level: <i>Low</i> <br> Skill Level: <i>Medium</i> "
+"<br> Likely Mentors: <i>Nathan (n8fr8)</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1121
+msgid ""
+"We need additional work on <a "
+"href=\"https://github.com/guardianproject/orlib\";>ORLib</a>, our library for"
+" use with third-party application to easily enable them to support "
+"&quot;Torification&quot; on non-rooted devices (i.e. w/o transparent "
+"proxying). This library includes a SOCKS client, a wrapper for the Apache "
+"HTTPClient library, a utility class for detecting the state of Orbot "
+"connectivity, and other relevant/useful things an Android app might need to "
+"anonymize itself. This work would includes direct development of the "
+"library, documentation, and sample code. Outreach or effort to implement the"
+" library within other open-source apps is also needed."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1134
+msgid "<a id=\"vidaliaNetworkMap\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1136
+msgid ""
+"<b>An Improved and More Usable Network Map in Vidalia</b> <br> Priority: "
+"<i>Low to Medium</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: "
+"<i>Medium</i> <br> Likely Mentors: <i>TomÃs</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1146
+msgid ""
+"One of Vidalia's existing features is a network map that shows the user the "
+"approximate geographic location of relays in the Tor network and plots the "
+"paths the user's traffic takes as it is tunneled through the Tor network. "
+"The map is currently not very interactive and has rather poor graphics. "
+"Instead, we implemented KDE's Marble widget such that it gives us a better "
+"quality map and enables improved interactivity, such as allowing the user to"
+" click on individual relays or circuits to display additional information. "
+"We want to add the ability for users to click on a particular relay or a "
+"country containing one or more Tor exit relays and say, \"I want my "
+"connections to exit from here.\""
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1160
+msgid ""
+"This project will first involve getting familiar with Vidalia and the Marble"
+" widget's API. One will then integrate the widget into Vidalia and customize"
+" Marble to be better suited for our application, such as making circuits "
+"clickable, storing cached map data in Vidalia's own data directory, and "
+"customizing some of the widget's dialogs."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1168
+msgid ""
+"A person undertaking this project should have good C++ development "
+"experience. Previous experience with Qt and CMake is helpful, but not "
+"required."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1174
+msgid "<a id=\"armGui\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1176
+msgid ""
+"<b>GUI for Arm</b> <br> Priority: <i>Low</i> <br> Effort Level: <i>High</i> "
+"<br> Skill Level: <i>Medium</i> <br> Likely Mentors: <i>Damian (atagar)</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1186
+msgid ""
+"Arm has several unique features, some of the most interesting being its "
+"connection listing (correlating netstat results against the Tor consensus)  "
+"and configuration editor (a quick method for editing Tor's config, with "
+"information pulled from the control port and man page). However, since arm "
+"is a command line controller it's of limited appeal to certain sets of "
+"users. This project would be to build a GTK or Qt frontend for the "
+"controller, providing similar features set but with a windowed interface."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1196
+msgid ""
+"The vast majority of arm's more interesting functionality lies in its "
+"backend <a "
+"href=\"https://gitweb.torproject.org/arm.git/tree/HEAD:/src/util\";>utilities</a>,"
+" so there should be little to no work decoupling the CLI from its backend.  "
+"Instead, this project would mostly be UI hacking and experimentation, trying"
+" different interfaces to find something that's elegant and simple, but "
+"matches the information found in the current terminal application."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1206
+msgid ""
+"<b>Bring up new ideas!</b> <br> Don't like any of these? Look at the <a "
+"href=\"/press/presskit/2008-12-19-roadmap-full.pdf\">Tor development "
+"roadmap</a> for more ideas, or just try out Tor, Vidalia, and Torbutton, and"
+" find out what you think needs fixing.  Some of the <a "
+"href=\"<spectree>proposals\">current proposals</a> might also be short on "
+"developers."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1218
+msgid "<a id=\"OtherCoding\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1219
+msgid ""
+"<a class=\"anchor\" href=\"#OtherCoding\">Other Coding and Design related "
+"ideas</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1221
+msgid ""
+"Tor relays don't work well on Windows XP. On Windows, Tor uses the standard "
+"<tt>select()</tt> system call, which uses space in the non-page pool. This "
+"means that a medium sized Tor relay will empty the non-page pool, <a "
+"href=\"<wiki>doc/WindowsBufferProblems\">causing havoc and system "
+"crashes</a>. We should probably be using overlapped IO instead. One solution"
+" would be to teach <a "
+"href=\"http://www.monkey.org/~provos/libevent/\";>libevent</a> how to use "
+"overlapped IO rather than select() on Windows, and then adapt Tor to the new"
+" libevent interface. Christian King made a <a "
+"href=\"https://svn.torproject.org/svn/libevent-urz/trunk/\";>good start</a> "
+"on this in the summer of 2007."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1234
+msgid ""
+"We need to actually start building our <a href=\"<page "
+"docs/documentation>#DesignDoc\">blocking-resistance design</a>. This "
+"involves fleshing out the design, modifying many different pieces of Tor, "
+"adapting <a href=\"<page projects/vidalia>\">Vidalia</a> so it supports the "
+"new features, and planning for deployment."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1240
+msgid ""
+"We need a flexible simulator framework for studying end-to-end traffic "
+"confirmation attacks. Many researchers have whipped up ad hoc simulators to "
+"support their intuition either that the attacks work really well or that "
+"some defense works great. Can we build a simulator that's clearly documented"
+" and open enough that everybody knows it's giving a reasonable answer? This "
+"will spur a lot of new research.  See the entry <a "
+"href=\"#Research\">below</a> on confirmation attacks for details on the "
+"research side of this task &mdash; who knows, when it's done maybe you can "
+"help write a paper or three also."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1250
+msgid ""
+"Tor 0.1.1.x and later include support for hardware crypto accelerators via "
+"OpenSSL. It has been lightly tested and is possibly very buggy.  We're "
+"looking for more rigorous testing, performance analysis, and optimally, code"
+" fixes to OpenSSL and Tor if needed."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1256
+msgid ""
+"Perform a security analysis of Tor with <a "
+"href=\"https://secure.wikimedia.org/wikipedia/en/wiki/Fuzz_testing\";>\"fuzz\"</a>."
+" Determine if there are good fuzzing libraries out there for what we want. "
+"Win fame by getting credit when we put out a new release because of you!"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1261
+msgid ""
+"Tor uses TCP for transport and TLS for link encryption. This is nice and "
+"simple, but it means all cells on a link are delayed when a single packet "
+"gets dropped, and it means we can only reasonably support TCP streams. We "
+"have a <a href=\"<page docs/faq>#TransportIPnotTCP\">list of reasons why we "
+"haven't shifted to UDP transport</a>, but it would be great to see that list"
+" get shorter. We also have a proposed <a href=\"<specblob>proposals/100-tor-"
+"spec-udp.txt\">specification for Tor and UDP</a> &mdash; please let us know "
+"what's wrong with it."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1272
+msgid ""
+"We're not that far from having IPv6 support for destination addresses (at "
+"exit nodes). If you care strongly about IPv6, that's probably the first "
+"place to start."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1276
+msgid ""
+"We need a way to generate the website diagrams (for example, the \"How Tor "
+"Works\" pictures on the <a href=\"<page about/overview>\">overview page</a> "
+"from source, so we can translate them as UTF-8 text rather than edit them by"
+" hand with Gimp. We might want to integrate this as an wml file so "
+"translations are easy and images are generated in multiple languages "
+"whenever we build the website."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1283
+msgid ""
+"How can we make the various LiveCD/USB systems easier to maintain, improve, "
+"and document? One example is <a href=\"https://tails.boum.org/\";>The Amnesic"
+" Incognito Live System</a>."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1290
+msgid ""
+"Another anti-censorship project is to try to make Tor more scanning-"
+"resistant.  Right now, an adversary can identify <a "
+"href=\"<specblob>proposals/125-bridges.txt\">Tor bridges</a> just by trying "
+"to connect to them, following the Tor protocol, and seeing if they respond."
+"  To solve this, bridges could <a href=\"<svnprojects>design-"
+"paper/blocking.html#tth_sEc9.3\">act like webservers</a> (HTTP or HTTPS) "
+"when contacted by port-scanning tools, and not act like bridges until the "
+"user provides a bridge-specific key.  To start, check out Shane Pope's <a "
+"href=\"http://dl.dropbox.com/u/37735/index.html\";>thesis and prototype</a>."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1304
+msgid "<a id=\"Research\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1305
+msgid "<a class=\"anchor\" href=\"#Research\">Research</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1307
+msgid ""
+"The \"end-to-end traffic confirmation attack\": by watching traffic at Alice"
+" and at Bob, we can <a "
+"href=\"http://freehaven.net/anonbib/#danezis:pet2004\";>compare traffic "
+"signatures and become convinced that we're watching the same stream</a>. So "
+"far Tor accepts this as a fact of life and assumes this attack is trivial in"
+" all cases. First of all, is that actually true? How much traffic of what "
+"sort of distribution is needed before the adversary is confident he has won?"
+" Are there scenarios (e.g. not transmitting much)  that slow down the "
+"attack? Do some traffic padding or traffic shaping schemes work better than "
+"others?"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1317
+msgid ""
+"A related question is: Does running a relay/bridge provide additional "
+"protection against these timing attacks? Can an external adversary that "
+"can't see inside TLS links still recognize individual streams reliably? Does"
+" the amount of traffic carried degrade this ability any? What if the client-"
+"relay deliberately delayed upstream relayed traffic to create a queue that "
+"could be used to mimic timings of client downstream traffic to make it look "
+"like it was also relayed? This same queue could also be used for masking "
+"timings in client upstream traffic with the techniques from <a "
+"href=\"http://www.freehaven.net/anonbib/#ShWa-Timing06\";>adaptive "
+"padding</a>, but without the need for additional traffic. Would such an "
+"interleaving of client upstream traffic obscure timings for external "
+"adversaries? Would the strategies need to be adjusted for asymmetric links? "
+"For example, on asymmetric links, is it actually possible to differentiate "
+"client traffic from natural bursts due to their asymmetric capacity? Or is "
+"it easier than symmetric links for some other reason?"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1332
+msgid ""
+"Repeat Murdoch and Danezis's <a "
+"href=\"http://www.cl.cam.ac.uk/~sjm217/projects/anon/#torta\";>attack from "
+"Oakland 05</a> on the current Tor network. See if you can learn why it works"
+" well on some nodes and not well on others. (My theory is that the fast "
+"nodes with spare capacity resist the attack better.) If that's true, then "
+"experiment with the RelayBandwidthRate and RelayBandwidthBurst options to "
+"run a relay that is used as a client while relaying the attacker's traffic: "
+"as we crank down the RelayBandwidthRate, does the attack get harder? What's "
+"the right ratio of RelayBandwidthRate to actually capacity? Or is it a ratio"
+" at all? While we're at it, does a much larger set of candidate relays "
+"increase the false positive rate or other complexity for the attack? (The "
+"Tor network is now almost two orders of magnitude larger than it was when "
+"they wrote their paper.) Be sure to read <a "
+"href=\"http://freehaven.net/anonbib/#clog-the-queue\";>Don't Clog the "
+"Queue</a> too."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1347
+msgid ""
+"The \"routing zones attack\": most of the literature thinks of the network "
+"path between Alice and her entry node (and between the exit node and Bob) as"
+" a single link on some graph. In practice, though, the path traverses many "
+"autonomous systems (ASes), and <a "
+"href=\"http://freehaven.net/anonbib/#feamster:wpes2004\";>it's not uncommon "
+"that the same AS appears on both the entry path and the exit path</a>.  "
+"Unfortunately, to accurately predict whether a given Alice, entry, exit, Bob"
+" quad will be dangerous, we need to download an entire Internet routing zone"
+" and perform expensive operations on it. Are there practical approximations,"
+" such as avoiding IP addresses in the same /8 network?"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1357
+msgid ""
+"Other research questions regarding geographic diversity consider the "
+"tradeoff between choosing an efficient circuit and choosing a random "
+"circuit. Look at Stephen Rollyson's <a "
+"href=\"http://swiki.cc.gatech.edu:8080/ugResearch/uploads/7/ImprovingTor.pdf\";>position"
+" paper</a> on how to discard particularly slow choices without hurting "
+"anonymity \"too much\". This line of reasoning needs more work and more "
+"thinking, but it looks very promising."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1364
+msgid ""
+"Tor doesn't work very well when relays have asymmetric bandwidth (e.g. cable"
+" or DSL). Because Tor has separate TCP connections between each hop, if the "
+"incoming bytes are arriving just fine and the outgoing bytes are all getting"
+" dropped on the floor, the TCP push-back mechanisms don't really transmit "
+"this information back to the incoming streams.  Perhaps Tor should detect "
+"when it's dropping a lot of outgoing packets, and rate-limit incoming "
+"streams to regulate this itself? I can imagine a build-up and drop-off "
+"scheme where we pick a conservative rate-limit, slowly increase it until we "
+"get lost packets, back off, repeat. We need somebody who's good with "
+"networks to simulate this and help design solutions; and/or we need to "
+"understand the extent of the performance degradation, and use this as "
+"motivation to reconsider UDP transport."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1376
+msgid ""
+"A related topic is congestion control. Is our current design sufficient once"
+" we have heavy use? Maybe we should experiment with variable-sized windows "
+"rather than fixed-size windows? That seemed to go well in an <a "
+"href=\"http://www.psc.edu/networking/projects/hpn-ssh/theory.php\";>ssh "
+"throughput experiment</a>. We'll need to measure and tweak, and maybe "
+"overhaul if the results are good."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1383
+msgid ""
+"Our censorship-resistance goals include preventing an attacker who's looking"
+" at Tor traffic on the wire from <a href=\"<svnprojects>design-"
+"paper/blocking.html#sec:network-fingerprint\">distinguishing it from normal "
+"SSL traffic</a>. Obviously we can't achieve perfect steganography and still "
+"remain usable, but for a first step we'd like to block any attacks that can "
+"win by observing only a few packets. One of the remaining attacks we haven't"
+" examined much is that Tor cells are 512 bytes, so the traffic on the wire "
+"may well be a multiple of 512 bytes.  How much does the batching and "
+"overhead in TLS records blur this on the wire? Do different buffer flushing "
+"strategies in Tor affect this? Could a bit of padding help a lot, or is this"
+" an attack we must accept?"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1394
+msgid ""
+"Tor circuits are built one hop at a time, so in theory we have the ability "
+"to make some streams exit from the second hop, some from the third, and so "
+"on. This seems nice because it breaks up the set of exiting streams that a "
+"given relay can see. But if we want each stream to be safe, the \"shortest\""
+" path should be at least 3 hops long by our current logic, so the rest will "
+"be even longer. We need to examine this performance / security tradeoff."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1401
+msgid ""
+"It's not that hard to DoS Tor relays or directory authorities. Are client "
+"puzzles the right answer? What other practical approaches are there? Bonus "
+"if they're backward-compatible with the current Tor protocol."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1404
+msgid ""
+"Programs like <a href=\"<page torbutton/index>\">Torbutton</a> aim to hide "
+"your browser's UserAgent string by replacing it with a uniform answer for "
+"every Tor user. That way the attacker can't splinter Tor's anonymity set by "
+"looking at that header. It tries to pick a string that is commonly used by "
+"non-Tor users too, so it doesn't stand out. Question one: how badly do we "
+"hurt ourselves by periodically updating the version of Firefox that "
+"Torbutton claims to be? If we update it too often, we splinter the anonymity"
+" sets ourselves. If we don't update it often enough, then all the Tor users "
+"stand out because they claim to be running a quite old version of Firefox. "
+"The answer here probably depends on the Firefox versions seen in the wild. "
+"Question two: periodically people ask us to cycle through N UserAgent "
+"strings rather than stick with one. Does this approach help, hurt, or not "
+"matter? Consider: cookies and recognizing Torbutton users by their rotating "
+"UserAgents; malicious websites who only attack certain browsers; and whether"
+" the answers to question one impact this answer."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1421
+msgid ""
+"How many bridge relays do you need to know to maintain reachability? We "
+"should measure the churn in our bridges. If there is lots of churn, are "
+"there ways to keep bridge users more likely to stay connected?"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1429
+msgid ""
+"<a href=\"<page about/contact>\">Let us know</a> if you've made progress on "
+"any of these!"
+msgstr ""
+
+

Modified: translation/trunk/projects/website/po/pl_PL/about/3-low.contact.po
===================================================================
--- translation/trunk/projects/website/po/pl_PL/about/3-low.contact.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/pl_PL/about/3-low.contact.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-07-08 08:44+0200\n"
-"PO-Revision-Date: 2011-07-09 12:39+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-25 09:10+0000\n"
 "Last-Translator: bogdrozd <bog.d@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -53,6 +53,15 @@
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/about/en/contact.wml:24
 msgid ""
+"<i>community-support at lists.torproject.org</i> is for volunteers helping "
+"people with questions about using or configuring Tor."
+msgstr ""
+"<i>community-support maÅpa lists.torproject.org</i> jest dla ochotnikÃw "
+"pomagajÄcym ludziom majÄcym pytania o uÅywaniu lub konfiguracji Tora."
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/contact.wml:27
+msgid ""
 "<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page "
 "getinvolved/translation>\">website translations</a> into place, and help "
 "answer questions about existing and new translations."
@@ -63,7 +72,7 @@
 "tÅumaczeniami."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:27
+#: /home/runa/tor/website/about/en/contact.wml:30
 msgid ""
 "<i>tordnsel at torproject.org</i> is the alias for the people responsible "
 "for the tordns exitlist."
@@ -72,7 +81,7 @@
 "odpowiedzialnymi za listÄ punktÃw wyjÅciowych tordns."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:29
+#: /home/runa/tor/website/about/en/contact.wml:32
 msgid ""
 "<i>donations at torproject.org</i> is for questions and comments about <a "
 "href=\"<page donate/donate>\">getting money to the developers</a>. More "
@@ -86,7 +95,7 @@
 "jakieÅ twÃrcze sposoby wniesienia swojego wkÅadu w projekt."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:34
+#: /home/runa/tor/website/about/en/contact.wml:37
 msgid ""
 "<i>execdir at torproject.org</i> is for press/media, questions and comments "
 "about Tor the non-profit corporation: trademark questions, affiliation and "
@@ -99,12 +108,12 @@
 "certyfikacja etc."
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:40
+#: /home/runa/tor/website/about/en/contact.wml:43
 msgid "Identi.ca"
 msgstr "Identi.ca"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:41
+#: /home/runa/tor/website/about/en/contact.wml:44
 msgid ""
 "<a id=\"identica\"></a> Contact us via our microblogging Identi.ca account "
 "at <a href=\"https://identi.ca/torproject\";>torproject</a>."
@@ -114,17 +123,17 @@
 "href=\"https://identi.ca/torproject\";>torproject</a>."
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:45
+#: /home/runa/tor/website/about/en/contact.wml:48
 msgid "IRC"
 msgstr "IRC"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:46
+#: /home/runa/tor/website/about/en/contact.wml:49
 msgid "<a id=\"irc\"></a>"
 msgstr "<a id=\"irc\"></a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:47
+#: /home/runa/tor/website/about/en/contact.wml:50
 msgid ""
 "Tor users and developers can also be found in the following channels on <a "
 "href=\"http://www.oftc.net/oftc/\";>OFTC</a>:"
@@ -133,7 +142,7 @@
 "na <a href=\"http://www.oftc.net/oftc/\";>oftc</a>:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:51
+#: /home/runa/tor/website/about/en/contact.wml:54
 msgid ""
 "<i>#tor</i> - User and relay operation discussions. Having trouble running "
 "Tor or a question for other Tor users? Then this is the spot for you."
@@ -143,7 +152,7 @@
 "jest miejsce dla Ciebie."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:54
+#: /home/runa/tor/website/about/en/contact.wml:57
 msgid ""
 "<i>#tor-dev</i> - Channel for people who want to do development.  "
 "Discussions about Tor-related coding, protocols, and <a href=\"<page "
@@ -154,7 +163,7 @@
 "getinvolved/volunteer>\">pomysÅy na projekty</a> sÄ mile widziane."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:57
+#: /home/runa/tor/website/about/en/contact.wml:60
 msgid ""
 "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that "
 "is not related to Tor."
@@ -163,23 +172,24 @@
 "rozmawiaÄ na tematy nie zwiÄzane z Torem."
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:61
+#: /home/runa/tor/website/about/en/contact.wml:64
 msgid "Telephone"
 msgstr "Telefon"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:62
+#: /home/runa/tor/website/about/en/contact.wml:65
 msgid "<a id=\"phone\"></a>"
 msgstr "<a id=\"phone\"></a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:63
+#: /home/runa/tor/website/about/en/contact.wml:66
 msgid ""
 "If none of the above appeal to you, calling +1-781-352-0568 will reach the "
-"Tor office.  Should there be no answer, please leave a message."
+"Tor office.  Should there be no answer, please leave a message with a way to"
+" reach you."
 msgstr ""
 "JeÅli Åaden z powyÅszych sposobÃw Ci nie odpowiada, wybranie numeru "
 "+1-781-352-0568 pozwoli na osiÄgniÄcie biura Tora. JeÅli nikt nie odbiera, "
-"prosimy zostawiÄ wiadomoÅÄ."
+"prosimy zostawiÄ wiadomoÅÄ, podajÄc sposÃb skontaktowania siÄ ze sobÄ."
 
 

Modified: translation/trunk/projects/website/po/pl_PL/about/3-low.financials.po
===================================================================
--- translation/trunk/projects/website/po/pl_PL/about/3-low.financials.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/pl_PL/about/3-low.financials.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-22 16:20+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-25 09:15+0000\n"
 "Last-Translator: bogdrozd <bog.d@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/about/en/financials.wml:9
+#: /home/runa/tor/website/about/en/financials.wml:9
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "about/overview>\">About &raquo; </a> <a href=\"<page "
@@ -30,17 +30,33 @@
 "about/financials>\">Finanse</a>"
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/transifex/website/about/en/financials.wml:14
+#: /home/runa/tor/website/about/en/financials.wml:14
 msgid "Tor: Financial Reports"
 msgstr "Tor: Raporty finansowe"
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/financials.wml:16
+#: /home/runa/tor/website/about/en/financials.wml:16
+msgid "Fiscal Year 2010"
+msgstr "Rok fiskalny 2010"
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/financials.wml:17
+msgid ""
+"<a href=\"findoc/2010-TorProject-combined-"
+"Form990_PC_Audit_Results.pdf\">2010 IRS Form 990, State of MA Form PC, and "
+"Independent Audit Results</a>"
+msgstr ""
+"<a href=\"findoc/2010-TorProject-combined-"
+"Form990_PC_Audit_Results.pdf\">Formularz IRS 990 2010,  i formularz PC Stanu"
+" MA, i Wyniki NiezaleÅnego Audytu</a>"
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/financials.wml:18
 msgid "Fiscal Year 2009"
 msgstr "Rok fiskalny 2009"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:17
+#: /home/runa/tor/website/about/en/financials.wml:19
 msgid ""
 "<a href=\"findoc/2009-TorProject-Annual-Report.pdf\">2009 Annual Report</a>"
 msgstr ""
@@ -48,7 +64,7 @@
 "2009</a>"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:18
+#: /home/runa/tor/website/about/en/financials.wml:20
 msgid ""
 "<a href=\"findoc/2009-TorProject-Form990andPC.pdf\">2009 IRS Form 990 and "
 "State of MA Form PC</a>"
@@ -57,7 +73,7 @@
 " formularz PC Stanu MA</a>"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:19
+#: /home/runa/tor/website/about/en/financials.wml:21
 msgid ""
 "<a href=\"findoc/2009-TorProject-FinancialStatements.pdf\">2009 Financial "
 "Statements and Audit results</a>"
@@ -66,7 +82,7 @@
 "finansowe za rok 2009 i wyniki audytu</a>"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:20
+#: /home/runa/tor/website/about/en/financials.wml:22
 msgid ""
 "<a href=\"findoc/2009-TorProject-DCF.pdf\">2009 Dept of Commerce Data "
 "Collection Form</a>"
@@ -75,17 +91,17 @@
 "Departamentu Handlu za rok 2009</a>"
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/financials.wml:21
+#: /home/runa/tor/website/about/en/financials.wml:23
 msgid "Fiscal Year 2008"
 msgstr "Rok fiskalny 2008"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:22
+#: /home/runa/tor/website/about/en/financials.wml:24
 msgid "<a href=\"findoc/2008-TorProject-Form990.pdf\">2008 IRS Form 990</a>"
 msgstr "<a href=\"findoc/2008-TorProject-Form990.pdf\">Formularz IRS 990 2008</a>"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:23
+#: /home/runa/tor/website/about/en/financials.wml:25
 msgid ""
 "<a href=\"findoc/2008-TorProject-FinancialStatements.pdf\">2008 Financial "
 "Statements and Audit Results</a>"
@@ -94,12 +110,12 @@
 "finansowe za rok 2009 i wyniki audytu</a>"
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/financials.wml:24
+#: /home/runa/tor/website/about/en/financials.wml:26
 msgid "Fiscal Year 2007"
 msgstr "Rok fiskalny 2007"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:25
+#: /home/runa/tor/website/about/en/financials.wml:27
 msgid "<a href=\"findoc/2007-TorProject-Form990.pdf\">2007 IRS Form 990</a>"
 msgstr "<a href=\"findoc/2007-TorProject-Form990.pdf\">Formularz IRS 990 2007</a>"
 

Modified: translation/trunk/projects/website/po/pl_PL/docs/2-medium.faq.po
===================================================================
--- translation/trunk/projects/website/po/pl_PL/docs/2-medium.faq.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/pl_PL/docs/2-medium.faq.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-08-30 08:50+0200\n"
-"PO-Revision-Date: 2011-09-03 11:41+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-25 09:02+0000\n"
 "Last-Translator: bogdrozd <bog.d@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@
 msgstr "FAQ Tora"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/NhlG8k8BI3.xml:1669
+#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/mo95NMnX36.xml:1670
 msgid "<hr>"
 msgstr "<hr>"
 
@@ -1451,28 +1451,31 @@
 "Some government or corporate firewalls censor connections to Tor's website. "
 "In those cases, you have three options. First, get it from a friend &mdash; "
 "the <a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a> fits "
-"nicely on a USB key. Second, find the google cache for the <a href=\"<page "
-"getinvolved/mirrors>\">Tor mirrors</a> page and see if any of those copies "
-"of our website work for you. Third, you can download Tor via email: log in "
-"to your Gmail account and mail '<tt>gettor AT torproject.org</tt>'. If you "
-"include the word 'help' in the body of the email, it will reply with "
-"instructions. Note that only a few webmail providers are supported, since "
-"they need to be able to receive very large attachments."
+"nicely on a USB key. Second, find the <a "
+"href=\"https://encrypted.google.com/search?q=tor+mirrors\";>google cache</a> "
+"for the <a href=\"<page getinvolved/mirrors>\">Tor mirrors</a> page and see "
+"if any of those copies of our website work for you. Third, you can download "
+"Tor via email: log in to your Gmail account and mail '<tt>gettor AT "
+"torproject.org</tt>'. If you include the word 'help' in the body of the "
+"email, it will reply with instructions. Note that only a few webmail "
+"providers are supported, since they need to be able to receive very large "
+"attachments."
 msgstr ""
 "NiektÃre rzÄdowe lub korporacyjne firewalle cenzurujÄ poÅÄczenia do strony "
 "Tora. W tych przypadkach masz trzy mozliwoÅci. Po pierwsze, weÅ od "
 "przyjaciela &mdash; <a href=\"<page projects/torbrowser>\">Paczka Tora z "
 "PrzeglÄdarkÄ</a> mieÅci siÄ dobrze na kluczu USB. Po drugie, znajdÅ stronÄ z"
-" <a href=\"<page getinvolved/mirrors>\">mirrorami Tora</a> w pamiÄci "
-"podrÄcznej google i sprawdÅ, czy ktÃraÅ z tych kopii naszej strony dziaÅa u "
-"Ciebie. Po trzecie, moÅesz pobraÄ Tora przez email: zaloguj siÄ na swoje "
-"konto Gmail i wyÅlij wiadomoÅÄ do '<tt>gettor AT torproject.org</tt>'. JeÅli"
-" wpiszesz sÅowo 'help' do treÅci listu, otrzymasz odpowiedÅ z instrukcjami. "
-"Tylko kilku dostawcÃw email jest obsÅugiwanych, gdyÅ muszÄ zezwalaÄ na "
-"odbieranie bardzo duÅych zaÅÄcznikÃw."
+" <a href=\"<page getinvolved/mirrors>\">mirrorami Tora</a> w <a "
+"href=\"https://encrypted.google.com/search?q=tor+mirrors\";>pamiÄci "
+"podrÄcznej google</a> i sprawdÅ, czy ktÃraÅ z tych kopii naszej strony "
+"dziaÅa u Ciebie. Po trzecie, moÅesz pobraÄ Tora przez email: zaloguj siÄ na "
+"swoje konto Gmail i wyÅlij wiadomoÅÄ do '<tt>gettor AT torproject.org</tt>'."
+" JeÅli wpiszesz sÅowo 'help' do treÅci listu, otrzymasz odpowiedÅ z "
+"instrukcjami. Tylko kilku dostawcÃw email jest obsÅugiwanych, gdyÅ muszÄ "
+"zezwalaÄ na odbieranie bardzo duÅych zaÅÄcznikÃw."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:669
+#: /home/runa/tor/website/docs/en/faq.wml:670
 msgid ""
 "Be sure to <a href=\"<page docs/verifying-signatures>\">verify the "
 "signature</a> of any package you download, especially when you get it from "
@@ -1483,12 +1486,12 @@
 "strony niÅ nasza oficjalna strona HTTPS."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:674
+#: /home/runa/tor/website/docs/en/faq.wml:675
 msgid "<hr> <a id=\"CompileTorWindows\"></a>"
 msgstr "<hr> <a id=\"CompileTorWindows\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:677
+#: /home/runa/tor/website/docs/en/faq.wml:678
 msgid ""
 "<a class=\"anchor\" href=\"#CompileTorWindows\">How do I compile Tor under "
 "Windows?</a>"
@@ -1497,7 +1500,7 @@
 "Windows?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:680
+#: /home/runa/tor/website/docs/en/faq.wml:681
 msgid ""
 "Try following the steps at <a href=\"<gitblob>doc/tor-win32-mingw-"
 "creation.txt\"> tor-win32-mingw-creation.txt</a>."
@@ -1506,7 +1509,7 @@
 "creation.txt\"> tor-win32-mingw-creation.txt</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:685
+#: /home/runa/tor/website/docs/en/faq.wml:686
 msgid ""
 "(Note that you don't need to compile Tor yourself in order to use it. Most "
 "people just use the packages available on the <a href=\"<page "
@@ -1517,12 +1520,12 @@
 "download/download>\">stronie pobierania</a>.)"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:690
+#: /home/runa/tor/website/docs/en/faq.wml:691
 msgid "<hr> <a id=\"VirusFalsePositives\"></a>"
 msgstr "<hr> <a id=\"VirusFalsePositives\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:693
+#: /home/runa/tor/website/docs/en/faq.wml:694
 msgid ""
 "<a class=\"anchor\" href=\"#VirusFalsePositives\">Why does my Tor executable"
 " appear to have a virus or spyware?</a>"
@@ -1531,7 +1534,7 @@
 "zdaje siÄ mieÄ wirusa lub oprogramowanie szpiegujÄce?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:696
+#: /home/runa/tor/website/docs/en/faq.wml:697
 msgid ""
 "Sometimes, overzealous Windows virus and spyware detectors trigger on some "
 "parts of the Tor Windows binary. Our best guess is that these are false "
@@ -1548,7 +1551,7 @@
 " daje faÅszywe pozytywne wyniki. Albo wybierz lepszego producenta."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:704
+#: /home/runa/tor/website/docs/en/faq.wml:705
 msgid ""
 "In the meantime, we encourage you to not just take our word for it. Our job "
 "is to provide the source; if you're concerned, please do <a "
@@ -1559,12 +1562,12 @@
 "<a href=\"#CompileTorWindows\">skompiluj program wÅasnorÄcznie</a>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:709
+#: /home/runa/tor/website/docs/en/faq.wml:710
 msgid "<hr> <a id=\"LiveCD\"></a>"
 msgstr "<hr> <a id=\"LiveCD\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:712
+#: /home/runa/tor/website/docs/en/faq.wml:713
 msgid ""
 "<a class=\"anchor\" href=\"#LiveCD\">Is there a LiveCD or other bundle that "
 "includes Tor?</a>"
@@ -1573,7 +1576,7 @@
 "dystrybucja/paczka zawierajÄca Tora?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:715
+#: /home/runa/tor/website/docs/en/faq.wml:716
 msgid ""
 "Yes.  Use <a href=\"https://tails.boum.org/\";>The Amnesic Incognito Live "
 "System</a> or <a href=\"<page projects/torbrowser>\">the Tor Browser "
@@ -1584,12 +1587,12 @@
 "PrzeglÄdarkÄ</a>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:720
+#: /home/runa/tor/website/docs/en/faq.wml:721
 msgid "<hr> <a id=\"torrc\"></a>"
 msgstr "<hr> <a id=\"torrc\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:723
+#: /home/runa/tor/website/docs/en/faq.wml:724
 msgid ""
 "<a class=\"anchor\" href=\"#torrc\">I'm supposed to \"edit my torrc\". What "
 "does that mean?</a>"
@@ -1598,7 +1601,7 @@
 "to znaczy?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:726
+#: /home/runa/tor/website/docs/en/faq.wml:727
 msgid ""
 "Tor installs a text file called torrc that contains configuration "
 "instructions for how your Tor program should behave. The default "
@@ -1614,12 +1617,12 @@
 "modyfikowaÄ swÃj plik torrc."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:734
+#: /home/runa/tor/website/docs/en/faq.wml:735
 msgid "The location of your torrc file depends on the way you installed Tor:"
 msgstr "Lokalizacja Twojego pliku torrc zaleÅy od posobu instalacji Tora:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:738
+#: /home/runa/tor/website/docs/en/faq.wml:739
 msgid ""
 "On Windows, if you installed a Tor bundle with Vidalia, you can find your "
 "torrc file in the Start menu under Programs -&gt; Vidalia Bundle -&gt; Tor, "
@@ -1640,7 +1643,7 @@
 "Settings\\<i>nazwa uÅytkownika</i>\\Application Data\\tor\\torrc</code>."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:747
+#: /home/runa/tor/website/docs/en/faq.wml:748
 msgid ""
 "On OS X, if you use Vidalia, edit <code>~/.vidalia/torrc</code>. Otherwise, "
 "open your favorite text editor and load <code>/Library/Tor/torrc</code>."
@@ -1650,7 +1653,7 @@
 "<code>/Library/Tor/torrc</code>."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:751
+#: /home/runa/tor/website/docs/en/faq.wml:752
 msgid ""
 "On Unix, if you installed a pre-built package, look for "
 "<code>/etc/tor/torrc</code> or <code>/etc/torrc</code> or consult your "
@@ -1661,7 +1664,7 @@
 "dokumentacjÄ swojej paczki."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:755
+#: /home/runa/tor/website/docs/en/faq.wml:756
 msgid ""
 "Finally, if you installed from source, you may not have a torrc installed "
 "yet: look in <code>/usr/local/etc/</code> and note that you may need to "
@@ -1672,7 +1675,7 @@
 "rÄcznie skopiowaÄ <code>torrc.sample</code> do <code>torrc</code>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:762
+#: /home/runa/tor/website/docs/en/faq.wml:763
 msgid ""
 "If you use Vidalia, be sure to exit both Tor and Vidalia before you edit "
 "your torrc file. Otherwise Vidalia might overwrite your changes."
@@ -1681,7 +1684,7 @@
 "swÃj plik torrc. W innym przypadku Vidalia moÅe nadpisaÄ Twoje zmiany."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:767
+#: /home/runa/tor/website/docs/en/faq.wml:768
 msgid ""
 "Once you've changed your torrc, you will need to restart Tor for the changes"
 " to take effect. (For advanced users on OS X and Unix, note that you "
@@ -1692,7 +1695,7 @@
 " wysÅaÄ Torowi sygnaÅ HUP, nie musisz go restartowaÄ.)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:773
+#: /home/runa/tor/website/docs/en/faq.wml:774
 msgid ""
 "For other configuration options you can use, look at the <a href=\"<page "
 "docs/tor-manual>\">Tor manual page</a>. Remember, all lines beginning with #"
@@ -1704,12 +1707,12 @@
 "nie majÄ wpÅywu na konfiguracjÄ Tora."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:779
+#: /home/runa/tor/website/docs/en/faq.wml:780
 msgid "<hr> <a id=\"Logs\"></a>"
 msgstr "<hr> <a id=\"Logs\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:782
+#: /home/runa/tor/website/docs/en/faq.wml:783
 msgid ""
 "<a class=\"anchor\" href=\"#Logs\">How do I set up logging, or see Tor's "
 "logs?</a>"
@@ -1718,7 +1721,7 @@
 " Tora?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:785
+#: /home/runa/tor/website/docs/en/faq.wml:786
 msgid ""
 "If you installed a Tor bundle that includes Vidalia, then Vidalia has a "
 "window called \"Message Log\" that will show you Tor's log messages. You can"
@@ -1731,7 +1734,7 @@
 "wiadomoÅci do pliku. Wszystko gotowe."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:792
+#: /home/runa/tor/website/docs/en/faq.wml:793
 msgid ""
 "If you're not using Vidalia, you'll have to go find the log files by hand. "
 "Here are some likely places for your logs to be:"
@@ -1740,12 +1743,12 @@
 "prawdopodobnych miejsc, w ktÃrych mogÄ byÄ Twoje logi:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:797
+#: /home/runa/tor/website/docs/en/faq.wml:798
 msgid "On OS X, Debian, Red Hat, etc, the logs are in /var/log/tor/"
 msgstr "Pod OS X, Debianem, Red Hatem, etc, logi sÄ w /var/log/tor/"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:799
+#: /home/runa/tor/website/docs/en/faq.wml:800
 msgid ""
 "On Windows, there are no default log files currently. If you enable logs in "
 "your torrc file, they default to <code>\\username\\Application "
@@ -1757,7 +1760,7 @@
 "<code>\\Application Data\\tor\\log\\</code>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:803
+#: /home/runa/tor/website/docs/en/faq.wml:804
 msgid ""
 "If you compiled Tor from source, by default your Tor logs to <a "
 "href=\"http://en.wikipedia.org/wiki/Standard_streams\";>\"stdout\"</a> at "
@@ -1770,7 +1773,7 @@
 "one kierowane do <code>/usr/local/var/log/tor/</code>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:811
+#: /home/runa/tor/website/docs/en/faq.wml:812
 msgid ""
 "To change your logging setup by hand, <a href=\"#torrc\">edit your torrc</a>"
 " and find the section (near the top of the file) which contains the "
@@ -1781,7 +1784,7 @@
 "liniÄ:"
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:817
+#: /home/runa/tor/website/docs/en/faq.wml:818
 #, no-wrap
 msgid ""
 "\\## Logs go to stdout at level \"notice\" unless redirected by something\n"
@@ -1791,7 +1794,7 @@
 "\\## else, like one of the below lines.\n"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:822
+#: /home/runa/tor/website/docs/en/faq.wml:823
 msgid ""
 "For example, if you want Tor to send complete debug, info, notice, warn, and"
 " err level messages to a file, append the following line to the end of the "
@@ -1802,13 +1805,13 @@
 "sekcji:"
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:828
+#: /home/runa/tor/website/docs/en/faq.wml:829
 #, no-wrap
 msgid "Log debug file c:/program files/tor/debug.log\n"
 msgstr "Log debug file c:/program files/tor/debug.log\n"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:832
+#: /home/runa/tor/website/docs/en/faq.wml:833
 msgid ""
 "Replace <code>c:/program files/tor/debug.log</code> with a directory and "
 "filename for your Tor log."
@@ -1817,12 +1820,12 @@
 "Twojego pliku logowania Tora."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:836
+#: /home/runa/tor/website/docs/en/faq.wml:837
 msgid "<hr> <a id=\"DoesntWork\"></a>"
 msgstr "<hr> <a id=\"DoesntWork\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:839
+#: /home/runa/tor/website/docs/en/faq.wml:840
 msgid ""
 "<a class=\"anchor\" href=\"#DoesntWork\">I installed Tor and Polipo but it's"
 " not working.</a>"
@@ -1831,7 +1834,7 @@
 "ale nie dziaÅajÄ.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:842
+#: /home/runa/tor/website/docs/en/faq.wml:843
 msgid ""
 "Once you've installed the Tor bundle, there are two questions to ask: first,"
 " is your Tor able to establish a circuit? Second, is your Firefox correctly "
@@ -1842,7 +1845,7 @@
 "skonfigurowany tak, by wysyÅaÅ swÃj ruch przez Tora?"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:847
+#: /home/runa/tor/website/docs/en/faq.wml:848
 msgid ""
 "If Tor can establish a circuit, the onion icon in Vidalia will turn green. "
 "You can also check in the Vidalia Control Panel to make sure it says "
@@ -1859,12 +1862,12 @@
 " obwÃd. WyglÄda na to, Åe funkcjonalnoÅÄ klienta dziaÅa.\")"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:857
+#: /home/runa/tor/website/docs/en/faq.wml:858
 msgid "If Tor can't establish a circuit, here are some hints:"
 msgstr "JeÅli Tor nie moÅe nawiÄzaÄ obwodu, oto kilka wskazÃwek:"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:861
+#: /home/runa/tor/website/docs/en/faq.wml:862
 msgid ""
 "Are you sure Tor is running? If you're using Vidalia, you may have to click "
 "on the onion and select \"Start\" to launch Tor."
@@ -1873,7 +1876,7 @@
 "cebulÄ i wybraÄ \"Start\", by uruchomiÄ Tora."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:863
+#: /home/runa/tor/website/docs/en/faq.wml:864
 msgid ""
 "Check your system clock. If it's more than a few hours off, Tor will refuse "
 "to build circuits. For XP users, synchronize your clock under the clock "
@@ -1886,7 +1889,7 @@
 "karcie 'Data i czas'."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:867
+#: /home/runa/tor/website/docs/en/faq.wml:868
 msgid ""
 "Is your Internet connection <a href=\"#FirewallPorts\">firewalled by "
 "port</a>, or do you normally need to use a <a "
@@ -1897,7 +1900,7 @@
 "href=\"<wikifaq>#MyInternetconnectionrequiresanHTTPorSOCKSproxy.\">proxy</a>?"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:872
+#: /home/runa/tor/website/docs/en/faq.wml:873
 msgid ""
 "Are you running programs like Norton Internet Security or SELinux that block"
 " certain connections, even though you don't realize they do? They could be "
@@ -1908,7 +1911,7 @@
 "tego sprawy? MogÄ przeszkadzaÄ Torowi w nawiÄzywaniu poÅÄczeÅ sieciowych."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:875
+#: /home/runa/tor/website/docs/en/faq.wml:876
 msgid ""
 "Are you in China, or behind a restrictive corporate network firewall that "
 "blocks the public Tor relays? If so, you should learn about <a href=\"<page "
@@ -1919,7 +1922,7 @@
 "href=\"<page docs/bridges>\">mostkach Tora</a>."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:878
+#: /home/runa/tor/website/docs/en/faq.wml:879
 msgid ""
 "Check your <a href=\"#Logs\">Tor logs</a>. Do they give you any hints about "
 "what's going wrong?"
@@ -1928,7 +1931,7 @@
 "wskazÃwki a tym, co jest nie tak?"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:883
+#: /home/runa/tor/website/docs/en/faq.wml:884
 msgid ""
 "Step two is to confirm that Firefox is correctly configured to send its "
 "traffic through Tor. Try the <a href=\"https://check.torproject.org/\";>Tor "
@@ -1944,12 +1947,12 @@
 " do FAQ o Tor Check</a>, by dowiedzieÄ siÄ wiÄcej."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:891
+#: /home/runa/tor/website/docs/en/faq.wml:892
 msgid "If it thinks you're not using Tor, here are some hints:"
 msgstr "JeÅli wedÅug tej strony nie uÅywas Tora, oto kilka wskazÃwek:"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:895
+#: /home/runa/tor/website/docs/en/faq.wml:896
 msgid ""
 "Did you install the Torbutton extension for Firefox? The installation "
 "bundles include it, but sometimes people forget to install it. Make sure it "
@@ -1963,7 +1966,7 @@
 "8118.)"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:900
+#: /home/runa/tor/website/docs/en/faq.wml:901
 msgid ""
 "Do you have incompatible Firefox extensions like FoxyProxy installed? If so,"
 " uninstall them. (Note that using FoxyProxy is NOT a sufficient substitute "
@@ -1982,7 +1985,7 @@
 "Torbuttona</a>.)"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:907
+#: /home/runa/tor/website/docs/en/faq.wml:908
 msgid ""
 "If your browser says \"The proxy server is refusing connections.\", check "
 "that Polipo (the http proxy that passes traffic between Firefox and Tor) is "
@@ -1997,7 +2000,7 @@
 "i otwÃrz Terminal.app. Potem uruchom \"ps aux|grep polipo\"."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:912
+#: /home/runa/tor/website/docs/en/faq.wml:913
 msgid ""
 "If you're upgrading from OS X, some of the earlier OS X installers were "
 "broken in really unfortunate ways. You may find that <a href=\"<page docs"
@@ -2012,7 +2015,7 @@
 " juÅ nie zgadzaÄ siÄ z TwojÄ paczkÄ. Przepraszamy."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:917
+#: /home/runa/tor/website/docs/en/faq.wml:918
 msgid ""
 "If you're on Linux, make sure Privoxy isn't running, since it will conflict "
 "with the port that our Polipo configuration file picks."
@@ -2021,7 +2024,7 @@
 "konflikt z portem, ktÃry jest wybrany w naszej konfiguracji Polipo."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:919
+#: /home/runa/tor/website/docs/en/faq.wml:920
 msgid ""
 "If you installed Polipo yourself (not from a bundle), did you edit the "
 "config file as described? Did you restart Polipo after this change? Are you "
@@ -2032,7 +2035,7 @@
 "zmianie? Na pewno?"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:922
+#: /home/runa/tor/website/docs/en/faq.wml:923
 msgid ""
 "For Red Hat Linux and related systems, do you have SELinux enabled? If so, "
 "it might be preventing Polipo from talking to Tor. We also run across BSD "
@@ -2045,12 +2048,12 @@
 "niektÃrym poÅaczeniom do localhosta."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:928
+#: /home/runa/tor/website/docs/en/faq.wml:929
 msgid "<hr /> <a id=\"VidaliaPassword\"></a>"
 msgstr "<hr /> <a id=\"VidaliaPassword\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:931
+#: /home/runa/tor/website/docs/en/faq.wml:932
 msgid ""
 "<a class=\"anchor\" href=\"#VidaliaPassword\">Tor/Vidalia prompts for a "
 "password at start.</a>"
@@ -2059,7 +2062,7 @@
 "podczas uruchamiania</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:934
+#: /home/runa/tor/website/docs/en/faq.wml:935
 msgid ""
 "Vidalia interacts with the Tor software via Tor's \"control port\". The "
 "control port lets Vidalia receive status updates from Tor, request a new "
@@ -2076,7 +2079,7 @@
 "potencjalnie zepsucie Twojej anonimowoÅci."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:943
+#: /home/runa/tor/website/docs/en/faq.wml:944
 msgid ""
 "Usually this process of generating and setting a random control password "
 "happens in the background. There are three common situations, though, where "
@@ -2086,7 +2089,7 @@
 " tle. SÄ jedna trzy sytuacje, w ktÃrych Vidalia moÅe poprosiÄ CiÄ o hasÅo:"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:949
+#: /home/runa/tor/website/docs/en/faq.wml:950
 msgid ""
 "You're already running Vidalia and Tor. For example, this situation can "
 "happen if you installed the Vidalia bundle and now you're trying to run the "
@@ -2099,7 +2102,7 @@
 "uruchomisz nowÄ."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:954
+#: /home/runa/tor/website/docs/en/faq.wml:955
 msgid ""
 "Vidalia crashed, but left Tor running with the last known random password. "
 "After you restart Vidalia, it generates a new random password, but Vidalia "
@@ -2122,7 +2125,7 @@
 "uruchomienia Tora i wszystko znÃw bÄdzie dziaÅaÄ."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:967
+#: /home/runa/tor/website/docs/en/faq.wml:968
 msgid ""
 "You had previously set Tor to run as a Windows NT service. When Tor is set "
 "to run as a service, it starts up when the system boots. If you configured "
@@ -2147,12 +2150,12 @@
 "usÅugi Windows NT</a> po wiÄcej informacji o tym, jak usunÄÄ usÅugÄ Tora."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:982
+#: /home/runa/tor/website/docs/en/faq.wml:983
 msgid "<hr> <a id=\"ChooseEntryExit\"></a>"
 msgstr "<hr> <a id=\"ChooseEntryExit\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:985
+#: /home/runa/tor/website/docs/en/faq.wml:986
 msgid ""
 "<a class=\"anchor\" href=\"#ChooseEntryExit\">Can I control which nodes (or "
 "country) are used for entry/exit?</a>"
@@ -2161,7 +2164,7 @@
 "wÄzÅy (lub kraje) sÄ uÅywane do wchodzenia/wychodzenia?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:988
+#: /home/runa/tor/website/docs/en/faq.wml:989
 msgid ""
 "Yes. You can set preferred entry and exit nodes as well as inform Tor which "
 "nodes you do not want to use.  The following options can be added to your "
@@ -2174,12 +2177,12 @@
 "href=\"#torrc\">\"torrc\"</a> lub podane na linii poleceÅ:"
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:994
+#: /home/runa/tor/website/docs/en/faq.wml:995
 msgid "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>"
 msgstr "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:995
+#: /home/runa/tor/website/docs/en/faq.wml:996
 msgid ""
 "A list of preferred nodes to use for the first hop in the circuit, if "
 "possible."
@@ -2188,12 +2191,12 @@
 "jeÅli moÅliwe."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:997
+#: /home/runa/tor/website/docs/en/faq.wml:998
 msgid "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:998
+#: /home/runa/tor/website/docs/en/faq.wml:999
 msgid ""
 "A list of preferred nodes to use for the last hop in the circuit, if "
 "possible."
@@ -2202,22 +2205,22 @@
 " moÅliwe."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:1000
+#: /home/runa/tor/website/docs/en/faq.wml:1001
 msgid "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>"
 msgstr "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:1001
+#: /home/runa/tor/website/docs/en/faq.wml:1002
 msgid "A list of nodes to never use when building a circuit."
 msgstr "Lista wÄzÅÃw, ktÃrych nigdy nie uÅywaÄ do budowania obwodu."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:1003
+#: /home/runa/tor/website/docs/en/faq.wml:1004
 msgid "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:1004
+#: /home/runa/tor/website/docs/en/faq.wml:1005
 msgid ""
 "A list of nodes to never use when picking an exit.  Nodes listed in "
 "<tt>ExcludeNodes</tt> are automatically in this list."
@@ -2226,7 +2229,7 @@
 "<tt>ExcludeNodes</tt> sÄ automatycznie na tej liÅcie."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1009
+#: /home/runa/tor/website/docs/en/faq.wml:1010
 msgid ""
 "<em>We recommend you do not use these</em> &mdash; they are intended for "
 "testing and may disappear in future versions.  You get the best security "
@@ -2241,7 +2244,7 @@
 "nie rozumiemy."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1016
+#: /home/runa/tor/website/docs/en/faq.wml:1017
 msgid ""
 "The <tt>EntryNodes</tt> and <tt>ExitNodes</tt> config options are treated as"
 " a request, meaning if the nodes are down or seem slow, Tor will still avoid"
@@ -2261,7 +2264,7 @@
 "Tora</a>, by znaleÅÄ wÄzÅy, ktÃre moÅna wybraÄ."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1026
+#: /home/runa/tor/website/docs/en/faq.wml:1027
 msgid ""
 "Instead of <tt>$fingerprint</tt> you can also specify a 2 letter ISO3166 "
 "country code in curly braces (for example {de}), or an ip address pattern "
@@ -2274,7 +2277,7 @@
 "miÄdzy przecinkami a elementami list."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1032
+#: /home/runa/tor/website/docs/en/faq.wml:1033
 msgid ""
 "If you want to access a service directly through Tor's SOCKS interface (eg. "
 "using ssh via connect.c), another option is to set up an internal mapping in"
@@ -2287,12 +2290,12 @@
 "<tt>MapAddress</tt>. Przeczytaj stronÄ podrÄcznika, by poznaÄ szczegÃÅy."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1038
+#: /home/runa/tor/website/docs/en/faq.wml:1039
 msgid "<hr> <a id=\"GoogleCaptcha\"></a>"
 msgstr "<hr> <a id=\"GoogleCaptcha\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1041
+#: /home/runa/tor/website/docs/en/faq.wml:1042
 msgid ""
 "<a class=\"anchor\" href=\"#GoogleCaptcha\">Google makes me solve a Captcha "
 "or tells me I have spyware installed.</a>"
@@ -2301,7 +2304,7 @@
 " Captcha lub mÃwi, Åe mam zainstalwoane oprogramowanie szpiegujÄce.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1044
+#: /home/runa/tor/website/docs/en/faq.wml:1045
 msgid ""
 "This is a known and intermittent problem; it does not mean that Google "
 "considers Tor to be spyware."
@@ -2310,7 +2313,7 @@
 "Google Tor to oprogramowanie szpiegujÄce."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1049
+#: /home/runa/tor/website/docs/en/faq.wml:1050
 msgid ""
 "When you use Tor, you are sending queries through exit relays that are also "
 "shared by thousands of other users. Tor users typically see this message "
@@ -2327,7 +2330,7 @@
 "strony i zwalnia ruch z tego adresu IP na krÃtki czas."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1057
+#: /home/runa/tor/website/docs/en/faq.wml:1058
 msgid ""
 "An alternate explanation is that Google tries to detect certain kinds of "
 "spyware or viruses that send distinctive queries to Google Search. It notes "
@@ -2343,7 +2346,7 @@
 "zaraÅenie."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1066
+#: /home/runa/tor/website/docs/en/faq.wml:1067
 msgid ""
 "To our knowledge, Google is not doing anything intentionally specifically to"
 " deter or block Tor use. The error message about an infected machine should "
@@ -2354,7 +2357,7 @@
 "powinna zniknÄÄ po krÃtkim czasie."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1072
+#: /home/runa/tor/website/docs/en/faq.wml:1073
 msgid ""
 "Torbutton 1.2.5 (released in mid 2010) detects Google captchas and can "
 "automatically redirect you to a more Tor-friendly search engine such as "
@@ -2365,12 +2368,12 @@
 "Torowi, jak Ixquick czy Bing."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1077
+#: /home/runa/tor/website/docs/en/faq.wml:1078
 msgid "<hr /> <a id=\"GmailWarning\"></a>"
 msgstr "<hr /> <a id=\"GmailWarning\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1080
+#: /home/runa/tor/website/docs/en/faq.wml:1081
 msgid ""
 "<a class=\"anchor\" href=\"#GmailWarning\">Gmail warns me that my account "
 "may have been compromised.</a>"
@@ -2379,7 +2382,7 @@
 "konto ktoÅ mÃgÅ siÄ wÅamaÄ.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1083
+#: /home/runa/tor/website/docs/en/faq.wml:1084
 msgid ""
 "Sometimes, after you've used Gmail over Tor, Google presents a pop-up "
 "notification that your account may have been compromised.  The notification "
@@ -2391,7 +2394,7 @@
 "miejsc na caÅym Åwiecie, z ktÃrych ostatnio korzystano z Twojego konta."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1090
+#: /home/runa/tor/website/docs/en/faq.wml:1091
 msgid ""
 "In general this is a false alarm: Google saw a bunch of logins from "
 "different places, as a result of running the service via Tor, and decided it"
@@ -2403,7 +2406,7 @@
 "bÄdzie potwierdziÄ, Åe konta uÅywa prawowity wÅaÅciciel."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1097
+#: /home/runa/tor/website/docs/en/faq.wml:1098
 msgid ""
 "Even though this may be a biproduct of using the service via tor, that "
 "doesn't mean you can entirely ignore the warning. It is <i>probably</i> a "
@@ -2416,7 +2419,7 @@
 " ktoÅ kiedyÅ ukradÅ Twoje ciasteczko Google."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1104
+#: /home/runa/tor/website/docs/en/faq.wml:1105
 msgid ""
 "Cookie hijacking is possible by either physical access to your computer or "
 "by watching your network traffic.  In theory only physical access should "
@@ -2433,7 +2436,7 @@
 "hijacking\">znacznie bardziej skomplikowane</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1113
+#: /home/runa/tor/website/docs/en/faq.wml:1114
 msgid ""
 "And if somebody <i>did</i> steal your google cookie, they might end up "
 "logging in from unusual places (though of course they also might not). So "
@@ -2452,12 +2455,12 @@
 " logowaÅeÅ/aÅ."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1122
+#: /home/runa/tor/website/docs/en/faq.wml:1123
 msgid "<hr> <a id=\"FirewallPorts\"></a>"
 msgstr "<hr> <a id=\"FirewallPorts\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1125
+#: /home/runa/tor/website/docs/en/faq.wml:1126
 msgid ""
 "<a class=\"anchor\" href=\"#FirewallPorts\">My firewall only allows a few "
 "outgoing ports.</a>"
@@ -2466,7 +2469,7 @@
 "tylko na kilka portÃw wychodzÄcych.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1128
+#: /home/runa/tor/website/docs/en/faq.wml:1129
 msgid ""
 "If your firewall works by blocking ports, then you can tell Tor to only use "
 "the ports that your firewall permits by adding \"FascistFirewall 1\" to your"
@@ -2482,7 +2485,7 @@
 "porty\") w oknie UstawieÅ Sieciowych (Network Settings) programu Vidalia."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1136
+#: /home/runa/tor/website/docs/en/faq.wml:1137
 msgid ""
 "By default, when you set this Tor assumes that your firewall allows only "
 "port 80 and port 443 (HTTP and HTTPS respectively). You can select a "
@@ -2493,7 +2496,7 @@
 "portÃw z opcjÄ FirewallPorts pliku torrc."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1142
+#: /home/runa/tor/website/docs/en/faq.wml:1143
 msgid ""
 "If you want to be more fine-grained with your controls, you can also use the"
 " ReachableAddresses config options, e.g.:"
@@ -2502,7 +2505,7 @@
 "konfiguracyjnych ReachableAddresses, np."
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1147
+#: /home/runa/tor/website/docs/en/faq.wml:1148
 #, no-wrap
 msgid ""
 "  ReachableDirAddresses *:80\n"
@@ -2512,12 +2515,12 @@
 "  ReachableORAddresses *:443\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1151
+#: /home/runa/tor/website/docs/en/faq.wml:1152
 msgid "<hr> <a id=\"RelayFlexible\"></a>"
 msgstr "<hr> <a id=\"RelayFlexible\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1154
+#: /home/runa/tor/website/docs/en/faq.wml:1155
 msgid ""
 "<a class=\"anchor\" href=\"#RelayFlexible\">How stable does my relay need to"
 " be?</a>"
@@ -2526,14 +2529,14 @@
 "przekaÅnik?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1157
+#: /home/runa/tor/website/docs/en/faq.wml:1158
 msgid "We aim to make setting up a Tor relay easy and convenient:"
 msgstr ""
 "Naszym celem jest uczynienie uruchomienia przekaÅnika Tora czynnoÅciÄ ÅatwÄ "
 "i wygodnÄ:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1161
+#: /home/runa/tor/website/docs/en/faq.wml:1162
 msgid ""
 "Tor has built-in support for <a "
 "href=\"<wikifaq>#WhatbandwidthshapingoptionsareavailabletoTorrelays\"> rate "
@@ -2550,7 +2553,7 @@
 " hibernacji</a>."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1169
+#: /home/runa/tor/website/docs/en/faq.wml:1170
 msgid ""
 "Each Tor relay has an <a href=\"#ExitPolicies\">exit policy</a> that "
 "specifies what sort of outbound connections are allowed or refused from that"
@@ -2564,7 +2567,7 @@
 "na poÅÄczenia tylko do innych przekaÅnikÃw Tora."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1174
+#: /home/runa/tor/website/docs/en/faq.wml:1175
 msgid ""
 "It's fine if the relay goes offline sometimes. The directories notice this "
 "quickly and stop advertising the relay. Just try to make sure it's not too "
@@ -2576,7 +2579,7 @@
 "korzystajÄce z przekaÅnika w chwili jego rozÅÄczenia."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1179
+#: /home/runa/tor/website/docs/en/faq.wml:1180
 msgid ""
 "We can handle relays with dynamic IPs just fine &mdash; simply leave the "
 "Address config option blank, and Tor will try to guess."
@@ -2586,7 +2589,7 @@
 "zgadnÄÄ."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1182
+#: /home/runa/tor/website/docs/en/faq.wml:1183
 msgid ""
 "If your relay is behind a NAT and it doesn't know its public IP (e.g. it has"
 " an IP of 192.168.x.y), you'll need to set up port forwarding. Forwarding "
@@ -2601,7 +2604,7 @@
 "przykÅadÃw, jak to wykonaÄ."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1188
+#: /home/runa/tor/website/docs/en/faq.wml:1189
 msgid ""
 "Your relay will passively estimate and advertise its recent bandwidth "
 "capacity, so high-bandwidth relays will attract more users than low-"
@@ -2613,12 +2616,12 @@
 "przydatne."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1194
+#: /home/runa/tor/website/docs/en/faq.wml:1195
 msgid "<hr> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>"
 msgstr "<hr> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1198
+#: /home/runa/tor/website/docs/en/faq.wml:1199
 msgid ""
 "<a class=\"anchor\" href=\"#ExitPolicies\">I'd run a relay, but I don't want"
 " to deal with abuse issues.</a>"
@@ -2627,12 +2630,12 @@
 "przekaÅnik, ale nie chcÄ mieÄ do czynienia z przypadkami naduÅyÄ.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1201
+#: /home/runa/tor/website/docs/en/faq.wml:1202
 msgid "Great. That's exactly why we implemented exit policies."
 msgstr "Wspaniale. To wÅaÅnie po to zaimplementowaliÅmy polityki wyjÅcia."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1205
+#: /home/runa/tor/website/docs/en/faq.wml:1206
 msgid ""
 "Each Tor relay has an exit policy that specifies what sort of outbound "
 "connections are allowed or refused from that relay. The exit policies are "
@@ -2660,7 +2663,7 @@
 "naraÅeniem</a> Mike'a Perry'ego."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1219
+#: /home/runa/tor/website/docs/en/faq.wml:1220
 msgid ""
 "The default exit policy allows access to many popular services (e.g. web "
 "browsing), but <a "
@@ -2689,7 +2692,7 @@
 "usÅug."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1233
+#: /home/runa/tor/website/docs/en/faq.wml:1234
 msgid ""
 "If you do allow any exit connections, make sure name resolution works (that "
 "is, your computer can resolve Internet addresses correctly).  If there are "
@@ -2705,12 +2708,12 @@
 "&mdash; w innym przypadku miaÅoby to wpÅyw teÅ na uÅytkownikÃw Tora."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1241
+#: /home/runa/tor/website/docs/en/faq.wml:1242
 msgid "<hr> <a id=\"RelayOrBridge\"></a>"
 msgstr "<hr> <a id=\"RelayOrBridge\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1244
+#: /home/runa/tor/website/docs/en/faq.wml:1245
 msgid ""
 "<a class=\"anchor\" href=\"#RelayOrBridge\">Should I be a normal relay or "
 "bridge relay?</a>"
@@ -2719,7 +2722,7 @@
 "prowadziÄ normalny przekaÅnik, czy przekaÅnik mostkowy?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1246
+#: /home/runa/tor/website/docs/en/faq.wml:1247
 msgid ""
 "<a href=\"<page docs/bridges>\">Bridge relays</a> (or \"bridges\" for short)"
 "  are <a href=\"<page docs/tor-doc-relay>\">Tor relays</a> that aren't "
@@ -2734,7 +2737,7 @@
 "sieci Tora prawdopodobnie nie bÄdzie mÃgÅ zablokowaÄ wszystkich mostkÃw."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1253
+#: /home/runa/tor/website/docs/en/faq.wml:1254
 msgid ""
 "Being a normal relay vs being a bridge relay is almost the same "
 "configuration: it's just a matter of whether your relay is listed publically"
@@ -2745,7 +2748,7 @@
 "publicznych listach, czy nie."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1258
+#: /home/runa/tor/website/docs/en/faq.wml:1259
 msgid ""
 "Right now, China is the main place in the world that filters connections to "
 "the Tor network. So bridges are useful a) for users in China, b) as a backup"
@@ -2761,7 +2764,7 @@
 "kontaktujÄ, jest adresem IP publicznego przekaÅnika Tora."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1266
+#: /home/runa/tor/website/docs/en/faq.wml:1267
 msgid ""
 "So should you run a normal relay or bridge relay? If you have lots of "
 "bandwidth, you should definitely run a normal relay &mdash; the average "
@@ -2779,12 +2782,12 @@
 "DziÄkujemy za zgÅoszenie!"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1275
+#: /home/runa/tor/website/docs/en/faq.wml:1276
 msgid "<hr> <a id=\"MultipleRelays\"></a>"
 msgstr "<hr> <a id=\"MultipleRelays\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1278
+#: /home/runa/tor/website/docs/en/faq.wml:1279
 msgid ""
 "<a class=\"anchor\" href=\"#MultipleRelays\">I want to run more than one "
 "relay.</a>"
@@ -2793,7 +2796,7 @@
 " przekaÅnik.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1281
+#: /home/runa/tor/website/docs/en/faq.wml:1282
 msgid ""
 "Great. If you want to run several relays to donate more to the network, "
 "we're happy with that. But please don't run more than a few dozen on the "
@@ -2805,7 +2808,7 @@
 "tej samej sieci, gdyÅ czÄÅÄ celÃw sieci Tora to rozproszenie i rÃÅnorodnoÅÄ."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1288
+#: /home/runa/tor/website/docs/en/faq.wml:1289
 msgid ""
 "If you do decide to run more than one relay, please set the \"MyFamily\" "
 "config option in the <a href=\"#torrc\">torrc</a> of each relay, listing all"
@@ -2817,13 +2820,13 @@
 "sÄ pod TwojÄ kontrolÄ:"
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1294
+#: /home/runa/tor/website/docs/en/faq.wml:1295
 #, no-wrap
 msgid "    MyFamily $fingerprint1,$fingerprint2,$fingerprint3\n"
 msgstr "    MyFamily $fingerprint1,$fingerprint2,$fingerprint3\n"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1298
+#: /home/runa/tor/website/docs/en/faq.wml:1299
 msgid ""
 "where each fingerprint is the 40 character identity fingerprint (without "
 "spaces). You can also list them by nickname, but fingerprint is safer. Be "
@@ -2836,7 +2839,7 @@
 " by odcisk palca w pliku konfiguracyjnym nie zostaÅ pomylony z nazwÄ."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1305
+#: /home/runa/tor/website/docs/en/faq.wml:1306
 msgid ""
 "That way clients will know to avoid using more than one of your relays in a "
 "single circuit. You should set MyFamily if you have administrative control "
@@ -2849,12 +2852,12 @@
 "sieciÄ, nawet jeÅli nie sÄ w tej samej lokalizacji geograficznej."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1311
+#: /home/runa/tor/website/docs/en/faq.wml:1312
 msgid "<hr> <a id=\"RelayMemory\"></a>"
 msgstr "<hr> <a id=\"RelayMemory\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1314
+#: /home/runa/tor/website/docs/en/faq.wml:1315
 msgid ""
 "<a class=\"anchor\" href=\"#RelayMemory\">Why is my Tor relay using so much "
 "memory?</a>"
@@ -2863,7 +2866,7 @@
 "tyle pamiÄci?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1316
+#: /home/runa/tor/website/docs/en/faq.wml:1317
 msgid ""
 "If your Tor relay is using more memory than you'd like, here are some tips "
 "for reducing its footprint:"
@@ -2872,7 +2875,7 @@
 "wskazÃwek, jak zmniejszyÄ tÄ iloÅÄ:"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1321
+#: /home/runa/tor/website/docs/en/faq.wml:1322
 msgid ""
 "If you're on Linux, you may be encountering memory fragmentation bugs in "
 "glibc's malloc implementation. That is, when Tor releases memory back to the"
@@ -2891,7 +2894,7 @@
 "malloc: <tt>./configure --enable-openbsd-malloc</tt>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1329
+#: /home/runa/tor/website/docs/en/faq.wml:1330
 msgid ""
 "If you're running a fast relay, meaning you have many TLS connections open, "
 "you are probably losing a lot of memory to OpenSSL's internal buffers (38KB+"
@@ -2910,7 +2913,7 @@
 "Tora automatycznie rozpozna i skorzysta z tej cechy."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1337
+#: /home/runa/tor/website/docs/en/faq.wml:1338
 msgid ""
 "If you're running on Solaris, OpenBSD, NetBSD, or old FreeBSD, Tor is "
 "probably forking separate processes rather than using threads. Consider "
@@ -2924,7 +2927,7 @@
 "system operacyjny</a>."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1343
+#: /home/runa/tor/website/docs/en/faq.wml:1344
 msgid ""
 "If you still can't handle the memory load, consider reducing the amount of "
 "bandwidth your relay advertises. Advertising less bandwidth means you will "
@@ -2938,7 +2941,7 @@
 "SpÃjrz na opcjÄ <tt>MaxAdvertisedBandwidth</tt> na stronie podrÄcznika."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1352
+#: /home/runa/tor/website/docs/en/faq.wml:1353
 msgid ""
 "All of this said, fast Tor relays do use a lot of ram. It is not unusual for"
 " a fast exit relay to use 500-1000 MB of memory."
@@ -2947,19 +2950,19 @@
 "Nierzadko szybkie przekaÅniki uÅywajÄ 500-1000 MB pamiÄci."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1356
+#: /home/runa/tor/website/docs/en/faq.wml:1357
 msgid "<hr> <a id=\"WhyNotNamed\"></a>"
 msgstr "<hr> <a id=\"WhyNotNamed\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1359
+#: /home/runa/tor/website/docs/en/faq.wml:1360
 msgid "<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 "<a class=\"anchor\" href=\"#WhyNotNamed\">Czemu mÃj przekaÅnik Tora nie ma "
 "nazwy?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1362
+#: /home/runa/tor/website/docs/en/faq.wml:1363
 msgid ""
 "We currently use these metrics to determine if your relay should be "
 "named:<br>"
@@ -2968,7 +2971,7 @@
 "przekaÅnik powinien mieÄ nazwÄ:<br>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1365
+#: /home/runa/tor/website/docs/en/faq.wml:1366
 msgid ""
 "The name is not currently mapped to a different key. Existing mappings are "
 "removed after 6 months of inactivity from a relay."
@@ -2977,22 +2980,22 @@
 "usuwane po 6 miesiÄcach nieaktywnoÅci przekaÅnika."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1367
+#: /home/runa/tor/website/docs/en/faq.wml:1368
 msgid "The relay must have been around for at least two weeks."
 msgstr "PrzekaÅnik musi dziaÅaÄ przez co najmniej 2 tygodnie."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1368
+#: /home/runa/tor/website/docs/en/faq.wml:1369
 msgid "No other router may have wanted the same name in the past month."
 msgstr "Åaden inny router nie chciaÅ tej nazwy w poprzednim miesiÄcu."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1371
+#: /home/runa/tor/website/docs/en/faq.wml:1372
 msgid "<hr> <a id=\"KeyManagement\"></a>"
 msgstr "<hr> <a id=\"KeyManagement\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1374
+#: /home/runa/tor/website/docs/en/faq.wml:1375
 msgid ""
 "<a class=\"anchor\" href=\"#KeyManagement\">Tell me about all the keys Tor "
 "uses.</a>"
@@ -3001,7 +3004,7 @@
 "uÅywanych przez Tora.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1377
+#: /home/runa/tor/website/docs/en/faq.wml:1378
 msgid ""
 "Tor uses a variety of different keys, with three goals in mind: 1)  "
 "encryption to ensure privacy of data within the Tor network, 2)  "
@@ -3016,7 +3019,7 @@
 "ten sam zestaw przekaÅnikÃw sieci."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1385
+#: /home/runa/tor/website/docs/en/faq.wml:1386
 msgid ""
 "<b>Encryption</b>: first, all connections in Tor use TLS link encryption, so"
 " observers can't look inside to see which circuit a given cell is intended "
@@ -3034,7 +3037,7 @@
 "przekaÅnika w celu odkrycia klucza nie podziaÅa."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1395
+#: /home/runa/tor/website/docs/en/faq.wml:1396
 msgid ""
 "<b>Authentication</b>: Every Tor relay has a public decryption key called "
 "the \"onion key\".  When the Tor client establishes circuits, at each step "
@@ -3052,7 +3055,7 @@
 " w tygodniu."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1405
+#: /home/runa/tor/website/docs/en/faq.wml:1406
 msgid ""
 "<b>Coordination</b>: How do clients know what the relays are, and how do "
 "they know that they have the right keys for them? Each relay has a long-term"
@@ -3077,7 +3080,7 @@
 "innych przekaÅnikÃw sieci."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1419
+#: /home/runa/tor/website/docs/en/faq.wml:1420
 msgid ""
 "How do clients know what the directory authorities are? The Tor software "
 "comes with a built-in list of location and public key for each directory "
@@ -3090,7 +3093,7 @@
 "sieci Tora jest danie im specjalnie zmodyfikowanej wersji programu."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1426
+#: /home/runa/tor/website/docs/en/faq.wml:1427
 msgid ""
 "How do users know they've got the right software? When we distribute the "
 "source code or a package, we digitally sign it with <a "
@@ -3105,7 +3108,7 @@
 "podpisÃw Tora</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1434
+#: /home/runa/tor/website/docs/en/faq.wml:1435
 msgid ""
 "In order to be certain that it's really signed by us, you need to have met "
 "us in person and gotten a copy of our GPG key fingerprint, or you need to "
@@ -3120,17 +3123,17 @@
 "z bezpieczeÅstwem i zaczÄÄ poznawaÄ ludzi."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1441
+#: /home/runa/tor/website/docs/en/faq.wml:1442
 msgid "<hr> <a id=\"EntryGuards\"></a>"
 msgstr "<hr> <a id=\"EntryGuards\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1444
+#: /home/runa/tor/website/docs/en/faq.wml:1445
 msgid "<a class=\"anchor\" href=\"#EntryGuards\">What are Entry Guards?</a>"
 msgstr "<a class=\"anchor\" href=\"#EntryGuards\">Co to sÄ StraÅnicy WejÅciowi?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1447
+#: /home/runa/tor/website/docs/en/faq.wml:1448
 msgid ""
 "Tor (like all current practical low-latency anonymity designs) fails when "
 "the attacker can see both ends of the communications channel. For example, "
@@ -3150,7 +3153,7 @@
 " na dwÃch koÅcach."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1457
+#: /home/runa/tor/website/docs/en/faq.wml:1458
 msgid ""
 "So, what should we do? Suppose the attacker controls, or can observe, "
 "<i>C</i> relays. Suppose there are <i>N</i> relays total. If you select new "
@@ -3175,7 +3178,7 @@
 "tego typu napastnika."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1469
+#: /home/runa/tor/website/docs/en/faq.wml:1470
 msgid ""
 "The solution is \"entry guards\": each Tor client selects a few relays at "
 "random to use as entry points, and uses only those relays for her first hop."
@@ -3197,7 +3200,7 @@
 "profilowania, a przedtem nie miaÅ Åadnych."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1480
+#: /home/runa/tor/website/docs/en/faq.wml:1481
 msgid ""
 "You can read more at <a href=\"http://freehaven.net/anonbib/#wright02\";>An "
 "Analysis of the Degradation of Anonymous Protocols</a>, <a "
@@ -3216,7 +3219,7 @@
 "Servers</a> (Lokalizowanie UsÅug Ukrytych)."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1489
+#: /home/runa/tor/website/docs/en/faq.wml:1490
 msgid ""
 "Restricting your entry nodes may also help against attackers who want to run"
 " a few Tor nodes and easily enumerate all of the Tor user IP addresses. "
@@ -3234,12 +3237,12 @@
 "serwerÃw katalogowych\"."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1497
+#: /home/runa/tor/website/docs/en/faq.wml:1498
 msgid "<hr> <a id=\"EverybodyARelay\"></a>"
 msgstr "<hr> <a id=\"EverybodyARelay\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1500
+#: /home/runa/tor/website/docs/en/faq.wml:1501
 msgid ""
 "<a class=\"anchor\" href=\"#EverybodyARelay\">You should make every Tor user"
 " be a relay.</a>"
@@ -3248,7 +3251,7 @@
 "uÅytkownik Tora byÅ przekaÅnikiem.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1503
+#: /home/runa/tor/website/docs/en/faq.wml:1504
 msgid ""
 "Requiring every Tor user to be a relay would help with scaling the network "
 "to handle all our users, and <a "
@@ -3274,7 +3277,7 @@
 "anonimowoÅci."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1516
+#: /home/runa/tor/website/docs/en/faq.wml:1517
 msgid ""
 "That said, we do want to encourage Tor users to run relays, so what we "
 "really want to do is simplify the process of setting up and maintaining a "
@@ -3292,12 +3295,12 @@
 "zaoferowaÄ."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1525
+#: /home/runa/tor/website/docs/en/faq.wml:1526
 msgid "There are five steps we need to address before we can do this though:"
 msgstr "Jest jednak piÄÄ krokÃw, ktÃrymi musimy siÄ najpierw zajÄÄ:"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1529
+#: /home/runa/tor/website/docs/en/faq.wml:1530
 msgid ""
 "First, we need to make Tor stable as a relay on all common operating "
 "systems. The main remaining platform is Windows, and we plan to finally "
@@ -3312,7 +3315,7 @@
 "release\">naszego planu rozwojowego</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1537
+#: /home/runa/tor/website/docs/en/faq.wml:1538
 msgid ""
 "Second, we still need to get better at automatically estimating the right "
 "amount of bandwidth to allow. See item #7 on the <a href=\"<page "
@@ -3332,7 +3335,7 @@
 "odpowiedziÄ."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1548
+#: /home/runa/tor/website/docs/en/faq.wml:1549
 msgid ""
 "Third, we need to work on scalability, both of the network (how to stop "
 "requiring that all Tor relays be able to connect to all Tor relays) and of "
@@ -3351,7 +3354,7 @@
 "szczegÃÅy. Ponownie, transport UDP by tu pomÃgÅ."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1558
+#: /home/runa/tor/website/docs/en/faq.wml:1559
 msgid ""
 "Fourth, we need to better understand the risks from letting the attacker "
 "send traffic through your relay while you're also initiating your own "
@@ -3382,7 +3385,7 @@
 "zagroÅenie i nauczyÄ siÄ je ÅagodziÄ."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1574
+#: /home/runa/tor/website/docs/en/faq.wml:1575
 msgid ""
 "Fifth, we might need some sort of incentive scheme to encourage people to "
 "relay traffic for others, and/or to become exit nodes. Here are our <a "
@@ -3395,17 +3398,17 @@
 "Tora</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1581
+#: /home/runa/tor/website/docs/en/faq.wml:1582
 msgid "Please help on all of these!"
 msgstr "Prosimy o pomoc przy kaÅdym z tych punktÃw!"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1584
+#: /home/runa/tor/website/docs/en/faq.wml:1585
 msgid "<hr> <a id=\"TransportIPnotTCP\"></a>"
 msgstr "<hr> <a id=\"TransportIPnotTCP\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1587
+#: /home/runa/tor/website/docs/en/faq.wml:1588
 msgid ""
 "<a class=\"anchor\" href=\"#TransportIPnotTCP\">You should transport all IP "
 "packets, not just TCP packets.</a>"
@@ -3414,7 +3417,7 @@
 "wszystkie pakiety IP, nie tylko pakiety TCP.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1590
+#: /home/runa/tor/website/docs/en/faq.wml:1591
 msgid ""
 "This would be handy, because it would make Tor better able to handle new "
 "protocols like VoIP, it could solve the whole need to socksify applications,"
@@ -3428,7 +3431,7 @@
 "otwartym."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1597
+#: /home/runa/tor/website/docs/en/faq.wml:1598
 msgid ""
 "We're heading in this direction: see <a "
 "href=\"https://trac.torproject.org/projects/tor/ticket/1855\";>this trac "
@@ -3441,7 +3444,7 @@
 "trudnych problemÃw to:"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1604
+#: /home/runa/tor/website/docs/en/faq.wml:1605
 msgid ""
 "IP packets reveal OS characteristics. We would still need to do IP-level "
 "packet normalization, to stop things like TCP fingerprinting attacks. Given "
@@ -3459,7 +3462,7 @@
 " jest dstarczenie wÅasnego stosu TCP w przestrzeni uÅytkownika."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1611
+#: /home/runa/tor/website/docs/en/faq.wml:1612
 msgid ""
 "Application-level streams still need scrubbing. We will still need user-side"
 " applications like Torbutton. So it won't become just a matter of capturing "
@@ -3470,7 +3473,7 @@
 "tylko kwestia przechwytywania pakietÃw i anonimizacji ich w warstwie IP."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1615
+#: /home/runa/tor/website/docs/en/faq.wml:1616
 msgid ""
 "Certain protocols will still leak information. For example, we must rewrite "
 "DNS requests so they are delivered to an unlinkable DNS server rather than "
@@ -3483,7 +3486,7 @@
 "uzytkownika; tak wiÄc musimy rozumieÄ protokoÅy, ktÃre transportujemy."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1620
+#: /home/runa/tor/website/docs/en/faq.wml:1621
 msgid ""
 "<a "
 "href=\"http://crypto.stanford.edu/~nagendra/projects/dtls/dtls.html\";>DTLS</a>"
@@ -3501,7 +3504,7 @@
 "na kasowanie pakietÃw, retransmisje itp."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1627
+#: /home/runa/tor/website/docs/en/faq.wml:1628
 msgid ""
 "Exit policies for arbitrary IP packets mean building a secure IDS. Our node "
 "operators tell us that exit policies are one of the main reasons they're "
@@ -3533,7 +3536,7 @@
 "wysÅaÄ w sesji, zanim wybiorÄ swÃj wÄzeÅ wyjÅciowy!"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1641
+#: /home/runa/tor/website/docs/en/faq.wml:1642
 msgid ""
 "The Tor-internal name spaces would need to be redesigned. We support hidden "
 "service \".onion\" addresses by intercepting the addresses when they are "
@@ -3547,12 +3550,12 @@
 "rozwiÅaywaniem nazw DNS."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1648
+#: /home/runa/tor/website/docs/en/faq.wml:1649
 msgid "<hr> <a id=\"Criminals\"></a>"
 msgstr "<hr> <a id=\"Criminals\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1651
+#: /home/runa/tor/website/docs/en/faq.wml:1652
 msgid ""
 "<a class=\"anchor\" href=\"#Criminals\">Doesn't Tor enable criminals to do "
 "bad things?</a>"
@@ -3561,7 +3564,7 @@
 "robienia zÅych rzeczy?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1654
+#: /home/runa/tor/website/docs/en/faq.wml:1655
 msgid ""
 "For the answer to this question and others, please see our <a href=\"<page "
 "docs/faq-abuse>\">Tor Abuse FAQ</a>."
@@ -3570,12 +3573,12 @@
 "/faq-abuse>\">FAQ o naduÅyciach Tora</a>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1658
+#: /home/runa/tor/website/docs/en/faq.wml:1659
 msgid "<hr> <a id=\"RespondISP\"></a>"
 msgstr "<hr> <a id=\"RespondISP\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1661
+#: /home/runa/tor/website/docs/en/faq.wml:1662
 msgid ""
 "<a class=\"anchor\" href=\"#RespondISP\">How do I respond to my ISP about my"
 " exit relay?</a>"
@@ -3584,7 +3587,7 @@
 "Internetu o moim przekaÅniku wyjÅciowym?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1664
+#: /home/runa/tor/website/docs/en/faq.wml:1665
 msgid ""
 "A collection of templates for successfully responding to ISPs is <a "
 "href=\"<wiki>doc/TorAbuseTemplates\">collected here</a>."

Modified: translation/trunk/projects/website/po/pl_PL/docs/2-medium.tor-doc-relay.po
===================================================================
--- translation/trunk/projects/website/po/pl_PL/docs/2-medium.tor-doc-relay.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/pl_PL/docs/2-medium.tor-doc-relay.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-06-21 08:19+0200\n"
-"PO-Revision-Date: 2011-06-26 09:36+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-25 09:07+0000\n"
 "Last-Translator: bogdrozd <bog.d@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@
 msgstr "Konfiguracja przekaÅnika Tora"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:16 /tmp/F5o0tOMw8z.xml:281
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:16 /tmp/A18i3Pxv3V.xml:282
 msgid "<hr>"
 msgstr "<hr>"
 
@@ -82,8 +82,8 @@
 msgstr "<a class=\"anchor\" href=\"#install\">Krok 1: Pobranie i instalacja Tora</a>"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37 /tmp/F5o0tOMw8z.xml:52
-#: /tmp/F5o0tOMw8z.xml:147 /tmp/F5o0tOMw8z.xml:171
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37 /tmp/A18i3Pxv3V.xml:52
+#: /tmp/A18i3Pxv3V.xml:147 /tmp/A18i3Pxv3V.xml:171
 msgid "<br>"
 msgstr "<br>"
 
@@ -559,7 +559,8 @@
 "add a line like \"toruser hard nofile 8192\" to your "
 "/etc/security/limits.conf file (where toruser is the user that runs the Tor "
 "process), and then restart Tor if it's installed as a package (or log out "
-"and log back in if you run it yourself)."
+"and log back in if you run it yourself). The Debian/Ubuntu package does this"
+" step for you."
 msgstr ""
 "14. (Tylko Unix) TwÃj system operacyjny prawdopodobnie ogranicza liczbÄ "
 "otwartych deskryptorÃw plikÃw dla kaÅdego procesu do 1024 (lub nawet mniej)."
@@ -569,10 +570,10 @@
 "/etc/security/limits.conf (gdzie toruser oznacza uÅytkownika, na ktÃrego "
 "prawach uruchomiony jest Tor), po czym ponownie uruchomiÄ Tora, jeÅli jest "
 "zainstalowany jako pakiet (lub wylogowaÄ siÄ i zalogowaÄ ponownie, jeÅli "
-"uruchamiasz go sam)."
+"uruchamiasz go sam). Paczka dla Debiana/Ubuntu sama wykonuje ten krok."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:266
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:267
 msgid ""
 "15. If you installed Tor via some package or installer, it probably starts "
 "Tor for you automatically on boot. But if you installed from source, you may"
@@ -584,7 +585,7 @@
 "inicjalizacyjne contrib/tor.sh lub contrib/torctl."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:272
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:273
 msgid ""
 "When you change your Tor configuration, remember to verify that your relay "
 "still works correctly after the change. Be sure to set your \"ContactInfo\" "
@@ -604,7 +605,7 @@
 " pomagasz rosnÄÄ sieci Tora!"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:283
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:284
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "about/contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/po/pl_PL/docs/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/po/pl_PL/docs/2-medium.verifying-signatures.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/pl_PL/docs/2-medium.verifying-signatures.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-09-05 00:00+0200\n"
-"PO-Revision-Date: 2011-09-11 11:07+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-25 09:51+0000\n"
 "Last-Translator: bogdrozd <bog.d@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -34,558 +34,250 @@
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:13
-#: /tmp/w7jGkC8yXE.xml:43 /tmp/w7jGkC8yXE.xml:59 /tmp/w7jGkC8yXE.xml:86
-#: /tmp/w7jGkC8yXE.xml:186
+#: /tmp/kzjpFaPDWT.xml:16 /tmp/kzjpFaPDWT.xml:60 /tmp/kzjpFaPDWT.xml:120
+#: /tmp/kzjpFaPDWT.xml:176
 msgid "<hr>"
 msgstr "<hr>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><h3>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:15
-msgid ""
-"Each file on <a href=\"<page download/download>\">our download page</a> is "
-"accompanied by a file with the same name as the package and the extension "
-"\".asc\". These .asc files are GPG signatures. They allow you to verify the "
-"file you've downloaded is exactly the one that we intended you to get. For "
-"example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by "
-"tor-browser-<version-torbrowserbundle>_en-US.exe.asc."
-msgstr ""
-"KaÅdemu plikowi na <a href=\"<page download/download>\">naszej stronie "
-"pobierania</a> towarzyszy plik z tÄ samÄ nazwÄ co paczka i rozszerzeniem "
-"\".asc\". Te pliki .asc to podpisy GPG. PozwalajÄ Ci zweryfikowaÄ, Åe plik, "
-"ktÃry pobraÅeÅ/aÅ jest dokÅadnie tym, ktÃry my wystawiliÅmy do pobierania. "
-"Na przykÅad, plikowi tor-browser-<version-torbrowserbundle>_en-US.exe "
-"towarzyszy tor-browser-<version-torbrowserbundle>_en-US.exe.asc."
+msgid "What is a signature and why should I check it?"
+msgstr "Co to jest podpis i czemu powinno siÄ go sprawdzaÄ?"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:22
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:18
 msgid ""
-"Of course, you'll need to have our GPG keys in your keyring: if you don't "
-"know the GPG key, you can't be sure that it was really us who signed it. The"
-" signing keys we use are:"
+"How do you know that the Tor program you have is really the one we made? "
+"Many Tor users have very real adversaries who might try to give them a fake "
+"version of Tor &mdash; and it doesn't matter how secure and anonymous Tor is"
+" if you're not running the real Tor."
 msgstr ""
-"OczywiÅcie, musicie mieÄ nasze klucze GPG w swojej bazie kluczy: jeÅli nie "
-"znacie klucza GPG, nie moÅecie byÄ pewni, Åe to naprawdÄ my podpisujemy. "
-"Klucze uÅywane przez nas do podpisu to:"
+"SkÄd wiesz, czy program Tor, ktÃry masz to ten, ktÃry my zrobiliÅmy? Wielu "
+"uÅytkownikÃw Tora ma realnych napastnikÃw, ktÃrzy mogÄ daÄ im faÅszywÄ "
+"wersjÄ Tora &mdash; i nie ma to znaczenia, jak bezpieczny i anonimowy jest "
+"Tor, jeÅli nie uÅywasz prawdziwego Tora."
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:26
-msgid "Roger's (0x28988BF5) typically signs the source code file."
-msgstr "Rogera (0x28988BF5) zazwyczaj podpisuje plik z kodem ÅrÃdÅowym."
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:27
-msgid "Nick's (0x165733EA, or its subkey 0x8D29319A)."
-msgstr "Nicka (0x165733EA, lub jego podklucz 0x8D29319A)."
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:28
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:23
 msgid ""
-"Andrew's (0x31B0974B) typically signed older packages for windows and mac."
-msgstr "Andrzeja (0x31B0974B) zazwyczaj podpisuje paczki dla windows i mac."
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:29
-msgid "Peter's (0xC82E0039, or its subkey 0xE1DEC577)."
-msgstr "Petera (0xC82E0039, lub jego podklucz 0xE1DEC577)."
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:30
-msgid "TomÃs's (0x9A753A6B) signs current Vidalia release tarballs and tags."
-msgstr "TomÃsa (0x9A753A6B) podpisuje aktualne wersje Vidalii i tagi."
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:31
-msgid "Matt's (0x5FA14861) signed older Vidalia release tarballs."
-msgstr "Matta (0x5FA14861) podpisyaÅ starsze wersje Vidalii."
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:32
-msgid "Damian's (0x9ABBEEC6) signs Arm releases"
-msgstr "Damiana (0x9ABBEEC6) podpisuje wydania Arma"
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:33
-msgid "Jacob's (0xE012B42D)."
-msgstr "Jacoba (0xE012B42D)."
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:34
-msgid ""
-"Erinn's (0x63FEE659) and (0xF1F5C9B5) typically signs all windows, mac, and "
-"most linux packages."
+"An attacker could try a variety of attacks to get you to download a fake "
+"Tor. For example, he could trick you into thinking some other website is a "
+"great place to download Tor. That's why you should always download Tor from "
+"<b>https</b>://www.torproject.org/. The https part means there's encryption "
+"and authentication between your browser and the website, making it much "
+"harder for the attacker to modify your download. But it's not perfect. Some "
+"places in the world block the Tor website, making users try <a href=\"<page "
+"docs/faq>#GetTor\">somewhere else</a>. Large companies sometimes force "
+"employees to use a modified browser, so the company can listen in on all "
+"their browsing. We've even <a href=\"https://blog.torproject.org/blog";
+"/diginotar-debacle-and-what-you-should-do-about-it\">seen</a> attackers who "
+"have the ability to trick your browser into thinking you're talking to the "
+"Tor website with https when you're not."
 msgstr ""
-"Erinn (0x63FEE659) i (0xF1F5C9B5) zazwyczaj podpisuje wszystkie paczki dla "
-"windows, mac i wiÄkszoÅÄ dla Linuksa."
+"Napastnik mÃgÅby wyprÃbowaÄ wiele rodzajÃw atakÃw, abyÅ pobraÅ/a faÅszywego "
+"Tora. Na przykÅad, mÃgÅby zwieÅÄ CiÄ, abyÅ myÅlaÅ/a, Åe jakaÅ inna strona "
+"jest wspaniaÅym miejscem do pobierania Tora. Dlatego zawsze powinno siÄ "
+"pobieraÄ Tora z <b>https</b>://www.torproject.org/. CzÄÅÄ https oznacza, Åe "
+"jest szyfrowanie i uwierzytelnianie miÄdzy TwojÄ przeglÄdarkÄ a stronÄ WWW, "
+"co znacznie utrudnia napastnikowi podmianÄ pobieranych danych. Ale to nie "
+"jest idealne. NiektÃre miejsca na Åwiecie blokujÄ stronÄ Tora, sprawiajÄc, "
+"Åe uÅytkownicy prÃbujÄ <a href=\"<page docs/faq>#GetTor\">gdzies "
+"indziej</a>. Wielkie firmy czasem zmuszajÄ uÅytkownikÃw do uÅywania "
+"zmodyfikowanych przeglÄdarek, aby firma mogÅa podsÅuchiwaÄ ich w sieci. "
+"Nawet <a href=\"https://blog.torproject.org/blog/diginotar-debacle-and-what-";
+"you-should-do-about-it\">widzieliÅmy</a> napastnikÃw majÄcych moÅliwoÅci "
+"oszukania Twojej przeglÄdarki, by myÅlaÅa, Åe ÅÄczysz siÄ ze stronÄ Tora "
+"przez https, podczas gdy tego nie robisz."
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:35
-msgid "Mike's (0xDDC6C0AD) signs the Torbutton xpi."
-msgstr "Mike'a (0xDDC6C0AD) podpisuje xpi Torbuttona."
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:36
-msgid "Karsten's (0xF7C11265) signs the metrics archives and tools."
-msgstr "Karsten (0xF7C11265) podpisuje archiwa pomiarÃw i narzÄdzia."
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:37
-msgid "Robert Hogan's (0x22F6856F) signs torsocks release tarballs and tags."
-msgstr "Roberta Hogana (0x22F6856F) podpisuje wydania torsocks i tagi."
-
-#. type: Content of: <div><div><ul><li>
+#. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:38
-msgid "Nathan's (0xB374CBD2) signs the Android APK file for Orbot."
-msgstr "Nathana (0xB374CBD2) podpisuje plik APK Androida dla Orbota."
-
-#. type: Content of: <div><div><ul>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:38
-msgid "."
-msgstr "."
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:39
 msgid ""
-"Tor Project Archive (0x886DDD89) signs the deb.torproject.org repositories "
-"and archives"
+"Some software sites list <a "
+"href=\"http://en.wikipedia.org/wiki/Cryptographic_hash_function\";>sha1 "
+"hashes</a> alongside the software on their website, so users can verify that"
+" they downloaded the file without any errors. These \"checksums\" help you "
+"answer the question \"Did I download this file correctly from whoever sent "
+"it to me?\" They do a good job at making sure you didn't have any random "
+"errors in your download, but they don't help you figure out whether you were"
+" downloading it from the attacker. The better question to answer is: \"Is "
+"this file that I just downloaded the file that Tor intended me to get?\""
 msgstr ""
-"Tor Project Archive (0x886DDD89) podpisuje repozytoria deb.torproject.org i "
-"archiwa"
+"NiektÃre strony z oprogramowaniem podajÄ <a "
+"href=\"http://en.wikipedia.org/wiki/Cryptographic_hash_function\";>skrÃty "
+"sha1</a> razem z programami na swoich stronach, by uÅytkownicy mogli "
+"sprawdziÄ, Åe pobrali plik bez bÅÄdÃw. Te \"sumy kontrolne\" pomagajÄ "
+"odpowiedzieÄ na pytanie \"Czy prawidÅowo pobrano plik od kogoÅ, kto mi go "
+"wysÅaÅ?\" WykonujÄ one dobrÄ robotÄ upewniajÄc CiÄ, Åe nie byÅo Åadnych "
+"losowych bÅÄdÃw w pobieraniu, ale nie pomagajÄ w dowiedzeniu siÄ, czy nie "
+"pobrano pliku od napastnika. Lepszym pytaniem, na ktÃre trzeba znaleÅÄ "
+"odpowiedÅ to \"Czy ten plik, ktÃry wÅaÅnie pobrano, to ten plik, ktÃry Tor "
+"chciaÅ, aby pobrano?\""
 
-#. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:42
-msgid "Step Zero: Install GnuPG"
-msgstr "Krok zero: Instalacja GnuPG"
-
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:44
-msgid "You need to have GnuPG installed before you can verify signatures."
-msgstr ""
-"Musisz mieÄ zainstalowane GnuPG, zanim bÄdziesz mÃgÅ/mogÅa weryfikowaÄ "
-"podpisy."
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:48
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:49
 msgid ""
-"Linux: see <a "
-"href=\"http://www.gnupg.org/download/\";>http://www.gnupg.org/download/</a> "
-"or install <i>gnupg</i> from the package management system."
+"Each file on <a href=\"<page download/download>\">our download page</a> is "
+"accompanied by a file with the same name as the package and the extension "
+"\".asc\". These .asc files are GPG signatures. They allow you to verify the "
+"file you've downloaded is exactly the one that we intended you to get. For "
+"example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by "
+"tor-browser-<version-torbrowserbundle>_en-US.exe.asc. For a list of which "
+"developer signs which package, see our <a href=\"<page docs/signing-"
+"keys>\">signing keys</a> page."
 msgstr ""
-"Linux: wejdÅ na <a "
-"href=\"http://www.gnupg.org/download/\";>http://www.gnupg.org/download/</a> "
-"lub zainstaluj <i>gnupg</i> z systemu zarzÄdzania pakietami."
+"Do kaÅdego pliku na <a href=\"<page download/download>\">naszej stronie "
+"pobierania</a> jest doÅaczony plik o tej samej nazwie jak paczka i "
+"rozszerzeniu \".asc\". Te pliki .asc to podpisy GPG. PozwalajÄ na "
+"sprawdzenie, czy pobrany plik jest dokÅadnie tym samym, ktÃry my daliÅmy do "
+"pobierania. Na przykÅad, plikowi tor-browser-<version-torbrowserbundle>_en-"
+"US.exe towarzyszy tor-browser-<version-torbrowserbundle>_en-US.exe.asc. Po "
+"listÄ, ktÃry deweloper podpisuje ktÃre paczki, wejdÅ na naszÄ stronÄ <a "
+"href=\"<page docs/signing-keys>\">kluczy podpisujÄcych</a>."
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:51
-msgid ""
-"Windows: see <a "
-"href=\"http://www.gnupg.org/download/\";>http://www.gnupg.org/download/</a>. "
-"Look for the \"version compiled for MS-Windows\" under \"Binaries\"."
-msgstr ""
-"Windows: wejdÅ na <a "
-"href=\"http://www.gnupg.org/download/\";>http://www.gnupg.org/download/</a>. "
-"Szukaj \"version compiled for MS-Windows\" (\"wersja skompilowana dla MS-"
-"Windows\") pod \"Binaries\" (\"Binaria\")."
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:54
-msgid ""
-"Mac: see <a "
-"href=\"http://macgpg.sourceforge.net/\";>http://macgpg.sourceforge.net/</a>."
-msgstr ""
-"Mac: wejdÅ na <a "
-"href=\"http://macgpg.sourceforge.net/\";>http://macgpg.sourceforge.net/</a>."
-
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:58
-msgid "Step One: Import the keys"
-msgstr "Krok pierwszy: Import kluczy"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:59
+msgid "Windows"
+msgstr "Windows"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:60
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:62
 msgid ""
-"The next step is to import the key. This can be done directly from GnuPG. "
-"Make sure you import the correct key. For example, if you downloaded a "
-"Windows package, you will need to import Erinn's key."
+"You need to have GnuPG installed before you can verify signatures. Download "
+"it from <a "
+"href=\"http://gpg4win.org/download.html\";>http://gpg4win.org/download.html</a>."
 msgstr ""
-"Kolejnym krokiem jest import klucza. MoÅna to zrobiÄ bezpoÅrednio z GnuPG. "
-"Upewnij siÄ, Åe importujesz wÅaÅciwy klucz. Na przykÅad, jeÅli pobraÅeÅ/aÅ "
-"paczkÄ dla Windows, musisz zaimportowaÄ klucz Erinn."
+"Musisz mieÄ zainstalowane GnuPG, zanim bÄdzie moÅna weryfikowaÄ podpisy. "
+"MoÅesz je zainstalowaÄ z <a "
+"href=\"http://gpg4win.org/download.html\";>http://gpg4win.org/download.html</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:64
-#: /tmp/w7jGkC8yXE.xml:89 /tmp/w7jGkC8yXE.xml:194
-msgid "<b>Windows:</b>"
-msgstr "<b>Windows:</b>"
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:65
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:66
 msgid ""
-"GnuPG for Windows is a command line tool, and you will need to use "
+"Once it's installed, use GnuPG to import the key that signed your package. "
+"Since GnuPG for Windows is a command-line tool, you will need to use "
 "<i>cmd.exe</i>. Unless you edit your PATH environment variable, you will "
 "need to tell Windows the full path to the GnuPG program. If you installed "
 "GnuPG with the default values, the path should be something like this: "
 "<i>C:\\Program Files\\Gnu\\GnuPg\\gpg.exe</i>."
 msgstr ""
-"GnuPG dla Windows jest narzÄdziem sterowanym liniÄ poleceÅ i bÄdziesz "
-"musiaÅ/a uÅywaÄ <i>cmd.exe</i>. JeÅli nie zmienisz swojej zmiennej "
-"Årodowiskowej PATH, bÄdziesz musiaÅ/a podawaÄ Windowsowi peÅnÄ ÅcieÅkÄ do "
-"programu GnuPG. JeÅli zainstalowaÅeÅ/aÅ GnuPG z wartoÅciami domyÅlnymi, "
-"ÅcieÅka powinna wyglÄdaÄ podobnie do <i>C:\\Program "
-"Files\\Gnu\\GnuPg\\gpg.exe</i>."
+"Po instalacji, uÅyj GnuPG do importu klucza, ktÃrym podpisano TwojÄ paczkÄ. "
+"Jako Åe GnuPG dla Windows jest narzÄdziem linii poleceÅ, trzeba uÅyÄ "
+"<i>cmd.exe</i>. JeÅli nie ustawisz swojej zmiennej Årodowiskowej PATH, "
+"bÄdzie trzeba podawaÄ Windowsowi peÅnÄ ÅcieÅkÄ do programu GnuPG. JeÅli "
+"zainstalowanu GnuPG z ustawieniami domyÅlnymi, ÅcieÅka powinna wyglÄdaÄ tak:"
+" <i>C:\\Program Files\\Gnu\\GnuPg\\gpg.exe</i>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:71
-msgid "To import the key 0x28988BF5, start <i>cmd.exe</i> and type:"
-msgstr "Aby zaimportowaÄ klucz 0x28988BF5, uruchom <i>cmd.exe</i> i wpisz:"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:73
+msgid ""
+"Erinn Clark signs the Tor Browser Bundles. Import her key (0x63FEE659) by "
+"starting <i>cmd.exe</i> and typing:"
+msgstr ""
+"Erinn Clark podpisuje Paczki Tora z PrzeglÄdarkÄ. Zaimportujcie jej klucz "
+"(0x63FEE659), uruchamiajÄc <i>cmd.exe</i> i wpisujÄc:"
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:73
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:76
 #, no-wrap
 msgid ""
 "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --keyserver hkp://keys.gnupg.net "
-"--recv-keys 0x28988BF5"
+"--recv-keys 0x63FEE659"
 msgstr ""
 "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --keyserver hkp://keys.gnupg.net "
-"--recv-keys 0x28988BF5"
+"--recv-keys 0x63FEE659"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:75
-#: /tmp/w7jGkC8yXE.xml:92
-msgid "<b>Mac and Linux</b>"
-msgstr "<b>Mac i Linux</b>"
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:76
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:78
+#: /tmp/kzjpFaPDWT.xml:134
 msgid ""
-"Whether you have a Mac or you run Linux, you will need to use the terminal "
-"to run GnuPG. Mac users can find the terminal under \"Applications\". If you"
-" run Linux and use Gnome, the terminal should be under \"Applications menu\""
-" and \"Accessories\". KDE users can find the terminal under \"Menu\" and "
-"\"System\"."
+"After importing the key, you can verify that the fingerprint is correct:"
 msgstr ""
-"Gdy masz Maka lub dziaÅasz na Linuksie, musisz uÅywaÄ terminala, by "
-"uruchamiaÄ GnuPG. UÅytkownicy MakÃw mogÄ znaleÅÄ terminal pod "
-"\"Applications\" (\"Aplikacje\"). JeÅli masz Linuksa i uÅywasz Gnome, "
-"terminal powinien byÄ pod \"Applications menu\" (\"menu Aplikacje\") i "
-"\"Accessories\" (\"Akcesoria\"). UÅytkownicy KDE mogÄ znaleÅÄ terminal w "
-"\"Menu\" i \"System\"."
+"Po zaimportowaniu klucza, powinieneÅ/aÅ sprawdziÄ, czy odcisk palca jest "
+"prawidÅowy:"
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:81
-msgid "To import the key 0x28988BF5, start the terminal and type:"
-msgstr "Aby zaimportowaÄ klucz 0x28988BF5, uruchom terminal i wpisz:"
-
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:83
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:81
 #, no-wrap
-msgid "gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x28988BF5"
-msgstr "gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x28988BF5"
+msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --fingerprint 0x63FEE659"
+msgstr "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --fingerprint 0x63FEE659"
 
-#. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:85
-msgid "Step Two: Verify the fingerprints"
-msgstr "Krok drugi: Sprawdzenie \"odciskÃw palcÃw\" (skrÃtÃw) kluczy"
-
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:87
-msgid ""
-"After importing the key, you will want to verify that the fingerprint is "
-"correct."
-msgstr ""
-"Po zaimportowaniu klucza, powinieneÅ/aÅ sprawdziÄ, czy odcisk palca jest "
-"prawidÅowy."
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:83
+#: /tmp/kzjpFaPDWT.xml:139
+msgid "You should see:"
+msgstr "PowinieneÅ/aÅ zobaczyÄ:"
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:90
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:85
 #, no-wrap
-msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --fingerprint (insert keyid here)"
-msgstr "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --fingerprint (tu id klucza)"
-
-#. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:93
-#, no-wrap
-msgid "gpg --fingerprint (insert keyid here)"
-msgstr "gpg --fingerprint (tu id klucza)"
-
-#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:95
-msgid "The fingerprints for the keys should be:"
-msgstr "Odciski palcÃw kluczy powinny byÄ nastÄpujÄce:"
-
-#. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:98
-#, no-wrap
 msgid ""
-"    pub   1024D/28988BF5 2000-02-27\n"
-"          Key fingerprint = B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
-"    uid                  Roger Dingledine &lt;arma@xxxxxxx&gt;\n"
-"\n"
-"    pub   3072R/165733EA 2004-07-03\n"
-"          Key fingerprint = B35B F85B F194 89D0 4E28  C33C 2119 4EBB 1657 33EA\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxxx&gt;\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxx&gt;\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxxxx&gt;\n"
-"\n"
-"    pub  1024D/31B0974B 2003-07-17\n"
-"         Key fingerprint = 0295 9AA7 190A B9E9 027E  0736 3B9D 093F 31B0 974B\n"
-"    uid                  Andrew Lewman (phobos) &lt;phobos@xxxxxxxxxx&gt;\n"
-"    uid                  Andrew Lewman &lt;andrew@xxxxxxxxxx&gt;\n"
-"    uid                  Andrew Lewman &lt;andrew@xxxxxxxxxxxxxx&gt;\n"
-"    sub   4096g/B77F95F7 2003-07-17\n"
-"\n"
-"    pub   4096R/C82E0039 2003-03-24\n"
-"          Key fingerprint = 25FC 1614 B8F8 7B52 FF2F  99B9 62AF 4031 C82E 0039\n"
-"    uid                  Peter Palfrader\n"
-"    uid                  Peter Palfrader &lt;peter@xxxxxxxxxxxxx&gt;\n"
-"    uid                  Peter Palfrader &lt;weasel@xxxxxxxxxx&gt;\n"
-"\n"
-"    pub   1024D/9A753A6B 2009-09-11\n"
-"          Key fingerprint = 553D 7C2C 626E F16F 27F3  30BC 95E3 881D 9A75 3A6B\n"
-"    uid                  TomÃs Touceda &lt;chiiph@xxxxxxxxx&gt;\n"
-"    sub   1024g/33BE0E5B 2009-09-11\n"
-"\n"
-"    pub   1024D/5FA14861 2005-08-17\n"
-"          Key fingerprint = 9467 294A 9985 3C9C 65CB  141D AF7E 0E43 5FA1 4861\n"
-"    uid                  Matt Edman &lt;edmanm@xxxxxxx&gt;\n"
-"    uid                  Matt Edman &lt;Matt_Edman@xxxxxxxxxx&gt;\n"
-"    uid                  Matt Edman &lt;edmanm2@xxxxxxxxxx&gt;\n"
-"    sub   4096g/EA654E59 2005-08-17\n"
-"\n"
-"    pub   1024D/9ABBEEC6 2009-06-17\n"
-"          Key fingerprint = 6827 8CC5 DD2D 1E85 C4E4  5AD9 0445 B7AB 9ABB EEC6\n"
-"    uid                  Damian Johnson (www.atagar.com) &lt;atagar1@xxxxxxxxx&gt;\n"
-"    uid                  Damian Johnson &lt;atagar@xxxxxxxxxxxxxx&gt;\n"
-"    sub   2048g/146276B2 2009-06-17\n"
-"    sub   2048R/87F30690 2010-08-07\n"
-"\n"
-"    pub   4096R/E012B42D 2010-05-07\n"
-"          Key fingerprint = D8C9 AF51 CAA9 CAEA D3D8  9C9E A34F A745 E012 B42D\n"
-"    uid                  Jacob Appelbaum &lt;jacob@xxxxxxxxxxxxx&gt;\n"
-"    uid                  Jacob Appelbaum &lt;jacob@xxxxxxxxxxxxxx&gt;\n"
-"    sub   4096R/7CA91A52 2010-05-07 [expires: 2011-05-07]\n"
-"\n"
 "    pub   2048R/63FEE659 2003-10-16\n"
 "          Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\n"
 "    sub   2048R/EB399FD7 2003-10-16\n"
-"\n"
-"    pub   1024D/F1F5C9B5 2010-02-03\n"
-"          Key fingerprint = C2E3 4CFC 13C6 2BD9 2C75  79B5 6B8A AEB1 F1F5 C9B5\n"
-"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
-"    sub   1024g/7828F26A 2010-02-03\n"
-"\n"
-"    pub   1024D/DDC6C0AD 2006-07-26\n"
-"          Key fingerprint = BECD 90ED D1EE 8736 7980  ECF8 1B0C A30C DDC6 C0AD\n"
-"    uid                  Mike Perry &lt;mikeperry@xxxxxxxxxx&gt;\n"
-"    uid                  Mike Perry &lt;mikepery@xxxxxxxxxx&gt;\n"
-"    sub   4096g/AF0A91D7 2006-07-26\n"
-"\n"
-"    pub   1024D/F7C11265 2007-03-09 [expires: 2012-03-01]\n"
-"          Key fingerprint = FC8A EEF1 792E EE71 D721  7D47 D0CF 963D F7C1 1265\n"
-"    uid                  Karsten Loesing &lt;karsten.loesing@xxxxxxx&gt;\n"
-"    sub   2048g/75D85E4B 2007-03-09 [expires: 2012-03-01]\n"
-"\n"
-"    pub   1024D/22F6856F 2006-08-19\n"
-"          Key fingerprint = DDB4 6B5B 7950 CD47 E59B  5189 4C09 25CF 22F6 856F\n"
-"    uid                  Robert Hogan &lt;robert@xxxxxxxxxxxxxxx&gt;\n"
-"    sub   1024g/FC4A9460 2006-08-19\n"
-"\n"
-"    pub   3072D/B374CBD2 2010-06-09 [expires: 2011-06-09]\n"
-"   \t  Key fingerprint = B92B CA64 72F7 C6F0 8D47  8503 D2AC D203 B374 CBD2\n"
-"    uid                  Nathan of Guardian &lt;nathan@xxxxxxxxxxxxxxxxxxxx&gt;\n"
-"    sub   4096g/B5878C3B 2010-06-09 [expires: 2011-06-09]\n"
-"\n"
-"    pub   2048R/886DDD89 2009-09-04 [expires: 2014-09-03]\n"
-"      Key fingerprint = A3C4 F0F9 79CA A22C DBA8  F512 EE8C BC9E 886D DD89\n"
-"    uid                  deb.torproject.org archive signing key\n"
-"    sub   2048R/219EC810 2009-09-04 [expires: 2012-09-03]\n"
-"    "
 msgstr ""
-"    pub   1024D/28988BF5 2000-02-27\n"
-"          Key fingerprint = B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
-"    uid                  Roger Dingledine &lt;arma@xxxxxxx&gt;\n"
-"\n"
-"    pub   3072R/165733EA 2004-07-03\n"
-"          Key fingerprint = B35B F85B F194 89D0 4E28  C33C 2119 4EBB 1657 33EA\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxxx&gt;\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxx&gt;\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxxxx&gt;\n"
-"\n"
-"    pub  1024D/31B0974B 2003-07-17\n"
-"         Key fingerprint = 0295 9AA7 190A B9E9 027E  0736 3B9D 093F 31B0 974B\n"
-"    uid                  Andrew Lewman (phobos) &lt;phobos@xxxxxxxxxx&gt;\n"
-"    uid                  Andrew Lewman &lt;andrew@xxxxxxxxxx&gt;\n"
-"    uid                  Andrew Lewman &lt;andrew@xxxxxxxxxxxxxx&gt;\n"
-"    sub   4096g/B77F95F7 2003-07-17\n"
-"\n"
-"    pub   4096R/C82E0039 2003-03-24\n"
-"          Key fingerprint = 25FC 1614 B8F8 7B52 FF2F  99B9 62AF 4031 C82E 0039\n"
-"    uid                  Peter Palfrader\n"
-"    uid                  Peter Palfrader &lt;peter@xxxxxxxxxxxxx&gt;\n"
-"    uid                  Peter Palfrader &lt;weasel@xxxxxxxxxx&gt;\n"
-"\n"
-"    pub   1024D/9A753A6B 2009-09-11\n"
-"          Key fingerprint = 553D 7C2C 626E F16F 27F3  30BC 95E3 881D 9A75 3A6B\n"
-"    uid                  TomÃs Touceda &lt;chiiph@xxxxxxxxx&gt;\n"
-"    sub   1024g/33BE0E5B 2009-09-11\n"
-"\n"
-"    pub   1024D/5FA14861 2005-08-17\n"
-"          Key fingerprint = 9467 294A 9985 3C9C 65CB  141D AF7E 0E43 5FA1 4861\n"
-"    uid                  Matt Edman &lt;edmanm@xxxxxxx&gt;\n"
-"    uid                  Matt Edman &lt;Matt_Edman@xxxxxxxxxx&gt;\n"
-"    uid                  Matt Edman &lt;edmanm2@xxxxxxxxxx&gt;\n"
-"    sub   4096g/EA654E59 2005-08-17\n"
-"\n"
-"    pub   1024D/9ABBEEC6 2009-06-17\n"
-"          Key fingerprint = 6827 8CC5 DD2D 1E85 C4E4  5AD9 0445 B7AB 9ABB EEC6\n"
-"    uid                  Damian Johnson (www.atagar.com) &lt;atagar1@xxxxxxxxx&gt;\n"
-"    uid                  Damian Johnson &lt;atagar@xxxxxxxxxxxxxx&gt;\n"
-"    sub   2048g/146276B2 2009-06-17\n"
-"    sub   2048R/87F30690 2010-08-07\n"
-"\n"
-"    pub   4096R/E012B42D 2010-05-07\n"
-"          Key fingerprint = D8C9 AF51 CAA9 CAEA D3D8  9C9E A34F A745 E012 B42D\n"
-"    uid                  Jacob Appelbaum &lt;jacob@xxxxxxxxxxxxx&gt;\n"
-"    uid                  Jacob Appelbaum &lt;jacob@xxxxxxxxxxxxxx&gt;\n"
-"    sub   4096R/7CA91A52 2010-05-07 [expires: 2011-05-07]\n"
-"\n"
 "    pub   2048R/63FEE659 2003-10-16\n"
 "          Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\n"
 "    sub   2048R/EB399FD7 2003-10-16\n"
-"\n"
-"    pub   1024D/F1F5C9B5 2010-02-03\n"
-"          Key fingerprint = C2E3 4CFC 13C6 2BD9 2C75  79B5 6B8A AEB1 F1F5 C9B5\n"
-"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
-"    sub   1024g/7828F26A 2010-02-03\n"
-"\n"
-"    pub   1024D/DDC6C0AD 2006-07-26\n"
-"          Key fingerprint = BECD 90ED D1EE 8736 7980  ECF8 1B0C A30C DDC6 C0AD\n"
-"    uid                  Mike Perry &lt;mikeperry@xxxxxxxxxx&gt;\n"
-"    uid                  Mike Perry &lt;mikepery@xxxxxxxxxx&gt;\n"
-"    sub   4096g/AF0A91D7 2006-07-26\n"
-"\n"
-"    pub   1024D/F7C11265 2007-03-09 [expires: 2012-03-01]\n"
-"          Key fingerprint = FC8A EEF1 792E EE71 D721  7D47 D0CF 963D F7C1 1265\n"
-"    uid                  Karsten Loesing &lt;karsten.loesing@xxxxxxx&gt;\n"
-"    sub   2048g/75D85E4B 2007-03-09 [expires: 2012-03-01]\n"
-"\n"
-"    pub   1024D/22F6856F 2006-08-19\n"
-"          Key fingerprint = DDB4 6B5B 7950 CD47 E59B  5189 4C09 25CF 22F6 856F\n"
-"    uid                  Robert Hogan &lt;robert@xxxxxxxxxxxxxxx&gt;\n"
-"    sub   1024g/FC4A9460 2006-08-19\n"
-"\n"
-"    pub   3072D/B374CBD2 2010-06-09 [expires: 2011-06-09]\n"
-"   \t  Key fingerprint = B92B CA64 72F7 C6F0 8D47  8503 D2AC D203 B374 CBD2\n"
-"    uid                  Nathan of Guardian &lt;nathan@xxxxxxxxxxxxxxxxxxxx&gt;\n"
-"    sub   4096g/B5878C3B 2010-06-09 [expires: 2011-06-09]\n"
-"\n"
-"    pub   2048R/886DDD89 2009-09-04 [expires: 2014-09-03]\n"
-"      Key fingerprint = A3C4 F0F9 79CA A22C DBA8  F512 EE8C BC9E 886D DD89\n"
-"    uid                  deb.torproject.org archive signing key\n"
-"    sub   2048R/219EC810 2009-09-04 [expires: 2012-09-03]\n"
-"    "
 
-#. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:185
-msgid "Step Three: Verify the downloaded package"
-msgstr "Krok trzeci: weryfikacja pobranej paczki"
-
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:187
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:93
+#: /tmp/kzjpFaPDWT.xml:149
 msgid ""
 "To verify the signature of the package you downloaded, you will need to "
-"download the \".asc\" file as well."
-msgstr "Aby zweryfikowaÄ podpis pobranej paczki, musisz pobraÄ teÅ plik \".asc\"."
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:190
-msgid ""
-"In the following examples, the user Alice downloads packages for Windows, "
-"Mac OS X and Linux and also verifies the signature of each package. All "
-"files are saved on the desktop."
+"download the \".asc\" file as well. Assuming you downloaded the package and "
+"its signature to your Desktop, run:"
 msgstr ""
-"W nastÄpujÄcych przykÅadach, uÅytkownik Alicja pobiera paczki dla Windows, "
-"Mac OS X i Linuksa i weryfikuje podpis kaÅdej paczki. Wszystkie pliki sÄ "
-"zapisywane na pulpicie."
+"Aby zweryfikowaÄ podpis pobranej paczki, musisz pobraÄ teÅ plik \".asc\". "
+"ZakÅadajÄc, Åe pobrano paczkÄ i podpis na Pulpit, uruchom:"
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:195
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:97
 #, no-wrap
 msgid ""
 "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --verify C:\\Users\\Alice\\Desktop"
-"\\<file-win32-bundle-stable>.asc C:\\Users\\Alice\\Desktop\\<file-win32"
-"-bundle-stable>"
+"\\<file-win32-bundle-stable>.asc"
 msgstr ""
 "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --verify C:\\Users\\Alice\\Desktop"
-"\\<file-win32-bundle-stable>.asc C:\\Users\\Alice\\Desktop\\<file-win32"
-"-bundle-stable>"
+"\\<file-win32-bundle-stable>.asc"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:197
-msgid "<b>Mac:</b>"
-msgstr "<b>Mac:</b>"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:99
+#: /tmp/kzjpFaPDWT.xml:155
+msgid "The output should say \"Good signature\":"
+msgstr "W wyniku powinno siÄ pojaciÄ \"PrawidÅowy podpis\" (\"Good signature\"):"
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:198
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:102
+#: /tmp/kzjpFaPDWT.xml:158
 #, no-wrap
 msgid ""
-"gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc /Users/Alice"
-"/<file-osx-x86-bundle-stable>"
-msgstr ""
-"gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc /Users/Alice"
-"/<file-osx-x86-bundle-stable>"
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:200
-msgid "<b>Linux</b>"
-msgstr "<b>Linux</b>"
-
-#. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:201
-#, no-wrap
-msgid ""
-"gpg --verify /home/Alice/Desktop/<file-source-stable>.asc "
-"/home/Alice/Desktop/<file-source-stable>"
-msgstr ""
-"gpg --verify /home/Alice/Desktop/<file-source-stable>.asc "
-"/home/Alice/Desktop/<file-source-stable>"
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:204
-msgid ""
-"After verifying, GnuPG will come back saying something like \"Good "
-"signature\" or \"BAD signature\". The output should look something like "
-"this:"
-msgstr ""
-"Po weryfikacji GnuPG wyÅwietli informacjÄ w stylu \"Good signature\" "
-"(\"Poprawny podpis\") lub \"BAD signature\" (\"NIEPOPRAWNY podpis\"). "
-"Powinno to wyglÄdaÄ podobnie do tego:"
-
-#. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:209
-#, no-wrap
-msgid ""
-"    gpg: Signature made Tue 16 Mar 2010 05:55:17 AM CET using DSA key ID 28988BF5\n"
-"    gpg: Good signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
+"    gpg: Signature made Wed 31 Aug 2011 06:37:01 PM EDT using RSA key ID 63FEE659\n"
+"    gpg: Good signature from \"Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\"\n"
+"    gpg:                 aka \"Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\"\n"
+"    gpg:                 aka \"Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\"\n"
 "    gpg: WARNING: This key is not certified with a trusted signature!\n"
 "    gpg:          There is no indication that the signature belongs to the owner.\n"
-"    Primary key fingerprint: B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
+"    Primary key fingerprint: 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
 "    "
 msgstr ""
-"    gpg: Signature made Tue 16 Mar 2010 05:55:17 AM CET using DSA key ID 28988BF5\n"
-"    gpg: Good signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
+"    gpg: Signature made Wed 31 Aug 2011 06:37:01 PM EDT using RSA key ID 63FEE659\n"
+"    gpg: Good signature from \"Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\"\n"
+"    gpg:                 aka \"Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\"\n"
+"    gpg:                 aka \"Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\"\n"
 "    gpg: WARNING: This key is not certified with a trusted signature!\n"
 "    gpg:          There is no indication that the signature belongs to the owner.\n"
-"    Primary key fingerprint: B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
+"    Primary key fingerprint: 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
 "    "
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:217
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:112
+#: /tmp/kzjpFaPDWT.xml:168
 msgid ""
 "Notice that there is a warning because you haven't assigned a trust index to"
 " this person. This means that GnuPG verified that the key made that "
@@ -600,71 +292,121 @@
 "sposobem jest spotkanie siÄ z nimi osobiÅcie i wymiana odciskÃw palcÃw "
 "kluczy."
 
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:119
+msgid "Mac OS X"
+msgstr "Mac OS X"
+
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:224
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:122
 msgid ""
-"For your reference, this is an example of a <em>BAD</em> verification. It "
-"means that the signature and file contents do not match. In this case, you "
-"should not trust the file contents:"
+"You need to have GnuPG installed before you can verify signatures. You can "
+"install it from <a "
+"href=\"http://macgpg.sourceforge.net/\";>http://macgpg.sourceforge.net/</a>."
 msgstr ""
-"Do Waszej wiadomoÅci, oto jest przykÅad <em>NIEPRAWIDÅOWEJ</em> (nieudanej) "
-"weryfikacji. Oznacza ona, Åe podpis i zawartoÅÄ pliku nie pasujÄ. W takim "
-"przypadku, nie powinniÅcie ufaÄ zawartoÅci pliku"
+"Musisz mieÄ zainstalowane GnuPG, zanim bÄdzie moÅna weryfikowaÄ podpisy. "
+"MoÅesz je zainstalowaÄ z <a "
+"href=\"http://macgpg.sourceforge.net/\";>http://macgpg.sourceforge.net/</a>."
 
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:127
+msgid ""
+"Once it's installed, use GnuPG to import the key that signed your package. "
+"Erinn Clark signs the Tor Browser Bundles. Import her key (0x63FEE659) by "
+"starting the terminal (under \"Applications\")  and typing:"
+msgstr ""
+"Po instalacji, uÅyj GnuPG do importu klucza, ktÃrym podpisano TwojÄ paczkÄ. "
+"Erinn Clark podpisuje Paczki Tora z PrzeglÄdarkÄ. Zaimportujcie jej klucz "
+"(0x63FEE659), uruchamiajÄc terminal (w \"Applications\") i wpisujÄc:"
+
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:229
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:132
 #, no-wrap
+msgid "gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659"
+msgstr "gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659"
+
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:137
+#, no-wrap
+msgid "gpg --fingerprint 0x63FEE659"
+msgstr "gpg --fingerprint 0x63FEE659"
+
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:141
+#, no-wrap
 msgid ""
-"    gpg: Signature made Tue 20 Apr 2010 12:22:32 PM CEST using DSA key ID 28988BF5\n"
-"    gpg: BAD signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
+"    pub   2048R/63FEE659 2003-10-16\n"
+"          Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\n"
+"    sub   2048R/EB399FD7 2003-10-16\n"
 "    "
 msgstr ""
-"    gpg: Signature made Tue 20 Apr 2010 12:22:32 PM CEST using DSA key ID 28988BF5\n"
-"    gpg: BAD signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
+"    pub   2048R/63FEE659 2003-10-16\n"
+"          Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\n"
+"    sub   2048R/EB399FD7 2003-10-16\n"
 "    "
 
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:153
+#, no-wrap
+msgid "gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc"
+msgstr "gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc"
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:175
+msgid "Linux"
+msgstr "Linux"
+
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:233
-msgid "<b>RPM-based distributions :</b>"
-msgstr "<b>Dystrybucje oparte na RPM :</b>"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:178
+msgid ""
+"Most Linux distributions come with gpg preinstalled, so users who want to "
+"verify the Tor Browser Bundle for Linux (or the source tarball) can just "
+"follow along with the instructions above for \"Mac OS X\"."
+msgstr ""
+"WiÄkszoÅÄ dystrybucji Linuksa ma preinstalowane gpg, wiÄc uÅytkownicy chcÄcy"
+" sprawdziÄ PaczkÄ Tora z PrzeglÄdarkÄ dla Linuksa (lub paczkÄ z kodem "
+"ÅrÃdÅowym) mogÄ po prostu postÄpowaÄ zgodnie z powyÅszymi instrukcjami dla "
+"\"Mac OS X\"."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:234
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:183
 msgid ""
-"In order to manually verify the signatures on the RPM packages, you must use"
-" the <code>rpm</code> tool like so: <br />"
+"If you're using the <b>Debian</b> packages, you should read the instructions"
+" on <a href=\"<page docs/debian>#packages\">importing these keys to apt</a>."
 msgstr ""
-"W celu rÄcznej weryfikacji podpisÃw na paczkach RPM, musicie uÅyÄ narzÄdzia "
-"<code>rpm</code> w ten sposÃb: <br />"
+"JeÅli uÅywasz paczek <b>Debian</b>, powinieneÅ/aÅ przeczytaÄ instrukcje o <a"
+" href=\"<page docs/debian>#packages\">importowaniu tych kluczy do apt</a>."
 
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:187
+msgid ""
+"If you're using the <b>RPMs</b>, you can manually verify the signatures on "
+"the RPM packages by"
+msgstr ""
+"JeÅli uÅywasz paczek <b>RPM</b>, moÅesz rÄcznie sprawdziÄ podpis na tych "
+"paczkach poprzez"
+
 #. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:237
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:188
 #, no-wrap
 msgid "rpm -K filename.rpm"
 msgstr "rpm -K filename.rpm"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:240
-msgid "<b>Debian:</b>"
-msgstr "<b>Debian:</b>"
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:241
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:190
 msgid ""
-"If you are running Tor on Debian you should read the instructions on <a "
-"href=\"<page docs/debian>#packages\">importing these keys to apt</a>."
+"See <a "
+"href=\"http://www.gnupg.org/documentation/\";>http://www.gnupg.org/documentation/</a>"
+" to learn more about GPG."
 msgstr ""
-"JeÅli uÅywacie Tora na Debianie, powinniÅcie przeczytaÄ instrukcje o <a "
-"href=\"<page docs/debian>#packages\">importowaniu tych kluczy do programu "
-"apt</a>."
+"WejdÅ na <a "
+"href=\"http://www.gnupg.org/documentation/\";>http://www.gnupg.org/documentation/</a>,"
+" by dowiedzieÄ siÄ wiÄcej o GPG."
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:244
-msgid ""
-"If you wish to learn more about GPG, see <a "
-"href=\"http://www.gnupg.org/documentation/\";>http://www.gnupg.org/documentation/</a>."
-msgstr ""
-"JeÅli chcecie dowiedzieÄ siÄ wiÄcej o GPG, wejdÅcie na <a "
-"href=\"http://www.gnupg.org/documentation/\";>http://www.gnupg.org/documentation/</a>."
 
-

Modified: translation/trunk/projects/website/po/pl_PL/docs/3-low.rpms.po
===================================================================
--- translation/trunk/projects/website/po/pl_PL/docs/3-low.rpms.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/pl_PL/docs/3-low.rpms.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-08-10 08:19+0200\n"
-"PO-Revision-Date: 2011-08-13 12:47+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-25 09:04+0000\n"
 "Last-Translator: bogdrozd <bog.d@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@
 "opartych na RPM.</a>"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/rpms.wml:16 /tmp/Xp_xTVMYLa.xml:70
+#: /home/runa/tor/website/docs/en/rpms.wml:16 /tmp/qK7cG0J74c.xml:71
 msgid "<br>"
 msgstr "<br>"
 
@@ -97,13 +97,15 @@
 #: /home/runa/tor/website/docs/en/rpms.wml:36
 msgid ""
 "If you wish to track the stable releases of Tor, you should substitute "
-"DISTRIBUTION with one of the following: centos4, centos5, fc13, fc14, suse"
+"DISTRIBUTION with one of the following: centos4, centos5, fc13, fc14, fc15, "
+"suse"
 msgstr ""
 "JeÅli chcecie byÄ na bieÅÄco z wersjami stabilnymi Tora, powinniÅcie zmieniÄ"
-" DISTRIBUTION na jedno z nastÄpujÄcych: centos4, centos5, fc13, fc14, suse"
+" DISTRIBUTION na jedno z nastÄpujÄcych: centos4, centos5, fc13, fc14, fc15, "
+"suse"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:39
+#: /home/runa/tor/website/docs/en/rpms.wml:40
 msgid ""
 "To track experimental releases, substitute DISTRIBUTION with one of these: "
 "centos4-experimental, centos5-experimental, fc13-experimental, "
@@ -115,18 +117,18 @@
 "experimental"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:44
+#: /home/runa/tor/website/docs/en/rpms.wml:45
 msgid "Then install Tor by running:"
 msgstr "Potem zainstalujcie Tora, uruchamiajÄc:"
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/rpms.wml:46
+#: /home/runa/tor/website/docs/en/rpms.wml:47
 #, no-wrap
 msgid "yum install tor"
 msgstr "yum install tor"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:49
+#: /home/runa/tor/website/docs/en/rpms.wml:50
 msgid ""
 "Now Tor is installed and running. Move on to <a href=\"<page docs/tor-doc-"
 "unix>#using\">step two</a> of the \"Tor on Linux/Unix\" instructions."
@@ -136,7 +138,7 @@
 "Linux/Unix\""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:55
+#: /home/runa/tor/website/docs/en/rpms.wml:56
 msgid ""
 "The DNS name <code>deb.torproject.org</code> is actually a set of "
 "independent servers in a DNS round-robin configuration.  If for some reason "
@@ -151,17 +153,17 @@
 "<code>mirror.netcologne.de</code> lub <code>tor.mirror.youam.de</code>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/rpms.wml:64
+#: /home/runa/tor/website/docs/en/rpms.wml:65
 msgid "<hr> <hr> <a id=\"source\"></a>"
 msgstr "<hr> <hr> <a id=\"source\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/rpms.wml:69
+#: /home/runa/tor/website/docs/en/rpms.wml:70
 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>"
 msgstr "<a class=\"anchor\" href=\"#source\">Kompilacja ze ÅrÃdeÅ</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:73
+#: /home/runa/tor/website/docs/en/rpms.wml:74
 msgid ""
 "If you'd like to build from source, please follow the <a href=\"<gitblob>doc"
 "/tor-rpm-creation.txt\">RPM creation instructions</a>."
@@ -170,12 +172,12 @@
 "href=\"<gitblob>doc/tor-rpm-creation.txt\">instrukcjami tworzenia RPM</a>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/rpms.wml:77
+#: /home/runa/tor/website/docs/en/rpms.wml:78
 msgid "<hr>"
 msgstr "<hr>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:79
+#: /home/runa/tor/website/docs/en/rpms.wml:80
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "about/contact>\">send them to us</a>. Thanks!"

Added: translation/trunk/projects/website/po/pl_PL/docs/4-optional.signing-keys.po
===================================================================
--- translation/trunk/projects/website/po/pl_PL/docs/4-optional.signing-keys.po	                        (rev 0)
+++ translation/trunk/projects/website/po/pl_PL/docs/4-optional.signing-keys.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -0,0 +1,320 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-09-21 20:22+0200\n"
+"PO-Revision-Date: 2011-09-25 09:23+0000\n"
+"Last-Translator: bogdrozd <bog.d@xxxxxxxxx>\n"
+"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl_PL\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/signing-keys.wml:8
+msgid ""
+"<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page docs/verifying-"
+"signatures>\">Verifying Signatures</a>"
+msgstr ""
+"<a href=\"<page index>\">Start &raquo; </a> <a href=\"<page docs/verifying-"
+"signatures>\">Weryfikacja podpisÃw</a> "
+
+#. type: Content of: <div><div><h1>
+#: /home/runa/tor/website/docs/en/signing-keys.wml:12
+msgid "Which PGP keys sign which packages"
+msgstr "KtÃre klucze PGP podpisujÄ ktÃre paczki"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/signing-keys.wml:13
+msgid "<hr>"
+msgstr "<hr>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/signing-keys.wml:15
+msgid "The signing keys we use are:"
+msgstr "Uzywane przez nas klucze to:"
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/signing-keys.wml:17
+msgid ""
+"Roger Dingledine (0x28988BF5 and 0x19F78451) or Nick Mathewson (0x165733EA, "
+"or its subkey 0x8D29319A) sign the Tor source code tarballs."
+msgstr ""
+"Roger Dingledine (0x28988BF5 i 0x19F78451) lub Nick Mathewson (0x165733EA "
+"lub jego podklucz 0x8D29319A) podpisuje plik z kodem ÅrÃdÅowym."
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/signing-keys.wml:20
+msgid ""
+"Erinn Clark (0x63FEE659) signs the Tor Browser Bundles, Vidalia bundles, and"
+" many other packages. She signs RPMs with her other key (0xF1F5C9B5). Andrew"
+" Lewman (0x31B0974B) used to sign packages for Windows and OS X."
+msgstr ""
+"Erinn Clark (0x63FEE659) podpisuje PaczkÄ Tora z PrzeglÄdarkÄ, paczki z "
+"VidaliÄ i wiele innych paczek. Podpisuje pliki RPM swoim innym kluczem "
+"(0xF1F5C9B5). Andrew Lewman (0x31B0974B) podpisywaÅ paczki dla Windows i OS "
+"X."
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/signing-keys.wml:24
+msgid ""
+"Tor Project Archive (0x886DDD89) signs the deb.torproject.org repositories "
+"and archives."
+msgstr ""
+"Tor Project Archive (0x886DDD89) podpisuje repozytoria deb.torproject.org i "
+"archiwa."
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/signing-keys.wml:26
+msgid "Nathan Freitas (0xB374CBD2) signs the Android APK file for Orbot."
+msgstr "Nathan Freitas (0xB374CBD2) podpisuje plik Android APK z Orbotem."
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/signing-keys.wml:28
+msgid ""
+"TomÃs Touceda (0x9A753A6B) signs current Vidalia tarballs. Matt Edman "
+"(0x5FA14861) signed older Vidalia tarballs."
+msgstr ""
+"TomÃs Touceda (0x9A753A6B) podpisuje aktualne paczki z kodem Vidalia. Matt "
+"Edman (0x5FA14861) podpisywaÅ starsze paczki z kodem Vidalia."
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/signing-keys.wml:30
+msgid "Damian Johnson (0x9ABBEEC6) signs Arm releases."
+msgstr "Damian Johnson (0x9ABBEEC6) podpisuje wydania Arma."
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/signing-keys.wml:31
+msgid "Mike Perry (0xDDC6C0AD) signs the Torbutton xpi."
+msgstr "Mike Perry (0xDDC6C0AD) podpisuje plik xpi Torbuttona."
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/signing-keys.wml:32
+msgid "Karsten Loesing (0xF7C11265) signs the metrics archives and tools."
+msgstr "Karsten Loesing (0xF7C11265) podpisuje archiwa i narzÄdzia pomiarÃw."
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/signing-keys.wml:34
+msgid "Robert Hogan (0x22F6856F) signs torsocks release tarballs."
+msgstr "Robert Hogan (0x22F6856F) podpisuje paczki z kodem torsocks."
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/signing-keys.wml:35
+msgid ""
+"Other developers include Peter Palfrader (0xC82E0039, or its subkey "
+"0xE1DEC577) and Jacob Appelbaum (0xE012B42D)."
+msgstr ""
+"Inni deweloperzy to Peter Palfrader (0xC82E0039 lub jego podklucz "
+"0xE1DEC577) i Jacob Appelbaum (0xE012B42D)."
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/signing-keys.wml:39
+msgid "The fingerprints for the keys should be:"
+msgstr "Odciski palcÃw kluczy powinny byÄ nastÄpujÄce:"
+
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/signing-keys.wml:42
+#, no-wrap
+msgid ""
+"    pub   1024D/28988BF5 2000-02-27\n"
+"          Key fingerprint = B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
+"    uid                  Roger Dingledine &lt;arma@xxxxxxx&gt;\n"
+"\n"
+"    pub   4096R/19F78451 2010-05-07\n"
+"          Key fingerprint = F65C E37F 04BA 5B36 0AE6  EE17 C218 5258 19F7 8451\n"
+"    uid                  Roger Dingledine &lt;arma@xxxxxxx&gt;\n"
+"    uid                  Roger Dingledine &lt;arma@xxxxxxxxxxxxx&gt;\n"
+"    uid                  Roger Dingledine &lt;arma@xxxxxxxxxxxxxx&gt;\n"
+"    sub   4096R/BA694D6A 2011-04-26 [expires: 2012-05-08]\n"
+"\n"
+"    pub   3072R/165733EA 2004-07-03\n"
+"          Key fingerprint = B35B F85B F194 89D0 4E28  C33C 2119 4EBB 1657 33EA\n"
+"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxxx&gt;\n"
+"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxx&gt;\n"
+"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxxxx&gt;\n"
+"    uid                  [jpeg image of size 3369]\n"
+"    sub   3072R/8D29319A 2004-07-03\n"
+"    sub   3072R/F25B8E5E 2004-07-03\n"
+"\n"
+"    pub   2048R/63FEE659 2003-10-16\n"
+"          Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\n"
+"    sub   2048R/EB399FD7 2003-10-16\n"
+"\n"
+"    pub   1024D/F1F5C9B5 2010-02-03\n"
+"          Key fingerprint = C2E3 4CFC 13C6 2BD9 2C75  79B5 6B8A AEB1 F1F5 C9B5\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
+"    sub   1024g/7828F26A 2010-02-03\n"
+"\n"
+"    pub  1024D/31B0974B 2003-07-17\n"
+"         Key fingerprint = 0295 9AA7 190A B9E9 027E  0736 3B9D 093F 31B0 974B\n"
+"    uid                  Andrew Lewman (phobos) &lt;phobos@xxxxxxxxxx&gt;\n"
+"    uid                  Andrew Lewman &lt;andrew@xxxxxxxxxx&gt;\n"
+"    uid                  Andrew Lewman &lt;andrew@xxxxxxxxxxxxxx&gt;\n"
+"    sub   4096g/B77F95F7 2003-07-17\n"
+"\n"
+"    pub   2048R/886DDD89 2009-09-04 [expires: 2014-09-03]\n"
+"          Key fingerprint = A3C4 F0F9 79CA A22C DBA8  F512 EE8C BC9E 886D DD89\n"
+"    uid                  deb.torproject.org archive signing key\n"
+"    sub   2048R/219EC810 2009-09-04 [expires: 2012-09-03]\n"
+"\n"
+"    pub   3072D/B374CBD2 2010-06-09 [expires: 2012-06-09]\n"
+"          Key fingerprint = B92B CA64 72F7 C6F0 8D47  8503 D2AC D203 B374 CBD2\n"
+"    uid                  Nathan of Guardian &lt;nathan@xxxxxxxxxxxxxxxxxxxx&gt;\n"
+"    uid                  [jpeg image of size 6978]\n"
+"    sub   4096g/B5878C3B 2010-06-09 [expires: 2012-06-09]\n"
+"\n"
+"    pub   1024D/9A753A6B 2009-09-11\n"
+"          Key fingerprint = 553D 7C2C 626E F16F 27F3  30BC 95E3 881D 9A75 3A6B\n"
+"    uid                  TomÃs Touceda &lt;chiiph@xxxxxxxxx&gt;\n"
+"    sub   1024g/33BE0E5B 2009-09-11\n"
+"\n"
+"    pub   1024D/5FA14861 2005-08-17\n"
+"          Key fingerprint = 9467 294A 9985 3C9C 65CB  141D AF7E 0E43 5FA1 4861\n"
+"    uid                  Matt Edman &lt;edmanm@xxxxxxx&gt;\n"
+"    uid                  Matt Edman &lt;Matt_Edman@xxxxxxxxxx&gt;\n"
+"    uid                  Matt Edman &lt;edmanm2@xxxxxxxxxx&gt;\n"
+"    sub   4096g/EA654E59 2005-08-17\n"
+"\n"
+"    pub   1024D/9ABBEEC6 2009-06-17\n"
+"          Key fingerprint = 6827 8CC5 DD2D 1E85 C4E4  5AD9 0445 B7AB 9ABB EEC6\n"
+"    uid                  Damian Johnson (www.atagar.com) &lt;atagar1@xxxxxxxxx&gt;\n"
+"    uid                  Damian Johnson &lt;atagar@xxxxxxxxxxxxxx&gt;\n"
+"    sub   2048g/146276B2 2009-06-17\n"
+"    sub   2048R/87F30690 2010-08-07\n"
+"\n"
+"    pub   1024D/DDC6C0AD 2006-07-26\n"
+"          Key fingerprint = BECD 90ED D1EE 8736 7980  ECF8 1B0C A30C DDC6 C0AD\n"
+"    uid                  Mike Perry &lt;mikeperry@xxxxxxxxxx&gt;\n"
+"    uid                  Mike Perry &lt;mikepery@xxxxxxxxxx&gt;\n"
+"    sub   4096g/AF0A91D7 2006-07-26\n"
+"\n"
+"    pub   1024D/F7C11265 2007-03-09 [expires: 2012-03-01]\n"
+"          Key fingerprint = FC8A EEF1 792E EE71 D721  7D47 D0CF 963D F7C1 1265\n"
+"    uid                  Karsten Loesing &lt;karsten.loesing@xxxxxxx&gt;\n"
+"    sub   2048g/75D85E4B 2007-03-09 [expires: 2012-03-01]\n"
+"\n"
+"    pub   1024D/22F6856F 2006-08-19\n"
+"          Key fingerprint = DDB4 6B5B 7950 CD47 E59B  5189 4C09 25CF 22F6 856F\n"
+"    uid                  Robert Hogan &lt;robert@xxxxxxxxxxxxxxx&gt;\n"
+"    sub   1024g/FC4A9460 2006-08-19\n"
+"\n"
+"    pub   4096R/C82E0039 2003-03-24\n"
+"          Key fingerprint = 25FC 1614 B8F8 7B52 FF2F  99B9 62AF 4031 C82E 0039\n"
+"    uid                  Peter Palfrader\n"
+"    uid                  Peter Palfrader &lt;peter@xxxxxxxxxxxxx&gt;\n"
+"    uid                  Peter Palfrader &lt;weasel@xxxxxxxxxx&gt;\n"
+"\n"
+"    pub   4096R/42DDE84F 2011-04-19 [expires: 2012-04-18]\n"
+"    uid                  Jacob Appelbaum &lt;jacob@xxxxxxxxxxxxxx&gt;\n"
+"    uid                  Jacob Appelbaum &lt;jacob@xxxxxxxxxxxxx&gt;\n"
+"    sub   4096R/437C9647 2011-04-19 [expires: 2012-04-18]\n"
+"    "
+msgstr ""
+"    pub   1024D/28988BF5 2000-02-27\n"
+"          Key fingerprint = B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
+"    uid                  Roger Dingledine &lt;arma@xxxxxxx&gt;\n"
+"\n"
+"    pub   4096R/19F78451 2010-05-07\n"
+"          Key fingerprint = F65C E37F 04BA 5B36 0AE6  EE17 C218 5258 19F7 8451\n"
+"    uid                  Roger Dingledine &lt;arma@xxxxxxx&gt;\n"
+"    uid                  Roger Dingledine &lt;arma@xxxxxxxxxxxxx&gt;\n"
+"    uid                  Roger Dingledine &lt;arma@xxxxxxxxxxxxxx&gt;\n"
+"    sub   4096R/BA694D6A 2011-04-26 [expires: 2012-05-08]\n"
+"\n"
+"    pub   3072R/165733EA 2004-07-03\n"
+"          Key fingerprint = B35B F85B F194 89D0 4E28  C33C 2119 4EBB 1657 33EA\n"
+"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxxx&gt;\n"
+"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxx&gt;\n"
+"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxxxx&gt;\n"
+"    uid                  [jpeg image of size 3369]\n"
+"    sub   3072R/8D29319A 2004-07-03\n"
+"    sub   3072R/F25B8E5E 2004-07-03\n"
+"\n"
+"    pub   2048R/63FEE659 2003-10-16\n"
+"          Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\n"
+"    sub   2048R/EB399FD7 2003-10-16\n"
+"\n"
+"    pub   1024D/F1F5C9B5 2010-02-03\n"
+"          Key fingerprint = C2E3 4CFC 13C6 2BD9 2C75  79B5 6B8A AEB1 F1F5 C9B5\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
+"    sub   1024g/7828F26A 2010-02-03\n"
+"\n"
+"    pub  1024D/31B0974B 2003-07-17\n"
+"         Key fingerprint = 0295 9AA7 190A B9E9 027E  0736 3B9D 093F 31B0 974B\n"
+"    uid                  Andrew Lewman (phobos) &lt;phobos@xxxxxxxxxx&gt;\n"
+"    uid                  Andrew Lewman &lt;andrew@xxxxxxxxxx&gt;\n"
+"    uid                  Andrew Lewman &lt;andrew@xxxxxxxxxxxxxx&gt;\n"
+"    sub   4096g/B77F95F7 2003-07-17\n"
+"\n"
+"    pub   2048R/886DDD89 2009-09-04 [expires: 2014-09-03]\n"
+"          Key fingerprint = A3C4 F0F9 79CA A22C DBA8  F512 EE8C BC9E 886D DD89\n"
+"    uid                  deb.torproject.org archive signing key\n"
+"    sub   2048R/219EC810 2009-09-04 [expires: 2012-09-03]\n"
+"\n"
+"    pub   3072D/B374CBD2 2010-06-09 [expires: 2012-06-09]\n"
+"          Key fingerprint = B92B CA64 72F7 C6F0 8D47  8503 D2AC D203 B374 CBD2\n"
+"    uid                  Nathan of Guardian &lt;nathan@xxxxxxxxxxxxxxxxxxxx&gt;\n"
+"    uid                  [jpeg image of size 6978]\n"
+"    sub   4096g/B5878C3B 2010-06-09 [expires: 2012-06-09]\n"
+"\n"
+"    pub   1024D/9A753A6B 2009-09-11\n"
+"          Key fingerprint = 553D 7C2C 626E F16F 27F3  30BC 95E3 881D 9A75 3A6B\n"
+"    uid                  TomÃs Touceda &lt;chiiph@xxxxxxxxx&gt;\n"
+"    sub   1024g/33BE0E5B 2009-09-11\n"
+"\n"
+"    pub   1024D/5FA14861 2005-08-17\n"
+"          Key fingerprint = 9467 294A 9985 3C9C 65CB  141D AF7E 0E43 5FA1 4861\n"
+"    uid                  Matt Edman &lt;edmanm@xxxxxxx&gt;\n"
+"    uid                  Matt Edman &lt;Matt_Edman@xxxxxxxxxx&gt;\n"
+"    uid                  Matt Edman &lt;edmanm2@xxxxxxxxxx&gt;\n"
+"    sub   4096g/EA654E59 2005-08-17\n"
+"\n"
+"    pub   1024D/9ABBEEC6 2009-06-17\n"
+"          Key fingerprint = 6827 8CC5 DD2D 1E85 C4E4  5AD9 0445 B7AB 9ABB EEC6\n"
+"    uid                  Damian Johnson (www.atagar.com) &lt;atagar1@xxxxxxxxx&gt;\n"
+"    uid                  Damian Johnson &lt;atagar@xxxxxxxxxxxxxx&gt;\n"
+"    sub   2048g/146276B2 2009-06-17\n"
+"    sub   2048R/87F30690 2010-08-07\n"
+"\n"
+"    pub   1024D/DDC6C0AD 2006-07-26\n"
+"          Key fingerprint = BECD 90ED D1EE 8736 7980  ECF8 1B0C A30C DDC6 C0AD\n"
+"    uid                  Mike Perry &lt;mikeperry@xxxxxxxxxx&gt;\n"
+"    uid                  Mike Perry &lt;mikepery@xxxxxxxxxx&gt;\n"
+"    sub   4096g/AF0A91D7 2006-07-26\n"
+"\n"
+"    pub   1024D/F7C11265 2007-03-09 [expires: 2012-03-01]\n"
+"          Key fingerprint = FC8A EEF1 792E EE71 D721  7D47 D0CF 963D F7C1 1265\n"
+"    uid                  Karsten Loesing &lt;karsten.loesing@xxxxxxx&gt;\n"
+"    sub   2048g/75D85E4B 2007-03-09 [expires: 2012-03-01]\n"
+"\n"
+"    pub   1024D/22F6856F 2006-08-19\n"
+"          Key fingerprint = DDB4 6B5B 7950 CD47 E59B  5189 4C09 25CF 22F6 856F\n"
+"    uid                  Robert Hogan &lt;robert@xxxxxxxxxxxxxxx&gt;\n"
+"    sub   1024g/FC4A9460 2006-08-19\n"
+"\n"
+"    pub   4096R/C82E0039 2003-03-24\n"
+"          Key fingerprint = 25FC 1614 B8F8 7B52 FF2F  99B9 62AF 4031 C82E 0039\n"
+"    uid                  Peter Palfrader\n"
+"    uid                  Peter Palfrader &lt;peter@xxxxxxxxxxxxx&gt;\n"
+"    uid                  Peter Palfrader &lt;weasel@xxxxxxxxxx&gt;\n"
+"\n"
+"    pub   4096R/42DDE84F 2011-04-19 [expires: 2012-04-18]\n"
+"    uid                  Jacob Appelbaum &lt;jacob@xxxxxxxxxxxxxx&gt;\n"
+"    uid                  Jacob Appelbaum &lt;jacob@xxxxxxxxxxxxx&gt;\n"
+"    sub   4096R/437C9647 2011-04-19 [expires: 2012-04-18]\n"
+"    "
+
+

Modified: translation/trunk/projects/website/po/pt_BR/about/3-low.contact.po
===================================================================
--- translation/trunk/projects/website/po/pt_BR/about/3-low.contact.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/pt_BR/about/3-low.contact.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-07-08 08:44+0200\n"
-"PO-Revision-Date: 2011-07-12 13:54+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 00:57+0000\n"
 "Last-Translator: brunogola <brunogola@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -55,6 +55,13 @@
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/about/en/contact.wml:24
 msgid ""
+"<i>community-support at lists.torproject.org</i> is for volunteers helping "
+"people with questions about using or configuring Tor."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/contact.wml:27
+msgid ""
 "<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page "
 "getinvolved/translation>\">website translations</a> into place, and help "
 "answer questions about existing and new translations."
@@ -64,14 +71,14 @@
 "      e ajudar a responder questÃes sobre traduÃÃes novas ou existentes."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:27
+#: /home/runa/tor/website/about/en/contact.wml:30
 msgid ""
 "<i>tordnsel at torproject.org</i> is the alias for the people responsible "
 "for the tordns exitlist."
 msgstr "atalho para chegar Ãs pessoas responsaveis pelo tordns exitlist."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:29
+#: /home/runa/tor/website/about/en/contact.wml:32
 msgid ""
 "<i>donations at torproject.org</i> is for questions and comments about <a "
 "href=\"<page donate/donate>\">getting money to the developers</a>. More "
@@ -84,7 +91,7 @@
 "      Tor</a>. Ficaremos felizes em ajuda-lo a pensar em formas criativas para contribuir."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:34
+#: /home/runa/tor/website/about/en/contact.wml:37
 msgid ""
 "<i>execdir at torproject.org</i> is for press/media, questions and comments "
 "about Tor the non-profit corporation: trademark questions, affiliation and "
@@ -96,12 +103,12 @@
 "      e coordenaÃÃo, grandes doaÃÃes, questÃes contratuais, licenciamento e certificaÃÃo, etc."
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:40
+#: /home/runa/tor/website/about/en/contact.wml:43
 msgid "Identi.ca"
 msgstr "Identi.ca"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:41
+#: /home/runa/tor/website/about/en/contact.wml:44
 msgid ""
 "<a id=\"identica\"></a> Contact us via our microblogging Identi.ca account "
 "at <a href=\"https://identi.ca/torproject\";>torproject</a>."
@@ -111,17 +118,17 @@
 "    href=\"https://identi.ca/torproject\";>torproject</a>."
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:45
+#: /home/runa/tor/website/about/en/contact.wml:48
 msgid "IRC"
 msgstr "IRC"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:46
+#: /home/runa/tor/website/about/en/contact.wml:49
 msgid "<a id=\"irc\"></a>"
 msgstr "<a id=\"irc\"></a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:47
+#: /home/runa/tor/website/about/en/contact.wml:50
 msgid ""
 "Tor users and developers can also be found in the following channels on <a "
 "href=\"http://www.oftc.net/oftc/\";>OFTC</a>:"
@@ -130,7 +137,7 @@
 "    href=\"http://www.oftc.net/oftc/\";>OFTC</a>:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:51
+#: /home/runa/tor/website/about/en/contact.wml:54
 msgid ""
 "<i>#tor</i> - User and relay operation discussions. Having trouble running "
 "Tor or a question for other Tor users? Then this is the spot for you."
@@ -140,7 +147,7 @@
 " EntÃo esse Ã o lugar para vocÃ."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:54
+#: /home/runa/tor/website/about/en/contact.wml:57
 msgid ""
 "<i>#tor-dev</i> - Channel for people who want to do development.  "
 "Discussions about Tor-related coding, protocols, and <a href=\"<page "
@@ -151,7 +158,7 @@
 "      getinvolved/volunteer>\">idÃias</a> sÃo todos bem vindos."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:57
+#: /home/runa/tor/website/about/en/contact.wml:60
 msgid ""
 "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that "
 "is not related to Tor."
@@ -160,23 +167,21 @@
 "para conversar sobre outras coisas nÃo relacionadas ao Tor."
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:61
+#: /home/runa/tor/website/about/en/contact.wml:64
 msgid "Telephone"
 msgstr "Telefone"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:62
+#: /home/runa/tor/website/about/en/contact.wml:65
 msgid "<a id=\"phone\"></a>"
 msgstr "<a id=\"phone\"></a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:63
+#: /home/runa/tor/website/about/en/contact.wml:66
 msgid ""
 "If none of the above appeal to you, calling +1-781-352-0568 will reach the "
-"Tor office.  Should there be no answer, please leave a message."
+"Tor office.  Should there be no answer, please leave a message with a way to"
+" reach you."
 msgstr ""
-"Se nenhuma das formas de contato acima resolver, ligue para +1-781-352-0568,"
-" o telefone do nosso escritÃrio.  Se nÃo obtiver resposta, por favor deixe "
-"uma mensagem."
 
 

Modified: translation/trunk/projects/website/po/pt_PT/docs/2-medium.installguide.po
===================================================================
--- translation/trunk/projects/website/po/pt_PT/docs/2-medium.installguide.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/pt_PT/docs/2-medium.installguide.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-09-21 19:42+0000\n"
+"PO-Revision-Date: 2011-09-28 08:57+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ru/about/3-low.contact.po
===================================================================
--- translation/trunk/projects/website/po/ru/about/3-low.contact.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ru/about/3-low.contact.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-07-08 08:44+0200\n"
-"PO-Revision-Date: 2011-07-09 01:09+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 00:57+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -50,20 +50,27 @@
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/about/en/contact.wml:24
 msgid ""
+"<i>community-support at lists.torproject.org</i> is for volunteers helping "
+"people with questions about using or configuring Tor."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/contact.wml:27
+msgid ""
 "<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page "
 "getinvolved/translation>\">website translations</a> into place, and help "
 "answer questions about existing and new translations."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:27
+#: /home/runa/tor/website/about/en/contact.wml:30
 msgid ""
 "<i>tordnsel at torproject.org</i> is the alias for the people responsible "
 "for the tordns exitlist."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:29
+#: /home/runa/tor/website/about/en/contact.wml:32
 msgid ""
 "<i>donations at torproject.org</i> is for questions and comments about <a "
 "href=\"<page donate/donate>\">getting money to the developers</a>. More "
@@ -72,7 +79,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:34
+#: /home/runa/tor/website/about/en/contact.wml:37
 msgid ""
 "<i>execdir at torproject.org</i> is for press/media, questions and comments "
 "about Tor the non-profit corporation: trademark questions, affiliation and "
@@ -81,43 +88,43 @@
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:40
+#: /home/runa/tor/website/about/en/contact.wml:43
 msgid "Identi.ca"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:41
+#: /home/runa/tor/website/about/en/contact.wml:44
 msgid ""
 "<a id=\"identica\"></a> Contact us via our microblogging Identi.ca account "
 "at <a href=\"https://identi.ca/torproject\";>torproject</a>."
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:45
+#: /home/runa/tor/website/about/en/contact.wml:48
 msgid "IRC"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:46
+#: /home/runa/tor/website/about/en/contact.wml:49
 msgid "<a id=\"irc\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:47
+#: /home/runa/tor/website/about/en/contact.wml:50
 msgid ""
 "Tor users and developers can also be found in the following channels on <a "
 "href=\"http://www.oftc.net/oftc/\";>OFTC</a>:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:51
+#: /home/runa/tor/website/about/en/contact.wml:54
 msgid ""
 "<i>#tor</i> - User and relay operation discussions. Having trouble running "
 "Tor or a question for other Tor users? Then this is the spot for you."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:54
+#: /home/runa/tor/website/about/en/contact.wml:57
 msgid ""
 "<i>#tor-dev</i> - Channel for people who want to do development.  "
 "Discussions about Tor-related coding, protocols, and <a href=\"<page "
@@ -125,27 +132,28 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:57
+#: /home/runa/tor/website/about/en/contact.wml:60
 msgid ""
 "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that "
 "is not related to Tor."
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/contact.wml:61
+#: /home/runa/tor/website/about/en/contact.wml:64
 msgid "Telephone"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:62
+#: /home/runa/tor/website/about/en/contact.wml:65
 msgid "<a id=\"phone\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:63
+#: /home/runa/tor/website/about/en/contact.wml:66
 msgid ""
 "If none of the above appeal to you, calling +1-781-352-0568 will reach the "
-"Tor office.  Should there be no answer, please leave a message."
+"Tor office.  Should there be no answer, please leave a message with a way to"
+" reach you."
 msgstr ""
 
 

Modified: translation/trunk/projects/website/po/ru/about/3-low.financials.po
===================================================================
--- translation/trunk/projects/website/po/ru/about/3-low.financials.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ru/about/3-low.financials.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-22 16:20+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 00:58+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/about/en/financials.wml:9
+#: /home/runa/tor/website/about/en/financials.wml:9
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "about/overview>\">About &raquo; </a> <a href=\"<page "
@@ -26,66 +26,79 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/transifex/website/about/en/financials.wml:14
+#: /home/runa/tor/website/about/en/financials.wml:14
 msgid "Tor: Financial Reports"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/financials.wml:16
+#: /home/runa/tor/website/about/en/financials.wml:16
+msgid "Fiscal Year 2010"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/financials.wml:17
+msgid ""
+"<a href=\"findoc/2010-TorProject-combined-"
+"Form990_PC_Audit_Results.pdf\">2010 IRS Form 990, State of MA Form PC, and "
+"Independent Audit Results</a>"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/financials.wml:18
 msgid "Fiscal Year 2009"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:17
+#: /home/runa/tor/website/about/en/financials.wml:19
 msgid ""
 "<a href=\"findoc/2009-TorProject-Annual-Report.pdf\">2009 Annual Report</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:18
+#: /home/runa/tor/website/about/en/financials.wml:20
 msgid ""
 "<a href=\"findoc/2009-TorProject-Form990andPC.pdf\">2009 IRS Form 990 and "
 "State of MA Form PC</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:19
+#: /home/runa/tor/website/about/en/financials.wml:21
 msgid ""
 "<a href=\"findoc/2009-TorProject-FinancialStatements.pdf\">2009 Financial "
 "Statements and Audit results</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:20
+#: /home/runa/tor/website/about/en/financials.wml:22
 msgid ""
 "<a href=\"findoc/2009-TorProject-DCF.pdf\">2009 Dept of Commerce Data "
 "Collection Form</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/financials.wml:21
+#: /home/runa/tor/website/about/en/financials.wml:23
 msgid "Fiscal Year 2008"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:22
+#: /home/runa/tor/website/about/en/financials.wml:24
 msgid "<a href=\"findoc/2008-TorProject-Form990.pdf\">2008 IRS Form 990</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:23
+#: /home/runa/tor/website/about/en/financials.wml:25
 msgid ""
 "<a href=\"findoc/2008-TorProject-FinancialStatements.pdf\">2008 Financial "
 "Statements and Audit Results</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/financials.wml:24
+#: /home/runa/tor/website/about/en/financials.wml:26
 msgid "Fiscal Year 2007"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/financials.wml:25
+#: /home/runa/tor/website/about/en/financials.wml:27
 msgid "<a href=\"findoc/2007-TorProject-Form990.pdf\">2007 IRS Form 990</a>"
 msgstr ""
 

Modified: translation/trunk/projects/website/po/ru/docs/2-medium.faq.po
===================================================================
--- translation/trunk/projects/website/po/ru/docs/2-medium.faq.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ru/docs/2-medium.faq.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-08-30 08:50+0200\n"
-"PO-Revision-Date: 2011-08-31 01:41+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 00:59+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/NhlG8k8BI3.xml:1669
+#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/mo95NMnX36.xml:1670
 msgid "<hr>"
 msgstr ""
 
@@ -1088,17 +1088,19 @@
 "Some government or corporate firewalls censor connections to Tor's website. "
 "In those cases, you have three options. First, get it from a friend &mdash; "
 "the <a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a> fits "
-"nicely on a USB key. Second, find the google cache for the <a href=\"<page "
-"getinvolved/mirrors>\">Tor mirrors</a> page and see if any of those copies "
-"of our website work for you. Third, you can download Tor via email: log in "
-"to your Gmail account and mail '<tt>gettor AT torproject.org</tt>'. If you "
-"include the word 'help' in the body of the email, it will reply with "
-"instructions. Note that only a few webmail providers are supported, since "
-"they need to be able to receive very large attachments."
+"nicely on a USB key. Second, find the <a "
+"href=\"https://encrypted.google.com/search?q=tor+mirrors\";>google cache</a> "
+"for the <a href=\"<page getinvolved/mirrors>\">Tor mirrors</a> page and see "
+"if any of those copies of our website work for you. Third, you can download "
+"Tor via email: log in to your Gmail account and mail '<tt>gettor AT "
+"torproject.org</tt>'. If you include the word 'help' in the body of the "
+"email, it will reply with instructions. Note that only a few webmail "
+"providers are supported, since they need to be able to receive very large "
+"attachments."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:669
+#: /home/runa/tor/website/docs/en/faq.wml:670
 msgid ""
 "Be sure to <a href=\"<page docs/verifying-signatures>\">verify the "
 "signature</a> of any package you download, especially when you get it from "
@@ -1106,26 +1108,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:674
+#: /home/runa/tor/website/docs/en/faq.wml:675
 msgid "<hr> <a id=\"CompileTorWindows\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:677
+#: /home/runa/tor/website/docs/en/faq.wml:678
 msgid ""
 "<a class=\"anchor\" href=\"#CompileTorWindows\">How do I compile Tor under "
 "Windows?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:680
+#: /home/runa/tor/website/docs/en/faq.wml:681
 msgid ""
 "Try following the steps at <a href=\"<gitblob>doc/tor-win32-mingw-"
 "creation.txt\"> tor-win32-mingw-creation.txt</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:685
+#: /home/runa/tor/website/docs/en/faq.wml:686
 msgid ""
 "(Note that you don't need to compile Tor yourself in order to use it. Most "
 "people just use the packages available on the <a href=\"<page "
@@ -1133,19 +1135,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:690
+#: /home/runa/tor/website/docs/en/faq.wml:691
 msgid "<hr> <a id=\"VirusFalsePositives\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:693
+#: /home/runa/tor/website/docs/en/faq.wml:694
 msgid ""
 "<a class=\"anchor\" href=\"#VirusFalsePositives\">Why does my Tor executable"
 " appear to have a virus or spyware?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:696
+#: /home/runa/tor/website/docs/en/faq.wml:697
 msgid ""
 "Sometimes, overzealous Windows virus and spyware detectors trigger on some "
 "parts of the Tor Windows binary. Our best guess is that these are false "
@@ -1156,7 +1158,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:704
+#: /home/runa/tor/website/docs/en/faq.wml:705
 msgid ""
 "In the meantime, we encourage you to not just take our word for it. Our job "
 "is to provide the source; if you're concerned, please do <a "
@@ -1164,19 +1166,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:709
+#: /home/runa/tor/website/docs/en/faq.wml:710
 msgid "<hr> <a id=\"LiveCD\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:712
+#: /home/runa/tor/website/docs/en/faq.wml:713
 msgid ""
 "<a class=\"anchor\" href=\"#LiveCD\">Is there a LiveCD or other bundle that "
 "includes Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:715
+#: /home/runa/tor/website/docs/en/faq.wml:716
 msgid ""
 "Yes.  Use <a href=\"https://tails.boum.org/\";>The Amnesic Incognito Live "
 "System</a> or <a href=\"<page projects/torbrowser>\">the Tor Browser "
@@ -1184,19 +1186,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:720
+#: /home/runa/tor/website/docs/en/faq.wml:721
 msgid "<hr> <a id=\"torrc\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:723
+#: /home/runa/tor/website/docs/en/faq.wml:724
 msgid ""
 "<a class=\"anchor\" href=\"#torrc\">I'm supposed to \"edit my torrc\". What "
 "does that mean?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:726
+#: /home/runa/tor/website/docs/en/faq.wml:727
 msgid ""
 "Tor installs a text file called torrc that contains configuration "
 "instructions for how your Tor program should behave. The default "
@@ -1206,12 +1208,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:734
+#: /home/runa/tor/website/docs/en/faq.wml:735
 msgid "The location of your torrc file depends on the way you installed Tor:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:738
+#: /home/runa/tor/website/docs/en/faq.wml:739
 msgid ""
 "On Windows, if you installed a Tor bundle with Vidalia, you can find your "
 "torrc file in the Start menu under Programs -&gt; Vidalia Bundle -&gt; Tor, "
@@ -1224,14 +1226,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:747
+#: /home/runa/tor/website/docs/en/faq.wml:748
 msgid ""
 "On OS X, if you use Vidalia, edit <code>~/.vidalia/torrc</code>. Otherwise, "
 "open your favorite text editor and load <code>/Library/Tor/torrc</code>."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:751
+#: /home/runa/tor/website/docs/en/faq.wml:752
 msgid ""
 "On Unix, if you installed a pre-built package, look for "
 "<code>/etc/tor/torrc</code> or <code>/etc/torrc</code> or consult your "
@@ -1239,7 +1241,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:755
+#: /home/runa/tor/website/docs/en/faq.wml:756
 msgid ""
 "Finally, if you installed from source, you may not have a torrc installed "
 "yet: look in <code>/usr/local/etc/</code> and note that you may need to "
@@ -1247,14 +1249,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:762
+#: /home/runa/tor/website/docs/en/faq.wml:763
 msgid ""
 "If you use Vidalia, be sure to exit both Tor and Vidalia before you edit "
 "your torrc file. Otherwise Vidalia might overwrite your changes."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:767
+#: /home/runa/tor/website/docs/en/faq.wml:768
 msgid ""
 "Once you've changed your torrc, you will need to restart Tor for the changes"
 " to take effect. (For advanced users on OS X and Unix, note that you "
@@ -1262,7 +1264,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:773
+#: /home/runa/tor/website/docs/en/faq.wml:774
 msgid ""
 "For other configuration options you can use, look at the <a href=\"<page "
 "docs/tor-manual>\">Tor manual page</a>. Remember, all lines beginning with #"
@@ -1270,19 +1272,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:779
+#: /home/runa/tor/website/docs/en/faq.wml:780
 msgid "<hr> <a id=\"Logs\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:782
+#: /home/runa/tor/website/docs/en/faq.wml:783
 msgid ""
 "<a class=\"anchor\" href=\"#Logs\">How do I set up logging, or see Tor's "
 "logs?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:785
+#: /home/runa/tor/website/docs/en/faq.wml:786
 msgid ""
 "If you installed a Tor bundle that includes Vidalia, then Vidalia has a "
 "window called \"Message Log\" that will show you Tor's log messages. You can"
@@ -1291,19 +1293,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:792
+#: /home/runa/tor/website/docs/en/faq.wml:793
 msgid ""
 "If you're not using Vidalia, you'll have to go find the log files by hand. "
 "Here are some likely places for your logs to be:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:797
+#: /home/runa/tor/website/docs/en/faq.wml:798
 msgid "On OS X, Debian, Red Hat, etc, the logs are in /var/log/tor/"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:799
+#: /home/runa/tor/website/docs/en/faq.wml:800
 msgid ""
 "On Windows, there are no default log files currently. If you enable logs in "
 "your torrc file, they default to <code>\\username\\Application "
@@ -1311,7 +1313,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:803
+#: /home/runa/tor/website/docs/en/faq.wml:804
 msgid ""
 "If you compiled Tor from source, by default your Tor logs to <a "
 "href=\"http://en.wikipedia.org/wiki/Standard_streams\";>\"stdout\"</a> at "
@@ -1320,7 +1322,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:811
+#: /home/runa/tor/website/docs/en/faq.wml:812
 msgid ""
 "To change your logging setup by hand, <a href=\"#torrc\">edit your torrc</a>"
 " and find the section (near the top of the file) which contains the "
@@ -1328,7 +1330,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:817
+#: /home/runa/tor/website/docs/en/faq.wml:818
 #, no-wrap
 msgid ""
 "\\## Logs go to stdout at level \"notice\" unless redirected by something\n"
@@ -1336,7 +1338,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:822
+#: /home/runa/tor/website/docs/en/faq.wml:823
 msgid ""
 "For example, if you want Tor to send complete debug, info, notice, warn, and"
 " err level messages to a file, append the following line to the end of the "
@@ -1344,32 +1346,32 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:828
+#: /home/runa/tor/website/docs/en/faq.wml:829
 #, no-wrap
 msgid "Log debug file c:/program files/tor/debug.log\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:832
+#: /home/runa/tor/website/docs/en/faq.wml:833
 msgid ""
 "Replace <code>c:/program files/tor/debug.log</code> with a directory and "
 "filename for your Tor log."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:836
+#: /home/runa/tor/website/docs/en/faq.wml:837
 msgid "<hr> <a id=\"DoesntWork\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:839
+#: /home/runa/tor/website/docs/en/faq.wml:840
 msgid ""
 "<a class=\"anchor\" href=\"#DoesntWork\">I installed Tor and Polipo but it's"
 " not working.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:842
+#: /home/runa/tor/website/docs/en/faq.wml:843
 msgid ""
 "Once you've installed the Tor bundle, there are two questions to ask: first,"
 " is your Tor able to establish a circuit? Second, is your Firefox correctly "
@@ -1377,7 +1379,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:847
+#: /home/runa/tor/website/docs/en/faq.wml:848
 msgid ""
 "If Tor can establish a circuit, the onion icon in Vidalia will turn green. "
 "You can also check in the Vidalia Control Panel to make sure it says "
@@ -1387,19 +1389,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:857
+#: /home/runa/tor/website/docs/en/faq.wml:858
 msgid "If Tor can't establish a circuit, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:861
+#: /home/runa/tor/website/docs/en/faq.wml:862
 msgid ""
 "Are you sure Tor is running? If you're using Vidalia, you may have to click "
 "on the onion and select \"Start\" to launch Tor."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:863
+#: /home/runa/tor/website/docs/en/faq.wml:864
 msgid ""
 "Check your system clock. If it's more than a few hours off, Tor will refuse "
 "to build circuits. For XP users, synchronize your clock under the clock "
@@ -1408,7 +1410,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:867
+#: /home/runa/tor/website/docs/en/faq.wml:868
 msgid ""
 "Is your Internet connection <a href=\"#FirewallPorts\">firewalled by "
 "port</a>, or do you normally need to use a <a "
@@ -1416,7 +1418,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:872
+#: /home/runa/tor/website/docs/en/faq.wml:873
 msgid ""
 "Are you running programs like Norton Internet Security or SELinux that block"
 " certain connections, even though you don't realize they do? They could be "
@@ -1424,7 +1426,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:875
+#: /home/runa/tor/website/docs/en/faq.wml:876
 msgid ""
 "Are you in China, or behind a restrictive corporate network firewall that "
 "blocks the public Tor relays? If so, you should learn about <a href=\"<page "
@@ -1432,14 +1434,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:878
+#: /home/runa/tor/website/docs/en/faq.wml:879
 msgid ""
 "Check your <a href=\"#Logs\">Tor logs</a>. Do they give you any hints about "
 "what's going wrong?"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:883
+#: /home/runa/tor/website/docs/en/faq.wml:884
 msgid ""
 "Step two is to confirm that Firefox is correctly configured to send its "
 "traffic through Tor. Try the <a href=\"https://check.torproject.org/\";>Tor "
@@ -1449,12 +1451,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:891
+#: /home/runa/tor/website/docs/en/faq.wml:892
 msgid "If it thinks you're not using Tor, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:895
+#: /home/runa/tor/website/docs/en/faq.wml:896
 msgid ""
 "Did you install the Torbutton extension for Firefox? The installation "
 "bundles include it, but sometimes people forget to install it. Make sure it "
@@ -1463,7 +1465,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:900
+#: /home/runa/tor/website/docs/en/faq.wml:901
 msgid ""
 "Do you have incompatible Firefox extensions like FoxyProxy installed? If so,"
 " uninstall them. (Note that using FoxyProxy is NOT a sufficient substitute "
@@ -1475,7 +1477,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:907
+#: /home/runa/tor/website/docs/en/faq.wml:908
 msgid ""
 "If your browser says \"The proxy server is refusing connections.\", check "
 "that Polipo (the http proxy that passes traffic between Firefox and Tor) is "
@@ -1485,7 +1487,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:912
+#: /home/runa/tor/website/docs/en/faq.wml:913
 msgid ""
 "If you're upgrading from OS X, some of the earlier OS X installers were "
 "broken in really unfortunate ways. You may find that <a href=\"<page docs"
@@ -1495,14 +1497,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:917
+#: /home/runa/tor/website/docs/en/faq.wml:918
 msgid ""
 "If you're on Linux, make sure Privoxy isn't running, since it will conflict "
 "with the port that our Polipo configuration file picks."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:919
+#: /home/runa/tor/website/docs/en/faq.wml:920
 msgid ""
 "If you installed Polipo yourself (not from a bundle), did you edit the "
 "config file as described? Did you restart Polipo after this change? Are you "
@@ -1510,7 +1512,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:922
+#: /home/runa/tor/website/docs/en/faq.wml:923
 msgid ""
 "For Red Hat Linux and related systems, do you have SELinux enabled? If so, "
 "it might be preventing Polipo from talking to Tor. We also run across BSD "
@@ -1519,19 +1521,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:928
+#: /home/runa/tor/website/docs/en/faq.wml:929
 msgid "<hr /> <a id=\"VidaliaPassword\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:931
+#: /home/runa/tor/website/docs/en/faq.wml:932
 msgid ""
 "<a class=\"anchor\" href=\"#VidaliaPassword\">Tor/Vidalia prompts for a "
 "password at start.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:934
+#: /home/runa/tor/website/docs/en/faq.wml:935
 msgid ""
 "Vidalia interacts with the Tor software via Tor's \"control port\". The "
 "control port lets Vidalia receive status updates from Tor, request a new "
@@ -1542,7 +1544,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:943
+#: /home/runa/tor/website/docs/en/faq.wml:944
 msgid ""
 "Usually this process of generating and setting a random control password "
 "happens in the background. There are three common situations, though, where "
@@ -1550,7 +1552,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:949
+#: /home/runa/tor/website/docs/en/faq.wml:950
 msgid ""
 "You're already running Vidalia and Tor. For example, this situation can "
 "happen if you installed the Vidalia bundle and now you're trying to run the "
@@ -1559,7 +1561,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:954
+#: /home/runa/tor/website/docs/en/faq.wml:955
 msgid ""
 "Vidalia crashed, but left Tor running with the last known random password. "
 "After you restart Vidalia, it generates a new random password, but Vidalia "
@@ -1573,7 +1575,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:967
+#: /home/runa/tor/website/docs/en/faq.wml:968
 msgid ""
 "You had previously set Tor to run as a Windows NT service. When Tor is set "
 "to run as a service, it starts up when the system boots. If you configured "
@@ -1588,19 +1590,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:982
+#: /home/runa/tor/website/docs/en/faq.wml:983
 msgid "<hr> <a id=\"ChooseEntryExit\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:985
+#: /home/runa/tor/website/docs/en/faq.wml:986
 msgid ""
 "<a class=\"anchor\" href=\"#ChooseEntryExit\">Can I control which nodes (or "
 "country) are used for entry/exit?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:988
+#: /home/runa/tor/website/docs/en/faq.wml:989
 msgid ""
 "Yes. You can set preferred entry and exit nodes as well as inform Tor which "
 "nodes you do not want to use.  The following options can be added to your "
@@ -1609,53 +1611,53 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:994
+#: /home/runa/tor/website/docs/en/faq.wml:995
 msgid "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:995
+#: /home/runa/tor/website/docs/en/faq.wml:996
 msgid ""
 "A list of preferred nodes to use for the first hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:997
+#: /home/runa/tor/website/docs/en/faq.wml:998
 msgid "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:998
+#: /home/runa/tor/website/docs/en/faq.wml:999
 msgid ""
 "A list of preferred nodes to use for the last hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:1000
+#: /home/runa/tor/website/docs/en/faq.wml:1001
 msgid "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:1001
+#: /home/runa/tor/website/docs/en/faq.wml:1002
 msgid "A list of nodes to never use when building a circuit."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:1003
+#: /home/runa/tor/website/docs/en/faq.wml:1004
 msgid "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:1004
+#: /home/runa/tor/website/docs/en/faq.wml:1005
 msgid ""
 "A list of nodes to never use when picking an exit.  Nodes listed in "
 "<tt>ExcludeNodes</tt> are automatically in this list."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1009
+#: /home/runa/tor/website/docs/en/faq.wml:1010
 msgid ""
 "<em>We recommend you do not use these</em> &mdash; they are intended for "
 "testing and may disappear in future versions.  You get the best security "
@@ -1665,7 +1667,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1016
+#: /home/runa/tor/website/docs/en/faq.wml:1017
 msgid ""
 "The <tt>EntryNodes</tt> and <tt>ExitNodes</tt> config options are treated as"
 " a request, meaning if the nodes are down or seem slow, Tor will still avoid"
@@ -1677,7 +1679,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1026
+#: /home/runa/tor/website/docs/en/faq.wml:1027
 msgid ""
 "Instead of <tt>$fingerprint</tt> you can also specify a 2 letter ISO3166 "
 "country code in curly braces (for example {de}), or an ip address pattern "
@@ -1686,7 +1688,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1032
+#: /home/runa/tor/website/docs/en/faq.wml:1033
 msgid ""
 "If you want to access a service directly through Tor's SOCKS interface (eg. "
 "using ssh via connect.c), another option is to set up an internal mapping in"
@@ -1695,26 +1697,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1038
+#: /home/runa/tor/website/docs/en/faq.wml:1039
 msgid "<hr> <a id=\"GoogleCaptcha\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1041
+#: /home/runa/tor/website/docs/en/faq.wml:1042
 msgid ""
 "<a class=\"anchor\" href=\"#GoogleCaptcha\">Google makes me solve a Captcha "
 "or tells me I have spyware installed.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1044
+#: /home/runa/tor/website/docs/en/faq.wml:1045
 msgid ""
 "This is a known and intermittent problem; it does not mean that Google "
 "considers Tor to be spyware."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1049
+#: /home/runa/tor/website/docs/en/faq.wml:1050
 msgid ""
 "When you use Tor, you are sending queries through exit relays that are also "
 "shared by thousands of other users. Tor users typically see this message "
@@ -1725,7 +1727,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1057
+#: /home/runa/tor/website/docs/en/faq.wml:1058
 msgid ""
 "An alternate explanation is that Google tries to detect certain kinds of "
 "spyware or viruses that send distinctive queries to Google Search. It notes "
@@ -1735,7 +1737,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1066
+#: /home/runa/tor/website/docs/en/faq.wml:1067
 msgid ""
 "To our knowledge, Google is not doing anything intentionally specifically to"
 " deter or block Tor use. The error message about an infected machine should "
@@ -1743,7 +1745,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1072
+#: /home/runa/tor/website/docs/en/faq.wml:1073
 msgid ""
 "Torbutton 1.2.5 (released in mid 2010) detects Google captchas and can "
 "automatically redirect you to a more Tor-friendly search engine such as "
@@ -1751,19 +1753,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1077
+#: /home/runa/tor/website/docs/en/faq.wml:1078
 msgid "<hr /> <a id=\"GmailWarning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1080
+#: /home/runa/tor/website/docs/en/faq.wml:1081
 msgid ""
 "<a class=\"anchor\" href=\"#GmailWarning\">Gmail warns me that my account "
 "may have been compromised.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1083
+#: /home/runa/tor/website/docs/en/faq.wml:1084
 msgid ""
 "Sometimes, after you've used Gmail over Tor, Google presents a pop-up "
 "notification that your account may have been compromised.  The notification "
@@ -1772,7 +1774,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1090
+#: /home/runa/tor/website/docs/en/faq.wml:1091
 msgid ""
 "In general this is a false alarm: Google saw a bunch of logins from "
 "different places, as a result of running the service via Tor, and decided it"
@@ -1781,7 +1783,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1097
+#: /home/runa/tor/website/docs/en/faq.wml:1098
 msgid ""
 "Even though this may be a biproduct of using the service via tor, that "
 "doesn't mean you can entirely ignore the warning. It is <i>probably</i> a "
@@ -1790,7 +1792,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1104
+#: /home/runa/tor/website/docs/en/faq.wml:1105
 msgid ""
 "Cookie hijacking is possible by either physical access to your computer or "
 "by watching your network traffic.  In theory only physical access should "
@@ -1801,7 +1803,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1113
+#: /home/runa/tor/website/docs/en/faq.wml:1114
 msgid ""
 "And if somebody <i>did</i> steal your google cookie, they might end up "
 "logging in from unusual places (though of course they also might not). So "
@@ -1813,19 +1815,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1122
+#: /home/runa/tor/website/docs/en/faq.wml:1123
 msgid "<hr> <a id=\"FirewallPorts\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1125
+#: /home/runa/tor/website/docs/en/faq.wml:1126
 msgid ""
 "<a class=\"anchor\" href=\"#FirewallPorts\">My firewall only allows a few "
 "outgoing ports.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1128
+#: /home/runa/tor/website/docs/en/faq.wml:1129
 msgid ""
 "If your firewall works by blocking ports, then you can tell Tor to only use "
 "the ports that your firewall permits by adding \"FascistFirewall 1\" to your"
@@ -1835,7 +1837,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1136
+#: /home/runa/tor/website/docs/en/faq.wml:1137
 msgid ""
 "By default, when you set this Tor assumes that your firewall allows only "
 "port 80 and port 443 (HTTP and HTTPS respectively). You can select a "
@@ -1843,14 +1845,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1142
+#: /home/runa/tor/website/docs/en/faq.wml:1143
 msgid ""
 "If you want to be more fine-grained with your controls, you can also use the"
 " ReachableAddresses config options, e.g.:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1147
+#: /home/runa/tor/website/docs/en/faq.wml:1148
 #, no-wrap
 msgid ""
 "  ReachableDirAddresses *:80\n"
@@ -1858,24 +1860,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1151
+#: /home/runa/tor/website/docs/en/faq.wml:1152
 msgid "<hr> <a id=\"RelayFlexible\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1154
+#: /home/runa/tor/website/docs/en/faq.wml:1155
 msgid ""
 "<a class=\"anchor\" href=\"#RelayFlexible\">How stable does my relay need to"
 " be?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1157
+#: /home/runa/tor/website/docs/en/faq.wml:1158
 msgid "We aim to make setting up a Tor relay easy and convenient:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1161
+#: /home/runa/tor/website/docs/en/faq.wml:1162
 msgid ""
 "Tor has built-in support for <a "
 "href=\"<wikifaq>#WhatbandwidthshapingoptionsareavailabletoTorrelays\"> rate "
@@ -1886,7 +1888,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1169
+#: /home/runa/tor/website/docs/en/faq.wml:1170
 msgid ""
 "Each Tor relay has an <a href=\"#ExitPolicies\">exit policy</a> that "
 "specifies what sort of outbound connections are allowed or refused from that"
@@ -1895,7 +1897,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1174
+#: /home/runa/tor/website/docs/en/faq.wml:1175
 msgid ""
 "It's fine if the relay goes offline sometimes. The directories notice this "
 "quickly and stop advertising the relay. Just try to make sure it's not too "
@@ -1903,14 +1905,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1179
+#: /home/runa/tor/website/docs/en/faq.wml:1180
 msgid ""
 "We can handle relays with dynamic IPs just fine &mdash; simply leave the "
 "Address config option blank, and Tor will try to guess."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1182
+#: /home/runa/tor/website/docs/en/faq.wml:1183
 msgid ""
 "If your relay is behind a NAT and it doesn't know its public IP (e.g. it has"
 " an IP of 192.168.x.y), you'll need to set up port forwarding. Forwarding "
@@ -1920,7 +1922,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1188
+#: /home/runa/tor/website/docs/en/faq.wml:1189
 msgid ""
 "Your relay will passively estimate and advertise its recent bandwidth "
 "capacity, so high-bandwidth relays will attract more users than low-"
@@ -1928,24 +1930,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1194
+#: /home/runa/tor/website/docs/en/faq.wml:1195
 msgid "<hr> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1198
+#: /home/runa/tor/website/docs/en/faq.wml:1199
 msgid ""
 "<a class=\"anchor\" href=\"#ExitPolicies\">I'd run a relay, but I don't want"
 " to deal with abuse issues.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1201
+#: /home/runa/tor/website/docs/en/faq.wml:1202
 msgid "Great. That's exactly why we implemented exit policies."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1205
+#: /home/runa/tor/website/docs/en/faq.wml:1206
 msgid ""
 "Each Tor relay has an exit policy that specifies what sort of outbound "
 "connections are allowed or refused from that relay. The exit policies are "
@@ -1961,7 +1963,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1219
+#: /home/runa/tor/website/docs/en/faq.wml:1220
 msgid ""
 "The default exit policy allows access to many popular services (e.g. web "
 "browsing), but <a "
@@ -1977,7 +1979,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1233
+#: /home/runa/tor/website/docs/en/faq.wml:1234
 msgid ""
 "If you do allow any exit connections, make sure name resolution works (that "
 "is, your computer can resolve Internet addresses correctly).  If there are "
@@ -1987,19 +1989,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1241
+#: /home/runa/tor/website/docs/en/faq.wml:1242
 msgid "<hr> <a id=\"RelayOrBridge\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1244
+#: /home/runa/tor/website/docs/en/faq.wml:1245
 msgid ""
 "<a class=\"anchor\" href=\"#RelayOrBridge\">Should I be a normal relay or "
 "bridge relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1246
+#: /home/runa/tor/website/docs/en/faq.wml:1247
 msgid ""
 "<a href=\"<page docs/bridges>\">Bridge relays</a> (or \"bridges\" for short)"
 "  are <a href=\"<page docs/tor-doc-relay>\">Tor relays</a> that aren't "
@@ -2009,7 +2011,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1253
+#: /home/runa/tor/website/docs/en/faq.wml:1254
 msgid ""
 "Being a normal relay vs being a bridge relay is almost the same "
 "configuration: it's just a matter of whether your relay is listed publically"
@@ -2017,7 +2019,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1258
+#: /home/runa/tor/website/docs/en/faq.wml:1259
 msgid ""
 "Right now, China is the main place in the world that filters connections to "
 "the Tor network. So bridges are useful a) for users in China, b) as a backup"
@@ -2027,7 +2029,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1266
+#: /home/runa/tor/website/docs/en/faq.wml:1267
 msgid ""
 "So should you run a normal relay or bridge relay? If you have lots of "
 "bandwidth, you should definitely run a normal relay &mdash; the average "
@@ -2038,19 +2040,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1275
+#: /home/runa/tor/website/docs/en/faq.wml:1276
 msgid "<hr> <a id=\"MultipleRelays\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1278
+#: /home/runa/tor/website/docs/en/faq.wml:1279
 msgid ""
 "<a class=\"anchor\" href=\"#MultipleRelays\">I want to run more than one "
 "relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1281
+#: /home/runa/tor/website/docs/en/faq.wml:1282
 msgid ""
 "Great. If you want to run several relays to donate more to the network, "
 "we're happy with that. But please don't run more than a few dozen on the "
@@ -2059,7 +2061,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1288
+#: /home/runa/tor/website/docs/en/faq.wml:1289
 msgid ""
 "If you do decide to run more than one relay, please set the \"MyFamily\" "
 "config option in the <a href=\"#torrc\">torrc</a> of each relay, listing all"
@@ -2067,13 +2069,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1294
+#: /home/runa/tor/website/docs/en/faq.wml:1295
 #, no-wrap
 msgid "    MyFamily $fingerprint1,$fingerprint2,$fingerprint3\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1298
+#: /home/runa/tor/website/docs/en/faq.wml:1299
 msgid ""
 "where each fingerprint is the 40 character identity fingerprint (without "
 "spaces). You can also list them by nickname, but fingerprint is safer. Be "
@@ -2082,7 +2084,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1305
+#: /home/runa/tor/website/docs/en/faq.wml:1306
 msgid ""
 "That way clients will know to avoid using more than one of your relays in a "
 "single circuit. You should set MyFamily if you have administrative control "
@@ -2091,26 +2093,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1311
+#: /home/runa/tor/website/docs/en/faq.wml:1312
 msgid "<hr> <a id=\"RelayMemory\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1314
+#: /home/runa/tor/website/docs/en/faq.wml:1315
 msgid ""
 "<a class=\"anchor\" href=\"#RelayMemory\">Why is my Tor relay using so much "
 "memory?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1316
+#: /home/runa/tor/website/docs/en/faq.wml:1317
 msgid ""
 "If your Tor relay is using more memory than you'd like, here are some tips "
 "for reducing its footprint:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1321
+#: /home/runa/tor/website/docs/en/faq.wml:1322
 msgid ""
 "If you're on Linux, you may be encountering memory fragmentation bugs in "
 "glibc's malloc implementation. That is, when Tor releases memory back to the"
@@ -2122,7 +2124,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1329
+#: /home/runa/tor/website/docs/en/faq.wml:1330
 msgid ""
 "If you're running a fast relay, meaning you have many TLS connections open, "
 "you are probably losing a lot of memory to OpenSSL's internal buffers (38KB+"
@@ -2134,7 +2136,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1337
+#: /home/runa/tor/website/docs/en/faq.wml:1338
 msgid ""
 "If you're running on Solaris, OpenBSD, NetBSD, or old FreeBSD, Tor is "
 "probably forking separate processes rather than using threads. Consider "
@@ -2144,7 +2146,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1343
+#: /home/runa/tor/website/docs/en/faq.wml:1344
 msgid ""
 "If you still can't handle the memory load, consider reducing the amount of "
 "bandwidth your relay advertises. Advertising less bandwidth means you will "
@@ -2153,60 +2155,60 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1352
+#: /home/runa/tor/website/docs/en/faq.wml:1353
 msgid ""
 "All of this said, fast Tor relays do use a lot of ram. It is not unusual for"
 " a fast exit relay to use 500-1000 MB of memory."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1356
+#: /home/runa/tor/website/docs/en/faq.wml:1357
 msgid "<hr> <a id=\"WhyNotNamed\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1359
+#: /home/runa/tor/website/docs/en/faq.wml:1360
 msgid "<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1362
+#: /home/runa/tor/website/docs/en/faq.wml:1363
 msgid ""
 "We currently use these metrics to determine if your relay should be "
 "named:<br>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1365
+#: /home/runa/tor/website/docs/en/faq.wml:1366
 msgid ""
 "The name is not currently mapped to a different key. Existing mappings are "
 "removed after 6 months of inactivity from a relay."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1367
+#: /home/runa/tor/website/docs/en/faq.wml:1368
 msgid "The relay must have been around for at least two weeks."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1368
+#: /home/runa/tor/website/docs/en/faq.wml:1369
 msgid "No other router may have wanted the same name in the past month."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1371
+#: /home/runa/tor/website/docs/en/faq.wml:1372
 msgid "<hr> <a id=\"KeyManagement\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1374
+#: /home/runa/tor/website/docs/en/faq.wml:1375
 msgid ""
 "<a class=\"anchor\" href=\"#KeyManagement\">Tell me about all the keys Tor "
 "uses.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1377
+#: /home/runa/tor/website/docs/en/faq.wml:1378
 msgid ""
 "Tor uses a variety of different keys, with three goals in mind: 1)  "
 "encryption to ensure privacy of data within the Tor network, 2)  "
@@ -2216,7 +2218,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1385
+#: /home/runa/tor/website/docs/en/faq.wml:1386
 msgid ""
 "<b>Encryption</b>: first, all connections in Tor use TLS link encryption, so"
 " observers can't look inside to see which circuit a given cell is intended "
@@ -2227,7 +2229,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1395
+#: /home/runa/tor/website/docs/en/faq.wml:1396
 msgid ""
 "<b>Authentication</b>: Every Tor relay has a public decryption key called "
 "the \"onion key\".  When the Tor client establishes circuits, at each step "
@@ -2238,7 +2240,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1405
+#: /home/runa/tor/website/docs/en/faq.wml:1406
 msgid ""
 "<b>Coordination</b>: How do clients know what the relays are, and how do "
 "they know that they have the right keys for them? Each relay has a long-term"
@@ -2253,7 +2255,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1419
+#: /home/runa/tor/website/docs/en/faq.wml:1420
 msgid ""
 "How do clients know what the directory authorities are? The Tor software "
 "comes with a built-in list of location and public key for each directory "
@@ -2262,7 +2264,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1426
+#: /home/runa/tor/website/docs/en/faq.wml:1427
 msgid ""
 "How do users know they've got the right software? When we distribute the "
 "source code or a package, we digitally sign it with <a "
@@ -2272,7 +2274,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1434
+#: /home/runa/tor/website/docs/en/faq.wml:1435
 msgid ""
 "In order to be certain that it's really signed by us, you need to have met "
 "us in person and gotten a copy of our GPG key fingerprint, or you need to "
@@ -2282,17 +2284,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1441
+#: /home/runa/tor/website/docs/en/faq.wml:1442
 msgid "<hr> <a id=\"EntryGuards\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1444
+#: /home/runa/tor/website/docs/en/faq.wml:1445
 msgid "<a class=\"anchor\" href=\"#EntryGuards\">What are Entry Guards?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1447
+#: /home/runa/tor/website/docs/en/faq.wml:1448
 msgid ""
 "Tor (like all current practical low-latency anonymity designs) fails when "
 "the attacker can see both ends of the communications channel. For example, "
@@ -2304,7 +2306,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1457
+#: /home/runa/tor/website/docs/en/faq.wml:1458
 msgid ""
 "So, what should we do? Suppose the attacker controls, or can observe, "
 "<i>C</i> relays. Suppose there are <i>N</i> relays total. If you select new "
@@ -2318,7 +2320,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1469
+#: /home/runa/tor/website/docs/en/faq.wml:1470
 msgid ""
 "The solution is \"entry guards\": each Tor client selects a few relays at "
 "random to use as entry points, and uses only those relays for her first hop."
@@ -2331,7 +2333,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1480
+#: /home/runa/tor/website/docs/en/faq.wml:1481
 msgid ""
 "You can read more at <a href=\"http://freehaven.net/anonbib/#wright02\";>An "
 "Analysis of the Degradation of Anonymous Protocols</a>, <a "
@@ -2342,7 +2344,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1489
+#: /home/runa/tor/website/docs/en/faq.wml:1490
 msgid ""
 "Restricting your entry nodes may also help against attackers who want to run"
 " a few Tor nodes and easily enumerate all of the Tor user IP addresses. "
@@ -2353,19 +2355,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1497
+#: /home/runa/tor/website/docs/en/faq.wml:1498
 msgid "<hr> <a id=\"EverybodyARelay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1500
+#: /home/runa/tor/website/docs/en/faq.wml:1501
 msgid ""
 "<a class=\"anchor\" href=\"#EverybodyARelay\">You should make every Tor user"
 " be a relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1503
+#: /home/runa/tor/website/docs/en/faq.wml:1504
 msgid ""
 "Requiring every Tor user to be a relay would help with scaling the network "
 "to handle all our users, and <a "
@@ -2380,7 +2382,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1516
+#: /home/runa/tor/website/docs/en/faq.wml:1517
 msgid ""
 "That said, we do want to encourage Tor users to run relays, so what we "
 "really want to do is simplify the process of setting up and maintaining a "
@@ -2391,12 +2393,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1525
+#: /home/runa/tor/website/docs/en/faq.wml:1526
 msgid "There are five steps we need to address before we can do this though:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1529
+#: /home/runa/tor/website/docs/en/faq.wml:1530
 msgid ""
 "First, we need to make Tor stable as a relay on all common operating "
 "systems. The main remaining platform is Windows, and we plan to finally "
@@ -2406,7 +2408,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1537
+#: /home/runa/tor/website/docs/en/faq.wml:1538
 msgid ""
 "Second, we still need to get better at automatically estimating the right "
 "amount of bandwidth to allow. See item #7 on the <a href=\"<page "
@@ -2418,7 +2420,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1548
+#: /home/runa/tor/website/docs/en/faq.wml:1549
 msgid ""
 "Third, we need to work on scalability, both of the network (how to stop "
 "requiring that all Tor relays be able to connect to all Tor relays) and of "
@@ -2430,7 +2432,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1558
+#: /home/runa/tor/website/docs/en/faq.wml:1559
 msgid ""
 "Fourth, we need to better understand the risks from letting the attacker "
 "send traffic through your relay while you're also initiating your own "
@@ -2448,7 +2450,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1574
+#: /home/runa/tor/website/docs/en/faq.wml:1575
 msgid ""
 "Fifth, we might need some sort of incentive scheme to encourage people to "
 "relay traffic for others, and/or to become exit nodes. Here are our <a "
@@ -2457,24 +2459,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1581
+#: /home/runa/tor/website/docs/en/faq.wml:1582
 msgid "Please help on all of these!"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1584
+#: /home/runa/tor/website/docs/en/faq.wml:1585
 msgid "<hr> <a id=\"TransportIPnotTCP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1587
+#: /home/runa/tor/website/docs/en/faq.wml:1588
 msgid ""
 "<a class=\"anchor\" href=\"#TransportIPnotTCP\">You should transport all IP "
 "packets, not just TCP packets.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1590
+#: /home/runa/tor/website/docs/en/faq.wml:1591
 msgid ""
 "This would be handy, because it would make Tor better able to handle new "
 "protocols like VoIP, it could solve the whole need to socksify applications,"
@@ -2483,7 +2485,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1597
+#: /home/runa/tor/website/docs/en/faq.wml:1598
 msgid ""
 "We're heading in this direction: see <a "
 "href=\"https://trac.torproject.org/projects/tor/ticket/1855\";>this trac "
@@ -2492,7 +2494,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1604
+#: /home/runa/tor/website/docs/en/faq.wml:1605
 msgid ""
 "IP packets reveal OS characteristics. We would still need to do IP-level "
 "packet normalization, to stop things like TCP fingerprinting attacks. Given "
@@ -2503,7 +2505,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1611
+#: /home/runa/tor/website/docs/en/faq.wml:1612
 msgid ""
 "Application-level streams still need scrubbing. We will still need user-side"
 " applications like Torbutton. So it won't become just a matter of capturing "
@@ -2511,7 +2513,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1615
+#: /home/runa/tor/website/docs/en/faq.wml:1616
 msgid ""
 "Certain protocols will still leak information. For example, we must rewrite "
 "DNS requests so they are delivered to an unlinkable DNS server rather than "
@@ -2520,7 +2522,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1620
+#: /home/runa/tor/website/docs/en/faq.wml:1621
 msgid ""
 "<a "
 "href=\"http://crypto.stanford.edu/~nagendra/projects/dtls/dtls.html\";>DTLS</a>"
@@ -2531,7 +2533,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1627
+#: /home/runa/tor/website/docs/en/faq.wml:1628
 msgid ""
 "Exit policies for arbitrary IP packets mean building a secure IDS. Our node "
 "operators tell us that exit policies are one of the main reasons they're "
@@ -2549,7 +2551,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1641
+#: /home/runa/tor/website/docs/en/faq.wml:1642
 msgid ""
 "The Tor-internal name spaces would need to be redesigned. We support hidden "
 "service \".onion\" addresses by intercepting the addresses when they are "
@@ -2558,38 +2560,38 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1648
+#: /home/runa/tor/website/docs/en/faq.wml:1649
 msgid "<hr> <a id=\"Criminals\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1651
+#: /home/runa/tor/website/docs/en/faq.wml:1652
 msgid ""
 "<a class=\"anchor\" href=\"#Criminals\">Doesn't Tor enable criminals to do "
 "bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1654
+#: /home/runa/tor/website/docs/en/faq.wml:1655
 msgid ""
 "For the answer to this question and others, please see our <a href=\"<page "
 "docs/faq-abuse>\">Tor Abuse FAQ</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1658
+#: /home/runa/tor/website/docs/en/faq.wml:1659
 msgid "<hr> <a id=\"RespondISP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1661
+#: /home/runa/tor/website/docs/en/faq.wml:1662
 msgid ""
 "<a class=\"anchor\" href=\"#RespondISP\">How do I respond to my ISP about my"
 " exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1664
+#: /home/runa/tor/website/docs/en/faq.wml:1665
 msgid ""
 "A collection of templates for successfully responding to ISPs is <a "
 "href=\"<wiki>doc/TorAbuseTemplates\">collected here</a>."

Modified: translation/trunk/projects/website/po/ru/docs/2-medium.tor-doc-relay.po
===================================================================
--- translation/trunk/projects/website/po/ru/docs/2-medium.tor-doc-relay.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ru/docs/2-medium.tor-doc-relay.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-06-21 08:19+0200\n"
-"PO-Revision-Date: 2011-06-22 00:52+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 01:01+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:16 /tmp/F5o0tOMw8z.xml:281
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:16 /tmp/A18i3Pxv3V.xml:282
 msgid "<hr>"
 msgstr ""
 
@@ -66,8 +66,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37 /tmp/F5o0tOMw8z.xml:52
-#: /tmp/F5o0tOMw8z.xml:147 /tmp/F5o0tOMw8z.xml:171
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37 /tmp/A18i3Pxv3V.xml:52
+#: /tmp/A18i3Pxv3V.xml:147 /tmp/A18i3Pxv3V.xml:171
 msgid "<br>"
 msgstr ""
 
@@ -404,11 +404,12 @@
 "add a line like \"toruser hard nofile 8192\" to your "
 "/etc/security/limits.conf file (where toruser is the user that runs the Tor "
 "process), and then restart Tor if it's installed as a package (or log out "
-"and log back in if you run it yourself)."
+"and log back in if you run it yourself). The Debian/Ubuntu package does this"
+" step for you."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:266
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:267
 msgid ""
 "15. If you installed Tor via some package or installer, it probably starts "
 "Tor for you automatically on boot. But if you installed from source, you may"
@@ -416,7 +417,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:272
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:273
 msgid ""
 "When you change your Tor configuration, remember to verify that your relay "
 "still works correctly after the change. Be sure to set your \"ContactInfo\" "
@@ -428,7 +429,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:283
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:284
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "about/contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/po/ru/docs/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/po/ru/docs/2-medium.verifying-signatures.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ru/docs/2-medium.verifying-signatures.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-09-05 00:00+0200\n"
-"PO-Revision-Date: 2011-09-05 00:55+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 01:02+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -31,166 +31,88 @@
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:13
-#: /tmp/w7jGkC8yXE.xml:43 /tmp/w7jGkC8yXE.xml:59 /tmp/w7jGkC8yXE.xml:86
-#: /tmp/w7jGkC8yXE.xml:186
+#: /tmp/kzjpFaPDWT.xml:16 /tmp/kzjpFaPDWT.xml:60 /tmp/kzjpFaPDWT.xml:120
+#: /tmp/kzjpFaPDWT.xml:176
 msgid "<hr>"
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><h3>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:15
-msgid ""
-"Each file on <a href=\"<page download/download>\">our download page</a> is "
-"accompanied by a file with the same name as the package and the extension "
-"\".asc\". These .asc files are GPG signatures. They allow you to verify the "
-"file you've downloaded is exactly the one that we intended you to get. For "
-"example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by "
-"tor-browser-<version-torbrowserbundle>_en-US.exe.asc."
+msgid "What is a signature and why should I check it?"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:22
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:18
 msgid ""
-"Of course, you'll need to have our GPG keys in your keyring: if you don't "
-"know the GPG key, you can't be sure that it was really us who signed it. The"
-" signing keys we use are:"
+"How do you know that the Tor program you have is really the one we made? "
+"Many Tor users have very real adversaries who might try to give them a fake "
+"version of Tor &mdash; and it doesn't matter how secure and anonymous Tor is"
+" if you're not running the real Tor."
 msgstr ""
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:26
-msgid "Roger's (0x28988BF5) typically signs the source code file."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:27
-msgid "Nick's (0x165733EA, or its subkey 0x8D29319A)."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:28
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:23
 msgid ""
-"Andrew's (0x31B0974B) typically signed older packages for windows and mac."
+"An attacker could try a variety of attacks to get you to download a fake "
+"Tor. For example, he could trick you into thinking some other website is a "
+"great place to download Tor. That's why you should always download Tor from "
+"<b>https</b>://www.torproject.org/. The https part means there's encryption "
+"and authentication between your browser and the website, making it much "
+"harder for the attacker to modify your download. But it's not perfect. Some "
+"places in the world block the Tor website, making users try <a href=\"<page "
+"docs/faq>#GetTor\">somewhere else</a>. Large companies sometimes force "
+"employees to use a modified browser, so the company can listen in on all "
+"their browsing. We've even <a href=\"https://blog.torproject.org/blog";
+"/diginotar-debacle-and-what-you-should-do-about-it\">seen</a> attackers who "
+"have the ability to trick your browser into thinking you're talking to the "
+"Tor website with https when you're not."
 msgstr ""
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:29
-msgid "Peter's (0xC82E0039, or its subkey 0xE1DEC577)."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:30
-msgid "TomÃs's (0x9A753A6B) signs current Vidalia release tarballs and tags."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:31
-msgid "Matt's (0x5FA14861) signed older Vidalia release tarballs."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:32
-msgid "Damian's (0x9ABBEEC6) signs Arm releases"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:33
-msgid "Jacob's (0xE012B42D)."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:34
-msgid ""
-"Erinn's (0x63FEE659) and (0xF1F5C9B5) typically signs all windows, mac, and "
-"most linux packages."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:35
-msgid "Mike's (0xDDC6C0AD) signs the Torbutton xpi."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:36
-msgid "Karsten's (0xF7C11265) signs the metrics archives and tools."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:37
-msgid "Robert Hogan's (0x22F6856F) signs torsocks release tarballs and tags."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
+#. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:38
-msgid "Nathan's (0xB374CBD2) signs the Android APK file for Orbot."
-msgstr ""
-
-#. type: Content of: <div><div><ul>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:38
-msgid "."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:39
 msgid ""
-"Tor Project Archive (0x886DDD89) signs the deb.torproject.org repositories "
-"and archives"
+"Some software sites list <a "
+"href=\"http://en.wikipedia.org/wiki/Cryptographic_hash_function\";>sha1 "
+"hashes</a> alongside the software on their website, so users can verify that"
+" they downloaded the file without any errors. These \"checksums\" help you "
+"answer the question \"Did I download this file correctly from whoever sent "
+"it to me?\" They do a good job at making sure you didn't have any random "
+"errors in your download, but they don't help you figure out whether you were"
+" downloading it from the attacker. The better question to answer is: \"Is "
+"this file that I just downloaded the file that Tor intended me to get?\""
 msgstr ""
 
-#. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:42
-msgid "Step Zero: Install GnuPG"
-msgstr ""
-
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:44
-msgid "You need to have GnuPG installed before you can verify signatures."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:48
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:49
 msgid ""
-"Linux: see <a "
-"href=\"http://www.gnupg.org/download/\";>http://www.gnupg.org/download/</a> "
-"or install <i>gnupg</i> from the package management system."
+"Each file on <a href=\"<page download/download>\">our download page</a> is "
+"accompanied by a file with the same name as the package and the extension "
+"\".asc\". These .asc files are GPG signatures. They allow you to verify the "
+"file you've downloaded is exactly the one that we intended you to get. For "
+"example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by "
+"tor-browser-<version-torbrowserbundle>_en-US.exe.asc. For a list of which "
+"developer signs which package, see our <a href=\"<page docs/signing-"
+"keys>\">signing keys</a> page."
 msgstr ""
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:51
-msgid ""
-"Windows: see <a "
-"href=\"http://www.gnupg.org/download/\";>http://www.gnupg.org/download/</a>. "
-"Look for the \"version compiled for MS-Windows\" under \"Binaries\"."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:54
-msgid ""
-"Mac: see <a "
-"href=\"http://macgpg.sourceforge.net/\";>http://macgpg.sourceforge.net/</a>."
-msgstr ""
-
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:58
-msgid "Step One: Import the keys"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:59
+msgid "Windows"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:60
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:62
 msgid ""
-"The next step is to import the key. This can be done directly from GnuPG. "
-"Make sure you import the correct key. For example, if you downloaded a "
-"Windows package, you will need to import Erinn's key."
+"You need to have GnuPG installed before you can verify signatures. Download "
+"it from <a "
+"href=\"http://gpg4win.org/download.html\";>http://gpg4win.org/download.html</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:64
-#: /tmp/w7jGkC8yXE.xml:89 /tmp/w7jGkC8yXE.xml:194
-msgid "<b>Windows:</b>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:65
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:66
 msgid ""
-"GnuPG for Windows is a command line tool, and you will need to use "
+"Once it's installed, use GnuPG to import the key that signed your package. "
+"Since GnuPG for Windows is a command-line tool, you will need to use "
 "<i>cmd.exe</i>. Unless you edit your PATH environment variable, you will "
 "need to tell Windows the full path to the GnuPG program. If you installed "
 "GnuPG with the default values, the path should be something like this: "
@@ -198,303 +120,191 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:71
-msgid "To import the key 0x28988BF5, start <i>cmd.exe</i> and type:"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:73
+msgid ""
+"Erinn Clark signs the Tor Browser Bundles. Import her key (0x63FEE659) by "
+"starting <i>cmd.exe</i> and typing:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:73
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:76
 #, no-wrap
 msgid ""
 "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --keyserver hkp://keys.gnupg.net "
-"--recv-keys 0x28988BF5"
+"--recv-keys 0x63FEE659"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:75
-#: /tmp/w7jGkC8yXE.xml:92
-msgid "<b>Mac and Linux</b>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:76
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:78
+#: /tmp/kzjpFaPDWT.xml:134
 msgid ""
-"Whether you have a Mac or you run Linux, you will need to use the terminal "
-"to run GnuPG. Mac users can find the terminal under \"Applications\". If you"
-" run Linux and use Gnome, the terminal should be under \"Applications menu\""
-" and \"Accessories\". KDE users can find the terminal under \"Menu\" and "
-"\"System\"."
+"After importing the key, you can verify that the fingerprint is correct:"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:81
-msgid "To import the key 0x28988BF5, start the terminal and type:"
-msgstr ""
-
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:83
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:81
 #, no-wrap
-msgid "gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x28988BF5"
+msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --fingerprint 0x63FEE659"
 msgstr ""
 
-#. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:85
-msgid "Step Two: Verify the fingerprints"
-msgstr ""
-
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:87
-msgid ""
-"After importing the key, you will want to verify that the fingerprint is "
-"correct."
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:83
+#: /tmp/kzjpFaPDWT.xml:139
+msgid "You should see:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:90
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:85
 #, no-wrap
-msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --fingerprint (insert keyid here)"
-msgstr ""
-
-#. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:93
-#, no-wrap
-msgid "gpg --fingerprint (insert keyid here)"
-msgstr ""
-
-#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:95
-msgid "The fingerprints for the keys should be:"
-msgstr ""
-
-#. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:98
-#, no-wrap
 msgid ""
-"    pub   1024D/28988BF5 2000-02-27\n"
-"          Key fingerprint = B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
-"    uid                  Roger Dingledine &lt;arma@xxxxxxx&gt;\n"
-"\n"
-"    pub   3072R/165733EA 2004-07-03\n"
-"          Key fingerprint = B35B F85B F194 89D0 4E28  C33C 2119 4EBB 1657 33EA\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxxx&gt;\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxx&gt;\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxxxx&gt;\n"
-"\n"
-"    pub  1024D/31B0974B 2003-07-17\n"
-"         Key fingerprint = 0295 9AA7 190A B9E9 027E  0736 3B9D 093F 31B0 974B\n"
-"    uid                  Andrew Lewman (phobos) &lt;phobos@xxxxxxxxxx&gt;\n"
-"    uid                  Andrew Lewman &lt;andrew@xxxxxxxxxx&gt;\n"
-"    uid                  Andrew Lewman &lt;andrew@xxxxxxxxxxxxxx&gt;\n"
-"    sub   4096g/B77F95F7 2003-07-17\n"
-"\n"
-"    pub   4096R/C82E0039 2003-03-24\n"
-"          Key fingerprint = 25FC 1614 B8F8 7B52 FF2F  99B9 62AF 4031 C82E 0039\n"
-"    uid                  Peter Palfrader\n"
-"    uid                  Peter Palfrader &lt;peter@xxxxxxxxxxxxx&gt;\n"
-"    uid                  Peter Palfrader &lt;weasel@xxxxxxxxxx&gt;\n"
-"\n"
-"    pub   1024D/9A753A6B 2009-09-11\n"
-"          Key fingerprint = 553D 7C2C 626E F16F 27F3  30BC 95E3 881D 9A75 3A6B\n"
-"    uid                  TomÃs Touceda &lt;chiiph@xxxxxxxxx&gt;\n"
-"    sub   1024g/33BE0E5B 2009-09-11\n"
-"\n"
-"    pub   1024D/5FA14861 2005-08-17\n"
-"          Key fingerprint = 9467 294A 9985 3C9C 65CB  141D AF7E 0E43 5FA1 4861\n"
-"    uid                  Matt Edman &lt;edmanm@xxxxxxx&gt;\n"
-"    uid                  Matt Edman &lt;Matt_Edman@xxxxxxxxxx&gt;\n"
-"    uid                  Matt Edman &lt;edmanm2@xxxxxxxxxx&gt;\n"
-"    sub   4096g/EA654E59 2005-08-17\n"
-"\n"
-"    pub   1024D/9ABBEEC6 2009-06-17\n"
-"          Key fingerprint = 6827 8CC5 DD2D 1E85 C4E4  5AD9 0445 B7AB 9ABB EEC6\n"
-"    uid                  Damian Johnson (www.atagar.com) &lt;atagar1@xxxxxxxxx&gt;\n"
-"    uid                  Damian Johnson &lt;atagar@xxxxxxxxxxxxxx&gt;\n"
-"    sub   2048g/146276B2 2009-06-17\n"
-"    sub   2048R/87F30690 2010-08-07\n"
-"\n"
-"    pub   4096R/E012B42D 2010-05-07\n"
-"          Key fingerprint = D8C9 AF51 CAA9 CAEA D3D8  9C9E A34F A745 E012 B42D\n"
-"    uid                  Jacob Appelbaum &lt;jacob@xxxxxxxxxxxxx&gt;\n"
-"    uid                  Jacob Appelbaum &lt;jacob@xxxxxxxxxxxxxx&gt;\n"
-"    sub   4096R/7CA91A52 2010-05-07 [expires: 2011-05-07]\n"
-"\n"
 "    pub   2048R/63FEE659 2003-10-16\n"
 "          Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\n"
 "    sub   2048R/EB399FD7 2003-10-16\n"
-"\n"
-"    pub   1024D/F1F5C9B5 2010-02-03\n"
-"          Key fingerprint = C2E3 4CFC 13C6 2BD9 2C75  79B5 6B8A AEB1 F1F5 C9B5\n"
-"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
-"    sub   1024g/7828F26A 2010-02-03\n"
-"\n"
-"    pub   1024D/DDC6C0AD 2006-07-26\n"
-"          Key fingerprint = BECD 90ED D1EE 8736 7980  ECF8 1B0C A30C DDC6 C0AD\n"
-"    uid                  Mike Perry &lt;mikeperry@xxxxxxxxxx&gt;\n"
-"    uid                  Mike Perry &lt;mikepery@xxxxxxxxxx&gt;\n"
-"    sub   4096g/AF0A91D7 2006-07-26\n"
-"\n"
-"    pub   1024D/F7C11265 2007-03-09 [expires: 2012-03-01]\n"
-"          Key fingerprint = FC8A EEF1 792E EE71 D721  7D47 D0CF 963D F7C1 1265\n"
-"    uid                  Karsten Loesing &lt;karsten.loesing@xxxxxxx&gt;\n"
-"    sub   2048g/75D85E4B 2007-03-09 [expires: 2012-03-01]\n"
-"\n"
-"    pub   1024D/22F6856F 2006-08-19\n"
-"          Key fingerprint = DDB4 6B5B 7950 CD47 E59B  5189 4C09 25CF 22F6 856F\n"
-"    uid                  Robert Hogan &lt;robert@xxxxxxxxxxxxxxx&gt;\n"
-"    sub   1024g/FC4A9460 2006-08-19\n"
-"\n"
-"    pub   3072D/B374CBD2 2010-06-09 [expires: 2011-06-09]\n"
-"   \t  Key fingerprint = B92B CA64 72F7 C6F0 8D47  8503 D2AC D203 B374 CBD2\n"
-"    uid                  Nathan of Guardian &lt;nathan@xxxxxxxxxxxxxxxxxxxx&gt;\n"
-"    sub   4096g/B5878C3B 2010-06-09 [expires: 2011-06-09]\n"
-"\n"
-"    pub   2048R/886DDD89 2009-09-04 [expires: 2014-09-03]\n"
-"      Key fingerprint = A3C4 F0F9 79CA A22C DBA8  F512 EE8C BC9E 886D DD89\n"
-"    uid                  deb.torproject.org archive signing key\n"
-"    sub   2048R/219EC810 2009-09-04 [expires: 2012-09-03]\n"
-"    "
 msgstr ""
 
-#. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:185
-msgid "Step Three: Verify the downloaded package"
-msgstr ""
-
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:187
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:93
+#: /tmp/kzjpFaPDWT.xml:149
 msgid ""
 "To verify the signature of the package you downloaded, you will need to "
-"download the \".asc\" file as well."
+"download the \".asc\" file as well. Assuming you downloaded the package and "
+"its signature to your Desktop, run:"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:190
-msgid ""
-"In the following examples, the user Alice downloads packages for Windows, "
-"Mac OS X and Linux and also verifies the signature of each package. All "
-"files are saved on the desktop."
-msgstr ""
-
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:195
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:97
 #, no-wrap
 msgid ""
 "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --verify C:\\Users\\Alice\\Desktop"
-"\\<file-win32-bundle-stable>.asc C:\\Users\\Alice\\Desktop\\<file-win32"
-"-bundle-stable>"
+"\\<file-win32-bundle-stable>.asc"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:197
-msgid "<b>Mac:</b>"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:99
+#: /tmp/kzjpFaPDWT.xml:155
+msgid "The output should say \"Good signature\":"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:198
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:102
+#: /tmp/kzjpFaPDWT.xml:158
 #, no-wrap
 msgid ""
-"gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc /Users/Alice"
-"/<file-osx-x86-bundle-stable>"
+"    gpg: Signature made Wed 31 Aug 2011 06:37:01 PM EDT using RSA key ID 63FEE659\n"
+"    gpg: Good signature from \"Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\"\n"
+"    gpg:                 aka \"Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\"\n"
+"    gpg:                 aka \"Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\"\n"
+"    gpg: WARNING: This key is not certified with a trusted signature!\n"
+"    gpg:          There is no indication that the signature belongs to the owner.\n"
+"    Primary key fingerprint: 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
+"    "
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:200
-msgid "<b>Linux</b>"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:112
+#: /tmp/kzjpFaPDWT.xml:168
+msgid ""
+"Notice that there is a warning because you haven't assigned a trust index to"
+" this person. This means that GnuPG verified that the key made that "
+"signature, but it's up to you to decide if that key really belongs to the "
+"developer. The best method is to meet the developer in person and exchange "
+"key fingerprints."
 msgstr ""
 
-#. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:201
-#, no-wrap
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:119
+msgid "Mac OS X"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:122
 msgid ""
-"gpg --verify /home/Alice/Desktop/<file-source-stable>.asc "
-"/home/Alice/Desktop/<file-source-stable>"
+"You need to have GnuPG installed before you can verify signatures. You can "
+"install it from <a "
+"href=\"http://macgpg.sourceforge.net/\";>http://macgpg.sourceforge.net/</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:204
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:127
 msgid ""
-"After verifying, GnuPG will come back saying something like \"Good "
-"signature\" or \"BAD signature\". The output should look something like "
-"this:"
+"Once it's installed, use GnuPG to import the key that signed your package. "
+"Erinn Clark signs the Tor Browser Bundles. Import her key (0x63FEE659) by "
+"starting the terminal (under \"Applications\")  and typing:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:209
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:132
 #, no-wrap
-msgid ""
-"    gpg: Signature made Tue 16 Mar 2010 05:55:17 AM CET using DSA key ID 28988BF5\n"
-"    gpg: Good signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
-"    gpg: WARNING: This key is not certified with a trusted signature!\n"
-"    gpg:          There is no indication that the signature belongs to the owner.\n"
-"    Primary key fingerprint: B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
-"    "
+msgid "gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:217
-msgid ""
-"Notice that there is a warning because you haven't assigned a trust index to"
-" this person. This means that GnuPG verified that the key made that "
-"signature, but it's up to you to decide if that key really belongs to the "
-"developer. The best method is to meet the developer in person and exchange "
-"key fingerprints."
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:137
+#, no-wrap
+msgid "gpg --fingerprint 0x63FEE659"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:224
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:141
+#, no-wrap
 msgid ""
-"For your reference, this is an example of a <em>BAD</em> verification. It "
-"means that the signature and file contents do not match. In this case, you "
-"should not trust the file contents:"
+"    pub   2048R/63FEE659 2003-10-16\n"
+"          Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\n"
+"    sub   2048R/EB399FD7 2003-10-16\n"
+"    "
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:229
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:153
 #, no-wrap
+msgid "gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:175
+msgid "Linux"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:178
 msgid ""
-"    gpg: Signature made Tue 20 Apr 2010 12:22:32 PM CEST using DSA key ID 28988BF5\n"
-"    gpg: BAD signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
-"    "
+"Most Linux distributions come with gpg preinstalled, so users who want to "
+"verify the Tor Browser Bundle for Linux (or the source tarball) can just "
+"follow along with the instructions above for \"Mac OS X\"."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:233
-msgid "<b>RPM-based distributions :</b>"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:183
+msgid ""
+"If you're using the <b>Debian</b> packages, you should read the instructions"
+" on <a href=\"<page docs/debian>#packages\">importing these keys to apt</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:234
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:187
 msgid ""
-"In order to manually verify the signatures on the RPM packages, you must use"
-" the <code>rpm</code> tool like so: <br />"
+"If you're using the <b>RPMs</b>, you can manually verify the signatures on "
+"the RPM packages by"
 msgstr ""
 
 #. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:237
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:188
 #, no-wrap
 msgid "rpm -K filename.rpm"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:240
-msgid "<b>Debian:</b>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:241
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:190
 msgid ""
-"If you are running Tor on Debian you should read the instructions on <a "
-"href=\"<page docs/debian>#packages\">importing these keys to apt</a>."
+"See <a "
+"href=\"http://www.gnupg.org/documentation/\";>http://www.gnupg.org/documentation/</a>"
+" to learn more about GPG."
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:244
-msgid ""
-"If you wish to learn more about GPG, see <a "
-"href=\"http://www.gnupg.org/documentation/\";>http://www.gnupg.org/documentation/</a>."
-msgstr ""
 
-

Modified: translation/trunk/projects/website/po/ru/docs/3-low.rpms.po
===================================================================
--- translation/trunk/projects/website/po/ru/docs/3-low.rpms.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ru/docs/3-low.rpms.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-08-10 08:19+0200\n"
-"PO-Revision-Date: 2011-08-11 01:04+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 01:04+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/rpms.wml:16 /tmp/Xp_xTVMYLa.xml:70
+#: /home/runa/tor/website/docs/en/rpms.wml:16 /tmp/qK7cG0J74c.xml:71
 msgid "<br>"
 msgstr ""
 
@@ -76,11 +76,12 @@
 #: /home/runa/tor/website/docs/en/rpms.wml:36
 msgid ""
 "If you wish to track the stable releases of Tor, you should substitute "
-"DISTRIBUTION with one of the following: centos4, centos5, fc13, fc14, suse"
+"DISTRIBUTION with one of the following: centos4, centos5, fc13, fc14, fc15, "
+"suse"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:39
+#: /home/runa/tor/website/docs/en/rpms.wml:40
 msgid ""
 "To track experimental releases, substitute DISTRIBUTION with one of these: "
 "centos4-experimental, centos5-experimental, fc13-experimental, "
@@ -88,25 +89,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:44
+#: /home/runa/tor/website/docs/en/rpms.wml:45
 msgid "Then install Tor by running:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/rpms.wml:46
+#: /home/runa/tor/website/docs/en/rpms.wml:47
 #, no-wrap
 msgid "yum install tor"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:49
+#: /home/runa/tor/website/docs/en/rpms.wml:50
 msgid ""
 "Now Tor is installed and running. Move on to <a href=\"<page docs/tor-doc-"
 "unix>#using\">step two</a> of the \"Tor on Linux/Unix\" instructions."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:55
+#: /home/runa/tor/website/docs/en/rpms.wml:56
 msgid ""
 "The DNS name <code>deb.torproject.org</code> is actually a set of "
 "independent servers in a DNS round-robin configuration.  If for some reason "
@@ -116,29 +117,29 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/rpms.wml:64
+#: /home/runa/tor/website/docs/en/rpms.wml:65
 msgid "<hr> <hr> <a id=\"source\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/rpms.wml:69
+#: /home/runa/tor/website/docs/en/rpms.wml:70
 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:73
+#: /home/runa/tor/website/docs/en/rpms.wml:74
 msgid ""
 "If you'd like to build from source, please follow the <a href=\"<gitblob>doc"
 "/tor-rpm-creation.txt\">RPM creation instructions</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/rpms.wml:77
+#: /home/runa/tor/website/docs/en/rpms.wml:78
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/rpms.wml:79
+#: /home/runa/tor/website/docs/en/rpms.wml:80
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "about/contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/po/ru/press/4-optional.2010-03-25-tor-store-press-release.po
===================================================================
--- translation/trunk/projects/website/po/ru/press/4-optional.2010-03-25-tor-store-press-release.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/ru/press/4-optional.2010-03-25-tor-store-press-release.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-05-02 17:00+0200\n"
-"PO-Revision-Date: 2011-09-21 19:51+0000\n"
+"PO-Revision-Date: 2011-09-28 09:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/vi/docs/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/po/vi/docs/2-medium.verifying-signatures.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/vi/docs/2-medium.verifying-signatures.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-09-05 00:00+0200\n"
-"PO-Revision-Date: 2011-09-05 00:55+0000\n"
+"POT-Creation-Date: 2011-09-21 20:02+0200\n"
+"PO-Revision-Date: 2011-09-22 01:02+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -33,187 +33,88 @@
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:13
-#: /tmp/w7jGkC8yXE.xml:43 /tmp/w7jGkC8yXE.xml:59 /tmp/w7jGkC8yXE.xml:86
-#: /tmp/w7jGkC8yXE.xml:186
+#: /tmp/kzjpFaPDWT.xml:16 /tmp/kzjpFaPDWT.xml:60 /tmp/kzjpFaPDWT.xml:120
+#: /tmp/kzjpFaPDWT.xml:176
 msgid "<hr>"
 msgstr "<hr>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><h3>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:15
-msgid ""
-"Each file on <a href=\"<page download/download>\">our download page</a> is "
-"accompanied by a file with the same name as the package and the extension "
-"\".asc\". These .asc files are GPG signatures. They allow you to verify the "
-"file you've downloaded is exactly the one that we intended you to get. For "
-"example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by "
-"tor-browser-<version-torbrowserbundle>_en-US.exe.asc."
+msgid "What is a signature and why should I check it?"
 msgstr ""
-"Mái táp tin trong <a href=\"<page download/download>\">phán tái vá cáa chÃng"
-" tÃi</a> ÄÆác kÃm theo mát táp tin chá kÃ .asc cÃ tÃn trÃng vái tÃn cáa táp "
-"tin phán mám. Nháng táp tin .asc nÃy lÃ chá kÃ dáng GPG. Nháng chá kÃ ÄÃ "
-"giÃp bán kiám tra cÃc táp tin bán ÄÃ tái vá cÃ trÃng vái bán gác hay khÃng. "
-"VÃ dá, tor-browser-<sáphiÃnbán-torbrowserbundle>_en-US.exe kÃm theo chá kÃ "
-"tor-browser-<sáphiÃnbán-torbrowserbundle>_en-US.exe.asc."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:22
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:18
 msgid ""
-"Of course, you'll need to have our GPG keys in your keyring: if you don't "
-"know the GPG key, you can't be sure that it was really us who signed it. The"
-" signing keys we use are:"
+"How do you know that the Tor program you have is really the one we made? "
+"Many Tor users have very real adversaries who might try to give them a fake "
+"version of Tor &mdash; and it doesn't matter how secure and anonymous Tor is"
+" if you're not running the real Tor."
 msgstr ""
-"Bán phái cÃ chá kÃ GPG máu cáa chÃng tÃi trong cÆ sá dá liáu cáa phán mám "
-"kiám tra chá kÄ. Náu khÃng thÃ bán khÃng thá chác chán ÄÆác ai ÄÃ thát sá kÃ"
-" táp tin phán mám ÄÃ. CÃc chá kÃ máu cáa chÃng tÃi bao gám:"
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:26
-msgid "Roger's (0x28988BF5) typically signs the source code file."
-msgstr "Roger's (0x28988BF5) : chá kÃ máu cho cÃc táp tin mÃ nguán."
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:27
-msgid "Nick's (0x165733EA, or its subkey 0x8D29319A)."
-msgstr "Nick's (0x165733EA, hoác 0x8D29319A)."
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:28
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:23
 msgid ""
-"Andrew's (0x31B0974B) typically signed older packages for windows and mac."
+"An attacker could try a variety of attacks to get you to download a fake "
+"Tor. For example, he could trick you into thinking some other website is a "
+"great place to download Tor. That's why you should always download Tor from "
+"<b>https</b>://www.torproject.org/. The https part means there's encryption "
+"and authentication between your browser and the website, making it much "
+"harder for the attacker to modify your download. But it's not perfect. Some "
+"places in the world block the Tor website, making users try <a href=\"<page "
+"docs/faq>#GetTor\">somewhere else</a>. Large companies sometimes force "
+"employees to use a modified browser, so the company can listen in on all "
+"their browsing. We've even <a href=\"https://blog.torproject.org/blog";
+"/diginotar-debacle-and-what-you-should-do-about-it\">seen</a> attackers who "
+"have the ability to trick your browser into thinking you're talking to the "
+"Tor website with https when you're not."
 msgstr ""
-"Andrew's (0x31B0974B) chá kÃ máu cho cÃc phiÃn bán cÅ dÃng trÃn windows vÃ "
-"mac."
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:29
-msgid "Peter's (0xC82E0039, or its subkey 0xE1DEC577)."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:30
-msgid "TomÃs's (0x9A753A6B) signs current Vidalia release tarballs and tags."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:31
-msgid "Matt's (0x5FA14861) signed older Vidalia release tarballs."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:32
-msgid "Damian's (0x9ABBEEC6) signs Arm releases"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:33
-msgid "Jacob's (0xE012B42D)."
-msgstr "Jacob's (0xE012B42D)."
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:34
-msgid ""
-"Erinn's (0x63FEE659) and (0xF1F5C9B5) typically signs all windows, mac, and "
-"most linux packages."
-msgstr ""
-"Erinn's (0x63FEE659) and (0xF1F5C9B5) chá kÃ máu cho tá cá táp tin phán mám "
-"cho windows, mac vÃ háu hát cÃc Linux."
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:35
-msgid "Mike's (0xDDC6C0AD) signs the Torbutton xpi."
-msgstr "Mike's (0xDDC6C0AD) chá kÃ máu cho táp tin Torbutton xpi."
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:36
-msgid "Karsten's (0xF7C11265) signs the metrics archives and tools."
-msgstr "Karsten's (0xF7C11265) signs the metrics archives and tools."
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:37
-msgid "Robert Hogan's (0x22F6856F) signs torsocks release tarballs and tags."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
+#. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:38
-msgid "Nathan's (0xB374CBD2) signs the Android APK file for Orbot."
-msgstr ""
-
-#. type: Content of: <div><div><ul>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:38
-msgid "."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:39
 msgid ""
-"Tor Project Archive (0x886DDD89) signs the deb.torproject.org repositories "
-"and archives"
+"Some software sites list <a "
+"href=\"http://en.wikipedia.org/wiki/Cryptographic_hash_function\";>sha1 "
+"hashes</a> alongside the software on their website, so users can verify that"
+" they downloaded the file without any errors. These \"checksums\" help you "
+"answer the question \"Did I download this file correctly from whoever sent "
+"it to me?\" They do a good job at making sure you didn't have any random "
+"errors in your download, but they don't help you figure out whether you were"
+" downloading it from the attacker. The better question to answer is: \"Is "
+"this file that I just downloaded the file that Tor intended me to get?\""
 msgstr ""
 
-#. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:42
-msgid "Step Zero: Install GnuPG"
-msgstr "BÆác Äáu tiÃn: CÃi Äát GnuPG"
-
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:44
-msgid "You need to have GnuPG installed before you can verify signatures."
-msgstr "Bán cán cÃ phán mám GnuPG Äá kiám tra chá kÃ trong táp tin."
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:48
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:49
 msgid ""
-"Linux: see <a "
-"href=\"http://www.gnupg.org/download/\";>http://www.gnupg.org/download/</a> "
-"or install <i>gnupg</i> from the package management system."
+"Each file on <a href=\"<page download/download>\">our download page</a> is "
+"accompanied by a file with the same name as the package and the extension "
+"\".asc\". These .asc files are GPG signatures. They allow you to verify the "
+"file you've downloaded is exactly the one that we intended you to get. For "
+"example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by "
+"tor-browser-<version-torbrowserbundle>_en-US.exe.asc. For a list of which "
+"developer signs which package, see our <a href=\"<page docs/signing-"
+"keys>\">signing keys</a> page."
 msgstr ""
-"Linux: see <a "
-"href=\"http://www.gnupg.org/download/\";>http://www.gnupg.org/download/</a> "
-"or install <i>gnupg</i> from the package management system."
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:51
-msgid ""
-"Windows: see <a "
-"href=\"http://www.gnupg.org/download/\";>http://www.gnupg.org/download/</a>. "
-"Look for the \"version compiled for MS-Windows\" under \"Binaries\"."
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:59
+msgid "Windows"
 msgstr ""
-"Windows: see <a "
-"href=\"http://www.gnupg.org/download/\";>http://www.gnupg.org/download/</a>. "
-"Look for the \"version compiled for MS-Windows\" under \"Binaries\"."
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:54
-msgid ""
-"Mac: see <a "
-"href=\"http://macgpg.sourceforge.net/\";>http://macgpg.sourceforge.net/</a>."
-msgstr ""
-"Mac: see <a "
-"href=\"http://macgpg.sourceforge.net/\";>http://macgpg.sourceforge.net/</a>."
-
-#. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:58
-msgid "Step One: Import the keys"
-msgstr "BÆác 2: Nháp chá kÃ máu."
-
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:60
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:62
 msgid ""
-"The next step is to import the key. This can be done directly from GnuPG. "
-"Make sure you import the correct key. For example, if you downloaded a "
-"Windows package, you will need to import Erinn's key."
+"You need to have GnuPG installed before you can verify signatures. Download "
+"it from <a "
+"href=\"http://gpg4win.org/download.html\";>http://gpg4win.org/download.html</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:64
-#: /tmp/w7jGkC8yXE.xml:89 /tmp/w7jGkC8yXE.xml:194
-msgid "<b>Windows:</b>"
-msgstr "<b>Windows:</b>"
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:65
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:66
 msgid ""
-"GnuPG for Windows is a command line tool, and you will need to use "
+"Once it's installed, use GnuPG to import the key that signed your package. "
+"Since GnuPG for Windows is a command-line tool, you will need to use "
 "<i>cmd.exe</i>. Unless you edit your PATH environment variable, you will "
 "need to tell Windows the full path to the GnuPG program. If you installed "
 "GnuPG with the default values, the path should be something like this: "
@@ -221,303 +122,191 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:71
-msgid "To import the key 0x28988BF5, start <i>cmd.exe</i> and type:"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:73
+msgid ""
+"Erinn Clark signs the Tor Browser Bundles. Import her key (0x63FEE659) by "
+"starting <i>cmd.exe</i> and typing:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:73
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:76
 #, no-wrap
 msgid ""
 "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --keyserver hkp://keys.gnupg.net "
-"--recv-keys 0x28988BF5"
+"--recv-keys 0x63FEE659"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:75
-#: /tmp/w7jGkC8yXE.xml:92
-msgid "<b>Mac and Linux</b>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:76
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:78
+#: /tmp/kzjpFaPDWT.xml:134
 msgid ""
-"Whether you have a Mac or you run Linux, you will need to use the terminal "
-"to run GnuPG. Mac users can find the terminal under \"Applications\". If you"
-" run Linux and use Gnome, the terminal should be under \"Applications menu\""
-" and \"Accessories\". KDE users can find the terminal under \"Menu\" and "
-"\"System\"."
+"After importing the key, you can verify that the fingerprint is correct:"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:81
-msgid "To import the key 0x28988BF5, start the terminal and type:"
-msgstr ""
-
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:83
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:81
 #, no-wrap
-msgid "gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x28988BF5"
+msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --fingerprint 0x63FEE659"
 msgstr ""
 
-#. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:85
-msgid "Step Two: Verify the fingerprints"
-msgstr ""
-
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:87
-msgid ""
-"After importing the key, you will want to verify that the fingerprint is "
-"correct."
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:83
+#: /tmp/kzjpFaPDWT.xml:139
+msgid "You should see:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:90
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:85
 #, no-wrap
-msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --fingerprint (insert keyid here)"
-msgstr ""
-
-#. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:93
-#, no-wrap
-msgid "gpg --fingerprint (insert keyid here)"
-msgstr ""
-
-#. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:95
-msgid "The fingerprints for the keys should be:"
-msgstr ""
-
-#. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:98
-#, no-wrap
 msgid ""
-"    pub   1024D/28988BF5 2000-02-27\n"
-"          Key fingerprint = B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
-"    uid                  Roger Dingledine &lt;arma@xxxxxxx&gt;\n"
-"\n"
-"    pub   3072R/165733EA 2004-07-03\n"
-"          Key fingerprint = B35B F85B F194 89D0 4E28  C33C 2119 4EBB 1657 33EA\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxxx&gt;\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxx&gt;\n"
-"    uid                  Nick Mathewson &lt;nickm@xxxxxxxxxxxxx&gt;\n"
-"\n"
-"    pub  1024D/31B0974B 2003-07-17\n"
-"         Key fingerprint = 0295 9AA7 190A B9E9 027E  0736 3B9D 093F 31B0 974B\n"
-"    uid                  Andrew Lewman (phobos) &lt;phobos@xxxxxxxxxx&gt;\n"
-"    uid                  Andrew Lewman &lt;andrew@xxxxxxxxxx&gt;\n"
-"    uid                  Andrew Lewman &lt;andrew@xxxxxxxxxxxxxx&gt;\n"
-"    sub   4096g/B77F95F7 2003-07-17\n"
-"\n"
-"    pub   4096R/C82E0039 2003-03-24\n"
-"          Key fingerprint = 25FC 1614 B8F8 7B52 FF2F  99B9 62AF 4031 C82E 0039\n"
-"    uid                  Peter Palfrader\n"
-"    uid                  Peter Palfrader &lt;peter@xxxxxxxxxxxxx&gt;\n"
-"    uid                  Peter Palfrader &lt;weasel@xxxxxxxxxx&gt;\n"
-"\n"
-"    pub   1024D/9A753A6B 2009-09-11\n"
-"          Key fingerprint = 553D 7C2C 626E F16F 27F3  30BC 95E3 881D 9A75 3A6B\n"
-"    uid                  TomÃs Touceda &lt;chiiph@xxxxxxxxx&gt;\n"
-"    sub   1024g/33BE0E5B 2009-09-11\n"
-"\n"
-"    pub   1024D/5FA14861 2005-08-17\n"
-"          Key fingerprint = 9467 294A 9985 3C9C 65CB  141D AF7E 0E43 5FA1 4861\n"
-"    uid                  Matt Edman &lt;edmanm@xxxxxxx&gt;\n"
-"    uid                  Matt Edman &lt;Matt_Edman@xxxxxxxxxx&gt;\n"
-"    uid                  Matt Edman &lt;edmanm2@xxxxxxxxxx&gt;\n"
-"    sub   4096g/EA654E59 2005-08-17\n"
-"\n"
-"    pub   1024D/9ABBEEC6 2009-06-17\n"
-"          Key fingerprint = 6827 8CC5 DD2D 1E85 C4E4  5AD9 0445 B7AB 9ABB EEC6\n"
-"    uid                  Damian Johnson (www.atagar.com) &lt;atagar1@xxxxxxxxx&gt;\n"
-"    uid                  Damian Johnson &lt;atagar@xxxxxxxxxxxxxx&gt;\n"
-"    sub   2048g/146276B2 2009-06-17\n"
-"    sub   2048R/87F30690 2010-08-07\n"
-"\n"
-"    pub   4096R/E012B42D 2010-05-07\n"
-"          Key fingerprint = D8C9 AF51 CAA9 CAEA D3D8  9C9E A34F A745 E012 B42D\n"
-"    uid                  Jacob Appelbaum &lt;jacob@xxxxxxxxxxxxx&gt;\n"
-"    uid                  Jacob Appelbaum &lt;jacob@xxxxxxxxxxxxxx&gt;\n"
-"    sub   4096R/7CA91A52 2010-05-07 [expires: 2011-05-07]\n"
-"\n"
 "    pub   2048R/63FEE659 2003-10-16\n"
 "          Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\n"
 "    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\n"
 "    sub   2048R/EB399FD7 2003-10-16\n"
-"\n"
-"    pub   1024D/F1F5C9B5 2010-02-03\n"
-"          Key fingerprint = C2E3 4CFC 13C6 2BD9 2C75  79B5 6B8A AEB1 F1F5 C9B5\n"
-"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
-"    sub   1024g/7828F26A 2010-02-03\n"
-"\n"
-"    pub   1024D/DDC6C0AD 2006-07-26\n"
-"          Key fingerprint = BECD 90ED D1EE 8736 7980  ECF8 1B0C A30C DDC6 C0AD\n"
-"    uid                  Mike Perry &lt;mikeperry@xxxxxxxxxx&gt;\n"
-"    uid                  Mike Perry &lt;mikepery@xxxxxxxxxx&gt;\n"
-"    sub   4096g/AF0A91D7 2006-07-26\n"
-"\n"
-"    pub   1024D/F7C11265 2007-03-09 [expires: 2012-03-01]\n"
-"          Key fingerprint = FC8A EEF1 792E EE71 D721  7D47 D0CF 963D F7C1 1265\n"
-"    uid                  Karsten Loesing &lt;karsten.loesing@xxxxxxx&gt;\n"
-"    sub   2048g/75D85E4B 2007-03-09 [expires: 2012-03-01]\n"
-"\n"
-"    pub   1024D/22F6856F 2006-08-19\n"
-"          Key fingerprint = DDB4 6B5B 7950 CD47 E59B  5189 4C09 25CF 22F6 856F\n"
-"    uid                  Robert Hogan &lt;robert@xxxxxxxxxxxxxxx&gt;\n"
-"    sub   1024g/FC4A9460 2006-08-19\n"
-"\n"
-"    pub   3072D/B374CBD2 2010-06-09 [expires: 2011-06-09]\n"
-"   \t  Key fingerprint = B92B CA64 72F7 C6F0 8D47  8503 D2AC D203 B374 CBD2\n"
-"    uid                  Nathan of Guardian &lt;nathan@xxxxxxxxxxxxxxxxxxxx&gt;\n"
-"    sub   4096g/B5878C3B 2010-06-09 [expires: 2011-06-09]\n"
-"\n"
-"    pub   2048R/886DDD89 2009-09-04 [expires: 2014-09-03]\n"
-"      Key fingerprint = A3C4 F0F9 79CA A22C DBA8  F512 EE8C BC9E 886D DD89\n"
-"    uid                  deb.torproject.org archive signing key\n"
-"    sub   2048R/219EC810 2009-09-04 [expires: 2012-09-03]\n"
-"    "
 msgstr ""
 
-#. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:185
-msgid "Step Three: Verify the downloaded package"
-msgstr ""
-
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:187
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:93
+#: /tmp/kzjpFaPDWT.xml:149
 msgid ""
 "To verify the signature of the package you downloaded, you will need to "
-"download the \".asc\" file as well."
+"download the \".asc\" file as well. Assuming you downloaded the package and "
+"its signature to your Desktop, run:"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:190
-msgid ""
-"In the following examples, the user Alice downloads packages for Windows, "
-"Mac OS X and Linux and also verifies the signature of each package. All "
-"files are saved on the desktop."
-msgstr ""
-
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:195
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:97
 #, no-wrap
 msgid ""
 "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --verify C:\\Users\\Alice\\Desktop"
-"\\<file-win32-bundle-stable>.asc C:\\Users\\Alice\\Desktop\\<file-win32"
-"-bundle-stable>"
+"\\<file-win32-bundle-stable>.asc"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:197
-msgid "<b>Mac:</b>"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:99
+#: /tmp/kzjpFaPDWT.xml:155
+msgid "The output should say \"Good signature\":"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:198
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:102
+#: /tmp/kzjpFaPDWT.xml:158
 #, no-wrap
 msgid ""
-"gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc /Users/Alice"
-"/<file-osx-x86-bundle-stable>"
+"    gpg: Signature made Wed 31 Aug 2011 06:37:01 PM EDT using RSA key ID 63FEE659\n"
+"    gpg: Good signature from \"Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\"\n"
+"    gpg:                 aka \"Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\"\n"
+"    gpg:                 aka \"Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\"\n"
+"    gpg: WARNING: This key is not certified with a trusted signature!\n"
+"    gpg:          There is no indication that the signature belongs to the owner.\n"
+"    Primary key fingerprint: 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
+"    "
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:200
-msgid "<b>Linux</b>"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:112
+#: /tmp/kzjpFaPDWT.xml:168
+msgid ""
+"Notice that there is a warning because you haven't assigned a trust index to"
+" this person. This means that GnuPG verified that the key made that "
+"signature, but it's up to you to decide if that key really belongs to the "
+"developer. The best method is to meet the developer in person and exchange "
+"key fingerprints."
 msgstr ""
 
-#. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:201
-#, no-wrap
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:119
+msgid "Mac OS X"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:122
 msgid ""
-"gpg --verify /home/Alice/Desktop/<file-source-stable>.asc "
-"/home/Alice/Desktop/<file-source-stable>"
+"You need to have GnuPG installed before you can verify signatures. You can "
+"install it from <a "
+"href=\"http://macgpg.sourceforge.net/\";>http://macgpg.sourceforge.net/</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:204
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:127
 msgid ""
-"After verifying, GnuPG will come back saying something like \"Good "
-"signature\" or \"BAD signature\". The output should look something like "
-"this:"
+"Once it's installed, use GnuPG to import the key that signed your package. "
+"Erinn Clark signs the Tor Browser Bundles. Import her key (0x63FEE659) by "
+"starting the terminal (under \"Applications\")  and typing:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:209
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:132
 #, no-wrap
-msgid ""
-"    gpg: Signature made Tue 16 Mar 2010 05:55:17 AM CET using DSA key ID 28988BF5\n"
-"    gpg: Good signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
-"    gpg: WARNING: This key is not certified with a trusted signature!\n"
-"    gpg:          There is no indication that the signature belongs to the owner.\n"
-"    Primary key fingerprint: B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
-"    "
+msgid "gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:217
-msgid ""
-"Notice that there is a warning because you haven't assigned a trust index to"
-" this person. This means that GnuPG verified that the key made that "
-"signature, but it's up to you to decide if that key really belongs to the "
-"developer. The best method is to meet the developer in person and exchange "
-"key fingerprints."
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:137
+#, no-wrap
+msgid "gpg --fingerprint 0x63FEE659"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:224
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:141
+#, no-wrap
 msgid ""
-"For your reference, this is an example of a <em>BAD</em> verification. It "
-"means that the signature and file contents do not match. In this case, you "
-"should not trust the file contents:"
+"    pub   2048R/63FEE659 2003-10-16\n"
+"          Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxx&gt;\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxx&gt;\n"
+"    uid                  Erinn Clark &lt;erinn@xxxxxxxxxxxxxxxx&gt;\n"
+"    sub   2048R/EB399FD7 2003-10-16\n"
+"    "
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:229
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:153
 #, no-wrap
+msgid "gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:175
+msgid "Linux"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:178
 msgid ""
-"    gpg: Signature made Tue 20 Apr 2010 12:22:32 PM CEST using DSA key ID 28988BF5\n"
-"    gpg: BAD signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
-"    "
+"Most Linux distributions come with gpg preinstalled, so users who want to "
+"verify the Tor Browser Bundle for Linux (or the source tarball) can just "
+"follow along with the instructions above for \"Mac OS X\"."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:233
-msgid "<b>RPM-based distributions :</b>"
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:183
+msgid ""
+"If you're using the <b>Debian</b> packages, you should read the instructions"
+" on <a href=\"<page docs/debian>#packages\">importing these keys to apt</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:234
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:187
 msgid ""
-"In order to manually verify the signatures on the RPM packages, you must use"
-" the <code>rpm</code> tool like so: <br />"
+"If you're using the <b>RPMs</b>, you can manually verify the signatures on "
+"the RPM packages by"
 msgstr ""
 
 #. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:237
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:188
 #, no-wrap
 msgid "rpm -K filename.rpm"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:240
-msgid "<b>Debian:</b>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:241
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:190
 msgid ""
-"If you are running Tor on Debian you should read the instructions on <a "
-"href=\"<page docs/debian>#packages\">importing these keys to apt</a>."
+"See <a "
+"href=\"http://www.gnupg.org/documentation/\";>http://www.gnupg.org/documentation/</a>"
+" to learn more about GPG."
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:244
-msgid ""
-"If you wish to learn more about GPG, see <a "
-"href=\"http://www.gnupg.org/documentation/\";>http://www.gnupg.org/documentation/</a>."
-msgstr ""
 
-

Modified: translation/trunk/projects/website/po/vi/download/3-low.download.po
===================================================================
--- translation/trunk/projects/website/po/vi/download/3-low.download.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/vi/download/3-low.download.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-09-05 00:00+0200\n"
-"PO-Revision-Date: 2011-09-21 19:39+0000\n"
+"PO-Revision-Date: 2011-09-28 08:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/zh_CN/1-high.index.po
===================================================================
--- translation/trunk/projects/website/po/zh_CN/1-high.index.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/zh_CN/1-high.index.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# chen zhang <magnyfx@xxxxxxxxxxx>, 2011.
 # snakeyi <snakeyi0624@xxxxxxxxx>, 2011.
 # xtoaster <zhazhenzhong@xxxxxxxxx>, 2011.
 #   <zhazhenzhong@xxxxxxxxx>, 2011.
@@ -11,8 +12,8 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-09-05 00:00+0200\n"
-"PO-Revision-Date: 2011-09-05 00:50+0000\n"
-"Last-Translator: xtoaster <zhazhenzhong@xxxxxxxxx>\n"
+"PO-Revision-Date: 2011-09-27 08:44+0000\n"
+"Last-Translator: magny <magnyfx@xxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,6 +55,8 @@
 "<a href=\"<page download/download-easy>\"> <span class=\"download-"
 "tor\">Download Tor</span></a>"
 msgstr ""
+"<a href=\"<page download/download-easy>\"> <span class=\"download-tor\">äè "
+"Tor</span></a>"
 
 #. type: Content of: <div><div><div><div><div><h2>
 #: /home/runa/tor/website/en/index.wml:26
@@ -108,16 +111,18 @@
 "<a href=\"http://tails.boum.org/\";><img src=\"$(IMGROOT)/icon-Tails.jpg\" "
 "alt=\"Tails Icon\"></a>"
 msgstr ""
+"<a href=\"http://tails.boum.org/\";><img src=\"$(IMGROOT)/icon-Tails.jpg\" "
+"alt=\"Tails Icon\"></a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div><h3>
 #: /home/runa/tor/website/en/index.wml:63
 msgid "<a href=\"http://tails.boum.org/\";>Tails</a>"
-msgstr ""
+msgstr "<a href=\"http://tails.boum.org/\";>Tails</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div><p>
 #: /home/runa/tor/website/en/index.wml:64
 msgid "Live CD/USB distribution preconfigured to use Tor safely."
-msgstr ""
+msgstr "ééççCD/USBäæååçäçTorã"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div>
 #: /home/runa/tor/website/en/index.wml:69
@@ -125,18 +130,20 @@
 "<a href=\"https://guardianproject.info/apps/orbot/\";><img src=\"$(IMGROOT"
 ")/icon-Orbot.jpg\" alt=\"Orbot Icon\"></a>"
 msgstr ""
+"<a href=\"https://guardianproject.info/apps/orbot/\";><img src=\"$(IMGROOT"
+")/icon-Orbot.jpg\" alt=\"Orbot Icon\"></a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div><h3>
 #: /home/runa/tor/website/en/index.wml:71
 msgid "<a href=\"https://guardianproject.info/apps/orbot/\";>Orbot</a>"
-msgstr ""
+msgstr "<a href=\"https://guardianproject.info/apps/orbot/\";>Orbot</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div><p>
 #: /home/runa/tor/website/en/index.wml:72
 msgid ""
 "Tor for <a href=\"https://code.google.com/android/\";>Google Android</a> "
 "devices."
-msgstr ""
+msgstr "Toræäç<a href=\"https://code.google.com/android/\";>èæAndroid</a> èå."
 
 #. type: Content of: <div><div><div><div><table><tr><td><div>
 #: /home/runa/tor/website/en/index.wml:85
@@ -144,16 +151,18 @@
 "<a href=\"http://torstatus.blutmagie.de/\";><img src=\"$(IMGROOT)/icon-"
 "TorStatus.jpg\" alt=\"TorStatus Icon\"></a>"
 msgstr ""
+"<a href=\"http://torstatus.blutmagie.de/\";><img src=\"$(IMGROOT)/icon-"
+"TorStatus.jpg\" alt=\"TorStatus Icon\"></a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div><h3>
 #: /home/runa/tor/website/en/index.wml:87
 msgid "<a href=\"http://torstatus.blutmagie.de/\";>TorStatus</a>"
-msgstr ""
+msgstr "<a href=\"http://torstatus.blutmagie.de/\";>TorStatus(Torçæ)</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div><p>
 #: /home/runa/tor/website/en/index.wml:88
 msgid "Site providing an overview of the Tor network."
-msgstr ""
+msgstr "ççæääääéåTorçççéèã"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div>
 #: /home/runa/tor/website/en/index.wml:98
@@ -161,16 +170,18 @@
 "<a href=\"http://www.atagar.com/arm/\";><img src=\"$(IMGROOT)/icon-Arm.jpg\" "
 "alt=\"Arm Icon\"></a>"
 msgstr ""
+"<a href=\"http://www.atagar.com/arm/\";><img src=\"$(IMGROOT)/icon-Arm.jpg\" "
+"alt=\"Arm Icon\"></a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div><h3>
 #: /home/runa/tor/website/en/index.wml:100
 msgid "<a href=\"http://www.atagar.com/arm/\";>Arm</a>"
-msgstr ""
+msgstr "<a href=\"http://www.atagar.com/arm/\";>Arm</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div><p>
 #: /home/runa/tor/website/en/index.wml:101
 msgid "Terminal application for monitoring and configuring Tor."
-msgstr ""
+msgstr "çççåçæçèåéçTor"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div>
 #: /home/runa/tor/website/en/index.wml:108
@@ -178,6 +189,8 @@
 "<a href=\"<page torbutton/index>\"><img src=\"$(IMGROOT)/icon-"
 "TorButton.jpg\" alt=\"Torbutton Icon\"></a>"
 msgstr ""
+"<a href=\"<page torbutton/index>\"><img src=\"$(IMGROOT)/icon-"
+"TorButton.jpg\" alt=\"Torbutton Icon\"></a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div><h3>
 #: /home/runa/tor/website/en/index.wml:110
@@ -197,6 +210,8 @@
 "<a href=\"https://check.torproject.org/\";><img src=\"$(IMGROOT)/icon-"
 "TorCheck.jpg\" alt=\"Tor Check Icon\"></a>"
 msgstr ""
+"<a href=\"https://check.torproject.org/\";><img src=\"$(IMGROOT)/icon-"
+"TorCheck.jpg\" alt=\"Tor Check Icon\"></a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div><h3>
 #: /home/runa/tor/website/en/index.wml:119
@@ -214,6 +229,8 @@
 "<a href=\"<page projects/vidalia>\"><img src=\"$(IMGROOT)/icon-Vidalia.jpg\""
 " alt=\"Vidalia Icon\"></a>"
 msgstr ""
+"<a href=\"<page projects/vidalia>\"><img src=\"$(IMGROOT)/icon-Vidalia.jpg\""
+" alt=\"Vidalia Icon\"></a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div><h3>
 #: /home/runa/tor/website/en/index.wml:130
@@ -233,6 +250,8 @@
 "<a href=\"<page projects/torbrowser>\"><img src=\"$(IMGROOT)/icon-"
 "TorBrowser.jpg\" alt=\"TorBrowser Icon\"></a>"
 msgstr ""
+"<a href=\"<page projects/torbrowser>\"><img src=\"$(IMGROOT)/icon-"
+"TorBrowser.jpg\" alt=\"TorBrowser Icon\"></a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div><h3>
 #: /home/runa/tor/website/en/index.wml:139
@@ -243,7 +262,7 @@
 #: /home/runa/tor/website/en/index.wml:141
 msgid ""
 "Tor Browser contains everything you need to safely browse the Internet."
-msgstr "Toræèåååääæèäèçæéèçäå"
+msgstr "Toræèåååääååçæèäèçæéèçäå"
 
 #. type: Content of: <div><div><div><div><h2>
 #: /home/runa/tor/website/en/index.wml:154
@@ -340,7 +359,7 @@
 #. type: Content of: <div><div><div><div><table><tr><td><div>
 #: /home/runa/tor/website/en/index.wml:192
 msgid "<span class=\"month\">Aug</span><br><span class=\"day\">28</span>"
-msgstr ""
+msgstr "<span class=\"month\">åæ</span><br><span class=\"day\">28æ</span>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
 #: /home/runa/tor/website/en/index.wml:193
@@ -354,6 +373,8 @@
 "network statistics, improved code security, and many many other features and"
 " bugfixes."
 msgstr ""
+"Toréçååäää <a href=\"<page "
+"press/2011-08-28-tor-022-stable>\">æççåçæ</a>çTorèäãèèäåççåïèäçææéäåæççæèåååæåçåéæïåAndroidææåçååïæçåççåääæääååçæïæåæååçæççååèåçïæåçççæææåïæèçæçååæïèèåååäçæåéèäæã"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div>
 #: /home/runa/tor/website/en/index.wml:203

Modified: translation/trunk/projects/website/po/zh_CN/about/2-medium.overview.po
===================================================================
--- translation/trunk/projects/website/po/zh_CN/about/2-medium.overview.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/zh_CN/about/2-medium.overview.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-06-29 20:42+0200\n"
-"PO-Revision-Date: 2011-09-21 19:51+0000\n"
+"PO-Revision-Date: 2011-09-28 09:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"

Added: translation/trunk/projects/website/po/zh_CN/about/3-low.contributors.po
===================================================================
--- translation/trunk/projects/website/po/zh_CN/about/3-low.contributors.po	                        (rev 0)
+++ translation/trunk/projects/website/po/zh_CN/about/3-low.contributors.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -0,0 +1,361 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# chen zhang <magnyfx@xxxxxxxxxxx>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-07-08 08:44+0200\n"
+"PO-Revision-Date: 2011-09-27 09:00+0000\n"
+"Last-Translator: magny <magnyfx@xxxxxxxxxxx>\n"
+"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/contributors.wml:7
+msgid ""
+"<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
+"about/overview>\">About &raquo; </a> <a href=\"<page "
+"about/contributors>\">Past Contributors</a>"
+msgstr ""
+
+#. type: Content of: <div><div><h1>
+#: /home/runa/tor/website/about/en/contributors.wml:12
+msgid "Past Contributors"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:14
+msgid "Carolyn Anhalt"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:14
+msgid ""
+"Coordinated translations and translators for all of tor's content; website, "
+"products, and materials."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:16
+msgid "Domenik Bork"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:16
+msgid ""
+"Worked on Configuration of Hidden Services with User Authorization in "
+"Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches";
+"/hidden-services\">svn</a>) as part of Google Summer of Code 2008."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:19
+msgid "Benedikt Boss"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:19
+msgid ""
+"Worked during the 2007 Google Summer of Code on <a "
+"href=\"https://svn.torproject.org/svn/topf/trunk/README\";>TOPF</a>, a fuzzer"
+" for Tor; mentored by Roger."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:22
+msgid "Ren Bucholz"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:22
+msgid "Our fine logo and images."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:23
+msgid "Fallon Chen"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:23
+msgid ""
+"Worked on Improving Tor Path Selection (<a href=\"https://svn.torproject.org";
+"/cgi-bin/viewvc.cgi/torflow/branches/gsoc2008/\">svn</a>)  and <a "
+"href=\"<specblob>proposals/151-path-selection-improvements.txt\">proposal "
+"151</a> as part of Google Summer of Code 2008."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:29
+msgid "Bram Cohen"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:29
+msgid "Helped design our congestion control mechanisms, in Tor's early days."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:31
+msgid "Pat Double"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:31
+msgid "Creator of the Incognito LiveCD."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:32
+msgid "Geoff Goodell"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:32
+msgid ""
+"Started the <a "
+"href=\"https://svn.torproject.org/svn/blossom/trunk/\";>Blossom project</a> "
+"which uses Tor as its overlay network; also helped motivate Tor's control "
+"interface to be as flexible as it is."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:36
+msgid "Aleksei Gorny"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:36
+msgid ""
+"Working on Tor exit scanner improvements (<a "
+"href=\"https://svn.torproject.org/cgi-";
+"bin/viewvc.cgi/torflow/branches/gsoc2008/\">svn</a>), originally started as "
+"part of Google Summer of Code 2008."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:39
+msgid "Justin Hipple"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:39
+msgid "The other developer for Vidalia."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:40
+msgid "Christian King"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:40
+msgid ""
+"Worked during the 2007 Google Summer of Code on making Tor relays stable on "
+"Windows, by developing a <a href=\"https://svn.torproject.org/svn/libevent-";
+"urz/trunk/README\">buffer implementation for libevent</a>; mentored by Nick."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:45
+msgid "Joe Kowalski"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:45
+msgid ""
+"Original author and provider of the torstatus script formerly run on "
+"nighteffect."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:47
+msgid "Adam Langley"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:47
+msgid "Our fine eventdns code."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:48
+msgid "Bruce Leidl"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:48
+msgid "Worked on a Tor client in Java."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:49
+msgid "Rebecca MacKinnon"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:49
+msgid ""
+"Former Director of Tor.  Co-Founder of <a "
+"href=\"http://www.globalvoicesonline.org/\";>Global Voices Online</a>."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:51
+msgid "Chris Palmer"
+msgstr "Chris Palmer"
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:51
+msgid ""
+"Our liaison and tech guy with EFF while EFF was funding us. Also helped "
+"advocate and write end-user docs."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:53
+msgid "Martin Peck"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:53
+msgid ""
+"Worked on a VM-based transparent proxying approach for Tor clients on "
+"Windows."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:55
+msgid "Matej Pfajfar"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:55
+msgid ""
+"Author of the original onion routing code that Tor is based on, so we didn't"
+" have to start from scratch."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:57
+msgid "Johannes Renner"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:57
+msgid ""
+"Worked during the 2007 Google Summer of Code on modifying <a "
+"href=\"https://svn.torproject.org/svn/torflow/trunk/README\";>TorFlow</a> to "
+"measure various properties of the Tor network; mentored by Mike Perry."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:62
+msgid "Scott Squires"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:62
+msgid ""
+"The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:64
+msgid "tup (a pseudonym)"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:64
+msgid ""
+"Added new features for making Tor easier to use as a <a "
+"href=\"<wiki>TransparentProxy\">transparent proxy</a>. Also wrote the <a "
+"href=\"http://p56soo2ibjkx23xo.onion/\";>TorDNSEL code</a>."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:69
+msgid "Stephen Tyree"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:69
+msgid ""
+"Worked during Google Summer of Code 2009 to develop a plugin API for <a "
+"href=\"<page projects/vidalia>\">Vidalia</a> and create a plugin to allow "
+"HerdictWeb integration, a project aiming at identifying website "
+"inaccessibility using user submissions."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:73
+msgid "Camilo Viecco"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:73
+msgid ""
+"Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac";
+".vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as "
+"part of Google Summer of Code 2008."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:76
+msgid "Fred von Lohmann"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:76
+msgid ""
+"Fred served on our Board of Directors from 2006 through 2009.  His complete "
+"bio can be found at the <a href=\"http://www.eff.org/about/staff/fred-von-";
+"lohmann\">EFF Staff Site</a>."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:80
+msgid "Kyle Williams"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:80
+msgid ""
+"Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
+"easier to set up and use."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:82
+msgid "Christian Wilms"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:82
+msgid ""
+"Worked on Performance Enhancing Measures for Tor Hidden Services (<a "
+"href=\"https://svn.torproject.org/cgi-bin/viewvs.cgi/tor/branches/hidserv-";
+"perf/\">svn</a>) as part of Google Summer of Code 2008."
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/contributors.wml:85
+msgid "Jillian C. York"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/contributors.wml:85
+msgid ""
+"<a href=\"http://jilliancyork.com/\";>Jillian C. York</a> is a writer, "
+"blogger, and activist based in Boston."
+msgstr ""
+
+

Added: translation/trunk/projects/website/po/zh_CN/docs/1-high.tor-doc-windows.po
===================================================================
--- translation/trunk/projects/website/po/zh_CN/docs/1-high.tor-doc-windows.po	                        (rev 0)
+++ translation/trunk/projects/website/po/zh_CN/docs/1-high.tor-doc-windows.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -0,0 +1,304 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# chen zhang <magnyfx@xxxxxxxxxxx>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-06-21 08:18+0200\n"
+"PO-Revision-Date: 2011-09-27 08:58+0000\n"
+"Last-Translator: magny <magnyfx@xxxxxxxxxxx>\n"
+"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:8
+msgid ""
+"<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
+"docs/documentation>\">Documentation &raquo; </a> <a href=\"<page docs/tor-"
+"doc-windows>\">Windows Client</a>"
+msgstr ""
+"<a href=\"<page index>\">éé &raquo; </a> <a href=\"<page "
+"docs/documentation>\">ææ &raquo; </a> <a href=\"<page docs/tor-doc-"
+"windows>\">Windowsåæç</a>"
+
+#. type: Content of: <div><div><h1>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:13
+msgid "Running the <a href=\"<page index>\">Tor</a> client on Microsoft Windows"
+msgstr "ååèWindowsççäèè <a href=\"<page index>\">Tor</a> åæç"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:14
+#: /tmp/eiWvEVT5Zj.xml:36 /tmp/eiWvEVT5Zj.xml:72 /tmp/eiWvEVT5Zj.xml:111
+#: /tmp/eiWvEVT5Zj.xml:154
+msgid "<br>"
+msgstr "<br>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:17
+msgid ""
+"<b>Note that these are the installation instructions for running a Tor "
+"client on Microsoft Windows (XP, Vista, 7, and Server Editions).  If you "
+"want to relay traffic for others to help the network grow (please do), read "
+"the <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</a> guide.</b>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:24
+msgid ""
+"Freedom House has produced a video on how to install Tor.  You can view it "
+"at <a href=\"https://media.torproject.org/video/2009-install-and-use-";
+"tor.ogv\">How to install Tor on Windows</a>.  Know of a better video, or one"
+" translated into your language? Let us know!"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:33
+msgid "<hr> <a id=\"installing\"></a>"
+msgstr "<hr> <a id=\"installing\"></a>"
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:35
+msgid ""
+"<a class=\"anchor\" href=\"#installing\">Step One: Download and Install "
+"Tor</a>"
+msgstr "<a class=\"anchor\" href=\"#installing\">çäæïäèåèTor</a>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:39
+msgid ""
+"The Vidalia Bundle for Windows contains <a href=\"<page index>\">Tor</a>, <a"
+" href=\"<page projects/vidalia>\">Vidalia</a> (a GUI for Tor), <a "
+"href=\"<page torbutton/index>\">Torbutton</a> (a plugin for Mozilla "
+"Firefox), and <a "
+"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\";>Polipo</a> (a web "
+"proxy) packaged into one bundle, with the four applications pre-configured "
+"to work together.  Download either the <a href=\"../<package-win32-bundle-"
+"stable>\">stable</a> or the <a href=\"../<package-win32-bundle-"
+"alpha>\">experimental</a> version of the Vidalia Bundle, or look for more "
+"options on the <a href=\"<page download/download>\">download page</a>."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:51
+msgid ""
+"<img alt=\"tor installer splash page\" src=\"$(IMGROOT)/screenshot-win32"
+"-installer-splash.png\">"
+msgstr ""
+"<img alt=\"tor installer splash page\" src=\"$(IMGROOT)/screenshot-win32"
+"-installer-splash.png\">"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:53
+msgid ""
+"If you have previously installed Tor, Vidalia, or Polipo you can deselect "
+"whichever components you do not need to install in the dialog shown below."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:58
+msgid ""
+"<img alt=\"select components to install\" src=\"$(IMGROOT)/screenshot-win32"
+"-installer-components.png\">"
+msgstr ""
+"<img alt=\"select components to install\" src=\"$(IMGROOT)/screenshot-win32"
+"-installer-components.png\">"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:60
+msgid ""
+"After you have completed the installer, the components you selected will "
+"automatically be started for you."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:64
+msgid ""
+"Tor comes configured as a client by default. It uses a built-in default "
+"configuration file, and most people won't need to change any of the "
+"settings. Tor is now installed."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:69
+msgid "<hr> <a id=\"using\"></a>"
+msgstr "<hr> <a id=\"using\"></a>"
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:71
+msgid ""
+"<a class=\"anchor\" href=\"#using\">Step Two: Configure your applications to"
+" use Tor</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:74
+msgid ""
+"After installing Tor and Polipo, you need to configure your applications to "
+"use them. The first step is to set up web browsing."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:77
+msgid ""
+"You should use Tor with Firefox and Torbutton, for best safety. The bundle "
+"installs the <a href=\"<page torbutton/index>\">Torbutton plugin</a> for "
+"you. Restart your Firefox, and you're all set:"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:83
+msgid ""
+"<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-"
+"torbutton.png\"/> <br>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:88
+msgid ""
+"If you plan to run Firefox on a different computer than Tor, see the <a "
+"href=\"<wikifaq>#SocksListenAddress\">FAQ entry for running Tor on a "
+"different computer</a>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:93
+msgid ""
+"To Torify other applications that support HTTP proxies, just point them at "
+"Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
+"messaging, Jabber, IRC, etc), you can point your application directly at Tor"
+" (localhost port 9050), but see <a href=\"<wikifaq>#SOCKSAndDNS\">this FAQ "
+"entry</a> for why this may be dangerous. For applications that support "
+"neither SOCKS nor HTTP, take a look at SocksCap or <a "
+"href=\"http://www.freecap.ru/eng/\";>FreeCap</a>.  (FreeCap is free software;"
+" SocksCap is proprietary.)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:103
+msgid ""
+"For information on how to Torify other applications, check out the <a "
+"href=\"<wiki>doc/TorifyHOWTO\">Torify HOWTO</a>."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:108
+msgid "<hr> <a id=\"verify\"></a>"
+msgstr "<hr> <a id=\"verify\"></a>"
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:110
+msgid "<a class=\"anchor\" href=\"#verify\">Step Three: Make sure it's working</a>"
+msgstr "<a class=\"anchor\" href=\"#verify\">çäæïçäååèè</a>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:114
+msgid ""
+"Check to see that Vidalia is running.  Vidalia uses a small green onion to "
+"indicate Tor is running or a dark onion with a red \"X\" when Tor is not "
+"running. You can start or stop Tor by right-clicking on Vidalia's icon in "
+"your system tray and selecting \"Start\" or \"Stop\" from the menu as shown "
+"below:"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:121
+msgid ""
+"<img alt=\"Vidalia Tray Icon\" src=\"$(IMGROOT)/screenshot-"
+"win32-vidalia.png\"/>"
+msgstr ""
+"<img alt=\"Vidalia Tray Icon\" src=\"$(IMGROOT)/screenshot-"
+"win32-vidalia.png\"/>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:124
+msgid ""
+"Next, you should try using your browser with Tor and make sure that your IP "
+"address is being anonymized. Click on <a "
+"href=\"https://check.torproject.org/\";>the Tor detector</a> and see whether "
+"it thinks you're using Tor or not.  (If that site is down, see <a "
+"href=\"<wikifaq>#IsMyConnectionPrivate\">this FAQ entry</a> for more "
+"suggestions on how to test your Tor.)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:132
+msgid ""
+"If you have a personal firewall that limits your computer's ability to "
+"connect to itself, be sure to allow connections from your local applications"
+" to local port 8118 and port 9050. If your firewall blocks outgoing "
+"connections, punch a hole so it can connect to at least TCP ports 80 and "
+"443, and then see <a href=\"<wikifaq>#FirewalledClient\">this FAQ entry</a>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:141
+msgid ""
+"If it's still not working, look at <a href=\"<page "
+"docs/faq>#DoesntWork\">this FAQ entry</a> for hints."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:146
+msgid ""
+"Once it's working, learn more about <a href=\"<page "
+"download/download>#Warning\">what Tor does and does not offer</a>."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:150
+msgid "<hr> <a id=\"server\"></a> <a id=\"relay\"></a>"
+msgstr "<hr> <a id=\"server\"></a> <a id=\"relay\"></a>"
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:153
+msgid "<a class=\"anchor\" href=\"#relay\">Step Four: Configure it as a relay</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:156
+msgid ""
+"The Tor network relies on volunteers to donate bandwidth. The more people "
+"who run relays, the faster the Tor network will be. If you have at least 20 "
+"kilobytes/s each way, please help out Tor by configuring your Tor to be a "
+"relay too. We have many features that make Tor relays easy and convenient, "
+"including rate limiting for bandwidth, exit policies so you can limit your "
+"exposure to abuse complaints, and support for dynamic IP addresses."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:164
+msgid ""
+"Having relays in many different places on the Internet is what makes Tor "
+"users secure. <a href=\"<wikifaq>#RelayAnonymity\">You may also get stronger"
+" anonymity yourself</a>, since remote sites can't know whether connections "
+"originated at your computer or were relayed from others."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:171
+msgid ""
+"Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a "
+"relay</a> guide."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:174
+msgid "<hr>"
+msgstr "<hr>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:176
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"about/contact>\">send them to us</a>. Thanks!"
+msgstr ""
+
+

Added: translation/trunk/projects/website/po/zh_CN/docs/2-medium.documentation.po
===================================================================
--- translation/trunk/projects/website/po/zh_CN/docs/2-medium.documentation.po	                        (rev 0)
+++ translation/trunk/projects/website/po/zh_CN/docs/2-medium.documentation.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -0,0 +1,516 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# chen zhang <magnyfx@xxxxxxxxxxx>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-06-29 20:41+0200\n"
+"PO-Revision-Date: 2011-09-27 09:13+0000\n"
+"Last-Translator: magny <magnyfx@xxxxxxxxxxx>\n"
+"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/documentation.wml:8
+msgid ""
+"<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
+"docs/documentation>\">Documentation</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/documentation.wml:12
+msgid "<a id=\"RunningTor\"></a>"
+msgstr "<a id=\"RunningTor\"></a>"
+
+#. type: Content of: <div><div><h1>
+#: /home/runa/tor/website/docs/en/documentation.wml:13
+msgid "<a class=\"anchor\" href=\"#RunningTor\">Running Tor</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:15
+msgid "<a href=\"<page docs/tor-doc-windows>\">Installing Tor on Win32</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:17
+msgid "<a href=\"<page docs/tor-doc-osx>\">Installing Tor on Mac OS X</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:19
+msgid "<a href=\"<page docs/tor-doc-unix>\">Installing Tor on Linux/BSD/Unix</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:21
+msgid "<a href=\"<page torbutton/index>\">Installing Torbutton for Tor</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:23
+msgid "<a href=\"<page docs/tor-doc-relay>\">Configuring a Tor relay</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:25
+msgid ""
+"<a href=\"<page docs/tor-hidden-service>\">Configuring a Tor hidden "
+"service</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/documentation.wml:29
+msgid "<a id=\"Support\"></a> <a id=\"UpToSpeed\"></a>"
+msgstr "<a id=\"Support\"></a> <a id=\"UpToSpeed\"></a>"
+
+#. type: Content of: <div><div><h1>
+#: /home/runa/tor/website/docs/en/documentation.wml:31
+msgid ""
+"<a class=\"anchor\" href=\"#UpToSpeed\">Getting up to speed on Tor's past, "
+"present, and future</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:36
+msgid ""
+"First, read the <a href=\"<page about/overview>\">overview page</a> to get a"
+" basic idea of how Tor works, what it's for, and who uses it."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:41
+msgid ""
+"<a href=\"<page download/download>\">Install the Tor bundle</a> and try it "
+"out.  Make sure you've got Firefox installed first, and be sure to read the "
+"<a href=\"<page download/download>#Warning\">list of warnings</a> about ways"
+" you can screw up your anonymity."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:48
+msgid ""
+"Our <a href=\"<page docs/faq>\">FAQ</a> covers all sorts of topics, "
+"including questions about setting up a client or relay, concerns about "
+"anonymity attacks, why we didn't build Tor in other ways, etc.  There's a "
+"separate <a href=\"<page docs/faq-abuse>\">Abuse FAQ</a> to answer common "
+"questions from or for relay operators.  The <a href=\"<page eff/tor-legal-"
+"faq>\">Tor Legal FAQ</a> is written by EFF lawyers, and aims to give you an "
+"overview of some of the legal issues that arise from The Tor Project in the "
+"US."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:60
+msgid ""
+"The <a href=\"<page docs/tor-manual>\">manual</a> lists all the possible "
+"entries you can put in your <a href=\"<page docs/faq>#torrc\">torrc "
+"file</a>. We also provide a <a href=\"<page docs/tor-manual-dev>\">manual "
+"for the development version of Tor</a>."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:66
+msgid ""
+"If you have questions, we have an IRC channel (for users, relay operators, "
+"and developers)  at <a href=\"irc://irc.oftc.net/tor\">#tor on "
+"irc.oftc.net</a>. If you have a bug, especially a crash bug, read <a "
+"href=\"<wikifaq>#MyTorkeepscrashing.\">how to report a Tor bug</a> first and"
+" then tell us as much information about it as you can in <a "
+"href=\"https://bugs.torproject.org/tor\";>our bugtracker</a>.  (If your bug "
+"is with your browser or some other application, please don't put it in our "
+"bugtracker.) The <a href=\"#MailingLists\">tor-talk mailing list</a> can "
+"also be useful."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:81
+msgid ""
+"<a href=\"<blog>\">Tor has a blog</a>.  We try to keep it updated every week"
+" or two with the latest news."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:86
+msgid ""
+"Download and watch Roger's <a href=\"https://media.torproject.org/video/tor-";
+"internet-days-2010.mp4\">overview talk from Internet Days in Sweden</a>, "
+"which provides good background on how Tor works and what it's for."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:93
+msgid ""
+"Look through our <a href=\"#DesignDoc\">Design Documents</a>. Notice that we"
+" have RFC-style specs to tell you exactly how Tor is built."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:99
+msgid ""
+"There's a skeletal <a "
+"href=\"https://svn.torproject.org/svn/projects/roadmaps/2008-12-19-roadmap-";
+"full.pdf\">list of items we'd like to tackle in the future</a>. Alas, many "
+"of those items need to be fleshed out more before they'll make sense to "
+"people who aren't Tor developers, but you can still get a general sense of "
+"what issues need to be resolved next."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:108
+msgid ""
+"Download and watch Nick's \"Technical changes since 2004\" talk from Defcon "
+"in July 2007 (<a href=\"http://freehaven.net/~arma/Defcon15-Mathewson-";
+"Technical_Changes_since_you_Last_Heard_about_Tor.mp4\">video</a>, <a "
+"href=\"http://freehaven.net/~nickm/slides/Defcon07/TorChanges.pdf\";>slides</a>),"
+" Roger's \"blocking-resistance and circumvention\" talk from 23C3 in "
+"December 2006 (<a href=\"http://freehaven.net/~arma/23C3-1444-en-";
+"tor_and_china.m4v\">video</a>, <a href=\"http://freehaven.net/~arma/slides-";
+"23c3.pdf\">slides</a>, <a "
+"href=\"http://events.ccc.de/congress/2006/Fahrplan/events/1444.en.html\";>abstract</a>,"
+" <a href=\"https://svn.torproject.org/svn/projects/design-";
+"paper/blocking.html\">design paper</a>), Roger's \"Current events in 2007\" "
+"talk from 24C3 in December 2007 (<a "
+"href=\"http://freehaven.net/~arma/24c3-2325-en-";
+"current_events_in_tor_development.mp4\">video</a>, <a "
+"href=\"http://freehaven.net/~arma/slides-24c3.pdf\";>slides</a>, <a "
+"href=\"http://events.ccc.de/congress/2007/Fahrplan/events/2325.en.html\";>abstract</a>),"
+" and Roger's \"Vulnerabilities in Tor\" talk from 25C3 in December 2008 (<a "
+"href=\"https://media.torproject.org/video/25c3-2977-en-";
+"security_and_anonymity_vulnerabilities_in_tor.mp4\">video</a>, <a "
+"href=\"http://freehaven.net/~arma/slides-25c3.pdf\";>slides</a>)."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:130
+msgid ""
+"See Mike's \"Securing the Tor network\" talk from Defcon in July 2007 (<a "
+"href=\"http://freehaven.net/~arma/Defcon15-Mike_Perry-";
+"Securing_the_Tor_Network.mp4\">video</a>, <a "
+"href=\"http://freehaven.net/~arma/SecuringTheTorNetwork.pdf\";>slides</a>).  "
+"It describes common ways to attack networks like Tor and how we try to "
+"defend against them, and it introduces the <a "
+"href=\"https://svn.torproject.org/svn/torflow/trunk/README\";>Torflow</a> "
+"script collection."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:140
+msgid ""
+"Learn about the <a href=\"<specblob>proposals/001-process.txt\">Tor proposal"
+" process for changing our design</a>, and look over the <a "
+"href=\"<spectree>proposals\">existing proposals</a>."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:147
+msgid ""
+"Our <a "
+"href=\"https://trac.torproject.org/projects/tor/wiki/sponsors\";>sponsor TODO"
+" list</a> starts with a timeline for external promises &mdash; things <a "
+"href=\"<page about/sponsors>\">our sponsors</a> have paid to see done. It "
+"also lists many other tasks and topics we'd like to tackle next."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:155
+msgid ""
+"Once you're up to speed, things will continue to change surprisingly fast.  "
+"The <a href=\"#MailingLists\">tor-dev mailing list</a> is where the complex "
+"discussion happens, and the #tor IRC channel is where the less complex "
+"discussion happens."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/documentation.wml:163
+msgid "<a id=\"MailingLists\"></a>"
+msgstr "<a id=\"MailingLists\"></a>"
+
+#. type: Content of: <div><div><h1>
+#: /home/runa/tor/website/docs/en/documentation.wml:164
+msgid "<a class=\"anchor\" href=\"#MailingLists\">Mailing List Information</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:166
+msgid ""
+"The <a href=\"https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-";
+"announce/\">tor-announce mailing list</a> is a low volume list for "
+"announcements of new releases and critical security updates. Everybody "
+"should be on this list.  There is also an <a "
+"href=\"http://rss.gmane.org/gmane.network.onion-routing.announce\";>RSS "
+"feed</a> of tor-announce at <a href=\"http://gmane.org\";>gmane.org</a>."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:172
+msgid ""
+"The <a href=\"https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-talk";
+"/\">tor-talk list</a> is where a lot of discussion happens, and is where we "
+"send notifications of prerelease versions and release candidates."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:175
+msgid ""
+"The <a href=\"https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-";
+"relays/\">tor-relays list</a> is where discussions about running, "
+"configuring, and handling your tor relay happen.  If you currently run a "
+"relay, or are thinking about doing so, this is the list for you."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:179
+msgid ""
+"The <a href=\"https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev";
+"/\">tor-dev list</a> is for posting by developers only, and is very low "
+"traffic."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:181
+msgid ""
+"A list for <a href=\"https://lists.torproject.org/cgi-bin/mailman/listinfo";
+"/tor-mirrors\">mirror operators</a> for new website mirrors, and supporting "
+"<a href=\"<page getinvolved/mirrors>\">current website mirrors</a>."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:184
+msgid ""
+"A list for <a href=\"https://lists.torproject.org/cgi-bin/mailman/listinfo";
+"/tor-commits/\">svn and git commits</a> may be interesting for developers."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:186
+msgid ""
+"An automated list for <a href=\"https://lists.torproject.org/cgi-";
+"bin/mailman/listinfo/tor-bugs/\">bug reports from trac</a> may be "
+"interesting for users and developers."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/documentation.wml:190
+msgid "<a id=\"DesignDoc\"></a>"
+msgstr "<a id=\"DesignDoc\"></a>"
+
+#. type: Content of: <div><div><h1>
+#: /home/runa/tor/website/docs/en/documentation.wml:191
+msgid "<a class=\"anchor\" href=\"#DesignDoc\">Design Documents</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:193
+msgid ""
+"The <b>design document</b> (published at Usenix Security 2004)  gives our "
+"justifications and security analysis for the Tor design: <a "
+"href=\"https://svn.torproject.org/svn/projects/design-paper/tor-";
+"design.pdf\">PDF</a> and <a href=\"https://svn.torproject.org/svn/projects";
+"/design-paper/tor-design.html\">HTML</a> versions available."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:198
+msgid ""
+"Our follow-up paper on <b>challenges in low-latency anonymity</b> (still in "
+"draft form) details more recent experiences and directions: <a "
+"href=\"https://svn.torproject.org/svn/projects/design-";
+"paper/challenges.pdf\">PDF draft</a>."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:202
+msgid ""
+"Our paper at WEIS 2006 &mdash; <b>Anonymity Loves Company: Usability and the"
+" Network Effect</b> &mdash; explains why usability in anonymity systems "
+"matters for their security: <a "
+"href=\"http://freehaven.net/anonbib/cache/usability:weis2006.pdf\";>PDF</a>."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:206
+msgid ""
+"Our preliminary design to make it harder for large firewalls to prevent "
+"access to the Tor network is described in <b>design of a blocking-resistant "
+"anonymity system</b>: <a href=\"https://svn.torproject.org/svn/projects";
+"/design-paper/blocking.pdf\">PDF draft</a> and <a "
+"href=\"https://svn.torproject.org/svn/projects/design-";
+"paper/blocking.html\">HTML draft</a>.  Want to <a href=\"<page "
+"getinvolved/volunteer>#Coding\">help us build it</a>?"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:212
+msgid ""
+"The <b>specifications</b> aim to give developers enough information to build"
+" a compatible version of Tor:"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:215
+msgid "<a href=\"<specblob>tor-spec.txt\">Main Tor specification</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:216
+msgid ""
+"<a href=\"<specblob>dir-spec.txt\">Tor version 3 directory server "
+"specification</a> (and older <a href=\"<specblob>dir-spec-v1.txt\">version "
+"1</a> and <a href=\"<specblob>dir-spec-v2.txt\">version 2</a> directory "
+"specifications)"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:221
+msgid ""
+"<a href=\"<specblob>control-spec.txt\">Tor control protocol "
+"specification</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:223
+msgid "<a href=\"<specblob>rend-spec.txt\">Tor rendezvous specification</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:225
+msgid "<a href=\"<specblob>path-spec.txt\">Tor path selection specification</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:227
+msgid "<a href=\"<specblob>address-spec.txt\">Special hostnames in Tor</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:229
+msgid ""
+"<a href=\"<specblob>socks-extensions.txt\">Tor's SOCKS support and "
+"extensions</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:231
+msgid "<a href=\"<specblob>version-spec.txt\">How Tor version numbers work</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:233
+msgid ""
+"<a href=\"<spectree>proposals\">In-progress drafts of new specifications and"
+" proposed changes</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/documentation.wml:239
+msgid "<a id=\"NeatLinks\"></a>"
+msgstr "<a id=\"NeatLinks\"></a>"
+
+#. type: Content of: <div><div><h1>
+#: /home/runa/tor/website/docs/en/documentation.wml:240
+msgid "<a class=\"anchor\" href=\"#NeatLinks\">Neat Links</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:242
+msgid ""
+"The <a href=\"<wiki>\">Tor wiki</a> provides a plethora of helpful "
+"contributions from Tor users. Check it out!"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:245
+msgid ""
+"<a href=\"<wiki>doc/SupportPrograms\">A list of supporting programs you "
+"might want to use in association with Tor</a>."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:249
+msgid ""
+"<a href=\"https://check.torproject.org/\";>The Tor detector</a> or <a "
+"href=\"http://torcheck.xenobite.eu/\";>the other Tor detector</a> try to "
+"guess if you're using Tor or not."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:252
+msgid ""
+"Check out one of the Tor status pages, such as <a "
+"href=\"http://torstatus.blutmagie.de/\";>blutmagie's</a>, or Xenobite's <a "
+"href=\"https://torstat.xenobite.eu/\";>Tor node status</a> page.  Remember "
+"that these lists may not be as accurate as what your Tor client uses, "
+"because your client fetches its own directory information and examines it "
+"locally."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:258
+msgid ""
+"Read <a "
+"href=\"http://freehaven.net/anonbib/topic.html#Anonymous_20communication\";>these"
+" papers</a> (especially the ones in boxes) to get up to speed on the field "
+"of anonymous communication systems."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/documentation.wml:264
+msgid "<a id=\"Developers\"></a>"
+msgstr "<a id=\"Developers\"></a>"
+
+#. type: Content of: <div><div><h1>
+#: /home/runa/tor/website/docs/en/documentation.wml:265
+msgid "<a class=\"anchor\" href=\"#Developers\">For Developers</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/documentation.wml:266
+msgid "Browse the Tor <b>source repository</b>:"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:268
+msgid "<a href=\"<gitrepo>\">Browse the repository's source tree directly</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:269
+msgid "Git and SVN access:"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:271
+msgid "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:272
+msgid ""
+"The development branch is <kbd>master</kbd>.  The active maintenance "
+"branches are <kbd>maint-0.2.1</kbd> and <kbd>maint-0.2.2</kbd>."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:273
+msgid ""
+"<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/documentation.wml:276
+msgid ""
+"<a "
+"href=\"https://gitweb.torproject.org//githax.git?a=blob;f=doc/Howto.txt;hb=HEAD\";>Basic"
+" instructions for using Git to contribute to Tor software.</a>"
+msgstr ""
+
+

Modified: translation/trunk/projects/website/po/zh_CN/download/3-low.download.po
===================================================================
--- translation/trunk/projects/website/po/zh_CN/download/3-low.download.po	2011-09-27 11:20:20 UTC (rev 25127)
+++ translation/trunk/projects/website/po/zh_CN/download/3-low.download.po	2011-09-28 09:14:44 UTC (rev 25128)
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# chen zhang <magnyfx@xxxxxxxxxxx>, 2011.
 #   <zhazhenzhong@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-09-05 00:00+0200\n"
-"PO-Revision-Date: 2011-09-05 01:00+0000\n"
-"Last-Translator: xtoaster <zhazhenzhong@xxxxxxxxx>\n"
+"PO-Revision-Date: 2011-09-27 08:53+0000\n"
+"Last-Translator: magny <magnyfx@xxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -61,7 +62,7 @@
 #. type: Content of: <div><div><div>
 #: /home/runa/tor/website/download/en/download.wml:26
 msgid "<span class=\"windows24\">Microsoft Windows</span>"
-msgstr ""
+msgstr "<span class=\"windows24\">åèWindows</span>"
 
 #. PO4ASHARPBEGINinclude <lang.wmi>
 #. PO4ASHARPEND
@@ -73,6 +74,10 @@
 "class=\"normal\">Tor Browser Bundle</span></a> <select name=\"language\" id"
 "=\"win-tbb\" class=\"lang\"> </select>"
 msgstr ""
+"<a class=\"button win-tbb\" href=\"../dist/torbrowser/tor-browser-<version-"
+"torbrowserbundle>_<lang>.exe\"><span class=\"strong\">äè</span><span "
+"class=\"normal\">Tor Browser Bundle</span></a> <select name=\"language\" id"
+"=\"win-tbb\" class=\"lang\"> </select>"
 
 #. type: Content of: <div><div><div><div><form><div>
 #: /home/runa/tor/website/download/en/download.wml:38
@@ -504,7 +509,7 @@
 #. type: Content of: <div><div><div><div><h2>
 #: /home/runa/tor/website/download/en/download.wml:228
 msgid "Nokia Maemo/N900"
-msgstr ""
+msgstr "èåä Maemo/N900"
 
 #. type: Content of: <div><div><div>
 #: /home/runa/tor/website/download/en/download.wml:234
@@ -544,7 +549,7 @@
 #. type: Content of: <div><div><div><div><h2>
 #: /home/runa/tor/website/download/en/download.wml:249
 msgid "Source Tarball"
-msgstr ""
+msgstr "æçå"
 
 #. type: Content of: <div><div><div><div><p>
 #: /home/runa/tor/website/download/en/download.wml:250
@@ -572,17 +577,17 @@
 #. type: Content of: <div><div><div>
 #: /home/runa/tor/website/download/en/download.wml:257 /tmp/9274UDVCYT.xml:335
 msgid "<br>"
-msgstr ""
+msgstr "<br>"
 
 #. type: Content of: <div><div><div>
 #: /home/runa/tor/website/download/en/download.wml:260
 msgid "<a name=\"warning\"></a> <a name=\"Warning\"></a>"
-msgstr ""
+msgstr "<a name=\"warning\"></a> <a name=\"Warning\"></a>"
 
 #. type: Content of: <div><div><div><h2>
 #: /home/runa/tor/website/download/en/download.wml:262
 msgid "<a class=\"anchor\" href=\"#warning\">Want Tor to really work?</a>"
-msgstr ""
+msgstr "<a class=\"anchor\" href=\"#warning\">æèTorççèäçåï</a>"
 
 #. type: Content of: <div><div><div><p>
 #: /home/runa/tor/website/download/en/download.wml:263
@@ -672,6 +677,8 @@
 "Do not use <a href=\"https://blog.torproject.org/blog/bittorrent-over-tor-";
 "isnt-good-idea\">BitTorrent and Tor</a> together."
 msgstr ""
+"èäèåæäç<a href=\"https://blog.torproject.org/blog/bittorrent-over-tor-isnt-";
+"good-idea\">BitTorrentåTor</a>ã"
 
 #. type: Content of: <div><div><div><p>
 #: /home/runa/tor/website/download/en/download.wml:337
@@ -694,7 +701,7 @@
 #. type: Content of: <div><div><script><h6>
 #: /home/runa/tor/website/download/en/download.wml:358
 msgid "<small>(Requires a PayPal Account)</small>"
-msgstr ""
+msgstr "<small>(éèPayPalèå)</small>"
 
 #. type: Content of: <div><div><script>
 #: /home/runa/tor/website/download/en/download.wml:358
@@ -721,32 +728,32 @@
 #. type: Content of: <div><div><form><h2>
 #: /home/runa/tor/website/download/en/download.wml:379
 msgid "Donate to Tor"
-msgstr ""
+msgstr "åToræå"
 
 #. type: Content of: <div><div><form><p><select>
 #: /home/runa/tor/website/download/en/download.wml:381
 msgid "<select name=\"currency_code\" class=\"cur\">"
-msgstr ""
+msgstr "<select name=\"currency_code\" class=\"cur\">"
 
 #. type: Content of: <div><div><form><p><select><option>
 #: /home/runa/tor/website/download/en/download.wml:382
 msgid "$"
-msgstr ""
+msgstr "$"
 
 #. type: Content of: <div><div><form><p><select><option>
 #: /home/runa/tor/website/download/en/download.wml:383
 msgid "&euro;"
-msgstr ""
+msgstr "&euro;"
 
 #. type: Content of: <div><div><form><p><select><option>
 #: /home/runa/tor/website/download/en/download.wml:384
 msgid "&pound;"
-msgstr ""
+msgstr "&pound;"
 
 #. type: Content of: <div><div><form><p><select><option>
 #: /home/runa/tor/website/download/en/download.wml:385
 msgid "&yen;"
-msgstr ""
+msgstr "&yen;"
 
 #. type: Content of: <div><div><form><p>
 #: /home/runa/tor/website/download/en/download.wml:386
@@ -754,11 +761,13 @@
 "</select> <input type=\"text\" id=\"amount\" class=\"amount\" "
 "name=\"amount\" value=\"5\" size=\"10\">"
 msgstr ""
+"</select> <input type=\"text\" id=\"amount\" class=\"amount\" "
+"name=\"amount\" value=\"5\" size=\"10\">"
 
 #. type: Content of: <div><div><form><p><select>
 #: /home/runa/tor/website/download/en/download.wml:390
 msgid "<input type=\"hidden\" id=\"a3\" name=\"a3\" value=\"0\"> <select id=\"t3\" name=\"t3\">"
-msgstr ""
+msgstr "<input type=\"hidden\" id=\"a3\" name=\"a3\" value=\"0\"> <select id=\"t3\" name=\"t3\">"
 
 #. type: Content of: <div><div><form><p><select><option>
 #: /home/runa/tor/website/download/en/download.wml:392
@@ -773,7 +782,7 @@
 #. type: Content of: <div><div><form><p>
 #: /home/runa/tor/website/download/en/download.wml:394
 msgid "</select>"
-msgstr ""
+msgstr "</select>"
 
 #. type: Content of: <div><div><form><p>
 #: /home/runa/tor/website/download/en/download.wml:397
@@ -794,12 +803,12 @@
 #. type: Content of: <div><div><form><p>
 #: /home/runa/tor/website/download/en/download.wml:410
 msgid "<input class=\"donate-btn\" type=\"submit\" name=\"donate\" value=\"Donate\">"
-msgstr ""
+msgstr "<input class=\"donate-btn\" type=\"submit\" name=\"donate\" value=\"Donate\">"
 
 #. type: Content of: <div><div><form><p>
 #: /home/runa/tor/website/download/en/download.wml:412
 msgid "<a href=\"<page donate/donate>\">Other donation options...</a>"
-msgstr ""
+msgstr "<a href=\"<page donate/donate>\">åäçæåæå...</a>"
 
 #. type: Content of: <div><div><div><div><h2>
 #: /home/runa/tor/website/download/en/download.wml:418

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
Prev by Author: [tor-commits] r25127: {} We do not need to keep translations for the manual pages eit (translation/trunk/projects)
Next by Author: [tor-commits] r25129: {website} only build English website files, please (website/trunk)
Previous by thread: [tor-commits] [tor/master] if we have enough usable guards, just pick one
Next by thread: [tor-commits] r25129: {website} only build English website files, please (website/trunk)
Index(es):
- Author
- Thread