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

[or-cvs] r24217: {translation} updated website pot templates (in translation/trunk/projects/website/po/templates: . about docs donate getinvolved press projects)



Author: runa
Date: 2011-02-12 12:21:10 +0000 (Sat, 12 Feb 2011)
New Revision: 24217

Modified:
   translation/trunk/projects/website/po/templates/3-low.index.pot
   translation/trunk/projects/website/po/templates/about/3-low.contact.pot
   translation/trunk/projects/website/po/templates/about/3-low.corepeople.pot
   translation/trunk/projects/website/po/templates/about/3-low.volunteers.pot
   translation/trunk/projects/website/po/templates/about/4-optional.gsoc.pot
   translation/trunk/projects/website/po/templates/docs/1-high.bridges.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.tor-doc-osx.pot
   translation/trunk/projects/website/po/templates/docs/2-medium.tor-doc-relay.pot
   translation/trunk/projects/website/po/templates/docs/2-medium.verifying-signatures.pot
   translation/trunk/projects/website/po/templates/docs/3-low.debian.pot
   translation/trunk/projects/website/po/templates/docs/3-low.faq-abuse.pot
   translation/trunk/projects/website/po/templates/docs/3-low.tor-doc-unix.pot
   translation/trunk/projects/website/po/templates/docs/3-low.tor-doc-web.pot
   translation/trunk/projects/website/po/templates/docs/3-low.tor-hidden-service.pot
   translation/trunk/projects/website/po/templates/donate/3-low.donate.pot
   translation/trunk/projects/website/po/templates/getinvolved/3-low.tshirt.pot
   translation/trunk/projects/website/po/templates/getinvolved/4-optional.research.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/projects/3-low.projects.pot
   translation/trunk/projects/website/po/templates/projects/3-low.torweather.pot
Log:
updated website pot templates

Modified: translation/trunk/projects/website/po/templates/3-low.index.pot
===================================================================
--- translation/trunk/projects/website/po/templates/3-low.index.pot	2011-02-12 12:18:18 UTC (rev 24216)
+++ translation/trunk/projects/website/po/templates/3-low.index.pot	2011-02-12 12:21:10 UTC (rev 24217)
@@ -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-02-12 12:19+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -236,12 +236,26 @@
 
 #. type: Content of: <div><div><div><div><table><tr><td><div>
 #: /home/runa/tor/website/en/index.wml:133
-msgid "<span class=\"month\">Jan</span><br><span class=\"day\">17</span>"
+msgid "<span class=\"month\">Jan</span><br><span class=\"day\">30</span>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
 #: /home/runa/tor/website/en/index.wml:134
 msgid ""
+"Tor helping with Egypt.  Here's what we've learned <a href=\"https://blog.";
+"torproject.org/blog/recent-events-egypt\">about recent events in Egypt</a>. "
+"And we're keeping our <a href=\"<page press/inthemedia>\">In the media</a> "
+"page up to date with stories about how we're helping around the world."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><div>
+#: /home/runa/tor/website/en/index.wml:140
+msgid "<span class=\"month\">Jan</span><br><span class=\"day\">17</span>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><p>
+#: /home/runa/tor/website/en/index.wml:141
+msgid ""
 "The latest stable Tor version, 0.2.1.29, is <a href=\"http://archives.seul.";
 "org/or/announce/Jan-2011/msg00000.html\">released</a>.  Tor 0.2.1.29 "
 "continues our recent code security audit work. The main fix resolves a "

Modified: translation/trunk/projects/website/po/templates/about/3-low.contact.pot
===================================================================
--- translation/trunk/projects/website/po/templates/about/3-low.contact.pot	2011-02-12 12:18:18 UTC (rev 24216)
+++ translation/trunk/projects/website/po/templates/about/3-low.contact.pot	2011-02-12 12:21:10 UTC (rev 24217)
@@ -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-02-12 12:19+0000\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/transifex/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/transifex/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/transifex/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,52 +40,56 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/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. All of these "
-"addresses are @torproject.org. Note that in practice most of them go to the "
-"same small group of people, so please be patient and <a href=\"http://www.";
+"addresses are @torproject.org. Please be patient and <a href=\"http://www.";
 "catb.org/~esr/faqs/smart-questions.html\">helpful</a>, and please make sure "
 "to write your mail in English."
 msgstr ""
 
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/about/en/contact.wml:25
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/contact.wml:23
 msgid ""
-"<i>tor-assistants</i> is the catch-all address for everything. If you'd like "
-"to ask a more directed question, please see the descriptions below."
+"<i>tor-assistants</i> is the catch-all address for everything. It can be "
+"used for:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/about/en/contact.wml:28
+#: /home/runa/tor/website/about/en/contact.wml:27
 msgid ""
-"<i>tor-ops</i> gets to the people who manage the directory authorities. Use "
-"this if you run a Tor relay and have a question or problem with your relay."
+"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/transifex/website/about/en/contact.wml:31
+#: /home/runa/tor/website/about/en/contact.wml:30
 msgid ""
-"<i>tor-webmaster</i> 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 want to make a draft of your new sections on <a href="
-"\"<wiki>\">the Tor wiki</a> first."
+"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 "
+"want to make a draft of your new sections on <a href=\"<wiki>\">the Tor "
+"wiki</a> first."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/about/en/contact.wml:35
+#: /home/runa/tor/website/about/en/contact.wml:34
 msgid ""
-"<i>tor-volunteer</i> wants to hear about your documents, patches, testing, "
-"experiences with supporting applications, and so forth inspired by our <a "
-"href=\"<page getinvolved/volunteer>\">volunteer page</a> (or other problems "
-"you've fixed or documented about using Tor). There's no need to mail us "
-"before you start working on something -- like all volunteer Internet "
-"projects, we hear from a lot of excited people who vanish soon after, so we "
-"are most interested in hearing about actual progress."
+"Hearing about your documents, patches, testing, experiences with supporting "
+"applications, and so forth inspired by our <a href=\"<page getinvolved/"
+"volunteer>\">volunteer page</a> (or other problems you've fixed or "
+"documented about using Tor). There's no need to mail us before you start "
+"working on something -- like all volunteer Internet projects, we hear from a "
+"lot of excited people who vanish soon after, so we are most interested in "
+"hearing about actual progress."
 msgstr ""
 
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/contact.wml:44
+msgid "A few other addresses are more specific:"
+msgstr ""
+
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/about/en/contact.wml:44
+#: /home/runa/tor/website/about/en/contact.wml:47
 msgid ""
 "<i>tor-translation</i> can put new <a href=\"<page getinvolved/translation>"
 "\">website translations</a> into place, and help answer questions about "
@@ -93,14 +97,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/about/en/contact.wml:47
+#: /home/runa/tor/website/about/en/contact.wml:50
 msgid ""
 "<i>tordnsel</i> is the alias for the people responsible for the tordns "
 "exitlist."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/about/en/contact.wml:49
+#: /home/runa/tor/website/about/en/contact.wml:52
 msgid ""
 "<i>donations</i> is for questions and comments about <a href=\"<page donate/"
 "donate>\">getting money to the developers</a>. More donations means <a href="
@@ -109,9 +113,38 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/about/en/contact.wml:54
+#: /home/runa/tor/website/about/en/contact.wml:57
 msgid ""
 "<i>execdir</i> is for press/media, questions and comments about Tor the non-"
 "profit corporation: trademark questions, affiliation and coordination, major "
 "gifts, contract inquiries, licensing and certification, etc."
 msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/contact.wml:63
+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/tor/website/about/en/contact.wml:68
+msgid ""
+"<i>#tor</i> - User and relay operation discussions. Having trouble running "
+"Tor or a question for other Tor users? Then this is the spot for you."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/contact.wml:71
+msgid ""
+"<i>#tor-dev</i> - Channel for people who want to do development.  "
+"Discussions about Tor related coding, protocols, and <a href=\"<page "
+"getinvolved/volunteer>\">project ideas</a> are all welcome."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/contact.wml:74
+msgid ""
+"<i>#nottor</i> - This is where Tor people hang out to talk about stuff that "
+"is not related to Tor."
+msgstr ""

Modified: translation/trunk/projects/website/po/templates/about/3-low.corepeople.pot
===================================================================
--- translation/trunk/projects/website/po/templates/about/3-low.corepeople.pot	2011-02-12 12:18:18 UTC (rev 24216)
+++ translation/trunk/projects/website/po/templates/about/3-low.corepeople.pot	2011-02-12 12:21:10 UTC (rev 24217)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-01-03 14:39+0000\n"
+"POT-Creation-Date: 2011-02-12 12:19+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -70,38 +70,39 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:32
+#: /home/runa/tor/website/about/en/corepeople.wml:40
 msgid "Erinn Clark, Packaging and Build Automation"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:33
+#: /home/runa/tor/website/about/en/corepeople.wml:41
 msgid ""
 "Erinn is tackling the growing needs for easy to install and configure "
 "packages on a variety of operating systems.  Also working on automating the "
 "build system and producing nightly builds for all operating systems we "
-"support."
+"support. Erinn is also doing some advocacy by talking to audiences at "
+"FSCONS, CodeBits.eu, and various European universites."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:34
+#: /home/runa/tor/website/about/en/corepeople.wml:47
 msgid "Christopher Davis, Libevent hacker"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:35
+#: /home/runa/tor/website/about/en/corepeople.wml:48
 msgid ""
-"Worked during Google Summer of Code 2009 on porting Polipo to Windows and on "
-"helping with the libevent bufferevent code."
+"Worked during Google Summer of Code 2009 on porting Polipo to Windows.  He "
+"currently helps with the libevent bufferevent code."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:36
+#: /home/runa/tor/website/about/en/corepeople.wml:51
 msgid "Roger Dingledine, Project Leader; Director, Researcher"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:37
+#: /home/runa/tor/website/about/en/corepeople.wml:52
 msgid ""
 "Original developer of Tor along with Nick Mathewson and Paul Syverson. "
 "Leading researcher in the anonymous communications field.  Frequent speaker "
@@ -110,36 +111,40 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:38
+#: /home/runa/tor/website/about/en/corepeople.wml:57
 msgid "Matt Edman, Vidalia Developer; Researcher"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:39
+#: /home/runa/tor/website/about/en/corepeople.wml:58
 msgid ""
 "Lead developer for <a href=\"<page projects/vidalia>\">Vidalia</a>, a cross-"
-"platform Tor GUI included in the bundles."
+"platform Tor Graphical User Interface included in the bundles."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:40
+#: /home/runa/tor/website/about/en/corepeople.wml:61
 msgid "Nathan Freitas, Mobile phone hacker"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:41
+#: /home/runa/tor/website/about/en/corepeople.wml:62
 msgid ""
-"The driving force behind Tor on the Android platform in the form of <a href="
-"\"<page docs/android>\">Orbot</a>."
+"The driving force behind <a href=\"https://guardianproject.info\";>The "
+"Guardian Project</a> and Tor on the Android platform in the form of <a href="
+"\"<page docs/android>\">Orbot</a>. He also works on <a href=\"https://";
+"guardianproject.info/apps/orlib/\">OrLib</a>: an Android library for Tor, "
+"and <a href=\"https://guardianproject.info/apps/orweb/\";>Orweb: A privacy-"
+"enhanced mobile browser</a>."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:42
+#: /home/runa/tor/website/about/en/corepeople.wml:70
 msgid "Christian Fromme, Developer"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:43
+#: /home/runa/tor/website/about/en/corepeople.wml:71
 msgid ""
 "Christian works on all things python for Tor.  He enhanced and maintains a "
 "slew of codebases for us, such as the get-tor email auto-responder, check."
@@ -147,12 +152,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:44
+#: /home/runa/tor/website/about/en/corepeople.wml:75
 msgid "Melissa Gilroy, CFO and Internal Audit"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:45
+#: /home/runa/tor/website/about/en/corepeople.wml:76
 msgid ""
 "With a strong background in non-profit accounting and auditing, Melissa is "
 "in charge of Tor's finances, audit compliance, and keeping Tor's financial "
@@ -160,12 +165,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:46
+#: /home/runa/tor/website/about/en/corepeople.wml:80
 msgid "Sebastian Hahn, Developer"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:47
+#: /home/runa/tor/website/about/en/corepeople.wml:81
 msgid ""
 "Worked during the 2008 Google Summer of Code on a networking application to "
 "automatically carry out tests for Tor and during the 2009 Google Summer of "
@@ -174,22 +179,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:48
+#: /home/runa/tor/website/about/en/corepeople.wml:86
 msgid "Tom Heydt-Benjamin, Researcher"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:49
-msgid "Anonymous communications and bridge distribution researcher."
+#: /home/runa/tor/website/about/en/corepeople.wml:87
+msgid ""
+"Anonymous communications and bridge distribution researcher. His other work "
+"can be found on his <a href=\"http://cryptocracy.net/\";>personal website</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:50
+#: /home/runa/tor/website/about/en/corepeople.wml:90
 msgid "Robert Hogan, Developer"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:51
+#: /home/runa/tor/website/about/en/corepeople.wml:91
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\";>TorK</a> Tor controller, a "
 "<a href=\"http://code.google.com/p/torora/\";>privacy-oriented Arora fork</"
@@ -198,12 +205,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:52
+#: /home/runa/tor/website/about/en/corepeople.wml:97
 msgid "Damian Johnson, Arm Developer"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:53
+#: /home/runa/tor/website/about/en/corepeople.wml:98
 msgid ""
 "Builds <a href=\"http://atagar.com/arm\";>Arm</a>, a command-line application "
 "for monitoring Tor relays and providing real-time status information such as "
@@ -211,26 +218,26 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:54
+#: /home/runa/tor/website/about/en/corepeople.wml:102
 msgid ""
 "Andrew Lewman, Executive Director; Director; <a href=\"<page press/press>"
 "\">press contact</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:55
+#: /home/runa/tor/website/about/en/corepeople.wml:103
 msgid ""
 "Manages the business operations of The Tor Project, Inc.  Plays roles of "
-"finance, advocacy, project management, and general support."
+"finance, advocacy, project management, strategy, press, and general support."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:56
+#: /home/runa/tor/website/about/en/corepeople.wml:106
 msgid "Dr. Karsten Loesing, Researcher and Developer"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:57
+#: /home/runa/tor/website/about/en/corepeople.wml:107
 msgid ""
 "Worked during the 2007 Google Summer of Code on <a href=\"<gitblob>doc/spec/"
 "proposals/114-distributed-storage.txt\">distributing and securing the "
@@ -240,61 +247,63 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:58
+#: /home/runa/tor/website/about/en/corepeople.wml:114
 msgid "Nick Mathewson, Chief Architect, Researcher, Director"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:59
+#: /home/runa/tor/website/about/en/corepeople.wml:115
 msgid ""
 "One of the three original designers of Tor; does a lot of the ongoing design "
 "work. One of the two main developers, along with Roger."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:60
+#: /home/runa/tor/website/about/en/corepeople.wml:118
 msgid "Dr. Steven Murdoch, Researcher and Developer"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:61
+#: /home/runa/tor/website/about/en/corepeople.wml:119
 msgid ""
 "Researcher at the University of Cambridge, currently funded by The Tor "
 "Project to improve the security, performance, and usability of Tor. Creator "
-"of the <a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a>."
+"of the <a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a>.  You "
+"can find out more about his work on his <a href=\"http://www.cl.cam.ac.uk/";
+"~sjm217/\">professional website</a>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:62
+#: /home/runa/tor/website/about/en/corepeople.wml:126
 msgid "Linus Nordberg, Advocate"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:63
+#: /home/runa/tor/website/about/en/corepeople.wml:127
 msgid ""
 "Swedish advocate for Tor, anonymous communications research, and employee at "
 "<a href=\"http://nordu.net\";>NORDUnet</a>."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:64
+#: /home/runa/tor/website/about/en/corepeople.wml:130
 msgid "Peter Palfrader, Sysadmin and Developer"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:65
+#: /home/runa/tor/website/about/en/corepeople.wml:131
 msgid ""
 "Manages the Debian packages, runs one of the directory authorities, runs the "
 "website and the wiki, and generally helps out a lot."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:66
+#: /home/runa/tor/website/about/en/corepeople.wml:132
 msgid "Mike Perry, Torbutton and Tor Performance Developer"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:67
+#: /home/runa/tor/website/about/en/corepeople.wml:133
 msgid ""
 "Author of <a href=\"https://svn.torproject.org/svn/torflow/trunk/README";
 "\">TorFlow</a>, a Tor controller that builds paths through the Tor network "
@@ -303,38 +312,41 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:68
-msgid "Karen Reilly, Marketing, Fundraising, and Grant Development Director"
+#: /home/runa/tor/website/about/en/corepeople.wml:139
+msgid "Karen Reilly, Development Director"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:69
+#: /home/runa/tor/website/about/en/corepeople.wml:140
 msgid ""
-"Responsible for fundraising, advocacy, and general marketing and outreach "
-"programs for Tor."
+"Responsible for fundraising, advocacy, general marketing, policy outreach "
+"programs for Tor. She is also available to speak for audiences about the "
+"benefits of online anonymity, privacy, and Tor."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:70
+#: /home/runa/tor/website/about/en/corepeople.wml:144
 msgid "Runa A. Sandvik, Translation Coordinator"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:71
+#: /home/runa/tor/website/about/en/corepeople.wml:145
 msgid ""
-"Maintains the <a href=\"https://translation.torproject.org/\";>Tor "
-"Translation Portal</a>, and works on automatically converting our website "
-"wml files to po files (and back) so that they can be handled by <a href="
-"\"http://translate.sourceforge.net/wiki/pootle/index\";>Pootle</a>."
+"Maintains the <a href=\"http://www.transifex.net/projects/p/torproject/";
+"\">Tor Translation Portal</a>, and works on automatically converting our "
+"website wml files to po files (and back).  She also generally helps out with "
+"the <a href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/";
+"Torouter\">Torouter project</a>, bridge distribution through instant "
+"messaging, and other projects."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:72
+#: /home/runa/tor/website/about/en/corepeople.wml:153
 msgid "Dr. Paul Syverson, Researcher"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:73
+#: /home/runa/tor/website/about/en/corepeople.wml:154
 msgid ""
 "Inventor of <a href=\"http://www.onion-router.net/\";>Onion Routing</a>, "
 "original designer of Tor along with Roger and Nick, and project leader for "
@@ -343,12 +355,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:74
+#: /home/runa/tor/website/about/en/corepeople.wml:159
 msgid "Jeremy Todaro, Illustration &amp; Design"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:75
+#: /home/runa/tor/website/about/en/corepeople.wml:160
 msgid ""
 "Works on the artwork and design for various projects, annual reports, and "
 "brochures. His other work can be found at <a href=\"http://jmtodaro.com/";

Modified: translation/trunk/projects/website/po/templates/about/3-low.volunteers.pot
===================================================================
--- translation/trunk/projects/website/po/templates/about/3-low.volunteers.pot	2011-02-12 12:18:18 UTC (rev 24216)
+++ translation/trunk/projects/website/po/templates/about/3-low.volunteers.pot	2011-02-12 12:21:10 UTC (rev 24217)
@@ -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-02-12 12:19+0000\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,34 +17,34 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/about/en/volunteers.wml:8
+#: /home/runa/tor/website/about/en/volunteers.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page about/overview>"
 "\">About &raquo; </a> <a href=\"<page about/volunteers>\">Volunteers</a>"
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/transifex/website/about/en/volunteers.wml:13
+#: /home/runa/tor/website/about/en/volunteers.wml:13
 msgid "Volunteers"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/volunteers.wml:15
+#: /home/runa/tor/website/about/en/volunteers.wml:15
 msgid "Anonym"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/volunteers.wml:15
+#: /home/runa/tor/website/about/en/volunteers.wml:15
 msgid "Maintainer of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/volunteers.wml:16
+#: /home/runa/tor/website/about/en/volunteers.wml:16
 msgid "Kevin Bankston"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/volunteers.wml:16
+#: /home/runa/tor/website/about/en/volunteers.wml:16
 msgid ""
 "EFF lawyer who helped write the <a href=\"<page eff/tor-legal-faq>\">Tor "
 "Legal FAQ</a> and tirelessly answers the phone when somebody in the world "
@@ -52,138 +52,148 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/volunteers.wml:20
+#: /home/runa/tor/website/about/en/volunteers.wml:20
 msgid "Marco Bonetti"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/volunteers.wml:20
+#: /home/runa/tor/website/about/en/volunteers.wml:20
 msgid "Focusing on MobileTor for the iPhone."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/volunteers.wml:21
+#: /home/runa/tor/website/about/en/volunteers.wml:21
 msgid "Kasimir Gabert"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/volunteers.wml:21
+#: /home/runa/tor/website/about/en/volunteers.wml:21
 msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\";>TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/volunteers.wml:23
+#: /home/runa/tor/website/about/en/volunteers.wml:23
 msgid "Andreas Jonsson"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/volunteers.wml:23
+#: /home/runa/tor/website/about/en/volunteers.wml:23
 msgid "Works on OS X Tor Browser Bundle sandbox technology."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/volunteers.wml:24
+#: /home/runa/tor/website/about/en/volunteers.wml:25
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/volunteers.wml:24
+#: /home/runa/tor/website/about/en/volunteers.wml:25
 msgid ""
 "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
 "and Privoxy still work well together."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/volunteers.wml:26
+#: /home/runa/tor/website/about/en/volunteers.wml:27
 msgid "Bruce Leidl"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/volunteers.wml:26
+#: /home/runa/tor/website/about/en/volunteers.wml:27
 msgid "Working on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/volunteers.wml:27
+#: /home/runa/tor/website/about/en/volunteers.wml:28
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/volunteers.wml:27
+#: /home/runa/tor/website/about/en/volunteers.wml:28
 msgid ""
 "A lawyer with the CCC in Germany. Coordinates the German Tor community with "
 "respect to legal questions and concerns."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/volunteers.wml:30
+#: /home/runa/tor/website/about/en/volunteers.wml:31
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/volunteers.wml:30
+#: /home/runa/tor/website/about/en/volunteers.wml:31
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/volunteers.wml:32
+#: /home/runa/tor/website/about/en/volunteers.wml:33
 msgid "Linus Nordberg"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/volunteers.wml:32
+#: /home/runa/tor/website/about/en/volunteers.wml:33
 msgid ""
 "Enjoys measuring the Tor network and helps with outreach in the Nordic "
 "countries."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/volunteers.wml:34
+#: /home/runa/tor/website/about/en/volunteers.wml:35
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/volunteers.wml:34
+#: /home/runa/tor/website/about/en/volunteers.wml:35
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/volunteers.wml:36
+#: /home/runa/tor/website/about/en/volunteers.wml:37
 msgid "Martin Peck"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/volunteers.wml:36
+#: /home/runa/tor/website/about/en/volunteers.wml:37
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/volunteers.wml:38
+#: /home/runa/tor/website/about/en/volunteers.wml:39
+msgid "Robert Ransom"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/volunteers.wml:39
+msgid "Bug catcher and immensely helpful on irc and the email lists"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/volunteers.wml:41
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/volunteers.wml:39
+#: /home/runa/tor/website/about/en/volunteers.wml:42
 msgid ""
 "The most dedicated bug reporter we've ever heard from. He must read Tor "
 "source code every day over breakfast."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/volunteers.wml:41
+#: /home/runa/tor/website/about/en/volunteers.wml:44
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/volunteers.wml:41
+#: /home/runa/tor/website/about/en/volunteers.wml:44
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a href="
 "\"<wiki>TransparentProxy\">transparent proxy</a>. Also maintains the <a href="
@@ -191,24 +201,34 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/volunteers.wml:46
+#: /home/runa/tor/website/about/en/volunteers.wml:49
+msgid "TomÃs Touceda"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/volunteers.wml:49
+msgid "Fantastic developer involved with the Vidalia project"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/volunteers.wml:51
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/volunteers.wml:46
+#: /home/runa/tor/website/about/en/volunteers.wml:51
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/volunteers.wml:49
+#: /home/runa/tor/website/about/en/volunteers.wml:54
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/about/en/volunteers.wml:49
+#: /home/runa/tor/website/about/en/volunteers.wml:54
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?";
 "p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/";
@@ -217,7 +237,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/about/en/volunteers.wml:54
+#: /home/runa/tor/website/about/en/volunteers.wml:59
 msgid ""
 "All our relay operators, people who write <a href=\"http://freehaven.net/";
 "anonbib/\">research papers</a> about Tor, people who teach others about Tor, "

Modified: translation/trunk/projects/website/po/templates/about/4-optional.gsoc.pot
===================================================================
--- translation/trunk/projects/website/po/templates/about/4-optional.gsoc.pot	2011-02-12 12:18:18 UTC (rev 24216)
+++ translation/trunk/projects/website/po/templates/about/4-optional.gsoc.pot	2011-02-12 12:21:10 UTC (rev 24217)
@@ -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-02-12 12:19+0000\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,47 +17,46 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/about/en/gsoc.wml:8
+#: /home/runa/tor/website/about/en/gsoc.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page about/gsoc>"
-"\">Google Summer of Code 2010</a>"
+"\">Google Summer of Code</a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/about/en/gsoc.wml:12
-msgid "Tor: Google Summer of Code 2010"
+#: /home/runa/tor/website/about/en/gsoc.wml:12
+msgid "Tor: Google Summer of Code 2011"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/about/en/gsoc.wml:13
+#: /home/runa/tor/website/about/en/gsoc.wml:13
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/about/en/gsoc.wml:16
+#: /home/runa/tor/website/about/en/gsoc.wml:16
 msgid ""
-"In the last three years, The Tor Project in collaboration with <a href="
+"In the last four years, The Tor Project in collaboration with <a href="
 "\"https://www.eff.org/\";>The Electronic Frontier Foundation</a> successfully "
 "took part in <a href=\"http://code.google.com/soc/2007/eff/about.html";
 "\">Google Summer of Code 2007</a>, <a href=\"http://code.google.com/soc/2008/";
-"eff/about.html\">2008</a>, and <a href=\"http://socghop.appspot.com/gsoc/org/";
-"home/google/gsoc2009/eff\">2009</a>.  In total we had 17 students as full-"
-"time developers for the summers of 2007 to 2009. Now we've been accepted to "
-"<a href=\"https://socghop.appspot.com/gsoc/org/show/google/gsoc2010/tor";
-"\">Google Summer of Code 2010</a>!"
+"eff/about.html\">2008</a>, <a href=\"http://socghop.appspot.com/gsoc/org/";
+"home/google/gsoc2009/eff\">2009</a>, and <a href=\"<blog>/tor-google-summer-"
+"code-2010\">2010</a>.  In total we had 21 students as full-time developers "
+"for the summers of 2007 to 2010. Now we are applying to <a href=\"https://";
+"socghop.appspot.com/gsoc/program/home/google/gsoc2011\">Google Summer of "
+"Code 2011</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/about/en/gsoc.wml:29
+#: /home/runa/tor/website/about/en/gsoc.wml:31
 msgid ""
-"The <a href=\"http://socghop.appspot.com/document/show/gsoc_program/google/";
-"gsoc2010/timeline\">deadline</a> for your <a href=\"http://socghop.appspot.";
-"com/document/show/gsoc_program/google/gsoc2010/faqs#student_apply"
-"\">application</a> is <b>April 9, 2010</b> at 19:00 UTC."
+"The <a href=\"https://socghop.appspot.com/document/show/gsoc_program/google/";
+"gsoc2011/timeline\">timeline</a> for GSoC 2011 is available."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/about/en/gsoc.wml:37
+#: /home/runa/tor/website/about/en/gsoc.wml:37
 msgid ""
 "You must be self-motivated and able to work independently. We have a "
 "thriving community of interested developers on the IRC channel and mailing "
@@ -67,33 +66,33 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/about/en/gsoc.wml:46
+#: /home/runa/tor/website/about/en/gsoc.wml:46
 msgid "Working on Tor is rewarding because:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/about/en/gsoc.wml:50
+#: /home/runa/tor/website/about/en/gsoc.wml:50
 msgid ""
 "You can work your own hours in your own locations. As long as you get the "
 "job done, we don't care about the process."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/about/en/gsoc.wml:52
+#: /home/runa/tor/website/about/en/gsoc.wml:52
 msgid ""
 "We only write free (open source) software. The tools you make won't be "
 "locked down or rot on a shelf."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/about/en/gsoc.wml:54
+#: /home/runa/tor/website/about/en/gsoc.wml:54
 msgid ""
 "You will work with a world-class team of anonymity experts and developers on "
 "what is already the largest and most active strong anonymity network ever."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/about/en/gsoc.wml:57
