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

[tor-commits] r24616: {translation} updated the pot files for the website (in translation/trunk/projects/website/po/templates: about docs download getinvolved press projects)



Author: runa
Date: 2011-04-13 15:28:29 +0000 (Wed, 13 Apr 2011)
New Revision: 24616

Modified:
   translation/trunk/projects/website/po/templates/about/2-medium.overview.pot
   translation/trunk/projects/website/po/templates/about/3-low.contact.pot
   translation/trunk/projects/website/po/templates/about/4-optional.gsoc.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-relay.pot
   translation/trunk/projects/website/po/templates/docs/3-low.rpms.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/4-optional.volunteer.pot
   translation/trunk/projects/website/po/templates/press/3-low.inthemedia.pot
   translation/trunk/projects/website/po/templates/press/4-optional.2008-12-19-roadmap-press-release.pot
   translation/trunk/projects/website/po/templates/press/4-optional.2009-03-12-performance-roadmap-press-release.pot
   translation/trunk/projects/website/po/templates/press/4-optional.2010-03-25-tor-store-press-release.pot
   translation/trunk/projects/website/po/templates/press/4-optional.2010-09-16-ten-things-circumvention-tools.pot
   translation/trunk/projects/website/po/templates/projects/1-high.torbrowser.pot
Log:
updated the pot files for the website

Modified: translation/trunk/projects/website/po/templates/about/2-medium.overview.pot
===================================================================
--- translation/trunk/projects/website/po/templates/about/2-medium.overview.pot	2011-04-13 15:27:51 UTC (rev 24615)
+++ translation/trunk/projects/website/po/templates/about/2-medium.overview.pot	2011-04-13 15:28:29 UTC (rev 24616)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-03-01 16:37+0000\n"
+"POT-Creation-Date: 2011-04-13 16:28+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -23,22 +23,22 @@
 "\">About &raquo; </a>"
 msgstr ""
 
-#. type: Content of: <div><div>
+#. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/about/en/overview.wml:12
-msgid "<a name=\"overview\"></a>"
+msgid "Tor: Overview"
 msgstr ""
 
-#. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/about/en/overview.wml:13
-msgid "<a class=\"anchor\" href=\"#overview\">Tor: Overview</a>"
-msgstr ""
-
 #. type: Content of: <div><div><div><h3>
-#: /home/runa/tor/website/about/en/overview.wml:16
+#: /home/runa/tor/website/about/en/overview.wml:15
 msgid "Topics"
 msgstr ""
 
 #. type: Content of: <div><div><div><ul><li>
+#: /home/runa/tor/website/about/en/overview.wml:17
+msgid "<a href=\"<page about/overview>#inception\">Inception</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
 #: /home/runa/tor/website/about/en/overview.wml:18
 msgid "<a href=\"<page about/overview>#overview\">Overview</a>"
 msgstr ""
@@ -72,12 +72,39 @@
 #.  END SIDEBAR 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/about/en/overview.wml:28
-msgid "<hr>"
+msgid "<hr> <a name=\"inception\"></a>"
 msgstr ""
 
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/about/en/overview.wml:31
+msgid "<a class=\"anchor\" href=\"#inception\">Inception</a>"
+msgstr ""
+
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/overview.wml:31
+#: /home/runa/tor/website/about/en/overview.wml:34
 msgid ""
+"Tor was originally designed, implemented, and deployed as a third-generation "
+"<a href=\"http://www.onion-router.net/\";>onion routing project of the U.S. "
+"Naval Research Laboratory</a>.  It was originally developed with the U.S. "
+"Navy in mind, for the primary purpose of protecting government "
+"communications.  Today, it is used every day for a wide variety of purposes "
+"by normal people, the military, journalists, law enforcement officers, "
+"activists, and many others."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/overview.wml:43
+msgid "<a name=\"overview\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/about/en/overview.wml:44
+msgid "<a class=\"anchor\" href=\"#overview\">Overview</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/overview.wml:47
+msgid ""
 "Tor is a network of virtual tunnels that allows people and groups to improve "
 "their privacy and security on the Internet.  It also enables software "
 "developers to create new communication tools with built-in privacy "
@@ -87,7 +114,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/overview.wml:41
+#: /home/runa/tor/website/about/en/overview.wml:57
 msgid ""
 "Individuals use Tor to keep websites from tracking them and their family "
 "members, or to connect to news sites, instant messaging services, or the "
@@ -99,7 +126,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/overview.wml:52
+#: /home/runa/tor/website/about/en/overview.wml:68
 msgid ""
 "Journalists use Tor to communicate more safely with whistleblowers and "
 "dissidents. Non-governmental organizations (NGOs) use Tor to allow their "
@@ -109,7 +136,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/overview.wml:60
+#: /home/runa/tor/website/about/en/overview.wml:76
 msgid ""
 "Groups such as Indymedia recommend Tor for safeguarding their members' "
 "online privacy and security. Activist groups like the Electronic Frontier "
@@ -123,7 +150,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/overview.wml:73
+#: /home/runa/tor/website/about/en/overview.wml:89
 msgid ""
 "A branch of the U.S. Navy uses Tor for open source intelligence gathering, "
 "and one of its teams used Tor while deployed in the Middle East recently. "
@@ -133,7 +160,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/overview.wml:81
+#: /home/runa/tor/website/about/en/overview.wml:97
 msgid ""
 "The variety of people who use Tor is actually <a href=\"http://freehaven.net/";
 "doc/fc03/econymics.pdf\">part of what makes it so secure</a>.  Tor hides you "
@@ -143,17 +170,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/overview.wml:89
+#: /home/runa/tor/website/about/en/overview.wml:105
 msgid "<a name=\"whyweneedtor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/overview.wml:90
+#: /home/runa/tor/website/about/en/overview.wml:106
 msgid "<a class=\"anchor\" href=\"#whyweneedtor\">Why we need Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/overview.wml:93
+#: /home/runa/tor/website/about/en/overview.wml:109
 msgid ""
 "Using Tor protects you against a common form of Internet surveillance known "
 "as \"traffic analysis.\" Traffic analysis can be used to infer who is "
@@ -169,7 +196,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/overview.wml:108
+#: /home/runa/tor/website/about/en/overview.wml:124
 msgid ""
 "How does traffic analysis work? Internet data packets have two parts: a data "
 "payload and a header used for routing.  The data payload is whatever is "
@@ -181,7 +208,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/overview.wml:118
+#: /home/runa/tor/website/about/en/overview.wml:134
 msgid ""
 "A basic problem for the privacy minded is that the recipient of your "
 "communications can see that you sent it by looking at headers.  So can "
@@ -192,7 +219,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/overview.wml:127
+#: /home/runa/tor/website/about/en/overview.wml:143
 msgid ""
 "But there are also more powerful kinds of traffic analysis.  Some attackers "
 "spy on multiple parts of the Internet and use sophisticated statistical "
@@ -203,24 +230,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/overview.wml:135
+#: /home/runa/tor/website/about/en/overview.wml:151
 msgid "<a name=\"thesolution\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/overview.wml:136
+#: /home/runa/tor/website/about/en/overview.wml:152
 msgid ""
 "<a class=\"anchor\" href=\"#thesolution\">The solution: a distributed, "
 "anonymous network</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/overview.wml:137
+#: /home/runa/tor/website/about/en/overview.wml:153
 msgid "<img src=\"$(IMGROOT)/htw1.png\" alt=\"How Tor works\">"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/overview.wml:140
+#: /home/runa/tor/website/about/en/overview.wml:156
 msgid ""
 "Tor helps to reduce the risks of both simple and sophisticated traffic "
 "analysis by distributing your transactions over several places on the "
@@ -234,7 +261,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/overview.wml:152
+#: /home/runa/tor/website/about/en/overview.wml:168
 msgid ""
 "To create a private network pathway with Tor, the user's software or client "
 "incrementally builds a circuit of encrypted connections through relays on "
@@ -247,12 +274,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/overview.wml:162
+#: /home/runa/tor/website/about/en/overview.wml:178
 msgid "<img alt=\"Tor circuit step two\" src=\"$(IMGROOT)/htw2.png\">"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/overview.wml:165
+#: /home/runa/tor/website/about/en/overview.wml:181
 msgid ""
 "Once a circuit has been established, many kinds of data can be exchanged and "
 "several different sorts of software applications can be deployed over the "
@@ -263,7 +290,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/overview.wml:175
+#: /home/runa/tor/website/about/en/overview.wml:191
 msgid ""
 "For efficiency, the Tor software uses the same circuit for connections that "
 "happen within the same ten minutes or so.  Later requests are given a new "
@@ -271,22 +298,22 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/overview.wml:181
+#: /home/runa/tor/website/about/en/overview.wml:197
 msgid "<img alt=\"Tor circuit step three\" src=\"$(IMGROOT)/htw3.png\">"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/overview.wml:184
+#: /home/runa/tor/website/about/en/overview.wml:200
 msgid "<a name=\"hiddenservices\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/overview.wml:185
+#: /home/runa/tor/website/about/en/overview.wml:201
 msgid "<a class=\"anchor\" href=\"#hiddenservices\">Hidden services</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/overview.wml:188
+#: /home/runa/tor/website/about/en/overview.wml:204
 msgid ""
 "Tor also makes it possible for users to hide their locations while offering "
 "various kinds of services, such as web publishing or an instant messaging "
@@ -301,17 +328,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/overview.wml:201
+#: /home/runa/tor/website/about/en/overview.wml:217
 msgid "<a name=\"stayinganonymous\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/overview.wml:202
+#: /home/runa/tor/website/about/en/overview.wml:218
 msgid "<a class=\"anchor\" href=\"#stayinganonymous\">Staying anonymous</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/overview.wml:205
+#: /home/runa/tor/website/about/en/overview.wml:221
 msgid ""
 "Tor can't solve all anonymity problems.  It focuses only on protecting the "
 "transport of data.  You need to use protocol-specific support software if "
@@ -321,7 +348,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/overview.wml:214
+#: /home/runa/tor/website/about/en/overview.wml:230
 msgid ""
 "Also, to protect your anonymity, be smart.  Don't provide your name or other "
 "revealing information in web forms.  Be aware that, like all anonymizing "
@@ -333,17 +360,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/overview.wml:223
+#: /home/runa/tor/website/about/en/overview.wml:239
 msgid "<a name=\"thefutureoftor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/about/en/overview.wml:224
+#: /home/runa/tor/website/about/en/overview.wml:240
 msgid "<a class=\"anchor\" href=\"#thefutureoftor\">The future of Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/overview.wml:227
+#: /home/runa/tor/website/about/en/overview.wml:243
 msgid ""
 "Providing a usable anonymizing network on the Internet today is an ongoing "
 "challenge. We want software that meets users' needs. We also want to keep "
@@ -358,7 +385,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/overview.wml:241
+#: /home/runa/tor/website/about/en/overview.wml:257
 msgid ""
 "Ongoing trends in law, policy, and technology threaten anonymity as never "
 "before, undermining our ability to speak and read freely online. These "

Modified: translation/trunk/projects/website/po/templates/about/3-low.contact.pot
===================================================================
--- translation/trunk/projects/website/po/templates/about/3-low.contact.pot	2011-04-13 15:27:51 UTC (rev 24615)
+++ translation/trunk/projects/website/po/templates/about/3-low.contact.pot	2011-04-13 15:28:29 UTC (rev 24616)
@@ -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-04-13 16:28+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,19 +17,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/about/en/contact.wml:9
+#: /home/runa/tor/website/about/en/contact.wml:9
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page about/overview>"
 "\">About &raquo; </a> <a href=\"<page about/contact>\">Contact</a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/dev/website/about/en/contact.wml:14
+#: /home/runa/tor/website/about/en/contact.wml:14
 msgid "Tor: Contact"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/about/en/contact.wml:16
+#: /home/runa/tor/website/about/en/contact.wml:16
 msgid ""
 "First, if you have a problem or question about using Tor, go look at the <a "
 "href=\"<page docs/documentation>#Support\">Support section</a> for how to "
@@ -40,7 +40,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/about/en/contact.wml:18
+#: /home/runa/tor/website/about/en/contact.wml:18
 msgid ""
 "If you really do need to reach us, here are some approaches. Please be "
 "patient and <a href=\"http://www.catb.org/~esr/faqs/smart-questions.html";
@@ -48,21 +48,21 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/about/en/contact.wml:21
+#: /home/runa/tor/website/about/en/contact.wml:21
 msgid ""
-"<i>tor-assistants at lists.torproject.org</i> is the catch-all address for "
+"<i>tor-assistants at torproject.org</i> is the catch-all address for "
 "everything. It can be used for:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/about/en/contact.wml:25
+#: /home/runa/tor/website/about/en/contact.wml:25
 msgid ""
 "Contacting the people who manage the directory authorities. Use this if you "
 "run a Tor relay and have a question or problem with your relay."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/about/en/contact.wml:28
+#: /home/runa/tor/website/about/en/contact.wml:28
 msgid ""
 "So we can fix typos on the website, change wrong statements or directions on "
 "the website, and add new sections and paragraphs that you send us. You might "
@@ -71,7 +71,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/about/en/contact.wml:32
+#: /home/runa/tor/website/about/en/contact.wml:32
 msgid ""
 "Hearing about your documents, patches, testing, experiences with supporting "
 "applications, and so forth inspired by our <a href=\"<page getinvolved/"
@@ -83,12 +83,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/about/en/contact.wml:42
+#: /home/runa/tor/website/about/en/contact.wml:42
 msgid "A few other addresses are more specific:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/about/en/contact.wml:45
+#: /home/runa/tor/website/about/en/contact.wml:45
 msgid ""
 "<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page "
 "getinvolved/translation>\">website translations</a> into place, and help "
@@ -96,14 +96,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/about/en/contact.wml:48
+#: /home/runa/tor/website/about/en/contact.wml:48
 msgid ""
 "<i>tordnsel at torproject.org</i> is the alias for the people responsible "
 "for the tordns exitlist."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/about/en/contact.wml:50
+#: /home/runa/tor/website/about/en/contact.wml:50
 msgid ""
 "<i>donations at torproject.org</i> is for questions and comments about <a "
 "href=\"<page donate/donate>\">getting money to the developers</a>. More "
@@ -112,7 +112,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/about/en/contact.wml:55
+#: /home/runa/tor/website/about/en/contact.wml:55
 msgid ""
 "<i>execdir at torproject.org</i> is for press/media, questions and comments "
 "about Tor the non-profit corporation: trademark questions, affiliation and "
@@ -121,21 +121,21 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/about/en/contact.wml:61
+#: /home/runa/tor/website/about/en/contact.wml:61
 msgid ""
 "<a id=\"irc\"></a> Tor users and developers can also be found in the "
 "following channels on <a href=\"http://www.oftc.net/oftc/\";>oftc</a>:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/about/en/contact.wml:66
+#: /home/runa/tor/website/about/en/contact.wml:66
 msgid ""
 "<i>#tor</i> - User and relay operation discussions. Having trouble running "
 "Tor or a question for other Tor users? Then this is the spot for you."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/about/en/contact.wml:69
+#: /home/runa/tor/website/about/en/contact.wml:69
 msgid ""
 "<i>#tor-dev</i> - Channel for people who want to do development.  "
 "Discussions about Tor related coding, protocols, and <a href=\"<page "
@@ -143,7 +143,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/about/en/contact.wml:72
+#: /home/runa/tor/website/about/en/contact.wml:72
 msgid ""
 "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that "
 "is not related to Tor."

Modified: translation/trunk/projects/website/po/templates/about/4-optional.gsoc.pot
===================================================================
--- translation/trunk/projects/website/po/templates/about/4-optional.gsoc.pot	2011-04-13 15:27:51 UTC (rev 24615)
+++ translation/trunk/projects/website/po/templates/about/4-optional.gsoc.pot	2011-04-13 15:28:29 UTC (rev 24616)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-03-25 16:51+0000\n"
+"POT-Creation-Date: 2011-04-13 16:28+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -200,23 +200,24 @@
 "descriptions of what you're going to do, with more details about the parts "
 "you expect to be tricky. Your proposal should also try to break down the "
 "project into tasks of a fairly fine granularity, and convince us you have a "
-"plan for finishing it."
+"plan for finishing it. A timeline for what you will be doing throughout the "
+"summer is highly recommended."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/about/en/gsoc.wml:134
+#: /home/runa/tor/website/about/en/gsoc.wml:135
 msgid ""
 "Point us to a code sample: something good and clean to demonstrate that you "
 "know what you're doing, ideally from an existing project."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/about/en/gsoc.wml:137
+#: /home/runa/tor/website/about/en/gsoc.wml:138
 msgid "Why do you want to work with The Tor Project / EFF in particular?"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/about/en/gsoc.wml:140
+#: /home/runa/tor/website/about/en/gsoc.wml:141
 msgid ""
 "Tell us about your experiences in free software development environments. We "
 "especially want to hear examples of how you have collaborated with others "
@@ -224,7 +225,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/about/en/gsoc.wml:145
+#: /home/runa/tor/website/about/en/gsoc.wml:146
 msgid ""
 "Will you be working full-time on the project for the summer, or will you "
 "have other commitments too (a second job, classes, etc)? If you won't be "
@@ -234,7 +235,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/about/en/gsoc.wml:151
+#: /home/runa/tor/website/about/en/gsoc.wml:152
 msgid ""
 "Will your project need more work and/or maintenance after the summer ends? "
 "What are the chances you will stick around and help out with that and other "
@@ -242,7 +243,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/about/en/gsoc.wml:155
+#: /home/runa/tor/website/about/en/gsoc.wml:156
 msgid ""
 "What is your ideal approach to keeping everybody informed of your progress, "
 "problems, and questions over the course of the project? Said another way, "
@@ -250,14 +251,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/about/en/gsoc.wml:159
+#: /home/runa/tor/website/about/en/gsoc.wml:160
 msgid ""
 "What school are you attending? What year are you, and what's your major/"
 "degree/focus? If you're part of a research group, which one?"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/about/en/gsoc.wml:162
+#: /home/runa/tor/website/about/en/gsoc.wml:163
 msgid ""
 "How can we contact you to ask you further questions? Google doesn't share "
 "your contact details with us automatically, so you should include that in "
@@ -266,14 +267,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/about/en/gsoc.wml:168
+#: /home/runa/tor/website/about/en/gsoc.wml:169
 msgid ""
 "Is there anything else we should know that will make us like your project "
 "more?"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/gsoc.wml:174
+#: /home/runa/tor/website/about/en/gsoc.wml:175
 msgid ""
 "We will pick out mentors for this year &mdash; most of the people on the <a "
 "href=\"<page about/corepeople>\">core Tor development team</a> plus a few "
@@ -287,7 +288,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/gsoc.wml:186
+#: /home/runa/tor/website/about/en/gsoc.wml:187
 msgid ""
 "If you're interested, you can either contact the <a href=\"<page about/"
 "contact>\">tor-assistants list</a> with a brief summary of your proposal and "
@@ -299,7 +300,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/gsoc.wml:196
+#: /home/runa/tor/website/about/en/gsoc.wml:197
 msgid ""
 "The more applications we get, the more likely Google is to give us good "
 "students. So if you haven't filled up your summer plans yet, please consider "
@@ -307,17 +308,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/gsoc.wml:201
+#: /home/runa/tor/website/about/en/gsoc.wml:202
 msgid "<a id=\"Example\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/about/en/gsoc.wml:202
+#: /home/runa/tor/website/about/en/gsoc.wml:203
 msgid "<a class=\"anchor\" href=\"#Example\">Application Examples</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/gsoc.wml:205
+#: /home/runa/tor/website/about/en/gsoc.wml:206
 msgid ""
 "Below are examples of some GSoC applications from previous years we liked.  "
 "The best applications tend to go through several iterations so you're highly "
@@ -325,28 +326,28 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><h4>
-#: /home/runa/tor/website/about/en/gsoc.wml:211
+#: /home/runa/tor/website/about/en/gsoc.wml:212
 msgid ""
 "<a href=\"http://tor.spanning-tree.org/proposal.html\";>DNSEL Rewrite</a> by "
 "Harry Bock"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><h4>
-#: /home/runa/tor/website/about/en/gsoc.wml:212
+#: /home/runa/tor/website/about/en/gsoc.wml:213
 msgid ""
 "<a href=\"http://kjb.homeunix.com/wp-content/uploads/2010/05/KevinBerry-";
 "GSoC2010-TorProposal.html\">Extending Tor Network Metrics</a> by Kevin Berry"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><h4>
-#: /home/runa/tor/website/about/en/gsoc.wml:213
+#: /home/runa/tor/website/about/en/gsoc.wml:214
 msgid ""
 "<a href=\"../about/gsocProposal/gsoc10-proposal-soat.txt\">SOAT Expansion</"
 "a> by John Schanck"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><h4>
-#: /home/runa/tor/website/about/en/gsoc.wml:214
+#: /home/runa/tor/website/about/en/gsoc.wml:215
 msgid ""
 "<a href=\"http://www.atagar.com/misc/gsocBlog09/\";>Website Pootle "
 "Translation</a> by Damian Johnson"

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-04-13 15:27:51 UTC (rev 24615)
+++ translation/trunk/projects/website/po/templates/docs/1-high.tor-doc-windows.pot	2011-04-13 15:28:29 UTC (rev 24616)
@@ -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-04-13 16:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -32,8 +32,8 @@
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:14
-#: /tmp/aFRjTXc1En.xml:36 /tmp/aFRjTXc1En.xml:72 /tmp/aFRjTXc1En.xml:111
-#: /tmp/aFRjTXc1En.xml:154
+#: /tmp/4CEPROVVx3.xml:36 /tmp/4CEPROVVx3.xml:72 /tmp/4CEPROVVx3.xml:111
+#: /tmp/4CEPROVVx3.xml:154
 msgid "<br>"
 msgstr ""
 
@@ -50,7 +50,7 @@
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:24
 msgid ""
 "Freedom House has produced a video on how to install Tor.  You can view it "
-"at <a href=\"http://media.torproject.org/video/2009-install-and-use-tor.ogv";
+"at <a href=\"https://media.torproject.org/video/2009-install-and-use-tor.ogv";
 "\">How to install Tor on Windows</a>.  Know of a better video, or one "
 "translated into your language? Let us know!"
 msgstr ""

Modified: translation/trunk/projects/website/po/templates/docs/2-medium.documentation.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/2-medium.documentation.pot	2011-04-13 15:27:51 UTC (rev 24615)
+++ translation/trunk/projects/website/po/templates/docs/2-medium.documentation.pot	2011-04-13 15:28:29 UTC (rev 24616)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-03-17 18:04+0000\n"
+"POT-Creation-Date: 2011-04-13 16:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -139,25 +139,20 @@
 #. type: Content of: <div><div><ol><li>
 #: /home/runa/tor/website/docs/en/documentation.wml:86
 msgid ""
-"Download and watch Roger's overview talk from What The Hack (<a href="
-"\"http://freehaven.net/~arma/wth-anonymous-communication-58.mp4\";>video</a>, "
-"<a href=\"http://freehaven.net/~arma/wth1.pdf\";>slides</a>, <a href=\"http://";
-"wiki.whatthehack.org/index.php/"
-"Anonymous_communication_for_the_United_States_Department_of_Defense...and_you"
-"\">abstract</a>).  This talk was given in July 2005, back when we were "
-"funded by EFF and back when the network was quite small, but it still "
-"provides good background on how Tor works and what it's for."
+"Download and watch Roger's <a href=\"https://media.torproject.org/video/tor-";
+"internet-days-2010.mp4\">overview talk from Internet Days in Sweden</a>, "
+"which provides good background on how Tor works and what it's for."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:96
+#: /home/runa/tor/website/docs/en/documentation.wml:93
 msgid ""
 "Look through our <a href=\"#DesignDoc\">Design Documents</a>. Notice that we "
 "have RFC-style specs to tell you exactly how Tor is built."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:102
+#: /home/runa/tor/website/docs/en/documentation.wml:99
 msgid ""
 "There's a skeletal <a href=\"https://svn.torproject.org/svn/projects/";
 "roadmaps/2008-12-19-roadmap-full.pdf\">list of items we'd like to tackle in "
@@ -167,7 +162,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:111
+#: /home/runa/tor/website/docs/en/documentation.wml:108
 msgid ""
 "Download and watch Nick's \"Technical changes since 2004\" talk from Defcon "
 "in July 2007 (<a href=\"http://freehaven.net/~arma/Defcon15-Mathewson-";
@@ -190,7 +185,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:133
+#: /home/runa/tor/website/docs/en/documentation.wml:130
 msgid ""
 "See Mike's \"Securing the Tor network\" talk from Defcon in July 2007 (<a "
 "href=\"http://freehaven.net/~arma/Defcon15-Mike_Perry-";
@@ -202,7 +197,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:143
+#: /home/runa/tor/website/docs/en/documentation.wml:140
 msgid ""
 "Learn about the <a href=\"<specblob>proposals/001-process.txt\">Tor proposal "
 "process for changing our design</a>, and look over the <a href="
@@ -210,7 +205,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:150
+#: /home/runa/tor/website/docs/en/documentation.wml:147
 msgid ""
 "Our <a href=\"<gitblob>doc/TODO\">developer TODO file</a> starts with a "
 "timeline for external promises &mdash; things <a href=\"<page about/sponsors>"
@@ -219,7 +214,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:157
+#: /home/runa/tor/website/docs/en/documentation.wml:154
 msgid ""
 "Once you're up to speed, things will continue to change surprisingly fast.  "
 "The <a href=\"#MailingLists\">tor-dev mailing list</a> is where the complex "
@@ -228,17 +223,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/documentation.wml:165
+#: /home/runa/tor/website/docs/en/documentation.wml:162
 msgid "<a id=\"MailingLists\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/docs/en/documentation.wml:166
+#: /home/runa/tor/website/docs/en/documentation.wml:163
 msgid "<a class=\"anchor\" href=\"#MailingLists\">Mailing List Information</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:168
+#: /home/runa/tor/website/docs/en/documentation.wml:165
 msgid ""
 "The <a href=\"https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-";
 "announce/\">tor-announce mailing list</a> is a low volume list for "
@@ -249,7 +244,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:174
+#: /home/runa/tor/website/docs/en/documentation.wml:171
 msgid ""
 "The <a href=\"https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-talk/";
 "\">tor-talk list</a> is where a lot of discussion happens, and is where we "
@@ -257,7 +252,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:177
+#: /home/runa/tor/website/docs/en/documentation.wml:174
 msgid ""
 "The <a href=\"https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-";
 "relays/\">tor-relays list</a> is where discussions about running, "
@@ -266,7 +261,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:181
+#: /home/runa/tor/website/docs/en/documentation.wml:178
 msgid ""
 "The <a href=\"https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev/";
 "\">tor-dev list</a> is for posting by developers only, and is very low "
@@ -274,22 +269,22 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:183
+#: /home/runa/tor/website/docs/en/documentation.wml:180
 msgid ""
-"A list for <a href=\"http://archives.seul.org/tor/mirrors/\";>mirror "
-"operators</a> for new website mirrors, and supporting <a href=\"<page "
-"getinvolved/mirrors>\">current website mirrors</a>."
+"A list for <a href=\"https://lists.torproject.org/cgi-bin/mailman/listinfo/";
+"tor-mirrors\">mirror operators</a> for new website mirrors, and supporting "
+"<a href=\"<page getinvolved/mirrors>\">current website mirrors</a>."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:186
+#: /home/runa/tor/website/docs/en/documentation.wml:183
 msgid ""
 "A list for <a href=\"https://lists.torproject.org/cgi-bin/mailman/listinfo/";
 "tor-commits/\">svn and git commits</a> may be interesting for developers."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:188
+#: /home/runa/tor/website/docs/en/documentation.wml:185
 msgid ""
 "An automated list for <a href=\"https://lists.torproject.org/cgi-bin/mailman/";
 "listinfo/tor-bugs/\">bug reports from trac</a> may be interesting for users "
@@ -297,17 +292,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/documentation.wml:192
+#: /home/runa/tor/website/docs/en/documentation.wml:189
 msgid "<a id=\"DesignDoc\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/docs/en/documentation.wml:193
+#: /home/runa/tor/website/docs/en/documentation.wml:190
 msgid "<a class=\"anchor\" href=\"#DesignDoc\">Design Documents</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:195
+#: /home/runa/tor/website/docs/en/documentation.wml:192
 msgid ""
 "The <b>design document</b> (published at Usenix Security 2004)  gives our "
 "justifications and security analysis for the Tor design: <a href=\"https://";
@@ -317,7 +312,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:200
+#: /home/runa/tor/website/docs/en/documentation.wml:197
 msgid ""
 "Our follow-up paper on <b>challenges in low-latency anonymity</b> (still in "
 "draft form) details more recent experiences and directions: <a href="
