[tor-commits] r24826: {translation} updated the translation templates for the website (in translation/trunk/projects/website/po/templates: about docs donate download getinvolved projects torbutton)

Runa Sandvik runa.sandvik at gmail.com
Tue Jun 21 07:19:28 UTC 2011


Author: runa
Date: 2011-06-21 07:19:28 +0000 (Tue, 21 Jun 2011)
New Revision: 24826

Modified:
   translation/trunk/projects/website/po/templates/about/3-low.board.pot
   translation/trunk/projects/website/po/templates/about/3-low.corepeople.pot
   translation/trunk/projects/website/po/templates/about/3-low.volunteers.pot
   translation/trunk/projects/website/po/templates/docs/1-high.tor-doc-windows.pot
   translation/trunk/projects/website/po/templates/docs/2-medium.documentation.pot
   translation/trunk/projects/website/po/templates/docs/2-medium.faq.pot
   translation/trunk/projects/website/po/templates/docs/2-medium.tor-doc-osx.pot
   translation/trunk/projects/website/po/templates/docs/2-medium.tor-doc-relay.pot
   translation/trunk/projects/website/po/templates/docs/2-medium.verifying-signatures.pot
   translation/trunk/projects/website/po/templates/docs/3-low.faq-abuse.pot
   translation/trunk/projects/website/po/templates/docs/3-low.tor-doc-unix.pot
   translation/trunk/projects/website/po/templates/donate/3-low.donate.pot
   translation/trunk/projects/website/po/templates/download/1-high.download-easy.pot
   translation/trunk/projects/website/po/templates/download/3-low.download-unix.pot
   translation/trunk/projects/website/po/templates/download/3-low.download.pot
   translation/trunk/projects/website/po/templates/getinvolved/3-low.tshirt.pot
   translation/trunk/projects/website/po/templates/getinvolved/4-optional.open-positions.pot
   translation/trunk/projects/website/po/templates/getinvolved/4-optional.volunteer.pot
   translation/trunk/projects/website/po/templates/projects/4-optional.vidalia.pot
   translation/trunk/projects/website/po/templates/torbutton/3-low.index.pot
Log:
updated the translation templates for the website

Modified: translation/trunk/projects/website/po/templates/about/3-low.board.pot
===================================================================
--- translation/trunk/projects/website/po/templates/about/3-low.board.pot	2011-06-21 04:41:02 UTC (rev 24825)
+++ translation/trunk/projects/website/po/templates/about/3-low.board.pot	2011-06-21 07:19:28 UTC (rev 24826)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-12-05 19:13+0000\n"
+"POT-Creation-Date: 2011-06-21 08:19+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -98,62 +98,75 @@
 msgid ""
 "Andrew is the Executive Director reponsible for all operations of The Tor "
 "Project, Inc.  His current activities can be found at <a href=\"http://"
-"lewman.com\">his website</a>."
+"lewman.is\">his website</a>."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><div>
-#: /home/runa/tor/website/about/en/board.wml:41
+#: /home/runa/tor/website/about/en/board.wml:43
 msgid "Nick Mathewson"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><div>
-#: /home/runa/tor/website/about/en/board.wml:42
+#: /home/runa/tor/website/about/en/board.wml:44
 msgid "Vice-President and Director"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><p>
-#: /home/runa/tor/website/about/en/board.wml:43
+#: /home/runa/tor/website/about/en/board.wml:45
 msgid ""
 "Nick is one of the original developers of Tor.  He's the Chief Architect of "
 "The Tor Project, Inc."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><div>
-#: /home/runa/tor/website/about/en/board.wml:46
+#: /home/runa/tor/website/about/en/board.wml:48
 msgid "Xianghui (Isaac) Mao"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><div>
-#: /home/runa/tor/website/about/en/board.wml:47 /tmp/suPiVmTnZN.xml:54
-#: /tmp/suPiVmTnZN.xml:59
+#: /home/runa/tor/website/about/en/board.wml:49 /tmp/b5Ptkc4L_E.xml:56
+#: /tmp/b5Ptkc4L_E.xml:61 /tmp/b5Ptkc4L_E.xml:68
 msgid "Director"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><p>
-#: /home/runa/tor/website/about/en/board.wml:48
+#: /home/runa/tor/website/about/en/board.wml:50
 msgid ""
 "Chinese blogging and privacy activist.  His current activities can be found "
 "at <a href=\"http://isaacmao.com/\">his website</a>."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><div>
-#: /home/runa/tor/website/about/en/board.wml:53
+#: /home/runa/tor/website/about/en/board.wml:55
 msgid "Frank Rieger"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><p>
-#: /home/runa/tor/website/about/en/board.wml:55
+#: /home/runa/tor/website/about/en/board.wml:57
 msgid "CTO of <a href=\"http://www.cryptophone.de/\">GSMK Cryptophone</a>."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><div>
-#: /home/runa/tor/website/about/en/board.wml:58
+#: /home/runa/tor/website/about/en/board.wml:60
 msgid "Wendy Seltzer"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><p>
-#: /home/runa/tor/website/about/en/board.wml:60
+#: /home/runa/tor/website/about/en/board.wml:62
 msgid ""
 "Lawyer, cyberlaw professor, and founder of <a href=\"http://chillingeffects."
 "org/\">ChillingEffects.org</a>."
 msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><div>
+#: /home/runa/tor/website/about/en/board.wml:67
+msgid "Rob Thomas"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><p>
+#: /home/runa/tor/website/about/en/board.wml:69
+msgid ""
+"Rob Thomas is CEO and founder of Team Cymru, and a Cymru Fellow. You can "
+"learn more about Rob at the <a href=\"http://www.team-cymru.org/\">Team "
+"Cymru</a> websites."
+msgstr ""

Modified: translation/trunk/projects/website/po/templates/about/3-low.corepeople.pot
===================================================================
--- translation/trunk/projects/website/po/templates/about/3-low.corepeople.pot	2011-06-21 04:41:02 UTC (rev 24825)
+++ translation/trunk/projects/website/po/templates/about/3-low.corepeople.pot	2011-06-21 07:19:28 UTC (rev 24826)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-04-18 10:38+0200\n"
+"POT-Creation-Date: 2011-06-21 08:19+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -348,9 +348,8 @@
 "Maintains the <a href=\"http://www.transifex.net/projects/p/torproject/"
 "\">Tor Translation Portal</a> and the translations for a number of projects "
 "(such as Vidalia, Torbutton and the website). She also generally helps out "
-"with the <a href=\"https://trac.torproject.org/projects/tor/wiki/"
-"TheOnionRouter/Torouter\">Torouter project</a>, bridge distribution through "
-"instant messaging, and other projects."
+"with the <a href=\"<wiki>doc/Torouter\">Torouter project</a>, bridge "
+"distribution through instant messaging, and other projects."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>

Modified: translation/trunk/projects/website/po/templates/about/3-low.volunteers.pot
===================================================================
--- translation/trunk/projects/website/po/templates/about/3-low.volunteers.pot	2011-06-21 04:41:02 UTC (rev 24825)
+++ translation/trunk/projects/website/po/templates/about/3-low.volunteers.pot	2011-06-21 07:19:28 UTC (rev 24826)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"POT-Creation-Date: 2011-06-21 08:19+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,34 +17,34 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/about/en/volunteers.wml:8
+#: /home/runa/tor/website/about/en/volunteers.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page about/overview>"
 "\">About &raquo; </a> <a href=\"<page about/volunteers>\">Volunteers</a>"
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/dev/website/about/en/volunteers.wml:13
+#: /home/runa/tor/website/about/en/volunteers.wml:13
 msgid "Volunteers"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/volunteers.wml:15
+#: /home/runa/tor/website/about/en/volunteers.wml:15
 msgid "Anonym"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/volunteers.wml:15
+#: /home/runa/tor/website/about/en/volunteers.wml:15
 msgid "Maintainer of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/volunteers.wml:16
+#: /home/runa/tor/website/about/en/volunteers.wml:16
 msgid "Kevin Bankston"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/volunteers.wml:16
+#: /home/runa/tor/website/about/en/volunteers.wml:16
 msgid ""
 "EFF lawyer who helped write the <a href=\"<page eff/tor-legal-faq>\">Tor "
 "Legal FAQ</a> and tirelessly answers the phone when somebody in the world "
@@ -52,138 +52,126 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/volunteers.wml:20
+#: /home/runa/tor/website/about/en/volunteers.wml:20
 msgid "Marco Bonetti"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/volunteers.wml:20
+#: /home/runa/tor/website/about/en/volunteers.wml:20
 msgid "Focusing on MobileTor for the iPhone."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/volunteers.wml:21
+#: /home/runa/tor/website/about/en/volunteers.wml:21
 msgid "Kasimir Gabert"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/volunteers.wml:21
+#: /home/runa/tor/website/about/en/volunteers.wml:21
 msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\">TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/volunteers.wml:23
+#: /home/runa/tor/website/about/en/volunteers.wml:23
 msgid "Andreas Jonsson"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/volunteers.wml:23
+#: /home/runa/tor/website/about/en/volunteers.wml:23
 msgid "Works on OS X Tor Browser Bundle sandbox technology."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/volunteers.wml:25
+#: /home/runa/tor/website/about/en/volunteers.wml:25
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/volunteers.wml:25
+#: /home/runa/tor/website/about/en/volunteers.wml:25
 msgid ""
 "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
 "and Privoxy still work well together."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/volunteers.wml:27
+#: /home/runa/tor/website/about/en/volunteers.wml:27
 msgid "Bruce Leidl"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/volunteers.wml:27
+#: /home/runa/tor/website/about/en/volunteers.wml:27
 msgid "Working on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/volunteers.wml:28
+#: /home/runa/tor/website/about/en/volunteers.wml:28
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/volunteers.wml:28
+#: /home/runa/tor/website/about/en/volunteers.wml:28
 msgid ""
 "A lawyer with the CCC in Germany. Coordinates the German Tor community with "
 "respect to legal questions and concerns."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/volunteers.wml:31
+#: /home/runa/tor/website/about/en/volunteers.wml:31
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/volunteers.wml:31
+#: /home/runa/tor/website/about/en/volunteers.wml:31
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/volunteers.wml:33
-msgid "Linus Nordberg"
-msgstr ""
-
-#. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/volunteers.wml:33
-msgid ""
-"Enjoys measuring the Tor network and helps with outreach in the Nordic "
-"countries."
-msgstr ""
-
-#. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/volunteers.wml:35
+#: /home/runa/tor/website/about/en/volunteers.wml:33
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/volunteers.wml:35
+#: /home/runa/tor/website/about/en/volunteers.wml:33
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/volunteers.wml:37
+#: /home/runa/tor/website/about/en/volunteers.wml:35
 msgid "Martin Peck"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/volunteers.wml:37
+#: /home/runa/tor/website/about/en/volunteers.wml:35
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/volunteers.wml:39
+#: /home/runa/tor/website/about/en/volunteers.wml:37
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/volunteers.wml:40
+#: /home/runa/tor/website/about/en/volunteers.wml:38
 msgid ""
 "The most dedicated bug reporter we've ever heard from. He must read Tor "
 "source code every day over breakfast."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/volunteers.wml:42
+#: /home/runa/tor/website/about/en/volunteers.wml:40
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/volunteers.wml:42
+#: /home/runa/tor/website/about/en/volunteers.wml:40
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a href="
 "\"<wiki>TransparentProxy\">transparent proxy</a>. Also maintains the <a href="
@@ -191,24 +179,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/volunteers.wml:47
+#: /home/runa/tor/website/about/en/volunteers.wml:45
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/volunteers.wml:47
+#: /home/runa/tor/website/about/en/volunteers.wml:45
 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/dev/website/about/en/volunteers.wml:50
+#: /home/runa/tor/website/about/en/volunteers.wml:48
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/about/en/volunteers.wml:50
+#: /home/runa/tor/website/about/en/volunteers.wml:48
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?"
 "p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/"
@@ -217,7 +205,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/about/en/volunteers.wml:55
+#: /home/runa/tor/website/about/en/volunteers.wml:53
 msgid ""
 "All our relay operators, people who write <a href=\"http://freehaven.net/"
 "anonbib/\">research papers</a> about Tor, people who teach others about Tor, "

Modified: translation/trunk/projects/website/po/templates/docs/1-high.tor-doc-windows.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/1-high.tor-doc-windows.pot	2011-06-21 04:41:02 UTC (rev 24825)
+++ translation/trunk/projects/website/po/templates/docs/1-high.tor-doc-windows.pot	2011-06-21 07:19:28 UTC (rev 24826)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-04-13 16:27+0200\n"
+"POT-Creation-Date: 2011-06-21 08:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -32,8 +32,8 @@
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:14
-#: /tmp/4CEPROVVx3.xml:36 /tmp/4CEPROVVx3.xml:72 /tmp/4CEPROVVx3.xml:111
-#: /tmp/4CEPROVVx3.xml:154
+#: /tmp/eiWvEVT5Zj.xml:36 /tmp/eiWvEVT5Zj.xml:72 /tmp/eiWvEVT5Zj.xml:111
+#: /tmp/eiWvEVT5Zj.xml:154
 msgid "<br>"
 msgstr ""
 
@@ -176,7 +176,7 @@
 #: /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>/TheOnionRouter/TorifyHOWTO\">Torify HOWTO</a>."
+"\"<wiki>doc/TorifyHOWTO\">Torify HOWTO</a>."
 msgstr ""
 
 #. type: Content of: <div><div>

Modified: translation/trunk/projects/website/po/templates/docs/2-medium.documentation.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/2-medium.documentation.pot	2011-06-21 04:41:02 UTC (rev 24825)
+++ translation/trunk/projects/website/po/templates/docs/2-medium.documentation.pot	2011-06-21 07:19:28 UTC (rev 24826)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-23 17:01+0200\n"
+"POT-Creation-Date: 2011-06-21 08:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -423,8 +423,8 @@
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/docs/en/documentation.wml:245
 msgid ""
-"<a href=\"<wiki>TheOnionRouter/SupportPrograms\">A list of supporting "
-"programs you might want to use in association with Tor</a>."
+"<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>

Modified: translation/trunk/projects/website/po/templates/docs/2-medium.faq.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/2-medium.faq.pot	2011-06-21 04:41:02 UTC (rev 24825)
+++ translation/trunk/projects/website/po/templates/docs/2-medium.faq.pot	2011-06-21 07:19:28 UTC (rev 24826)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-06 10:07+0200\n"
+"POT-Creation-Date: 2011-06-21 08:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,7 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:8
+#: /home/runa/tor/website/docs/en/faq.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page docs/"
 "documentation>\">Documentation &raquo; </a> <a href=\"<page docs/faq>\">FAQ</"
@@ -25,303 +25,303 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tordev/website/docs/en/faq.wml:14
+#: /home/runa/tor/website/docs/en/faq.wml:14
 msgid "Tor FAQ"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:15 /tmp/g86Mg7JZIw.xml:1666
+#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/Lr_DWY6vt6.xml:1668
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:17
+#: /home/runa/tor/website/docs/en/faq.wml:17
 msgid "General questions:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:19
+#: /home/runa/tor/website/docs/en/faq.wml:19
 msgid "<a href=\"#WhatIsTor\">What is Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:20
+#: /home/runa/tor/website/docs/en/faq.wml:20
 msgid ""
 "<a href=\"#Torisdifferent\">How is Tor different from other proxies?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:21
+#: /home/runa/tor/website/docs/en/faq.wml:21
 msgid ""
 "<a href=\"#CompatibleApplications\">What programs can I use with Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:23
+#: /home/runa/tor/website/docs/en/faq.wml:23
 msgid "<a href=\"#WhyCalledTor\">Why is it called Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:24
+#: /home/runa/tor/website/docs/en/faq.wml:24
 msgid "<a href=\"#Backdoor\">Is there a backdoor in Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:25
+#: /home/runa/tor/website/docs/en/faq.wml:25
 msgid ""
 "<a href=\"#DistributingTor\">Can I distribute Tor on my magazine's CD?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:27
+#: /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 ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:29
+#: /home/runa/tor/website/docs/en/faq.wml:29
 msgid "<a href=\"#WhySlow\">Why is Tor so slow?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:30
+#: /home/runa/tor/website/docs/en/faq.wml:30
 msgid ""
 "<a href=\"#Funding\">What would The Tor Project do with more funding?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:32
+#: /home/runa/tor/website/docs/en/faq.wml:32
 msgid ""
 "<a href=\"#Metrics\">How many people use Tor? How many relays or exit nodes "
 "are there?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:34
+#: /home/runa/tor/website/docs/en/faq.wml:34
 msgid ""
 "<a href=\"#SSLcertfingerprint\">What are your SSL cerificate fingerprints?</"
 "a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:38
+#: /home/runa/tor/website/docs/en/faq.wml:38
 msgid "Compilation and Installation:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:40
+#: /home/runa/tor/website/docs/en/faq.wml:40
 msgid "<a href=\"#HowUninstallTor\">How do I uninstall Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:41
+#: /home/runa/tor/website/docs/en/faq.wml:41
 msgid ""
 "<a href=\"#PGPSigs\">What are these \"sig\" files on the download page?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:43
+#: /home/runa/tor/website/docs/en/faq.wml:43
 msgid ""
 "<a href=\"#GetTor\">Your website is blocked in my country. How do I download "
 "Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:45
+#: /home/runa/tor/website/docs/en/faq.wml:45
 msgid "<a href=\"#CompileTorWindows\">How do I compile Tor under Windows?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:46
+#: /home/runa/tor/website/docs/en/faq.wml:46
 msgid ""
 "<a href=\"#VirusFalsePositives\">Why does my Tor executable appear to have a "
 "virus or spyware?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:48
+#: /home/runa/tor/website/docs/en/faq.wml:48
 msgid ""
 "<a href=\"#LiveCD\">Is there a LiveCD or other bundle that includes Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:51
+#: /home/runa/tor/website/docs/en/faq.wml:51
 msgid "Running Tor:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:53
+#: /home/runa/tor/website/docs/en/faq.wml:53
 msgid ""
 "<a href=\"#torrc\">I'm supposed to \"edit my torrc\". What does that mean?</"
 "a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:55
+#: /home/runa/tor/website/docs/en/faq.wml:55
 msgid "<a href=\"#Logs\">How do I set up logging, or see Tor's logs?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:59
+#: /home/runa/tor/website/docs/en/faq.wml:59
 msgid "Running a Tor client:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:61
+#: /home/runa/tor/website/docs/en/faq.wml:61
 msgid ""
 "<a href=\"#DoesntWork\">I installed Tor and Polipo but it's not working.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:63
+#: /home/runa/tor/website/docs/en/faq.wml:63
 msgid ""
 "<a href=\"#VidaliaPassword\">Tor/Vidalia prompts for a password at start.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:65
+#: /home/runa/tor/website/docs/en/faq.wml:65
 msgid ""
 "<a href=\"#ChooseEntryExit\">Can I control which nodes (or country)  are "
 "used for entry/exit?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:67
+#: /home/runa/tor/website/docs/en/faq.wml:67
 msgid ""
 "<a href=\"#GoogleCaptcha\">Google makes me solve a Captcha or tells me I "
 "have spyware installed.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:69
+#: /home/runa/tor/website/docs/en/faq.wml:69
 msgid ""
 "<a href=\"#GmailWarning\">Gmail warns me that my account may have been "
 "compromised.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:71
+#: /home/runa/tor/website/docs/en/faq.wml:71
 msgid ""
 "<a href=\"#FirewallPorts\">My firewall only allows a few outgoing ports.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:75
+#: /home/runa/tor/website/docs/en/faq.wml:75
 msgid "Running a Tor relay:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:77
+#: /home/runa/tor/website/docs/en/faq.wml:77
 msgid "<a href=\"#RelayFlexible\">How stable does my relay need to be?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:78
+#: /home/runa/tor/website/docs/en/faq.wml:78
 msgid ""
 "<a href=\"#ExitPolicies\">I'd run a relay, but I don't want to deal with "
 "abuse issues.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:80
+#: /home/runa/tor/website/docs/en/faq.wml:80
 msgid ""
 "<a href=\"#RelayOrBridge\">Should I be a normal relay or bridge relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:82
+#: /home/runa/tor/website/docs/en/faq.wml:82
 msgid "<a href=\"#MultipleRelays\">I want to run more than one relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:83
+#: /home/runa/tor/website/docs/en/faq.wml:83
 msgid "<a href=\"#RelayMemory\">Why is my Tor relay using so much memory?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:84
+#: /home/runa/tor/website/docs/en/faq.wml:84
 msgid "<a href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:87
+#: /home/runa/tor/website/docs/en/faq.wml:87
 msgid "Running a Tor hidden service:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:89
+#: /home/runa/tor/website/docs/en/faq.wml:89
 msgid "Anonymity and Security:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:91
+#: /home/runa/tor/website/docs/en/faq.wml:91
 msgid "<a href=\"#KeyManagement\">Tell me about all the keys Tor uses.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:92
+#: /home/runa/tor/website/docs/en/faq.wml:92
 msgid "<a href=\"#EntryGuards\">What are Entry Guards?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:95
+#: /home/runa/tor/website/docs/en/faq.wml:95
 msgid "Alternate designs that we don't do (yet):"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:97
+#: /home/runa/tor/website/docs/en/faq.wml:97
 msgid ""
 "<a href=\"#EverybodyARelay\">You should make every Tor user be a relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:99
+#: /home/runa/tor/website/docs/en/faq.wml:99
 msgid ""
 "<a href=\"#TransportIPnotTCP\">You should transport all IP packets, not just "
 "TCP packets.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:103
+#: /home/runa/tor/website/docs/en/faq.wml:103
 msgid "Abuse:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:105
+#: /home/runa/tor/website/docs/en/faq.wml:105
 msgid ""
 "<a href=\"#Criminals\">Doesn't Tor enable criminals to do bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:106
+#: /home/runa/tor/website/docs/en/faq.wml:106
 msgid ""
 "<a href=\"#RespondISP\">How do I respond to my ISP about my exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:110
+#: /home/runa/tor/website/docs/en/faq.wml:110
 msgid ""
 "For other questions not yet on this version of the FAQ, see the <a href="
 "\"<wikifaq>\">wiki FAQ</a> for now."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:113
+#: /home/runa/tor/website/docs/en/faq.wml:113
 msgid "<hr> <a id=\"General\"></a> <a id=\"WhatIsTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:118
+#: /home/runa/tor/website/docs/en/faq.wml:118
 msgid "<a class=\"anchor\" href=\"#WhatIsTor\">What is Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:121
+#: /home/runa/tor/website/docs/en/faq.wml:121
 msgid "The name \"Tor\" can refer to several different components."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:125
+#: /home/runa/tor/website/docs/en/faq.wml:125
 msgid ""
 "The Tor software is a program you can run on your computer that helps keep "
 "you safe on the Internet. Tor protects you by bouncing your communications "
@@ -334,26 +334,26 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:136
+#: /home/runa/tor/website/docs/en/faq.wml:136
 msgid ""
 "The Tor Project is a non-profit (charity) organization that maintains and "
 "develops the Tor software."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:140
+#: /home/runa/tor/website/docs/en/faq.wml:140
 msgid "<hr> <a id=\"Torisdifferent\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:143
+#: /home/runa/tor/website/docs/en/faq.wml:143
 msgid ""
 "<a class=\"anchor\" href=\"#Torisdifferent\">How is Tor different from other "
 "proxies?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:145
+#: /home/runa/tor/website/docs/en/faq.wml:145
 msgid ""
 "A typical proxy provider sets up a server somewhere on the Internet and "
 "allows you to use it to relay your traffic.  This creates a simple, easy to "
@@ -369,22 +369,23 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:158
+#: /home/runa/tor/website/docs/en/faq.wml:158
 msgid ""
 "Simple proxy providers also create a single point of failure.  The provider "
 "knows who you are and where you browse on the Internet.  They can see your "