+#: /home/runa/tor/website/about/en/gsoc.wml:57
 msgid ""
 "The work you do could contribute to academic publications &mdash; Tor "
 "development raises many open questions and interesting problems in the field "
@@ -101,17 +100,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/about/en/gsoc.wml:63
+#: /home/runa/tor/website/about/en/gsoc.wml:63
 msgid "<a id=\"GettingInvolved\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/about/en/gsoc.wml:64
+#: /home/runa/tor/website/about/en/gsoc.wml:64
 msgid "<a class=\"anchor\" href=\"#GettingInvolved\">How To Get Involved</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/about/en/gsoc.wml:67
+#: /home/runa/tor/website/about/en/gsoc.wml:67
 msgid ""
 "The best way to get involved is to come listen on IRC (both \"#tor\" and "
 "\"#tor-dev\"), read our docs and other webpages, try out the various tools "
@@ -121,7 +120,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/about/en/gsoc.wml:75
+#: /home/runa/tor/website/about/en/gsoc.wml:75
 msgid ""
 "In addition to getting some more development work done on Tor and related "
 "applications, Google and Tor are most interested in getting students "
@@ -134,7 +133,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/about/en/gsoc.wml:86
+#: /home/runa/tor/website/about/en/gsoc.wml:86
 msgid ""
 "When it comes time for us to choose projects, our impression of how well "
 "you'll fit into our community &mdash; and how good you are at taking the "
@@ -143,25 +142,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/about/en/gsoc.wml:92
+#: /home/runa/tor/website/about/en/gsoc.wml:92
 msgid "<a id=\"Ideas\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/about/en/gsoc.wml:93
+#: /home/runa/tor/website/about/en/gsoc.wml:93
 msgid "<a class=\"anchor\" href=\"#Ideas\">Ideas List</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/about/en/gsoc.wml:96
+#: /home/runa/tor/website/about/en/gsoc.wml:96
 msgid ""
-"This year, we have two ideas lists: one for projects to <a href=\"<page "
-"getinvolved/volunteer>#Projects\">help develop Tor</a>, and one for <a href="
-"\"https://www.eff.org/gsoc2010\";>EFF's projects</a>."
+"This year, we started an ideas list about projects to <a href=\"<page "
+"getinvolved/volunteer>#Projects\">help develop Tor</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/about/en/gsoc.wml:102
+#: /home/runa/tor/website/about/en/gsoc.wml:101
 msgid ""
 "The best kind of ideas are A) ones that we know we need done real soon now "
 "(you can get a sense of urgency from the priority on the wishlist, and from "
@@ -178,24 +176,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/about/en/gsoc.wml:117
+#: /home/runa/tor/website/about/en/gsoc.wml:116
 msgid "<a id=\"Template\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/about/en/gsoc.wml:118
+#: /home/runa/tor/website/about/en/gsoc.wml:117
 msgid "<a class=\"anchor\" href=\"#Template\">Application Template</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/about/en/gsoc.wml:121
+#: /home/runa/tor/website/about/en/gsoc.wml:120
 msgid ""
 "Please use the following template for your application, to make sure you "
 "provide enough information for us to evaluate you and your proposal."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/about/en/gsoc.wml:127
+#: /home/runa/tor/website/about/en/gsoc.wml:126
 msgid ""
 "What project would you like to work on? Use our ideas lists as a starting "
 "point or make up your own idea. Your proposal should include high-level "
@@ -206,19 +204,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/about/en/gsoc.wml:134
+#: /home/runa/tor/website/about/en/gsoc.wml:133
 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/transifex/website/about/en/gsoc.wml:137
+#: /home/runa/tor/website/about/en/gsoc.wml:136
 msgid "Why do you want to work with The Tor Project / EFF in particular?"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/about/en/gsoc.wml:140
+#: /home/runa/tor/website/about/en/gsoc.wml:139
 msgid ""
 "Tell us about your experiences in free software development environments. We "
 "especially want to hear examples of how you have collaborated with others "
@@ -226,7 +224,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/about/en/gsoc.wml:145
+#: /home/runa/tor/website/about/en/gsoc.wml:144
 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 "
@@ -236,7 +234,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/about/en/gsoc.wml:151
+#: /home/runa/tor/website/about/en/gsoc.wml:150
 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 "
@@ -244,7 +242,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/about/en/gsoc.wml:155
+#: /home/runa/tor/website/about/en/gsoc.wml:154
 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, "
@@ -252,14 +250,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/about/en/gsoc.wml:159
+#: /home/runa/tor/website/about/en/gsoc.wml:158
 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/transifex/website/about/en/gsoc.wml:162
+#: /home/runa/tor/website/about/en/gsoc.wml:161
 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 "
@@ -268,18 +266,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/about/en/gsoc.wml:168
+#: /home/runa/tor/website/about/en/gsoc.wml:167
 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/transifex/website/about/en/gsoc.wml:174
+#: /home/runa/tor/website/about/en/gsoc.wml:173
 msgid ""
-"We have picked out 10+ mentors for this year &mdash; most of the people on "
-"the <a href=\"<page about/corepeople>\">core Tor development team</a> plus a "
-"few people from <a href=\"http://www.eff.org/about/staff\";>EFF's staff</a> "
+"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 "
+"people from <a href=\"http://www.eff.org/about/staff\";>EFF's staff</a> "
 "&mdash; so we should be able to accommodate a wide variety of projects, "
 "ranging from work on Tor itself to work on supporting or peripheral "
 "projects. We can figure out which mentor is appropriate while we're "
@@ -289,7 +287,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/about/en/gsoc.wml:186
+#: /home/runa/tor/website/about/en/gsoc.wml:185
 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 "
@@ -301,7 +299,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/about/en/gsoc.wml:196
+#: /home/runa/tor/website/about/en/gsoc.wml:195
 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 "

Modified: translation/trunk/projects/website/po/templates/docs/1-high.bridges.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/1-high.bridges.pot	2011-02-12 12:18:18 UTC (rev 24216)
+++ translation/trunk/projects/website/po/templates/docs/1-high.bridges.pot	2011-02-12 12:21:10 UTC (rev 24217)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-12-05 19:13+0000\n"
+"POT-Creation-Date: 2011-02-12 12:20+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -35,8 +35,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/bridges.wml:15 /tmp/sMu5P9ecyI.xml:79
-#: /tmp/sMu5P9ecyI.xml:102 /tmp/sMu5P9ecyI.xml:125 /tmp/sMu5P9ecyI.xml:149
+#: /home/runa/tor/website/docs/en/bridges.wml:15 /tmp/D41bBAMkKK.xml:79
+#: /tmp/D41bBAMkKK.xml:102 /tmp/D41bBAMkKK.xml:125 /tmp/D41bBAMkKK.xml:149
 msgid "<hr>"
 msgstr ""
 
@@ -245,12 +245,12 @@
 #. type: Content of: <div><div><p><ul><li>
 #: /home/runa/tor/website/docs/en/bridges.wml:156
 msgid ""
-"manually <a href=\"<wikifaq>#Imsupposedtoeditmytorrc.Whatdoesthatmean\">edit "
-"your torrc file</a> to be just these four lines:<br>"
+"manually <a href=\"<page docs/faq>#torrc\">edit your torrc file</a> to be "
+"just these four lines:<br>"
 msgstr ""
 
 #. type: Content of: <div><div><p><ul><li><pre>
-#: /home/runa/tor/website/docs/en/bridges.wml:159
+#: /home/runa/tor/website/docs/en/bridges.wml:158
 #, no-wrap
 msgid ""
 "<code>\n"
@@ -262,7 +262,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p><ul><li>
-#: /home/runa/tor/website/docs/en/bridges.wml:165
+#: /home/runa/tor/website/docs/en/bridges.wml:164
 msgid ""
 "<a href=\"<page docs/tor-doc-relay>\">or using Vidalia</a>:<br> <img src="
 "\"$(IMGROOT)/vidalia-bridges-setup.png\" alt=\"Vidalia's Sharing settings "
@@ -270,23 +270,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/bridges.wml:171
+#: /home/runa/tor/website/docs/en/bridges.wml:170
 msgid ""
 "If you get \"Could not bind to 0.0.0.0:443: Permission denied\" errors on "
 "startup, you'll need to pick a higher ORPort (e.g. 8080) or do <a href="
-"\"<wikifaq>#Myfirewallonlyallowsafewoutgoingports.\">some complex port "
-"forwarding</a>."
+"\"<page docs/"
+"faq>#HowcanImakemyrelayaccessibletopeoplestuckbehindrestrictivefirewalls"
+"\">some complex port forwarding</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/bridges.wml:178
+#: /home/runa/tor/website/docs/en/bridges.wml:177
 msgid ""
 "When configured as a bridge, your server will <b>not</b> appear in the "
 "public Tor network."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/bridges.wml:183
+#: /home/runa/tor/website/docs/en/bridges.wml:182
 msgid ""
 "Your bridge relay will automatically publish its address to the bridge "
 "authority, which will give it out via https or email as above. You can also "
@@ -299,7 +300,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/bridges.wml:194
+#: /home/runa/tor/website/docs/en/bridges.wml:193
 msgid ""
 "If you would like to learn more about our bridge design from a technical "
 "standpoint, please read the <a href=\"<gitblob>doc/spec/bridges-spec.txt"

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-02-12 12:18:18 UTC (rev 24216)
+++ translation/trunk/projects/website/po/templates/docs/1-high.tor-doc-windows.pot	2011-02-12 12:21:10 UTC (rev 24217)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-12-05 19:13+0000\n"
+"POT-Creation-Date: 2011-02-12 12:20+0000\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/fdqY5WWwpk.xml:36 /tmp/fdqY5WWwpk.xml:72 /tmp/fdqY5WWwpk.xml:111
-#: /tmp/fdqY5WWwpk.xml:154
+#: /tmp/aFRjTXc1En.xml:36 /tmp/aFRjTXc1En.xml:72 /tmp/aFRjTXc1En.xml:111
+#: /tmp/aFRjTXc1En.xml:154
 msgid "<br>"
 msgstr ""
 
@@ -41,10 +41,9 @@
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:17
 msgid ""
 "<b>Note that these are the installation instructions for running a Tor "
-"client on Microsoft Windows (2000, XP, Vista, 7, and Server Editions).  If "
-"you want to relay traffic for others to help the network grow (please do), "
-"read the <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</a> guide."
-"</b>"
+"client on Microsoft Windows (XP, Vista, 7, and Server Editions).  If you "
+"want to relay traffic for others to help the network grow (please do), read "
+"the <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</a> guide.</b>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -71,16 +70,15 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:39
 msgid ""
-"Microsoft Windows bundles contain <a href=\"<page index>\">Tor</a>, <a href="
-"\"<page projects/vidalia>\">Vidalia</a> (a GUI for Tor), <a href=\"https://";
-"addons.mozilla.org/firefox/2275/\">Torbutton</a> (a plugin for Mozilla "
-"Firefox), and <a href=\"http://www.pps.jussieu.fr/~jch/software/polipo/";
-"\">Polipo</a> (a web proxy) packaged into one bundle, with the four "
-"applications pre-configured to work together.  Download either the <a href="
-"\"../<package-win32-bundle-stable>\">stable</a> or the <a href=\"../<package-"
-"win32-bundle-alpha>\">experimental</a> version of the Windows bundle, or "
-"look for more options on the <a href=\"<page download/download>\">download "
-"page</a>."
+"The Vidalia Bundle for Windows contains <a href=\"<page index>\">Tor</a>, <a "
+"href=\"<page projects/vidalia>\">Vidalia</a> (a GUI for Tor), <a href="
+"\"<page torbutton/index>\">Torbutton</a> (a plugin for Mozilla Firefox), and "
+"<a href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\";>Polipo</a> (a "
+"web proxy) packaged into one bundle, with the four applications pre-"
+"configured to work together.  Download either the <a href=\"../<package-"
+"win32-bundle-stable>\">stable</a> or the <a href=\"../<package-win32-bundle-"
+"alpha>\">experimental</a> version of the Vidalia Bundle, or look for more "
+"options on the <a href=\"<page download/download>\">download page</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
@@ -142,8 +140,8 @@
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:77
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety. The bundle "
-"installs the <a href=\"https://addons.mozilla.org/firefox/2275/\";>Torbutton "
-"plugin</a> for you. Restart your Firefox, and you're all set:"
+"installs the <a href=\"<page torbutton/index>\">Torbutton plugin</a> for "
+"you. Restart your Firefox, and you're all set:"
 msgstr ""
 
 #. type: Content of: <div><div>
@@ -232,8 +230,8 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:141
 msgid ""
-"If it's still not working, look at <a href=\"<wikifaq>#ItDoesntWork\">this "
-"FAQ entry</a> for hints."
+"If it's still not working, look at <a href=\"<page docs/faq>#DoesntWork"
+"\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/po/templates/docs/2-medium.documentation.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/2-medium.documentation.pot	2011-02-12 12:18:18 UTC (rev 24216)
+++ translation/trunk/projects/website/po/templates/docs/2-medium.documentation.pot	2011-02-12 12:21:10 UTC (rev 24217)
@@ -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-02-12 12:20+0000\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,76 +17,76 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/documentation.wml:8
+#: /home/runa/tor/website/docs/en/documentation.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page docs/"
 "documentation>\">Documentation</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/documentation.wml:12
+#: /home/runa/tor/website/docs/en/documentation.wml:12
 msgid "<a id=\"RunningTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/transifex/website/docs/en/documentation.wml:13
+#: /home/runa/tor/website/docs/en/documentation.wml:13
 msgid "<a class=\"anchor\" href=\"#RunningTor\">Running Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:15
+#: /home/runa/tor/website/docs/en/documentation.wml:15
 msgid "<a href=\"<page docs/tor-doc-windows>\">Installing Tor on Win32</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:17
+#: /home/runa/tor/website/docs/en/documentation.wml:17
 msgid "<a href=\"<page docs/tor-doc-osx>\">Installing Tor on Mac OS X</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:19
+#: /home/runa/tor/website/docs/en/documentation.wml:19
 msgid ""
 "<a href=\"<page docs/tor-doc-unix>\">Installing Tor on Linux/BSD/Unix</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:21
+#: /home/runa/tor/website/docs/en/documentation.wml:21
 msgid "<a href=\"<page torbutton/index>\">Installing Torbutton for Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:23
+#: /home/runa/tor/website/docs/en/documentation.wml:23
 msgid "<a href=\"<page docs/tor-doc-relay>\">Configuring a Tor relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:25
+#: /home/runa/tor/website/docs/en/documentation.wml:25
 msgid ""
 "<a href=\"<page docs/tor-hidden-service>\">Configuring a Tor hidden service</"
 "a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/documentation.wml:29
+#: /home/runa/tor/website/docs/en/documentation.wml:29
 msgid "<a id=\"Support\"></a> <a id=\"UpToSpeed\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/transifex/website/docs/en/documentation.wml:31
+#: /home/runa/tor/website/docs/en/documentation.wml:31
 msgid ""
 "<a class=\"anchor\" href=\"#UpToSpeed\">Getting up to speed on Tor's past, "
 "present, and future</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:36
+#: /home/runa/tor/website/docs/en/documentation.wml:36
 msgid ""
 "First, read the <a href=\"<page about/overview>\">overview page</a> to get a "
 "basic idea of how Tor works, what it's for, and who uses it."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:41
+#: /home/runa/tor/website/docs/en/documentation.wml:41
 msgid ""
 "<a href=\"<page download/download>\">Install the Tor bundle</a> and try it "
 "out.  Make sure you've got Firefox installed first, and be sure to read the "
@@ -95,7 +95,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:48
+#: /home/runa/tor/website/docs/en/documentation.wml:48
 msgid ""
 "Our <a href=\"<wikifaq>\">FAQ</a> covers all sorts of topics, including "
 "questions about setting up a client or relay, concerns about anonymity "
@@ -107,16 +107,16 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:60
+#: /home/runa/tor/website/docs/en/documentation.wml:60
 msgid ""
 "The <a href=\"<page docs/tor-manual-dev>\">manual</a> lists all the possible "
-"entries you can put in your <a href=\"<wikifaq>#Imsupposedtoeditmytorrc."
-"Whatdoesthatmean\">torrc file</a>. We also provide a <a href=\"<page docs/"
-"tor-manual-dev>\">manual for the development version of Tor</a>."
+"entries you can put in your <a href=\"<page docs/faq>#torrc\">torrc file</"
+"a>. We also provide a <a href=\"<page docs/tor-manual-dev>\">manual for the "
+"development version of Tor</a>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:66
+#: /home/runa/tor/website/docs/en/documentation.wml:66
 msgid ""
 "If you have questions, we have an IRC channel (for users, relay operators, "
 "and developers)  at <a href=\"irc://irc.oftc.net/tor\">#tor on irc.oftc.net</"
@@ -129,14 +129,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:81
+#: /home/runa/tor/website/docs/en/documentation.wml:81
 msgid ""
 "<a href=\"<blog>\">Tor has a blog now</a>.  We try to keep it updated every "
 "week or two with the latest news."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:86
+#: /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>, "
@@ -149,14 +149,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:96
+#: /home/runa/tor/website/docs/en/documentation.wml:96
 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/transifex/website/docs/en/documentation.wml:102
+#: /home/runa/tor/website/docs/en/documentation.wml:102
 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 "
@@ -166,7 +166,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:111
+#: /home/runa/tor/website/docs/en/documentation.wml:111
 msgid ""
 "Download and watch Nick's \"Technical changes since 2004\" talk from Defcon "
 "in July 2007 (<a href=\"http://freehaven.net/~arma/Defcon15-Mathewson-";
@@ -186,7 +186,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:129
+#: /home/runa/tor/website/docs/en/documentation.wml:129
 msgid ""
 "See Mike's \"Securing the Tor network\" talk from Defcon in July 2007 (<a "
 "href=\"http://freehaven.net/~arma/Defcon15-Mike_Perry-";
@@ -198,7 +198,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:139
+#: /home/runa/tor/website/docs/en/documentation.wml:139
 msgid ""
 "Learn about the <a href=\"<gitblob>doc/spec/proposals/001-process.txt\">Tor "
 "proposal process for changing our design</a>, and look over the <a href="
@@ -206,7 +206,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:146
+#: /home/runa/tor/website/docs/en/documentation.wml:146
 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>"
@@ -215,7 +215,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:153
+#: /home/runa/tor/website/docs/en/documentation.wml:153
 msgid ""
 "Once you're up to speed, things will continue to change surprisingly fast.  "
 "The <a href=\"#MailingLists\">or-dev mailing list</a> is where the complex "
@@ -224,17 +224,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/documentation.wml:161
+#: /home/runa/tor/website/docs/en/documentation.wml:161
 msgid "<a id=\"MailingLists\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/transifex/website/docs/en/documentation.wml:162
+#: /home/runa/tor/website/docs/en/documentation.wml:162
 msgid "<a class=\"anchor\" href=\"#MailingLists\">Mailing List Information</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:164
+#: /home/runa/tor/website/docs/en/documentation.wml:164
 msgid ""
 "The <a href=\"http://archives.seul.org/or/announce/\";>or-announce mailing "
 "list</a> is a low volume list for announcements of new releases and critical "
@@ -244,7 +244,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:170
+#: /home/runa/tor/website/docs/en/documentation.wml:170
 msgid ""
 "The <a href=\"http://archives.seul.org/or/talk/\";>or-talk list</a> is where "
 "a lot of discussion happens, and is where we send notifications of "
@@ -252,7 +252,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:173
+#: /home/runa/tor/website/docs/en/documentation.wml:173
 msgid ""
 "The <a href=\"http://archives.seul.org/tor/relays/\";>tor-relays list</a> is "
 "where discussions about running, configuring, and handling your tor relay "
@@ -261,14 +261,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:177
+#: /home/runa/tor/website/docs/en/documentation.wml:177
 msgid ""
 "The <a href=\"http://archives.seul.org/or/dev/\";>or-dev list</a> is for "
 "posting by developers only, and is very low traffic."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:179
+#: /home/runa/tor/website/docs/en/documentation.wml:179
 msgid ""
 "A list for <a href=\"http://archives.seul.org/tor/mirrors/\";>mirror "
 "operators</a> for new website mirrors, and supporting <a href=\"<page "
@@ -276,31 +276,31 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:182
+#: /home/runa/tor/website/docs/en/documentation.wml:182
 msgid ""
 "A list for <a href=\"http://archives.seul.org/or/cvs/\";>svn and git commits</"
 "a> may be interesting for developers."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:184
+#: /home/runa/tor/website/docs/en/documentation.wml:184
 msgid ""
 "An automated list for <a href=\"http://archives.seul.org/tor/bugs/\";>bug "
 "reports from trac</a> may be interesting for users and developers."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/documentation.wml:188
+#: /home/runa/tor/website/docs/en/documentation.wml:188
 msgid "<a id=\"DesignDoc\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/transifex/website/docs/en/documentation.wml:189
+#: /home/runa/tor/website/docs/en/documentation.wml:189
 msgid "<a class=\"anchor\" href=\"#DesignDoc\">Design Documents</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:191
+#: /home/runa/tor/website/docs/en/documentation.wml:191
 msgid ""
 "The <b>design document</b> (published at Usenix Security 2004)  gives our "
 "justifications and security analysis for the Tor design: <a href=\"https://";
@@ -310,7 +310,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:196
+#: /home/runa/tor/website/docs/en/documentation.wml:196
 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="
@@ -319,7 +319,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:200
+#: /home/runa/tor/website/docs/en/documentation.wml:200
 msgid ""
 "Our paper at WEIS 2006 &mdash; <b>Anonymity Loves Company: Usability and the "
 "Network Effect</b> &mdash; explains why usability in anonymity systems "
@@ -328,7 +328,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:204
+#: /home/runa/tor/website/docs/en/documentation.wml:204
 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 "
@@ -339,19 +339,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:210
+#: /home/runa/tor/website/docs/en/documentation.wml:210
 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/transifex/website/docs/en/documentation.wml:213
+#: /home/runa/tor/website/docs/en/documentation.wml:213
 msgid "<a href=\"<gitblob>doc/spec/tor-spec.txt\">Main Tor specification</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:214
+#: /home/runa/tor/website/docs/en/documentation.wml:214
 msgid ""
 "<a href=\"<gitblob>doc/spec/dir-spec.txt\">Tor version 3 directory server "
 "specification</a> (and older <a href=\"<gitblob>doc/spec/dir-spec-v1.txt"
@@ -360,78 +360,78 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:219
+#: /home/runa/tor/website/docs/en/documentation.wml:219
 msgid ""
 "<a href=\"<gitblob>doc/spec/control-spec.txt\">Tor control protocol "
 "specification</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:221
+#: /home/runa/tor/website/docs/en/documentation.wml:221
 msgid ""
 "<a href=\"<gitblob>doc/spec/rend-spec.txt\">Tor rendezvous specification</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:223
+#: /home/runa/tor/website/docs/en/documentation.wml:223
 msgid ""
 "<a href=\"<gitblob>doc/spec/path-spec.txt\">Tor path selection "
 "specification</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:225
+#: /home/runa/tor/website/docs/en/documentation.wml:225
 msgid ""
 "<a href=\"<gitblob>doc/spec/address-spec.txt\">Special hostnames in Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:227
+#: /home/runa/tor/website/docs/en/documentation.wml:227
 msgid ""
 "<a href=\"<gitblob>doc/spec/socks-extensions.txt\">Tor's SOCKS support and "
 "extensions</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:229
+#: /home/runa/tor/website/docs/en/documentation.wml:229
 msgid ""
 "<a href=\"<gitblob>doc/spec/version-spec.txt\">How Tor version numbers work</"
 "a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:231
+#: /home/runa/tor/website/docs/en/documentation.wml:231
 msgid ""
-"<a href=\"<gitblob>doc/spec/proposals\">In-progress drafts of new "
+"<a href=\"<gittree>doc/spec/proposals\">In-progress drafts of new "
 "specifications and proposed changes</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/documentation.wml:237
+#: /home/runa/tor/website/docs/en/documentation.wml:237
 msgid "<a id=\"NeatLinks\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/transifex/website/docs/en/documentation.wml:238
+#: /home/runa/tor/website/docs/en/documentation.wml:238
 msgid "<a class=\"anchor\" href=\"#NeatLinks\">Neat Links</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:240
+#: /home/runa/tor/website/docs/en/documentation.wml:240
 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/transifex/website/docs/en/documentation.wml:243
+#: /home/runa/tor/website/docs/en/documentation.wml:243
 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/transifex/website/docs/en/documentation.wml:247
+#: /home/runa/tor/website/docs/en/documentation.wml:247
 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 "
@@ -439,7 +439,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:250
+#: /home/runa/tor/website/docs/en/documentation.wml:250
 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.";
@@ -450,7 +450,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:257
+#: /home/runa/tor/website/docs/en/documentation.wml:257
 msgid ""
 "Read <a href=\"http://freehaven.net/anonbib/topic.";
 "html#Anonymous_20communication\">these papers</a> (especially the ones in "
@@ -458,50 +458,50 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/documentation.wml:263
+#: /home/runa/tor/website/docs/en/documentation.wml:263
 msgid "<a id=\"Developers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/transifex/website/docs/en/documentation.wml:264
+#: /home/runa/tor/website/docs/en/documentation.wml:264
 msgid "<a class=\"anchor\" href=\"#Developers\">For Developers</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/documentation.wml:265
+#: /home/runa/tor/website/docs/en/documentation.wml:265
 msgid "Browse the Tor <b>source repository</b>:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:267
+#: /home/runa/tor/website/docs/en/documentation.wml:267
 msgid "<a href=\"<gitrepo>\">Browse the repository's source tree directly</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:268
+#: /home/runa/tor/website/docs/en/documentation.wml:268
 msgid "Git and SVN access:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:270
+#: /home/runa/tor/website/docs/en/documentation.wml:270
 msgid "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:271
+#: /home/runa/tor/website/docs/en/documentation.wml:271
 msgid ""
 "The development branch is <kbd>master</kbd>.  The active maintenance "
 "branches are <kbd>maint-0.2.0</kbd> and <kbd>maint-0.2.1</kbd>."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:272
+#: /home/runa/tor/website/docs/en/documentation.wml:272
 msgid ""
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/documentation.wml:275
+#: /home/runa/tor/website/docs/en/documentation.wml:275
 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.tor-doc-osx.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/2-medium.tor-doc-osx.pot	2011-02-12 12:18:18 UTC (rev 24216)
+++ translation/trunk/projects/website/po/templates/docs/2-medium.tor-doc-osx.pot	2011-02-12 12:21:10 UTC (rev 24217)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-12-05 19:13+0000\n"
+"POT-Creation-Date: 2011-02-12 12:20+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -30,9 +30,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:14 /tmp/Ea2JWuxtxy.xml:26
-#: /tmp/Ea2JWuxtxy.xml:71 /tmp/Ea2JWuxtxy.xml:104 /tmp/Ea2JWuxtxy.xml:136
-#: /tmp/Ea2JWuxtxy.xml:158
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:14 /tmp/N9PceEMclo.xml:26
+#: /tmp/N9PceEMclo.xml:71 /tmp/N9PceEMclo.xml:104 /tmp/N9PceEMclo.xml:136
+#: /tmp/N9PceEMclo.xml:158
 msgid "<br>"
 msgstr ""
 
@@ -208,8 +208,8 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-osx.wml:124
 msgid ""
-"If it's still not working, look at <a href=\"<wikifaq>#ItDoesntWork\">this "
-"FAQ entry</a> for hints."
+"If it's still not working, look at <a href=\"<page docs/faq>#DoesntWork"
+"\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div><p>

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-02-12 12:18:18 UTC (rev 24216)
+++ translation/trunk/projects/website/po/templates/docs/2-medium.tor-doc-relay.pot	2011-02-12 12:21:10 UTC (rev 24217)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-12-26 17:28+0000\n"
+"POT-Creation-Date: 2011-02-12 12:20+0000\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/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,30 +25,29 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/transifex/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/transifex/website/docs/en/tor-doc-relay.wml:16
-#: /tmp/YlgEJzuxx4.xml:272
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:16 /tmp/eKLg46HT7B.xml:275
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/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 "
 "kilobytes/s each way, please help out Tor by configuring your Tor to be a "
 "relay too. We have many features that make Tor relays easy and convenient, "