@@ -326,7 +321,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:204
+#: /home/runa/tor/website/docs/en/documentation.wml:201
 msgid ""
 "Our paper at WEIS 2006 &mdash; <b>Anonymity Loves Company: Usability and the "
 "Network Effect</b> &mdash; explains why usability in anonymity systems "
@@ -335,7 +330,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:208
+#: /home/runa/tor/website/docs/en/documentation.wml:205
 msgid ""
 "Our preliminary design to make it harder for large firewalls to prevent "
 "access to the Tor network is described in <b>design of a blocking-resistant "
@@ -346,19 +341,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:214
+#: /home/runa/tor/website/docs/en/documentation.wml:211
 msgid ""
 "The <b>specifications</b> aim to give developers enough information to build "
 "a compatible version of Tor:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:217
+#: /home/runa/tor/website/docs/en/documentation.wml:214
 msgid "<a href=\"<specblob>tor-spec.txt\">Main Tor specification</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:218
+#: /home/runa/tor/website/docs/en/documentation.wml:215
 msgid ""
 "<a href=\"<specblob>dir-spec.txt\">Tor version 3 directory server "
 "specification</a> (and older <a href=\"<specblob>dir-spec-v1.txt\">version "
@@ -367,72 +362,72 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:223
+#: /home/runa/tor/website/docs/en/documentation.wml:220
 msgid ""
 "<a href=\"<specblob>control-spec.txt\">Tor control protocol specification</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:225
+#: /home/runa/tor/website/docs/en/documentation.wml:222
 msgid "<a href=\"<specblob>rend-spec.txt\">Tor rendezvous specification</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:227
+#: /home/runa/tor/website/docs/en/documentation.wml:224
 msgid ""
 "<a href=\"<specblob>path-spec.txt\">Tor path selection specification</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:229
+#: /home/runa/tor/website/docs/en/documentation.wml:226
 msgid "<a href=\"<specblob>address-spec.txt\">Special hostnames in Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:231
+#: /home/runa/tor/website/docs/en/documentation.wml:228
 msgid ""
 "<a href=\"<specblob>socks-extensions.txt\">Tor's SOCKS support and "
 "extensions</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:233
+#: /home/runa/tor/website/docs/en/documentation.wml:230
 msgid "<a href=\"<specblob>version-spec.txt\">How Tor version numbers work</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:235
+#: /home/runa/tor/website/docs/en/documentation.wml:232
 msgid ""
 "<a href=\"<spectree>proposals\">In-progress drafts of new specifications and "
 "proposed changes</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/documentation.wml:241
+#: /home/runa/tor/website/docs/en/documentation.wml:238
 msgid "<a id=\"NeatLinks\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/docs/en/documentation.wml:242
+#: /home/runa/tor/website/docs/en/documentation.wml:239
 msgid "<a class=\"anchor\" href=\"#NeatLinks\">Neat Links</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:244
+#: /home/runa/tor/website/docs/en/documentation.wml:241
 msgid ""
 "The <a href=\"<wiki>\">Tor wiki</a> provides a plethora of helpful "
 "contributions from Tor users. Check it out!"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:247
+#: /home/runa/tor/website/docs/en/documentation.wml:244
 msgid ""
 "<a href=\"<wiki>TheOnionRouter/SupportPrograms\">A list of supporting "
 "programs you might want to use in association with Tor</a>."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:251
+#: /home/runa/tor/website/docs/en/documentation.wml:248
 msgid ""
 "<a href=\"https://check.torproject.org/\";>The Tor detector</a> or <a href="
 "\"http://torcheck.xenobite.eu/\";>the other Tor detector</a> try to guess if "
@@ -440,7 +435,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:254
+#: /home/runa/tor/website/docs/en/documentation.wml:251
 msgid ""
 "Check out one of the Tor status pages, such as <a href=\"http://torstatus.";
 "blutmagie.de/\">blutmagie's</a>, or <a href=\"http://trunk.torstatus.kgprog.";
@@ -451,7 +446,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:261
+#: /home/runa/tor/website/docs/en/documentation.wml:258
 msgid ""
 "Read <a href=\"http://freehaven.net/anonbib/topic.";
 "html#Anonymous_20communication\">these papers</a> (especially the ones in "
@@ -459,50 +454,50 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/documentation.wml:267
+#: /home/runa/tor/website/docs/en/documentation.wml:264
 msgid "<a id=\"Developers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/docs/en/documentation.wml:268
+#: /home/runa/tor/website/docs/en/documentation.wml:265
 msgid "<a class=\"anchor\" href=\"#Developers\">For Developers</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/documentation.wml:269
+#: /home/runa/tor/website/docs/en/documentation.wml:266
 msgid "Browse the Tor <b>source repository</b>:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:271
+#: /home/runa/tor/website/docs/en/documentation.wml:268
 msgid "<a href=\"<gitrepo>\">Browse the repository's source tree directly</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:272
+#: /home/runa/tor/website/docs/en/documentation.wml:269
 msgid "Git and SVN access:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:274
+#: /home/runa/tor/website/docs/en/documentation.wml:271
 msgid "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:275
+#: /home/runa/tor/website/docs/en/documentation.wml:272
 msgid ""
 "The development branch is <kbd>master</kbd>.  The active maintenance "
 "branches are <kbd>maint-0.2.1</kbd> and <kbd>maint-0.2.2</kbd>."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:276
+#: /home/runa/tor/website/docs/en/documentation.wml:273
 msgid ""
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/documentation.wml:279
+#: /home/runa/tor/website/docs/en/documentation.wml:276
 msgid ""
 "<a href=\"https://gitweb.torproject.org//githax.git?a=blob;f=doc/Howto.txt;";
 "hb=HEAD\">Basic instructions for using Git to contribute to Tor software.</a>"

Modified: translation/trunk/projects/website/po/templates/docs/2-medium.faq.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/2-medium.faq.pot	2011-04-13 15:27:51 UTC (rev 24615)
+++ translation/trunk/projects/website/po/templates/docs/2-medium.faq.pot	2011-04-13 15:28:29 UTC (rev 24616)
@@ -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-04-13 16:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,7 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/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,296 +25,303 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/dev/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/dev/website/docs/en/faq.wml:15 /tmp/tNikbgsymy.xml:1646
+#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/dShS5hYCPE.xml:1666
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/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/dev/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/dev/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/dev/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/dev/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/dev/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/dev/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/dev/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/dev/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/dev/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/dev/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/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/dev/website/docs/en/faq.wml:36
+#: /home/runa/tor/website/docs/en/faq.wml:38
 msgid "Compilation and Installation:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:38
+#: /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/dev/website/docs/en/faq.wml:39
+#: /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/dev/website/docs/en/faq.wml:41
+#: /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/dev/website/docs/en/faq.wml:43
+#: /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/dev/website/docs/en/faq.wml:44
+#: /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/dev/website/docs/en/faq.wml:46
+#: /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/dev/website/docs/en/faq.wml:49
+#: /home/runa/tor/website/docs/en/faq.wml:51
 msgid "Running Tor:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:51
+#: /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/dev/website/docs/en/faq.wml:53
+#: /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/dev/website/docs/en/faq.wml:57
+#: /home/runa/tor/website/docs/en/faq.wml:59
 msgid "Running a Tor client:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:59
+#: /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/dev/website/docs/en/faq.wml:61
+#: /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/dev/website/docs/en/faq.wml:63
+#: /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/dev/website/docs/en/faq.wml:65
+#: /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/dev/website/docs/en/faq.wml:67
+#: /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/dev/website/docs/en/faq.wml:69
+#: /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/dev/website/docs/en/faq.wml:73
+#: /home/runa/tor/website/docs/en/faq.wml:75
 msgid "Running a Tor relay:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:75
+#: /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/dev/website/docs/en/faq.wml:76
+#: /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/dev/website/docs/en/faq.wml:78
+#: /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/dev/website/docs/en/faq.wml:80
+#: /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/dev/website/docs/en/faq.wml:81
+#: /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/dev/website/docs/en/faq.wml:82
+#: /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/dev/website/docs/en/faq.wml:85
+#: /home/runa/tor/website/docs/en/faq.wml:87
 msgid "Running a Tor hidden service:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:87
+#: /home/runa/tor/website/docs/en/faq.wml:89
 msgid "Anonymity and Security:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:89
+#: /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/dev/website/docs/en/faq.wml:90
+#: /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/dev/website/docs/en/faq.wml:93
+#: /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/dev/website/docs/en/faq.wml:95
+#: /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/dev/website/docs/en/faq.wml:97
+#: /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/dev/website/docs/en/faq.wml:101
+#: /home/runa/tor/website/docs/en/faq.wml:103
 msgid "Abuse:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:103
+#: /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/dev/website/docs/en/faq.wml:104
+#: /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/dev/website/docs/en/faq.wml:108
+#: /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/dev/website/docs/en/faq.wml:111
+#: /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/dev/website/docs/en/faq.wml:116
+#: /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/dev/website/docs/en/faq.wml:119
+#: /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/dev/website/docs/en/faq.wml:123
+#: /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 "
@@ -327,26 +334,26 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:134
+#: /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/dev/website/docs/en/faq.wml:138
+#: /home/runa/tor/website/docs/en/faq.wml:140
 msgid "<hr> <a id=\"Torisdifferent\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:141
+#: /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/dev/website/docs/en/faq.wml:143
+#: /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 "
@@ -362,7 +369,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:156
+#: /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 "
@@ -374,7 +381,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:165
+#: /home/runa/tor/website/docs/en/faq.wml:167
 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 "
@@ -387,12 +394,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p><dl><dt>
-#: /home/runa/dev/website/docs/en/faq.wml:175
+#: /home/runa/tor/website/docs/en/faq.wml:177
 msgid "Doesn't the first server see who I am?"
 msgstr ""
 
 #. type: Content of: <div><div><p><dl><dd>
-#: /home/runa/dev/website/docs/en/faq.wml:175
+#: /home/runa/tor/website/docs/en/faq.wml:177
 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 "
@@ -403,12 +410,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p><dl><dt>
-#: /home/runa/dev/website/docs/en/faq.wml:181
+#: /home/runa/tor/website/docs/en/faq.wml:183
 msgid "Can't the third server see my traffic?"
 msgstr ""
 
 #. type: Content of: <div><div><p><dl><dd>
-#: /home/runa/dev/website/docs/en/faq.wml:181
+#: /home/runa/tor/website/docs/en/faq.wml:183
 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 "
@@ -420,19 +427,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:191
+#: /home/runa/tor/website/docs/en/faq.wml:193
 msgid "<hr> <a id=\"CompatibleApplications\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:194
+#: /home/runa/tor/website/docs/en/faq.wml:196
 msgid ""
 "<a class=\"anchor\" href=\"#CompatibleApplications\">What programs can I use "
 "with Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:197
+#: /home/runa/tor/website/docs/en/faq.wml:199
 msgid ""
 "There are two pieces to \"Torifying\" a program: connection-level anonymity "
 "and application-level anonymity. Connection-level anonymity focuses on "
@@ -448,7 +455,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:211
+#: /home/runa/tor/website/docs/en/faq.wml:213
 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 "
@@ -458,7 +465,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:220
+#: /home/runa/tor/website/docs/en/faq.wml:222
 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 "
@@ -470,17 +477,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:231
+#: /home/runa/tor/website/docs/en/faq.wml:233
 msgid "<hr> <a id=\"WhyCalledTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:234
+#: /home/runa/tor/website/docs/en/faq.wml:236
 msgid "<a class=\"anchor\" href=\"#WhyCalledTor\">Why is it called Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:237
+#: /home/runa/tor/website/docs/en/faq.wml:239
 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 "
@@ -491,12 +498,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:247
+#: /home/runa/tor/website/docs/en/faq.wml:249
 msgid "(It's also got a fine translation from German and Turkish.)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:251
+#: /home/runa/tor/website/docs/en/faq.wml:253
 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 "
@@ -506,17 +513,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:258
+#: /home/runa/tor/website/docs/en/faq.wml:260
 msgid "<hr> <a id=\"Backdoor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:261
+#: /home/runa/tor/website/docs/en/faq.wml:263
 msgid "<a class=\"anchor\" href=\"#Backdoor\">Is there a backdoor in Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:264
+#: /home/runa/tor/website/docs/en/faq.wml:266
 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 "
@@ -525,7 +532,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:271
+#: /home/runa/tor/website/docs/en/faq.wml:273
 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 "
@@ -535,7 +542,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:279
+#: /home/runa/tor/website/docs/en/faq.wml:281
 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 "
@@ -548,7 +555,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:291
+#: /home/runa/tor/website/docs/en/faq.wml:293
 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 "
@@ -556,24 +563,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:296
+#: /home/runa/tor/website/docs/en/faq.wml:298
 msgid "<hr> <a id=\"DistributingTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:299
+#: /home/runa/tor/website/docs/en/faq.wml:301
 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/dev/website/docs/en/faq.wml:302
+#: /home/runa/tor/website/docs/en/faq.wml:304
 msgid "Yes."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:306
+#: /home/runa/tor/website/docs/en/faq.wml:308
 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 "
@@ -582,7 +589,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:313
+#: /home/runa/tor/website/docs/en/faq.wml:315
 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 "
@@ -591,7 +598,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:320
+#: /home/runa/tor/website/docs/en/faq.wml:322
 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 "
@@ -607,7 +614,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:336
+#: /home/runa/tor/website/docs/en/faq.wml:338
 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 "
@@ -615,7 +622,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:342
+#: /home/runa/tor/website/docs/en/faq.wml:344
 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 "
@@ -625,79 +632,80 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:349
+#: /home/runa/tor/website/docs/en/faq.wml:351
 msgid "<hr> <a id=\"SupportMail\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:352
+#: /home/runa/tor/website/docs/en/faq.wml:354
 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/dev/website/docs/en/faq.wml:354
+#: /home/runa/tor/website/docs/en/faq.wml:356
 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/dev/website/docs/en/faq.wml:356
+#: /home/runa/tor/website/docs/en/faq.wml:358
 msgid "Read through this <a href=\"<page docs/faq>\">FAQ</a>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:357
+#: /home/runa/tor/website/docs/en/faq.wml:359
 msgid ""
 "Read through the <a href=\"<page docs/documentation>\">documentation</a>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:358
+#: /home/runa/tor/website/docs/en/faq.wml:360
 msgid ""
-"Read through the <a href=\"http://archives.seul.org/or/talk\";>OR-TALK "
-"Archives</a> and see if your question is already answered."
+"Read through the <a href=\"https://lists.torproject.org/cgi-bin/mailman/";
+"listinfo/tor-talk\">tor-talk archives</a> and see if your question is "
+"already answered."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:361
+#: /home/runa/tor/website/docs/en/faq.wml:364
 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/dev/website/docs/en/faq.wml:363
+#: /home/runa/tor/website/docs/en/faq.wml:366
 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/dev/website/docs/en/faq.wml:368
+#: /home/runa/tor/website/docs/en/faq.wml:371
 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/dev/website/docs/en/faq.wml:371
+#: /home/runa/tor/website/docs/en/faq.wml:374
 msgid "<hr> <a id=\"WhySlow\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:374
+#: /home/runa/tor/website/docs/en/faq.wml:377
 msgid "<a class=\"anchor\" href=\"#WhySlow\">Why is Tor so slow?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:377
+#: /home/runa/tor/website/docs/en/faq.wml:380
 msgid "There are many reasons why the Tor network is currently slow."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:381
+#: /home/runa/tor/website/docs/en/faq.wml:384
 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 "
@@ -707,7 +715,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:389
+#: /home/runa/tor/website/docs/en/faq.wml:392
 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 "
@@ -716,7 +724,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:396
+#: /home/runa/tor/website/docs/en/faq.wml:399
 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 "
@@ -724,12 +732,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:403
+#: /home/runa/tor/website/docs/en/faq.wml:406
 msgid "What can you do to help?"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:409
+#: /home/runa/tor/website/docs/en/faq.wml:412
 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 "
@@ -737,7 +745,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:415
+#: /home/runa/tor/website/docs/en/faq.wml:418
 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 "
@@ -746,7 +754,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:422
+#: /home/runa/tor/website/docs/en/faq.wml:425
 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 "
@@ -754,7 +762,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:428
+#: /home/runa/tor/website/docs/en/faq.wml:431
 msgid ""
 "There are some steps that individuals can take to improve their Tor "
 "performance. <a href=\"<wiki>TheOnionRouter/FireFoxTorPerf\">You can "
@@ -766,7 +774,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:439
+#: /home/runa/tor/website/docs/en/faq.wml:442
 msgid ""
 "Tor needs some architectural changes too. One important change is to start "
 "providing <a href=\"#EverybodyARelay\">better service to people who relay "
@@ -775,7 +783,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:446
+#: /home/runa/tor/website/docs/en/faq.wml:449
 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 "
@@ -783,7 +791,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:452
+#: /home/runa/tor/website/docs/en/faq.wml:455
 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 "
@@ -794,7 +802,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:461
+#: /home/runa/tor/website/docs/en/faq.wml:464
 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 "
@@ -802,19 +810,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:468
+#: /home/runa/tor/website/docs/en/faq.wml:471
 msgid "<hr> <a id=\"Funding\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:471
+#: /home/runa/tor/website/docs/en/faq.wml:474
 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/dev/website/docs/en/faq.wml:474
+#: /home/runa/tor/website/docs/en/faq.wml:477
 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 "
@@ -822,12 +830,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:480
+#: /home/runa/tor/website/docs/en/faq.wml:483
 msgid "There are six main development/maintenance pushes that need attention:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:486
+#: /home/runa/tor/website/docs/en/faq.wml:489
 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 "
@@ -836,7 +844,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:493
+#: /home/runa/tor/website/docs/en/faq.wml:496
 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 "
@@ -844,7 +852,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:499
+#: /home/runa/tor/website/docs/en/faq.wml:502
 msgid ""
 "Relay support: the Tor network is run by volunteers, but they still need "
 "attention with prompt bug fixes, explanations when things go wrong, "
@@ -855,7 +863,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:508
+#: /home/runa/tor/website/docs/en/faq.wml:511
 msgid ""
 "Usability: Beyond documentation, we also need to work on usability of the "
 "software itself. This includes installers, clean GUIs, easy configuration to "
@@ -866,7 +874,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:517
+#: /home/runa/tor/website/docs/en/faq.wml:520
 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="
@@ -875,7 +883,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:524
+#: /home/runa/tor/website/docs/en/faq.wml:527
 msgid ""
 "Research: The anonymous communications field is full of surprises and "
 "gotchas. In our copious free time, we also help run top anonymity and "
@@ -887,7 +895,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:537
+#: /home/runa/tor/website/docs/en/faq.wml:540
 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 "
@@ -896,14 +904,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:545
+#: /home/runa/tor/website/docs/en/faq.wml:548
 msgid ""
 "We are also excited about tackling related problems, such as censorship-"
 "resistance."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:550
+#: /home/runa/tor/website/docs/en/faq.wml:553
 msgid ""
 "We are proud to have <a href=\"<page about/sponsors>\">sponsorship and "
 "support</a> from the Omidyar Network, the International Broadcasting Bureau, "
@@ -913,7 +921,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:557
+#: /home/runa/tor/website/docs/en/faq.wml:560
 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</"
@@ -922,37 +930,64 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:563
+#: /home/runa/tor/website/docs/en/faq.wml:566
 msgid "<hr> <a id=\"Metrics\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:566
+#: /home/runa/tor/website/docs/en/faq.wml:569
 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/dev/website/docs/en/faq.wml:568
+#: /home/runa/tor/website/docs/en/faq.wml:571
 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/dev/website/docs/en/faq.wml:570
+#: /home/runa/tor/website/docs/en/faq.wml:573
+msgid "<hr> <a id=\"SSLcertfingerprint\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/docs/en/faq.wml:576
+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/tor/website/docs/en/faq.wml:580
+#, no-wrap
+msgid ""
+"    *.torproject.org SSL certificate from Digicert:\n"
+"    The serial number is: 02:DA:41:04:89:A5:FD:A2:B5:DB:DB:F8:ED:15:0D:BE\n"
+"    The SHA-1 fingerprint is: a7e70f8a648fe04a9677f13eedf6f91b5f7f2e25\n"
+"    The SHA-256 fingerprint is: 23b854af6b96co224fd173382c520b46fa94f2d4e7238893f63ad2d783e27b4b\n"
+"\n"
+"    blog.torproject.org SSL certificate from RapidSSL:\n"
+"    The serial number is: 00:EF:A3\n"
+"    The SHA-1 fingerprint is: 50af43db8438e67f305a3257d8ef198e8c42f13f\n"
+"    "
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/faq.wml:590
 msgid "<hr> <a id=\"HowUninstallTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:573
+#: /home/runa/tor/website/docs/en/faq.wml:593
 msgid ""
 "<a class=\"anchor\" href=\"#HowUninstallTor\">How do I uninstall Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:576
+#: /home/runa/tor/website/docs/en/faq.wml:596
 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 "
@@ -962,35 +997,35 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:584
+#: /home/runa/tor/website/docs/en/faq.wml:604
 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/dev/website/docs/en/faq.wml:586
+#: /home/runa/tor/website/docs/en/faq.wml:606
 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/dev/website/docs/en/faq.wml:588
+#: /home/runa/tor/website/docs/en/faq.wml:608
 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/dev/website/docs/en/faq.wml:590
+#: /home/runa/tor/website/docs/en/faq.wml:610
 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/dev/website/docs/en/faq.wml:595
+#: /home/runa/tor/website/docs/en/faq.wml:615
 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 "
@@ -998,14 +1033,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:601
+#: /home/runa/tor/website/docs/en/faq.wml:621
 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/dev/website/docs/en/faq.wml:606
+#: /home/runa/tor/website/docs/en/faq.wml:626
 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 "
@@ -1013,45 +1048,45 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:611
+#: /home/runa/tor/website/docs/en/faq.wml:631
 msgid "<hr> <a id=\"PGPSigs\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:614
+#: /home/runa/tor/website/docs/en/faq.wml:634
 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/dev/website/docs/en/faq.wml:617
+#: /home/runa/tor/website/docs/en/faq.wml:637
 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/dev/website/docs/en/faq.wml:622
+#: /home/runa/tor/website/docs/en/faq.wml:642
 msgid ""
 "Please read the <a href=\"<page docs/verifying-signatures>\">verifying "
 "signatures</a> page for details."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:626
+#: /home/runa/tor/website/docs/en/faq.wml:646
 msgid "<hr> <a id=\"GetTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:629
+#: /home/runa/tor/website/docs/en/faq.wml:649
 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/dev/website/docs/en/faq.wml:633
+#: /home/runa/tor/website/docs/en/faq.wml:653
 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; "
@@ -1066,7 +1101,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:647
+#: /home/runa/tor/website/docs/en/faq.wml:667
 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 "
@@ -1074,26 +1109,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:652
+#: /home/runa/tor/website/docs/en/faq.wml:672
 msgid "<hr> <a id=\"CompileTorWindows\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:655
+#: /home/runa/tor/website/docs/en/faq.wml:675
 msgid ""
 "<a class=\"anchor\" href=\"#CompileTorWindows\">How do I compile Tor under "
 "Windows?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:658
+#: /home/runa/tor/website/docs/en/faq.wml:678
 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/dev/website/docs/en/faq.wml:663
+#: /home/runa/tor/website/docs/en/faq.wml:683
 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/"
@@ -1101,19 +1136,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:668
+#: /home/runa/tor/website/docs/en/faq.wml:688
 msgid "<hr> <a id=\"VirusFalsePositives\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:671
+#: /home/runa/tor/website/docs/en/faq.wml:691
 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/dev/website/docs/en/faq.wml:674
+#: /home/runa/tor/website/docs/en/faq.wml:694
 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 "
@@ -1124,7 +1159,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:682
+#: /home/runa/tor/website/docs/en/faq.wml:702
 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="
@@ -1132,19 +1167,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:687
+#: /home/runa/tor/website/docs/en/faq.wml:707
 msgid "<hr> <a id=\"LiveCD\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:690
+#: /home/runa/tor/website/docs/en/faq.wml:710
 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/dev/website/docs/en/faq.wml:693
+#: /home/runa/tor/website/docs/en/faq.wml:713
 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</"
@@ -1152,19 +1187,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:698
+#: /home/runa/tor/website/docs/en/faq.wml:718
 msgid "<hr> <a id=\"torrc\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:701
+#: /home/runa/tor/website/docs/en/faq.wml:721
 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/dev/website/docs/en/faq.wml:704
+#: /home/runa/tor/website/docs/en/faq.wml:724
 msgid ""
 "Tor installs a text file called torrc that contains configuration "
 "instructions for how your Tor program should behave. The default "
@@ -1174,12 +1209,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:712
+#: /home/runa/tor/website/docs/en/faq.wml:732
 msgid "The location of your torrc file depends on the way you installed Tor:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:716
+#: /home/runa/tor/website/docs/en/faq.wml:736
 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, "
@@ -1192,14 +1227,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:725
+#: /home/runa/tor/website/docs/en/faq.wml:745
 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/dev/website/docs/en/faq.wml:729
+#: /home/runa/tor/website/docs/en/faq.wml:749
 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 "
@@ -1207,7 +1242,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:733
+#: /home/runa/tor/website/docs/en/faq.wml:753
 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 "
@@ -1215,14 +1250,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:740
+#: /home/runa/tor/website/docs/en/faq.wml:760
 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/dev/website/docs/en/faq.wml:745
+#: /home/runa/tor/website/docs/en/faq.wml:765
 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 "
@@ -1230,7 +1265,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:751
+#: /home/runa/tor/website/docs/en/faq.wml:771
 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 # "
@@ -1238,19 +1273,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:757
+#: /home/runa/tor/website/docs/en/faq.wml:777
 msgid "<hr> <a id=\"Logs\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:760
+#: /home/runa/tor/website/docs/en/faq.wml:780
 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/dev/website/docs/en/faq.wml:763
+#: /home/runa/tor/website/docs/en/faq.wml:783
 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 "
@@ -1259,19 +1294,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:770
+#: /home/runa/tor/website/docs/en/faq.wml:790
 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/dev/website/docs/en/faq.wml:775
+#: /home/runa/tor/website/docs/en/faq.wml:795
 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/dev/website/docs/en/faq.wml:777
+#: /home/runa/tor/website/docs/en/faq.wml:797
 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"
@@ -1279,7 +1314,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:781
+#: /home/runa/tor/website/docs/en/faq.wml:801
 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-"
@@ -1288,7 +1323,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:789
+#: /home/runa/tor/website/docs/en/faq.wml:809
 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 "
@@ -1296,7 +1331,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/dev/website/docs/en/faq.wml:795
+#: /home/runa/tor/website/docs/en/faq.wml:815
 #, no-wrap
 msgid ""
 "\\## Logs go to stdout at level \"notice\" unless redirected by something\n"
@@ -1304,7 +1339,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:800
+#: /home/runa/tor/website/docs/en/faq.wml:820
 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 "
@@ -1312,32 +1347,32 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/dev/website/docs/en/faq.wml:806
+#: /home/runa/tor/website/docs/en/faq.wml:826
 #, no-wrap
 msgid "Log debug file c:/program files/tor/debug.log\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:810
+#: /home/runa/tor/website/docs/en/faq.wml:830
 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/dev/website/docs/en/faq.wml:814
+#: /home/runa/tor/website/docs/en/faq.wml:834
 msgid "<hr> <a id=\"DoesntWork\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:817
+#: /home/runa/tor/website/docs/en/faq.wml:837
 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/dev/website/docs/en/faq.wml:820
+#: /home/runa/tor/website/docs/en/faq.wml:840
 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 "
@@ -1345,7 +1380,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:825
+#: /home/runa/tor/website/docs/en/faq.wml:845
 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 "
@@ -1355,19 +1390,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:835
+#: /home/runa/tor/website/docs/en/faq.wml:855
 msgid "If Tor can't establish a circuit, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:839
+#: /home/runa/tor/website/docs/en/faq.wml:859
 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/dev/website/docs/en/faq.wml:841
+#: /home/runa/tor/website/docs/en/faq.wml:861
 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 -"
@@ -1376,7 +1411,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:845
+#: /home/runa/tor/website/docs/en/faq.wml:865
 msgid ""
 "Is your Internet connection <a href=\"#FirewallPorts\">firewalled by port</"
 "a>, or do you normally need to use a <a href="
@@ -1384,7 +1419,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:850
+#: /home/runa/tor/website/docs/en/faq.wml:870
 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 "
@@ -1392,7 +1427,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:853
+#: /home/runa/tor/website/docs/en/faq.wml:873
 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 "
@@ -1400,14 +1435,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:856
+#: /home/runa/tor/website/docs/en/faq.wml:876
 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/dev/website/docs/en/faq.wml:861
+#: /home/runa/tor/website/docs/en/faq.wml:881
 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 "
@@ -1417,12 +1452,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:869
+#: /home/runa/tor/website/docs/en/faq.wml:889
 msgid "If it thinks you're not using Tor, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:873
