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

[or-cvs] r21131: {translation} updated po files (in translation/trunk/projects/website: bms bms/docs de de/docs nb nb/docs zh_CN zh_CN/docs)



Author: runa
Date: 2009-12-08 12:53:48 -0500 (Tue, 08 Dec 2009)
New Revision: 21131

Modified:
   translation/trunk/projects/website/bms/1-high.index.po
   translation/trunk/projects/website/bms/2-medium.donate.po
   translation/trunk/projects/website/bms/2-medium.faq.po
   translation/trunk/projects/website/bms/3-low.download-unix.po
   translation/trunk/projects/website/bms/3-low.faq-abuse.po
   translation/trunk/projects/website/bms/3-low.news.po
   translation/trunk/projects/website/bms/3-low.people.po
   translation/trunk/projects/website/bms/3-low.sponsors.po
   translation/trunk/projects/website/bms/4-optional.running-a-mirror.po
   translation/trunk/projects/website/bms/4-optional.volunteer.po
   translation/trunk/projects/website/bms/docs/2-medium.tor-doc-relay.po
   translation/trunk/projects/website/de/1-high.index.po
   translation/trunk/projects/website/de/2-medium.donate.po
   translation/trunk/projects/website/de/2-medium.faq.po
   translation/trunk/projects/website/de/3-low.download-unix.po
   translation/trunk/projects/website/de/3-low.faq-abuse.po
   translation/trunk/projects/website/de/3-low.news.po
   translation/trunk/projects/website/de/3-low.people.po
   translation/trunk/projects/website/de/3-low.sponsors.po
   translation/trunk/projects/website/de/4-optional.running-a-mirror.po
   translation/trunk/projects/website/de/4-optional.volunteer.po
   translation/trunk/projects/website/de/docs/2-medium.tor-doc-relay.po
   translation/trunk/projects/website/nb/1-high.index.po
   translation/trunk/projects/website/nb/2-medium.donate.po
   translation/trunk/projects/website/nb/2-medium.faq.po
   translation/trunk/projects/website/nb/3-low.download-unix.po
   translation/trunk/projects/website/nb/3-low.faq-abuse.po
   translation/trunk/projects/website/nb/3-low.news.po
   translation/trunk/projects/website/nb/3-low.people.po
   translation/trunk/projects/website/nb/3-low.sponsors.po
   translation/trunk/projects/website/nb/4-optional.running-a-mirror.po
   translation/trunk/projects/website/nb/4-optional.volunteer.po
   translation/trunk/projects/website/nb/docs/2-medium.tor-doc-relay.po
   translation/trunk/projects/website/zh_CN/1-high.bridges.po
   translation/trunk/projects/website/zh_CN/1-high.index.po
   translation/trunk/projects/website/zh_CN/2-medium.donate.po
   translation/trunk/projects/website/zh_CN/2-medium.faq.po
   translation/trunk/projects/website/zh_CN/3-low.download-unix.po
   translation/trunk/projects/website/zh_CN/3-low.faq-abuse.po
   translation/trunk/projects/website/zh_CN/3-low.news.po
   translation/trunk/projects/website/zh_CN/3-low.people.po
   translation/trunk/projects/website/zh_CN/3-low.sponsors.po
   translation/trunk/projects/website/zh_CN/4-optional.running-a-mirror.po
   translation/trunk/projects/website/zh_CN/4-optional.volunteer.po
   translation/trunk/projects/website/zh_CN/docs/2-medium.tor-doc-relay.po
Log:
updated po files

Modified: translation/trunk/projects/website/bms/1-high.index.po
===================================================================
--- translation/trunk/projects/website/bms/1-high.index.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/bms/1-high.index.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:06+0100\n"
+"POT-Creation-Date: 2009-12-08 18:50+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -41,8 +41,8 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/index.wml:20 /tmp/2aCB5PfdOJ.xml:30
-#: /tmp/2aCB5PfdOJ.xml:76
+#: /home/runa/tor/website/en/index.wml:20 /tmp/C_aZN7GLaY.xml:30
+#: /tmp/C_aZN7GLaY.xml:76
 msgid "<hr />"
 msgstr ""
 
@@ -130,17 +130,22 @@
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/index.wml:79
+msgid "07 December 2009: <a href=\"<page open-positions>\">Tor is hiring!</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/index.wml:80
 msgid ""
-"28 July 2009: Tor 0.2.1.19 released as stable.  Read the <a href=\"http://";
-"archives.seul.org/or/announce/Aug-2009/msg00000.html\">announcement</a> for "
+"10 October 2009: Tor 0.2.1.20 released as stable.  Read the <a href="
+"\"https://blog.torproject.org/blog/tor-02120-released\";>announcement</a> for "
 "the updates and changes."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/index.wml:81
 msgid ""
-"25 June 2009: Tor 0.2.0.35 released as stable.  Read the <a href=\"http://";
-"archives.seul.org/or/announce/Jun-2009/msg00000.html\">announcement</a> for "
+"28 July 2009: Tor 0.2.1.19 released as stable.  Read the <a href=\"http://";
+"archives.seul.org/or/announce/Aug-2009/msg00000.html\">announcement</a> for "
 "the updates and changes."
 msgstr ""
 

Modified: translation/trunk/projects/website/bms/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/bms/2-medium.donate.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/bms/2-medium.donate.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:06+0100\n"
+"POT-Creation-Date: 2009-12-08 18:50+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -22,70 +22,99 @@
 
 #. type: Content of: <div><div><h3>
 #: /home/runa/tor/website/en/donate.wml:13
-msgid "We accept donations via:"
+msgid "We accept donations of:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/donate.wml:15
-msgid "<a href=\"#paypal\">PayPal</a>"
+msgid "<a href=\"#money\">Money</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/donate.wml:16
-msgid "<a href=\"#check\">Check, Money Order, or Postal Order</a>"
+msgid "<a href=\"#services\">Services</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/donate.wml:17
-msgid "<a href=\"#wire\">ACH/e-check/Wire Transfers</a>"
+msgid "<a href=\"#hardware\">Hardware</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/donate.wml:18
-msgid "<a href=\"#eurobank\">European Bank Transfers</a>"
+msgid "<a href=\"#time\">Time</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/donate.wml:19
-msgid "<a href=\"#funds\">What happens to my donation?</a>"
+msgid "<a href=\"#outcome\">What happens to my donation?</a>"
 msgstr ""
 
-#.  END SIDEBAR 
-#. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:24
-msgid "<hr />"
-msgstr ""
-
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:27
+#: /home/runa/tor/website/en/donate.wml:26
 msgid ""
-"Your tax-deductible donation helps ensure online anonymity and privacy "
-"continue to exist in the world."
+"We offer a few ways to support online privacy and anonymity through "
+"donations.  You can donate <a href=\"#money\">money</a>, <a href=\"#services"
+"\">services</a>, <a href=\"#hardware\">hardware</a>, and <a href=\"#time"
+"\">time</a>.  Your tax-deductible donation helps ensure online anonymity and "
+"privacy continue to exist in the world."
 msgstr ""
 
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/donate.wml:32 /tmp/ZnGANnnrpi.xml:93
+msgid "<br />"
+msgstr ""
+
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:29
+#: /home/runa/tor/website/en/donate.wml:34
 msgid ""
 "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.  If you can't donate, but want to help raise funds please <a href="
-"\"mailto:donations@xxxxxxxxxxxxxx\";>contact us</a> directly."
+"donations.  We're happy to accept donations via paypal, checks, money "
+"orders, stock grants or other more sophisticated transations.  Contact us at "
+"donations@xxxxxxxxxxxxxx for more details."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:33
-msgid "<a id=\"paypal\"></a>"
+#: /home/runa/tor/website/en/donate.wml:43
+msgid "<a id=\"relay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:34
+#: /home/runa/tor/website/en/donate.wml:44
+msgid "<a class=\"anchor\" href=\"#relay\">Run a relay</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/donate.wml:45
+msgid ""
+"The easiest, most effective way to support online privacy and anonymity "
+"around the world is to run a relay.  You join a set of committed people in "
+"the world already running a relay.  The easiest way to speed up Tor is to "
+"add more relays to the network.  Running a relay is as easy as <a href="
+"\"<page docs/tor-doc-relay>\">clicking a button</a>.  Join the network.  "
+"Support your online anonymity and privacy!"
+msgstr ""
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/donate.wml:53
+msgid "<a id=\"money\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/donate.wml:54
+msgid "<a class=\"anchor\" href=\"#money\">Donate Money</a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/donate.wml:55
 msgid "<a class=\"anchor\" href=\"#paypal\">Subscription via PayPal</a>"
 msgstr ""
 
 #. type: Content of: <div><form><p>
-#: /home/runa/tor/website/en/donate.wml:37
+#: /home/runa/tor/website/en/donate.wml:57
 msgid ""
 "One of our core fundraising goals is not to annoy donors with repeated "
 "requests.  Therefore, we advocate for a subscription-based approach: simply "
@@ -97,64 +126,64 @@
 msgstr ""
 
 #. type: Content of: <div><form><select>
-#: /home/runa/tor/website/en/donate.wml:41
+#: /home/runa/tor/website/en/donate.wml:59
 msgid "<br /> <br /> Choose your currency: <select name=\"currency_code\">"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:45 /tmp/8PknLuQdzN.xml:87
+#: /home/runa/tor/website/en/donate.wml:63 /tmp/ZnGANnnrpi.xml:105
 msgid "$"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:46 /tmp/8PknLuQdzN.xml:88
+#: /home/runa/tor/website/en/donate.wml:64 /tmp/ZnGANnnrpi.xml:106
 msgid "€"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:47 /tmp/8PknLuQdzN.xml:89
+#: /home/runa/tor/website/en/donate.wml:65 /tmp/ZnGANnnrpi.xml:107
 msgid "£"
 msgstr ""
 
 #. type: Content of: <div><form>
-#: /home/runa/tor/website/en/donate.wml:48
+#: /home/runa/tor/website/en/donate.wml:66
 msgid "</select>"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:51
+#: /home/runa/tor/website/en/donate.wml:69
 msgid "<input type=\"radio\" name=\"a3\" value=\"250.00\" />250/month"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:52
+#: /home/runa/tor/website/en/donate.wml:70
 msgid "<input type=\"radio\" name=\"a3\" value=\"100.00\" />100/month"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:53
+#: /home/runa/tor/website/en/donate.wml:71
 msgid "<input type=\"radio\" name=\"a3\" value=\"50.00\" />50/month"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:54
+#: /home/runa/tor/website/en/donate.wml:72
 msgid ""
 "<input type=\"radio\" name=\"a3\" value=\"20.00\" checked=\"checked\" />20/"
 "month"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:55
+#: /home/runa/tor/website/en/donate.wml:73
 msgid "<input type=\"radio\" name=\"a3\" value=\"10.00\" />10/month"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:56
+#: /home/runa/tor/website/en/donate.wml:74
 msgid "<input type=\"radio\" name=\"a3\" value=\"5.00\" />5/month"
 msgstr ""
 
 #. type: Content of: <div><form>
-#: /home/runa/tor/website/en/donate.wml:59
+#: /home/runa/tor/website/en/donate.wml:77
 msgid ""
 "<input type=\"hidden\" name=\"p3\" value=\"1\" /> <input type=\"hidden\" "
 "name=\"t3\" value=\"M\" /> <input type=\"hidden\" name=\"sra\" value=\"1\" /"
@@ -170,18 +199,13 @@
 "\"https://www.torproject.org/donate\"/>"
 msgstr ""
 
-#. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:75
-msgid "<br />"
-msgstr ""
-
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:76
+#: /home/runa/tor/website/en/donate.wml:94
 msgid "<a class=\"anchor\" href=\"#paypal\">Single donation via PayPal</a>"
 msgstr ""
 
 #. type: Content of: <div><form><p><select>
-#: /home/runa/tor/website/en/donate.wml:78
+#: /home/runa/tor/website/en/donate.wml:96
 msgid ""
 "You can also make a <b>one-time donation</b> (via PayPal, but doesn't "
 "require any account):<br /> <input type=\"radio\" name=\"amount\" value="
@@ -193,7 +217,7 @@
 msgstr ""
 
 #. type: Content of: <div><form><p>
-#: /home/runa/tor/website/en/donate.wml:90
+#: /home/runa/tor/website/en/donate.wml:108
 msgid ""
 "</select> <input type=\"hidden\" name=\"no_shipping\" value=\"1\" /> <input "
 "type=\"image\" src=\"images/btn_donateCC_LG.gif\" name=\"submit\" alt=\"Make "
@@ -205,133 +229,143 @@
 "\"cancel_return\" value=\"https://www.torproject.org/donate\"/>"
 msgstr ""
 
-#. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:106
-msgid "<a id=\"check\"></a>"
-msgstr ""
-
-#. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:107
-msgid ""
-"<a class=\"anchor\" href=\"#check\">Checks, Money Orders, and Postal Orders</"
-"a>"
-msgstr ""
-
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:110
-msgid "These payments can be sent to:"
+#: /home/runa/tor/website/en/donate.wml:124
+msgid "If you want to send a check, money order, or cash, please send to:"
 msgstr ""
 
-#. type: Content of: <div><blockquote><p>
-#: /home/runa/tor/website/en/donate.wml:113
-msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026 USA"
+#. type: Content of: <div><p><address>
+#: /home/runa/tor/website/en/donate.wml:127
+msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:119
+#: /home/runa/tor/website/en/donate.wml:131
 msgid ""
-"Attention US citizens: if you would like an acknowledgement letter, please "
-"inform us with your donation.  A canceled check, money/postal order receipt, "
-"or appraisal of donated property are valid records according to the IRS."
+"If you want a donation receipt for your non-paypal, non-check deposit, "
+"please specifically request one with your mailed donation."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:124
-msgid "<a id=\"wire\"></a>"
+#: /home/runa/tor/website/en/donate.wml:135
+msgid "<a id=\"services\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:125
-msgid "<a class=\"anchor\" href=\"#wire\">ACH/e-check/Wire Transfers</a>"
+#: /home/runa/tor/website/en/donate.wml:136
+msgid "<a class=\"anchor\" href=\"#services\">Donate Services</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:126
+#: /home/runa/tor/website/en/donate.wml:137
 msgid ""
-"In the US, ACH or e-check transfers are a fine way to donate.  We're happy "
-"to accept wire transfers over US$100.  Domestic United States ACH/e-check "
-"transfers are normally free for the sender, whereas wire transfers will "
-"incur fees.  If you are located in Europe, <a href=\"#eurobank\">please see "
-"below</a>."
+"The Tor Project is always looking for services relating to technical needs, "
+"like bandwidth, colocation, hosted services, legal representation, or "
+"consulting.  By donating services, you join our <a href=\"<page sponsors>"
+"\">many sponsors</a> in providing online privacy and anonymity.  We're "
+"currently looking for scalable hosting services for reporting needs from "
+"large data sets and reliable high-bandwidth hosting.  We may have hardware "
+"we can provide you for your service donation."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:132
+#: /home/runa/tor/website/en/donate.wml:144
 msgid ""
-"Organization Address:<br /> The Tor Project<br /> 122 Scott Circle<br /> "
-"Dedham, MA 02026<br />"
+"Can you write code? We're always looking for smart, motivated coders to "
+"either port Tor to new or old operating systems, or solve difficult online "
+"anonymity problems.  Take a look at <a href=\"<page volunteer>#Coding\">our "
+"coding projects</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:138
+#: /home/runa/tor/website/en/donate.wml:148
 msgid ""
-"account number: 63904957725<br /> routing number: 011075150<br /> SWIFT "
-"Code: SVRNUS33//FW011075150<br />"
+"Are you a creative person? Do you have a fantastic idea for a campaign? Are "
+"you someone who can come up with awesome artwork? We're always looking for "
+"new ways to promote Tor and get the word out that everyone needs their "
+"privacy and anonymity online."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:143
+#: /home/runa/tor/website/en/donate.wml:152
 msgid ""
-"Bank Address:<br /> Sovereign Bank<br /> 1130 Berkshire Boulevard<br /> "
-"Wyomissing, PA 19610<br />"
+"Is your legal firm willing to defend Tor and its volunteers? Are you waiting "
+"for an interesting case to defend online privacy and anonymity?"
 msgstr ""
 
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/donate.wml:155
+msgid ""
+"If any of the service ideas struck a nerve, contact us at "
+"donations@xxxxxxxxxxxxxx for more details."
+msgstr ""
+
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:149
-msgid "<a id=\"eurobank\"></a>"
+#: /home/runa/tor/website/en/donate.wml:158
+msgid "<a id=\"hardware\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:150
-msgid "<a class=\"anchor\" href=\"#eurobank\">European Bank Transfers</a>"
+#: /home/runa/tor/website/en/donate.wml:159
+msgid "<a class=\"anchor\" href=\"#hardware\">Donate Hardware</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:151
+#: /home/runa/tor/website/en/donate.wml:160
 msgid ""
-"In Europe, we have a funding arrangement with the <a href=\"http://www.ccc.";
-"de/\">Chaos Computer Club</a>.  Your donations go into a separate bank "
-"account managed by the CCC, and they use the funds to do beneficial "
-"activities for Tor in Europe.  Residents from any of the <a href=\"http://en.";
-"wikipedia.org/wiki/Single_Euro_Payments_Area\">31 SEPA member states</a> can "
-"wire up to 50.000 Euro at the cost of a domestic transaction (i.e., usually "
-"free if submitted electronically)."
+"We're generally looking for donated hardware and support services that could "
+"be used to provide the infrastructure that supports Tor's operations, "
+"including website mirrors, database servers, build systems and legacy "
+"hardware for supporting packages on older Operating Systems; such as OS X "
+"10.2, OS X 10.3, Windows XP, Windows 7, IRIX, Redhat, CentOS, Fedora, "
+"Debian, etc.  A number of service providers have an abundance of bandwidth "
+"capacity, but need hardware in order donate it to us."
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/donate.wml:161
 msgid ""
-"The account information is:<br /> Wau Holland Stiftung<br /> IBAN "
-"DE57520400210277281200<br /> SWIFT BIC COBADEFF520<br />"
+"By donating hardware, you're joining our <a href=\"<page sponsors>\">many "
+"sponsors</a> in providing online privacy and anonymity.  If you want Tor to "
+"work on your architecture or hardware, a fine way to do this is to donate "
+"the hardware and operating system to us.  Contact us at donations@torproject."
+"org for more details."
 msgstr ""
 
-#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:167
-msgid ""
-"Classic style German account information is:<br /> Konto: 2772812-02<br /> "
-"Inhaber: Wau Holland Stiftung<br /> Bank: Commerzbank Kassel<br /> BLZ: "
-"52040021<br />"
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/donate.wml:164
+msgid "<a id=\"time\"></a>"
 msgstr ""
 
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/donate.wml:165
+msgid "<a class=\"anchor\" href=\"#time\">Donate Time</a>"
+msgstr ""
+
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:173
+#: /home/runa/tor/website/en/donate.wml:166
 msgid ""
-"WHS issues a donation receipt upon request (if provided with address "
-"information)."
+"We're always looking for excited volunteers to give talks or trainins at "
+"conferences, barcamps, and other meetings where people should learn about "
+"online privacy and anonymity with Tor.  We're happy to work with you to help "
+"you better present Tor and online privacy and anonymity.  Contact us at "
+"donations@xxxxxxxxxxxxxx for more details."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:177
-msgid "<a id=\"funds\"></a>"
+#: /home/runa/tor/website/en/donate.wml:169
+msgid ""
+"<a id=\"outcome\"></a> <a id=\"funds\"></a><a class=\"anchor\" href=\"#funds"
+"\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:178
-msgid "<a class=\"anchor\" href=\"#funds\">What happens to my donation?</a>"
+#: /home/runa/tor/website/en/donate.wml:171
+msgid "<a class=\"anchor\" href=\"#outcome\">What happens to my donation?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:179
+#: /home/runa/tor/website/en/donate.wml:172
 msgid ""
 "If you've just donated, thank you for your donation.  Your funds are "
 "deposited into our general fund.  You join our <a href=\"<page sponsors>"
@@ -340,7 +374,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:182
+#: /home/runa/tor/website/en/donate.wml:175
 msgid ""
 "<img src=\"images/2008-funding-chart.png\" alt=\"Who funds the Tor Project?"
 "\"/> <img src=\"images/2008-expenses-chart.png\" alt=\"How is the money "
@@ -348,9 +382,9 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:185
+#: /home/runa/tor/website/en/donate.wml:179
 msgid ""
-"<hr /> <strong>The Tor Project respects the confidentiality of our "
-"supporters, when requested. We do not lend, rent, or sell our lists of "
-"donors at any time.</strong>"
+"<strong>The Tor Project respects the confidentiality of our supporters, when "
+"requested. We do not lend, rent, or sell our lists of donors at any time.</"
+"strong>"
 msgstr ""

Modified: translation/trunk/projects/website/bms/2-medium.faq.po
===================================================================
--- translation/trunk/projects/website/bms/2-medium.faq.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/bms/2-medium.faq.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:06+0100\n"
+"POT-Creation-Date: 2009-12-08 18:50+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -21,7 +21,7 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:12 /tmp/0t7A0MrQjb.xml:1085
+#: /home/runa/tor/website/en/faq.wml:12 /tmp/JLln88wPtn.xml:1084
 msgid "<hr />"
 msgstr ""
 
@@ -559,11 +559,11 @@
 "answer these mails, but typically they need to spend most of their time on "
 "development tasks that will benefit more people.  This is especially true if "
 "your question is already covered in the <a href=\"<page documentation>"
-"\">documentation</a> or on this FAQ. We don't hate you; we're just busy."
+"\">documentation</a> or on this FAQ."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:308
+#: /home/runa/tor/website/en/faq.wml:307
 msgid ""
 "So if we don't answer your mail, first check the <a href=\"<page "
 "documentation>\">documentation</a> page, along with this FAQ, to make sure "
@@ -580,7 +580,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:323
+#: /home/runa/tor/website/en/faq.wml:322
 msgid ""
 "Another strategy is to <a href=\"<page docs/tor-doc-relay>\">run a Tor relay "
 "for a while</a>, and/or <a href=\"<page donate>\">donate money</a> <a href="
@@ -590,29 +590,29 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:331
+#: /home/runa/tor/website/en/faq.wml:330
 msgid ""
 "If you find your answer, please stick around on the IRC channel or the "
 "mailing list and answer questions from others."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:335
+#: /home/runa/tor/website/en/faq.wml:334
 msgid "<hr /> <a id=\"WhySlow\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:338
+#: /home/runa/tor/website/en/faq.wml:337
 msgid "<a class=\"anchor\" href=\"#WhySlow\">Why is Tor so slow?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:341
+#: /home/runa/tor/website/en/faq.wml:340
 msgid "There are many reasons why the Tor network is currently slow."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:345
+#: /home/runa/tor/website/en/faq.wml:344
 msgid ""
 "Before we answer, though, you should realize that Tor is never going to be "
 "blazing fast. Your traffic is bouncing through volunteers' computers in "
@@ -622,7 +622,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:353
+#: /home/runa/tor/website/en/faq.wml:352
 msgid ""
 "But that doesn't mean that it can't be improved. The current Tor network is "
 "quite small compared to the number of people trying to use it, and many of "
@@ -631,12 +631,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:360
+#: /home/runa/tor/website/en/faq.wml:359
 msgid "What can you do to help?"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:366
+#: /home/runa/tor/website/en/faq.wml:365
 msgid ""
 "<a href=\"<page docs/tor-doc-relay>\">Configure your Tor to relay traffic "
 "for others</a>. Help make the Tor network large enough that we can handle "
@@ -644,7 +644,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:372
+#: /home/runa/tor/website/en/faq.wml:371
 msgid ""
 "<a href=\"<page gui/index>\">Help us make Tor more usable</a>. We especially "
 "need people to help make it easier to configure your Tor as a relay. Also, "
@@ -653,7 +653,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:379
+#: /home/runa/tor/website/en/faq.wml:378
 msgid ""
 "There are some bottlenecks in the current Tor network. Help us design "
 "experiments to track down and demonstrate where the problems are, and then "
@@ -661,7 +661,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:385
+#: /home/runa/tor/website/en/faq.wml:384
 msgid ""
 "There are some steps that individuals can take to improve their Tor "
 "performance. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
@@ -673,7 +673,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:396
+#: /home/runa/tor/website/en/faq.wml:395
 msgid ""
 "Tor needs some architectural changes too. One important change is to start "
 "providing <a href=\"#EverybodyARelay\">better service to people who relay "
@@ -682,7 +682,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:404
+#: /home/runa/tor/website/en/faq.wml:403
 msgid ""
 "Help do other things so we can do the hard stuff. Please take a moment to "
 "figure out what your skills and interests are, and then <a href=\"<page "
@@ -690,7 +690,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:410
+#: /home/runa/tor/website/en/faq.wml:409
 msgid ""
 "Help find sponsors for Tor. Do you work at a company or government agency "
 "that uses Tor or has a use for Internet privacy, e.g. to browse the "
@@ -701,7 +701,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:419
+#: /home/runa/tor/website/en/faq.wml:418
 msgid ""
 "If you can't help out with any of the above, you can still help out "
 "individually by <a href=\"<page donate>\">donating a bit of money to the "
@@ -709,32 +709,32 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:426
+#: /home/runa/tor/website/en/faq.wml:425
 msgid "<hr /> <a id=\"Funding\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:429
+#: /home/runa/tor/website/en/faq.wml:428
 msgid ""
 "<a class=\"anchor\" href=\"#Funding\">What would The Tor Project do with "
 "more funding?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:433
+#: /home/runa/tor/website/en/faq.wml:432
 msgid ""
-"We have about 1500 relays right now, pushing over 150 MB/s average traffic. "
+"We have about 1800 relays right now, pushing over 150 MB/s average traffic. "
 "We have several hundred thousand active users. But the Tor network is not "
 "yet self-sustaining."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:439
+#: /home/runa/tor/website/en/faq.wml:438
 msgid "There are six main development/maintenance pushes that need attention:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:445
+#: /home/runa/tor/website/en/faq.wml:444
 msgid ""
 "Scalability: We need to keep scaling and decentralizing the Tor architecture "
 "so it can handle thousands of relays and millions of users. The upcoming "
@@ -743,7 +743,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:452
+#: /home/runa/tor/website/en/faq.wml:451
 msgid ""
 "User support: With this many users, a lot of people are asking questions all "
 "the time, offering to help out with things, and so on. We need good clean "
@@ -751,7 +751,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:458
+#: /home/runa/tor/website/en/faq.wml:457
 msgid ""
 "Relay support: the Tor network is run by volunteers, but they still need "
 "attention with prompt bug fixes, explanations when things go wrong, "
@@ -762,7 +762,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:467
+#: /home/runa/tor/website/en/faq.wml:466
 msgid ""
 "Usability: Beyond documentation, we also need to work on usability of the "
 "software itself. This includes installers, clean GUIs, easy configuration to "
@@ -773,7 +773,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:476
+#: /home/runa/tor/website/en/faq.wml:475
 msgid ""
 "Incentives: We need to work on ways to encourage people to configure their "
 "Tors as relays and exit nodes rather than just clients.  <a href="
@@ -782,7 +782,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:483
+#: /home/runa/tor/website/en/faq.wml:482
 msgid ""
 "Research: The anonymous communications field is full of surprises and "
 "gotchas. In our copious free time, we also help run top anonymity and "
@@ -794,7 +794,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:496
+#: /home/runa/tor/website/en/faq.wml:495
 msgid ""
 "We're continuing to move forward on all of these, but at this rate <a href="
 "\"#WhySlow\">the Tor network is growing faster than the developers can keep "
@@ -803,14 +803,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:504
+#: /home/runa/tor/website/en/faq.wml:503
 msgid ""
 "We are also excited about tackling related problems, such as censorship-"
 "resistance."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:509
+#: /home/runa/tor/website/en/faq.wml:508
 msgid ""
 "We are proud to have <a href=\"<page sponsors>\">sponsorship and support</a> "
 "from the Omidyar Network, the International Broadcasting Bureau, Bell "
@@ -819,7 +819,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:516
+#: /home/runa/tor/website/en/faq.wml:515
 msgid ""
 "However, this support is not enough to keep Tor abreast of changes in the "
 "Internet privacy landscape. Please <a href=\"<page donate>\">donate</a> to "
@@ -828,18 +828,18 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:522
+#: /home/runa/tor/website/en/faq.wml:521
 msgid "<hr /> <a id=\"HowUninstallTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:525
+#: /home/runa/tor/website/en/faq.wml:524
 msgid ""
 "<a class=\"anchor\" href=\"#HowUninstallTor\">How do I uninstall Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:528
+#: /home/runa/tor/website/en/faq.wml:527
 msgid ""
 "This depends entirely on how you installed it and which operating system you "
 "have. If you installed a package, then hopefully your package has a way to "
@@ -849,35 +849,35 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:536
+#: /home/runa/tor/website/en/faq.wml:535
 msgid ""
 "In your taskbar, right click on Vidalia (the green onion or the black head)  "
 "and choose exit."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:538
+#: /home/runa/tor/website/en/faq.wml:537
 msgid ""
 "Right click on the taskbar to bring up TaskManager. Look for tor.exe in the "
 "Process List. If it's running, right click and choose End Process."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:540
+#: /home/runa/tor/website/en/faq.wml:539
 msgid ""
 "Click the Start button, go to Programs, go to Vidalia, choose Uninstall.  "
 "This will remove the Vidalia bundle, which includes Tor and Polipo."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:542
+#: /home/runa/tor/website/en/faq.wml:541
 msgid ""
 "Start Firefox. Go to the Tools menu, choose Add-ons. Select Torbutton.  "
 "Click the Uninstall button."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:547
+#: /home/runa/tor/website/en/faq.wml:546
 msgid ""
 "If you do not follow these steps (for example by trying to uninstall "
 "Vidalia, Tor, and Polipo while they are still running), you will need to "
@@ -885,14 +885,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:553
+#: /home/runa/tor/website/en/faq.wml:552
 msgid ""
 "For Mac OS X, follow the <a href=\"<page docs/tor-doc-osx>#uninstall"
 "\">uninstall directions</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:558
+#: /home/runa/tor/website/en/faq.wml:557
 msgid ""
 "If you installed by source, I'm afraid there is no easy uninstall method. "
 "But on the bright side, by default it only installs into /usr/local/ and it "
@@ -900,52 +900,52 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:563
+#: /home/runa/tor/website/en/faq.wml:562
 msgid "<hr /> <a id=\"PGPSigs\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:566
+#: /home/runa/tor/website/en/faq.wml:565
 msgid ""
 "<a class=\"anchor\" href=\"#PGPSigs\">What are these \"sig\" files on the "
 "download page?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:570
+#: /home/runa/tor/website/en/faq.wml:569
 msgid ""
 "These are PGP signatures, so you can verify that the file you've downloaded "
 "is exactly the one that we intended you to get."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:575
+#: /home/runa/tor/website/en/faq.wml:574
 msgid ""
 "Please read the <a href=\"<page verifying-signatures>\">verifying "
 "signatures</a> page for details."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:579
+#: /home/runa/tor/website/en/faq.wml:578
 msgid "<hr /> <a id=\"CompileTorWindows\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:582
+#: /home/runa/tor/website/en/faq.wml:581
 msgid ""
 "<a class=\"anchor\" href=\"#CompileTorWindows\">How do I compile Tor under "
 "Windows?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:586
+#: /home/runa/tor/website/en/faq.wml:585
 msgid ""
 "Try following the steps at <a href=\"<svnsandbox>doc/tor-win32-mingw-"
 "creation.txt\"><svnsandbox>doc/tor-win32-mingw-creation.txt</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:591
+#: /home/runa/tor/website/en/faq.wml:590
 msgid ""
 "(Note that you don't need to compile Tor yourself in order to use it. Most "
 "people just use the packages available on the <a href=\"<page download>"
@@ -953,19 +953,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:596
+#: /home/runa/tor/website/en/faq.wml:595
 msgid "<hr /> <a id=\"VirusFalsePositives\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:599
+#: /home/runa/tor/website/en/faq.wml:598
 msgid ""
 "<a class=\"anchor\" href=\"#VirusFalsePositives\">Why does my Tor executable "
 "appear to have a virus or spyware?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:603
+#: /home/runa/tor/website/en/faq.wml:602
 msgid ""
 "Sometimes, overzealous Windows virus and spyware detectors trigger on some "
 "parts of the Tor Windows binary. Our best guess is that these are false "
@@ -976,7 +976,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:611
+#: /home/runa/tor/website/en/faq.wml:610
 msgid ""
 "In the meantime, we encourage you to not just take our word for it. Our job "
 "is to provide the source; if you're concerned, please do <a href="
@@ -984,19 +984,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:616
+#: /home/runa/tor/website/en/faq.wml:615
 msgid "<hr /> <a id=\"LiveCD\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:619
+#: /home/runa/tor/website/en/faq.wml:618
 msgid ""
 "<a class=\"anchor\" href=\"#LiveCD\">Is there a LiveCD or other bundle that "
 "includes Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:623
+#: /home/runa/tor/website/en/faq.wml:622
 msgid ""
 "There isn't any official LiveCD at this point. We're still trying to find "
 "good solutions and trying to understand the security and anonymity "
@@ -1005,12 +1005,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:630
+#: /home/runa/tor/website/en/faq.wml:629
 msgid "LiveCDs:"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:634
+#: /home/runa/tor/website/en/faq.wml:633
 msgid ""
 "<a href=\"http://incognito.anonymityanywhere.com/\";>Incognito LiveCD/USB</a> "
 "is a CD you can boot that has several Internet applications (Firefox, IRC, "
@@ -1020,7 +1020,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:639
+#: /home/runa/tor/website/en/faq.wml:638
 msgid ""
 "<a href=\"http://tork.sourceforge.net/wiki/index.php/LiveCD\";>TorK LiveCD</"
 "a> is Knoppix-based with an emphasis on user-friendliness. You can work "
@@ -1030,7 +1030,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:644
+#: /home/runa/tor/website/en/faq.wml:643
 msgid ""
 "<a href=\"http://mandalka.name/privatix/\";>Privatix LiveCD/USB</a> is a "
 "debian based live-system including tor, firefox and torbutton which can save "
@@ -1038,12 +1038,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:650
+#: /home/runa/tor/website/en/faq.wml:649
 msgid "Windows bundles:"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:654
+#: /home/runa/tor/website/en/faq.wml:653
 msgid ""
 "<a href=\"<page torbrowser/index>\">Tor Browser Bundle</a> for Windows comes "
 "with a pre-configured web browser and is self contained so you can run it "
@@ -1051,14 +1051,14 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:657
+#: /home/runa/tor/website/en/faq.wml:656
 msgid ""
 "<a href=\"http://www.janusvm.com/tor_vm/\";>Tor VM</a> is a successor to "
 "JanusVM. It needs testing from you!"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:659
+#: /home/runa/tor/website/en/faq.wml:658
 msgid ""
 "<a href=\"http://janusvm.com/\";>JanusVM</a> is a Linux kernel and software "
 "running in VMWare that sits between your Windows computer and the Internet, "
@@ -1066,7 +1066,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:662
+#: /home/runa/tor/website/en/faq.wml:661
 msgid ""
 "<a href=\"http://www.xerobank.com/xB_browser.html\";>xB Browser</a>, "
 "previously known as Torpark, is a Firefox+Tor package for Win32 that can "
@@ -1074,12 +1074,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:668
+#: /home/runa/tor/website/en/faq.wml:667
 msgid "Not currently maintained as far as we know:"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:672
+#: /home/runa/tor/website/en/faq.wml:671
 msgid ""
 "Polippix / Privatlivets Fred is a Danish Knoppix-based LiveCD with Tor and "
 "utilities to encrypt IP-telephony. <a href=\"http://polippix.org/\";>Info and "
@@ -1087,7 +1087,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:675
+#: /home/runa/tor/website/en/faq.wml:674
 msgid ""
 "ELE is a Linux LiveCD which is focused on privacy related software. It "
 "includes Tor and you can download it at <a href=\"http://www.";
@@ -1096,7 +1096,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:679
+#: /home/runa/tor/website/en/faq.wml:678
 msgid ""
 "Virtual Privacy Machine is a Linux LiveCD that includes Firefox, Privoxy, "
 "Tor, some IRC and IM applications, and a set of ipchains rules aimed to "
@@ -1107,7 +1107,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:684
+#: /home/runa/tor/website/en/faq.wml:683
 msgid ""
 "Anonym.OS is a LiveCD similar to the above but is based on OpenBSD rather "
 "than Linux for maximum security. It was designed to be anonymous and secure "
@@ -1118,7 +1118,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:690
+#: /home/runa/tor/website/en/faq.wml:689
 msgid ""
 "Phantomix is a LiveCD for anonymous surfing and chatting based on the most "
 "recent KNOPPIX release. It comes preconfigured with Privoxy, Tor and Polipo. "
@@ -1127,24 +1127,24 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:697
+#: /home/runa/tor/website/en/faq.wml:696
 msgid "Please contact us if you know any others."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:700
+#: /home/runa/tor/website/en/faq.wml:699
 msgid "<hr /> <a id=\"ChooseEntryExit\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:703
+#: /home/runa/tor/website/en/faq.wml:702
 msgid ""
 "<a class=\"anchor\" href=\"#ChooseEntryExit\">Can I control which nodes (or "
 "country) are used for entry/exit?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:706
+#: /home/runa/tor/website/en/faq.wml:705
 msgid ""
 "Yes. You can set preferred entry and exit nodes as well as inform Tor which "
 "nodes you do not want to use.  The following options can be added to your "
@@ -1152,53 +1152,53 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/faq.wml:712
+#: /home/runa/tor/website/en/faq.wml:711
 msgid "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/faq.wml:713
+#: /home/runa/tor/website/en/faq.wml:712
 msgid ""
 "A list of preferred nodes to use for the first hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/faq.wml:715
+#: /home/runa/tor/website/en/faq.wml:714
 msgid "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/faq.wml:716
+#: /home/runa/tor/website/en/faq.wml:715
 msgid ""
 "A list of preferred nodes to use for the last hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/faq.wml:718
+#: /home/runa/tor/website/en/faq.wml:717
 msgid "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/faq.wml:719
+#: /home/runa/tor/website/en/faq.wml:718
 msgid "A list of nodes to never use when building a circuit."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/faq.wml:721
+#: /home/runa/tor/website/en/faq.wml:720
 msgid "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/faq.wml:722
+#: /home/runa/tor/website/en/faq.wml:721
 msgid ""
 "A list of nodes to never use when picking an exit.  Nodes listed in "
 "<tt>ExcludeNodes</tt> are automatically in this list."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:727
+#: /home/runa/tor/website/en/faq.wml:726
 msgid ""
 "<em>We recommend you do not use these</em> -- they are intended for testing "
 "and may disappear in future versions.  You get the best security that Tor "
@@ -1207,7 +1207,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:733
+#: /home/runa/tor/website/en/faq.wml:732
 msgid ""
 "The <tt>EntryNodes</tt> and <tt>ExitNodes</tt> config options are treated as "
 "a request, meaning if the nodes are down or seem slow, Tor will still avoid "
@@ -1219,7 +1219,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:743
+#: /home/runa/tor/website/en/faq.wml:742
 msgid ""
 "Instead of <tt>$fingerprint</tt> you can also specify a 2 letter ISO3166 "
 "country code in curly braces (for example {de}), or an ip address pattern "
@@ -1228,7 +1228,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:751
+#: /home/runa/tor/website/en/faq.wml:750
 msgid ""
 "If you want to access a service directly through Tor's SOCKS interface (eg. "
 "using ssh via connect.c), another option is to set up an internal mapping in "
@@ -1237,24 +1237,24 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:757
+#: /home/runa/tor/website/en/faq.wml:756
 msgid "<hr /> <a id=\"RelayFlexible\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:760
+#: /home/runa/tor/website/en/faq.wml:759
 msgid ""
 "<a class=\"anchor\" href=\"#RelayFlexible\">How stable does my relay need to "
 "be?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:764
+#: /home/runa/tor/website/en/faq.wml:763
 msgid "We aim to make setting up a Tor relay easy and convenient:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:768
+#: /home/runa/tor/website/en/faq.wml:767
 msgid ""
 "Tor has built-in support for <a href=\"https://wiki.torproject.org/noreply/";
 "TheOnionRouter/TorFAQ#LimitBandwidth\"> rate limiting</a>. Further, if you "
@@ -1264,7 +1264,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:778
+#: /home/runa/tor/website/en/faq.wml:777
 msgid ""
 "Each Tor relay has an <a href=\"#ExitPolicies\">exit policy</a> that "
 "specifies what sort of outbound connections are allowed or refused from that "
@@ -1273,7 +1273,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:785
+#: /home/runa/tor/website/en/faq.wml:784
 msgid ""
 "It's fine if the relay goes offline sometimes. The directories notice this "
 "quickly and stop advertising the relay. Just try to make sure it's not too "
@@ -1281,14 +1281,14 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:790
+#: /home/runa/tor/website/en/faq.wml:789
 msgid ""
 "We can handle relays with dynamic IPs just fine &mdash; simply leave the "
 "Address config option blank, and Tor will try to guess."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:793
+#: /home/runa/tor/website/en/faq.wml:792
 msgid ""
 "If your relay is behind a NAT and it doesn't know its public IP (e.g. it has "
 "an IP of 192.168.x.y), you'll need to set up port forwarding. Forwarding TCP "
@@ -1298,7 +1298,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:800
+#: /home/runa/tor/website/en/faq.wml:799
 msgid ""
 "Your relay will passively estimate and advertise its recent bandwidth "
 "capacity, so high-bandwidth relays will attract more users than low-"
@@ -1306,24 +1306,24 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:806
+#: /home/runa/tor/website/en/faq.wml:805
 msgid "<hr /> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:810
+#: /home/runa/tor/website/en/faq.wml:809
 msgid ""
 "<a class=\"anchor\" href=\"#ExitPolicies\">I'd run a relay, but I don't want "
 "to deal with abuse issues.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:814
+#: /home/runa/tor/website/en/faq.wml:813
 msgid "Great. That's exactly why we implemented exit policies."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:818
+#: /home/runa/tor/website/en/faq.wml:817
 msgid ""
 "Each Tor relay has an exit policy that specifies what sort of outbound "
 "connections are allowed or refused from that relay. The exit policies are "
@@ -1339,7 +1339,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:832
+#: /home/runa/tor/website/en/faq.wml:831
 msgid ""
 "The default exit policy allows access to many popular services (e.g. web "
 "browsing), but <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
@@ -1355,7 +1355,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:847
+#: /home/runa/tor/website/en/faq.wml:846
 msgid ""
 "If you do allow any exit connections, make sure name resolution works (that "
 "is, your computer can resolve Internet addresses correctly).  If there are "
@@ -1365,19 +1365,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:855
+#: /home/runa/tor/website/en/faq.wml:854
 msgid "<hr /> <a id=\"RelayOrBridge\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:858
+#: /home/runa/tor/website/en/faq.wml:857
 msgid ""
 "<a class=\"anchor\" href=\"#RelayOrBridge\">Should I be a normal relay or "
 "bridge relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:861
+#: /home/runa/tor/website/en/faq.wml:860
 msgid ""
 "<a href=\"<page bridges>\">Bridge relays</a> (or \"bridges\" for short)  are "
 "<a href=\"<page docs/tor-doc-relay>\">Tor relays</a> that aren't listed in "
@@ -1387,7 +1387,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:868
+#: /home/runa/tor/website/en/faq.wml:867
 msgid ""
 "Being a normal relay vs being a bridge relay is almost the same "
 "configuration: it's just a matter of whether your relay is listed publically "
@@ -1395,7 +1395,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:873
+#: /home/runa/tor/website/en/faq.wml:872
 msgid ""
 "Right now, there are roughly zero places in the world that filter "
 "connections to the Tor network. So getting a lot of bridges running right "
@@ -1406,7 +1406,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:881
+#: /home/runa/tor/website/en/faq.wml:880
 msgid ""
 "So should you run a normal relay or bridge relay? If you have lots of "
 "bandwidth, you should definitely run a normal relay &mdash; bridge relays "
@@ -1417,54 +1417,54 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:889
+#: /home/runa/tor/website/en/faq.wml:888
 msgid "<hr /> <a id=\"WhyNotNamed\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:892
+#: /home/runa/tor/website/en/faq.wml:891
 msgid ""
 "<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:895
+#: /home/runa/tor/website/en/faq.wml:894
 msgid ""
 "We currently use these metrics to determine if your relay should be named:"
 "<br />"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:898
+#: /home/runa/tor/website/en/faq.wml:897
 msgid ""
 "The name is not currently mapped to a different key. Existing mappings are "
 "removed after 6 months of inactivity from a relay."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:900
+#: /home/runa/tor/website/en/faq.wml:899
 msgid "The relay must have been around for at least two weeks."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:901
+#: /home/runa/tor/website/en/faq.wml:900
 msgid "No other router may have wanted the same name in the past month."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:904
+#: /home/runa/tor/website/en/faq.wml:903
 msgid "<hr /> <a id=\"KeyManagement\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:907
+#: /home/runa/tor/website/en/faq.wml:906
 msgid ""
 "<a class=\"anchor\" href=\"#KeyManagement\">Tell me about all the keys Tor "
 "uses.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:911
+#: /home/runa/tor/website/en/faq.wml:910
 msgid ""
 "Tor uses a variety of different keys, with three goals in mind: 1)  "
 "encryption to ensure privacy of data within the Tor network, 2)  "
@@ -1474,7 +1474,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:919
+#: /home/runa/tor/website/en/faq.wml:918
 msgid ""
 "<b>Encryption</b>: first, all connections in Tor use TLS link encryption, so "
 "observers can't look inside to see which circuit a given cell is intended "
@@ -1485,7 +1485,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:929
+#: /home/runa/tor/website/en/faq.wml:928
 msgid ""
 "<b>Authentication</b>: Every Tor relay has a public decryption key called "
 "the \"onion key\".  When the Tor client establishes circuits, at each step "
@@ -1496,7 +1496,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:939
+#: /home/runa/tor/website/en/faq.wml:938
 msgid ""
 "<b>Coordination</b>: How do clients know what the relays are, and how do "
 "they know that they have the right keys for them? Each relay has a long-term "
@@ -1511,7 +1511,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:953
+#: /home/runa/tor/website/en/faq.wml:952
 msgid ""
 "How do clients know what the directory authorities are? The Tor software "
 "comes with a built-in list of location and public key for each directory "
@@ -1520,7 +1520,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:960
+#: /home/runa/tor/website/en/faq.wml:959
 msgid ""
 "How do users know they've got the right software? When we distribute the "
 "source code or a package, we digitally sign it with <a href=\"http://www.";
@@ -1529,7 +1529,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:968
+#: /home/runa/tor/website/en/faq.wml:967
 msgid ""
 "In order to be certain that it's really signed by us, you need to have met "
 "us in person and gotten a copy of our GPG key fingerprint, or you need to "
@@ -1539,19 +1539,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:975
+#: /home/runa/tor/website/en/faq.wml:974
 msgid "<hr /> <a id=\"EverybodyARelay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:978
+#: /home/runa/tor/website/en/faq.wml:977
 msgid ""
 "<a class=\"anchor\" href=\"#EverybodyARelay\">You should make every Tor user "
 "be a relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:982
+#: /home/runa/tor/website/en/faq.wml:981
 msgid ""
 "Requiring every Tor user to be a relay would help with scaling the network "
 "to handle all our users, and <a href=\"https://wiki.torproject.org/noreply/";
@@ -1566,7 +1566,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:994
+#: /home/runa/tor/website/en/faq.wml:993
 msgid ""
 "That said, we do want to encourage Tor users to run relays, so what we "
 "really want to do is simplify the process of setting up and maintaining a "
@@ -1577,12 +1577,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1003
+#: /home/runa/tor/website/en/faq.wml:1002
 msgid "There are five steps we need to address before we can do this though:"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1007
+#: /home/runa/tor/website/en/faq.wml:1006
 msgid ""
 "First, we need to make Tor stable as a relay on all common operating "
 "systems. The main remaining platform is Windows, and we plan to finally "
@@ -1591,7 +1591,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1015
+#: /home/runa/tor/website/en/faq.wml:1014
 msgid ""
 "Second, we still need to get better at automatically estimating the right "
 "amount of bandwidth to allow. See item #7 on the <a href=\"<page "
@@ -1604,7 +1604,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1026
+#: /home/runa/tor/website/en/faq.wml:1025
 msgid ""
 "Third, we need to work on scalability, both of the network (how to stop "
 "requiring that all Tor relays be able to connect to all Tor relays) and of "
@@ -1616,7 +1616,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1036
+#: /home/runa/tor/website/en/faq.wml:1035
 msgid ""
 "Fourth, we need to better understand the risks from letting the attacker "
 "send traffic through your relay while you're also initiating your own "
@@ -1633,7 +1633,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1052
+#: /home/runa/tor/website/en/faq.wml:1051
 msgid ""
 "Fifth, we might need some sort of incentive scheme to encourage people to "
 "relay traffic for others, and/or to become exit nodes. Here are our <a href="
@@ -1642,43 +1642,43 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1059
+#: /home/runa/tor/website/en/faq.wml:1058
 msgid "Please help on all of these!"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:1062
+#: /home/runa/tor/website/en/faq.wml:1061
 msgid "<hr /> <a id=\"Criminals\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:1065
+#: /home/runa/tor/website/en/faq.wml:1064
 msgid ""
 "<a class=\"anchor\" href=\"#Criminals\">Doesn't Tor enable criminals to do "
 "bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1069
+#: /home/runa/tor/website/en/faq.wml:1068
 msgid ""
 "For the answer to this question and others, please see our <a href=\"<page "
 "faq-abuse>\">Tor Abuse FAQ</a>."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:1073
+#: /home/runa/tor/website/en/faq.wml:1072
 msgid "<hr /> <a id=\"RespondISP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:1076
+#: /home/runa/tor/website/en/faq.wml:1075
 msgid ""
 "<a class=\"anchor\" href=\"#RespondISP\">How do I respond to my ISP about my "
 "exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1080
+#: /home/runa/tor/website/en/faq.wml:1079
 msgid ""
 "A collection of templates for successfully responding to ISPs is <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TorAbuseTemplates";

Modified: translation/trunk/projects/website/bms/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/bms/3-low.download-unix.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/bms/3-low.download-unix.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:06+0100\n"
+"POT-Creation-Date: 2009-12-08 18:50+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -69,15 +69,15 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:35 /tmp/8TTDOPMvXm.xml:51
-#: /tmp/8TTDOPMvXm.xml:67 /tmp/8TTDOPMvXm.xml:83 /tmp/8TTDOPMvXm.xml:99
-#: /tmp/8TTDOPMvXm.xml:115 /tmp/8TTDOPMvXm.xml:131 /tmp/8TTDOPMvXm.xml:147
-#: /tmp/8TTDOPMvXm.xml:163 /tmp/8TTDOPMvXm.xml:180 /tmp/8TTDOPMvXm.xml:197
+#: /home/runa/tor/website/en/download-unix.wml:35 /tmp/c1moyy1pco.xml:51
+#: /tmp/c1moyy1pco.xml:67 /tmp/c1moyy1pco.xml:83 /tmp/c1moyy1pco.xml:99
+#: /tmp/c1moyy1pco.xml:115 /tmp/c1moyy1pco.xml:131 /tmp/c1moyy1pco.xml:147
+#: /tmp/c1moyy1pco.xml:163 /tmp/c1moyy1pco.xml:180 /tmp/c1moyy1pco.xml:197
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:40 /tmp/8TTDOPMvXm.xml:56
+#: /home/runa/tor/website/en/download-unix.wml:40 /tmp/c1moyy1pco.xml:56
 msgid "<img src=\"images/distros/centos.png\" alt=\"CentOS 4\" />"
 msgstr ""
 
@@ -120,7 +120,7 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:72 /tmp/8TTDOPMvXm.xml:88
+#: /home/runa/tor/website/en/download-unix.wml:72 /tmp/c1moyy1pco.xml:88
 msgid "<img src=\"images/distros/centos.png\" alt=\"CentOS 5\" />"
 msgstr ""
 
@@ -163,7 +163,7 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:104 /tmp/8TTDOPMvXm.xml:120
+#: /home/runa/tor/website/en/download-unix.wml:104 /tmp/c1moyy1pco.xml:120
 msgid "<img src=\"images/distros/fedora.png\" alt=\"Fedora Core 10\" />"
 msgstr ""
 
@@ -206,7 +206,7 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:136 /tmp/8TTDOPMvXm.xml:152
+#: /home/runa/tor/website/en/download-unix.wml:136 /tmp/c1moyy1pco.xml:152
 msgid "<img src=\"images/distros/suse.png\" alt=\"openSUSE 11\" />"
 msgstr ""
 
@@ -521,8 +521,7 @@
 "See the <a href=\"<page documentation>#Developers\">developer documentation</"
 "a> for instructions on fetching Tor from Git to get the very latest "
 "development version source code.  You can also download the <a href=\"dist/"
-"\">Privoxy source</a> or <a href=\"dist/vidalia-bundles/?C=M;O=D\">Vidalia "
-"source</a>."
+"\">Privoxy source</a> or <a href=\"vidalia/dist/\">Vidalia source</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/bms/3-low.faq-abuse.po
===================================================================
--- translation/trunk/projects/website/bms/3-low.faq-abuse.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/bms/3-low.faq-abuse.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:06+0100\n"
+"POT-Creation-Date: 2009-12-08 18:50+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -87,25 +87,32 @@
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/faq-abuse.wml:25
 msgid ""
+"<a href=\"<page faq-abuse>#RemoveContent\">I want some content removed from "
+"a .onion address.</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/en/faq-abuse.wml:26
+msgid ""
 "<a href=\"<page faq-abuse>#LegalQuestions\">I have legal questions about Tor "
 "abuse.</a>"
 msgstr ""
 
 #.  END SIDEBAR 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:29
+#: /home/runa/tor/website/en/faq-abuse.wml:30
 msgid "<hr /> <a id=\"WhatAboutCriminals\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:32
+#: /home/runa/tor/website/en/faq-abuse.wml:33
 msgid ""
 "<a class=\"anchor\" href=\"#WhatAboutCriminals\">Doesn't Tor enable "
 "criminals to do bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:34
+#: /home/runa/tor/website/en/faq-abuse.wml:35
 msgid ""
 "Criminals can already do bad things. Since they're willing to break laws, "
 "they already have lots of options available that provide <em>better</em> "
@@ -117,14 +124,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:42
+#: /home/runa/tor/website/en/faq-abuse.wml:43
 msgid ""
 "Tor aims to provide protection for ordinary people who want to follow the "
 "law. Only criminals have privacy right now, and we need to fix that."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:45
+#: /home/runa/tor/website/en/faq-abuse.wml:46
 msgid ""
 "Some advocates of anonymity explain that it's just a tradeoff &mdash; "
 "accepting the bad uses for the good ones &mdash; but there's more to it than "
@@ -137,7 +144,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:55
+#: /home/runa/tor/website/en/faq-abuse.wml:56
 msgid ""
 "So yes, criminals could in theory use Tor, but they already have better "
 "options, and it seems unlikely that taking Tor away from the world will stop "
@@ -153,19 +160,19 @@
 #. <h3><a class="anchor" href="#Pervasive">If the whole world starts using
 #. Tor, won't civilization collapse?</a></h3>
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:67
+#: /home/runa/tor/website/en/faq-abuse.wml:68
 msgid "<a id=\"DDoS\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:68
+#: /home/runa/tor/website/en/faq-abuse.wml:69
 msgid ""
 "<a class=\"anchor\" href=\"#DDoS\">What about distributed denial of service "
 "attacks?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:70
+#: /home/runa/tor/website/en/faq-abuse.wml:71
 msgid ""
 "Distributed denial of service (DDoS) attacks typically rely on having a "
 "group of thousands of computers all sending floods of traffic to a victim. "
@@ -174,7 +181,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:75
+#: /home/runa/tor/website/en/faq-abuse.wml:76
 msgid ""
 "But because Tor only transports correctly formed TCP streams, not all IP "
 "packets, you cannot send UDP packets over Tor. (You can't do specialized "
@@ -187,18 +194,18 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:84
+#: /home/runa/tor/website/en/faq-abuse.wml:85
 msgid "<a id=\"WhatAboutSpammers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:85
+#: /home/runa/tor/website/en/faq-abuse.wml:86
 msgid ""
 "<a class=\"anchor\" href=\"#WhatAboutSpammers\">What about spammers?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:87
+#: /home/runa/tor/website/en/faq-abuse.wml:88
 msgid ""
 "First of all, the default Tor exit policy rejects all outgoing port 25 "
 "(SMTP) traffic. So sending spam mail through Tor isn't going to work by "
@@ -210,7 +217,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:95
+#: /home/runa/tor/website/en/faq-abuse.wml:96
 msgid ""
 "Of course, it's not all about delivering the mail. Spammers can use Tor to "
 "connect to open HTTP proxies (and from there to SMTP servers); to connect to "
@@ -220,7 +227,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:103
+#: /home/runa/tor/website/en/faq-abuse.wml:104
 msgid ""
 "This is a shame, but notice that spammers are already doing great without "
 "Tor. Also, remember that many of their more subtle communication mechanisms "
@@ -229,33 +236,33 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:109
+#: /home/runa/tor/website/en/faq-abuse.wml:110
 msgid "<a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:110
+#: /home/runa/tor/website/en/faq-abuse.wml:111
 msgid ""
 "<a class=\"anchor\" href=\"#ExitPolicies\">How do Tor exit policies work?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:113
+#: /home/runa/tor/website/en/faq-abuse.wml:114
 msgid "<a href=\"<page faq>#ExitPolicies\">Moved to the new FAQ page</a>"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:116
+#: /home/runa/tor/website/en/faq-abuse.wml:117
 msgid "<a id=\"HowMuchAbuse\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:117
+#: /home/runa/tor/website/en/faq-abuse.wml:118
 msgid "<a class=\"anchor\" href=\"#HowMuchAbuse\">Does Tor get much abuse?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:119
+#: /home/runa/tor/website/en/faq-abuse.wml:120
 msgid ""
 "Not much, in the grand scheme of things. We've been running the network "
 "since October 2003, and it's only generated a handful of complaints. Of "
@@ -267,26 +274,26 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:127
+#: /home/runa/tor/website/en/faq-abuse.wml:128
 msgid ""
 "Since Tor has <a href=\"<page overview>\">many good uses as well</a>, we "
 "feel that we're doing pretty well at striking a balance currently."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:132
+#: /home/runa/tor/website/en/faq-abuse.wml:133
 msgid "<a id=\"TypicalAbuses\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:133
+#: /home/runa/tor/website/en/faq-abuse.wml:134
 msgid ""
 "<a class=\"anchor\" href=\"#TypicalAbuses\">So what should I expect if I run "
 "an exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:135
+#: /home/runa/tor/website/en/faq-abuse.wml:136
 msgid ""
 "If you run a Tor relay that allows exit connections (such as the default "
 "exit policy), it's probably safe to say that you will eventually hear from "
@@ -294,7 +301,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:140
+#: /home/runa/tor/website/en/faq-abuse.wml:141
 msgid ""
 "Somebody connects to Hotmail, and sends a ransom note to a company. The FBI "
 "sends you a polite email, you explain that you run a Tor relay, and they say "
@@ -302,7 +309,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:144
+#: /home/runa/tor/website/en/faq-abuse.wml:145
 msgid ""
 "Somebody tries to get you shut down by using Tor to connect to Google groups "
 "and post spam to Usenet, and then sends an angry mail to your ISP about how "
@@ -310,7 +317,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:147
+#: /home/runa/tor/website/en/faq-abuse.wml:148
 msgid ""
 "Somebody connects to an IRC network and makes a nuisance of himself. Your "
 "ISP gets polite mail about how your computer has been compromised; and/or "
@@ -318,7 +325,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:150
+#: /home/runa/tor/website/en/faq-abuse.wml:151
 msgid ""
 "Somebody uses Tor to download a Vin Diesel movie, and your ISP gets a DMCA "
 "takedown notice. See EFF's <a href=\"<page eff/tor-dmca-response>\">Tor DMCA "
@@ -327,7 +334,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:157
+#: /home/runa/tor/website/en/faq-abuse.wml:158
 msgid ""
 "You might also find that your Tor relay's IP is blocked from accessing some "
 "Internet sites/services. This might happen regardless of your exit policy, "
@@ -337,7 +344,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:164
+#: /home/runa/tor/website/en/faq-abuse.wml:165
 msgid ""
 "Because of a few cases of anonymous jerks messing with its web pages, "
 "Wikipedia is currently blocking many Tor relay IPs from writing (reading "
@@ -349,7 +356,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:173
+#: /home/runa/tor/website/en/faq-abuse.wml:174
 msgid ""
 "SORBS is putting some Tor relay IPs on their email blacklist as well. They "
 "do this because they passively detect whether your relay connects to certain "
@@ -361,19 +368,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:184
+#: /home/runa/tor/website/en/faq-abuse.wml:185
 msgid "<a id=\"IrcBans\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:185
+#: /home/runa/tor/website/en/faq-abuse.wml:186
 msgid ""
 "<a class=\"anchor\" href=\"#IrcBans\">Tor is banned from the IRC network I "
 "want to use.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:187
+#: /home/runa/tor/website/en/faq-abuse.wml:188
 msgid ""
 "Sometimes jerks make use of Tor to troll IRC channels. This abuse results in "
 "IP-specific temporary bans (\"klines\" in IRC lingo), as the network "
@@ -381,7 +388,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:191
+#: /home/runa/tor/website/en/faq-abuse.wml:192
 msgid ""
 "This response underscores a fundamental flaw in IRC's security model: they "
 "assume that IP addresses equate to humans, and by banning the IP address "
@@ -395,7 +402,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:201
+#: /home/runa/tor/website/en/faq-abuse.wml:202
 msgid ""
 "On the other hand, from the viewpoint of IRC server operators, security is "
 "not an all-or-nothing thing.  By responding quickly to trolls or any other "
@@ -409,7 +416,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:211
+#: /home/runa/tor/website/en/faq-abuse.wml:212
 msgid ""
 "But the real answer is to implement application-level auth systems, to let "
 "in well-behaving users and keep out badly-behaving users. This needs to be "
@@ -418,7 +425,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:216
+#: /home/runa/tor/website/en/faq-abuse.wml:217
 msgid ""
 "Of course, not all IRC networks are trying to ban Tor nodes. After all, "
 "quite a few people use Tor to IRC in privacy in order to carry on legitimate "
@@ -429,7 +436,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:223
+#: /home/runa/tor/website/en/faq-abuse.wml:224
 msgid ""
 "If you're being blocked, have a discussion with the network operators and "
 "explain the issues to them. They may not be aware of the existence of Tor at "
@@ -441,7 +448,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:231
+#: /home/runa/tor/website/en/faq-abuse.wml:232
 msgid ""
 "Finally, if you become aware of an IRC network that seems to be blocking "
 "Tor, or a single Tor exit node, please put that information on <a href="
@@ -452,19 +459,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:238
+#: /home/runa/tor/website/en/faq-abuse.wml:239
 msgid "<a id=\"SMTPBans\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:239
+#: /home/runa/tor/website/en/faq-abuse.wml:240
 msgid ""
 "<a class=\"anchor\" href=\"#SMTPBans\">Your nodes are banned from the mail "
 "server I want to use.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:241
+#: /home/runa/tor/website/en/faq-abuse.wml:242
 msgid ""
 "Even though <a href=\"#WhatAboutSpammers\">Tor isn't useful for spamming</"
 "a>, some over-zealous blacklisters seem to think that all open networks like "
@@ -473,7 +480,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:247
+#: /home/runa/tor/website/en/faq-abuse.wml:248
 msgid ""
 "If your server administrators decide to make use of these blacklists to "
 "refuse incoming mail, you should have a conversation with them and explain "
@@ -481,19 +488,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:251
+#: /home/runa/tor/website/en/faq-abuse.wml:252
 msgid "<a id=\"Bans\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:252
+#: /home/runa/tor/website/en/faq-abuse.wml:253
 msgid ""
 "<a class=\"anchor\" href=\"#Bans\">I want to ban the Tor network from my "
 "service.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:254
+#: /home/runa/tor/website/en/faq-abuse.wml:255
 msgid ""
 "We're sorry to hear that. There are some situations where it makes sense to "
 "block anonymous users for an Internet service. But in many cases, there are "
@@ -502,7 +509,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:259
+#: /home/runa/tor/website/en/faq-abuse.wml:260
 msgid ""
 "First, ask yourself if there's a way to do application-level decisions to "
 "separate the legitimate users from the jerks. For example, you might have "
@@ -514,7 +521,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:268
+#: /home/runa/tor/website/en/faq-abuse.wml:269
 msgid ""
 "For example, the <a href=\"http://freenode.net/policy.shtml#tor\";>Freenode "
 "IRC network</a> had a problem with a coordinated group of abusers joining "
@@ -525,7 +532,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:276
+#: /home/runa/tor/website/en/faq-abuse.wml:277
 msgid ""
 "Second, consider that hundreds of thousands of people use Tor every day "
 "simply for good data hygiene &mdash; for example, to protect against data-"
@@ -540,7 +547,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:289
+#: /home/runa/tor/website/en/faq-abuse.wml:290
 msgid ""
 "At this point, you should also ask yourself what you do about other services "
 "that aggregate many users behind a few IP addresses. Tor is not so different "
@@ -548,7 +555,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:293
+#: /home/runa/tor/website/en/faq-abuse.wml:294
 msgid ""
 "Lastly, please remember that Tor relays have <a href=\"<page "
 "faq>#ExitPolicies\">individual exit policies</a>. Many Tor relays do not "
@@ -560,7 +567,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:302
+#: /home/runa/tor/website/en/faq-abuse.wml:303
 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 "
@@ -568,7 +575,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:309
+#: /home/runa/tor/website/en/faq-abuse.wml:310
 msgid ""
 "(Some system administrators block ranges of IP addresses because of official "
 "policy or some abuse pattern, but some have also asked about whitelisting "
@@ -577,19 +584,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:315
+#: /home/runa/tor/website/en/faq-abuse.wml:316
 msgid "<a id=\"TracingUsers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:316
+#: /home/runa/tor/website/en/faq-abuse.wml:317
 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><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:319
+#: /home/runa/tor/website/en/faq-abuse.wml:320
 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 "
@@ -597,7 +604,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:325
+#: /home/runa/tor/website/en/faq-abuse.wml:326
 msgid ""
 "Some fans have suggested that we redesign Tor to include a <a href=\"<page "
 "faq>#Backdoor\">backdoor</a>.  There are two problems with this idea. First, "
@@ -611,7 +618,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:338
+#: /home/runa/tor/website/en/faq-abuse.wml:339
 msgid ""
 "But remember that this doesn't mean that Tor is invulnerable. Traditional "
 "police techniques can still be very effective against Tor, such as "
@@ -620,26 +627,61 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:344
+#: /home/runa/tor/website/en/faq-abuse.wml:345
+msgid "<a id=\"RemoveContent\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/faq-abuse.wml:346
+msgid ""
+"<a class=\"anchor\" href=\"#RemoveContent\">I want some content removed from "
+"a .onion address.</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/faq-abuse.wml:347
+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 "
+"from <a href=\"<page docs/tor-hidden-service>\">a hidden service</a>.  The "
+"name you see ending in .onion is a hidden service descriptor.  It's an "
+"automatically generated name which can be located on any Tor relay or client "
+"anywhere on the Internet.  Hidden services are designed to protect both the "
+"user and service provider from discovering who they are and where they are "
+"from.  The design of hidden services means the owner and location of the ."
+"onion site is hidden even from us."
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/faq-abuse.wml:356
+msgid ""
+"But remember that this doesn't mean that hidden services are invulnerable. "
+"Traditional police techniques can still be very effective against them, such "
+"as interviewing suspects, surveillance and keyboard taps, writing style "
+"analysis, sting operations, and other physical investigations."
+msgstr ""
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/faq-abuse.wml:362
 msgid "<a id=\"LegalQuestions\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:345
+#: /home/runa/tor/website/en/faq-abuse.wml:363
 msgid ""
 "<a class=\"anchor\" href=\"#LegalQuestions\">I have legal questions about "
 "Tor abuse.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:347
+#: /home/runa/tor/website/en/faq-abuse.wml:365
 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><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:350
+#: /home/runa/tor/website/en/faq-abuse.wml:368
 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/bms/3-low.news.po
===================================================================
--- translation/trunk/projects/website/bms/3-low.news.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/bms/3-low.news.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:06+0100\n"
+"POT-Creation-Date: 2009-12-08 18:50+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -34,13 +34,21 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/news.wml:16
 msgid ""
+"10 October 2009: Tor 0.2.1.20 released as stable.  Read the <a href="
+"\"https://blog.torproject.org/blog/tor-02120-released\";>announcement</a> for "
+"the updates and changes."
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/news.wml:17
+msgid ""
 "28 July 2009: Tor 0.2.1.19 released as stable.  Read the <a href=\"http://";
 "archives.seul.org/or/announce/Aug-2009/msg00000.html\">announcement</a> for "
 "the updates and changes."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:19
+#: /home/runa/tor/website/en/news.wml:20
 msgid ""
 "25 June 2009: Tor 0.2.0.35 released as stable.  Read the <a href=\"http://";
 "archives.seul.org/or/announce/Jun-2009/msg00000.html\">announcement</a> for "
@@ -48,7 +56,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:21
+#: /home/runa/tor/website/en/news.wml:22
 msgid ""
 "12 March 2009: Tor launches performance roadmap and campaign.  Read the <a "
 "href=\"<page press/2009-03-12-performance-roadmap-press-release>\">Press "
@@ -56,7 +64,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:22
+#: /home/runa/tor/website/en/news.wml:23
 msgid ""
 "09 February 2009: Tor 0.2.0.34 released as stable.  Read the <a href="
 "\"http://archives.seul.org/or/announce/Feb-2009/msg00000.html";
@@ -65,7 +73,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:25
+#: /home/runa/tor/website/en/news.wml:26
 msgid ""
 "21 January 2009: Tor 0.2.0.33 released as stable.  Read the <a href=\"http://";
 "archives.seul.org/or/announce/Jan-2009/msg00000.html\">announcement</a> for "
@@ -73,7 +81,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:28
+#: /home/runa/tor/website/en/news.wml:29
 msgid ""
 "19 December 2008: Tor releases 3-year development roadmap.  Read the <a href="
 "\"<page press/2008-12-19-roadmap-press-release>\">Press Release</a> for more "
@@ -81,7 +89,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:31
+#: /home/runa/tor/website/en/news.wml:32
 msgid ""
 "05 December 2008: Tor 0.2.0.32 released as stable.  Read the <a href="
 "\"http://archives.seul.org/or/announce/Dec-2008/msg00000.html";
@@ -89,7 +97,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:34
+#: /home/runa/tor/website/en/news.wml:35
 msgid ""
 "08 September 2008: Tor 0.2.0.31 released as stable. Read the <a href="
 "\"http://archives.seul.org/or/announce/Sep-2008/msg00000.html";
@@ -97,7 +105,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:37
+#: /home/runa/tor/website/en/news.wml:38
 msgid ""
 "25 August 2008: Tor 0.2.0.30 released as stable.  Read the <a href=\"http://";
 "archives.seul.org/or/announce/Aug-2008/msg00000.html\">announcement</a> or "
@@ -106,7 +114,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:42
+#: /home/runa/tor/website/en/news.wml:43
 msgid ""
 "25 May 2008: Tor receives two awards from the <a href=\"http://nlnet.nl/";
 "\">NLnet Foundation</a>.  The first is to improve the performance of hidden "
@@ -116,7 +124,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:49
+#: /home/runa/tor/website/en/news.wml:50
 msgid ""
 "13 May 2008: <a href=\"http://archives.seul.org/or/talk/May-2008/msg00048.";
 "html\">Tor 0.2.0.26-rc</a> replaces several V3 directory authority keys "
@@ -135,14 +143,14 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:62
+#: /home/runa/tor/website/en/news.wml:63
 msgid ""
 "Mar 2008: <a href=\"https://blog.torproject.org/blog/tor-project-google-";
 "summer-code-2008!\">Tor Project is in Google Summer of Code 2008!</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:66
+#: /home/runa/tor/website/en/news.wml:67
 msgid ""
 "Feb 2008: The <a href=\"https://www.torproject.org/people#Board\";>Board of "
 "Directors</a> welcomes <a href=\"https://blog.torproject.org/blog/isaac-mao-";
@@ -151,14 +159,14 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:72
+#: /home/runa/tor/website/en/news.wml:73
 msgid ""
 "Feb 2008: Tor is happy to announce the <a href=\"https://blog.torproject.org";
 "\">official Tor blog</a>."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:75
+#: /home/runa/tor/website/en/news.wml:76
 msgid ""
 "Jan 2008: <a href=\"<page download>\">Tor 0.1.2.19</a> (the latest stable "
 "release) fixes a huge memory leak on exit relays, makes the default exit "
@@ -169,7 +177,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:83
+#: /home/runa/tor/website/en/news.wml:84
 msgid ""
 "Oct 2007: <a href=\"<page download>\">Tor 0.1.2.18</a> (the new stable "
 "release) fixes many problems including crash bugs, problems with hidden "
@@ -183,7 +191,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:93
+#: /home/runa/tor/website/en/news.wml:94
 msgid ""
 "Oct 2007: As many of you know, The Tor Project became an <a href=\"<page "
 "people>\">independent and official nonprofit</a> this past February. We did "
@@ -197,7 +205,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:105
+#: /home/runa/tor/website/en/news.wml:106
 msgid ""
 "Sep 2007: If you have received email claiming to be Tor, it wasn't from us. "
 "The <a href=\"<page download>\">official Tor bundles</a> can be <a href="
@@ -205,7 +213,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:109
+#: /home/runa/tor/website/en/news.wml:110
 msgid ""
 "Aug 2007: <strong>Please update your Tor software!</strong> The latest "
 "versions (stable: 0.1.2.17; development: 0.2.0.6-alpha)  patch a significant "
@@ -215,7 +223,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:115
+#: /home/runa/tor/website/en/news.wml:116
 msgid ""
 "Feb 2007: The Tor Project and UColo/Boulder <a href=\"http://blogs.law.";
 "harvard.edu/anonymous/2007/02/26/the-rumors-of-our-demise/\">respond</a> to "
@@ -224,7 +232,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:120
+#: /home/runa/tor/website/en/news.wml:121
 msgid ""
 "Jan 2007: The Tor network has grown to hundreds of thousands of users. The "
 "developers can't do all the new features, bug fixes, and documentation. <a "
@@ -232,7 +240,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:124
+#: /home/runa/tor/website/en/news.wml:125
 msgid ""
 "<b>We are actively looking for new sponsors and funding.</b> If your "
 "organization has an interest in keeping the Tor network usable and fast, "

Modified: translation/trunk/projects/website/bms/3-low.people.po
===================================================================
--- translation/trunk/projects/website/bms/3-low.people.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/bms/3-low.people.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:06+0100\n"
+"POT-Creation-Date: 2009-12-08 18:50+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -121,12 +121,25 @@
 
 #. type: Content of: <div><dl><dt>
 #: /home/runa/tor/website/en/people.wml:49
-msgid "Sebastian Hahn"
+msgid "Melissa Gilroy (CFO and Internal Audit)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:49
 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 "
+"operations moving along."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:53
+msgid "Sebastian Hahn"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:53
+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 "
 "Code on expanding Thandy to include BitTorrent support. Generally helps out "
@@ -134,14 +147,14 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:53
+#: /home/runa/tor/website/en/people.wml:57
 msgid ""
 "Andrew Lewman (Executive Director; Director; <a href=\"<page press/index>"
 "\">press contact</a>)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:54
+#: /home/runa/tor/website/en/people.wml:58
 msgid ""
 "Manages the business operations of The Tor Project, Inc.  Plays roles of "
 "finance, advocacy, project management, and general support.  General package "
@@ -149,12 +162,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:58
+#: /home/runa/tor/website/en/people.wml:62
 msgid "Karsten Loesing (Developer)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:58
+#: /home/runa/tor/website/en/people.wml:62
 msgid ""
 "Worked during the 2007 Google Summer of Code on <a href=\"<svnsandbox>doc/"
 "spec/proposals/114-distributed-storage.txt\">distributing and securing the "
@@ -164,24 +177,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:66
+#: /home/runa/tor/website/en/people.wml:70
 msgid "Nick Mathewson (Chief architect; Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:66
+#: /home/runa/tor/website/en/people.wml:70
 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><dl><dt>
-#: /home/runa/tor/website/en/people.wml:69
+#: /home/runa/tor/website/en/people.wml:73
 msgid "Steven Murdoch (Researcher and Developer)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:69
+#: /home/runa/tor/website/en/people.wml:73
 msgid ""
 "Researcher at the University of Cambridge, currently funded by The Tor "
 "Project to improve the security, performance, and usability of Tor. Creator "
@@ -189,36 +202,36 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:74
+#: /home/runa/tor/website/en/people.wml:78
 msgid "Peter Palfrader"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:74
+#: /home/runa/tor/website/en/people.wml:78
 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><dl><dt>
-#: /home/runa/tor/website/en/people.wml:77
+#: /home/runa/tor/website/en/people.wml:81
 msgid "Martin Peck (Developer)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:77
+#: /home/runa/tor/website/en/people.wml:81
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:79
+#: /home/runa/tor/website/en/people.wml:83
 msgid "Mike Perry (Developer)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:79
+#: /home/runa/tor/website/en/people.wml:83
 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 "
@@ -227,24 +240,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:84
+#: /home/runa/tor/website/en/people.wml:88
 msgid "Karen Reilly (Development Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:84
+#: /home/runa/tor/website/en/people.wml:88
 msgid ""
 "Responsible for fundraising, advocacy, and general marketing and outreach "
 "programs for Tor."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:87
+#: /home/runa/tor/website/en/people.wml:91
 msgid "Paul Syverson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:87
+#: /home/runa/tor/website/en/people.wml:91
 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 "
@@ -253,69 +266,69 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:94
+#: /home/runa/tor/website/en/people.wml:98
 msgid "<a id=\"Board\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:95
+#: /home/runa/tor/website/en/people.wml:99
 msgid ""
 "<a class=\"anchor\" href=\"#Board\">The Tor Project Board of Directors:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:99
+#: /home/runa/tor/website/en/people.wml:103
 msgid "Ian Goldberg (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:99
+#: /home/runa/tor/website/en/people.wml:103
 msgid ""
 "Cryptographer, privacy expert, and professor; one of the designers of <a "
 "href=\"http://www.cypherpunks.ca/otr/\";>Off-the-Record Messaging</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:102
+#: /home/runa/tor/website/en/people.wml:106
 msgid "Xianghui (Isaac) Mao (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:102
+#: /home/runa/tor/website/en/people.wml:106
 msgid ""
 "Chinese blogging and privacy activist.  His current activities can be found "
 "at <a href=\"http://isaacmao.com/\";>his website</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:105
+#: /home/runa/tor/website/en/people.wml:109
 msgid "Frank Rieger (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:105
+#: /home/runa/tor/website/en/people.wml:109
 msgid "CTO of <a href=\"http://www.gsmk.de/\";>GSMK Cryptophone</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:107
+#: /home/runa/tor/website/en/people.wml:111
 msgid "Wendy Seltzer (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:107
+#: /home/runa/tor/website/en/people.wml:111
 msgid ""
 "Lawyer, cyberlaw professor, and founder of <a href=\"http://chillingeffects.";
 "org/\">ChillingEffects.org</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:110
+#: /home/runa/tor/website/en/people.wml:114
 msgid "Fred von Lohmann (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:110
+#: /home/runa/tor/website/en/people.wml:114
 msgid ""
 "Fred is a Senior Intellectual Property Attorney at the Electronic Frontier "
 "Foundation (EFF). His complete bio can be found at the <a href=\"http://www.";
@@ -323,27 +336,27 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:115
+#: /home/runa/tor/website/en/people.wml:119
 msgid "Along with Roger, Nick, and Andrew listed above as Directors."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:118
+#: /home/runa/tor/website/en/people.wml:122
 msgid "<a id=\"Summer\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:119
+#: /home/runa/tor/website/en/people.wml:123
 msgid "<a class=\"anchor\" href=\"#Summer\">Summer students:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:122
+#: /home/runa/tor/website/en/people.wml:126
 msgid "Christopher Davis"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:122
+#: /home/runa/tor/website/en/people.wml:126
 msgid ""
 "Adapts Polipo to depend upon the libevent library, making use of its event "
 "loop, asynchronous DNS resolver, and utility library. (<a href=\"http://www.";
@@ -352,12 +365,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:128
+#: /home/runa/tor/website/en/people.wml:132
 msgid "Damian Johnson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:128
+#: /home/runa/tor/website/en/people.wml:132
 msgid ""
 "Builds a command-line application for monitoring Tor relays, providing real-"
 "time status information such as the current configuration, bandwidth usage, "
@@ -366,12 +379,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:132
+#: /home/runa/tor/website/en/people.wml:136
 msgid "Kory Kirk"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:132
+#: /home/runa/tor/website/en/people.wml:136
 msgid ""
 "Extends <a href=\"<page torbutton/index>\">Torbutton</a> by implementing "
 "three feature requests, namely the <a href=\"https://bugs.torproject.org/";
@@ -384,12 +397,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:143
+#: /home/runa/tor/website/en/people.wml:147
 msgid "Runa Sandvik"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:143
+#: /home/runa/tor/website/en/people.wml:147
 msgid ""
 "Improves usability of <a href=\"https://translation.torproject.org/";
 "\">translating the website</a> by automatically converting wml files to po "
@@ -399,12 +412,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:150
+#: /home/runa/tor/website/en/people.wml:154
 msgid "Stephen Tyree"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:150
+#: /home/runa/tor/website/en/people.wml:154
 msgid ""
 "Develops a plugin API for <a href=\"<page vidalia/index>\">Vidalia</a> and "
 "creates a plugin to allow HerdictWeb integration, a project aiming at "
@@ -415,136 +428,136 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:161
+#: /home/runa/tor/website/en/people.wml:165
 msgid "<a id=\"Translators\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:162
+#: /home/runa/tor/website/en/people.wml:166
 msgid "<a class=\"anchor\" href=\"#Translators\">Core translators:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:165
+#: /home/runa/tor/website/en/people.wml:169
 msgid "Bogdan Drozdowski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:165
+#: /home/runa/tor/website/en/people.wml:169
 msgid "<a href=\"https://www.torproject.org/index.html.pl\";>Polish</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:167
+#: /home/runa/tor/website/en/people.wml:171
 msgid "fredzupy"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:167
+#: /home/runa/tor/website/en/people.wml:171
 msgid "<a href=\"https://www.torproject.org/index.html.fr\";>French</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:169
+#: /home/runa/tor/website/en/people.wml:173
 msgid ""
 "Ruben Garcia, plus further pages by <a href=\"http://www.greentranslations.";
 "com/\">Green Crescent</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:170
+#: /home/runa/tor/website/en/people.wml:174
 msgid "<a href=\"https://www.torproject.org/index.html.es\";>Spanish</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:172
+#: /home/runa/tor/website/en/people.wml:176
 msgid "Jens Kubieziel and Oliver Knapp"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:172
+#: /home/runa/tor/website/en/people.wml:176
 msgid "<a href=\"https://www.torproject.org/index.html.de\";>German</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:174
+#: /home/runa/tor/website/en/people.wml:178
 msgid "Pei Hanru and bridgefish"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:174
+#: /home/runa/tor/website/en/people.wml:178
 msgid ""
 "<a href=\"https://www.torproject.org/index.html.zh-cn\";>Simplified Chinese</"
 "a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:176
+#: /home/runa/tor/website/en/people.wml:180
 msgid "Jan Reister"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:176
+#: /home/runa/tor/website/en/people.wml:180
 msgid "<a href=\"https://www.torproject.org/index.html.it\";>Italian</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:178
+#: /home/runa/tor/website/en/people.wml:182
 msgid "Masaki Taniguchi"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:178
+#: /home/runa/tor/website/en/people.wml:182
 msgid "<a href=\"https://www.torproject.org/index.html.ja\";>Japanese</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:180
+#: /home/runa/tor/website/en/people.wml:184
 msgid "Jan Woning"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:180
+#: /home/runa/tor/website/en/people.wml:184
 msgid "<a href=\"https://www.torproject.org/index.html.nl\";>Dutch</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:182
+#: /home/runa/tor/website/en/people.wml:186
 msgid "ygrek"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:182
+#: /home/runa/tor/website/en/people.wml:186
 msgid "<a href=\"https://www.torproject.org/index.html.ru\";>Russian</a>."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:186
+#: /home/runa/tor/website/en/people.wml:190
 msgid "<a id=\"Volunteers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:187
+#: /home/runa/tor/website/en/people.wml:191
 msgid "<a class=\"anchor\" href=\"#Volunteers\">More volunteers:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:190
+#: /home/runa/tor/website/en/people.wml:194
 msgid "Anonym"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:190
+#: /home/runa/tor/website/en/people.wml:194
 msgid "Maintainer of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:191
+#: /home/runa/tor/website/en/people.wml:195
 msgid "Kevin Bankston"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:191
+#: /home/runa/tor/website/en/people.wml:195
 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 "
@@ -552,24 +565,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:195
+#: /home/runa/tor/website/en/people.wml:199
 msgid "Kasimir Gabert"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:195
+#: /home/runa/tor/website/en/people.wml:199
 msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\";>TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:197
+#: /home/runa/tor/website/en/people.wml:201
 msgid "Geoff Goodell"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:197
+#: /home/runa/tor/website/en/people.wml:201
 msgid ""
 "Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/";
 "\">Blossom project</a> which uses Tor as its overlay network; also helped "
@@ -577,12 +590,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:201
+#: /home/runa/tor/website/en/people.wml:205
 msgid "Aleksei Gorny"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:201
+#: /home/runa/tor/website/en/people.wml:205
 msgid ""
 "Working on Tor exit scanner improvements (<a href=\"https://svn.torproject.";
 "org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
@@ -590,83 +603,83 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:208
 msgid "Robert Hogan"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:208
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\";>TorK</a> Tor controller."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:210
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:210
 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><dl><dt>
-#: /home/runa/tor/website/en/people.wml:208
+#: /home/runa/tor/website/en/people.wml:212
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:208
+#: /home/runa/tor/website/en/people.wml:212
 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><dl><dt>
-#: /home/runa/tor/website/en/people.wml:211
+#: /home/runa/tor/website/en/people.wml:215
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:211
+#: /home/runa/tor/website/en/people.wml:215
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:213
+#: /home/runa/tor/website/en/people.wml:217
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:213
+#: /home/runa/tor/website/en/people.wml:217
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:219
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:220
 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><dl><dt>
-#: /home/runa/tor/website/en/people.wml:218
+#: /home/runa/tor/website/en/people.wml:222
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:218
+#: /home/runa/tor/website/en/people.wml:222
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy";
@@ -675,24 +688,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:227
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:227
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:230
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:230
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?";
 "p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/";
@@ -701,7 +714,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:231
+#: /home/runa/tor/website/en/people.wml:235
 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, "
@@ -709,22 +722,22 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:240
 msgid "<a id=\"Past\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:237
+#: /home/runa/tor/website/en/people.wml:241
 msgid "<a class=\"anchor\" href=\"#Past\">Past thanks to:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:240
+#: /home/runa/tor/website/en/people.wml:244
 msgid "Domenik Bork"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:240
+#: /home/runa/tor/website/en/people.wml:244
 msgid ""
 "Worked on Configuration of Hidden Services with User Authorization in "
 "Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches/";
@@ -732,12 +745,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:243
+#: /home/runa/tor/website/en/people.wml:247
 msgid "Benedikt Boss"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:243
+#: /home/runa/tor/website/en/people.wml:247
 msgid ""
 "Worked during the 2007 Google Summer of Code on <a href=\"https://svn.";
 "torproject.org/svn/topf/trunk/README\">TOPF</a>, a fuzzer for Tor; mentored "
@@ -745,22 +758,22 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:246
+#: /home/runa/tor/website/en/people.wml:250
 msgid "Ren Bucholz"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:246
+#: /home/runa/tor/website/en/people.wml:250
 msgid "Our fine logo and images."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:251
 msgid "Fallon Chen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:251
 msgid ""
 "Worked on Improving Tor Path Selection (<a href=\"https://svn.torproject.org/";
 "cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>)  and <a href="
@@ -770,42 +783,42 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:253
+#: /home/runa/tor/website/en/people.wml:257
 msgid "Bram Cohen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:253
+#: /home/runa/tor/website/en/people.wml:257
 msgid "Helped design our congestion control mechanisms, in Tor's early days."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:259
 msgid "Pat Double"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:259
 msgid "Creator of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:256
+#: /home/runa/tor/website/en/people.wml:260
 msgid "Justin Hipple"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:256
+#: /home/runa/tor/website/en/people.wml:260
 msgid "The other developer for Vidalia."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:257
+#: /home/runa/tor/website/en/people.wml:261
 msgid "Christian King"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:257
+#: /home/runa/tor/website/en/people.wml:261
 msgid ""
 "Worked during the 2007 Google Summer of Code on making Tor relays stable on "
 "Windows, by developing a <a href=\"https://svn.torproject.org/svn/libevent-";
@@ -813,70 +826,70 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:262
+#: /home/runa/tor/website/en/people.wml:266
 msgid "Joe Kowalski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:262
+#: /home/runa/tor/website/en/people.wml:266
 msgid ""
 "Original author and provider of the torstatus script formerly run on "
 "nighteffect."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:264
+#: /home/runa/tor/website/en/people.wml:268
 msgid "Adam Langley"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:264
+#: /home/runa/tor/website/en/people.wml:268
 msgid "Our fine eventdns code."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:269
 msgid "Rebecca MacKinnon"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:269
 msgid ""
 "Former Director of Tor.  Co-Founder of <a href=\"http://www.";
 "globalvoicesonline.org/\">Global Voices Online</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:271
 msgid "Chris Palmer"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:271
 msgid ""
 "Our liaison and tech guy with EFF while EFF was funding us. Also helped "
 "advocate and write end-user docs."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:269
+#: /home/runa/tor/website/en/people.wml:273
 msgid "Matej Pfajfar"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:269
+#: /home/runa/tor/website/en/people.wml:273
 msgid ""
 "Author of the original onion routing code that Tor is based on, so we didn't "
 "have to start from scratch."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:271
+#: /home/runa/tor/website/en/people.wml:275
 msgid "Johannes Renner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:271
+#: /home/runa/tor/website/en/people.wml:275
 msgid ""
 "Worked during the 2007 Google Summer of Code on modifying <a href=\"https://";
 "svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a> to measure various "
@@ -884,23 +897,23 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Scott Squires"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:280
 msgid ""
 "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:282
 msgid "Camilo Viecco"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:282
 msgid ""
 "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac.";
 "vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
@@ -908,12 +921,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:281
+#: /home/runa/tor/website/en/people.wml:285
 msgid "Christian Wilms"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:281
+#: /home/runa/tor/website/en/people.wml:285
 msgid ""
 "Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
 "\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";
@@ -921,12 +934,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:284
+#: /home/runa/tor/website/en/people.wml:288
 msgid "Jillian C. York"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:284
+#: /home/runa/tor/website/en/people.wml:288
 msgid ""
 "<a href=\"http://jilliancyork.com/\";>Jillian C. York</a> is a writer, "
 "blogger, and activist based in Boston.  She blogs on the uses of Tor and "

Modified: translation/trunk/projects/website/bms/3-low.sponsors.po
===================================================================
--- translation/trunk/projects/website/bms/3-low.sponsors.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/bms/3-low.sponsors.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:07+0100\n"
+"POT-Creation-Date: 2009-12-08 18:50+0100\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,143 +30,158 @@
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/sponsors.wml:19
-msgid "<i>Liliopsida</i> (up to $750k)"
+#: /home/runa/tor/website/en/sponsors.wml:17
+msgid "<i>Magnoliophyta</i> (over $1 million)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:21
+#: /home/runa/tor/website/en/sponsors.wml:19 /tmp/H5AUUJj71q.xml:35
 msgid "You?"
 msgstr ""
 
 #. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/sponsors.wml:22
+msgid "<i>Liliopsida</i> (up to $750k)"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/sponsors.wml:24
+msgid "An anonymous North American NGO (2008-2009)"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/sponsors.wml:27
 msgid "<i>Asparagales</i> (up to $500k)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:26
+#: /home/runa/tor/website/en/sponsors.wml:29
 msgid ""
 "<a href=\"http://www.ibb.gov/\";>International Broadcasting Bureau</a> (2006-"
 "2009)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:27
+#: /home/runa/tor/website/en/sponsors.wml:30
 msgid "An anonymous European NGO (2006-2008)"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/sponsors.wml:30
+#: /home/runa/tor/website/en/sponsors.wml:33
 msgid "<i>Alliaceae</i> (up to $200k)"
 msgstr ""
 
-#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:32
-msgid "An anonymous North American NGO (2008-2009)"
-msgstr ""
-
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/sponsors.wml:35
+#: /home/runa/tor/website/en/sponsors.wml:38
 msgid "<i>Allium</i> (up to $100k)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:37
+#: /home/runa/tor/website/en/sponsors.wml:40
 msgid "<a href=\"http://www.nlnet.nl/\";>NLnet Foundation</a> (2008-2009)"
 msgstr ""
 
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/sponsors.wml:41
+msgid ""
+"<a href=\"http://chacs.nrl.navy.mil/\";>Naval Research Laboratory</a> (2006-"
+"2009)"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/sponsors.wml:42
+msgid "An anonymous North American ISP (2009)"
+msgstr ""
+
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/sponsors.wml:40
+#: /home/runa/tor/website/en/sponsors.wml:45
 msgid "<i>Allium cepa</i> (up to $50k)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:42
+#: /home/runa/tor/website/en/sponsors.wml:47
 msgid ""
 "<a href=\"<page donate>\">More than 500 personal donations from individuals "
 "like you</a> (2006-2009)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:43
+#: /home/runa/tor/website/en/sponsors.wml:48
 msgid "<a href=\"http://code.google.com/opensource/\";>Google</a> (2008)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:44
+#: /home/runa/tor/website/en/sponsors.wml:49
 msgid ""
 "<a href=\"http://code.google.com/soc/\";>Google Summer of Code</a> (2007-2009)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:45
+#: /home/runa/tor/website/en/sponsors.wml:50
 msgid "<a href=\"http://www.hrw.org/\";>Human Rights Watch</a> (2007)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:46
-msgid ""
-"<a href=\"http://chacs.nrl.navy.mil/\";>Naval Research Laboratory</a> (2006-"
-"2009)"
+#: /home/runa/tor/website/en/sponsors.wml:51
+msgid "<a href=\"http://www.torfox.org/\";>Torfox</a> (2009)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:47
-msgid "<a href=\"http://www.torfox.org/\";>Torfox</a> (2009)"
+#: /home/runa/tor/website/en/sponsors.wml:52
+msgid "<a href=\"http://www.shinjiru.com/\";>Shinjiru Technology</a> (2009)"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/sponsors.wml:50
+#: /home/runa/tor/website/en/sponsors.wml:55
 msgid "Past sponsors"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/sponsors.wml:51
+#: /home/runa/tor/website/en/sponsors.wml:56
 msgid ""
 "We greatly appreciate the support provided by our past sponsors in keeping "
 "the pre-501(c)(3) Tor Project progressing through our ambitious goals"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:53
+#: /home/runa/tor/website/en/sponsors.wml:58
 msgid ""
 "<a href=\"https://www.eff.org/\";>Electronic Frontier Foundation</a> (2004-"
 "2005)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:54
+#: /home/runa/tor/website/en/sponsors.wml:59
 msgid ""
 "<a href=\"http://chacs.nrl.navy.mil/\";>DARPA and ONR via Naval Research "
 "Laboratory</a> (2001-2006)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:55
+#: /home/runa/tor/website/en/sponsors.wml:60
 msgid "<a href=\"http://www.cyber-ta.org/\";>Cyber-TA project</a> (2006-2008)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:56
+#: /home/runa/tor/website/en/sponsors.wml:61
 msgid "Bell Security Solutions Inc (2006)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:57
+#: /home/runa/tor/website/en/sponsors.wml:62
 msgid ""
 "<a href=\"http://www.omidyar.net/\";>Omidyar Network Enzyme Grant</a> (2006)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:58
+#: /home/runa/tor/website/en/sponsors.wml:63
 msgid ""
 "<a href=\"http://seclab.cs.rice.edu/lab/2005/08/01/seclab-awarded-grant-to-";
 "study-security-of-p2p/\">NSF via Rice University</a> (2006-2007)"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/sponsors.wml:60
+#: /home/runa/tor/website/en/sponsors.wml:65
 msgid ""
 "Thank you to all the people and groups who have made Tor possible so far, "
 "and thank you especially to the individual volunteers who have made non-"

Modified: translation/trunk/projects/website/bms/4-optional.running-a-mirror.po
===================================================================
--- translation/trunk/projects/website/bms/4-optional.running-a-mirror.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/bms/4-optional.running-a-mirror.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:07+0100\n"
+"POT-Creation-Date: 2009-12-08 18:50+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -52,8 +52,8 @@
 #: /home/runa/tor/website/en/running-a-mirror.wml:36
 msgid ""
 "In order to assure we have reliable and up to date mirrors, please ensure "
-"your mirror does at least the following:<br/><br/> Updates no later than "
-"every six hours, but no more frequent than every hour.<br/><br/> Allows "
+"your mirror does at least the following:<br/><br/> Updates <b>no less</b> "
+"than every six hours, but no more frequent than every hour.<br/><br/> Allows "
 "\"Directory Index / Indexes\" (Index viewing) of the /dist directory.<br/"
 "><br/> Allows \"Multiviews\" or equivalent for language localization.<br/"
 "><br/> Have a valid contact email for administrative communications should "
@@ -62,7 +62,7 @@
 msgstr ""
 
 #. type: Content of: <div><p><A>
-#: /home/runa/tor/website/en/running-a-mirror.wml:51 /tmp/bcTykvcePZ.xml:95
+#: /home/runa/tor/website/en/running-a-mirror.wml:51 /tmp/YullHSPuxf.xml:95
 msgid "tor-mirrors mailing list"
 msgstr ""
 
@@ -92,7 +92,7 @@
 #, no-wrap
 msgid ""
 "\n"
-"0 */6 * * * rsync -av --delete rsync://rsync.torproject.org/tor/ /var/www/mirrors/torproject.org\n"
+"0 */6 * * * rsync -aq --delete rsync://rsync.torproject.org/tor/ /var/www/mirrors/torproject.org\n"
 msgstr ""
 
 #. type: Content of: <div><p><p>

Modified: translation/trunk/projects/website/bms/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/bms/4-optional.volunteer.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/bms/4-optional.volunteer.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 13:42+0100\n"
+"POT-Creation-Date: 2009-12-08 18:50+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -53,18 +53,25 @@
 "love to hear from you."
 msgstr ""
 
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/volunteer.wml:27
+msgid ""
+"Tor has <a href=\"<page open-positions>\">two open positions</a>, please <a "
+"href=\"<page contact>\">contact us</a> if you are qualified!"
+msgstr ""
+
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:27
+#: /home/runa/tor/website/en/volunteer.wml:30
 msgid "<a id=\"Usability\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:28
+#: /home/runa/tor/website/en/volunteer.wml:31
 msgid "<a class=\"anchor\" href=\"#Usability\">Supporting Applications</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:30
+#: /home/runa/tor/website/en/volunteer.wml:33
 msgid ""
 "We need more and better ways to intercept DNS requests so they don't \"leak"
 "\" their request to a local observer while we're trying to be anonymous. "
@@ -73,12 +80,12 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:34
+#: /home/runa/tor/website/en/volunteer.wml:37
 msgid "Tsocks/dsocks items:"
 msgstr ""
 
 #. type: Content of: <div><ol><li><ul><li>
-#: /home/runa/tor/website/en/volunteer.wml:36
+#: /home/runa/tor/website/en/volunteer.wml:39
 msgid ""
 "We should patch Dug Song's \"dsocks\" program to use Tor's <i>mapaddress</i> "
 "commands from the controller interface, so we don't waste a whole round-trip "
@@ -86,7 +93,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li><ul><li>
-#: /home/runa/tor/website/en/volunteer.wml:40
+#: /home/runa/tor/website/en/volunteer.wml:43
 msgid ""
 "We need to make our <i>torify</i> script detect which of tsocks or dsocks is "
 "installed, and call them appropriately. This probably means unifying their "
@@ -95,7 +102,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:46
+#: /home/runa/tor/website/en/volunteer.wml:49
 msgid ""
 "People running relays tell us they want to have one BandwidthRate during "
 "some part of the day, and a different BandwidthRate at other parts of the "
@@ -106,7 +113,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:54
+#: /home/runa/tor/website/en/volunteer.wml:57
 msgid ""
 "Speaking of geolocation data, somebody should draw a map of the Earth with a "
 "pin-point for each Tor relay. Bonus points if it updates as the network "
@@ -116,17 +123,17 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:61
+#: /home/runa/tor/website/en/volunteer.wml:64
 msgid "<a id=\"Advocacy\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:62
+#: /home/runa/tor/website/en/volunteer.wml:65
 msgid "<a class=\"anchor\" href=\"#Advocacy\">Advocacy</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:64
+#: /home/runa/tor/website/en/volunteer.wml:67
 msgid ""
 "Create a <a href=\"https://wiki.torproject.org/noreply/CommunityLogos";
 "\">community logo</a> under a Creative Commons license that all can use and "
@@ -134,45 +141,45 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:65
+#: /home/runa/tor/website/en/volunteer.wml:68
 msgid ""
 "Create a presentation that can be used for various user group meetings "
 "around the world"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:66
+#: /home/runa/tor/website/en/volunteer.wml:69
 msgid ""
 "Create a video about your positive uses of Tor.  Some have already started "
-"on Seesmic."
+"on <a href=\"http://tinyvid.tv\";>TinyVid</a>."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:67
+#: /home/runa/tor/website/en/volunteer.wml:70
 msgid ""
 "Create a poster, or a set of posters, around a theme, such as \"Tor for "
 "Freedom!\""
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:70
+#: /home/runa/tor/website/en/volunteer.wml:73
 msgid "<a id=\"Documentation\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:71
+#: /home/runa/tor/website/en/volunteer.wml:74
 msgid "<a class=\"anchor\" href=\"#Documentation\">Documentation</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:73
+#: /home/runa/tor/website/en/volunteer.wml:76
 msgid ""
 "Please help Matt Edman with the documentation and how-tos for his Tor "
 "controller, <a href=\"<page vidalia/index>\">Vidalia</a>."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:76
+#: /home/runa/tor/website/en/volunteer.wml:79
 msgid ""
 "Evaluate and document <a href=\"https://wiki.torproject.org/wiki/";
 "TheOnionRouter/TorifyHOWTO\">our list of programs</a> that can be configured "
@@ -180,7 +187,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:79
+#: /home/runa/tor/website/en/volunteer.wml:82
 msgid ""
 "We need better documentation for dynamically intercepting connections and "
 "sending them through Tor. tsocks (Linux), dsocks (BSD), and freecap "
@@ -189,7 +196,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:83
+#: /home/runa/tor/website/en/volunteer.wml:86
 msgid ""
 "We have a huge list of <a href=\"https://wiki.torproject.org/noreply/";
 "TheOnionRouter/SupportPrograms\">potentially useful programs that interface "
@@ -198,7 +205,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:86
+#: /home/runa/tor/website/en/volunteer.wml:89
 msgid ""
 "Help translate the web page and documentation into other languages. See the "
 "<a href=\"<page translation>\">translation guidelines</a> if you want to "
@@ -207,17 +214,17 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:92
+#: /home/runa/tor/website/en/volunteer.wml:95
 msgid "<a id=\"Coding\"></a> <a id=\"Summer\"></a> <a id=\"Projects\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:95
+#: /home/runa/tor/website/en/volunteer.wml:98
 msgid "<a class=\"anchor\" href=\"#Projects\">Good Coding Projects</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/volunteer.wml:98
+#: /home/runa/tor/website/en/volunteer.wml:101
 msgid ""
 "You may find some of these projects to be good <a href=\"<page gsoc>"
 "\">Google Summer of Code 2010</a> ideas. We have labelled each idea with how "
@@ -232,11 +239,11 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:113
+#: /home/runa/tor/website/en/volunteer.wml:116
 msgid ""
 "<b>Tor Browser Bundle for Linux/Mac OS X</b> <br /> Priority: <i>High</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>Medium</i> <br /> "
-"Likely Mentors: <i>Steven, Andrew</i> <br /> The Tor Browser Bundle "
+"Likely Mentors: <i>Steven, Andrew, Jacob</i> <br /> The Tor Browser Bundle "
 "incorporates Tor, Firefox, Polipo, and the Vidalia user interface (and "
 "optionally the <a href=\"http://pidgin.im/\";>Pidgin</a> Instant Messaging "
 "client). Components are pre-configured to operate in a secure way, and it "
@@ -257,7 +264,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:146
+#: /home/runa/tor/website/en/volunteer.wml:149
 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: "
@@ -280,12 +287,12 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:176
+#: /home/runa/tor/website/en/volunteer.wml:179
 msgid ""
 "<b>Improving Tor's ability to resist censorship</b> <br /> Priority: "
 "<i>Medium to High</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: "
 "<i>High</i> <br /> Likely Mentors: <i>Nick, Roger, Steven</i> <br /> The Tor "
-"0.2.0.x series makes <a href=\"<svnsandbox>doc/design-paper/blocking.html"
+"0.2.1.x series makes <a href=\"<svnsandbox>doc/design-paper/blocking.html"
 "\">significant improvements</a> in resisting national and organizational "
 "censorship.  But Tor still needs better mechanisms for some parts of its "
 "anti-censorship design.  For example, current Tors can only listen on a "
@@ -308,7 +315,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:211
+#: /home/runa/tor/website/en/volunteer.wml:214
 msgid ""
 "<b>Tuneup Tor!</b> <br /> Priority: <i>Medium to High</i> <br /> Effort "
 "Level: <i>Medium to High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
@@ -329,13 +336,13 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:242
+#: /home/runa/tor/website/en/volunteer.wml:245
 msgid ""
 "<b>Improving Polipo on Windows</b> <br /> Priority: <i>Medium to High</i> "
 "<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Medium</i> <br /> "
-"Likely Mentors: <i>Martin</i> <br /> Help port <a href=\"http://www.pps.";
-"jussieu.fr/~jch/software/polipo/\">Polipo</a> to Windows. Example topics to "
-"tackle include: 1) the ability to asynchronously query name servers, find "
+"Likely Mentors: <i>Martin, Chris</i> <br /> Help port <a href=\"http://www.";
+"pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> to Windows. Example topics "
+"to tackle include: 1) the ability to asynchronously query name servers, find "
 "the system nameservers, and manage netbios and dns queries.  2) manage "
 "events and buffers natively (i.e. in Unix-like OSes, Polipo defaults to 25% "
 "of ram, in Windows it's whatever the config specifies). 3) some sort of GUI "
@@ -346,7 +353,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:268
+#: /home/runa/tor/website/en/volunteer.wml:271
 msgid ""
 "<b>Tor Controller Status Event Interface</b> <br /> Priority: <i>Medium</i> "
 "<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> "
@@ -379,7 +386,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:311
+#: /home/runa/tor/website/en/volunteer.wml:314
 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 /> "
@@ -398,28 +405,26 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:338
+#: /home/runa/tor/website/en/volunteer.wml:341
 msgid ""
-"<b>Help revive an independent Tor client implementation</b> <br /> Priority: "
+"<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>Karsten, Nick</i> <br /> Reanimate one "
-"of the approaches to implement a Tor client in Java, e.g. the <a href="
-"\"http://onioncoffee.sourceforge.net/\";>OnionCoffee project</a>, and make it "
-"run on <a href=\"http://code.google.com/android/\";>Android</a>. The first "
-"step would be to port the existing code and execute it in an Android "
-"environment. Next, the code should be updated to support the newer Tor "
-"protocol versions like the <a href=\"<svnsandbox>doc/spec/dir-spec.txt\">v3 "
-"directory protocol</a>. Further, support for requesting or even providing "
-"Tor hidden services would be neat, but not required.  <br /> 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."
+"to High</i> <br /> Likely Mentors: <i>Karsten, Nick</i> <br /> We're "
+"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; Tor for Java, Android/Orbot, or Tor for "
+"Maemo. Check out the repository and familiarlize yourself with the source "
+"code.  Further, support for requesting or even providing Tor hidden services "
+"would be neat, but not required.  <br /> 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><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:368
+#: /home/runa/tor/website/en/volunteer.wml:367
 msgid ""
 "<b>New Torbutton Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
 "Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely Mentors: "
@@ -443,7 +448,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:402
+#: /home/runa/tor/website/en/volunteer.wml:401
 msgid ""
 "<b>New Thandy Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
 "Level: <i>Medium</i> <br /> Skill Level: <i>Medium to High</i> <br /> Likely "
@@ -462,7 +467,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:429
+#: /home/runa/tor/website/en/volunteer.wml:428
 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 /"
@@ -483,7 +488,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:459
+#: /home/runa/tor/website/en/volunteer.wml:458
 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: "
@@ -507,7 +512,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:493
+#: /home/runa/tor/website/en/volunteer.wml:492
 msgid ""
 "<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Low</i> <br /"
 "> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
@@ -519,7 +524,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:511
+#: /home/runa/tor/website/en/volunteer.wml:510
 msgid ""
 "<b>Intermediate Level Network Device Driver</b> <br /> Priority: <i>Low</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> "
@@ -533,7 +538,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:531
+#: /home/runa/tor/website/en/volunteer.wml:530
 msgid ""
 "<b>Improve Tor Weather</b> <br /> Priority: <i>Medium</i> <br /> Effort "
 "Level: <i>Medium</i> <br /> Skill Level: <i>Medium</i> <br /> Likely "
@@ -556,7 +561,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:561
+#: /home/runa/tor/website/en/volunteer.wml:560
 msgid ""
 "<b>Bring up new ideas!</b> <br /> Don't like any of these? Look at the <a "
 "href=\"<svnsandbox>doc/roadmaps/2008-12-19-roadmap-full.pdf\">Tor "
@@ -566,7 +571,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:571
+#: /home/runa/tor/website/en/volunteer.wml:570
 msgid ""
 "<b>Better Debian/Ubuntu Packaging for Tor+Vidalia</b> <br /> Vidalia "
 "currently doesn't play nicely on Debian and Ubuntu with the default Tor "
@@ -604,7 +609,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:615
+#: /home/runa/tor/website/en/volunteer.wml:614
 msgid ""
 "<b>Tor/Polipo/Vidalia Auto-Update Framework</b> <br /> We're in need of a "
 "good authenticated-update framework.  Vidalia already has the ability to "
@@ -633,7 +638,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:649
+#: /home/runa/tor/website/en/volunteer.wml:648
 msgid ""
 "<b>Improving the Tor QA process: Continuous Integration for builds</b> <br /"
 "> It would be useful to have automated build processes for Windows and "
@@ -660,7 +665,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:677
+#: /home/runa/tor/website/en/volunteer.wml:676
 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 "
@@ -671,19 +676,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:694
+#: /home/runa/tor/website/en/volunteer.wml:693
 msgid "<a id=\"OtherCoding\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:695
+#: /home/runa/tor/website/en/volunteer.wml:694
 msgid ""
 "<a class=\"anchor\" href=\"#OtherCoding\">Other Coding and Design related "
 "ideas</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:697
+#: /home/runa/tor/website/en/volunteer.wml:696
 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 "
@@ -698,7 +703,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:710
+#: /home/runa/tor/website/en/volunteer.wml:709
 msgid ""
 "We need to actually start building our <a href=\"<page "
 "documentation>#DesignDoc\">blocking-resistance design</a>. This involves "
@@ -708,7 +713,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:716
+#: /home/runa/tor/website/en/volunteer.wml:715
 msgid ""
 "We need a flexible simulator framework for studying end-to-end traffic "
 "confirmation attacks. Many researchers have whipped up ad hoc simulators to "
@@ -722,7 +727,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:726
+#: /home/runa/tor/website/en/volunteer.wml:725
 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 "
@@ -731,7 +736,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:729
+#: /home/runa/tor/website/en/volunteer.wml:728
 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 "
@@ -740,7 +745,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:734
+#: /home/runa/tor/website/en/volunteer.wml:733
 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 "
@@ -754,7 +759,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:745
+#: /home/runa/tor/website/en/volunteer.wml:744
 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 "
@@ -762,7 +767,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:749
+#: /home/runa/tor/website/en/volunteer.wml:748
 msgid ""
 "We need a way to generate the website diagrams (for example, the \"How Tor "
 "Works\" pictures on the <a href=\"<page overview>\">overview page</a> from "
@@ -773,24 +778,24 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:756
+#: /home/runa/tor/website/en/volunteer.wml:755
 msgid ""
 "How can we make the <a href=\"http://anonymityanywhere.com/incognito/";
 "\">Incognito LiveCD</a> easier to maintain, improve, and document?"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:761
+#: /home/runa/tor/website/en/volunteer.wml:760
 msgid "<a id=\"Research\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:762
+#: /home/runa/tor/website/en/volunteer.wml:761
 msgid "<a class=\"anchor\" href=\"#Research\">Research</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:764
+#: /home/runa/tor/website/en/volunteer.wml:763
 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 "
@@ -806,7 +811,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:776
+#: /home/runa/tor/website/en/volunteer.wml:775
 msgid ""
 "The \"end-to-end traffic confirmation attack\": by watching traffic at Alice "
 "and at Bob, we can <a href=\"http://freehaven.net/anonbib/#danezis:pet2004";
@@ -820,7 +825,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:786
+#: /home/runa/tor/website/en/volunteer.wml:785
 msgid ""
 "A related question is: Does running a relay/bridge provide additional "
 "protection against these timing attacks? Can an external adversary that "
@@ -840,7 +845,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:801
+#: /home/runa/tor/website/en/volunteer.wml:800
 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 "
@@ -859,7 +864,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:816
+#: /home/runa/tor/website/en/volunteer.wml:815
 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 "
@@ -874,7 +879,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:826
+#: /home/runa/tor/website/en/volunteer.wml:825
 msgid ""
 "Other research questions regarding geographic diversity consider the "
 "tradeoff between choosing an efficient circuit and choosing a random "
@@ -886,7 +891,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:833
+#: /home/runa/tor/website/en/volunteer.wml:832
 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 "
@@ -903,7 +908,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:845
+#: /home/runa/tor/website/en/volunteer.wml:844
 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 "
@@ -914,7 +919,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:852
+#: /home/runa/tor/website/en/volunteer.wml:851
 msgid ""
 "Our censorship-resistance goals include preventing an attacker who's looking "
 "at Tor traffic on the wire from <a href=\"<svnsandbox>doc/design-paper/"
@@ -930,7 +935,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:863
+#: /home/runa/tor/website/en/volunteer.wml:862
 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 "
@@ -941,7 +946,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:870
+#: /home/runa/tor/website/en/volunteer.wml:869
 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 "
@@ -949,7 +954,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:873
+#: /home/runa/tor/website/en/volunteer.wml:872
 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 "
@@ -969,7 +974,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:890
+#: /home/runa/tor/website/en/volunteer.wml:889
 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 "
@@ -986,7 +991,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:903
+#: /home/runa/tor/website/en/volunteer.wml:902
 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 "
@@ -994,7 +999,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/volunteer.wml:911
+#: /home/runa/tor/website/en/volunteer.wml:910
 msgid ""
 "<a href=\"<page contact>\">Let us know</a> if you've made progress on any of "
 "these!"

Modified: translation/trunk/projects/website/bms/docs/2-medium.tor-doc-relay.po
===================================================================
--- translation/trunk/projects/website/bms/docs/2-medium.tor-doc-relay.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/bms/docs/2-medium.tor-doc-relay.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:07+0100\n"
+"POT-Creation-Date: 2009-12-08 18:50+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -47,7 +47,7 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:25 /tmp/QNdH0RUk_Y.xml:285
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:25 /tmp/2x8vGQBn2G.xml:285
 msgid "<hr />"
 msgstr ""
 
@@ -67,9 +67,9 @@
 #: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37
 msgid ""
 "You can run a Tor relay on <a href=\"https://wiki.torproject.org/noreply/";
-"TheOnionRouter/TorFAQ#RelayOS\">pretty much any</a> operating system, but "
-"Linux, FreeBSD 5.x+, OS X Tiger or later, and Windows Server 2003 or later "
-"work best."
+"TheOnionRouter/TorFAQ#RelayOS\">pretty much any</a> operating system. Tor "
+"relays work best on Linux, OS X Tiger or later, FreeBSD 5.x+, NetBSD 5.x+, "
+"and Windows Server 2003 or later."
 msgstr ""
 
 #. type: Content of: <div><div>
@@ -84,8 +84,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:47 /tmp/QNdH0RUk_Y.xml:62
-#: /tmp/QNdH0RUk_Y.xml:149 /tmp/QNdH0RUk_Y.xml:175
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:47 /tmp/2x8vGQBn2G.xml:62
+#: /tmp/2x8vGQBn2G.xml:149 /tmp/2x8vGQBn2G.xml:175
 msgid "<br />"
 msgstr ""
 

Modified: translation/trunk/projects/website/de/1-high.index.po
===================================================================
--- translation/trunk/projects/website/de/1-high.index.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/de/1-high.index.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:07+0100\n"
+"POT-Creation-Date: 2009-12-08 18:51+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -41,8 +41,8 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/index.wml:20 /tmp/WZ0KZUn7i4.xml:30
-#: /tmp/WZ0KZUn7i4.xml:76
+#: /home/runa/tor/website/en/index.wml:20 /tmp/vL47mhBc8M.xml:30
+#: /tmp/vL47mhBc8M.xml:76
 msgid "<hr />"
 msgstr ""
 
@@ -130,17 +130,22 @@
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/index.wml:79
+msgid "07 December 2009: <a href=\"<page open-positions>\">Tor is hiring!</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/index.wml:80
 msgid ""
-"28 July 2009: Tor 0.2.1.19 released as stable.  Read the <a href=\"http://";
-"archives.seul.org/or/announce/Aug-2009/msg00000.html\">announcement</a> for "
+"10 October 2009: Tor 0.2.1.20 released as stable.  Read the <a href="
+"\"https://blog.torproject.org/blog/tor-02120-released\";>announcement</a> for "
 "the updates and changes."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/index.wml:81
 msgid ""
-"25 June 2009: Tor 0.2.0.35 released as stable.  Read the <a href=\"http://";
-"archives.seul.org/or/announce/Jun-2009/msg00000.html\">announcement</a> for "
+"28 July 2009: Tor 0.2.1.19 released as stable.  Read the <a href=\"http://";
+"archives.seul.org/or/announce/Aug-2009/msg00000.html\">announcement</a> for "
 "the updates and changes."
 msgstr ""
 

Modified: translation/trunk/projects/website/de/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/de/2-medium.donate.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/de/2-medium.donate.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:07+0100\n"
+"POT-Creation-Date: 2009-12-08 18:51+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -22,70 +22,99 @@
 
 #. type: Content of: <div><div><h3>
 #: /home/runa/tor/website/en/donate.wml:13
-msgid "We accept donations via:"
+msgid "We accept donations of:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/donate.wml:15
-msgid "<a href=\"#paypal\">PayPal</a>"
+msgid "<a href=\"#money\">Money</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/donate.wml:16
-msgid "<a href=\"#check\">Check, Money Order, or Postal Order</a>"
+msgid "<a href=\"#services\">Services</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/donate.wml:17
-msgid "<a href=\"#wire\">ACH/e-check/Wire Transfers</a>"
+msgid "<a href=\"#hardware\">Hardware</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/donate.wml:18
-msgid "<a href=\"#eurobank\">European Bank Transfers</a>"
+msgid "<a href=\"#time\">Time</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/donate.wml:19
-msgid "<a href=\"#funds\">What happens to my donation?</a>"
+msgid "<a href=\"#outcome\">What happens to my donation?</a>"
 msgstr ""
 
-#.  END SIDEBAR 
-#. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:24
-msgid "<hr />"
-msgstr ""
-
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:27
+#: /home/runa/tor/website/en/donate.wml:26
 msgid ""
-"Your tax-deductible donation helps ensure online anonymity and privacy "
-"continue to exist in the world."
+"We offer a few ways to support online privacy and anonymity through "
+"donations.  You can donate <a href=\"#money\">money</a>, <a href=\"#services"
+"\">services</a>, <a href=\"#hardware\">hardware</a>, and <a href=\"#time"
+"\">time</a>.  Your tax-deductible donation helps ensure online anonymity and "
+"privacy continue to exist in the world."
 msgstr ""
 
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/donate.wml:32 /tmp/cbiaCc0v_O.xml:93
+msgid "<br />"
+msgstr ""
+
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:29
+#: /home/runa/tor/website/en/donate.wml:34
 msgid ""
 "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.  If you can't donate, but want to help raise funds please <a href="
-"\"mailto:donations@xxxxxxxxxxxxxx\";>contact us</a> directly."
+"donations.  We're happy to accept donations via paypal, checks, money "
+"orders, stock grants or other more sophisticated transations.  Contact us at "
+"donations@xxxxxxxxxxxxxx for more details."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:33
-msgid "<a id=\"paypal\"></a>"
+#: /home/runa/tor/website/en/donate.wml:43
+msgid "<a id=\"relay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:34
+#: /home/runa/tor/website/en/donate.wml:44
+msgid "<a class=\"anchor\" href=\"#relay\">Run a relay</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/donate.wml:45
+msgid ""
+"The easiest, most effective way to support online privacy and anonymity "
+"around the world is to run a relay.  You join a set of committed people in "
+"the world already running a relay.  The easiest way to speed up Tor is to "
+"add more relays to the network.  Running a relay is as easy as <a href="
+"\"<page docs/tor-doc-relay>\">clicking a button</a>.  Join the network.  "
+"Support your online anonymity and privacy!"
+msgstr ""
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/donate.wml:53
+msgid "<a id=\"money\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/donate.wml:54
+msgid "<a class=\"anchor\" href=\"#money\">Donate Money</a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/donate.wml:55
 msgid "<a class=\"anchor\" href=\"#paypal\">Subscription via PayPal</a>"
 msgstr ""
 
 #. type: Content of: <div><form><p>
-#: /home/runa/tor/website/en/donate.wml:37
+#: /home/runa/tor/website/en/donate.wml:57
 msgid ""
 "One of our core fundraising goals is not to annoy donors with repeated "
 "requests.  Therefore, we advocate for a subscription-based approach: simply "
@@ -97,64 +126,64 @@
 msgstr ""
 
 #. type: Content of: <div><form><select>
-#: /home/runa/tor/website/en/donate.wml:41
+#: /home/runa/tor/website/en/donate.wml:59
 msgid "<br /> <br /> Choose your currency: <select name=\"currency_code\">"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:45 /tmp/lEOri6JHNb.xml:87
+#: /home/runa/tor/website/en/donate.wml:63 /tmp/cbiaCc0v_O.xml:105
 msgid "$"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:46 /tmp/lEOri6JHNb.xml:88
+#: /home/runa/tor/website/en/donate.wml:64 /tmp/cbiaCc0v_O.xml:106
 msgid "€"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:47 /tmp/lEOri6JHNb.xml:89
+#: /home/runa/tor/website/en/donate.wml:65 /tmp/cbiaCc0v_O.xml:107
 msgid "£"
 msgstr ""
 
 #. type: Content of: <div><form>
-#: /home/runa/tor/website/en/donate.wml:48
+#: /home/runa/tor/website/en/donate.wml:66
 msgid "</select>"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:51
+#: /home/runa/tor/website/en/donate.wml:69
 msgid "<input type=\"radio\" name=\"a3\" value=\"250.00\" />250/month"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:52
+#: /home/runa/tor/website/en/donate.wml:70
 msgid "<input type=\"radio\" name=\"a3\" value=\"100.00\" />100/month"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:53
+#: /home/runa/tor/website/en/donate.wml:71
 msgid "<input type=\"radio\" name=\"a3\" value=\"50.00\" />50/month"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:54
+#: /home/runa/tor/website/en/donate.wml:72
 msgid ""
 "<input type=\"radio\" name=\"a3\" value=\"20.00\" checked=\"checked\" />20/"
 "month"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:55
+#: /home/runa/tor/website/en/donate.wml:73
 msgid "<input type=\"radio\" name=\"a3\" value=\"10.00\" />10/month"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:56
+#: /home/runa/tor/website/en/donate.wml:74
 msgid "<input type=\"radio\" name=\"a3\" value=\"5.00\" />5/month"
 msgstr ""
 
 #. type: Content of: <div><form>
-#: /home/runa/tor/website/en/donate.wml:59
+#: /home/runa/tor/website/en/donate.wml:77
 msgid ""
 "<input type=\"hidden\" name=\"p3\" value=\"1\" /> <input type=\"hidden\" "
 "name=\"t3\" value=\"M\" /> <input type=\"hidden\" name=\"sra\" value=\"1\" /"
@@ -170,18 +199,13 @@
 "\"https://www.torproject.org/donate\"/>"
 msgstr ""
 
-#. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:75
-msgid "<br />"
-msgstr ""
-
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:76
+#: /home/runa/tor/website/en/donate.wml:94
 msgid "<a class=\"anchor\" href=\"#paypal\">Single donation via PayPal</a>"
 msgstr ""
 
 #. type: Content of: <div><form><p><select>
-#: /home/runa/tor/website/en/donate.wml:78
+#: /home/runa/tor/website/en/donate.wml:96
 msgid ""
 "You can also make a <b>one-time donation</b> (via PayPal, but doesn't "
 "require any account):<br /> <input type=\"radio\" name=\"amount\" value="
@@ -193,7 +217,7 @@
 msgstr ""
 
 #. type: Content of: <div><form><p>
-#: /home/runa/tor/website/en/donate.wml:90
+#: /home/runa/tor/website/en/donate.wml:108
 msgid ""
 "</select> <input type=\"hidden\" name=\"no_shipping\" value=\"1\" /> <input "
 "type=\"image\" src=\"images/btn_donateCC_LG.gif\" name=\"submit\" alt=\"Make "
@@ -205,133 +229,143 @@
 "\"cancel_return\" value=\"https://www.torproject.org/donate\"/>"
 msgstr ""
 
-#. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:106
-msgid "<a id=\"check\"></a>"
-msgstr ""
-
-#. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:107
-msgid ""
-"<a class=\"anchor\" href=\"#check\">Checks, Money Orders, and Postal Orders</"
-"a>"
-msgstr ""
-
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:110
-msgid "These payments can be sent to:"
+#: /home/runa/tor/website/en/donate.wml:124
+msgid "If you want to send a check, money order, or cash, please send to:"
 msgstr ""
 
-#. type: Content of: <div><blockquote><p>
-#: /home/runa/tor/website/en/donate.wml:113
-msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026 USA"
+#. type: Content of: <div><p><address>
+#: /home/runa/tor/website/en/donate.wml:127
+msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:119
+#: /home/runa/tor/website/en/donate.wml:131
 msgid ""
-"Attention US citizens: if you would like an acknowledgement letter, please "
-"inform us with your donation.  A canceled check, money/postal order receipt, "
-"or appraisal of donated property are valid records according to the IRS."
+"If you want a donation receipt for your non-paypal, non-check deposit, "
+"please specifically request one with your mailed donation."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:124
-msgid "<a id=\"wire\"></a>"
+#: /home/runa/tor/website/en/donate.wml:135
+msgid "<a id=\"services\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:125
-msgid "<a class=\"anchor\" href=\"#wire\">ACH/e-check/Wire Transfers</a>"
+#: /home/runa/tor/website/en/donate.wml:136
+msgid "<a class=\"anchor\" href=\"#services\">Donate Services</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:126
+#: /home/runa/tor/website/en/donate.wml:137
 msgid ""
-"In the US, ACH or e-check transfers are a fine way to donate.  We're happy "
-"to accept wire transfers over US$100.  Domestic United States ACH/e-check "
-"transfers are normally free for the sender, whereas wire transfers will "
-"incur fees.  If you are located in Europe, <a href=\"#eurobank\">please see "
-"below</a>."
+"The Tor Project is always looking for services relating to technical needs, "
+"like bandwidth, colocation, hosted services, legal representation, or "
+"consulting.  By donating services, you join our <a href=\"<page sponsors>"
+"\">many sponsors</a> in providing online privacy and anonymity.  We're "
+"currently looking for scalable hosting services for reporting needs from "
+"large data sets and reliable high-bandwidth hosting.  We may have hardware "
+"we can provide you for your service donation."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:132
+#: /home/runa/tor/website/en/donate.wml:144
 msgid ""
-"Organization Address:<br /> The Tor Project<br /> 122 Scott Circle<br /> "
-"Dedham, MA 02026<br />"
+"Can you write code? We're always looking for smart, motivated coders to "
+"either port Tor to new or old operating systems, or solve difficult online "
+"anonymity problems.  Take a look at <a href=\"<page volunteer>#Coding\">our "
+"coding projects</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:138
+#: /home/runa/tor/website/en/donate.wml:148
 msgid ""
-"account number: 63904957725<br /> routing number: 011075150<br /> SWIFT "
-"Code: SVRNUS33//FW011075150<br />"
+"Are you a creative person? Do you have a fantastic idea for a campaign? Are "
+"you someone who can come up with awesome artwork? We're always looking for "
+"new ways to promote Tor and get the word out that everyone needs their "
+"privacy and anonymity online."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:143
+#: /home/runa/tor/website/en/donate.wml:152
 msgid ""
-"Bank Address:<br /> Sovereign Bank<br /> 1130 Berkshire Boulevard<br /> "
-"Wyomissing, PA 19610<br />"
+"Is your legal firm willing to defend Tor and its volunteers? Are you waiting "
+"for an interesting case to defend online privacy and anonymity?"
 msgstr ""
 
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/donate.wml:155
+msgid ""
+"If any of the service ideas struck a nerve, contact us at "
+"donations@xxxxxxxxxxxxxx for more details."
+msgstr ""
+
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:149
-msgid "<a id=\"eurobank\"></a>"
+#: /home/runa/tor/website/en/donate.wml:158
+msgid "<a id=\"hardware\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:150
-msgid "<a class=\"anchor\" href=\"#eurobank\">European Bank Transfers</a>"
+#: /home/runa/tor/website/en/donate.wml:159
+msgid "<a class=\"anchor\" href=\"#hardware\">Donate Hardware</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:151
+#: /home/runa/tor/website/en/donate.wml:160
 msgid ""
-"In Europe, we have a funding arrangement with the <a href=\"http://www.ccc.";
-"de/\">Chaos Computer Club</a>.  Your donations go into a separate bank "
-"account managed by the CCC, and they use the funds to do beneficial "
-"activities for Tor in Europe.  Residents from any of the <a href=\"http://en.";
-"wikipedia.org/wiki/Single_Euro_Payments_Area\">31 SEPA member states</a> can "
-"wire up to 50.000 Euro at the cost of a domestic transaction (i.e., usually "
-"free if submitted electronically)."
+"We're generally looking for donated hardware and support services that could "
+"be used to provide the infrastructure that supports Tor's operations, "
+"including website mirrors, database servers, build systems and legacy "
+"hardware for supporting packages on older Operating Systems; such as OS X "
+"10.2, OS X 10.3, Windows XP, Windows 7, IRIX, Redhat, CentOS, Fedora, "
+"Debian, etc.  A number of service providers have an abundance of bandwidth "
+"capacity, but need hardware in order donate it to us."
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/donate.wml:161
 msgid ""
-"The account information is:<br /> Wau Holland Stiftung<br /> IBAN "
-"DE57520400210277281200<br /> SWIFT BIC COBADEFF520<br />"
+"By donating hardware, you're joining our <a href=\"<page sponsors>\">many "
+"sponsors</a> in providing online privacy and anonymity.  If you want Tor to "
+"work on your architecture or hardware, a fine way to do this is to donate "
+"the hardware and operating system to us.  Contact us at donations@torproject."
+"org for more details."
 msgstr ""
 
-#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:167
-msgid ""
-"Classic style German account information is:<br /> Konto: 2772812-02<br /> "
-"Inhaber: Wau Holland Stiftung<br /> Bank: Commerzbank Kassel<br /> BLZ: "
-"52040021<br />"
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/donate.wml:164
+msgid "<a id=\"time\"></a>"
 msgstr ""
 
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/donate.wml:165
+msgid "<a class=\"anchor\" href=\"#time\">Donate Time</a>"
+msgstr ""
+
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:173
+#: /home/runa/tor/website/en/donate.wml:166
 msgid ""
-"WHS issues a donation receipt upon request (if provided with address "
-"information)."
+"We're always looking for excited volunteers to give talks or trainins at "
+"conferences, barcamps, and other meetings where people should learn about "
+"online privacy and anonymity with Tor.  We're happy to work with you to help "
+"you better present Tor and online privacy and anonymity.  Contact us at "
+"donations@xxxxxxxxxxxxxx for more details."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:177
-msgid "<a id=\"funds\"></a>"
+#: /home/runa/tor/website/en/donate.wml:169
+msgid ""
+"<a id=\"outcome\"></a> <a id=\"funds\"></a><a class=\"anchor\" href=\"#funds"
+"\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:178
-msgid "<a class=\"anchor\" href=\"#funds\">What happens to my donation?</a>"
+#: /home/runa/tor/website/en/donate.wml:171
+msgid "<a class=\"anchor\" href=\"#outcome\">What happens to my donation?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:179
+#: /home/runa/tor/website/en/donate.wml:172
 msgid ""
 "If you've just donated, thank you for your donation.  Your funds are "
 "deposited into our general fund.  You join our <a href=\"<page sponsors>"
@@ -340,7 +374,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:182
+#: /home/runa/tor/website/en/donate.wml:175
 msgid ""
 "<img src=\"images/2008-funding-chart.png\" alt=\"Who funds the Tor Project?"
 "\"/> <img src=\"images/2008-expenses-chart.png\" alt=\"How is the money "
@@ -348,9 +382,9 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:185
+#: /home/runa/tor/website/en/donate.wml:179
 msgid ""
-"<hr /> <strong>The Tor Project respects the confidentiality of our "
-"supporters, when requested. We do not lend, rent, or sell our lists of "
-"donors at any time.</strong>"
+"<strong>The Tor Project respects the confidentiality of our supporters, when "
+"requested. We do not lend, rent, or sell our lists of donors at any time.</"
+"strong>"
 msgstr ""

Modified: translation/trunk/projects/website/de/2-medium.faq.po
===================================================================
--- translation/trunk/projects/website/de/2-medium.faq.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/de/2-medium.faq.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:07+0100\n"
+"POT-Creation-Date: 2009-12-08 18:51+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -21,7 +21,7 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:12 /tmp/carB5doktd.xml:1085
+#: /home/runa/tor/website/en/faq.wml:12 /tmp/qIQT6HNEXD.xml:1084
 msgid "<hr />"
 msgstr ""
 
@@ -559,11 +559,11 @@
 "answer these mails, but typically they need to spend most of their time on "
 "development tasks that will benefit more people.  This is especially true if "
 "your question is already covered in the <a href=\"<page documentation>"
-"\">documentation</a> or on this FAQ. We don't hate you; we're just busy."
+"\">documentation</a> or on this FAQ."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:308
+#: /home/runa/tor/website/en/faq.wml:307
 msgid ""
 "So if we don't answer your mail, first check the <a href=\"<page "
 "documentation>\">documentation</a> page, along with this FAQ, to make sure "
@@ -580,7 +580,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:323
+#: /home/runa/tor/website/en/faq.wml:322
 msgid ""
 "Another strategy is to <a href=\"<page docs/tor-doc-relay>\">run a Tor relay "
 "for a while</a>, and/or <a href=\"<page donate>\">donate money</a> <a href="
@@ -590,29 +590,29 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:331
+#: /home/runa/tor/website/en/faq.wml:330
 msgid ""
 "If you find your answer, please stick around on the IRC channel or the "
 "mailing list and answer questions from others."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:335
+#: /home/runa/tor/website/en/faq.wml:334
 msgid "<hr /> <a id=\"WhySlow\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:338
+#: /home/runa/tor/website/en/faq.wml:337
 msgid "<a class=\"anchor\" href=\"#WhySlow\">Why is Tor so slow?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:341
+#: /home/runa/tor/website/en/faq.wml:340
 msgid "There are many reasons why the Tor network is currently slow."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:345
+#: /home/runa/tor/website/en/faq.wml:344
 msgid ""
 "Before we answer, though, you should realize that Tor is never going to be "
 "blazing fast. Your traffic is bouncing through volunteers' computers in "
@@ -622,7 +622,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:353
+#: /home/runa/tor/website/en/faq.wml:352
 msgid ""
 "But that doesn't mean that it can't be improved. The current Tor network is "
 "quite small compared to the number of people trying to use it, and many of "
@@ -631,12 +631,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:360
+#: /home/runa/tor/website/en/faq.wml:359
 msgid "What can you do to help?"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:366
+#: /home/runa/tor/website/en/faq.wml:365
 msgid ""
 "<a href=\"<page docs/tor-doc-relay>\">Configure your Tor to relay traffic "
 "for others</a>. Help make the Tor network large enough that we can handle "
@@ -644,7 +644,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:372
+#: /home/runa/tor/website/en/faq.wml:371
 msgid ""
 "<a href=\"<page gui/index>\">Help us make Tor more usable</a>. We especially "
 "need people to help make it easier to configure your Tor as a relay. Also, "
@@ -653,7 +653,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:379
+#: /home/runa/tor/website/en/faq.wml:378
 msgid ""
 "There are some bottlenecks in the current Tor network. Help us design "
 "experiments to track down and demonstrate where the problems are, and then "
@@ -661,7 +661,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:385
+#: /home/runa/tor/website/en/faq.wml:384
 msgid ""
 "There are some steps that individuals can take to improve their Tor "
 "performance. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
@@ -673,7 +673,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:396
+#: /home/runa/tor/website/en/faq.wml:395
 msgid ""
 "Tor needs some architectural changes too. One important change is to start "
 "providing <a href=\"#EverybodyARelay\">better service to people who relay "
@@ -682,7 +682,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:404
+#: /home/runa/tor/website/en/faq.wml:403
 msgid ""
 "Help do other things so we can do the hard stuff. Please take a moment to "
 "figure out what your skills and interests are, and then <a href=\"<page "
@@ -690,7 +690,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:410
+#: /home/runa/tor/website/en/faq.wml:409
 msgid ""
 "Help find sponsors for Tor. Do you work at a company or government agency "
 "that uses Tor or has a use for Internet privacy, e.g. to browse the "
@@ -701,7 +701,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:419
+#: /home/runa/tor/website/en/faq.wml:418
 msgid ""
 "If you can't help out with any of the above, you can still help out "
 "individually by <a href=\"<page donate>\">donating a bit of money to the "
@@ -709,32 +709,32 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:426
+#: /home/runa/tor/website/en/faq.wml:425
 msgid "<hr /> <a id=\"Funding\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:429
+#: /home/runa/tor/website/en/faq.wml:428
 msgid ""
 "<a class=\"anchor\" href=\"#Funding\">What would The Tor Project do with "
 "more funding?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:433
+#: /home/runa/tor/website/en/faq.wml:432
 msgid ""
-"We have about 1500 relays right now, pushing over 150 MB/s average traffic. "
+"We have about 1800 relays right now, pushing over 150 MB/s average traffic. "
 "We have several hundred thousand active users. But the Tor network is not "
 "yet self-sustaining."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:439
+#: /home/runa/tor/website/en/faq.wml:438
 msgid "There are six main development/maintenance pushes that need attention:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:445
+#: /home/runa/tor/website/en/faq.wml:444
 msgid ""
 "Scalability: We need to keep scaling and decentralizing the Tor architecture "
 "so it can handle thousands of relays and millions of users. The upcoming "
@@ -743,7 +743,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:452
+#: /home/runa/tor/website/en/faq.wml:451
 msgid ""
 "User support: With this many users, a lot of people are asking questions all "
 "the time, offering to help out with things, and so on. We need good clean "
@@ -751,7 +751,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:458
+#: /home/runa/tor/website/en/faq.wml:457
 msgid ""
 "Relay support: the Tor network is run by volunteers, but they still need "
 "attention with prompt bug fixes, explanations when things go wrong, "
@@ -762,7 +762,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:467
+#: /home/runa/tor/website/en/faq.wml:466
 msgid ""
 "Usability: Beyond documentation, we also need to work on usability of the "
 "software itself. This includes installers, clean GUIs, easy configuration to "
@@ -773,7 +773,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:476
+#: /home/runa/tor/website/en/faq.wml:475
 msgid ""
 "Incentives: We need to work on ways to encourage people to configure their "
 "Tors as relays and exit nodes rather than just clients.  <a href="
@@ -782,7 +782,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:483
+#: /home/runa/tor/website/en/faq.wml:482
 msgid ""
 "Research: The anonymous communications field is full of surprises and "
 "gotchas. In our copious free time, we also help run top anonymity and "
@@ -794,7 +794,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:496
+#: /home/runa/tor/website/en/faq.wml:495
 msgid ""
 "We're continuing to move forward on all of these, but at this rate <a href="
 "\"#WhySlow\">the Tor network is growing faster than the developers can keep "
@@ -803,14 +803,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:504
+#: /home/runa/tor/website/en/faq.wml:503
 msgid ""
 "We are also excited about tackling related problems, such as censorship-"
 "resistance."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:509
+#: /home/runa/tor/website/en/faq.wml:508
 msgid ""
 "We are proud to have <a href=\"<page sponsors>\">sponsorship and support</a> "
 "from the Omidyar Network, the International Broadcasting Bureau, Bell "
@@ -819,7 +819,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:516
+#: /home/runa/tor/website/en/faq.wml:515
 msgid ""
 "However, this support is not enough to keep Tor abreast of changes in the "
 "Internet privacy landscape. Please <a href=\"<page donate>\">donate</a> to "
@@ -828,18 +828,18 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:522
+#: /home/runa/tor/website/en/faq.wml:521
 msgid "<hr /> <a id=\"HowUninstallTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:525
+#: /home/runa/tor/website/en/faq.wml:524
 msgid ""
 "<a class=\"anchor\" href=\"#HowUninstallTor\">How do I uninstall Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:528
+#: /home/runa/tor/website/en/faq.wml:527
 msgid ""
 "This depends entirely on how you installed it and which operating system you "
 "have. If you installed a package, then hopefully your package has a way to "
@@ -849,35 +849,35 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:536
+#: /home/runa/tor/website/en/faq.wml:535
 msgid ""
 "In your taskbar, right click on Vidalia (the green onion or the black head)  "
 "and choose exit."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:538
+#: /home/runa/tor/website/en/faq.wml:537
 msgid ""
 "Right click on the taskbar to bring up TaskManager. Look for tor.exe in the "
 "Process List. If it's running, right click and choose End Process."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:540
+#: /home/runa/tor/website/en/faq.wml:539
 msgid ""
 "Click the Start button, go to Programs, go to Vidalia, choose Uninstall.  "
 "This will remove the Vidalia bundle, which includes Tor and Polipo."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:542
+#: /home/runa/tor/website/en/faq.wml:541
 msgid ""
 "Start Firefox. Go to the Tools menu, choose Add-ons. Select Torbutton.  "
 "Click the Uninstall button."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:547
+#: /home/runa/tor/website/en/faq.wml:546
 msgid ""
 "If you do not follow these steps (for example by trying to uninstall "
 "Vidalia, Tor, and Polipo while they are still running), you will need to "
@@ -885,14 +885,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:553
+#: /home/runa/tor/website/en/faq.wml:552
 msgid ""
 "For Mac OS X, follow the <a href=\"<page docs/tor-doc-osx>#uninstall"
 "\">uninstall directions</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:558
+#: /home/runa/tor/website/en/faq.wml:557
 msgid ""
 "If you installed by source, I'm afraid there is no easy uninstall method. "
 "But on the bright side, by default it only installs into /usr/local/ and it "
@@ -900,52 +900,52 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:563
+#: /home/runa/tor/website/en/faq.wml:562
 msgid "<hr /> <a id=\"PGPSigs\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:566
+#: /home/runa/tor/website/en/faq.wml:565
 msgid ""
 "<a class=\"anchor\" href=\"#PGPSigs\">What are these \"sig\" files on the "
 "download page?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:570
+#: /home/runa/tor/website/en/faq.wml:569
 msgid ""
 "These are PGP signatures, so you can verify that the file you've downloaded "
 "is exactly the one that we intended you to get."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:575
+#: /home/runa/tor/website/en/faq.wml:574
 msgid ""
 "Please read the <a href=\"<page verifying-signatures>\">verifying "
 "signatures</a> page for details."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:579
+#: /home/runa/tor/website/en/faq.wml:578
 msgid "<hr /> <a id=\"CompileTorWindows\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:582
+#: /home/runa/tor/website/en/faq.wml:581
 msgid ""
 "<a class=\"anchor\" href=\"#CompileTorWindows\">How do I compile Tor under "
 "Windows?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:586
+#: /home/runa/tor/website/en/faq.wml:585
 msgid ""
 "Try following the steps at <a href=\"<svnsandbox>doc/tor-win32-mingw-"
 "creation.txt\"><svnsandbox>doc/tor-win32-mingw-creation.txt</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:591
+#: /home/runa/tor/website/en/faq.wml:590
 msgid ""
 "(Note that you don't need to compile Tor yourself in order to use it. Most "
 "people just use the packages available on the <a href=\"<page download>"
@@ -953,19 +953,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:596
+#: /home/runa/tor/website/en/faq.wml:595
 msgid "<hr /> <a id=\"VirusFalsePositives\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:599
+#: /home/runa/tor/website/en/faq.wml:598
 msgid ""
 "<a class=\"anchor\" href=\"#VirusFalsePositives\">Why does my Tor executable "
 "appear to have a virus or spyware?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:603
+#: /home/runa/tor/website/en/faq.wml:602
 msgid ""
 "Sometimes, overzealous Windows virus and spyware detectors trigger on some "
 "parts of the Tor Windows binary. Our best guess is that these are false "
@@ -976,7 +976,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:611
+#: /home/runa/tor/website/en/faq.wml:610
 msgid ""
 "In the meantime, we encourage you to not just take our word for it. Our job "
 "is to provide the source; if you're concerned, please do <a href="
@@ -984,19 +984,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:616
+#: /home/runa/tor/website/en/faq.wml:615
 msgid "<hr /> <a id=\"LiveCD\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:619
+#: /home/runa/tor/website/en/faq.wml:618
 msgid ""
 "<a class=\"anchor\" href=\"#LiveCD\">Is there a LiveCD or other bundle that "
 "includes Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:623
+#: /home/runa/tor/website/en/faq.wml:622
 msgid ""
 "There isn't any official LiveCD at this point. We're still trying to find "
 "good solutions and trying to understand the security and anonymity "
@@ -1005,12 +1005,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:630
+#: /home/runa/tor/website/en/faq.wml:629
 msgid "LiveCDs:"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:634
+#: /home/runa/tor/website/en/faq.wml:633
 msgid ""
 "<a href=\"http://incognito.anonymityanywhere.com/\";>Incognito LiveCD/USB</a> "
 "is a CD you can boot that has several Internet applications (Firefox, IRC, "
@@ -1020,7 +1020,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:639
+#: /home/runa/tor/website/en/faq.wml:638
 msgid ""
 "<a href=\"http://tork.sourceforge.net/wiki/index.php/LiveCD\";>TorK LiveCD</"
 "a> is Knoppix-based with an emphasis on user-friendliness. You can work "
@@ -1030,7 +1030,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:644
+#: /home/runa/tor/website/en/faq.wml:643
 msgid ""
 "<a href=\"http://mandalka.name/privatix/\";>Privatix LiveCD/USB</a> is a "
 "debian based live-system including tor, firefox and torbutton which can save "
@@ -1038,12 +1038,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:650
+#: /home/runa/tor/website/en/faq.wml:649
 msgid "Windows bundles:"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:654
+#: /home/runa/tor/website/en/faq.wml:653
 msgid ""
 "<a href=\"<page torbrowser/index>\">Tor Browser Bundle</a> for Windows comes "
 "with a pre-configured web browser and is self contained so you can run it "
@@ -1051,14 +1051,14 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:657
+#: /home/runa/tor/website/en/faq.wml:656
 msgid ""
 "<a href=\"http://www.janusvm.com/tor_vm/\";>Tor VM</a> is a successor to "
 "JanusVM. It needs testing from you!"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:659
+#: /home/runa/tor/website/en/faq.wml:658
 msgid ""
 "<a href=\"http://janusvm.com/\";>JanusVM</a> is a Linux kernel and software "
 "running in VMWare that sits between your Windows computer and the Internet, "
@@ -1066,7 +1066,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:662
+#: /home/runa/tor/website/en/faq.wml:661
 msgid ""
 "<a href=\"http://www.xerobank.com/xB_browser.html\";>xB Browser</a>, "
 "previously known as Torpark, is a Firefox+Tor package for Win32 that can "
@@ -1074,12 +1074,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:668
+#: /home/runa/tor/website/en/faq.wml:667
 msgid "Not currently maintained as far as we know:"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:672
+#: /home/runa/tor/website/en/faq.wml:671
 msgid ""
 "Polippix / Privatlivets Fred is a Danish Knoppix-based LiveCD with Tor and "
 "utilities to encrypt IP-telephony. <a href=\"http://polippix.org/\";>Info and "
@@ -1087,7 +1087,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:675
+#: /home/runa/tor/website/en/faq.wml:674
 msgid ""
 "ELE is a Linux LiveCD which is focused on privacy related software. It "
 "includes Tor and you can download it at <a href=\"http://www.";
@@ -1096,7 +1096,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:679
+#: /home/runa/tor/website/en/faq.wml:678
 msgid ""
 "Virtual Privacy Machine is a Linux LiveCD that includes Firefox, Privoxy, "
 "Tor, some IRC and IM applications, and a set of ipchains rules aimed to "
@@ -1107,7 +1107,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:684
+#: /home/runa/tor/website/en/faq.wml:683
 msgid ""
 "Anonym.OS is a LiveCD similar to the above but is based on OpenBSD rather "
 "than Linux for maximum security. It was designed to be anonymous and secure "
@@ -1118,7 +1118,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:690
+#: /home/runa/tor/website/en/faq.wml:689
 msgid ""
 "Phantomix is a LiveCD for anonymous surfing and chatting based on the most "
 "recent KNOPPIX release. It comes preconfigured with Privoxy, Tor and Polipo. "
@@ -1127,24 +1127,24 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:697
+#: /home/runa/tor/website/en/faq.wml:696
 msgid "Please contact us if you know any others."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:700
+#: /home/runa/tor/website/en/faq.wml:699
 msgid "<hr /> <a id=\"ChooseEntryExit\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:703
+#: /home/runa/tor/website/en/faq.wml:702
 msgid ""
 "<a class=\"anchor\" href=\"#ChooseEntryExit\">Can I control which nodes (or "
 "country) are used for entry/exit?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:706
+#: /home/runa/tor/website/en/faq.wml:705
 msgid ""
 "Yes. You can set preferred entry and exit nodes as well as inform Tor which "
 "nodes you do not want to use.  The following options can be added to your "
@@ -1152,53 +1152,53 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/faq.wml:712
+#: /home/runa/tor/website/en/faq.wml:711
 msgid "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/faq.wml:713
+#: /home/runa/tor/website/en/faq.wml:712
 msgid ""
 "A list of preferred nodes to use for the first hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/faq.wml:715
+#: /home/runa/tor/website/en/faq.wml:714
 msgid "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/faq.wml:716
+#: /home/runa/tor/website/en/faq.wml:715
 msgid ""
 "A list of preferred nodes to use for the last hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/faq.wml:718
+#: /home/runa/tor/website/en/faq.wml:717
 msgid "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/faq.wml:719
+#: /home/runa/tor/website/en/faq.wml:718
 msgid "A list of nodes to never use when building a circuit."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/faq.wml:721
+#: /home/runa/tor/website/en/faq.wml:720
 msgid "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/faq.wml:722
+#: /home/runa/tor/website/en/faq.wml:721
 msgid ""
 "A list of nodes to never use when picking an exit.  Nodes listed in "
 "<tt>ExcludeNodes</tt> are automatically in this list."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:727
+#: /home/runa/tor/website/en/faq.wml:726
 msgid ""
 "<em>We recommend you do not use these</em> -- they are intended for testing "
 "and may disappear in future versions.  You get the best security that Tor "
@@ -1207,7 +1207,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:733
+#: /home/runa/tor/website/en/faq.wml:732
 msgid ""
 "The <tt>EntryNodes</tt> and <tt>ExitNodes</tt> config options are treated as "
 "a request, meaning if the nodes are down or seem slow, Tor will still avoid "
@@ -1219,7 +1219,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:743
+#: /home/runa/tor/website/en/faq.wml:742
 msgid ""
 "Instead of <tt>$fingerprint</tt> you can also specify a 2 letter ISO3166 "
 "country code in curly braces (for example {de}), or an ip address pattern "
@@ -1228,7 +1228,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:751
+#: /home/runa/tor/website/en/faq.wml:750
 msgid ""
 "If you want to access a service directly through Tor's SOCKS interface (eg. "
 "using ssh via connect.c), another option is to set up an internal mapping in "
@@ -1237,24 +1237,24 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:757
+#: /home/runa/tor/website/en/faq.wml:756
 msgid "<hr /> <a id=\"RelayFlexible\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:760
+#: /home/runa/tor/website/en/faq.wml:759
 msgid ""
 "<a class=\"anchor\" href=\"#RelayFlexible\">How stable does my relay need to "
 "be?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:764
+#: /home/runa/tor/website/en/faq.wml:763
 msgid "We aim to make setting up a Tor relay easy and convenient:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:768
+#: /home/runa/tor/website/en/faq.wml:767
 msgid ""
 "Tor has built-in support for <a href=\"https://wiki.torproject.org/noreply/";
 "TheOnionRouter/TorFAQ#LimitBandwidth\"> rate limiting</a>. Further, if you "
@@ -1264,7 +1264,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:778
+#: /home/runa/tor/website/en/faq.wml:777
 msgid ""
 "Each Tor relay has an <a href=\"#ExitPolicies\">exit policy</a> that "
 "specifies what sort of outbound connections are allowed or refused from that "
@@ -1273,7 +1273,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:785
+#: /home/runa/tor/website/en/faq.wml:784
 msgid ""
 "It's fine if the relay goes offline sometimes. The directories notice this "
 "quickly and stop advertising the relay. Just try to make sure it's not too "
@@ -1281,14 +1281,14 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:790
+#: /home/runa/tor/website/en/faq.wml:789
 msgid ""
 "We can handle relays with dynamic IPs just fine &mdash; simply leave the "
 "Address config option blank, and Tor will try to guess."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:793
+#: /home/runa/tor/website/en/faq.wml:792
 msgid ""
 "If your relay is behind a NAT and it doesn't know its public IP (e.g. it has "
 "an IP of 192.168.x.y), you'll need to set up port forwarding. Forwarding TCP "
@@ -1298,7 +1298,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:800
+#: /home/runa/tor/website/en/faq.wml:799
 msgid ""
 "Your relay will passively estimate and advertise its recent bandwidth "
 "capacity, so high-bandwidth relays will attract more users than low-"
@@ -1306,24 +1306,24 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:806
+#: /home/runa/tor/website/en/faq.wml:805
 msgid "<hr /> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:810
+#: /home/runa/tor/website/en/faq.wml:809
 msgid ""
 "<a class=\"anchor\" href=\"#ExitPolicies\">I'd run a relay, but I don't want "
 "to deal with abuse issues.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:814
+#: /home/runa/tor/website/en/faq.wml:813
 msgid "Great. That's exactly why we implemented exit policies."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:818
+#: /home/runa/tor/website/en/faq.wml:817
 msgid ""
 "Each Tor relay has an exit policy that specifies what sort of outbound "
 "connections are allowed or refused from that relay. The exit policies are "
@@ -1339,7 +1339,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:832
+#: /home/runa/tor/website/en/faq.wml:831
 msgid ""
 "The default exit policy allows access to many popular services (e.g. web "
 "browsing), but <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
@@ -1355,7 +1355,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:847
+#: /home/runa/tor/website/en/faq.wml:846
 msgid ""
 "If you do allow any exit connections, make sure name resolution works (that "
 "is, your computer can resolve Internet addresses correctly).  If there are "
@@ -1365,19 +1365,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:855
+#: /home/runa/tor/website/en/faq.wml:854
 msgid "<hr /> <a id=\"RelayOrBridge\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:858
+#: /home/runa/tor/website/en/faq.wml:857
 msgid ""
 "<a class=\"anchor\" href=\"#RelayOrBridge\">Should I be a normal relay or "
 "bridge relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:861
+#: /home/runa/tor/website/en/faq.wml:860
 msgid ""
 "<a href=\"<page bridges>\">Bridge relays</a> (or \"bridges\" for short)  are "
 "<a href=\"<page docs/tor-doc-relay>\">Tor relays</a> that aren't listed in "
@@ -1387,7 +1387,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:868
+#: /home/runa/tor/website/en/faq.wml:867
 msgid ""
 "Being a normal relay vs being a bridge relay is almost the same "
 "configuration: it's just a matter of whether your relay is listed publically "
@@ -1395,7 +1395,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:873
+#: /home/runa/tor/website/en/faq.wml:872
 msgid ""
 "Right now, there are roughly zero places in the world that filter "
 "connections to the Tor network. So getting a lot of bridges running right "
@@ -1406,7 +1406,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:881
+#: /home/runa/tor/website/en/faq.wml:880
 msgid ""
 "So should you run a normal relay or bridge relay? If you have lots of "
 "bandwidth, you should definitely run a normal relay &mdash; bridge relays "
@@ -1417,54 +1417,54 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:889
+#: /home/runa/tor/website/en/faq.wml:888
 msgid "<hr /> <a id=\"WhyNotNamed\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:892
+#: /home/runa/tor/website/en/faq.wml:891
 msgid ""
 "<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:895
+#: /home/runa/tor/website/en/faq.wml:894
 msgid ""
 "We currently use these metrics to determine if your relay should be named:"
 "<br />"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:898
+#: /home/runa/tor/website/en/faq.wml:897
 msgid ""
 "The name is not currently mapped to a different key. Existing mappings are "
 "removed after 6 months of inactivity from a relay."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:900
+#: /home/runa/tor/website/en/faq.wml:899
 msgid "The relay must have been around for at least two weeks."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:901
+#: /home/runa/tor/website/en/faq.wml:900
 msgid "No other router may have wanted the same name in the past month."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:904
+#: /home/runa/tor/website/en/faq.wml:903
 msgid "<hr /> <a id=\"KeyManagement\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:907
+#: /home/runa/tor/website/en/faq.wml:906
 msgid ""
 "<a class=\"anchor\" href=\"#KeyManagement\">Tell me about all the keys Tor "
 "uses.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:911
+#: /home/runa/tor/website/en/faq.wml:910
 msgid ""
 "Tor uses a variety of different keys, with three goals in mind: 1)  "
 "encryption to ensure privacy of data within the Tor network, 2)  "
@@ -1474,7 +1474,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:919
+#: /home/runa/tor/website/en/faq.wml:918
 msgid ""
 "<b>Encryption</b>: first, all connections in Tor use TLS link encryption, so "
 "observers can't look inside to see which circuit a given cell is intended "
@@ -1485,7 +1485,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:929
+#: /home/runa/tor/website/en/faq.wml:928
 msgid ""
 "<b>Authentication</b>: Every Tor relay has a public decryption key called "
 "the \"onion key\".  When the Tor client establishes circuits, at each step "
@@ -1496,7 +1496,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:939
+#: /home/runa/tor/website/en/faq.wml:938
 msgid ""
 "<b>Coordination</b>: How do clients know what the relays are, and how do "
 "they know that they have the right keys for them? Each relay has a long-term "
@@ -1511,7 +1511,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:953
+#: /home/runa/tor/website/en/faq.wml:952
 msgid ""
 "How do clients know what the directory authorities are? The Tor software "
 "comes with a built-in list of location and public key for each directory "
@@ -1520,7 +1520,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:960
+#: /home/runa/tor/website/en/faq.wml:959
 msgid ""
 "How do users know they've got the right software? When we distribute the "
 "source code or a package, we digitally sign it with <a href=\"http://www.";
@@ -1529,7 +1529,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:968
+#: /home/runa/tor/website/en/faq.wml:967
 msgid ""
 "In order to be certain that it's really signed by us, you need to have met "
 "us in person and gotten a copy of our GPG key fingerprint, or you need to "
@@ -1539,19 +1539,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:975
+#: /home/runa/tor/website/en/faq.wml:974
 msgid "<hr /> <a id=\"EverybodyARelay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:978
+#: /home/runa/tor/website/en/faq.wml:977
 msgid ""
 "<a class=\"anchor\" href=\"#EverybodyARelay\">You should make every Tor user "
 "be a relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:982
+#: /home/runa/tor/website/en/faq.wml:981
 msgid ""
 "Requiring every Tor user to be a relay would help with scaling the network "
 "to handle all our users, and <a href=\"https://wiki.torproject.org/noreply/";
@@ -1566,7 +1566,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:994
+#: /home/runa/tor/website/en/faq.wml:993
 msgid ""
 "That said, we do want to encourage Tor users to run relays, so what we "
 "really want to do is simplify the process of setting up and maintaining a "
@@ -1577,12 +1577,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1003
+#: /home/runa/tor/website/en/faq.wml:1002
 msgid "There are five steps we need to address before we can do this though:"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1007
+#: /home/runa/tor/website/en/faq.wml:1006
 msgid ""
 "First, we need to make Tor stable as a relay on all common operating "
 "systems. The main remaining platform is Windows, and we plan to finally "
@@ -1591,7 +1591,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1015
+#: /home/runa/tor/website/en/faq.wml:1014
 msgid ""
 "Second, we still need to get better at automatically estimating the right "
 "amount of bandwidth to allow. See item #7 on the <a href=\"<page "
@@ -1604,7 +1604,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1026
+#: /home/runa/tor/website/en/faq.wml:1025
 msgid ""
 "Third, we need to work on scalability, both of the network (how to stop "
 "requiring that all Tor relays be able to connect to all Tor relays) and of "
@@ -1616,7 +1616,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1036
+#: /home/runa/tor/website/en/faq.wml:1035
 msgid ""
 "Fourth, we need to better understand the risks from letting the attacker "
 "send traffic through your relay while you're also initiating your own "
@@ -1633,7 +1633,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1052
+#: /home/runa/tor/website/en/faq.wml:1051
 msgid ""
 "Fifth, we might need some sort of incentive scheme to encourage people to "
 "relay traffic for others, and/or to become exit nodes. Here are our <a href="
@@ -1642,43 +1642,43 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1059
+#: /home/runa/tor/website/en/faq.wml:1058
 msgid "Please help on all of these!"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:1062
+#: /home/runa/tor/website/en/faq.wml:1061
 msgid "<hr /> <a id=\"Criminals\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:1065
+#: /home/runa/tor/website/en/faq.wml:1064
 msgid ""
 "<a class=\"anchor\" href=\"#Criminals\">Doesn't Tor enable criminals to do "
 "bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1069
+#: /home/runa/tor/website/en/faq.wml:1068
 msgid ""
 "For the answer to this question and others, please see our <a href=\"<page "
 "faq-abuse>\">Tor Abuse FAQ</a>."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:1073
+#: /home/runa/tor/website/en/faq.wml:1072
 msgid "<hr /> <a id=\"RespondISP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:1076
+#: /home/runa/tor/website/en/faq.wml:1075
 msgid ""
 "<a class=\"anchor\" href=\"#RespondISP\">How do I respond to my ISP about my "
 "exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1080
+#: /home/runa/tor/website/en/faq.wml:1079
 msgid ""
 "A collection of templates for successfully responding to ISPs is <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TorAbuseTemplates";

Modified: translation/trunk/projects/website/de/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/de/3-low.download-unix.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/de/3-low.download-unix.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:07+0100\n"
+"POT-Creation-Date: 2009-12-08 18:51+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -69,15 +69,15 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:35 /tmp/EO9JOCAg4E.xml:51
-#: /tmp/EO9JOCAg4E.xml:67 /tmp/EO9JOCAg4E.xml:83 /tmp/EO9JOCAg4E.xml:99
-#: /tmp/EO9JOCAg4E.xml:115 /tmp/EO9JOCAg4E.xml:131 /tmp/EO9JOCAg4E.xml:147
-#: /tmp/EO9JOCAg4E.xml:163 /tmp/EO9JOCAg4E.xml:180 /tmp/EO9JOCAg4E.xml:197
+#: /home/runa/tor/website/en/download-unix.wml:35 /tmp/enprRihGKC.xml:51
+#: /tmp/enprRihGKC.xml:67 /tmp/enprRihGKC.xml:83 /tmp/enprRihGKC.xml:99
+#: /tmp/enprRihGKC.xml:115 /tmp/enprRihGKC.xml:131 /tmp/enprRihGKC.xml:147
+#: /tmp/enprRihGKC.xml:163 /tmp/enprRihGKC.xml:180 /tmp/enprRihGKC.xml:197
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:40 /tmp/EO9JOCAg4E.xml:56
+#: /home/runa/tor/website/en/download-unix.wml:40 /tmp/enprRihGKC.xml:56
 msgid "<img src=\"images/distros/centos.png\" alt=\"CentOS 4\" />"
 msgstr ""
 
@@ -120,7 +120,7 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:72 /tmp/EO9JOCAg4E.xml:88
+#: /home/runa/tor/website/en/download-unix.wml:72 /tmp/enprRihGKC.xml:88
 msgid "<img src=\"images/distros/centos.png\" alt=\"CentOS 5\" />"
 msgstr ""
 
@@ -163,7 +163,7 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:104 /tmp/EO9JOCAg4E.xml:120
+#: /home/runa/tor/website/en/download-unix.wml:104 /tmp/enprRihGKC.xml:120
 msgid "<img src=\"images/distros/fedora.png\" alt=\"Fedora Core 10\" />"
 msgstr ""
 
@@ -206,7 +206,7 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:136 /tmp/EO9JOCAg4E.xml:152
+#: /home/runa/tor/website/en/download-unix.wml:136 /tmp/enprRihGKC.xml:152
 msgid "<img src=\"images/distros/suse.png\" alt=\"openSUSE 11\" />"
 msgstr ""
 
@@ -521,8 +521,7 @@
 "See the <a href=\"<page documentation>#Developers\">developer documentation</"
 "a> for instructions on fetching Tor from Git to get the very latest "
 "development version source code.  You can also download the <a href=\"dist/"
-"\">Privoxy source</a> or <a href=\"dist/vidalia-bundles/?C=M;O=D\">Vidalia "
-"source</a>."
+"\">Privoxy source</a> or <a href=\"vidalia/dist/\">Vidalia source</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/de/3-low.faq-abuse.po
===================================================================
--- translation/trunk/projects/website/de/3-low.faq-abuse.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/de/3-low.faq-abuse.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:07+0100\n"
+"POT-Creation-Date: 2009-12-08 18:51+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -87,25 +87,32 @@
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/faq-abuse.wml:25
 msgid ""
+"<a href=\"<page faq-abuse>#RemoveContent\">I want some content removed from "
+"a .onion address.</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/en/faq-abuse.wml:26
+msgid ""
 "<a href=\"<page faq-abuse>#LegalQuestions\">I have legal questions about Tor "
 "abuse.</a>"
 msgstr ""
 
 #.  END SIDEBAR 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:29
+#: /home/runa/tor/website/en/faq-abuse.wml:30
 msgid "<hr /> <a id=\"WhatAboutCriminals\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:32
+#: /home/runa/tor/website/en/faq-abuse.wml:33
 msgid ""
 "<a class=\"anchor\" href=\"#WhatAboutCriminals\">Doesn't Tor enable "
 "criminals to do bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:34
+#: /home/runa/tor/website/en/faq-abuse.wml:35
 msgid ""
 "Criminals can already do bad things. Since they're willing to break laws, "
 "they already have lots of options available that provide <em>better</em> "
@@ -117,14 +124,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:42
+#: /home/runa/tor/website/en/faq-abuse.wml:43
 msgid ""
 "Tor aims to provide protection for ordinary people who want to follow the "
 "law. Only criminals have privacy right now, and we need to fix that."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:45
+#: /home/runa/tor/website/en/faq-abuse.wml:46
 msgid ""
 "Some advocates of anonymity explain that it's just a tradeoff &mdash; "
 "accepting the bad uses for the good ones &mdash; but there's more to it than "
@@ -137,7 +144,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:55
+#: /home/runa/tor/website/en/faq-abuse.wml:56
 msgid ""
 "So yes, criminals could in theory use Tor, but they already have better "
 "options, and it seems unlikely that taking Tor away from the world will stop "
@@ -153,19 +160,19 @@
 #. <h3><a class="anchor" href="#Pervasive">If the whole world starts using
 #. Tor, won't civilization collapse?</a></h3>
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:67
+#: /home/runa/tor/website/en/faq-abuse.wml:68
 msgid "<a id=\"DDoS\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:68
+#: /home/runa/tor/website/en/faq-abuse.wml:69
 msgid ""
 "<a class=\"anchor\" href=\"#DDoS\">What about distributed denial of service "
 "attacks?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:70
+#: /home/runa/tor/website/en/faq-abuse.wml:71
 msgid ""
 "Distributed denial of service (DDoS) attacks typically rely on having a "
 "group of thousands of computers all sending floods of traffic to a victim. "
@@ -174,7 +181,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:75
+#: /home/runa/tor/website/en/faq-abuse.wml:76
 msgid ""
 "But because Tor only transports correctly formed TCP streams, not all IP "
 "packets, you cannot send UDP packets over Tor. (You can't do specialized "
@@ -187,18 +194,18 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:84
+#: /home/runa/tor/website/en/faq-abuse.wml:85
 msgid "<a id=\"WhatAboutSpammers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:85
+#: /home/runa/tor/website/en/faq-abuse.wml:86
 msgid ""
 "<a class=\"anchor\" href=\"#WhatAboutSpammers\">What about spammers?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:87
+#: /home/runa/tor/website/en/faq-abuse.wml:88
 msgid ""
 "First of all, the default Tor exit policy rejects all outgoing port 25 "
 "(SMTP) traffic. So sending spam mail through Tor isn't going to work by "
@@ -210,7 +217,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:95
+#: /home/runa/tor/website/en/faq-abuse.wml:96
 msgid ""
 "Of course, it's not all about delivering the mail. Spammers can use Tor to "
 "connect to open HTTP proxies (and from there to SMTP servers); to connect to "
@@ -220,7 +227,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:103
+#: /home/runa/tor/website/en/faq-abuse.wml:104
 msgid ""
 "This is a shame, but notice that spammers are already doing great without "
 "Tor. Also, remember that many of their more subtle communication mechanisms "
@@ -229,33 +236,33 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:109
+#: /home/runa/tor/website/en/faq-abuse.wml:110
 msgid "<a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:110
+#: /home/runa/tor/website/en/faq-abuse.wml:111
 msgid ""
 "<a class=\"anchor\" href=\"#ExitPolicies\">How do Tor exit policies work?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:113
+#: /home/runa/tor/website/en/faq-abuse.wml:114
 msgid "<a href=\"<page faq>#ExitPolicies\">Moved to the new FAQ page</a>"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:116
+#: /home/runa/tor/website/en/faq-abuse.wml:117
 msgid "<a id=\"HowMuchAbuse\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:117
+#: /home/runa/tor/website/en/faq-abuse.wml:118
 msgid "<a class=\"anchor\" href=\"#HowMuchAbuse\">Does Tor get much abuse?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:119
+#: /home/runa/tor/website/en/faq-abuse.wml:120
 msgid ""
 "Not much, in the grand scheme of things. We've been running the network "
 "since October 2003, and it's only generated a handful of complaints. Of "
@@ -267,26 +274,26 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:127
+#: /home/runa/tor/website/en/faq-abuse.wml:128
 msgid ""
 "Since Tor has <a href=\"<page overview>\">many good uses as well</a>, we "
 "feel that we're doing pretty well at striking a balance currently."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:132
+#: /home/runa/tor/website/en/faq-abuse.wml:133
 msgid "<a id=\"TypicalAbuses\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:133
+#: /home/runa/tor/website/en/faq-abuse.wml:134
 msgid ""
 "<a class=\"anchor\" href=\"#TypicalAbuses\">So what should I expect if I run "
 "an exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:135
+#: /home/runa/tor/website/en/faq-abuse.wml:136
 msgid ""
 "If you run a Tor relay that allows exit connections (such as the default "
 "exit policy), it's probably safe to say that you will eventually hear from "
@@ -294,7 +301,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:140
+#: /home/runa/tor/website/en/faq-abuse.wml:141
 msgid ""
 "Somebody connects to Hotmail, and sends a ransom note to a company. The FBI "
 "sends you a polite email, you explain that you run a Tor relay, and they say "
@@ -302,7 +309,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:144
+#: /home/runa/tor/website/en/faq-abuse.wml:145
 msgid ""
 "Somebody tries to get you shut down by using Tor to connect to Google groups "
 "and post spam to Usenet, and then sends an angry mail to your ISP about how "
@@ -310,7 +317,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:147
+#: /home/runa/tor/website/en/faq-abuse.wml:148
 msgid ""
 "Somebody connects to an IRC network and makes a nuisance of himself. Your "
 "ISP gets polite mail about how your computer has been compromised; and/or "
@@ -318,7 +325,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:150
+#: /home/runa/tor/website/en/faq-abuse.wml:151
 msgid ""
 "Somebody uses Tor to download a Vin Diesel movie, and your ISP gets a DMCA "
 "takedown notice. See EFF's <a href=\"<page eff/tor-dmca-response>\">Tor DMCA "
@@ -327,7 +334,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:157
+#: /home/runa/tor/website/en/faq-abuse.wml:158
 msgid ""
 "You might also find that your Tor relay's IP is blocked from accessing some "
 "Internet sites/services. This might happen regardless of your exit policy, "
@@ -337,7 +344,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:164
+#: /home/runa/tor/website/en/faq-abuse.wml:165
 msgid ""
 "Because of a few cases of anonymous jerks messing with its web pages, "
 "Wikipedia is currently blocking many Tor relay IPs from writing (reading "
@@ -349,7 +356,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:173
+#: /home/runa/tor/website/en/faq-abuse.wml:174
 msgid ""
 "SORBS is putting some Tor relay IPs on their email blacklist as well. They "
 "do this because they passively detect whether your relay connects to certain "
@@ -361,19 +368,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:184
+#: /home/runa/tor/website/en/faq-abuse.wml:185
 msgid "<a id=\"IrcBans\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:185
+#: /home/runa/tor/website/en/faq-abuse.wml:186
 msgid ""
 "<a class=\"anchor\" href=\"#IrcBans\">Tor is banned from the IRC network I "
 "want to use.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:187
+#: /home/runa/tor/website/en/faq-abuse.wml:188
 msgid ""
 "Sometimes jerks make use of Tor to troll IRC channels. This abuse results in "
 "IP-specific temporary bans (\"klines\" in IRC lingo), as the network "
@@ -381,7 +388,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:191
+#: /home/runa/tor/website/en/faq-abuse.wml:192
 msgid ""
 "This response underscores a fundamental flaw in IRC's security model: they "
 "assume that IP addresses equate to humans, and by banning the IP address "
@@ -395,7 +402,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:201
+#: /home/runa/tor/website/en/faq-abuse.wml:202
 msgid ""
 "On the other hand, from the viewpoint of IRC server operators, security is "
 "not an all-or-nothing thing.  By responding quickly to trolls or any other "
@@ -409,7 +416,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:211
+#: /home/runa/tor/website/en/faq-abuse.wml:212
 msgid ""
 "But the real answer is to implement application-level auth systems, to let "
 "in well-behaving users and keep out badly-behaving users. This needs to be "
@@ -418,7 +425,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:216
+#: /home/runa/tor/website/en/faq-abuse.wml:217
 msgid ""
 "Of course, not all IRC networks are trying to ban Tor nodes. After all, "
 "quite a few people use Tor to IRC in privacy in order to carry on legitimate "
@@ -429,7 +436,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:223
+#: /home/runa/tor/website/en/faq-abuse.wml:224
 msgid ""
 "If you're being blocked, have a discussion with the network operators and "
 "explain the issues to them. They may not be aware of the existence of Tor at "
@@ -441,7 +448,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:231
+#: /home/runa/tor/website/en/faq-abuse.wml:232
 msgid ""
 "Finally, if you become aware of an IRC network that seems to be blocking "
 "Tor, or a single Tor exit node, please put that information on <a href="
@@ -452,19 +459,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:238
+#: /home/runa/tor/website/en/faq-abuse.wml:239
 msgid "<a id=\"SMTPBans\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:239
+#: /home/runa/tor/website/en/faq-abuse.wml:240
 msgid ""
 "<a class=\"anchor\" href=\"#SMTPBans\">Your nodes are banned from the mail "
 "server I want to use.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:241
+#: /home/runa/tor/website/en/faq-abuse.wml:242
 msgid ""
 "Even though <a href=\"#WhatAboutSpammers\">Tor isn't useful for spamming</"
 "a>, some over-zealous blacklisters seem to think that all open networks like "
@@ -473,7 +480,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:247
+#: /home/runa/tor/website/en/faq-abuse.wml:248
 msgid ""
 "If your server administrators decide to make use of these blacklists to "
 "refuse incoming mail, you should have a conversation with them and explain "
@@ -481,19 +488,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:251
+#: /home/runa/tor/website/en/faq-abuse.wml:252
 msgid "<a id=\"Bans\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:252
+#: /home/runa/tor/website/en/faq-abuse.wml:253
 msgid ""
 "<a class=\"anchor\" href=\"#Bans\">I want to ban the Tor network from my "
 "service.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:254
+#: /home/runa/tor/website/en/faq-abuse.wml:255
 msgid ""
 "We're sorry to hear that. There are some situations where it makes sense to "
 "block anonymous users for an Internet service. But in many cases, there are "
@@ -502,7 +509,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:259
+#: /home/runa/tor/website/en/faq-abuse.wml:260
 msgid ""
 "First, ask yourself if there's a way to do application-level decisions to "
 "separate the legitimate users from the jerks. For example, you might have "
@@ -514,7 +521,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:268
+#: /home/runa/tor/website/en/faq-abuse.wml:269
 msgid ""
 "For example, the <a href=\"http://freenode.net/policy.shtml#tor\";>Freenode "
 "IRC network</a> had a problem with a coordinated group of abusers joining "
@@ -525,7 +532,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:276
+#: /home/runa/tor/website/en/faq-abuse.wml:277
 msgid ""
 "Second, consider that hundreds of thousands of people use Tor every day "
 "simply for good data hygiene &mdash; for example, to protect against data-"
@@ -540,7 +547,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:289
+#: /home/runa/tor/website/en/faq-abuse.wml:290
 msgid ""
 "At this point, you should also ask yourself what you do about other services "
 "that aggregate many users behind a few IP addresses. Tor is not so different "
@@ -548,7 +555,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:293
+#: /home/runa/tor/website/en/faq-abuse.wml:294
 msgid ""
 "Lastly, please remember that Tor relays have <a href=\"<page "
 "faq>#ExitPolicies\">individual exit policies</a>. Many Tor relays do not "
@@ -560,7 +567,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:302
+#: /home/runa/tor/website/en/faq-abuse.wml:303
 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 "
@@ -568,7 +575,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:309
+#: /home/runa/tor/website/en/faq-abuse.wml:310
 msgid ""
 "(Some system administrators block ranges of IP addresses because of official "
 "policy or some abuse pattern, but some have also asked about whitelisting "
@@ -577,19 +584,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:315
+#: /home/runa/tor/website/en/faq-abuse.wml:316
 msgid "<a id=\"TracingUsers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:316
+#: /home/runa/tor/website/en/faq-abuse.wml:317
 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><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:319
+#: /home/runa/tor/website/en/faq-abuse.wml:320
 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 "
@@ -597,7 +604,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:325
+#: /home/runa/tor/website/en/faq-abuse.wml:326
 msgid ""
 "Some fans have suggested that we redesign Tor to include a <a href=\"<page "
 "faq>#Backdoor\">backdoor</a>.  There are two problems with this idea. First, "
@@ -611,7 +618,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:338
+#: /home/runa/tor/website/en/faq-abuse.wml:339
 msgid ""
 "But remember that this doesn't mean that Tor is invulnerable. Traditional "
 "police techniques can still be very effective against Tor, such as "
@@ -620,26 +627,61 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:344
+#: /home/runa/tor/website/en/faq-abuse.wml:345
+msgid "<a id=\"RemoveContent\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/faq-abuse.wml:346
+msgid ""
+"<a class=\"anchor\" href=\"#RemoveContent\">I want some content removed from "
+"a .onion address.</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/faq-abuse.wml:347
+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 "
+"from <a href=\"<page docs/tor-hidden-service>\">a hidden service</a>.  The "
+"name you see ending in .onion is a hidden service descriptor.  It's an "
+"automatically generated name which can be located on any Tor relay or client "
+"anywhere on the Internet.  Hidden services are designed to protect both the "
+"user and service provider from discovering who they are and where they are "
+"from.  The design of hidden services means the owner and location of the ."
+"onion site is hidden even from us."
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/faq-abuse.wml:356
+msgid ""
+"But remember that this doesn't mean that hidden services are invulnerable. "
+"Traditional police techniques can still be very effective against them, such "
+"as interviewing suspects, surveillance and keyboard taps, writing style "
+"analysis, sting operations, and other physical investigations."
+msgstr ""
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/faq-abuse.wml:362
 msgid "<a id=\"LegalQuestions\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:345
+#: /home/runa/tor/website/en/faq-abuse.wml:363
 msgid ""
 "<a class=\"anchor\" href=\"#LegalQuestions\">I have legal questions about "
 "Tor abuse.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:347
+#: /home/runa/tor/website/en/faq-abuse.wml:365
 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><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:350
+#: /home/runa/tor/website/en/faq-abuse.wml:368
 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/de/3-low.news.po
===================================================================
--- translation/trunk/projects/website/de/3-low.news.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/de/3-low.news.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:07+0100\n"
+"POT-Creation-Date: 2009-12-08 18:51+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -34,13 +34,21 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/news.wml:16
 msgid ""
+"10 October 2009: Tor 0.2.1.20 released as stable.  Read the <a href="
+"\"https://blog.torproject.org/blog/tor-02120-released\";>announcement</a> for "
+"the updates and changes."
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/news.wml:17
+msgid ""
 "28 July 2009: Tor 0.2.1.19 released as stable.  Read the <a href=\"http://";
 "archives.seul.org/or/announce/Aug-2009/msg00000.html\">announcement</a> for "
 "the updates and changes."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:19
+#: /home/runa/tor/website/en/news.wml:20
 msgid ""
 "25 June 2009: Tor 0.2.0.35 released as stable.  Read the <a href=\"http://";
 "archives.seul.org/or/announce/Jun-2009/msg00000.html\">announcement</a> for "
@@ -48,7 +56,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:21
+#: /home/runa/tor/website/en/news.wml:22
 msgid ""
 "12 March 2009: Tor launches performance roadmap and campaign.  Read the <a "
 "href=\"<page press/2009-03-12-performance-roadmap-press-release>\">Press "
@@ -56,7 +64,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:22
+#: /home/runa/tor/website/en/news.wml:23
 msgid ""
 "09 February 2009: Tor 0.2.0.34 released as stable.  Read the <a href="
 "\"http://archives.seul.org/or/announce/Feb-2009/msg00000.html";
@@ -65,7 +73,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:25
+#: /home/runa/tor/website/en/news.wml:26
 msgid ""
 "21 January 2009: Tor 0.2.0.33 released as stable.  Read the <a href=\"http://";
 "archives.seul.org/or/announce/Jan-2009/msg00000.html\">announcement</a> for "
@@ -73,7 +81,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:28
+#: /home/runa/tor/website/en/news.wml:29
 msgid ""
 "19 December 2008: Tor releases 3-year development roadmap.  Read the <a href="
 "\"<page press/2008-12-19-roadmap-press-release>\">Press Release</a> for more "
@@ -81,7 +89,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:31
+#: /home/runa/tor/website/en/news.wml:32
 msgid ""
 "05 December 2008: Tor 0.2.0.32 released as stable.  Read the <a href="
 "\"http://archives.seul.org/or/announce/Dec-2008/msg00000.html";
@@ -89,7 +97,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:34
+#: /home/runa/tor/website/en/news.wml:35
 msgid ""
 "08 September 2008: Tor 0.2.0.31 released as stable. Read the <a href="
 "\"http://archives.seul.org/or/announce/Sep-2008/msg00000.html";
@@ -97,7 +105,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:37
+#: /home/runa/tor/website/en/news.wml:38
 msgid ""
 "25 August 2008: Tor 0.2.0.30 released as stable.  Read the <a href=\"http://";
 "archives.seul.org/or/announce/Aug-2008/msg00000.html\">announcement</a> or "
@@ -106,7 +114,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:42
+#: /home/runa/tor/website/en/news.wml:43
 msgid ""
 "25 May 2008: Tor receives two awards from the <a href=\"http://nlnet.nl/";
 "\">NLnet Foundation</a>.  The first is to improve the performance of hidden "
@@ -116,7 +124,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:49
+#: /home/runa/tor/website/en/news.wml:50
 msgid ""
 "13 May 2008: <a href=\"http://archives.seul.org/or/talk/May-2008/msg00048.";
 "html\">Tor 0.2.0.26-rc</a> replaces several V3 directory authority keys "
@@ -135,14 +143,14 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:62
+#: /home/runa/tor/website/en/news.wml:63
 msgid ""
 "Mar 2008: <a href=\"https://blog.torproject.org/blog/tor-project-google-";
 "summer-code-2008!\">Tor Project is in Google Summer of Code 2008!</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:66
+#: /home/runa/tor/website/en/news.wml:67
 msgid ""
 "Feb 2008: The <a href=\"https://www.torproject.org/people#Board\";>Board of "
 "Directors</a> welcomes <a href=\"https://blog.torproject.org/blog/isaac-mao-";
@@ -151,14 +159,14 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:72
+#: /home/runa/tor/website/en/news.wml:73
 msgid ""
 "Feb 2008: Tor is happy to announce the <a href=\"https://blog.torproject.org";
 "\">official Tor blog</a>."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:75
+#: /home/runa/tor/website/en/news.wml:76
 msgid ""
 "Jan 2008: <a href=\"<page download>\">Tor 0.1.2.19</a> (the latest stable "
 "release) fixes a huge memory leak on exit relays, makes the default exit "
@@ -169,7 +177,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:83
+#: /home/runa/tor/website/en/news.wml:84
 msgid ""
 "Oct 2007: <a href=\"<page download>\">Tor 0.1.2.18</a> (the new stable "
 "release) fixes many problems including crash bugs, problems with hidden "
@@ -183,7 +191,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:93
+#: /home/runa/tor/website/en/news.wml:94
 msgid ""
 "Oct 2007: As many of you know, The Tor Project became an <a href=\"<page "
 "people>\">independent and official nonprofit</a> this past February. We did "
@@ -197,7 +205,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:105
+#: /home/runa/tor/website/en/news.wml:106
 msgid ""
 "Sep 2007: If you have received email claiming to be Tor, it wasn't from us. "
 "The <a href=\"<page download>\">official Tor bundles</a> can be <a href="
@@ -205,7 +213,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:109
+#: /home/runa/tor/website/en/news.wml:110
 msgid ""
 "Aug 2007: <strong>Please update your Tor software!</strong> The latest "
 "versions (stable: 0.1.2.17; development: 0.2.0.6-alpha)  patch a significant "
@@ -215,7 +223,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:115
+#: /home/runa/tor/website/en/news.wml:116
 msgid ""
 "Feb 2007: The Tor Project and UColo/Boulder <a href=\"http://blogs.law.";
 "harvard.edu/anonymous/2007/02/26/the-rumors-of-our-demise/\">respond</a> to "
@@ -224,7 +232,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:120
+#: /home/runa/tor/website/en/news.wml:121
 msgid ""
 "Jan 2007: The Tor network has grown to hundreds of thousands of users. The "
 "developers can't do all the new features, bug fixes, and documentation. <a "
@@ -232,7 +240,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:124
+#: /home/runa/tor/website/en/news.wml:125
 msgid ""
 "<b>We are actively looking for new sponsors and funding.</b> If your "
 "organization has an interest in keeping the Tor network usable and fast, "

Modified: translation/trunk/projects/website/de/3-low.people.po
===================================================================
--- translation/trunk/projects/website/de/3-low.people.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/de/3-low.people.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:07+0100\n"
+"POT-Creation-Date: 2009-12-08 18:51+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -121,12 +121,25 @@
 
 #. type: Content of: <div><dl><dt>
 #: /home/runa/tor/website/en/people.wml:49
-msgid "Sebastian Hahn"
+msgid "Melissa Gilroy (CFO and Internal Audit)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:49
 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 "
+"operations moving along."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:53
+msgid "Sebastian Hahn"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:53
+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 "
 "Code on expanding Thandy to include BitTorrent support. Generally helps out "
@@ -134,14 +147,14 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:53
+#: /home/runa/tor/website/en/people.wml:57
 msgid ""
 "Andrew Lewman (Executive Director; Director; <a href=\"<page press/index>"
 "\">press contact</a>)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:54
+#: /home/runa/tor/website/en/people.wml:58
 msgid ""
 "Manages the business operations of The Tor Project, Inc.  Plays roles of "
 "finance, advocacy, project management, and general support.  General package "
@@ -149,12 +162,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:58
+#: /home/runa/tor/website/en/people.wml:62
 msgid "Karsten Loesing (Developer)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:58
+#: /home/runa/tor/website/en/people.wml:62
 msgid ""
 "Worked during the 2007 Google Summer of Code on <a href=\"<svnsandbox>doc/"
 "spec/proposals/114-distributed-storage.txt\">distributing and securing the "
@@ -164,24 +177,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:66
+#: /home/runa/tor/website/en/people.wml:70
 msgid "Nick Mathewson (Chief architect; Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:66
+#: /home/runa/tor/website/en/people.wml:70
 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><dl><dt>
-#: /home/runa/tor/website/en/people.wml:69
+#: /home/runa/tor/website/en/people.wml:73
 msgid "Steven Murdoch (Researcher and Developer)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:69
+#: /home/runa/tor/website/en/people.wml:73
 msgid ""
 "Researcher at the University of Cambridge, currently funded by The Tor "
 "Project to improve the security, performance, and usability of Tor. Creator "
@@ -189,36 +202,36 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:74
+#: /home/runa/tor/website/en/people.wml:78
 msgid "Peter Palfrader"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:74
+#: /home/runa/tor/website/en/people.wml:78
 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><dl><dt>
-#: /home/runa/tor/website/en/people.wml:77
+#: /home/runa/tor/website/en/people.wml:81
 msgid "Martin Peck (Developer)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:77
+#: /home/runa/tor/website/en/people.wml:81
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:79
+#: /home/runa/tor/website/en/people.wml:83
 msgid "Mike Perry (Developer)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:79
+#: /home/runa/tor/website/en/people.wml:83
 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 "
@@ -227,24 +240,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:84
+#: /home/runa/tor/website/en/people.wml:88
 msgid "Karen Reilly (Development Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:84
+#: /home/runa/tor/website/en/people.wml:88
 msgid ""
 "Responsible for fundraising, advocacy, and general marketing and outreach "
 "programs for Tor."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:87
+#: /home/runa/tor/website/en/people.wml:91
 msgid "Paul Syverson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:87
+#: /home/runa/tor/website/en/people.wml:91
 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 "
@@ -253,69 +266,69 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:94
+#: /home/runa/tor/website/en/people.wml:98
 msgid "<a id=\"Board\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:95
+#: /home/runa/tor/website/en/people.wml:99
 msgid ""
 "<a class=\"anchor\" href=\"#Board\">The Tor Project Board of Directors:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:99
+#: /home/runa/tor/website/en/people.wml:103
 msgid "Ian Goldberg (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:99
+#: /home/runa/tor/website/en/people.wml:103
 msgid ""
 "Cryptographer, privacy expert, and professor; one of the designers of <a "
 "href=\"http://www.cypherpunks.ca/otr/\";>Off-the-Record Messaging</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:102
+#: /home/runa/tor/website/en/people.wml:106
 msgid "Xianghui (Isaac) Mao (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:102
+#: /home/runa/tor/website/en/people.wml:106
 msgid ""
 "Chinese blogging and privacy activist.  His current activities can be found "
 "at <a href=\"http://isaacmao.com/\";>his website</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:105
+#: /home/runa/tor/website/en/people.wml:109
 msgid "Frank Rieger (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:105
+#: /home/runa/tor/website/en/people.wml:109
 msgid "CTO of <a href=\"http://www.gsmk.de/\";>GSMK Cryptophone</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:107
+#: /home/runa/tor/website/en/people.wml:111
 msgid "Wendy Seltzer (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:107
+#: /home/runa/tor/website/en/people.wml:111
 msgid ""
 "Lawyer, cyberlaw professor, and founder of <a href=\"http://chillingeffects.";
 "org/\">ChillingEffects.org</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:110
+#: /home/runa/tor/website/en/people.wml:114
 msgid "Fred von Lohmann (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:110
+#: /home/runa/tor/website/en/people.wml:114
 msgid ""
 "Fred is a Senior Intellectual Property Attorney at the Electronic Frontier "
 "Foundation (EFF). His complete bio can be found at the <a href=\"http://www.";
@@ -323,27 +336,27 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:115
+#: /home/runa/tor/website/en/people.wml:119
 msgid "Along with Roger, Nick, and Andrew listed above as Directors."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:118
+#: /home/runa/tor/website/en/people.wml:122
 msgid "<a id=\"Summer\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:119
+#: /home/runa/tor/website/en/people.wml:123
 msgid "<a class=\"anchor\" href=\"#Summer\">Summer students:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:122
+#: /home/runa/tor/website/en/people.wml:126
 msgid "Christopher Davis"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:122
+#: /home/runa/tor/website/en/people.wml:126
 msgid ""
 "Adapts Polipo to depend upon the libevent library, making use of its event "
 "loop, asynchronous DNS resolver, and utility library. (<a href=\"http://www.";
@@ -352,12 +365,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:128
+#: /home/runa/tor/website/en/people.wml:132
 msgid "Damian Johnson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:128
+#: /home/runa/tor/website/en/people.wml:132
 msgid ""
 "Builds a command-line application for monitoring Tor relays, providing real-"
 "time status information such as the current configuration, bandwidth usage, "
@@ -366,12 +379,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:132
+#: /home/runa/tor/website/en/people.wml:136
 msgid "Kory Kirk"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:132
+#: /home/runa/tor/website/en/people.wml:136
 msgid ""
 "Extends <a href=\"<page torbutton/index>\">Torbutton</a> by implementing "
 "three feature requests, namely the <a href=\"https://bugs.torproject.org/";
@@ -384,12 +397,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:143
+#: /home/runa/tor/website/en/people.wml:147
 msgid "Runa Sandvik"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:143
+#: /home/runa/tor/website/en/people.wml:147
 msgid ""
 "Improves usability of <a href=\"https://translation.torproject.org/";
 "\">translating the website</a> by automatically converting wml files to po "
@@ -399,12 +412,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:150
+#: /home/runa/tor/website/en/people.wml:154
 msgid "Stephen Tyree"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:150
+#: /home/runa/tor/website/en/people.wml:154
 msgid ""
 "Develops a plugin API for <a href=\"<page vidalia/index>\">Vidalia</a> and "
 "creates a plugin to allow HerdictWeb integration, a project aiming at "
@@ -415,136 +428,136 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:161
+#: /home/runa/tor/website/en/people.wml:165
 msgid "<a id=\"Translators\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:162
+#: /home/runa/tor/website/en/people.wml:166
 msgid "<a class=\"anchor\" href=\"#Translators\">Core translators:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:165
+#: /home/runa/tor/website/en/people.wml:169
 msgid "Bogdan Drozdowski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:165
+#: /home/runa/tor/website/en/people.wml:169
 msgid "<a href=\"https://www.torproject.org/index.html.pl\";>Polish</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:167
+#: /home/runa/tor/website/en/people.wml:171
 msgid "fredzupy"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:167
+#: /home/runa/tor/website/en/people.wml:171
 msgid "<a href=\"https://www.torproject.org/index.html.fr\";>French</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:169
+#: /home/runa/tor/website/en/people.wml:173
 msgid ""
 "Ruben Garcia, plus further pages by <a href=\"http://www.greentranslations.";
 "com/\">Green Crescent</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:170
+#: /home/runa/tor/website/en/people.wml:174
 msgid "<a href=\"https://www.torproject.org/index.html.es\";>Spanish</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:172
+#: /home/runa/tor/website/en/people.wml:176
 msgid "Jens Kubieziel and Oliver Knapp"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:172
+#: /home/runa/tor/website/en/people.wml:176
 msgid "<a href=\"https://www.torproject.org/index.html.de\";>German</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:174
+#: /home/runa/tor/website/en/people.wml:178
 msgid "Pei Hanru and bridgefish"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:174
+#: /home/runa/tor/website/en/people.wml:178
 msgid ""
 "<a href=\"https://www.torproject.org/index.html.zh-cn\";>Simplified Chinese</"
 "a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:176
+#: /home/runa/tor/website/en/people.wml:180
 msgid "Jan Reister"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:176
+#: /home/runa/tor/website/en/people.wml:180
 msgid "<a href=\"https://www.torproject.org/index.html.it\";>Italian</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:178
+#: /home/runa/tor/website/en/people.wml:182
 msgid "Masaki Taniguchi"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:178
+#: /home/runa/tor/website/en/people.wml:182
 msgid "<a href=\"https://www.torproject.org/index.html.ja\";>Japanese</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:180
+#: /home/runa/tor/website/en/people.wml:184
 msgid "Jan Woning"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:180
+#: /home/runa/tor/website/en/people.wml:184
 msgid "<a href=\"https://www.torproject.org/index.html.nl\";>Dutch</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:182
+#: /home/runa/tor/website/en/people.wml:186
 msgid "ygrek"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:182
+#: /home/runa/tor/website/en/people.wml:186
 msgid "<a href=\"https://www.torproject.org/index.html.ru\";>Russian</a>."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:186
+#: /home/runa/tor/website/en/people.wml:190
 msgid "<a id=\"Volunteers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:187
+#: /home/runa/tor/website/en/people.wml:191
 msgid "<a class=\"anchor\" href=\"#Volunteers\">More volunteers:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:190
+#: /home/runa/tor/website/en/people.wml:194
 msgid "Anonym"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:190
+#: /home/runa/tor/website/en/people.wml:194
 msgid "Maintainer of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:191
+#: /home/runa/tor/website/en/people.wml:195
 msgid "Kevin Bankston"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:191
+#: /home/runa/tor/website/en/people.wml:195
 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 "
@@ -552,24 +565,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:195
+#: /home/runa/tor/website/en/people.wml:199
 msgid "Kasimir Gabert"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:195
+#: /home/runa/tor/website/en/people.wml:199
 msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\";>TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:197
+#: /home/runa/tor/website/en/people.wml:201
 msgid "Geoff Goodell"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:197
+#: /home/runa/tor/website/en/people.wml:201
 msgid ""
 "Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/";
 "\">Blossom project</a> which uses Tor as its overlay network; also helped "
@@ -577,12 +590,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:201
+#: /home/runa/tor/website/en/people.wml:205
 msgid "Aleksei Gorny"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:201
+#: /home/runa/tor/website/en/people.wml:205
 msgid ""
 "Working on Tor exit scanner improvements (<a href=\"https://svn.torproject.";
 "org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
@@ -590,83 +603,83 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:208
 msgid "Robert Hogan"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:208
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\";>TorK</a> Tor controller."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:210
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:210
 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><dl><dt>
-#: /home/runa/tor/website/en/people.wml:208
+#: /home/runa/tor/website/en/people.wml:212
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:208
+#: /home/runa/tor/website/en/people.wml:212
 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><dl><dt>
-#: /home/runa/tor/website/en/people.wml:211
+#: /home/runa/tor/website/en/people.wml:215
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:211
+#: /home/runa/tor/website/en/people.wml:215
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:213
+#: /home/runa/tor/website/en/people.wml:217
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:213
+#: /home/runa/tor/website/en/people.wml:217
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:219
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:220
 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><dl><dt>
-#: /home/runa/tor/website/en/people.wml:218
+#: /home/runa/tor/website/en/people.wml:222
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:218
+#: /home/runa/tor/website/en/people.wml:222
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy";
@@ -675,24 +688,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:227
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:227
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:230
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:230
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?";
 "p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/";
@@ -701,7 +714,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:231
+#: /home/runa/tor/website/en/people.wml:235
 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, "
@@ -709,22 +722,22 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:240
 msgid "<a id=\"Past\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:237
+#: /home/runa/tor/website/en/people.wml:241
 msgid "<a class=\"anchor\" href=\"#Past\">Past thanks to:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:240
+#: /home/runa/tor/website/en/people.wml:244
 msgid "Domenik Bork"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:240
+#: /home/runa/tor/website/en/people.wml:244
 msgid ""
 "Worked on Configuration of Hidden Services with User Authorization in "
 "Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches/";
@@ -732,12 +745,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:243
+#: /home/runa/tor/website/en/people.wml:247
 msgid "Benedikt Boss"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:243
+#: /home/runa/tor/website/en/people.wml:247
 msgid ""
 "Worked during the 2007 Google Summer of Code on <a href=\"https://svn.";
 "torproject.org/svn/topf/trunk/README\">TOPF</a>, a fuzzer for Tor; mentored "
@@ -745,22 +758,22 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:246
+#: /home/runa/tor/website/en/people.wml:250
 msgid "Ren Bucholz"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:246
+#: /home/runa/tor/website/en/people.wml:250
 msgid "Our fine logo and images."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:251
 msgid "Fallon Chen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:251
 msgid ""
 "Worked on Improving Tor Path Selection (<a href=\"https://svn.torproject.org/";
 "cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>)  and <a href="
@@ -770,42 +783,42 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:253
+#: /home/runa/tor/website/en/people.wml:257
 msgid "Bram Cohen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:253
+#: /home/runa/tor/website/en/people.wml:257
 msgid "Helped design our congestion control mechanisms, in Tor's early days."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:259
 msgid "Pat Double"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:259
 msgid "Creator of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:256
+#: /home/runa/tor/website/en/people.wml:260
 msgid "Justin Hipple"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:256
+#: /home/runa/tor/website/en/people.wml:260
 msgid "The other developer for Vidalia."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:257
+#: /home/runa/tor/website/en/people.wml:261
 msgid "Christian King"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:257
+#: /home/runa/tor/website/en/people.wml:261
 msgid ""
 "Worked during the 2007 Google Summer of Code on making Tor relays stable on "
 "Windows, by developing a <a href=\"https://svn.torproject.org/svn/libevent-";
@@ -813,70 +826,70 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:262
+#: /home/runa/tor/website/en/people.wml:266
 msgid "Joe Kowalski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:262
+#: /home/runa/tor/website/en/people.wml:266
 msgid ""
 "Original author and provider of the torstatus script formerly run on "
 "nighteffect."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:264
+#: /home/runa/tor/website/en/people.wml:268
 msgid "Adam Langley"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:264
+#: /home/runa/tor/website/en/people.wml:268
 msgid "Our fine eventdns code."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:269
 msgid "Rebecca MacKinnon"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:269
 msgid ""
 "Former Director of Tor.  Co-Founder of <a href=\"http://www.";
 "globalvoicesonline.org/\">Global Voices Online</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:271
 msgid "Chris Palmer"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:271
 msgid ""
 "Our liaison and tech guy with EFF while EFF was funding us. Also helped "
 "advocate and write end-user docs."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:269
+#: /home/runa/tor/website/en/people.wml:273
 msgid "Matej Pfajfar"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:269
+#: /home/runa/tor/website/en/people.wml:273
 msgid ""
 "Author of the original onion routing code that Tor is based on, so we didn't "
 "have to start from scratch."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:271
+#: /home/runa/tor/website/en/people.wml:275
 msgid "Johannes Renner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:271
+#: /home/runa/tor/website/en/people.wml:275
 msgid ""
 "Worked during the 2007 Google Summer of Code on modifying <a href=\"https://";
 "svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a> to measure various "
@@ -884,23 +897,23 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Scott Squires"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:280
 msgid ""
 "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:282
 msgid "Camilo Viecco"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:282
 msgid ""
 "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac.";
 "vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
@@ -908,12 +921,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:281
+#: /home/runa/tor/website/en/people.wml:285
 msgid "Christian Wilms"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:281
+#: /home/runa/tor/website/en/people.wml:285
 msgid ""
 "Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
 "\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";
@@ -921,12 +934,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:284
+#: /home/runa/tor/website/en/people.wml:288
 msgid "Jillian C. York"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:284
+#: /home/runa/tor/website/en/people.wml:288
 msgid ""
 "<a href=\"http://jilliancyork.com/\";>Jillian C. York</a> is a writer, "
 "blogger, and activist based in Boston.  She blogs on the uses of Tor and "

Modified: translation/trunk/projects/website/de/3-low.sponsors.po
===================================================================
--- translation/trunk/projects/website/de/3-low.sponsors.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/de/3-low.sponsors.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:07+0100\n"
+"POT-Creation-Date: 2009-12-08 18:51+0100\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,143 +30,158 @@
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/sponsors.wml:19
-msgid "<i>Liliopsida</i> (up to $750k)"
+#: /home/runa/tor/website/en/sponsors.wml:17
+msgid "<i>Magnoliophyta</i> (over $1 million)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:21
+#: /home/runa/tor/website/en/sponsors.wml:19 /tmp/kfa5KcagGy.xml:35
 msgid "You?"
 msgstr ""
 
 #. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/sponsors.wml:22
+msgid "<i>Liliopsida</i> (up to $750k)"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/sponsors.wml:24
+msgid "An anonymous North American NGO (2008-2009)"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/sponsors.wml:27
 msgid "<i>Asparagales</i> (up to $500k)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:26
+#: /home/runa/tor/website/en/sponsors.wml:29
 msgid ""
 "<a href=\"http://www.ibb.gov/\";>International Broadcasting Bureau</a> (2006-"
 "2009)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:27
+#: /home/runa/tor/website/en/sponsors.wml:30
 msgid "An anonymous European NGO (2006-2008)"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/sponsors.wml:30
+#: /home/runa/tor/website/en/sponsors.wml:33
 msgid "<i>Alliaceae</i> (up to $200k)"
 msgstr ""
 
-#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:32
-msgid "An anonymous North American NGO (2008-2009)"
-msgstr ""
-
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/sponsors.wml:35
+#: /home/runa/tor/website/en/sponsors.wml:38
 msgid "<i>Allium</i> (up to $100k)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:37
+#: /home/runa/tor/website/en/sponsors.wml:40
 msgid "<a href=\"http://www.nlnet.nl/\";>NLnet Foundation</a> (2008-2009)"
 msgstr ""
 
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/sponsors.wml:41
+msgid ""
+"<a href=\"http://chacs.nrl.navy.mil/\";>Naval Research Laboratory</a> (2006-"
+"2009)"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/sponsors.wml:42
+msgid "An anonymous North American ISP (2009)"
+msgstr ""
+
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/sponsors.wml:40
+#: /home/runa/tor/website/en/sponsors.wml:45
 msgid "<i>Allium cepa</i> (up to $50k)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:42
+#: /home/runa/tor/website/en/sponsors.wml:47
 msgid ""
 "<a href=\"<page donate>\">More than 500 personal donations from individuals "
 "like you</a> (2006-2009)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:43
+#: /home/runa/tor/website/en/sponsors.wml:48
 msgid "<a href=\"http://code.google.com/opensource/\";>Google</a> (2008)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:44
+#: /home/runa/tor/website/en/sponsors.wml:49
 msgid ""
 "<a href=\"http://code.google.com/soc/\";>Google Summer of Code</a> (2007-2009)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:45
+#: /home/runa/tor/website/en/sponsors.wml:50
 msgid "<a href=\"http://www.hrw.org/\";>Human Rights Watch</a> (2007)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:46
-msgid ""
-"<a href=\"http://chacs.nrl.navy.mil/\";>Naval Research Laboratory</a> (2006-"
-"2009)"
+#: /home/runa/tor/website/en/sponsors.wml:51
+msgid "<a href=\"http://www.torfox.org/\";>Torfox</a> (2009)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:47
-msgid "<a href=\"http://www.torfox.org/\";>Torfox</a> (2009)"
+#: /home/runa/tor/website/en/sponsors.wml:52
+msgid "<a href=\"http://www.shinjiru.com/\";>Shinjiru Technology</a> (2009)"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/sponsors.wml:50
+#: /home/runa/tor/website/en/sponsors.wml:55
 msgid "Past sponsors"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/sponsors.wml:51
+#: /home/runa/tor/website/en/sponsors.wml:56
 msgid ""
 "We greatly appreciate the support provided by our past sponsors in keeping "
 "the pre-501(c)(3) Tor Project progressing through our ambitious goals"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:53
+#: /home/runa/tor/website/en/sponsors.wml:58
 msgid ""
 "<a href=\"https://www.eff.org/\";>Electronic Frontier Foundation</a> (2004-"
 "2005)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:54
+#: /home/runa/tor/website/en/sponsors.wml:59
 msgid ""
 "<a href=\"http://chacs.nrl.navy.mil/\";>DARPA and ONR via Naval Research "
 "Laboratory</a> (2001-2006)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:55
+#: /home/runa/tor/website/en/sponsors.wml:60
 msgid "<a href=\"http://www.cyber-ta.org/\";>Cyber-TA project</a> (2006-2008)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:56
+#: /home/runa/tor/website/en/sponsors.wml:61
 msgid "Bell Security Solutions Inc (2006)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:57
+#: /home/runa/tor/website/en/sponsors.wml:62
 msgid ""
 "<a href=\"http://www.omidyar.net/\";>Omidyar Network Enzyme Grant</a> (2006)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:58
+#: /home/runa/tor/website/en/sponsors.wml:63
 msgid ""
 "<a href=\"http://seclab.cs.rice.edu/lab/2005/08/01/seclab-awarded-grant-to-";
 "study-security-of-p2p/\">NSF via Rice University</a> (2006-2007)"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/sponsors.wml:60
+#: /home/runa/tor/website/en/sponsors.wml:65
 msgid ""
 "Thank you to all the people and groups who have made Tor possible so far, "
 "and thank you especially to the individual volunteers who have made non-"

Modified: translation/trunk/projects/website/de/4-optional.running-a-mirror.po
===================================================================
--- translation/trunk/projects/website/de/4-optional.running-a-mirror.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/de/4-optional.running-a-mirror.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:07+0100\n"
+"POT-Creation-Date: 2009-12-08 18:51+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -52,8 +52,8 @@
 #: /home/runa/tor/website/en/running-a-mirror.wml:36
 msgid ""
 "In order to assure we have reliable and up to date mirrors, please ensure "
-"your mirror does at least the following:<br/><br/> Updates no later than "
-"every six hours, but no more frequent than every hour.<br/><br/> Allows "
+"your mirror does at least the following:<br/><br/> Updates <b>no less</b> "
+"than every six hours, but no more frequent than every hour.<br/><br/> Allows "
 "\"Directory Index / Indexes\" (Index viewing) of the /dist directory.<br/"
 "><br/> Allows \"Multiviews\" or equivalent for language localization.<br/"
 "><br/> Have a valid contact email for administrative communications should "
@@ -62,7 +62,7 @@
 msgstr ""
 
 #. type: Content of: <div><p><A>
-#: /home/runa/tor/website/en/running-a-mirror.wml:51 /tmp/obEnt_MCPg.xml:95
+#: /home/runa/tor/website/en/running-a-mirror.wml:51 /tmp/YmJ9A27pwl.xml:95
 msgid "tor-mirrors mailing list"
 msgstr ""
 
@@ -92,7 +92,7 @@
 #, no-wrap
 msgid ""
 "\n"
-"0 */6 * * * rsync -av --delete rsync://rsync.torproject.org/tor/ /var/www/mirrors/torproject.org\n"
+"0 */6 * * * rsync -aq --delete rsync://rsync.torproject.org/tor/ /var/www/mirrors/torproject.org\n"
 msgstr ""
 
 #. type: Content of: <div><p><p>

Modified: translation/trunk/projects/website/de/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/de/4-optional.volunteer.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/de/4-optional.volunteer.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 13:43+0100\n"
+"POT-Creation-Date: 2009-12-08 18:51+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -53,18 +53,25 @@
 "love to hear from you."
 msgstr ""
 
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/volunteer.wml:27
+msgid ""
+"Tor has <a href=\"<page open-positions>\">two open positions</a>, please <a "
+"href=\"<page contact>\">contact us</a> if you are qualified!"
+msgstr ""
+
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:27
+#: /home/runa/tor/website/en/volunteer.wml:30
 msgid "<a id=\"Usability\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:28
+#: /home/runa/tor/website/en/volunteer.wml:31
 msgid "<a class=\"anchor\" href=\"#Usability\">Supporting Applications</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:30
+#: /home/runa/tor/website/en/volunteer.wml:33
 msgid ""
 "We need more and better ways to intercept DNS requests so they don't \"leak"
 "\" their request to a local observer while we're trying to be anonymous. "
@@ -73,12 +80,12 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:34
+#: /home/runa/tor/website/en/volunteer.wml:37
 msgid "Tsocks/dsocks items:"
 msgstr ""
 
 #. type: Content of: <div><ol><li><ul><li>
-#: /home/runa/tor/website/en/volunteer.wml:36
+#: /home/runa/tor/website/en/volunteer.wml:39
 msgid ""
 "We should patch Dug Song's \"dsocks\" program to use Tor's <i>mapaddress</i> "
 "commands from the controller interface, so we don't waste a whole round-trip "
@@ -86,7 +93,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li><ul><li>
-#: /home/runa/tor/website/en/volunteer.wml:40
+#: /home/runa/tor/website/en/volunteer.wml:43
 msgid ""
 "We need to make our <i>torify</i> script detect which of tsocks or dsocks is "
 "installed, and call them appropriately. This probably means unifying their "
@@ -95,7 +102,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:46
+#: /home/runa/tor/website/en/volunteer.wml:49
 msgid ""
 "People running relays tell us they want to have one BandwidthRate during "
 "some part of the day, and a different BandwidthRate at other parts of the "
@@ -106,7 +113,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:54
+#: /home/runa/tor/website/en/volunteer.wml:57
 msgid ""
 "Speaking of geolocation data, somebody should draw a map of the Earth with a "
 "pin-point for each Tor relay. Bonus points if it updates as the network "
@@ -116,17 +123,17 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:61
+#: /home/runa/tor/website/en/volunteer.wml:64
 msgid "<a id=\"Advocacy\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:62
+#: /home/runa/tor/website/en/volunteer.wml:65
 msgid "<a class=\"anchor\" href=\"#Advocacy\">Advocacy</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:64
+#: /home/runa/tor/website/en/volunteer.wml:67
 msgid ""
 "Create a <a href=\"https://wiki.torproject.org/noreply/CommunityLogos";
 "\">community logo</a> under a Creative Commons license that all can use and "
@@ -134,45 +141,45 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:65
+#: /home/runa/tor/website/en/volunteer.wml:68
 msgid ""
 "Create a presentation that can be used for various user group meetings "
 "around the world"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:66
+#: /home/runa/tor/website/en/volunteer.wml:69
 msgid ""
 "Create a video about your positive uses of Tor.  Some have already started "
-"on Seesmic."
+"on <a href=\"http://tinyvid.tv\";>TinyVid</a>."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:67
+#: /home/runa/tor/website/en/volunteer.wml:70
 msgid ""
 "Create a poster, or a set of posters, around a theme, such as \"Tor for "
 "Freedom!\""
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:70
+#: /home/runa/tor/website/en/volunteer.wml:73
 msgid "<a id=\"Documentation\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:71
+#: /home/runa/tor/website/en/volunteer.wml:74
 msgid "<a class=\"anchor\" href=\"#Documentation\">Documentation</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:73
+#: /home/runa/tor/website/en/volunteer.wml:76
 msgid ""
 "Please help Matt Edman with the documentation and how-tos for his Tor "
 "controller, <a href=\"<page vidalia/index>\">Vidalia</a>."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:76
+#: /home/runa/tor/website/en/volunteer.wml:79
 msgid ""
 "Evaluate and document <a href=\"https://wiki.torproject.org/wiki/";
 "TheOnionRouter/TorifyHOWTO\">our list of programs</a> that can be configured "
@@ -180,7 +187,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:79
+#: /home/runa/tor/website/en/volunteer.wml:82
 msgid ""
 "We need better documentation for dynamically intercepting connections and "
 "sending them through Tor. tsocks (Linux), dsocks (BSD), and freecap "
@@ -189,7 +196,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:83
+#: /home/runa/tor/website/en/volunteer.wml:86
 msgid ""
 "We have a huge list of <a href=\"https://wiki.torproject.org/noreply/";
 "TheOnionRouter/SupportPrograms\">potentially useful programs that interface "
@@ -198,7 +205,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:86
+#: /home/runa/tor/website/en/volunteer.wml:89
 msgid ""
 "Help translate the web page and documentation into other languages. See the "
 "<a href=\"<page translation>\">translation guidelines</a> if you want to "
@@ -207,17 +214,17 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:92
+#: /home/runa/tor/website/en/volunteer.wml:95
 msgid "<a id=\"Coding\"></a> <a id=\"Summer\"></a> <a id=\"Projects\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:95
+#: /home/runa/tor/website/en/volunteer.wml:98
 msgid "<a class=\"anchor\" href=\"#Projects\">Good Coding Projects</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/volunteer.wml:98
+#: /home/runa/tor/website/en/volunteer.wml:101
 msgid ""
 "You may find some of these projects to be good <a href=\"<page gsoc>"
 "\">Google Summer of Code 2010</a> ideas. We have labelled each idea with how "
@@ -232,11 +239,11 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:113
+#: /home/runa/tor/website/en/volunteer.wml:116
 msgid ""
 "<b>Tor Browser Bundle for Linux/Mac OS X</b> <br /> Priority: <i>High</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>Medium</i> <br /> "
-"Likely Mentors: <i>Steven, Andrew</i> <br /> The Tor Browser Bundle "
+"Likely Mentors: <i>Steven, Andrew, Jacob</i> <br /> The Tor Browser Bundle "
 "incorporates Tor, Firefox, Polipo, and the Vidalia user interface (and "
 "optionally the <a href=\"http://pidgin.im/\";>Pidgin</a> Instant Messaging "
 "client). Components are pre-configured to operate in a secure way, and it "
@@ -257,7 +264,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:146
+#: /home/runa/tor/website/en/volunteer.wml:149
 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: "
@@ -280,12 +287,12 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:176
+#: /home/runa/tor/website/en/volunteer.wml:179
 msgid ""
 "<b>Improving Tor's ability to resist censorship</b> <br /> Priority: "
 "<i>Medium to High</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: "
 "<i>High</i> <br /> Likely Mentors: <i>Nick, Roger, Steven</i> <br /> The Tor "
-"0.2.0.x series makes <a href=\"<svnsandbox>doc/design-paper/blocking.html"
+"0.2.1.x series makes <a href=\"<svnsandbox>doc/design-paper/blocking.html"
 "\">significant improvements</a> in resisting national and organizational "
 "censorship.  But Tor still needs better mechanisms for some parts of its "
 "anti-censorship design.  For example, current Tors can only listen on a "
@@ -308,7 +315,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:211
+#: /home/runa/tor/website/en/volunteer.wml:214
 msgid ""
 "<b>Tuneup Tor!</b> <br /> Priority: <i>Medium to High</i> <br /> Effort "
 "Level: <i>Medium to High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
@@ -329,13 +336,13 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:242
+#: /home/runa/tor/website/en/volunteer.wml:245
 msgid ""
 "<b>Improving Polipo on Windows</b> <br /> Priority: <i>Medium to High</i> "
 "<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Medium</i> <br /> "
-"Likely Mentors: <i>Martin</i> <br /> Help port <a href=\"http://www.pps.";
-"jussieu.fr/~jch/software/polipo/\">Polipo</a> to Windows. Example topics to "
-"tackle include: 1) the ability to asynchronously query name servers, find "
+"Likely Mentors: <i>Martin, Chris</i> <br /> Help port <a href=\"http://www.";
+"pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> to Windows. Example topics "
+"to tackle include: 1) the ability to asynchronously query name servers, find "
 "the system nameservers, and manage netbios and dns queries.  2) manage "
 "events and buffers natively (i.e. in Unix-like OSes, Polipo defaults to 25% "
 "of ram, in Windows it's whatever the config specifies). 3) some sort of GUI "
@@ -346,7 +353,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:268
+#: /home/runa/tor/website/en/volunteer.wml:271
 msgid ""
 "<b>Tor Controller Status Event Interface</b> <br /> Priority: <i>Medium</i> "
 "<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> "
@@ -379,7 +386,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:311
+#: /home/runa/tor/website/en/volunteer.wml:314
 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 /> "
@@ -398,28 +405,26 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:338
+#: /home/runa/tor/website/en/volunteer.wml:341
 msgid ""
-"<b>Help revive an independent Tor client implementation</b> <br /> Priority: "
+"<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>Karsten, Nick</i> <br /> Reanimate one "
-"of the approaches to implement a Tor client in Java, e.g. the <a href="
-"\"http://onioncoffee.sourceforge.net/\";>OnionCoffee project</a>, and make it "
-"run on <a href=\"http://code.google.com/android/\";>Android</a>. The first "
-"step would be to port the existing code and execute it in an Android "
-"environment. Next, the code should be updated to support the newer Tor "
-"protocol versions like the <a href=\"<svnsandbox>doc/spec/dir-spec.txt\">v3 "
-"directory protocol</a>. Further, support for requesting or even providing "
-"Tor hidden services would be neat, but not required.  <br /> 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."
+"to High</i> <br /> Likely Mentors: <i>Karsten, Nick</i> <br /> We're "
+"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; Tor for Java, Android/Orbot, or Tor for "
+"Maemo. Check out the repository and familiarlize yourself with the source "
+"code.  Further, support for requesting or even providing Tor hidden services "
+"would be neat, but not required.  <br /> 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><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:368
+#: /home/runa/tor/website/en/volunteer.wml:367
 msgid ""
 "<b>New Torbutton Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
 "Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely Mentors: "
@@ -443,7 +448,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:402
+#: /home/runa/tor/website/en/volunteer.wml:401
 msgid ""
 "<b>New Thandy Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
 "Level: <i>Medium</i> <br /> Skill Level: <i>Medium to High</i> <br /> Likely "
@@ -462,7 +467,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:429
+#: /home/runa/tor/website/en/volunteer.wml:428
 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 /"
@@ -483,7 +488,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:459
+#: /home/runa/tor/website/en/volunteer.wml:458
 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: "
@@ -507,7 +512,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:493
+#: /home/runa/tor/website/en/volunteer.wml:492
 msgid ""
 "<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Low</i> <br /"
 "> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
@@ -519,7 +524,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:511
+#: /home/runa/tor/website/en/volunteer.wml:510
 msgid ""
 "<b>Intermediate Level Network Device Driver</b> <br /> Priority: <i>Low</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> "
@@ -533,7 +538,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:531
+#: /home/runa/tor/website/en/volunteer.wml:530
 msgid ""
 "<b>Improve Tor Weather</b> <br /> Priority: <i>Medium</i> <br /> Effort "
 "Level: <i>Medium</i> <br /> Skill Level: <i>Medium</i> <br /> Likely "
@@ -556,7 +561,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:561
+#: /home/runa/tor/website/en/volunteer.wml:560
 msgid ""
 "<b>Bring up new ideas!</b> <br /> Don't like any of these? Look at the <a "
 "href=\"<svnsandbox>doc/roadmaps/2008-12-19-roadmap-full.pdf\">Tor "
@@ -566,7 +571,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:571
+#: /home/runa/tor/website/en/volunteer.wml:570
 msgid ""
 "<b>Better Debian/Ubuntu Packaging for Tor+Vidalia</b> <br /> Vidalia "
 "currently doesn't play nicely on Debian and Ubuntu with the default Tor "
@@ -604,7 +609,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:615
+#: /home/runa/tor/website/en/volunteer.wml:614
 msgid ""
 "<b>Tor/Polipo/Vidalia Auto-Update Framework</b> <br /> We're in need of a "
 "good authenticated-update framework.  Vidalia already has the ability to "
@@ -633,7 +638,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:649
+#: /home/runa/tor/website/en/volunteer.wml:648
 msgid ""
 "<b>Improving the Tor QA process: Continuous Integration for builds</b> <br /"
 "> It would be useful to have automated build processes for Windows and "
@@ -660,7 +665,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:677
+#: /home/runa/tor/website/en/volunteer.wml:676
 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 "
@@ -671,19 +676,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:694
+#: /home/runa/tor/website/en/volunteer.wml:693
 msgid "<a id=\"OtherCoding\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:695
+#: /home/runa/tor/website/en/volunteer.wml:694
 msgid ""
 "<a class=\"anchor\" href=\"#OtherCoding\">Other Coding and Design related "
 "ideas</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:697
+#: /home/runa/tor/website/en/volunteer.wml:696
 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 "
@@ -698,7 +703,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:710
+#: /home/runa/tor/website/en/volunteer.wml:709
 msgid ""
 "We need to actually start building our <a href=\"<page "
 "documentation>#DesignDoc\">blocking-resistance design</a>. This involves "
@@ -708,7 +713,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:716
+#: /home/runa/tor/website/en/volunteer.wml:715
 msgid ""
 "We need a flexible simulator framework for studying end-to-end traffic "
 "confirmation attacks. Many researchers have whipped up ad hoc simulators to "
@@ -722,7 +727,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:726
+#: /home/runa/tor/website/en/volunteer.wml:725
 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 "
@@ -731,7 +736,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:729
+#: /home/runa/tor/website/en/volunteer.wml:728
 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 "
@@ -740,7 +745,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:734
+#: /home/runa/tor/website/en/volunteer.wml:733
 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 "
@@ -754,7 +759,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:745
+#: /home/runa/tor/website/en/volunteer.wml:744
 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 "
@@ -762,7 +767,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:749
+#: /home/runa/tor/website/en/volunteer.wml:748
 msgid ""
 "We need a way to generate the website diagrams (for example, the \"How Tor "
 "Works\" pictures on the <a href=\"<page overview>\">overview page</a> from "
@@ -773,24 +778,24 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:756
+#: /home/runa/tor/website/en/volunteer.wml:755
 msgid ""
 "How can we make the <a href=\"http://anonymityanywhere.com/incognito/";
 "\">Incognito LiveCD</a> easier to maintain, improve, and document?"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:761
+#: /home/runa/tor/website/en/volunteer.wml:760
 msgid "<a id=\"Research\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:762
+#: /home/runa/tor/website/en/volunteer.wml:761
 msgid "<a class=\"anchor\" href=\"#Research\">Research</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:764
+#: /home/runa/tor/website/en/volunteer.wml:763
 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 "
@@ -806,7 +811,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:776
+#: /home/runa/tor/website/en/volunteer.wml:775
 msgid ""
 "The \"end-to-end traffic confirmation attack\": by watching traffic at Alice "
 "and at Bob, we can <a href=\"http://freehaven.net/anonbib/#danezis:pet2004";
@@ -820,7 +825,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:786
+#: /home/runa/tor/website/en/volunteer.wml:785
 msgid ""
 "A related question is: Does running a relay/bridge provide additional "
 "protection against these timing attacks? Can an external adversary that "
@@ -840,7 +845,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:801
+#: /home/runa/tor/website/en/volunteer.wml:800
 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 "
@@ -859,7 +864,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:816
+#: /home/runa/tor/website/en/volunteer.wml:815
 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 "
@@ -874,7 +879,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:826
+#: /home/runa/tor/website/en/volunteer.wml:825
 msgid ""
 "Other research questions regarding geographic diversity consider the "
 "tradeoff between choosing an efficient circuit and choosing a random "
@@ -886,7 +891,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:833
+#: /home/runa/tor/website/en/volunteer.wml:832
 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 "
@@ -903,7 +908,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:845
+#: /home/runa/tor/website/en/volunteer.wml:844
 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 "
@@ -914,7 +919,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:852
+#: /home/runa/tor/website/en/volunteer.wml:851
 msgid ""
 "Our censorship-resistance goals include preventing an attacker who's looking "
 "at Tor traffic on the wire from <a href=\"<svnsandbox>doc/design-paper/"
@@ -930,7 +935,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:863
+#: /home/runa/tor/website/en/volunteer.wml:862
 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 "
@@ -941,7 +946,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:870
+#: /home/runa/tor/website/en/volunteer.wml:869
 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 "
@@ -949,7 +954,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:873
+#: /home/runa/tor/website/en/volunteer.wml:872
 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 "
@@ -969,7 +974,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:890
+#: /home/runa/tor/website/en/volunteer.wml:889
 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 "
@@ -986,7 +991,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:903
+#: /home/runa/tor/website/en/volunteer.wml:902
 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 "
@@ -994,7 +999,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/volunteer.wml:911
+#: /home/runa/tor/website/en/volunteer.wml:910
 msgid ""
 "<a href=\"<page contact>\">Let us know</a> if you've made progress on any of "
 "these!"

Modified: translation/trunk/projects/website/de/docs/2-medium.tor-doc-relay.po
===================================================================
--- translation/trunk/projects/website/de/docs/2-medium.tor-doc-relay.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/de/docs/2-medium.tor-doc-relay.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:07+0100\n"
+"POT-Creation-Date: 2009-12-08 18:51+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -47,7 +47,7 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:25 /tmp/yMKAjGf7gr.xml:285
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:25 /tmp/aMpJ304d10.xml:285
 msgid "<hr />"
 msgstr ""
 
@@ -67,9 +67,9 @@
 #: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37
 msgid ""
 "You can run a Tor relay on <a href=\"https://wiki.torproject.org/noreply/";
-"TheOnionRouter/TorFAQ#RelayOS\">pretty much any</a> operating system, but "
-"Linux, FreeBSD 5.x+, OS X Tiger or later, and Windows Server 2003 or later "
-"work best."
+"TheOnionRouter/TorFAQ#RelayOS\">pretty much any</a> operating system. Tor "
+"relays work best on Linux, OS X Tiger or later, FreeBSD 5.x+, NetBSD 5.x+, "
+"and Windows Server 2003 or later."
 msgstr ""
 
 #. type: Content of: <div><div>
@@ -84,8 +84,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:47 /tmp/yMKAjGf7gr.xml:62
-#: /tmp/yMKAjGf7gr.xml:149 /tmp/yMKAjGf7gr.xml:175
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:47 /tmp/aMpJ304d10.xml:62
+#: /tmp/aMpJ304d10.xml:149 /tmp/aMpJ304d10.xml:175
 msgid "<br />"
 msgstr ""
 

Modified: translation/trunk/projects/website/nb/1-high.index.po
===================================================================
--- translation/trunk/projects/website/nb/1-high.index.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/nb/1-high.index.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-01 17:52+0100\n"
+"POT-Creation-Date: 2009-12-08 18:49+0100\n"
 "PO-Revision-Date: 2009-11-19 02:01-0700\n"
 "Last-Translator: Runa Sandvik <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -41,8 +41,8 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/index.wml:20 /tmp/INBy91FujZ.xml:30
-#: /tmp/INBy91FujZ.xml:76
+#: /home/runa/tor/website/en/index.wml:20 /tmp/MYWeUpzcy7.xml:30
+#: /tmp/MYWeUpzcy7.xml:76
 msgid "<hr />"
 msgstr ""
 
@@ -130,17 +130,22 @@
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/index.wml:79
+msgid "07 December 2009: <a href=\"<page open-positions>\">Tor is hiring!</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/index.wml:80
 msgid ""
-"28 July 2009: Tor 0.2.1.19 released as stable.  Read the <a href=\"http://";
-"archives.seul.org/or/announce/Aug-2009/msg00000.html\">announcement</a> for "
+"10 October 2009: Tor 0.2.1.20 released as stable.  Read the <a href="
+"\"https://blog.torproject.org/blog/tor-02120-released\";>announcement</a> for "
 "the updates and changes."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/index.wml:81
 msgid ""
-"25 June 2009: Tor 0.2.0.35 released as stable.  Read the <a href=\"http://";
-"archives.seul.org/or/announce/Jun-2009/msg00000.html\">announcement</a> for "
+"28 July 2009: Tor 0.2.1.19 released as stable.  Read the <a href=\"http://";
+"archives.seul.org/or/announce/Aug-2009/msg00000.html\">announcement</a> for "
 "the updates and changes."
 msgstr ""
 

Modified: translation/trunk/projects/website/nb/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/nb/2-medium.donate.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/nb/2-medium.donate.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-01 17:52+0100\n"
+"POT-Creation-Date: 2009-12-08 18:48+0100\n"
 "PO-Revision-Date: 2009-12-08 10:34-0700\n"
 "Last-Translator: Runa Sandvik <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -22,70 +22,100 @@
 
 #. type: Content of: <div><div><h3>
 #: /home/runa/tor/website/en/donate.wml:13
-msgid "We accept donations via:"
+#, fuzzy
+msgid "We accept donations of:"
 msgstr "Vi aksepterer donasjoner via:"
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/donate.wml:15
-msgid "<a href=\"#paypal\">PayPal</a>"
+msgid "<a href=\"#money\">Money</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/donate.wml:16
-msgid "<a href=\"#check\">Check, Money Order, or Postal Order</a>"
+msgid "<a href=\"#services\">Services</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/donate.wml:17
-msgid "<a href=\"#wire\">ACH/e-check/Wire Transfers</a>"
+msgid "<a href=\"#hardware\">Hardware</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/donate.wml:18
-msgid "<a href=\"#eurobank\">European Bank Transfers</a>"
+msgid "<a href=\"#time\">Time</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/donate.wml:19
-msgid "<a href=\"#funds\">What happens to my donation?</a>"
+msgid "<a href=\"#outcome\">What happens to my donation?</a>"
 msgstr ""
 
-#.  END SIDEBAR 
-#. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:24
-msgid "<hr />"
-msgstr ""
-
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:27
+#: /home/runa/tor/website/en/donate.wml:26
 msgid ""
-"Your tax-deductible donation helps ensure online anonymity and privacy "
-"continue to exist in the world."
+"We offer a few ways to support online privacy and anonymity through "
+"donations.  You can donate <a href=\"#money\">money</a>, <a href=\"#services"
+"\">services</a>, <a href=\"#hardware\">hardware</a>, and <a href=\"#time"
+"\">time</a>.  Your tax-deductible donation helps ensure online anonymity and "
+"privacy continue to exist in the world."
 msgstr ""
 
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/donate.wml:32 /tmp/DExBfQdGja.xml:93
+msgid "<br />"
+msgstr ""
+
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:29
+#: /home/runa/tor/website/en/donate.wml:34
 msgid ""
 "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.  If you can't donate, but want to help raise funds please <a href="
-"\"mailto:donations@xxxxxxxxxxxxxx\";>contact us</a> directly."
+"donations.  We're happy to accept donations via paypal, checks, money "
+"orders, stock grants or other more sophisticated transations.  Contact us at "
+"donations@xxxxxxxxxxxxxx for more details."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:33
-msgid "<a id=\"paypal\"></a>"
+#: /home/runa/tor/website/en/donate.wml:43
+msgid "<a id=\"relay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:34
+#: /home/runa/tor/website/en/donate.wml:44
+msgid "<a class=\"anchor\" href=\"#relay\">Run a relay</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/donate.wml:45
+msgid ""
+"The easiest, most effective way to support online privacy and anonymity "
+"around the world is to run a relay.  You join a set of committed people in "
+"the world already running a relay.  The easiest way to speed up Tor is to "
+"add more relays to the network.  Running a relay is as easy as <a href="
+"\"<page docs/tor-doc-relay>\">clicking a button</a>.  Join the network.  "
+"Support your online anonymity and privacy!"
+msgstr ""
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/donate.wml:53
+msgid "<a id=\"money\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/donate.wml:54
+msgid "<a class=\"anchor\" href=\"#money\">Donate Money</a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/donate.wml:55
 msgid "<a class=\"anchor\" href=\"#paypal\">Subscription via PayPal</a>"
 msgstr ""
 
 #. type: Content of: <div><form><p>
-#: /home/runa/tor/website/en/donate.wml:37
+#: /home/runa/tor/website/en/donate.wml:57
 msgid ""
 "One of our core fundraising goals is not to annoy donors with repeated "
 "requests.  Therefore, we advocate for a subscription-based approach: simply "
@@ -97,64 +127,64 @@
 msgstr ""
 
 #. type: Content of: <div><form><select>
-#: /home/runa/tor/website/en/donate.wml:41
+#: /home/runa/tor/website/en/donate.wml:59
 msgid "<br /> <br /> Choose your currency: <select name=\"currency_code\">"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:45 /tmp/_ZP7OPyRK0.xml:87
+#: /home/runa/tor/website/en/donate.wml:63 /tmp/DExBfQdGja.xml:105
 msgid "$"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:46 /tmp/_ZP7OPyRK0.xml:88
+#: /home/runa/tor/website/en/donate.wml:64 /tmp/DExBfQdGja.xml:106
 msgid "€"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:47 /tmp/_ZP7OPyRK0.xml:89
+#: /home/runa/tor/website/en/donate.wml:65 /tmp/DExBfQdGja.xml:107
 msgid "£"
 msgstr ""
 
 #. type: Content of: <div><form>
-#: /home/runa/tor/website/en/donate.wml:48
+#: /home/runa/tor/website/en/donate.wml:66
 msgid "</select>"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:51
+#: /home/runa/tor/website/en/donate.wml:69
 msgid "<input type=\"radio\" name=\"a3\" value=\"250.00\" />250/month"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:52
+#: /home/runa/tor/website/en/donate.wml:70
 msgid "<input type=\"radio\" name=\"a3\" value=\"100.00\" />100/month"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:53
+#: /home/runa/tor/website/en/donate.wml:71
 msgid "<input type=\"radio\" name=\"a3\" value=\"50.00\" />50/month"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:54
+#: /home/runa/tor/website/en/donate.wml:72
 msgid ""
 "<input type=\"radio\" name=\"a3\" value=\"20.00\" checked=\"checked\" />20/"
 "month"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:55
+#: /home/runa/tor/website/en/donate.wml:73
 msgid "<input type=\"radio\" name=\"a3\" value=\"10.00\" />10/month"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:56
+#: /home/runa/tor/website/en/donate.wml:74
 msgid "<input type=\"radio\" name=\"a3\" value=\"5.00\" />5/month"
 msgstr ""
 
 #. type: Content of: <div><form>
-#: /home/runa/tor/website/en/donate.wml:59
+#: /home/runa/tor/website/en/donate.wml:77
 msgid ""
 "<input type=\"hidden\" name=\"p3\" value=\"1\" /> <input type=\"hidden\" "
 "name=\"t3\" value=\"M\" /> <input type=\"hidden\" name=\"sra\" value=\"1\" /"
@@ -170,18 +200,13 @@
 "\"https://www.torproject.org/donate\"/>"
 msgstr ""
 
-#. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:75
-msgid "<br />"
-msgstr ""
-
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:76
+#: /home/runa/tor/website/en/donate.wml:94
 msgid "<a class=\"anchor\" href=\"#paypal\">Single donation via PayPal</a>"
 msgstr ""
 
 #. type: Content of: <div><form><p><select>
-#: /home/runa/tor/website/en/donate.wml:78
+#: /home/runa/tor/website/en/donate.wml:96
 msgid ""
 "You can also make a <b>one-time donation</b> (via PayPal, but doesn't "
 "require any account):<br /> <input type=\"radio\" name=\"amount\" value="
@@ -193,7 +218,7 @@
 msgstr ""
 
 #. type: Content of: <div><form><p>
-#: /home/runa/tor/website/en/donate.wml:90
+#: /home/runa/tor/website/en/donate.wml:108
 msgid ""
 "</select> <input type=\"hidden\" name=\"no_shipping\" value=\"1\" /> <input "
 "type=\"image\" src=\"images/btn_donateCC_LG.gif\" name=\"submit\" alt=\"Make "
@@ -205,133 +230,143 @@
 "\"cancel_return\" value=\"https://www.torproject.org/donate\"/>"
 msgstr ""
 
-#. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:106
-msgid "<a id=\"check\"></a>"
-msgstr ""
-
-#. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:107
-msgid ""
-"<a class=\"anchor\" href=\"#check\">Checks, Money Orders, and Postal Orders</"
-"a>"
-msgstr ""
-
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:110
-msgid "These payments can be sent to:"
+#: /home/runa/tor/website/en/donate.wml:124
+msgid "If you want to send a check, money order, or cash, please send to:"
 msgstr ""
 
-#. type: Content of: <div><blockquote><p>
-#: /home/runa/tor/website/en/donate.wml:113
-msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026 USA"
+#. type: Content of: <div><p><address>
+#: /home/runa/tor/website/en/donate.wml:127
+msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:119
+#: /home/runa/tor/website/en/donate.wml:131
 msgid ""
-"Attention US citizens: if you would like an acknowledgement letter, please "
-"inform us with your donation.  A canceled check, money/postal order receipt, "
-"or appraisal of donated property are valid records according to the IRS."
+"If you want a donation receipt for your non-paypal, non-check deposit, "
+"please specifically request one with your mailed donation."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:124
-msgid "<a id=\"wire\"></a>"
+#: /home/runa/tor/website/en/donate.wml:135
+msgid "<a id=\"services\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:125
-msgid "<a class=\"anchor\" href=\"#wire\">ACH/e-check/Wire Transfers</a>"
+#: /home/runa/tor/website/en/donate.wml:136
+msgid "<a class=\"anchor\" href=\"#services\">Donate Services</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:126
+#: /home/runa/tor/website/en/donate.wml:137
 msgid ""
-"In the US, ACH or e-check transfers are a fine way to donate.  We're happy "
-"to accept wire transfers over US$100.  Domestic United States ACH/e-check "
-"transfers are normally free for the sender, whereas wire transfers will "
-"incur fees.  If you are located in Europe, <a href=\"#eurobank\">please see "
-"below</a>."
+"The Tor Project is always looking for services relating to technical needs, "
+"like bandwidth, colocation, hosted services, legal representation, or "
+"consulting.  By donating services, you join our <a href=\"<page sponsors>"
+"\">many sponsors</a> in providing online privacy and anonymity.  We're "
+"currently looking for scalable hosting services for reporting needs from "
+"large data sets and reliable high-bandwidth hosting.  We may have hardware "
+"we can provide you for your service donation."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:132
+#: /home/runa/tor/website/en/donate.wml:144
 msgid ""
-"Organization Address:<br /> The Tor Project<br /> 122 Scott Circle<br /> "
-"Dedham, MA 02026<br />"
+"Can you write code? We're always looking for smart, motivated coders to "
+"either port Tor to new or old operating systems, or solve difficult online "
+"anonymity problems.  Take a look at <a href=\"<page volunteer>#Coding\">our "
+"coding projects</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:138
+#: /home/runa/tor/website/en/donate.wml:148
 msgid ""
-"account number: 63904957725<br /> routing number: 011075150<br /> SWIFT "
-"Code: SVRNUS33//FW011075150<br />"
+"Are you a creative person? Do you have a fantastic idea for a campaign? Are "
+"you someone who can come up with awesome artwork? We're always looking for "
+"new ways to promote Tor and get the word out that everyone needs their "
+"privacy and anonymity online."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:143
+#: /home/runa/tor/website/en/donate.wml:152
 msgid ""
-"Bank Address:<br /> Sovereign Bank<br /> 1130 Berkshire Boulevard<br /> "
-"Wyomissing, PA 19610<br />"
+"Is your legal firm willing to defend Tor and its volunteers? Are you waiting "
+"for an interesting case to defend online privacy and anonymity?"
 msgstr ""
 
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/donate.wml:155
+msgid ""
+"If any of the service ideas struck a nerve, contact us at "
+"donations@xxxxxxxxxxxxxx for more details."
+msgstr ""
+
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:149
-msgid "<a id=\"eurobank\"></a>"
+#: /home/runa/tor/website/en/donate.wml:158
+msgid "<a id=\"hardware\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:150
-msgid "<a class=\"anchor\" href=\"#eurobank\">European Bank Transfers</a>"
+#: /home/runa/tor/website/en/donate.wml:159
+msgid "<a class=\"anchor\" href=\"#hardware\">Donate Hardware</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:151
+#: /home/runa/tor/website/en/donate.wml:160
 msgid ""
-"In Europe, we have a funding arrangement with the <a href=\"http://www.ccc.";
-"de/\">Chaos Computer Club</a>.  Your donations go into a separate bank "
-"account managed by the CCC, and they use the funds to do beneficial "
-"activities for Tor in Europe.  Residents from any of the <a href=\"http://en.";
-"wikipedia.org/wiki/Single_Euro_Payments_Area\">31 SEPA member states</a> can "
-"wire up to 50.000 Euro at the cost of a domestic transaction (i.e., usually "
-"free if submitted electronically)."
+"We're generally looking for donated hardware and support services that could "
+"be used to provide the infrastructure that supports Tor's operations, "
+"including website mirrors, database servers, build systems and legacy "
+"hardware for supporting packages on older Operating Systems; such as OS X "
+"10.2, OS X 10.3, Windows XP, Windows 7, IRIX, Redhat, CentOS, Fedora, "
+"Debian, etc.  A number of service providers have an abundance of bandwidth "
+"capacity, but need hardware in order donate it to us."
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/donate.wml:161
 msgid ""
-"The account information is:<br /> Wau Holland Stiftung<br /> IBAN "
-"DE57520400210277281200<br /> SWIFT BIC COBADEFF520<br />"
+"By donating hardware, you're joining our <a href=\"<page sponsors>\">many "
+"sponsors</a> in providing online privacy and anonymity.  If you want Tor to "
+"work on your architecture or hardware, a fine way to do this is to donate "
+"the hardware and operating system to us.  Contact us at donations@torproject."
+"org for more details."
 msgstr ""
 
-#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:167
-msgid ""
-"Classic style German account information is:<br /> Konto: 2772812-02<br /> "
-"Inhaber: Wau Holland Stiftung<br /> Bank: Commerzbank Kassel<br /> BLZ: "
-"52040021<br />"
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/donate.wml:164
+msgid "<a id=\"time\"></a>"
 msgstr ""
 
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/donate.wml:165
+msgid "<a class=\"anchor\" href=\"#time\">Donate Time</a>"
+msgstr ""
+
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:173
+#: /home/runa/tor/website/en/donate.wml:166
 msgid ""
-"WHS issues a donation receipt upon request (if provided with address "
-"information)."
+"We're always looking for excited volunteers to give talks or trainins at "
+"conferences, barcamps, and other meetings where people should learn about "
+"online privacy and anonymity with Tor.  We're happy to work with you to help "
+"you better present Tor and online privacy and anonymity.  Contact us at "
+"donations@xxxxxxxxxxxxxx for more details."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:177
-msgid "<a id=\"funds\"></a>"
+#: /home/runa/tor/website/en/donate.wml:169
+msgid ""
+"<a id=\"outcome\"></a> <a id=\"funds\"></a><a class=\"anchor\" href=\"#funds"
+"\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:178
-msgid "<a class=\"anchor\" href=\"#funds\">What happens to my donation?</a>"
+#: /home/runa/tor/website/en/donate.wml:171
+msgid "<a class=\"anchor\" href=\"#outcome\">What happens to my donation?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:179
+#: /home/runa/tor/website/en/donate.wml:172
 msgid ""
 "If you've just donated, thank you for your donation.  Your funds are "
 "deposited into our general fund.  You join our <a href=\"<page sponsors>"
@@ -340,7 +375,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:182
+#: /home/runa/tor/website/en/donate.wml:175
 msgid ""
 "<img src=\"images/2008-funding-chart.png\" alt=\"Who funds the Tor Project?"
 "\"/> <img src=\"images/2008-expenses-chart.png\" alt=\"How is the money "
@@ -348,9 +383,9 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:185
+#: /home/runa/tor/website/en/donate.wml:179
 msgid ""
-"<hr /> <strong>The Tor Project respects the confidentiality of our "
-"supporters, when requested. We do not lend, rent, or sell our lists of "
-"donors at any time.</strong>"
+"<strong>The Tor Project respects the confidentiality of our supporters, when "
+"requested. We do not lend, rent, or sell our lists of donors at any time.</"
+"strong>"
 msgstr ""

Modified: translation/trunk/projects/website/nb/2-medium.faq.po
===================================================================
--- translation/trunk/projects/website/nb/2-medium.faq.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/nb/2-medium.faq.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:06+0100\n"
+"POT-Creation-Date: 2009-12-08 18:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -21,7 +21,7 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:12 /tmp/UAkS9zMp6M.xml:1085
+#: /home/runa/tor/website/en/faq.wml:12 /tmp/uclJzaPVz6.xml:1084
 msgid "<hr />"
 msgstr ""
 
@@ -559,11 +559,11 @@
 "answer these mails, but typically they need to spend most of their time on "
 "development tasks that will benefit more people.  This is especially true if "
 "your question is already covered in the <a href=\"<page documentation>"
-"\">documentation</a> or on this FAQ. We don't hate you; we're just busy."
+"\">documentation</a> or on this FAQ."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:308
+#: /home/runa/tor/website/en/faq.wml:307
 msgid ""
 "So if we don't answer your mail, first check the <a href=\"<page "
 "documentation>\">documentation</a> page, along with this FAQ, to make sure "
@@ -580,7 +580,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:323
+#: /home/runa/tor/website/en/faq.wml:322
 msgid ""
 "Another strategy is to <a href=\"<page docs/tor-doc-relay>\">run a Tor relay "
 "for a while</a>, and/or <a href=\"<page donate>\">donate money</a> <a href="
@@ -590,29 +590,29 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:331
+#: /home/runa/tor/website/en/faq.wml:330
 msgid ""
 "If you find your answer, please stick around on the IRC channel or the "
 "mailing list and answer questions from others."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:335
+#: /home/runa/tor/website/en/faq.wml:334
 msgid "<hr /> <a id=\"WhySlow\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:338
+#: /home/runa/tor/website/en/faq.wml:337
 msgid "<a class=\"anchor\" href=\"#WhySlow\">Why is Tor so slow?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:341
+#: /home/runa/tor/website/en/faq.wml:340
 msgid "There are many reasons why the Tor network is currently slow."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:345
+#: /home/runa/tor/website/en/faq.wml:344
 msgid ""
 "Before we answer, though, you should realize that Tor is never going to be "
 "blazing fast. Your traffic is bouncing through volunteers' computers in "
@@ -622,7 +622,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:353
+#: /home/runa/tor/website/en/faq.wml:352
 msgid ""
 "But that doesn't mean that it can't be improved. The current Tor network is "
 "quite small compared to the number of people trying to use it, and many of "
@@ -631,12 +631,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:360
+#: /home/runa/tor/website/en/faq.wml:359
 msgid "What can you do to help?"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:366
+#: /home/runa/tor/website/en/faq.wml:365
 msgid ""
 "<a href=\"<page docs/tor-doc-relay>\">Configure your Tor to relay traffic "
 "for others</a>. Help make the Tor network large enough that we can handle "
@@ -644,7 +644,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:372
+#: /home/runa/tor/website/en/faq.wml:371
 msgid ""
 "<a href=\"<page gui/index>\">Help us make Tor more usable</a>. We especially "
 "need people to help make it easier to configure your Tor as a relay. Also, "
@@ -653,7 +653,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:379
+#: /home/runa/tor/website/en/faq.wml:378
 msgid ""
 "There are some bottlenecks in the current Tor network. Help us design "
 "experiments to track down and demonstrate where the problems are, and then "
@@ -661,7 +661,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:385
+#: /home/runa/tor/website/en/faq.wml:384
 msgid ""
 "There are some steps that individuals can take to improve their Tor "
 "performance. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
@@ -673,7 +673,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:396
+#: /home/runa/tor/website/en/faq.wml:395
 msgid ""
 "Tor needs some architectural changes too. One important change is to start "
 "providing <a href=\"#EverybodyARelay\">better service to people who relay "
@@ -682,7 +682,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:404
+#: /home/runa/tor/website/en/faq.wml:403
 msgid ""
 "Help do other things so we can do the hard stuff. Please take a moment to "
 "figure out what your skills and interests are, and then <a href=\"<page "
@@ -690,7 +690,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:410
+#: /home/runa/tor/website/en/faq.wml:409
 msgid ""
 "Help find sponsors for Tor. Do you work at a company or government agency "
 "that uses Tor or has a use for Internet privacy, e.g. to browse the "
@@ -701,7 +701,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:419
+#: /home/runa/tor/website/en/faq.wml:418
 msgid ""
 "If you can't help out with any of the above, you can still help out "
 "individually by <a href=\"<page donate>\">donating a bit of money to the "
@@ -709,32 +709,32 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:426
+#: /home/runa/tor/website/en/faq.wml:425
 msgid "<hr /> <a id=\"Funding\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:429
+#: /home/runa/tor/website/en/faq.wml:428
 msgid ""
 "<a class=\"anchor\" href=\"#Funding\">What would The Tor Project do with "
 "more funding?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:433
+#: /home/runa/tor/website/en/faq.wml:432
 msgid ""
-"We have about 1500 relays right now, pushing over 150 MB/s average traffic. "
+"We have about 1800 relays right now, pushing over 150 MB/s average traffic. "
 "We have several hundred thousand active users. But the Tor network is not "
 "yet self-sustaining."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:439
+#: /home/runa/tor/website/en/faq.wml:438
 msgid "There are six main development/maintenance pushes that need attention:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:445
+#: /home/runa/tor/website/en/faq.wml:444
 msgid ""
 "Scalability: We need to keep scaling and decentralizing the Tor architecture "
 "so it can handle thousands of relays and millions of users. The upcoming "
@@ -743,7 +743,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:452
+#: /home/runa/tor/website/en/faq.wml:451
 msgid ""
 "User support: With this many users, a lot of people are asking questions all "
 "the time, offering to help out with things, and so on. We need good clean "
@@ -751,7 +751,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:458
+#: /home/runa/tor/website/en/faq.wml:457
 msgid ""
 "Relay support: the Tor network is run by volunteers, but they still need "
 "attention with prompt bug fixes, explanations when things go wrong, "
@@ -762,7 +762,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:467
+#: /home/runa/tor/website/en/faq.wml:466
 msgid ""
 "Usability: Beyond documentation, we also need to work on usability of the "
 "software itself. This includes installers, clean GUIs, easy configuration to "
@@ -773,7 +773,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:476
+#: /home/runa/tor/website/en/faq.wml:475
 msgid ""
 "Incentives: We need to work on ways to encourage people to configure their "
 "Tors as relays and exit nodes rather than just clients.  <a href="
@@ -782,7 +782,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:483
+#: /home/runa/tor/website/en/faq.wml:482
 msgid ""
 "Research: The anonymous communications field is full of surprises and "
 "gotchas. In our copious free time, we also help run top anonymity and "
@@ -794,7 +794,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:496
+#: /home/runa/tor/website/en/faq.wml:495
 msgid ""
 "We're continuing to move forward on all of these, but at this rate <a href="
 "\"#WhySlow\">the Tor network is growing faster than the developers can keep "
@@ -803,14 +803,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:504
+#: /home/runa/tor/website/en/faq.wml:503
 msgid ""
 "We are also excited about tackling related problems, such as censorship-"
 "resistance."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:509
+#: /home/runa/tor/website/en/faq.wml:508
 msgid ""
 "We are proud to have <a href=\"<page sponsors>\">sponsorship and support</a> "
 "from the Omidyar Network, the International Broadcasting Bureau, Bell "
@@ -819,7 +819,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:516
+#: /home/runa/tor/website/en/faq.wml:515
 msgid ""
 "However, this support is not enough to keep Tor abreast of changes in the "
 "Internet privacy landscape. Please <a href=\"<page donate>\">donate</a> to "
@@ -828,18 +828,18 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:522
+#: /home/runa/tor/website/en/faq.wml:521
 msgid "<hr /> <a id=\"HowUninstallTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:525
+#: /home/runa/tor/website/en/faq.wml:524
 msgid ""
 "<a class=\"anchor\" href=\"#HowUninstallTor\">How do I uninstall Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:528
+#: /home/runa/tor/website/en/faq.wml:527
 msgid ""
 "This depends entirely on how you installed it and which operating system you "
 "have. If you installed a package, then hopefully your package has a way to "
@@ -849,35 +849,35 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:536
+#: /home/runa/tor/website/en/faq.wml:535
 msgid ""
 "In your taskbar, right click on Vidalia (the green onion or the black head)  "
 "and choose exit."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:538
+#: /home/runa/tor/website/en/faq.wml:537
 msgid ""
 "Right click on the taskbar to bring up TaskManager. Look for tor.exe in the "
 "Process List. If it's running, right click and choose End Process."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:540
+#: /home/runa/tor/website/en/faq.wml:539
 msgid ""
 "Click the Start button, go to Programs, go to Vidalia, choose Uninstall.  "
 "This will remove the Vidalia bundle, which includes Tor and Polipo."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:542
+#: /home/runa/tor/website/en/faq.wml:541
 msgid ""
 "Start Firefox. Go to the Tools menu, choose Add-ons. Select Torbutton.  "
 "Click the Uninstall button."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:547
+#: /home/runa/tor/website/en/faq.wml:546
 msgid ""
 "If you do not follow these steps (for example by trying to uninstall "
 "Vidalia, Tor, and Polipo while they are still running), you will need to "
@@ -885,14 +885,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:553
+#: /home/runa/tor/website/en/faq.wml:552
 msgid ""
 "For Mac OS X, follow the <a href=\"<page docs/tor-doc-osx>#uninstall"
 "\">uninstall directions</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:558
+#: /home/runa/tor/website/en/faq.wml:557
 msgid ""
 "If you installed by source, I'm afraid there is no easy uninstall method. "
 "But on the bright side, by default it only installs into /usr/local/ and it "
@@ -900,52 +900,52 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:563
+#: /home/runa/tor/website/en/faq.wml:562
 msgid "<hr /> <a id=\"PGPSigs\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:566
+#: /home/runa/tor/website/en/faq.wml:565
 msgid ""
 "<a class=\"anchor\" href=\"#PGPSigs\">What are these \"sig\" files on the "
 "download page?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:570
+#: /home/runa/tor/website/en/faq.wml:569
 msgid ""
 "These are PGP signatures, so you can verify that the file you've downloaded "
 "is exactly the one that we intended you to get."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:575
+#: /home/runa/tor/website/en/faq.wml:574
 msgid ""
 "Please read the <a href=\"<page verifying-signatures>\">verifying "
 "signatures</a> page for details."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:579
+#: /home/runa/tor/website/en/faq.wml:578
 msgid "<hr /> <a id=\"CompileTorWindows\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:582
+#: /home/runa/tor/website/en/faq.wml:581
 msgid ""
 "<a class=\"anchor\" href=\"#CompileTorWindows\">How do I compile Tor under "
 "Windows?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:586
+#: /home/runa/tor/website/en/faq.wml:585
 msgid ""
 "Try following the steps at <a href=\"<svnsandbox>doc/tor-win32-mingw-"
 "creation.txt\"><svnsandbox>doc/tor-win32-mingw-creation.txt</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:591
+#: /home/runa/tor/website/en/faq.wml:590
 msgid ""
 "(Note that you don't need to compile Tor yourself in order to use it. Most "
 "people just use the packages available on the <a href=\"<page download>"
@@ -953,19 +953,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:596
+#: /home/runa/tor/website/en/faq.wml:595
 msgid "<hr /> <a id=\"VirusFalsePositives\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:599
+#: /home/runa/tor/website/en/faq.wml:598
 msgid ""
 "<a class=\"anchor\" href=\"#VirusFalsePositives\">Why does my Tor executable "
 "appear to have a virus or spyware?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:603
+#: /home/runa/tor/website/en/faq.wml:602
 msgid ""
 "Sometimes, overzealous Windows virus and spyware detectors trigger on some "
 "parts of the Tor Windows binary. Our best guess is that these are false "
@@ -976,7 +976,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:611
+#: /home/runa/tor/website/en/faq.wml:610
 msgid ""
 "In the meantime, we encourage you to not just take our word for it. Our job "
 "is to provide the source; if you're concerned, please do <a href="
@@ -984,19 +984,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:616
+#: /home/runa/tor/website/en/faq.wml:615
 msgid "<hr /> <a id=\"LiveCD\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:619
+#: /home/runa/tor/website/en/faq.wml:618
 msgid ""
 "<a class=\"anchor\" href=\"#LiveCD\">Is there a LiveCD or other bundle that "
 "includes Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:623
+#: /home/runa/tor/website/en/faq.wml:622
 msgid ""
 "There isn't any official LiveCD at this point. We're still trying to find "
 "good solutions and trying to understand the security and anonymity "
@@ -1005,12 +1005,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:630
+#: /home/runa/tor/website/en/faq.wml:629
 msgid "LiveCDs:"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:634
+#: /home/runa/tor/website/en/faq.wml:633
 msgid ""
 "<a href=\"http://incognito.anonymityanywhere.com/\";>Incognito LiveCD/USB</a> "
 "is a CD you can boot that has several Internet applications (Firefox, IRC, "
@@ -1020,7 +1020,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:639
+#: /home/runa/tor/website/en/faq.wml:638
 msgid ""
 "<a href=\"http://tork.sourceforge.net/wiki/index.php/LiveCD\";>TorK LiveCD</"
 "a> is Knoppix-based with an emphasis on user-friendliness. You can work "
@@ -1030,7 +1030,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:644
+#: /home/runa/tor/website/en/faq.wml:643
 msgid ""
 "<a href=\"http://mandalka.name/privatix/\";>Privatix LiveCD/USB</a> is a "
 "debian based live-system including tor, firefox and torbutton which can save "
@@ -1038,12 +1038,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:650
+#: /home/runa/tor/website/en/faq.wml:649
 msgid "Windows bundles:"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:654
+#: /home/runa/tor/website/en/faq.wml:653
 msgid ""
 "<a href=\"<page torbrowser/index>\">Tor Browser Bundle</a> for Windows comes "
 "with a pre-configured web browser and is self contained so you can run it "
@@ -1051,14 +1051,14 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:657
+#: /home/runa/tor/website/en/faq.wml:656
 msgid ""
 "<a href=\"http://www.janusvm.com/tor_vm/\";>Tor VM</a> is a successor to "
 "JanusVM. It needs testing from you!"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:659
+#: /home/runa/tor/website/en/faq.wml:658
 msgid ""
 "<a href=\"http://janusvm.com/\";>JanusVM</a> is a Linux kernel and software "
 "running in VMWare that sits between your Windows computer and the Internet, "
@@ -1066,7 +1066,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:662
+#: /home/runa/tor/website/en/faq.wml:661
 msgid ""
 "<a href=\"http://www.xerobank.com/xB_browser.html\";>xB Browser</a>, "
 "previously known as Torpark, is a Firefox+Tor package for Win32 that can "
@@ -1074,12 +1074,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:668
+#: /home/runa/tor/website/en/faq.wml:667
 msgid "Not currently maintained as far as we know:"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:672
+#: /home/runa/tor/website/en/faq.wml:671
 msgid ""
 "Polippix / Privatlivets Fred is a Danish Knoppix-based LiveCD with Tor and "
 "utilities to encrypt IP-telephony. <a href=\"http://polippix.org/\";>Info and "
@@ -1087,7 +1087,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:675
+#: /home/runa/tor/website/en/faq.wml:674
 msgid ""
 "ELE is a Linux LiveCD which is focused on privacy related software. It "
 "includes Tor and you can download it at <a href=\"http://www.";
@@ -1096,7 +1096,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:679
+#: /home/runa/tor/website/en/faq.wml:678
 msgid ""
 "Virtual Privacy Machine is a Linux LiveCD that includes Firefox, Privoxy, "
 "Tor, some IRC and IM applications, and a set of ipchains rules aimed to "
@@ -1107,7 +1107,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:684
+#: /home/runa/tor/website/en/faq.wml:683
 msgid ""
 "Anonym.OS is a LiveCD similar to the above but is based on OpenBSD rather "
 "than Linux for maximum security. It was designed to be anonymous and secure "
@@ -1118,7 +1118,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:690
+#: /home/runa/tor/website/en/faq.wml:689
 msgid ""
 "Phantomix is a LiveCD for anonymous surfing and chatting based on the most "
 "recent KNOPPIX release. It comes preconfigured with Privoxy, Tor and Polipo. "
@@ -1127,24 +1127,24 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:697
+#: /home/runa/tor/website/en/faq.wml:696
 msgid "Please contact us if you know any others."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:700
+#: /home/runa/tor/website/en/faq.wml:699
 msgid "<hr /> <a id=\"ChooseEntryExit\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:703
+#: /home/runa/tor/website/en/faq.wml:702
 msgid ""
 "<a class=\"anchor\" href=\"#ChooseEntryExit\">Can I control which nodes (or "
 "country) are used for entry/exit?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:706
+#: /home/runa/tor/website/en/faq.wml:705
 msgid ""
 "Yes. You can set preferred entry and exit nodes as well as inform Tor which "
 "nodes you do not want to use.  The following options can be added to your "
@@ -1152,53 +1152,53 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/faq.wml:712
+#: /home/runa/tor/website/en/faq.wml:711
 msgid "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/faq.wml:713
+#: /home/runa/tor/website/en/faq.wml:712
 msgid ""
 "A list of preferred nodes to use for the first hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/faq.wml:715
+#: /home/runa/tor/website/en/faq.wml:714
 msgid "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/faq.wml:716
+#: /home/runa/tor/website/en/faq.wml:715
 msgid ""
 "A list of preferred nodes to use for the last hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/faq.wml:718
+#: /home/runa/tor/website/en/faq.wml:717
 msgid "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/faq.wml:719
+#: /home/runa/tor/website/en/faq.wml:718
 msgid "A list of nodes to never use when building a circuit."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/faq.wml:721
+#: /home/runa/tor/website/en/faq.wml:720
 msgid "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/faq.wml:722
+#: /home/runa/tor/website/en/faq.wml:721
 msgid ""
 "A list of nodes to never use when picking an exit.  Nodes listed in "
 "<tt>ExcludeNodes</tt> are automatically in this list."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:727
+#: /home/runa/tor/website/en/faq.wml:726
 msgid ""
 "<em>We recommend you do not use these</em> -- they are intended for testing "
 "and may disappear in future versions.  You get the best security that Tor "
@@ -1207,7 +1207,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:733
+#: /home/runa/tor/website/en/faq.wml:732
 msgid ""
 "The <tt>EntryNodes</tt> and <tt>ExitNodes</tt> config options are treated as "
 "a request, meaning if the nodes are down or seem slow, Tor will still avoid "
@@ -1219,7 +1219,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:743
+#: /home/runa/tor/website/en/faq.wml:742
 msgid ""
 "Instead of <tt>$fingerprint</tt> you can also specify a 2 letter ISO3166 "
 "country code in curly braces (for example {de}), or an ip address pattern "
@@ -1228,7 +1228,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:751
+#: /home/runa/tor/website/en/faq.wml:750
 msgid ""
 "If you want to access a service directly through Tor's SOCKS interface (eg. "
 "using ssh via connect.c), another option is to set up an internal mapping in "
@@ -1237,24 +1237,24 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:757
+#: /home/runa/tor/website/en/faq.wml:756
 msgid "<hr /> <a id=\"RelayFlexible\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:760
+#: /home/runa/tor/website/en/faq.wml:759
 msgid ""
 "<a class=\"anchor\" href=\"#RelayFlexible\">How stable does my relay need to "
 "be?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:764
+#: /home/runa/tor/website/en/faq.wml:763
 msgid "We aim to make setting up a Tor relay easy and convenient:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:768
+#: /home/runa/tor/website/en/faq.wml:767
 msgid ""
 "Tor has built-in support for <a href=\"https://wiki.torproject.org/noreply/";
 "TheOnionRouter/TorFAQ#LimitBandwidth\"> rate limiting</a>. Further, if you "
@@ -1264,7 +1264,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:778
+#: /home/runa/tor/website/en/faq.wml:777
 msgid ""
 "Each Tor relay has an <a href=\"#ExitPolicies\">exit policy</a> that "
 "specifies what sort of outbound connections are allowed or refused from that "
@@ -1273,7 +1273,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:785
+#: /home/runa/tor/website/en/faq.wml:784
 msgid ""
 "It's fine if the relay goes offline sometimes. The directories notice this "
 "quickly and stop advertising the relay. Just try to make sure it's not too "
@@ -1281,14 +1281,14 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:790
+#: /home/runa/tor/website/en/faq.wml:789
 msgid ""
 "We can handle relays with dynamic IPs just fine &mdash; simply leave the "
 "Address config option blank, and Tor will try to guess."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:793
+#: /home/runa/tor/website/en/faq.wml:792
 msgid ""
 "If your relay is behind a NAT and it doesn't know its public IP (e.g. it has "
 "an IP of 192.168.x.y), you'll need to set up port forwarding. Forwarding TCP "
@@ -1298,7 +1298,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:800
+#: /home/runa/tor/website/en/faq.wml:799
 msgid ""
 "Your relay will passively estimate and advertise its recent bandwidth "
 "capacity, so high-bandwidth relays will attract more users than low-"
@@ -1306,24 +1306,24 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:806
+#: /home/runa/tor/website/en/faq.wml:805
 msgid "<hr /> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:810
+#: /home/runa/tor/website/en/faq.wml:809
 msgid ""
 "<a class=\"anchor\" href=\"#ExitPolicies\">I'd run a relay, but I don't want "
 "to deal with abuse issues.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:814
+#: /home/runa/tor/website/en/faq.wml:813
 msgid "Great. That's exactly why we implemented exit policies."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:818
+#: /home/runa/tor/website/en/faq.wml:817
 msgid ""
 "Each Tor relay has an exit policy that specifies what sort of outbound "
 "connections are allowed or refused from that relay. The exit policies are "
@@ -1339,7 +1339,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:832
+#: /home/runa/tor/website/en/faq.wml:831
 msgid ""
 "The default exit policy allows access to many popular services (e.g. web "
 "browsing), but <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
@@ -1355,7 +1355,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:847
+#: /home/runa/tor/website/en/faq.wml:846
 msgid ""
 "If you do allow any exit connections, make sure name resolution works (that "
 "is, your computer can resolve Internet addresses correctly).  If there are "
@@ -1365,19 +1365,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:855
+#: /home/runa/tor/website/en/faq.wml:854
 msgid "<hr /> <a id=\"RelayOrBridge\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:858
+#: /home/runa/tor/website/en/faq.wml:857
 msgid ""
 "<a class=\"anchor\" href=\"#RelayOrBridge\">Should I be a normal relay or "
 "bridge relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:861
+#: /home/runa/tor/website/en/faq.wml:860
 msgid ""
 "<a href=\"<page bridges>\">Bridge relays</a> (or \"bridges\" for short)  are "
 "<a href=\"<page docs/tor-doc-relay>\">Tor relays</a> that aren't listed in "
@@ -1387,7 +1387,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:868
+#: /home/runa/tor/website/en/faq.wml:867
 msgid ""
 "Being a normal relay vs being a bridge relay is almost the same "
 "configuration: it's just a matter of whether your relay is listed publically "
@@ -1395,7 +1395,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:873
+#: /home/runa/tor/website/en/faq.wml:872
 msgid ""
 "Right now, there are roughly zero places in the world that filter "
 "connections to the Tor network. So getting a lot of bridges running right "
@@ -1406,7 +1406,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:881
+#: /home/runa/tor/website/en/faq.wml:880
 msgid ""
 "So should you run a normal relay or bridge relay? If you have lots of "
 "bandwidth, you should definitely run a normal relay &mdash; bridge relays "
@@ -1417,54 +1417,54 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:889
+#: /home/runa/tor/website/en/faq.wml:888
 msgid "<hr /> <a id=\"WhyNotNamed\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:892
+#: /home/runa/tor/website/en/faq.wml:891
 msgid ""
 "<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:895
+#: /home/runa/tor/website/en/faq.wml:894
 msgid ""
 "We currently use these metrics to determine if your relay should be named:"
 "<br />"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:898
+#: /home/runa/tor/website/en/faq.wml:897
 msgid ""
 "The name is not currently mapped to a different key. Existing mappings are "
 "removed after 6 months of inactivity from a relay."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:900
+#: /home/runa/tor/website/en/faq.wml:899
 msgid "The relay must have been around for at least two weeks."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:901
+#: /home/runa/tor/website/en/faq.wml:900
 msgid "No other router may have wanted the same name in the past month."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:904
+#: /home/runa/tor/website/en/faq.wml:903
 msgid "<hr /> <a id=\"KeyManagement\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:907
+#: /home/runa/tor/website/en/faq.wml:906
 msgid ""
 "<a class=\"anchor\" href=\"#KeyManagement\">Tell me about all the keys Tor "
 "uses.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:911
+#: /home/runa/tor/website/en/faq.wml:910
 msgid ""
 "Tor uses a variety of different keys, with three goals in mind: 1)  "
 "encryption to ensure privacy of data within the Tor network, 2)  "
@@ -1474,7 +1474,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:919
+#: /home/runa/tor/website/en/faq.wml:918
 msgid ""
 "<b>Encryption</b>: first, all connections in Tor use TLS link encryption, so "
 "observers can't look inside to see which circuit a given cell is intended "
@@ -1485,7 +1485,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:929
+#: /home/runa/tor/website/en/faq.wml:928
 msgid ""
 "<b>Authentication</b>: Every Tor relay has a public decryption key called "
 "the \"onion key\".  When the Tor client establishes circuits, at each step "
@@ -1496,7 +1496,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:939
+#: /home/runa/tor/website/en/faq.wml:938
 msgid ""
 "<b>Coordination</b>: How do clients know what the relays are, and how do "
 "they know that they have the right keys for them? Each relay has a long-term "
@@ -1511,7 +1511,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:953
+#: /home/runa/tor/website/en/faq.wml:952
 msgid ""
 "How do clients know what the directory authorities are? The Tor software "
 "comes with a built-in list of location and public key for each directory "
@@ -1520,7 +1520,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:960
+#: /home/runa/tor/website/en/faq.wml:959
 msgid ""
 "How do users know they've got the right software? When we distribute the "
 "source code or a package, we digitally sign it with <a href=\"http://www.";
@@ -1529,7 +1529,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:968
+#: /home/runa/tor/website/en/faq.wml:967
 msgid ""
 "In order to be certain that it's really signed by us, you need to have met "
 "us in person and gotten a copy of our GPG key fingerprint, or you need to "
@@ -1539,19 +1539,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:975
+#: /home/runa/tor/website/en/faq.wml:974
 msgid "<hr /> <a id=\"EverybodyARelay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:978
+#: /home/runa/tor/website/en/faq.wml:977
 msgid ""
 "<a class=\"anchor\" href=\"#EverybodyARelay\">You should make every Tor user "
 "be a relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:982
+#: /home/runa/tor/website/en/faq.wml:981
 msgid ""
 "Requiring every Tor user to be a relay would help with scaling the network "
 "to handle all our users, and <a href=\"https://wiki.torproject.org/noreply/";
@@ -1566,7 +1566,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:994
+#: /home/runa/tor/website/en/faq.wml:993
 msgid ""
 "That said, we do want to encourage Tor users to run relays, so what we "
 "really want to do is simplify the process of setting up and maintaining a "
@@ -1577,12 +1577,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1003
+#: /home/runa/tor/website/en/faq.wml:1002
 msgid "There are five steps we need to address before we can do this though:"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1007
+#: /home/runa/tor/website/en/faq.wml:1006
 msgid ""
 "First, we need to make Tor stable as a relay on all common operating "
 "systems. The main remaining platform is Windows, and we plan to finally "
@@ -1591,7 +1591,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1015
+#: /home/runa/tor/website/en/faq.wml:1014
 msgid ""
 "Second, we still need to get better at automatically estimating the right "
 "amount of bandwidth to allow. See item #7 on the <a href=\"<page "
@@ -1604,7 +1604,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1026
+#: /home/runa/tor/website/en/faq.wml:1025
 msgid ""
 "Third, we need to work on scalability, both of the network (how to stop "
 "requiring that all Tor relays be able to connect to all Tor relays) and of "
@@ -1616,7 +1616,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1036
+#: /home/runa/tor/website/en/faq.wml:1035
 msgid ""
 "Fourth, we need to better understand the risks from letting the attacker "
 "send traffic through your relay while you're also initiating your own "
@@ -1633,7 +1633,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1052
+#: /home/runa/tor/website/en/faq.wml:1051
 msgid ""
 "Fifth, we might need some sort of incentive scheme to encourage people to "
 "relay traffic for others, and/or to become exit nodes. Here are our <a href="
@@ -1642,43 +1642,43 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1059
+#: /home/runa/tor/website/en/faq.wml:1058
 msgid "Please help on all of these!"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:1062
+#: /home/runa/tor/website/en/faq.wml:1061
 msgid "<hr /> <a id=\"Criminals\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:1065
+#: /home/runa/tor/website/en/faq.wml:1064
 msgid ""
 "<a class=\"anchor\" href=\"#Criminals\">Doesn't Tor enable criminals to do "
 "bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1069
+#: /home/runa/tor/website/en/faq.wml:1068
 msgid ""
 "For the answer to this question and others, please see our <a href=\"<page "
 "faq-abuse>\">Tor Abuse FAQ</a>."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:1073
+#: /home/runa/tor/website/en/faq.wml:1072
 msgid "<hr /> <a id=\"RespondISP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:1076
+#: /home/runa/tor/website/en/faq.wml:1075
 msgid ""
 "<a class=\"anchor\" href=\"#RespondISP\">How do I respond to my ISP about my "
 "exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1080
+#: /home/runa/tor/website/en/faq.wml:1079
 msgid ""
 "A collection of templates for successfully responding to ISPs is <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TorAbuseTemplates";

Modified: translation/trunk/projects/website/nb/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/nb/3-low.download-unix.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/nb/3-low.download-unix.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:06+0100\n"
+"POT-Creation-Date: 2009-12-08 18:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -69,15 +69,15 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:35 /tmp/rgFmwIqE5i.xml:51
-#: /tmp/rgFmwIqE5i.xml:67 /tmp/rgFmwIqE5i.xml:83 /tmp/rgFmwIqE5i.xml:99
-#: /tmp/rgFmwIqE5i.xml:115 /tmp/rgFmwIqE5i.xml:131 /tmp/rgFmwIqE5i.xml:147
-#: /tmp/rgFmwIqE5i.xml:163 /tmp/rgFmwIqE5i.xml:180 /tmp/rgFmwIqE5i.xml:197
+#: /home/runa/tor/website/en/download-unix.wml:35 /tmp/XU8T_CWXWc.xml:51
+#: /tmp/XU8T_CWXWc.xml:67 /tmp/XU8T_CWXWc.xml:83 /tmp/XU8T_CWXWc.xml:99
+#: /tmp/XU8T_CWXWc.xml:115 /tmp/XU8T_CWXWc.xml:131 /tmp/XU8T_CWXWc.xml:147
+#: /tmp/XU8T_CWXWc.xml:163 /tmp/XU8T_CWXWc.xml:180 /tmp/XU8T_CWXWc.xml:197
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:40 /tmp/rgFmwIqE5i.xml:56
+#: /home/runa/tor/website/en/download-unix.wml:40 /tmp/XU8T_CWXWc.xml:56
 msgid "<img src=\"images/distros/centos.png\" alt=\"CentOS 4\" />"
 msgstr ""
 
@@ -120,7 +120,7 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:72 /tmp/rgFmwIqE5i.xml:88
+#: /home/runa/tor/website/en/download-unix.wml:72 /tmp/XU8T_CWXWc.xml:88
 msgid "<img src=\"images/distros/centos.png\" alt=\"CentOS 5\" />"
 msgstr ""
 
@@ -163,7 +163,7 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:104 /tmp/rgFmwIqE5i.xml:120
+#: /home/runa/tor/website/en/download-unix.wml:104 /tmp/XU8T_CWXWc.xml:120
 msgid "<img src=\"images/distros/fedora.png\" alt=\"Fedora Core 10\" />"
 msgstr ""
 
@@ -206,7 +206,7 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:136 /tmp/rgFmwIqE5i.xml:152
+#: /home/runa/tor/website/en/download-unix.wml:136 /tmp/XU8T_CWXWc.xml:152
 msgid "<img src=\"images/distros/suse.png\" alt=\"openSUSE 11\" />"
 msgstr ""
 
@@ -521,8 +521,7 @@
 "See the <a href=\"<page documentation>#Developers\">developer documentation</"
 "a> for instructions on fetching Tor from Git to get the very latest "
 "development version source code.  You can also download the <a href=\"dist/"
-"\">Privoxy source</a> or <a href=\"dist/vidalia-bundles/?C=M;O=D\">Vidalia "
-"source</a>."
+"\">Privoxy source</a> or <a href=\"vidalia/dist/\">Vidalia source</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/nb/3-low.faq-abuse.po
===================================================================
--- translation/trunk/projects/website/nb/3-low.faq-abuse.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/nb/3-low.faq-abuse.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-01 17:53+0100\n"
+"POT-Creation-Date: 2009-12-08 18:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -87,25 +87,32 @@
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/faq-abuse.wml:25
 msgid ""
+"<a href=\"<page faq-abuse>#RemoveContent\">I want some content removed from "
+"a .onion address.</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/en/faq-abuse.wml:26
+msgid ""
 "<a href=\"<page faq-abuse>#LegalQuestions\">I have legal questions about Tor "
 "abuse.</a>"
 msgstr ""
 
 #.  END SIDEBAR 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:29
+#: /home/runa/tor/website/en/faq-abuse.wml:30
 msgid "<hr /> <a id=\"WhatAboutCriminals\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:32
+#: /home/runa/tor/website/en/faq-abuse.wml:33
 msgid ""
 "<a class=\"anchor\" href=\"#WhatAboutCriminals\">Doesn't Tor enable "
 "criminals to do bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:34
+#: /home/runa/tor/website/en/faq-abuse.wml:35
 msgid ""
 "Criminals can already do bad things. Since they're willing to break laws, "
 "they already have lots of options available that provide <em>better</em> "
@@ -117,14 +124,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:42
+#: /home/runa/tor/website/en/faq-abuse.wml:43
 msgid ""
 "Tor aims to provide protection for ordinary people who want to follow the "
 "law. Only criminals have privacy right now, and we need to fix that."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:45
+#: /home/runa/tor/website/en/faq-abuse.wml:46
 msgid ""
 "Some advocates of anonymity explain that it's just a tradeoff &mdash; "
 "accepting the bad uses for the good ones &mdash; but there's more to it than "
@@ -137,7 +144,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:55
+#: /home/runa/tor/website/en/faq-abuse.wml:56
 msgid ""
 "So yes, criminals could in theory use Tor, but they already have better "
 "options, and it seems unlikely that taking Tor away from the world will stop "
@@ -153,19 +160,19 @@
 #. <h3><a class="anchor" href="#Pervasive">If the whole world starts using
 #. Tor, won't civilization collapse?</a></h3>
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:67
+#: /home/runa/tor/website/en/faq-abuse.wml:68
 msgid "<a id=\"DDoS\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:68
+#: /home/runa/tor/website/en/faq-abuse.wml:69
 msgid ""
 "<a class=\"anchor\" href=\"#DDoS\">What about distributed denial of service "
 "attacks?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:70
+#: /home/runa/tor/website/en/faq-abuse.wml:71
 msgid ""
 "Distributed denial of service (DDoS) attacks typically rely on having a "
 "group of thousands of computers all sending floods of traffic to a victim. "
@@ -174,7 +181,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:75
+#: /home/runa/tor/website/en/faq-abuse.wml:76
 msgid ""
 "But because Tor only transports correctly formed TCP streams, not all IP "
 "packets, you cannot send UDP packets over Tor. (You can't do specialized "
@@ -187,18 +194,18 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:84
+#: /home/runa/tor/website/en/faq-abuse.wml:85
 msgid "<a id=\"WhatAboutSpammers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:85
+#: /home/runa/tor/website/en/faq-abuse.wml:86
 msgid ""
 "<a class=\"anchor\" href=\"#WhatAboutSpammers\">What about spammers?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:87
+#: /home/runa/tor/website/en/faq-abuse.wml:88
 msgid ""
 "First of all, the default Tor exit policy rejects all outgoing port 25 "
 "(SMTP) traffic. So sending spam mail through Tor isn't going to work by "
@@ -210,7 +217,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:95
+#: /home/runa/tor/website/en/faq-abuse.wml:96
 msgid ""
 "Of course, it's not all about delivering the mail. Spammers can use Tor to "
 "connect to open HTTP proxies (and from there to SMTP servers); to connect to "
@@ -220,7 +227,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:103
+#: /home/runa/tor/website/en/faq-abuse.wml:104
 msgid ""
 "This is a shame, but notice that spammers are already doing great without "
 "Tor. Also, remember that many of their more subtle communication mechanisms "
@@ -229,33 +236,33 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:109
+#: /home/runa/tor/website/en/faq-abuse.wml:110
 msgid "<a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:110
+#: /home/runa/tor/website/en/faq-abuse.wml:111
 msgid ""
 "<a class=\"anchor\" href=\"#ExitPolicies\">How do Tor exit policies work?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:113
+#: /home/runa/tor/website/en/faq-abuse.wml:114
 msgid "<a href=\"<page faq>#ExitPolicies\">Moved to the new FAQ page</a>"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:116
+#: /home/runa/tor/website/en/faq-abuse.wml:117
 msgid "<a id=\"HowMuchAbuse\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:117
+#: /home/runa/tor/website/en/faq-abuse.wml:118
 msgid "<a class=\"anchor\" href=\"#HowMuchAbuse\">Does Tor get much abuse?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:119
+#: /home/runa/tor/website/en/faq-abuse.wml:120
 msgid ""
 "Not much, in the grand scheme of things. We've been running the network "
 "since October 2003, and it's only generated a handful of complaints. Of "
@@ -267,26 +274,26 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:127
+#: /home/runa/tor/website/en/faq-abuse.wml:128
 msgid ""
 "Since Tor has <a href=\"<page overview>\">many good uses as well</a>, we "
 "feel that we're doing pretty well at striking a balance currently."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:132
+#: /home/runa/tor/website/en/faq-abuse.wml:133
 msgid "<a id=\"TypicalAbuses\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:133
+#: /home/runa/tor/website/en/faq-abuse.wml:134
 msgid ""
 "<a class=\"anchor\" href=\"#TypicalAbuses\">So what should I expect if I run "
 "an exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:135
+#: /home/runa/tor/website/en/faq-abuse.wml:136
 msgid ""
 "If you run a Tor relay that allows exit connections (such as the default "
 "exit policy), it's probably safe to say that you will eventually hear from "
@@ -294,7 +301,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:140
+#: /home/runa/tor/website/en/faq-abuse.wml:141
 msgid ""
 "Somebody connects to Hotmail, and sends a ransom note to a company. The FBI "
 "sends you a polite email, you explain that you run a Tor relay, and they say "
@@ -302,7 +309,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:144
+#: /home/runa/tor/website/en/faq-abuse.wml:145
 msgid ""
 "Somebody tries to get you shut down by using Tor to connect to Google groups "
 "and post spam to Usenet, and then sends an angry mail to your ISP about how "
@@ -310,7 +317,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:147
+#: /home/runa/tor/website/en/faq-abuse.wml:148
 msgid ""
 "Somebody connects to an IRC network and makes a nuisance of himself. Your "
 "ISP gets polite mail about how your computer has been compromised; and/or "
@@ -318,7 +325,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:150
+#: /home/runa/tor/website/en/faq-abuse.wml:151
 msgid ""
 "Somebody uses Tor to download a Vin Diesel movie, and your ISP gets a DMCA "
 "takedown notice. See EFF's <a href=\"<page eff/tor-dmca-response>\">Tor DMCA "
@@ -327,7 +334,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:157
+#: /home/runa/tor/website/en/faq-abuse.wml:158
 msgid ""
 "You might also find that your Tor relay's IP is blocked from accessing some "
 "Internet sites/services. This might happen regardless of your exit policy, "
@@ -337,7 +344,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:164
+#: /home/runa/tor/website/en/faq-abuse.wml:165
 msgid ""
 "Because of a few cases of anonymous jerks messing with its web pages, "
 "Wikipedia is currently blocking many Tor relay IPs from writing (reading "
@@ -349,7 +356,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:173
+#: /home/runa/tor/website/en/faq-abuse.wml:174
 msgid ""
 "SORBS is putting some Tor relay IPs on their email blacklist as well. They "
 "do this because they passively detect whether your relay connects to certain "
@@ -361,19 +368,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:184
+#: /home/runa/tor/website/en/faq-abuse.wml:185
 msgid "<a id=\"IrcBans\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:185
+#: /home/runa/tor/website/en/faq-abuse.wml:186
 msgid ""
 "<a class=\"anchor\" href=\"#IrcBans\">Tor is banned from the IRC network I "
 "want to use.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:187
+#: /home/runa/tor/website/en/faq-abuse.wml:188
 msgid ""
 "Sometimes jerks make use of Tor to troll IRC channels. This abuse results in "
 "IP-specific temporary bans (\"klines\" in IRC lingo), as the network "
@@ -381,7 +388,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:191
+#: /home/runa/tor/website/en/faq-abuse.wml:192
 msgid ""
 "This response underscores a fundamental flaw in IRC's security model: they "
 "assume that IP addresses equate to humans, and by banning the IP address "
@@ -395,7 +402,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:201
+#: /home/runa/tor/website/en/faq-abuse.wml:202
 msgid ""
 "On the other hand, from the viewpoint of IRC server operators, security is "
 "not an all-or-nothing thing.  By responding quickly to trolls or any other "
@@ -409,7 +416,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:211
+#: /home/runa/tor/website/en/faq-abuse.wml:212
 msgid ""
 "But the real answer is to implement application-level auth systems, to let "
 "in well-behaving users and keep out badly-behaving users. This needs to be "
@@ -418,7 +425,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:216
+#: /home/runa/tor/website/en/faq-abuse.wml:217
 msgid ""
 "Of course, not all IRC networks are trying to ban Tor nodes. After all, "
 "quite a few people use Tor to IRC in privacy in order to carry on legitimate "
@@ -429,7 +436,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:223
+#: /home/runa/tor/website/en/faq-abuse.wml:224
 msgid ""
 "If you're being blocked, have a discussion with the network operators and "
 "explain the issues to them. They may not be aware of the existence of Tor at "
@@ -441,7 +448,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:231
+#: /home/runa/tor/website/en/faq-abuse.wml:232
 msgid ""
 "Finally, if you become aware of an IRC network that seems to be blocking "
 "Tor, or a single Tor exit node, please put that information on <a href="
@@ -452,19 +459,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:238
+#: /home/runa/tor/website/en/faq-abuse.wml:239
 msgid "<a id=\"SMTPBans\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:239
+#: /home/runa/tor/website/en/faq-abuse.wml:240
 msgid ""
 "<a class=\"anchor\" href=\"#SMTPBans\">Your nodes are banned from the mail "
 "server I want to use.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:241
+#: /home/runa/tor/website/en/faq-abuse.wml:242
 msgid ""
 "Even though <a href=\"#WhatAboutSpammers\">Tor isn't useful for spamming</"
 "a>, some over-zealous blacklisters seem to think that all open networks like "
@@ -473,7 +480,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:247
+#: /home/runa/tor/website/en/faq-abuse.wml:248
 msgid ""
 "If your server administrators decide to make use of these blacklists to "
 "refuse incoming mail, you should have a conversation with them and explain "
@@ -481,19 +488,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:251
+#: /home/runa/tor/website/en/faq-abuse.wml:252
 msgid "<a id=\"Bans\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:252
+#: /home/runa/tor/website/en/faq-abuse.wml:253
 msgid ""
 "<a class=\"anchor\" href=\"#Bans\">I want to ban the Tor network from my "
 "service.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:254
+#: /home/runa/tor/website/en/faq-abuse.wml:255
 msgid ""
 "We're sorry to hear that. There are some situations where it makes sense to "
 "block anonymous users for an Internet service. But in many cases, there are "
@@ -502,7 +509,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:259
+#: /home/runa/tor/website/en/faq-abuse.wml:260
 msgid ""
 "First, ask yourself if there's a way to do application-level decisions to "
 "separate the legitimate users from the jerks. For example, you might have "
@@ -514,7 +521,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:268
+#: /home/runa/tor/website/en/faq-abuse.wml:269
 msgid ""
 "For example, the <a href=\"http://freenode.net/policy.shtml#tor\";>Freenode "
 "IRC network</a> had a problem with a coordinated group of abusers joining "
@@ -525,7 +532,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:276
+#: /home/runa/tor/website/en/faq-abuse.wml:277
 msgid ""
 "Second, consider that hundreds of thousands of people use Tor every day "
 "simply for good data hygiene &mdash; for example, to protect against data-"
@@ -540,7 +547,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:289
+#: /home/runa/tor/website/en/faq-abuse.wml:290
 msgid ""
 "At this point, you should also ask yourself what you do about other services "
 "that aggregate many users behind a few IP addresses. Tor is not so different "
@@ -548,7 +555,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:293
+#: /home/runa/tor/website/en/faq-abuse.wml:294
 msgid ""
 "Lastly, please remember that Tor relays have <a href=\"<page "
 "faq>#ExitPolicies\">individual exit policies</a>. Many Tor relays do not "
@@ -560,7 +567,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:302
+#: /home/runa/tor/website/en/faq-abuse.wml:303
 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 "
@@ -568,7 +575,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:309
+#: /home/runa/tor/website/en/faq-abuse.wml:310
 msgid ""
 "(Some system administrators block ranges of IP addresses because of official "
 "policy or some abuse pattern, but some have also asked about whitelisting "
@@ -577,19 +584,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:315
+#: /home/runa/tor/website/en/faq-abuse.wml:316
 msgid "<a id=\"TracingUsers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:316
+#: /home/runa/tor/website/en/faq-abuse.wml:317
 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><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:319
+#: /home/runa/tor/website/en/faq-abuse.wml:320
 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 "
@@ -597,7 +604,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:325
+#: /home/runa/tor/website/en/faq-abuse.wml:326
 msgid ""
 "Some fans have suggested that we redesign Tor to include a <a href=\"<page "
 "faq>#Backdoor\">backdoor</a>.  There are two problems with this idea. First, "
@@ -611,7 +618,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:338
+#: /home/runa/tor/website/en/faq-abuse.wml:339
 msgid ""
 "But remember that this doesn't mean that Tor is invulnerable. Traditional "
 "police techniques can still be very effective against Tor, such as "
@@ -620,26 +627,61 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:344
+#: /home/runa/tor/website/en/faq-abuse.wml:345
+msgid "<a id=\"RemoveContent\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/faq-abuse.wml:346
+msgid ""
+"<a class=\"anchor\" href=\"#RemoveContent\">I want some content removed from "
+"a .onion address.</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/faq-abuse.wml:347
+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 "
+"from <a href=\"<page docs/tor-hidden-service>\">a hidden service</a>.  The "
+"name you see ending in .onion is a hidden service descriptor.  It's an "
+"automatically generated name which can be located on any Tor relay or client "
+"anywhere on the Internet.  Hidden services are designed to protect both the "
+"user and service provider from discovering who they are and where they are "
+"from.  The design of hidden services means the owner and location of the ."
+"onion site is hidden even from us."
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/faq-abuse.wml:356
+msgid ""
+"But remember that this doesn't mean that hidden services are invulnerable. "
+"Traditional police techniques can still be very effective against them, such "
+"as interviewing suspects, surveillance and keyboard taps, writing style "
+"analysis, sting operations, and other physical investigations."
+msgstr ""
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/faq-abuse.wml:362
 msgid "<a id=\"LegalQuestions\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:345
+#: /home/runa/tor/website/en/faq-abuse.wml:363
 msgid ""
 "<a class=\"anchor\" href=\"#LegalQuestions\">I have legal questions about "
 "Tor abuse.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:347
+#: /home/runa/tor/website/en/faq-abuse.wml:365
 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><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:350
+#: /home/runa/tor/website/en/faq-abuse.wml:368
 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/nb/3-low.news.po
===================================================================
--- translation/trunk/projects/website/nb/3-low.news.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/nb/3-low.news.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-01 17:53+0100\n"
+"POT-Creation-Date: 2009-12-08 18:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -34,13 +34,21 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/news.wml:16
 msgid ""
+"10 October 2009: Tor 0.2.1.20 released as stable.  Read the <a href="
+"\"https://blog.torproject.org/blog/tor-02120-released\";>announcement</a> for "
+"the updates and changes."
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/news.wml:17
+msgid ""
 "28 July 2009: Tor 0.2.1.19 released as stable.  Read the <a href=\"http://";
 "archives.seul.org/or/announce/Aug-2009/msg00000.html\">announcement</a> for "
 "the updates and changes."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:19
+#: /home/runa/tor/website/en/news.wml:20
 msgid ""
 "25 June 2009: Tor 0.2.0.35 released as stable.  Read the <a href=\"http://";
 "archives.seul.org/or/announce/Jun-2009/msg00000.html\">announcement</a> for "
@@ -48,7 +56,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:21
+#: /home/runa/tor/website/en/news.wml:22
 msgid ""
 "12 March 2009: Tor launches performance roadmap and campaign.  Read the <a "
 "href=\"<page press/2009-03-12-performance-roadmap-press-release>\">Press "
@@ -56,7 +64,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:22
+#: /home/runa/tor/website/en/news.wml:23
 msgid ""
 "09 February 2009: Tor 0.2.0.34 released as stable.  Read the <a href="
 "\"http://archives.seul.org/or/announce/Feb-2009/msg00000.html";
@@ -65,7 +73,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:25
+#: /home/runa/tor/website/en/news.wml:26
 msgid ""
 "21 January 2009: Tor 0.2.0.33 released as stable.  Read the <a href=\"http://";
 "archives.seul.org/or/announce/Jan-2009/msg00000.html\">announcement</a> for "
@@ -73,7 +81,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:28
+#: /home/runa/tor/website/en/news.wml:29
 msgid ""
 "19 December 2008: Tor releases 3-year development roadmap.  Read the <a href="
 "\"<page press/2008-12-19-roadmap-press-release>\">Press Release</a> for more "
@@ -81,7 +89,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:31
+#: /home/runa/tor/website/en/news.wml:32
 msgid ""
 "05 December 2008: Tor 0.2.0.32 released as stable.  Read the <a href="
 "\"http://archives.seul.org/or/announce/Dec-2008/msg00000.html";
@@ -89,7 +97,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:34
+#: /home/runa/tor/website/en/news.wml:35
 msgid ""
 "08 September 2008: Tor 0.2.0.31 released as stable. Read the <a href="
 "\"http://archives.seul.org/or/announce/Sep-2008/msg00000.html";
@@ -97,7 +105,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:37
+#: /home/runa/tor/website/en/news.wml:38
 msgid ""
 "25 August 2008: Tor 0.2.0.30 released as stable.  Read the <a href=\"http://";
 "archives.seul.org/or/announce/Aug-2008/msg00000.html\">announcement</a> or "
@@ -106,7 +114,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:42
+#: /home/runa/tor/website/en/news.wml:43
 msgid ""
 "25 May 2008: Tor receives two awards from the <a href=\"http://nlnet.nl/";
 "\">NLnet Foundation</a>.  The first is to improve the performance of hidden "
@@ -116,7 +124,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:49
+#: /home/runa/tor/website/en/news.wml:50
 msgid ""
 "13 May 2008: <a href=\"http://archives.seul.org/or/talk/May-2008/msg00048.";
 "html\">Tor 0.2.0.26-rc</a> replaces several V3 directory authority keys "
@@ -135,14 +143,14 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:62
+#: /home/runa/tor/website/en/news.wml:63
 msgid ""
 "Mar 2008: <a href=\"https://blog.torproject.org/blog/tor-project-google-";
 "summer-code-2008!\">Tor Project is in Google Summer of Code 2008!</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:66
+#: /home/runa/tor/website/en/news.wml:67
 msgid ""
 "Feb 2008: The <a href=\"https://www.torproject.org/people#Board\";>Board of "
 "Directors</a> welcomes <a href=\"https://blog.torproject.org/blog/isaac-mao-";
@@ -151,14 +159,14 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:72
+#: /home/runa/tor/website/en/news.wml:73
 msgid ""
 "Feb 2008: Tor is happy to announce the <a href=\"https://blog.torproject.org";
 "\">official Tor blog</a>."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:75
+#: /home/runa/tor/website/en/news.wml:76
 msgid ""
 "Jan 2008: <a href=\"<page download>\">Tor 0.1.2.19</a> (the latest stable "
 "release) fixes a huge memory leak on exit relays, makes the default exit "
@@ -169,7 +177,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:83
+#: /home/runa/tor/website/en/news.wml:84
 msgid ""
 "Oct 2007: <a href=\"<page download>\">Tor 0.1.2.18</a> (the new stable "
 "release) fixes many problems including crash bugs, problems with hidden "
@@ -183,7 +191,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:93
+#: /home/runa/tor/website/en/news.wml:94
 msgid ""
 "Oct 2007: As many of you know, The Tor Project became an <a href=\"<page "
 "people>\">independent and official nonprofit</a> this past February. We did "
@@ -197,7 +205,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:105
+#: /home/runa/tor/website/en/news.wml:106
 msgid ""
 "Sep 2007: If you have received email claiming to be Tor, it wasn't from us. "
 "The <a href=\"<page download>\">official Tor bundles</a> can be <a href="
@@ -205,7 +213,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:109
+#: /home/runa/tor/website/en/news.wml:110
 msgid ""
 "Aug 2007: <strong>Please update your Tor software!</strong> The latest "
 "versions (stable: 0.1.2.17; development: 0.2.0.6-alpha)  patch a significant "
@@ -215,7 +223,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:115
+#: /home/runa/tor/website/en/news.wml:116
 msgid ""
 "Feb 2007: The Tor Project and UColo/Boulder <a href=\"http://blogs.law.";
 "harvard.edu/anonymous/2007/02/26/the-rumors-of-our-demise/\">respond</a> to "
@@ -224,7 +232,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:120
+#: /home/runa/tor/website/en/news.wml:121
 msgid ""
 "Jan 2007: The Tor network has grown to hundreds of thousands of users. The "
 "developers can't do all the new features, bug fixes, and documentation. <a "
@@ -232,7 +240,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:124
+#: /home/runa/tor/website/en/news.wml:125
 msgid ""
 "<b>We are actively looking for new sponsors and funding.</b> If your "
 "organization has an interest in keeping the Tor network usable and fast, "

Modified: translation/trunk/projects/website/nb/3-low.people.po
===================================================================
--- translation/trunk/projects/website/nb/3-low.people.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/nb/3-low.people.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:06+0100\n"
+"POT-Creation-Date: 2009-12-08 18:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -121,12 +121,25 @@
 
 #. type: Content of: <div><dl><dt>
 #: /home/runa/tor/website/en/people.wml:49
-msgid "Sebastian Hahn"
+msgid "Melissa Gilroy (CFO and Internal Audit)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:49
 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 "
+"operations moving along."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:53
+msgid "Sebastian Hahn"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:53
+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 "
 "Code on expanding Thandy to include BitTorrent support. Generally helps out "
@@ -134,14 +147,14 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:53
+#: /home/runa/tor/website/en/people.wml:57
 msgid ""
 "Andrew Lewman (Executive Director; Director; <a href=\"<page press/index>"
 "\">press contact</a>)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:54
+#: /home/runa/tor/website/en/people.wml:58
 msgid ""
 "Manages the business operations of The Tor Project, Inc.  Plays roles of "
 "finance, advocacy, project management, and general support.  General package "
@@ -149,12 +162,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:58
+#: /home/runa/tor/website/en/people.wml:62
 msgid "Karsten Loesing (Developer)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:58
+#: /home/runa/tor/website/en/people.wml:62
 msgid ""
 "Worked during the 2007 Google Summer of Code on <a href=\"<svnsandbox>doc/"
 "spec/proposals/114-distributed-storage.txt\">distributing and securing the "
@@ -164,24 +177,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:66
+#: /home/runa/tor/website/en/people.wml:70
 msgid "Nick Mathewson (Chief architect; Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:66
+#: /home/runa/tor/website/en/people.wml:70
 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><dl><dt>
-#: /home/runa/tor/website/en/people.wml:69
+#: /home/runa/tor/website/en/people.wml:73
 msgid "Steven Murdoch (Researcher and Developer)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:69
+#: /home/runa/tor/website/en/people.wml:73
 msgid ""
 "Researcher at the University of Cambridge, currently funded by The Tor "
 "Project to improve the security, performance, and usability of Tor. Creator "
@@ -189,36 +202,36 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:74
+#: /home/runa/tor/website/en/people.wml:78
 msgid "Peter Palfrader"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:74
+#: /home/runa/tor/website/en/people.wml:78
 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><dl><dt>
-#: /home/runa/tor/website/en/people.wml:77
+#: /home/runa/tor/website/en/people.wml:81
 msgid "Martin Peck (Developer)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:77
+#: /home/runa/tor/website/en/people.wml:81
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:79
+#: /home/runa/tor/website/en/people.wml:83
 msgid "Mike Perry (Developer)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:79
+#: /home/runa/tor/website/en/people.wml:83
 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 "
@@ -227,24 +240,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:84
+#: /home/runa/tor/website/en/people.wml:88
 msgid "Karen Reilly (Development Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:84
+#: /home/runa/tor/website/en/people.wml:88
 msgid ""
 "Responsible for fundraising, advocacy, and general marketing and outreach "
 "programs for Tor."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:87
+#: /home/runa/tor/website/en/people.wml:91
 msgid "Paul Syverson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:87
+#: /home/runa/tor/website/en/people.wml:91
 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 "
@@ -253,69 +266,69 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:94
+#: /home/runa/tor/website/en/people.wml:98
 msgid "<a id=\"Board\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:95
+#: /home/runa/tor/website/en/people.wml:99
 msgid ""
 "<a class=\"anchor\" href=\"#Board\">The Tor Project Board of Directors:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:99
+#: /home/runa/tor/website/en/people.wml:103
 msgid "Ian Goldberg (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:99
+#: /home/runa/tor/website/en/people.wml:103
 msgid ""
 "Cryptographer, privacy expert, and professor; one of the designers of <a "
 "href=\"http://www.cypherpunks.ca/otr/\";>Off-the-Record Messaging</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:102
+#: /home/runa/tor/website/en/people.wml:106
 msgid "Xianghui (Isaac) Mao (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:102
+#: /home/runa/tor/website/en/people.wml:106
 msgid ""
 "Chinese blogging and privacy activist.  His current activities can be found "
 "at <a href=\"http://isaacmao.com/\";>his website</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:105
+#: /home/runa/tor/website/en/people.wml:109
 msgid "Frank Rieger (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:105
+#: /home/runa/tor/website/en/people.wml:109
 msgid "CTO of <a href=\"http://www.gsmk.de/\";>GSMK Cryptophone</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:107
+#: /home/runa/tor/website/en/people.wml:111
 msgid "Wendy Seltzer (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:107
+#: /home/runa/tor/website/en/people.wml:111
 msgid ""
 "Lawyer, cyberlaw professor, and founder of <a href=\"http://chillingeffects.";
 "org/\">ChillingEffects.org</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:110
+#: /home/runa/tor/website/en/people.wml:114
 msgid "Fred von Lohmann (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:110
+#: /home/runa/tor/website/en/people.wml:114
 msgid ""
 "Fred is a Senior Intellectual Property Attorney at the Electronic Frontier "
 "Foundation (EFF). His complete bio can be found at the <a href=\"http://www.";
@@ -323,27 +336,27 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:115
+#: /home/runa/tor/website/en/people.wml:119
 msgid "Along with Roger, Nick, and Andrew listed above as Directors."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:118
+#: /home/runa/tor/website/en/people.wml:122
 msgid "<a id=\"Summer\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:119
+#: /home/runa/tor/website/en/people.wml:123
 msgid "<a class=\"anchor\" href=\"#Summer\">Summer students:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:122
+#: /home/runa/tor/website/en/people.wml:126
 msgid "Christopher Davis"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:122
+#: /home/runa/tor/website/en/people.wml:126
 msgid ""
 "Adapts Polipo to depend upon the libevent library, making use of its event "
 "loop, asynchronous DNS resolver, and utility library. (<a href=\"http://www.";
@@ -352,12 +365,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:128
+#: /home/runa/tor/website/en/people.wml:132
 msgid "Damian Johnson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:128
+#: /home/runa/tor/website/en/people.wml:132
 msgid ""
 "Builds a command-line application for monitoring Tor relays, providing real-"
 "time status information such as the current configuration, bandwidth usage, "
@@ -366,12 +379,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:132
+#: /home/runa/tor/website/en/people.wml:136
 msgid "Kory Kirk"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:132
+#: /home/runa/tor/website/en/people.wml:136
 msgid ""
 "Extends <a href=\"<page torbutton/index>\">Torbutton</a> by implementing "
 "three feature requests, namely the <a href=\"https://bugs.torproject.org/";
@@ -384,12 +397,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:143
+#: /home/runa/tor/website/en/people.wml:147
 msgid "Runa Sandvik"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:143
+#: /home/runa/tor/website/en/people.wml:147
 msgid ""
 "Improves usability of <a href=\"https://translation.torproject.org/";
 "\">translating the website</a> by automatically converting wml files to po "
@@ -399,12 +412,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:150
+#: /home/runa/tor/website/en/people.wml:154
 msgid "Stephen Tyree"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:150
+#: /home/runa/tor/website/en/people.wml:154
 msgid ""
 "Develops a plugin API for <a href=\"<page vidalia/index>\">Vidalia</a> and "
 "creates a plugin to allow HerdictWeb integration, a project aiming at "
@@ -415,136 +428,136 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:161
+#: /home/runa/tor/website/en/people.wml:165
 msgid "<a id=\"Translators\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:162
+#: /home/runa/tor/website/en/people.wml:166
 msgid "<a class=\"anchor\" href=\"#Translators\">Core translators:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:165
+#: /home/runa/tor/website/en/people.wml:169
 msgid "Bogdan Drozdowski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:165
+#: /home/runa/tor/website/en/people.wml:169
 msgid "<a href=\"https://www.torproject.org/index.html.pl\";>Polish</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:167
+#: /home/runa/tor/website/en/people.wml:171
 msgid "fredzupy"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:167
+#: /home/runa/tor/website/en/people.wml:171
 msgid "<a href=\"https://www.torproject.org/index.html.fr\";>French</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:169
+#: /home/runa/tor/website/en/people.wml:173
 msgid ""
 "Ruben Garcia, plus further pages by <a href=\"http://www.greentranslations.";
 "com/\">Green Crescent</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:170
+#: /home/runa/tor/website/en/people.wml:174
 msgid "<a href=\"https://www.torproject.org/index.html.es\";>Spanish</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:172
+#: /home/runa/tor/website/en/people.wml:176
 msgid "Jens Kubieziel and Oliver Knapp"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:172
+#: /home/runa/tor/website/en/people.wml:176
 msgid "<a href=\"https://www.torproject.org/index.html.de\";>German</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:174
+#: /home/runa/tor/website/en/people.wml:178
 msgid "Pei Hanru and bridgefish"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:174
+#: /home/runa/tor/website/en/people.wml:178
 msgid ""
 "<a href=\"https://www.torproject.org/index.html.zh-cn\";>Simplified Chinese</"
 "a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:176
+#: /home/runa/tor/website/en/people.wml:180
 msgid "Jan Reister"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:176
+#: /home/runa/tor/website/en/people.wml:180
 msgid "<a href=\"https://www.torproject.org/index.html.it\";>Italian</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:178
+#: /home/runa/tor/website/en/people.wml:182
 msgid "Masaki Taniguchi"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:178
+#: /home/runa/tor/website/en/people.wml:182
 msgid "<a href=\"https://www.torproject.org/index.html.ja\";>Japanese</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:180
+#: /home/runa/tor/website/en/people.wml:184
 msgid "Jan Woning"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:180
+#: /home/runa/tor/website/en/people.wml:184
 msgid "<a href=\"https://www.torproject.org/index.html.nl\";>Dutch</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:182
+#: /home/runa/tor/website/en/people.wml:186
 msgid "ygrek"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:182
+#: /home/runa/tor/website/en/people.wml:186
 msgid "<a href=\"https://www.torproject.org/index.html.ru\";>Russian</a>."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:186
+#: /home/runa/tor/website/en/people.wml:190
 msgid "<a id=\"Volunteers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:187
+#: /home/runa/tor/website/en/people.wml:191
 msgid "<a class=\"anchor\" href=\"#Volunteers\">More volunteers:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:190
+#: /home/runa/tor/website/en/people.wml:194
 msgid "Anonym"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:190
+#: /home/runa/tor/website/en/people.wml:194
 msgid "Maintainer of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:191
+#: /home/runa/tor/website/en/people.wml:195
 msgid "Kevin Bankston"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:191
+#: /home/runa/tor/website/en/people.wml:195
 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 "
@@ -552,24 +565,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:195
+#: /home/runa/tor/website/en/people.wml:199
 msgid "Kasimir Gabert"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:195
+#: /home/runa/tor/website/en/people.wml:199
 msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\";>TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:197
+#: /home/runa/tor/website/en/people.wml:201
 msgid "Geoff Goodell"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:197
+#: /home/runa/tor/website/en/people.wml:201
 msgid ""
 "Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/";
 "\">Blossom project</a> which uses Tor as its overlay network; also helped "
@@ -577,12 +590,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:201
+#: /home/runa/tor/website/en/people.wml:205
 msgid "Aleksei Gorny"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:201
+#: /home/runa/tor/website/en/people.wml:205
 msgid ""
 "Working on Tor exit scanner improvements (<a href=\"https://svn.torproject.";
 "org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
@@ -590,83 +603,83 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:208
 msgid "Robert Hogan"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:208
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\";>TorK</a> Tor controller."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:210
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:210
 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><dl><dt>
-#: /home/runa/tor/website/en/people.wml:208
+#: /home/runa/tor/website/en/people.wml:212
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:208
+#: /home/runa/tor/website/en/people.wml:212
 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><dl><dt>
-#: /home/runa/tor/website/en/people.wml:211
+#: /home/runa/tor/website/en/people.wml:215
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:211
+#: /home/runa/tor/website/en/people.wml:215
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:213
+#: /home/runa/tor/website/en/people.wml:217
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:213
+#: /home/runa/tor/website/en/people.wml:217
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:219
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:220
 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><dl><dt>
-#: /home/runa/tor/website/en/people.wml:218
+#: /home/runa/tor/website/en/people.wml:222
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:218
+#: /home/runa/tor/website/en/people.wml:222
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy";
@@ -675,24 +688,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:227
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:227
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:230
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:230
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?";
 "p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/";
@@ -701,7 +714,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:231
+#: /home/runa/tor/website/en/people.wml:235
 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, "
@@ -709,22 +722,22 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:240
 msgid "<a id=\"Past\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:237
+#: /home/runa/tor/website/en/people.wml:241
 msgid "<a class=\"anchor\" href=\"#Past\">Past thanks to:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:240
+#: /home/runa/tor/website/en/people.wml:244
 msgid "Domenik Bork"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:240
+#: /home/runa/tor/website/en/people.wml:244
 msgid ""
 "Worked on Configuration of Hidden Services with User Authorization in "
 "Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches/";
@@ -732,12 +745,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:243
+#: /home/runa/tor/website/en/people.wml:247
 msgid "Benedikt Boss"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:243
+#: /home/runa/tor/website/en/people.wml:247
 msgid ""
 "Worked during the 2007 Google Summer of Code on <a href=\"https://svn.";
 "torproject.org/svn/topf/trunk/README\">TOPF</a>, a fuzzer for Tor; mentored "
@@ -745,22 +758,22 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:246
+#: /home/runa/tor/website/en/people.wml:250
 msgid "Ren Bucholz"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:246
+#: /home/runa/tor/website/en/people.wml:250
 msgid "Our fine logo and images."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:251
 msgid "Fallon Chen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:251
 msgid ""
 "Worked on Improving Tor Path Selection (<a href=\"https://svn.torproject.org/";
 "cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>)  and <a href="
@@ -770,42 +783,42 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:253
+#: /home/runa/tor/website/en/people.wml:257
 msgid "Bram Cohen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:253
+#: /home/runa/tor/website/en/people.wml:257
 msgid "Helped design our congestion control mechanisms, in Tor's early days."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:259
 msgid "Pat Double"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:259
 msgid "Creator of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:256
+#: /home/runa/tor/website/en/people.wml:260
 msgid "Justin Hipple"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:256
+#: /home/runa/tor/website/en/people.wml:260
 msgid "The other developer for Vidalia."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:257
+#: /home/runa/tor/website/en/people.wml:261
 msgid "Christian King"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:257
+#: /home/runa/tor/website/en/people.wml:261
 msgid ""
 "Worked during the 2007 Google Summer of Code on making Tor relays stable on "
 "Windows, by developing a <a href=\"https://svn.torproject.org/svn/libevent-";
@@ -813,70 +826,70 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:262
+#: /home/runa/tor/website/en/people.wml:266
 msgid "Joe Kowalski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:262
+#: /home/runa/tor/website/en/people.wml:266
 msgid ""
 "Original author and provider of the torstatus script formerly run on "
 "nighteffect."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:264
+#: /home/runa/tor/website/en/people.wml:268
 msgid "Adam Langley"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:264
+#: /home/runa/tor/website/en/people.wml:268
 msgid "Our fine eventdns code."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:269
 msgid "Rebecca MacKinnon"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:269
 msgid ""
 "Former Director of Tor.  Co-Founder of <a href=\"http://www.";
 "globalvoicesonline.org/\">Global Voices Online</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:271
 msgid "Chris Palmer"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:271
 msgid ""
 "Our liaison and tech guy with EFF while EFF was funding us. Also helped "
 "advocate and write end-user docs."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:269
+#: /home/runa/tor/website/en/people.wml:273
 msgid "Matej Pfajfar"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:269
+#: /home/runa/tor/website/en/people.wml:273
 msgid ""
 "Author of the original onion routing code that Tor is based on, so we didn't "
 "have to start from scratch."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:271
+#: /home/runa/tor/website/en/people.wml:275
 msgid "Johannes Renner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:271
+#: /home/runa/tor/website/en/people.wml:275
 msgid ""
 "Worked during the 2007 Google Summer of Code on modifying <a href=\"https://";
 "svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a> to measure various "
@@ -884,23 +897,23 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Scott Squires"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:280
 msgid ""
 "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:282
 msgid "Camilo Viecco"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:282
 msgid ""
 "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac.";
 "vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
@@ -908,12 +921,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:281
+#: /home/runa/tor/website/en/people.wml:285
 msgid "Christian Wilms"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:281
+#: /home/runa/tor/website/en/people.wml:285
 msgid ""
 "Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
 "\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";
@@ -921,12 +934,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:284
+#: /home/runa/tor/website/en/people.wml:288
 msgid "Jillian C. York"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:284
+#: /home/runa/tor/website/en/people.wml:288
 msgid ""
 "<a href=\"http://jilliancyork.com/\";>Jillian C. York</a> is a writer, "
 "blogger, and activist based in Boston.  She blogs on the uses of Tor and "

Modified: translation/trunk/projects/website/nb/3-low.sponsors.po
===================================================================
--- translation/trunk/projects/website/nb/3-low.sponsors.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/nb/3-low.sponsors.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-01 17:53+0100\n"
+"POT-Creation-Date: 2009-12-08 18:49+0100\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,143 +30,158 @@
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/sponsors.wml:19
-msgid "<i>Liliopsida</i> (up to $750k)"
+#: /home/runa/tor/website/en/sponsors.wml:17
+msgid "<i>Magnoliophyta</i> (over $1 million)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:21
+#: /home/runa/tor/website/en/sponsors.wml:19 /tmp/uPsMbyFkhA.xml:35
 msgid "You?"
 msgstr ""
 
 #. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/sponsors.wml:22
+msgid "<i>Liliopsida</i> (up to $750k)"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/sponsors.wml:24
+msgid "An anonymous North American NGO (2008-2009)"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/sponsors.wml:27
 msgid "<i>Asparagales</i> (up to $500k)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:26
+#: /home/runa/tor/website/en/sponsors.wml:29
 msgid ""
 "<a href=\"http://www.ibb.gov/\";>International Broadcasting Bureau</a> (2006-"
 "2009)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:27
+#: /home/runa/tor/website/en/sponsors.wml:30
 msgid "An anonymous European NGO (2006-2008)"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/sponsors.wml:30
+#: /home/runa/tor/website/en/sponsors.wml:33
 msgid "<i>Alliaceae</i> (up to $200k)"
 msgstr ""
 
-#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:32
-msgid "An anonymous North American NGO (2008-2009)"
-msgstr ""
-
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/sponsors.wml:35
+#: /home/runa/tor/website/en/sponsors.wml:38
 msgid "<i>Allium</i> (up to $100k)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:37
+#: /home/runa/tor/website/en/sponsors.wml:40
 msgid "<a href=\"http://www.nlnet.nl/\";>NLnet Foundation</a> (2008-2009)"
 msgstr ""
 
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/sponsors.wml:41
+msgid ""
+"<a href=\"http://chacs.nrl.navy.mil/\";>Naval Research Laboratory</a> (2006-"
+"2009)"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/sponsors.wml:42
+msgid "An anonymous North American ISP (2009)"
+msgstr ""
+
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/sponsors.wml:40
+#: /home/runa/tor/website/en/sponsors.wml:45
 msgid "<i>Allium cepa</i> (up to $50k)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:42
+#: /home/runa/tor/website/en/sponsors.wml:47
 msgid ""
 "<a href=\"<page donate>\">More than 500 personal donations from individuals "
 "like you</a> (2006-2009)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:43
+#: /home/runa/tor/website/en/sponsors.wml:48
 msgid "<a href=\"http://code.google.com/opensource/\";>Google</a> (2008)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:44
+#: /home/runa/tor/website/en/sponsors.wml:49
 msgid ""
 "<a href=\"http://code.google.com/soc/\";>Google Summer of Code</a> (2007-2009)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:45
+#: /home/runa/tor/website/en/sponsors.wml:50
 msgid "<a href=\"http://www.hrw.org/\";>Human Rights Watch</a> (2007)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:46
-msgid ""
-"<a href=\"http://chacs.nrl.navy.mil/\";>Naval Research Laboratory</a> (2006-"
-"2009)"
+#: /home/runa/tor/website/en/sponsors.wml:51
+msgid "<a href=\"http://www.torfox.org/\";>Torfox</a> (2009)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:47
-msgid "<a href=\"http://www.torfox.org/\";>Torfox</a> (2009)"
+#: /home/runa/tor/website/en/sponsors.wml:52
+msgid "<a href=\"http://www.shinjiru.com/\";>Shinjiru Technology</a> (2009)"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/sponsors.wml:50
+#: /home/runa/tor/website/en/sponsors.wml:55
 msgid "Past sponsors"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/sponsors.wml:51
+#: /home/runa/tor/website/en/sponsors.wml:56
 msgid ""
 "We greatly appreciate the support provided by our past sponsors in keeping "
 "the pre-501(c)(3) Tor Project progressing through our ambitious goals"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:53
+#: /home/runa/tor/website/en/sponsors.wml:58
 msgid ""
 "<a href=\"https://www.eff.org/\";>Electronic Frontier Foundation</a> (2004-"
 "2005)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:54
+#: /home/runa/tor/website/en/sponsors.wml:59
 msgid ""
 "<a href=\"http://chacs.nrl.navy.mil/\";>DARPA and ONR via Naval Research "
 "Laboratory</a> (2001-2006)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:55
+#: /home/runa/tor/website/en/sponsors.wml:60
 msgid "<a href=\"http://www.cyber-ta.org/\";>Cyber-TA project</a> (2006-2008)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:56
+#: /home/runa/tor/website/en/sponsors.wml:61
 msgid "Bell Security Solutions Inc (2006)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:57
+#: /home/runa/tor/website/en/sponsors.wml:62
 msgid ""
 "<a href=\"http://www.omidyar.net/\";>Omidyar Network Enzyme Grant</a> (2006)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:58
+#: /home/runa/tor/website/en/sponsors.wml:63
 msgid ""
 "<a href=\"http://seclab.cs.rice.edu/lab/2005/08/01/seclab-awarded-grant-to-";
 "study-security-of-p2p/\">NSF via Rice University</a> (2006-2007)"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/sponsors.wml:60
+#: /home/runa/tor/website/en/sponsors.wml:65
 msgid ""
 "Thank you to all the people and groups who have made Tor possible so far, "
 "and thank you especially to the individual volunteers who have made non-"

Modified: translation/trunk/projects/website/nb/4-optional.running-a-mirror.po
===================================================================
--- translation/trunk/projects/website/nb/4-optional.running-a-mirror.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/nb/4-optional.running-a-mirror.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-01 17:53+0100\n"
+"POT-Creation-Date: 2009-12-08 18:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -52,8 +52,8 @@
 #: /home/runa/tor/website/en/running-a-mirror.wml:36
 msgid ""
 "In order to assure we have reliable and up to date mirrors, please ensure "
-"your mirror does at least the following:<br/><br/> Updates no later than "
-"every six hours, but no more frequent than every hour.<br/><br/> Allows "
+"your mirror does at least the following:<br/><br/> Updates <b>no less</b> "
+"than every six hours, but no more frequent than every hour.<br/><br/> Allows "
 "\"Directory Index / Indexes\" (Index viewing) of the /dist directory.<br/"
 "><br/> Allows \"Multiviews\" or equivalent for language localization.<br/"
 "><br/> Have a valid contact email for administrative communications should "
@@ -62,7 +62,7 @@
 msgstr ""
 
 #. type: Content of: <div><p><A>
-#: /home/runa/tor/website/en/running-a-mirror.wml:51 /tmp/yMkNGo6S3F.xml:95
+#: /home/runa/tor/website/en/running-a-mirror.wml:51 /tmp/v_uvBNN2Ii.xml:95
 msgid "tor-mirrors mailing list"
 msgstr ""
 
@@ -92,7 +92,7 @@
 #, no-wrap
 msgid ""
 "\n"
-"0 */6 * * * rsync -av --delete rsync://rsync.torproject.org/tor/ /var/www/mirrors/torproject.org\n"
+"0 */6 * * * rsync -aq --delete rsync://rsync.torproject.org/tor/ /var/www/mirrors/torproject.org\n"
 msgstr ""
 
 #. type: Content of: <div><p><p>

Modified: translation/trunk/projects/website/nb/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/nb/4-optional.volunteer.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/nb/4-optional.volunteer.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 13:40+0100\n"
+"POT-Creation-Date: 2009-12-08 18:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -53,18 +53,25 @@
 "love to hear from you."
 msgstr ""
 
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/volunteer.wml:27
+msgid ""
+"Tor has <a href=\"<page open-positions>\">two open positions</a>, please <a "
+"href=\"<page contact>\">contact us</a> if you are qualified!"
+msgstr ""
+
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:27
+#: /home/runa/tor/website/en/volunteer.wml:30
 msgid "<a id=\"Usability\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:28
+#: /home/runa/tor/website/en/volunteer.wml:31
 msgid "<a class=\"anchor\" href=\"#Usability\">Supporting Applications</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:30
+#: /home/runa/tor/website/en/volunteer.wml:33
 msgid ""
 "We need more and better ways to intercept DNS requests so they don't \"leak"
 "\" their request to a local observer while we're trying to be anonymous. "
@@ -73,12 +80,12 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:34
+#: /home/runa/tor/website/en/volunteer.wml:37
 msgid "Tsocks/dsocks items:"
 msgstr ""
 
 #. type: Content of: <div><ol><li><ul><li>
-#: /home/runa/tor/website/en/volunteer.wml:36
+#: /home/runa/tor/website/en/volunteer.wml:39
 msgid ""
 "We should patch Dug Song's \"dsocks\" program to use Tor's <i>mapaddress</i> "
 "commands from the controller interface, so we don't waste a whole round-trip "
@@ -86,7 +93,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li><ul><li>
-#: /home/runa/tor/website/en/volunteer.wml:40
+#: /home/runa/tor/website/en/volunteer.wml:43
 msgid ""
 "We need to make our <i>torify</i> script detect which of tsocks or dsocks is "
 "installed, and call them appropriately. This probably means unifying their "
@@ -95,7 +102,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:46
+#: /home/runa/tor/website/en/volunteer.wml:49
 msgid ""
 "People running relays tell us they want to have one BandwidthRate during "
 "some part of the day, and a different BandwidthRate at other parts of the "
@@ -106,7 +113,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:54
+#: /home/runa/tor/website/en/volunteer.wml:57
 msgid ""
 "Speaking of geolocation data, somebody should draw a map of the Earth with a "
 "pin-point for each Tor relay. Bonus points if it updates as the network "
@@ -116,17 +123,17 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:61
+#: /home/runa/tor/website/en/volunteer.wml:64
 msgid "<a id=\"Advocacy\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:62
+#: /home/runa/tor/website/en/volunteer.wml:65
 msgid "<a class=\"anchor\" href=\"#Advocacy\">Advocacy</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:64
+#: /home/runa/tor/website/en/volunteer.wml:67
 msgid ""
 "Create a <a href=\"https://wiki.torproject.org/noreply/CommunityLogos";
 "\">community logo</a> under a Creative Commons license that all can use and "
@@ -134,45 +141,45 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:65
+#: /home/runa/tor/website/en/volunteer.wml:68
 msgid ""
 "Create a presentation that can be used for various user group meetings "
 "around the world"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:66
+#: /home/runa/tor/website/en/volunteer.wml:69
 msgid ""
 "Create a video about your positive uses of Tor.  Some have already started "
-"on Seesmic."
+"on <a href=\"http://tinyvid.tv\";>TinyVid</a>."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:67
+#: /home/runa/tor/website/en/volunteer.wml:70
 msgid ""
 "Create a poster, or a set of posters, around a theme, such as \"Tor for "
 "Freedom!\""
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:70
+#: /home/runa/tor/website/en/volunteer.wml:73
 msgid "<a id=\"Documentation\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:71
+#: /home/runa/tor/website/en/volunteer.wml:74
 msgid "<a class=\"anchor\" href=\"#Documentation\">Documentation</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:73
+#: /home/runa/tor/website/en/volunteer.wml:76
 msgid ""
 "Please help Matt Edman with the documentation and how-tos for his Tor "
 "controller, <a href=\"<page vidalia/index>\">Vidalia</a>."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:76
+#: /home/runa/tor/website/en/volunteer.wml:79
 msgid ""
 "Evaluate and document <a href=\"https://wiki.torproject.org/wiki/";
 "TheOnionRouter/TorifyHOWTO\">our list of programs</a> that can be configured "
@@ -180,7 +187,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:79
+#: /home/runa/tor/website/en/volunteer.wml:82
 msgid ""
 "We need better documentation for dynamically intercepting connections and "
 "sending them through Tor. tsocks (Linux), dsocks (BSD), and freecap "
@@ -189,7 +196,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:83
+#: /home/runa/tor/website/en/volunteer.wml:86
 msgid ""
 "We have a huge list of <a href=\"https://wiki.torproject.org/noreply/";
 "TheOnionRouter/SupportPrograms\">potentially useful programs that interface "
@@ -198,7 +205,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:86
+#: /home/runa/tor/website/en/volunteer.wml:89
 msgid ""
 "Help translate the web page and documentation into other languages. See the "
 "<a href=\"<page translation>\">translation guidelines</a> if you want to "
@@ -207,17 +214,17 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:92
+#: /home/runa/tor/website/en/volunteer.wml:95
 msgid "<a id=\"Coding\"></a> <a id=\"Summer\"></a> <a id=\"Projects\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:95
+#: /home/runa/tor/website/en/volunteer.wml:98
 msgid "<a class=\"anchor\" href=\"#Projects\">Good Coding Projects</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/volunteer.wml:98
+#: /home/runa/tor/website/en/volunteer.wml:101
 msgid ""
 "You may find some of these projects to be good <a href=\"<page gsoc>"
 "\">Google Summer of Code 2010</a> ideas. We have labelled each idea with how "
@@ -232,11 +239,11 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:113
+#: /home/runa/tor/website/en/volunteer.wml:116
 msgid ""
 "<b>Tor Browser Bundle for Linux/Mac OS X</b> <br /> Priority: <i>High</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>Medium</i> <br /> "
-"Likely Mentors: <i>Steven, Andrew</i> <br /> The Tor Browser Bundle "
+"Likely Mentors: <i>Steven, Andrew, Jacob</i> <br /> The Tor Browser Bundle "
 "incorporates Tor, Firefox, Polipo, and the Vidalia user interface (and "
 "optionally the <a href=\"http://pidgin.im/\";>Pidgin</a> Instant Messaging "
 "client). Components are pre-configured to operate in a secure way, and it "
@@ -257,7 +264,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:146
+#: /home/runa/tor/website/en/volunteer.wml:149
 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: "
@@ -280,12 +287,12 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:176
+#: /home/runa/tor/website/en/volunteer.wml:179
 msgid ""
 "<b>Improving Tor's ability to resist censorship</b> <br /> Priority: "
 "<i>Medium to High</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: "
 "<i>High</i> <br /> Likely Mentors: <i>Nick, Roger, Steven</i> <br /> The Tor "
-"0.2.0.x series makes <a href=\"<svnsandbox>doc/design-paper/blocking.html"
+"0.2.1.x series makes <a href=\"<svnsandbox>doc/design-paper/blocking.html"
 "\">significant improvements</a> in resisting national and organizational "
 "censorship.  But Tor still needs better mechanisms for some parts of its "
 "anti-censorship design.  For example, current Tors can only listen on a "
@@ -308,7 +315,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:211
+#: /home/runa/tor/website/en/volunteer.wml:214
 msgid ""
 "<b>Tuneup Tor!</b> <br /> Priority: <i>Medium to High</i> <br /> Effort "
 "Level: <i>Medium to High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
@@ -329,13 +336,13 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:242
+#: /home/runa/tor/website/en/volunteer.wml:245
 msgid ""
 "<b>Improving Polipo on Windows</b> <br /> Priority: <i>Medium to High</i> "
 "<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Medium</i> <br /> "
-"Likely Mentors: <i>Martin</i> <br /> Help port <a href=\"http://www.pps.";
-"jussieu.fr/~jch/software/polipo/\">Polipo</a> to Windows. Example topics to "
-"tackle include: 1) the ability to asynchronously query name servers, find "
+"Likely Mentors: <i>Martin, Chris</i> <br /> Help port <a href=\"http://www.";
+"pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> to Windows. Example topics "
+"to tackle include: 1) the ability to asynchronously query name servers, find "
 "the system nameservers, and manage netbios and dns queries.  2) manage "
 "events and buffers natively (i.e. in Unix-like OSes, Polipo defaults to 25% "
 "of ram, in Windows it's whatever the config specifies). 3) some sort of GUI "
@@ -346,7 +353,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:268
+#: /home/runa/tor/website/en/volunteer.wml:271
 msgid ""
 "<b>Tor Controller Status Event Interface</b> <br /> Priority: <i>Medium</i> "
 "<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> "
@@ -379,7 +386,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:311
+#: /home/runa/tor/website/en/volunteer.wml:314
 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 /> "
@@ -398,28 +405,26 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:338
+#: /home/runa/tor/website/en/volunteer.wml:341
 msgid ""
-"<b>Help revive an independent Tor client implementation</b> <br /> Priority: "
+"<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>Karsten, Nick</i> <br /> Reanimate one "
-"of the approaches to implement a Tor client in Java, e.g. the <a href="
-"\"http://onioncoffee.sourceforge.net/\";>OnionCoffee project</a>, and make it "
-"run on <a href=\"http://code.google.com/android/\";>Android</a>. The first "
-"step would be to port the existing code and execute it in an Android "
-"environment. Next, the code should be updated to support the newer Tor "
-"protocol versions like the <a href=\"<svnsandbox>doc/spec/dir-spec.txt\">v3 "
-"directory protocol</a>. Further, support for requesting or even providing "
-"Tor hidden services would be neat, but not required.  <br /> 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."
+"to High</i> <br /> Likely Mentors: <i>Karsten, Nick</i> <br /> We're "
+"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; Tor for Java, Android/Orbot, or Tor for "
+"Maemo. Check out the repository and familiarlize yourself with the source "
+"code.  Further, support for requesting or even providing Tor hidden services "
+"would be neat, but not required.  <br /> 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><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:368
+#: /home/runa/tor/website/en/volunteer.wml:367
 msgid ""
 "<b>New Torbutton Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
 "Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely Mentors: "
@@ -443,7 +448,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:402
+#: /home/runa/tor/website/en/volunteer.wml:401
 msgid ""
 "<b>New Thandy Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
 "Level: <i>Medium</i> <br /> Skill Level: <i>Medium to High</i> <br /> Likely "
@@ -462,7 +467,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:429
+#: /home/runa/tor/website/en/volunteer.wml:428
 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 /"
@@ -483,7 +488,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:459
+#: /home/runa/tor/website/en/volunteer.wml:458
 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: "
@@ -507,7 +512,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:493
+#: /home/runa/tor/website/en/volunteer.wml:492
 msgid ""
 "<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Low</i> <br /"
 "> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
@@ -519,7 +524,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:511
+#: /home/runa/tor/website/en/volunteer.wml:510
 msgid ""
 "<b>Intermediate Level Network Device Driver</b> <br /> Priority: <i>Low</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> "
@@ -533,7 +538,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:531
+#: /home/runa/tor/website/en/volunteer.wml:530
 msgid ""
 "<b>Improve Tor Weather</b> <br /> Priority: <i>Medium</i> <br /> Effort "
 "Level: <i>Medium</i> <br /> Skill Level: <i>Medium</i> <br /> Likely "
@@ -556,7 +561,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:561
+#: /home/runa/tor/website/en/volunteer.wml:560
 msgid ""
 "<b>Bring up new ideas!</b> <br /> Don't like any of these? Look at the <a "
 "href=\"<svnsandbox>doc/roadmaps/2008-12-19-roadmap-full.pdf\">Tor "
@@ -566,7 +571,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:571
+#: /home/runa/tor/website/en/volunteer.wml:570
 msgid ""
 "<b>Better Debian/Ubuntu Packaging for Tor+Vidalia</b> <br /> Vidalia "
 "currently doesn't play nicely on Debian and Ubuntu with the default Tor "
@@ -604,7 +609,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:615
+#: /home/runa/tor/website/en/volunteer.wml:614
 msgid ""
 "<b>Tor/Polipo/Vidalia Auto-Update Framework</b> <br /> We're in need of a "
 "good authenticated-update framework.  Vidalia already has the ability to "
@@ -633,7 +638,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:649
+#: /home/runa/tor/website/en/volunteer.wml:648
 msgid ""
 "<b>Improving the Tor QA process: Continuous Integration for builds</b> <br /"
 "> It would be useful to have automated build processes for Windows and "
@@ -660,7 +665,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:677
+#: /home/runa/tor/website/en/volunteer.wml:676
 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 "
@@ -671,19 +676,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:694
+#: /home/runa/tor/website/en/volunteer.wml:693
 msgid "<a id=\"OtherCoding\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:695
+#: /home/runa/tor/website/en/volunteer.wml:694
 msgid ""
 "<a class=\"anchor\" href=\"#OtherCoding\">Other Coding and Design related "
 "ideas</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:697
+#: /home/runa/tor/website/en/volunteer.wml:696
 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 "
@@ -698,7 +703,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:710
+#: /home/runa/tor/website/en/volunteer.wml:709
 msgid ""
 "We need to actually start building our <a href=\"<page "
 "documentation>#DesignDoc\">blocking-resistance design</a>. This involves "
@@ -708,7 +713,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:716
+#: /home/runa/tor/website/en/volunteer.wml:715
 msgid ""
 "We need a flexible simulator framework for studying end-to-end traffic "
 "confirmation attacks. Many researchers have whipped up ad hoc simulators to "
@@ -722,7 +727,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:726
+#: /home/runa/tor/website/en/volunteer.wml:725
 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 "
@@ -731,7 +736,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:729
+#: /home/runa/tor/website/en/volunteer.wml:728
 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 "
@@ -740,7 +745,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:734
+#: /home/runa/tor/website/en/volunteer.wml:733
 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 "
@@ -754,7 +759,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:745
+#: /home/runa/tor/website/en/volunteer.wml:744
 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 "
@@ -762,7 +767,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:749
+#: /home/runa/tor/website/en/volunteer.wml:748
 msgid ""
 "We need a way to generate the website diagrams (for example, the \"How Tor "
 "Works\" pictures on the <a href=\"<page overview>\">overview page</a> from "
@@ -773,24 +778,24 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:756
+#: /home/runa/tor/website/en/volunteer.wml:755
 msgid ""
 "How can we make the <a href=\"http://anonymityanywhere.com/incognito/";
 "\">Incognito LiveCD</a> easier to maintain, improve, and document?"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:761
+#: /home/runa/tor/website/en/volunteer.wml:760
 msgid "<a id=\"Research\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:762
+#: /home/runa/tor/website/en/volunteer.wml:761
 msgid "<a class=\"anchor\" href=\"#Research\">Research</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:764
+#: /home/runa/tor/website/en/volunteer.wml:763
 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 "
@@ -806,7 +811,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:776
+#: /home/runa/tor/website/en/volunteer.wml:775
 msgid ""
 "The \"end-to-end traffic confirmation attack\": by watching traffic at Alice "
 "and at Bob, we can <a href=\"http://freehaven.net/anonbib/#danezis:pet2004";
@@ -820,7 +825,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:786
+#: /home/runa/tor/website/en/volunteer.wml:785
 msgid ""
 "A related question is: Does running a relay/bridge provide additional "
 "protection against these timing attacks? Can an external adversary that "
@@ -840,7 +845,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:801
+#: /home/runa/tor/website/en/volunteer.wml:800
 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 "
@@ -859,7 +864,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:816
+#: /home/runa/tor/website/en/volunteer.wml:815
 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 "
@@ -874,7 +879,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:826
+#: /home/runa/tor/website/en/volunteer.wml:825
 msgid ""
 "Other research questions regarding geographic diversity consider the "
 "tradeoff between choosing an efficient circuit and choosing a random "
@@ -886,7 +891,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:833
+#: /home/runa/tor/website/en/volunteer.wml:832
 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 "
@@ -903,7 +908,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:845
+#: /home/runa/tor/website/en/volunteer.wml:844
 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 "
@@ -914,7 +919,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:852
+#: /home/runa/tor/website/en/volunteer.wml:851
 msgid ""
 "Our censorship-resistance goals include preventing an attacker who's looking "
 "at Tor traffic on the wire from <a href=\"<svnsandbox>doc/design-paper/"
@@ -930,7 +935,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:863
+#: /home/runa/tor/website/en/volunteer.wml:862
 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 "
@@ -941,7 +946,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:870
+#: /home/runa/tor/website/en/volunteer.wml:869
 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 "
@@ -949,7 +954,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:873
+#: /home/runa/tor/website/en/volunteer.wml:872
 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 "
@@ -969,7 +974,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:890
+#: /home/runa/tor/website/en/volunteer.wml:889
 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 "
@@ -986,7 +991,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:903
+#: /home/runa/tor/website/en/volunteer.wml:902
 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 "
@@ -994,7 +999,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/volunteer.wml:911
+#: /home/runa/tor/website/en/volunteer.wml:910
 msgid ""
 "<a href=\"<page contact>\">Let us know</a> if you've made progress on any of "
 "these!"

Modified: translation/trunk/projects/website/nb/docs/2-medium.tor-doc-relay.po
===================================================================
--- translation/trunk/projects/website/nb/docs/2-medium.tor-doc-relay.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/nb/docs/2-medium.tor-doc-relay.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:06+0100\n"
+"POT-Creation-Date: 2009-12-08 18:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -47,7 +47,7 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:25 /tmp/49FxDG6nQn.xml:285
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:25 /tmp/hczBS9rBKQ.xml:285
 msgid "<hr />"
 msgstr ""
 
@@ -67,9 +67,9 @@
 #: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37
 msgid ""
 "You can run a Tor relay on <a href=\"https://wiki.torproject.org/noreply/";
-"TheOnionRouter/TorFAQ#RelayOS\">pretty much any</a> operating system, but "
-"Linux, FreeBSD 5.x+, OS X Tiger or later, and Windows Server 2003 or later "
-"work best."
+"TheOnionRouter/TorFAQ#RelayOS\">pretty much any</a> operating system. Tor "
+"relays work best on Linux, OS X Tiger or later, FreeBSD 5.x+, NetBSD 5.x+, "
+"and Windows Server 2003 or later."
 msgstr ""
 
 #. type: Content of: <div><div>
@@ -84,8 +84,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:47 /tmp/49FxDG6nQn.xml:62
-#: /tmp/49FxDG6nQn.xml:149 /tmp/49FxDG6nQn.xml:175
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:47 /tmp/hczBS9rBKQ.xml:62
+#: /tmp/hczBS9rBKQ.xml:149 /tmp/hczBS9rBKQ.xml:175
 msgid "<br />"
 msgstr ""
 

Modified: translation/trunk/projects/website/zh_CN/1-high.bridges.po
===================================================================
--- translation/trunk/projects/website/zh_CN/1-high.bridges.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/zh_CN/1-high.bridges.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -6,13 +6,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-23 19:02+0100\n"
+"POT-Creation-Date: 2009-12-08 18:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: ENCODING"
+"Content-Transfer-Encoding: ENCODING\n"
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/bridges.wml:9
@@ -24,6 +24,12 @@
 msgid "<a class=\"anchor\" href=\"#BridgeIntroduction\">Tor: Bridges</a>"
 msgstr "<a class=\"anchor\" href=\"#BridgeIntroduction\">Tor:网桥</a>"
 
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/bridges.wml:11 /tmp/hhisfQWXLk.xml:71
+#: /tmp/hhisfQWXLk.xml:94 /tmp/hhisfQWXLk.xml:117 /tmp/hhisfQWXLk.xml:141
+msgid "<hr />"
+msgstr ""
+
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:14
 msgid ""
@@ -34,8 +40,9 @@
 "to the Tor network is being blocked, you may want to use the bridge feature "
 "of Tor."
 msgstr ""
-"网桥中继(简称“网桥”)是 Tor 中继,但不被列在 Tor 的主目录中。 因为没有它们的完整公共目录,即使您的 ISP 屏蔽了所有已知的 Tor "
-"中继,也不可能屏蔽所有的网桥。 如果您怀疑您的 Tor 网络被屏蔽了,您可能需要用到 Tor 的网桥功能。"
+"网桥中继(简称“网桥”)是 Tor 中继,但不被列在 Tor 的主目录中。 因为没有它们的"
+"完整公共目录,即使您的 ISP 屏蔽了所有已知的 Tor 中继,也不可能屏蔽所有的网"
+"桥。 如果您怀疑您的 Tor 网络被屏蔽了,您可能需要用到 Tor 的网桥功能。"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:22
@@ -49,30 +56,34 @@
 "recognize Tor connections. So you should try to use Tor without bridges "
 "first, since it might work."
 msgstr ""
-"网桥对于 Tor 的反屏蔽战役来讲是一个进步。但很有可能在 ISP 过滤了 Internet 的情况下, 您仍能够不使用网桥功能而直接连接 "
-"Tor。许多屏蔽程序通过搜寻那些未加密的 Tor 目录请求来识别您是否在使用 Tor,但 Tor 0.2.0.23-rc "
-"或更高版本默认使用加密的目录请求。 这一变化意味着大多数屏蔽程序将不能识别 Tor 连接。因此,您应该首先尝试不使用网桥功能来连接 Tor, "
-"也许在不使用网桥功能的情况下您仍然能够连接 Tor 网络。"
+"网桥对于 Tor 的反屏蔽战役来讲是一个进步。但很有可能在 ISP 过滤了 Internet 的"
+"情况下, 您仍能够不使用网桥功能而直接连接 Tor。许多屏蔽程序通过搜寻那些未加密"
+"的 Tor 目录请求来识别您是否在使用 Tor,但 Tor 0.2.0.23-rc 或更高版本默认使用"
+"加密的目录请求。 这一变化意味着大多数屏蔽程序将不能识别 Tor 连接。因此,您应"
+"该首先尝试不使用网桥功能来连接 Tor, 也许在不使用网桥功能的情况下您仍然能够连"
+"接 Tor 网络。"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:33
 msgid ""
-"Note that it's also possible that Tor is non-functional for other "
-"reasons. The latest version of <a href=\"<page torbrowser/index>\">The Tor "
-"Browser Bundle</a> on Windows tries to give you better hints about why Tor "
-"is having problems connecting. You should also read <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\";>the "
-"FAQ about problems with running Tor properly</a> when you have issues.  If "
-"you feel that the issue is clearly blocking, or you'd simply like to try "
-"because you're unsure or feeling adventurous, please read on. Ensure that "
-"you're using the <a href=\"<page download>#Dev\">latest 0.2.1.x or 0.2.2.x "
-"bundle for your platform</a>."
+"Note that it's also possible that Tor is non-functional for other reasons. "
+"The latest version of <a href=\"<page torbrowser/index>\">The Tor Browser "
+"Bundle</a> on Windows tries to give you better hints about why Tor is having "
+"problems connecting. You should also read <a href=\"https://wiki.torproject.";
+"org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">the FAQ about problems with "
+"running Tor properly</a> when you have issues.  If you feel that the issue "
+"is clearly blocking, or you'd simply like to try because you're unsure or "
+"feeling adventurous, please read on. Ensure that you're using the <a href="
+"\"<page download>#Dev\">latest 0.2.1.x or 0.2.2.x bundle for your platform</"
+"a>."
 msgstr ""
-"注意:Tor 也可能因其它原因而不能工作。最新版本的 <a href=\"<page torbrowser/index>\">Windows Tor "
-"浏览器套件</a>试图给予您更好的关于 Tor 故障原因的提示。当您遇到问题时,您也应该仔细阅读 <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\";>FAQ:关于 "
-"Tor 使用常见问题</a> 。 如果您觉得问题很明显是被屏蔽了,或您就是想试一试网桥功能,请您继续阅读。 请确定您正在使用<a "
-"href=\"<page download>#Dev\">最新版 0.2.1.x 或 0.2.2.x </a>的 Tor 软件。"
+"注意:Tor 也可能因其它原因而不能工作。最新版本的 <a href=\"<page torbrowser/"
+"index>\">Windows Tor 浏览器套件</a>试图给予您更好的关于 Tor 故障原因的提示。"
+"当您遇到问题时,您也应该仔细阅读 <a href=\"https://wiki.torproject.org/";
+"noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">FAQ:关于 Tor 使用常见问题</"
+"a> 。 如果您觉得问题很明显是被屏蔽了,或您就是想试一试网桥功能,请您继续阅"
+"读。 请确定您正在使用<a href=\"<page download>#Dev\">最新版 0.2.1.x 或 0.2.2."
+"x </a>的 Tor 软件。"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:46
@@ -84,36 +95,36 @@
 "you don't think you need to configure a proxy for your Internet connection, "
 "you probably don't.  Give it a try and if you have issues, ask us for help."
 msgstr ""
-"要使用网桥,您必须找到一个网桥地址。此外,您得将 Tor 配置为使用这个网桥。 您可以用 Vidalia(Tor 的 GUI 控制程序)来配置。 "
-"如果您的 Internet 使用了代理,您也要在 Vidalia 中配置同样的代理。 "
-"如果您认为不需要代理,也可不配置。可以试一试是否需要代理,如果有问题,可以向我们求助。"
+"要使用网桥,您必须找到一个网桥地址。此外,您得将 Tor 配置为使用这个网桥。 您"
+"可以用 Vidalia(Tor 的 GUI 控制程序)来配置。 如果您的 Internet 使用了代理,"
+"您也要在 Vidalia 中配置同样的代理。 如果您认为不需要代理,也可不配置。可以试"
+"一试是否需要代理,如果有问题,可以向我们求助。"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:55
 msgid ""
 "Freedom House has produced a video on how to get and use Tor bridges.  You "
-"can view the video at <a "
-"href=\"http://tinyvid.tv/show/3uiwckrlqynqv\";>TinyVid: Using Bridge Relays "
-"to Access Tor</a>.  Know of a better video, or one translated into your "
-"language? Let us know!"
+"can view the video at <a href=\"http://tinyvid.tv/show/3uiwckrlqynqv";
+"\">TinyVid: Using Bridge Relays to Access Tor</a>.  Know of a better video, "
+"or one translated into your language? Let us know!"
 msgstr ""
-"自由之家制作了一个视频演示如何获得和使用 Tor 网桥。 你可以在 <a "
-"href=\"http://tinyvid.tv/show/3uiwckrlqynqv\";>TinyVid:使用网桥中继来进入 Tor</a> "
+"自由之家制作了一个视频演示如何获得和使用 Tor 网桥。 你可以在 <a href="
+"\"http://tinyvid.tv/show/3uiwckrlqynqv\";>TinyVid:使用网桥中继来进入 Tor</a> "
 "观看视频。知道更好的视频,或者翻译成您的语言之一?请告诉我们!"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:62
 msgid ""
-"At the moment, you can get a bridge by visiting <a "
-"href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</a> "
-"with your web browser. If this page is filtered for you, and you don't have "
-"any other proxies or ways to reach it, there are <a "
-"href=\"#FindingMore\">other ways to find bridges</a> too."
+"At the moment, you can get a bridge by visiting <a href=\"https://bridges.";
+"torproject.org/\">https://bridges.torproject.org/</a> with your web browser. "
+"If this page is filtered for you, and you don't have any other proxies or "
+"ways to reach it, there are <a href=\"#FindingMore\">other ways to find "
+"bridges</a> too."
 msgstr ""
-"现在,您可以通过访问 <a "
-"href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</a> "
-"来获取网桥地址。如果该网页被屏蔽了,且您也没有任何代理或其它方法访问该页面, 请参考<a "
-"href=\"#FindingMore\">查找网桥的其它方法</a> 。"
+"现在,您可以通过访问 <a href=\"https://bridges.torproject.org/\";>https://";
+"bridges.torproject.org/</a> 来获取网桥地址。如果该网页被屏蔽了,且您也没有任"
+"何代理或其它方法访问该页面, 请参考<a href=\"#FindingMore\">查找网桥的其它方"
+"法</a> 。"
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/bridges.wml:69
@@ -132,6 +143,7 @@
 
 #. type: Content of: <div><pre>
 #: /home/runa/tor/website/en/bridges.wml:77
+#, no-wrap
 msgid ""
 "<samp>\n"
 "bridge 141.201.27.48:443 4352e58420e68f5e40bf7c74faddccd9d1349413\n"
@@ -145,26 +157,12 @@
 #: /home/runa/tor/website/en/bridges.wml:83
 msgid ""
 "Understanding the components of a bridge line isn't strictly required but "
-"may prove useful. You can skip this section if you'd like."
-msgstr "理解网桥地址的含义并非必须,但却比较有用。如果您愿意,您可以跳过本节。"
+"may prove useful. You can skip this section if you'd like.<br /> The first "
+"element is the IP address: <tt>'141.201.27.48'</tt><br /> The second element "
+"is the port: <tt>'443'</tt><br /> The third element, the fingerprint, is "
+"optional: <tt>'4352e58420e68f5e40bf7c74faddccd9d1349413'</tt><br />"
+msgstr ""
 
-#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/bridges.wml:85
-msgid "The first element is the IP address: <tt>'141.201.27.48'</tt>"
-msgstr "第一部分是 IP 地址:<tt>'141.201.27.48'</tt>"
-
-#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/bridges.wml:86
-msgid "The second element is the port: <tt>'443'</tt>"
-msgstr "第二部分是端口:<tt>'443'</tt>"
-
-#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/bridges.wml:87
-msgid ""
-"The third element, the fingerprint, is optional: "
-"<tt>'4352e58420e68f5e40bf7c74faddccd9d1349413'</tt>"
-msgstr "第三部分是指纹(可选): <tt>'4352e58420e68f5e40bf7c74faddccd9d1349413'</tt>"
-
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/bridges.wml:91
 msgid "<a id=\"UsingBridges\"></a>"
@@ -175,7 +173,8 @@
 msgid ""
 "<a class=\"anchor\" href=\"#UsingBridges\">Using bridges with Tor and "
 "Vidalia</a>"
-msgstr "<a class=\"anchor\" href=\"#UsingBridges\">在 Vidalia 和 Tor 中使用网桥</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#UsingBridges\">在 Vidalia 和 Tor 中使用网桥</a>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:97
@@ -186,14 +185,17 @@
 "pasting it into the \"Add a Bridge\" window and then clicking the \"+\" "
 "sign. Adding a bridge is pictured below:"
 msgstr ""
-"要使用上述示例中的网桥,请前往 Vidalia 的 Network settings(网络设置)页面, 选中 \"My ISP blocks "
-"connections to the Tor network\"(我的 ISP 阻挡了对 Tor 网络的连接)项, "
-"一次一个的将网桥地址加入设置中,即将网桥地址粘帖到\"Add a Bridge\"(添加一个网桥)框中, 点击 \"+\"。添加网桥如下图所示:"
+"要使用上述示例中的网桥,请前往 Vidalia 的 Network settings(网络设置)页面, "
+"选中 \"My ISP blocks connections to the Tor network\"(我的 ISP 阻挡了对 Tor "
+"网络的连接)项, 一次一个的将网桥地址加入设置中,即将网桥地址粘帖到\"Add a "
+"Bridge\"(添加一个网桥)框中, 点击 \"+\"。添加网桥如下图所示:"
 
-#. type: Attribute 'alt' of: <div><img>
-#: /home/runa/tor/website/en/bridges.wml:105
-msgid "Vidalia's Network settings page"
-msgstr "Vidalia 的网络设置界面"
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/bridges.wml:104
+msgid ""
+"<br /><br /> <img src=\"$(IMGROOT)/vidalia-bridges.png\" alt=\"Vidalia's "
+"Network settings page\" /> <br /><br />"
+msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:109
@@ -203,8 +205,9 @@
 "reach the Tor network, but if you only have one bridge and it goes down, you "
 "will be cut off from the Tor network."
 msgstr ""
-"您可能想将您所知的所有网桥都添加进去,较多的网桥可以增加 Tor 的稳定性。 因为,虽然一个网桥就足以让您进入 Tor "
-"网络了,但如果您只有一个网桥,而该网桥关闭了, 您将从 Tor 网络断开。"
+"您可能想将您所知的所有网桥都添加进去,较多的网桥可以增加 Tor 的稳定性。 因"
+"为,虽然一个网桥就足以让您进入 Tor 网络了,但如果您只有一个网桥,而该网桥关闭"
+"了, 您将从 Tor 网络断开。"
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/bridges.wml:115
@@ -213,7 +216,8 @@
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/bridges.wml:116
-msgid "<a class=\"anchor\" href=\"#FindingMore\">Finding more bridges for Tor</a>"
+msgid ""
+"<a class=\"anchor\" href=\"#FindingMore\">Finding more bridges for Tor</a>"
 msgstr "<a class=\"anchor\" href=\"#FindingMore\">查找 Tor 网桥的其它方法</a>"
 
 #. type: Content of: <div><p>
@@ -226,11 +230,14 @@
 "addresses and learn about all the bridges.  Almost instantly, you'll receive "
 "a reply that includes:"
 msgstr ""
-"另一个查找公共网桥地址的方法是给 bridges@xxxxxxxxxxxxxx 发邮件,邮件正文为 \"get bridges\" 。 您必须使用 "
-"Gmail 的电子邮件账户, 否则攻击者很容易制造大量的电子邮件地址来窃取所有的网桥地址。 当您发送邮件后,几乎立即可以收到回信,回信包含如下信息:"
+"另一个查找公共网桥地址的方法是给 bridges@xxxxxxxxxxxxxx 发邮件,邮件正文为 "
+"\"get bridges\" 。 您必须使用 Gmail 的电子邮件账户, 否则攻击者很容易制造大量"
+"的电子邮件地址来窃取所有的网桥地址。 当您发送邮件后,几乎立即可以收到回信,回"
+"信包含如下信息:"
 
 #. type: Content of: <div><pre>
 #: /home/runa/tor/website/en/bridges.wml:128
+#, no-wrap
 msgid ""
 "Here are your bridge relays:\n"
 "\n"
@@ -252,9 +259,9 @@
 "Once you've received the email with bridge information, you can continue the "
 "Vidalia configuration steps outlined <a href=\"#UsingBridges\">above</a>."
 msgstr ""
-"只要您收到回复的电子邮件,获得其中的网桥信息,您就可以继续 Vidalia 的配置步骤 <a "
-"href=\"#UsingBridges\">配置方法</a>。 您收到包含网桥信息的回复后,就可以在 Vidalia 中设置使用。<a "
-"href=\"#UsingBridges\">设置方法</a>"
+"只要您收到回复的电子邮件,获得其中的网桥信息,您就可以继续 Vidalia 的配置步"
+"骤 <a href=\"#UsingBridges\">配置方法</a>。 您收到包含网桥信息的回复后,就可"
+"以在 Vidalia 中设置使用。<a href=\"#UsingBridges\">设置方法</a>"
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/bridges.wml:139
@@ -269,26 +276,26 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:144
 msgid ""
-"If you want to help out and you can't run a <a href=\"<page "
-"docs/tor-doc-relay>\">normal Tor relay</a>, you should run a bridge "
-"relay. You can configure it either way:"
+"If you want to help out and you can't run a <a href=\"<page docs/tor-doc-"
+"relay>\">normal Tor relay</a>, you should run a bridge relay. You can "
+"configure it either way:"
 msgstr ""
-"如果您愿意提供帮助,但是无法运行<a href=\"<page docs/tor-doc-relay>\">普通的 Tor "
-"中继</a>,您可以运行一个网桥中继。您可以用以下任何一种方式配置:"
+"如果您愿意提供帮助,但是无法运行<a href=\"<page docs/tor-doc-relay>\">普通的 "
+"Tor 中继</a>,您可以运行一个网桥中继。您可以用以下任何一种方式配置:"
 
 #. type: Content of: <div><p><ul><li>
 #: /home/runa/tor/website/en/bridges.wml:148
+#, fuzzy
 msgid ""
-"manually <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc\";>edit "
-"your torrc file</a> to be just these four lines:"
+"manually <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
+"TorFAQ#torrc\">edit your torrc file</a> to be just these four lines:<br />"
 msgstr ""
-"手动 <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc\";>编辑您的 "
-"torrc 文件</a> 只需要修改以下四行:"
+"手动 <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
+"TorFAQ#torrc\">编辑您的 torrc 文件</a> 只需要修改以下四行:"
 
 #. type: Content of: <div><p><ul><li><pre>
 #: /home/runa/tor/website/en/bridges.wml:151
+#, no-wrap
 msgid ""
 "<code>\n"
 "SocksPort 0\n"
@@ -306,33 +313,32 @@
 
 #. type: Content of: <div><p><ul><li>
 #: /home/runa/tor/website/en/bridges.wml:157
-msgid "<a href=\"<page docs/tor-doc-relay>\">or using Vidalia</a>:"
-msgstr "<a href=\"<page docs/tor-doc-relay>\">或者使用 Vidalia</a>:"
+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 "
+"page\" />"
+msgstr ""
 
-#. type: Attribute 'alt' of: <div><p><ul><li><img>
-#: /home/runa/tor/website/en/bridges.wml:158
-msgid "Vidalia's Sharing settings page"
-msgstr "Vidalia 的共享设置页"
-
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:163
 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=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ServerForFirewalledClients\";>some "
-"complex port forwarding</a>."
+"startup, you'll need to pick a higher ORPort (e.g. 8080) or do <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/";
+"TorFAQ#ServerForFirewalledClients\">some complex port forwarding</a>."
 msgstr ""
-"如果您在启动时看到“Could not bind to 0.0.0.0:443: Permission denied”这样的错误, 您需要挑选一个 "
-"1023 以上的端口作为 ORPort(例如 8080),或者,配置<a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ServerForFirewalledClients\";>复杂 "
-"的端口转发</a>。"
+"如果您在启动时看到“Could not bind to 0.0.0.0:443: Permission denied”这样的错"
+"误, 您需要挑选一个 1023 以上的端口作为 ORPort(例如 8080),或者,配置<a "
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
+"TorFAQ#ServerForFirewalledClients\">复杂 的端口转发</a>。"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:170
 msgid ""
 "When configured as a bridge, your server will <b>not</b> appear in the "
 "public Tor network."
-msgstr "当您的服务器被配置成为网桥后,它将<b>不再</b>出现在 Tor 公共网络列表中。"
+msgstr ""
+"当您的服务器被配置成为网桥后,它将<b>不再</b>出现在 Tor 公共网络列表中。"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:175
@@ -346,20 +352,49 @@
 "your Tor log files or in <tt>/var/lib/tor/fingerprint</tt> depending on your "
 "platform)."
 msgstr ""
-"您的网桥中继会自动将其地址发布到权威网桥,地址将通过上面提到的 HTTPS 或电子邮件的方法分发到给户。您也可以将网桥地址直接告诉用户:如果您使用 "
-"Vidalia, 网桥地址可以复制粘贴自设置窗口。如果您使用 Linux 或 BSD,网桥地址需要按照<a "
-"href=\"#Understanding\">上面的格式</a>手工生成(不同的平台下,指纹可以在 Tor 日志文件或 "
-"<tt>/var/lib/tor/fingerprint</tt> 文件中找到)。"
+"您的网桥中继会自动将其地址发布到权威网桥,地址将通过上面提到的 HTTPS 或电子邮"
+"件的方法分发到给户。您也可以将网桥地址直接告诉用户:如果您使用 Vidalia, 网桥"
+"地址可以复制粘贴自设置窗口。如果您使用 Linux 或 BSD,网桥地址需要按照<a href="
+"\"#Understanding\">上面的格式</a>手工生成(不同的平台下,指纹可以在 Tor 日志"
+"文件或 <tt>/var/lib/tor/fingerprint</tt> 文件中找到)。"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:186
 msgid ""
 "If you would like to learn more about our bridge design from a technical "
-"standpoint, please read the <a "
-"href=\"<svnsandbox>doc/spec/bridges-spec.txt\">Tor bridges "
-"specification</a>. If you're interested in running an unpublished bridge or "
-"other non-standard uses, please do read the specification."
+"standpoint, please read the <a href=\"<svnsandbox>doc/spec/bridges-spec.txt"
+"\">Tor bridges specification</a>. If you're interested in running an "
+"unpublished bridge or other non-standard uses, please do read the "
+"specification."
 msgstr ""
-"如果您需要从技术角度了解更多有关网桥的设计,请参考 <a "
-"href=\"<svnsandbox>doc/spec/bridges-spec.txt\">Tor "
-"网桥规格说明</a>。如果您对运行私人网桥或其它特殊应用感兴趣,也请您务必阅读该说明。"
+"如果您需要从技术角度了解更多有关网桥的设计,请参考 <a href=\"<svnsandbox>doc/"
+"spec/bridges-spec.txt\">Tor 网桥规格说明</a>。如果您对运行私人网桥或其它特殊"
+"应用感兴趣,也请您务必阅读该说明。"
+
+#~ msgid ""
+#~ "Understanding the components of a bridge line isn't strictly required but "
+#~ "may prove useful. You can skip this section if you'd like."
+#~ msgstr ""
+#~ "理解网桥地址的含义并非必须,但却比较有用。如果您愿意,您可以跳过本节。"
+
+#~ msgid "The first element is the IP address: <tt>'141.201.27.48'</tt>"
+#~ msgstr "第一部分是 IP 地址:<tt>'141.201.27.48'</tt>"
+
+#~ msgid "The second element is the port: <tt>'443'</tt>"
+#~ msgstr "第二部分是端口:<tt>'443'</tt>"
+
+#~ msgid ""
+#~ "The third element, the fingerprint, is optional: "
+#~ "<tt>'4352e58420e68f5e40bf7c74faddccd9d1349413'</tt>"
+#~ msgstr ""
+#~ "第三部分是指纹(可选): <tt>'4352e58420e68f5e40bf7c74faddccd9d1349413'</"
+#~ "tt>"
+
+#~ msgid "Vidalia's Network settings page"
+#~ msgstr "Vidalia 的网络设置界面"
+
+#~ msgid "<a href=\"<page docs/tor-doc-relay>\">or using Vidalia</a>:"
+#~ msgstr "<a href=\"<page docs/tor-doc-relay>\">或者使用 Vidalia</a>:"
+
+#~ msgid "Vidalia's Sharing settings page"
+#~ msgstr "Vidalia 的共享设置页"

Modified: translation/trunk/projects/website/zh_CN/1-high.index.po
===================================================================
--- translation/trunk/projects/website/zh_CN/1-high.index.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/zh_CN/1-high.index.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:52+0100\n"
+"POT-Creation-Date: 2009-12-08 18:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -41,8 +41,8 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/index.wml:20 /tmp/UTJEfy4738.xml:30
-#: /tmp/UTJEfy4738.xml:76
+#: /home/runa/tor/website/en/index.wml:20 /tmp/Y5WCsZ9WlL.xml:30
+#: /tmp/Y5WCsZ9WlL.xml:76
 msgid "<hr />"
 msgstr ""
 
@@ -130,17 +130,22 @@
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/index.wml:79
+msgid "07 December 2009: <a href=\"<page open-positions>\">Tor is hiring!</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/index.wml:80
 msgid ""
-"28 July 2009: Tor 0.2.1.19 released as stable.  Read the <a href=\"http://";
-"archives.seul.org/or/announce/Aug-2009/msg00000.html\">announcement</a> for "
+"10 October 2009: Tor 0.2.1.20 released as stable.  Read the <a href="
+"\"https://blog.torproject.org/blog/tor-02120-released\";>announcement</a> for "
 "the updates and changes."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/index.wml:81
 msgid ""
-"25 June 2009: Tor 0.2.0.35 released as stable.  Read the <a href=\"http://";
-"archives.seul.org/or/announce/Jun-2009/msg00000.html\">announcement</a> for "
+"28 July 2009: Tor 0.2.1.19 released as stable.  Read the <a href=\"http://";
+"archives.seul.org/or/announce/Aug-2009/msg00000.html\">announcement</a> for "
 "the updates and changes."
 msgstr ""
 

Modified: translation/trunk/projects/website/zh_CN/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/zh_CN/2-medium.donate.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/zh_CN/2-medium.donate.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:52+0100\n"
+"POT-Creation-Date: 2009-12-08 18:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -22,70 +22,99 @@
 
 #. type: Content of: <div><div><h3>
 #: /home/runa/tor/website/en/donate.wml:13
-msgid "We accept donations via:"
+msgid "We accept donations of:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/donate.wml:15
-msgid "<a href=\"#paypal\">PayPal</a>"
+msgid "<a href=\"#money\">Money</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/donate.wml:16
-msgid "<a href=\"#check\">Check, Money Order, or Postal Order</a>"
+msgid "<a href=\"#services\">Services</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/donate.wml:17
-msgid "<a href=\"#wire\">ACH/e-check/Wire Transfers</a>"
+msgid "<a href=\"#hardware\">Hardware</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/donate.wml:18
-msgid "<a href=\"#eurobank\">European Bank Transfers</a>"
+msgid "<a href=\"#time\">Time</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/donate.wml:19
-msgid "<a href=\"#funds\">What happens to my donation?</a>"
+msgid "<a href=\"#outcome\">What happens to my donation?</a>"
 msgstr ""
 
-#.  END SIDEBAR 
-#. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:24
-msgid "<hr />"
-msgstr ""
-
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:27
+#: /home/runa/tor/website/en/donate.wml:26
 msgid ""
-"Your tax-deductible donation helps ensure online anonymity and privacy "
-"continue to exist in the world."
+"We offer a few ways to support online privacy and anonymity through "
+"donations.  You can donate <a href=\"#money\">money</a>, <a href=\"#services"
+"\">services</a>, <a href=\"#hardware\">hardware</a>, and <a href=\"#time"
+"\">time</a>.  Your tax-deductible donation helps ensure online anonymity and "
+"privacy continue to exist in the world."
 msgstr ""
 
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/donate.wml:32 /tmp/kwSQzCCenB.xml:93
+msgid "<br />"
+msgstr ""
+
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:29
+#: /home/runa/tor/website/en/donate.wml:34
 msgid ""
 "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.  If you can't donate, but want to help raise funds please <a href="
-"\"mailto:donations@xxxxxxxxxxxxxx\";>contact us</a> directly."
+"donations.  We're happy to accept donations via paypal, checks, money "
+"orders, stock grants or other more sophisticated transations.  Contact us at "
+"donations@xxxxxxxxxxxxxx for more details."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:33
-msgid "<a id=\"paypal\"></a>"
+#: /home/runa/tor/website/en/donate.wml:43
+msgid "<a id=\"relay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:34
+#: /home/runa/tor/website/en/donate.wml:44
+msgid "<a class=\"anchor\" href=\"#relay\">Run a relay</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/donate.wml:45
+msgid ""
+"The easiest, most effective way to support online privacy and anonymity "
+"around the world is to run a relay.  You join a set of committed people in "
+"the world already running a relay.  The easiest way to speed up Tor is to "
+"add more relays to the network.  Running a relay is as easy as <a href="
+"\"<page docs/tor-doc-relay>\">clicking a button</a>.  Join the network.  "
+"Support your online anonymity and privacy!"
+msgstr ""
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/donate.wml:53
+msgid "<a id=\"money\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/donate.wml:54
+msgid "<a class=\"anchor\" href=\"#money\">Donate Money</a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/donate.wml:55
 msgid "<a class=\"anchor\" href=\"#paypal\">Subscription via PayPal</a>"
 msgstr ""
 
 #. type: Content of: <div><form><p>
-#: /home/runa/tor/website/en/donate.wml:37
+#: /home/runa/tor/website/en/donate.wml:57
 msgid ""
 "One of our core fundraising goals is not to annoy donors with repeated "
 "requests.  Therefore, we advocate for a subscription-based approach: simply "
@@ -97,64 +126,64 @@
 msgstr ""
 
 #. type: Content of: <div><form><select>
-#: /home/runa/tor/website/en/donate.wml:41
+#: /home/runa/tor/website/en/donate.wml:59
 msgid "<br /> <br /> Choose your currency: <select name=\"currency_code\">"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:45 /tmp/eIjf3PYIQr.xml:87
+#: /home/runa/tor/website/en/donate.wml:63 /tmp/kwSQzCCenB.xml:105
 msgid "$"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:46 /tmp/eIjf3PYIQr.xml:88
+#: /home/runa/tor/website/en/donate.wml:64 /tmp/kwSQzCCenB.xml:106
 msgid "€"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:47 /tmp/eIjf3PYIQr.xml:89
+#: /home/runa/tor/website/en/donate.wml:65 /tmp/kwSQzCCenB.xml:107
 msgid "£"
 msgstr ""
 
 #. type: Content of: <div><form>
-#: /home/runa/tor/website/en/donate.wml:48
+#: /home/runa/tor/website/en/donate.wml:66
 msgid "</select>"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:51
+#: /home/runa/tor/website/en/donate.wml:69
 msgid "<input type=\"radio\" name=\"a3\" value=\"250.00\" />250/month"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:52
+#: /home/runa/tor/website/en/donate.wml:70
 msgid "<input type=\"radio\" name=\"a3\" value=\"100.00\" />100/month"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:53
+#: /home/runa/tor/website/en/donate.wml:71
 msgid "<input type=\"radio\" name=\"a3\" value=\"50.00\" />50/month"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:54
+#: /home/runa/tor/website/en/donate.wml:72
 msgid ""
 "<input type=\"radio\" name=\"a3\" value=\"20.00\" checked=\"checked\" />20/"
 "month"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:55
+#: /home/runa/tor/website/en/donate.wml:73
 msgid "<input type=\"radio\" name=\"a3\" value=\"10.00\" />10/month"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
-#: /home/runa/tor/website/en/donate.wml:56
+#: /home/runa/tor/website/en/donate.wml:74
 msgid "<input type=\"radio\" name=\"a3\" value=\"5.00\" />5/month"
 msgstr ""
 
 #. type: Content of: <div><form>
-#: /home/runa/tor/website/en/donate.wml:59
+#: /home/runa/tor/website/en/donate.wml:77
 msgid ""
 "<input type=\"hidden\" name=\"p3\" value=\"1\" /> <input type=\"hidden\" "
 "name=\"t3\" value=\"M\" /> <input type=\"hidden\" name=\"sra\" value=\"1\" /"
@@ -170,18 +199,13 @@
 "\"https://www.torproject.org/donate\"/>"
 msgstr ""
 
-#. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:75
-msgid "<br />"
-msgstr ""
-
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:76
+#: /home/runa/tor/website/en/donate.wml:94
 msgid "<a class=\"anchor\" href=\"#paypal\">Single donation via PayPal</a>"
 msgstr ""
 
 #. type: Content of: <div><form><p><select>
-#: /home/runa/tor/website/en/donate.wml:78
+#: /home/runa/tor/website/en/donate.wml:96
 msgid ""
 "You can also make a <b>one-time donation</b> (via PayPal, but doesn't "
 "require any account):<br /> <input type=\"radio\" name=\"amount\" value="
@@ -193,7 +217,7 @@
 msgstr ""
 
 #. type: Content of: <div><form><p>
-#: /home/runa/tor/website/en/donate.wml:90
+#: /home/runa/tor/website/en/donate.wml:108
 msgid ""
 "</select> <input type=\"hidden\" name=\"no_shipping\" value=\"1\" /> <input "
 "type=\"image\" src=\"images/btn_donateCC_LG.gif\" name=\"submit\" alt=\"Make "
@@ -205,133 +229,143 @@
 "\"cancel_return\" value=\"https://www.torproject.org/donate\"/>"
 msgstr ""
 
-#. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:106
-msgid "<a id=\"check\"></a>"
-msgstr ""
-
-#. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:107
-msgid ""
-"<a class=\"anchor\" href=\"#check\">Checks, Money Orders, and Postal Orders</"
-"a>"
-msgstr ""
-
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:110
-msgid "These payments can be sent to:"
+#: /home/runa/tor/website/en/donate.wml:124
+msgid "If you want to send a check, money order, or cash, please send to:"
 msgstr ""
 
-#. type: Content of: <div><blockquote><p>
-#: /home/runa/tor/website/en/donate.wml:113
-msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026 USA"
+#. type: Content of: <div><p><address>
+#: /home/runa/tor/website/en/donate.wml:127
+msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:119
+#: /home/runa/tor/website/en/donate.wml:131
 msgid ""
-"Attention US citizens: if you would like an acknowledgement letter, please "
-"inform us with your donation.  A canceled check, money/postal order receipt, "
-"or appraisal of donated property are valid records according to the IRS."
+"If you want a donation receipt for your non-paypal, non-check deposit, "
+"please specifically request one with your mailed donation."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:124
-msgid "<a id=\"wire\"></a>"
+#: /home/runa/tor/website/en/donate.wml:135
+msgid "<a id=\"services\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:125
-msgid "<a class=\"anchor\" href=\"#wire\">ACH/e-check/Wire Transfers</a>"
+#: /home/runa/tor/website/en/donate.wml:136
+msgid "<a class=\"anchor\" href=\"#services\">Donate Services</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:126
+#: /home/runa/tor/website/en/donate.wml:137
 msgid ""
-"In the US, ACH or e-check transfers are a fine way to donate.  We're happy "
-"to accept wire transfers over US$100.  Domestic United States ACH/e-check "
-"transfers are normally free for the sender, whereas wire transfers will "
-"incur fees.  If you are located in Europe, <a href=\"#eurobank\">please see "
-"below</a>."
+"The Tor Project is always looking for services relating to technical needs, "
+"like bandwidth, colocation, hosted services, legal representation, or "
+"consulting.  By donating services, you join our <a href=\"<page sponsors>"
+"\">many sponsors</a> in providing online privacy and anonymity.  We're "
+"currently looking for scalable hosting services for reporting needs from "
+"large data sets and reliable high-bandwidth hosting.  We may have hardware "
+"we can provide you for your service donation."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:132
+#: /home/runa/tor/website/en/donate.wml:144
 msgid ""
-"Organization Address:<br /> The Tor Project<br /> 122 Scott Circle<br /> "
-"Dedham, MA 02026<br />"
+"Can you write code? We're always looking for smart, motivated coders to "
+"either port Tor to new or old operating systems, or solve difficult online "
+"anonymity problems.  Take a look at <a href=\"<page volunteer>#Coding\">our "
+"coding projects</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:138
+#: /home/runa/tor/website/en/donate.wml:148
 msgid ""
-"account number: 63904957725<br /> routing number: 011075150<br /> SWIFT "
-"Code: SVRNUS33//FW011075150<br />"
+"Are you a creative person? Do you have a fantastic idea for a campaign? Are "
+"you someone who can come up with awesome artwork? We're always looking for "
+"new ways to promote Tor and get the word out that everyone needs their "
+"privacy and anonymity online."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:143
+#: /home/runa/tor/website/en/donate.wml:152
 msgid ""
-"Bank Address:<br /> Sovereign Bank<br /> 1130 Berkshire Boulevard<br /> "
-"Wyomissing, PA 19610<br />"
+"Is your legal firm willing to defend Tor and its volunteers? Are you waiting "
+"for an interesting case to defend online privacy and anonymity?"
 msgstr ""
 
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/donate.wml:155
+msgid ""
+"If any of the service ideas struck a nerve, contact us at "
+"donations@xxxxxxxxxxxxxx for more details."
+msgstr ""
+
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:149
-msgid "<a id=\"eurobank\"></a>"
+#: /home/runa/tor/website/en/donate.wml:158
+msgid "<a id=\"hardware\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:150
-msgid "<a class=\"anchor\" href=\"#eurobank\">European Bank Transfers</a>"
+#: /home/runa/tor/website/en/donate.wml:159
+msgid "<a class=\"anchor\" href=\"#hardware\">Donate Hardware</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:151
+#: /home/runa/tor/website/en/donate.wml:160
 msgid ""
-"In Europe, we have a funding arrangement with the <a href=\"http://www.ccc.";
-"de/\">Chaos Computer Club</a>.  Your donations go into a separate bank "
-"account managed by the CCC, and they use the funds to do beneficial "
-"activities for Tor in Europe.  Residents from any of the <a href=\"http://en.";
-"wikipedia.org/wiki/Single_Euro_Payments_Area\">31 SEPA member states</a> can "
-"wire up to 50.000 Euro at the cost of a domestic transaction (i.e., usually "
-"free if submitted electronically)."
+"We're generally looking for donated hardware and support services that could "
+"be used to provide the infrastructure that supports Tor's operations, "
+"including website mirrors, database servers, build systems and legacy "
+"hardware for supporting packages on older Operating Systems; such as OS X "
+"10.2, OS X 10.3, Windows XP, Windows 7, IRIX, Redhat, CentOS, Fedora, "
+"Debian, etc.  A number of service providers have an abundance of bandwidth "
+"capacity, but need hardware in order donate it to us."
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/donate.wml:161
 msgid ""
-"The account information is:<br /> Wau Holland Stiftung<br /> IBAN "
-"DE57520400210277281200<br /> SWIFT BIC COBADEFF520<br />"
+"By donating hardware, you're joining our <a href=\"<page sponsors>\">many "
+"sponsors</a> in providing online privacy and anonymity.  If you want Tor to "
+"work on your architecture or hardware, a fine way to do this is to donate "
+"the hardware and operating system to us.  Contact us at donations@torproject."
+"org for more details."
 msgstr ""
 
-#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:167
-msgid ""
-"Classic style German account information is:<br /> Konto: 2772812-02<br /> "
-"Inhaber: Wau Holland Stiftung<br /> Bank: Commerzbank Kassel<br /> BLZ: "
-"52040021<br />"
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/donate.wml:164
+msgid "<a id=\"time\"></a>"
 msgstr ""
 
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/donate.wml:165
+msgid "<a class=\"anchor\" href=\"#time\">Donate Time</a>"
+msgstr ""
+
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:173
+#: /home/runa/tor/website/en/donate.wml:166
 msgid ""
-"WHS issues a donation receipt upon request (if provided with address "
-"information)."
+"We're always looking for excited volunteers to give talks or trainins at "
+"conferences, barcamps, and other meetings where people should learn about "
+"online privacy and anonymity with Tor.  We're happy to work with you to help "
+"you better present Tor and online privacy and anonymity.  Contact us at "
+"donations@xxxxxxxxxxxxxx for more details."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:177
-msgid "<a id=\"funds\"></a>"
+#: /home/runa/tor/website/en/donate.wml:169
+msgid ""
+"<a id=\"outcome\"></a> <a id=\"funds\"></a><a class=\"anchor\" href=\"#funds"
+"\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/donate.wml:178
-msgid "<a class=\"anchor\" href=\"#funds\">What happens to my donation?</a>"
+#: /home/runa/tor/website/en/donate.wml:171
+msgid "<a class=\"anchor\" href=\"#outcome\">What happens to my donation?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:179
+#: /home/runa/tor/website/en/donate.wml:172
 msgid ""
 "If you've just donated, thank you for your donation.  Your funds are "
 "deposited into our general fund.  You join our <a href=\"<page sponsors>"
@@ -340,7 +374,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/donate.wml:182
+#: /home/runa/tor/website/en/donate.wml:175
 msgid ""
 "<img src=\"images/2008-funding-chart.png\" alt=\"Who funds the Tor Project?"
 "\"/> <img src=\"images/2008-expenses-chart.png\" alt=\"How is the money "
@@ -348,9 +382,9 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:185
+#: /home/runa/tor/website/en/donate.wml:179
 msgid ""
-"<hr /> <strong>The Tor Project respects the confidentiality of our "
-"supporters, when requested. We do not lend, rent, or sell our lists of "
-"donors at any time.</strong>"
+"<strong>The Tor Project respects the confidentiality of our supporters, when "
+"requested. We do not lend, rent, or sell our lists of donors at any time.</"
+"strong>"
 msgstr ""

Modified: translation/trunk/projects/website/zh_CN/2-medium.faq.po
===================================================================
--- translation/trunk/projects/website/zh_CN/2-medium.faq.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/zh_CN/2-medium.faq.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:52+0100\n"
+"POT-Creation-Date: 2009-12-08 18:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -21,7 +21,7 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:12 /tmp/GUtPfdhLZd.xml:1085
+#: /home/runa/tor/website/en/faq.wml:12 /tmp/hXJhT0ECzq.xml:1084
 msgid "<hr />"
 msgstr ""
 
@@ -559,11 +559,11 @@
 "answer these mails, but typically they need to spend most of their time on "
 "development tasks that will benefit more people.  This is especially true if "
 "your question is already covered in the <a href=\"<page documentation>"
-"\">documentation</a> or on this FAQ. We don't hate you; we're just busy."
+"\">documentation</a> or on this FAQ."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:308
+#: /home/runa/tor/website/en/faq.wml:307
 msgid ""
 "So if we don't answer your mail, first check the <a href=\"<page "
 "documentation>\">documentation</a> page, along with this FAQ, to make sure "
@@ -580,7 +580,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:323
+#: /home/runa/tor/website/en/faq.wml:322
 msgid ""
 "Another strategy is to <a href=\"<page docs/tor-doc-relay>\">run a Tor relay "
 "for a while</a>, and/or <a href=\"<page donate>\">donate money</a> <a href="
@@ -590,29 +590,29 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:331
+#: /home/runa/tor/website/en/faq.wml:330
 msgid ""
 "If you find your answer, please stick around on the IRC channel or the "
 "mailing list and answer questions from others."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:335
+#: /home/runa/tor/website/en/faq.wml:334
 msgid "<hr /> <a id=\"WhySlow\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:338
+#: /home/runa/tor/website/en/faq.wml:337
 msgid "<a class=\"anchor\" href=\"#WhySlow\">Why is Tor so slow?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:341
+#: /home/runa/tor/website/en/faq.wml:340
 msgid "There are many reasons why the Tor network is currently slow."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:345
+#: /home/runa/tor/website/en/faq.wml:344
 msgid ""
 "Before we answer, though, you should realize that Tor is never going to be "
 "blazing fast. Your traffic is bouncing through volunteers' computers in "
@@ -622,7 +622,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:353
+#: /home/runa/tor/website/en/faq.wml:352
 msgid ""
 "But that doesn't mean that it can't be improved. The current Tor network is "
 "quite small compared to the number of people trying to use it, and many of "
@@ -631,12 +631,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:360
+#: /home/runa/tor/website/en/faq.wml:359
 msgid "What can you do to help?"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:366
+#: /home/runa/tor/website/en/faq.wml:365
 msgid ""
 "<a href=\"<page docs/tor-doc-relay>\">Configure your Tor to relay traffic "
 "for others</a>. Help make the Tor network large enough that we can handle "
@@ -644,7 +644,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:372
+#: /home/runa/tor/website/en/faq.wml:371
 msgid ""
 "<a href=\"<page gui/index>\">Help us make Tor more usable</a>. We especially "
 "need people to help make it easier to configure your Tor as a relay. Also, "
@@ -653,7 +653,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:379
+#: /home/runa/tor/website/en/faq.wml:378
 msgid ""
 "There are some bottlenecks in the current Tor network. Help us design "
 "experiments to track down and demonstrate where the problems are, and then "
@@ -661,7 +661,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:385
+#: /home/runa/tor/website/en/faq.wml:384
 msgid ""
 "There are some steps that individuals can take to improve their Tor "
 "performance. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
@@ -673,7 +673,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:396
+#: /home/runa/tor/website/en/faq.wml:395
 msgid ""
 "Tor needs some architectural changes too. One important change is to start "
 "providing <a href=\"#EverybodyARelay\">better service to people who relay "
@@ -682,7 +682,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:404
+#: /home/runa/tor/website/en/faq.wml:403
 msgid ""
 "Help do other things so we can do the hard stuff. Please take a moment to "
 "figure out what your skills and interests are, and then <a href=\"<page "
@@ -690,7 +690,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:410
+#: /home/runa/tor/website/en/faq.wml:409
 msgid ""
 "Help find sponsors for Tor. Do you work at a company or government agency "
 "that uses Tor or has a use for Internet privacy, e.g. to browse the "
@@ -701,7 +701,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:419
+#: /home/runa/tor/website/en/faq.wml:418
 msgid ""
 "If you can't help out with any of the above, you can still help out "
 "individually by <a href=\"<page donate>\">donating a bit of money to the "
@@ -709,32 +709,32 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:426
+#: /home/runa/tor/website/en/faq.wml:425
 msgid "<hr /> <a id=\"Funding\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:429
+#: /home/runa/tor/website/en/faq.wml:428
 msgid ""
 "<a class=\"anchor\" href=\"#Funding\">What would The Tor Project do with "
 "more funding?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:433
+#: /home/runa/tor/website/en/faq.wml:432
 msgid ""
-"We have about 1500 relays right now, pushing over 150 MB/s average traffic. "
+"We have about 1800 relays right now, pushing over 150 MB/s average traffic. "
 "We have several hundred thousand active users. But the Tor network is not "
 "yet self-sustaining."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:439
+#: /home/runa/tor/website/en/faq.wml:438
 msgid "There are six main development/maintenance pushes that need attention:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:445
+#: /home/runa/tor/website/en/faq.wml:444
 msgid ""
 "Scalability: We need to keep scaling and decentralizing the Tor architecture "
 "so it can handle thousands of relays and millions of users. The upcoming "
@@ -743,7 +743,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:452
+#: /home/runa/tor/website/en/faq.wml:451
 msgid ""
 "User support: With this many users, a lot of people are asking questions all "
 "the time, offering to help out with things, and so on. We need good clean "
@@ -751,7 +751,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:458
+#: /home/runa/tor/website/en/faq.wml:457
 msgid ""
 "Relay support: the Tor network is run by volunteers, but they still need "
 "attention with prompt bug fixes, explanations when things go wrong, "
@@ -762,7 +762,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:467
+#: /home/runa/tor/website/en/faq.wml:466
 msgid ""
 "Usability: Beyond documentation, we also need to work on usability of the "
 "software itself. This includes installers, clean GUIs, easy configuration to "
@@ -773,7 +773,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:476
+#: /home/runa/tor/website/en/faq.wml:475
 msgid ""
 "Incentives: We need to work on ways to encourage people to configure their "
 "Tors as relays and exit nodes rather than just clients.  <a href="
@@ -782,7 +782,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:483
+#: /home/runa/tor/website/en/faq.wml:482
 msgid ""
 "Research: The anonymous communications field is full of surprises and "
 "gotchas. In our copious free time, we also help run top anonymity and "
@@ -794,7 +794,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:496
+#: /home/runa/tor/website/en/faq.wml:495
 msgid ""
 "We're continuing to move forward on all of these, but at this rate <a href="
 "\"#WhySlow\">the Tor network is growing faster than the developers can keep "
@@ -803,14 +803,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:504
+#: /home/runa/tor/website/en/faq.wml:503
 msgid ""
 "We are also excited about tackling related problems, such as censorship-"
 "resistance."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:509
+#: /home/runa/tor/website/en/faq.wml:508
 msgid ""
 "We are proud to have <a href=\"<page sponsors>\">sponsorship and support</a> "
 "from the Omidyar Network, the International Broadcasting Bureau, Bell "
@@ -819,7 +819,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:516
+#: /home/runa/tor/website/en/faq.wml:515
 msgid ""
 "However, this support is not enough to keep Tor abreast of changes in the "
 "Internet privacy landscape. Please <a href=\"<page donate>\">donate</a> to "
@@ -828,18 +828,18 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:522
+#: /home/runa/tor/website/en/faq.wml:521
 msgid "<hr /> <a id=\"HowUninstallTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:525
+#: /home/runa/tor/website/en/faq.wml:524
 msgid ""
 "<a class=\"anchor\" href=\"#HowUninstallTor\">How do I uninstall Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:528
+#: /home/runa/tor/website/en/faq.wml:527
 msgid ""
 "This depends entirely on how you installed it and which operating system you "
 "have. If you installed a package, then hopefully your package has a way to "
@@ -849,35 +849,35 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:536
+#: /home/runa/tor/website/en/faq.wml:535
 msgid ""
 "In your taskbar, right click on Vidalia (the green onion or the black head)  "
 "and choose exit."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:538
+#: /home/runa/tor/website/en/faq.wml:537
 msgid ""
 "Right click on the taskbar to bring up TaskManager. Look for tor.exe in the "
 "Process List. If it's running, right click and choose End Process."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:540
+#: /home/runa/tor/website/en/faq.wml:539
 msgid ""
 "Click the Start button, go to Programs, go to Vidalia, choose Uninstall.  "
 "This will remove the Vidalia bundle, which includes Tor and Polipo."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:542
+#: /home/runa/tor/website/en/faq.wml:541
 msgid ""
 "Start Firefox. Go to the Tools menu, choose Add-ons. Select Torbutton.  "
 "Click the Uninstall button."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:547
+#: /home/runa/tor/website/en/faq.wml:546
 msgid ""
 "If you do not follow these steps (for example by trying to uninstall "
 "Vidalia, Tor, and Polipo while they are still running), you will need to "
@@ -885,14 +885,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:553
+#: /home/runa/tor/website/en/faq.wml:552
 msgid ""
 "For Mac OS X, follow the <a href=\"<page docs/tor-doc-osx>#uninstall"
 "\">uninstall directions</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:558
+#: /home/runa/tor/website/en/faq.wml:557
 msgid ""
 "If you installed by source, I'm afraid there is no easy uninstall method. "
 "But on the bright side, by default it only installs into /usr/local/ and it "
@@ -900,52 +900,52 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:563
+#: /home/runa/tor/website/en/faq.wml:562
 msgid "<hr /> <a id=\"PGPSigs\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:566
+#: /home/runa/tor/website/en/faq.wml:565
 msgid ""
 "<a class=\"anchor\" href=\"#PGPSigs\">What are these \"sig\" files on the "
 "download page?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:570
+#: /home/runa/tor/website/en/faq.wml:569
 msgid ""
 "These are PGP signatures, so you can verify that the file you've downloaded "
 "is exactly the one that we intended you to get."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:575
+#: /home/runa/tor/website/en/faq.wml:574
 msgid ""
 "Please read the <a href=\"<page verifying-signatures>\">verifying "
 "signatures</a> page for details."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:579
+#: /home/runa/tor/website/en/faq.wml:578
 msgid "<hr /> <a id=\"CompileTorWindows\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:582
+#: /home/runa/tor/website/en/faq.wml:581
 msgid ""
 "<a class=\"anchor\" href=\"#CompileTorWindows\">How do I compile Tor under "
 "Windows?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:586
+#: /home/runa/tor/website/en/faq.wml:585
 msgid ""
 "Try following the steps at <a href=\"<svnsandbox>doc/tor-win32-mingw-"
 "creation.txt\"><svnsandbox>doc/tor-win32-mingw-creation.txt</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:591
+#: /home/runa/tor/website/en/faq.wml:590
 msgid ""
 "(Note that you don't need to compile Tor yourself in order to use it. Most "
 "people just use the packages available on the <a href=\"<page download>"
@@ -953,19 +953,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:596
+#: /home/runa/tor/website/en/faq.wml:595
 msgid "<hr /> <a id=\"VirusFalsePositives\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:599
+#: /home/runa/tor/website/en/faq.wml:598
 msgid ""
 "<a class=\"anchor\" href=\"#VirusFalsePositives\">Why does my Tor executable "
 "appear to have a virus or spyware?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:603
+#: /home/runa/tor/website/en/faq.wml:602
 msgid ""
 "Sometimes, overzealous Windows virus and spyware detectors trigger on some "
 "parts of the Tor Windows binary. Our best guess is that these are false "
@@ -976,7 +976,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:611
+#: /home/runa/tor/website/en/faq.wml:610
 msgid ""
 "In the meantime, we encourage you to not just take our word for it. Our job "
 "is to provide the source; if you're concerned, please do <a href="
@@ -984,19 +984,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:616
+#: /home/runa/tor/website/en/faq.wml:615
 msgid "<hr /> <a id=\"LiveCD\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:619
+#: /home/runa/tor/website/en/faq.wml:618
 msgid ""
 "<a class=\"anchor\" href=\"#LiveCD\">Is there a LiveCD or other bundle that "
 "includes Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:623
+#: /home/runa/tor/website/en/faq.wml:622
 msgid ""
 "There isn't any official LiveCD at this point. We're still trying to find "
 "good solutions and trying to understand the security and anonymity "
@@ -1005,12 +1005,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:630
+#: /home/runa/tor/website/en/faq.wml:629
 msgid "LiveCDs:"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:634
+#: /home/runa/tor/website/en/faq.wml:633
 msgid ""
 "<a href=\"http://incognito.anonymityanywhere.com/\";>Incognito LiveCD/USB</a> "
 "is a CD you can boot that has several Internet applications (Firefox, IRC, "
@@ -1020,7 +1020,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:639
+#: /home/runa/tor/website/en/faq.wml:638
 msgid ""
 "<a href=\"http://tork.sourceforge.net/wiki/index.php/LiveCD\";>TorK LiveCD</"
 "a> is Knoppix-based with an emphasis on user-friendliness. You can work "
@@ -1030,7 +1030,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:644
+#: /home/runa/tor/website/en/faq.wml:643
 msgid ""
 "<a href=\"http://mandalka.name/privatix/\";>Privatix LiveCD/USB</a> is a "
 "debian based live-system including tor, firefox and torbutton which can save "
@@ -1038,12 +1038,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:650
+#: /home/runa/tor/website/en/faq.wml:649
 msgid "Windows bundles:"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:654
+#: /home/runa/tor/website/en/faq.wml:653
 msgid ""
 "<a href=\"<page torbrowser/index>\">Tor Browser Bundle</a> for Windows comes "
 "with a pre-configured web browser and is self contained so you can run it "
@@ -1051,14 +1051,14 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:657
+#: /home/runa/tor/website/en/faq.wml:656
 msgid ""
 "<a href=\"http://www.janusvm.com/tor_vm/\";>Tor VM</a> is a successor to "
 "JanusVM. It needs testing from you!"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:659
+#: /home/runa/tor/website/en/faq.wml:658
 msgid ""
 "<a href=\"http://janusvm.com/\";>JanusVM</a> is a Linux kernel and software "
 "running in VMWare that sits between your Windows computer and the Internet, "
@@ -1066,7 +1066,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:662
+#: /home/runa/tor/website/en/faq.wml:661
 msgid ""
 "<a href=\"http://www.xerobank.com/xB_browser.html\";>xB Browser</a>, "
 "previously known as Torpark, is a Firefox+Tor package for Win32 that can "
@@ -1074,12 +1074,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:668
+#: /home/runa/tor/website/en/faq.wml:667
 msgid "Not currently maintained as far as we know:"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:672
+#: /home/runa/tor/website/en/faq.wml:671
 msgid ""
 "Polippix / Privatlivets Fred is a Danish Knoppix-based LiveCD with Tor and "
 "utilities to encrypt IP-telephony. <a href=\"http://polippix.org/\";>Info and "
@@ -1087,7 +1087,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:675
+#: /home/runa/tor/website/en/faq.wml:674
 msgid ""
 "ELE is a Linux LiveCD which is focused on privacy related software. It "
 "includes Tor and you can download it at <a href=\"http://www.";
@@ -1096,7 +1096,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:679
+#: /home/runa/tor/website/en/faq.wml:678
 msgid ""
 "Virtual Privacy Machine is a Linux LiveCD that includes Firefox, Privoxy, "
 "Tor, some IRC and IM applications, and a set of ipchains rules aimed to "
@@ -1107,7 +1107,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:684
+#: /home/runa/tor/website/en/faq.wml:683
 msgid ""
 "Anonym.OS is a LiveCD similar to the above but is based on OpenBSD rather "
 "than Linux for maximum security. It was designed to be anonymous and secure "
@@ -1118,7 +1118,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/faq.wml:690
+#: /home/runa/tor/website/en/faq.wml:689
 msgid ""
 "Phantomix is a LiveCD for anonymous surfing and chatting based on the most "
 "recent KNOPPIX release. It comes preconfigured with Privoxy, Tor and Polipo. "
@@ -1127,24 +1127,24 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:697
+#: /home/runa/tor/website/en/faq.wml:696
 msgid "Please contact us if you know any others."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:700
+#: /home/runa/tor/website/en/faq.wml:699
 msgid "<hr /> <a id=\"ChooseEntryExit\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:703
+#: /home/runa/tor/website/en/faq.wml:702
 msgid ""
 "<a class=\"anchor\" href=\"#ChooseEntryExit\">Can I control which nodes (or "
 "country) are used for entry/exit?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:706
+#: /home/runa/tor/website/en/faq.wml:705
 msgid ""
 "Yes. You can set preferred entry and exit nodes as well as inform Tor which "
 "nodes you do not want to use.  The following options can be added to your "
@@ -1152,53 +1152,53 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/faq.wml:712
+#: /home/runa/tor/website/en/faq.wml:711
 msgid "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/faq.wml:713
+#: /home/runa/tor/website/en/faq.wml:712
 msgid ""
 "A list of preferred nodes to use for the first hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/faq.wml:715
+#: /home/runa/tor/website/en/faq.wml:714
 msgid "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/faq.wml:716
+#: /home/runa/tor/website/en/faq.wml:715
 msgid ""
 "A list of preferred nodes to use for the last hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/faq.wml:718
+#: /home/runa/tor/website/en/faq.wml:717
 msgid "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/faq.wml:719
+#: /home/runa/tor/website/en/faq.wml:718
 msgid "A list of nodes to never use when building a circuit."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/faq.wml:721
+#: /home/runa/tor/website/en/faq.wml:720
 msgid "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/faq.wml:722
+#: /home/runa/tor/website/en/faq.wml:721
 msgid ""
 "A list of nodes to never use when picking an exit.  Nodes listed in "
 "<tt>ExcludeNodes</tt> are automatically in this list."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:727
+#: /home/runa/tor/website/en/faq.wml:726
 msgid ""
 "<em>We recommend you do not use these</em> -- they are intended for testing "
 "and may disappear in future versions.  You get the best security that Tor "
@@ -1207,7 +1207,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:733
+#: /home/runa/tor/website/en/faq.wml:732
 msgid ""
 "The <tt>EntryNodes</tt> and <tt>ExitNodes</tt> config options are treated as "
 "a request, meaning if the nodes are down or seem slow, Tor will still avoid "
@@ -1219,7 +1219,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:743
+#: /home/runa/tor/website/en/faq.wml:742
 msgid ""
 "Instead of <tt>$fingerprint</tt> you can also specify a 2 letter ISO3166 "
 "country code in curly braces (for example {de}), or an ip address pattern "
@@ -1228,7 +1228,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:751
+#: /home/runa/tor/website/en/faq.wml:750
 msgid ""
 "If you want to access a service directly through Tor's SOCKS interface (eg. "
 "using ssh via connect.c), another option is to set up an internal mapping in "
@@ -1237,24 +1237,24 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:757
+#: /home/runa/tor/website/en/faq.wml:756
 msgid "<hr /> <a id=\"RelayFlexible\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:760
+#: /home/runa/tor/website/en/faq.wml:759
 msgid ""
 "<a class=\"anchor\" href=\"#RelayFlexible\">How stable does my relay need to "
 "be?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:764
+#: /home/runa/tor/website/en/faq.wml:763
 msgid "We aim to make setting up a Tor relay easy and convenient:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:768
+#: /home/runa/tor/website/en/faq.wml:767
 msgid ""
 "Tor has built-in support for <a href=\"https://wiki.torproject.org/noreply/";
 "TheOnionRouter/TorFAQ#LimitBandwidth\"> rate limiting</a>. Further, if you "
@@ -1264,7 +1264,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:778
+#: /home/runa/tor/website/en/faq.wml:777
 msgid ""
 "Each Tor relay has an <a href=\"#ExitPolicies\">exit policy</a> that "
 "specifies what sort of outbound connections are allowed or refused from that "
@@ -1273,7 +1273,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:785
+#: /home/runa/tor/website/en/faq.wml:784
 msgid ""
 "It's fine if the relay goes offline sometimes. The directories notice this "
 "quickly and stop advertising the relay. Just try to make sure it's not too "
@@ -1281,14 +1281,14 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:790
+#: /home/runa/tor/website/en/faq.wml:789
 msgid ""
 "We can handle relays with dynamic IPs just fine &mdash; simply leave the "
 "Address config option blank, and Tor will try to guess."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:793
+#: /home/runa/tor/website/en/faq.wml:792
 msgid ""
 "If your relay is behind a NAT and it doesn't know its public IP (e.g. it has "
 "an IP of 192.168.x.y), you'll need to set up port forwarding. Forwarding TCP "
@@ -1298,7 +1298,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:800
+#: /home/runa/tor/website/en/faq.wml:799
 msgid ""
 "Your relay will passively estimate and advertise its recent bandwidth "
 "capacity, so high-bandwidth relays will attract more users than low-"
@@ -1306,24 +1306,24 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:806
+#: /home/runa/tor/website/en/faq.wml:805
 msgid "<hr /> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:810
+#: /home/runa/tor/website/en/faq.wml:809
 msgid ""
 "<a class=\"anchor\" href=\"#ExitPolicies\">I'd run a relay, but I don't want "
 "to deal with abuse issues.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:814
+#: /home/runa/tor/website/en/faq.wml:813
 msgid "Great. That's exactly why we implemented exit policies."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:818
+#: /home/runa/tor/website/en/faq.wml:817
 msgid ""
 "Each Tor relay has an exit policy that specifies what sort of outbound "
 "connections are allowed or refused from that relay. The exit policies are "
@@ -1339,7 +1339,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:832
+#: /home/runa/tor/website/en/faq.wml:831
 msgid ""
 "The default exit policy allows access to many popular services (e.g. web "
 "browsing), but <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
@@ -1355,7 +1355,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:847
+#: /home/runa/tor/website/en/faq.wml:846
 msgid ""
 "If you do allow any exit connections, make sure name resolution works (that "
 "is, your computer can resolve Internet addresses correctly).  If there are "
@@ -1365,19 +1365,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:855
+#: /home/runa/tor/website/en/faq.wml:854
 msgid "<hr /> <a id=\"RelayOrBridge\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:858
+#: /home/runa/tor/website/en/faq.wml:857
 msgid ""
 "<a class=\"anchor\" href=\"#RelayOrBridge\">Should I be a normal relay or "
 "bridge relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:861
+#: /home/runa/tor/website/en/faq.wml:860
 msgid ""
 "<a href=\"<page bridges>\">Bridge relays</a> (or \"bridges\" for short)  are "
 "<a href=\"<page docs/tor-doc-relay>\">Tor relays</a> that aren't listed in "
@@ -1387,7 +1387,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:868
+#: /home/runa/tor/website/en/faq.wml:867
 msgid ""
 "Being a normal relay vs being a bridge relay is almost the same "
 "configuration: it's just a matter of whether your relay is listed publically "
@@ -1395,7 +1395,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:873
+#: /home/runa/tor/website/en/faq.wml:872
 msgid ""
 "Right now, there are roughly zero places in the world that filter "
 "connections to the Tor network. So getting a lot of bridges running right "
@@ -1406,7 +1406,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:881
+#: /home/runa/tor/website/en/faq.wml:880
 msgid ""
 "So should you run a normal relay or bridge relay? If you have lots of "
 "bandwidth, you should definitely run a normal relay &mdash; bridge relays "
@@ -1417,54 +1417,54 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:889
+#: /home/runa/tor/website/en/faq.wml:888
 msgid "<hr /> <a id=\"WhyNotNamed\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:892
+#: /home/runa/tor/website/en/faq.wml:891
 msgid ""
 "<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:895
+#: /home/runa/tor/website/en/faq.wml:894
 msgid ""
 "We currently use these metrics to determine if your relay should be named:"
 "<br />"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:898
+#: /home/runa/tor/website/en/faq.wml:897
 msgid ""
 "The name is not currently mapped to a different key. Existing mappings are "
 "removed after 6 months of inactivity from a relay."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:900
+#: /home/runa/tor/website/en/faq.wml:899
 msgid "The relay must have been around for at least two weeks."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq.wml:901
+#: /home/runa/tor/website/en/faq.wml:900
 msgid "No other router may have wanted the same name in the past month."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:904
+#: /home/runa/tor/website/en/faq.wml:903
 msgid "<hr /> <a id=\"KeyManagement\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:907
+#: /home/runa/tor/website/en/faq.wml:906
 msgid ""
 "<a class=\"anchor\" href=\"#KeyManagement\">Tell me about all the keys Tor "
 "uses.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:911
+#: /home/runa/tor/website/en/faq.wml:910
 msgid ""
 "Tor uses a variety of different keys, with three goals in mind: 1)  "
 "encryption to ensure privacy of data within the Tor network, 2)  "
@@ -1474,7 +1474,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:919
+#: /home/runa/tor/website/en/faq.wml:918
 msgid ""
 "<b>Encryption</b>: first, all connections in Tor use TLS link encryption, so "
 "observers can't look inside to see which circuit a given cell is intended "
@@ -1485,7 +1485,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:929
+#: /home/runa/tor/website/en/faq.wml:928
 msgid ""
 "<b>Authentication</b>: Every Tor relay has a public decryption key called "
 "the \"onion key\".  When the Tor client establishes circuits, at each step "
@@ -1496,7 +1496,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:939
+#: /home/runa/tor/website/en/faq.wml:938
 msgid ""
 "<b>Coordination</b>: How do clients know what the relays are, and how do "
 "they know that they have the right keys for them? Each relay has a long-term "
@@ -1511,7 +1511,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:953
+#: /home/runa/tor/website/en/faq.wml:952
 msgid ""
 "How do clients know what the directory authorities are? The Tor software "
 "comes with a built-in list of location and public key for each directory "
@@ -1520,7 +1520,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:960
+#: /home/runa/tor/website/en/faq.wml:959
 msgid ""
 "How do users know they've got the right software? When we distribute the "
 "source code or a package, we digitally sign it with <a href=\"http://www.";
@@ -1529,7 +1529,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:968
+#: /home/runa/tor/website/en/faq.wml:967
 msgid ""
 "In order to be certain that it's really signed by us, you need to have met "
 "us in person and gotten a copy of our GPG key fingerprint, or you need to "
@@ -1539,19 +1539,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:975
+#: /home/runa/tor/website/en/faq.wml:974
 msgid "<hr /> <a id=\"EverybodyARelay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:978
+#: /home/runa/tor/website/en/faq.wml:977
 msgid ""
 "<a class=\"anchor\" href=\"#EverybodyARelay\">You should make every Tor user "
 "be a relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:982
+#: /home/runa/tor/website/en/faq.wml:981
 msgid ""
 "Requiring every Tor user to be a relay would help with scaling the network "
 "to handle all our users, and <a href=\"https://wiki.torproject.org/noreply/";
@@ -1566,7 +1566,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:994
+#: /home/runa/tor/website/en/faq.wml:993
 msgid ""
 "That said, we do want to encourage Tor users to run relays, so what we "
 "really want to do is simplify the process of setting up and maintaining a "
@@ -1577,12 +1577,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1003
+#: /home/runa/tor/website/en/faq.wml:1002
 msgid "There are five steps we need to address before we can do this though:"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1007
+#: /home/runa/tor/website/en/faq.wml:1006
 msgid ""
 "First, we need to make Tor stable as a relay on all common operating "
 "systems. The main remaining platform is Windows, and we plan to finally "
@@ -1591,7 +1591,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1015
+#: /home/runa/tor/website/en/faq.wml:1014
 msgid ""
 "Second, we still need to get better at automatically estimating the right "
 "amount of bandwidth to allow. See item #7 on the <a href=\"<page "
@@ -1604,7 +1604,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1026
+#: /home/runa/tor/website/en/faq.wml:1025
 msgid ""
 "Third, we need to work on scalability, both of the network (how to stop "
 "requiring that all Tor relays be able to connect to all Tor relays) and of "
@@ -1616,7 +1616,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1036
+#: /home/runa/tor/website/en/faq.wml:1035
 msgid ""
 "Fourth, we need to better understand the risks from letting the attacker "
 "send traffic through your relay while you're also initiating your own "
@@ -1633,7 +1633,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1052
+#: /home/runa/tor/website/en/faq.wml:1051
 msgid ""
 "Fifth, we might need some sort of incentive scheme to encourage people to "
 "relay traffic for others, and/or to become exit nodes. Here are our <a href="
@@ -1642,43 +1642,43 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1059
+#: /home/runa/tor/website/en/faq.wml:1058
 msgid "Please help on all of these!"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:1062
+#: /home/runa/tor/website/en/faq.wml:1061
 msgid "<hr /> <a id=\"Criminals\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:1065
+#: /home/runa/tor/website/en/faq.wml:1064
 msgid ""
 "<a class=\"anchor\" href=\"#Criminals\">Doesn't Tor enable criminals to do "
 "bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1069
+#: /home/runa/tor/website/en/faq.wml:1068
 msgid ""
 "For the answer to this question and others, please see our <a href=\"<page "
 "faq-abuse>\">Tor Abuse FAQ</a>."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:1073
+#: /home/runa/tor/website/en/faq.wml:1072
 msgid "<hr /> <a id=\"RespondISP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq.wml:1076
+#: /home/runa/tor/website/en/faq.wml:1075
 msgid ""
 "<a class=\"anchor\" href=\"#RespondISP\">How do I respond to my ISP about my "
 "exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq.wml:1080
+#: /home/runa/tor/website/en/faq.wml:1079
 msgid ""
 "A collection of templates for successfully responding to ISPs is <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TorAbuseTemplates";

Modified: translation/trunk/projects/website/zh_CN/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/zh_CN/3-low.download-unix.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/zh_CN/3-low.download-unix.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:52+0100\n"
+"POT-Creation-Date: 2009-12-08 18:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -69,15 +69,15 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:35 /tmp/PswpC95eQo.xml:51
-#: /tmp/PswpC95eQo.xml:67 /tmp/PswpC95eQo.xml:83 /tmp/PswpC95eQo.xml:99
-#: /tmp/PswpC95eQo.xml:115 /tmp/PswpC95eQo.xml:131 /tmp/PswpC95eQo.xml:147
-#: /tmp/PswpC95eQo.xml:163 /tmp/PswpC95eQo.xml:180 /tmp/PswpC95eQo.xml:197
+#: /home/runa/tor/website/en/download-unix.wml:35 /tmp/w2FNmBr9Zw.xml:51
+#: /tmp/w2FNmBr9Zw.xml:67 /tmp/w2FNmBr9Zw.xml:83 /tmp/w2FNmBr9Zw.xml:99
+#: /tmp/w2FNmBr9Zw.xml:115 /tmp/w2FNmBr9Zw.xml:131 /tmp/w2FNmBr9Zw.xml:147
+#: /tmp/w2FNmBr9Zw.xml:163 /tmp/w2FNmBr9Zw.xml:180 /tmp/w2FNmBr9Zw.xml:197
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:40 /tmp/PswpC95eQo.xml:56
+#: /home/runa/tor/website/en/download-unix.wml:40 /tmp/w2FNmBr9Zw.xml:56
 msgid "<img src=\"images/distros/centos.png\" alt=\"CentOS 4\" />"
 msgstr ""
 
@@ -120,7 +120,7 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:72 /tmp/PswpC95eQo.xml:88
+#: /home/runa/tor/website/en/download-unix.wml:72 /tmp/w2FNmBr9Zw.xml:88
 msgid "<img src=\"images/distros/centos.png\" alt=\"CentOS 5\" />"
 msgstr ""
 
@@ -163,7 +163,7 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:104 /tmp/PswpC95eQo.xml:120
+#: /home/runa/tor/website/en/download-unix.wml:104 /tmp/w2FNmBr9Zw.xml:120
 msgid "<img src=\"images/distros/fedora.png\" alt=\"Fedora Core 10\" />"
 msgstr ""
 
@@ -206,7 +206,7 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:136 /tmp/PswpC95eQo.xml:152
+#: /home/runa/tor/website/en/download-unix.wml:136 /tmp/w2FNmBr9Zw.xml:152
 msgid "<img src=\"images/distros/suse.png\" alt=\"openSUSE 11\" />"
 msgstr ""
 
@@ -521,8 +521,7 @@
 "See the <a href=\"<page documentation>#Developers\">developer documentation</"
 "a> for instructions on fetching Tor from Git to get the very latest "
 "development version source code.  You can also download the <a href=\"dist/"
-"\">Privoxy source</a> or <a href=\"dist/vidalia-bundles/?C=M;O=D\">Vidalia "
-"source</a>."
+"\">Privoxy source</a> or <a href=\"vidalia/dist/\">Vidalia source</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/zh_CN/3-low.faq-abuse.po
===================================================================
--- translation/trunk/projects/website/zh_CN/3-low.faq-abuse.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/zh_CN/3-low.faq-abuse.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:52+0100\n"
+"POT-Creation-Date: 2009-12-08 18:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -87,25 +87,32 @@
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/faq-abuse.wml:25
 msgid ""
+"<a href=\"<page faq-abuse>#RemoveContent\">I want some content removed from "
+"a .onion address.</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/en/faq-abuse.wml:26
+msgid ""
 "<a href=\"<page faq-abuse>#LegalQuestions\">I have legal questions about Tor "
 "abuse.</a>"
 msgstr ""
 
 #.  END SIDEBAR 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:29
+#: /home/runa/tor/website/en/faq-abuse.wml:30
 msgid "<hr /> <a id=\"WhatAboutCriminals\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:32
+#: /home/runa/tor/website/en/faq-abuse.wml:33
 msgid ""
 "<a class=\"anchor\" href=\"#WhatAboutCriminals\">Doesn't Tor enable "
 "criminals to do bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:34
+#: /home/runa/tor/website/en/faq-abuse.wml:35
 msgid ""
 "Criminals can already do bad things. Since they're willing to break laws, "
 "they already have lots of options available that provide <em>better</em> "
@@ -117,14 +124,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:42
+#: /home/runa/tor/website/en/faq-abuse.wml:43
 msgid ""
 "Tor aims to provide protection for ordinary people who want to follow the "
 "law. Only criminals have privacy right now, and we need to fix that."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:45
+#: /home/runa/tor/website/en/faq-abuse.wml:46
 msgid ""
 "Some advocates of anonymity explain that it's just a tradeoff &mdash; "
 "accepting the bad uses for the good ones &mdash; but there's more to it than "
@@ -137,7 +144,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:55
+#: /home/runa/tor/website/en/faq-abuse.wml:56
 msgid ""
 "So yes, criminals could in theory use Tor, but they already have better "
 "options, and it seems unlikely that taking Tor away from the world will stop "
@@ -153,19 +160,19 @@
 #. <h3><a class="anchor" href="#Pervasive">If the whole world starts using
 #. Tor, won't civilization collapse?</a></h3>
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:67
+#: /home/runa/tor/website/en/faq-abuse.wml:68
 msgid "<a id=\"DDoS\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:68
+#: /home/runa/tor/website/en/faq-abuse.wml:69
 msgid ""
 "<a class=\"anchor\" href=\"#DDoS\">What about distributed denial of service "
 "attacks?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:70
+#: /home/runa/tor/website/en/faq-abuse.wml:71
 msgid ""
 "Distributed denial of service (DDoS) attacks typically rely on having a "
 "group of thousands of computers all sending floods of traffic to a victim. "
@@ -174,7 +181,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:75
+#: /home/runa/tor/website/en/faq-abuse.wml:76
 msgid ""
 "But because Tor only transports correctly formed TCP streams, not all IP "
 "packets, you cannot send UDP packets over Tor. (You can't do specialized "
@@ -187,18 +194,18 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:84
+#: /home/runa/tor/website/en/faq-abuse.wml:85
 msgid "<a id=\"WhatAboutSpammers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:85
+#: /home/runa/tor/website/en/faq-abuse.wml:86
 msgid ""
 "<a class=\"anchor\" href=\"#WhatAboutSpammers\">What about spammers?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:87
+#: /home/runa/tor/website/en/faq-abuse.wml:88
 msgid ""
 "First of all, the default Tor exit policy rejects all outgoing port 25 "
 "(SMTP) traffic. So sending spam mail through Tor isn't going to work by "
@@ -210,7 +217,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:95
+#: /home/runa/tor/website/en/faq-abuse.wml:96
 msgid ""
 "Of course, it's not all about delivering the mail. Spammers can use Tor to "
 "connect to open HTTP proxies (and from there to SMTP servers); to connect to "
@@ -220,7 +227,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:103
+#: /home/runa/tor/website/en/faq-abuse.wml:104
 msgid ""
 "This is a shame, but notice that spammers are already doing great without "
 "Tor. Also, remember that many of their more subtle communication mechanisms "
@@ -229,33 +236,33 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:109
+#: /home/runa/tor/website/en/faq-abuse.wml:110
 msgid "<a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:110
+#: /home/runa/tor/website/en/faq-abuse.wml:111
 msgid ""
 "<a class=\"anchor\" href=\"#ExitPolicies\">How do Tor exit policies work?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:113
+#: /home/runa/tor/website/en/faq-abuse.wml:114
 msgid "<a href=\"<page faq>#ExitPolicies\">Moved to the new FAQ page</a>"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:116
+#: /home/runa/tor/website/en/faq-abuse.wml:117
 msgid "<a id=\"HowMuchAbuse\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:117
+#: /home/runa/tor/website/en/faq-abuse.wml:118
 msgid "<a class=\"anchor\" href=\"#HowMuchAbuse\">Does Tor get much abuse?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:119
+#: /home/runa/tor/website/en/faq-abuse.wml:120
 msgid ""
 "Not much, in the grand scheme of things. We've been running the network "
 "since October 2003, and it's only generated a handful of complaints. Of "
@@ -267,26 +274,26 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:127
+#: /home/runa/tor/website/en/faq-abuse.wml:128
 msgid ""
 "Since Tor has <a href=\"<page overview>\">many good uses as well</a>, we "
 "feel that we're doing pretty well at striking a balance currently."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:132
+#: /home/runa/tor/website/en/faq-abuse.wml:133
 msgid "<a id=\"TypicalAbuses\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:133
+#: /home/runa/tor/website/en/faq-abuse.wml:134
 msgid ""
 "<a class=\"anchor\" href=\"#TypicalAbuses\">So what should I expect if I run "
 "an exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:135
+#: /home/runa/tor/website/en/faq-abuse.wml:136
 msgid ""
 "If you run a Tor relay that allows exit connections (such as the default "
 "exit policy), it's probably safe to say that you will eventually hear from "
@@ -294,7 +301,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:140
+#: /home/runa/tor/website/en/faq-abuse.wml:141
 msgid ""
 "Somebody connects to Hotmail, and sends a ransom note to a company. The FBI "
 "sends you a polite email, you explain that you run a Tor relay, and they say "
@@ -302,7 +309,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:144
+#: /home/runa/tor/website/en/faq-abuse.wml:145
 msgid ""
 "Somebody tries to get you shut down by using Tor to connect to Google groups "
 "and post spam to Usenet, and then sends an angry mail to your ISP about how "
@@ -310,7 +317,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:147
+#: /home/runa/tor/website/en/faq-abuse.wml:148
 msgid ""
 "Somebody connects to an IRC network and makes a nuisance of himself. Your "
 "ISP gets polite mail about how your computer has been compromised; and/or "
@@ -318,7 +325,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:150
+#: /home/runa/tor/website/en/faq-abuse.wml:151
 msgid ""
 "Somebody uses Tor to download a Vin Diesel movie, and your ISP gets a DMCA "
 "takedown notice. See EFF's <a href=\"<page eff/tor-dmca-response>\">Tor DMCA "
@@ -327,7 +334,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:157
+#: /home/runa/tor/website/en/faq-abuse.wml:158
 msgid ""
 "You might also find that your Tor relay's IP is blocked from accessing some "
 "Internet sites/services. This might happen regardless of your exit policy, "
@@ -337,7 +344,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:164
+#: /home/runa/tor/website/en/faq-abuse.wml:165
 msgid ""
 "Because of a few cases of anonymous jerks messing with its web pages, "
 "Wikipedia is currently blocking many Tor relay IPs from writing (reading "
@@ -349,7 +356,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/faq-abuse.wml:173
+#: /home/runa/tor/website/en/faq-abuse.wml:174
 msgid ""
 "SORBS is putting some Tor relay IPs on their email blacklist as well. They "
 "do this because they passively detect whether your relay connects to certain "
@@ -361,19 +368,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:184
+#: /home/runa/tor/website/en/faq-abuse.wml:185
 msgid "<a id=\"IrcBans\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:185
+#: /home/runa/tor/website/en/faq-abuse.wml:186
 msgid ""
 "<a class=\"anchor\" href=\"#IrcBans\">Tor is banned from the IRC network I "
 "want to use.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:187
+#: /home/runa/tor/website/en/faq-abuse.wml:188
 msgid ""
 "Sometimes jerks make use of Tor to troll IRC channels. This abuse results in "
 "IP-specific temporary bans (\"klines\" in IRC lingo), as the network "
@@ -381,7 +388,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:191
+#: /home/runa/tor/website/en/faq-abuse.wml:192
 msgid ""
 "This response underscores a fundamental flaw in IRC's security model: they "
 "assume that IP addresses equate to humans, and by banning the IP address "
@@ -395,7 +402,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:201
+#: /home/runa/tor/website/en/faq-abuse.wml:202
 msgid ""
 "On the other hand, from the viewpoint of IRC server operators, security is "
 "not an all-or-nothing thing.  By responding quickly to trolls or any other "
@@ -409,7 +416,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:211
+#: /home/runa/tor/website/en/faq-abuse.wml:212
 msgid ""
 "But the real answer is to implement application-level auth systems, to let "
 "in well-behaving users and keep out badly-behaving users. This needs to be "
@@ -418,7 +425,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:216
+#: /home/runa/tor/website/en/faq-abuse.wml:217
 msgid ""
 "Of course, not all IRC networks are trying to ban Tor nodes. After all, "
 "quite a few people use Tor to IRC in privacy in order to carry on legitimate "
@@ -429,7 +436,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:223
+#: /home/runa/tor/website/en/faq-abuse.wml:224
 msgid ""
 "If you're being blocked, have a discussion with the network operators and "
 "explain the issues to them. They may not be aware of the existence of Tor at "
@@ -441,7 +448,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:231
+#: /home/runa/tor/website/en/faq-abuse.wml:232
 msgid ""
 "Finally, if you become aware of an IRC network that seems to be blocking "
 "Tor, or a single Tor exit node, please put that information on <a href="
@@ -452,19 +459,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:238
+#: /home/runa/tor/website/en/faq-abuse.wml:239
 msgid "<a id=\"SMTPBans\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:239
+#: /home/runa/tor/website/en/faq-abuse.wml:240
 msgid ""
 "<a class=\"anchor\" href=\"#SMTPBans\">Your nodes are banned from the mail "
 "server I want to use.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:241
+#: /home/runa/tor/website/en/faq-abuse.wml:242
 msgid ""
 "Even though <a href=\"#WhatAboutSpammers\">Tor isn't useful for spamming</"
 "a>, some over-zealous blacklisters seem to think that all open networks like "
@@ -473,7 +480,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:247
+#: /home/runa/tor/website/en/faq-abuse.wml:248
 msgid ""
 "If your server administrators decide to make use of these blacklists to "
 "refuse incoming mail, you should have a conversation with them and explain "
@@ -481,19 +488,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:251
+#: /home/runa/tor/website/en/faq-abuse.wml:252
 msgid "<a id=\"Bans\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:252
+#: /home/runa/tor/website/en/faq-abuse.wml:253
 msgid ""
 "<a class=\"anchor\" href=\"#Bans\">I want to ban the Tor network from my "
 "service.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:254
+#: /home/runa/tor/website/en/faq-abuse.wml:255
 msgid ""
 "We're sorry to hear that. There are some situations where it makes sense to "
 "block anonymous users for an Internet service. But in many cases, there are "
@@ -502,7 +509,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:259
+#: /home/runa/tor/website/en/faq-abuse.wml:260
 msgid ""
 "First, ask yourself if there's a way to do application-level decisions to "
 "separate the legitimate users from the jerks. For example, you might have "
@@ -514,7 +521,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:268
+#: /home/runa/tor/website/en/faq-abuse.wml:269
 msgid ""
 "For example, the <a href=\"http://freenode.net/policy.shtml#tor\";>Freenode "
 "IRC network</a> had a problem with a coordinated group of abusers joining "
@@ -525,7 +532,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:276
+#: /home/runa/tor/website/en/faq-abuse.wml:277
 msgid ""
 "Second, consider that hundreds of thousands of people use Tor every day "
 "simply for good data hygiene &mdash; for example, to protect against data-"
@@ -540,7 +547,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:289
+#: /home/runa/tor/website/en/faq-abuse.wml:290
 msgid ""
 "At this point, you should also ask yourself what you do about other services "
 "that aggregate many users behind a few IP addresses. Tor is not so different "
@@ -548,7 +555,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:293
+#: /home/runa/tor/website/en/faq-abuse.wml:294
 msgid ""
 "Lastly, please remember that Tor relays have <a href=\"<page "
 "faq>#ExitPolicies\">individual exit policies</a>. Many Tor relays do not "
@@ -560,7 +567,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:302
+#: /home/runa/tor/website/en/faq-abuse.wml:303
 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 "
@@ -568,7 +575,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:309
+#: /home/runa/tor/website/en/faq-abuse.wml:310
 msgid ""
 "(Some system administrators block ranges of IP addresses because of official "
 "policy or some abuse pattern, but some have also asked about whitelisting "
@@ -577,19 +584,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:315
+#: /home/runa/tor/website/en/faq-abuse.wml:316
 msgid "<a id=\"TracingUsers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:316
+#: /home/runa/tor/website/en/faq-abuse.wml:317
 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><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:319
+#: /home/runa/tor/website/en/faq-abuse.wml:320
 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 "
@@ -597,7 +604,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:325
+#: /home/runa/tor/website/en/faq-abuse.wml:326
 msgid ""
 "Some fans have suggested that we redesign Tor to include a <a href=\"<page "
 "faq>#Backdoor\">backdoor</a>.  There are two problems with this idea. First, "
@@ -611,7 +618,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:338
+#: /home/runa/tor/website/en/faq-abuse.wml:339
 msgid ""
 "But remember that this doesn't mean that Tor is invulnerable. Traditional "
 "police techniques can still be very effective against Tor, such as "
@@ -620,26 +627,61 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq-abuse.wml:344
+#: /home/runa/tor/website/en/faq-abuse.wml:345
+msgid "<a id=\"RemoveContent\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/faq-abuse.wml:346
+msgid ""
+"<a class=\"anchor\" href=\"#RemoveContent\">I want some content removed from "
+"a .onion address.</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/faq-abuse.wml:347
+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 "
+"from <a href=\"<page docs/tor-hidden-service>\">a hidden service</a>.  The "
+"name you see ending in .onion is a hidden service descriptor.  It's an "
+"automatically generated name which can be located on any Tor relay or client "
+"anywhere on the Internet.  Hidden services are designed to protect both the "
+"user and service provider from discovering who they are and where they are "
+"from.  The design of hidden services means the owner and location of the ."
+"onion site is hidden even from us."
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/faq-abuse.wml:356
+msgid ""
+"But remember that this doesn't mean that hidden services are invulnerable. "
+"Traditional police techniques can still be very effective against them, such "
+"as interviewing suspects, surveillance and keyboard taps, writing style "
+"analysis, sting operations, and other physical investigations."
+msgstr ""
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/en/faq-abuse.wml:362
 msgid "<a id=\"LegalQuestions\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/faq-abuse.wml:345
+#: /home/runa/tor/website/en/faq-abuse.wml:363
 msgid ""
 "<a class=\"anchor\" href=\"#LegalQuestions\">I have legal questions about "
 "Tor abuse.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:347
+#: /home/runa/tor/website/en/faq-abuse.wml:365
 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><p>
-#: /home/runa/tor/website/en/faq-abuse.wml:350
+#: /home/runa/tor/website/en/faq-abuse.wml:368
 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/zh_CN/3-low.news.po
===================================================================
--- translation/trunk/projects/website/zh_CN/3-low.news.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/zh_CN/3-low.news.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:52+0100\n"
+"POT-Creation-Date: 2009-12-08 18:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -34,13 +34,21 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/news.wml:16
 msgid ""
+"10 October 2009: Tor 0.2.1.20 released as stable.  Read the <a href="
+"\"https://blog.torproject.org/blog/tor-02120-released\";>announcement</a> for "
+"the updates and changes."
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/news.wml:17
+msgid ""
 "28 July 2009: Tor 0.2.1.19 released as stable.  Read the <a href=\"http://";
 "archives.seul.org/or/announce/Aug-2009/msg00000.html\">announcement</a> for "
 "the updates and changes."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:19
+#: /home/runa/tor/website/en/news.wml:20
 msgid ""
 "25 June 2009: Tor 0.2.0.35 released as stable.  Read the <a href=\"http://";
 "archives.seul.org/or/announce/Jun-2009/msg00000.html\">announcement</a> for "
@@ -48,7 +56,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:21
+#: /home/runa/tor/website/en/news.wml:22
 msgid ""
 "12 March 2009: Tor launches performance roadmap and campaign.  Read the <a "
 "href=\"<page press/2009-03-12-performance-roadmap-press-release>\">Press "
@@ -56,7 +64,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:22
+#: /home/runa/tor/website/en/news.wml:23
 msgid ""
 "09 February 2009: Tor 0.2.0.34 released as stable.  Read the <a href="
 "\"http://archives.seul.org/or/announce/Feb-2009/msg00000.html";
@@ -65,7 +73,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:25
+#: /home/runa/tor/website/en/news.wml:26
 msgid ""
 "21 January 2009: Tor 0.2.0.33 released as stable.  Read the <a href=\"http://";
 "archives.seul.org/or/announce/Jan-2009/msg00000.html\">announcement</a> for "
@@ -73,7 +81,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:28
+#: /home/runa/tor/website/en/news.wml:29
 msgid ""
 "19 December 2008: Tor releases 3-year development roadmap.  Read the <a href="
 "\"<page press/2008-12-19-roadmap-press-release>\">Press Release</a> for more "
@@ -81,7 +89,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:31
+#: /home/runa/tor/website/en/news.wml:32
 msgid ""
 "05 December 2008: Tor 0.2.0.32 released as stable.  Read the <a href="
 "\"http://archives.seul.org/or/announce/Dec-2008/msg00000.html";
@@ -89,7 +97,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:34
+#: /home/runa/tor/website/en/news.wml:35
 msgid ""
 "08 September 2008: Tor 0.2.0.31 released as stable. Read the <a href="
 "\"http://archives.seul.org/or/announce/Sep-2008/msg00000.html";
@@ -97,7 +105,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:37
+#: /home/runa/tor/website/en/news.wml:38
 msgid ""
 "25 August 2008: Tor 0.2.0.30 released as stable.  Read the <a href=\"http://";
 "archives.seul.org/or/announce/Aug-2008/msg00000.html\">announcement</a> or "
@@ -106,7 +114,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:42
+#: /home/runa/tor/website/en/news.wml:43
 msgid ""
 "25 May 2008: Tor receives two awards from the <a href=\"http://nlnet.nl/";
 "\">NLnet Foundation</a>.  The first is to improve the performance of hidden "
@@ -116,7 +124,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:49
+#: /home/runa/tor/website/en/news.wml:50
 msgid ""
 "13 May 2008: <a href=\"http://archives.seul.org/or/talk/May-2008/msg00048.";
 "html\">Tor 0.2.0.26-rc</a> replaces several V3 directory authority keys "
@@ -135,14 +143,14 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:62
+#: /home/runa/tor/website/en/news.wml:63
 msgid ""
 "Mar 2008: <a href=\"https://blog.torproject.org/blog/tor-project-google-";
 "summer-code-2008!\">Tor Project is in Google Summer of Code 2008!</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:66
+#: /home/runa/tor/website/en/news.wml:67
 msgid ""
 "Feb 2008: The <a href=\"https://www.torproject.org/people#Board\";>Board of "
 "Directors</a> welcomes <a href=\"https://blog.torproject.org/blog/isaac-mao-";
@@ -151,14 +159,14 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:72
+#: /home/runa/tor/website/en/news.wml:73
 msgid ""
 "Feb 2008: Tor is happy to announce the <a href=\"https://blog.torproject.org";
 "\">official Tor blog</a>."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:75
+#: /home/runa/tor/website/en/news.wml:76
 msgid ""
 "Jan 2008: <a href=\"<page download>\">Tor 0.1.2.19</a> (the latest stable "
 "release) fixes a huge memory leak on exit relays, makes the default exit "
@@ -169,7 +177,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:83
+#: /home/runa/tor/website/en/news.wml:84
 msgid ""
 "Oct 2007: <a href=\"<page download>\">Tor 0.1.2.18</a> (the new stable "
 "release) fixes many problems including crash bugs, problems with hidden "
@@ -183,7 +191,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:93
+#: /home/runa/tor/website/en/news.wml:94
 msgid ""
 "Oct 2007: As many of you know, The Tor Project became an <a href=\"<page "
 "people>\">independent and official nonprofit</a> this past February. We did "
@@ -197,7 +205,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:105
+#: /home/runa/tor/website/en/news.wml:106
 msgid ""
 "Sep 2007: If you have received email claiming to be Tor, it wasn't from us. "
 "The <a href=\"<page download>\">official Tor bundles</a> can be <a href="
@@ -205,7 +213,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:109
+#: /home/runa/tor/website/en/news.wml:110
 msgid ""
 "Aug 2007: <strong>Please update your Tor software!</strong> The latest "
 "versions (stable: 0.1.2.17; development: 0.2.0.6-alpha)  patch a significant "
@@ -215,7 +223,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:115
+#: /home/runa/tor/website/en/news.wml:116
 msgid ""
 "Feb 2007: The Tor Project and UColo/Boulder <a href=\"http://blogs.law.";
 "harvard.edu/anonymous/2007/02/26/the-rumors-of-our-demise/\">respond</a> to "
@@ -224,7 +232,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:120
+#: /home/runa/tor/website/en/news.wml:121
 msgid ""
 "Jan 2007: The Tor network has grown to hundreds of thousands of users. The "
 "developers can't do all the new features, bug fixes, and documentation. <a "
@@ -232,7 +240,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:124
+#: /home/runa/tor/website/en/news.wml:125
 msgid ""
 "<b>We are actively looking for new sponsors and funding.</b> If your "
 "organization has an interest in keeping the Tor network usable and fast, "

Modified: translation/trunk/projects/website/zh_CN/3-low.people.po
===================================================================
--- translation/trunk/projects/website/zh_CN/3-low.people.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/zh_CN/3-low.people.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:52+0100\n"
+"POT-Creation-Date: 2009-12-08 18:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -121,12 +121,25 @@
 
 #. type: Content of: <div><dl><dt>
 #: /home/runa/tor/website/en/people.wml:49
-msgid "Sebastian Hahn"
+msgid "Melissa Gilroy (CFO and Internal Audit)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:49
 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 "
+"operations moving along."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:53
+msgid "Sebastian Hahn"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:53
+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 "
 "Code on expanding Thandy to include BitTorrent support. Generally helps out "
@@ -134,14 +147,14 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:53
+#: /home/runa/tor/website/en/people.wml:57
 msgid ""
 "Andrew Lewman (Executive Director; Director; <a href=\"<page press/index>"
 "\">press contact</a>)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:54
+#: /home/runa/tor/website/en/people.wml:58
 msgid ""
 "Manages the business operations of The Tor Project, Inc.  Plays roles of "
 "finance, advocacy, project management, and general support.  General package "
@@ -149,12 +162,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:58
+#: /home/runa/tor/website/en/people.wml:62
 msgid "Karsten Loesing (Developer)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:58
+#: /home/runa/tor/website/en/people.wml:62
 msgid ""
 "Worked during the 2007 Google Summer of Code on <a href=\"<svnsandbox>doc/"
 "spec/proposals/114-distributed-storage.txt\">distributing and securing the "
@@ -164,24 +177,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:66
+#: /home/runa/tor/website/en/people.wml:70
 msgid "Nick Mathewson (Chief architect; Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:66
+#: /home/runa/tor/website/en/people.wml:70
 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><dl><dt>
-#: /home/runa/tor/website/en/people.wml:69
+#: /home/runa/tor/website/en/people.wml:73
 msgid "Steven Murdoch (Researcher and Developer)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:69
+#: /home/runa/tor/website/en/people.wml:73
 msgid ""
 "Researcher at the University of Cambridge, currently funded by The Tor "
 "Project to improve the security, performance, and usability of Tor. Creator "
@@ -189,36 +202,36 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:74
+#: /home/runa/tor/website/en/people.wml:78
 msgid "Peter Palfrader"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:74
+#: /home/runa/tor/website/en/people.wml:78
 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><dl><dt>
-#: /home/runa/tor/website/en/people.wml:77
+#: /home/runa/tor/website/en/people.wml:81
 msgid "Martin Peck (Developer)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:77
+#: /home/runa/tor/website/en/people.wml:81
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:79
+#: /home/runa/tor/website/en/people.wml:83
 msgid "Mike Perry (Developer)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:79
+#: /home/runa/tor/website/en/people.wml:83
 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 "
@@ -227,24 +240,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:84
+#: /home/runa/tor/website/en/people.wml:88
 msgid "Karen Reilly (Development Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:84
+#: /home/runa/tor/website/en/people.wml:88
 msgid ""
 "Responsible for fundraising, advocacy, and general marketing and outreach "
 "programs for Tor."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:87
+#: /home/runa/tor/website/en/people.wml:91
 msgid "Paul Syverson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:87
+#: /home/runa/tor/website/en/people.wml:91
 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 "
@@ -253,69 +266,69 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:94
+#: /home/runa/tor/website/en/people.wml:98
 msgid "<a id=\"Board\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:95
+#: /home/runa/tor/website/en/people.wml:99
 msgid ""
 "<a class=\"anchor\" href=\"#Board\">The Tor Project Board of Directors:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:99
+#: /home/runa/tor/website/en/people.wml:103
 msgid "Ian Goldberg (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:99
+#: /home/runa/tor/website/en/people.wml:103
 msgid ""
 "Cryptographer, privacy expert, and professor; one of the designers of <a "
 "href=\"http://www.cypherpunks.ca/otr/\";>Off-the-Record Messaging</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:102
+#: /home/runa/tor/website/en/people.wml:106
 msgid "Xianghui (Isaac) Mao (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:102
+#: /home/runa/tor/website/en/people.wml:106
 msgid ""
 "Chinese blogging and privacy activist.  His current activities can be found "
 "at <a href=\"http://isaacmao.com/\";>his website</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:105
+#: /home/runa/tor/website/en/people.wml:109
 msgid "Frank Rieger (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:105
+#: /home/runa/tor/website/en/people.wml:109
 msgid "CTO of <a href=\"http://www.gsmk.de/\";>GSMK Cryptophone</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:107
+#: /home/runa/tor/website/en/people.wml:111
 msgid "Wendy Seltzer (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:107
+#: /home/runa/tor/website/en/people.wml:111
 msgid ""
 "Lawyer, cyberlaw professor, and founder of <a href=\"http://chillingeffects.";
 "org/\">ChillingEffects.org</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:110
+#: /home/runa/tor/website/en/people.wml:114
 msgid "Fred von Lohmann (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:110
+#: /home/runa/tor/website/en/people.wml:114
 msgid ""
 "Fred is a Senior Intellectual Property Attorney at the Electronic Frontier "
 "Foundation (EFF). His complete bio can be found at the <a href=\"http://www.";
@@ -323,27 +336,27 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:115
+#: /home/runa/tor/website/en/people.wml:119
 msgid "Along with Roger, Nick, and Andrew listed above as Directors."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:118
+#: /home/runa/tor/website/en/people.wml:122
 msgid "<a id=\"Summer\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:119
+#: /home/runa/tor/website/en/people.wml:123
 msgid "<a class=\"anchor\" href=\"#Summer\">Summer students:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:122
+#: /home/runa/tor/website/en/people.wml:126
 msgid "Christopher Davis"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:122
+#: /home/runa/tor/website/en/people.wml:126
 msgid ""
 "Adapts Polipo to depend upon the libevent library, making use of its event "
 "loop, asynchronous DNS resolver, and utility library. (<a href=\"http://www.";
@@ -352,12 +365,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:128
+#: /home/runa/tor/website/en/people.wml:132
 msgid "Damian Johnson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:128
+#: /home/runa/tor/website/en/people.wml:132
 msgid ""
 "Builds a command-line application for monitoring Tor relays, providing real-"
 "time status information such as the current configuration, bandwidth usage, "
@@ -366,12 +379,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:132
+#: /home/runa/tor/website/en/people.wml:136
 msgid "Kory Kirk"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:132
+#: /home/runa/tor/website/en/people.wml:136
 msgid ""
 "Extends <a href=\"<page torbutton/index>\">Torbutton</a> by implementing "
 "three feature requests, namely the <a href=\"https://bugs.torproject.org/";
@@ -384,12 +397,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:143
+#: /home/runa/tor/website/en/people.wml:147
 msgid "Runa Sandvik"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:143
+#: /home/runa/tor/website/en/people.wml:147
 msgid ""
 "Improves usability of <a href=\"https://translation.torproject.org/";
 "\">translating the website</a> by automatically converting wml files to po "
@@ -399,12 +412,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:150
+#: /home/runa/tor/website/en/people.wml:154
 msgid "Stephen Tyree"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:150
+#: /home/runa/tor/website/en/people.wml:154
 msgid ""
 "Develops a plugin API for <a href=\"<page vidalia/index>\">Vidalia</a> and "
 "creates a plugin to allow HerdictWeb integration, a project aiming at "
@@ -415,136 +428,136 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:161
+#: /home/runa/tor/website/en/people.wml:165
 msgid "<a id=\"Translators\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:162
+#: /home/runa/tor/website/en/people.wml:166
 msgid "<a class=\"anchor\" href=\"#Translators\">Core translators:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:165
+#: /home/runa/tor/website/en/people.wml:169
 msgid "Bogdan Drozdowski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:165
+#: /home/runa/tor/website/en/people.wml:169
 msgid "<a href=\"https://www.torproject.org/index.html.pl\";>Polish</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:167
+#: /home/runa/tor/website/en/people.wml:171
 msgid "fredzupy"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:167
+#: /home/runa/tor/website/en/people.wml:171
 msgid "<a href=\"https://www.torproject.org/index.html.fr\";>French</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:169
+#: /home/runa/tor/website/en/people.wml:173
 msgid ""
 "Ruben Garcia, plus further pages by <a href=\"http://www.greentranslations.";
 "com/\">Green Crescent</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:170
+#: /home/runa/tor/website/en/people.wml:174
 msgid "<a href=\"https://www.torproject.org/index.html.es\";>Spanish</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:172
+#: /home/runa/tor/website/en/people.wml:176
 msgid "Jens Kubieziel and Oliver Knapp"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:172
+#: /home/runa/tor/website/en/people.wml:176
 msgid "<a href=\"https://www.torproject.org/index.html.de\";>German</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:174
+#: /home/runa/tor/website/en/people.wml:178
 msgid "Pei Hanru and bridgefish"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:174
+#: /home/runa/tor/website/en/people.wml:178
 msgid ""
 "<a href=\"https://www.torproject.org/index.html.zh-cn\";>Simplified Chinese</"
 "a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:176
+#: /home/runa/tor/website/en/people.wml:180
 msgid "Jan Reister"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:176
+#: /home/runa/tor/website/en/people.wml:180
 msgid "<a href=\"https://www.torproject.org/index.html.it\";>Italian</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:178
+#: /home/runa/tor/website/en/people.wml:182
 msgid "Masaki Taniguchi"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:178
+#: /home/runa/tor/website/en/people.wml:182
 msgid "<a href=\"https://www.torproject.org/index.html.ja\";>Japanese</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:180
+#: /home/runa/tor/website/en/people.wml:184
 msgid "Jan Woning"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:180
+#: /home/runa/tor/website/en/people.wml:184
 msgid "<a href=\"https://www.torproject.org/index.html.nl\";>Dutch</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:182
+#: /home/runa/tor/website/en/people.wml:186
 msgid "ygrek"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:182
+#: /home/runa/tor/website/en/people.wml:186
 msgid "<a href=\"https://www.torproject.org/index.html.ru\";>Russian</a>."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:186
+#: /home/runa/tor/website/en/people.wml:190
 msgid "<a id=\"Volunteers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:187
+#: /home/runa/tor/website/en/people.wml:191
 msgid "<a class=\"anchor\" href=\"#Volunteers\">More volunteers:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:190
+#: /home/runa/tor/website/en/people.wml:194
 msgid "Anonym"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:190
+#: /home/runa/tor/website/en/people.wml:194
 msgid "Maintainer of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:191
+#: /home/runa/tor/website/en/people.wml:195
 msgid "Kevin Bankston"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:191
+#: /home/runa/tor/website/en/people.wml:195
 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 "
@@ -552,24 +565,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:195
+#: /home/runa/tor/website/en/people.wml:199
 msgid "Kasimir Gabert"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:195
+#: /home/runa/tor/website/en/people.wml:199
 msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\";>TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:197
+#: /home/runa/tor/website/en/people.wml:201
 msgid "Geoff Goodell"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:197
+#: /home/runa/tor/website/en/people.wml:201
 msgid ""
 "Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/";
 "\">Blossom project</a> which uses Tor as its overlay network; also helped "
@@ -577,12 +590,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:201
+#: /home/runa/tor/website/en/people.wml:205
 msgid "Aleksei Gorny"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:201
+#: /home/runa/tor/website/en/people.wml:205
 msgid ""
 "Working on Tor exit scanner improvements (<a href=\"https://svn.torproject.";
 "org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
@@ -590,83 +603,83 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:208
 msgid "Robert Hogan"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:208
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\";>TorK</a> Tor controller."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:210
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:210
 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><dl><dt>
-#: /home/runa/tor/website/en/people.wml:208
+#: /home/runa/tor/website/en/people.wml:212
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:208
+#: /home/runa/tor/website/en/people.wml:212
 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><dl><dt>
-#: /home/runa/tor/website/en/people.wml:211
+#: /home/runa/tor/website/en/people.wml:215
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:211
+#: /home/runa/tor/website/en/people.wml:215
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:213
+#: /home/runa/tor/website/en/people.wml:217
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:213
+#: /home/runa/tor/website/en/people.wml:217
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:219
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:220
 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><dl><dt>
-#: /home/runa/tor/website/en/people.wml:218
+#: /home/runa/tor/website/en/people.wml:222
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:218
+#: /home/runa/tor/website/en/people.wml:222
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy";
@@ -675,24 +688,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:227
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:227
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:230
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:230
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?";
 "p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/";
@@ -701,7 +714,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:231
+#: /home/runa/tor/website/en/people.wml:235
 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, "
@@ -709,22 +722,22 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:240
 msgid "<a id=\"Past\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:237
+#: /home/runa/tor/website/en/people.wml:241
 msgid "<a class=\"anchor\" href=\"#Past\">Past thanks to:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:240
+#: /home/runa/tor/website/en/people.wml:244
 msgid "Domenik Bork"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:240
+#: /home/runa/tor/website/en/people.wml:244
 msgid ""
 "Worked on Configuration of Hidden Services with User Authorization in "
 "Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches/";
@@ -732,12 +745,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:243
+#: /home/runa/tor/website/en/people.wml:247
 msgid "Benedikt Boss"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:243
+#: /home/runa/tor/website/en/people.wml:247
 msgid ""
 "Worked during the 2007 Google Summer of Code on <a href=\"https://svn.";
 "torproject.org/svn/topf/trunk/README\">TOPF</a>, a fuzzer for Tor; mentored "
@@ -745,22 +758,22 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:246
+#: /home/runa/tor/website/en/people.wml:250
 msgid "Ren Bucholz"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:246
+#: /home/runa/tor/website/en/people.wml:250
 msgid "Our fine logo and images."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:251
 msgid "Fallon Chen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:251
 msgid ""
 "Worked on Improving Tor Path Selection (<a href=\"https://svn.torproject.org/";
 "cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>)  and <a href="
@@ -770,42 +783,42 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:253
+#: /home/runa/tor/website/en/people.wml:257
 msgid "Bram Cohen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:253
+#: /home/runa/tor/website/en/people.wml:257
 msgid "Helped design our congestion control mechanisms, in Tor's early days."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:259
 msgid "Pat Double"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:259
 msgid "Creator of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:256
+#: /home/runa/tor/website/en/people.wml:260
 msgid "Justin Hipple"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:256
+#: /home/runa/tor/website/en/people.wml:260
 msgid "The other developer for Vidalia."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:257
+#: /home/runa/tor/website/en/people.wml:261
 msgid "Christian King"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:257
+#: /home/runa/tor/website/en/people.wml:261
 msgid ""
 "Worked during the 2007 Google Summer of Code on making Tor relays stable on "
 "Windows, by developing a <a href=\"https://svn.torproject.org/svn/libevent-";
@@ -813,70 +826,70 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:262
+#: /home/runa/tor/website/en/people.wml:266
 msgid "Joe Kowalski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:262
+#: /home/runa/tor/website/en/people.wml:266
 msgid ""
 "Original author and provider of the torstatus script formerly run on "
 "nighteffect."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:264
+#: /home/runa/tor/website/en/people.wml:268
 msgid "Adam Langley"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:264
+#: /home/runa/tor/website/en/people.wml:268
 msgid "Our fine eventdns code."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:269
 msgid "Rebecca MacKinnon"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:269
 msgid ""
 "Former Director of Tor.  Co-Founder of <a href=\"http://www.";
 "globalvoicesonline.org/\">Global Voices Online</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:271
 msgid "Chris Palmer"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:271
 msgid ""
 "Our liaison and tech guy with EFF while EFF was funding us. Also helped "
 "advocate and write end-user docs."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:269
+#: /home/runa/tor/website/en/people.wml:273
 msgid "Matej Pfajfar"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:269
+#: /home/runa/tor/website/en/people.wml:273
 msgid ""
 "Author of the original onion routing code that Tor is based on, so we didn't "
 "have to start from scratch."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:271
+#: /home/runa/tor/website/en/people.wml:275
 msgid "Johannes Renner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:271
+#: /home/runa/tor/website/en/people.wml:275
 msgid ""
 "Worked during the 2007 Google Summer of Code on modifying <a href=\"https://";
 "svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a> to measure various "
@@ -884,23 +897,23 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Scott Squires"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:280
 msgid ""
 "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:282
 msgid "Camilo Viecco"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:282
 msgid ""
 "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac.";
 "vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
@@ -908,12 +921,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:281
+#: /home/runa/tor/website/en/people.wml:285
 msgid "Christian Wilms"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:281
+#: /home/runa/tor/website/en/people.wml:285
 msgid ""
 "Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
 "\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";
@@ -921,12 +934,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:284
+#: /home/runa/tor/website/en/people.wml:288
 msgid "Jillian C. York"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:284
+#: /home/runa/tor/website/en/people.wml:288
 msgid ""
 "<a href=\"http://jilliancyork.com/\";>Jillian C. York</a> is a writer, "
 "blogger, and activist based in Boston.  She blogs on the uses of Tor and "

Modified: translation/trunk/projects/website/zh_CN/3-low.sponsors.po
===================================================================
--- translation/trunk/projects/website/zh_CN/3-low.sponsors.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/zh_CN/3-low.sponsors.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:52+0100\n"
+"POT-Creation-Date: 2009-12-08 18:49+0100\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,143 +30,158 @@
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/sponsors.wml:19
-msgid "<i>Liliopsida</i> (up to $750k)"
+#: /home/runa/tor/website/en/sponsors.wml:17
+msgid "<i>Magnoliophyta</i> (over $1 million)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:21
+#: /home/runa/tor/website/en/sponsors.wml:19 /tmp/QupeY6VlbN.xml:35
 msgid "You?"
 msgstr ""
 
 #. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/sponsors.wml:22
+msgid "<i>Liliopsida</i> (up to $750k)"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/sponsors.wml:24
+msgid "An anonymous North American NGO (2008-2009)"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/en/sponsors.wml:27
 msgid "<i>Asparagales</i> (up to $500k)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:26
+#: /home/runa/tor/website/en/sponsors.wml:29
 msgid ""
 "<a href=\"http://www.ibb.gov/\";>International Broadcasting Bureau</a> (2006-"
 "2009)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:27
+#: /home/runa/tor/website/en/sponsors.wml:30
 msgid "An anonymous European NGO (2006-2008)"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/sponsors.wml:30
+#: /home/runa/tor/website/en/sponsors.wml:33
 msgid "<i>Alliaceae</i> (up to $200k)"
 msgstr ""
 
-#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:32
-msgid "An anonymous North American NGO (2008-2009)"
-msgstr ""
-
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/sponsors.wml:35
+#: /home/runa/tor/website/en/sponsors.wml:38
 msgid "<i>Allium</i> (up to $100k)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:37
+#: /home/runa/tor/website/en/sponsors.wml:40
 msgid "<a href=\"http://www.nlnet.nl/\";>NLnet Foundation</a> (2008-2009)"
 msgstr ""
 
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/sponsors.wml:41
+msgid ""
+"<a href=\"http://chacs.nrl.navy.mil/\";>Naval Research Laboratory</a> (2006-"
+"2009)"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/sponsors.wml:42
+msgid "An anonymous North American ISP (2009)"
+msgstr ""
+
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/sponsors.wml:40
+#: /home/runa/tor/website/en/sponsors.wml:45
 msgid "<i>Allium cepa</i> (up to $50k)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:42
+#: /home/runa/tor/website/en/sponsors.wml:47
 msgid ""
 "<a href=\"<page donate>\">More than 500 personal donations from individuals "
 "like you</a> (2006-2009)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:43
+#: /home/runa/tor/website/en/sponsors.wml:48
 msgid "<a href=\"http://code.google.com/opensource/\";>Google</a> (2008)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:44
+#: /home/runa/tor/website/en/sponsors.wml:49
 msgid ""
 "<a href=\"http://code.google.com/soc/\";>Google Summer of Code</a> (2007-2009)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:45
+#: /home/runa/tor/website/en/sponsors.wml:50
 msgid "<a href=\"http://www.hrw.org/\";>Human Rights Watch</a> (2007)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:46
-msgid ""
-"<a href=\"http://chacs.nrl.navy.mil/\";>Naval Research Laboratory</a> (2006-"
-"2009)"
+#: /home/runa/tor/website/en/sponsors.wml:51
+msgid "<a href=\"http://www.torfox.org/\";>Torfox</a> (2009)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:47
-msgid "<a href=\"http://www.torfox.org/\";>Torfox</a> (2009)"
+#: /home/runa/tor/website/en/sponsors.wml:52
+msgid "<a href=\"http://www.shinjiru.com/\";>Shinjiru Technology</a> (2009)"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/sponsors.wml:50
+#: /home/runa/tor/website/en/sponsors.wml:55
 msgid "Past sponsors"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/sponsors.wml:51
+#: /home/runa/tor/website/en/sponsors.wml:56
 msgid ""
 "We greatly appreciate the support provided by our past sponsors in keeping "
 "the pre-501(c)(3) Tor Project progressing through our ambitious goals"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:53
+#: /home/runa/tor/website/en/sponsors.wml:58
 msgid ""
 "<a href=\"https://www.eff.org/\";>Electronic Frontier Foundation</a> (2004-"
 "2005)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:54
+#: /home/runa/tor/website/en/sponsors.wml:59
 msgid ""
 "<a href=\"http://chacs.nrl.navy.mil/\";>DARPA and ONR via Naval Research "
 "Laboratory</a> (2001-2006)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:55
+#: /home/runa/tor/website/en/sponsors.wml:60
 msgid "<a href=\"http://www.cyber-ta.org/\";>Cyber-TA project</a> (2006-2008)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:56
+#: /home/runa/tor/website/en/sponsors.wml:61
 msgid "Bell Security Solutions Inc (2006)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:57
+#: /home/runa/tor/website/en/sponsors.wml:62
 msgid ""
 "<a href=\"http://www.omidyar.net/\";>Omidyar Network Enzyme Grant</a> (2006)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/sponsors.wml:58
+#: /home/runa/tor/website/en/sponsors.wml:63
 msgid ""
 "<a href=\"http://seclab.cs.rice.edu/lab/2005/08/01/seclab-awarded-grant-to-";
 "study-security-of-p2p/\">NSF via Rice University</a> (2006-2007)"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/sponsors.wml:60
+#: /home/runa/tor/website/en/sponsors.wml:65
 msgid ""
 "Thank you to all the people and groups who have made Tor possible so far, "
 "and thank you especially to the individual volunteers who have made non-"

Modified: translation/trunk/projects/website/zh_CN/4-optional.running-a-mirror.po
===================================================================
--- translation/trunk/projects/website/zh_CN/4-optional.running-a-mirror.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/zh_CN/4-optional.running-a-mirror.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:52+0100\n"
+"POT-Creation-Date: 2009-12-08 18:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -52,8 +52,8 @@
 #: /home/runa/tor/website/en/running-a-mirror.wml:36
 msgid ""
 "In order to assure we have reliable and up to date mirrors, please ensure "
-"your mirror does at least the following:<br/><br/> Updates no later than "
-"every six hours, but no more frequent than every hour.<br/><br/> Allows "
+"your mirror does at least the following:<br/><br/> Updates <b>no less</b> "
+"than every six hours, but no more frequent than every hour.<br/><br/> Allows "
 "\"Directory Index / Indexes\" (Index viewing) of the /dist directory.<br/"
 "><br/> Allows \"Multiviews\" or equivalent for language localization.<br/"
 "><br/> Have a valid contact email for administrative communications should "
@@ -62,7 +62,7 @@
 msgstr ""
 
 #. type: Content of: <div><p><A>
-#: /home/runa/tor/website/en/running-a-mirror.wml:51 /tmp/HzwxbghaHq.xml:95
+#: /home/runa/tor/website/en/running-a-mirror.wml:51 /tmp/tUqyiBUKEp.xml:95
 msgid "tor-mirrors mailing list"
 msgstr ""
 
@@ -92,7 +92,7 @@
 #, no-wrap
 msgid ""
 "\n"
-"0 */6 * * * rsync -av --delete rsync://rsync.torproject.org/tor/ /var/www/mirrors/torproject.org\n"
+"0 */6 * * * rsync -aq --delete rsync://rsync.torproject.org/tor/ /var/www/mirrors/torproject.org\n"
 msgstr ""
 
 #. type: Content of: <div><p><p>

Modified: translation/trunk/projects/website/zh_CN/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/zh_CN/4-optional.volunteer.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/zh_CN/4-optional.volunteer.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 13:41+0100\n"
+"POT-Creation-Date: 2009-12-08 18:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -53,18 +53,25 @@
 "love to hear from you."
 msgstr ""
 
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/en/volunteer.wml:27
+msgid ""
+"Tor has <a href=\"<page open-positions>\">two open positions</a>, please <a "
+"href=\"<page contact>\">contact us</a> if you are qualified!"
+msgstr ""
+
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:27
+#: /home/runa/tor/website/en/volunteer.wml:30
 msgid "<a id=\"Usability\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:28
+#: /home/runa/tor/website/en/volunteer.wml:31
 msgid "<a class=\"anchor\" href=\"#Usability\">Supporting Applications</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:30
+#: /home/runa/tor/website/en/volunteer.wml:33
 msgid ""
 "We need more and better ways to intercept DNS requests so they don't \"leak"
 "\" their request to a local observer while we're trying to be anonymous. "
@@ -73,12 +80,12 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:34
+#: /home/runa/tor/website/en/volunteer.wml:37
 msgid "Tsocks/dsocks items:"
 msgstr ""
 
 #. type: Content of: <div><ol><li><ul><li>
-#: /home/runa/tor/website/en/volunteer.wml:36
+#: /home/runa/tor/website/en/volunteer.wml:39
 msgid ""
 "We should patch Dug Song's \"dsocks\" program to use Tor's <i>mapaddress</i> "
 "commands from the controller interface, so we don't waste a whole round-trip "
@@ -86,7 +93,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li><ul><li>
-#: /home/runa/tor/website/en/volunteer.wml:40
+#: /home/runa/tor/website/en/volunteer.wml:43
 msgid ""
 "We need to make our <i>torify</i> script detect which of tsocks or dsocks is "
 "installed, and call them appropriately. This probably means unifying their "
@@ -95,7 +102,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:46
+#: /home/runa/tor/website/en/volunteer.wml:49
 msgid ""
 "People running relays tell us they want to have one BandwidthRate during "
 "some part of the day, and a different BandwidthRate at other parts of the "
@@ -106,7 +113,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:54
+#: /home/runa/tor/website/en/volunteer.wml:57
 msgid ""
 "Speaking of geolocation data, somebody should draw a map of the Earth with a "
 "pin-point for each Tor relay. Bonus points if it updates as the network "
@@ -116,17 +123,17 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:61
+#: /home/runa/tor/website/en/volunteer.wml:64
 msgid "<a id=\"Advocacy\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:62
+#: /home/runa/tor/website/en/volunteer.wml:65
 msgid "<a class=\"anchor\" href=\"#Advocacy\">Advocacy</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:64
+#: /home/runa/tor/website/en/volunteer.wml:67
 msgid ""
 "Create a <a href=\"https://wiki.torproject.org/noreply/CommunityLogos";
 "\">community logo</a> under a Creative Commons license that all can use and "
@@ -134,45 +141,45 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:65
+#: /home/runa/tor/website/en/volunteer.wml:68
 msgid ""
 "Create a presentation that can be used for various user group meetings "
 "around the world"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:66
+#: /home/runa/tor/website/en/volunteer.wml:69
 msgid ""
 "Create a video about your positive uses of Tor.  Some have already started "
-"on Seesmic."
+"on <a href=\"http://tinyvid.tv\";>TinyVid</a>."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:67
+#: /home/runa/tor/website/en/volunteer.wml:70
 msgid ""
 "Create a poster, or a set of posters, around a theme, such as \"Tor for "
 "Freedom!\""
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:70
+#: /home/runa/tor/website/en/volunteer.wml:73
 msgid "<a id=\"Documentation\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:71
+#: /home/runa/tor/website/en/volunteer.wml:74
 msgid "<a class=\"anchor\" href=\"#Documentation\">Documentation</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:73
+#: /home/runa/tor/website/en/volunteer.wml:76
 msgid ""
 "Please help Matt Edman with the documentation and how-tos for his Tor "
 "controller, <a href=\"<page vidalia/index>\">Vidalia</a>."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:76
+#: /home/runa/tor/website/en/volunteer.wml:79
 msgid ""
 "Evaluate and document <a href=\"https://wiki.torproject.org/wiki/";
 "TheOnionRouter/TorifyHOWTO\">our list of programs</a> that can be configured "
@@ -180,7 +187,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:79
+#: /home/runa/tor/website/en/volunteer.wml:82
 msgid ""
 "We need better documentation for dynamically intercepting connections and "
 "sending them through Tor. tsocks (Linux), dsocks (BSD), and freecap "
@@ -189,7 +196,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:83
+#: /home/runa/tor/website/en/volunteer.wml:86
 msgid ""
 "We have a huge list of <a href=\"https://wiki.torproject.org/noreply/";
 "TheOnionRouter/SupportPrograms\">potentially useful programs that interface "
@@ -198,7 +205,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:86
+#: /home/runa/tor/website/en/volunteer.wml:89
 msgid ""
 "Help translate the web page and documentation into other languages. See the "
 "<a href=\"<page translation>\">translation guidelines</a> if you want to "
@@ -207,17 +214,17 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:92
+#: /home/runa/tor/website/en/volunteer.wml:95
 msgid "<a id=\"Coding\"></a> <a id=\"Summer\"></a> <a id=\"Projects\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:95
+#: /home/runa/tor/website/en/volunteer.wml:98
 msgid "<a class=\"anchor\" href=\"#Projects\">Good Coding Projects</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/volunteer.wml:98
+#: /home/runa/tor/website/en/volunteer.wml:101
 msgid ""
 "You may find some of these projects to be good <a href=\"<page gsoc>"
 "\">Google Summer of Code 2010</a> ideas. We have labelled each idea with how "
@@ -232,11 +239,11 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:113
+#: /home/runa/tor/website/en/volunteer.wml:116
 msgid ""
 "<b>Tor Browser Bundle for Linux/Mac OS X</b> <br /> Priority: <i>High</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>Medium</i> <br /> "
-"Likely Mentors: <i>Steven, Andrew</i> <br /> The Tor Browser Bundle "
+"Likely Mentors: <i>Steven, Andrew, Jacob</i> <br /> The Tor Browser Bundle "
 "incorporates Tor, Firefox, Polipo, and the Vidalia user interface (and "
 "optionally the <a href=\"http://pidgin.im/\";>Pidgin</a> Instant Messaging "
 "client). Components are pre-configured to operate in a secure way, and it "
@@ -257,7 +264,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:146
+#: /home/runa/tor/website/en/volunteer.wml:149
 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: "
@@ -280,12 +287,12 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:176
+#: /home/runa/tor/website/en/volunteer.wml:179
 msgid ""
 "<b>Improving Tor's ability to resist censorship</b> <br /> Priority: "
 "<i>Medium to High</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: "
 "<i>High</i> <br /> Likely Mentors: <i>Nick, Roger, Steven</i> <br /> The Tor "
-"0.2.0.x series makes <a href=\"<svnsandbox>doc/design-paper/blocking.html"
+"0.2.1.x series makes <a href=\"<svnsandbox>doc/design-paper/blocking.html"
 "\">significant improvements</a> in resisting national and organizational "
 "censorship.  But Tor still needs better mechanisms for some parts of its "
 "anti-censorship design.  For example, current Tors can only listen on a "
@@ -308,7 +315,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:211
+#: /home/runa/tor/website/en/volunteer.wml:214
 msgid ""
 "<b>Tuneup Tor!</b> <br /> Priority: <i>Medium to High</i> <br /> Effort "
 "Level: <i>Medium to High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
@@ -329,13 +336,13 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:242
+#: /home/runa/tor/website/en/volunteer.wml:245
 msgid ""
 "<b>Improving Polipo on Windows</b> <br /> Priority: <i>Medium to High</i> "
 "<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Medium</i> <br /> "
-"Likely Mentors: <i>Martin</i> <br /> Help port <a href=\"http://www.pps.";
-"jussieu.fr/~jch/software/polipo/\">Polipo</a> to Windows. Example topics to "
-"tackle include: 1) the ability to asynchronously query name servers, find "
+"Likely Mentors: <i>Martin, Chris</i> <br /> Help port <a href=\"http://www.";
+"pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> to Windows. Example topics "
+"to tackle include: 1) the ability to asynchronously query name servers, find "
 "the system nameservers, and manage netbios and dns queries.  2) manage "
 "events and buffers natively (i.e. in Unix-like OSes, Polipo defaults to 25% "
 "of ram, in Windows it's whatever the config specifies). 3) some sort of GUI "
@@ -346,7 +353,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:268
+#: /home/runa/tor/website/en/volunteer.wml:271
 msgid ""
 "<b>Tor Controller Status Event Interface</b> <br /> Priority: <i>Medium</i> "
 "<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> "
@@ -379,7 +386,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:311
+#: /home/runa/tor/website/en/volunteer.wml:314
 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 /> "
@@ -398,28 +405,26 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:338
+#: /home/runa/tor/website/en/volunteer.wml:341
 msgid ""
-"<b>Help revive an independent Tor client implementation</b> <br /> Priority: "
+"<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>Karsten, Nick</i> <br /> Reanimate one "
-"of the approaches to implement a Tor client in Java, e.g. the <a href="
-"\"http://onioncoffee.sourceforge.net/\";>OnionCoffee project</a>, and make it "
-"run on <a href=\"http://code.google.com/android/\";>Android</a>. The first "
-"step would be to port the existing code and execute it in an Android "
-"environment. Next, the code should be updated to support the newer Tor "
-"protocol versions like the <a href=\"<svnsandbox>doc/spec/dir-spec.txt\">v3 "
-"directory protocol</a>. Further, support for requesting or even providing "
-"Tor hidden services would be neat, but not required.  <br /> 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."
+"to High</i> <br /> Likely Mentors: <i>Karsten, Nick</i> <br /> We're "
+"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; Tor for Java, Android/Orbot, or Tor for "
+"Maemo. Check out the repository and familiarlize yourself with the source "
+"code.  Further, support for requesting or even providing Tor hidden services "
+"would be neat, but not required.  <br /> 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><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:368
+#: /home/runa/tor/website/en/volunteer.wml:367
 msgid ""
 "<b>New Torbutton Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
 "Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely Mentors: "
@@ -443,7 +448,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:402
+#: /home/runa/tor/website/en/volunteer.wml:401
 msgid ""
 "<b>New Thandy Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
 "Level: <i>Medium</i> <br /> Skill Level: <i>Medium to High</i> <br /> Likely "
@@ -462,7 +467,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:429
+#: /home/runa/tor/website/en/volunteer.wml:428
 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 /"
@@ -483,7 +488,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:459
+#: /home/runa/tor/website/en/volunteer.wml:458
 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: "
@@ -507,7 +512,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:493
+#: /home/runa/tor/website/en/volunteer.wml:492
 msgid ""
 "<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Low</i> <br /"
 "> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
@@ -519,7 +524,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:511
+#: /home/runa/tor/website/en/volunteer.wml:510
 msgid ""
 "<b>Intermediate Level Network Device Driver</b> <br /> Priority: <i>Low</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> "
@@ -533,7 +538,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:531
+#: /home/runa/tor/website/en/volunteer.wml:530
 msgid ""
 "<b>Improve Tor Weather</b> <br /> Priority: <i>Medium</i> <br /> Effort "
 "Level: <i>Medium</i> <br /> Skill Level: <i>Medium</i> <br /> Likely "
@@ -556,7 +561,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:561
+#: /home/runa/tor/website/en/volunteer.wml:560
 msgid ""
 "<b>Bring up new ideas!</b> <br /> Don't like any of these? Look at the <a "
 "href=\"<svnsandbox>doc/roadmaps/2008-12-19-roadmap-full.pdf\">Tor "
@@ -566,7 +571,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:571
+#: /home/runa/tor/website/en/volunteer.wml:570
 msgid ""
 "<b>Better Debian/Ubuntu Packaging for Tor+Vidalia</b> <br /> Vidalia "
 "currently doesn't play nicely on Debian and Ubuntu with the default Tor "
@@ -604,7 +609,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:615
+#: /home/runa/tor/website/en/volunteer.wml:614
 msgid ""
 "<b>Tor/Polipo/Vidalia Auto-Update Framework</b> <br /> We're in need of a "
 "good authenticated-update framework.  Vidalia already has the ability to "
@@ -633,7 +638,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:649
+#: /home/runa/tor/website/en/volunteer.wml:648
 msgid ""
 "<b>Improving the Tor QA process: Continuous Integration for builds</b> <br /"
 "> It would be useful to have automated build processes for Windows and "
@@ -660,7 +665,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:677
+#: /home/runa/tor/website/en/volunteer.wml:676
 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 "
@@ -671,19 +676,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:694
+#: /home/runa/tor/website/en/volunteer.wml:693
 msgid "<a id=\"OtherCoding\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:695
+#: /home/runa/tor/website/en/volunteer.wml:694
 msgid ""
 "<a class=\"anchor\" href=\"#OtherCoding\">Other Coding and Design related "
 "ideas</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:697
+#: /home/runa/tor/website/en/volunteer.wml:696
 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 "
@@ -698,7 +703,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:710
+#: /home/runa/tor/website/en/volunteer.wml:709
 msgid ""
 "We need to actually start building our <a href=\"<page "
 "documentation>#DesignDoc\">blocking-resistance design</a>. This involves "
@@ -708,7 +713,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:716
+#: /home/runa/tor/website/en/volunteer.wml:715
 msgid ""
 "We need a flexible simulator framework for studying end-to-end traffic "
 "confirmation attacks. Many researchers have whipped up ad hoc simulators to "
@@ -722,7 +727,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:726
+#: /home/runa/tor/website/en/volunteer.wml:725
 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 "
@@ -731,7 +736,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:729
+#: /home/runa/tor/website/en/volunteer.wml:728
 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 "
@@ -740,7 +745,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:734
+#: /home/runa/tor/website/en/volunteer.wml:733
 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 "
@@ -754,7 +759,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:745
+#: /home/runa/tor/website/en/volunteer.wml:744
 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 "
@@ -762,7 +767,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:749
+#: /home/runa/tor/website/en/volunteer.wml:748
 msgid ""
 "We need a way to generate the website diagrams (for example, the \"How Tor "
 "Works\" pictures on the <a href=\"<page overview>\">overview page</a> from "
@@ -773,24 +778,24 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:756
+#: /home/runa/tor/website/en/volunteer.wml:755
 msgid ""
 "How can we make the <a href=\"http://anonymityanywhere.com/incognito/";
 "\">Incognito LiveCD</a> easier to maintain, improve, and document?"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/volunteer.wml:761
+#: /home/runa/tor/website/en/volunteer.wml:760
 msgid "<a id=\"Research\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/volunteer.wml:762
+#: /home/runa/tor/website/en/volunteer.wml:761
 msgid "<a class=\"anchor\" href=\"#Research\">Research</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:764
+#: /home/runa/tor/website/en/volunteer.wml:763
 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 "
@@ -806,7 +811,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:776
+#: /home/runa/tor/website/en/volunteer.wml:775
 msgid ""
 "The \"end-to-end traffic confirmation attack\": by watching traffic at Alice "
 "and at Bob, we can <a href=\"http://freehaven.net/anonbib/#danezis:pet2004";
@@ -820,7 +825,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:786
+#: /home/runa/tor/website/en/volunteer.wml:785
 msgid ""
 "A related question is: Does running a relay/bridge provide additional "
 "protection against these timing attacks? Can an external adversary that "
@@ -840,7 +845,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:801
+#: /home/runa/tor/website/en/volunteer.wml:800
 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 "
@@ -859,7 +864,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:816
+#: /home/runa/tor/website/en/volunteer.wml:815
 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 "
@@ -874,7 +879,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:826
+#: /home/runa/tor/website/en/volunteer.wml:825
 msgid ""
 "Other research questions regarding geographic diversity consider the "
 "tradeoff between choosing an efficient circuit and choosing a random "
@@ -886,7 +891,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:833
+#: /home/runa/tor/website/en/volunteer.wml:832
 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 "
@@ -903,7 +908,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:845
+#: /home/runa/tor/website/en/volunteer.wml:844
 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 "
@@ -914,7 +919,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:852
+#: /home/runa/tor/website/en/volunteer.wml:851
 msgid ""
 "Our censorship-resistance goals include preventing an attacker who's looking "
 "at Tor traffic on the wire from <a href=\"<svnsandbox>doc/design-paper/"
@@ -930,7 +935,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:863
+#: /home/runa/tor/website/en/volunteer.wml:862
 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 "
@@ -941,7 +946,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:870
+#: /home/runa/tor/website/en/volunteer.wml:869
 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 "
@@ -949,7 +954,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:873
+#: /home/runa/tor/website/en/volunteer.wml:872
 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 "
@@ -969,7 +974,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:890
+#: /home/runa/tor/website/en/volunteer.wml:889
 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 "
@@ -986,7 +991,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:903
+#: /home/runa/tor/website/en/volunteer.wml:902
 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 "
@@ -994,7 +999,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/volunteer.wml:911
+#: /home/runa/tor/website/en/volunteer.wml:910
 msgid ""
 "<a href=\"<page contact>\">Let us know</a> if you've made progress on any of "
 "these!"

Modified: translation/trunk/projects/website/zh_CN/docs/2-medium.tor-doc-relay.po
===================================================================
--- translation/trunk/projects/website/zh_CN/docs/2-medium.tor-doc-relay.po	2009-12-08 17:37:05 UTC (rev 21130)
+++ translation/trunk/projects/website/zh_CN/docs/2-medium.tor-doc-relay.po	2009-12-08 17:53:48 UTC (rev 21131)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:52+0100\n"
+"POT-Creation-Date: 2009-12-08 18:50+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -47,7 +47,7 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:25 /tmp/SBYPDpNcVw.xml:285
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:25 /tmp/mrZL6UaTzX.xml:285
 msgid "<hr />"
 msgstr ""
 
@@ -67,9 +67,9 @@
 #: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37
 msgid ""
 "You can run a Tor relay on <a href=\"https://wiki.torproject.org/noreply/";
-"TheOnionRouter/TorFAQ#RelayOS\">pretty much any</a> operating system, but "
-"Linux, FreeBSD 5.x+, OS X Tiger or later, and Windows Server 2003 or later "
-"work best."
+"TheOnionRouter/TorFAQ#RelayOS\">pretty much any</a> operating system. Tor "
+"relays work best on Linux, OS X Tiger or later, FreeBSD 5.x+, NetBSD 5.x+, "
+"and Windows Server 2003 or later."
 msgstr ""
 
 #. type: Content of: <div><div>
@@ -84,8 +84,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:47 /tmp/SBYPDpNcVw.xml:62
-#: /tmp/SBYPDpNcVw.xml:149 /tmp/SBYPDpNcVw.xml:175
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:47 /tmp/mrZL6UaTzX.xml:62
+#: /tmp/mrZL6UaTzX.xml:149 /tmp/mrZL6UaTzX.xml:175
 msgid "<br />"
 msgstr ""