-"including <a href=\"<wikifaq>#RelayFlexible\">rate limiting for bandwidth, "
-"exit policies so you can limit your exposure to abuse complaints, and "
-"support for dynamic IP addresses</a>."
+"including <a href=\"<page docs/faq>#ExitPolicies\">rate limiting for "
+"bandwidth, exit policies so you can limit your exposure to abuse complaints, "
+"and support for dynamic IP addresses</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/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 <a href=\"<wikifaq>#RelayOS\">pretty much any</a> "
 "operating system. Tor relays work best on Linux, OS X Tiger or later, "
@@ -56,53 +55,53 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/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/transifex/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/transifex/website/docs/en/tor-doc-relay.wml:37
-#: /tmp/YlgEJzuxx4.xml:52 /tmp/YlgEJzuxx4.xml:136 /tmp/YlgEJzuxx4.xml:162
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37 /tmp/eKLg46HT7B.xml:52
+#: /tmp/eKLg46HT7B.xml:141 /tmp/eKLg46HT7B.xml:165
 msgid "<br>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/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/transifex/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/transifex/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/transifex/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/transifex/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/transifex/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/";
@@ -110,70 +109,70 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/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/transifex/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=\"<wikifaq>#torrc\">your torrc file</a>. If "
-"you want to be a public relay (recommended), make sure to define ORPort and "
-"<a href=\"<wikifaq>#ExitPolicies\">look at ExitPolicy</a>; otherwise if you "
-"want to be a <a href=\"<wikifaq>#RelayOrBridge\">bridge</a> for users in "
-"countries that censor their Internet, just use <a href=\"<page docs/"
-"bridges>#RunningABridge\">these lines</a>."
+"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 "
+"ORPort and <a href=\"<page docs/faq>#ExitPolicies\">look at ExitPolicy</a>; "
+"otherwise if you want to be a <a href=\"<page docs/faq>#RelayOrBridge"
+"\">bridge</a> for users in countries that censor their Internet, just use <a "
+"href=\"<page docs/bridges>#RunningABridge\">these lines</a>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/docs/en/tor-doc-relay.wml:70
+#: /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/transifex/website/docs/en/tor-doc-relay.wml:74
+#: /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/transifex/website/docs/en/tor-doc-relay.wml:75
+#: /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/transifex/website/docs/en/tor-doc-relay.wml:78
+#: /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/transifex/website/docs/en/tor-doc-relay.wml:81
+#: /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 "
-"network</tt> if you want to be a <a href=\"<wikifaq>#RelayOrBridge\">bridge</"
-"a> for users in countries that censor their Internet."
+"network</tt> if you want to be a <a href=\"<page docs/faq>#RelayOrBridge"
+"\">bridge</a> for users in countries that censor their Internet."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/transifex/website/docs/en/tor-doc-relay.wml:85
+#: /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/transifex/website/docs/en/tor-doc-relay.wml:88
+#: /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/transifex/website/docs/en/tor-doc-relay.wml:91
+#: /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.  "
@@ -181,45 +180,45 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/transifex/website/docs/en/tor-doc-relay.wml:95
+#: /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/transifex/website/docs/en/tor-doc-relay.wml:96
+#: /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/transifex/website/docs/en/tor-doc-relay.wml:99
+#: /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 "
-"you don't want to allow people to <a href=\"<wikifaq>#ExitPolicies\">reach "
-"from your relay</a>.  If you want to be a non-exit relay, un-check all "
-"services."
+"you don't want to allow people to <a href=\"<page docs/faq>#ExitPolicies"
+"\">reach from your relay</a>.  If you want to be a non-exit relay, un-check "
+"all services."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/transifex/website/docs/en/tor-doc-relay.wml:102
+#: /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/transifex/website/docs/en/tor-doc-relay.wml:105
+#: /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/transifex/website/docs/en/tor-doc-relay.wml:109
+#: /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 "
@@ -230,14 +229,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><li>
-#: /home/runa/transifex/website/docs/en/tor-doc-relay.wml:118
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:123
 msgid ""
-"Restart your relay. If it <a href=\"<wikifaq>#Logs\">logs any warnings</a>, "
-"address them."
+"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/transifex/website/docs/en/tor-doc-relay.wml:123
+#: /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 "
@@ -247,31 +246,31 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/tor-doc-relay.wml:133
+#: /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/transifex/website/docs/en/tor-doc-relay.wml:135
+#: /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/transifex/website/docs/en/tor-doc-relay.wml:138
+#: /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. "
 "This step is usually fast, but may take up to 20 minutes. Look for a <a href="
-"\"<wikifaq>#Logs\">log entry</a> like <tt>Self-testing indicates your ORPort "
-"is reachable from the outside. Excellent.</tt> If you don't see this "
+"\"<page docs/faq>#Logs\">log entry</a> like <tt>Self-testing indicates your "
+"ORPort is reachable from the outside. Excellent.</tt> If you don't see this "
 "message, it means that your relay is not reachable from the outside &mdash; "
 "you should re-check your firewalls, check that it's testing the IP and port "
 "you think it should be testing, etc."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-relay.wml:150
+#: /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 "
@@ -283,22 +282,22 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/tor-doc-relay.wml:159
+#: /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/transifex/website/docs/en/tor-doc-relay.wml:161
+#: /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/transifex/website/docs/en/tor-doc-relay.wml:165
+#: /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/transifex/website/docs/en/tor-doc-relay.wml:169
+#: /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 "
@@ -306,15 +305,15 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-relay.wml:175
+#: /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=\"<wikifaq>#MultipleRelays\">the MyFamily option</a> in all your "
+"href=\"<page docs/faq>#MultipleRelays\">the MyFamily option</a> in all your "
 "relays' configuration files."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-relay.wml:181
+#: /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 "
@@ -323,7 +322,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-relay.wml:189
+#: /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 "
@@ -333,7 +332,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-relay.wml:199
+#: /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 "
@@ -345,7 +344,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-relay.wml:210
+#: /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 "
@@ -360,7 +359,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-relay.wml:225
+#: /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 "
@@ -372,7 +371,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-relay.wml:236
+#: /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 "
@@ -384,7 +383,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-relay.wml:247
+#: /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 "
@@ -396,7 +395,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-relay.wml:257
+#: /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 "
@@ -404,7 +403,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-relay.wml:263
+#: /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\" "
@@ -416,7 +415,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-relay.wml:274
+#: /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/2-medium.verifying-signatures.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/2-medium.verifying-signatures.pot	2011-02-12 12:18:18 UTC (rev 24216)
+++ translation/trunk/projects/website/po/templates/docs/2-medium.verifying-signatures.pot	2011-02-12 12:21:10 UTC (rev 24217)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-01-03 15:54+0000\n"
+"POT-Creation-Date: 2011-02-12 12:20+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -30,8 +30,8 @@
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:13
-#: /tmp/Epk57P4xOb.xml:38 /tmp/Epk57P4xOb.xml:54 /tmp/Epk57P4xOb.xml:81
-#: /tmp/Epk57P4xOb.xml:155
+#: /tmp/cQhhW5Yv14.xml:38 /tmp/cQhhW5Yv14.xml:54 /tmp/cQhhW5Yv14.xml:81
+#: /tmp/cQhhW5Yv14.xml:155
 msgid "<hr>"
 msgstr ""
 
@@ -149,7 +149,7 @@
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:59
-#: /tmp/Epk57P4xOb.xml:84 /tmp/Epk57P4xOb.xml:163
+#: /tmp/cQhhW5Yv14.xml:84 /tmp/cQhhW5Yv14.xml:163
 msgid "<b>Windows:</b>"
 msgstr ""
 
@@ -176,7 +176,7 @@
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:70
-#: /tmp/Epk57P4xOb.xml:87
+#: /tmp/cQhhW5Yv14.xml:87
 msgid "<b>Mac and Linux</b>"
 msgstr ""
 
@@ -345,14 +345,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:172
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:173
 msgid ""
 "After verifying, GnuPG will come back saying something like \"Good signature"
 "\" or \"BAD signature\". The output should look something like this:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:177
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:178
 #, no-wrap
 msgid ""
 "    gpg: Signature made Tue 16 Mar 2010 05:55:17 AM CET using DSA key ID 28988BF5\n"
@@ -364,7 +364,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:185
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:186
 msgid ""
 "Notice that there is a warning because you haven't assigned a trust index to "
 "this person. This means that GnuPG verified that the key made that "
@@ -374,7 +374,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:192
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:193
 msgid ""
 "For your reference, this is an example of a <em>BAD</em> verification. It "
 "means that the signature and file contents do not match. In this case, you "
@@ -382,7 +382,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:197
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:198
 #, no-wrap
 msgid ""
 "    gpg: Signature made Tue 20 Apr 2010 12:22:32 PM CEST using DSA key ID 28988BF5\n"
@@ -391,14 +391,37 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:201
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:202
+msgid "<b>RPM-based distributions :</b>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:203
 msgid ""
+"In order to manually verify the signatures on the RPM packages, you must use "
+"the <code>rpm</code> tool like so: <br />"
+msgstr ""
+
+#. type: Content of: <div><div><p><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:206
+#, no-wrap
+msgid "rpm -K filename.rpm"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:209
+msgid "<b>Debian:</b>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:210
+msgid ""
 "If you are running Tor on Debian you should read the instructions on <a href="
 "\"<page docs/debian>#packages\">importing these keys to apt</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/verifying-signatures.wml:204
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:213
 msgid ""
 "If you wish to learn more about GPG, see <a href=\"http://www.gnupg.org/";
 "documentation/\">http://www.gnupg.org/documentation/</a>."

Modified: translation/trunk/projects/website/po/templates/docs/3-low.debian.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/3-low.debian.pot	2011-02-12 12:18:18 UTC (rev 24216)
+++ translation/trunk/projects/website/po/templates/docs/3-low.debian.pot	2011-02-12 12:21:10 UTC (rev 24217)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-01-03 14:39+0000\n"
+"POT-Creation-Date: 2011-02-12 12:20+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -37,8 +37,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:16 /tmp/EAtBUAAmwE.xml:43
-#: /tmp/EAtBUAAmwE.xml:110 /tmp/EAtBUAAmwE.xml:144
+#: /home/runa/tor/website/docs/en/debian.wml:16 /tmp/X5hNtpS8Ny.xml:43
+#: /tmp/X5hNtpS8Ny.xml:112 /tmp/X5hNtpS8Ny.xml:147
 msgid "<br />"
 msgstr ""
 
@@ -58,8 +58,8 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:32 /tmp/EAtBUAAmwE.xml:91
-#: /tmp/EAtBUAAmwE.xml:135 /tmp/EAtBUAAmwE.xml:178
+#: /home/runa/tor/website/docs/en/debian.wml:32 /tmp/X5hNtpS8Ny.xml:93
+#: /tmp/X5hNtpS8Ny.xml:138 /tmp/X5hNtpS8Ny.xml:181
 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."
@@ -87,8 +87,8 @@
 #: /home/runa/tor/website/docs/en/debian.wml:52
 msgid ""
 "You'll need to set up our package repository before you can fetch Tor. "
-"First, you need to figure out the name of your distribution. Here's a quick "
-"mapping:"
+"First, you need to figure out the name of your distribution. A quick command "
+"to run is <tt>lsb_release -c</tt>.  Here's a quick mapping:"
 msgstr ""
 
 #. type: Content of: <div><div><p><ul><li>
@@ -146,19 +146,19 @@
 #: /home/runa/tor/website/docs/en/debian.wml:72
 msgid ""
 "where you put the codename of your distribution (i.e. etch, lenny, sid, "
-"maverick, lucid, karmic, jaunty, intrepid, hardy or whatever it is) in place "
-"of &lt;DISTRIBUTION&gt;."
+"maverick, lucid, karmic, jaunty, intrepid, hardy or whatever it is)  in "
+"place of &lt;DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:76
+#: /home/runa/tor/website/docs/en/debian.wml:78
 msgid ""
 "Then add the gpg key used to sign the packages by running the following "
 "commands at your command prompt:"
 msgstr ""
 
 #. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian.wml:79
+#: /home/runa/tor/website/docs/en/debian.wml:81
 #, no-wrap
 msgid ""
 "gpg --keyserver keys.gnupg.net --recv 886DDD89\n"
@@ -166,14 +166,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:82
+#: /home/runa/tor/website/docs/en/debian.wml:84
 msgid ""
 "Now refresh your sources and install Tor by running the following commands "
 "(as root) at your command prompt:"
 msgstr ""
 
 #. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian.wml:85
+#: /home/runa/tor/website/docs/en/debian.wml:87
 #, no-wrap
 msgid ""
 "apt-get update\n"
@@ -181,7 +181,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:97
+#: /home/runa/tor/website/docs/en/debian.wml:99
 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 "
@@ -191,19 +191,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:105
+#: /home/runa/tor/website/docs/en/debian.wml:107
 msgid "<hr /> <a id=\"development\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/debian.wml:108
+#: /home/runa/tor/website/docs/en/debian.wml:110
 msgid ""
 "<a class=\"anchor\" href=\"#development\">Option three: Using the "
 "development branch of Tor on Debian or Ubuntu</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:112
+#: /home/runa/tor/website/docs/en/debian.wml:114
 msgid ""
 "If you want to use the <a href=\"<page download/download>#packagediff"
 "\">development branch</a> of Tor instead (more features and more bugs), you "
@@ -212,7 +212,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian.wml:116
+#: /home/runa/tor/website/docs/en/debian.wml:119
 #, no-wrap
 msgid ""
 "deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main\n"
@@ -220,7 +220,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:119
+#: /home/runa/tor/website/docs/en/debian.wml:122
 msgid ""
 "where you again substitute the name of your distro (etch, lenny, sid, "
 "maverick, lucid, karmic, jaunty, intrepid, hardy) in place of &lt;"
@@ -228,12 +228,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:125
+#: /home/runa/tor/website/docs/en/debian.wml:128
 msgid "Then run the following commands at your command prompt:"
 msgstr ""
 
 #. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian.wml:127
+#: /home/runa/tor/website/docs/en/debian.wml:130
 #, no-wrap
 msgid ""
 "gpg --keyserver keys.gnupg.net --recv 886DDD89\n"
@@ -243,17 +243,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:140
+#: /home/runa/tor/website/docs/en/debian.wml:143
 msgid "<hr /> <a id=\"source\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/debian.wml:143
+#: /home/runa/tor/website/docs/en/debian.wml:146
 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:147
+#: /home/runa/tor/website/docs/en/debian.wml:150
 msgid ""
 "If you want to build your own debs from source you must first add an "
 "appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>."
@@ -262,7 +262,7 @@
 #. PO4ASHARPBEGIN For the stable version.PO4ASHARPEND
 #. PO4ASHARPBEGIN For the unstable version.PO4ASHARPEND
 #. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian.wml:150
+#: /home/runa/tor/website/docs/en/debian.wml:153
 #, no-wrap
 msgid ""
 "\n"
@@ -274,14 +274,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:157
+#: /home/runa/tor/website/docs/en/debian.wml:160
 msgid ""
 "You also need to install the necessary packages to build your own debs and "
 "the packages needed to build Tor:"
 msgstr ""
 
 #. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian.wml:160
+#: /home/runa/tor/website/docs/en/debian.wml:163
 #, no-wrap
 msgid ""
 "apt-get install build-essential fakeroot devscripts\n"
@@ -289,12 +289,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:163
+#: /home/runa/tor/website/docs/en/debian.wml:166
 msgid "Then you can build Tor in ~/debian-packages:"
 msgstr ""
 
 #. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian.wml:165
+#: /home/runa/tor/website/docs/en/debian.wml:168
 #, no-wrap
 msgid ""
 "mkdir ~/debian-packages; cd ~/debian-packages\n"
@@ -305,23 +305,23 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:171
+#: /home/runa/tor/website/docs/en/debian.wml:174
 msgid "Now you can install the new package:"
 msgstr ""
 
 #. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian.wml:173
+#: /home/runa/tor/website/docs/en/debian.wml:176
 #, no-wrap
 msgid "sudo dpkg -i tor_*.deb\n"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:183
+#: /home/runa/tor/website/docs/en/debian.wml:186
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:185
+#: /home/runa/tor/website/docs/en/debian.wml:188
 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.faq-abuse.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/3-low.faq-abuse.pot	2011-02-12 12:18:18 UTC (rev 24216)
+++ translation/trunk/projects/website/po/templates/docs/3-low.faq-abuse.pot	2011-02-12 12:21:10 UTC (rev 24217)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-12-05 19:13+0000\n"
+"POT-Creation-Date: 2011-02-12 12:20+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -36,12 +36,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><div>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:17 /tmp/8TgOzp4hlP.xml:18
-#: /tmp/8TgOzp4hlP.xml:19 /tmp/8TgOzp4hlP.xml:20 /tmp/8TgOzp4hlP.xml:21
-#: /tmp/8TgOzp4hlP.xml:22 /tmp/8TgOzp4hlP.xml:23 /tmp/8TgOzp4hlP.xml:24
-#: /tmp/8TgOzp4hlP.xml:25 /tmp/8TgOzp4hlP.xml:26 /tmp/8TgOzp4hlP.xml:27
-#: /tmp/8TgOzp4hlP.xml:28 /tmp/8TgOzp4hlP.xml:29 /tmp/8TgOzp4hlP.xml:30
-#: /tmp/8TgOzp4hlP.xml:31
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:17 /tmp/gWXQV_nZkD.xml:18
+#: /tmp/gWXQV_nZkD.xml:19 /tmp/gWXQV_nZkD.xml:20 /tmp/gWXQV_nZkD.xml:21
+#: /tmp/gWXQV_nZkD.xml:22 /tmp/gWXQV_nZkD.xml:23 /tmp/gWXQV_nZkD.xml:24
+#: /tmp/gWXQV_nZkD.xml:25 /tmp/gWXQV_nZkD.xml:26 /tmp/gWXQV_nZkD.xml:27
+#: /tmp/gWXQV_nZkD.xml:28 /tmp/gWXQV_nZkD.xml:29 /tmp/gWXQV_nZkD.xml:30
+#: /tmp/gWXQV_nZkD.xml:31
 msgid "#"
 msgstr ""
 
@@ -275,7 +275,7 @@
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/faq-abuse.wml:117
-msgid "<a href=\"<wikifaq>#ExitPolicies\">See the FAQ</a>"
+msgid "<a href=\"<page docs/faq>#ExitPolicies\">See the main FAQ</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
@@ -583,17 +583,17 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/faq-abuse.wml:297
 msgid ""
-"Lastly, please remember that Tor relays have <a href=\"<wikifaq>#ExitPolicies"
-"\">individual exit policies</a>. Many Tor relays do not allow exiting "
-"connections at all. Many of those that do allow some exit connections might "
-"already disallow connections to your service. When you go about banning "
-"nodes, you should parse the exit policies and only block the ones that allow "
-"these connections; and you should keep in mind that exit policies can change "
-"(as well as the overall list of nodes in the network)."
+"Lastly, please remember that Tor relays have <a href=\"<page docs/"
+"faq>#ExitPolicies\">individual exit policies</a>. Many Tor relays do not "
+"allow exiting connections at all. Many of those that do allow some exit "
+"connections might already disallow connections to your service. When you go "
+"about banning nodes, you should parse the exit policies and only block the "
+"ones that allow these connections; and you should keep in mind that exit "
+"policies can change (as well as the overall list of nodes in the network)."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:306
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:307
 msgid ""
 "If you really want to do this, we provide a <a href=\"https://check.";
 "torproject.org/cgi-bin/TorBulkExitList.py\">Tor exit relay list</a> or a <a "
@@ -601,7 +601,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:313
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:314
 msgid ""
 "(Some system administrators block ranges of IP addresses because of official "
 "policy or some abuse pattern, but some have also asked about whitelisting "
@@ -610,19 +610,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:319
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:320
 msgid "<a id=\"TracingUsers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:320
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:321
 msgid ""
 "<a class=\"anchor\" href=\"#TracingUsers\">I have a compelling reason to "
 "trace a Tor user. Can you help?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:323
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:324
 msgid ""
 "There is nothing the Tor developers can do to trace Tor users. The same "
 "protections that keep bad people from breaking Tor's anonymity also prevent "
@@ -630,10 +630,10 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:329
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:330
 msgid ""
-"Some fans have suggested that we redesign Tor to include a <a href="
-"\"<wikifaq>#Backdoor\">backdoor</a>.  There are two problems with this idea. "
+"Some fans have suggested that we redesign Tor to include a <a href=\"<page "
+"docs/faq>#Backdoor\">backdoor</a>.  There are two problems with this idea. "
 "First, it technically weakens the system too far. Having a central way to "
 "link users to their activities is a gaping hole for all sorts of attackers; "
 "and the policy mechanisms needed to ensure correct handling of this "
@@ -644,7 +644,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:342
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:343
 msgid ""
 "But remember that this doesn't mean that Tor is invulnerable. Traditional "
 "police techniques can still be very effective against Tor, such as "
@@ -653,19 +653,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:348
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:349
 msgid "<a id=\"RemoveContent\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:349
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:350
 msgid ""
 "<a class=\"anchor\" href=\"#RemoveContent\">I want some content removed from "
 "a .onion address.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:350
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:351
 msgid ""
 "The Tor Project does not host, control, nor have the ability to discover the "
 "owner or location of a .onion address.  The .onion address is an address "
@@ -679,7 +679,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:359
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:360
 msgid ""
 "But remember that this doesn't mean that hidden services are invulnerable. "
 "Traditional police techniques can still be very effective against them, such "
@@ -688,7 +688,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:364
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:365
 msgid ""
 "If you have a complaint about child pornography, you may wish to report it "
 "to the National Center for Missing and Exploited Children, which serves as a "
@@ -698,26 +698,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:370
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:371
 msgid "<a id=\"LegalQuestions\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:371
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:372
 msgid ""
 "<a class=\"anchor\" href=\"#LegalQuestions\">I have legal questions about "
 "Tor abuse.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:373
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:374
 msgid ""
 "We're only the developers. We can answer technical questions, but we're not "
 "the ones to talk to about legal questions or concerns."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq-abuse.wml:376
+#: /home/runa/tor/website/docs/en/faq-abuse.wml:377
 msgid ""
 "Please take a look at the <a href=\"<page eff/tor-legal-faq>\">Tor Legal "
 "FAQ</a>, and contact EFF directly if you have any further legal questions."

Modified: translation/trunk/projects/website/po/templates/docs/3-low.tor-doc-unix.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/3-low.tor-doc-unix.pot	2011-02-12 12:18:18 UTC (rev 24216)
+++ translation/trunk/projects/website/po/templates/docs/3-low.tor-doc-unix.pot	2011-02-12 12:21:10 UTC (rev 24217)
@@ -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-02-12 12:20+0000\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/tor-doc-unix.wml:8
+#: /home/runa/tor/website/docs/en/tor-doc-unix.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,19 +25,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:13
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:13
 msgid "Running the <a href=\"<page index>\">Tor</a> client on Linux/BSD/Unix"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:14
-#: /tmp/gqdwbV82SJ.xml:26 /tmp/gqdwbV82SJ.xml:56 /tmp/gqdwbV82SJ.xml:90
-#: /tmp/gqdwbV82SJ.xml:133 /tmp/gqdwbV82SJ.xml:171
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:14 /tmp/IT3itHQw4v.xml:26
+#: /tmp/IT3itHQw4v.xml:58 /tmp/IT3itHQw4v.xml:92 /tmp/IT3itHQw4v.xml:135
+#: /tmp/IT3itHQw4v.xml:173
 msgid "<br>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:17
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:17
 msgid ""
 "<b>Note that these are the installation instructions for running a Tor "
 "client. If you want to relay traffic for others to help the network grow "
@@ -46,28 +46,30 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:23
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:23
 msgid "<hr> <a id=\"installing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:25
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:25
 msgid ""
 "<a class=\"anchor\" href=\"#installing\">Step One: Download and Install Tor</"
 "a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:29
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:29
 msgid ""
 "The latest release of Tor can be found on the <a href=\"<page download/"
 "download>\">download</a> page. We have packages for Debian, Red Hat, Gentoo, "
 "*BSD, etc there too. If you're using Ubuntu, don't use the default packages: "
-"use <a href=\"<page docs/debian>#ubuntu\">our deb repository</a> instead."
+"use <a href=\"<page docs/debian>#ubuntu\">our deb repository</a> instead.  "
+"Similarly, CentOS / Fedora / OpenSUSE users should use <a href=\"<page docs/"
+"rpms>\">our rpm repository</a> instead."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:36
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:38
 msgid ""
 "If you're building from source, first install <a href=\"http://www.monkey.";
 "org/~provos/libevent/\">libevent</a>, and make sure you have openssl and "
@@ -79,7 +81,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:47
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:49
 msgid ""
 "Tor comes configured as a client by default. It uses a built-in default "
 "configuration file, and most people won't need to change any of the "
@@ -87,25 +89,25 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:52
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:54
 msgid "<hr> <a id=\"privoxy\"></a> <a id=\"polipo\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:55
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:57
 msgid ""
 "<a class=\"anchor\" href=\"#polipo\">Step Two: Install Polipo for Web "
 "Browsing</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:58
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:60
 msgid ""
 "After installing Tor, you need to configure your applications to use it."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:62
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:64
 msgid ""
 "The first step is to set up web browsing. Start by installing <a href="
 "\"http://www.pps.jussieu.fr/~jch/software/polipo/\";>Polipo</a> from your "
@@ -117,7 +119,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:72
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:74
 msgid ""
 "Once you've installed Polipo (either from package or from source), <b>you "
 "will need to configure Polipo to use Tor</b>. Grab our <a href=\"<tbbrepo>/"
@@ -128,7 +130,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:82
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:84
 msgid ""
 "If you prefer, you can instead use Privoxy with <a href="
 "\"<wiki>TheOnionRouter/PrivoxyConfig\">this sample Privoxy configuration</"
@@ -137,41 +139,41 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:87
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:89
 msgid "<hr> <a id=\"using\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:89
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications "
 "to use Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:92
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:94
 msgid ""
 "After installing Tor and Polipo, you need to configure your applications to "
 "use them. The first step is to set up web browsing."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:95
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety.  Simply "
-"install the <a href=\"https://addons.mozilla.org/firefox/2275/\";>Torbutton "
-"plugin</a>, restart your Firefox, and you're all set:"
+"install the <a href=\"<page torbutton/index>\">Torbutton plugin</a>, restart "
+"your Firefox, and you're all set:"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:101
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:103
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-"
 "torbutton.png\" > <br>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:108
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110
 msgid ""
 "If you plan to run Firefox on a different computer than Tor, see the <a href="
 "\"<wikifaq>#SocksListenAddress\"> FAQ entry for running Tor on a different "
@@ -179,7 +181,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:114
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:116
 msgid ""
 "To Torify other applications that support HTTP proxies, just point them at "
 "Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
@@ -192,25 +194,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:125
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:127
 msgid ""
 "For information on how to Torify other applications, check out the <a href="
 "\"<wiki>TheOnionRouter/TorifyHOWTO\">Torify HOWTO</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:130
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132
 msgid "<hr> <a id=\"verify\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:132
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:134
 msgid ""
 "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:136
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:138
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
 "address is being anonymized. Click on <a href=\"https://check.torproject.org/";
@@ -222,7 +224,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:148
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:150
 msgid ""
 "If you have a personal firewall that limits your computer's ability to "
 "connect to itself (this includes something like SELinux on Fedora Core 4), "
@@ -237,25 +239,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:163
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165
 msgid ""
-"If it's still not working, look at <a href=\"<wikifaq>#ItDoesntWork\">this "
-"FAQ entry</a> for hints."
+"If it's still not working, look at <a href=\"<page docs/faq>#DoesntWork"
+"\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:167
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169
 msgid "<hr> <a id=\"server\"></a> <a id=\"relay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:170
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:172
 msgid ""
 "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:173
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:175
 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 "
@@ -266,7 +268,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:181
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:183
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
 "users secure. <a href=\"<wikifaq>#RelayAnonymity\">You may also get stronger "
@@ -275,19 +277,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:188
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:190
 msgid ""
 "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
 "a> guide."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:191
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:193
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-unix.wml:193
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:195
 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.tor-doc-web.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/3-low.tor-doc-web.pot	2011-02-12 12:18:18 UTC (rev 24216)
+++ translation/trunk/projects/website/po/templates/docs/3-low.tor-doc-web.pot	2011-02-12 12:21:10 UTC (rev 24217)
@@ -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-02-12 12:20+0000\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/tor-doc-web.wml:8
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page docs/"
 "documentation>\">Documentation &raquo; </a> <a href=\"<page docs/tor-doc-web>"