+#: /home/runa/tor/website/docs/en/faq.wml:893
 msgid ""
 "Did you install the Torbutton extension for Firefox? The installation "
 "bundles include it, but sometimes people forget to install it. Make sure it "
@@ -1431,7 +1466,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:878
+#: /home/runa/tor/website/docs/en/faq.wml:898
 msgid ""
 "Do you have incompatible Firefox extensions like FoxyProxy installed? If so, "
 "uninstall them. (Note that using FoxyProxy is NOT a sufficient substitute "
@@ -1442,7 +1477,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:885
+#: /home/runa/tor/website/docs/en/faq.wml:905
 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 "
@@ -1452,7 +1487,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:890
+#: /home/runa/tor/website/docs/en/faq.wml:910
 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/"
@@ -1462,14 +1497,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:895
+#: /home/runa/tor/website/docs/en/faq.wml:915
 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/dev/website/docs/en/faq.wml:897
+#: /home/runa/tor/website/docs/en/faq.wml:917
 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 "
@@ -1477,7 +1512,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:900
+#: /home/runa/tor/website/docs/en/faq.wml:920
 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 "
@@ -1486,19 +1521,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:906
+#: /home/runa/tor/website/docs/en/faq.wml:926
 msgid "<hr /> <a id=\"VidaliaPassword\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:909
+#: /home/runa/tor/website/docs/en/faq.wml:929
 msgid ""
 "<a class=\"anchor\" href=\"#VidaliaPassword\">Tor/Vidalia prompts for a "
 "password at start.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:912
+#: /home/runa/tor/website/docs/en/faq.wml:932
 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 "
@@ -1509,7 +1544,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:921
+#: /home/runa/tor/website/docs/en/faq.wml:941
 msgid ""
 "Usually this process of generating and setting a random control password "
 "happens in the background. There are three common situations, though, where "
@@ -1517,7 +1552,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:927
+#: /home/runa/tor/website/docs/en/faq.wml:947
 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 "
@@ -1526,7 +1561,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:932
+#: /home/runa/tor/website/docs/en/faq.wml:952
 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 "
@@ -1540,7 +1575,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:945
+#: /home/runa/tor/website/docs/en/faq.wml:965
 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 "
@@ -1555,19 +1590,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:960
+#: /home/runa/tor/website/docs/en/faq.wml:980
 msgid "<hr> <a id=\"ChooseEntryExit\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:963
+#: /home/runa/tor/website/docs/en/faq.wml:983
 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/dev/website/docs/en/faq.wml:966
+#: /home/runa/tor/website/docs/en/faq.wml:986
 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 "
@@ -1576,53 +1611,53 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/docs/en/faq.wml:972
+#: /home/runa/tor/website/docs/en/faq.wml:992
 msgid "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/docs/en/faq.wml:973
+#: /home/runa/tor/website/docs/en/faq.wml:993
 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/dev/website/docs/en/faq.wml:975
+#: /home/runa/tor/website/docs/en/faq.wml:995
 msgid "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/docs/en/faq.wml:976
+#: /home/runa/tor/website/docs/en/faq.wml:996
 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/dev/website/docs/en/faq.wml:978
+#: /home/runa/tor/website/docs/en/faq.wml:998
 msgid "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/docs/en/faq.wml:979
+#: /home/runa/tor/website/docs/en/faq.wml:999
 msgid "A list of nodes to never use when building a circuit."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/dev/website/docs/en/faq.wml:981
+#: /home/runa/tor/website/docs/en/faq.wml:1001
 msgid "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/dev/website/docs/en/faq.wml:982
+#: /home/runa/tor/website/docs/en/faq.wml:1002
 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/dev/website/docs/en/faq.wml:987
+#: /home/runa/tor/website/docs/en/faq.wml:1007
 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 "
@@ -1632,7 +1667,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:994
+#: /home/runa/tor/website/docs/en/faq.wml:1014
 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 "
@@ -1644,7 +1679,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1004
+#: /home/runa/tor/website/docs/en/faq.wml:1024
 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 "
@@ -1653,7 +1688,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1010
+#: /home/runa/tor/website/docs/en/faq.wml:1030
 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 "
@@ -1662,26 +1697,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:1016
+#: /home/runa/tor/website/docs/en/faq.wml:1036
 msgid "<hr> <a id=\"GoogleCaptcha\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:1019
+#: /home/runa/tor/website/docs/en/faq.wml:1039
 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/dev/website/docs/en/faq.wml:1022
+#: /home/runa/tor/website/docs/en/faq.wml:1042
 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/dev/website/docs/en/faq.wml:1027
+#: /home/runa/tor/website/docs/en/faq.wml:1047
 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 "
@@ -1692,7 +1727,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1035
+#: /home/runa/tor/website/docs/en/faq.wml:1055
 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 "
@@ -1702,7 +1737,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1044
+#: /home/runa/tor/website/docs/en/faq.wml:1064
 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 "
@@ -1710,7 +1745,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1050
+#: /home/runa/tor/website/docs/en/faq.wml:1070
 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 "
@@ -1718,19 +1753,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:1055
+#: /home/runa/tor/website/docs/en/faq.wml:1075
 msgid "<hr /> <a id=\"GmailWarning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:1058
+#: /home/runa/tor/website/docs/en/faq.wml:1078
 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/dev/website/docs/en/faq.wml:1061
+#: /home/runa/tor/website/docs/en/faq.wml:1081
 msgid ""
 "Sometimes, after you've used Gmail over Tor, Google presents a pop-up "
 "notification that your account may have been compromised.  The notification "
@@ -1739,7 +1774,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1068
+#: /home/runa/tor/website/docs/en/faq.wml:1088
 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 "
@@ -1748,7 +1783,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1075
+#: /home/runa/tor/website/docs/en/faq.wml:1095
 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 "
@@ -1757,7 +1792,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1082
+#: /home/runa/tor/website/docs/en/faq.wml:1102
 msgid ""
 "Cookie hijacking is possible by either physical access to your computer or "
 "by watching your network traffic.  In theory only physical access should "
@@ -1768,7 +1803,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1091
+#: /home/runa/tor/website/docs/en/faq.wml:1111
 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 "
@@ -1780,19 +1815,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:1100
+#: /home/runa/tor/website/docs/en/faq.wml:1120
 msgid "<hr> <a id=\"FirewallPorts\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:1103
+#: /home/runa/tor/website/docs/en/faq.wml:1123
 msgid ""
 "<a class=\"anchor\" href=\"#FirewallPorts\">My firewall only allows a few "
 "outgoing ports.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1106
+#: /home/runa/tor/website/docs/en/faq.wml:1126
 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 "
@@ -1802,7 +1837,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1114
+#: /home/runa/tor/website/docs/en/faq.wml:1134
 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 "
@@ -1810,14 +1845,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1120
+#: /home/runa/tor/website/docs/en/faq.wml:1140
 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/dev/website/docs/en/faq.wml:1125
+#: /home/runa/tor/website/docs/en/faq.wml:1145
 #, no-wrap
 msgid ""
 "  ReachableDirAddresses *:80\n"
@@ -1825,24 +1860,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:1129
+#: /home/runa/tor/website/docs/en/faq.wml:1149
 msgid "<hr> <a id=\"RelayFlexible\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:1132
+#: /home/runa/tor/website/docs/en/faq.wml:1152
 msgid ""
 "<a class=\"anchor\" href=\"#RelayFlexible\">How stable does my relay need to "
 "be?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1135
+#: /home/runa/tor/website/docs/en/faq.wml:1155
 msgid "We aim to make setting up a Tor relay easy and convenient:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:1139
+#: /home/runa/tor/website/docs/en/faq.wml:1159
 msgid ""
 "Tor has built-in support for <a href="
 "\"<wikifaq>#WhatbandwidthshapingoptionsareavailabletoTorrelays\"> rate "
@@ -1853,7 +1888,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:1147
+#: /home/runa/tor/website/docs/en/faq.wml:1167
 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 "
@@ -1862,7 +1897,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:1152
+#: /home/runa/tor/website/docs/en/faq.wml:1172
 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 "
@@ -1870,14 +1905,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:1157
+#: /home/runa/tor/website/docs/en/faq.wml:1177
 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/dev/website/docs/en/faq.wml:1160
+#: /home/runa/tor/website/docs/en/faq.wml:1180
 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 "
@@ -1886,7 +1921,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:1166
+#: /home/runa/tor/website/docs/en/faq.wml:1186
 msgid ""
 "Your relay will passively estimate and advertise its recent bandwidth "
 "capacity, so high-bandwidth relays will attract more users than low-"
@@ -1894,24 +1929,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:1172
+#: /home/runa/tor/website/docs/en/faq.wml:1192
 msgid "<hr> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:1176
+#: /home/runa/tor/website/docs/en/faq.wml:1196
 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/dev/website/docs/en/faq.wml:1179
+#: /home/runa/tor/website/docs/en/faq.wml:1199
 msgid "Great. That's exactly why we implemented exit policies."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1183
+#: /home/runa/tor/website/docs/en/faq.wml:1203
 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 "
@@ -1927,7 +1962,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1197
+#: /home/runa/tor/website/docs/en/faq.wml:1217
 msgid ""
 "The default exit policy allows access to many popular services (e.g. web "
 "browsing), but <a href=\"<wikifaq>#Istherealistofdefaultexitports"
@@ -1942,7 +1977,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1211
+#: /home/runa/tor/website/docs/en/faq.wml:1231
 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 "
@@ -1952,19 +1987,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:1219
+#: /home/runa/tor/website/docs/en/faq.wml:1239
 msgid "<hr> <a id=\"RelayOrBridge\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:1222
+#: /home/runa/tor/website/docs/en/faq.wml:1242
 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/dev/website/docs/en/faq.wml:1224
+#: /home/runa/tor/website/docs/en/faq.wml:1244
 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 "
@@ -1974,7 +2009,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1231
+#: /home/runa/tor/website/docs/en/faq.wml:1251
 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 "
@@ -1982,7 +2017,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1236
+#: /home/runa/tor/website/docs/en/faq.wml:1256
 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 "
@@ -1993,7 +2028,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1244
+#: /home/runa/tor/website/docs/en/faq.wml:1264
 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 "
@@ -2004,19 +2039,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:1252
+#: /home/runa/tor/website/docs/en/faq.wml:1272
 msgid "<hr> <a id=\"MultipleRelays\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:1255
+#: /home/runa/tor/website/docs/en/faq.wml:1275
 msgid ""
 "<a class=\"anchor\" href=\"#MultipleRelays\">I want to run more than one "
 "relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1258
+#: /home/runa/tor/website/docs/en/faq.wml:1278
 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 "
@@ -2025,7 +2060,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1265
+#: /home/runa/tor/website/docs/en/faq.wml:1285
 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 "
@@ -2033,13 +2068,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/dev/website/docs/en/faq.wml:1271
+#: /home/runa/tor/website/docs/en/faq.wml:1291
 #, no-wrap
 msgid "    MyFamily $fingerprint1,$fingerprint2,$fingerprint3\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1275
+#: /home/runa/tor/website/docs/en/faq.wml:1295
 msgid ""
 "where each fingerprint is the 40 character identity fingerprint (without "
 "spaces). You can also list them by nickname, but fingerprint is safer. Be "
@@ -2048,7 +2083,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1282
+#: /home/runa/tor/website/docs/en/faq.wml:1302
 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 "
@@ -2057,26 +2092,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:1288
+#: /home/runa/tor/website/docs/en/faq.wml:1308
 msgid "<hr> <a id=\"RelayMemory\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:1291
+#: /home/runa/tor/website/docs/en/faq.wml:1311
 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/dev/website/docs/en/faq.wml:1293
+#: /home/runa/tor/website/docs/en/faq.wml:1313
 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/dev/website/docs/en/faq.wml:1298
+#: /home/runa/tor/website/docs/en/faq.wml:1318
 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 "
@@ -2088,18 +2123,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:1306
+#: /home/runa/tor/website/docs/en/faq.wml:1326
 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+ "
-"per socket). We've patched OpenSSL to <a href=\"http://archives.seul.org/or/";
-"dev/Jun-2008/msg00001.html\">release unused buffer memory more aggressively</"
-"a>. If you update to OpenSSL 1.0.0-beta5, Tor's build process will "
-"automatically recognize and use this feature."
+"per socket). We've patched OpenSSL to <a href=\"https://lists.torproject.org/";
+"pipermail/tor-dev/2008-June/001519.html\">release unused buffer memory more "
+"aggressively</a>. If you update to OpenSSL 1.0.0-beta5, Tor's build process "
+"will automatically recognize and use this feature."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:1314
+#: /home/runa/tor/website/docs/en/faq.wml:1334
 msgid ""
 "If you're running on Solaris, OpenBSD, NetBSD, or old FreeBSD, Tor is "
 "probably forking separate processes rather than using threads. Consider "
@@ -2108,7 +2143,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:1320
+#: /home/runa/tor/website/docs/en/faq.wml:1340
 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 "
@@ -2117,61 +2152,61 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1329
+#: /home/runa/tor/website/docs/en/faq.wml:1349
 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/dev/website/docs/en/faq.wml:1333
+#: /home/runa/tor/website/docs/en/faq.wml:1353
 msgid "<hr> <a id=\"WhyNotNamed\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:1336
+#: /home/runa/tor/website/docs/en/faq.wml:1356
 msgid ""
 "<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1339
+#: /home/runa/tor/website/docs/en/faq.wml:1359
 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/dev/website/docs/en/faq.wml:1342
+#: /home/runa/tor/website/docs/en/faq.wml:1362
 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/dev/website/docs/en/faq.wml:1344
+#: /home/runa/tor/website/docs/en/faq.wml:1364
 msgid "The relay must have been around for at least two weeks."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/docs/en/faq.wml:1345
+#: /home/runa/tor/website/docs/en/faq.wml:1365
 msgid "No other router may have wanted the same name in the past month."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:1348
+#: /home/runa/tor/website/docs/en/faq.wml:1368
 msgid "<hr> <a id=\"KeyManagement\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:1351
+#: /home/runa/tor/website/docs/en/faq.wml:1371
 msgid ""
 "<a class=\"anchor\" href=\"#KeyManagement\">Tell me about all the keys Tor "
 "uses.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1354
+#: /home/runa/tor/website/docs/en/faq.wml:1374
 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)  "
@@ -2181,7 +2216,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1362
+#: /home/runa/tor/website/docs/en/faq.wml:1382
 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 "
@@ -2192,7 +2227,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1372
+#: /home/runa/tor/website/docs/en/faq.wml:1392
 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 "
@@ -2203,7 +2238,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1382
+#: /home/runa/tor/website/docs/en/faq.wml:1402
 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 "
@@ -2218,7 +2253,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1396
+#: /home/runa/tor/website/docs/en/faq.wml:1416
 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 "
@@ -2227,7 +2262,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1403
+#: /home/runa/tor/website/docs/en/faq.wml:1423
 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.";
@@ -2236,7 +2271,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1411
+#: /home/runa/tor/website/docs/en/faq.wml:1431
 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 "
@@ -2246,17 +2281,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:1418
+#: /home/runa/tor/website/docs/en/faq.wml:1438
 msgid "<hr> <a id=\"EntryGuards\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:1421
+#: /home/runa/tor/website/docs/en/faq.wml:1441
 msgid "<a class=\"anchor\" href=\"#EntryGuards\">What are Entry Guards?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1424
+#: /home/runa/tor/website/docs/en/faq.wml:1444
 msgid ""
 "Tor (like all current practical low-latency anonymity designs) fails when "
 "the attacker can see both ends of the communications channel. For example, "
@@ -2268,7 +2303,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1434
+#: /home/runa/tor/website/docs/en/faq.wml:1454
 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 "
@@ -2282,7 +2317,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1446
+#: /home/runa/tor/website/docs/en/faq.wml:1466
 msgid ""
 "The solution is \"entry guards\": each user selects a few relays at random "
 "to use as entry points, and uses only those relays for her first hop. If "
@@ -2295,7 +2330,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1457
+#: /home/runa/tor/website/docs/en/faq.wml:1477
 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://";
@@ -2305,7 +2340,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1466
+#: /home/runa/tor/website/docs/en/faq.wml:1486
 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 "
@@ -2316,19 +2351,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:1474
+#: /home/runa/tor/website/docs/en/faq.wml:1494
 msgid "<hr> <a id=\"EverybodyARelay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:1477
+#: /home/runa/tor/website/docs/en/faq.wml:1497
 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/dev/website/docs/en/faq.wml:1480
+#: /home/runa/tor/website/docs/en/faq.wml:1500
 msgid ""
 "Requiring every Tor user to be a relay would help with scaling the network "
 "to handle all our users, and <a href="
@@ -2343,7 +2378,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1493
+#: /home/runa/tor/website/docs/en/faq.wml:1513
 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 "
@@ -2354,12 +2389,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1502
+#: /home/runa/tor/website/docs/en/faq.wml:1522
 msgid "There are five steps we need to address before we can do this though:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1506
+#: /home/runa/tor/website/docs/en/faq.wml:1526
 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 "
@@ -2368,7 +2403,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1514
+#: /home/runa/tor/website/docs/en/faq.wml:1534
 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/"
@@ -2380,7 +2415,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1525
+#: /home/runa/tor/website/docs/en/faq.wml:1545
 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 "
@@ -2392,7 +2427,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1535
+#: /home/runa/tor/website/docs/en/faq.wml:1555
 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 "
@@ -2409,7 +2444,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1551
+#: /home/runa/tor/website/docs/en/faq.wml:1571
 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="
@@ -2417,24 +2452,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1558
+#: /home/runa/tor/website/docs/en/faq.wml:1578
 msgid "Please help on all of these!"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:1561
+#: /home/runa/tor/website/docs/en/faq.wml:1581
 msgid "<hr> <a id=\"TransportIPnotTCP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:1564
+#: /home/runa/tor/website/docs/en/faq.wml:1584
 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/dev/website/docs/en/faq.wml:1567
+#: /home/runa/tor/website/docs/en/faq.wml:1587
 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, "
@@ -2443,7 +2478,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/faq.wml:1574
+#: /home/runa/tor/website/docs/en/faq.wml:1594
 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 "
@@ -2451,7 +2486,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:1581
+#: /home/runa/tor/website/docs/en/faq.wml:1601
 msgid ""
 "IP packets reveal OS characteristics. We would still need to do IP-level "
 "packet normalization, to stop things like TCP fingerprinting attacks. Given "
@@ -2462,7 +2497,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:1588
+#: /home/runa/tor/website/docs/en/faq.wml:1608
 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 "
@@ -2470,7 +2505,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:1592
+#: /home/runa/tor/website/docs/en/faq.wml:1612
 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 "
@@ -2479,7 +2514,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:1597
+#: /home/runa/tor/website/docs/en/faq.wml:1617
 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. "
@@ -2489,7 +2524,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:1604
+#: /home/runa/tor/website/docs/en/faq.wml:1624
 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 "
@@ -2507,7 +2542,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/faq.wml:1618
+#: /home/runa/tor/website/docs/en/faq.wml:1638
 msgid ""
 "The Tor-internal name spaces would need to be redesigned. We support hidden "
 "service \".onion\" addresses by intercepting the addresses when they are "
@@ -2516,38 +2551,38 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/faq.wml:1625
+#: /home/runa/tor/website/docs/en/faq.wml:1645
 msgid "<hr> <a id=\"Criminals\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:1628
+#: /home/runa/tor/website/docs/en/faq.wml:1648
 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/dev/website/docs/en/faq.wml:1631
+#: /home/runa/tor/website/docs/en/faq.wml:1651
 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/dev/website/docs/en/faq.wml:1635
+#: /home/runa/tor/website/docs/en/faq.wml:1655
 msgid "<hr> <a id=\"RespondISP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/docs/en/faq.wml:1638
+#: /home/runa/tor/website/docs/en/faq.wml:1658
 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/dev/website/docs/en/faq.wml:1641
+#: /home/runa/tor/website/docs/en/faq.wml:1661
 msgid ""
 "A collection of templates for successfully responding to ISPs is <a href="
 "\"<wiki>TheOnionRouter/TorAbuseTemplates\">collected here</a>."

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-04-13 15:27:51 UTC (rev 24615)
+++ translation/trunk/projects/website/po/templates/docs/2-medium.tor-doc-relay.pot	2011-04-13 15:28:29 UTC (rev 24616)
@@ -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-04-13 16:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,7 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:8
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page docs/"
 "documentation>\">Documentation &raquo; </a> <a href=\"<page docs/tor-doc-"
@@ -25,17 +25,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:14
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:14
 msgid "Configuring a Tor relay"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:16 /tmp/ogZUlgnLzH.xml:275
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:16 /tmp/KVtvajbVzt.xml:275
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:19
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:19
 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 "
@@ -47,7 +47,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:28
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:28
 msgid ""
 "You can run a Tor relay on pretty much any operating system. Tor relays work "
 "best on Linux, OS X Tiger or later, FreeBSD 5.x+, NetBSD 5.x+, and Windows "
@@ -55,53 +55,53 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:33
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:33
 msgid "<hr> <a id=\"zero\"></a> <a id=\"install\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:36
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:36
 msgid ""
 "<a class=\"anchor\" href=\"#install\">Step One: Download and Install Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:37 /tmp/ogZUlgnLzH.xml:52
-#: /tmp/ogZUlgnLzH.xml:141 /tmp/ogZUlgnLzH.xml:165
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37 /tmp/KVtvajbVzt.xml:52
+#: /tmp/KVtvajbVzt.xml:141 /tmp/KVtvajbVzt.xml:165
 msgid "<br>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:39
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:39
 msgid "Before you start, you need to make sure that Tor is up and running."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:42
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:42
 msgid ""
 "Visit our <a href=\"<page download/download>\">download page</a> and install "
 "the \"Installation Bundle\" for your OS."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:46
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:46
 msgid ""
 "If it's convenient, you might also want to use it as a client for a while to "
 "make sure it's actually working."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:49
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:49
 msgid "<hr> <a id=\"setup\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:51
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:51
 msgid "<a class=\"anchor\" href=\"#setup\">Step Two: Set it up as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:54
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:54
 msgid ""
 "Verify that your clock and timezone are set correctly. If possible, "
 "synchronize your clock with public <a href=\"http://en.wikipedia.org/wiki/";
@@ -109,12 +109,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:60
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:60
 msgid "<strong>Manual Configuration</strong>:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:62
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:62
 msgid ""
 "Edit the bottom part of <a href=\"<page docs/faq>#torrc\">your torrc file</"
 "a>. If you want to be a public relay (recommended), make sure to define "
@@ -125,31 +125,31 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:72
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:72
 msgid "<strong>Configuring Tor with the Vidalia Graphical Interface</strong>:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:76
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:76
 msgid ""
 "Right click on the Vidalia icon in your task bar.  Choose <tt>Control Panel</"
 "tt>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:77
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:77
 msgid ""
 "<img alt=\"vidalia right click menu\" src=\"$(IMGROOT)/screenshot-win32-"
 "vidalia.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:80
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:80
 msgid "Click <tt>Setup Relaying</tt>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:83
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:83
 msgid ""
 "Choose <tt>Relay Traffic for the Tor network</tt> if you want to be a public "
 "relay (recommended), or choose <tt>Help censored users reach the Tor "
@@ -158,21 +158,21 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:88
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:88
 msgid ""
 "<img alt=\"vidalia basic settings\" src=\"$(IMGROOT)/screenshot-win32-"
 "configure-relay-1.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:91
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:91
 msgid ""
 "Enter a nickname for your relay, and enter contact information in case we "
 "need to contact you about problems."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:94
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:94
 msgid ""
 "Leave <tt>Attempt to automatically configure port forwarding</tt> clicked.  "
 "Push the <tt>Test</tt> button to see if it works.  If it does work, great.  "
@@ -180,21 +180,21 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:98
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:98
 msgid ""
 "Choose the <tt>Bandwidth Limits</tt> tab.  Select how much bandwidth you "
 "want to provide for Tor users like yourself."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:99
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:99
 msgid ""
 "<img alt=\"vidalia bandwidth limits\" src=\"$(IMGROOT)/screenshot-win32-"
 "configure-relay-2.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:102
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:102
 msgid ""
 "Choose the <tt>Exit Policies</tt> tab.  If you want to allow others to use "
 "your relay for these services, don't change anything.  Un-check the services "
@@ -204,21 +204,21 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:107
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:107
 msgid ""
 "<img alt=\"vidalia exit policies\" src=\"$(IMGROOT)/screenshot-win32-"
 "configure-relay-3.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:110
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:110
 msgid ""
 "Click the <tt>Ok</tt> button.  See Step Three below for confirmation that "
 "the relay is working correctly."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><li>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:114
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:114
 msgid ""
 "If you are using a firewall, open a hole in your firewall so incoming "
 "connections can reach the ports you configured (ORPort, plus DirPort if you "
@@ -229,35 +229,35 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><li>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:123
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:123
 msgid ""
 "Restart your relay. If it <a href=\"<page docs/faq>#Logs\">logs any "
 "warnings</a>, address them."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><li>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:128
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:128
 msgid ""
-"Subscribe to the <a href=\"http://archives.seul.org/or/announce/\";>or-"
-"announce</a> mailing list. It is very low volume, and it will keep you "
-"informed of new stable releases. You might also consider subscribing to <a "
-"href=\"<page docs/documentation>#MailingLists\">the higher-volume Tor lists</"
-"a> too."
+"Subscribe to the <a href=\"https://lists.torproject.org/cgi-bin/mailman/";
+"listinfo/tor-announce\">tor-announce</a> mailing list. It is very low "
+"volume, and it will keep you informed of new stable releases. You might also "
+"consider subscribing to <a href=\"<page docs/documentation>#MailingLists"
+"\">the higher-volume Tor lists</a> too."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:138
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:138
 msgid "<hr> <a id=\"check\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:140
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:140
 msgid ""
 "<a class=\"anchor\" href=\"#check\">Step Three: Make sure it is working</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:143
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:143
 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 +270,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:153
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:153
 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,22 +282,22 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:162
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:162
 msgid "<hr> <a id=\"after\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:164
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:164
 msgid "<a class=\"anchor\" href=\"#after\">Step Four: Once it is working</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:168
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:168
 msgid "We recommend the following steps as well:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:172
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:172
 msgid ""
 "6. Read <a href=\"<wiki>TheOnionRouter/OperationalSecurity\">about "
 "operational security</a> to get ideas how you can increase the security of "
@@ -305,7 +305,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:178
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:178
 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 +313,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:184
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:184
 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 +322,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:192
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:192
 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 +332,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:202
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:202
 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 +344,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:213
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:213
 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 +359,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:228
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:228
 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,7 +371,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:239
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:239
 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 "
@@ -383,7 +383,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:250
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:250
 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 +395,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:260
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:260
 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 +403,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:266
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:266
 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 +415,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:277
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:277
 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/3-low.rpms.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/3-low.rpms.pot	2011-04-13 15:27:51 UTC (rev 24615)
+++ translation/trunk/projects/website/po/templates/docs/3-low.rpms.pot	2011-04-13 15:28:29 UTC (rev 24616)
@@ -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-04-13 16:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,7 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/rpms.wml:8
+#: /home/runa/tor/website/docs/en/rpms.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page docs/"
 "documentation>\">Documentation &raquo; </a> <a href=\"<page docs/rpms>"
@@ -25,31 +25,32 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/rpms.wml:13
+#: /home/runa/tor/website/docs/en/rpms.wml:13
 msgid "<a id=\"rpms\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/docs/en/rpms.wml:14
+#: /home/runa/tor/website/docs/en/rpms.wml:14
 msgid ""
-"<a class=\"anchor\" href=\"#rpms\">Tor packages for rpm-based linux "
+"<a class=\"anchor\" href=\"#rpms\">Tor packages for RPM-based linux "
 "distributions.</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/rpms.wml:16 /tmp/qT7lVlv9SX.xml:65
+#: /home/runa/tor/website/docs/en/rpms.wml:16 /tmp/nZ7V2YMfe1.xml:70
 msgid "<br>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/rpms.wml:18
+#: /home/runa/tor/website/docs/en/rpms.wml:18
 msgid ""
-"Do not use the packages in the native repositories. They are frequently out "
-"of date. That means you'll be missing stability and security fixes."
+"<strong>Do not</strong> use the packages in the native repositories. They "
+"are frequently out of date. That means you'll be missing stability and "
+"security fixes."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/rpms.wml:24
+#: /home/runa/tor/website/docs/en/rpms.wml:24
 msgid ""
 "You'll need to set up our package repository before you can fetch Tor.  "
 "Assuming yum, in /etc/yum.repos.d/, create a file called torproject.repo.  "
@@ -57,29 +58,28 @@
 msgstr ""
 
 #. type: Content of: <div><div><p><pre>
-#: /home/runa/transifex/website/docs/en/rpms.wml:27
+#: /home/runa/tor/website/docs/en/rpms.wml:27
 #, no-wrap
 msgid ""
 "[torproject]\n"