-"traffic as it passes through their server.  In some cases, they can see your "
-"encrypted traffic as they relay it to your banking site or to ecommerce "
-"stores.  You have to trust the provider isn't doing any number of things, "
-"such as watching your traffic, injecting their own advertisements into your "
-"traffic stream, and isn't recording your personal details."
+"traffic as it passes through their server.  In some cases, they can even see "
+"inside your encrypted traffic as they relay it to your banking site or to "
+"ecommerce stores.  You have to trust the provider isn't doing any number of "
+"things, such as watching your traffic, injecting their own advertisements "
+"into your traffic stream, and recording your personal details."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:167
+#: /home/runa/tor/website/docs/en/faq.wml:168
 msgid ""
 "Tor passes your traffic through at least 3 different servers before sending "
-"it on to the destination.  Tor does not modify, or even know, what you are "
+"it on to the destination. Because there's a separate layer of encryption for "
+"each of the three relays, Tor does not modify, or even know, what you are "
 "sending into it.  It merely relays your traffic, completely encrypted "
 "through the Tor network and has it pop out somewhere else in the world, "
 "completely intact.  The Tor client is required because we assume you trust "
@@ -394,12 +395,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p><dl><dt>
-#: /home/runa/tordev/website/docs/en/faq.wml:177
+#: /home/runa/tor/website/docs/en/faq.wml:179
 msgid "Doesn't the first server see who I am?"
 msgstr ""
 
 #. type: Content of: <div><div><p><dl><dd>
-#: /home/runa/tordev/website/docs/en/faq.wml:177
+#: /home/runa/tor/website/docs/en/faq.wml:179
 msgid ""
 "Possibly. A bad first of three servers can see encrypted Tor traffic coming "
 "from your computer.  It still doesn't know who you are and what you are "
@@ -410,12 +411,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p><dl><dt>
-#: /home/runa/tordev/website/docs/en/faq.wml:183
+#: /home/runa/tor/website/docs/en/faq.wml:185
 msgid "Can't the third server see my traffic?"
 msgstr ""
 
 #. type: Content of: <div><div><p><dl><dd>
-#: /home/runa/tordev/website/docs/en/faq.wml:183
+#: /home/runa/tor/website/docs/en/faq.wml:185
 msgid ""
 "Possibly.  A bad third of three servers can see the traffic you sent into "
 "Tor.  It won't know who sent this traffic.  If you're using encryption, such "
@@ -427,19 +428,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:193
+#: /home/runa/tor/website/docs/en/faq.wml:195
 msgid "<hr> <a id=\"CompatibleApplications\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:196
+#: /home/runa/tor/website/docs/en/faq.wml:198
 msgid ""
 "<a class=\"anchor\" href=\"#CompatibleApplications\">What programs can I use "
 "with Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:199
+#: /home/runa/tor/website/docs/en/faq.wml:201
 msgid ""
 "There are two pieces to \"Torifying\" a program: connection-level anonymity "
 "and application-level anonymity. Connection-level anonymity focuses on "
@@ -455,7 +456,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:213
+#: /home/runa/tor/website/docs/en/faq.wml:215
 msgid ""
 "Most of our work so far has focused on the Firefox web browser. The bundles "
 "on the <a href=\"<page download/download>\">download page</a> automatically "
@@ -465,29 +466,29 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:222
+#: /home/runa/tor/website/docs/en/faq.wml:224
 msgid ""
 "There are plenty of other programs you can use with Tor, but we haven't "
 "researched the application-level anonymity issues on them well enough to be "
 "able to recommend a safe configuration. Our wiki has a list of instructions "
-"for <a href=\"<wiki>TheOnionRouter/TorifyHOWTO\">Torifying specific "
-"applications</a>. There's also a <a href=\"<wiki>TheOnionRouter/"
-"SupportPrograms\">list of applications that help you direct your traffic "
-"through Tor</a>.  Please add to these lists and help us keep them accurate!"
+"for <a href=\"<wiki>doc/TorifyHOWTO\">Torifying specific applications</a>. "
+"There's also a <a href=\"<wiki>doc/SupportPrograms\">list of applications "
+"that help you direct your traffic through Tor</a>.  Please add to these "
+"lists and help us keep them accurate!"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:233
+#: /home/runa/tor/website/docs/en/faq.wml:235
 msgid "<hr> <a id=\"WhyCalledTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:236
+#: /home/runa/tor/website/docs/en/faq.wml:238
 msgid "<a class=\"anchor\" href=\"#WhyCalledTor\">Why is it called Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:239
+#: /home/runa/tor/website/docs/en/faq.wml:241
 msgid ""
 "Because Tor is the onion routing network. When we were starting the new next-"
 "generation design and implementation of onion routing in 2001-2002, we would "
@@ -498,12 +499,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:249
+#: /home/runa/tor/website/docs/en/faq.wml:251
 msgid "(It's also got a fine translation from German and Turkish.)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:253
+#: /home/runa/tor/website/docs/en/faq.wml:255
 msgid ""
 "Note: even though it originally came from an acronym, Tor is not spelled "
 "\"TOR\". Only the first letter is capitalized. In fact, we can usually spot "
@@ -513,17 +514,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:260
+#: /home/runa/tor/website/docs/en/faq.wml:262
 msgid "<hr> <a id=\"Backdoor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:263
+#: /home/runa/tor/website/docs/en/faq.wml:265
 msgid "<a class=\"anchor\" href=\"#Backdoor\">Is there a backdoor in Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:266
+#: /home/runa/tor/website/docs/en/faq.wml:268
 msgid ""
 "There is absolutely no backdoor in Tor. Nobody has asked us to put one in, "
 "and we know some smart lawyers who say that it's unlikely that anybody will "
@@ -532,7 +533,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:273
+#: /home/runa/tor/website/docs/en/faq.wml:275
 msgid ""
 "We think that putting a backdoor in Tor would be tremendously irresponsible "
 "to our users, and a bad precedent for security software in general. If we "
@@ -542,7 +543,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:281
+#: /home/runa/tor/website/docs/en/faq.wml:283
 msgid ""
 "But that said, there are still plenty of subtle attacks people might try. "
 "Somebody might impersonate us, or break into our computers, or something "
@@ -555,7 +556,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:293
+#: /home/runa/tor/website/docs/en/faq.wml:295
 msgid ""
 "Also, there might be accidental bugs in Tor that could affect your "
 "anonymity. We periodically find and fix anonymity-related bugs, so make sure "
@@ -563,24 +564,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:298
+#: /home/runa/tor/website/docs/en/faq.wml:300
 msgid "<hr> <a id=\"DistributingTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:301
+#: /home/runa/tor/website/docs/en/faq.wml:303
 msgid ""
 "<a class=\"anchor\" href=\"#DistributingTor\">Can I distribute Tor on my "
 "magazine's CD?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:304
+#: /home/runa/tor/website/docs/en/faq.wml:306
 msgid "Yes."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:308
+#: /home/runa/tor/website/docs/en/faq.wml:310
 msgid ""
 "The Tor software is <a href=\"https://www.fsf.org/\">free software</a>. This "
 "means we give you the rights to redistribute the Tor software, either "
@@ -589,7 +590,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:315
+#: /home/runa/tor/website/docs/en/faq.wml:317
 msgid ""
 "However, if you want to redistribute the Tor software you must follow our <a "
 "href=\"<gitblob>LICENSE\">LICENSE</a>.  Essentially this means that you need "
@@ -598,7 +599,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:322
+#: /home/runa/tor/website/docs/en/faq.wml:324
 msgid ""
 "Most people who ask us this question don't want to distribute just the Tor "
 "software, though. They want to distribute the Tor bundles, which typically "
@@ -614,7 +615,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:338
+#: /home/runa/tor/website/docs/en/faq.wml:340
 msgid ""
 "Also, you should make sure not to confuse your readers about what Tor is, "
 "who makes it, and what properties it provides (and doesn't provide). See our "
@@ -622,7 +623,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:344
+#: /home/runa/tor/website/docs/en/faq.wml:346
 msgid ""
 "Lastly, you should realize that we release new versions of the Tor software "
 "frequently, and sometimes we make backward incompatible changes. So if you "
@@ -632,36 +633,36 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:351
+#: /home/runa/tor/website/docs/en/faq.wml:353
 msgid "<hr> <a id=\"SupportMail\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:354
+#: /home/runa/tor/website/docs/en/faq.wml:356
 msgid ""
 "<a class=\"anchor\" href=\"#SupportMail\">How can I get an answer to my Tor "
 "support mail?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:356
+#: /home/runa/tor/website/docs/en/faq.wml:358
 msgid ""
 "There is no official support for Tor. Your best bet is to try the following:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:358
+#: /home/runa/tor/website/docs/en/faq.wml:360
 msgid "Read through this <a href=\"<page docs/faq>\">FAQ</a>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:359
+#: /home/runa/tor/website/docs/en/faq.wml:361
 msgid ""
 "Read through the <a href=\"<page docs/documentation>\">documentation</a>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:360
+#: /home/runa/tor/website/docs/en/faq.wml:362
 msgid ""
 "Read through the <a href=\"https://lists.torproject.org/cgi-bin/mailman/"
 "listinfo/tor-talk\">tor-talk archives</a> and see if your question is "
@@ -669,43 +670,43 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:364
+#: /home/runa/tor/website/docs/en/faq.wml:366
 msgid ""
 "Join our <a href=\"irc://irc.oftc.net#tor\">irc channel</a> and state the "
 "issue and wait for help."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:366
+#: /home/runa/tor/website/docs/en/faq.wml:368
 msgid ""
 "Send an email to tor-assistants at torproject.org. These are volunteers who "
 "may be able to help you but you may not get a response for days."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:371
+#: /home/runa/tor/website/docs/en/faq.wml:373
 msgid ""
 "If you find your answer, please stick around on the IRC channel or the "
 "mailing list and answer questions from others."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:374
+#: /home/runa/tor/website/docs/en/faq.wml:376
 msgid "<hr> <a id=\"WhySlow\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:377
+#: /home/runa/tor/website/docs/en/faq.wml:379
 msgid "<a class=\"anchor\" href=\"#WhySlow\">Why is Tor so slow?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:380
+#: /home/runa/tor/website/docs/en/faq.wml:382
 msgid "There are many reasons why the Tor network is currently slow."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:384
+#: /home/runa/tor/website/docs/en/faq.wml:386
 msgid ""
 "Before we answer, though, you should realize that Tor is never going to be "
 "blazing fast. Your traffic is bouncing through volunteers' computers in "
@@ -715,7 +716,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:392
+#: /home/runa/tor/website/docs/en/faq.wml:394
 msgid ""
 "But that doesn't mean that it can't be improved. The current Tor network is "
 "quite small compared to the number of people trying to use it, and many of "
@@ -724,7 +725,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:399
+#: /home/runa/tor/website/docs/en/faq.wml:401
 msgid ""
 "For the much more in-depth answer, see <a href=\"<blog>why-tor-is-slow"
 "\">Roger's blog post on the topic</a>, which includes both a detailed PDF "
@@ -732,12 +733,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:406
+#: /home/runa/tor/website/docs/en/faq.wml:408
 msgid "What can you do to help?"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:412
+#: /home/runa/tor/website/docs/en/faq.wml:414
 msgid ""
 "<a href=\"<page docs/tor-doc-relay>\">Configure your Tor to relay traffic "
 "for others</a>. Help make the Tor network large enough that we can handle "
@@ -745,7 +746,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:418
+#: /home/runa/tor/website/docs/en/faq.wml:420
 msgid ""
 "<a href=\"<page projects/vidalia>\">Help us make Tor more usable</a>. We "
 "especially need people to help make it easier to configure your Tor as a "
@@ -754,7 +755,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:425
+#: /home/runa/tor/website/docs/en/faq.wml:427
 msgid ""
 "There are some bottlenecks in the current Tor network. Help us design "
 "experiments to track down and demonstrate where the problems are, and then "
@@ -762,19 +763,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:431
+#: /home/runa/tor/website/docs/en/faq.wml:433
 msgid ""
 "There are some steps that individuals can take to improve their Tor "
-"performance. <a href=\"<wiki>TheOnionRouter/FireFoxTorPerf\">You can "
-"configure your Firefox to handle Tor better</a>, <a href=\"http://www.pps."
-"jussieu.fr/~jch/software/polipo/tor.html\">you can use Polipo with Tor</a>, "
-"or you can try <a href=\"<page download/download>\">upgrading to the latest "
-"version of Tor</a>.  If this works well, please help by documenting what you "
-"did, and letting us know about it."
+"performance. <a href=\"<wiki>doc/FireFoxTorPerf\">You can configure your "
+"Firefox to handle Tor better</a>, <a href=\"http://www.pps.jussieu.fr/~jch/"
+"software/polipo/tor.html\">you can use Polipo with Tor</a>, or you can try "
+"<a href=\"<page download/download>\">upgrading to the latest version of Tor</"
+"a>.  If this works well, please help by documenting what you did, and "
+"letting us know about it."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:442
+#: /home/runa/tor/website/docs/en/faq.wml:444
 msgid ""
 "Tor needs some architectural changes too. One important change is to start "
 "providing <a href=\"#EverybodyARelay\">better service to people who relay "
@@ -783,7 +784,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:449
+#: /home/runa/tor/website/docs/en/faq.wml:451
 msgid ""
 "Help do other things so we can do the hard stuff. Please take a moment to "
 "figure out what your skills and interests are, and then <a href=\"<page "
@@ -791,7 +792,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:455
+#: /home/runa/tor/website/docs/en/faq.wml:457
 msgid ""
 "Help find sponsors for Tor. Do you work at a company or government agency "
 "that uses Tor or has a use for Internet privacy, e.g. to browse the "
@@ -802,7 +803,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:464
+#: /home/runa/tor/website/docs/en/faq.wml:466
 msgid ""
 "If you can't help out with any of the above, you can still help out "
 "individually by <a href=\"<page donate/donate>\">donating a bit of money to "
@@ -810,19 +811,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:471
+#: /home/runa/tor/website/docs/en/faq.wml:473
 msgid "<hr> <a id=\"Funding\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:474
+#: /home/runa/tor/website/docs/en/faq.wml:476
 msgid ""
 "<a class=\"anchor\" href=\"#Funding\">What would The Tor Project do with "
 "more funding?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:477
+#: /home/runa/tor/website/docs/en/faq.wml:479
 msgid ""
 "We have about 1800 relays right now, pushing over 150 MB/s average traffic. "
 "We have several hundred thousand active users. But the Tor network is not "
@@ -830,12 +831,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:483
+#: /home/runa/tor/website/docs/en/faq.wml:485
 msgid "There are six main development/maintenance pushes that need attention:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:489
+#: /home/runa/tor/website/docs/en/faq.wml:491
 msgid ""
 "Scalability: We need to keep scaling and decentralizing the Tor architecture "
 "so it can handle thousands of relays and millions of users. The upcoming "
@@ -844,7 +845,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:496
+#: /home/runa/tor/website/docs/en/faq.wml:498
 msgid ""
 "User support: With this many users, a lot of people are asking questions all "
 "the time, offering to help out with things, and so on. We need good clean "
@@ -852,7 +853,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:502
+#: /home/runa/tor/website/docs/en/faq.wml:504
 msgid ""
 "Relay support: the Tor network is run by volunteers, but they still need "
 "attention with prompt bug fixes, explanations when things go wrong, "
@@ -863,7 +864,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:511
+#: /home/runa/tor/website/docs/en/faq.wml:513
 msgid ""
 "Usability: Beyond documentation, we also need to work on usability of the "
 "software itself. This includes installers, clean GUIs, easy configuration to "
@@ -874,7 +875,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:520
+#: /home/runa/tor/website/docs/en/faq.wml:522
 msgid ""
 "Incentives: We need to work on ways to encourage people to configure their "
 "Tors as relays and exit nodes rather than just clients.  <a href="
@@ -883,7 +884,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:527
+#: /home/runa/tor/website/docs/en/faq.wml:529
 msgid ""
 "Research: The anonymous communications field is full of surprises and "
 "gotchas. In our copious free time, we also help run top anonymity and "
@@ -895,7 +896,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:540
+#: /home/runa/tor/website/docs/en/faq.wml:542
 msgid ""
 "We're continuing to move forward on all of these, but at this rate <a href="
 "\"#WhySlow\">the Tor network is growing faster than the developers can keep "
@@ -904,14 +905,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:548
+#: /home/runa/tor/website/docs/en/faq.wml:550
 msgid ""
 "We are also excited about tackling related problems, such as censorship-"
 "resistance."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:553
+#: /home/runa/tor/website/docs/en/faq.wml:555
 msgid ""
 "We are proud to have <a href=\"<page about/sponsors>\">sponsorship and "
 "support</a> from the Omidyar Network, the International Broadcasting Bureau, "
@@ -921,7 +922,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:560
+#: /home/runa/tor/website/docs/en/faq.wml:562
 msgid ""
 "However, this support is not enough to keep Tor abreast of changes in the "
 "Internet privacy landscape. Please <a href=\"<page donate/donate>\">donate</"
@@ -930,38 +931,38 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:566
+#: /home/runa/tor/website/docs/en/faq.wml:568
 msgid "<hr> <a id=\"Metrics\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:569
+#: /home/runa/tor/website/docs/en/faq.wml:571
 msgid ""
 "<a class=\"anchor\" href=\"#Metrics\">How many people use Tor? How many "
 "relays or exit nodes are there?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:571
+#: /home/runa/tor/website/docs/en/faq.wml:573
 msgid ""
 "All this and more about measuring Tor can be found at the <a href=\"https://"
 "metrics.torproject.org/\">Tor Metrics Portal</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:573
+#: /home/runa/tor/website/docs/en/faq.wml:575
 msgid "<hr> <a id=\"SSLcertfingerprint\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:576
+#: /home/runa/tor/website/docs/en/faq.wml:578
 msgid ""
 "<a class=\"anchor\" href=\"#SSLcertfingerprint\">What are the SSL "
 "certificate fingerprints for Tor's various websites?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p><pre>
-#: /home/runa/tordev/website/docs/en/faq.wml:580
+#: /home/runa/tor/website/docs/en/faq.wml:582
 #, no-wrap
 msgid ""
 "    *.torproject.org SSL certificate from Digicert:\n"
@@ -976,18 +977,18 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:590
+#: /home/runa/tor/website/docs/en/faq.wml:592
 msgid "<hr> <a id=\"HowUninstallTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:593
+#: /home/runa/tor/website/docs/en/faq.wml:595
 msgid ""
 "<a class=\"anchor\" href=\"#HowUninstallTor\">How do I uninstall Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:596
+#: /home/runa/tor/website/docs/en/faq.wml:598
 msgid ""
 "This depends entirely on how you installed it and which operating system you "
 "have. If you installed a package, then hopefully your package has a way to "
@@ -997,35 +998,35 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:604
+#: /home/runa/tor/website/docs/en/faq.wml:606
 msgid ""
 "In your taskbar, right click on Vidalia (the green onion or the black head)  "
 "and choose exit."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:606
+#: /home/runa/tor/website/docs/en/faq.wml:608
 msgid ""
 "Right click on the taskbar to bring up TaskManager. Look for tor.exe in the "
 "Process List. If it's running, right click and choose End Process."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:608
+#: /home/runa/tor/website/docs/en/faq.wml:610
 msgid ""
 "Click the Start button, go to Programs, go to Vidalia, choose Uninstall.  "
 "This will remove the Vidalia bundle, which includes Tor and Polipo."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:610
+#: /home/runa/tor/website/docs/en/faq.wml:612
 msgid ""
 "Start Firefox. Go to the Tools menu, choose Add-ons. Select Torbutton.  "
 "Click the Uninstall button."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:615
+#: /home/runa/tor/website/docs/en/faq.wml:617
 msgid ""
 "If you do not follow these steps (for example by trying to uninstall "
 "Vidalia, Tor, and Polipo while they are still running), you will need to "
@@ -1033,14 +1034,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:621
+#: /home/runa/tor/website/docs/en/faq.wml:623
 msgid ""
 "For Mac OS X, follow the <a href=\"<page docs/tor-doc-osx>#uninstall"
 "\">uninstall directions</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:626
+#: /home/runa/tor/website/docs/en/faq.wml:628
 msgid ""
 "If you installed by source, I'm afraid there is no easy uninstall method. "
 "But on the bright side, by default it only installs into /usr/local/ and it "
@@ -1048,45 +1049,45 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:631
+#: /home/runa/tor/website/docs/en/faq.wml:633
 msgid "<hr> <a id=\"PGPSigs\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:634
+#: /home/runa/tor/website/docs/en/faq.wml:636
 msgid ""
 "<a class=\"anchor\" href=\"#PGPSigs\">What are these \"sig\" files on the "
 "download page?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:637
+#: /home/runa/tor/website/docs/en/faq.wml:639
 msgid ""
 "These are PGP signatures, so you can verify that the file you've downloaded "
 "is exactly the one that we intended you to get."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:642
+#: /home/runa/tor/website/docs/en/faq.wml:644
 msgid ""
 "Please read the <a href=\"<page docs/verifying-signatures>\">verifying "
 "signatures</a> page for details."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:646
+#: /home/runa/tor/website/docs/en/faq.wml:648
 msgid "<hr> <a id=\"GetTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:649
+#: /home/runa/tor/website/docs/en/faq.wml:651
 msgid ""
 "<a class=\"anchor\" href=\"#GetTor\">Your website is blocked in my country. "
 "How do I download Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:653
+#: /home/runa/tor/website/docs/en/faq.wml:655
 msgid ""
 "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; "
@@ -1101,7 +1102,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:667
+#: /home/runa/tor/website/docs/en/faq.wml:669
 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 "
@@ -1109,26 +1110,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:672
+#: /home/runa/tor/website/docs/en/faq.wml:674
 msgid "<hr> <a id=\"CompileTorWindows\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:675
+#: /home/runa/tor/website/docs/en/faq.wml:677
 msgid ""
 "<a class=\"anchor\" href=\"#CompileTorWindows\">How do I compile Tor under "
 "Windows?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:678
+#: /home/runa/tor/website/docs/en/faq.wml:680
 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/tordev/website/docs/en/faq.wml:683
+#: /home/runa/tor/website/docs/en/faq.wml:685
 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 download/"
@@ -1136,19 +1137,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:688
+#: /home/runa/tor/website/docs/en/faq.wml:690
 msgid "<hr> <a id=\"VirusFalsePositives\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:691
+#: /home/runa/tor/website/docs/en/faq.wml:693
 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/tordev/website/docs/en/faq.wml:694
+#: /home/runa/tor/website/docs/en/faq.wml:696
 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 "
@@ -1159,7 +1160,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:702
+#: /home/runa/tor/website/docs/en/faq.wml:704
 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 href="
@@ -1167,19 +1168,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:707
+#: /home/runa/tor/website/docs/en/faq.wml:709
 msgid "<hr> <a id=\"LiveCD\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:710
+#: /home/runa/tor/website/docs/en/faq.wml:712
 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/tordev/website/docs/en/faq.wml:713
+#: /home/runa/tor/website/docs/en/faq.wml:715
 msgid ""
 "Yes.  Use <a href=\"https://tails.boum.org/\">The Amnesic Incognito Live "
 "System</a> or <a href=\"<page projects/torbrowser>\">the Tor Browser Bundle</"
@@ -1187,19 +1188,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:718
+#: /home/runa/tor/website/docs/en/faq.wml:720
 msgid "<hr> <a id=\"torrc\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:721
+#: /home/runa/tor/website/docs/en/faq.wml:723
 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/tordev/website/docs/en/faq.wml:724
+#: /home/runa/tor/website/docs/en/faq.wml:726
 msgid ""
 "Tor installs a text file called torrc that contains configuration "
 "instructions for how your Tor program should behave. The default "
@@ -1209,12 +1210,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:732
+#: /home/runa/tor/website/docs/en/faq.wml:734
 msgid "The location of your torrc file depends on the way you installed Tor:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:736
+#: /home/runa/tor/website/docs/en/faq.wml:738
 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, "
@@ -1227,14 +1228,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:745
+#: /home/runa/tor/website/docs/en/faq.wml:747
 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/tordev/website/docs/en/faq.wml:749
+#: /home/runa/tor/website/docs/en/faq.wml:751
 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 package's "
@@ -1242,7 +1243,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:753
+#: /home/runa/tor/website/docs/en/faq.wml:755
 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 "
@@ -1250,14 +1251,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:760
+#: /home/runa/tor/website/docs/en/faq.wml:762
 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/tordev/website/docs/en/faq.wml:765
+#: /home/runa/tor/website/docs/en/faq.wml:767
 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 actually "