@@ -25,65 +25,65 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/transifex/website/docs/en/tor-doc-web.wml:13
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:13
 msgid "Configuring your browser to use <a href=\"<page index>\">Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/tor-doc-web.wml:14
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:14
 msgid "<br>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-web.wml:16
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:16
 msgid ""
 "If you're using Firefox (we recommend it), you don't need this page.  Simply "
-"install the <a href=\"https://addons.mozilla.org/firefox/2275/\";>Torbutton "
-"plugin</a>, restart your Firefox, and you're all set:"
+"install the <a href=\"<page torbutton/index>\">Torbutton plugin</a>, restart "
+"your Firefox, and you're all set:"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/tor-doc-web.wml:22
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:22
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-"
 "torbutton.png\" /> <br>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-web.wml:27
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:27
 msgid ""
 "Otherwise, you need to manually configure your browser's proxy settings."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-web.wml:29
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:29
 msgid ""
 "In Mozilla and Firefox on Windows, this is in Tools - Options - General - "
 "Connection Settings."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-web.wml:31
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:31
 msgid ""
 "In Firefox on OS X, it's Firefox - Preferences - General - Connection "
 "Settings."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-web.wml:33
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:33
 msgid ""
 "In Firefox on Linux, this is in Edit - Preferences - Advanced - Proxies."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/tor-doc-web.wml:36
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:36
 msgid ""
 "<img alt=\"Proxy settings in Firefox\" src=\"$(IMGROOT)/screenshot-win32-"
 "firefox-proxies.jpg\">"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-web.wml:40
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:40
 msgid ""
 "You should fill in \"localhost\" and \"8118\" to point the top four "
 "protocols to Polipo, as shown here. (Even though Polipo doesn't support FTP "
@@ -94,12 +94,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/tor-doc-web.wml:47
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:47
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-doc-web.wml:49
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:49
 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.tor-hidden-service.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/3-low.tor-hidden-service.pot	2011-02-12 12:18:18 UTC (rev 24216)
+++ translation/trunk/projects/website/po/templates/docs/3-low.tor-hidden-service.pot	2011-02-12 12:21:10 UTC (rev 24217)
@@ -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-02-12 12:20+0000\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/tor-hidden-service.wml:8
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page docs/"
 "documentation>\">Documentation &raquo; </a> <a href=\"<page docs/tor-hidden-"
@@ -25,18 +25,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:13
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:13
 msgid "Configuring Hidden Services for <a href=\"<page index>\">Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:14
-#: /tmp/0tWrxIvojF.xml:261
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:14
+#: /tmp/rpmxmzRNmk.xml:260
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:16
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:16
 msgid ""
 "Tor allows clients and relays to offer hidden services. That is, you can "
 "offer a web server, SSH server, etc., without revealing your IP address to "
@@ -45,14 +45,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:22
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:22
 msgid ""
 "If you have Tor installed, you can see hidden services in action by visiting "
 "<a href=\"http://duskgytldkxiuqc6.onion/\";>our example hidden service</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:27
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:27
 msgid ""
 "This howto describes the steps for setting up your own hidden service "
 "website. For the technical details of how the hidden service protocol works, "
@@ -61,38 +61,38 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:32
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:32
 msgid "<hr> <a id=\"zero\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:34
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:34
 msgid "<a class=\"anchor\" href=\"#zero\">Step Zero: Get Tor working</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:35
-#: /tmp/0tWrxIvojF.xml:69 /tmp/0tWrxIvojF.xml:114 /tmp/0tWrxIvojF.xml:216
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:35
+#: /tmp/rpmxmzRNmk.xml:69 /tmp/rpmxmzRNmk.xml:114 /tmp/rpmxmzRNmk.xml:215
 msgid "<br>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:37
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:37
 msgid "Before you start, you need to make sure:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:39
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:39
 msgid "Tor is up and running,"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:40
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:40
 msgid "You actually set it up correctly."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:44
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:44
 msgid ""
 "Windows users should follow the <a href=\"<page docs/tor-doc-windows>"
 "\">Windows howto</a>, OS X users should follow the <a href=\"<page docs/tor-"
@@ -101,7 +101,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:52
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:52
 msgid ""
 "Once you've got Tor installed and configured, you can see hidden services in "
 "action by following this link to <a href=\"http://duskgytldkxiuqc6.onion/";
@@ -110,23 +110,23 @@
 "take 10-60 seconds to load (or to decide that it is currently unreachable). "
 "If it fails immediately and your browser pops up an alert saying that \"www."
 "duskgytldkxiuqc6.onion could not be found, please check the name and try "
-"again\" then you haven't configured Tor correctly; see <a href="
-"\"<wikifaq>#ItDoesntWork\">the it-doesn't-work FAQ entry</a> for some help."
+"again\" then you haven't configured Tor correctly; see <a href=\"<page docs/"
+"faq>#DoesntWork\">the it-doesn't-work FAQ entry</a> for some help."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:66
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:66
 msgid "<hr> <a id=\"one\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:68
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:68
 msgid ""
 "<a class=\"anchor\" href=\"#one\">Step One: Install a web server locally</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:71
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:71
 msgid ""
 "First, you need to set up a web server locally. Setting up a web server can "
 "be tricky, so we're just going to go over a few basics here. If you get "
@@ -137,7 +137,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:80
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:80
 msgid ""
 "If you're on Unix or OS X and you're comfortable with the command-line, by "
 "far the best way to go is to install <a href=\"http://www.acme.com/software/";
@@ -149,7 +149,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:91
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:91
 msgid ""
 "If you're on Windows, you might pick <a href=\"http://savant.sourceforge.net/";
 "\">Savant</a> or <a href=\"http://httpd.apache.org/\";>Apache</a>, and be "
@@ -158,7 +158,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:98
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:98
 msgid ""
 "(The reason we bind the web server only to localhost is to make sure it "
 "isn't publically accessible. If people could get to it directly, they could "
@@ -166,7 +166,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:104
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:104
 msgid ""
 "Once you've got your web server set up, make sure it works: open your "
 "browser and go to <a href=\"http://localhost:5222/\";>http://localhost:5222/</"
@@ -175,33 +175,33 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:111
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:111
 msgid "<hr> <a id=\"two\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:113
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:113
 msgid ""
 "<a class=\"anchor\" href=\"#two\">Step Two: Configure your hidden service</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:116
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:116
 msgid ""
 "Next, you need to configure your hidden service to point to your local web "
 "server."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:120
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:120
 msgid ""
 "First, open your torrc file in your favorite text editor. (See <a href="
-"\"<wikifaq>#torrc\">the torrc FAQ entry</a> to learn what this means.) Go to "
-"the middle section and look for the line"
+"\"<page docs/faq>#torrc\">the torrc FAQ entry</a> to learn what this means.) "
+"Go to the middle section and look for the line"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:126
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:126
 #, no-wrap
 msgid ""
 "    \\############### This section is just for location-hidden services ###\n"
@@ -209,7 +209,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:130
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:130
 msgid ""
 "This section of the file consists of groups of lines, each representing one "
 "hidden service. Right now they are all commented out (the lines start with "
@@ -219,7 +219,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:136
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:136
 msgid ""
 "<var>HiddenServiceDir</var> is a directory where Tor will store information "
 "about that hidden service.  In particular, Tor will create a file here named "
@@ -230,7 +230,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:142
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:142
 msgid ""
 "<var>HiddenServicePort</var> lets you specify a virtual port (that is, what "
 "port people accessing the hidden service will think they're using) and an IP "
@@ -238,12 +238,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:147
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:147
 msgid "Add the following lines to your torrc:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:151
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:151
 #, no-wrap
 msgid ""
 "    HiddenServiceDir /Library/Tor/var/lib/tor/hidden_service/\n"
@@ -252,7 +252,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:155
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:155
 msgid ""
 "You're going to want to change the <var>HiddenServiceDir</var> line, so it "
 "points to an actual directory that is readable/writeable by the user that "
@@ -262,7 +262,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:161
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:161
 #, no-wrap
 msgid ""
 "    HiddenServiceDir C:\\Documents and Settings\\username\\Application Data\\hidden_service\\\\\n"
@@ -271,34 +271,35 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:165
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:165
 msgid "Now save the torrc, shut down your Tor, and then start it again."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:169
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:169
 msgid ""
 "If Tor starts up again, great. Otherwise, something is wrong. First look at "
 "your logfiles for hints. It will print some warnings or error messages. That "
 "should give you an idea what went wrong. Typically there are typos in the "
-"torrc or wrong directory permissions (See <a href=\"<wikifaq>#Logs\">the "
-"logging FAQ entry</a> if you don't know how to enable or find your log file.)"
+"torrc or wrong directory permissions (See <a href=\"<page docs/faq>#Logs"
+"\">the logging FAQ entry</a> if you don't know how to enable or find your "
+"log file.)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:178
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:177
 msgid ""
 "When Tor starts, it will automatically create the <var>HiddenServiceDir</"
 "var> that you specified (if necessary), and it will create two files there."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:182
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:181
 msgid "<var>private_key</var>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:183
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:182
 msgid ""
 "First, Tor will generate a new public/private keypair for your hidden "
 "service. It is written into a file called \"private_key\". Don't share this "
@@ -307,12 +308,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:187
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:186
 msgid "<var>hostname</var>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:188
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:187
 msgid ""
 "The other file Tor will create is called \"hostname\". This contains a short "
 "summary of your public key -- it will look something like "
@@ -322,14 +323,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:195
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:194
 msgid ""
 "If Tor runs as a different user than you, for example on OS X, Debian, or "
 "Red Hat, then you may need to become root to be able to view these files."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:199
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:198
 msgid ""
 "Now that you've restarted Tor, it is busy picking introduction points in the "
 "Tor network, and generating a <em>hidden service descriptor</em>. This is a "
@@ -340,7 +341,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:207
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:206
 msgid ""
 "Try it now: paste the contents of the hostname file into your web browser. "
 "If it works, you'll get the html page you set up in step one.  If it doesn't "
@@ -349,24 +350,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:213
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:212
 msgid "<hr> <a id=\"three\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:215
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:214
 msgid "<a class=\"anchor\" href=\"#three\">Step Three: More advanced tips</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:218
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:217
 msgid ""
 "If you plan to keep your service available for a long time, you might want "
 "to make a backup copy of the <var>private_key</var> file somewhere."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:222
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:221
 msgid ""
 "We avoided recommending Apache above, a) because many people might already "
 "be running it for a public web server on their computer, and b)  because "
@@ -378,7 +379,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:232
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:231
 msgid ""
 "If you want to forward multiple virtual ports for a single hidden service, "
 "just add more <var>HiddenServicePort</var> lines.  If you want to run "
@@ -389,7 +390,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:241
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:240
 #, no-wrap
 msgid ""
 "    HiddenServiceDir /usr/local/etc/tor/hidden_service/\n"
@@ -402,12 +403,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:249
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:248
 msgid "There are some anonymity issues you should keep in mind too:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:252
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:251
 msgid ""
 "As mentioned above, be careful of letting your web server reveal identifying "
 "information about you, your computer, or your location.  For example, "
@@ -416,14 +417,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:256
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:255
 msgid ""
 "If your computer isn't online all the time, your hidden service won't be "
 "either. This leaks information to an observant adversary."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/docs/en/tor-hidden-service.wml:263
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:262
 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/donate/3-low.donate.pot
===================================================================
--- translation/trunk/projects/website/po/templates/donate/3-low.donate.pot	2011-02-12 12:18:18 UTC (rev 24216)
+++ translation/trunk/projects/website/po/templates/donate/3-low.donate.pot	2011-02-12 12:21:10 UTC (rev 24217)
@@ -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-02-12 12:19+0000\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,109 +17,111 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/donate/en/donate.wml:8
+#: /home/runa/tor/website/donate/en/donate.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page donate/donate>"
 "\">Donate</a>"
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/transifex/website/donate/en/donate.wml:12
+#: /home/runa/tor/website/donate/en/donate.wml:12
 msgid "Monetary Donations"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/donate/en/donate.wml:13
+#: /home/runa/tor/website/donate/en/donate.wml:13
 msgid ""
 "<strong>Your support is critical to our success.</strong> The Tor Project is "
 "a US 501(c)(3) non-profit dedicated to the research, development, and "
 "education of online anonymity and privacy. Donations to The Tor Project may "
 "be tax deductible to persons who are in the US; or who pay taxes in "
 "countries with reciprocity with the US on charitable donations. Our tax ID "
-"number is 20-8096820.  We're happy to accept donations via:"
+"number is 20-8096820.  We are listed on <a href=\"http://www2.guidestar.org/";
+"organizations/20-8096820/tor-project.aspx\">GuideStar</a>.  We're happy to "
+"accept donations via:"
 msgstr ""
 
 #. type: Content of: <div><div><p><ul><li>
-#: /home/runa/transifex/website/donate/en/donate.wml:21
+#: /home/runa/tor/website/donate/en/donate.wml:23
 msgid "Paypal"
 msgstr ""
 
 #. type: Content of: <div><div><p><ul><li>
-#: /home/runa/transifex/website/donate/en/donate.wml:22
+#: /home/runa/tor/website/donate/en/donate.wml:24
 msgid "Amazon Payments"
 msgstr ""
 
 #. type: Content of: <div><div><p><ul><li>
-#: /home/runa/transifex/website/donate/en/donate.wml:23
+#: /home/runa/tor/website/donate/en/donate.wml:25
 msgid "Google Checkout"
 msgstr ""
 
 #. type: Content of: <div><div><p><ul><li>
-#: /home/runa/transifex/website/donate/en/donate.wml:24
+#: /home/runa/tor/website/donate/en/donate.wml:26
 msgid "Givv.org"
 msgstr ""
 
 #. type: Content of: <div><div><p><ul><li>
-#: /home/runa/transifex/website/donate/en/donate.wml:25
+#: /home/runa/tor/website/donate/en/donate.wml:27
 msgid ""
 "checks, money orders, bank transfers, stock grants or other more "
 "sophisticated transactions."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/donate/en/donate.wml:28
+#: /home/runa/tor/website/donate/en/donate.wml:30
 msgid ""
 "If you want to make an anonymous donation, please do so in an anonymous "
 "way.  Contact us at donations@xxxxxxxxxxxxxx for more details."
 msgstr ""
 
 #. type: Content of: <div><div><div>
-#: /home/runa/transifex/website/donate/en/donate.wml:30
+#: /home/runa/tor/website/donate/en/donate.wml:32
 msgid "Tor Project Subscription via PayPal"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h4>
-#: /home/runa/transifex/website/donate/en/donate.wml:33
+#: /home/runa/tor/website/donate/en/donate.wml:35
 msgid "Monthly Subscription to The Tor Project"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><form><table><tr><td>
-#: /home/runa/transifex/website/donate/en/donate.wml:38 /tmp/qqtRRkRv6E.xml:87
+#: /home/runa/tor/website/donate/en/donate.wml:40 /tmp/ugTbmfEHjk.xml:89
 msgid "Choose your currency:"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><form><table><tr><td><select>
-#: /home/runa/transifex/website/donate/en/donate.wml:40 /tmp/qqtRRkRv6E.xml:89
+#: /home/runa/tor/website/donate/en/donate.wml:42 /tmp/ugTbmfEHjk.xml:91
 msgid "<select name=\"currency_code\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><form><table><tr><td><select><option>
-#: /home/runa/transifex/website/donate/en/donate.wml:41 /tmp/qqtRRkRv6E.xml:90
+#: /home/runa/tor/website/donate/en/donate.wml:43 /tmp/ugTbmfEHjk.xml:92
 msgid "$"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><form><table><tr><td><select><option>
-#: /home/runa/transifex/website/donate/en/donate.wml:42 /tmp/qqtRRkRv6E.xml:91
+#: /home/runa/tor/website/donate/en/donate.wml:44 /tmp/ugTbmfEHjk.xml:93
 msgid "&euro;"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><form><table><tr><td><select><option>
-#: /home/runa/transifex/website/donate/en/donate.wml:43 /tmp/qqtRRkRv6E.xml:92
+#: /home/runa/tor/website/donate/en/donate.wml:45 /tmp/ugTbmfEHjk.xml:94
 msgid "&pound;"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><form><table><tr><td><select><option>
-#: /home/runa/transifex/website/donate/en/donate.wml:44 /tmp/qqtRRkRv6E.xml:93
+#: /home/runa/tor/website/donate/en/donate.wml:46 /tmp/ugTbmfEHjk.xml:95
 msgid "&yen;"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><form><table><tr><td>
-#: /home/runa/transifex/website/donate/en/donate.wml:45 /tmp/qqtRRkRv6E.xml:94
+#: /home/runa/tor/website/donate/en/donate.wml:47 /tmp/ugTbmfEHjk.xml:96
 msgid "</select>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><form><div><tr>
-#: /home/runa/transifex/website/donate/en/donate.wml:49
+#: /home/runa/tor/website/donate/en/donate.wml:51
 msgid ""
 "<input type=\"hidden\" name=\"p3\" value=\"1\"> <input type=\"hidden\" name="
 "\"t3\" value=\"M\"> <input type=\"hidden\" name=\"sra\" value=\"1\"> <input "
@@ -137,48 +139,48 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><form><div><tr><td>
-#: /home/runa/transifex/website/donate/en/donate.wml:64
+#: /home/runa/tor/website/donate/en/donate.wml:66
 msgid "<input type=\"radio\" name=\"a3\" value=\"5.00\">5/mo"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><form><div><tr><td>
-#: /home/runa/transifex/website/donate/en/donate.wml:65
+#: /home/runa/tor/website/donate/en/donate.wml:67
 msgid "<input type=\"radio\" name=\"a3\" value=\"10.00\">10/mo"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><form><div><tr><td>
-#: /home/runa/transifex/website/donate/en/donate.wml:66
+#: /home/runa/tor/website/donate/en/donate.wml:68
 msgid ""
 "<input type=\"radio\" name=\"a3\" value=\"20.00\" checked=\"checked\">20/mo"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><form><div><tr><td>
-#: /home/runa/transifex/website/donate/en/donate.wml:69
+#: /home/runa/tor/website/donate/en/donate.wml:71
 msgid "<input type=\"radio\" name=\"a3\" value=\"50.00\">50/mo"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><form><div><tr><td>
-#: /home/runa/transifex/website/donate/en/donate.wml:70
+#: /home/runa/tor/website/donate/en/donate.wml:72
 msgid "<input type=\"radio\" name=\"a3\" value=\"100.00\">100/mo"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><form><div><tr><td>
-#: /home/runa/transifex/website/donate/en/donate.wml:71
+#: /home/runa/tor/website/donate/en/donate.wml:73
 msgid "<input type=\"radio\" name=\"a3\" value=\"250.00\">250/mo"
 msgstr ""
 
 #. type: Content of: <div><div><div>
-#: /home/runa/transifex/website/donate/en/donate.wml:80
+#: /home/runa/tor/website/donate/en/donate.wml:82
 msgid "Single Donation via PayPal"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h4>
-#: /home/runa/transifex/website/donate/en/donate.wml:83
+#: /home/runa/tor/website/donate/en/donate.wml:85
 msgid "Make a one-time donation"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><form><table><tr>
-#: /home/runa/transifex/website/donate/en/donate.wml:98
+#: /home/runa/tor/website/donate/en/donate.wml:100
 msgid ""
 "<input type=\"hidden\" name=\"no_shipping\" value=\"1\"> <input type=\"image"
 "\" src=\"$(IMGROOT)/btn_donateCC_LG.gif\" name=\"submit\" alt=\"Make a "
@@ -192,59 +194,58 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><form><table><tr><td>
-#: /home/runa/transifex/website/donate/en/donate.wml:107
+#: /home/runa/tor/website/donate/en/donate.wml:109
 msgid "<input type=\"radio\" name=\"a3\" value=\"10.00\"> 10"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><form><table><tr><td>
-#: /home/runa/transifex/website/donate/en/donate.wml:108
+#: /home/runa/tor/website/donate/en/donate.wml:110
 msgid ""
 "<input type=\"radio\" name=\"a3\" value=\"20.00\" checked=\"checked\"> 20"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><form><table><tr><td>
-#: /home/runa/transifex/website/donate/en/donate.wml:109
+#: /home/runa/tor/website/donate/en/donate.wml:111
 msgid "<input type=\"radio\" name=\"a3\" value=\"50.00\"> 50"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><form><table><tr><td>
-#: /home/runa/transifex/website/donate/en/donate.wml:110
+#: /home/runa/tor/website/donate/en/donate.wml:112
 msgid "<input type=\"radio\" name=\"a3\" value=\"100.00\"> 100"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><form><table><tr><td>
-#: /home/runa/transifex/website/donate/en/donate.wml:113
+#: /home/runa/tor/website/donate/en/donate.wml:115
 msgid "<input type=\"radio\" name=\"a3\" value=\"250.00\"> 250"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><form><table><tr><td>
-#: /home/runa/transifex/website/donate/en/donate.wml:114
+#: /home/runa/tor/website/donate/en/donate.wml:116
 msgid "<input type=\"radio\" name=\"a3\" value=\"500.00\"> 500"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><form><table><tr><td>
-#: /home/runa/transifex/website/donate/en/donate.wml:115
+#: /home/runa/tor/website/donate/en/donate.wml:117
 msgid "<input type=\"radio\" name=\"a3\" value=\"1000.00\"> 1,000"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><form><table><tr><td>
-#: /home/runa/transifex/website/donate/en/donate.wml:116
+#: /home/runa/tor/website/donate/en/donate.wml:118
 msgid "<input type=\"radio\" name=\"a3\" value=\"5000.00\"> 5,000"
 msgstr ""
 
 #. type: Content of: <div><div><div>
-#: /home/runa/transifex/website/donate/en/donate.wml:124
+#: /home/runa/tor/website/donate/en/donate.wml:126
 msgid "Single Donation via Amazon Payments"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h4>
-#: /home/runa/transifex/website/donate/en/donate.wml:127
-#: /tmp/qqtRRkRv6E.xml:157
+#: /home/runa/tor/website/donate/en/donate.wml:129 /tmp/ugTbmfEHjk.xml:159
 msgid "Make a single donation."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><form><table><tr>
-#: /home/runa/transifex/website/donate/en/donate.wml:131
+#: /home/runa/tor/website/donate/en/donate.wml:133
 msgid ""
 "<input type=\"hidden\" name=\"immediateReturn\" value=\"1\"> <input type="
 "\"hidden\" name=\"collectShippingAddress\" value=\"0\"> <input type=\"hidden"
@@ -261,30 +262,29 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><form><table><td>
-#: /home/runa/transifex/website/donate/en/donate.wml:142
-#: /tmp/qqtRRkRv6E.xml:144
+#: /home/runa/tor/website/donate/en/donate.wml:144 /tmp/ugTbmfEHjk.xml:146
 msgid "&nbsp;"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><form><table><td>
-#: /home/runa/transifex/website/donate/en/donate.wml:143
+#: /home/runa/tor/website/donate/en/donate.wml:145
 msgid "$<input type=\"text\" name=\"amount\" size=\"8\" value=\"10\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><form><table><tr><td>
-#: /home/runa/transifex/website/donate/en/donate.wml:146
+#: /home/runa/tor/website/donate/en/donate.wml:148
 msgid ""
 "<input type=\"image\" src=\"http://g-ecx.images-amazon.com/images/G/01/asp/";
 "golden_small_donate_withmsg_whitebg.gif\">"
 msgstr ""
 
 #. type: Content of: <div><div><div>
-#: /home/runa/transifex/website/donate/en/donate.wml:154
+#: /home/runa/tor/website/donate/en/donate.wml:156
 msgid "Single Donation via Google Checkout"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><script>
-#: /home/runa/transifex/website/donate/en/donate.wml:160
+#: /home/runa/tor/website/donate/en/donate.wml:162
 msgid ""
 "function validateAmount(amount){ if(amount.value.match( /^[0-9]+(\\."
 "([0-9]+))?$/)){ return true; }else{ alert('You must enter a valid "
@@ -292,7 +292,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><form><table><tr>
-#: /home/runa/transifex/website/donate/en/donate.wml:173
+#: /home/runa/tor/website/donate/en/donate.wml:175
 msgid ""
 "<input name=\"item_name_1\" type=\"hidden\" value=\"Donate to the Tor Project"
 "\"/> <input name=\"item_description_1\" type=\"hidden\" value=\"Tor is "
@@ -306,7 +306,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><form><table><tr><td>
-#: /home/runa/transifex/website/donate/en/donate.wml:186
+#: /home/runa/tor/website/donate/en/donate.wml:188
 msgid ""
 "&#x24; <input id=\"item_price_1\" name=\"item_price_1\" onfocus=\"this.style."
 "color='black'; this.value='';\" size=\"6\" type=\"text\" value=\"25.00\"/> "
@@ -316,12 +316,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><div>
-#: /home/runa/transifex/website/donate/en/donate.wml:196
+#: /home/runa/tor/website/donate/en/donate.wml:198
 msgid "Donate via Givv.org"
 msgstr ""
 
 #. type: Content of: <div><div><div><p>
-#: /home/runa/transifex/website/donate/en/donate.wml:199
+#: /home/runa/tor/website/donate/en/donate.wml:201
 msgid ""
 "Givv.org is a new way to think about making your impact. Make one monthly "
 "donation. To as many nonprofits as you like.  Automatic, one-click giving. "
@@ -330,53 +330,53 @@
 msgstr ""
 
 #. type: Content of: <div><div><div>
-#: /home/runa/transifex/website/donate/en/donate.wml:205
+#: /home/runa/tor/website/donate/en/donate.wml:207
 msgid "Donate via Check, Cash, or Money Order"
 msgstr ""
 
 #. type: Content of: <div><div><div><p>
-#: /home/runa/transifex/website/donate/en/donate.wml:208
+#: /home/runa/tor/website/donate/en/donate.wml:210
 msgid "You can send checks or money orders to:"
 msgstr ""
 
 #. type: Content of: <div><div><div><p>
-#: /home/runa/transifex/website/donate/en/donate.wml:209
+#: /home/runa/tor/website/donate/en/donate.wml:211
 msgid ""
 "The Tor Project, Inc<br> 969 Main Street, Suite 206<br> Walpole, MA "
 "02081-2972 USA"
 msgstr ""
 
 #. type: Content of: <div><div><div>
-#: /home/runa/transifex/website/donate/en/donate.wml:215
+#: /home/runa/tor/website/donate/en/donate.wml:217
 msgid "Donate via Wire or Bank Transfer"
 msgstr ""
 
 #. type: Content of: <div><div><div><h3>
-#: /home/runa/transifex/website/donate/en/donate.wml:218
+#: /home/runa/tor/website/donate/en/donate.wml:220
 msgid "US Transfers"
 msgstr ""
 
 #. type: Content of: <div><div><div><p>
-#: /home/runa/transifex/website/donate/en/donate.wml:219
+#: /home/runa/tor/website/donate/en/donate.wml:221
 msgid ""
 "For US donations via wire or ACH transfer, please contact us for the "
 "relevant information."
 msgstr ""
 
 #. type: Content of: <div><div><div><h3>
-#: /home/runa/transifex/website/donate/en/donate.wml:220
+#: /home/runa/tor/website/donate/en/donate.wml:222
 msgid "European Transfers"
 msgstr ""
 
 #. type: Content of: <div><div><div><p>
-#: /home/runa/transifex/website/donate/en/donate.wml:221
+#: /home/runa/tor/website/donate/en/donate.wml:223
 msgid ""
 "Wau Holland Stiftung<br> IBAN DE03 5204 0021 0277 281202<br> SWIFT BIC "
 "COBADEFF520"
 msgstr ""
 
 #. type: Content of: <div><div><div><p>
-#: /home/runa/transifex/website/donate/en/donate.wml:224
+#: /home/runa/tor/website/donate/en/donate.wml:226
 msgid ""
 "<strong>Classic style German account information is:</strong><br> Konto: "
 "2772812-02<br> Inhaber: Wau Holland Stiftung<br> Bank: Commerzbank "
@@ -384,7 +384,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><p>
-#: /home/runa/transifex/website/donate/en/donate.wml:229
+#: /home/runa/tor/website/donate/en/donate.wml:231
 msgid ""
 "<em>For European bank transfers, we have an arrangement with <a href="
 "\"https://www.ccc.de/\";>CCC in Germany</a> to provide tax-deductible "
@@ -392,7 +392,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><ul><li>
-#: /home/runa/transifex/website/donate/en/donate.wml:233
+#: /home/runa/tor/website/donate/en/donate.wml:235
 msgid ""
 "Residents from any of the 31 <a href=\"http://en.wikipedia.org/wiki/";
 "Single_Euro_Payments_Area\">SEPA</a> member states can wire up to 50.000 "