-"    name=Tor and Vidalia\n"
-"    enabled=1\n"
-"    autorefresh=0\n"
-"    baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/\n";
-"    type=rpm-md\n"
-"    gpgcheck=1\n"
-"    gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org\n";
-"    "
+"name=Tor and Vidalia\n"
+"enabled=1\n"
+"autorefresh=0\n"
+"baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/\n";
+"type=rpm-md\n"
+"gpgcheck=1\n"
+"gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org";
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/rpms.wml:37
+#: /home/runa/tor/website/docs/en/rpms.wml:36
 msgid ""
 "If you wish to track the stable releases of Tor, you should substitute "
 "DISTRIBUTION with one of the following: centos4, centos5, fc13, fc14, suse"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/rpms.wml:40
+#: /home/runa/tor/website/docs/en/rpms.wml:39
 msgid ""
 "To track experimental releases, substitute DISTRIBUTION with one of these: "
 "centos4-experimental, centos5-experimental, fc13-experimental, fc14-"
@@ -87,46 +87,57 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/rpms.wml:45
+#: /home/runa/tor/website/docs/en/rpms.wml:44
+msgid "Then install Tor by running:"
+msgstr ""
+
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/rpms.wml:46
+#, no-wrap
+msgid "yum install tor"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/rpms.wml:49
 msgid ""
 "Now Tor is installed and running. Move on to <a href=\"<page docs/tor-doc-"
 "unix>#polipo\">step two</a> of the \"Tor on Linux/Unix\" instructions."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/rpms.wml:51
+#: /home/runa/tor/website/docs/en/rpms.wml:55
 msgid ""
 "The DNS name <code>deb.torproject.org</code> is actually a set of "
-"independent servers in a DNS round robin configuration.  If you for some "
-"reason cannot access it you might try to use the name of one of its part "
+"independent servers in a DNS round-robin configuration.  If for some reason "
+"you cannot use it, you might be able to access one of the individual servers "
 "instead.  Try <code>deb-master.torproject.org</code>, <code>mirror."
 "netcologne.de</code> or <code>tor.mirror.youam.de</code>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/rpms.wml:59
+#: /home/runa/tor/website/docs/en/rpms.wml:64
 msgid "<hr> <hr> <a id=\"source\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/docs/en/rpms.wml:64
+#: /home/runa/tor/website/docs/en/rpms.wml:69
 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/rpms.wml:68
+#: /home/runa/tor/website/docs/en/rpms.wml:73
 msgid ""
 "If you'd like to build from source, please follow the <a href=\"<gitblob>doc/"
-"tor-rpm-creation.txt\">rpm creation instructions</a>."
+"tor-rpm-creation.txt\">RPM creation instructions</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/rpms.wml:72
+#: /home/runa/tor/website/docs/en/rpms.wml:77
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/rpms.wml:74
+#: /home/runa/tor/website/docs/en/rpms.wml:79
 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/download/3-low.download-unix.pot
===================================================================
--- translation/trunk/projects/website/po/templates/download/3-low.download-unix.pot	2011-04-13 15:27:51 UTC (rev 24615)
+++ translation/trunk/projects/website/po/templates/download/3-low.download-unix.pot	2011-04-13 15:28:29 UTC (rev 24616)
@@ -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-04-13 16:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -82,7 +82,7 @@
 
 #. type: Content of: <div><div><table><tr><td>
 #: /home/runa/tor/website/download/en/download-unix.wml:33
-#: /tmp/eYbWLGBYtm.xml:40 /tmp/eYbWLGBYtm.xml:56 /tmp/eYbWLGBYtm.xml:73
+#: /tmp/Bjk_HZ1oA5.xml:40 /tmp/Bjk_HZ1oA5.xml:56 /tmp/Bjk_HZ1oA5.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -257,43 +257,34 @@
 #: /home/runa/tor/website/download/en/download-unix.wml:126
 msgid ""
 "To keep informed of security advisories and new stable releases, subscribe "
-"to the <a href=\"http://archives.seul.org/or/announce/\";>or-announce mailing "
-"list</a> (you will be asked to confirm via email). You can also <a href="
-"\"http://rss.gmane.org/gmane.network.onion-routing.announce\";>watch the "
-"list's RSS feed</a>."
+"to the <a href=\"https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-";
+"announce\">tor-announce mailing list</a> (you will be asked to confirm via "
+"email). You can also <a href=\"http://rss.gmane.org/gmane.network.onion-";
+"routing.announce\">watch the list's RSS feed</a>."
 msgstr ""
 
-#. type: Content of: <div><div><div><form>
-#: /home/runa/tor/website/download/en/download-unix.wml:134
-msgid ""
-"<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
-"\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
-"\"host\" value=\"freehaven.net\"/> <input name=\"email\" size=\"15\"/> "
-"<input type=\"submit\" value=\"subscribe to or-announce\"/>"
-msgstr ""
-
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/download/en/download-unix.wml:143
+#: /home/runa/tor/website/download/en/download-unix.wml:135
 msgid ""
 "If you would like to research any past release of Tor source, packages, or "
-"other binaries, see <a href=\"http://archive.torproject.org/\";>the archive</"
+"other binaries, see <a href=\"https://archive.torproject.org/\";>the archive</"
 "a>."
 msgstr ""
 
 #. type: Content of: <div><div><div><p>
-#: /home/runa/tor/website/download/en/download-unix.wml:150
+#: /home/runa/tor/website/download/en/download-unix.wml:142
 msgid ""
 "If you have trouble downloading Tor from this site, here is a <a href="
 "\"<page getinvolved/mirrors>\">list of sites mirroring the Tor site</a>."
 msgstr ""
 
 #. type: Content of: <div><div><div>
-#: /home/runa/tor/website/download/en/download-unix.wml:154
+#: /home/runa/tor/website/download/en/download-unix.wml:146
 msgid "<a id=\"ChangeLog\"></a> <a id=\"Stable\"></a> <a id=\"Testing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><p>
-#: /home/runa/tor/website/download/en/download-unix.wml:158
+#: /home/runa/tor/website/download/en/download-unix.wml:150
 msgid ""
 "For a list of what has changed in each stable Tor release, see the <a href="
 "\"<gitblobstable>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in "
@@ -302,29 +293,29 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/download/en/download-unix.wml:169
+#: /home/runa/tor/website/download/en/download-unix.wml:161
 msgid "Verify Signatures"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><p>
-#: /home/runa/tor/website/download/en/download-unix.wml:170
+#: /home/runa/tor/website/download/en/download-unix.wml:162
 msgid "Verify your downloads with our GPG signatures:"
 msgstr ""
 
 #. type: Content of: <div><div><div><div>
-#: /home/runa/tor/website/download/en/download-unix.wml:171
+#: /home/runa/tor/website/download/en/download-unix.wml:163
 msgid ""
 "<a href=\"<page docs/verifying-signatures>\">Read how to verify the "
 "signatures</a>."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/download/en/download-unix.wml:178
+#: /home/runa/tor/website/download/en/download-unix.wml:170
 msgid "Having Trouble?"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download-unix.wml:180
+#: /home/runa/tor/website/download/en/download-unix.wml:172
 msgid ""
 "<a href=\"#packagediff\">What are the differences between stable and "
 "unstable downloads?</a>"

Modified: translation/trunk/projects/website/po/templates/download/3-low.download.pot
===================================================================
--- translation/trunk/projects/website/po/templates/download/3-low.download.pot	2011-04-13 15:27:51 UTC (rev 24615)
+++ translation/trunk/projects/website/po/templates/download/3-low.download.pot	2011-04-13 15:28:29 UTC (rev 24616)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-03-17 18:04+0000\n"
+"POT-Creation-Date: 2011-04-13 16:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -53,8 +53,8 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:25 /tmp/LYAFL6nMUK.xml:82
-#: /tmp/LYAFL6nMUK.xml:120
+#: /home/runa/tor/website/download/en/download.wml:25 /tmp/l7enfOI5_h.xml:82
+#: /tmp/l7enfOI5_h.xml:120
 msgid ""
 "The <strong>Tor Browser Bundle</strong> contains everything you need to "
 "safely browse the Internet. This package requires no installation. Just "
@@ -63,7 +63,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:26 /tmp/LYAFL6nMUK.xml:83
+#: /home/runa/tor/website/download/en/download.wml:26 /tmp/l7enfOI5_h.xml:83
 msgid ""
 "The <strong>Vidalia Bundle</strong> contains Tor, <a href=\"<page projects/"
 "vidalia>\">Vidalia</a>, and Polipo for installation on your system.  You "
@@ -78,7 +78,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><p>
-#: /home/runa/tor/website/download/en/download.wml:29 /tmp/LYAFL6nMUK.xml:85
+#: /home/runa/tor/website/download/en/download.wml:29 /tmp/l7enfOI5_h.xml:85
 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 "
@@ -245,7 +245,7 @@
 #: /home/runa/tor/website/download/en/download.wml:121
 msgid ""
 "Read how to use <a href=\"<page download/download-unix>\">our repositories "
-"for the Tor software.</a>."
+"for the Tor software</a>."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
@@ -367,7 +367,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div>
-#: /home/runa/tor/website/download/en/download.wml:182 /tmp/LYAFL6nMUK.xml:255
+#: /home/runa/tor/website/download/en/download.wml:182 /tmp/l7enfOI5_h.xml:255
 msgid "<br>"
 msgstr ""
 

Modified: translation/trunk/projects/website/po/templates/getinvolved/4-optional.volunteer.pot
===================================================================
--- translation/trunk/projects/website/po/templates/getinvolved/4-optional.volunteer.pot	2011-04-13 15:27:51 UTC (rev 24615)
+++ translation/trunk/projects/website/po/templates/getinvolved/4-optional.volunteer.pot	2011-04-13 15:28:29 UTC (rev 24616)
@@ -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-04-13 16:28+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,33 +17,33 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:8
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page getinvolved/"
 "volunteer>\">Volunteer</a>"
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:13
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:13
 msgid "A few things everyone can do now:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:15
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:15
 msgid ""
 "Please consider <a href=\"<page docs/tor-doc-relay>\">running a relay</a> to "
 "help the Tor network grow."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:17
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:17
 msgid ""
 "Tell your friends! Get them to run relays. Get them to run hidden services. "
 "Get them to tell their friends."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:19
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:19
 msgid ""
 "If you like Tor's goals, please <a href=\"<page donate/donate>\">take a "
 "moment to donate to support further Tor development</a>. We're also looking "
@@ -53,7 +53,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:24
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:24
 msgid ""
 "We're looking for more <a href=\"<page about/torusers>\">good examples of "
 "Tor users and Tor use cases</a>. If you use Tor for a scenario or purpose "
@@ -62,7 +62,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:30
+#: /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 "
@@ -70,17 +70,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:33
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:33
 msgid "<a id=\"Documentation\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:34
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:34
 msgid "<a class=\"anchor\" href=\"#Documentation\">Documentation</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:36
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:36
 msgid ""
 "Help translate the web page and documentation into other languages. See the "
 "<a href=\"<page getinvolved/translation>\">translation guidelines</a> if you "
@@ -89,7 +89,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:40
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:40
 msgid ""
 "Evaluate and document <a href=\"https://trac.torproject.org/projects/tor/";
 "wiki/TheOnionRouter/TorifyHOWTO\">our list of programs</a> that can be "
@@ -97,7 +97,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:43
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:43
 msgid ""
 "We have a huge list of <a href=\"https://trac.torproject.org/projects/tor/";
 "wiki/TheOnionRouter/SupportPrograms\">potentially useful programs that "
@@ -106,58 +106,58 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:49
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:49
 msgid "<a id=\"Advocacy\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:50
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:50
 msgid "<a class=\"anchor\" href=\"#Advocacy\">Advocacy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:52
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:52
 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/dev/website/getinvolved/en/volunteer.wml:54
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:54
 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=\"http://media.torproject.org/";
+"it.  Some have already started on <a href=\"https://media.torproject.org/";
 "video/\">Tor's Media server</a>, <a href=\"http://www.howcast.com/";
 "videos/90601-How-To-Circumvent-an-Internet-Proxy\">Howcast</a>, and <a href="
 "\"http://www.youtube.com/thetorproject\";>YouTube</a>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:60
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:60
 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/dev/website/getinvolved/en/volunteer.wml:62
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:62
 msgid ""
 "Create a t-shirt design that incorporates \"Congratulations! You are using "
 "Tor!\" in any language."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:66
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:66
 msgid "<a id=\"Projects\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:67
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:67
 msgid "<a class=\"anchor\" href=\"#Projects\">Projects</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:70
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:70
 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 +168,333 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:80
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:80
 msgid "Name"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:81
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:81
 msgid "Category"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:82
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:82
 msgid "Language"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:83
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:83
 msgid "Activity"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:84
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:84
 msgid "Contributors"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:88
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:88
 msgid "<a href=\"#project-tor\">Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:89
-#: /tmp/qxq11tAO2x.xml:97
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:89
+#: /tmp/TXmB9_uBOH.xml:97
 msgid "Core"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:90
-#: /tmp/qxq11tAO2x.xml:122
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:90
+#: /tmp/TXmB9_uBOH.xml:122
 msgid "C"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:91
-#: /tmp/qxq11tAO2x.xml:115 /tmp/qxq11tAO2x.xml:147 /tmp/qxq11tAO2x.xml:187
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:91
+#: /tmp/TXmB9_uBOH.xml:115 /tmp/TXmB9_uBOH.xml:147 /tmp/TXmB9_uBOH.xml:187
 msgid "Heavy"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:92
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:92
 msgid "nickm, arma, Sebastian"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:96
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:96
 msgid "*<a href=\"#project-jtor\">JTor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:98
-#: /tmp/qxq11tAO2x.xml:154 /tmp/qxq11tAO2x.xml:186
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:98
+#: /tmp/TXmB9_uBOH.xml:154 /tmp/TXmB9_uBOH.xml:186
 msgid "Java"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:99
-#: /tmp/qxq11tAO2x.xml:195 /tmp/qxq11tAO2x.xml:219 /tmp/qxq11tAO2x.xml:243
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:99
+#: /tmp/TXmB9_uBOH.xml:195 /tmp/TXmB9_uBOH.xml:219 /tmp/TXmB9_uBOH.xml:243
 msgid "None"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:104
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:104
 msgid "<a href=\"#project-tbb\">TBB</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:105
-#: /tmp/qxq11tAO2x.xml:113 /tmp/qxq11tAO2x.xml:121 /tmp/qxq11tAO2x.xml:129
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:105
+#: /tmp/TXmB9_uBOH.xml:113 /tmp/TXmB9_uBOH.xml:121 /tmp/TXmB9_uBOH.xml:129
 msgid "Usability"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:106
-#: /tmp/qxq11tAO2x.xml:114 /tmp/qxq11tAO2x.xml:130
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:106
+#: /tmp/TXmB9_uBOH.xml:114 /tmp/TXmB9_uBOH.xml:130
 msgid "Sys Admin"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:107
-#: /tmp/qxq11tAO2x.xml:155 /tmp/qxq11tAO2x.xml:163 /tmp/qxq11tAO2x.xml:227
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:107
+#: /tmp/TXmB9_uBOH.xml:155 /tmp/TXmB9_uBOH.xml:163 /tmp/TXmB9_uBOH.xml:227
 msgid "Moderate"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:108
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:108
 msgid "Erinn"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:112
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:112
 msgid "<a href=\"#project-tails\">Tails</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:116
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:116
 msgid "<a href=\"https://tails.boum.org/chat/\";>#tails</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:120
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:120
 msgid "<a href=\"#project-torsocks\">Torsocks</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:123
-#: /tmp/qxq11tAO2x.xml:131 /tmp/qxq11tAO2x.xml:139 /tmp/qxq11tAO2x.xml:171
-#: /tmp/qxq11tAO2x.xml:179 /tmp/qxq11tAO2x.xml:203 /tmp/qxq11tAO2x.xml:211
-#: /tmp/qxq11tAO2x.xml:235
+#: /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
 msgid "Light"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:124
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:124
 msgid "mwenge"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:128
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:128
 msgid "*<a href=\"#project-torouter\">Torouter</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:132
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:132
 msgid "ioerror, Runa"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:136
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:136
 msgid "<a href=\"#project-vidalia\">Vidalia</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:137
-#: /tmp/qxq11tAO2x.xml:145 /tmp/qxq11tAO2x.xml:153
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:137
+#: /tmp/TXmB9_uBOH.xml:145 /tmp/TXmB9_uBOH.xml:153
 msgid "User Interface"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:138
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:138
 msgid "C++, Qt"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:140
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:140
 msgid "chiiph"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:144
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:144
 msgid "<a href=\"#project-arm\">Arm</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:146
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:146
 msgid "Python, Curses"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:148
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:148
 msgid "atagar"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:152
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:152
 msgid "<a href=\"#project-orbot\">Orbot</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:156
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:156
 msgid "n8fr8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:160
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:160
 msgid "<a href=\"#project-torbutton\">Torbutton</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:161
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:161
 msgid "Browser Add-on"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:162
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:162
 msgid "Javascript"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:164
-#: /tmp/qxq11tAO2x.xml:180 /tmp/qxq11tAO2x.xml:236
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:164
+#: /tmp/TXmB9_uBOH.xml:180 /tmp/TXmB9_uBOH.xml:236
 msgid "mikeperry"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:168
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:168
 msgid "*<a href=\"#project-thandy\">Thandy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:169
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:169
 msgid "Updater"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:170
-#: /tmp/qxq11tAO2x.xml:178 /tmp/qxq11tAO2x.xml:202 /tmp/qxq11tAO2x.xml:210
-#: /tmp/qxq11tAO2x.xml:226 /tmp/qxq11tAO2x.xml:234 /tmp/qxq11tAO2x.xml:242
+#: /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
 msgid "Python"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:172
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:172
 msgid "Sebastian, Erinn, nickm"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:176
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:176
 msgid "<a href=\"#project-torctl\">TorCtl</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:177
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:177
 msgid "Library"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:184
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:184
 msgid "<a href=\"#project-metrics\">Metrics</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:185
-#: /tmp/qxq11tAO2x.xml:193 /tmp/qxq11tAO2x.xml:201 /tmp/qxq11tAO2x.xml:209
-#: /tmp/qxq11tAO2x.xml:217
+#: /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
 msgid "Client Service"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:188
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:188
 msgid "karsten"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:192
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:192
 msgid "<a href=\"#project-torstatus\">TorStatus</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:194
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:194
 msgid "PHP"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:200
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:200
 msgid "<a href=\"#project-weather\">Weather</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:204
-#: /tmp/qxq11tAO2x.xml:212
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:204
+#: /tmp/TXmB9_uBOH.xml:212
 msgid "kaner"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:208
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:208
 msgid "<a href=\"#project-gettor\">GetTor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:216
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:216
 msgid "<a href=\"#project-torcheck\">TorCheck</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:218
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:218
 msgid "Python, Perl"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:224
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:224
 msgid "<a href=\"#project-bridgedb\">BridgeDB</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:225
-#: /tmp/qxq11tAO2x.xml:233 /tmp/qxq11tAO2x.xml:241
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:225
+#: /tmp/TXmB9_uBOH.xml:233 /tmp/TXmB9_uBOH.xml:241
 msgid "Backend Service"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:228
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:228
 msgid "kaner, nickm"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:232
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:232
 msgid "<a href=\"#project-torflow\">TorFlow</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:240
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:240
 msgid "*<a href=\"#project-torbel\">TorBEL</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:244
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:244
 msgid "Sebastian"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:248
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:248
 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/dev/website/getinvolved/en/volunteer.wml:255
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:255
 msgid ""
 "Tor (<a href=\"https://gitweb.torproject.org/tor.git\";>code</a>, <a href="
 "\"https://trac.torproject.org/projects/tor/query?";
@@ -504,7 +504,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:260
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:260
 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 +512,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:266
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:266
 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 +521,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:273
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:273
 msgid "<a id=\"project-jtor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:274
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:274
 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 +534,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:280
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:280
 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 +542,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:285
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:285
 msgid "<a id=\"project-tbb\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:286
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:286
 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 +557,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:292
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:292
 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 +565,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:298
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:298
 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 +573,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:303
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:303
 msgid "<a id=\"project-tails\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:304
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:304
 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 +586,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:310
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:310
 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 +596,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:318
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:318
 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 +606,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:327
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:327
 msgid "<a id=\"project-torsocks\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:328
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:328
 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 +621,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:334
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:334
 msgid ""
 "Utility for adapting other applications to work with Tor. Development has "
 "slowed and compatibility issues remain with some platforms, but it's "
@@ -629,19 +629,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:340
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:340
 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/dev/website/getinvolved/en/volunteer.wml:344
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:344
 msgid "<a id=\"project-torouter\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:345
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:345
 msgid ""
 "<a href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/";
 "Torouter\">Torouter</a> (<a href=\"https://trac.torproject.org/projects/tor/";
@@ -651,19 +651,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:351
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:351
 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/dev/website/getinvolved/en/volunteer.wml:355
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:355
 msgid "<a id=\"project-vidalia\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:356
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:356
 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 +673,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:362
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:362
 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 +682,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:369
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:369
 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 +691,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:374
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:374
 msgid "<a id=\"project-arm\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:375
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:375
 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 +706,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:381
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:381
 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 +714,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:387
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:387
 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/dev/website/getinvolved/en/volunteer.wml:392
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:392
 msgid "<a id=\"project-orbot\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:393
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:393
 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 +736,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:399
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:399
 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/dev/website/getinvolved/en/volunteer.wml:404
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:404
 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 +754,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:411
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:411
 msgid "<a id=\"project-torbutton\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:412
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:412
 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 +769,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:418
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:418
 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 +779,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:426
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:426
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#torbuttonForThunderbird"
 "\">Torbutton equivalent for Thunderbird</a></i>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:430
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:430
 msgid "<a id=\"project-thandy\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:431
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:431
 msgid "Thandy (<a href=\"https://gitweb.torproject.org/thandy.git\";>code</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:435
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:435
 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 +804,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:440
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:440
 msgid "<a id=\"project-torctl\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:441
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:441
 msgid ""
 "TorCtl (<a href=\"https://gitweb.torproject.org/pytorctl.git\";>code</a>, <a "
 "href=\"https://trac.torproject.org/projects/tor/query?";
@@ -818,19 +818,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:447
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:447
 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/dev/website/getinvolved/en/volunteer.wml:451
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:451
 msgid "<a id=\"project-metrics\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:452
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:452
 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 +842,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:460
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:460
 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 +850,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:465
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:465
 msgid "<a id=\"project-torstatus\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:466
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:466
 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 +863,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:470
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:470
 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 +871,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:475
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:475
 msgid "<a id=\"project-weather\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:476
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:476
 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 +886,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:482
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:482
 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 +894,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:488
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:488
 msgid "<a id=\"project-gettor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:489
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:489
 msgid ""
 "<a href=\"https://trac.torproject.org/projects/tor/wiki/projects/";
 "EmailAutoResponder\">GetTor</a> (<a href=\"https://svn.torproject.org/svn/";
@@ -910,19 +910,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:495
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:495
 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/dev/website/getinvolved/en/volunteer.wml:499
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:499
 msgid "<a id=\"project-torcheck\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:500
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:500
 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 +932,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:506
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:506
 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/dev/website/getinvolved/en/volunteer.wml:510
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:510
 msgid "<a id=\"project-bridgedb\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:511
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:511
 msgid ""
 "<a href=\"https://trac.torproject.org/projects/tor/wiki/projects/BridgeDB";
 "\">BridgeDB</a> (<a href=\"https://gitweb.torproject.org/bridgedb.git";
@@ -954,19 +954,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:517
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:517
 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/dev/website/getinvolved/en/volunteer.wml:521
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:521
 msgid "<a id=\"project-torflow\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:522
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:522
 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 +976,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:528
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:528
 msgid ""
 "Library and collection of services for actively monitoring the Tor network.  "
 "These include the Bandwidth Scanners (measuring throughput of relays) and "
@@ -987,12 +987,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:536
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:536
 msgid "<a id=\"project-torbel\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:537
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:537
 msgid ""
 "<a href=\"https://trac.torproject.org/projects/tor/wiki/projects/";
 "TorBulkExitlist\">TorBEL</a> (<a href=\"https://gitweb.torproject.org/";
@@ -1003,7 +1003,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:544
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:544
 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 +1013,17 @@
 
 #
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:551
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:551
 msgid "<a id=\"Coding\"></a> <a id=\"Summer\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:553
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:553
 msgid "<a class=\"anchor\" href=\"#Coding\">Project Ideas</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:556
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:556
 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,20 +1038,20 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:570
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:570
 msgid "<a id=\"auditTBB\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:572
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:572
 msgid ""
 "<b>Audit Tor Browser Bundles for data leaks</b> <br> Priority: <i>High</i> "
 "<br> Effort Level: <i>High</i> <br> Skill Level: <i>Medium</i> <br> Likely "
-"Mentors: <i>Steven, Erinn, Jacob, Andrew</i>"
+"Mentors: <i>Erinn, Jacob, Andrew</i>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:581
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:581
 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 +1062,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:587
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:587
 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 +1070,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:590
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:590
 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 +1078,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:593
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:593
 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/dev/website/getinvolved/en/volunteer.wml:597
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:597
 msgid "<a id=\"firewallProbeTool\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:599
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:599
 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 +1098,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:608
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:608
 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 +1107,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:612
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:612
 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 +1115,38 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:615
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:615
 msgid "The test tool should:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:617
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:617
 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/dev/website/getinvolved/en/volunteer.wml:619
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:619
 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/dev/website/getinvolved/en/volunteer.wml:621
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:621
 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/dev/website/getinvolved/en/volunteer.wml:627
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:627
 msgid "<a id=\"tailsStartMenu\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:629
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:629
 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 +1154,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:638
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:638
 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/dev/website/getinvolved/en/volunteer.wml:641
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:641
 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 +1171,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:646
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:646
 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 +1183,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:653
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:653
 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/dev/website/getinvolved/en/volunteer.wml:656
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:656
 msgid "<a id=\"orbot-torbutton\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:658
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:658
 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 +1203,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:667
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:667
 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 +1215,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:677
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:677
 msgid "<a id=\"orbot-userInterface\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:679
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:679
 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 +1228,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:688
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:688
 msgid ""
 "Improved home screen to show confirmation of connection (via a TorCheck API "
 "call), better statistics about data transferred (up/down), number of "
@@ -1245,20 +1245,20 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:703
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:703
 msgid "<a id=\"resistCensorship\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:705
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:705
 msgid ""
 "<b>Improving Tor's ability to resist censorship</b> <br> Priority: <i>Medium "
 "to High</i> <br> Effort Level: <i>Medium to High</i> <br> Skill Level: "
-"<i>High</i> <br> Likely Mentors: <i>Roger, Nick, Steven, Jake</i>"
+"<i>High</i> <br> Likely Mentors: <i>Roger, Nick, Jake, Thomas</i>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:714
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:714
 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 +1267,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:719
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:719
 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 "
@@ -1275,13 +1275,14 @@
 "users that can't reach the Tor network directly, but there's an arms race "
 "between algorithms for distributing addresses and algorithms for gathering "
 "and blocking them. See <a href=\"<blog>bridge-distribution-strategies\">our "
-"blog post on the topic</a> as an overview, and then look at <a href=\"http://";
-"archives.seul.org/or/dev/Dec-2009/msg00000.html\">Roger's or-dev post</a> "
-"from December for more recent thoughts &mdash; lots of design work remains."
+"blog post on the topic</a> as an overview, and then look at <a href="
+"\"https://lists.torproject.org/pipermail/tor-dev/2009-December/000666.html";
+"\">Roger's or-dev post</a> from December 2009 for more recent thoughts "
+"&mdash; lots of design work remains."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:730
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:730
 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 "
@@ -1292,7 +1293,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:737
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:737
 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 "
@@ -1301,12 +1302,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:744
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:744
 msgid "<a id=\"geoIPUpgrade\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:746
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:746
 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> "
@@ -1314,7 +1315,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:755
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:755
 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 "
@@ -1323,7 +1324,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:760
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:760
 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 "
@@ -1332,12 +1333,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:769
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:769
 msgid "<a id=\"armClientMode\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:771
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:771
 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 "
@@ -1345,7 +1346,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:780
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:780
 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, "
@@ -1356,14 +1357,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:788
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:788
 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/dev/website/getinvolved/en/volunteer.wml:792
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:792
 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 "
@@ -1376,21 +1377,21 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:801
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:801
 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/dev/website/getinvolved/en/volunteer.wml:804
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:804
 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/dev/website/getinvolved/en/volunteer.wml:807
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:807
 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://";
@@ -1398,7 +1399,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:812
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:812
 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 "
@@ -1406,7 +1407,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:816
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:816
 msgid ""
 "Menus as an alternative to hotkeys to make the interface more intuitive and "
 "usable for beginners (<a href=\"http://gnosis.cx/publish/programming/";