@@ -1265,7 +1266,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:771
+#: /home/runa/tor/website/docs/en/faq.wml:773
 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 # "
@@ -1273,19 +1274,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:777
+#: /home/runa/tor/website/docs/en/faq.wml:779
 msgid "<hr> <a id=\"Logs\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:780
+#: /home/runa/tor/website/docs/en/faq.wml:782
 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/tordev/website/docs/en/faq.wml:783
+#: /home/runa/tor/website/docs/en/faq.wml:785
 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 "
@@ -1294,19 +1295,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:790
+#: /home/runa/tor/website/docs/en/faq.wml:792
 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/tordev/website/docs/en/faq.wml:795
+#: /home/runa/tor/website/docs/en/faq.wml:797
 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/tordev/website/docs/en/faq.wml:797
+#: /home/runa/tor/website/docs/en/faq.wml:799
 msgid ""
 "On Windows, there are no default log files currently. If you enable logs in "
 "your torrc file, they default to <code>\\username\\Application Data\\tor\\log"
@@ -1314,7 +1315,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:801
+#: /home/runa/tor/website/docs/en/faq.wml:803
 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 log-"
@@ -1323,7 +1324,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:809
+#: /home/runa/tor/website/docs/en/faq.wml:811
 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 following "
@@ -1331,7 +1332,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tordev/website/docs/en/faq.wml:815
+#: /home/runa/tor/website/docs/en/faq.wml:817
 #, no-wrap
 msgid ""
 "\\## Logs go to stdout at level \"notice\" unless redirected by something\n"
@@ -1339,7 +1340,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:820
+#: /home/runa/tor/website/docs/en/faq.wml:822
 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 "
@@ -1347,32 +1348,32 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tordev/website/docs/en/faq.wml:826
+#: /home/runa/tor/website/docs/en/faq.wml:828
 #, no-wrap
 msgid "Log debug file c:/program files/tor/debug.log\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:830
+#: /home/runa/tor/website/docs/en/faq.wml:832
 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/tordev/website/docs/en/faq.wml:834
+#: /home/runa/tor/website/docs/en/faq.wml:836
 msgid "<hr> <a id=\"DoesntWork\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:837
+#: /home/runa/tor/website/docs/en/faq.wml:839
 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/tordev/website/docs/en/faq.wml:840
+#: /home/runa/tor/website/docs/en/faq.wml:842
 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 "
@@ -1380,7 +1381,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:845
+#: /home/runa/tor/website/docs/en/faq.wml:847
 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 "
@@ -1390,19 +1391,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:855
+#: /home/runa/tor/website/docs/en/faq.wml:857
 msgid "If Tor can't establish a circuit, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:859
+#: /home/runa/tor/website/docs/en/faq.wml:861
 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/tordev/website/docs/en/faq.wml:861
+#: /home/runa/tor/website/docs/en/faq.wml:863
 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 -"
@@ -1411,7 +1412,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:865
+#: /home/runa/tor/website/docs/en/faq.wml:867
 msgid ""
 "Is your Internet connection <a href=\"#FirewallPorts\">firewalled by port</"
 "a>, or do you normally need to use a <a href="
@@ -1419,7 +1420,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:870
+#: /home/runa/tor/website/docs/en/faq.wml:872
 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 "
@@ -1427,7 +1428,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:873
+#: /home/runa/tor/website/docs/en/faq.wml:875
 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 "
@@ -1435,14 +1436,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:876
+#: /home/runa/tor/website/docs/en/faq.wml:878
 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/tordev/website/docs/en/faq.wml:881
+#: /home/runa/tor/website/docs/en/faq.wml:883
 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 "
@@ -1452,12 +1453,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:889
+#: /home/runa/tor/website/docs/en/faq.wml:891
 msgid "If it thinks you're not using Tor, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:893
+#: /home/runa/tor/website/docs/en/faq.wml:895
 msgid ""
 "Did you install the Torbutton extension for Firefox? The installation "
 "bundles include it, but sometimes people forget to install it. Make sure it "
@@ -1466,7 +1467,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:898
+#: /home/runa/tor/website/docs/en/faq.wml:900
 msgid ""
 "Do you have incompatible Firefox extensions like FoxyProxy installed? If so, "
 "uninstall them. (Note that using FoxyProxy is NOT a sufficient substitute "
@@ -1477,7 +1478,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:905
+#: /home/runa/tor/website/docs/en/faq.wml:907
 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 "
@@ -1487,7 +1488,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:910
+#: /home/runa/tor/website/docs/en/faq.wml:912
 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/"
@@ -1497,14 +1498,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:915
+#: /home/runa/tor/website/docs/en/faq.wml:917
 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/tordev/website/docs/en/faq.wml:917
+#: /home/runa/tor/website/docs/en/faq.wml:919
 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 "
@@ -1512,7 +1513,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:920
+#: /home/runa/tor/website/docs/en/faq.wml:922
 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 "
@@ -1521,19 +1522,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:926
+#: /home/runa/tor/website/docs/en/faq.wml:928
 msgid "<hr /> <a id=\"VidaliaPassword\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:929
+#: /home/runa/tor/website/docs/en/faq.wml:931
 msgid ""
 "<a class=\"anchor\" href=\"#VidaliaPassword\">Tor/Vidalia prompts for a "
 "password at start.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:932
+#: /home/runa/tor/website/docs/en/faq.wml:934
 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 "
@@ -1544,7 +1545,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:941
+#: /home/runa/tor/website/docs/en/faq.wml:943
 msgid ""
 "Usually this process of generating and setting a random control password "
 "happens in the background. There are three common situations, though, where "
@@ -1552,7 +1553,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:947
+#: /home/runa/tor/website/docs/en/faq.wml:949
 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 "
@@ -1561,7 +1562,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:952
+#: /home/runa/tor/website/docs/en/faq.wml:954
 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 "
@@ -1575,7 +1576,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:965
+#: /home/runa/tor/website/docs/en/faq.wml:967
 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 "
@@ -1590,19 +1591,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:980
+#: /home/runa/tor/website/docs/en/faq.wml:982
 msgid "<hr> <a id=\"ChooseEntryExit\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:983
+#: /home/runa/tor/website/docs/en/faq.wml:985
 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/tordev/website/docs/en/faq.wml:986
+#: /home/runa/tor/website/docs/en/faq.wml:988
 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 "
@@ -1611,53 +1612,53 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tordev/website/docs/en/faq.wml:992
+#: /home/runa/tor/website/docs/en/faq.wml:994
 msgid "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tordev/website/docs/en/faq.wml:993
+#: /home/runa/tor/website/docs/en/faq.wml:995
 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/tordev/website/docs/en/faq.wml:995
+#: /home/runa/tor/website/docs/en/faq.wml:997
 msgid "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tordev/website/docs/en/faq.wml:996
+#: /home/runa/tor/website/docs/en/faq.wml:998
 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/tordev/website/docs/en/faq.wml:998
+#: /home/runa/tor/website/docs/en/faq.wml:1000
 msgid "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tordev/website/docs/en/faq.wml:999
+#: /home/runa/tor/website/docs/en/faq.wml:1001
 msgid "A list of nodes to never use when building a circuit."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tordev/website/docs/en/faq.wml:1001
+#: /home/runa/tor/website/docs/en/faq.wml:1003
 msgid "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tordev/website/docs/en/faq.wml:1002
+#: /home/runa/tor/website/docs/en/faq.wml:1004
 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/tordev/website/docs/en/faq.wml:1007
+#: /home/runa/tor/website/docs/en/faq.wml:1009
 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 "
@@ -1667,7 +1668,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1014
+#: /home/runa/tor/website/docs/en/faq.wml:1016
 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 "
@@ -1679,7 +1680,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1024
+#: /home/runa/tor/website/docs/en/faq.wml:1026
 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 "
@@ -1688,7 +1689,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1030
+#: /home/runa/tor/website/docs/en/faq.wml:1032
 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 "
@@ -1697,26 +1698,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:1036
+#: /home/runa/tor/website/docs/en/faq.wml:1038
 msgid "<hr> <a id=\"GoogleCaptcha\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:1039
+#: /home/runa/tor/website/docs/en/faq.wml:1041
 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/tordev/website/docs/en/faq.wml:1042
+#: /home/runa/tor/website/docs/en/faq.wml:1044
 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/tordev/website/docs/en/faq.wml:1047
+#: /home/runa/tor/website/docs/en/faq.wml:1049
 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 "
@@ -1727,7 +1728,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1055
+#: /home/runa/tor/website/docs/en/faq.wml:1057
 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 "
@@ -1737,7 +1738,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1064
+#: /home/runa/tor/website/docs/en/faq.wml:1066
 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 "
@@ -1745,7 +1746,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1070
+#: /home/runa/tor/website/docs/en/faq.wml:1072
 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 "
@@ -1753,19 +1754,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:1075
+#: /home/runa/tor/website/docs/en/faq.wml:1077
 msgid "<hr /> <a id=\"GmailWarning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:1078
+#: /home/runa/tor/website/docs/en/faq.wml:1080
 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/tordev/website/docs/en/faq.wml:1081
+#: /home/runa/tor/website/docs/en/faq.wml:1083
 msgid ""
 "Sometimes, after you've used Gmail over Tor, Google presents a pop-up "
 "notification that your account may have been compromised.  The notification "
@@ -1774,7 +1775,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1088
+#: /home/runa/tor/website/docs/en/faq.wml:1090
 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 "
@@ -1783,7 +1784,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1095
+#: /home/runa/tor/website/docs/en/faq.wml:1097
 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 "
@@ -1792,7 +1793,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1102
+#: /home/runa/tor/website/docs/en/faq.wml:1104
 msgid ""
 "Cookie hijacking is possible by either physical access to your computer or "
 "by watching your network traffic.  In theory only physical access should "
@@ -1803,7 +1804,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1111
+#: /home/runa/tor/website/docs/en/faq.wml:1113
 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 "
@@ -1815,19 +1816,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:1120
+#: /home/runa/tor/website/docs/en/faq.wml:1122
 msgid "<hr> <a id=\"FirewallPorts\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:1123
+#: /home/runa/tor/website/docs/en/faq.wml:1125
 msgid ""
 "<a class=\"anchor\" href=\"#FirewallPorts\">My firewall only allows a few "
 "outgoing ports.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1126
+#: /home/runa/tor/website/docs/en/faq.wml:1128
 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 "
@@ -1837,7 +1838,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1134
+#: /home/runa/tor/website/docs/en/faq.wml:1136
 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 "
@@ -1845,14 +1846,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1140
+#: /home/runa/tor/website/docs/en/faq.wml:1142
 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/tordev/website/docs/en/faq.wml:1145
+#: /home/runa/tor/website/docs/en/faq.wml:1147
 #, no-wrap
 msgid ""
 "  ReachableDirAddresses *:80\n"
@@ -1860,24 +1861,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:1149
+#: /home/runa/tor/website/docs/en/faq.wml:1151
 msgid "<hr> <a id=\"RelayFlexible\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:1152
+#: /home/runa/tor/website/docs/en/faq.wml:1154
 msgid ""
 "<a class=\"anchor\" href=\"#RelayFlexible\">How stable does my relay need to "
 "be?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1155
+#: /home/runa/tor/website/docs/en/faq.wml:1157
 msgid "We aim to make setting up a Tor relay easy and convenient:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:1159
+#: /home/runa/tor/website/docs/en/faq.wml:1161
 msgid ""
 "Tor has built-in support for <a href="
 "\"<wikifaq>#WhatbandwidthshapingoptionsareavailabletoTorrelays\"> rate "
@@ -1888,7 +1889,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:1167
+#: /home/runa/tor/website/docs/en/faq.wml:1169
 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 "
@@ -1897,7 +1898,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:1172
+#: /home/runa/tor/website/docs/en/faq.wml:1174
 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 "
@@ -1905,14 +1906,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:1177
+#: /home/runa/tor/website/docs/en/faq.wml:1179
 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/tordev/website/docs/en/faq.wml:1180
+#: /home/runa/tor/website/docs/en/faq.wml:1182
 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 TCP "
@@ -1921,7 +1922,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:1186
+#: /home/runa/tor/website/docs/en/faq.wml:1188
 msgid ""
 "Your relay will passively estimate and advertise its recent bandwidth "
 "capacity, so high-bandwidth relays will attract more users than low-"
@@ -1929,24 +1930,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:1192
+#: /home/runa/tor/website/docs/en/faq.wml:1194
 msgid "<hr> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:1196
+#: /home/runa/tor/website/docs/en/faq.wml:1198
 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/tordev/website/docs/en/faq.wml:1199
+#: /home/runa/tor/website/docs/en/faq.wml:1201
 msgid "Great. That's exactly why we implemented exit policies."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1203
+#: /home/runa/tor/website/docs/en/faq.wml:1205
 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 "
@@ -1962,7 +1963,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1217
+#: /home/runa/tor/website/docs/en/faq.wml:1219
 msgid ""
 "The default exit policy allows access to many popular services (e.g. web "
 "browsing), but <a href=\"<wikifaq>#Istherealistofdefaultexitports"
@@ -1977,7 +1978,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1231
+#: /home/runa/tor/website/docs/en/faq.wml:1233
 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 +1988,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:1239
+#: /home/runa/tor/website/docs/en/faq.wml:1241
 msgid "<hr> <a id=\"RelayOrBridge\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:1242
+#: /home/runa/tor/website/docs/en/faq.wml:1244
 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/tordev/website/docs/en/faq.wml:1244
+#: /home/runa/tor/website/docs/en/faq.wml:1246
 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 +2010,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1251
+#: /home/runa/tor/website/docs/en/faq.wml:1253
 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,18 +2018,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1256
+#: /home/runa/tor/website/docs/en/faq.wml:1258
 msgid ""
 "Right now, there are a small number of places in the world that filter "
 "connections to the Tor network. So getting a lot of bridges running right "
 "now is mostly a backup measure, a) in case the Tor network does get blocked "
-"somewhere, and b) for people who want an extra layer of security because "
-"they're worried somebody will recognize that it's a public Tor relay IP "
-"address they're contacting."
+"in more places, and b) for people who want an extra layer of security "
+"because they're worried somebody will recognize that it's a public Tor relay "
+"IP address they're contacting."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1264
+#: /home/runa/tor/website/docs/en/faq.wml:1266
 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; bridge relays "
@@ -2039,19 +2040,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:1272
+#: /home/runa/tor/website/docs/en/faq.wml:1274
 msgid "<hr> <a id=\"MultipleRelays\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:1275
+#: /home/runa/tor/website/docs/en/faq.wml:1277
 msgid ""
 "<a class=\"anchor\" href=\"#MultipleRelays\">I want to run more than one "
 "relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1278
+#: /home/runa/tor/website/docs/en/faq.wml:1280
 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 "
@@ -2060,7 +2061,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1285
+#: /home/runa/tor/website/docs/en/faq.wml:1287
 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 "
@@ -2068,13 +2069,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tordev/website/docs/en/faq.wml:1291
+#: /home/runa/tor/website/docs/en/faq.wml:1293
 #, no-wrap
 msgid "    MyFamily $fingerprint1,$fingerprint2,$fingerprint3\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1295
+#: /home/runa/tor/website/docs/en/faq.wml:1297
 msgid ""
 "where each fingerprint is the 40 character identity fingerprint (without "
 "spaces). You can also list them by nickname, but fingerprint is safer. Be "
@@ -2083,7 +2084,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1302
+#: /home/runa/tor/website/docs/en/faq.wml:1304
 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 "
@@ -2092,26 +2093,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:1308
+#: /home/runa/tor/website/docs/en/faq.wml:1310
 msgid "<hr> <a id=\"RelayMemory\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:1311
+#: /home/runa/tor/website/docs/en/faq.wml:1313
 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/tordev/website/docs/en/faq.wml:1313
+#: /home/runa/tor/website/docs/en/faq.wml:1315
 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/tordev/website/docs/en/faq.wml:1318
+#: /home/runa/tor/website/docs/en/faq.wml:1320
 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 "
@@ -2123,7 +2124,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:1326
+#: /home/runa/tor/website/docs/en/faq.wml:1328
 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 +2135,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:1334
+#: /home/runa/tor/website/docs/en/faq.wml:1336
 msgid ""
 "If you're running on Solaris, OpenBSD, NetBSD, or old FreeBSD, Tor is "
 "probably forking separate processes rather than using threads. Consider "
@@ -2143,7 +2144,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:1340
+#: /home/runa/tor/website/docs/en/faq.wml:1342
 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 "
@@ -2152,61 +2153,61 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1349
+#: /home/runa/tor/website/docs/en/faq.wml:1351
 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/tordev/website/docs/en/faq.wml:1353
+#: /home/runa/tor/website/docs/en/faq.wml:1355
 msgid "<hr> <a id=\"WhyNotNamed\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:1356
+#: /home/runa/tor/website/docs/en/faq.wml:1358
 msgid ""
 "<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1359
+#: /home/runa/tor/website/docs/en/faq.wml:1361
 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/tordev/website/docs/en/faq.wml:1362
+#: /home/runa/tor/website/docs/en/faq.wml:1364
 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/tordev/website/docs/en/faq.wml:1364
+#: /home/runa/tor/website/docs/en/faq.wml:1366
 msgid "The relay must have been around for at least two weeks."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:1365
+#: /home/runa/tor/website/docs/en/faq.wml:1367
 msgid "No other router may have wanted the same name in the past month."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:1368
+#: /home/runa/tor/website/docs/en/faq.wml:1370
 msgid "<hr> <a id=\"KeyManagement\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:1371
+#: /home/runa/tor/website/docs/en/faq.wml:1373
 msgid ""
 "<a class=\"anchor\" href=\"#KeyManagement\">Tell me about all the keys Tor "
 "uses.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1374
+#: /home/runa/tor/website/docs/en/faq.wml:1376
 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 +2217,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1382
+#: /home/runa/tor/website/docs/en/faq.wml:1384
 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 +2228,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1392
+#: /home/runa/tor/website/docs/en/faq.wml:1394
 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 +2239,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1402
+#: /home/runa/tor/website/docs/en/faq.wml:1404
 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 +2254,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1416
+#: /home/runa/tor/website/docs/en/faq.wml:1418
 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 +2263,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1423
+#: /home/runa/tor/website/docs/en/faq.wml:1425
 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 href=\"http://www."
@@ -2271,7 +2272,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1431
+#: /home/runa/tor/website/docs/en/faq.wml:1433
 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 "
@@ -2281,17 +2282,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:1438
+#: /home/runa/tor/website/docs/en/faq.wml:1440
 msgid "<hr> <a id=\"EntryGuards\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:1441
+#: /home/runa/tor/website/docs/en/faq.wml:1443
 msgid "<a class=\"anchor\" href=\"#EntryGuards\">What are Entry Guards?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1444
+#: /home/runa/tor/website/docs/en/faq.wml:1446
 msgid ""
 "Tor (like all current practical low-latency anonymity designs) fails when "
 "the attacker can see both ends of the communications channel. For example, "
@@ -2303,7 +2304,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1454
+#: /home/runa/tor/website/docs/en/faq.wml:1456
 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 entry "
@@ -2317,7 +2318,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1466
+#: /home/runa/tor/website/docs/en/faq.wml:1468
 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. "
@@ -2330,7 +2331,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1477
+#: /home/runa/tor/website/docs/en/faq.wml:1479
 msgid ""
 "You can read more at <a href=\"http://freehaven.net/anonbib/#wright02\">An "
 "Analysis of the Degradation of Anonymous Protocols</a>, <a href=\"http://"