@@ -401,7 +401,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><ul><li>
-#: /home/runa/transifex/website/donate/en/donate.wml:238
+#: /home/runa/tor/website/donate/en/donate.wml:240
 msgid ""
 "German citizens can make a charitable contribution that is tax-deductible to "
 "a certain degree (max 5% of total income, up to 1.650 Euro per annum). A new "
@@ -410,7 +410,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><ul><li>
-#: /home/runa/transifex/website/donate/en/donate.wml:242
+#: /home/runa/tor/website/donate/en/donate.wml:244
 msgid ""
 "Corporate entities can deduct donations up to 4/1000 of their combined "
 "turnovers, wages and salaries. WHS issues a donation receipt upon request "

Modified: translation/trunk/projects/website/po/templates/getinvolved/3-low.tshirt.pot
===================================================================
--- translation/trunk/projects/website/po/templates/getinvolved/3-low.tshirt.pot	2011-02-12 12:18:18 UTC (rev 24216)
+++ translation/trunk/projects/website/po/templates/getinvolved/3-low.tshirt.pot	2011-02-12 12:21:10 UTC (rev 24217)
@@ -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-02-12 12:20+0000\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/getinvolved/en/tshirt.wml:8
+#: /home/runa/tor/website/getinvolved/en/tshirt.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page getinvolved/"
 "volunteer>\">Get Involved &raquo; </a> <a href=\"<page getinvolved/tshirt>"
@@ -25,31 +25,31 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/transifex/website/getinvolved/en/tshirt.wml:13
+#: /home/runa/tor/website/getinvolved/en/tshirt.wml:13
 msgid "Tor: T-shirt for Contributing"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/getinvolved/en/tshirt.wml:14
+#: /home/runa/tor/website/getinvolved/en/tshirt.wml:14
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/getinvolved/en/tshirt.wml:16
+#: /home/runa/tor/website/getinvolved/en/tshirt.wml:16
 msgid ""
 "You can get one of these fine Tor T-shirts for contributing to the Tor "
 "project. There are three primary ways of contributing:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/tshirt.wml:20
+#: /home/runa/tor/website/getinvolved/en/tshirt.wml:20
 msgid ""
 "A large enough ($65+) <a href=\"<page donate/donate>\">donation</a> to the "
 "Tor Project."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/tshirt.wml:22
+#: /home/runa/tor/website/getinvolved/en/tshirt.wml:22
 msgid ""
 "Operate a fast <a href=\"<page docs/tor-doc-relay>\">Tor relay</a> that's "
 "been running for the past two months: you are eligible if you allow exits to "
@@ -58,7 +58,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/tshirt.wml:26
+#: /home/runa/tor/website/getinvolved/en/tshirt.wml:26
 msgid ""
 "Help out in <a href=\"<page getinvolved/volunteer>\">other ways</a>. <a href="
 "\"<page getinvolved/translation>\">Maintain a translation for the website</"
@@ -70,7 +70,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/getinvolved/en/tshirt.wml:36
+#: /home/runa/tor/website/getinvolved/en/tshirt.wml:36
 msgid ""
 "If you qualify, send mail to donations at torproject dot org with a brief "
 "explanation. Be sure to specify a color preference, a size (S/M/L/XL/XXL), a "
@@ -78,7 +78,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/getinvolved/en/tshirt.wml:43
+#: /home/runa/tor/website/getinvolved/en/tshirt.wml:43
 msgid ""
 "You can choose between the traditional black and our conversation-starting "
 "bright green. You can also see the shirts <a href=\"https://trac.torproject.";
@@ -87,9 +87,9 @@
 msgstr ""
 
 #. type: Content of: <div><div><div>
-#: /home/runa/transifex/website/getinvolved/en/tshirt.wml:50
+#: /home/runa/tor/website/getinvolved/en/tshirt.wml:50
 msgid ""
-"<a href=\"tshirt/black-tor-tshirt.png\"><img src=\"tshirt/black-tor-tshirt."
-"png\"></a> <a href=\"tshirt/green-tor-tshirt.png\"><img src=\"tshirt/green-"
-"tor-tshirt.png\"></a>"
+"<a href=\"$(IMGROOT)/black-tor-tshirt.png\"><img src=\"$(IMGROOT)/black-tor-"
+"tshirt.png\"></a> <a href=\"$(IMGROOT)/green-tor-tshirt.png\"><img src="
+"\"$(IMGROOT)/green-tor-tshirt.png\"></a>"
 msgstr ""

Modified: translation/trunk/projects/website/po/templates/getinvolved/4-optional.research.pot
===================================================================
--- translation/trunk/projects/website/po/templates/getinvolved/4-optional.research.pot	2011-02-12 12:18:18 UTC (rev 24216)
+++ translation/trunk/projects/website/po/templates/getinvolved/4-optional.research.pot	2011-02-12 12:21:10 UTC (rev 24217)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-01-03 14:40+0000\n"
+"POT-Creation-Date: 2011-02-12 12:20+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -198,6 +198,15 @@
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/getinvolved/en/research.wml:141
 msgid ""
+"For various diversity metrics, how has the diversity of the Tor network "
+"changed over time? How robust is it to change or attack? These results can "
+"help us make better design decisions. See the <a href=\"<blog>/research-"
+"problem-measuring-safety-tor-network\">blog post</a> for details."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/getinvolved/en/research.wml:148
+msgid ""
 "If we prevent the really loud users from using too much of the Tor network, "
 "how much can it help? We've instrumented Tor's entry relays so they can rate-"
 "limit connections from users, and we've instrumented the directory "
@@ -211,7 +220,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/getinvolved/en/research.wml:154
+#: /home/runa/tor/website/getinvolved/en/research.wml:161
 msgid ""
 "Right now Tor clients are willing to reuse a given circuit for ten minutes "
 "after it's first used. The goal is to avoid loading down the network with "
@@ -228,7 +237,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/getinvolved/en/research.wml:168
+#: /home/runa/tor/website/getinvolved/en/research.wml:175
 msgid ""
 "The \"website fingerprinting attack\": make a list of a few hundred popular "
 "websites, download their pages, and make a set of \"signatures\" for each "
@@ -250,7 +259,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/getinvolved/en/research.wml:195
+#: /home/runa/tor/website/getinvolved/en/research.wml:202
 msgid ""
 "More coming soon. See also the \"Research\" section of the <a href=\"<page "
 "getinvolved/volunteer>#Research\">volunteer</a> page for other topics."

Modified: translation/trunk/projects/website/po/templates/getinvolved/4-optional.volunteer.pot
===================================================================
--- translation/trunk/projects/website/po/templates/getinvolved/4-optional.volunteer.pot	2011-02-12 12:18:18 UTC (rev 24216)
+++ translation/trunk/projects/website/po/templates/getinvolved/4-optional.volunteer.pot	2011-02-12 12:21:10 UTC (rev 24217)
@@ -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-02-12 12:20+0000\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/transifex/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/transifex/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/transifex/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/transifex/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/transifex/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/transifex/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/transifex/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/transifex/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/transifex/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/transifex/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/transifex/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/transifex/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,17 +106,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/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/transifex/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/transifex/website/getinvolved/en/volunteer.wml:52
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:52
 msgid ""
 "Create a <a href=\"https://trac.torproject.org/projects/tor/wiki/";
 "CommunityLogos\">community logo</a> under a Creative Commons license that "
@@ -124,14 +124,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:55
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:55
 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/transifex/website/getinvolved/en/volunteer.wml:57
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:57
 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/";
@@ -141,34 +141,866 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:63
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:63
 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/transifex/website/getinvolved/en/volunteer.wml:65
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:65
 msgid ""
 "Create a t-shirt design that incorporates \"Congratulations! You are using "
 "Tor!\" in any language."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:69
-msgid "<a id=\"Coding\"></a> <a id=\"Summer\"></a> <a id=\"Projects\"></a>"
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:69
+msgid "<a id=\"Projects\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:72
-msgid "<a class=\"anchor\" href=\"#Projects\">Good Coding Projects</a>"
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:70
+msgid "<a class=\"anchor\" href=\"#Projects\">Projects</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:75
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:73
 msgid ""
+"Below are a list of Tor related projects we're developing and/or "
+"maintaining. Most discussions happen on IRC so if you're interested in any "
+"of these (or you have a project idea of your own), then please <a href="
+"\"<page about/contact>#irc\">join us in #tor-dev</a>. Project contributors "
+"are listed by their IRC nicks."
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><th>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:82
+msgid "Name"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><th>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:83
+msgid "Category"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><th>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:84
+msgid "Language"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><th>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:85
+msgid "Activity"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><th>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:86
+msgid "Contributors"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:90
+msgid "<a href=\"#project-tor\">Tor</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:91
+msgid "Core"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:92
+#: /tmp/gq8ebnHYWV.xml:108
+msgid "C"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:93
+#: /tmp/gq8ebnHYWV.xml:101 /tmp/gq8ebnHYWV.xml:133 /tmp/gq8ebnHYWV.xml:181
+msgid "Heavy"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:94
+msgid "nickm, arma, etc"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:98
+msgid "<a href=\"#project-tbb\">TBB</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:99
+#: /tmp/gq8ebnHYWV.xml:107 /tmp/gq8ebnHYWV.xml:115
+msgid "Usability"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:100
+msgid "Multiple"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:102
+msgid "helix"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:106
+msgid "<a href=\"#project-torsocks\">Torsocks</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:109
+#: /tmp/gq8ebnHYWV.xml:117 /tmp/gq8ebnHYWV.xml:125 /tmp/gq8ebnHYWV.xml:157
+#: /tmp/gq8ebnHYWV.xml:165 /tmp/gq8ebnHYWV.xml:197
+msgid "Light"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:110
+msgid "mwenge"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:114
+msgid "*<a href=\"#project-torouter\">Torouter</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:116
+#: /tmp/gq8ebnHYWV.xml:141 /tmp/gq8ebnHYWV.xml:173 /tmp/gq8ebnHYWV.xml:189
+#: /tmp/gq8ebnHYWV.xml:205 /tmp/gq8ebnHYWV.xml:213 /tmp/gq8ebnHYWV.xml:221
+#: /tmp/gq8ebnHYWV.xml:229 /tmp/gq8ebnHYWV.xml:237
+msgid "None"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:118
+msgid "ioerror, Runa"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:122
+msgid "<a href=\"#project-vidalia\">Vidalia</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:123
+#: /tmp/gq8ebnHYWV.xml:131 /tmp/gq8ebnHYWV.xml:139
+msgid "User Interface"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:124
+msgid "C++, Qt"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:126
+msgid "chiiph"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:130
+msgid "<a href=\"#project-arm\">Arm</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:132
+msgid "Python, Curses"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:134
+msgid "atagar"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:138
+msgid "<a href=\"#project-orbot\">Orbot</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:140
+#: /tmp/gq8ebnHYWV.xml:172 /tmp/gq8ebnHYWV.xml:180
+msgid "Java"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:142
+msgid "n8fr8"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:146
+msgid "<a href=\"#project-torbutton\">Torbutton</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:147
+msgid "Browser Add-on"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:148
+msgid "Javascript"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:149
+msgid "Moderate"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:150
+#: /tmp/gq8ebnHYWV.xml:166 /tmp/gq8ebnHYWV.xml:230
+msgid "mikeperry"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:154
+msgid "*<a href=\"#project-thandy\">Thandy</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:155
+msgid "Updater"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:156
+#: /tmp/gq8ebnHYWV.xml:164 /tmp/gq8ebnHYWV.xml:196 /tmp/gq8ebnHYWV.xml:204
+#: /tmp/gq8ebnHYWV.xml:220 /tmp/gq8ebnHYWV.xml:228 /tmp/gq8ebnHYWV.xml:236
+msgid "Python"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:158
+msgid "Sebastian, helix"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:162
+msgid "<a href=\"#project-torctl\">TorCtl</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:163
+#: /tmp/gq8ebnHYWV.xml:171
+msgid "Library"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:170
+msgid "*<a href=\"#project-jtor\">JTor</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:178
+msgid "<a href=\"#project-metrics\">Metrics</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:179
+#: /tmp/gq8ebnHYWV.xml:187 /tmp/gq8ebnHYWV.xml:195 /tmp/gq8ebnHYWV.xml:203
+#: /tmp/gq8ebnHYWV.xml:211
+msgid "Client Service"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:182
+msgid "karsten"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:186
+msgid "<a href=\"#project-torstatus\">TorStatus</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:188
+msgid "PHP"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:194
+msgid "<a href=\"#project-weather\">Weather</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:198
+#: /tmp/gq8ebnHYWV.xml:222
+msgid "kaner"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:202
+msgid "<a href=\"#project-gettor\">GetTor</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:210
+msgid "<a href=\"#project-torcheck\">TorCheck</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:212
+msgid "Python, Perl"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:218
+msgid "<a href=\"#project-bridgedb\">BridgeDB</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:219
+#: /tmp/gq8ebnHYWV.xml:227 /tmp/gq8ebnHYWV.xml:235
+msgid "Backend Service"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:226
+msgid "<a href=\"#project-torflow\">TorFlow</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:234
+msgid "*<a href=\"#project-torbel\">TorBEL</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:238
+msgid "Sebastian"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:242
+msgid ""
+"<sub> * Project is still in an alpha state.  </sub> <br /><br /> <a id="
+"\"project-tor\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:249
+msgid ""
+"Tor (<a href=\"https://gitweb.torproject.org/tor.git\";>code</a>, <a href="
+"\"https://trac.torproject.org/projects/tor/query?";
+"status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Tor"
+"+Client&component=Tor+Relay&component=vidalia&order=priority\">bug tracker</"
+"a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:254
+msgid ""
+"Central project, providing the core software for using and participating in "
+"the Tor network. Numerous people contribute to the project to varying "
+"extents, but the chief architects are Nick Mathewson and Roger Dingledine."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:260
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a href=\"#resistCensorship\">Improving Tor's "
+"ability to resist censorship</a></i><br /> <i><a href=\"#unitTesting"
+"\">Improve our unit testing process</a></i><br /> <i><a href="
+"\"#simulateSlowConnections\">Simulator for slow Internet connections</a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:267
+msgid "<a id=\"project-tbb\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:268
+msgid ""
+"<a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a> (<a href="
+"\"https://gitweb.torproject.org/torbrowser.git\";>code</a>, <a href=\"https://";
+"trac.torproject.org/projects/tor/query?"
+"status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Tor"
+"+bundles/installation&order=priority\">bug tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:274
+msgid ""
+"The Tor Browser Bundle is an easy-to-use portable package of Tor, Vidalia, "
+"and Firefox preconfigured to work together out of the box. This is actively "
+"being worked on by Erinn Clark."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:280
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a href=\"#auditTBB\">Audit Tor Browser "
+"Bundles for data leaks</a></i><br /> <i><a href=\"#usabilityTesting"
+"\">Usability testing of Tor</a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:285
+msgid "<a id=\"project-torsocks\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:286
+msgid ""
+"<a href=\"http://code.google.com/p/torsocks/\";>Torsocks</a> (<a href="
+"\"https://gitweb.torproject.org/torsocks.git\";>code</a>, <a href=\"https://";
+"trac.torproject.org/projects/tor/query?"
+"status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torify&order=priority"
+"\">bug tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:292
+msgid ""
+"Utility for adapting other applications to work with Tor. Development has "
+"slowed and compatibility issues remain with some platforms, but it's "
+"otherwise feature complete."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:298
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a href=\"#torsocksForOSX\">Make torsocks/"
+"dsocks work on OS X</a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:302
+msgid "<a id=\"project-torouter\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:303
+msgid ""
+"<a href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/";
+"Torouter\">Torouter</a> (<a href=\"https://trac.torproject.org/projects/tor/";
+"query?"
+"status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torouter&order=priority"
+"\">bug tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:309
+msgid ""
+"Project to provide an easy-to-use, embedded Tor instance for routers. This "
+"had a couple months of high activity, but has since been rather quiet."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:313
+msgid "<a id=\"project-vidalia\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:314
+msgid ""
+"<a href=\"<page projects/vidalia>\">Vidalia</a> (<a href=\"https://svn.";
+"torproject.org/vidalia/vidalia/trunk/\">code</a>, <a href=\"https://trac.";
+"torproject.org/projects/tor/query?"
+"status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Vidalia&order=priority"
+"\">bug tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:320
+msgid ""
+"The most commonly used user interface for Tor. Matt Edman started the "
+"project in 2006 and brought it to its current stable state. Development "
+"slowed for several years, though TomÃs Touceda has since taken a lead with "
+"pushing the project forward."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:327
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a href=\"#vidaliaStatusEventInterface\">Tor "
+"Controller Status Event Interface for Vidalia</a></i><br /> <i><a href="
+"\"#vidaliaNetworkMap\">An Improved and More Usable Network Map in Vidalia</"
+"a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:332
+msgid "<a id=\"project-arm\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:333
+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.";
+"org/projects/tor/query?"
+"status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=arm&order=priority"
+"\">bug tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:339
+msgid ""
+"Command-line monitor for Tor. This has been under very active development by "
+"its author, Damian Johnson, since early 2009 to make it a better general-"
+"purpose controller for *nix environments."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:345
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a href=\"#armClientMode\">Client Mode Use "
+"Cases for Arm</a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:349
+msgid "<a id=\"project-orbot\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:350
+msgid ""
+"<a href=\"https://guardianproject.info/apps/orbot/\";>Orbot</a> (<a href="
+"\"https://svn.torproject.org/svn/projects/android/trunk/Orbot/\";>code</a>, "
+"<a href=\"https://trac.torproject.org/projects/tor/query?";
+"status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Orbot&order=priority"
+"\">bug tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:356
+msgid ""
+"Provides Tor on the Android platform. This was under very active development "
+"up through Fall 2010, after which things have been quiet."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:361
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a href=\"#orbotDevelopment\">More on Orbot & "
+"Android OS-specific development</a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:365
+msgid "<a id=\"project-torbutton\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:366
+msgid ""
+"<a href=\"<page torbutton/index>\">Torbutton</a> (<a href=\"https://gitweb.";
+"torproject.org/torbutton.git\">code</a>, <a href=\"https://trac.torproject.";
+"org/projects/tor/query?"
+"status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torbutton&order=priority"
+"\">bug tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:372
+msgid ""
+"Firefox addon that addresses many of the client-side threats to browsing the "
+"Internet anonymously. Mike has since continued to adapt it to new threats, "
+"updated versions of Firefox, and possibly <a href=\"https://blog.torproject.";
+"org/blog/google-chrome-incognito-mode-tor-and-fingerprinting\">Chrome as "
+"well</a>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:380
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a href=\"#torbuttonForThunderbird"
+"\">Torbutton equivalent for Thunderbird</a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:384
+msgid "<a id=\"project-thandy\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:385
+msgid "Thandy (<a href=\"https://gitweb.torproject.org/thandy.git\";>code</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:389
+msgid ""
+"Updater for Tor. The project began in the Summer of 2008 but wasn't "
+"completed. Recently interest in it has been rekindled and many aspects of "
+"its design (including the language it'll be in) are currently in flux."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:394
+msgid "<a id=\"project-torctl\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:395
+msgid ""
+"TorCtl (<a href=\"https://gitweb.torproject.org/pytorctl.git\";>code</a>, <a "
+"href=\"https://trac.torproject.org/projects/tor/query?";
+"status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torctl&order=priority"
+"\">bug tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:401
+msgid ""
+"Python bindings and utilities for using the Tor control port. It has been "
+"stable for several years, with only minor revisions."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:405
+msgid "<a id=\"project-jtor\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:406
+msgid ""
+"<a href=\"https://github.com/brl/JTor/wiki\";>JTor</a> (<a href=\"https://";
+"github.com/brl/JTor\">code</a>, <a href=\"https://github.com/brl/JTor/issues";
+"\">bug tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:412
+msgid ""
+"Java implementation of Tor. This project isn't yet complete, and has been "
+"inactive since Fall 2010."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:416
+msgid "<a id=\"project-metrics\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:417
+msgid ""
+"<a href=\"https://metrics.torproject.org/\";>Metrics</a> (code: <a href="
+"\"https://gitweb.torproject.org/metrics-db.git\";>db</a>, <a href=\"https://";
+"gitweb.torproject.org/metrics-utils.git\">utils</a>, <a href=\"https://";
+"gitweb.torproject.org/metrics-web.git\">web</a>, <a href=\"https://gitweb.";
+"torproject.org/metrics.git\">general</a>, <a href=\"https://trac.torproject.";
+"org/projects/tor/query?"
+"status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Metrics&order=priority"
+"\">bug tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:426
+msgid ""
+"Processing and analytics of consensus data, provided to users via the "
+"metrics portal. This has been under active development for several years by "
+"Karsten Loesing."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:432
+msgid ""
+"<b>Project Ideas:</b><br /> <i><a href=\"#trackNetworkStatus\">Help track "
+"the overall Tor Network status</a></i>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:436
+msgid "<a id=\"project-torstatus\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:437
+msgid ""
+"<a href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorStatus";
+"\">TorStatus</a> (<a href=\"https://svn.torproject.org/svn/torstatus/trunk/";
+"\">code</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:441
+msgid ""
+"Portal providing an overview of the Tor network, and details on any of its "
+"current relays. Though very actively used, this project has been "
+"unmaintained for a long while."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:446
+msgid "<a id=\"project-weather\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:447
+msgid ""
+"<a href=\"https://trac.torproject.org/projects/tor/wiki/projects/Weather";
+"\">Weather</a> (<a href=\"https://gitweb.torproject.org/weather.git\";>code</"
+"a>, <a href=\"https://trac.torproject.org/projects/tor/query?";
+"status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Tor"
+"+Weather&order=priority\">bug tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:453
+msgid ""
+"Provides automatic notification to subscribed relay operators when their "
+"relay's unreachable. This underwent a rewrite by the <a href=\"http://hfoss.";
+"wesleyan.edu/\">Wesleyan HFOSS team</a>, which went live in early 2011."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:459
+msgid "<a id=\"project-gettor\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:460
+msgid ""
+"<a href=\"https://trac.torproject.org/projects/tor/wiki/projects/";
+"EmailAutoResponder\">GetTor</a> (<a href=\"https://svn.torproject.org/svn/";
+"projects/gettor/\">code</a>, <a href=\"https://trac.torproject.org/projects/";
+"tor/query?"
+"status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=GetTor&order=priority"
+"\">bug tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:466
+msgid ""
+"E-mail autoresponder providing Tor's packages over SMTP. This has been "
+"relatively unchanged for quite a while."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:470
+msgid "<a id=\"project-torcheck\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:471
+msgid ""
+"<a href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorCheck";
+"\">TorCheck</a> (<a href=\"https://svn.torproject.org/svn/check/trunk/";
+"\">code</a>, <a href=\"https://trac.torproject.org/projects/tor/query?";
+"status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Tor"
+"+Check&order=priority\">bug tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:477
+msgid ""
+"Provides a simple site for determining if the visitor is using Tor or not.  "
+"This has been relatively unchanged for quite a while."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:481
+msgid "<a id=\"project-bridgedb\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:482
+msgid ""
+"<a href=\"https://trac.torproject.org/projects/tor/wiki/projects/BridgeDB";
+"\">BridgeDB</a> (<a href=\"https://gitweb.torproject.org/bridgedb.git";
+"\">code</a>, <a href=\"https://trac.torproject.org/projects/tor/query?";
+"status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=BridgeDB&order=priority"
+"\">bug tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:488
+msgid ""
+"Backend bridge distributor, handling the various pools they're distributed "
+"in. This was actively developed until Fall of 2010."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:492
+msgid "<a id=\"project-torflow\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:493
+msgid ""
+"<a href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorFlow";
+"\">TorFlow</a> (<a href=\"https://gitweb.torproject.org/torflow.git\";>code</"
+"a>, <a href=\"https://trac.torproject.org/projects/tor/query?";
+"status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torflow&order=priority"
+"\">bug tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:499
+msgid ""
+"Library and collection of services for actively monitoring the Tor network.  "
+"These include the Bandwidth Scanners (measuring throughput of relays) and "
+"SoaT (scans for malicious or misconfigured exit nodes). SoaT was last "
+"actively developed in the Summer of 2010, and the Bandwidth Scanners a few "
+"months later. Both have been under active use since then, but development "
+"has stopped."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:507
+msgid "<a id=\"project-torbel\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:508
+msgid ""
+"<a href=\"https://trac.torproject.org/projects/tor/wiki/projects/";
+"TorBulkExitlist\">TorBEL</a> (<a href=\"https://gitweb.torproject.org/";
+"tordnsel.git\">code</a>, <a href=\"https://trac.torproject.org/projects/tor/";
+"query?"
+"status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=TorDNSEL/"
+"TorBEL&order=priority\">bug tracker</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:515
+msgid ""
+"The Tor Bulk Exitlist provides a method of identifying if IPs belong to exit "
+"nodes or not. This is a replacement for TorDNSEL which is a stable (though "
+"unmaintained) Haskell application for this purpose. The initial version of "
+"TorBEL was started in GSOC 2010 but since then the project has been inactive."
+msgstr ""
+
+#
+#.     Copy and fill out the following for new projects:
+#.     
+#.     <a id="project-">
+#. </a>
+#.     <h3><a href=""></a> (<a
+#.     href="">code</a>, <a
+#.     href="">bug
+#.     tracker</a>)</h3>
+#.     
+#.     <p>
+#.     </p>
+#.     
+#.     
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:536
+msgid "<a id=\"Coding\"></a> <a id=\"Summer\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:538
+msgid "<a class=\"anchor\" href=\"#Coding\">Project Ideas</a>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:541
+msgid ""
 "You may find some of these projects to be good <a href=\"<page about/gsoc>"
-"\">Google Summer of Code 2010</a> ideas. We have labelled each idea with how "
+"\">Google Summer of Code 2011</a> ideas. We have labelled each idea with how "
 "useful it would be to the overall Tor project (priority), how much work we "
 "expect it would be (effort level), how much clue you should start with "
 "(skill level), and which of our <a href=\"<page about/corepeople>\">core "
@@ -179,8 +1011,13 @@
 "applications."
 msgstr ""
 
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:555
+msgid "<a id=\"auditTBB\"></a>"
+msgstr ""
+
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:90
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:557
 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 "
@@ -188,7 +1025,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:99
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:566
 msgid ""
 "The Tor Browser Bundle incorporates Tor, Firefox, Polipo, and the Vidalia "
 "user interface (and optionally the <a href=\"http://pidgin.im/\";>Pidgin</a> "
@@ -199,7 +1036,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:105
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:572
 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, "
@@ -207,7 +1044,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:108
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:575
 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 "
@@ -215,14 +1052,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:111
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:578
 msgid ""
 "If you would like to help extend or do security auditing for TBB, please "
 "contact Erinn."
 msgstr ""
 
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:582
+msgid "<a id=\"trackNetworkStatus\"></a>"
+msgstr ""
+
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:116
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:584
 msgid ""
 "<b>Help track the overall Tor Network status</b> <br> Priority: <i>Medium to "
 "High</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium</i> "
@@ -230,7 +1072,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:125
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:593
 msgid ""
 "It would be great to set up an automated system for tracking network health "
 "over time, graphing it, etc. Part of this project would involve inventing "
@@ -243,7 +1085,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:133
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:601
 msgid ""
 "Data could be collected from the Tor Network Scanners in <a href=\"https://";
 "svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a>, from the server "
@@ -254,16 +1096,21 @@
 "org/or/talk/Jan-2008/msg00300.html\">Tor Status wish list</a>."
 msgstr ""
 
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:611
+msgid "<a id=\"resistCensorship\"></a>"
+msgstr ""
+
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:144
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:613
 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</i>"
+"<i>High</i> <br> Likely Mentors: <i>Roger, Nick, Steven, Jake</i>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:153
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:622
 msgid ""
 "The Tor 0.2.1.x series makes <a href=\"<svnprojects>design-paper/blocking."
 "html\">significant improvements</a> in resisting national and organizational "
@@ -272,9 +1119,9 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:158
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:627
 msgid ""
-"One huge category of work is adding features to our <a href=\"http://gitweb.";
+"One huge category of work is adding features to our <a href=\"https://gitweb.";
 "torproject.org/bridgedb.git?a=tree\">BridgeDB</a> service (Python). Tor aims "
 "to give out <a href=\"<page docs/bridges>\">bridge relay addresses</a> to "
 "users that can't reach the Tor network directly, but there's an arms race "
@@ -286,7 +1133,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:169
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:638
 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 "
@@ -297,7 +1144,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:176
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:645
 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 "
@@ -305,62 +1152,13 @@
 "censorship resistance with usability and robustness."
 msgstr ""
 