@@ -1414,13 +1415,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:820
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:820
 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/dev/website/getinvolved/en/volunteer.wml:824
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:824
 msgid ""
 "More information is available in the following sections of arm's dev notes: "
 "<a href=\"https://trac.torproject.org/projects/tor/wiki/projects/";
@@ -1431,12 +1432,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:828
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:828
 msgid "<a id=\"unitTesting\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:830
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:830
 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 "
@@ -1444,7 +1445,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:839
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:839
 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 "
@@ -1454,7 +1455,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:845
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:845
 msgid ""
 "Additionally, we need to automate our performance testing. We've got "
 "buildbot to automate our regular integration and compile testing already "
@@ -1467,20 +1468,20 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:855
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:855
 msgid "<a id=\"simulateSlowConnections\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:857
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:857
 msgid ""
 "<b>Simulator for slow Internet connections</b> <br> Priority: <i>Medium</i> "
 "<br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium</i> <br> Likely "
-"Mentors: <i>Steven</i>"
+"Mentors: <i>Nick</i>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:867
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:867
 msgid ""
 "Many users of Tor have poor-quality Internet connections, giving low "
 "bandwidth, high latency, and high packet loss/re-ordering. User experience "
@@ -1489,7 +1490,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:875
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:875
 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. "
@@ -1499,7 +1500,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:883
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:883
 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 "
@@ -1508,12 +1509,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:891
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:891
 msgid "<a id=\"torbuttonForThunderbird\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:893
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:893
 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 "
@@ -1521,7 +1522,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:903
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:903
 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 "
@@ -1531,12 +1532,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:911
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:911
 msgid "<a id=\"usabilityTesting\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:913
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:913
 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 "
@@ -1544,7 +1545,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:923
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:923
 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 "
@@ -1553,19 +1554,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:930
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:930
 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/dev/website/getinvolved/en/volunteer.wml:935
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:935
 msgid "<a id=\"tailsMetadataAnonymizing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:937
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:937
 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: "
@@ -1573,7 +1574,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:946
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:946
 msgid ""
 "Tor helps greatly in publishing files anonymously. However, much personal "
 "information can be enclosed *inside* such published files' meta-data: GPS "
@@ -1582,14 +1583,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:950
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:950
 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/dev/website/getinvolved/en/volunteer.wml:952
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:952
 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 "
@@ -1598,7 +1599,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:956
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:956
 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 "
@@ -1607,7 +1608,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:960
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:960
 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 "
@@ -1616,12 +1617,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:966
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:966
 msgid "<a id=\"tailsDebianLive\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:968
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:968
 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> "
@@ -1629,7 +1630,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:977
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:977
 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 "
@@ -1637,7 +1638,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:980
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:980
 msgid ""
 "Some real-life use cases, however, require some kind of data persistence. To "
 "start with, Tails should (carefully) support persistence of application-"
@@ -1647,7 +1648,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:985
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:985
 msgid ""
 "The backend work consists of improving Debian Live's existing persistence "
 "features to make them suit the specific context of Tails. A trust "
@@ -1658,7 +1659,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:991
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:991
 msgid ""
 "Anyone undertaking this project must be familiar with GNU/Linux, and "
 "preferably with Debian. Being able to (quickly learn to) write clean and "
@@ -1666,19 +1667,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:994
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:994
 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/dev/website/getinvolved/en/volunteer.wml:997
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:997
 msgid "<a id=\"torsocksForOSX\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:999
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:999
 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 "
@@ -1686,7 +1687,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1009
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1009
 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 "
@@ -1706,12 +1707,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1028
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1028
 msgid "<a id=\"vidaliaStatusEventInterface\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1030
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1030
 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 "
@@ -1719,7 +1720,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1039
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1039
 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 "
@@ -1732,7 +1733,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1047
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1047
 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 "
@@ -1741,7 +1742,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1052
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1052
 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 "
@@ -1753,7 +1754,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1060
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1060
 msgid ""
 "A person undertaking this project should have good UI design and layout "
 "skills and some C++ development experience. Previous experience with Qt and "
@@ -1765,12 +1766,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1069
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1069
 msgid "<a id=\"orbot-optimisation\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1071
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1071
 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: "
@@ -1778,7 +1779,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1081
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1081
 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 "
@@ -1788,7 +1789,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1090
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1090
 msgid ""
 "It should be noted, that even without optimisation, Tor is handling the "
 "mobile network environment very well, automatically detecting change in IP "
@@ -1800,7 +1801,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1100
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1100
 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 "
@@ -1808,19 +1809,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1106
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1106
 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/dev/website/getinvolved/en/volunteer.wml:1112
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1112
 msgid "<a id=\"orbot-orlibAndOutreach\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1114
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1114
 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> "
@@ -1828,7 +1829,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1124
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1124
 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 "
@@ -1842,12 +1843,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1137
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1137
 msgid "<a id=\"vidaliaNetworkMap\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1139
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1139
 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: "
@@ -1855,7 +1856,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1149
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1149
 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 "
@@ -1870,7 +1871,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1163
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1163
 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 "
@@ -1880,7 +1881,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1171
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1171
 msgid ""
 "A person undertaking this project should have good C++ development "
 "experience. Previous experience with Qt and CMake is helpful, but not "
@@ -1888,19 +1889,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1177
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1177
 msgid "<a id=\"armGui\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1179
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1179
 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/dev/website/getinvolved/en/volunteer.wml:1189
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1189
 msgid ""
 "Arm has several unique features, some of the most interesting being its "
 "connection listing (correlating netstat results against the Tor consensus)  "
@@ -1912,7 +1913,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1199
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1199
 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/";
@@ -1924,7 +1925,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1209
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1209
 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> "
@@ -1934,19 +1935,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1221
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1221
 msgid "<a id=\"OtherCoding\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1222
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1222
 msgid ""
 "<a class=\"anchor\" href=\"#OtherCoding\">Other Coding and Design related "
 "ideas</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1224
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1224
 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 "
@@ -1961,7 +1962,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1237
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1237
 msgid ""
 "We need to actually start building our <a href=\"<page docs/"
 "documentation>#DesignDoc\">blocking-resistance design</a>. This involves "
@@ -1971,7 +1972,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1243
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1243
 msgid ""
 "We need a flexible simulator framework for studying end-to-end traffic "
 "confirmation attacks. Many researchers have whipped up ad hoc simulators to "
@@ -1985,7 +1986,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1253
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1253
 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 "
@@ -1994,7 +1995,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1259
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1259
 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 "
@@ -2003,7 +2004,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1264
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1264
 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 "
@@ -2016,7 +2017,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1275
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1275
 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 "
@@ -2024,7 +2025,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1279
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1279
 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> "
@@ -2035,7 +2036,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1286
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1286
 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 "
@@ -2043,7 +2044,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1293
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1293
 msgid ""
 "Another anti-censorship project is to try to make Tor more scanning-"
 "resistant.  Right now, an adversary can identify <a href="
@@ -2057,17 +2058,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1307
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1307
 msgid "<a id=\"Research\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1308
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1308
 msgid "<a class=\"anchor\" href=\"#Research\">Research</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1310
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1310
 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:";
@@ -2081,7 +2082,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1320
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1320
 msgid ""
 "A related question is: Does running a relay/bridge provide additional "
 "protection against these timing attacks? Can an external adversary that "
@@ -2101,7 +2102,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1335
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1335
 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 "
@@ -2120,7 +2121,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1350
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1350
 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 "
@@ -2135,7 +2136,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1360
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1360
 msgid ""
 "Other research questions regarding geographic diversity consider the "
 "tradeoff between choosing an efficient circuit and choosing a random "
@@ -2147,7 +2148,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1367
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1367
 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 "
@@ -2164,7 +2165,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1379
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1379
 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 "
@@ -2175,7 +2176,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1386
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1386
 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."
@@ -2191,7 +2192,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1397
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1397
 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 "
@@ -2202,7 +2203,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1404
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1404
 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 "
@@ -2210,7 +2211,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1407
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1407
 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 "
@@ -2230,7 +2231,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1424
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1424
 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 "
@@ -2238,7 +2239,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1432
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1432
 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/press/3-low.inthemedia.pot
===================================================================
--- translation/trunk/projects/website/po/templates/press/3-low.inthemedia.pot	2011-04-13 15:27:51 UTC (rev 24615)
+++ translation/trunk/projects/website/po/templates/press/3-low.inthemedia.pot	2011-04-13 15:28:29 UTC (rev 24616)
@@ -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-04-13 16:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,7 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/press/en/inthemedia.wml:8
+#: /home/runa/tor/website/press/en/inthemedia.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page press/press>"
 "\">Press &raquo; </a> <a href=\"<page press/inthemedia>\">Tor in the Media</"
@@ -25,12 +25,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/dev/website/press/en/inthemedia.wml:15
+#: /home/runa/tor/website/press/en/inthemedia.wml:15
 msgid "Media Appearances"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/press/en/inthemedia.wml:17
+#: /home/runa/tor/website/press/en/inthemedia.wml:17
 msgid ""
 "Major news organizations including the New York Times, Forbes, Al Jazeera, "
 "Washington Post, Le Monde, NPR, BBC, and more have sought out or quoted Tor "
@@ -39,7 +39,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/press/en/inthemedia.wml:21
+#: /home/runa/tor/website/press/en/inthemedia.wml:21
 msgid ""
 "Since Tor is widely used throughout the world, it is mentioned regularly in "
 "the press.  This list is not comprehensive, but illustrates some of the "
@@ -47,39 +47,57 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/press/en/inthemedia.wml:24
+#: /home/runa/tor/website/press/en/inthemedia.wml:24
 msgid ""
 "A sample of such media appearances and mentions is below in order of newest "
 "to oldest:"
 msgstr ""
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/dev/website/press/en/inthemedia.wml:30
+#: /home/runa/tor/website/press/en/inthemedia.wml:30
 msgid "Date"
 msgstr ""
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/dev/website/press/en/inthemedia.wml:31
+#: /home/runa/tor/website/press/en/inthemedia.wml:31
 msgid "Publication"
 msgstr ""
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/dev/website/press/en/inthemedia.wml:32
+#: /home/runa/tor/website/press/en/inthemedia.wml:32
 msgid "Topic"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:36
+#: /home/runa/tor/website/press/en/inthemedia.wml:36
+msgid "2011 March 29"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:37
+msgid "CNN: Situation Room"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:38
+msgid ""
+"<a href=\"http://edition.cnn.com/CNN/Programs/situation.room/\";>Tor featured "
+"in a segment about US companies providing censorship to repressive regimes "
+"and those circumventing their products.</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:43
 msgid "2011 March 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:37
+#: /home/runa/tor/website/press/en/inthemedia.wml:44
 msgid "Telegraph"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:38
+#: /home/runa/tor/website/press/en/inthemedia.wml:45
 msgid ""
 "<a href=\"http://www.telegraph.co.uk/news/worldnews/middleeast/iran/8388484/";
 "Iran-cracks-down-on-web-dissident-technology.html\">Iran cracks down on web "
@@ -87,51 +105,51 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:43
+#: /home/runa/tor/website/press/en/inthemedia.wml:50
 msgid "2011 March 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:44 /tmp/Q2ndl8ZYsF.xml:228
+#: /home/runa/tor/website/press/en/inthemedia.wml:51 /tmp/f4ZHcgeG58.xml:235
 msgid "BusinessWeek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:45
+#: /home/runa/tor/website/press/en/inthemedia.wml:52
 msgid ""
 "<a href=\"http://www.businessweek.com/magazine/content/11_13/b4221043353206.";
 "htm\">Social Networking: Fighting to Remain Anonymous</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:50
+#: /home/runa/tor/website/press/en/inthemedia.wml:57
 msgid "2011 March 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:51
+#: /home/runa/tor/website/press/en/inthemedia.wml:58
 msgid "NyTeknik"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:52
+#: /home/runa/tor/website/press/en/inthemedia.wml:59
 msgid ""
 "<a href=\"http://www.nyteknik.se/nyheter/it_telekom/internet/article3123594.";
 "ece\">Svenska bistÃndspengar till Facebookrevolutionen</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:57
+#: /home/runa/tor/website/press/en/inthemedia.wml:64
 msgid "2011 March 09"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:58
+#: /home/runa/tor/website/press/en/inthemedia.wml:65
 msgid "Washington Post"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:59
+#: /home/runa/tor/website/press/en/inthemedia.wml:66
 msgid ""
 "<a href=\"http://www.washingtonpost.com/wp-dyn/content/article/2011/03/09/";
 "AR2011030905157_pf.html\">U.S.  funding tech firms that help Mideast "
@@ -139,17 +157,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:65
+#: /home/runa/tor/website/press/en/inthemedia.wml:72
 msgid "2011 February 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:66
+#: /home/runa/tor/website/press/en/inthemedia.wml:73
 msgid "Walpole Times"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:67
+#: /home/runa/tor/website/press/en/inthemedia.wml:74
 msgid ""
 "<a href=\"http://www.wickedlocal.com/walpole/news/x95296113/Tor-Project-a-";
 "Walpole-based-company-helps-Egyptians-avoid-Internet-censorship-during-"
@@ -158,18 +176,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:72 /tmp/Q2ndl8ZYsF.xml:86
-#: /tmp/Q2ndl8ZYsF.xml:93 /tmp/Q2ndl8ZYsF.xml:100
+#: /home/runa/tor/website/press/en/inthemedia.wml:79 /tmp/f4ZHcgeG58.xml:93
+#: /tmp/f4ZHcgeG58.xml:100 /tmp/f4ZHcgeG58.xml:107
 msgid "2011 January 31"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:73
+#: /home/runa/tor/website/press/en/inthemedia.wml:80
 msgid "NPR: WBUR"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:74
+#: /home/runa/tor/website/press/en/inthemedia.wml:81
 msgid ""
 "<a href=\"http://hereandnow.wbur.org/2011/01/31/egypt-internet-government";
 "\">Here &amp; Now: U.S. Activists Help Egyptian Protesters Elude Government "
@@ -177,29 +195,29 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:80
+#: /home/runa/tor/website/press/en/inthemedia.wml:87
 msgid "2011 February 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:81
+#: /home/runa/tor/website/press/en/inthemedia.wml:88
 msgid "Discovery News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:82
+#: /home/runa/tor/website/press/en/inthemedia.wml:89
 msgid ""
 "<a href=\"http://news.discovery.com/tech/egypt-internet-online-";
 "protesters-110201.html\">Egypt's Internet Block Incomplete But Damaging</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:87
+#: /home/runa/tor/website/press/en/inthemedia.wml:94
 msgid "IDG Poland"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:88
+#: /home/runa/tor/website/press/en/inthemedia.wml:95
 msgid ""
 "<a href=\"http://www.idg.pl/news/366773/Egipt.blokuje.Internet.aktywisci.";
 "szukaja.alternatyw.html\">Egipt blokuje Internet, aktywiÅci szukajÄ "
@@ -207,24 +225,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:94 /tmp/Q2ndl8ZYsF.xml:677
+#: /home/runa/tor/website/press/en/inthemedia.wml:101 /tmp/f4ZHcgeG58.xml:684
 msgid "New Scientist"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:95
+#: /home/runa/tor/website/press/en/inthemedia.wml:102
 msgid ""
 "<a href=\"http://www.newscientist.com/blogs/onepercent/2011/01/egypt-remains-";
 "officially-offli.html\">How Egypt is getting online</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:101
+#: /home/runa/tor/website/press/en/inthemedia.wml:108
 msgid "El Pais"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:102
+#: /home/runa/tor/website/press/en/inthemedia.wml:109
 msgid ""
 "<a href=\"http://www.elpais.com/articulo/internacional/Sortear/censura/golpe/";
 "fax/elpepuint/20110130elpepuint_14/Tes\">Sortear la censura a golpe de fax</"
@@ -232,18 +250,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:107 /tmp/Q2ndl8ZYsF.xml:114
-#: /tmp/Q2ndl8ZYsF.xml:121
+#: /home/runa/tor/website/press/en/inthemedia.wml:114 /tmp/f4ZHcgeG58.xml:121
+#: /tmp/f4ZHcgeG58.xml:128
 msgid "2011 January 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:108
+#: /home/runa/tor/website/press/en/inthemedia.wml:115
 msgid "Fox 25 News - Boston"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:109
+#: /home/runa/tor/website/press/en/inthemedia.wml:116
 msgid ""
 "<a href=\"http://www.myfoxboston.com/dpp/news/local/local-company-helps-give-";
 "egyptians-internet-access-20110130\">Local company helps give Egyptians "
@@ -251,12 +269,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:115
+#: /home/runa/tor/website/press/en/inthemedia.wml:122
 msgid "New England Cable News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:116
+#: /home/runa/tor/website/press/en/inthemedia.wml:123
 msgid ""
 "<a href=\"http://www.necn.com/01/30/11/Mass-company-helps-activists-avoid-";
 "onlin/landing.html?blockID=400628&feedID=4213\">Mass.  company helps "
@@ -264,12 +282,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:122 /tmp/Q2ndl8ZYsF.xml:253
+#: /home/runa/tor/website/press/en/inthemedia.wml:129 /tmp/f4ZHcgeG58.xml:260
 msgid "Boston Globe"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:123
+#: /home/runa/tor/website/press/en/inthemedia.wml:130
 msgid ""
 "<a href=\"http://www.boston.com/news/local/massachusetts/articles/2011/01/30/";
 "mass_groups_software_helps_avoid_censorship/\">Foreign activists stay "
@@ -277,29 +295,29 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:128 /tmp/Q2ndl8ZYsF.xml:135
+#: /home/runa/tor/website/press/en/inthemedia.wml:135 /tmp/f4ZHcgeG58.xml:142
 msgid "2011 January 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:129
+#: /home/runa/tor/website/press/en/inthemedia.wml:136
 msgid "SvD.se"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:130
+#: /home/runa/tor/website/press/en/inthemedia.wml:137
 msgid ""
 "<a href=\"http://www.svd.se/nyheter/utrikes/tor-oppnar-dorrar-for-";
 "natdissidenter_5902693.svd\">Tor Ãppnar dÃrrar fÃr nÃtdissidenter</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:136 /tmp/Q2ndl8ZYsF.xml:329
+#: /home/runa/tor/website/press/en/inthemedia.wml:143 /tmp/f4ZHcgeG58.xml:336
 msgid "ComputerWorld"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:137
+#: /home/runa/tor/website/press/en/inthemedia.wml:144
 msgid ""
 "<a href=\"http://www.computerworld.com/s/article/9207058/";
 "Without_Internet_Egyptians_find_new_ways_to_get_online?"
@@ -307,17 +325,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:142
+#: /home/runa/tor/website/press/en/inthemedia.wml:149
 msgid "2011 January 28"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:143
+#: /home/runa/tor/website/press/en/inthemedia.wml:150
 msgid "Globe and Mail"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:144
+#: /home/runa/tor/website/press/en/inthemedia.wml:151
 msgid ""
 "<a href=\"https://www.theglobeandmail.com/news/technology/in-a-span-of-";
 "minutes-a-country-goes-offline/article1887207/\">In a span of minutes, a "
@@ -325,87 +343,87 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:149
+#: /home/runa/tor/website/press/en/inthemedia.wml:156
 msgid "2010 December 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:150 /tmp/Q2ndl8ZYsF.xml:222
-#: /tmp/Q2ndl8ZYsF.xml:241 /tmp/Q2ndl8ZYsF.xml:317 /tmp/Q2ndl8ZYsF.xml:355
-#: /tmp/Q2ndl8ZYsF.xml:628
+#: /home/runa/tor/website/press/en/inthemedia.wml:157 /tmp/f4ZHcgeG58.xml:229
+#: /tmp/f4ZHcgeG58.xml:248 /tmp/f4ZHcgeG58.xml:324 /tmp/f4ZHcgeG58.xml:362
+#: /tmp/f4ZHcgeG58.xml:635
 msgid "Technology Review"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:151
+#: /home/runa/tor/website/press/en/inthemedia.wml:158
 msgid ""
 "<a href=\"http://www.technologyreview.com/web/26981/\";>Home Internet with "
 "Anonymity Built In</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:155
+#: /home/runa/tor/website/press/en/inthemedia.wml:162
 msgid "2010 December 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:156
+#: /home/runa/tor/website/press/en/inthemedia.wml:163
 msgid "New York Times Magazine"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:157
+#: /home/runa/tor/website/press/en/inthemedia.wml:164
 msgid ""
 "<a href=\"https://www.nytimes.com/2010/12/19/magazine/19FOB-Medium-t.html";
 "\">Granting Anonymity</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:162
+#: /home/runa/tor/website/press/en/inthemedia.wml:169
 msgid "2010 November 03"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:163
+#: /home/runa/tor/website/press/en/inthemedia.wml:170
 msgid "metro sverige"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:164
+#: /home/runa/tor/website/press/en/inthemedia.wml:171
 msgid ""
 "<a href=\"http://www.metro.se/2010/11/03/73897/sida-hjalper-utsatta-bli-";
 "anonyma-pa-n/\">Sida hjÃlper utsatta bli anonyma pà nÃtet</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:168
+#: /home/runa/tor/website/press/en/inthemedia.wml:175
 msgid "2010 Sept 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:169
+#: /home/runa/tor/website/press/en/inthemedia.wml:176
 msgid "NPR: On the media"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:170
+#: /home/runa/tor/website/press/en/inthemedia.wml:177
 msgid ""
 "<a href=\"http://www.onthemedia.org/transcripts/2010/09/17/05\";>On the "
 "Media: Interview with Jacob Appelbaum</a>."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:174
+#: /home/runa/tor/website/press/en/inthemedia.wml:181
 msgid "2010 August 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:175
+#: /home/runa/tor/website/press/en/inthemedia.wml:182
 msgid "PC Format - Poland"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:176
+#: /home/runa/tor/website/press/en/inthemedia.wml:183
 msgid ""
 "<a href=\"http://www.pcformat.pl/index.php/artykul/aid/1236/t/google-";
 "facebook-nas-szpieguj-jak-chroni-prywatno-w-sieci\">Google and Facebook are "
@@ -413,17 +431,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:181
+#: /home/runa/tor/website/press/en/inthemedia.wml:188
 msgid "2010 July 14"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:182
+#: /home/runa/tor/website/press/en/inthemedia.wml:189
 msgid "China Rights Forum"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:183
+#: /home/runa/tor/website/press/en/inthemedia.wml:190
 msgid ""
 "<a href=\"http://www.hrichina.org/public/contents/category?";
 "cid=175033\">China Rights Forum, No. 2 - âChinaâs Internetâ: Staking Digital "
@@ -431,17 +449,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:189
+#: /home/runa/tor/website/press/en/inthemedia.wml:196
 msgid "2010 May 25"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:190
+#: /home/runa/tor/website/press/en/inthemedia.wml:197
 msgid "The Australian"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:191
+#: /home/runa/tor/website/press/en/inthemedia.wml:198
 msgid ""
 "<a href=\"http://www.theaustralian.com.au/australian-it/call-to-join-tor-";
 "network-to-fight-censorship/story-e6frgakx-1225870756466\"> Call to join Tor "
@@ -449,68 +467,68 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:196
+#: /home/runa/tor/website/press/en/inthemedia.wml:203
 msgid "2010 Mar 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:197
+#: /home/runa/tor/website/press/en/inthemedia.wml:204
 msgid "PC World Poland"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:198
+#: /home/runa/tor/website/press/en/inthemedia.wml:205
 msgid ""
 "<a href=\"http://www.idg.pl/news/356993/Anonimowosc.w.Sieci.html\";>Anonymity "
 "in the Web</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:202
+#: /home/runa/tor/website/press/en/inthemedia.wml:209
 msgid "2010 Mar 11"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:203
+#: /home/runa/tor/website/press/en/inthemedia.wml:210
 msgid "ABC Australia"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:204
+#: /home/runa/tor/website/press/en/inthemedia.wml:211
 msgid ""
 "<a href=\"http://www.abc.net.au/rn/futuretense/stories/2010/2837736.htm";
 "\">Future Tense: The Deep Web</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:207
+#: /home/runa/tor/website/press/en/inthemedia.wml:214
 msgid "2010 Mar 09"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:208
+#: /home/runa/tor/website/press/en/inthemedia.wml:215
 msgid "PC Pro UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:209
+#: /home/runa/tor/website/press/en/inthemedia.wml:216
 msgid ""
 "<a href=\"http://www.pcpro.co.uk/features/356254/the-dark-side-of-the-web";
 "\">The dark side of the web</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:214
+#: /home/runa/tor/website/press/en/inthemedia.wml:221
 msgid "2009 Dec 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:215
+#: /home/runa/tor/website/press/en/inthemedia.wml:222
 msgid "Times Online"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:216
+#: /home/runa/tor/website/press/en/inthemedia.wml:223
 msgid ""
 "<a href=\"http://www.timesonline.co.uk/tol/news/world/middle_east/";
 "article6969958.ece\">When Iranâs regime falls this will be remembered as the "
@@ -518,41 +536,41 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:221
+#: /home/runa/tor/website/press/en/inthemedia.wml:228
 msgid "2009 Oct 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:223
+#: /home/runa/tor/website/press/en/inthemedia.wml:230
 msgid ""
 "<a href=\"http://www.technologyreview.com/web/23736/?a=f\";>China Cracks Down "
 "on Tor Anonymity Network</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:227
+#: /home/runa/tor/website/press/en/inthemedia.wml:234
 msgid "2009 Sep 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:229
+#: /home/runa/tor/website/press/en/inthemedia.wml:236
 msgid ""
 "<a href=\"http://www.businessweek.com/globalbiz/content/sep2009/";
 "gb20090930_620354.htm\">China's Online Censors Work Overtime</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:233
+#: /home/runa/tor/website/press/en/inthemedia.wml:240
 msgid "2009 Aug 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:234
+#: /home/runa/tor/website/press/en/inthemedia.wml:241
 msgid "Reuters"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:235
+#: /home/runa/tor/website/press/en/inthemedia.wml:242
 msgid ""
 "<a href=\"http://www.reuters.com/article/internetNews/idUSTRE57I4IE20090819?";
 "pageNumber=1&amp;virtualBrandChannel=0&amp;sp=true\">Web tools help protect "
@@ -560,36 +578,36 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:240
+#: /home/runa/tor/website/press/en/inthemedia.wml:247
 msgid "2009 Aug 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:242
+#: /home/runa/tor/website/press/en/inthemedia.wml:249
 msgid ""
 "<a href=\"http://www.technologyreview.com/blog/editors/23958/?";
 "nlid=2255\">How to Build Anonymity Into the Internet</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:246 /tmp/Q2ndl8ZYsF.xml:252
+#: /home/runa/tor/website/press/en/inthemedia.wml:253 /tmp/f4ZHcgeG58.xml:259
 msgid "2009 Jul 26"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:247 /tmp/Q2ndl8ZYsF.xml:278
+#: /home/runa/tor/website/press/en/inthemedia.wml:254 /tmp/f4ZHcgeG58.xml:285
 msgid "Washington Times"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:248
+#: /home/runa/tor/website/press/en/inthemedia.wml:255
 msgid ""
 "<a href=\"http://www.washingtontimes.com/news/2009/jul/26/senate-help-iran-";
 "dodge-internet-censorship/\">Senate OKs funds to thwart Iran Web censors</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:254
+#: /home/runa/tor/website/press/en/inthemedia.wml:261
 msgid ""
 "<a href=\"http://www.boston.com/news/nation/washington/articles/2009/07/26/";
 "us_to_increase_funding_for_hackivists_aiding_iranians/\">US set to hike aid "
@@ -597,17 +615,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:259
+#: /home/runa/tor/website/press/en/inthemedia.wml:266
 msgid "2009 Jul 24"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:260
+#: /home/runa/tor/website/press/en/inthemedia.wml:267
 msgid "Associated Press"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:261
+#: /home/runa/tor/website/press/en/inthemedia.wml:268
 msgid ""
 "<a href=\"http://www.google.com/hostednews/ap/article/ALeqM5hTf-";
 "p6Iy3sWHK8BRR58npGosLC3AD99L01QO0\">Iran activists work to elude crackdown "
@@ -615,46 +633,46 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:266
+#: /home/runa/tor/website/press/en/inthemedia.wml:273
 msgid "2009 Jul 08"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:267
+#: /home/runa/tor/website/press/en/inthemedia.wml:274
 msgid "Tehran Bureau"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:268
+#: /home/runa/tor/website/press/en/inthemedia.wml:275
 msgid ""
 "<a href=\"http://tehranbureau.com/geeks-globe-rally-iranians-online/\";>Geeks "
 "Around the Globe Rally to Help Iranians Online</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:272
+#: /home/runa/tor/website/press/en/inthemedia.wml:279
 msgid "2009 Jul 02"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:273
+#: /home/runa/tor/website/press/en/inthemedia.wml:280
 msgid "NED/CIMA"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:274