@@ -2340,7 +2341,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1486
+#: /home/runa/tor/website/docs/en/faq.wml:1488
 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. (Even "
@@ -2351,19 +2352,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:1494
+#: /home/runa/tor/website/docs/en/faq.wml:1496
 msgid "<hr> <a id=\"EverybodyARelay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:1497
+#: /home/runa/tor/website/docs/en/faq.wml:1499
 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/tordev/website/docs/en/faq.wml:1500
+#: /home/runa/tor/website/docs/en/faq.wml:1502
 msgid ""
 "Requiring every Tor user to be a relay would help with scaling the network "
 "to handle all our users, and <a href="
@@ -2378,7 +2379,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1513
+#: /home/runa/tor/website/docs/en/faq.wml:1515
 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 "
@@ -2389,12 +2390,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1522
+#: /home/runa/tor/website/docs/en/faq.wml:1524
 msgid "There are five steps we need to address before we can do this though:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1526
+#: /home/runa/tor/website/docs/en/faq.wml:1528
 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 "
@@ -2403,7 +2404,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1534
+#: /home/runa/tor/website/docs/en/faq.wml:1536
 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 getinvolved/"
@@ -2415,7 +2416,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1545
+#: /home/runa/tor/website/docs/en/faq.wml:1547
 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 "
@@ -2427,7 +2428,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1555
+#: /home/runa/tor/website/docs/en/faq.wml:1557
 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 "
@@ -2444,7 +2445,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1571
+#: /home/runa/tor/website/docs/en/faq.wml:1573
 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 href="
@@ -2452,24 +2453,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1578
+#: /home/runa/tor/website/docs/en/faq.wml:1580
 msgid "Please help on all of these!"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:1581
+#: /home/runa/tor/website/docs/en/faq.wml:1583
 msgid "<hr> <a id=\"TransportIPnotTCP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:1584
+#: /home/runa/tor/website/docs/en/faq.wml:1586
 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/tordev/website/docs/en/faq.wml:1587
+#: /home/runa/tor/website/docs/en/faq.wml:1589
 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, "
@@ -2478,7 +2479,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tordev/website/docs/en/faq.wml:1594
+#: /home/runa/tor/website/docs/en/faq.wml:1596
 msgid ""
 "We're heading in this direction: see <a href=\"https://trac.torproject.org/"
 "projects/tor/ticket/1855\">this trac ticket</a> for directions we should "
@@ -2486,7 +2487,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:1601
+#: /home/runa/tor/website/docs/en/faq.wml:1603
 msgid ""
 "IP packets reveal OS characteristics. We would still need to do IP-level "
 "packet normalization, to stop things like TCP fingerprinting attacks. Given "
@@ -2497,7 +2498,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:1608
+#: /home/runa/tor/website/docs/en/faq.wml:1610
 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 "
@@ -2505,7 +2506,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:1612
+#: /home/runa/tor/website/docs/en/faq.wml:1614
 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 "
@@ -2514,7 +2515,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:1617
+#: /home/runa/tor/website/docs/en/faq.wml:1619
 msgid ""
 "<a href=\"http://crypto.stanford.edu/~nagendra/projects/dtls/dtls.html"
 "\">DTLS</a> (datagram TLS) basically has no users, and IPsec sure is big. "
@@ -2524,7 +2525,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:1624
+#: /home/runa/tor/website/docs/en/faq.wml:1626
 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 "
@@ -2542,7 +2543,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tordev/website/docs/en/faq.wml:1638
+#: /home/runa/tor/website/docs/en/faq.wml:1640
 msgid ""
 "The Tor-internal name spaces would need to be redesigned. We support hidden "
 "service \".onion\" addresses by intercepting the addresses when they are "
@@ -2551,39 +2552,39 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tordev/website/docs/en/faq.wml:1645
+#: /home/runa/tor/website/docs/en/faq.wml:1647
 msgid "<hr> <a id=\"Criminals\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:1648
+#: /home/runa/tor/website/docs/en/faq.wml:1650
 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/tordev/website/docs/en/faq.wml:1651
+#: /home/runa/tor/website/docs/en/faq.wml:1653
 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/tordev/website/docs/en/faq.wml:1655
+#: /home/runa/tor/website/docs/en/faq.wml:1657
 msgid "<hr> <a id=\"RespondISP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tordev/website/docs/en/faq.wml:1658
+#: /home/runa/tor/website/docs/en/faq.wml:1660
 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/tordev/website/docs/en/faq.wml:1661
+#: /home/runa/tor/website/docs/en/faq.wml:1663
 msgid ""
 "A collection of templates for successfully responding to ISPs is <a href="
-"\"<wiki>TheOnionRouter/TorAbuseTemplates\">collected here</a>."
+"\"<wiki>doc/TorAbuseTemplates\">collected here</a>."
 msgstr ""

Modified: translation/trunk/projects/website/po/templates/docs/2-medium.tor-doc-osx.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/2-medium.tor-doc-osx.pot	2011-06-21 04:41:02 UTC (rev 24825)
+++ translation/trunk/projects/website/po/templates/docs/2-medium.tor-doc-osx.pot	2011-06-21 07:19:28 UTC (rev 24826)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"POT-Creation-Date: 2011-06-21 08:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,7 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:8
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page docs/"
 "documentation>\">Documentation &raquo; </a> <a href=\"<page docs/tor-doc-osx>"
@@ -25,19 +25,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:13
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:13
 msgid "Running the <a href=\"<page index>\">Tor</a> client on Mac OS X"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:14 /tmp/dnqIbbGTnT.xml:26
-#: /tmp/dnqIbbGTnT.xml:71 /tmp/dnqIbbGTnT.xml:104 /tmp/dnqIbbGTnT.xml:136
-#: /tmp/dnqIbbGTnT.xml:158
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:14 /tmp/hshvT3yShk.xml:26
+#: /tmp/hshvT3yShk.xml:71 /tmp/hshvT3yShk.xml:104 /tmp/hshvT3yShk.xml:136
+#: /tmp/hshvT3yShk.xml:158
 msgid "<br>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:17
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:17
 msgid ""
 "<b>Note that these are the installation instructions for running a Tor "
 "client on Mac OS X. If you want to relay traffic for others to help the "
@@ -46,19 +46,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:23
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:23
 msgid "<hr> <a id=\"installing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:25
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:25
 msgid ""
 "<a class=\"anchor\" href=\"#installing\">Step One: Download and Install Tor</"
 "a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:29
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:29
 msgid ""
 "The install for Macintosh OS X bundles <a href=\"<page index>\">Tor</a>, <a "
 "href=\"<page projects/vidalia>\">Vidalia</a> (a graphical interface for "
@@ -72,7 +72,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:42
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:42
 msgid ""
 "Once you've downloaded the dmg, double-click and let it mount.  Browse to "
 "the now open Vidalia Bundle in Finder.  It's easy to install the bundle; "
@@ -83,7 +83,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:49
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:49
 msgid ""
 "When you are finished installing, you can start Vidalia by selecting its "
 "icon from your Applications folder. A dark onion with a red X in your dock "
@@ -92,19 +92,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:55
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:55
 msgid "When Tor is running, Vidalia's dock icon will look like the following:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:58
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:58
 msgid ""
 "<img alt=\"vidalia running tor\" src=\"$(IMGROOT)/screenshot-osx-vidalia.png"
 "\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:61
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:61
 msgid ""
 "Polipo is installed as part of the Tor bundle package installer. Once it is "
 "installed, it will start automatically when your computer is restarted.  You "
@@ -113,26 +113,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:68
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:68
 msgid "<hr> <a id=\"using\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:70
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:70
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Two: Configure your applications to "
 "use Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:73
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:73
 msgid ""
 "After installing, 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/dev/website/docs/en/tor-doc-osx.wml:76
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:76
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety.  Torbutton "
 "was installed for you.  Click on the red \"Tor Disabled\" toggle button to "
@@ -140,14 +140,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:80
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:80
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-"
 "torbutton.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:83
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:83
 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 "
@@ -155,7 +155,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:87
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:87
 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 "
@@ -168,25 +168,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:97
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:97
 msgid ""
 "For information on how to Torify other applications, check out the <a href="
-"\"<wiki>/TheOnionRouter/TorifyHOWTO\">Torify HOWTO</a>."
+"\"<wiki>doc/TorifyHOWTO\">Torify HOWTO</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:101
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:101
 msgid "<hr> <a id=\"verify\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:103
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:103
 msgid ""
 "<a class=\"anchor\" href=\"#verify\">Step Three: Make sure it's working</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:107
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:107
 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/"
@@ -196,7 +196,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:115
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:115
 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 "
@@ -206,32 +206,32 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:124
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:124
 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/dev/website/docs/en/tor-doc-osx.wml:128
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:128
 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/dev/website/docs/en/tor-doc-osx.wml:132
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:132
 msgid "<hr> <a id=\"server\"></a> <a id=\"relay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:135
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:135
 msgid ""
 "<a class=\"anchor\" href=\"#relay\">Step Four: Configure it as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:138
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:138
 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 "
@@ -242,7 +242,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:146
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:146
 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 "
@@ -251,25 +251,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:152
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:152
 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/dev/website/docs/en/tor-doc-osx.wml:155
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:155
 msgid "<hr> <a id=\"uninstall\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:157
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:157
 msgid ""
 "<a class=\"anchor\" href=\"#uninstall\">How To Uninstall Tor and Polipo</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:160
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:160
 msgid ""
 "There are two ways to uninstall the bundle from your computer, using Finder "
 "or a command line or Terminal-based uninstaller.  If you want to remove Tor "
@@ -277,79 +277,79 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:164
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:164
 msgid ""
 "Change your application proxy settings back to their original values.  If "
 "you just want to stop using Tor, you can end at this point."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:168
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:168
 msgid ""
 "If you want to completely remove Tor, and your account has Admin Privileges, "
 "then proceed as follows:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:172
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:172
 msgid "Open Finder and click on Applications."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:173
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:173
 msgid "Drag /Applications/Vidalia to the Trash."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:174
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:174
 msgid "Remove /Library/Torbutton from your system."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:175
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:175
 msgid ""
 "In your User or home directory, go to Library, remove the Vidalia directory"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:179
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:179
 msgid "Tor, Vidalia, and Polipo are now completely removed from your system."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:181
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:181
 msgid ""
 "If you're familiar with the command line or Terminal, you can manually type "
 "the following:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:184
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:184
 msgid "rm -r /Applications/Vidalia.app"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:185
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:185
 msgid "rm -r /Library/Torbutton"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:186
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:186
 msgid "rm -r ~/Library/Vidalia"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:187
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:187
 msgid "rm -r ~/.tor"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:190
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:190
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:192
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:192
 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/templates/docs/2-medium.tor-doc-relay.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/2-medium.tor-doc-relay.pot	2011-06-21 04:41:02 UTC (rev 24825)
+++ translation/trunk/projects/website/po/templates/docs/2-medium.tor-doc-relay.pot	2011-06-21 07:19:28 UTC (rev 24826)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-04-13 16:27+0200\n"
+"POT-Creation-Date: 2011-06-21 08:19+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -30,7 +30,7 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:16 /tmp/KVtvajbVzt.xml:275
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:16 /tmp/F5o0tOMw8z.xml:281
 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/KVtvajbVzt.xml:52
-#: /tmp/KVtvajbVzt.xml:141 /tmp/KVtvajbVzt.xml:165
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37 /tmp/F5o0tOMw8z.xml:52
+#: /tmp/F5o0tOMw8z.xml:147 /tmp/F5o0tOMw8z.xml:171
 msgid "<br>"
 msgstr ""
 
@@ -245,19 +245,30 @@
 "\">the higher-volume Tor lists</a> too."
 msgstr ""
 
+#. type: Content of: <div><div><ol><li><li>
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:134
+msgid ""
+"<a href=\"https://weather.torproject.org/\">Tor Weather</a> provides an "
+"email notification service to any users who want to monitor the status of a "
+"Tor node. Upon subscribing, you can specify what types of alerts you would "
+"like to receive. The main purpose of Tor Weather is to notify node operators "
+"via email if their node is down for longer than a specified period, but "
+"other notification types are available."
+msgstr ""
+
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:138
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:144
 msgid "<hr> <a id=\"check\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:140
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:146
 msgid ""
 "<a class=\"anchor\" href=\"#check\">Step Three: Make sure it is working</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:143
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:149
 msgid ""
 "As soon as your relay manages to connect to the network, it will try to "
 "determine whether the ports you configured are reachable from the outside. "
@@ -270,7 +281,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:153
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:159
 msgid ""
 "When it decides that it's reachable, it will upload a \"server descriptor\" "
 "to the directories, to let clients know what address, ports, keys, etc your "
@@ -282,30 +293,29 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:162
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:168
 msgid "<hr> <a id=\"after\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:164
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:170
 msgid "<a class=\"anchor\" href=\"#after\">Step Four: Once it is working</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:168
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:174
 msgid "We recommend the following steps as well:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:172
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:178
 msgid ""
-"6. Read <a href=\"<wiki>TheOnionRouter/OperationalSecurity\">about "
-"operational security</a> to get ideas how you can increase the security of "
-"your relay."
+"6. Read <a href=\"<wiki>doc/OperationalSecurity\">about operational "
+"security</a> to get ideas how you can increase the security of your relay."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:178
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:184
 msgid ""
 "7. If you want to run more than one relay that's great, but please set <a "
 "href=\"<page docs/faq>#MultipleRelays\">the MyFamily option</a> in all your "
@@ -313,7 +323,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:184
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:190
 msgid ""
 "8. Decide about rate limiting. Cable modem, DSL, and other users who have "
 "asymmetric bandwidth (e.g. more down than up) should rate limit to their "
@@ -322,7 +332,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:192
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:198
 msgid ""
 "9. Back up your Tor relay's private key (stored in \"keys/secret_id_key\" in "
 "your DataDirectory). This is your relay's \"identity,\" and you need to keep "
@@ -332,7 +342,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:202
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:208
 msgid ""
 "10. If you control the name servers for your domain, consider setting your "
 "reverse DNS hostname to 'anonymous-relay', 'proxy' or 'tor-proxy', so when "
@@ -344,7 +354,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:213
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:219
 msgid ""
 "11. If your computer isn't running a webserver, please consider changing "
 "your ORPort to 443 and your DirPort to 80. Many Tor users are stuck behind "
@@ -359,7 +369,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:228
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:234
 msgid ""
 "12. If your Tor relay provides other services on the same IP address &mdash; "
 "such as a public webserver &mdash; make sure that connections to the "
@@ -371,19 +381,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:239
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:245
 msgid ""
 "13. (Unix only). Make a separate user to run the relay. If you installed the "
 "OS X package or the deb or the rpm, this is already done. Otherwise, you can "
 "do it by hand. (The Tor relay doesn't need to be run as root, so it's good "
 "practice to not run it as root. Running as a 'tor' user avoids issues with "
 "identd and other services that detect user name. If you're the paranoid "
-"sort, feel free to <a href=\"<wiki>TheOnionRouter/TorInChroot\">put Tor into "
-"a chroot jail</a>.)"
+"sort, feel free to <a href=\"<wiki>doc/TorInChroot\">put Tor into a chroot "
+"jail</a>.)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:250
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:256
 msgid ""
 "14. (Unix only.) Your operating system probably limits the number of open "
 "file descriptors per process to 1024 (or even less). If you plan to be "
@@ -395,7 +405,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:260
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:266
 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 "
@@ -403,7 +413,7 @@
 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:272
 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\" "
@@ -415,7 +425,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:277
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:283
 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/templates/docs/2-medium.verifying-signatures.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/2-medium.verifying-signatures.pot	2011-06-21 04:41:02 UTC (rev 24825)
+++ translation/trunk/projects/website/po/templates/docs/2-medium.verifying-signatures.pot	2011-06-21 07:19:28 UTC (rev 24826)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-23 17:01+0200\n"
+"POT-Creation-Date: 2011-06-21 08:19+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -30,8 +30,8 @@
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:13
-#: /tmp/GgIrzWMX_o.xml:42 /tmp/GgIrzWMX_o.xml:58 /tmp/GgIrzWMX_o.xml:85
-#: /tmp/GgIrzWMX_o.xml:181
+#: /tmp/dObLGpwp1_.xml:43 /tmp/dObLGpwp1_.xml:59 /tmp/dObLGpwp1_.xml:86
+#: /tmp/dObLGpwp1_.xml:186
 msgid "<hr>"
 msgstr ""
 
@@ -127,25 +127,32 @@
 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"
+msgstr ""
+
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:41
+#: /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:43
+#: /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:47
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:48
 msgid ""
 "Linux: see <a href=\"http://www.gnupg.org/download/\">http://www.gnupg.org/"
 "download/</a> or install <i>gnupg</i> from the package management system."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:50
+#: /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 "
@@ -153,19 +160,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:53
+#: /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:57
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:58
 msgid "Step One: Import the keys"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:59
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:60
 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 "
@@ -173,13 +180,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:63
-#: /tmp/GgIrzWMX_o.xml:88 /tmp/GgIrzWMX_o.xml:189
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:64
+#: /tmp/dObLGpwp1_.xml:89 /tmp/dObLGpwp1_.xml:194
 msgid "<b>Windows:</b>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:64
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:65
 msgid ""
 "GnuPG for Windows is a command line tool, and you will need to use <i>cmd."
 "exe</i>. Unless you edit your PATH environment variable, you will need to "
@@ -189,24 +196,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:70
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:71
 msgid "To import the key 0x28988BF5, start <i>cmd.exe</i> and type:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:72
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:73
 #, no-wrap
 msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --keyserver hkp://keys.gnupg.net --recv-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:74
-#: /tmp/GgIrzWMX_o.xml:91
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:75
+#: /tmp/dObLGpwp1_.xml:92
 msgid "<b>Mac and Linux</b>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:75
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:76
 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 "
@@ -216,47 +223,47 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:80
+#: /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:82
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:83
 #, no-wrap
 msgid "gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:84
+#: /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:86
+#: /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 ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:89
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:90
 #, 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:92
+#: /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:94
+#: /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:97
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:98
 #, no-wrap
 msgid ""
 "    pub   1024D/28988BF5 2000-02-27\n"
@@ -340,23 +347,27 @@
 "    uid                  Nathan of Guardian &lt;nathan at guardianproject.info&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:180
+#: /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:182
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:187
 msgid ""
 "To verify the signature of the package you downloaded, you will need to "
 "download the \".asc\" file as well."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:185
+#: /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 "
@@ -364,42 +375,42 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:190
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:195
 #, 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>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:192
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:197
 msgid "<b>Mac:</b>"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:193
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:198
 #, no-wrap
 msgid "gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc /Users/Alice/<file-osx-x86-bundle-stable>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:195
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:200
 msgid "<b>Linux</b>"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:196
+#: /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 ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:199
+#: /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 ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:204
+#: /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"
@@ -411,7 +422,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:212
+#: /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 "
@@ -421,7 +432,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:219
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:224
 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 "
@@ -429,7 +440,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:224
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:229
 #, no-wrap
 msgid ""
 "    gpg: Signature made Tue 20 Apr 2010 12:22:32 PM CEST using DSA key ID 28988BF5\n"
@@ -438,37 +449,37 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:228
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:233
 msgid "<b>RPM-based distributions :</b>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:229
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:234
 msgid ""
 "In order to manually verify the signatures on the RPM packages, you must use "
 "the <code>rpm</code> tool like so: <br />"
 msgstr ""
 
 #. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:232
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:237
 #, no-wrap
 msgid "rpm -K filename.rpm"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:235
+#: /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:236
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:241
 msgid ""
 "If you are running Tor on Debian you should read the instructions on <a href="
 "\"<page docs/debian>#packages\">importing these keys to apt</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:239
+#: /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>."

Modified: translation/trunk/projects/website/po/templates/docs/3-low.faq-abuse.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/3-low.faq-abuse.pot	2011-06-21 04:41:02 UTC (rev 24825)
+++ translation/trunk/projects/website/po/templates/docs/3-low.faq-abuse.pot	2011-06-21 07:19:28 UTC (rev 24826)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-04-18 10:36+0200\n"
+"POT-Creation-Date: 2011-06-21 08:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -37,17 +37,17 @@
 
 #.  END SIDEBAR 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:18 /tmp/5DznWgeZY9.xml:19
-#: /tmp/5DznWgeZY9.xml:20 /tmp/5DznWgeZY9.xml:21 /tmp/5DznWgeZY9.xml:22
-#: /tmp/5DznWgeZY9.xml:23 /tmp/5DznWgeZY9.xml:24 /tmp/5DznWgeZY9.xml:25
-#: /tmp/5DznWgeZY9.xml:26 /tmp/5DznWgeZY9.xml:27 /tmp/5DznWgeZY9.xml:28
-#: /tmp/5DznWgeZY9.xml:29 /tmp/5DznWgeZY9.xml:30 /tmp/5DznWgeZY9.xml:31
-#: /tmp/5DznWgeZY9.xml:32 /tmp/5DznWgeZY9.xml:33
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:18 /tmp/YB05pTyICt.xml:19
+#: /tmp/YB05pTyICt.xml:20 /tmp/YB05pTyICt.xml:21 /tmp/YB05pTyICt.xml:22
+#: /tmp/YB05pTyICt.xml:23 /tmp/YB05pTyICt.xml:24 /tmp/YB05pTyICt.xml:25
+#: /tmp/YB05pTyICt.xml:26 /tmp/YB05pTyICt.xml:27 /tmp/YB05pTyICt.xml:28
+#: /tmp/YB05pTyICt.xml:29 /tmp/YB05pTyICt.xml:30 /tmp/YB05pTyICt.xml:31
+#: /tmp/YB05pTyICt.xml:32 /tmp/YB05pTyICt.xml:33
 msgid "#"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:18 /tmp/5DznWgeZY9.xml:34
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:18 /tmp/YB05pTyICt.xml:34
 msgid "Questions"
 msgstr ""
 
@@ -437,10 +437,10 @@
 #: /home/runa/tor/website/docs/en/faq-abuse.wml:174
 msgid ""
 "For a complete set of template responses to different abuse complaint types, "
-"see <a href=\"<wiki>TheOnionRouter/TorAbuseTemplates\">the collection of "
-"templates on the Tor wiki</a>. You can also proactively reduce the amount of "
-"abuse you get by following <a href=\"<blog>tips-running-exit-node-minimal-"
-"harassment\">these tips for running an exit node with minimal harassment</a>."
+"see <a href=\"<wiki>doc/TorAbuseTemplates\">the collection of templates on "
+"the Tor wiki</a>. You can also proactively reduce the amount of abuse you "
+"get by following <a href=\"<blog>tips-running-exit-node-minimal-harassment"
+"\">these tips for running an exit node with minimal harassment</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -562,9 +562,9 @@
 msgid ""
 "Finally, if you become aware of an IRC network that seems to be blocking "
 "Tor, or a single Tor exit node, please put that information on <a href="
-"\"<wiki>TheOnionRouter/BlockingIrc\">The Tor IRC block tracker</a> so that "
-"others can share.  At least one IRC network consults that page to unblock "
-"exit nodes that have been blocked inadvertently."
+"\"<wiki>doc/BlockingIrc\">The Tor IRC block tracker</a> so that others can "
+"share.  At least one IRC network consults that page to unblock exit nodes "
+"that have been blocked inadvertently."
 msgstr ""
 
 #. type: Content of: <div><div>

Modified: translation/trunk/projects/website/po/templates/docs/3-low.tor-doc-unix.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/3-low.tor-doc-unix.pot	2011-06-21 04:41:02 UTC (rev 24825)
+++ translation/trunk/projects/website/po/templates/docs/3-low.tor-doc-unix.pot	2011-06-21 07:19:28 UTC (rev 24826)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-02-12 12:20+0000\n"
+"POT-Creation-Date: 2011-06-21 08:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -30,9 +30,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:14 /tmp/IT3itHQw4v.xml:26
-#: /tmp/IT3itHQw4v.xml:58 /tmp/IT3itHQw4v.xml:92 /tmp/IT3itHQw4v.xml:135
-#: /tmp/IT3itHQw4v.xml:173
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:14 /tmp/4vVJb7zECD.xml:26
+#: /tmp/4vVJb7zECD.xml:58 /tmp/4vVJb7zECD.xml:92 /tmp/4vVJb7zECD.xml:135
+#: /tmp/4vVJb7zECD.xml:173
 msgid "<br>"
 msgstr ""
 
@@ -132,10 +132,10 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:84
 msgid ""
-"If you prefer, you can instead use Privoxy with <a href="
-"\"<wiki>TheOnionRouter/PrivoxyConfig\">this sample Privoxy configuration</"
-"a>. But since the config files both use port 8118, you shouldn't run both "
-"Polipo and Privoxy at the same time."
+"If you prefer, you can instead use Privoxy with <a href=\"<wiki>doc/"
+"PrivoxyConfig\">this sample Privoxy configuration</a>. But since the config "
+"files both use port 8118, you shouldn't run both Polipo and Privoxy at the "
+"same time."
 msgstr ""
 
 #. type: Content of: <div><div>
@@ -189,15 +189,15 @@
 "(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 <a href=\"https://code.google.com/p/"
-"torsocks/\">torsocks</a> or <a href=\"<wiki>TheOnionRouter/TorifyHOWTO#socat"
-"\">socat</a>."
+"torsocks/\">torsocks</a> or <a href=\"<wiki>doc/TorifyHOWTO#socat\">socat</"
+"a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:127
 msgid ""
 "For information on how to Torify other applications, check out the <a href="
-"\"<wiki>TheOnionRouter/TorifyHOWTO\">Torify HOWTO</a>."
+"\"<wiki>doc/TorifyHOWTO\">Torify HOWTO</a>."
 msgstr ""
 
 #. type: Content of: <div><div>

Modified: translation/trunk/projects/website/po/templates/donate/3-low.donate.pot
===================================================================
--- translation/trunk/projects/website/po/templates/donate/3-low.donate.pot	2011-06-21 04:41:02 UTC (rev 24825)
+++ translation/trunk/projects/website/po/templates/donate/3-low.donate.pot	2011-06-21 07:19:28 UTC (rev 24826)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-23 17:01+0200\n"
+"POT-Creation-Date: 2011-06-21 08:19+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -25,7 +25,7 @@
 
 #. type: Content of: <div><div><h1>
 #: /home/runa/tor/website/donate/en/donate.wml:12
-msgid "Monetary Donations"
+msgid "Make A Donation"
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -36,32 +36,32 @@
 "education of online anonymity and privacy. Donations to The Tor Project may "
 "be tax deductible to persons who are in the US; or who pay taxes in "
 "countries with reciprocity with the US on charitable donations. Our tax ID "
-"number is 20-8096820.  We are listed on <a href=\"http://www2.guidestar.org/"
+"number is 20-8096820. We are listed on <a href=\"http://www2.guidestar.org/"
 "organizations/20-8096820/tor-project.aspx\">GuideStar</a>.  We're happy to "
 "accept donations via:"
 msgstr ""
 
-#. type: Content of: <div><div><p><ul><li>
+#. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/donate/en/donate.wml:23
 msgid "<a href=\"#paypal\">Paypal</a>"
 msgstr ""
 
-#. type: Content of: <div><div><p><ul><li>
+#. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/donate/en/donate.wml:24
 msgid "<a href=\"#amazon\">Amazon Payments</a>"
 msgstr ""
 
-#. type: Content of: <div><div><p><ul><li>
+#. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/donate/en/donate.wml:25
 msgid "<a href=\"#google\">Google Checkout</a>"
 msgstr ""
 
-#. type: Content of: <div><div><p><ul><li>
+#. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/donate/en/donate.wml:26
 msgid "<a href=\"#givv\">Givv.org</a>"
 msgstr ""
 
-#. type: Content of: <div><div><p><ul><li>
+#. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/donate/en/donate.wml:27
 msgid ""
 "<a href=\"#cash\">checks, money orders, bank transfers, stock grants or "
@@ -71,354 +71,375 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/donate/en/donate.wml:30
 msgid ""
-"If you want to make an anonymous donation, please do so in an anonymous "
-"way.  Contact us at donations at torproject.org for more details."
+"If you want to make an anonymous donation, please do so in an anonymous way. "
+"Contact us at donations at torproject.org for more details."
 msgstr ""
 
-#. type: Content of: <div><div><div>
-#: /home/runa/tor/website/donate/en/donate.wml:32
-msgid "Tor Project Subscription via PayPal"
+#. type: Content of: <div><div><script>
+#: /home/runa/tor/website/donate/en/donate.wml:34
+msgid ""
+"function displayVals() { var t3 = jQuery('#t3').val(); var amount = jQuery"
+"('#amount').val(); var radioVal = jQuery('input[@name=\"amount\"]:checked')."
+"val(); if(t3 != 0){ if( !amount ) { jQuery('#a3').val(radioVal); }else"
+"{ jQuery('#a3').val(amount); } jQuery('#p3').val(1); jQuery('#cmd').val"
+"('_xclick-subscriptions'); jQuery('#item_name').val('Tor Project "
+"Membership'); jQuery('#ppinfo').replaceWith('<small id=\"ppinfo\">Requires a "
+"PayPal Account</small>'); }else{ jQuery('#a3').val(0); jQuery('#p3').val(0); "
+"jQuery('#cmd').val('_donations'); jQuery('#item_name').val('Donation to the "
+"Tor Project'); jQuery('#ppinfo').replaceWith('<small id=\"ppinfo\">Does Not "
+"Require a PayPal Account</small>'); } if( !t3 ) { jQuery('#cmd').val"
+"('_donations'); jQuery('#item_name').val('Donation to the Tor Project'); "
+"jQuery('#ppinfo').replaceWith('<small id=\"ppinfo\">Does Not Require a "
+"PayPal Account</small>'); } } jQuery(function(){ jQuery(\"input"
+"[@name='amount']:checked\").change(displayVals); jQuery(\"#amount\").change"
+"(displayVals); jQuery(\"#t3\").change(displayVals); displayVals(); });"
 msgstr ""
 
 #. type: Content of: <div><div><div><div>
-#: /home/runa/tor/website/donate/en/donate.wml:35
-msgid "<a id=\"paypal\"></a> <a class=\"anchor\" href=\"#paypal\"></a>"
+#: /home/runa/tor/website/donate/en/donate.wml:73
+msgid "<a name=\"paypal\"></a>"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><h4>
-#: /home/runa/tor/website/donate/en/donate.wml:37
-msgid "Monthly Subscription to The Tor Project"
+#. type: Content of: <div><div><div><div><h3>
+#: /home/runa/tor/website/donate/en/donate.wml:74
+msgid "Donate via PayPal"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><form><table><tr><td>
-#: /home/runa/tor/website/donate/en/donate.wml:42 /tmp/JsimINXUVm.xml:91
-msgid "Choose your currency:"
+#. type: Content of: <div><div><div><div><form><p><select>
+#: /home/runa/tor/website/donate/en/donate.wml:77
+msgid ""
+"<label for=\"type\">Donation Type:</label> <select id=\"t3\" name=\"t3\">"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><form><table><tr><td><select>
-#: /home/runa/tor/website/donate/en/donate.wml:44 /tmp/JsimINXUVm.xml:93
-msgid "<select name=\"currency_code\">"
+#. type: Content of: <div><div><div><div><form><p><select><option>
+#: /home/runa/tor/website/donate/en/donate.wml:79
+msgid "One-time Donation"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><form><table><tr><td><select><option>
-#: /home/runa/tor/website/donate/en/donate.wml:45 /tmp/JsimINXUVm.xml:94
+#. type: Content of: <div><div><div><div><form><p><select><option>
+#: /home/runa/tor/website/donate/en/donate.wml:80
+msgid "Monthly Subscription"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><form><p>
+#: /home/runa/tor/website/donate/en/donate.wml:81
+msgid ""
+"</select>\t\t <small id=\"ppinfo\">Does Not Require a PayPal Account</small>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><form><div><div><span><select>
+#: /home/runa/tor/website/donate/en/donate.wml:86
+msgid "<span> <select name=\"currency_code\" class=\"cur\">"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><form><div><div><span><select><option>
+#: /home/runa/tor/website/donate/en/donate.wml:88
 msgid "$"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><form><table><tr><td><select><option>
-#: /home/runa/tor/website/donate/en/donate.wml:46 /tmp/JsimINXUVm.xml:95
+#. type: Content of: <div><div><div><div><form><div><div><span><select><option>
+#: /home/runa/tor/website/donate/en/donate.wml:89
 msgid "&euro;"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><form><table><tr><td><select><option>
-#: /home/runa/tor/website/donate/en/donate.wml:47 /tmp/JsimINXUVm.xml:96
+#. type: Content of: <div><div><div><div><form><div><div><span><select><option>
+#: /home/runa/tor/website/donate/en/donate.wml:90
 msgid "&pound;"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><form><table><tr><td><select><option>
-#: /home/runa/tor/website/donate/en/donate.wml:48 /tmp/JsimINXUVm.xml:97
+#. type: Content of: <div><div><div><div><form><div><div><span><select><option>
+#: /home/runa/tor/website/donate/en/donate.wml:91
 msgid "&yen;"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><form><table><tr><td>
-#: /home/runa/tor/website/donate/en/donate.wml:49 /tmp/JsimINXUVm.xml:98
-msgid "</select>"
+#. type: Content of: <div><div><div><div><form><div><div>
+#: /home/runa/tor/website/donate/en/donate.wml:92
+msgid "</select> </span>"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><table><form><div><tr>
-#: /home/runa/tor/website/donate/en/donate.wml:53
+#. type: Content of: <div><div><div><div><form><div><div><ul><li>
+#: /home/runa/tor/website/donate/en/donate.wml:95
 msgid ""
-"<input type=\"hidden\" name=\"p3\" value=\"1\"> <input type=\"hidden\" name="
-"\"t3\" value=\"M\"> <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=\"image\" src=\"$(IMGROOT)/btn_donateCC_LG.gif\" name="
-"\"submit\" alt=\"Subscribe to Tor with PayPal - it's fast, free and secure!"
-"\"/> <input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"> "
-"<input type=\"hidden\" name=\"business\" value=\"donations at torproject.org\"> "
-"<input type=\"hidden\" name=\"item_name\" value=\"Tor Project Membership\"> "
-"<input type=\"hidden\" name=\"return\" value=\"https://www.torproject.org/"
-"donate\"/> <input type=\"hidden\" name=\"cancel_return\" value=\"https://www."
-"torproject.org/donate\"/> <input class=\"donate-btn\" type=\"submit\" name="
-"\"donate\" value=\"Donate\">"
+"<input type=\"radio\" class=\"radio\" name=\"amount\" value="
+"\"2000.00\"><label for=\"2000\">2000</label>"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><table><form><div><tr><td>
-#: /home/runa/tor/website/donate/en/donate.wml:68
-msgid "<input type=\"radio\" name=\"amount\" value=\"5.00\">5/mo"
+#. type: Content of: <div><div><div><div><form><div><div><ul><li>
+#: /home/runa/tor/website/donate/en/donate.wml:96
+msgid ""
+"<input type=\"radio\" class=\"radio\" name=\"amount\" value="
+"\"1000.00\"><label for=\"1000\">1000</label>"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><table><form><div><tr><td>
-#: /home/runa/tor/website/donate/en/donate.wml:69
-msgid "<input type=\"radio\" name=\"amount\" value=\"10.00\">10/mo"
+#. type: Content of: <div><div><div><div><form><div><div><ul><li>
+#: /home/runa/tor/website/donate/en/donate.wml:97
+msgid ""
+"<input type=\"radio\" class=\"radio\" name=\"amount\" value="
+"\"500.00\"><label for=\"500\">500</label>"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><table><form><div><tr><td>
-#: /home/runa/tor/website/donate/en/donate.wml:70
+#. type: Content of: <div><div><div><div><form><div><div><ul><li>
+#: /home/runa/tor/website/donate/en/donate.wml:98
 msgid ""
-"<input type=\"radio\" name=\"amount\" value=\"20.00\" checked=\"checked\">20/"
-"mo"
+"<input type=\"radio\" class=\"radio\" name=\"amount\" value="
+"\"250.00\"><label for=\"250\">250</label>"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><table><form><div><tr><td>
-#: /home/runa/tor/website/donate/en/donate.wml:73
-msgid "<input type=\"radio\" name=\"amount\" value=\"50.00\">50/mo"
+#. type: Content of: <div><div><div><div><form><div><div><ul><li>
+#: /home/runa/tor/website/donate/en/donate.wml:99
+msgid ""
+"<input type=\"radio\" class=\"radio\" name=\"amount\" value="
+"\"100.00\"><label for=\"100\">100</label>"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><table><form><div><tr><td>
-#: /home/runa/tor/website/donate/en/donate.wml:74
-msgid "<input type=\"radio\" name=\"amount\" value=\"100.00\">100/mo"
+#. type: Content of: <div><div><div><div><form><div><div><ul><li>
+#: /home/runa/tor/website/donate/en/donate.wml:100
+msgid ""
+"<input type=\"radio\" class=\"radio\" name=\"amount\" value=\"50.00\"><label "
+"for=\"50\">50</label>"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><table><form><div><tr><td>
-#: /home/runa/tor/website/donate/en/donate.wml:75
-msgid "<input type=\"radio\" name=\"amount\" value=\"250.00\">250/mo"
+#. type: Content of: <div><div><div><div><form><div><div><ul><li>
+#: /home/runa/tor/website/donate/en/donate.wml:101
+msgid ""
+"<input type=\"radio\" class=\"radio\" name=\"amount\" value=\"20.00\" "
+"checked=\"checked\"><label for=\"20\">20</label>"
 msgstr ""
 
-#. type: Content of: <div><div><div>
-#: /home/runa/tor/website/donate/en/donate.wml:84
-msgid "Single Donation via PayPal"
+#. type: Content of: <div><div><div><div><form><div><div><ul><li>
+#: /home/runa/tor/website/donate/en/donate.wml:102
+msgid ""
+"<input type=\"radio\" class=\"radio\" name=\"amount\" value=\"10.00\"><label "
+"for=\"10\">10</label>"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><h4>
-#: /home/runa/tor/website/donate/en/donate.wml:87
-msgid "Make a one-time donation"
+#. type: Content of: <div><div><div><div><form><div><div><ul><li>
+#: /home/runa/tor/website/donate/en/donate.wml:103
+msgid ""
+"<input type=\"radio\" class=\"radio\" name=\"amount\" value=\"5.00\"><label "
+"for=\"5\">5</label>"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><form><table><tr>
-#: /home/runa/tor/website/donate/en/donate.wml:102
+#.  <input type="image" src="../images/btn_donateCC_LG.gif" name="submit" alt="Subscribe to Tor with PayPal - it's fast, free and secure!">
+#.  
+#. type: Content of: <div><div><div><div><form><div><div>
+#: /home/runa/tor/website/donate/en/donate.wml:107
 msgid ""
-"<input type=\"hidden\" name=\"no_shipping\" value=\"1\"> <input type=\"image"
-"\" src=\"$(IMGROOT)/btn_donateCC_LG.gif\" name=\"submit\" alt=\"Make a "
-"single donation with PayPal - it's fast, free and secure!\"/> <input type="
-"\"hidden\" name=\"cmd\" value=\"_xclick\"> <input type=\"hidden\" name="
-"\"business\" value=\"donations at torproject.org\"> <input type=\"hidden\" name="
-"\"item_name\" value=\"Donation to the Tor Project\"> <input type=\"hidden\" "
-"name=\"return\" value=\"https://www.torproject.org/donate/donate.html.en\"/> "
-"<input type=\"hidden\" name=\"cancel_return\" value=\"https://www.torproject."
-"org/donate/donate.html.en\"/>"
+"<label for=\"custom\">or enter a donation amount:</label><input type=\"text"
+"\" id=\"amount\" class=\"amount\" name=\"amount\"> <input type=\"hidden\" id="
+"\"a3\" name=\"a3\" value=\"0\">\t\t <input class=\"donate-btn\" type=\"submit"
+"\" name=\"donate\" value=\"Donate\" alt=\"Subscribe to Tor with PayPal - "
+"it's fast, free and secure!\">"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><form><table><tr><td>
-#: /home/runa/tor/website/donate/en/donate.wml:111
-msgid "<input type=\"radio\" name=\"amount\" value=\"10.00\"> 10"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><form><table><tr><td>
+#. type: Content of: <div><div><div><div><form><div>
 #: /home/runa/tor/website/donate/en/donate.wml:112
 msgid ""
-"<input type=\"radio\" name=\"amount\" value=\"20.00\" checked=\"checked\"> 20"
+"<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 at torproject.org\"> <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\"> "
+"<input type=\"hidden\" name=\"cancel_return\" value=\"https://www.torproject."
+"org/donate\">"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><form><table><tr><td>
-#: /home/runa/tor/website/donate/en/donate.wml:113
-msgid "<input type=\"radio\" name=\"amount\" value=\"50.00\"> 50"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><form><table><tr><td>
-#: /home/runa/tor/website/donate/en/donate.wml:114
-msgid "<input type=\"radio\" name=\"amount\" value=\"100.00\"> 100"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><form><table><tr><td>
-#: /home/runa/tor/website/donate/en/donate.wml:117
-msgid "<input type=\"radio\" name=\"amount\" value=\"250.00\"> 250"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><form><table><tr><td>
-#: /home/runa/tor/website/donate/en/donate.wml:118
-msgid "<input type=\"radio\" name=\"amount\" value=\"500.00\"> 500"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><form><table><tr><td>
-#: /home/runa/tor/website/donate/en/donate.wml:119
-msgid "<input type=\"radio\" name=\"amount\" value=\"1000.00\"> 1,000"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><form><table><tr><td>
-#: /home/runa/tor/website/donate/en/donate.wml:120
-msgid "<input type=\"radio\" name=\"amount\" value=\"5000.00\"> 5,000"
-msgstr ""
-
+#.  BEGIN AMAZON 
 #. type: Content of: <div><div><div>
-#: /home/runa/tor/website/donate/en/donate.wml:128
-msgid "Single Donation via Amazon Payments"
+#: /home/runa/tor/website/donate/en/donate.wml:129
+msgid "<a name=\"amazon\"></a>"
 msgstr ""
 
-#. type: Content of: <div><div><div><div>
+#. type: Content of: <div><div><div><div><h3>
 #: /home/runa/tor/website/donate/en/donate.wml:131
-msgid "<a id=\"amazon\"></a> <a class=\"anchor\" href=\"#amazon\"></a>"
+msgid "Donate via Amazon Payments"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><h4>
-#: /home/runa/tor/website/donate/en/donate.wml:133 /tmp/JsimINXUVm.xml:165
-msgid "Make a single donation."
+#. type: Content of: <div><div><div><div><form><div><div>
+#: /home/runa/tor/website/donate/en/donate.wml:135
+msgid ""
+"<label for=\"amazon\">&#x24;</label> <input type=\"text\" name=\"amount\" "
+"size=\"6\" value=\"20\"> <input class=\"donate-btn\" type=\"image\" src="
+"\"http://g-ecx.images-amazon.com/images/G/01/asp/"
+"golden_small_donate_withmsg_whitebg.gif\">"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><form><table><tr>
-#: /home/runa/tor/website/donate/en/donate.wml:137
+#. type: Content of: <div><div><div><div><form><div>
+#: /home/runa/tor/website/donate/en/donate.wml:139
 msgid ""
 "<input type=\"hidden\" name=\"immediateReturn\" value=\"1\"> <input type="
 "\"hidden\" name=\"collectShippingAddress\" value=\"0\"> <input type=\"hidden"
-"\" name=\"minimumDonationAmount\" value=\"USD 10\"> <input type=\"hidden\" "
+"\" name=\"minimumDonationAmount\" value=\"USD 5\"> <input type=\"hidden\" "
 "name=\"isDonationWidget\" value=\"1\"> <input type=\"hidden\" name="
 "\"description\" value=\"Supporting Online Anonymity &amp; Privacy\"> <input "
 "type=\"hidden\" name=\"amazonPaymentsAccountId\" value="
 "\"XGSROLNTXRNC3N1P4TXKMNK14LN1D6SZUD8SN1\"> <input type=\"hidden\" name="
-"\"returnUrl\" value=\"https://www.torproject.org/donate/donate.html.en\"> "
-"<input type=\"hidden\" name=\"processImmediate\" value=\"1\"> <input type="
-"\"hidden\" name=\"cobrandingStyle\" value=\"logo\"> <input type=\"hidden\" "
-"name=\"abandonUrl\" value=\"https://www.torproject.org/donate/donate.html.en"
-"\">"
+"\"returnUrl\" value=\"https://www.torproject.org/donate/donate\"> <input "
+"type=\"hidden\" name=\"processImmediate\" value=\"1\"> <input type=\"hidden"
+"\" name=\"cobrandingStyle\" value=\"logo\"> <input type=\"hidden\" name="
+"\"abandonUrl\" value=\"https://www.torproject.org/donate/donate\">"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><form><table><td>
-#: /home/runa/tor/website/donate/en/donate.wml:148 /tmp/JsimINXUVm.xml:150
-msgid "&nbsp;"
+#. type: Content of: <div><div><div><div>
+#: /home/runa/tor/website/donate/en/donate.wml:151
+msgid "<small>Requires an Amazon Account</small>"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><form><table><td>
-#: /home/runa/tor/website/donate/en/donate.wml:149
-msgid "$<input type=\"text\" name=\"amount\" size=\"8\" value=\"10\">"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><form><table><tr><td>
-#: /home/runa/tor/website/donate/en/donate.wml:152
-msgid ""
-"<input type=\"image\" src=\"http://g-ecx.images-amazon.com/images/G/01/asp/"
-"golden_small_donate_withmsg_whitebg.gif\">"
-msgstr ""
-
+#.  END AMAZON 
+#.  BEGIN GOOGLE 
 #. type: Content of: <div><div><div>
-#: /home/runa/tor/website/donate/en/donate.wml:160
-msgid "Single Donation via Google Checkout"
+#: /home/runa/tor/website/donate/en/donate.wml:155
+msgid "<a id=\"google\"></a>"
 msgstr ""
 
-#. type: Content of: <div><div><div><div>
-#: /home/runa/tor/website/donate/en/donate.wml:163
-msgid "<a id=\"google\"></a> <a class=\"anchor\" href=\"#google\"></a>"
+#. type: Content of: <div><div><div><div><h3>
+#: /home/runa/tor/website/donate/en/donate.wml:157
+msgid "Donate via Google Checkout"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><script>
-#: /home/runa/tor/website/donate/en/donate.wml:168
+#: /home/runa/tor/website/donate/en/donate.wml:160
 msgid ""
 "function validateAmount(amount){ if(amount.value.match( /^[0-9]+(\\."
 "([0-9]+))?$/)){ return true; }else{ alert('You must enter a valid "
 "donation.'); amount.focus(); return false; } }"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><form><table><tr>
-#: /home/runa/tor/website/donate/en/donate.wml:181
+#. type: Content of: <div><div><div><div><form><div><div>
+#: /home/runa/tor/website/donate/en/donate.wml:174
 msgid ""
-"<input name=\"item_name_1\" type=\"hidden\" value=\"Donate to the Tor Project"
-"\"/> <input name=\"item_description_1\" type=\"hidden\" value=\"Tor is "
-"written for and supported by people like you\"/> <input name="
-"\"item_quantity_1\" type=\"hidden\" value=\"1\"/> <input name="
-"\"item_currency_1\" type=\"hidden\" value=\"USD\"/> <input name="
-"\"item_is_modifiable_1\" type=\"hidden\" value=\"true\"/> <input name="
-"\"item_min_price_1\" type=\"hidden\" value=\"0.01\"/> <input name="
-"\"item_max_price_1\" type=\"hidden\" value=\"25000.0\"/> <input name="
-"\"_charset_\" type=\"hidden\" value=\"utf-8\"/>"
+"<label for=\"google\">&#x24;</label> <input id=\"item_price_1\" name="
+"\"item_price_1\" size=\"6\" type=\"text\" value=\"20\"> <input class="
+"\"donate-btn\" alt=\"Donate\" src=\"https://checkout.google.com/buttons/"
+"checkout.gif?merchant_id=&w=168&h=44&style=trans&variant=text&loc=en_US\" "
+"type=\"image\">"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><form><table><tr><td>
-#: /home/runa/tor/website/donate/en/donate.wml:194
+#. type: Content of: <div><div><div><div><form><div>
+#: /home/runa/tor/website/donate/en/donate.wml:178
 msgid ""
-"&#x24; <input id=\"item_price_1\" name=\"item_price_1\" onfocus=\"this.style."
-"color='black'; this.value='';\" size=\"6\" type=\"text\" value=\"25.00\"/> "
-"<input alt=\"Donate\" src=\"https://checkout.google.com/buttons/donateNow."
-"gif?merchant_id=250937139555708&amp;w=115&amp;h=50&amp;style=trans&amp;"
-"variant=text&amp;loc=en_US\" type=\"image\"/>"
+"<input name=\"item_name_1\" type=\"hidden\" value=\"Donate to the Tor Project"
+"\"> <input name=\"item_description_1\" type=\"hidden\" value=\"Tor is "
+"written for and supported by people like you\"> <input name="
+"\"item_quantity_1\" type=\"hidden\" value=\"1\"> <input name="
+"\"item_currency_1\" type=\"hidden\" value=\"USD\"> <input name="
+"\"item_is_modifiable_1\" type=\"hidden\" value=\"true\"> <input name="
+"\"item_min_price_1\" type=\"hidden\" value=\"0.01\"> <input name="
+"\"item_max_price_1\" type=\"hidden\" value=\"25000.0\"> <input name="
+"\"_charset_\" type=\"hidden\" value=\"utf-8\">"
 msgstr ""
 
-#. type: Content of: <div><div><div>
-#: /home/runa/tor/website/donate/en/donate.wml:204
-msgid "Donate via Givv.org"
+#. type: Content of: <div><div><div><div>
+#: /home/runa/tor/website/donate/en/donate.wml:188
+msgid "<small>Requires a Google Account</small>"
 msgstr ""
 
+#.  END GOOGLE 
+#.  BEGIN GIVV 
 #. type: Content of: <div><div><div>
-#: /home/runa/tor/website/donate/en/donate.wml:206
-msgid "<a id=\"givv\"></a> <a class=\"anchor\" href=\"#givv\"></a>"
+#: /home/runa/tor/website/donate/en/donate.wml:192
+msgid "<a id=\"givv\"></a>"
 msgstr ""
 
-#. type: Content of: <div><div><div><p>
-#: /home/runa/tor/website/donate/en/donate.wml:208
+#. type: Content of: <div><div><div><div><h3>
+#: /home/runa/tor/website/donate/en/donate.wml:194
+msgid "Donate via Givv.org"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/tor/website/donate/en/donate.wml:195
 msgid ""
 "Givv.org is a new way to think about making your impact. Make one monthly "
-"donation. To as many nonprofits as you like.  Automatic, one-click giving. "
-"You stay anonymous and stay in control! <strong><a href=\"http://givv.org/"
-"recipients/the-tor-project\">Continue to Givv.org &raquo;</a></strong>"
+"donation. To as many nonprofits as you like. Automatic, one-click giving. "
+"<strong>You stay anonymous and stay in control!</strong>"
 msgstr ""
 
-#. type: Content of: <div><div><div>
-#: /home/runa/tor/website/donate/en/donate.wml:214
-msgid "Donate via Check, Cash, or Money Order"
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/tor/website/donate/en/donate.wml:196
+msgid ""
+"<strong><a href=\"http://givv.org/recipients/the-tor-project\">Continue to "
+"Givv.org &raquo;</a></strong>"
 msgstr ""
 
-#. type: Content of: <div><div><div>
-#: /home/runa/tor/website/donate/en/donate.wml:216
-msgid "<a id=\"cash\"></a> <a class=\"anchor\" href=\"#cash\"></a>"
+#.  BEGIN CHECK 
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/donate/en/donate.wml:201
+msgid "<a id=\"cash\"></a>"
 msgstr ""
 
-#. type: Content of: <div><div><div><p>
-#: /home/runa/tor/website/donate/en/donate.wml:218
+#. type: Content of: <div><div><div><div><h3>
+#: /home/runa/tor/website/donate/en/donate.wml:204
+msgid ""
+"Donate via Check, Cash, Money Order, Bank Transfer, Stock Grant, or Another "
+"More Sophisticated Transaction"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><h4>
+#: /home/runa/tor/website/donate/en/donate.wml:205
 msgid "You can send checks or money orders to:"
 msgstr ""
 
-#. type: Content of: <div><div><div><p>
-#: /home/runa/tor/website/donate/en/donate.wml:219
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/tor/website/donate/en/donate.wml:206
 msgid ""
 "The Tor Project, Inc<br> 969 Main Street, Suite 206<br> Walpole, MA "
 "02081-2972 USA"
 msgstr ""
 
-#. type: Content of: <div><div><div>
-#: /home/runa/tor/website/donate/en/donate.wml:225
+#. type: Content of: <div><div><div><div><h3>
+#: /home/runa/tor/website/donate/en/donate.wml:210
 msgid "Donate via Wire or Bank Transfer"
 msgstr ""
 
-#. type: Content of: <div><div><div><h3>
-#: /home/runa/tor/website/donate/en/donate.wml:228
+#. type: Content of: <div><div><div><div><h4>
+#: /home/runa/tor/website/donate/en/donate.wml:211
 msgid "US Transfers"
 msgstr ""
 
-#. type: Content of: <div><div><div><p>
-#: /home/runa/tor/website/donate/en/donate.wml:229
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/tor/website/donate/en/donate.wml:212
 msgid ""
 "For US donations via wire or ACH transfer, please contact us for the "
 "relevant information."
 msgstr ""
 
-#. type: Content of: <div><div><div><h3>
-#: /home/runa/tor/website/donate/en/donate.wml:230
+#. type: Content of: <div><div><div><div><h4>
+#: /home/runa/tor/website/donate/en/donate.wml:213
 msgid "European Transfers"
 msgstr ""
 
-#. type: Content of: <div><div><div><p>
-#: /home/runa/tor/website/donate/en/donate.wml:231
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/tor/website/donate/en/donate.wml:214
 msgid ""
 "Wau Holland Stiftung<br> IBAN DE03 5204 0021 0277 281202<br> SWIFT BIC "
 "COBADEFF520"
 msgstr ""
 
-#. type: Content of: <div><div><div><p>
-#: /home/runa/tor/website/donate/en/donate.wml:234
+#. type: Content of: <div><div><div><div><h4>
+#: /home/runa/tor/website/donate/en/donate.wml:217
+msgid "Classic style German account information is:"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/tor/website/donate/en/donate.wml:218
 msgid ""
-"<strong>Classic style German account information is:</strong><br> Konto: "
-"2772812-02<br> Inhaber: Wau Holland Stiftung<br> Bank: Commerzbank "
+"Konto: 2772812-02<br> Inhaber: Wau Holland Stiftung<br> Bank: Commerzbank "
 "Kassel<br> BLZ: 52040021"
 msgstr ""
 
-#. type: Content of: <div><div><div><p>
-#: /home/runa/tor/website/donate/en/donate.wml:239
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/tor/website/donate/en/donate.wml:222
 msgid ""
 "<em>For European bank transfers, we have an arrangement with <a href="
 "\"https://www.ccc.de/\">CCC in Germany</a> to provide tax-deductible "
 "donations for Europeans:</em>"
 msgstr ""
 
-#. type: Content of: <div><div><div><ul><li>
-#: /home/runa/tor/website/donate/en/donate.wml:243
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/donate/en/donate.wml:226
 msgid ""
 "Residents from any of the 31 <a href=\"http://en.wikipedia.org/wiki/"
 "Single_Euro_Payments_Area\">SEPA</a> member states can wire up to 50.000 "
@@ -426,8 +447,8 @@
 "electronically)."
 msgstr ""
 
-#. type: Content of: <div><div><div><ul><li>
-#: /home/runa/tor/website/donate/en/donate.wml:248
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/donate/en/donate.wml:231
 msgid ""
 "German citizens can make a charitable contribution that is tax-deductible to "
 "a certain degree (max 5% of total income, up to 1.650 Euro per annum). A new "
@@ -435,8 +456,8 @@
 "ceiling."
 msgstr ""
 
-#. type: Content of: <div><div><div><ul><li>
-#: /home/runa/tor/website/donate/en/donate.wml:252
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/donate/en/donate.wml:235
 msgid ""
 "Corporate entities can deduct donations up to 4/1000 of their combined "
 "turnovers, wages and salaries. WHS issues a donation receipt upon request "

Modified: translation/trunk/projects/website/po/templates/download/1-high.download-easy.pot
===================================================================
--- translation/trunk/projects/website/po/templates/download/1-high.download-easy.pot	2011-06-21 04:41:02 UTC (rev 24825)
+++ translation/trunk/projects/website/po/templates/download/1-high.download-easy.pot	2011-06-21 07:19:28 UTC (rev 24826)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-01-29 21:13+0000\n"
+"POT-Creation-Date: 2011-06-21 08:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -23,14 +23,155 @@
 "easy>\">Easy Download Selector</a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><div>
-#: /home/runa/tor/website/download/en/download-easy.wml:14
+#. type: Content of: <div><div><div><h2>
+#: /home/runa/tor/website/download/en/download-easy.wml:12
+msgid "Want Tor to really work?"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+#: /home/runa/tor/website/download/en/download-easy.wml:13
+msgid ""
+"...then please don't just install it and go on. You need to change some of "
+"your habits, and reconfigure your software! Tor by itself is <em>NOT</em> "
+"all you need to maintain your anonymity. Read the <a href=\"<page download/"
+"download>#warning\">full list of warnings</a>."
+msgstr ""
+
+#.  END TEASER WARNING 
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/download/en/download-easy.wml:20
+msgid "<br>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tbody><tr><td><h2>
+#: /home/runa/tor/website/download/en/download-easy.wml:26
 msgid "Tor Browser Bundle"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download-easy.wml:19
+#. type: Content of: <div><div><table><tbody><tr><script>
+#: /home/runa/tor/website/download/en/download-easy.wml:33
 msgid ""
+"function displayVals() { var t3 = jQuery(\"#t3\").val(); var amount = jQuery"
+"(\"#amount\").val(); if(t3 != 0){ jQuery('#a3').val(amount); jQuery('#p3')."
+"val(1); jQuery('#cmd').val('_xclick-subscriptions'); jQuery('#item_name').val"
+"('Tor Project Membership'); jQuery('#ppinfo').replaceWith('"
+msgstr ""
+
+#. type: Content of: <div><div><table><tbody><tr><script><h6>
+#: /home/runa/tor/website/download/en/download-easy.wml:41
+msgid "<small>(Requires a PayPal Account)</small>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tbody><tr><script>
+#: /home/runa/tor/website/download/en/download-easy.wml:41
+msgid ""
+"'); }else{ jQuery('#a3').val(0); jQuery('#p3').val(0); jQuery('#cmd').val"
+"('_donations'); jQuery('#item_name').val('Donation to the Tor Project'); "
+"jQuery('#ppinfo').replaceWith('"
+msgstr ""
+
+#. type: Content of: <div><div><table><tbody><tr><script>
+#: /home/runa/tor/website/download/en/download-easy.wml:47
+msgid ""
+"'); } if( !t3 ) { jQuery('#cmd').val('_donations'); jQuery('#item_name').val"
+"('Donation to the Tor Project'); jQuery('#ppinfo').replaceWith('"
+msgstr ""
+
+#. type: Content of: <div><div><table><tbody><tr><script>
+#: /home/runa/tor/website/download/en/download-easy.wml:52
+msgid ""
+"'); } } jQuery(function(){ jQuery(\"#amount\").change(displayVals); jQuery"
+"(\"#t3\").change(displayVals); displayVals(); });"
+msgstr ""
+
+#. type: Content of: <div><div><table><tbody><tr><td><form><h2>
+#: /home/runa/tor/website/download/en/download-easy.wml:65
+msgid "Donate to Tor"
+msgstr ""
+
+#. type: Content of: <div><div><table><tbody><tr><td><form><p><select>
+#: /home/runa/tor/website/download/en/download-easy.wml:67
+msgid "<select name=\"currency_code\" class=\"cur\">"
+msgstr ""
+
+#. type: Content of: <div><div><table><tbody><tr><td><form><p><select><option>
+#: /home/runa/tor/website/download/en/download-easy.wml:68
+msgid "$"
+msgstr ""
+
+#. type: Content of: <div><div><table><tbody><tr><td><form><p><select><option>
+#: /home/runa/tor/website/download/en/download-easy.wml:69
+msgid "&euro;"
+msgstr ""
+
+#. type: Content of: <div><div><table><tbody><tr><td><form><p><select><option>
+#: /home/runa/tor/website/download/en/download-easy.wml:70
+msgid "&pound;"
+msgstr ""
+
+#. type: Content of: <div><div><table><tbody><tr><td><form><p><select><option>
+#: /home/runa/tor/website/download/en/download-easy.wml:71
+msgid "&yen;"
+msgstr ""
+
+#. type: Content of: <div><div><table><tbody><tr><td><form><p>
+#: /home/runa/tor/website/download/en/download-easy.wml:72
+msgid ""
+"</select> <input type=\"text\" id=\"amount\" class=\"amount\" name=\"amount"
+"\" value=\"5\" size=\"10\">"
+msgstr ""
+
+#. type: Content of: <div><div><table><tbody><tr><td><form><p><select>
+#: /home/runa/tor/website/download/en/download-easy.wml:76
+msgid ""
+"<input type=\"hidden\" id=\"a3\" name=\"a3\" value=\"0\"> <select id=\"t3\" "
+"name=\"t3\">"
+msgstr ""
+
+#. type: Content of: <div><div><table><tbody><tr><td><form><p><select><option>
+#: /home/runa/tor/website/download/en/download-easy.wml:78
+msgid "One-time Donation"
+msgstr ""
+
+#. type: Content of: <div><div><table><tbody><tr><td><form><p><select><option>
+#: /home/runa/tor/website/download/en/download-easy.wml:79
+msgid "Monthly Subscription"
+msgstr ""
+
+#. type: Content of: <div><div><table><tbody><tr><td><form><p>
+#: /home/runa/tor/website/download/en/download-easy.wml:80
+msgid "</select>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tbody><tr><td><form><p>
+#: /home/runa/tor/website/download/en/download-easy.wml:83
+msgid ""
+"<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 at torproject.org\"> <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\"> "
+"<input type=\"hidden\" name=\"cancel_return\" value=\"https://www.torproject."
+"org/donate\">"
+msgstr ""
+
+#. type: Content of: <div><div><table><tbody><tr><td><form><p>
+#: /home/runa/tor/website/download/en/download-easy.wml:96
+msgid ""
+"<input class=\"donate-btn\" type=\"submit\" name=\"donate\" value=\"Donate\">"
+msgstr ""
+
+#. type: Content of: <div><div><table><tbody><tr><td><form><p>
+#: /home/runa/tor/website/download/en/download-easy.wml:99
+msgid "<a href=\"<page donate/donate>\">Other donation options...</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tbody><tr><td>
+#: /home/runa/tor/website/download/en/download-easy.wml:107
+msgid ""
 "The <strong>Tor Browser Bundle</strong> contains everything you need to "
 "safely browse the Internet. This package requires no installation.  Just "
 "extract it and run. <a href=\"<page projects/torbrowser>\">Learn more &amp; "
@@ -38,8 +179,8 @@
 msgstr ""
 
 #. PO4ASHARPBEGIN Translators: please point to the version of TBB in your language, if there is one.PO4ASHARPEND
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download-easy.wml:25
+#. type: Content of: <div><div><table><tbody><tr><td>
+#: /home/runa/tor/website/download/en/download-easy.wml:114
 msgid ""
 "<span class=\"windows\"> <a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_en-US.exe\">Windows 7, Vista, XP</a>&nbsp; (<a href=\"../"
@@ -48,8 +189,8 @@
 msgstr ""
 
 #. PO4ASHARPBEGIN Translators: please point to the version of TBB in your language, if there is one.PO4ASHARPEND
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download-easy.wml:33
+#. type: Content of: <div><div><table><tbody><tr><td>
+#: /home/runa/tor/website/download/en/download-easy.wml:122
 msgid ""
 "<span class=\"mac\"> <a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
 "torbrowserbundleosx>-dev-osx-i386-en-US.zip\">Apple OS X Intel</a>&nbsp; (<a "
@@ -58,8 +199,8 @@
 msgstr ""
 
 #. PO4ASHARPBEGIN Translators: please point to the version of TBB in your language, if there is one.PO4ASHARPEND
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download-easy.wml:41
+#. type: Content of: <div><div><table><tbody><tr><td>
+#: /home/runa/tor/website/download/en/download-easy.wml:130
 msgid ""
 "<span class=\"linux\"> <a href=\"../dist/torbrowser/linux/tor-browser-gnu-"
 "linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz\">GNU/Linux "
@@ -68,43 +209,16 @@
 "span>"
 msgstr ""
 
-#. type: Content of: <div><div>
-#: /home/runa/tor/website/download/en/download-easy.wml:49
-#: /tmp/iVSv3grhGK.xml:60 /tmp/iVSv3grhGK.xml:62 /tmp/iVSv3grhGK.xml:64
-msgid "<br>"
-msgstr ""
-
-#. type: Content of: <div><div><div><h2>
-#: /home/runa/tor/website/download/en/download-easy.wml:52
-msgid "Want Tor to really work?"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-#: /home/runa/tor/website/download/en/download-easy.wml:53
+#. type: Content of: <div><div><table><tbody><tr><td><p>
+#: /home/runa/tor/website/download/en/download-easy.wml:139
 msgid ""
-"...then please don't just install it and go on.  You need to change some of "
-"your habits, and reconfigure your software! Tor by itself is <em>NOT</em> "
-"all you need to maintain your anonymity. Read the <a href=\"<page download/"
-"download>#warning\">full list of warnings</a>."
+"Looking for something else? <a href=\"<page download/download>\">View All "
+"Downloads</a>."
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/download/en/download-easy.wml:61
+#. type: Content of: <div><div><table><tbody><tr><td><p>
+#: /home/runa/tor/website/download/en/download-easy.wml:144
 msgid ""
-"Need more download options? <a href=\"<page download/download>\">See "
-"advanced choices</a>."
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/download/en/download-easy.wml:63
-msgid ""
-"Interested in <a href=\"<page about/overview>\">learning more about Tor in "
-"general</a>?"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/download/en/download-easy.wml:65
-msgid ""
 "To keep informed of security advisories and new stable releases, subscribe "
 "to the <a href=\"https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-"
 "announce\">tor-announce mailing list</a>. You can also <a href=\"http://rss."
@@ -112,69 +226,65 @@
 "a>."
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/download/en/download-easy.wml:71
-msgid "All trademarks are the property of their respective owners."
-msgstr ""
-
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/download/en/download-easy.wml:78
+#: /home/runa/tor/website/download/en/download-easy.wml:161
 msgid "Advanced Choices:"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download-easy.wml:80
+#: /home/runa/tor/website/download/en/download-easy.wml:163
 msgid "<a href=\"<page download/download>#Windows\">Microsoft Windows</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download-easy.wml:81
+#: /home/runa/tor/website/download/en/download-easy.wml:164
 msgid "<a href=\"<page download/download>#mac\">Apple OS X</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download-easy.wml:82
+#: /home/runa/tor/website/download/en/download-easy.wml:165
 msgid "<a href=\"<page download/download>#linux\">Linux/Unix</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download-easy.wml:83
+#: /home/runa/tor/website/download/en/download-easy.wml:166
 msgid "<a href=\"<page download/download>#smartphones\">Smartphones</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download-easy.wml:84
+#: /home/runa/tor/website/download/en/download-easy.wml:167
 msgid "<a href=\"<page download/download>#source\">Source Code</a>"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download-easy.wml:85
-msgid "<a href=\"<page donate/donate>\">Please consider a donation</a>"
-msgstr ""
-
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/download/en/download-easy.wml:93
+#: /home/runa/tor/website/download/en/download-easy.wml:174
 msgid "What is the (sig) link?"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><p>
-#: /home/runa/tor/website/download/en/download-easy.wml:94
+#: /home/runa/tor/website/download/en/download-easy.wml:175
 msgid ""
 "These are GPG signatures to allow you to verify that your downloaded file is "
 "really from The Tor Project and not an imposter."
 msgstr ""
 
 #. type: Content of: <div><div><div><div>
-#: /home/runa/tor/website/download/en/download-easy.wml:97
+#: /home/runa/tor/website/download/en/download-easy.wml:178
 msgid "<a href=\"<page docs/verifying-signatures>\">Learn more &raquo;</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/download/en/download-easy.wml:103
+#: /home/runa/tor/website/download/en/download-easy.wml:184
 msgid "Having Trouble?"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download-easy.wml:105
+#: /home/runa/tor/website/download/en/download-easy.wml:186
 msgid "<a href=\"<page docs/documentation>\">Read the fine manuals</a>"
 msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/download/en/download-easy.wml:194
+msgid ""
+"<small>All trademarks are the property of their respective owners.</small>"
+msgstr ""

Modified: translation/trunk/projects/website/po/templates/download/3-low.download-unix.pot
===================================================================
--- translation/trunk/projects/website/po/templates/download/3-low.download-unix.pot	2011-06-21 04:41:02 UTC (rev 24825)
+++ translation/trunk/projects/website/po/templates/download/3-low.download-unix.pot	2011-06-21 07:19:28 UTC (rev 24826)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-04-13 16:27+0200\n"
+"POT-Creation-Date: 2011-06-21 08:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@
 
 #. type: Content of: <div><div><table><tr><td>
 #: /home/runa/tor/website/download/en/download-unix.wml:33
-#: /tmp/Bjk_HZ1oA5.xml:40 /tmp/Bjk_HZ1oA5.xml:56 /tmp/Bjk_HZ1oA5.xml:73
+#: /tmp/C4sfW4_oXY.xml:40 /tmp/C4sfW4_oXY.xml:56 /tmp/C4sfW4_oXY.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -158,8 +158,8 @@
 #. type: Content of: <div><div><table><tr><td>
 #: /home/runa/tor/website/download/en/download-unix.wml:64
 msgid ""
-"<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a><br> <a href=\"<wiki>/"
-"TheOnionRouter/OpenbsdChrootedTor\">Guide to chrooting Tor in OpenBSD</a>"
+"<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a><br> <a href="
+"\"<wiki>doc/OpenbsdChrootedTor\">Guide to chrooting Tor in OpenBSD</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>

Modified: translation/trunk/projects/website/po/templates/download/3-low.download.pot
===================================================================
--- translation/trunk/projects/website/po/templates/download/3-low.download.pot	2011-06-21 04:41:02 UTC (rev 24825)
+++ translation/trunk/projects/website/po/templates/download/3-low.download.pot	2011-06-21 07:19:28 UTC (rev 24826)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-23 17:00+0200\n"
+"POT-Creation-Date: 2011-06-21 08:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -47,14 +47,136 @@
 msgid "<a name=\"Windows\">Microsoft Windows</a>"
 msgstr ""
 
+#. type: Content of: <div><div><table><tr><td><script>
+#: /home/runa/tor/website/download/en/download.wml:27
+msgid ""
+"function displayVals() { var t3 = jQuery(\"#t3\").val(); var amount = jQuery"
+"(\"#amount\").val(); if(t3 != 0){ jQuery('#a3').val(amount); jQuery('#p3')."
+"val(1); jQuery('#cmd').val('_xclick-subscriptions'); jQuery('#item_name').val"
+"('Tor Project Membership'); jQuery('#ppinfo').replaceWith('"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><script><h6>
+#: /home/runa/tor/website/download/en/download.wml:35
+msgid "<small>(Requires a PayPal Account)</small>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><script>
+#: /home/runa/tor/website/download/en/download.wml:35
+msgid ""
+"'); }else{ jQuery('#a3').val(0); jQuery('#p3').val(0); jQuery('#cmd').val"
+"('_donations'); jQuery('#item_name').val('Donation to the Tor Project'); "
+"jQuery('#ppinfo').replaceWith('"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><script>
+#: /home/runa/tor/website/download/en/download.wml:41
+msgid ""
+"'); } if( !t3 ) { jQuery('#cmd').val('_donations'); jQuery('#item_name').val"
+"('Donation to the Tor Project'); jQuery('#ppinfo').replaceWith('"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><script>
+#: /home/runa/tor/website/download/en/download.wml:46
+msgid ""
+"'); } } jQuery(function(){ jQuery(\"#amount\").change(displayVals); jQuery"
+"(\"#t3\").change(displayVals); displayVals(); });"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><form><h2>
+#: /home/runa/tor/website/download/en/download.wml:58
+msgid "Donate to Tor"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><form><p><select>
+#: /home/runa/tor/website/download/en/download.wml:60
+msgid "<select name=\"currency_code\" class=\"cur\">"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><form><p><select><option>
+#: /home/runa/tor/website/download/en/download.wml:61
+msgid "$"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><form><p><select><option>
+#: /home/runa/tor/website/download/en/download.wml:62
+msgid "&euro;"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><form><p><select><option>
+#: /home/runa/tor/website/download/en/download.wml:63
+msgid "&pound;"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><form><p><select><option>
+#: /home/runa/tor/website/download/en/download.wml:64
+msgid "&yen;"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><form><p>
+#: /home/runa/tor/website/download/en/download.wml:65
+msgid ""
+"</select> <input type=\"text\" id=\"amount\" class=\"amount\" name=\"amount"
+"\" value=\"5\" size=\"10\">"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><form><p><select>
+#: /home/runa/tor/website/download/en/download.wml:69
+msgid ""
+"<input type=\"hidden\" id=\"a3\" name=\"a3\" value=\"0\"> <select id=\"t3\" "
+"name=\"t3\">"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><form><p><select><option>
+#: /home/runa/tor/website/download/en/download.wml:71
+msgid "One-time Donation"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><form><p><select><option>
+#: /home/runa/tor/website/download/en/download.wml:72
+msgid "Monthly Subscription"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><form><p>
+#: /home/runa/tor/website/download/en/download.wml:73
+msgid "</select>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><form><p>
+#: /home/runa/tor/website/download/en/download.wml:78
+msgid ""
+"<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 at torproject.org\"> <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\"> "
+"<input type=\"hidden\" name=\"cancel_return\" value=\"https://www.torproject."
+"org/donate\">"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><form><p>
+#: /home/runa/tor/website/download/en/download.wml:93
+msgid ""
+"<input class=\"donate-btn\" type=\"submit\" name=\"donate\" value=\"Donate\">"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><form><p>
+#: /home/runa/tor/website/download/en/download.wml:95
+msgid "<a href=\"<page donate/donate>\">Other donation options...</a>"
+msgstr ""
+
+#.  DONATION WIDGET END 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:23
+#: /home/runa/tor/website/download/en/download.wml:100
 msgid "The Tor Software for Windows comes bundled in four different ways:"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:25 /tmp/lRozugJuoH.xml:88
-#: /tmp/lRozugJuoH.xml:126
+#: /home/runa/tor/website/download/en/download.wml:102 /tmp/FhqGC1ISDt.xml:165
+#: /tmp/FhqGC1ISDt.xml:203
 msgid ""
 "The <strong>Tor Browser Bundle</strong> contains everything you need to "
 "safely browse the Internet. This package requires no installation. Just "
@@ -63,7 +185,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:26
+#: /home/runa/tor/website/download/en/download.wml:103
 msgid ""
 "The <strong>Vidalia Bundle</strong> contains Tor, <a href=\"<page projects/"
 "vidalia>\">Vidalia</a>, Polipo, and Torbutton for installation on your "
@@ -72,7 +194,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:27
+#: /home/runa/tor/website/download/en/download.wml:104
 msgid ""
 "The <strong>Bridge-by-Default Vidalia Bundle</strong> is a <strong>Vidalia "
 "Bundle</strong> which is configured to be a <a href=\"<page docs/bridges>"
@@ -80,14 +202,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:31
+#: /home/runa/tor/website/download/en/download.wml:108
 msgid ""
 "The <strong>Expert Package</strong> contains just Tor and nothing else.  "
 "You'll need to configure Tor and all of your applications manually."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><p>
-#: /home/runa/tor/website/download/en/download.wml:33 /tmp/lRozugJuoH.xml:91
+#: /home/runa/tor/website/download/en/download.wml:110 /tmp/FhqGC1ISDt.xml:168
 msgid ""
 "There are two versions of each package, a stable and alpha release.  Stable "
 "packages are released when we believe the features and code will not change "
@@ -99,7 +221,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><p>
-#: /home/runa/tor/website/download/en/download.wml:34
+#: /home/runa/tor/website/download/en/download.wml:111
 msgid ""
 "The current stable version of Tor for Windows is <version-win32-stable>.  "
 "The current alpha/unstable version of Tor for Windows is <version-win32-"
@@ -107,7 +229,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:38
+#: /home/runa/tor/website/download/en/download.wml:115
 msgid ""
 "<span class=\"windows\"> Tor Browser Bundle (English) version <version-"
 "torbrowserbundle>, works with Windows 7, Vista, and XP. <a href=\"../dist/"
@@ -117,7 +239,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:45
+#: /home/runa/tor/website/download/en/download.wml:122
 msgid ""
 "<span class=\"windows\"> Tor Browser Instant Messaging Bundle (English) has "
 "been <a href=\"https://blog.torproject.org/blog/tor-im-browser-bundle-"
@@ -125,7 +247,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:52
+#: /home/runa/tor/website/download/en/download.wml:129
 msgid ""
 "<span class=\"windows\"> Download <a href=\"<page projects/torbrowser>"
 "\">other language versions and the source code</a> of the Tor Browser "
@@ -133,7 +255,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:57
+#: /home/runa/tor/website/download/en/download.wml:134
 msgid ""
 "<span class=\"windows\"> Stable Vidalia Bundle works with Windows 7, Vista, "
 "XP, <a href=\"<package-win32-bundle-stable>\">Download Stable</a>&nbsp;(<a "
@@ -141,7 +263,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:61
+#: /home/runa/tor/website/download/en/download.wml:138
 msgid ""
 "<span class=\"windows\">Unstable Vidalia Bundle works with Windows 7, Vista, "
 "XP, <a href=\"<package-win32-bundle-alpha>\">Download Unstable</a>&nbsp;(<a "
@@ -149,7 +271,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:63
+#: /home/runa/tor/website/download/en/download.wml:140
 msgid ""
 "<span class=\"windows\">Unstable Bridge-by-Default Vidalia Bundle works with "
 "Windows 7, Vista, XP, <a href=\"../dist/vidalia-bundles/vidalia-bridge-"
@@ -159,7 +281,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:66
+#: /home/runa/tor/website/download/en/download.wml:143
 msgid ""
 "<span class=\"windows\">Stable Expert Bundle works with Windows 98SE, ME, "
 "Windows 7, Vista, XP, 2000, 2003 Server, <a href=\"../dist/win32/tor-"
@@ -168,7 +290,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:69
+#: /home/runa/tor/website/download/en/download.wml:146
 msgid ""
 "<span class=\"windows\">Unstable Expert Bundle works with Windows 98SE, ME, "
 "Windows 7, Vista, XP, 2000, 2003 Server, <a href=\"../dist/win32/tor-"
@@ -177,24 +299,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:75
+#: /home/runa/tor/website/download/en/download.wml:152
 msgid ""
 "<a href=\"<page docs/tor-doc-windows>\">Documentation for Microsoft Windows "
 "clients</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><div>
-#: /home/runa/tor/website/download/en/download.wml:83
+#: /home/runa/tor/website/download/en/download.wml:160
 msgid "<a name=\"mac\">Apple OS X</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:86
+#: /home/runa/tor/website/download/en/download.wml:163
 msgid "The Tor Software for OS X comes bundled in two different ways:"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:89
+#: /home/runa/tor/website/download/en/download.wml:166
 msgid ""
 "The <strong>Vidalia Bundle</strong> contains Tor, <a href=\"<page projects/"
 "vidalia>\">Vidalia</a>, Polipo, and Torbutton for installation on your "
@@ -203,14 +325,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><p>
-#: /home/runa/tor/website/download/en/download.wml:92
+#: /home/runa/tor/website/download/en/download.wml:169
 msgid ""
 "The current stable version of Tor for OS X is <version-osx-x86-stable>.  The "
 "current alpha/unstable version of Tor for OS X is <version-osx-x86-alpha>."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:96
+#: /home/runa/tor/website/download/en/download.wml:173
 msgid ""
 "<span class=\"mac\">Tor Browser Bundle for OS X Intel (beta version), <a "
 "href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
@@ -220,7 +342,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:103
+#: /home/runa/tor/website/download/en/download.wml:180
 msgid ""
 "<span class=\"mac\">Stable Vidalia Bundle for OS X Intel, <a href=\"<package-"
 "osx-x86-bundle-stable>\">Download Stable</a>&nbsp;(<a href=\"<package-osx-"
@@ -228,7 +350,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:106
+#: /home/runa/tor/website/download/en/download.wml:183
 msgid ""
 "<span class=\"mac\">Unstable Vidalia Bundle for OS X Intel, <a href="
 "\"<package-osx-x86-bundle-alpha>\">Download Unstable</a>&nbsp;(<a href="
@@ -236,7 +358,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:109
+#: /home/runa/tor/website/download/en/download.wml:186
 msgid ""
 "<span class=\"mac\">Stable Vidalia Bundle for OS X PowerPC, <a href="
 "\"<package-osx-ppc-bundle-stable>\">Download Stable</a>&nbsp;(<a href="
@@ -244,7 +366,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:112
+#: /home/runa/tor/website/download/en/download.wml:189
 msgid ""
 "<span class=\"mac\">Unstable Vidalia Bundle for OS X PowerPC, <a href="
 "\"<package-osx-ppc-bundle-alpha>\">Download Unstable</a>&nbsp;(<a href="
@@ -252,30 +374,30 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:115
+#: /home/runa/tor/website/download/en/download.wml:192
 msgid ""
 "<a href=\"<page docs/tor-doc-osx>\">Documentation for Apple OS X clients</a>."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><div>
-#: /home/runa/tor/website/download/en/download.wml:122
+#: /home/runa/tor/website/download/en/download.wml:199
 msgid "<a name=\"linux\">Linux/Unix</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:124
+#: /home/runa/tor/website/download/en/download.wml:201
 msgid "The Tor Software comes bundled in two different ways:"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:127
+#: /home/runa/tor/website/download/en/download.wml:204
 msgid ""
 "Read how to use <a href=\"<page download/download-unix>\">our repositories "
 "for the Tor software</a>."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:132
+#: /home/runa/tor/website/download/en/download.wml:209
 msgid ""
 "<span class=\"linux\">Tor Browser Bundle for GNU/Linux (beta version) on "
 "i686, <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -285,7 +407,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:137
+#: /home/runa/tor/website/download/en/download.wml:214
 msgid ""
 "<span class=\"linux\">Tor Browser Bundle for GNU/Linux (beta version) on "
 "x86_64, <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-"
@@ -295,65 +417,65 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:142
+#: /home/runa/tor/website/download/en/download.wml:219
 msgid ""
 "<span class=\"linux\">Use <a href=\"<page download/download-unix>\">our "
 "repositories</a> for all other Tor-related software.</span>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><div>
-#: /home/runa/tor/website/download/en/download.wml:147
+#: /home/runa/tor/website/download/en/download.wml:224
 msgid "<a name=\"smartphones\">Tor for Smartphones</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:150
+#: /home/runa/tor/website/download/en/download.wml:227
 msgid "Android-based phones, tablets, computers"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:151
+#: /home/runa/tor/website/download/en/download.wml:228
 msgid ""
 "<a href=\"../dist/android/<version-androidbundle-tor>-orbot-<version-"
 "androidbundle-orbot>.apk\">Android Bundle</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:152
+#: /home/runa/tor/website/download/en/download.wml:229
 msgid "<a href=\"<page docs/android>\">Android Instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:155
+#: /home/runa/tor/website/download/en/download.wml:232
 msgid "iPhone, iPod Touch, iPad"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:156
+#: /home/runa/tor/website/download/en/download.wml:233
 msgid ""
 "<span class=\"mac\"><a href=\"http://sid77.slackware.it/iphone/\">Test "
 "packages by Marco</a></span>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:159
+#: /home/runa/tor/website/download/en/download.wml:236
 msgid "Nokia Maemo/N900"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:161
+#: /home/runa/tor/website/download/en/download.wml:238
 msgid ""
 "<span class=\"nokia\"><a href=\"<page docs/N900>\">Experimental "
 "instructions</a></span>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><div>
-#: /home/runa/tor/website/download/en/download.wml:169
+#: /home/runa/tor/website/download/en/download.wml:246
 msgid "<a name=\"source\">Source&nbsp;Code</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:172
+#: /home/runa/tor/website/download/en/download.wml:249
 msgid ""
 "The current stable version of Tor is <version-stable>.  Its <a href="
 "\"https://gitweb.torproject.org/tor.git/blob/release-0.2.1:/ChangeLog"
@@ -361,7 +483,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:175
+#: /home/runa/tor/website/download/en/download.wml:252
 msgid ""
 "The current unstable/alpha version of Tor is <version-alpha>.  Its <a href="
 "\"https://gitweb.torproject.org/tor.git/blob/refs/heads/release-0.2.2:/"
@@ -369,46 +491,46 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:181
+#: /home/runa/tor/website/download/en/download.wml:258
 msgid "Source Tarballs"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:182
+#: /home/runa/tor/website/download/en/download.wml:259
 msgid "./configure &amp;&amp; make &amp;&amp; src/or/tor"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:183
+#: /home/runa/tor/website/download/en/download.wml:260
 msgid ""
 "<a href=\"../dist/tor-<version-stable>.tar.gz\">Download Stable</a> (<a href="
 "\"../dist/tor-<version-stable>.tar.gz.asc\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:184
+#: /home/runa/tor/website/download/en/download.wml:261
 msgid ""
 "<a href=\"../dist/tor-<version-alpha>.tar.gz\">Download Unstable</a> (<a "
 "href=\"../dist/tor-<version-alpha>.tar.gz.asc\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><div>
-#: /home/runa/tor/website/download/en/download.wml:188 /tmp/lRozugJuoH.xml:267
+#: /home/runa/tor/website/download/en/download.wml:265 /tmp/FhqGC1ISDt.xml:344
 msgid "<br>"
 msgstr ""
 
 #. type: Content of: <div><div><div>
-#: /home/runa/tor/website/download/en/download.wml:191
+#: /home/runa/tor/website/download/en/download.wml:268
 msgid "<a name=\"warning\"></a> <a name=\"Warning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><h2>
-#: /home/runa/tor/website/download/en/download.wml:193
+#: /home/runa/tor/website/download/en/download.wml:270
 msgid "<a class=\"anchor\" href=\"#warning\">Want Tor to really work?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><p>
-#: /home/runa/tor/website/download/en/download.wml:194
+#: /home/runa/tor/website/download/en/download.wml:271
 msgid ""
 "...then please don't just install it and go on.  You need to change some of "
 "your habits, and reconfigure your software! Tor by itself is <em>NOT</em> "
@@ -417,7 +539,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><ol><li>
-#: /home/runa/tor/website/download/en/download.wml:199
+#: /home/runa/tor/website/download/en/download.wml:276
 msgid ""
 "Tor only protects Internet applications that are configured to send their "
 "traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
@@ -427,7 +549,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><ol><li>
-#: /home/runa/tor/website/download/en/download.wml:207
+#: /home/runa/tor/website/download/en/download.wml:284
 msgid ""
 "Torbutton blocks browser plugins such as Java, Flash, ActiveX, RealPlayer, "
 "Quicktime, Adobe's PDF plugin, and others: they can be manipulated into "
@@ -441,7 +563,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><ol><li>
-#: /home/runa/tor/website/download/en/download.wml:220
+#: /home/runa/tor/website/download/en/download.wml:297
 msgid ""
 "Beware of cookies: if you ever browse without Tor and a site gives you a "
 "cookie, that cookie could identify you even when you start using Tor again. "
@@ -451,7 +573,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><ol><li>
-#: /home/runa/tor/website/download/en/download.wml:228
+#: /home/runa/tor/website/download/en/download.wml:305
 msgid ""
 "Tor anonymizes the origin of your traffic, and it encrypts everything "
 "between you and the Tor network and everything inside the Tor network, but "
@@ -466,7 +588,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><ol><li>
-#: /home/runa/tor/website/download/en/download.wml:242
+#: /home/runa/tor/website/download/en/download.wml:319
 msgid ""
 "While Tor blocks attackers on your local network from discovering or "
 "influencing your destination, it opens new risks: malicious or misconfigured "
@@ -477,7 +599,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><ol><li>
-#: /home/runa/tor/website/download/en/download.wml:251
+#: /home/runa/tor/website/download/en/download.wml:328
 msgid ""
 "Tor tries to prevent attackers from learning what destinations you connect "
 "to. It doesn't prevent somebody watching your traffic from learning that "
@@ -490,7 +612,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><ol><li>
-#: /home/runa/tor/website/download/en/download.wml:261
+#: /home/runa/tor/website/download/en/download.wml:338
 msgid ""
 "Do not use <a href=\"https://blog.torproject.org/blog/bittorrent-over-tor-"
 "isnt-good-idea\">BitTorrent and Tor</a> together unless you are using a "
@@ -498,7 +620,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><p>
-#: /home/runa/tor/website/download/en/download.wml:269
+#: /home/runa/tor/website/download/en/download.wml:346
 msgid ""
 "Be smart and learn more. Understand what Tor does and does not offer.  This "
 "list of pitfalls isn't complete, and we need your help <a href=\"<page "
@@ -507,63 +629,58 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/download/en/download.wml:281
+#: /home/runa/tor/website/download/en/download.wml:358
 msgid "Jump to:"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:283
+#: /home/runa/tor/website/download/en/download.wml:360
 msgid "<a href=\"#Windows\">Microsoft Windows</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:284
+#: /home/runa/tor/website/download/en/download.wml:361
 msgid "<a href=\"#mac\">Apple OS X</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:285
+#: /home/runa/tor/website/download/en/download.wml:362
 msgid "<a href=\"#linux\">Linux/Unix</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:286
+#: /home/runa/tor/website/download/en/download.wml:363
 msgid "<a href=\"#smartphones\">Smartphones</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:287
+#: /home/runa/tor/website/download/en/download.wml:364
 msgid "<a href=\"#source\">Source Code</a>"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:288
-msgid "<a href=\"<page donate/donate>\">Please consider a donation</a>"
-msgstr ""
-
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/download/en/download.wml:296
+#: /home/runa/tor/website/download/en/download.wml:371
 msgid "What is the (sig) link?"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><p>
-#: /home/runa/tor/website/download/en/download.wml:297
+#: /home/runa/tor/website/download/en/download.wml:372
 msgid ""
 "These are GPG signatures to allow you to verify that your downloaded file is "
 "really from The Tor Project and not an imposter."
 msgstr ""
 
 #. type: Content of: <div><div><div><div>
-#: /home/runa/tor/website/download/en/download.wml:300
+#: /home/runa/tor/website/download/en/download.wml:375
 msgid "<a href=\"<page docs/verifying-signatures>\">Learn more &raquo;</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/download/en/download.wml:306
+#: /home/runa/tor/website/download/en/download.wml:381
 msgid "Having Trouble?"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:308
+#: /home/runa/tor/website/download/en/download.wml:383
 msgid "<a href=\"<page docs/documentation>\">Read the fine manuals</a>"
 msgstr ""

Modified: translation/trunk/projects/website/po/templates/getinvolved/3-low.tshirt.pot
===================================================================
--- translation/trunk/projects/website/po/templates/getinvolved/3-low.tshirt.pot	2011-06-21 04:41:02 UTC (rev 24825)
+++ translation/trunk/projects/website/po/templates/getinvolved/3-low.tshirt.pot	2011-06-21 07:19:28 UTC (rev 24826)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-02-12 12:20+0000\n"
+"POT-Creation-Date: 2011-06-21 08:19+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -62,11 +62,10 @@
 msgid ""
 "Help out in <a href=\"<page getinvolved/volunteer>\">other ways</a>. <a href="
 "\"<page getinvolved/translation>\">Maintain a translation for the website</"
-"a>. Write a good <a href=\"https://trac.torproject.org/projects/tor/wiki/"
-"TheOnionRouter/SupportPrograms\">support program and get a lot of people to "
-"use it</a>. Do research on Tor and anonymity, solve some of <a href="
-"\"https://bugs.torproject.org/\">our bugs</a>, or establish yourself as a "
-"Tor advocate."
+"a>. Write a good <a href=\"<wiki>doc/SupportPrograms\">support program and "
+"get a lot of people to use it</a>. Do research on Tor and anonymity, solve "
+"some of <a href=\"https://bugs.torproject.org/\">our bugs</a>, or establish "
+"yourself as a Tor advocate."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -81,9 +80,8 @@
 #: /home/runa/tor/website/getinvolved/en/tshirt.wml:43
 msgid ""
 "You can choose between the traditional black and our conversation-starting "
-"bright green. You can also see the shirts <a href=\"https://trac.torproject."
-"org/projects/tor/wiki/TheOnionRouter/TorShirt\">in action</a> &mdash; add "
-"your own photos there too."
+"bright green. You can also see the shirts <a href=\"<wiki>doc/TorShirt\">in "
+"action</a> &mdash; add your own photos there too."
 msgstr ""
 
 #. type: Content of: <div><div><div>

Modified: translation/trunk/projects/website/po/templates/getinvolved/4-optional.open-positions.pot
===================================================================
--- translation/trunk/projects/website/po/templates/getinvolved/4-optional.open-positions.pot	2011-06-21 04:41:02 UTC (rev 24825)
+++ translation/trunk/projects/website/po/templates/getinvolved/4-optional.open-positions.pot	2011-06-21 07:19:28 UTC (rev 24826)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-12-26 14:32+0000\n"
+"POT-Creation-Date: 2011-06-21 08:19+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,7 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:8
+#: /home/runa/tor/website/getinvolved/en/open-positions.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page getinvolved/"
 "volunteer>\">Get Involved &raquo; </a> <a href=\"<page getinvolved/open-"
@@ -25,66 +25,51 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:14
+#: /home/runa/tor/website/getinvolved/en/open-positions.wml:14
 msgid "Tor: Open Positions"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:15
+#: /home/runa/tor/website/getinvolved/en/open-positions.wml:15
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:17
+#: /home/runa/tor/website/getinvolved/en/open-positions.wml:17
 msgid ""
-"Tor is hiring! We're looking for self-motivated individuals who are able to "
-"work independently and want to help make Tor better.  These are short-term "
-"contract positions ranging from one to three months."
+"Tor is currently not hiring. We are generally looking for self-motivated "
+"individuals who are able to work independently and want to help make Tor "
+"better."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:21
-msgid "In particular, we're looking for a few people:"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:23
-msgid "<a href=\"#vidaliadev\">Vidalia Developer</a>"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:24
-msgid "<a href=\"#windowsdev\">Microsoft Windows Developer</a>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:27
+#: /home/runa/tor/website/getinvolved/en/open-positions.wml:21
 msgid "Working on Tor is rewarding because:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:29
+#: /home/runa/tor/website/getinvolved/en/open-positions.wml:23
 msgid ""
 "You can work your own hours in your own locations. As long as you get the "
 "job done, we don't care about the process."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:31
+#: /home/runa/tor/website/getinvolved/en/open-positions.wml:25
 msgid ""
 "We only write free (open source) software. The tools you make won't be "
 "locked down or rot on a shelf."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:33
+#: /home/runa/tor/website/getinvolved/en/open-positions.wml:27
 msgid ""
 "You will work with a world-class team of anonymity experts and developers on "
 "what is already the largest and most active strong anonymity network ever."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:38
+#: /home/runa/tor/website/getinvolved/en/open-positions.wml:32
 msgid ""
 "We want you to have good communication and writing skills (in particular, "
 "you should know how to keep other project members informed of your "
@@ -94,7 +79,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:44
+#: /home/runa/tor/website/getinvolved/en/open-positions.wml:38
 msgid ""
 "The best way to get noticed as a good developer is to join the community and "
 "start helping out. Smart code commits and ideas are welcome anytime.  We "
@@ -103,106 +88,9 @@
 "contractors came through volunteering first."
 msgstr ""
 
-#. type: Content of: <div><div>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:50
-msgid "<a id=\"vidaliadev\"></a>"
-msgstr ""
-
-#. type: Content of: <div><div><h3>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:51
-msgid "<a class=\"anchor\" href=\"#vidaliadev\">Vidalia Developer</a>"
-msgstr ""
-
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:52
+#: /home/runa/tor/website/getinvolved/en/open-positions.wml:44
 msgid ""
-"<a href=\"<page projects/vidalia>\">Vidalia</a> is the cross-platform "
-"graphical user interface to Tor written in C++ using the Qt libraries.  It "
-"is used by millions of people successfully.  Our current developer is a "
-"volunteer and otherwise occupied with finishing his PhD.  We're looking for "
-"someone who knows C++, Qt, and would like to kickstart development on the "
-"next generation of Vidalia.  Some suggested next steps involve:"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:59
-msgid ""
-"Implementing the KDE Marble interface into Vidalia for better and more "
-"accurate mappings of relays to countries.  Plus, it just looks cool."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:62
-msgid ""
-"Implementing the ability to click a country and instruct Tor to either start "
-"or end circuits in that country."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:64
-msgid "Work on bug fixes and enhancements as suggested by users."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:65
-msgid ""
-"Give Vidalia the ability to control the http proxy included, to start, stop, "
-"and possibly configure either privoxy, polipo, or an http shim we ship in "
-"the combined bundles of tor, vidalia, and polipo."
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:68
-msgid ""
-"Possibly re-design the Vidalia interface to have different modes for "
-"different levels of user sophistication.  Many users see a button or a "
-"setting and feel they have to change it.  The defaults are set to ensure "
-"users are sufficiently anonymous.  How can we better hide the complexity of "
-"Tor configurations?"
-msgstr ""
-
-#. type: Content of: <div><div>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:75
-msgid "<a id=\"windowsdev\"></a>"
-msgstr ""
-
-#. type: Content of: <div><div><h3>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:76
-msgid ""
-"<a class=\"anchor\" href=\"#windowsdev\">Microsoft Windows Developer</a>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:77
-msgid ""
-"This person needs to be very familiar with Windows at a system and network "
-"level.  We're looking for someone to help make Tor on Windows more "
-"compatible and work more reliably as a relay.  There are a number of "
-"projects relating to Windows that current need a skilled developer:"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:83
-msgid ""
-"Develop a Tor network shim to redirect all traffic through Tor.  OpenVPN has "
-"a network layer device for Windows that redirects traffic through the "
-"OpenVPN connection.  Is this the model Tor should be using? Or is there "
-"something else that may work better?"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:87
-msgid ""
-"Tor relays under non-server editions of Windows run into WSAENOBUFS problems "
-"after a short while.  This problem is described in detail in <a href="
-"\"https://trac.torproject.org/projects/tor/ticket/98\">bug ticket 98</a>.  "
-"So far, there are no solutions. We think libevent 2.0 with its bufferevents "
-"code will help solve the problem."
-msgstr ""
-
-#. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/getinvolved/en/open-positions.wml:94
-msgid ""
 "Periodically we get new funding to work on more development projects.  Your "
 "goal should be to get into the list of <a href=\"<page about/corepeople>"
 "\">core project members</a> so we think of you when new funding arrives."

Modified: translation/trunk/projects/website/po/templates/getinvolved/4-optional.volunteer.pot
===================================================================
--- translation/trunk/projects/website/po/templates/getinvolved/4-optional.volunteer.pot	2011-06-21 04:41:02 UTC (rev 24825)
+++ translation/trunk/projects/website/po/templates/getinvolved/4-optional.volunteer.pot	2011-06-21 07:19:28 UTC (rev 24826)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-04-13 16:28+0200\n"
+"POT-Creation-Date: 2011-06-21 08:19+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -61,26 +61,18 @@
 "we'd love to hear from you."
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:30
-msgid ""
-"Tor has <a href=\"<page getinvolved/open-positions>\">two open positions</"
-"a>.  Please <a href=\"<page about/contact>\">contact us</a> if you are "
-"qualified!"
-msgstr ""
-
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:33
+#: /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:34
+#: /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:36
+#: /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 "
@@ -89,41 +81,39 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:40
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:37
 msgid ""
-"Evaluate and document <a href=\"https://trac.torproject.org/projects/tor/"
-"wiki/TheOnionRouter/TorifyHOWTO\">our list of programs</a> that can be "
-"configured to use Tor."
+"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:43
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:40
 msgid ""
-"We have a huge list of <a href=\"https://trac.torproject.org/projects/tor/"
-"wiki/TheOnionRouter/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."
+"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:49
+#: /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:50
+#: /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:52
+#: /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:54
+#: /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/"
@@ -133,31 +123,31 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:60
+#: /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:62
+#: /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:66
+#: /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:67
+#: /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:70
+#: /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 "
@@ -168,333 +158,333 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:80
+#: /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:81
+#: /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:82
+#: /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:83
+#: /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:84
+#: /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:88
+#: /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:89
-#: /tmp/TXmB9_uBOH.xml:97
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:86
+#: /tmp/r1AqHDMca8.xml:94
 msgid "Core"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:90
-#: /tmp/TXmB9_uBOH.xml:122
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:87
+#: /tmp/r1AqHDMca8.xml:119
 msgid "C"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:91
-#: /tmp/TXmB9_uBOH.xml:115 /tmp/TXmB9_uBOH.xml:147 /tmp/TXmB9_uBOH.xml:187
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:88
+#: /tmp/r1AqHDMca8.xml:112 /tmp/r1AqHDMca8.xml:144 /tmp/r1AqHDMca8.xml:184
 msgid "Heavy"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:92
+#: /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:96
+#: /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:98
-#: /tmp/TXmB9_uBOH.xml:154 /tmp/TXmB9_uBOH.xml:186
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:95
+#: /tmp/r1AqHDMca8.xml:151 /tmp/r1AqHDMca8.xml:183
 msgid "Java"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:99
-#: /tmp/TXmB9_uBOH.xml:195 /tmp/TXmB9_uBOH.xml:219 /tmp/TXmB9_uBOH.xml:243
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:96
+#: /tmp/r1AqHDMca8.xml:192 /tmp/r1AqHDMca8.xml:216 /tmp/r1AqHDMca8.xml:240
 msgid "None"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:104
+#: /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:105
-#: /tmp/TXmB9_uBOH.xml:113 /tmp/TXmB9_uBOH.xml:121 /tmp/TXmB9_uBOH.xml:129
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:102
+#: /tmp/r1AqHDMca8.xml:110 /tmp/r1AqHDMca8.xml:118 /tmp/r1AqHDMca8.xml:126
 msgid "Usability"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:106
-#: /tmp/TXmB9_uBOH.xml:114 /tmp/TXmB9_uBOH.xml:130
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:103
+#: /tmp/r1AqHDMca8.xml:111 /tmp/r1AqHDMca8.xml:127
 msgid "Sys Admin"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:107
-#: /tmp/TXmB9_uBOH.xml:155 /tmp/TXmB9_uBOH.xml:163 /tmp/TXmB9_uBOH.xml:227
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:104
+#: /tmp/r1AqHDMca8.xml:152 /tmp/r1AqHDMca8.xml:160 /tmp/r1AqHDMca8.xml:224
 msgid "Moderate"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:108
+#: /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:112
+#: /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:116
+#: /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:120
+#: /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:123
-#: /tmp/TXmB9_uBOH.xml:131 /tmp/TXmB9_uBOH.xml:139 /tmp/TXmB9_uBOH.xml:171
-#: /tmp/TXmB9_uBOH.xml:179 /tmp/TXmB9_uBOH.xml:203 /tmp/TXmB9_uBOH.xml:211
-#: /tmp/TXmB9_uBOH.xml:235
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:120
+#: /tmp/r1AqHDMca8.xml:128 /tmp/r1AqHDMca8.xml:136 /tmp/r1AqHDMca8.xml:168
+#: /tmp/r1AqHDMca8.xml:176 /tmp/r1AqHDMca8.xml:200 /tmp/r1AqHDMca8.xml:208
+#: /tmp/r1AqHDMca8.xml:232
 msgid "Light"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:124
+#: /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:128
+#: /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:132
+#: /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:136
+#: /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:137
-#: /tmp/TXmB9_uBOH.xml:145 /tmp/TXmB9_uBOH.xml:153
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:134
+#: /tmp/r1AqHDMca8.xml:142 /tmp/r1AqHDMca8.xml:150
 msgid "User Interface"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:138
+#: /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:140
+#: /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:144
+#: /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:146
+#: /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:148
+#: /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:152
+#: /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:156
+#: /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:160
+#: /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:161
+#: /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:162
+#: /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:164
-#: /tmp/TXmB9_uBOH.xml:180 /tmp/TXmB9_uBOH.xml:236
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:161
+#: /tmp/r1AqHDMca8.xml:177 /tmp/r1AqHDMca8.xml:233
 msgid "mikeperry"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:168
+#: /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:169
+#: /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:170
-#: /tmp/TXmB9_uBOH.xml:178 /tmp/TXmB9_uBOH.xml:202 /tmp/TXmB9_uBOH.xml:210
-#: /tmp/TXmB9_uBOH.xml:226 /tmp/TXmB9_uBOH.xml:234 /tmp/TXmB9_uBOH.xml:242
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:167
+#: /tmp/r1AqHDMca8.xml:175 /tmp/r1AqHDMca8.xml:199 /tmp/r1AqHDMca8.xml:207
+#: /tmp/r1AqHDMca8.xml:223 /tmp/r1AqHDMca8.xml:231 /tmp/r1AqHDMca8.xml:239
 msgid "Python"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:172
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:169
 msgid "Sebastian, Erinn, nickm"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:176
+#: /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:177
+#: /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:184
+#: /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:185
-#: /tmp/TXmB9_uBOH.xml:193 /tmp/TXmB9_uBOH.xml:201 /tmp/TXmB9_uBOH.xml:209
-#: /tmp/TXmB9_uBOH.xml:217
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:182
+#: /tmp/r1AqHDMca8.xml:190 /tmp/r1AqHDMca8.xml:198 /tmp/r1AqHDMca8.xml:206
+#: /tmp/r1AqHDMca8.xml:214
 msgid "Client Service"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:188
+#: /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:192
+#: /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:194
+#: /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:200
+#: /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:204
-#: /tmp/TXmB9_uBOH.xml:212
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:201
+#: /tmp/r1AqHDMca8.xml:209
 msgid "kaner"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:208
+#: /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:216
+#: /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:218
+#: /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:224
+#: /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:225
-#: /tmp/TXmB9_uBOH.xml:233 /tmp/TXmB9_uBOH.xml:241
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:222
+#: /tmp/r1AqHDMca8.xml:230 /tmp/r1AqHDMca8.xml:238
 msgid "Backend Service"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:228
+#: /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:232
+#: /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:240
+#: /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:244
+#: /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:248
+#: /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:255
+#: /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?"
@@ -504,7 +494,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:260
+#: /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 "
@@ -512,7 +502,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:266
+#: /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"
@@ -521,12 +511,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:273
+#: /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:274
+#: /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"
@@ -534,7 +524,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:280
+#: /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 "
@@ -542,12 +532,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:285
+#: /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:286
+#: /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://"
@@ -557,7 +547,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:292
+#: /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 "
@@ -565,7 +555,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:298
+#: /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"
@@ -573,12 +563,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:303
+#: /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:304
+#: /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 "
@@ -586,7 +576,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:310
+#: /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 "
@@ -596,7 +586,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:318
+#: /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="
@@ -606,12 +596,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:327
+#: /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:328
+#: /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://"
@@ -621,7 +611,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:334
+#: /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 "
@@ -629,41 +619,40 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:340
+#: /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:344
+#: /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:345
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:342
 msgid ""
-"<a href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/"
-"Torouter\">Torouter</a> (<a href=\"https://trac.torproject.org/projects/tor/"
-"query?"
+"<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:351
+#: /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:355
+#: /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:356
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:353
 msgid ""
 "<a href=\"<page projects/vidalia>\">Vidalia</a> (<a href=\"https://svn."
 "torproject.org/vidalia/vidalia/trunk/\">code</a>, <a href=\"https://trac."
@@ -673,7 +662,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:362
+#: /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 "
@@ -682,7 +671,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:369
+#: /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="
@@ -691,12 +680,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:374
+#: /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:375
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:372
 msgid ""
 "<a href=\"http://www.atagar.com/arm/\">Arm</a> (<a href=\"https://svn."
 "torproject.org/svn/arm/trunk/\">code</a>, <a href=\"https://trac.torproject."
@@ -706,7 +695,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:381
+#: /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-"
@@ -714,19 +703,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:387
+#: /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:392
+#: /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:393
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:390
 msgid ""
 "<a href=\"https://guardianproject.info/apps/orbot/\">Orbot</a> (<a href="
 "\"https://svn.torproject.org/svn/projects/android/trunk/Orbot/\">code</a>, "
@@ -736,14 +725,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:399
+#: /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:404
+#: /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="
@@ -754,12 +743,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:411
+#: /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:412
+#: /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."
@@ -769,7 +758,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:418
+#: /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, "
@@ -779,24 +768,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:426
+#: /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:430
+#: /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:431
+#: /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:435
+#: /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 "
@@ -804,12 +793,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:440
+#: /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:441
+#: /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?"
@@ -818,19 +807,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:447
+#: /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:451
+#: /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:452
+#: /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://"
@@ -842,7 +831,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:460
+#: /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 "
@@ -850,12 +839,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:465
+#: /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:466
+#: /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/"
@@ -863,7 +852,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:470
+#: /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 "
@@ -871,12 +860,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:475
+#: /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:476
+#: /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</"
@@ -886,7 +875,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:482
+#: /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."
@@ -894,12 +883,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:488
+#: /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:489
+#: /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://svn.torproject.org/svn/"
@@ -910,19 +899,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:495
+#: /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:499
+#: /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:500
+#: /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/"
@@ -932,19 +921,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:506
+#: /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:510
+#: /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:511
+#: /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"
@@ -954,19 +943,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:517
+#: /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:521
+#: /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:522
+#: /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</"
@@ -976,7 +965,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:528
+#: /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 "
@@ -987,12 +976,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:536
+#: /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:537
+#: /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/"
@@ -1003,7 +992,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:544
+#: /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 "
@@ -1013,17 +1002,17 @@
 
 #
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:551
+#: /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:553
+#: /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:556
+#: /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 "
@@ -1038,12 +1027,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:570
+#: /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:572
+#: /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 "
@@ -1051,7 +1040,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:581
+#: /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> "
@@ -1062,7 +1051,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:587
+#: /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, "
@@ -1070,7 +1059,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:590
+#: /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 "
@@ -1078,19 +1067,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:593
+#: /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:597
+#: /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:599
+#: /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: "
@@ -1098,7 +1087,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:608
+#: /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 "
@@ -1107,7 +1096,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:612
+#: /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 "
@@ -1115,38 +1104,38 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:615
+#: /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:617
+#: /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:619
+#: /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:621
+#: /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:627
+#: /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:629
+#: /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> "
@@ -1154,14 +1143,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:638
+#: /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:641
+#: /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 "
@@ -1171,7 +1160,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:646
+#: /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 "
@@ -1183,19 +1172,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:653
+#: /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:656
+#: /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:658
+#: /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: "
@@ -1203,7 +1192,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:667
+#: /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"
@@ -1215,12 +1204,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:677
+#: /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:679
+#: /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 "
@@ -1228,7 +1217,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:688
+#: /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 "
@@ -1245,12 +1234,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:703
+#: /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:705
+#: /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: "
@@ -1258,7 +1247,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:714
+#: /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 "
@@ -1267,7 +1256,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:719
+#: /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 "
@@ -1282,7 +1271,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:730
+#: /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 "
@@ -1293,7 +1282,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:737
+#: /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 "
@@ -1302,12 +1291,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:744
+#: /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:746
+#: /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> "
@@ -1315,7 +1304,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:755
+#: /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 "
@@ -1324,7 +1313,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:760
+#: /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 "
@@ -1333,12 +1322,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:769
+#: /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:771
+#: /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 "
@@ -1346,7 +1335,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:780
+#: /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, "
@@ -1357,14 +1346,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:788
+#: /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:792
+#: /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 "
@@ -1377,21 +1366,21 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:801
+#: /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:804
+#: /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:807
+#: /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://"
@@ -1399,7 +1388,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:812
+#: /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 "
@@ -1407,7 +1396,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:816
+#: /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/"
@@ -1415,13 +1404,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:820
+#: /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:824
+#: /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/"
@@ -1432,12 +1421,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:828
+#: /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:830
+#: /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 "
@@ -1445,7 +1434,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:839
+#: /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 "
@@ -1455,7 +1444,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:845
+#: /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 "
@@ -1468,12 +1457,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:855
+#: /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:857
+#: /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 "
@@ -1481,7 +1470,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:867
+#: /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 "
@@ -1490,7 +1479,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:875
+#: /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. "
@@ -1500,7 +1489,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:883
+#: /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 "
@@ -1509,12 +1498,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:891
+#: /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:893
+#: /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 "
@@ -1522,7 +1511,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:903
+#: /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 "
@@ -1532,12 +1521,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:911
+#: /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:913
+#: /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 "
@@ -1545,7 +1534,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:923
+#: /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 "
@@ -1554,19 +1543,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:930
+#: /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:935
+#: /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:937
+#: /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: "
@@ -1574,7 +1563,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:946
+#: /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 "
@@ -1583,14 +1572,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:950
+#: /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:952
+#: /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 "
@@ -1599,7 +1588,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:956
+#: /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 "
@@ -1608,7 +1597,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:960
+#: /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 "
@@ -1617,12 +1606,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:966
+#: /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:968
+#: /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> "
@@ -1630,7 +1619,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:977
+#: /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 "
@@ -1638,7 +1627,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:980
+#: /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-"
@@ -1648,7 +1637,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:985
+#: /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 "
@@ -1659,7 +1648,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:991
+#: /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 "
@@ -1667,19 +1656,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:994
+#: /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:997
+#: /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:999
+#: /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 "
@@ -1687,7 +1676,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1009
+#: /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 "
@@ -1707,12 +1696,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1028
+#: /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:1030
+#: /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 "
@@ -1720,7 +1709,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1039
+#: /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 "
@@ -1733,7 +1722,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1047
+#: /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 "
@@ -1742,7 +1731,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1052
+#: /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 "
@@ -1754,7 +1743,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1060
+#: /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 "
@@ -1766,12 +1755,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1069
+#: /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:1071
+#: /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: "
@@ -1779,7 +1768,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1081
+#: /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 "
@@ -1789,7 +1778,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1090
+#: /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 "
@@ -1801,7 +1790,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1100
+#: /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 "
@@ -1809,19 +1798,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1106
+#: /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:1112
+#: /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:1114
+#: /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> "
@@ -1829,7 +1818,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1124
+#: /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 "
@@ -1843,12 +1832,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1137
+#: /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:1139
+#: /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: "
@@ -1856,7 +1845,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1149
+#: /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 "
@@ -1871,7 +1860,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1163
+#: /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 "
@@ -1881,7 +1870,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1171
+#: /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 "
@@ -1889,19 +1878,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1177
+#: /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:1179
+#: /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:1189
+#: /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)  "
@@ -1913,7 +1902,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1199
+#: /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://svn.torproject.org/svn/arm/trunk/src/util/"
@@ -1925,7 +1914,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1209
+#: /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> "
@@ -1935,34 +1924,34 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1221
+#: /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:1222
+#: /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:1224
+#: /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="
-"\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/"
-"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."
+"\"<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:1237
+#: /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 "
@@ -1972,7 +1961,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1243
+#: /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 "
@@ -1986,7 +1975,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1253
+#: /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 "
@@ -1995,7 +1984,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1259
+#: /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 "
@@ -2004,7 +1993,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1264
+#: /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 "
@@ -2017,7 +2006,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1275
+#: /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 "
@@ -2025,7 +2014,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1279
+#: /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> "
@@ -2036,7 +2025,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1286
+#: /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 "
@@ -2044,7 +2033,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1293
+#: /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="
@@ -2058,17 +2047,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1307
+#: /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:1308
+#: /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:1310
+#: /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:"
@@ -2082,7 +2071,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1320
+#: /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 "
@@ -2102,7 +2091,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1335
+#: /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 "
@@ -2121,7 +2110,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1350
+#: /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 "
@@ -2136,7 +2125,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1360
+#: /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 "
@@ -2148,7 +2137,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1367
+#: /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 "
@@ -2165,7 +2154,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1379
+#: /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 "
@@ -2176,7 +2165,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1386
+#: /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."
@@ -2192,7 +2181,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1397
+#: /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 "
@@ -2203,7 +2192,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1404
+#: /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 "
@@ -2211,7 +2200,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1407
+#: /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 "
@@ -2231,7 +2220,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1424
+#: /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 "
@@ -2239,7 +2228,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1432
+#: /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!"

Modified: translation/trunk/projects/website/po/templates/projects/4-optional.vidalia.pot
===================================================================
--- translation/trunk/projects/website/po/templates/projects/4-optional.vidalia.pot	2011-06-21 04:41:02 UTC (rev 24825)
+++ translation/trunk/projects/website/po/templates/projects/4-optional.vidalia.pot	2011-06-21 07:19:28 UTC (rev 24826)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-23 17:01+0200\n"
+"POT-Creation-Date: 2011-06-21 08:19+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -139,7 +139,7 @@
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/projects/en/vidalia.wml:83
-msgid "<strong>WARNING</strong> this are very alpha bundles."
+msgid "<strong>WARNING</strong> these are very alpha bundles."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
@@ -163,8 +163,8 @@
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/projects/en/vidalia.wml:94
 msgid ""
-"<a href=\"../dist/vidalia/vidalia-0.3.0.tar.gz\">Source Tarball</a> (<a href="
-"\"../dist/vidalia/vidalia-0.3.0-alpha.tar.gz.asc\">sig</a>)"
+"<a href=\"../dist/vidalia/vidalia-0.3.0-alpha.tar.gz\">Source Tarball</a> "
+"(<a href=\"../dist/vidalia/vidalia-0.3.0-alpha.tar.gz.asc\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><div>

Modified: translation/trunk/projects/website/po/templates/torbutton/3-low.index.pot
===================================================================
--- translation/trunk/projects/website/po/templates/torbutton/3-low.index.pot	2011-06-21 04:41:02 UTC (rev 24825)
+++ translation/trunk/projects/website/po/templates/torbutton/3-low.index.pot	2011-06-21 07:19:28 UTC (rev 24826)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-12-26 14:32+0000\n"
+"POT-Creation-Date: 2011-06-21 08:19+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,29 +17,29 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/torbutton/en/index.wml:8
+#: /home/runa/tor/website/torbutton/en/index.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page torbutton/index>"
 "\">Torbutton</a>"
 msgstr ""
 
 #. type: Attribute 'title' of: <div><div><link>
-#: /home/runa/transifex/website/torbutton/en/index.wml:14
+#: /home/runa/tor/website/torbutton/en/index.wml:14
 msgid "Google Canada"
 msgstr ""
 
 #. type: Attribute 'title' of: <div><div><link>
-#: /home/runa/transifex/website/torbutton/en/index.wml:15
+#: /home/runa/tor/website/torbutton/en/index.wml:15
 msgid "Google UK"
 msgstr ""
 
 #. type: Attribute 'title' of: <div><div><link>
-#: /home/runa/transifex/website/torbutton/en/index.wml:16
+#: /home/runa/tor/website/torbutton/en/index.wml:16
 msgid "Google USA"
 msgstr ""
 
 #. type: Content of: <div><div><script>
-#: /home/runa/transifex/website/torbutton/en/index.wml:19
+#: /home/runa/tor/website/torbutton/en/index.wml:19
 msgid ""
 "function addSearchProvider(prov) { try { window.external.AddSearchProvider"
 "(prov); } catch (e) { alert(\"Search plugins require Firefox 2\"); "
@@ -73,21 +73,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/torbutton/en/index.wml:86
+#: /home/runa/tor/website/torbutton/en/index.wml:86
 msgid "Torbutton"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/torbutton/en/index.wml:87
+#: /home/runa/tor/website/torbutton/en/index.wml:87
 msgid ""
 "<hr> <strong>Current stable version:</strong><version-torbutton><br/> "
 "<strong>Current alpha version:</strong><version-torbutton-alpha><br/> <br/> "
 "<strong>Authors:</strong> Mike Perry &amp; Scott Squires<br/> <br/> "
 "<strong>Install Stable:</strong> Click to <a href=\"https://www.torproject."
 "org/dist/torbutton/torbutton-current.xpi\" hash=\"<version-hash-torbutton>\" "
-"onclick=\"return install(event);\">install from this website</a> or <a href="
-"\"https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-"
-"latest.xpi?src=addondetail\">install from Mozilla's Add-On site</a><br/> "
+"onclick=\"return install(event);\">install from this website</a>.<br/> "
 "<strong>Install Alpha:</strong> Click to <a href=\"https://www.torproject."
 "org/dist/torbutton/torbutton-current-alpha.xpi\" hash=\"<version-hash-"
 "torbutton-alpha>\" onclick=\"return install(event);\">install from this "
@@ -97,24 +95,24 @@
 "\">Google CA</a>, and <a href=\"/jsreq.html\" title=\"Ref: 14938 "
 "(googleCA)\" onClick=\"addOpenSearch"
 "('googleuk_web','png','General','14445','g');return false\">Google UK</a>.  "
-"<br/> <strong>Past Releases:</strong> <a href=\"../dist/torbutton/\">Local</"
-"a><br/> <br/> <strong>Developer Documentation:</strong> <a href=\"en/design/"
-"index.html.en\">Torbutton Design Document</a> and <a href=\"en/design/"
-"MozillaBrownBag.pdf\">Slides (Not actively updated)</a><br/> <strong>Source:"
-"</strong> You can <a href=\"https://gitweb.torproject.org/torbutton.git"
-"\">browse the repository</a> or simply unzip the xpi.  <br/> <strong>Bug "
-"Reports:</strong> <a href=\"https://trac.torproject.org/projects/tor/"
-"report/14\">Torproject Bug Tracker</a><br/> <strong>Documents:</strong> <b>"
-"[</b> <a href=\"<page torbutton/torbutton-faq>\">FAQ</a> <b>|</b> <a href="
-"\"https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CHANGELOG"
-"\">changelog</a> <b>|</b> <a href=\"https://gitweb.torproject.org/torbutton."
-"git/blob/HEAD:/src/LICENSE\">license</a> <b>|</b> <a href=\"https://gitweb."
-"torproject.org/torbutton.git/blob/HEAD:/src/CREDITS\">credits</a> <b>]</"
-"b><br/> <br/>"
+"<br/> <strong>Past Releases:</strong> <a href=\"https://archive.torproject."
+"org/tor-package-archive/torbutton/\">Tor Archive</a><br/> <br/> "
+"<strong>Developer Documentation:</strong> <a href=\"en/design/index.html.en"
+"\">Torbutton Design Document</a> and <a href=\"en/design/MozillaBrownBag.pdf"
+"\">Slides (Not actively updated)</a><br/> <strong>Source:</strong> You can "
+"<a href=\"https://gitweb.torproject.org/torbutton.git\">browse the "
+"repository</a> or simply unzip the xpi.  <br/> <strong>Bug Reports:</strong> "
+"<a href=\"https://trac.torproject.org/projects/tor/report/14\">Torproject "
+"Bug Tracker</a><br/> <strong>Documents:</strong> <b>[</b> <a href=\"<page "
+"torbutton/torbutton-faq>\">FAQ</a> <b>|</b> <a href=\"https://gitweb."
+"torproject.org/torbutton.git/blob/HEAD:/src/CHANGELOG\">changelog</a> <b>|</"
+"b> <a href=\"https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/"
+"LICENSE\">license</a> <b>|</b> <a href=\"https://gitweb.torproject.org/"
+"torbutton.git/blob/HEAD:/src/CREDITS\">credits</a> <b>]</b><br/> <br/>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/torbutton/en/index.wml:129
+#: /home/runa/tor/website/torbutton/en/index.wml:127
 msgid ""
 "Torbutton is a 1-click way for Firefox users to enable or disable the "
 "browser's use of <a href=\"<page index>\">Tor</a>.  It adds a panel to the "
@@ -125,7 +123,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/torbutton/en/index.wml:138
+#: /home/runa/tor/website/torbutton/en/index.wml:136
 msgid ""
 "To keep you safe, Torbutton disables many types of active content. You can "
 "learn more from the <a href=\"<page torbutton/torbutton-faq>\">Torbutton "
@@ -134,7 +132,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/torbutton/en/index.wml:145
+#: /home/runa/tor/website/torbutton/en/index.wml:143
 msgid ""
 "Some users may prefer a toolbar button instead of a statusbar panel.  "
 "Torbutton lets you add a toolbar button by right-clicking on the desired "



More information about the tor-commits mailing list