-#. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:184
-msgid ""
-"<b>Tor Controller Status Event Interface for Vidalia</b> <br> Priority: "
-"<i>Medium</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Low to "
-"Medium</i> <br> Likely Mentors: <i>Matt</i>"
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:652
+msgid "<a id=\"armClientMode\"></a>"
 msgstr ""
 
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:193
-msgid ""
-"There are a number of status changes inside Tor of which the user may need "
-"to be informed. For example, if the user is trying to set up his Tor as a "
-"relay and Tor decides that its ports are not reachable from outside the "
-"user's network, we should alert the user. Currently, all the user gets is a "
-"couple of log messages in Vidalia's 'message log' window, which they likely "
-"never see since they don't receive a notification that something has gone "
-"wrong. Even if the user does actually look at the message log, most of the "
-"messages make little sense to the novice user."
-msgstr ""
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:201
-msgid ""
-"Tor has the ability to inform Vidalia of many such status changes, and we "
-"recently implemented support for a couple of these events. Still, there are "
-"many more status events which the user should be informed of, and we need a "
-"better UI for actually displaying them to the user."
-msgstr ""
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:206
-msgid ""
-"The goal of this project then is to design and implement a UI for displaying "
-"Tor status events to the user. For example, we might put a little badge on "
-"Vidalia's tray icon that alerts the user to new status events they should "
-"look at. Double-clicking the icon could bring up a dialog that summarizes "
-"recent status events in simple terms and maybe suggests a remedy for any "
-"negative events if they can be corrected by the user. Of course, this is "
-"just an example and one is free to suggest another approach."
-msgstr ""
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:214
-msgid ""
-"A person undertaking this project should have good UI design and layout "
-"skills and some C++ development experience. Previous experience with Qt and "
-"Qt's Designer will be very helpful, but are not required. Some English "
-"writing ability will also be useful, since this project will likely involve "
-"writing small amounts of help documentation that should be understandable by "
-"non-technical users. Bonus points for some graphic design/Photoshop fu, "
-"since we might want/need some shiny new icons too."
-msgstr ""
-
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:224
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:654
 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 "
@@ -368,7 +1166,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:233
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:663
 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, "
@@ -379,14 +1177,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:241
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:671
 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/transifex/website/getinvolved/en/volunteer.wml:245
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:675
 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 "
@@ -399,21 +1197,21 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:254
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:684
 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/transifex/website/getinvolved/en/volunteer.wml:257
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:687
 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/transifex/website/getinvolved/en/volunteer.wml:260
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:690
 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://";
@@ -421,7 +1219,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:265
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:695
 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 "
@@ -429,7 +1227,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:269
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:699
 msgid ""
 "Menus as an alternative to hotkeys to make the interface more intuitive and "
 "usable for beginners (<a href=\"http://gnosis.cx/publish/programming/";
@@ -437,13 +1235,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:273
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:703
 msgid ""
 "Look at Vidalia and TorK for ideas and solicit input from the Tor community."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:275
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:705
 msgid ""
 "Make it easier for users to install arm by <a href=\"https://secure.";
 "wikimedia.org/wikipedia/en/wiki/Opkg\">packaging for OpenWrt</a> (as a UI "
@@ -452,14 +1250,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:282
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:712
 msgid ""
 "For more project ideas see arm's <a href=\"https://svn.torproject.org/svn/";
 "arm/trunk/TODO\">TODO</a>."
 msgstr ""
 
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:716
+msgid "<a id=\"unitTesting\"></a>"
+msgstr ""
+
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:287
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:718
 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 "
@@ -467,7 +1270,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:296
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:727
 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 "
@@ -477,7 +1280,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:302
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:733
 msgid ""
 "Additionally, we need to automate our performance testing. We've got "
 "buildbot to automate our regular integration and compile testing already "
@@ -489,48 +1292,21 @@
 "different roles automatically."
 msgstr ""
 
-#. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:313
-msgid ""
-"<b>Help with independent Tor client implementations</b> <br> Priority: "
-"<i>Medium</i> <br> Effort Level: <i>High</i> <br> Skill Level: <i>Medium to "
-"High</i> <br> Likely Mentors: <i>Bruce, Nathan</i>"
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:743
+msgid "<a id=\"orbotDevelopment\"></a>"
 msgstr ""
 
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:322
-msgid ""
-"Others are currently working on Tor clients for Java, Android, and Maemo "
-"environments.  The first step is to get a handle on the current state of the "
-"project in which you are interested in helping; <a href=\"http://github.com/";
-"brl/JTor\">Tor for Java</a>, <a href=\"https://svn.torproject.org/svn/";
-"projects/android/trunk/\">Android/Orbot</a>, or <a href=\"<page docs/N900>"
-"\">Tor for Maemo</a>. Check out the repository and familiarize yourself with "
-"the source code.  Further, support for requesting or even providing Tor "
-"hidden services would be neat, but not required."
-msgstr ""
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:331
-msgid ""
-"A prospective developer should be able to understand and write new Java "
-"code, including a Java cryptography API. Being able to read C code would be "
-"helpful, too. One should be willing to read the existing documentation, "
-"implement code based on it, and refine the documentation when things are "
-"underdocumented. This project is mostly about coding and to a small degree "
-"about design."
-msgstr ""
-
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:340
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:745
 msgid ""
 "<b>More on Orbot &amp; Android OS-specific development</b> <br/> <br> "
 "Priority: <i>Medium</i> <br> Effort Level: <i>High</i> <br> Skill Level: "
-"<i>Medium to High</i> <br> Likely Mentors: <i>Nathan</i>"
+"<i>Medium to High</i> <br> Likely Mentors: <i>Nathan, Jake</i>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:350
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:755
 msgid ""
 "<b>Android Java UI work:</b> Improved home screen to show better statistics "
 "about data transferred (up/down), number of circuits connected, quality of "
@@ -544,7 +1320,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:362
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:767
 msgid ""
 "<b>Android Java OS/Core app work:</b> Better system-wide indication, either "
 "via the notification bar, \"Toast\" pop-up dialogs or some other indicator, "
@@ -556,7 +1332,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:371
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:776
 msgid ""
 "<b>Android Java Library/Community Outreach work:</b> We need to package a "
 "simple library for use with third-party application to easily enable them to "
@@ -570,7 +1346,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:382
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:787
 msgid ""
 "<b>Android OS/C/Linux work:</b> The port of Tor to Android is basically a "
 "straight cross-compile to Linux ARM. There has been no work done in looking "
@@ -582,167 +1358,280 @@
 "forth."
 msgstr ""
 
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:798
+msgid "<a id=\"simulateSlowConnections\"></a>"
+msgstr ""
+
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:394
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:800
 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> <br> Many users of Tor have poor-quality Internet "
-"connections, giving low bandwidth, high latency, and high packet loss/re-"
-"ordering. User experience is that Tor reacts badly to these conditions, but "
-"it is difficult to improve the situation without being able to repeat the "
-"problems in the lab.  <br> This project would be to build a simulation "
-"environment which replicates the poor connectivity so that the effect on Tor "
-"performance can be measured. Other components would be a testing utility to "
-"establish what are the properties of connections available, and to measure "
-"the effect of performance-improving modifications to Tor.  <br> The tools "
-"used would be up to the student, but dummynet (for FreeBSD)  and nistnet "
-"(for Linux) are two potential components on which this project could be "
-"built. Students should be experienced with network programming/debugging and "
-"TCP/IP, and preferably familiar with C and a scripting language."
+"Mentors: <i>Steven</i>"
 msgstr ""
 
-#. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:424
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:810
 msgid ""
-"<b>An Improved and More Usable Network Map in Vidalia</b> <br> Priority: "
-"<i>Low to Medium</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: "
-"<i>Medium</i> <br> Likely Mentors: <i>Matt</i> <br> One of Vidalia's "
-"existing features is a network map that shows the user the approximate "
-"geographic location of relays in the Tor network and plots the paths the "
-"user's traffic takes as it is tunneled through the Tor network. The map is "
-"currently not very interactive and has rather poor graphics. Instead, we "
-"implemented KDE's Marble widget such that it gives us a better quality map "
-"and enables improved interactivity, such as allowing the user to click on "
-"individual relays or circuits to display additional information. We want to "
-"add the ability for users to click on a particular relay or a country "
-"containing one or more Tor exit relays and say, \"I want my connections to "
-"exit from here.\" <br> This project will first involve getting familiar with "
-"Vidalia and the Marble widget's API. One will then integrate the widget into "
-"Vidalia and customize Marble to be better suited for our application, such "
-"as making circuits clickable, storing cached map data in Vidalia's own data "
-"directory, and customizing some of the widget's dialogs.  <br> A person "
-"undertaking this project should have good C++ development experience. "
-"Previous experience with Qt and CMake is helpful, but not required."
+"Many users of Tor have poor-quality Internet connections, giving low "
+"bandwidth, high latency, and high packet loss/re-ordering. User experience "
+"is that Tor reacts badly to these conditions, but it is difficult to improve "
+"the situation without being able to repeat the problems in the lab."
 msgstr ""
 
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:818
+msgid ""
+"This project would be to build a simulation environment which replicates the "
+"poor connectivity so that the effect on Tor performance can be measured. "
+"Other components would be a testing utility to establish what are the "
+"properties of connections available, and to measure the effect of "
+"performance-improving modifications to Tor."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:826
+msgid ""
+"The tools used would be up to the student, but dummynet (for FreeBSD)  and "
+"nistnet (for Linux) are two potential components on which this project could "
+"be built. Students should be experienced with network programming/debugging "
+"and TCP/IP, and preferably familiar with C and a scripting language."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:834
+msgid "<a id=\"torbuttonForThunderbird\"></a>"
+msgstr ""
+
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:458
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:836
 msgid ""
 "<b>Torbutton equivalent for Thunderbird</b> <br> Priority: <i>Medium</i> "
 "<br> Effort Level: <i>High</i> <br> Skill Level: <i>High</i> <br> Likely "
-"Mentors: <i>Mike</i> <br> We're hearing from an increasing number of users "
-"that they want to use Thunderbird with Tor. However, there are plenty of "
-"application-level concerns, for example, by default Thunderbird will put "
-"your hostname in the outgoing mail that it sends. At some point we should "
-"start a new push to build a Thunderbird extension similar to Torbutton."
+"Mentors: <i>Mike</i>"
 msgstr ""
 
-#. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:476
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:846
 msgid ""
-"<b>Improvements for Tor+Vidalia interaction on Linux/Unix platforms</b> <br> "
-"Priority: <i>Medium</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: "
-"<i>Medium</i> <br> Likely Mentors: <i>Erinn, Peter</i> <br> Vidalia "
-"currently doesn't play nicely with Tor on Linux and Unix platforms.  "
-"Currently, on Debian and Ubuntu, there is a configuration mechanism which "
-"allows Vidalia to override Tor's ability to start on boot (by sourcing "
-"<code>/etc/default/tor.vidalia</code> which sets <code>RUN_DAEMON=no</code> "
-"at the user's request), but full implementation of <a href=\"<gitblob>doc/"
-"spec/control-spec.txt\">ControlPort</a> communication is still required.  "
-"<br> A better solution on Linux and Unix platforms would be to use Tor's "
-"ControlSocket, which allows Vidalia to talk to Tor via a Unix domain socket, "
-"and could possibly be enabled by default in Tor's distribution packages.  "
-"Vidalia can then authenticate to Tor using filesystem-based (cookie)  "
-"authentication if the user running Vidalia is also in the distribution-"
-"specific tor group.  <br> This project will first involve adding support for "
-"Tor's ControlSocket to Vidalia. The student will then develop and test this "
-"support on various distributions to make sure it behaves in a predictable "
-"and consistent manner on all of them.  <br> The next challenge would be to "
-"find an intuitive and usable way for Vidalia to be able to change Tor's "
-"configuration (torrc) even though it is located in <code>/etc/tor/torrc</"
-"code> and thus immutable. In Debian and Ubuntu we handle this with the "
-"aforementioned <code>/etc/default/tor.vidalia</code> but this functionality "
-"could (or should) be less distribution-specific.  <br> The best idea we've "
-"come up with so far is to feed Tor a new configuration via the ControlSocket "
-"when Vidalia starts, but that's bad because if the user is not using the "
-"latest Debian/Ubuntu packages, they may not have disabled Tor's ability to "
-"run on boot and will end up with a configuration that is different from what "
-"they want. The second best idea we've come up with is for Vidalia to write "
-"out a temporary torrc file and ask the user to manually move it to <code>/"
-"etc/tor/torrc</code>, but that's bad because users shouldn't have to mess "
-"with files directly.  <br> A person undertaking this project should have "
-"prior knowledge of various Linux distributions and their packaging "
-"mechanisms as well as some C++ development experience. Previous experience "
-"with Qt is helpful, but not required."
+"We're hearing from an increasing number of users that they want to use "
+"Thunderbird with Tor. However, there are plenty of application-level "
+"concerns, for example, by default Thunderbird will put your hostname in the "
+"outgoing mail that it sends. At some point we should start a new push to "
+"build a Thunderbird extension similar to Torbutton."
 msgstr ""
 
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:854
+msgid "<a id=\"usabilityTesting\"></a>"
+msgstr ""
+
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:527
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:856
 msgid ""
 "<b>Usability testing of Tor</b> <br> Priority: <i>Medium</i> <br> Effort "
 "Level: <i>Medium</i> <br> Skill Level: <i>Low to Medium</i> <br> Likely "
-"Mentors: <i>Andrew</i> <br> Especially the browser bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
+"Mentors: <i>Andrew</i>"
 msgstr ""
 
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:866
+msgid ""
+"Especially the browser bundle, ideally amongst our target demographic.  That "
+"would help a lot in knowing what needs to be done in terms of bug fixes or "
+"new features. We get this informally at the moment, but a more structured "
+"process would be better."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:873
+msgid ""
+"Please note that since this isn't a coding project, it isn't suitable for "
+"Google Summer of Code."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:878
+msgid "<a id=\"authenticatingIrcProxy\"></a>"
+msgstr ""
+
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:544
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:880
 msgid ""
 "<b>An authenticating IRC proxy</b> <br> Priority: <i>Low</i> <br> Effort "
 "Level: <i>Medium to High</i> <br> Skill Level: <i>Medium to High</i> <br> "
-"Likely Mentors: <i>Sebastian, Weasel, Roger</i> <br> The world needs an "
-"authenticating irc proxy. As we're periodically reminded from the Penny "
-"Arcade web comic, \"Internet user + anonymity = jerk\". With respect to "
-"websites we're actually doing ok, since websites can make their users log in "
-"and use other application-level authentication approaches. But IRC servers "
-"are much worse off, because most IRC server code is poorly written: hard to "
-"maintain, and harder to modify. Many IRC networks now block connections from "
-"Tor, and we're basically down to two holdouts (OFTC and Freenode). This "
-"state of affairs means that a lot of people around the world are thinking "
-"\"I told you so\" about anonymity online, when in fact the problem is simply "
-"lack of technology to make the problem manageable. We need some way to let "
-"the IRC networks distinguish which users have developed a reputation as not "
-"being jerks, so they can treat the two groups separately. There are some "
-"really cool research designs like <a href=\"http://www.cs.dartmouth.edu/";
-"~nymble/\">Nymble</a>, which aim to let websites blacklist users without "
-"needing to learn who they are.  But Nymble is designed around web "
-"interactions. We need to build the glue around the IRC protocol that would "
-"let us plug in a project like Nymble (or a simpler one to start, as a proof-"
-"of-concept). One way to do that would be to build an IRC proxy that knows "
-"how to hear from IRC clients, knows how to talk to IRC servers, and has an "
-"additional layer that requires the users to authenticate.  Some work on this "
-"has begun by other volunteers, see their progress at <a href=\"http://github.";
-"com/anonirc/orc\">http://github.com/anonirc/orc</a>."
+"Likely Mentors: <i>Sebastian, Peter, Roger</i>"
 msgstr ""
 
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:890
+msgid ""
+"The world needs an authenticating irc proxy. As we're periodically reminded "
+"from the Penny Arcade web comic, \"Internet user + anonymity = jerk\". With "
+"respect to websites we're actually doing ok, since websites can make their "
+"users log in and use other application-level authentication approaches. But "
+"IRC servers are much worse off, because most IRC server code is poorly "
+"written: hard to maintain, and harder to modify. Many IRC networks now block "
+"connections from Tor, and we're basically down to two holdouts (OFTC and "
+"Freenode). This state of affairs means that a lot of people around the world "
+"are thinking \"I told you so\" about anonymity online, when in fact the "
+"problem is simply lack of technology to make the problem manageable. We need "
+"some way to let the IRC networks distinguish which users have developed a "
+"reputation as not being jerks, so they can treat the two groups separately. "
+"There are some really cool research designs like <a href=\"http://www.cs.";
+"dartmouth.edu/~nymble/\">Nymble</a>, which aim to let websites blacklist "
+"users without needing to learn who they are.  But Nymble is designed around "
+"web interactions. We need to build the glue around the IRC protocol that "
+"would let us plug in a project like Nymble (or a simpler one to start, as a "
+"proof-of-concept). One way to do that would be to build an IRC proxy that "
+"knows how to hear from IRC clients, knows how to talk to IRC servers, and "
+"has an additional layer that requires the users to authenticate.  Some work "
+"on this has begun by other volunteers, see their progress at <a href="
+"\"https://github.com/anonirc/orc\";>https://github.com/anonirc/orc</a>."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:916
+msgid "<a id=\"torsocksForOSX\"></a>"
+msgstr ""
+
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:580
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:918
 msgid ""
 "<b>Make torsocks/dsocks work on OS X</b> <br> Priority: <i>Medium</i> <br> "
 "Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium</i> <br> Likely "
-"Mentors: <i>?</i> <br> <a href=\"http://code.google.com/p/torsocks/";
-"\">Torsocks</a> and <a href=\"http://code.google.com/p/dsocks/\";>dsocks</a> "
-"are wrappers that will run applications, intercept their outgoing network "
-"connections, and push those connections through Tor. The goal is to handle "
-"applications that don't support proxies (or don't supporting them well). To "
-"get it right, they need to intercept many system calls. The syscalls you "
-"need to intercept on Linux differ dramatically from those on BSD. So "
-"Torsocks works fine on Linux, dsocks works ok on BSD (though it may be less "
-"maintained and thus might miss more syscalls), and nothing works well on "
-"both. First, we should patch dsocks to use Tor's <i>mapaddress</i> commands "
-"from the controller interface, so we don't waste a whole round-trip inside "
-"Tor doing the resolve before connecting. Second, we should make our "
-"<i>torify</i> script detect which of torsocks or dsocks is installed, and "
-"call them appropriately. This probably means unifying their interfaces, and "
-"might involve sharing code between them or discarding one entirely."
+"Mentors: <i>?</i>"
 msgstr ""
 
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:928
+msgid ""
+"<a href=\"https://code.google.com/p/torsocks/\";>Torsocks</a> and <a href="
+"\"https://code.google.com/p/dsocks/\";>dsocks</a> are wrappers that will run "
+"applications, intercept their outgoing network connections, and push those "
+"connections through Tor. The goal is to handle applications that don't "
+"support proxies (or don't supporting them well). To get it right, they need "
+"to intercept many system calls. The syscalls you need to intercept on Linux "
+"differ dramatically from those on BSD. So Torsocks works fine on Linux, "
+"dsocks works ok on BSD (though it may be less maintained and thus might miss "
+"more syscalls), and nothing works well on both. First, we should patch "
+"dsocks to use Tor's <i>mapaddress</i> commands from the controller "
+"interface, so we don't waste a whole round-trip inside Tor doing the resolve "
+"before connecting. Second, we should make our <i>torify</i> script detect "
+"which of torsocks or dsocks is installed, and call them appropriately. This "
+"probably means unifying their interfaces, and might involve sharing code "
+"between them or discarding one entirely."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:947
+msgid "<a id=\"vidaliaStatusEventInterface\"></a>"
+msgstr ""
+
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:609
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:949
 msgid ""
+"<b>Tor Controller Status Event Interface for Vidalia</b> <br> Priority: "
+"<i>Medium</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Low to "
+"Medium</i> <br> Likely Mentors: <i>TomÃs?</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:958
+msgid ""
+"There are a number of status changes inside Tor of which the user may need "
+"to be informed. For example, if the user is trying to set up his Tor as a "
+"relay and Tor decides that its ports are not reachable from outside the "
+"user's network, we should alert the user. Currently, all the user gets is a "
+"couple of log messages in Vidalia's 'message log' window, which they likely "
+"never see since they don't receive a notification that something has gone "
+"wrong. Even if the user does actually look at the message log, most of the "
+"messages make little sense to the novice user."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:966
+msgid ""
+"Tor has the ability to inform Vidalia of many such status changes, and we "
+"recently implemented support for a couple of these events. Still, there are "
+"many more status events which the user should be informed of, and we need a "
+"better UI for actually displaying them to the user."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:971
+msgid ""
+"The goal of this project then is to design and implement a UI for displaying "
+"Tor status events to the user. For example, we might put a little badge on "
+"Vidalia's tray icon that alerts the user to new status events they should "
+"look at. Double-clicking the icon could bring up a dialog that summarizes "
+"recent status events in simple terms and maybe suggests a remedy for any "
+"negative events if they can be corrected by the user. Of course, this is "
+"just an example and one is free to suggest another approach."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:979
+msgid ""
+"A person undertaking this project should have good UI design and layout "
+"skills and some C++ development experience. Previous experience with Qt and "
+"Qt's Designer will be very helpful, but are not required. Some English "
+"writing ability will also be useful, since this project will likely involve "
+"writing small amounts of help documentation that should be understandable by "
+"non-technical users. Bonus points for some graphic design/Photoshop fu, "
+"since we might want/need some shiny new icons too."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:988
+msgid "<a id=\"vidaliaNetworkMap\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:990
+msgid ""
+"<b>An Improved and More Usable Network Map in Vidalia</b> <br> Priority: "
+"<i>Low to Medium</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: "
+"<i>Medium</i> <br> Likely Mentors: <i>TomÃs?</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1000
+msgid ""
+"One of Vidalia's existing features is a network map that shows the user the "
+"approximate geographic location of relays in the Tor network and plots the "
+"paths the user's traffic takes as it is tunneled through the Tor network. "
+"The map is currently not very interactive and has rather poor graphics. "
+"Instead, we implemented KDE's Marble widget such that it gives us a better "
+"quality map and enables improved interactivity, such as allowing the user to "
+"click on individual relays or circuits to display additional information. We "
+"want to add the ability for users to click on a particular relay or a "
+"country containing one or more Tor exit relays and say, \"I want my "
+"connections to exit from here.\""
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1014
+msgid ""
+"This project will first involve getting familiar with Vidalia and the Marble "
+"widget's API. One will then integrate the widget into Vidalia and customize "
+"Marble to be better suited for our application, such as making circuits "
+"clickable, storing cached map data in Vidalia's own data directory, and "
+"customizing some of the widget's dialogs."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1022
+msgid ""
+"A person undertaking this project should have good C++ development "
+"experience. Previous experience with Qt and CMake is helpful, but not "
+"required."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1121
+msgid ""
 "<b>Bring up new ideas!</b> <br> Don't like any of these? Look at the <a href="
 "\"<gitblob>doc/roadmaps/2008-12-19-roadmap-full.pdf\">Tor development "
 "roadmap</a> for more ideas, or just try out Tor, Vidalia, and Torbutton, and "
@@ -751,19 +1640,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:621
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1133
 msgid "<a id=\"OtherCoding\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:622
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1134
 msgid ""
 "<a class=\"anchor\" href=\"#OtherCoding\">Other Coding and Design related "
 "ideas</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:624
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1136
 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 "
@@ -778,7 +1667,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:637
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1149
 msgid ""
 "We need to actually start building our <a href=\"<page docs/"
 "documentation>#DesignDoc\">blocking-resistance design</a>. This involves "
@@ -788,7 +1677,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:643
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1155
 msgid ""
 "We need a flexible simulator framework for studying end-to-end traffic "
 "confirmation attacks. Many researchers have whipped up ad hoc simulators to "
@@ -802,7 +1691,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:653
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1165
 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 "
@@ -811,30 +1700,29 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:659
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1171
 msgid ""
-"Perform a security analysis of Tor with <a href=\"http://en.wikipedia.org/";
-"wiki/Fuzz_testing\">\"fuzz\"</a>. Determine if there are good fuzzing "
-"libraries out there for what we want. Win fame by getting credit when we put "
-"out a new release because of you!"
+"Perform a security analysis of Tor with <a href=\"https://secure.wikimedia.";
+"org/wikipedia/en/wiki/Fuzz_testing\">\"fuzz\"</a>. Determine if there are "
+"good fuzzing libraries out there for what we want. Win fame by getting "
+"credit when we put out a new release because of you!"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:664
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1176
 msgid ""
 "Tor uses TCP for transport and TLS for link encryption. This is nice and "
 "simple, but it means all cells on a link are delayed when a single packet "
 "gets dropped, and it means we can only reasonably support TCP streams. We "
-"have a <a href=\"https://trac.torproject.org/projects/tor/wiki/";
-"TheOnionRouter/TorFAQ#YoushouldtransportallIPpacketsnotjustTCPpackets."
-"\">list of reasons why we haven't shifted to UDP transport</a>, but it would "
-"be great to see that list get shorter. We also have a proposed <a href="
-"\"<gitblob>doc/spec/proposals/100-tor-spec-udp.txt\">specification for Tor "
-"and UDP</a> &mdash; please let us know what's wrong with it."
+"have a <a href=\"<page docs/faq>#TransportIPnotTCP\">list of reasons why we "
+"haven't shifted to UDP transport</a>, but it would be great to see that list "
+"get shorter. We also have a proposed <a href=\"<gitblob>doc/spec/"
+"proposals/100-tor-spec-udp.txt\">specification for Tor and UDP</a> &mdash; "
+"please let us know what's wrong with it."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:675
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1187
 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 "
@@ -842,7 +1730,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:679
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1191
 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> "
@@ -853,7 +1741,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:686
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1198
 msgid ""
 "How can we make the various LiveCD/USB systems easier to maintain, improve, "
 "and document? One example is <a href=\"https://amnesia.boum.org/\";>The "
@@ -861,7 +1749,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:693
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1205
 msgid ""
 "Another anti-censorship project is to try to make Tor more scanning-"
 "resistant.  Right now, an adversary can identify <a href=\"<gitblob>doc/spec/"
@@ -875,17 +1763,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:707
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1219
 msgid "<a id=\"Research\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:708
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1220
 msgid "<a class=\"anchor\" href=\"#Research\">Research</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:710
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1222
 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:";
@@ -899,7 +1787,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:720
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1232
 msgid ""
 "A related question is: Does running a relay/bridge provide additional "
 "protection against these timing attacks? Can an external adversary that "
@@ -919,7 +1807,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:735
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1247
 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 "
@@ -938,7 +1826,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:750
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1262
 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 "
@@ -953,7 +1841,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:760
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1272
 msgid ""
 "Other research questions regarding geographic diversity consider the "
 "tradeoff between choosing an efficient circuit and choosing a random "
@@ -965,7 +1853,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:767
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1279
 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 "
@@ -982,7 +1870,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:779
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1291
 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 "
@@ -993,7 +1881,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:786
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1298
 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."
@@ -1009,7 +1897,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:797
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1309
 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 "
@@ -1020,7 +1908,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:804
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1316
 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 "
@@ -1028,7 +1916,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:807
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1319
 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 "
@@ -1048,7 +1936,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:824
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1336
 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 "
@@ -1056,7 +1944,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/getinvolved/en/volunteer.wml:832
+#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1344
 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-02-12 12:18:18 UTC (rev 24216)
+++ translation/trunk/projects/website/po/templates/press/3-low.inthemedia.pot	2011-02-12 12:21:10 UTC (rev 24217)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-01-03 14:39+0000\n"
+"POT-Creation-Date: 2011-02-12 12:20+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -44,100 +44,151 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/tor/website/press/en/inthemedia.wml:27 /tmp/RSE70o2_2j.xml:136
+#: /home/runa/tor/website/press/en/inthemedia.wml:27 /tmp/nRA6ZM91EX.xml:157
 msgid "Date"
 msgstr ""
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/tor/website/press/en/inthemedia.wml:28 /tmp/RSE70o2_2j.xml:137
+#: /home/runa/tor/website/press/en/inthemedia.wml:28 /tmp/nRA6ZM91EX.xml:158
 msgid "Publication"
 msgstr ""
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/tor/website/press/en/inthemedia.wml:29 /tmp/RSE70o2_2j.xml:138
+#: /home/runa/tor/website/press/en/inthemedia.wml:29 /tmp/nRA6ZM91EX.xml:159
 msgid "Topic"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:33 /tmp/nRA6ZM91EX.xml:170