+#: /home/runa/tor/website/press/en/inthemedia.wml:281
 msgid ""
 "<a href=\"http://cima.ned.org/events/new-media-in-iran.html\";>The Role of "
 "New Media in the Iranian Elections</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:277
+#: /home/runa/tor/website/press/en/inthemedia.wml:284
 msgid "2009 Jun 26"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:279
+#: /home/runa/tor/website/press/en/inthemedia.wml:286
 msgid ""
 "<a href=\"http://www.washingtontimes.com/news/2009/jun/26/protesters-use-";
 "navy-technology-to-avoid-censorship/?feat=home_headlines\">Iranian "
@@ -662,70 +680,70 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:284
+#: /home/runa/tor/website/press/en/inthemedia.wml:291
 msgid "2009 Jun 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:285
+#: /home/runa/tor/website/press/en/inthemedia.wml:292
 msgid "EFF"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:286
+#: /home/runa/tor/website/press/en/inthemedia.wml:293
 msgid ""
 "<a href=\"http://www.eff.org/deeplinks/2009/06/help-protesters-iran-run-tor-";
 "relays-bridges\">Help Protesters in Iran: Run a Tor Bridge or a Tor Relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:290
+#: /home/runa/tor/website/press/en/inthemedia.wml:297
 msgid "2009 Jun 24"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:291
+#: /home/runa/tor/website/press/en/inthemedia.wml:298
 msgid "Daily Finance"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:292
+#: /home/runa/tor/website/press/en/inthemedia.wml:299
 msgid ""
 "<a href=\"http://www.dailyfinance.com/2009/06/24/nokia-and-siemens-in-iran-";
 "controversy/\">Nokia and Siemens in Iran controversy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:296 /tmp/Q2ndl8ZYsF.xml:310
-#: /tmp/Q2ndl8ZYsF.xml:316
+#: /home/runa/tor/website/press/en/inthemedia.wml:303 /tmp/f4ZHcgeG58.xml:317
+#: /tmp/f4ZHcgeG58.xml:323
 msgid "2009 Jun 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:297 /tmp/Q2ndl8ZYsF.xml:386
-#: /tmp/Q2ndl8ZYsF.xml:622
+#: /home/runa/tor/website/press/en/inthemedia.wml:304 /tmp/f4ZHcgeG58.xml:393
+#: /tmp/f4ZHcgeG58.xml:629
 msgid "Wall Street Journal"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:298
+#: /home/runa/tor/website/press/en/inthemedia.wml:305
 msgid ""
 "<a href=\"http://blogs.wsj.com/digits/2009/06/18/iranians-using-tor-to-";
 "anonymize-web-use/\">Iranians Using Tor to Anonymize Web Use</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:302
+#: /home/runa/tor/website/press/en/inthemedia.wml:309
 msgid "2009 Jun 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:303
+#: /home/runa/tor/website/press/en/inthemedia.wml:310
 msgid "O'Reilly Radar"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:304
+#: /home/runa/tor/website/press/en/inthemedia.wml:311
 msgid ""
 "<a href=\"http://radar.oreilly.com/2009/06/tor-and-the-legality-of-runnin.";
 "html\"> Dramatic Increase in Number of Tor Clients from Iran: Interview with "
@@ -733,43 +751,43 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:311
+#: /home/runa/tor/website/press/en/inthemedia.wml:318
 msgid "Deutsche Welle"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:312
+#: /home/runa/tor/website/press/en/inthemedia.wml:319
 msgid ""
 "<a href=\"http://www.dw-world.de/dw/article/0,,4400882,00.html\";>Internet "
 "proxies let Iranians and others connect to blocked Web sites</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:318
+#: /home/runa/tor/website/press/en/inthemedia.wml:325
 msgid ""
 "<a href=\"http://www.technologyreview.com/web/22893/\";>The Web vs. the "
 "Republic of Iran</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:322 /tmp/Q2ndl8ZYsF.xml:328
+#: /home/runa/tor/website/press/en/inthemedia.wml:329 /tmp/f4ZHcgeG58.xml:335
 msgid "2009 Jun 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:323
+#: /home/runa/tor/website/press/en/inthemedia.wml:330
 msgid "CNet News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:324
+#: /home/runa/tor/website/press/en/inthemedia.wml:331
 msgid ""
 "<a href=\"http://news.cnet.com/8301-13578_3-10267287-38.html\";>Iranians find "
 "ways to bypass Net censors</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:330
+#: /home/runa/tor/website/press/en/inthemedia.wml:337
 msgid ""
 "<a href=\"http://www.computerworld.com/action/article.do?";
 "command=viewArticleBasic&amp;articleId=9134471&amp;intsrc=news_ts_head"
@@ -777,34 +795,34 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:335
+#: /home/runa/tor/website/press/en/inthemedia.wml:342
 msgid "2009 May 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:336 /tmp/Q2ndl8ZYsF.xml:362
+#: /home/runa/tor/website/press/en/inthemedia.wml:343 /tmp/f4ZHcgeG58.xml:369
 msgid "Le Monde"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:337
+#: /home/runa/tor/website/press/en/inthemedia.wml:344
 msgid ""
 "<a href=\"http://www.lemonde.fr/actualite-medias/article/2009/05/29/les-";
 "censeurs-du-net_1199993_3236.html\">Les censeurs du Net</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:341
+#: /home/runa/tor/website/press/en/inthemedia.wml:348
 msgid "2009 May 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:342
+#: /home/runa/tor/website/press/en/inthemedia.wml:349
 msgid "Mass High Tech"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:343
+#: /home/runa/tor/website/press/en/inthemedia.wml:350
 msgid ""
 "<a href=\"http://www.masshightech.com/stories/2009/05/11/newscolumn2-Tor-";
 "tackles-Net-privacy-game-makers-flock-to-Hub.html\">Tor tackles Net privacy</"
@@ -812,30 +830,30 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:347
+#: /home/runa/tor/website/press/en/inthemedia.wml:354
 msgid "2009 May 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:348 /tmp/Q2ndl8ZYsF.xml:633
-#: /tmp/Q2ndl8ZYsF.xml:643
+#: /home/runa/tor/website/press/en/inthemedia.wml:355 /tmp/f4ZHcgeG58.xml:640
+#: /tmp/f4ZHcgeG58.xml:650
 msgid "New York Times"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:349
+#: /home/runa/tor/website/press/en/inthemedia.wml:356
 msgid ""
 "<a href=\"http://www.nytimes.com/2009/05/01/technology/01filter.html";
 "\">Iranians and Others Outwit Net Censors</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:354
+#: /home/runa/tor/website/press/en/inthemedia.wml:361
 msgid "2009 Apr 23"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:356
+#: /home/runa/tor/website/press/en/inthemedia.wml:363
 msgid ""
 "<a href=\"http://www.technologyreview.com/computing/22427/?a=f\";>Dissent "
 "Made Safer: How anonymity technology could save free speech on the Internet."
@@ -843,87 +861,87 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:361
+#: /home/runa/tor/website/press/en/inthemedia.wml:368
 msgid "2009 Apr 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:363
+#: /home/runa/tor/website/press/en/inthemedia.wml:370
 msgid ""
 "<a href=\"http://bugbrother.blog.lemonde.fr/2009/04/22/comment-contourner-la-";
 "cybersurveillance/\">How to circumvent cybersurveillance</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:367 /tmp/Q2ndl8ZYsF.xml:373
+#: /home/runa/tor/website/press/en/inthemedia.wml:374 /tmp/f4ZHcgeG58.xml:380
 msgid "2009 Apr 06"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:368
+#: /home/runa/tor/website/press/en/inthemedia.wml:375
 msgid "Reader's Digest"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:369
+#: /home/runa/tor/website/press/en/inthemedia.wml:376
 msgid ""
 "<a href=\"http://www.rd.com/advice-and-know-how/how-to-hide-anything/";
 "article122219.html\">How to Hide Anything</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:374
+#: /home/runa/tor/website/press/en/inthemedia.wml:381
 msgid "Al Jazeera"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:375
+#: /home/runa/tor/website/press/en/inthemedia.wml:382
 msgid ""
 "<a href=\"http://www.youtube.com/watch?v=vuatxUN2cUQ\";>Global Village Voices "
 "showcases Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:379
+#: /home/runa/tor/website/press/en/inthemedia.wml:386
 msgid "2009 Mar 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:380
+#: /home/runa/tor/website/press/en/inthemedia.wml:387
 msgid "Marie Claire"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:381
+#: /home/runa/tor/website/press/en/inthemedia.wml:388
 msgid ""
 "<a href=\"http://www.marieclaire.com/career-money/career-coach/manage-";
 "online--web-image\">How to Manage Your Web Footprint</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:385
+#: /home/runa/tor/website/press/en/inthemedia.wml:392
 msgid "2009 Mar 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:387
+#: /home/runa/tor/website/press/en/inthemedia.wml:394
 msgid ""
 "<a href=\"http://online.wsj.com/article/SB123567809587886053.html\";>The "
 "Kindness of Strangers</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:392
+#: /home/runa/tor/website/press/en/inthemedia.wml:399
 msgid "2009 Mar 12"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:393
+#: /home/runa/tor/website/press/en/inthemedia.wml:400
 msgid "BBC World Service"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:394
+#: /home/runa/tor/website/press/en/inthemedia.wml:401
 msgid ""
 "<a href=\"http://bbcworldservicetrust.wordpress.com/2009/03/12/12-march-";
 "world-day-against-cyber-censorship/\">Steven J Murdoch interviewed about Tor "
@@ -931,170 +949,170 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:397
+#: /home/runa/tor/website/press/en/inthemedia.wml:404
 msgid "2009 Mar 03"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:398
+#: /home/runa/tor/website/press/en/inthemedia.wml:405
 msgid "Orf Austria"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:399
+#: /home/runa/tor/website/press/en/inthemedia.wml:406
 msgid ""
 "<a href=\"http://futurezone.orf.at/stories/1503028/\";>WIRTSCHAFTSKAMMER "
 "column</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:403
+#: /home/runa/tor/website/press/en/inthemedia.wml:410
 msgid "2009 Feb 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:404 /tmp/Q2ndl8ZYsF.xml:553
+#: /home/runa/tor/website/press/en/inthemedia.wml:411 /tmp/f4ZHcgeG58.xml:560
 msgid "Bangkok Post"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:405
+#: /home/runa/tor/website/press/en/inthemedia.wml:412
 msgid ""
 "<a href=\"http://www.bangkokpost.com/tech/technews/11872/the-old-fake-404-";
 "not-found-routine\">The old fake \"404 not found\" routine</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:409
+#: /home/runa/tor/website/press/en/inthemedia.wml:416
 msgid "2009 Feb 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:410
+#: /home/runa/tor/website/press/en/inthemedia.wml:417
 msgid "Hearsay Culture"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:411
+#: /home/runa/tor/website/press/en/inthemedia.wml:418
 msgid ""
 "<a href=\"http://www.hearsayculture.com/?p=307\";>Hearsay Culture Radio "
 "Interview/Podcast</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:414
+#: /home/runa/tor/website/press/en/inthemedia.wml:421
 msgid "2008 Dec 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:415
+#: /home/runa/tor/website/press/en/inthemedia.wml:422
 msgid "nu.nl"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:416
+#: /home/runa/tor/website/press/en/inthemedia.wml:423
 msgid ""
 "<a href=\"http://www.nu.nl/internet/1891289/anoniem-browsen-voor-gsm-in-de-";
 "maak.html\">Anoniem browsen voor gsm in de maak</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:420
+#: /home/runa/tor/website/press/en/inthemedia.wml:427
 msgid "2008 Dec 14"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:421
+#: /home/runa/tor/website/press/en/inthemedia.wml:428
 msgid "PC Magazine: Middle &amp; Near East"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:422
+#: /home/runa/tor/website/press/en/inthemedia.wml:429
 msgid ""
 "<a href=\"http://www.pcmag-mideast.com/FeatureDetail.aspx?ID=1039\";>How To "
 "Reclaim Your Online Privacy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:427
+#: /home/runa/tor/website/press/en/inthemedia.wml:434
 msgid "2008 Aug 21"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:428
+#: /home/runa/tor/website/press/en/inthemedia.wml:435
 msgid "CNN"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:429
+#: /home/runa/tor/website/press/en/inthemedia.wml:436
 msgid ""
 "<a href=\"http://www.cnn.com/2008/TECH/08/21/internet.filtering/index.html";
 "\">Experts: Internet filtering and censorship rife</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:434
+#: /home/runa/tor/website/press/en/inthemedia.wml:441
 msgid "2008 Aug 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:435
+#: /home/runa/tor/website/press/en/inthemedia.wml:442
 msgid "The Sydney Morning Herald"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:436
+#: /home/runa/tor/website/press/en/inthemedia.wml:443
 msgid ""
 "<a href=\"http://www.smh.com.au/news/web/the-china-";
 "syndrome/2008/08/20/1218911800889.html\">The China Syndrome</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:441
+#: /home/runa/tor/website/press/en/inthemedia.wml:448
 msgid "2008 Aug 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:442
+#: /home/runa/tor/website/press/en/inthemedia.wml:449
 msgid "Scientific American"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:443
+#: /home/runa/tor/website/press/en/inthemedia.wml:450
 msgid ""
 "<a href=\"http://www.sciam.com/article.cfm?id=cryptography-how-to-keep-your-";
 "secrets-safe\">Cryptography: How to Keep Your Secrets Safe</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:448
+#: /home/runa/tor/website/press/en/inthemedia.wml:455
 msgid "2008 Aug 05"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:449
+#: /home/runa/tor/website/press/en/inthemedia.wml:456
 msgid "Guardian UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:450
+#: /home/runa/tor/website/press/en/inthemedia.wml:457
 msgid ""
 "<a href=\"http://www.guardian.co.uk/commentisfree/2008/aug/05/china.";
 "censorship\"> Vaulting the great firewall</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:456
+#: /home/runa/tor/website/press/en/inthemedia.wml:463
 msgid "2008 Aug 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:457
+#: /home/runa/tor/website/press/en/inthemedia.wml:464
 msgid "Tech Radar UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:458
+#: /home/runa/tor/website/press/en/inthemedia.wml:465
 msgid ""
 "<a href=\"http://www.techradar.com/news/internet/web/freedom-stick-";
 "highlights-chinese-net-censorship-449233\">Freedom Stick highlights Chinese "
@@ -1102,31 +1120,31 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:465 /tmp/Q2ndl8ZYsF.xml:473
-#: /tmp/Q2ndl8ZYsF.xml:481 /tmp/Q2ndl8ZYsF.xml:489
+#: /home/runa/tor/website/press/en/inthemedia.wml:472 /tmp/f4ZHcgeG58.xml:480
+#: /tmp/f4ZHcgeG58.xml:488 /tmp/f4ZHcgeG58.xml:496
 msgid "2008 Aug 07"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:466
+#: /home/runa/tor/website/press/en/inthemedia.wml:473
 msgid "Spiegel"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:467
+#: /home/runa/tor/website/press/en/inthemedia.wml:474
 msgid ""
 "<a href=\"http://www.spiegel.de/netzwelt/tech/0,1518,570421,00.html\";>Tricks "
 "gegen Zensur und Ãberwachung</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:474 /tmp/Q2ndl8ZYsF.xml:524
-#: /tmp/Q2ndl8ZYsF.xml:592 /tmp/Q2ndl8ZYsF.xml:706
+#: /home/runa/tor/website/press/en/inthemedia.wml:481 /tmp/f4ZHcgeG58.xml:531
+#: /tmp/f4ZHcgeG58.xml:599 /tmp/f4ZHcgeG58.xml:713
 msgid "PC World"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:475
+#: /home/runa/tor/website/press/en/inthemedia.wml:482
 msgid ""
 "<a href=\"http://www.pcworld.com/";
 "article/149399-3/15_great_free_privacy_downloads.html\">15 Great, Free "
@@ -1134,41 +1152,41 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:482
+#: /home/runa/tor/website/press/en/inthemedia.wml:489
 msgid "The Guardian UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:483
+#: /home/runa/tor/website/press/en/inthemedia.wml:490
 msgid ""
 "<a href=\"http://www.guardian.co.uk/technology/2008/aug/07/censorship.hacking";
 "\">Chaos aims to crack China's wall</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:490
+#: /home/runa/tor/website/press/en/inthemedia.wml:497
 msgid "The Register UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:491
+#: /home/runa/tor/website/press/en/inthemedia.wml:498
 msgid ""
 "<a href=\"http://www.theregister.co.uk/2008/08/07/torbrowser_olympics/";
 "\">German hackers poke hole in great firewall of China</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:497
+#: /home/runa/tor/website/press/en/inthemedia.wml:504
 msgid "2008 May 24"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:498
+#: /home/runa/tor/website/press/en/inthemedia.wml:505
 msgid "Groupo Estado"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:499
+#: /home/runa/tor/website/press/en/inthemedia.wml:506
 msgid ""
 "<a href=\"http://blog.estadao.com.br/blog/cruz/?";
 "title=cfp08_navegacao_anonima_na_rede&amp;more=1&amp;c=1&amp;tb=1&amp;"
@@ -1177,17 +1195,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:505
+#: /home/runa/tor/website/press/en/inthemedia.wml:512
 msgid "2008 Mar 12"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:506
+#: /home/runa/tor/website/press/en/inthemedia.wml:513
 msgid "SearchSecurity.com"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:507
+#: /home/runa/tor/website/press/en/inthemedia.wml:514
 msgid ""
 "<a href=\"http://searchsecurity.techtarget.com/news/article/0,289142,";
 "sid14_gci1305120,00.html\"> Tor network 'bridges' help evade blockers</a>.  "
@@ -1196,29 +1214,29 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:516
+#: /home/runa/tor/website/press/en/inthemedia.wml:523
 msgid "2008 Feb 14"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:517
+#: /home/runa/tor/website/press/en/inthemedia.wml:524
 msgid "Wired: Compiler Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:518
+#: /home/runa/tor/website/press/en/inthemedia.wml:525
 msgid ""
 "<a href=\"http://blog.wired.com/monkeybites/2008/02/how-to-set-up-a.html\";> "
 "How To: Set Up Anonymous Browsing in 30 Seconds or Less</a>."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:523
+#: /home/runa/tor/website/press/en/inthemedia.wml:530
 msgid "2008 Feb 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:525
+#: /home/runa/tor/website/press/en/inthemedia.wml:532
 msgid ""
 "<a href=\"http://www.pcworld.com/article/id,142094-pg,1/article.html\";> "
 "Hackers Can Expose Masked Surfers, Study Says</a> A report on <a href="
@@ -1230,17 +1248,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:532
+#: /home/runa/tor/website/press/en/inthemedia.wml:539
 msgid "2007 Sep 21"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:533
+#: /home/runa/tor/website/press/en/inthemedia.wml:540
 msgid "Wired HowTo Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:534
+#: /home/runa/tor/website/press/en/inthemedia.wml:541
 msgid ""
 "<a href=\"http://howto.wired.com/wiredhowtos/index.cgi?";
 "page_name=be_a_whistle_blower;action=display;category=Work\">Be a "
@@ -1249,17 +1267,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:537
+#: /home/runa/tor/website/press/en/inthemedia.wml:544
 msgid "2007 Sep 16"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:538
+#: /home/runa/tor/website/press/en/inthemedia.wml:545
 msgid "Cnet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:539
+#: /home/runa/tor/website/press/en/inthemedia.wml:546
 msgid ""
 "<a href=\"http://news.cnet.com/8301-13739_3-9779225-46.html\";>Tor anonymity "
 "server admin arrested</a>.  A Tor exit node operator from Germany was "
@@ -1274,18 +1292,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:542
+#: /home/runa/tor/website/press/en/inthemedia.wml:549
 msgid "2007 Sep 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:543 /tmp/Q2ndl8ZYsF.xml:660
-#: /tmp/Q2ndl8ZYsF.xml:736 /tmp/Q2ndl8ZYsF.xml:845 /tmp/Q2ndl8ZYsF.xml:857
+#: /home/runa/tor/website/press/en/inthemedia.wml:550 /tmp/f4ZHcgeG58.xml:667
+#: /tmp/f4ZHcgeG58.xml:743 /tmp/f4ZHcgeG58.xml:852 /tmp/f4ZHcgeG58.xml:864
 msgid "Wired"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:544
+#: /home/runa/tor/website/press/en/inthemedia.wml:551
 msgid ""
 "<a href=\"http://www.wired.com/politics/security/news/2007/09/embassy_hacks";
 "\"> Rogue Nodes Turn Tor Anonymizer Into Eavesdropper's Paradise</a><br/> "
@@ -1318,17 +1336,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:547
+#: /home/runa/tor/website/press/en/inthemedia.wml:554
 msgid "2007 Jul 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:548
+#: /home/runa/tor/website/press/en/inthemedia.wml:555
 msgid "Wired Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:549
+#: /home/runa/tor/website/press/en/inthemedia.wml:556
 msgid ""
 "<a href=\"http://blog.wired.com/27bstroke6/2007/07/cyber-jihadists.html\";> "
 "Cyber Jihadists Embrace Tor</a><br/> A pointer to a <a href=\"http://";
@@ -1339,12 +1357,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:552
+#: /home/runa/tor/website/press/en/inthemedia.wml:559
 msgid "2007 Jun 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:554
+#: /home/runa/tor/website/press/en/inthemedia.wml:561
 msgid ""
 "<a href=\"http://www.asiamedia.ucla.edu/article-southeastasia.asp?";
 "parentid=72388\"> The problems with censorship</a>.  Mentions anecdotes that "
@@ -1352,17 +1370,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:557
+#: /home/runa/tor/website/press/en/inthemedia.wml:564
 msgid "2007 Mar 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:558
+#: /home/runa/tor/website/press/en/inthemedia.wml:565
 msgid "World Changing"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:559
+#: /home/runa/tor/website/press/en/inthemedia.wml:566
 msgid ""
 "<a href=\"http://www.worldchanging.com/archives/006309.html\";> Blogging "
 "Where Speech Isnât Free</a><br/> Coverage of former Tor Executive Director "
@@ -1372,17 +1390,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:562
+#: /home/runa/tor/website/press/en/inthemedia.wml:569
 msgid "2007 Mar 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:563
+#: /home/runa/tor/website/press/en/inthemedia.wml:570
 msgid "Security Focus"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:564
+#: /home/runa/tor/website/press/en/inthemedia.wml:571
 msgid ""
 "<a href=\"http://www.securityfocus.com/news/11447/1\";> Tor hack proposed to "
 "catch criminals</a>.  Coverage of a toolset called \"Torment\" for "
@@ -1391,17 +1409,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:567
+#: /home/runa/tor/website/press/en/inthemedia.wml:574
 msgid "2007 Feb 1"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:568
+#: /home/runa/tor/website/press/en/inthemedia.wml:575
 msgid "Dr Dobb's"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:569
+#: /home/runa/tor/website/press/en/inthemedia.wml:576
 msgid ""
 "<a href=\"http://www.ddj.com/security/197002414\";> Tor Project Protects "
 "Anonymous Sources</a>.  An introduction to Tor, including technical and "
@@ -1409,17 +1427,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:572
+#: /home/runa/tor/website/press/en/inthemedia.wml:579
 msgid "2006 Oct 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:573
+#: /home/runa/tor/website/press/en/inthemedia.wml:580
 msgid "Wired Threat Level"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:574
+#: /home/runa/tor/website/press/en/inthemedia.wml:581
 msgid ""
 "<a href=\"http://blog.wired.com/27bstroke6/2006/10/the_onion_route.html\";> "
 "The Onion Router (TOR) is Leaky (Leeky)</a>.  Explains why you need "
@@ -1429,17 +1447,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:577
+#: /home/runa/tor/website/press/en/inthemedia.wml:584
 msgid "2006 Aug 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:578 /tmp/Q2ndl8ZYsF.xml:666
+#: /home/runa/tor/website/press/en/inthemedia.wml:585 /tmp/f4ZHcgeG58.xml:673
 msgid "NPR"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:579
+#: /home/runa/tor/website/press/en/inthemedia.wml:586
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\";> "
 "Tips for Protecting Privacy Online</a>.  Kevin Bankston of the EFF "
@@ -1448,17 +1466,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:582
+#: /home/runa/tor/website/press/en/inthemedia.wml:589
 msgid "2006 Jul 5"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:583
+#: /home/runa/tor/website/press/en/inthemedia.wml:590
 msgid "MSNBC"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:584
+#: /home/runa/tor/website/press/en/inthemedia.wml:591
 msgid ""
 "<a href=\"http://www.msnbc.msn.com/id/13718446/page/2/\";> Defending "
 "liberties in high-tech world</a>.  Mentions EFF funding for Tor as one of "
@@ -1466,46 +1484,46 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:586
+#: /home/runa/tor/website/press/en/inthemedia.wml:593
 msgid "2006 Apr 11"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:587
+#: /home/runa/tor/website/press/en/inthemedia.wml:594
 msgid "PBS Frontline"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:588
+#: /home/runa/tor/website/press/en/inthemedia.wml:595
 msgid ""
 "<a href=\"http://pbs.gen.in/wgbh/pages/frontline/tankman/internet/tech.html";
 "\">Chipping Away at China's Great Firewall</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:591
+#: /home/runa/tor/website/press/en/inthemedia.wml:598
 msgid "2006 Feb 28"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:593
+#: /home/runa/tor/website/press/en/inthemedia.wml:600
 msgid ""
 "<a href=\"http://www.pcworld.com/article/id,124891-page,1/article.html";
 "\">Outsmarting the Online Privacy Snoops</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:596
+#: /home/runa/tor/website/press/en/inthemedia.wml:603
 msgid "2006 Feb 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:597
+#: /home/runa/tor/website/press/en/inthemedia.wml:604
 msgid "Forbes"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:598
+#: /home/runa/tor/website/press/en/inthemedia.wml:605
 msgid ""
 "<a href=\"http://members.forbes.com/global/2006/0227/018A_2.html\";> Cracks "
 "In the Wall</a>.  Discussion of Tor being used for evading censorship by "
@@ -1513,35 +1531,35 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:601
+#: /home/runa/tor/website/press/en/inthemedia.wml:608
 msgid "2006 Feb 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:602
+#: /home/runa/tor/website/press/en/inthemedia.wml:609
 msgid "The Boston Globe"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:603
+#: /home/runa/tor/website/press/en/inthemedia.wml:610
 msgid ""
 "<a href=\"http://members.forbes.com/global/2006/0227/018A_2.html\";> Beating "
 "censorship on the Internet</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:606 /tmp/Q2ndl8ZYsF.xml:611
-#: /tmp/Q2ndl8ZYsF.xml:616 /tmp/Q2ndl8ZYsF.xml:653
+#: /home/runa/tor/website/press/en/inthemedia.wml:613 /tmp/f4ZHcgeG58.xml:618
+#: /tmp/f4ZHcgeG58.xml:623 /tmp/f4ZHcgeG58.xml:660
 msgid "2006 Feb 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:607
+#: /home/runa/tor/website/press/en/inthemedia.wml:614
 msgid "CBS Evening News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:608
+#: /home/runa/tor/website/press/en/inthemedia.wml:615
 msgid ""
 "<a href=\"http://www.cbsnews.com/stories/2006/02/15/eveningnews/main1321785.";
 "shtml?source=search_story\"> Cracking The 'Great Firewall Of China'</a>.  "
@@ -1550,34 +1568,34 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:612
+#: /home/runa/tor/website/press/en/inthemedia.wml:619
 msgid "CNBC - Closing Bell"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:613
+#: /home/runa/tor/website/press/en/inthemedia.wml:620
 msgid "TV Appearance by Roger Dingledine at 4:25pm. (no link)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:617
+#: /home/runa/tor/website/press/en/inthemedia.wml:624
 msgid "Network Secure"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:618
+#: /home/runa/tor/website/press/en/inthemedia.wml:625
 msgid ""
 "<a href=\"http://www.network-secure.de/index.php?option=com_content&amp;";
 "task=view&amp;id=3909\">Tor: Anonymisierungswerkzeug entwickelt</a> (German)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:621
+#: /home/runa/tor/website/press/en/inthemedia.wml:628
 msgid "2006 Feb 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:623
+#: /home/runa/tor/website/press/en/inthemedia.wml:630
 msgid ""
 "<a href=\"http://online.wsj.com/article/SB113979965346572150.html\";> Chinese "
 "Censors Of Internet Face 'Hacktivists' in U.S.</a>Full article text can also "
@@ -1586,53 +1604,53 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:627
+#: /home/runa/tor/website/press/en/inthemedia.wml:634
 msgid "2006 Jan 31"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:629
+#: /home/runa/tor/website/press/en/inthemedia.wml:636
 msgid ""
 "<a href=\"http://www.technologyreview.com/Infotech/16216/page2/\";>Evading "
 "the Google Eye</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:632
+#: /home/runa/tor/website/press/en/inthemedia.wml:639
 msgid "2006 Jan 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:634