+#: /tmp/nRA6ZM91EX.xml:177 /tmp/nRA6ZM91EX.xml:184
+msgid "2011 January 31"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
 #: /home/runa/tor/website/press/en/inthemedia.wml:34
+msgid "NPR: WBUR"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:35
+msgid ""
+"<a href=\"http://hereandnow.wbur.org/2011/01/31/egypt-internet-government";
+"\">Here &amp; Now: U.S. Activists Help Egyptian Protesters Elude Government "
+"Censorship Online</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:41 /tmp/nRA6ZM91EX.xml:48
+#: /tmp/nRA6ZM91EX.xml:191
+msgid "2011 January 30"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:42
+msgid "Fox 25 News - Boston"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:43
+msgid ""
+"<a href=\"http://www.myfoxboston.com/dpp/news/local/local-company-helps-give-";
+"egyptians-internet-access-20110130\">Local company helps give Egyptians "
+"internet access</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:49
+msgid "New England Cable News"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:50
+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 "
+"activists avoid online government censorship</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:55
 msgid "2010 Sept 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:35
+#: /home/runa/tor/website/press/en/inthemedia.wml:56
 msgid "NPR: On the media"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:36
+#: /home/runa/tor/website/press/en/inthemedia.wml:57
 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/tor/website/press/en/inthemedia.wml:40
+#: /home/runa/tor/website/press/en/inthemedia.wml:61
 msgid "2010 Mar 11"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:41
+#: /home/runa/tor/website/press/en/inthemedia.wml:62
 msgid "ABC Australia"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:42
+#: /home/runa/tor/website/press/en/inthemedia.wml:63
 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/tor/website/press/en/inthemedia.wml:45
+#: /home/runa/tor/website/press/en/inthemedia.wml:66
 msgid "2009 Jul 02"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:46
+#: /home/runa/tor/website/press/en/inthemedia.wml:67
 msgid "NED/CIMA"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:47
+#: /home/runa/tor/website/press/en/inthemedia.wml:68
 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/tor/website/press/en/inthemedia.wml:50 /tmp/RSE70o2_2j.xml:311
+#: /home/runa/tor/website/press/en/inthemedia.wml:71 /tmp/nRA6ZM91EX.xml:388
 msgid "2009 Apr 06"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:51
+#: /home/runa/tor/website/press/en/inthemedia.wml:72
 msgid "Al Jazeera"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:52
+#: /home/runa/tor/website/press/en/inthemedia.wml:73
 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/tor/website/press/en/inthemedia.wml:56
+#: /home/runa/tor/website/press/en/inthemedia.wml:77
 msgid "2009 Mar 12"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:57
+#: /home/runa/tor/website/press/en/inthemedia.wml:78
 msgid "BBC World Service"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:58
+#: /home/runa/tor/website/press/en/inthemedia.wml:79
 msgid ""
 "<a href=\"http://bbcworldservicetrust.wordpress.com/2009/03/12/12-march-";
 "world-day-against-cyber-censorship/\">Steven J Murdoch interviewed about Tor "
@@ -145,86 +196,86 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:61
+#: /home/runa/tor/website/press/en/inthemedia.wml:82
 msgid "2009 Feb 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:62
+#: /home/runa/tor/website/press/en/inthemedia.wml:83
 msgid "Hearsay Culture"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:63
+#: /home/runa/tor/website/press/en/inthemedia.wml:84
 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/tor/website/press/en/inthemedia.wml:66
+#: /home/runa/tor/website/press/en/inthemedia.wml:87
 msgid "2008 Dec 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:67
+#: /home/runa/tor/website/press/en/inthemedia.wml:88
 msgid "nu.nl"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:68
+#: /home/runa/tor/website/press/en/inthemedia.wml:89
 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><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:71
+#: /home/runa/tor/website/press/en/inthemedia.wml:92
 msgid "2006 Apr 11"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:72
+#: /home/runa/tor/website/press/en/inthemedia.wml:93
 msgid "PBS Frontline"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:73
+#: /home/runa/tor/website/press/en/inthemedia.wml:94
 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/tor/website/press/en/inthemedia.wml:76
+#: /home/runa/tor/website/press/en/inthemedia.wml:97
 msgid "2006 Feb 28"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:77 /tmp/RSE70o2_2j.xml:390
-#: /tmp/RSE70o2_2j.xml:438 /tmp/RSE70o2_2j.xml:725
+#: /home/runa/tor/website/press/en/inthemedia.wml:98 /tmp/nRA6ZM91EX.xml:467
+#: /tmp/nRA6ZM91EX.xml:515 /tmp/nRA6ZM91EX.xml:802
 msgid "PC World"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:78
+#: /home/runa/tor/website/press/en/inthemedia.wml:99
 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/tor/website/press/en/inthemedia.wml:82
+#: /home/runa/tor/website/press/en/inthemedia.wml:103
 msgid "2006 Feb 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:83
+#: /home/runa/tor/website/press/en/inthemedia.wml:104
 msgid "Forbes"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:84
+#: /home/runa/tor/website/press/en/inthemedia.wml:105
 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 "
@@ -232,35 +283,35 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:89
+#: /home/runa/tor/website/press/en/inthemedia.wml:110
 msgid "2006 Feb 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:90
+#: /home/runa/tor/website/press/en/inthemedia.wml:111
 msgid "The Boston Globe"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:91
+#: /home/runa/tor/website/press/en/inthemedia.wml:112
 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/tor/website/press/en/inthemedia.wml:95 /tmp/RSE70o2_2j.xml:102
-#: /tmp/RSE70o2_2j.xml:575 /tmp/RSE70o2_2j.xml:634
+#: /home/runa/tor/website/press/en/inthemedia.wml:116 /tmp/nRA6ZM91EX.xml:123
+#: /tmp/nRA6ZM91EX.xml:652 /tmp/nRA6ZM91EX.xml:711
 msgid "2006 Feb 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:96
+#: /home/runa/tor/website/press/en/inthemedia.wml:117
 msgid "CBS Evening News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:97
+#: /home/runa/tor/website/press/en/inthemedia.wml:118
 msgid ""
 "<a href=\"http://www.cbsnews.com/stories/2006/02/15/eveningnews/main1321785.";
 "shtml?source=search_story\"> Cracking The 'Great Firewall Of China'</a>.  "
@@ -269,45 +320,45 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:103
+#: /home/runa/tor/website/press/en/inthemedia.wml:124
 msgid "CNBC - Closing Bell"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:104
+#: /home/runa/tor/website/press/en/inthemedia.wml:125
 msgid "TV Appearance by Roger Dingledine at 4:25pm. (no link)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:107
+#: /home/runa/tor/website/press/en/inthemedia.wml:128
 msgid "2006 Jan 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:108
+#: /home/runa/tor/website/press/en/inthemedia.wml:129
 msgid "Fox News/eWeek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:109
+#: /home/runa/tor/website/press/en/inthemedia.wml:130
 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/tor/website/press/en/inthemedia.wml:113
+#: /home/runa/tor/website/press/en/inthemedia.wml:134
 msgid "2006 Jan 25"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:114 /tmp/RSE70o2_2j.xml:297
-#: /tmp/RSE70o2_2j.xml:613
+#: /home/runa/tor/website/press/en/inthemedia.wml:135 /tmp/nRA6ZM91EX.xml:374
+#: /tmp/nRA6ZM91EX.xml:690
 msgid "New York Times"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:115
+#: /home/runa/tor/website/press/en/inthemedia.wml:136
 msgid ""
 "<a href=\"http://www.nytimes.com/2006/01/25/technology/";
 "techspecial2/25privacy.html?_r=1&amp;oref=slogin\"> Privacy for People Who "
@@ -315,34 +366,34 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:119
+#: /home/runa/tor/website/press/en/inthemedia.wml:140
 msgid "2005 Aug 6"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:120
+#: /home/runa/tor/website/press/en/inthemedia.wml:141 /tmp/nRA6ZM91EX.xml:178
 msgid "New Scientist"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:121
+#: /home/runa/tor/website/press/en/inthemedia.wml:142
 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>
-#: /home/runa/tor/website/press/en/inthemedia.wml:125
+#: /home/runa/tor/website/press/en/inthemedia.wml:146
 msgid "<br/>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/press/en/inthemedia.wml:127
+#: /home/runa/tor/website/press/en/inthemedia.wml:148
 msgid "Articles"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/press/en/inthemedia.wml:129
+#: /home/runa/tor/website/press/en/inthemedia.wml:150
 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 "
@@ -350,70 +401,181 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:142
+#: /home/runa/tor/website/press/en/inthemedia.wml:163
+msgid "2011 February 01"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:164
+msgid "Discovery News"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:165
+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/tor/website/press/en/inthemedia.wml:171
+msgid "IDG Poland"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:172
+msgid ""
+"<a href=\"http://www.idg.pl/news/366773/Egipt.blokuje.Internet.aktywisci.";
+"szukaja.alternatyw.html\">Egipt blokuje Internet, aktywiÅci szukajÄ "
+"alternatyw</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:179
+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/tor/website/press/en/inthemedia.wml:185
+msgid "El Pais"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:186
+msgid ""
+"<a href=\"http://www.elpais.com/articulo/internacional/Sortear/censura/golpe/";
+"fax/elpepuint/20110130elpepuint_14/Tes\">Sortear la censura a golpe de fax</"
+"a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:192 /tmp/nRA6ZM91EX.xml:304
+msgid "Boston Globe"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:193
+msgid ""
+"<a href=\"http://www.boston.com/news/local/massachusetts/articles/2011/01/30/";
+"mass_groups_software_helps_avoid_censorship/\">Foreign activists stay "
+"covered online</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:198 /tmp/nRA6ZM91EX.xml:205
+msgid "2011 January 29"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:199
+msgid "SvD.se"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:200
+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/tor/website/press/en/inthemedia.wml:206 /tmp/nRA6ZM91EX.xml:359
+msgid "ComputerWorld"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:207
+msgid ""
+"<a href=\"http://www.computerworld.com/s/article/9207058/";
+"Without_Internet_Egyptians_find_new_ways_to_get_online?"
+"taxonomyId=16\">Without Internet, Egyptians find new ways to get online.</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:212
+msgid "2011 January 28"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:213
+msgid "Globe and Mail"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:214
+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 "
+"country goes offline</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/press/en/inthemedia.wml:219
 msgid "2010 December 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:143 /tmp/RSE70o2_2j.xml:202
-#: /tmp/RSE70o2_2j.xml:217 /tmp/RSE70o2_2j.xml:272 /tmp/RSE70o2_2j.xml:302
-#: /tmp/RSE70o2_2j.xml:602
+#: /home/runa/tor/website/press/en/inthemedia.wml:220 /tmp/nRA6ZM91EX.xml:279
+#: /tmp/nRA6ZM91EX.xml:294 /tmp/nRA6ZM91EX.xml:349 /tmp/nRA6ZM91EX.xml:379
+#: /tmp/nRA6ZM91EX.xml:679
 msgid "Technology Review"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:144
+#: /home/runa/tor/website/press/en/inthemedia.wml:221
 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/tor/website/press/en/inthemedia.wml:148
+#: /home/runa/tor/website/press/en/inthemedia.wml:225
 msgid "2010 December 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:149
+#: /home/runa/tor/website/press/en/inthemedia.wml:226
 msgid "New York Times Magazine"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:150
+#: /home/runa/tor/website/press/en/inthemedia.wml:227
 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/tor/website/press/en/inthemedia.wml:155
+#: /home/runa/tor/website/press/en/inthemedia.wml:232
 msgid "2010 November 03"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:156
+#: /home/runa/tor/website/press/en/inthemedia.wml:233
 msgid "metro sverige"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:157
+#: /home/runa/tor/website/press/en/inthemedia.wml:234
 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/tor/website/press/en/inthemedia.wml:162
+#: /home/runa/tor/website/press/en/inthemedia.wml:239
 msgid "2010 August 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:163
+#: /home/runa/tor/website/press/en/inthemedia.wml:240
 msgid "PC Format - Poland"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:164
+#: /home/runa/tor/website/press/en/inthemedia.wml:241
 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 "
@@ -421,17 +583,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:169
+#: /home/runa/tor/website/press/en/inthemedia.wml:246
 msgid "2010 July 14"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:170
+#: /home/runa/tor/website/press/en/inthemedia.wml:247
 msgid "China Rights Forum"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:171
+#: /home/runa/tor/website/press/en/inthemedia.wml:248
 msgid ""
 "<a href=\"http://www.hrichina.org/public/contents/category?";
 "cid=175033\">China Rights Forum, No. 2 - âChinaâs Internetâ: Staking Digital "
@@ -439,17 +601,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:177
+#: /home/runa/tor/website/press/en/inthemedia.wml:254
 msgid "2010 May 25"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:178
+#: /home/runa/tor/website/press/en/inthemedia.wml:255
 msgid "The Australian"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:179
+#: /home/runa/tor/website/press/en/inthemedia.wml:256
 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 "
@@ -457,51 +619,51 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:184
+#: /home/runa/tor/website/press/en/inthemedia.wml:261
 msgid "2010 Mar 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:185
+#: /home/runa/tor/website/press/en/inthemedia.wml:262
 msgid "PC World Poland"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:186
+#: /home/runa/tor/website/press/en/inthemedia.wml:263
 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/tor/website/press/en/inthemedia.wml:189
+#: /home/runa/tor/website/press/en/inthemedia.wml:266
 msgid "2010 Mar 09"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:190
+#: /home/runa/tor/website/press/en/inthemedia.wml:267
 msgid "PC Pro UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:191
+#: /home/runa/tor/website/press/en/inthemedia.wml:268
 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/tor/website/press/en/inthemedia.wml:194
+#: /home/runa/tor/website/press/en/inthemedia.wml:271
 msgid "2009 Dec 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:195
+#: /home/runa/tor/website/press/en/inthemedia.wml:272
 msgid "Times Online"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:196
+#: /home/runa/tor/website/press/en/inthemedia.wml:273
 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 "
@@ -509,46 +671,46 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:201
+#: /home/runa/tor/website/press/en/inthemedia.wml:278
 msgid "2009 Oct 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:203
+#: /home/runa/tor/website/press/en/inthemedia.wml:280
 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/tor/website/press/en/inthemedia.wml:206
+#: /home/runa/tor/website/press/en/inthemedia.wml:283
 msgid "2009 Sep 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:207
+#: /home/runa/tor/website/press/en/inthemedia.wml:284
 msgid "BusinessWeek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:208
+#: /home/runa/tor/website/press/en/inthemedia.wml:285
 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/tor/website/press/en/inthemedia.wml:211
+#: /home/runa/tor/website/press/en/inthemedia.wml:288
 msgid "2009 Aug 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:212
+#: /home/runa/tor/website/press/en/inthemedia.wml:289
 msgid "Reuters"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:213
+#: /home/runa/tor/website/press/en/inthemedia.wml:290
 msgid ""
 "<a href=\"http://www.reuters.com/article/internetNews/idUSTRE57I4IE20090819?";
 "pageNumber=1&amp;virtualBrandChannel=0&amp;sp=true\">Web tools help protect "
@@ -556,41 +718,36 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:216
+#: /home/runa/tor/website/press/en/inthemedia.wml:293
 msgid "2009 Aug 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:218
+#: /home/runa/tor/website/press/en/inthemedia.wml:295
 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/tor/website/press/en/inthemedia.wml:221 /tmp/RSE70o2_2j.xml:226
+#: /home/runa/tor/website/press/en/inthemedia.wml:298 /tmp/nRA6ZM91EX.xml:303
 msgid "2009 Jul 26"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:222 /tmp/RSE70o2_2j.xml:242
+#: /home/runa/tor/website/press/en/inthemedia.wml:299 /tmp/nRA6ZM91EX.xml:319
 msgid "Washington Times"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:223
+#: /home/runa/tor/website/press/en/inthemedia.wml:300
 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/tor/website/press/en/inthemedia.wml:227
-msgid "Boston Globe"
-msgstr ""
-
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:228
+#: /home/runa/tor/website/press/en/inthemedia.wml:305
 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 "
@@ -598,17 +755,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:231
+#: /home/runa/tor/website/press/en/inthemedia.wml:308
 msgid "2009 Jul 24"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:232
+#: /home/runa/tor/website/press/en/inthemedia.wml:309
 msgid "Associated Press"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:233
+#: /home/runa/tor/website/press/en/inthemedia.wml:310
 msgid ""
 "<a href=\"http://www.google.com/hostednews/ap/article/ALeqM5hTf-";
 "p6Iy3sWHK8BRR58npGosLC3AD99L01QO0\">Iran activists work to elude crackdown "
@@ -616,29 +773,29 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:236
+#: /home/runa/tor/website/press/en/inthemedia.wml:313
 msgid "2009 Jul 08"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:237
+#: /home/runa/tor/website/press/en/inthemedia.wml:314
 msgid "Tehran Bureau"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:238
+#: /home/runa/tor/website/press/en/inthemedia.wml:315
 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/tor/website/press/en/inthemedia.wml:241
+#: /home/runa/tor/website/press/en/inthemedia.wml:318
 msgid "2009 Jun 26"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:243
+#: /home/runa/tor/website/press/en/inthemedia.wml:320
 msgid ""
 "<a href=\"http://www.washingtontimes.com/news/2009/jun/26/protesters-use-";
 "navy-technology-to-avoid-censorship/?feat=home_headlines\">Iranian "
@@ -646,70 +803,70 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:246
+#: /home/runa/tor/website/press/en/inthemedia.wml:323
 msgid "2009 Jun 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:247
+#: /home/runa/tor/website/press/en/inthemedia.wml:324
 msgid "EFF"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:248
+#: /home/runa/tor/website/press/en/inthemedia.wml:325
 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/tor/website/press/en/inthemedia.wml:251
+#: /home/runa/tor/website/press/en/inthemedia.wml:328
 msgid "2009 Jun 24"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:252
+#: /home/runa/tor/website/press/en/inthemedia.wml:329
 msgid "Daily Finance"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:253
+#: /home/runa/tor/website/press/en/inthemedia.wml:330
 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/tor/website/press/en/inthemedia.wml:256 /tmp/RSE70o2_2j.xml:266
-#: /tmp/RSE70o2_2j.xml:271
+#: /home/runa/tor/website/press/en/inthemedia.wml:333 /tmp/nRA6ZM91EX.xml:343
+#: /tmp/nRA6ZM91EX.xml:348
 msgid "2009 Jun 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:257 /tmp/RSE70o2_2j.xml:322
-#: /tmp/RSE70o2_2j.xml:589
+#: /home/runa/tor/website/press/en/inthemedia.wml:334 /tmp/nRA6ZM91EX.xml:399
+#: /tmp/nRA6ZM91EX.xml:666
 msgid "Wall Street Journal"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:258
+#: /home/runa/tor/website/press/en/inthemedia.wml:335
 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/tor/website/press/en/inthemedia.wml:261
+#: /home/runa/tor/website/press/en/inthemedia.wml:338
 msgid "2009 Jun 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:262
+#: /home/runa/tor/website/press/en/inthemedia.wml:339
 msgid "O'Reilly Radar"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:263
+#: /home/runa/tor/website/press/en/inthemedia.wml:340
 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 "
@@ -717,48 +874,43 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:267
+#: /home/runa/tor/website/press/en/inthemedia.wml:344
 msgid "Deutsche Welle"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:268
+#: /home/runa/tor/website/press/en/inthemedia.wml:345
 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/tor/website/press/en/inthemedia.wml:273
+#: /home/runa/tor/website/press/en/inthemedia.wml:350
 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/tor/website/press/en/inthemedia.wml:276 /tmp/RSE70o2_2j.xml:281
+#: /home/runa/tor/website/press/en/inthemedia.wml:353 /tmp/nRA6ZM91EX.xml:358
 msgid "2009 Jun 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:277
+#: /home/runa/tor/website/press/en/inthemedia.wml:354
 msgid "CNet News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:278
+#: /home/runa/tor/website/press/en/inthemedia.wml:355
 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/tor/website/press/en/inthemedia.wml:282
-msgid "ComputerWorld"
-msgstr ""
-
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:283
+#: /home/runa/tor/website/press/en/inthemedia.wml:360
 msgid ""
 "<a href=\"http://www.computerworld.com/action/article.do?";
 "command=viewArticleBasic&amp;articleId=9134471&amp;intsrc=news_ts_head"
@@ -766,34 +918,34 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:286
+#: /home/runa/tor/website/press/en/inthemedia.wml:363
 msgid "2009 May 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:287 /tmp/RSE70o2_2j.xml:307
+#: /home/runa/tor/website/press/en/inthemedia.wml:364 /tmp/nRA6ZM91EX.xml:384
 msgid "Le Monde"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:288
+#: /home/runa/tor/website/press/en/inthemedia.wml:365
 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/tor/website/press/en/inthemedia.wml:291
+#: /home/runa/tor/website/press/en/inthemedia.wml:368
 msgid "2009 May 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:292
+#: /home/runa/tor/website/press/en/inthemedia.wml:369
 msgid "Mass High Tech"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:293
+#: /home/runa/tor/website/press/en/inthemedia.wml:370
 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</"
@@ -801,24 +953,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:296
+#: /home/runa/tor/website/press/en/inthemedia.wml:373
 msgid "2009 May 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:298
+#: /home/runa/tor/website/press/en/inthemedia.wml:375
 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/tor/website/press/en/inthemedia.wml:301
+#: /home/runa/tor/website/press/en/inthemedia.wml:378
 msgid "2009 Apr 23"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:303
+#: /home/runa/tor/website/press/en/inthemedia.wml:380
 msgid ""
 "<a href=\"http://www.technologyreview.com/computing/22427/?a=f\";>Dissent "
 "Made Safer: How anonymity technology could save free speech on the Internet."
@@ -826,189 +978,189 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:306
+#: /home/runa/tor/website/press/en/inthemedia.wml:383
 msgid "2009 Apr 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:308
+#: /home/runa/tor/website/press/en/inthemedia.wml:385
 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/tor/website/press/en/inthemedia.wml:312
+#: /home/runa/tor/website/press/en/inthemedia.wml:389
 msgid "Reader's Digest"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:313
+#: /home/runa/tor/website/press/en/inthemedia.wml:390
 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/tor/website/press/en/inthemedia.wml:316
+#: /home/runa/tor/website/press/en/inthemedia.wml:393
 msgid "2009 Mar 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:317
+#: /home/runa/tor/website/press/en/inthemedia.wml:394
 msgid "Marie Claire"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:318
+#: /home/runa/tor/website/press/en/inthemedia.wml:395
 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/tor/website/press/en/inthemedia.wml:321
+#: /home/runa/tor/website/press/en/inthemedia.wml:398
 msgid "2009 Mar 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:323
+#: /home/runa/tor/website/press/en/inthemedia.wml:400
 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/tor/website/press/en/inthemedia.wml:328
+#: /home/runa/tor/website/press/en/inthemedia.wml:405
 msgid "2009 Mar 03"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:329
+#: /home/runa/tor/website/press/en/inthemedia.wml:406
 msgid "Orf Austria"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:330
+#: /home/runa/tor/website/press/en/inthemedia.wml:407
 msgid ""
 "<a href=\"http://futurezone.orf.at/stories/1503028/\";>WIRTSCHAFTSKAMMER "
 "column</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:333
+#: /home/runa/tor/website/press/en/inthemedia.wml:410
 msgid "2009 Feb 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:334 /tmp/RSE70o2_2j.xml:506
+#: /home/runa/tor/website/press/en/inthemedia.wml:411 /tmp/nRA6ZM91EX.xml:583
 msgid "Bangkok Post"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:335
+#: /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/tor/website/press/en/inthemedia.wml:338
+#: /home/runa/tor/website/press/en/inthemedia.wml:415
 msgid "2008 Dec 14"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:339
+#: /home/runa/tor/website/press/en/inthemedia.wml:416
 msgid "PC Magazine: Middle &amp; Near East"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:340
+#: /home/runa/tor/website/press/en/inthemedia.wml:417
 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><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:345
+#: /home/runa/tor/website/press/en/inthemedia.wml:422
 msgid "2008 Aug 21"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:346
+#: /home/runa/tor/website/press/en/inthemedia.wml:423
 msgid "CNN"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:347
+#: /home/runa/tor/website/press/en/inthemedia.wml:424
 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><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:352
+#: /home/runa/tor/website/press/en/inthemedia.wml:429
 msgid "2008 Aug 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:353
+#: /home/runa/tor/website/press/en/inthemedia.wml:430
 msgid "The Sydney Morning Herald"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:354
+#: /home/runa/tor/website/press/en/inthemedia.wml:431
 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><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:359
+#: /home/runa/tor/website/press/en/inthemedia.wml:436
 msgid "2008 Aug 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:360
+#: /home/runa/tor/website/press/en/inthemedia.wml:437
 msgid "Scientific American"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:361
+#: /home/runa/tor/website/press/en/inthemedia.wml:438
 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><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:366
+#: /home/runa/tor/website/press/en/inthemedia.wml:443
 msgid "2008 Aug 05"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:367
+#: /home/runa/tor/website/press/en/inthemedia.wml:444
 msgid "Guardian UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:368
+#: /home/runa/tor/website/press/en/inthemedia.wml:445
 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><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:373
+#: /home/runa/tor/website/press/en/inthemedia.wml:450
 msgid "2008 Aug 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:374
+#: /home/runa/tor/website/press/en/inthemedia.wml:451
 msgid "Tech Radar UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:375
+#: /home/runa/tor/website/press/en/inthemedia.wml:452
 msgid ""
 "<a href=\"http://www.techradar.com/news/internet/web/freedom-stick-";
 "highlights-chinese-net-censorship-449233\">Freedom Stick highlights Chinese "
@@ -1016,25 +1168,25 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:381 /tmp/RSE70o2_2j.xml:389
-#: /tmp/RSE70o2_2j.xml:397 /tmp/RSE70o2_2j.xml:405
+#: /home/runa/tor/website/press/en/inthemedia.wml:458 /tmp/nRA6ZM91EX.xml:466
+#: /tmp/nRA6ZM91EX.xml:474 /tmp/nRA6ZM91EX.xml:482
 msgid "2008 Aug 07"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:382
+#: /home/runa/tor/website/press/en/inthemedia.wml:459
 msgid "Spiegel"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:383
+#: /home/runa/tor/website/press/en/inthemedia.wml:460
 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/tor/website/press/en/inthemedia.wml:391
+#: /home/runa/tor/website/press/en/inthemedia.wml:468
 msgid ""
 "<a href=\"http://www.pcworld.com/";
 "article/149399-3/15_great_free_privacy_downloads.html\">15 Great, Free "
@@ -1042,41 +1194,41 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:398
+#: /home/runa/tor/website/press/en/inthemedia.wml:475
 msgid "The Guardian UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:399
+#: /home/runa/tor/website/press/en/inthemedia.wml:476
 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><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:406
+#: /home/runa/tor/website/press/en/inthemedia.wml:483
 msgid "The Register UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:407
+#: /home/runa/tor/website/press/en/inthemedia.wml:484
 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><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:413
+#: /home/runa/tor/website/press/en/inthemedia.wml:490
 msgid "2008 May 24"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:414
+#: /home/runa/tor/website/press/en/inthemedia.wml:491
 msgid "Groupo Estado"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:415
+#: /home/runa/tor/website/press/en/inthemedia.wml:492
 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;"
@@ -1085,17 +1237,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:421
+#: /home/runa/tor/website/press/en/inthemedia.wml:498
 msgid "2008 Mar 12"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:422
+#: /home/runa/tor/website/press/en/inthemedia.wml:499
 msgid "SearchSecurity.com"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:423
+#: /home/runa/tor/website/press/en/inthemedia.wml:500
 msgid ""
 "<a href=\"http://searchsecurity.techtarget.com/news/article/0,289142,";
 "sid14_gci1305120,00.html\"> Tor network 'bridges' help evade blockers</a>.  "
@@ -1104,29 +1256,29 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:430
+#: /home/runa/tor/website/press/en/inthemedia.wml:507
 msgid "2008 Feb 14"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:431
+#: /home/runa/tor/website/press/en/inthemedia.wml:508
 msgid "Wired: Compiler Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:432
+#: /home/runa/tor/website/press/en/inthemedia.wml:509
 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><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:437
+#: /home/runa/tor/website/press/en/inthemedia.wml:514
 msgid "2008 Feb 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:439
+#: /home/runa/tor/website/press/en/inthemedia.wml:516
 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="
@@ -1138,17 +1290,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:447
+#: /home/runa/tor/website/press/en/inthemedia.wml:524
 msgid "2007 Sep 21"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:448
+#: /home/runa/tor/website/press/en/inthemedia.wml:525
 msgid "Wired HowTo Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:449
+#: /home/runa/tor/website/press/en/inthemedia.wml:526
 msgid ""
 "<a href=\"http://howto.wired.com/wiredhowtos/index.cgi?";
 "page_name=be_a_whistle_blower;action=display;category=Work\"> Be a "
@@ -1157,17 +1309,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:455
+#: /home/runa/tor/website/press/en/inthemedia.wml:532
 msgid "2007 Sep 16"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:456
+#: /home/runa/tor/website/press/en/inthemedia.wml:533
 msgid "Cnet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:457
+#: /home/runa/tor/website/press/en/inthemedia.wml:534
 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 "
@@ -1182,18 +1334,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:466
+#: /home/runa/tor/website/press/en/inthemedia.wml:543
 msgid "2007 Sep 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:467 /tmp/RSE70o2_2j.xml:648
-#: /tmp/RSE70o2_2j.xml:781 /tmp/RSE70o2_2j.xml:980 /tmp/RSE70o2_2j.xml:1003
+#: /home/runa/tor/website/press/en/inthemedia.wml:544 /tmp/nRA6ZM91EX.xml:725
+#: /tmp/nRA6ZM91EX.xml:858 /tmp/nRA6ZM91EX.xml:1057 /tmp/nRA6ZM91EX.xml:1080
 msgid "Wired"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:468
+#: /home/runa/tor/website/press/en/inthemedia.wml:545
 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/> "
@@ -1226,17 +1378,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:495
+#: /home/runa/tor/website/press/en/inthemedia.wml:572
 msgid "2007 Jul 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:496
+#: /home/runa/tor/website/press/en/inthemedia.wml:573
 msgid "Wired Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:497
+#: /home/runa/tor/website/press/en/inthemedia.wml:574
 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://";
@@ -1247,12 +1399,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:505
+#: /home/runa/tor/website/press/en/inthemedia.wml:582
 msgid "2007 Jun 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:507
+#: /home/runa/tor/website/press/en/inthemedia.wml:584
 msgid ""
 "<a href=\"http://www.asiamedia.ucla.edu/article-southeastasia.asp?";
 "parentid=72388\"> The problems with censorship</a>.  Mentions anecdotes that "
@@ -1260,17 +1412,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:513
+#: /home/runa/tor/website/press/en/inthemedia.wml:590
 msgid "2007 Mar 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:514
+#: /home/runa/tor/website/press/en/inthemedia.wml:591
 msgid "World Changing"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:515
+#: /home/runa/tor/website/press/en/inthemedia.wml:592
 msgid ""
 "<a href=\"http://www.worldchanging.com/archives/006309.html\";> Blogging "
 "Where Speech Isnât Free</a><br/> Coverage of former Tor Executive Director "
@@ -1280,17 +1432,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:524
+#: /home/runa/tor/website/press/en/inthemedia.wml:601
 msgid "2007 Mar 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:525
+#: /home/runa/tor/website/press/en/inthemedia.wml:602
 msgid "Security Focus"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:526
+#: /home/runa/tor/website/press/en/inthemedia.wml:603
 msgid ""
 "<a href=\"http://www.securityfocus.com/news/11447/1\";> Tor hack proposed to "
 "catch criminals</a>.  Coverage of a toolset called \"Torment\" for "
@@ -1299,17 +1451,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:534
+#: /home/runa/tor/website/press/en/inthemedia.wml:611
 msgid "2007 Feb 1"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:535
+#: /home/runa/tor/website/press/en/inthemedia.wml:612
 msgid "Dr Dobb's"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:536
+#: /home/runa/tor/website/press/en/inthemedia.wml:613
 msgid ""
 "<a href=\"http://www.ddj.com/security/197002414\";> Tor Project Protects "
 "Anonymous Sources</a>.  An introduction to Tor, including technical and "
@@ -1317,17 +1469,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:543
+#: /home/runa/tor/website/press/en/inthemedia.wml:620
 msgid "2006 Oct 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:544
+#: /home/runa/tor/website/press/en/inthemedia.wml:621
 msgid "Wired Threat Level"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:545
+#: /home/runa/tor/website/press/en/inthemedia.wml:622
 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 "
@@ -1337,17 +1489,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:555
+#: /home/runa/tor/website/press/en/inthemedia.wml:632
 msgid "2006 Aug 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:556 /tmp/RSE70o2_2j.xml:659
+#: /home/runa/tor/website/press/en/inthemedia.wml:633 /tmp/nRA6ZM91EX.xml:736
 msgid "NPR"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:557
+#: /home/runa/tor/website/press/en/inthemedia.wml:634
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\";> "
 "Tips for Protecting Privacy Online</a>.  Kevin Bankston of the EFF "
@@ -1356,17 +1508,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:565
+#: /home/runa/tor/website/press/en/inthemedia.wml:642
 msgid "2006 Jul 5"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:566
+#: /home/runa/tor/website/press/en/inthemedia.wml:643
 msgid "MSNBC"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:567
+#: /home/runa/tor/website/press/en/inthemedia.wml:644
 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 "
@@ -1374,12 +1526,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:578
+#: /home/runa/tor/website/press/en/inthemedia.wml:655
 msgid "Network Secure"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:579
+#: /home/runa/tor/website/press/en/inthemedia.wml:656
 msgid ""
 "<a href=\"http://www.network-secure.de/index.php?option=com_content&amp;";
 "task=view&amp;id=3909\"> Tor: Anonymisierungswerkzeug entwickelt</a> (German)"
@@ -1387,12 +1539,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:586
+#: /home/runa/tor/website/press/en/inthemedia.wml:663
 msgid "2006 Feb 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:590
+#: /home/runa/tor/website/press/en/inthemedia.wml:667
 msgid ""
 "<a href=\"http://online.wsj.com/article/SB113979965346572150.html\";> Chinese "
 "Censors Of Internet Face 'Hacktivists' in U.S.</a><br/> Full article text "
@@ -1401,41 +1553,41 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:599
+#: /home/runa/tor/website/press/en/inthemedia.wml:676
 msgid "2006 Jan 31"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:603
+#: /home/runa/tor/website/press/en/inthemedia.wml:680
 msgid ""
 "<a href=\"http://www.technologyreview.com/Infotech/16216/page2/\";> Evading "
 "the Google Eye</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:610
+#: /home/runa/tor/website/press/en/inthemedia.wml:687
 msgid "2006 Jan 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:614
+#: /home/runa/tor/website/press/en/inthemedia.wml:691
 msgid ""
 "<a href=\"http://www.nytimes.com/2006/01/29/weekinreview/29basic.html\";> How "
 "to Outwit the World's Internet Censors</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:621
+#: /home/runa/tor/website/press/en/inthemedia.wml:698
 msgid "2006 Jan 23"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:624
+#: /home/runa/tor/website/press/en/inthemedia.wml:701
 msgid "NPR Talk of the Nation"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:625
+#: /home/runa/tor/website/press/en/inthemedia.wml:702
 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.";
@@ -1443,99 +1595,99 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:637
+#: /home/runa/tor/website/press/en/inthemedia.wml:714
 msgid "Punto Informatico"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:638
+#: /home/runa/tor/website/press/en/inthemedia.wml:715
 msgid ""
 "<a href=\"http://punto-informatico.it/p.aspx?i=1430903\";> TOR c'Ã</a> "
 "(Italian)<br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:645 /tmp/RSE70o2_2j.xml:656
+#: /home/runa/tor/website/press/en/inthemedia.wml:722 /tmp/nRA6ZM91EX.xml:733
 msgid "2006 Jan 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:649
+#: /home/runa/tor/website/press/en/inthemedia.wml:726
 msgid ""
 "<a href=\"http://www.wired.com/science/discoveries/news/2006/01/70051?";
 "currentPage=2\"> How to Foil Search Engine Snoops</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:660
+#: /home/runa/tor/website/press/en/inthemedia.wml:737
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5165854\";> "
 "Google Records Subpoena Raises Privacy Fears</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:667
+#: /home/runa/tor/website/press/en/inthemedia.wml:744
 msgid "2005 Sep 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:670
+#: /home/runa/tor/website/press/en/inthemedia.wml:747
 msgid "Viva o Linux"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:671
+#: /home/runa/tor/website/press/en/inthemedia.wml:748
 msgid ""
 "<a href=\"http://www.vivaolinux.com.br/artigos/verArtigo.php?codigo=2759\";> "
 "TOR: A Internet sem rastreabilidade</a> (Portuguese)<br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:678
+#: /home/runa/tor/website/press/en/inthemedia.wml:755
 msgid "2005 Jul 12"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:681
+#: /home/runa/tor/website/press/en/inthemedia.wml:758
 msgid "IEEE Computer Society's Technical Committee on Security and Privacy"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:682
+#: /home/runa/tor/website/press/en/inthemedia.wml:759
 msgid ""
 "<a href=\"http://www.ieee-security.org/Cipher/Newsbriefs/2005/071805.html#TOR";
 "\"> Onion routing application Tor makes PCWorld's top 100</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:689
+#: /home/runa/tor/website/press/en/inthemedia.wml:766
 msgid "2005 Jun 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:692
+#: /home/runa/tor/website/press/en/inthemedia.wml:769
 msgid "The Unofficial Apple Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:693
+#: /home/runa/tor/website/press/en/inthemedia.wml:770
 msgid ""
 "<a href=\"http://www.tuaw.com/2005/06/22/privacy-watch-tor/\";> Privacy "
 "Watch: Tor</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:700
+#: /home/runa/tor/website/press/en/inthemedia.wml:777
 msgid "2005 Jun 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:703
+#: /home/runa/tor/website/press/en/inthemedia.wml:780
 msgid "The New Zealand Herald"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:704
+#: /home/runa/tor/website/press/en/inthemedia.wml:781
 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</"
@@ -1543,104 +1695,104 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:711
+#: /home/runa/tor/website/press/en/inthemedia.wml:788
 msgid "2005 Jun 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:714
+#: /home/runa/tor/website/press/en/inthemedia.wml:791
 msgid "American Public Radio"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:715
+#: /home/runa/tor/website/press/en/inthemedia.wml:792
 msgid ""
 "<a href=\"http://www.publicradio.org/columns/futuretense/2005/06/08.shtml\";> "
 "An Internet privacy tool called \"Tor\"</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:722 /tmp/RSE70o2_2j.xml:734
+#: /home/runa/tor/website/press/en/inthemedia.wml:799 /tmp/nRA6ZM91EX.xml:811
 msgid "2005 Jun 1"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:726
+#: /home/runa/tor/website/press/en/inthemedia.wml:803
 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/tor/website/press/en/inthemedia.wml:737
+#: /home/runa/tor/website/press/en/inthemedia.wml:814
 msgid "Linux Weekly News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:738
+#: /home/runa/tor/website/press/en/inthemedia.wml:815
 msgid ""
 "<a href=\"http://lwn.net/Articles/138242/\";> A Look at The Onion Router (Tor)"
 "</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:745
+#: /home/runa/tor/website/press/en/inthemedia.wml:822
 msgid "2005 May 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:748 /tmp/RSE70o2_2j.xml:904
+#: /home/runa/tor/website/press/en/inthemedia.wml:825 /tmp/nRA6ZM91EX.xml:981
 msgid "Slashdot"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:749
+#: /home/runa/tor/website/press/en/inthemedia.wml:826
 msgid ""
 "<a href=\"http://yro.slashdot.org/article.pl?sid=05/05/22/0113244\";> Tor "
 "Anonymity Network Reaches 100 Verified Nodes</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:756
+#: /home/runa/tor/website/press/en/inthemedia.wml:833
 msgid "2005 May 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:759
+#: /home/runa/tor/website/press/en/inthemedia.wml:836
 msgid "Security.uz"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:760
+#: /home/runa/tor/website/press/en/inthemedia.wml:837
 msgid ""
 "<a href=\"http://security.uz/news/default.asp?id=10541\";> Tor - ÐÐÑÐÑÐ "
 "ÐÐÐÐÐÐÐÐÐÐÑ ÐÐÑ ÐÑÐÑ ÐÐ</a> (Russian)<br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:767
+#: /home/runa/tor/website/press/en/inthemedia.wml:844
 msgid "2005 May 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:770
+#: /home/runa/tor/website/press/en/inthemedia.wml:847
 msgid "WebPlanet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:771
+#: /home/runa/tor/website/press/en/inthemedia.wml:848
 msgid ""
 "<a href=\"http://webplanet.ru/news/security/2005/5/19/tor.html\";> Tor: "
 "ÑÐÑÐÑÐÐÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐ ÐÐÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ</a> (Russian)<br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:778 /tmp/RSE70o2_2j.xml:791
+#: /home/runa/tor/website/press/en/inthemedia.wml:855 /tmp/nRA6ZM91EX.xml:868
 msgid "2005 May 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:782
+#: /home/runa/tor/website/press/en/inthemedia.wml:859
 msgid ""
 "<a href=\"http://www.wired.com/politics/security/news/2005/05/67542?";
 "currentPage=all\"> Tor Torches Online Tracking</a><br/> Also available in <a "
@@ -1648,170 +1800,170 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:794
+#: /home/runa/tor/website/press/en/inthemedia.wml:871
 msgid "XBiz"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:795
+#: /home/runa/tor/website/press/en/inthemedia.wml:872
 msgid ""
 "<a href=\"http://xbiz.com/news/8761\";> Navy Project Allows Anonymous "
 "Browsing</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:802
+#: /home/runa/tor/website/press/en/inthemedia.wml:879
 msgid "2005 Apr 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:805
+#: /home/runa/tor/website/press/en/inthemedia.wml:882
 msgid "Heise online"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:806
+#: /home/runa/tor/website/press/en/inthemedia.wml:883
 msgid ""
 "<a href=\"http://www.heise.de/newsticker/meldung/58506\";> CFP: Vom "
 "kafkaesken Schwinden der AnonymitÃt</a> (German)<br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:813
+#: /home/runa/tor/website/press/en/inthemedia.wml:890
 msgid "2005 Apr 5"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:816
+#: /home/runa/tor/website/press/en/inthemedia.wml:893
 msgid "Libero"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:817
+#: /home/runa/tor/website/press/en/inthemedia.wml:894
 msgid ""
 "<a href=\"http://magazine.libero.it/internetlife/scienzaeweb/ne208.phtml\";> "
 "Anonimato on line, ecco Tor</a> (Italian)<br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:824
+#: /home/runa/tor/website/press/en/inthemedia.wml:901
 msgid "2005 Jan 4"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:827
+#: /home/runa/tor/website/press/en/inthemedia.wml:904
 msgid "Internetnews"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:828
+#: /home/runa/tor/website/press/en/inthemedia.wml:905
 msgid ""
 "<a href=\"http://www.internetnews.com/dev-news/article.php/3454521\";> EFF "
 "Throws Support to 'Anonymous' Internet Project</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:835
+#: /home/runa/tor/website/press/en/inthemedia.wml:912
 msgid "2005 Mar 31"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:838
+#: /home/runa/tor/website/press/en/inthemedia.wml:915
 msgid "Linux.com"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:839
+#: /home/runa/tor/website/press/en/inthemedia.wml:916
 msgid ""
 "<a href=\"http://www.linux.com/articles/43713?tid=19&amp;tid=78\";> Securing "
 "your online privacy with Tor</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:846
+#: /home/runa/tor/website/press/en/inthemedia.wml:923
 msgid "2004 Dec 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:849
+#: /home/runa/tor/website/press/en/inthemedia.wml:926
 msgid "BoingBoing"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:850
+#: /home/runa/tor/website/press/en/inthemedia.wml:927
 msgid ""
 "<a href=\"http://www.boingboing.net/2004/12/27/eff-helping-produce-.html\";> "
 "EFF helping produce anonymizing software</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:857
+#: /home/runa/tor/website/press/en/inthemedia.wml:934
 msgid "2004 Dec 25"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:860
+#: /home/runa/tor/website/press/en/inthemedia.wml:937
 msgid "Kansas City infozine"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:861
+#: /home/runa/tor/website/press/en/inthemedia.wml:938
 msgid ""
 "<a href=\"http://www.infozine.com/news/stories/op/storiesView/sid/4933/\";> "
 "EFF Joins Forces with Tor Software Project</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:868 /tmp/RSE70o2_2j.xml:879
+#: /home/runa/tor/website/press/en/inthemedia.wml:945 /tmp/nRA6ZM91EX.xml:956
 msgid "2004 Dec 23"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:871
+#: /home/runa/tor/website/press/en/inthemedia.wml:948
 msgid "golem.de"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:872
+#: /home/runa/tor/website/press/en/inthemedia.wml:949
 msgid ""
 "<a href=\"http://www.golem.de/0412/35340.html\";> EFF unterstÃtzt "
 "Anonymisierer Tor</a> (German)<br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:882
+#: /home/runa/tor/website/press/en/inthemedia.wml:959
 msgid "SuicideGirls"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:883
+#: /home/runa/tor/website/press/en/inthemedia.wml:960
 msgid ""
 "<a href=\"http://suicidegirls.com/news/technology/6150/\";> New Routing "
 "Software Allows Anonymous Internet Use</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:890
+#: /home/runa/tor/website/press/en/inthemedia.wml:967
 msgid "2004 Dec 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:893
+#: /home/runa/tor/website/press/en/inthemedia.wml:970
 msgid "P2Pnet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:894
+#: /home/runa/tor/website/press/en/inthemedia.wml:971
 msgid "<a href=\"http://p2pnet.net/story/3357\";> EFF to sponsor Tor</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:901
+#: /home/runa/tor/website/press/en/inthemedia.wml:978
 msgid "2004 Dec 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:905
+#: /home/runa/tor/website/press/en/inthemedia.wml:982
 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 "
@@ -1819,107 +1971,108 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:912
+#: /home/runa/tor/website/press/en/inthemedia.wml:989
 msgid "2004 Nov 16"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:915
+#: /home/runa/tor/website/press/en/inthemedia.wml:992
 msgid "AlterNet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:916
+#: /home/runa/tor/website/press/en/inthemedia.wml:993
 msgid ""
 "<a href=\"http://www.alternet.org/columnists/story/20523/\";> Heavy Traffic</"
 "a><br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:923
+#: /home/runa/tor/website/press/en/inthemedia.wml:1000
 msgid "2004 Aug 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:926
+#: /home/runa/tor/website/press/en/inthemedia.wml:1003
 msgid "Newsweek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:927
+#: /home/runa/tor/website/press/en/inthemedia.wml:1004
 msgid "Technology: Instant Security (no link)<br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:933
+#: /home/runa/tor/website/press/en/inthemedia.wml:1010
 msgid "2004 Aug 16"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:936
+#: /home/runa/tor/website/press/en/inthemedia.wml:1013
 msgid "Eweek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:937
+#: /home/runa/tor/website/press/en/inthemedia.wml:1014
 msgid ""
 "<a href=\"http://www.eweek.com/c/a/Security/Dont-Fear-Internet-Anonymity-";
 "Tools/\"> Don't Fear Internet Anonymity Tools</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:944 /tmp/RSE70o2_2j.xml:955
+#: /home/runa/tor/website/press/en/inthemedia.wml:1021
+#: /tmp/nRA6ZM91EX.xml:1032
 msgid "2004 Aug 6"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:947
+#: /home/runa/tor/website/press/en/inthemedia.wml:1024
 msgid "HCC magazine"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:948
+#: /home/runa/tor/website/press/en/inthemedia.wml:1025
 msgid ""
 "<a href=\"http://www.hcc.nl/eCache/DEF/21/083.html\";> Anoniem surfen met "
 "hulp van marine VS</a> (Dutch)<br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:958
+#: /home/runa/tor/website/press/en/inthemedia.wml:1035
 msgid "Golem"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:959
+#: /home/runa/tor/website/press/en/inthemedia.wml:1036
 msgid ""
 "<a href=\"http://www.golem.de/0408/32835.html\";> Tor: Anonymisierer nutzt "
 "Onion-Routing</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:966
+#: /home/runa/tor/website/press/en/inthemedia.wml:1043
 msgid "2004 Aug 5"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:969
+#: /home/runa/tor/website/press/en/inthemedia.wml:1046
 msgid "Network World Security"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:970
+#: /home/runa/tor/website/press/en/inthemedia.wml:1047
 msgid ""
 "<a href=\"http://www.networkworld.com/details/7088.html\";> Onion routing</"
 "a><br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:977
+#: /home/runa/tor/website/press/en/inthemedia.wml:1054
 msgid "2004 May 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:981
+#: /home/runa/tor/website/press/en/inthemedia.wml:1058
 msgid ""
 "<a href=\"http://www.wired.com/politics/security/news/2004/08/64464\";> Onion "
 "Routing Averts Prying Eyes</a><br/> Also in <a href=\"http://hotwired.goo.ne.";
@@ -1927,29 +2080,29 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:989
+#: /home/runa/tor/website/press/en/inthemedia.wml:1066
 msgid "2004 Mar 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:992
+#: /home/runa/tor/website/press/en/inthemedia.wml:1069
 msgid "CNET Japan blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:993
+#: /home/runa/tor/website/press/en/inthemedia.wml:1070
 msgid ""
 "<a href=\"http://japan.cnet.com/blog/umeda/2004/03/08/entry_post_126/\";> "
 "Yearning of hackers and insecurity</a> (Japanese)<br/>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:1000
+#: /home/runa/tor/website/press/en/inthemedia.wml:1077
 msgid "1999 Apr 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:1004
+#: /home/runa/tor/website/press/en/inthemedia.wml:1081
 msgid ""
 "<a href=\"http://www.wired.com/science/discoveries/news/1999/04/19091\";> "
 "Anonymous Web Surfing? Uh-Uh</a><br/>"

Modified: translation/trunk/projects/website/po/templates/projects/3-low.projects.pot
===================================================================
--- translation/trunk/projects/website/po/templates/projects/3-low.projects.pot	2011-02-12 12:18:18 UTC (rev 24216)
+++ translation/trunk/projects/website/po/templates/projects/3-low.projects.pot	2011-02-12 12:21:10 UTC (rev 24217)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-12-26 17:27+0000\n"
+"POT-Creation-Date: 2011-02-12 12:19+0000\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,55 +17,55 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/projects/en/projects.wml:8
+#: /home/runa/tor/website/projects/en/projects.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page projects/projects>"
 "\">Projects Overview</a>"
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/transifex/website/projects/en/projects.wml:12
+#: /home/runa/tor/website/projects/en/projects.wml:12
 msgid "Software &amp; Services"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/projects/en/projects.wml:13
+#: /home/runa/tor/website/projects/en/projects.wml:13
 msgid ""
 "The Tor Project maintains a growing set of software and services in order to "
 "make your experience safer, better, and more anonymous."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><div>
-#: /home/runa/transifex/website/projects/en/projects.wml:18
+#: /home/runa/tor/website/projects/en/projects.wml:18
 msgid "<a href=\"<page torbutton/index>\">Torbutton</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><p>
-#: /home/runa/transifex/website/projects/en/projects.wml:19
+#: /home/runa/tor/website/projects/en/projects.wml:19
 msgid ""
 "Torbutton is a 1-click way for Firefox users to enable or disable Tor in "
 "Firefox.  To keep you safe, Torbutton disables many types of active content."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><div>
-#: /home/runa/transifex/website/projects/en/projects.wml:24
+#: /home/runa/tor/website/projects/en/projects.wml:24
 msgid "<a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><p>
-#: /home/runa/transifex/website/projects/en/projects.wml:25
+#: /home/runa/tor/website/projects/en/projects.wml:25
 msgid ""
 "The Tor Browser Bundle contains everything you need to safely browse the "
 "Internet. This package requires no installation. Just extract it and run."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><div>
-#: /home/runa/transifex/website/projects/en/projects.wml:32
+#: /home/runa/tor/website/projects/en/projects.wml:32
 msgid "<a href=\"<page projects/vidalia>\">Vidalia</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><p>
-#: /home/runa/transifex/website/projects/en/projects.wml:33
+#: /home/runa/tor/website/projects/en/projects.wml:33
 msgid ""
 "Vidalia is a graphical Tor controller.  It allows you to see where your "
 "connections are in the world and configure Tor without getting into "
@@ -73,12 +73,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><div>
-#: /home/runa/transifex/website/projects/en/projects.wml:38
+#: /home/runa/tor/website/projects/en/projects.wml:38
 msgid "<a href=\"<page projects/arm>\">Arm</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><p>
-#: /home/runa/transifex/website/projects/en/projects.wml:39
+#: /home/runa/tor/website/projects/en/projects.wml:39
 msgid ""
 "Arm is a terminal status monitor for Tor, intended for command-line "
 "aficionados and ssh connections. This functions much like top does for "
@@ -87,36 +87,51 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><div>
-#: /home/runa/transifex/website/projects/en/projects.wml:47
+#: /home/runa/tor/website/projects/en/projects.wml:45
 msgid "<a href=\"<wiki>projects/TorBulkExitlist\">TorBEL</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><p>
-#: /home/runa/transifex/website/projects/en/projects.wml:48
+#: /home/runa/tor/website/projects/en/projects.wml:46
 msgid ""
 "The Tor Bulk Exitlist is a service others can query to determine if an IP is "
 "a tor exit node or not, and if so, on which TCP ports it allows traffic."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><div>
-#: /home/runa/transifex/website/projects/en/projects.wml:53
+#: /home/runa/tor/website/projects/en/projects.wml:51
 msgid "<a href=\"<wiki>projects/TorCheck\">Tor Check</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><p>
-#: /home/runa/transifex/website/projects/en/projects.wml:54
+#: /home/runa/tor/website/projects/en/projects.wml:52
 msgid ""
 "The Tor Check website determines if you are successfully browsing with Tor."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><div>
-#: /home/runa/transifex/website/projects/en/projects.wml:60
+#: /home/runa/tor/website/projects/en/projects.wml:58
 msgid "<a href=\"<page projects/gettor>\">GetTor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td><p>
-#: /home/runa/transifex/website/projects/en/projects.wml:61
+#: /home/runa/tor/website/projects/en/projects.wml:59
 msgid ""
 "GetTor is a program for serving Tor and related files over SMTP.  Users "
 "interact with GetTor by sending it email."
 msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><div>
+#: /home/runa/tor/website/projects/en/projects.wml:63
+msgid "<a href=\"https://guardianproject.info/apps/orbot/\";>Orbot</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><p>
+#: /home/runa/tor/website/projects/en/projects.wml:65
+msgid ""
+"In collaboration with <a href=\"https://guardianproject.info\";>The Guardian "
+"Project</a>, we're developing Tor on the Google Android mobile operating "
+"system. A related application is <a href=\"https://guardianproject.info/apps/";
+"orlib/\">Orlib</a>; a library for use by any Android application to route "
+"Internet traffic through Orbot/Tor."
+msgstr ""

Modified: translation/trunk/projects/website/po/templates/projects/3-low.torweather.pot
===================================================================
--- translation/trunk/projects/website/po/templates/projects/3-low.torweather.pot	2011-02-12 12:18:18 UTC (rev 24216)
+++ translation/trunk/projects/website/po/templates/projects/3-low.torweather.pot	2011-02-12 12:21:10 UTC (rev 24217)
@@ -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-02-12 12:19+0000\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,23 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/projects/en/torweather.wml:8
+#: /home/runa/tor/website/projects/en/torweather.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page projects/projects>"
-"\">Projects &raquo; </a> <a href=\"<page projects/projects>\">Sample "
-"Project</a>"
+"\">Projects &raquo; </a> <a href=\"<page projects/torweather>\">Tor Weather</"
+"a>"
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/transifex/website/projects/en/torweather.wml:14
-msgid "Sample Tor Project"
+#: /home/runa/tor/website/projects/en/torweather.wml:14
+msgid "Weather"
 msgstr ""
 
-#. type: Content of: <div><div>
-#: /home/runa/transifex/website/projects/en/torweather.wml:15
-msgid "Here is some information"
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/projects/en/torweather.wml:15
+msgid ""
+"<a href=\"https://weather.torproject.org\";>Tor Weather</a> is a web "
+"application that lets Tor relay operators subscribe to alerts about the "
+"availability of their relay, whether their relay bandwidth has dramatically "
+"dropped, or whether their Tor version is obsolete."
 msgstr ""