+#: /home/runa/tor/website/press/en/inthemedia.wml:641
 msgid ""
 "<a href=\"http://www.nytimes.com/2006/01/29/weekinreview/29basic.html\";> How "
 "to Outwit the World's Internet Censors</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:637
+#: /home/runa/tor/website/press/en/inthemedia.wml:644
 msgid "2006 Jan 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:638
+#: /home/runa/tor/website/press/en/inthemedia.wml:645
 msgid "Fox News/eWeek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:639
+#: /home/runa/tor/website/press/en/inthemedia.wml:646
 msgid ""
 "<a href=\"http://www.foxnews.com/story/0,2933,183005,00.html\";> Web "
 "Anonymizers Suddenly Get Very Popular</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:642
+#: /home/runa/tor/website/press/en/inthemedia.wml:649
 msgid "2006 Jan 25"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:644
+#: /home/runa/tor/website/press/en/inthemedia.wml:651
 msgid ""
 "<a href=\"http://www.nytimes.com/2006/01/25/technology/";
 "techspecial2/25privacy.html?_r=1&amp;oref=slogin\"> Privacy for People Who "
@@ -1640,17 +1658,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:647
+#: /home/runa/tor/website/press/en/inthemedia.wml:654
 msgid "2006 Jan 23"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:648
+#: /home/runa/tor/website/press/en/inthemedia.wml:655
 msgid "NPR Talk of the Nation"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:649
+#: /home/runa/tor/website/press/en/inthemedia.wml:656
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\";> "
 "Search Engines and Privacy Rights on the Web</a><br/> <a href=\"http://xeni.";
@@ -1658,215 +1676,215 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:654
+#: /home/runa/tor/website/press/en/inthemedia.wml:661
 msgid "Punto Informatico"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:655
+#: /home/runa/tor/website/press/en/inthemedia.wml:662
 msgid ""
 "<a href=\"http://punto-informatico.it/p.aspx?i=1430903\";> TOR c'Ã</a> "
 "(Italian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:659 /tmp/Q2ndl8ZYsF.xml:665
+#: /home/runa/tor/website/press/en/inthemedia.wml:666 /tmp/f4ZHcgeG58.xml:672
 msgid "2006 Jan 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:661
+#: /home/runa/tor/website/press/en/inthemedia.wml:668
 msgid ""
 "<a href=\"http://www.wired.com/science/discoveries/news/2006/01/70051?";
 "currentPage=2\"> How to Foil Search Engine Snoops</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:667
+#: /home/runa/tor/website/press/en/inthemedia.wml:674
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5165854\";> "
 "Google Records Subpoena Raises Privacy Fears</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:671
+#: /home/runa/tor/website/press/en/inthemedia.wml:678
 msgid "2005 Sep 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:672
+#: /home/runa/tor/website/press/en/inthemedia.wml:679
 msgid "Viva o Linux"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:673
+#: /home/runa/tor/website/press/en/inthemedia.wml:680
 msgid ""
 "<a href=\"http://www.vivaolinux.com.br/artigos/verArtigo.php?codigo=2759\";> "
 "TOR: A Internet sem rastreabilidade</a> (Portuguese)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:676
+#: /home/runa/tor/website/press/en/inthemedia.wml:683
 msgid "2005 Aug 6"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:678
+#: /home/runa/tor/website/press/en/inthemedia.wml:685
 msgid ""
 "<a href=\"http://www.eurekalert.org/pub_releases/2005-08/ns-wwa080305.php";
 "\">Why we all need pornography</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:681
+#: /home/runa/tor/website/press/en/inthemedia.wml:688
 msgid "2005 Jul 12"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:682
+#: /home/runa/tor/website/press/en/inthemedia.wml:689
 msgid "IEEE Computer Society's Technical Committee on Security and Privacy"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:683
+#: /home/runa/tor/website/press/en/inthemedia.wml:690
 msgid ""
 "<a href=\"http://www.ieee-security.org/Cipher/Newsbriefs/2005/071805.html#TOR";
 "\"> Onion routing application Tor makes PCWorld's top 100</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:687
+#: /home/runa/tor/website/press/en/inthemedia.wml:694
 msgid "2005 Jun 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:688
+#: /home/runa/tor/website/press/en/inthemedia.wml:695
 msgid "The Unofficial Apple Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:689
+#: /home/runa/tor/website/press/en/inthemedia.wml:696
 msgid ""
 "<a href=\"http://www.tuaw.com/2005/06/22/privacy-watch-tor/\";> Privacy "
 "Watch: Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:693
+#: /home/runa/tor/website/press/en/inthemedia.wml:700
 msgid "2005 Jun 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:694
+#: /home/runa/tor/website/press/en/inthemedia.wml:701
 msgid "The New Zealand Herald"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:695
+#: /home/runa/tor/website/press/en/inthemedia.wml:702
 msgid ""
 "<a href=\"http://www.nzherald.co.nz/section/story.cfm?c_id=5&amp;";
 "objectid=10329896\"> China's internet censorship stranglehold can't last</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:699
+#: /home/runa/tor/website/press/en/inthemedia.wml:706
 msgid "2005 Jun 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:700
+#: /home/runa/tor/website/press/en/inthemedia.wml:707
 msgid "American Public Radio"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:701
+#: /home/runa/tor/website/press/en/inthemedia.wml:708
 msgid ""
 "<a href=\"http://www.publicradio.org/columns/futuretense/2005/06/08.shtml\";> "
 "An Internet privacy tool called \"Tor\"</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:705 /tmp/Q2ndl8ZYsF.xml:711
+#: /home/runa/tor/website/press/en/inthemedia.wml:712 /tmp/f4ZHcgeG58.xml:718
 msgid "2005 Jun 1"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:707
+#: /home/runa/tor/website/press/en/inthemedia.wml:714
 msgid ""
 "<a href=\"http://www.pcworld.com/article/id,120763-page,4/article.html\";> "
 "The 100 Best Products of 2005</a><br/> Tor is ranked #40 on the list."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:712
+#: /home/runa/tor/website/press/en/inthemedia.wml:719
 msgid "Linux Weekly News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:713
+#: /home/runa/tor/website/press/en/inthemedia.wml:720
 msgid ""
 "<a href=\"http://lwn.net/Articles/138242/\";> A Look at The Onion Router (Tor)"
 "</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:717
+#: /home/runa/tor/website/press/en/inthemedia.wml:724
 msgid "2005 May 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:718 /tmp/Q2ndl8ZYsF.xml:803
+#: /home/runa/tor/website/press/en/inthemedia.wml:725 /tmp/f4ZHcgeG58.xml:810
 msgid "Slashdot"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:719
+#: /home/runa/tor/website/press/en/inthemedia.wml:726
 msgid ""
 "<a href=\"http://yro.slashdot.org/article.pl?sid=05/05/22/0113244\";> Tor "
 "Anonymity Network Reaches 100 Verified Nodes</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:723
+#: /home/runa/tor/website/press/en/inthemedia.wml:730
 msgid "2005 May 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:724
+#: /home/runa/tor/website/press/en/inthemedia.wml:731
 msgid "Security.uz"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:725
+#: /home/runa/tor/website/press/en/inthemedia.wml:732
 msgid ""
 "<a href=\"http://security.uz/news/default.asp?id=10541\";> Tor - ÐÐÑÐÑÐ "
 "ÐÐÐÐÐÐÐÐÐÐÑ ÐÐÑ ÐÑÐÑ ÐÐ</a> (Russian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:729
+#: /home/runa/tor/website/press/en/inthemedia.wml:736
 msgid "2005 May 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:730
+#: /home/runa/tor/website/press/en/inthemedia.wml:737
 msgid "WebPlanet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:731
+#: /home/runa/tor/website/press/en/inthemedia.wml:738
 msgid ""
 "<a href=\"http://webplanet.ru/news/security/2005/5/19/tor.html\";> Tor: "
 "ÑÐÑÐÑÐÐÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐ ÐÐÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ</a> (Russian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:735 /tmp/Q2ndl8ZYsF.xml:742
+#: /home/runa/tor/website/press/en/inthemedia.wml:742 /tmp/f4ZHcgeG58.xml:749
 msgid "2005 May 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:737
+#: /home/runa/tor/website/press/en/inthemedia.wml:744
 msgid ""
 "<a href=\"http://www.wired.com/politics/security/news/2005/05/67542?";
 "currentPage=all\"> Tor Torches Online Tracking</a>. Also available in <a "
@@ -1874,170 +1892,170 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:743
+#: /home/runa/tor/website/press/en/inthemedia.wml:750
 msgid "XBiz"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:744
+#: /home/runa/tor/website/press/en/inthemedia.wml:751
 msgid ""
 "<a href=\"http://xbiz.com/news/8761\";> Navy Project Allows Anonymous "
 "Browsing</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:748
+#: /home/runa/tor/website/press/en/inthemedia.wml:755
 msgid "2005 Apr 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:749
+#: /home/runa/tor/website/press/en/inthemedia.wml:756
 msgid "Heise online"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:750
+#: /home/runa/tor/website/press/en/inthemedia.wml:757
 msgid ""
 "<a href=\"http://www.heise.de/newsticker/meldung/58506\";> CFP: Vom "
 "kafkaesken Schwinden der AnonymitÃt</a> (German)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:754
+#: /home/runa/tor/website/press/en/inthemedia.wml:761
 msgid "2005 Apr 5"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:755
+#: /home/runa/tor/website/press/en/inthemedia.wml:762
 msgid "Libero"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:756
+#: /home/runa/tor/website/press/en/inthemedia.wml:763
 msgid ""
 "<a href=\"http://magazine.libero.it/internetlife/scienzaeweb/ne208.phtml\";> "
 "Anonimato on line, ecco Tor</a> (Italian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:760
+#: /home/runa/tor/website/press/en/inthemedia.wml:767
 msgid "2005 Jan 4"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:761
+#: /home/runa/tor/website/press/en/inthemedia.wml:768
 msgid "Internetnews"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:762
+#: /home/runa/tor/website/press/en/inthemedia.wml:769
 msgid ""
 "<a href=\"http://www.internetnews.com/dev-news/article.php/3454521\";> EFF "
 "Throws Support to 'Anonymous' Internet Project</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:766
+#: /home/runa/tor/website/press/en/inthemedia.wml:773
 msgid "2005 Mar 31"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:767
+#: /home/runa/tor/website/press/en/inthemedia.wml:774
 msgid "Linux.com"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:768
+#: /home/runa/tor/website/press/en/inthemedia.wml:775
 msgid ""
 "<a href=\"http://www.linux.com/articles/43713?tid=19&amp;tid=78\";> Securing "
 "your online privacy with Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:772
+#: /home/runa/tor/website/press/en/inthemedia.wml:779
 msgid "2004 Dec 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:773
+#: /home/runa/tor/website/press/en/inthemedia.wml:780
 msgid "BoingBoing"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:774
+#: /home/runa/tor/website/press/en/inthemedia.wml:781
 msgid ""
 "<a href=\"http://www.boingboing.net/2004/12/27/eff-helping-produce-.html\";> "
 "EFF helping produce anonymizing software</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:778
+#: /home/runa/tor/website/press/en/inthemedia.wml:785
 msgid "2004 Dec 25"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:779
+#: /home/runa/tor/website/press/en/inthemedia.wml:786
 msgid "Kansas City infozine"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:780
+#: /home/runa/tor/website/press/en/inthemedia.wml:787
 msgid ""
 "<a href=\"http://www.infozine.com/news/stories/op/storiesView/sid/4933/\";> "
 "EFF Joins Forces with Tor Software Project</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:784 /tmp/Q2ndl8ZYsF.xml:790
+#: /home/runa/tor/website/press/en/inthemedia.wml:791 /tmp/f4ZHcgeG58.xml:797
 msgid "2004 Dec 23"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:785
+#: /home/runa/tor/website/press/en/inthemedia.wml:792
 msgid "golem.de"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:786
+#: /home/runa/tor/website/press/en/inthemedia.wml:793
 msgid ""
 "<a href=\"http://www.golem.de/0412/35340.html\";> EFF unterstÃtzt "
 "Anonymisierer Tor</a> (German)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:791
+#: /home/runa/tor/website/press/en/inthemedia.wml:798
 msgid "SuicideGirls"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:792
+#: /home/runa/tor/website/press/en/inthemedia.wml:799
 msgid ""
 "<a href=\"http://suicidegirls.com/news/technology/6150/\";> New Routing "
 "Software Allows Anonymous Internet Use</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:796
+#: /home/runa/tor/website/press/en/inthemedia.wml:803
 msgid "2004 Dec 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:797
+#: /home/runa/tor/website/press/en/inthemedia.wml:804
 msgid "P2Pnet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:798
+#: /home/runa/tor/website/press/en/inthemedia.wml:805
 msgid "<a href=\"http://p2pnet.net/story/3357\";> EFF to sponsor Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:802
+#: /home/runa/tor/website/press/en/inthemedia.wml:809
 msgid "2004 Dec 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:804
+#: /home/runa/tor/website/press/en/inthemedia.wml:811
 msgid ""
 "<a href=\"http://yro.slashdot.org/article.pl?sid=04/12/22/2031229&amp;";
 "tid=95&amp;tid=158&amp;tid=153&amp;tid=17\"> EFF Promotes Freenet-like "
@@ -2045,106 +2063,106 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:808
+#: /home/runa/tor/website/press/en/inthemedia.wml:815
 msgid "2004 Nov 16"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:809
+#: /home/runa/tor/website/press/en/inthemedia.wml:816
 msgid "AlterNet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:810
+#: /home/runa/tor/website/press/en/inthemedia.wml:817
 msgid ""
 "<a href=\"http://www.alternet.org/columnists/story/20523/\";> Heavy Traffic</"
 "a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:814
+#: /home/runa/tor/website/press/en/inthemedia.wml:821
 msgid "2004 Aug 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:815
+#: /home/runa/tor/website/press/en/inthemedia.wml:822
 msgid "Newsweek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:816
+#: /home/runa/tor/website/press/en/inthemedia.wml:823
 msgid "Technology: Instant Security (no link)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:820
+#: /home/runa/tor/website/press/en/inthemedia.wml:827
 msgid "2004 Aug 16"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:821
+#: /home/runa/tor/website/press/en/inthemedia.wml:828
 msgid "Eweek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:822
+#: /home/runa/tor/website/press/en/inthemedia.wml:829
 msgid ""
 "<a href=\"http://www.eweek.com/c/a/Security/Dont-Fear-Internet-Anonymity-";
 "Tools/\"> Don't Fear Internet Anonymity Tools</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:826 /tmp/Q2ndl8ZYsF.xml:832
+#: /home/runa/tor/website/press/en/inthemedia.wml:833 /tmp/f4ZHcgeG58.xml:839
 msgid "2004 Aug 6"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:827
+#: /home/runa/tor/website/press/en/inthemedia.wml:834
 msgid "HCC magazine"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:828
+#: /home/runa/tor/website/press/en/inthemedia.wml:835
 msgid ""
 "<a href=\"http://www.hcc.nl/eCache/DEF/21/083.html\";> Anoniem surfen met "
 "hulp van marine VS</a> (Dutch)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:833
+#: /home/runa/tor/website/press/en/inthemedia.wml:840
 msgid "Golem"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:834
+#: /home/runa/tor/website/press/en/inthemedia.wml:841
 msgid ""
 "<a href=\"http://www.golem.de/0408/32835.html\";> Tor: Anonymisierer nutzt "
 "Onion-Routing</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:838
+#: /home/runa/tor/website/press/en/inthemedia.wml:845
 msgid "2004 Aug 5"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:839
+#: /home/runa/tor/website/press/en/inthemedia.wml:846
 msgid "Network World Security"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:840
+#: /home/runa/tor/website/press/en/inthemedia.wml:847
 msgid ""
 "<a href=\"http://www.networkworld.com/details/7088.html\";> Onion routing</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:844
+#: /home/runa/tor/website/press/en/inthemedia.wml:851
 msgid "2004 May 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:846
+#: /home/runa/tor/website/press/en/inthemedia.wml:853
 msgid ""
 "<a href=\"http://www.wired.com/politics/security/news/2004/08/64464\";> Onion "
 "Routing Averts Prying Eyes</a>. Also in <a href=\"http://hotwired.goo.ne.jp/";
@@ -2152,29 +2170,29 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:850
+#: /home/runa/tor/website/press/en/inthemedia.wml:857
 msgid "2004 Mar 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:851
+#: /home/runa/tor/website/press/en/inthemedia.wml:858
 msgid "CNET Japan blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:852
+#: /home/runa/tor/website/press/en/inthemedia.wml:859
 msgid ""
 "<a href=\"http://japan.cnet.com/blog/umeda/2004/03/08/entry_post_126/\";> "
 "Yearning of hackers and insecurity</a> (Japanese)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:856
+#: /home/runa/tor/website/press/en/inthemedia.wml:863
 msgid "1999 Apr 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/dev/website/press/en/inthemedia.wml:858
+#: /home/runa/tor/website/press/en/inthemedia.wml:865
 msgid ""
 "<a href=\"http://www.wired.com/science/discoveries/news/1999/04/19091\";> "
 "Anonymous Web Surfing? Uh-Uh</a>"

Modified: translation/trunk/projects/website/po/templates/press/4-optional.2008-12-19-roadmap-press-release.pot
===================================================================
--- translation/trunk/projects/website/po/templates/press/4-optional.2008-12-19-roadmap-press-release.pot	2011-04-13 15:27:51 UTC (rev 24615)
+++ translation/trunk/projects/website/po/templates/press/4-optional.2008-12-19-roadmap-press-release.pot	2011-04-13 15:28:29 UTC (rev 24616)
@@ -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-04-13 16:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,7 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/press/en/2008-12-19-roadmap-press-release.wml:8
+#: /home/runa/tor/website/press/en/2008-12-19-roadmap-press-release.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page press/press>"
 "\">Press &raquo; </a> <a href=\"<page press/2008-12-19-roadmap-press-release>"
@@ -25,18 +25,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/press/en/2008-12-19-roadmap-press-release.wml:15
+#: /home/runa/tor/website/press/en/2008-12-19-roadmap-press-release.wml:15
 msgid "FOR IMMEDIATE RELEASE"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/press/en/2008-12-19-roadmap-press-release.wml:17
+#: /home/runa/tor/website/press/en/2008-12-19-roadmap-press-release.wml:17
 msgid ""
 "<strong>THE TOR PROJECT ANNOUNCES THREE-YEAR DEVELOPMENT ROADMAP</strong>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2008-12-19-roadmap-press-release.wml:19
+#: /home/runa/tor/website/press/en/2008-12-19-roadmap-press-release.wml:19
 msgid ""
 "<strong>DEDHAM, MA</strong> - The Tor Project has published its <a href=\"../"
 "press/presskit/2008-12-19-roadmap-full.pdf\">three year development roadmap</"
@@ -45,7 +45,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2008-12-19-roadmap-press-release.wml:25
+#: /home/runa/tor/website/press/en/2008-12-19-roadmap-press-release.wml:25
 msgid ""
 "Tor's tools and technologies are already used by hundreds of thousands of "
 "people to protect their activities online.  These users include journalists "
@@ -59,7 +59,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2008-12-19-roadmap-press-release.wml:37
+#: /home/runa/tor/website/press/en/2008-12-19-roadmap-press-release.wml:37
 msgid ""
 "While Tor's original goal was to provide this important anonymity, many "
 "people around the world use Tor to get around Internet censorship, as well. "
@@ -71,7 +71,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2008-12-19-roadmap-press-release.wml:46
+#: /home/runa/tor/website/press/en/2008-12-19-roadmap-press-release.wml:46
 msgid ""
 "\"If your Internet provider can't see what sites you're looking at, that "
 "also means they can't prevent you from reaching sites they don't want you to "
@@ -83,7 +83,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2008-12-19-roadmap-press-release.wml:55
+#: /home/runa/tor/website/press/en/2008-12-19-roadmap-press-release.wml:55
 msgid ""
 "Tor welcomes additional sponsors to join <a href=\"https://www.torproject.";
 "org/sponsors\">current sponsors</a>; such as the Broadcasting Board of "
@@ -94,12 +94,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/press/en/2008-12-19-roadmap-press-release.wml:62
+#: /home/runa/tor/website/press/en/2008-12-19-roadmap-press-release.wml:62
 msgid "ABOUT THE TOR PROJECT"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2008-12-19-roadmap-press-release.wml:64
+#: /home/runa/tor/website/press/en/2008-12-19-roadmap-press-release.wml:64
 msgid ""
 "Based in Dedham, MA, The Tor Project develops free and open-source software "
 "that provides online anonymity to the everyday Internet user. Tor was born "
@@ -110,7 +110,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2008-12-19-roadmap-press-release.wml:73
+#: /home/runa/tor/website/press/en/2008-12-19-roadmap-press-release.wml:73
 msgid ""
 "In addition to its efforts developing and maintaining the Tor anonymity "
 "software and the Tor network, The Tor Project also helps to lead the "
@@ -121,28 +121,28 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2008-12-19-roadmap-press-release.wml:81
+#: /home/runa/tor/website/press/en/2008-12-19-roadmap-press-release.wml:81
 msgid ""
 "The \"Onion Logo\" and \"Tor\" wordmark are registered trademarks of The Tor "
 "Project, Inc."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2008-12-19-roadmap-press-release.wml:84
+#: /home/runa/tor/website/press/en/2008-12-19-roadmap-press-release.wml:84
 msgid "Contact: Andrew Lewman"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2008-12-19-roadmap-press-release.wml:85
-msgid "Tel: +1-781-424-9877"
+#: /home/runa/tor/website/press/en/2008-12-19-roadmap-press-release.wml:85
+msgid "Tel: +1-406-356-6475"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2008-12-19-roadmap-press-release.wml:86
+#: /home/runa/tor/website/press/en/2008-12-19-roadmap-press-release.wml:86
 msgid "Email: execdir@xxxxxxxxxxxxxx"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2008-12-19-roadmap-press-release.wml:87
+#: /home/runa/tor/website/press/en/2008-12-19-roadmap-press-release.wml:87
 msgid "<a href=\"https://www.torproject.org/\";>Website: Tor Project</a>"
 msgstr ""

Modified: translation/trunk/projects/website/po/templates/press/4-optional.2009-03-12-performance-roadmap-press-release.pot
===================================================================
--- translation/trunk/projects/website/po/templates/press/4-optional.2009-03-12-performance-roadmap-press-release.pot	2011-04-13 15:27:51 UTC (rev 24615)
+++ translation/trunk/projects/website/po/templates/press/4-optional.2009-03-12-performance-roadmap-press-release.pot	2011-04-13 15:28:29 UTC (rev 24616)
@@ -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-04-13 16:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,7 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/press/en/2009-03-12-performance-roadmap-press-release.wml:8
+#: /home/runa/tor/website/press/en/2009-03-12-performance-roadmap-press-release.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page press/press>"
 "\">Press &raquo; </a> <a href=\"<page press/2009-03-12-performance-roadmap-"
@@ -25,17 +25,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/press/en/2009-03-12-performance-roadmap-press-release.wml:15
+#: /home/runa/tor/website/press/en/2009-03-12-performance-roadmap-press-release.wml:15
 msgid "FOR IMMEDIATE RELEASE"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/press/en/2009-03-12-performance-roadmap-press-release.wml:17
+#: /home/runa/tor/website/press/en/2009-03-12-performance-roadmap-press-release.wml:17
 msgid "<strong>TOR PROJECT LAUNCHES PERFORMANCE ROADMAP AND CAMPAIGN</strong>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2009-03-12-performance-roadmap-press-release.wml:19
+#: /home/runa/tor/website/press/en/2009-03-12-performance-roadmap-press-release.wml:19
 msgid ""
 "<strong>DEDHAM, MA</strong> -The Tor Project has <a href=\"../press/"
 "presskit/2009-03-11-performance.pdf\">launched a roadmap</a> for "
@@ -51,7 +51,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2009-03-12-performance-roadmap-press-release.wml:21
+#: /home/runa/tor/website/press/en/2009-03-12-performance-roadmap-press-release.wml:21
 msgid ""
 "As Tor's user base has grown, the performance of the Tor network has "
 "suffered.  Over the past few years, Tor's funding (and thus the development "
@@ -68,7 +68,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2009-03-12-performance-roadmap-press-release.wml:25
+#: /home/runa/tor/website/press/en/2009-03-12-performance-roadmap-press-release.wml:25
 msgid ""
 "Tor's tools and technologies are already used by hundreds of thousands of "
 "people to protect their activities online.  These users include journalists "
@@ -82,7 +82,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2009-03-12-performance-roadmap-press-release.wml:37
+#: /home/runa/tor/website/press/en/2009-03-12-performance-roadmap-press-release.wml:37
 msgid ""
 "Tor welcomes additional sponsors to join our <a href=\"<page about/sponsors>"
 "\">current sponsors</a>; such as the Broadcasting Board of Governors, the "
@@ -93,12 +93,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/press/en/2009-03-12-performance-roadmap-press-release.wml:44
+#: /home/runa/tor/website/press/en/2009-03-12-performance-roadmap-press-release.wml:44
 msgid "ABOUT THE TOR PROJECT"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2009-03-12-performance-roadmap-press-release.wml:46
+#: /home/runa/tor/website/press/en/2009-03-12-performance-roadmap-press-release.wml:46
 msgid ""
 "Based in Dedham, MA, The Tor Project develops free and open-source software "
 "that provides online anonymity to the everyday Internet user. Tor was born "
@@ -109,7 +109,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2009-03-12-performance-roadmap-press-release.wml:55
+#: /home/runa/tor/website/press/en/2009-03-12-performance-roadmap-press-release.wml:55
 msgid ""
 "In addition to its efforts developing and maintaining the Tor anonymity "
 "software and the Tor network, The Tor Project also helps to lead the "
@@ -121,28 +121,28 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2009-03-12-performance-roadmap-press-release.wml:64
+#: /home/runa/tor/website/press/en/2009-03-12-performance-roadmap-press-release.wml:64
 msgid ""
 "The \"Onion Logo\" and \"Tor\" wordmark are registered trademarks of The Tor "
 "Project, Inc."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2009-03-12-performance-roadmap-press-release.wml:67
+#: /home/runa/tor/website/press/en/2009-03-12-performance-roadmap-press-release.wml:67
 msgid "Contact: Andrew Lewman"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2009-03-12-performance-roadmap-press-release.wml:68
-msgid "Tel: +1-781-424-9877"
+#: /home/runa/tor/website/press/en/2009-03-12-performance-roadmap-press-release.wml:68
+msgid "Tel: +1-406-356-6475"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2009-03-12-performance-roadmap-press-release.wml:69
+#: /home/runa/tor/website/press/en/2009-03-12-performance-roadmap-press-release.wml:69
 msgid "Email: execdir@xxxxxxxxxxxxxx"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2009-03-12-performance-roadmap-press-release.wml:70
+#: /home/runa/tor/website/press/en/2009-03-12-performance-roadmap-press-release.wml:70
 msgid "<a href=\"https://www.torproject.org/\";>Website: Tor Project</a>"
 msgstr ""

Modified: translation/trunk/projects/website/po/templates/press/4-optional.2010-03-25-tor-store-press-release.pot
===================================================================
--- translation/trunk/projects/website/po/templates/press/4-optional.2010-03-25-tor-store-press-release.pot	2011-04-13 15:27:51 UTC (rev 24615)
+++ translation/trunk/projects/website/po/templates/press/4-optional.2010-03-25-tor-store-press-release.pot	2011-04-13 15:28:29 UTC (rev 24616)
@@ -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-04-13 16:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,7 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/press/en/2010-03-25-tor-store-press-release.wml:8
+#: /home/runa/tor/website/press/en/2010-03-25-tor-store-press-release.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page press/press>"
 "\">Press &raquo; </a> <a href=\"<page press/2010-03-25-tor-store-press-"
@@ -25,17 +25,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/press/en/2010-03-25-tor-store-press-release.wml:15
+#: /home/runa/tor/website/press/en/2010-03-25-tor-store-press-release.wml:15
 msgid "FOR IMMEDIATE RELEASE"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/press/en/2010-03-25-tor-store-press-release.wml:17
+#: /home/runa/tor/website/press/en/2010-03-25-tor-store-press-release.wml:17
 msgid "<strong>TOR PROJECT AND PRINTFECTION ANNOUNCE THE TOR STORE</strong>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2010-03-25-tor-store-press-release.wml:19
+#: /home/runa/tor/website/press/en/2010-03-25-tor-store-press-release.wml:19
 msgid ""
 "<strong>WALPOLE, MA</strong> The Tor Project and Printfection launch <a href="
 "\"http://printfection.com/torprojectstore\";>The Tor Store</a> for all your "
@@ -46,7 +46,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p><blockquote>
-#: /home/runa/transifex/website/press/en/2010-03-25-tor-store-press-release.wml:27
+#: /home/runa/tor/website/press/en/2010-03-25-tor-store-press-release.wml:27
 msgid ""
 "\"The Tor Project is leveraging Printfection's on-demand merchandise "
 "fulfillment technology to engage their supporters and generate additional "
@@ -55,12 +55,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2010-03-25-tor-store-press-release.wml:32
+#: /home/runa/tor/website/press/en/2010-03-25-tor-store-press-release.wml:32
 msgid "-- Casey Shorr, CEO of Printfection"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2010-03-25-tor-store-press-release.wml:34
+#: /home/runa/tor/website/press/en/2010-03-25-tor-store-press-release.wml:34
 msgid ""
 "Tor's tools and technologies are already used by millions of people to "
 "protect their activities online.  These users include journalists and human "
@@ -74,7 +74,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2010-03-25-tor-store-press-release.wml:46
+#: /home/runa/tor/website/press/en/2010-03-25-tor-store-press-release.wml:46
 msgid ""
 "Tor welcomes your support through purchasing of Tor branded items and "
 "through the consistent donations of thousands of individuals through our <a "
@@ -82,12 +82,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/press/en/2010-03-25-tor-store-press-release.wml:50
+#: /home/runa/tor/website/press/en/2010-03-25-tor-store-press-release.wml:50
 msgid "ABOUT THE TOR PROJECT"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2010-03-25-tor-store-press-release.wml:52
+#: /home/runa/tor/website/press/en/2010-03-25-tor-store-press-release.wml:52
 msgid ""
 "Based in Walpole, MA, The Tor Project develops free and open-source software "
 "that provides online anonymity to the everyday Internet user. Tor was born "
@@ -98,7 +98,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2010-03-25-tor-store-press-release.wml:61
+#: /home/runa/tor/website/press/en/2010-03-25-tor-store-press-release.wml:61
 msgid ""
 "In addition to its efforts developing and maintaining the Tor anonymity "
 "software and the Tor network, The Tor Project also helps to lead the "
@@ -110,12 +110,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/press/en/2010-03-25-tor-store-press-release.wml:70
+#: /home/runa/tor/website/press/en/2010-03-25-tor-store-press-release.wml:70
 msgid "ABOUT PRINTFECTION"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2010-03-25-tor-store-press-release.wml:72
+#: /home/runa/tor/website/press/en/2010-03-25-tor-store-press-release.wml:72
 msgid ""
 "Printfection is the leading all-in-one merchandise fulfillment service. Tens "
 "of thousands of businesses use our technologies and services to power their "
@@ -127,28 +127,28 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2010-03-25-tor-store-press-release.wml:81
+#: /home/runa/tor/website/press/en/2010-03-25-tor-store-press-release.wml:81
 msgid ""
 "The \"Onion Logo\" and \"Tor\" wordmark are registered trademarks of The Tor "
 "Project, Inc."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2010-03-25-tor-store-press-release.wml:84
+#: /home/runa/tor/website/press/en/2010-03-25-tor-store-press-release.wml:84
 msgid "Contact: Andrew Lewman"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2010-03-25-tor-store-press-release.wml:85
-msgid "Tel: +1-781-424-9877"
+#: /home/runa/tor/website/press/en/2010-03-25-tor-store-press-release.wml:85
+msgid "Tel: +1-406-356-6475"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2010-03-25-tor-store-press-release.wml:86
+#: /home/runa/tor/website/press/en/2010-03-25-tor-store-press-release.wml:86
 msgid "Email: execdir@xxxxxxxxxxxxxx"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2010-03-25-tor-store-press-release.wml:87
+#: /home/runa/tor/website/press/en/2010-03-25-tor-store-press-release.wml:87
 msgid "<a href=\"https://www.torproject.org/\";>Website: Tor Project</a>"
 msgstr ""

Modified: translation/trunk/projects/website/po/templates/press/4-optional.2010-09-16-ten-things-circumvention-tools.pot
===================================================================
--- translation/trunk/projects/website/po/templates/press/4-optional.2010-09-16-ten-things-circumvention-tools.pot	2011-04-13 15:27:51 UTC (rev 24615)
+++ translation/trunk/projects/website/po/templates/press/4-optional.2010-09-16-ten-things-circumvention-tools.pot	2011-04-13 15:28:29 UTC (rev 24616)
@@ -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-04-13 16:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,7 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:8
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page press/press>"
 "\">Press &raquo; </a> <a href=\"<page press/2010-09-16-ten-things-"
@@ -26,17 +26,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:15
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:15
 msgid "FOR IMMEDIATE RELEASE"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:17
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:17
 msgid "<strong>TOR PROJECT RELEASES CIRCUMVENTION TOOL ARTICLE</strong>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:19
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:19
 msgid ""
 "<strong>WALPOLE, MA</strong> The Tor Project releases an article about the "
 "<a href=\"../press/presskit/2010-09-16-circumvention-features.pdf\">\"Ten "
@@ -49,7 +49,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:29
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:29
 msgid ""
 "This article lays out ten features you should consider when evaluating a "
 "circumvention tool. The goal isn't to advocate for any specific tool, but to "
@@ -57,7 +57,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:34
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:34
 msgid ""
 "Tor's tools and technologies are already used by millions of people to "
 "protect their activities online.  These users include journalists and human "
@@ -71,12 +71,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:45
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:45
 msgid "ABOUT THE TOR PROJECT"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:47
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:47
 msgid ""
 "Based in Walpole, MA, The Tor Project develops free and open-source software "
 "that provides online anonymity to the everyday Internet user. Tor was born "
@@ -87,7 +87,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:55
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:55
 msgid ""
 "In addition to its efforts developing and maintaining the Tor anonymity "
 "software and the Tor network, The Tor Project also helps to lead the "
@@ -99,33 +99,33 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:63
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:63
 msgid ""
 "The \"Onion Logo\" and \"Tor\" wordmark are registered trademarks of The Tor "
 "Project, Inc."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:66
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:66
 msgid "Contact: Andrew Lewman"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:67
-msgid "Tel: +1-781-424-9877"
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:67
+msgid "Tel: +1-406-356-6475"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:68
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:68
 msgid "Email: execdir@xxxxxxxxxxxxxx"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:69
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:69
 msgid "<a href=\"https://www.torproject.org/\";>Website: Tor Project</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div>
-#: /home/runa/transifex/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:70
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:70
 msgid "###"
 msgstr ""

Modified: translation/trunk/projects/website/po/templates/projects/1-high.torbrowser.pot
===================================================================
--- translation/trunk/projects/website/po/templates/projects/1-high.torbrowser.pot	2011-04-13 15:27:51 UTC (rev 24615)
+++ translation/trunk/projects/website/po/templates/projects/1-high.torbrowser.pot	2011-04-13 15:28:29 UTC (rev 24616)
@@ -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-04-13 16:28+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,7 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:9
+#: /home/runa/tor/website/projects/en/torbrowser.wml:9
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page projects/projects>"
 "\">Projects &raquo; </a> <a href=\"<page projects/torbrowser>\">TorBrowser</"
@@ -25,17 +25,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:17
+#: /home/runa/tor/website/projects/en/torbrowser.wml:17
 msgid "Tor Browser Bundle"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:18
+#: /home/runa/tor/website/projects/en/torbrowser.wml:18
 msgid "<hr/>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:20
+#: /home/runa/tor/website/projects/en/torbrowser.wml:20
 msgid ""
 "The <strong>Tor</strong> software protects you by bouncing your "
 "communications around a distributed network of relays run by volunteers all "
@@ -46,7 +46,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:27
+#: /home/runa/tor/website/projects/en/torbrowser.wml:27
 msgid ""
 "The <strong>Tor Browser Bundle</strong> lets you use Tor on Windows, Mac OS "
 "X, or Linux without needing to install any software.  It can run off a USB "
@@ -58,7 +58,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:39
+#: /home/runa/tor/website/projects/en/torbrowser.wml:39
 msgid ""
 "Freedom House has produced a video on how to find and use the Tor Browser "
 "Bundle.  If you don't see a video below, view it at <a href=\"http://www.";
@@ -67,19 +67,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:49
+#: /home/runa/tor/website/projects/en/torbrowser.wml:49
 msgid "<a id=\"Download\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:50
+#: /home/runa/tor/website/projects/en/torbrowser.wml:50
 msgid ""
 "<a class=\"anchor\" href=\"#Download\">Download Tor Browser Bundle and Tor "
 "IM Browser Bundle</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:52
+#: /home/runa/tor/website/projects/en/torbrowser.wml:52
 msgid ""
 "To start using the Tor Browser Bundle or Tor IM Browser Bundle, download the "
 "file for your preferred language. This file can be saved wherever is "
@@ -87,7 +87,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:56
+#: /home/runa/tor/website/projects/en/torbrowser.wml:56
 msgid ""
 "If you have an unreliable Internet connection, it may be easier for you to "
 "download the bundle edition which is <a href=\"<page projects/torbrowser-"
@@ -95,14 +95,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:58
+#: /home/runa/tor/website/projects/en/torbrowser.wml:58
 msgid ""
 "Tor Browser Bundle for Windows with Firefox (version <version-"
 "torbrowserbundle>, 16 MB)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:62
+#: /home/runa/tor/website/projects/en/torbrowser.wml:62
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe"
 "\">English (en-US)</a> (<a href=\"../dist/torbrowser/tor-browser-<version-"
@@ -110,7 +110,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:64
+#: /home/runa/tor/website/projects/en/torbrowser.wml:64
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ar.exe"
 "\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar)</a> (<a "
@@ -119,7 +119,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:66
+#: /home/runa/tor/website/projects/en/torbrowser.wml:66
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_de.exe"
 "\">Deutsch (de)</a> (<a href=\"../dist/torbrowser/tor-browser-<version-"
@@ -127,7 +127,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:68
+#: /home/runa/tor/website/projects/en/torbrowser.wml:68
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_es-ES.exe"
 "\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES)</a> (<a "
@@ -136,7 +136,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:70
+#: /home/runa/tor/website/projects/en/torbrowser.wml:70
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_fa.exe"
 "\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa)</a> (<a href=\"../dist/"
@@ -145,7 +145,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:72
+#: /home/runa/tor/website/projects/en/torbrowser.wml:72
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_fr.exe"
 "\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr)</a> "
@@ -154,7 +154,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:74
+#: /home/runa/tor/website/projects/en/torbrowser.wml:74
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_it.exe"
 "\">Italiano (it)</a> (<a href=\"../dist/torbrowser/tor-browser-<version-"
@@ -162,7 +162,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:76
+#: /home/runa/tor/website/projects/en/torbrowser.wml:76
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_nl.exe"
 "\">Nederlands (nl)</a> (<a href=\"../dist/torbrowser/tor-browser-<version-"
@@ -170,7 +170,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:78
+#: /home/runa/tor/website/projects/en/torbrowser.wml:78
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_pl.exe"
 "\">Polish (pl)</a> (<a href=\"../dist/torbrowser/tor-browser-<version-"
@@ -178,7 +178,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:80
+#: /home/runa/tor/website/projects/en/torbrowser.wml:80
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_pt-PT.exe"
 "\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; "
@@ -187,7 +187,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:82
+#: /home/runa/tor/website/projects/en/torbrowser.wml:82
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ru.exe"
 "\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru)</a> (<a "
@@ -196,7 +196,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:84
+#: /home/runa/tor/website/projects/en/torbrowser.wml:84
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_vi.exe"
 "\">Vietnamese (vi)</a> (<a href=\"../dist/torbrowser/tor-browser-<version-"
@@ -204,7 +204,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:86
+#: /home/runa/tor/website/projects/en/torbrowser.wml:86
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_zh-CN.exe"
 "\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"../dist/torbrowser/tor-"
@@ -213,14 +213,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:90
+#: /home/runa/tor/website/projects/en/torbrowser.wml:90
 msgid ""
 "Tor IM Browser Bundle for Windows with Firefox and Pidgin (version <version-"
 "torimbrowserbundle>, 25 MB)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:94
+#: /home/runa/tor/website/projects/en/torbrowser.wml:94
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_en-"
 "US.exe\">English (en-US)</a> (<a href=\"../dist/torbrowser/tor-im-browser-"
@@ -229,7 +229,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:96
+#: /home/runa/tor/website/projects/en/torbrowser.wml:96
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_ar."
 "exe\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar)</a> (<a "
@@ -238,7 +238,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:98
+#: /home/runa/tor/website/projects/en/torbrowser.wml:98
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_de."
 "exe\">Deutsch (de)</a> (<a href=\"../dist/torbrowser/tor-im-browser-<version-"
@@ -246,7 +246,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:100
+#: /home/runa/tor/website/projects/en/torbrowser.wml:100
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_es-"
 "ES.exe\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES)</"
@@ -255,7 +255,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:102
+#: /home/runa/tor/website/projects/en/torbrowser.wml:102
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_fa."
 "exe\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa)</a> (<a href=\"../dist/"
@@ -264,7 +264,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:104
+#: /home/runa/tor/website/projects/en/torbrowser.wml:104
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_fr."
 "exe\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr)</"
@@ -273,7 +273,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:106
+#: /home/runa/tor/website/projects/en/torbrowser.wml:106
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_it."
 "exe\">Italiano (it)</a> (<a href=\"../dist/torbrowser/tor-im-browser-"
@@ -282,7 +282,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:108
+#: /home/runa/tor/website/projects/en/torbrowser.wml:108
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_nl."
 "exe\">Nederlands (nl)</a> (<a href=\"../dist/torbrowser/tor-im-browser-"
@@ -291,7 +291,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:110
+#: /home/runa/tor/website/projects/en/torbrowser.wml:110
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_pl."
 "exe\">Polish (pl)</a> (<a href=\"../dist/torbrowser/tor-im-browser-<version-"
@@ -299,7 +299,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:112
+#: /home/runa/tor/website/projects/en/torbrowser.wml:112
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_pt-"
 "PT.exe\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;"
@@ -308,7 +308,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:114
+#: /home/runa/tor/website/projects/en/torbrowser.wml:114
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_ru."
 "exe\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru)</a> (<a "
@@ -317,7 +317,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:116
+#: /home/runa/tor/website/projects/en/torbrowser.wml:116
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_vi."
 "exe\">Vietnamese (vi)</a> (<a href=\"../dist/torbrowser/tor-im-browser-"
@@ -326,7 +326,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:118
+#: /home/runa/tor/website/projects/en/torbrowser.wml:118
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_zh-"
 "CN.exe\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"../dist/torbrowser/"
@@ -335,14 +335,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:122
+#: /home/runa/tor/website/projects/en/torbrowser.wml:122
 msgid ""
 "BETA: Tor Browser Bundle for Intel Mac OS X 10.5 and higher with Firefox "
 "(version <version-torbrowserbundleosx>, 28 MB)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:126
+#: /home/runa/tor/website/projects/en/torbrowser.wml:126
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-en-US.zip\">English (en-US)</a> (<a href=\"../dist/torbrowser/"
@@ -351,7 +351,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:129
+#: /home/runa/tor/website/projects/en/torbrowser.wml:129
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-ar.zip\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;"
@@ -361,7 +361,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:133
+#: /home/runa/tor/website/projects/en/torbrowser.wml:133
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-de.zip\">Deutsch (de)</a> (<a href=\"../dist/torbrowser/osx/"
@@ -370,7 +370,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:136
+#: /home/runa/tor/website/projects/en/torbrowser.wml:136
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-es-ES.zip\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;"
@@ -380,7 +380,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:140
+#: /home/runa/tor/website/projects/en/torbrowser.wml:140
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-fa.zip\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa) </a> (<a "
@@ -389,7 +389,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:143
+#: /home/runa/tor/website/projects/en/torbrowser.wml:143
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-fr.zip\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;"
@@ -399,7 +399,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:146
+#: /home/runa/tor/website/projects/en/torbrowser.wml:146
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-it.zip\">Italiano (it)</a> (<a href=\"../dist/torbrowser/osx/"
@@ -408,7 +408,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:149
+#: /home/runa/tor/website/projects/en/torbrowser.wml:149
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-nl.zip\">Nederlands (nl)</a> (<a href=\"../dist/torbrowser/osx/"
@@ -417,7 +417,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:152
+#: /home/runa/tor/website/projects/en/torbrowser.wml:152
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-pl.zip\">Polish (pl)</a> (<a href=\"../dist/torbrowser/osx/"
@@ -426,7 +426,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:155
+#: /home/runa/tor/website/projects/en/torbrowser.wml:155
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-pt-PT.zip\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;"
@@ -436,7 +436,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:158
+#: /home/runa/tor/website/projects/en/torbrowser.wml:158
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-ru.zip\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;"
@@ -446,7 +446,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:162
+#: /home/runa/tor/website/projects/en/torbrowser.wml:162
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
 "dev-osx-i386-zh-CN.zip\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"../"
@@ -455,7 +455,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:169
+#: /home/runa/tor/website/projects/en/torbrowser.wml:169
 msgid ""
 "BETA: Tor Browser Bundle for Linux with Firefox (version <version-"
 "torbrowserbundlelinux32> (32-bit), <version-torbrowserbundlelinux64> (64-"
@@ -463,7 +463,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:172
+#: /home/runa/tor/website/projects/en/torbrowser.wml:172
 msgid ""
 "English (en-US): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
 "i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz\">32-bit</a> (<a "
@@ -477,7 +477,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:175
+#: /home/runa/tor/website/projects/en/torbrowser.wml:175
 msgid ""
 "&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar): <a href=\"../"
 "dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -492,7 +492,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:177
+#: /home/runa/tor/website/projects/en/torbrowser.wml:177
 msgid ""
 "Deutsch (de): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-"
 "<version-torbrowserbundlelinux32>-dev-de.tar.gz\">32-bit</a> (<a href=\"../"
@@ -506,7 +506,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:179
+#: /home/runa/tor/website/projects/en/torbrowser.wml:179
 msgid ""
 "&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES): <a href="
 "\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -521,7 +521,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:181
+#: /home/runa/tor/website/projects/en/torbrowser.wml:181
 msgid ""
 "&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa): <a href=\"../dist/torbrowser/"
 "linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-fa."
@@ -535,7 +535,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:183
+#: /home/runa/tor/website/projects/en/torbrowser.wml:183
 msgid ""
 "&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -550,7 +550,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:185
+#: /home/runa/tor/website/projects/en/torbrowser.wml:185
 msgid ""
 "Italiano (it): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-"
 "<version-torbrowserbundlelinux32>-dev-it.tar.gz\">32-bit</a> (<a href=\"../"
@@ -564,7 +564,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:187
+#: /home/runa/tor/website/projects/en/torbrowser.wml:187
 msgid ""
 "Nederlands (nl): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
 "i686-<version-torbrowserbundlelinux32>-dev-nl.tar.gz\">32-bit</a> (<a href="
@@ -578,7 +578,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:189
+#: /home/runa/tor/website/projects/en/torbrowser.wml:189
 msgid ""
 "Polish (pl): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-"
 "<version-torbrowserbundlelinux32>-dev-pl.tar.gz\">32-bit</a> (<a href=\"../"
@@ -592,7 +592,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:191
+#: /home/runa/tor/website/projects/en/torbrowser.wml:191
 msgid ""
 "&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; (pt-"
 "PT): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -607,7 +607,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:193
+#: /home/runa/tor/website/projects/en/torbrowser.wml:193
 msgid ""
 "&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru): <a href=\"../"
 "dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -622,7 +622,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:195
+#: /home/runa/tor/website/projects/en/torbrowser.wml:195
 msgid ""
 "&#x7b80;&#x4f53;&#x5b57; (zh-CN): <a href=\"../dist/torbrowser/linux/tor-"
 "browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-zh-CN.tar.gz"
@@ -636,7 +636,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:201
+#: /home/runa/tor/website/projects/en/torbrowser.wml:201
 msgid ""
 "See our instructions on <a href=\"<page docs/verifying-signatures>\">how to "
 "verify package signatures</a>, which allows you to make sure you've "
@@ -648,17 +648,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:211
+#: /home/runa/tor/website/projects/en/torbrowser.wml:211
 msgid "<a id=\"MacOSX\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:212
+#: /home/runa/tor/website/projects/en/torbrowser.wml:212
 msgid "<a class=\"anchor\" href=\"#MacOSX\">Mac OS X instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:213
+#: /home/runa/tor/website/projects/en/torbrowser.wml:213
 msgid ""
 "Download the file above, save it somewhere, then click on it. Mac OS X will "
 "automatically unarchive it and you will have a TorBrowser application in "
@@ -668,47 +668,58 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:219
+#: /home/runa/tor/website/projects/en/torbrowser.wml:219
 msgid ""
 "<img src=\"$(IMGROOT)/screenshot-osx-torbrowser-icon.png\" alt=\"Screenshot "
 "Mac OS X bundle\" />"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:221
+#: /home/runa/tor/website/projects/en/torbrowser.wml:221
 msgid "<a id=\"Linux\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:222
+#: /home/runa/tor/website/projects/en/torbrowser.wml:222
 msgid "<a class=\"anchor\" href=\"#Linux\">Linux instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:223
+#: /home/runa/tor/website/projects/en/torbrowser.wml:223
 msgid ""
 "Download the architecture-appropriate file above, save it somewhere, then "
-"run:<br> tar -xvzf tor-browser-gnu-linux-i686-<version-"
-"torbrowserbundlelinux32>-dev-LANG.tar.gz or tor-browser-gnu-linux-x86_64-"
-"<version-torbrowserbundlelinux64>-dev-LANG.tar.gz (where LANG is the "
-"language listed in the filename), and either double click on the directory "
-"or cd into it, then execute the <strong>start-tor-browser</strong> script. "
-"This will launch Vidalia and once that connects to Tor, it will launch "
-"Firefox."
+"run:<br> <code>tar -xvzf tor-browser-gnu-linux-i686-<version-"
+"torbrowserbundlelinux32>-dev-<var>LANG</var>.tar.gz</code> or <code>tor-"
+"browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<var>LANG</"
+"var>.tar.gz</code> (where <var>LANG</var> is the language listed in the "
+"filename), and either double click on the directory or <code>cd</code> into "
+"it, then execute the <strong>start-tor-browser</strong> script. This will "
+"launch Vidalia and once that connects to Tor, it will launch Firefox. <em>Do "
+"not unpack or run TBB as root.</em>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:232
+#: /home/runa/tor/website/projects/en/torbrowser.wml:232
+msgid "<a id=\"Windows\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/projects/en/torbrowser.wml:233
+msgid "<a class=\"anchor\" href=\"#Windows\">Windows instructions</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/projects/en/torbrowser.wml:235
 msgid "<a id=\"Extraction\"></a>"
 msgstr ""
 
-#. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:233
+#. type: Content of: <div><div><h4>
+#: /home/runa/tor/website/projects/en/torbrowser.wml:236
 msgid "<a class=\"anchor\" href=\"#Extraction\">Extraction</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:235
+#: /home/runa/tor/website/projects/en/torbrowser.wml:238
 msgid ""
 "Download the file above, and save it somewhere, then double click on it.  "
 "Click on the button labelled <strong>\"...\"</strong> (1) and select where "
@@ -720,57 +731,57 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:243
+#: /home/runa/tor/website/projects/en/torbrowser.wml:246
 msgid ""
 "Click <strong>Extract</strong> (3) to begin extraction. This may take a few "
 "minutes to complete."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:246
+#: /home/runa/tor/website/projects/en/torbrowser.wml:249
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot1.png\" alt=\"Screenshot of extraction "
 "process\" />"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:249
+#: /home/runa/tor/website/projects/en/torbrowser.wml:252
 msgid "<a id=\"Usage\"></a>"
 msgstr ""
 
-#. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:250
+#. type: Content of: <div><div><h4>
+#: /home/runa/tor/website/projects/en/torbrowser.wml:253
 msgid "<a class=\"anchor\" href=\"#Usage\">Usage</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:252
+#: /home/runa/tor/website/projects/en/torbrowser.wml:255
 msgid ""
 "Once extraction is complete, open the folder <strong>Tor Browser</strong> "
 "from the location you saved the bundle."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:254
+#: /home/runa/tor/website/projects/en/torbrowser.wml:257
 msgid ""
 "Double click on the <strong>Start Tor Browser</strong> (4) application (it "
 "may be called <strong>Start Tor Browser.exe</strong> on some systems.)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:257
+#: /home/runa/tor/website/projects/en/torbrowser.wml:260
 msgid "The Vidalia window will shortly appear."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:259
+#: /home/runa/tor/website/projects/en/torbrowser.wml:262
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot2.png\" alt=\"Screenshot of bundle "
 "startup\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:262
+#: /home/runa/tor/website/projects/en/torbrowser.wml:265
 msgid ""
 "Once Tor is ready, Firefox will automatically be opened. Only web pages "
 "visited through the included Firefox browser will be sent via Tor. Other web "
@@ -782,14 +793,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:269
+#: /home/runa/tor/website/projects/en/torbrowser.wml:272
 msgid ""
 "If you installed the Tor IM Browser Bundle, the Pidgin instant messaging "
 "client will also be automatically opened."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:271
+#: /home/runa/tor/website/projects/en/torbrowser.wml:274
 msgid ""
 "Once you are finished browsing, close any open Firefox windows by clicking "
 "on the <img src=\"$(IMGROOT)/tbb-close-button.png\" alt=\"Close button "
@@ -798,13 +809,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:277
+#: /home/runa/tor/website/projects/en/torbrowser.wml:280
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot3a.png\" alt=\"Screenshot of Firefox\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:280
+#: /home/runa/tor/website/projects/en/torbrowser.wml:283
 msgid ""
 "With the Tor Browser Bundle, Vidalia and Tor will automatically close. With "
 "the Tor IM Browser Bundle you need to also close Pidgin by right-clicking on "
@@ -812,20 +823,20 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:282
+#: /home/runa/tor/website/projects/en/torbrowser.wml:285
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot3b.png\" alt=\"Screenshot of Pidgin\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:285
+#: /home/runa/tor/website/projects/en/torbrowser.wml:288
 msgid ""
 "To use the Tor Browser Bundle or Tor IM Browser Bundle again, repeat the "
 "steps in <a href=\"#Usage\">\"Usage\"</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:287
+#: /home/runa/tor/website/projects/en/torbrowser.wml:290
 msgid ""
 "Remember that Tor anonymizes the origin of your traffic, and it encrypts "
 "everything inside the Tor network, but <a href=\"<wikifaq>#ExitEavesdroppers"
@@ -836,42 +847,43 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:295
+#: /home/runa/tor/website/projects/en/torbrowser.wml:298
 msgid "<a id=\"Feedback\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:296
+#: /home/runa/tor/website/projects/en/torbrowser.wml:299
 msgid "<a class=\"anchor\" href=\"#Feedback\">Comments and suggestions</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:298
+#: /home/runa/tor/website/projects/en/torbrowser.wml:301
 msgid ""
 "The Tor Browser Bundle is under development and not yet complete.  To "
-"discuss improvements and submit comments, please use the <a href=\"http://";
-"archives.seul.org/or/talk/\">or-talk</a> mailing list."
+"discuss improvements and submit comments, please use the <a href=\"https://";
+"lists.torproject.org/cgi-bin/mailman/listinfo/tor-talk\">tor-talk</a> "
+"mailing list."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:302
+#: /home/runa/tor/website/projects/en/torbrowser.wml:306
 msgid "<a id=\"More\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:303
+#: /home/runa/tor/website/projects/en/torbrowser.wml:307
 msgid "<a class=\"anchor\" href=\"#More\">More information</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:305
+#: /home/runa/tor/website/projects/en/torbrowser.wml:309
 msgid ""
 "<strong>What is Tor and why do I need it?</strong> To learn more about Tor, "
 "visit the <a href=\"<page index>\">Tor Project website</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:309
+#: /home/runa/tor/website/projects/en/torbrowser.wml:313
 msgid ""
 "<strong>What is in the Tor Browser Bundle?</strong> It contains Tor, "
 "Vidalia, Polipo, Firefox, and Torbutton (<a href=\"<page projects/torbrowser-"
@@ -879,7 +891,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:313
+#: /home/runa/tor/website/projects/en/torbrowser.wml:317
 msgid ""
 "<strong>What is in the Tor IM Browser Bundle?</strong> It contains Tor, "
 "Vidalia, Polipo, Firefox, Torbutton, Pidgin and OTR (<a href=\"<page "
@@ -887,7 +899,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:317
+#: /home/runa/tor/website/projects/en/torbrowser.wml:321
 msgid ""
 "<strong>How can I make my own bundle?</strong> To download the source code "
 "and learn how to build the bundle yourself, read the <a href=\"<page "
@@ -895,7 +907,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/dev/website/projects/en/torbrowser.wml:321
+#: /home/runa/tor/website/projects/en/torbrowser.wml:325
 msgid ""
 "Tor Browser Bundle is partially based on <a href=\"http://portableapps.com/";
 "apps/internet/firefox_portable\">Mozilla Firefox, Portable Edition</a> and "

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits