[or-cvs] r23030: {translation} updated template files for the website (in translation/trunk/projects/website/templates: . docs)

Runa Sandvik runa.sandvik at gmail.com
Mon Aug 23 19:47:54 UTC 2010


Author: runa
Date: 2010-08-23 19:47:54 +0000 (Mon, 23 Aug 2010)
New Revision: 23030

Modified:
   translation/trunk/projects/website/templates/1-high.bridges.pot
   translation/trunk/projects/website/templates/1-high.download.pot
   translation/trunk/projects/website/templates/1-high.index.pot
   translation/trunk/projects/website/templates/2-medium.documentation.pot
   translation/trunk/projects/website/templates/2-medium.faq.pot
   translation/trunk/projects/website/templates/3-low.contact.pot
   translation/trunk/projects/website/templates/3-low.download-unix.pot
   translation/trunk/projects/website/templates/3-low.faq-abuse.pot
   translation/trunk/projects/website/templates/3-low.hidden-services.pot
   translation/trunk/projects/website/templates/3-low.news.pot
   translation/trunk/projects/website/templates/3-low.people.pot
   translation/trunk/projects/website/templates/3-low.tshirt.pot
   translation/trunk/projects/website/templates/4-optional.open-positions.pot
   translation/trunk/projects/website/templates/4-optional.tormedia.pot
   translation/trunk/projects/website/templates/4-optional.translation-overview.pot
   translation/trunk/projects/website/templates/4-optional.translation.pot
   translation/trunk/projects/website/templates/4-optional.volunteer.pot
   translation/trunk/projects/website/templates/docs/3-low.rpms.pot
Log:
updated template files for the website

Modified: translation/trunk/projects/website/templates/1-high.bridges.pot
===================================================================
--- translation/trunk/projects/website/templates/1-high.bridges.pot	2010-08-23 19:40:14 UTC (rev 23029)
+++ translation/trunk/projects/website/templates/1-high.bridges.pot	2010-08-23 19:47:54 UTC (rev 23030)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-08-23 20:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,23 +17,23 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/bridges.wml:9
+#: /home/runa/tor/website/en/bridges.wml:9
 msgid "<a id=\"BridgeIntroduction\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/bridges.wml:10
+#: /home/runa/tor/website/en/bridges.wml:10
 msgid "<a class=\"anchor\" href=\"#BridgeIntroduction\">Tor: Bridges</a>"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/bridges.wml:11 /tmp/3Zv1CDcrEE.xml:71
-#: /tmp/3Zv1CDcrEE.xml:94 /tmp/3Zv1CDcrEE.xml:117 /tmp/3Zv1CDcrEE.xml:141
+#: /home/runa/tor/website/en/bridges.wml:11 /tmp/w2MltrQGFU.xml:71
+#: /tmp/w2MltrQGFU.xml:94 /tmp/w2MltrQGFU.xml:117 /tmp/w2MltrQGFU.xml:141
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/bridges.wml:14
+#: /home/runa/tor/website/en/bridges.wml:14
 msgid ""
 "Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed "
 "in the main Tor directory. Since there is no complete public list of them, "
@@ -44,7 +44,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/bridges.wml:22
+#: /home/runa/tor/website/en/bridges.wml:22
 msgid ""
 "The addition of bridges to Tor is a step forward in the blocking resistance "
 "race. It is perfectly possible that even if your ISP filters the Internet, "
@@ -57,23 +57,22 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/bridges.wml:33
+#: /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://trac.torproject."
-"org/projects/tor/wiki/TheOnionRouter/"
-"TorFAQ#IinstalledTorandPolipobutitsnotworking.\">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>."
+"problems connecting. You should also read <a href="
+"\"<wiki>TorFAQ#IinstalledTorandPolipobutitsnotworking.\">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 ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/bridges.wml:46
+#: /home/runa/tor/website/en/bridges.wml:46
 msgid ""
 "To use a bridge, you'll need to locate one. Furthermore, you'll need to "
 "configure Tor with whatever bridge address you intend to use. You'll do this "
@@ -84,7 +83,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/bridges.wml:55
+#: /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 it at <a href=\"http://www.youtube.com/thetorproject\">Youtube: "
@@ -94,7 +93,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/bridges.wml:62
+#: /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. "
@@ -104,22 +103,22 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/bridges.wml:69
+#: /home/runa/tor/website/en/bridges.wml:69
 msgid "<a id=\"Understanding\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/bridges.wml:70
+#: /home/runa/tor/website/en/bridges.wml:70
 msgid "<a class=\"anchor\" href=\"#Understanding\">Understanding bridges</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/bridges.wml:74
+#: /home/runa/tor/website/en/bridges.wml:74
 msgid "As an example, you'll get a bridge entry that looks like the following:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/code/website/en/bridges.wml:77
+#: /home/runa/tor/website/en/bridges.wml:77
 #, no-wrap
 msgid ""
 "<samp>\n"
@@ -128,7 +127,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/bridges.wml:83
+#: /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.<br /> The first "
@@ -138,19 +137,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/bridges.wml:91
+#: /home/runa/tor/website/en/bridges.wml:91
 msgid "<a id=\"UsingBridges\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/bridges.wml:92
+#: /home/runa/tor/website/en/bridges.wml:92
 msgid ""
 "<a class=\"anchor\" href=\"#UsingBridges\">Using bridges with Tor and "
 "Vidalia</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/bridges.wml:97
+#: /home/runa/tor/website/en/bridges.wml:97
 msgid ""
 "To use the example bridge address above, go to Vidalia's Network settings "
 "page, and click \"My ISP blocks connections to the Tor network\".  Add each "
@@ -160,14 +159,14 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/bridges.wml:104
+#: /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/code/website/en/bridges.wml:109
+#: /home/runa/tor/website/en/bridges.wml:109
 msgid ""
 "You'll want to add as many bridge addresses as you know about, since "
 "additional bridges will increase reliability. One bridge should be enough to "
@@ -176,18 +175,18 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/bridges.wml:115
+#: /home/runa/tor/website/en/bridges.wml:115
 msgid "<a id=\"FindingMore\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/bridges.wml:116
+#: /home/runa/tor/website/en/bridges.wml:116
 msgid ""
 "<a class=\"anchor\" href=\"#FindingMore\">Finding more bridges for Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/bridges.wml:120
+#: /home/runa/tor/website/en/bridges.wml:120
 msgid ""
 "Another way to find public bridge addresses is to send mail to "
 "bridges at torproject.org with the line \"get bridges\" by itself in the body "
@@ -198,7 +197,7 @@
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/code/website/en/bridges.wml:128
+#: /home/runa/tor/website/en/bridges.wml:128
 #, no-wrap
 msgid ""
 "Here are your bridge relays:\n"
@@ -210,24 +209,24 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/bridges.wml:136
+#: /home/runa/tor/website/en/bridges.wml:136
 msgid ""
 "Once you've received the email with bridge information, you can continue the "
 "Vidalia configuration steps outlined <a href=\"#UsingBridges\">above</a>."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/bridges.wml:139
+#: /home/runa/tor/website/en/bridges.wml:139
 msgid "<a id=\"RunningABridge\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/bridges.wml:140
+#: /home/runa/tor/website/en/bridges.wml:140
 msgid "<a class=\"anchor\" href=\"#RunningABridge\">Running a Tor Bridge</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/bridges.wml:144
+#: /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 "
@@ -235,15 +234,14 @@
 msgstr ""
 
 #. type: Content of: <div><p><ul><li>
-#: /home/runa/code/website/en/bridges.wml:148
+#: /home/runa/tor/website/en/bridges.wml:148
 msgid ""
-"manually <a href=\"https://trac.torproject.org/projects/tor/wiki/"
-"TheOnionRouter/TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean\">edit your "
-"torrc file</a> to be just these four lines:<br />"
+"manually <a href=\"<wiki>TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean"
+"\">edit your torrc file</a> to be just these four lines:<br />"
 msgstr ""
 
 #. type: Content of: <div><p><ul><li><pre>
-#: /home/runa/code/website/en/bridges.wml:151
+#: /home/runa/tor/website/en/bridges.wml:151
 #, no-wrap
 msgid ""
 "<code>\n"
@@ -255,7 +253,7 @@
 msgstr ""
 
 #. type: Content of: <div><p><ul><li>
-#: /home/runa/code/website/en/bridges.wml:157
+#: /home/runa/tor/website/en/bridges.wml:157
 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 "
@@ -263,24 +261,23 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/bridges.wml:163
+#: /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://trac.torproject.org/projects/tor/wiki/TheOnionRouter/"
-"TorFAQ#Myfirewallonlyallowsafewoutgoingports.\">some complex port "
+"\"<wiki>TorFAQ#Myfirewallonlyallowsafewoutgoingports.\">some complex port "
 "forwarding</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/bridges.wml:170
+#: /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 ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/bridges.wml:175
+#: /home/runa/tor/website/en/bridges.wml:175
 msgid ""
 "Your bridge relay will automatically publish its address to the bridge "
 "authority, which will give it out via https or email as above. You can also "
@@ -293,7 +290,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/bridges.wml:186
+#: /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=\"<gitblob>doc/spec/bridges-spec.txt"

Modified: translation/trunk/projects/website/templates/1-high.download.pot
===================================================================
--- translation/trunk/projects/website/templates/1-high.download.pot	2010-08-23 19:40:14 UTC (rev 23029)
+++ translation/trunk/projects/website/templates/1-high.download.pot	2010-08-23 19:47:54 UTC (rev 23030)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-08-23 20:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,12 +17,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/download.wml:9
+#: /home/runa/tor/website/en/download.wml:9
 msgid "Available Tor Bundles"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/code/website/en/download.wml:13
+#: /home/runa/tor/website/en/download.wml:13
 msgid ""
 "Warning: Want Tor to really work? ...then please don't just install it and "
 "go on. You need to change some of your habits, and reconfigure your "
@@ -32,53 +32,53 @@
 msgstr ""
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/code/website/en/download.wml:25 /tmp/gni9BohmWV.xml:313
+#: /home/runa/tor/website/en/download.wml:25 /tmp/WAHNsuaupO.xml:313
 msgid "Operating System"
 msgstr ""
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/code/website/en/download.wml:26 /tmp/gni9BohmWV.xml:314
+#: /home/runa/tor/website/en/download.wml:26 /tmp/WAHNsuaupO.xml:314
 msgid "Download Stable"
 msgstr ""
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/code/website/en/download.wml:27 /tmp/gni9BohmWV.xml:315
+#: /home/runa/tor/website/en/download.wml:27 /tmp/WAHNsuaupO.xml:315
 msgid "Download Unstable"
 msgstr ""
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/code/website/en/download.wml:28 /tmp/gni9BohmWV.xml:316
+#: /home/runa/tor/website/en/download.wml:28 /tmp/WAHNsuaupO.xml:316
 msgid "Installation and Configuration"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:34
+#: /home/runa/tor/website/en/download.wml:34
 msgid ""
 "<img src=\"images/distros/windows.png\" /> Windows<br /> <small><em>Windows "
 "7, Vista, XP, 2003 Server</em></small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:38
+#: /home/runa/tor/website/en/download.wml:38
 msgid ""
 "<a href=\"<package-win32-bundle-stable>\"><version-win32-bundle-stable></a> "
 "(<a href=\"<package-win32-bundle-stable-sig>\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:42
+#: /home/runa/tor/website/en/download.wml:42
 msgid ""
 "<a href=\"<package-win32-bundle-alpha>\"><version-win32-bundle-alpha></a> "
 "(<a href=\"<package-win32-bundle-alpha-sig>\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:46 /tmp/gni9BohmWV.xml:333
+#: /home/runa/tor/website/en/download.wml:46 /tmp/WAHNsuaupO.xml:333
 msgid "<a href=\"<page docs/tor-doc-windows>\">Windows</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:52
+#: /home/runa/tor/website/en/download.wml:52
 msgid ""
 "<img src=\"images/distros/windows.png\" /> Tor Browser Bundle for Windows "
 "<br /> (Contains Tor, Vidalia, Torbutton, Polipo, and Firefox)"
@@ -87,7 +87,7 @@
 #. PO4ASHARPBEGIN Translators should link to the Browser Bundle for their language,PO4ASHARPEND
 #. PO4ASHARPBEGIN e.g. _ru.exe Russian, _de.exe for Deutsch, etc.PO4ASHARPEND
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:57
+#: /home/runa/tor/website/en/download.wml:57
 msgid ""
 "<a href=\"torbrowser/dist/tor-browser-<version-torbrowserbundle>_en-US.exe"
 "\"><version-torbrowser-tor></a> (<a href=\"torbrowser/dist/tor-browser-"
@@ -95,12 +95,12 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:63
+#: /home/runa/tor/website/en/download.wml:63
 msgid "<a href=\"<page torbrowser/index>\">Windows Browser Bundle</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:69
+#: /home/runa/tor/website/en/download.wml:69
 msgid ""
 "<img src=\"images/distros/windows.png\" /> Tor IM Browser Bundle for Windows "
 "<br />(Contains Tor, Vidalia, Torbutton, Polipo, Firefox, and Pidgin)"
@@ -109,7 +109,7 @@
 #. PO4ASHARPBEGIN Translators should link to the IM Browser Bundle for their language,PO4ASHARPEND
 #. PO4ASHARPBEGIN e.g. _ru.exe Russian, _de.exe for Deutsch, etc.PO4ASHARPEND
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:74
+#: /home/runa/tor/website/en/download.wml:74
 msgid ""
 "<a href=\"torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-US."
 "exe\"><version-torbrowser-tor></a> (<a href=\"torbrowser/dist/tor-im-browser-"
@@ -117,96 +117,96 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:80
+#: /home/runa/tor/website/en/download.wml:80
 msgid "<a href=\"<page torbrowser/index>\">Windows IM Browser Bundle</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:86
+#: /home/runa/tor/website/en/download.wml:86
 msgid ""
 "<img src=\"images/distros/apple.png\" /> Mac<br /> <small><em>Intel Only</"
 "em></small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:90
+#: /home/runa/tor/website/en/download.wml:90
 msgid ""
 "<a href=\"<package-osx-bundle-stable>\"><version-osx-bundle-stable></a> (<a "
 "href=\"<package-osx-bundle-stable-sig>\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:93
+#: /home/runa/tor/website/en/download.wml:93
 msgid ""
 "<a href=\"<package-osx-bundle-alpha>\"><version-osx-bundle-alpha></a> (<a "
 "href=\"<package-osx-bundle-alpha-sig>\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:97 /tmp/gni9BohmWV.xml:115
-#: /tmp/gni9BohmWV.xml:350 /tmp/gni9BohmWV.xml:367
+#: /home/runa/tor/website/en/download.wml:97 /tmp/WAHNsuaupO.xml:115
+#: /tmp/WAHNsuaupO.xml:350 /tmp/WAHNsuaupO.xml:367
 msgid "<a href=\"<page docs/tor-doc-osx>\">Mac OS X</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:103
+#: /home/runa/tor/website/en/download.wml:103
 msgid ""
 "<img src=\"images/distros/apple.png\" /> Mac<br /> <small><em>PowerPC Only</"
 "em></small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:107
+#: /home/runa/tor/website/en/download.wml:107
 msgid ""
 "<a href=\"<package-oldosx-bundle-stable>\"><version-oldosx-bundle-stable></"
 "a> (<a href=\"<package-oldosx-bundle-stable-sig>\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:111
+#: /home/runa/tor/website/en/download.wml:111
 msgid ""
 "<a href=\"<package-oldosx-bundle-alpha>\"><version-oldosx-bundle-alpha></a> "
 "(<a href=\"<package-oldosx-bundle-alpha-sig>\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:121
+#: /home/runa/tor/website/en/download.wml:121
 msgid ""
 "<img src=\"images/distros/generic.png\" /> Linux/Unix packages<br /> "
 "<small><em>Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE</em></small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:125 /tmp/gni9BohmWV.xml:377
+#: /home/runa/tor/website/en/download.wml:125 /tmp/WAHNsuaupO.xml:377
 msgid "<a href=\"<page download-unix>\">Linux/Unix download page</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:128 /tmp/gni9BohmWV.xml:380
+#: /home/runa/tor/website/en/download.wml:128 /tmp/WAHNsuaupO.xml:380
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/code/website/en/download.wml:135
+#: /home/runa/tor/website/en/download.wml:135
 msgid "<a id=\"packagediff\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/code/website/en/download.wml:136
+#: /home/runa/tor/website/en/download.wml:136
 msgid ""
 "<a class=\"anchor\" href=\"#packagediff\">What's the difference between "
 "Stable &amp; Unstable?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download.wml:139
+#: /home/runa/tor/website/en/download.wml:139
 msgid ""
 "Stable packages are released when we believe the features and code will not "
 "change for many months."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download.wml:143
+#: /home/runa/tor/website/en/download.wml:143
 msgid ""
 "Unstable packages are released so you can help us test new features and "
 "bugfixes. Even though they have a higher version number than the stable "
@@ -216,7 +216,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download.wml:154
+#: /home/runa/tor/website/en/download.wml:154
 msgid ""
 "Tor is distributed as <a href=\"http://www.fsf.org/\">Free Software</a> "
 "under the <a href=\"<gitblob>LICENSE\">3-clause BSD license</a>. The bundles "
@@ -226,7 +226,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download.wml:161
+#: /home/runa/tor/website/en/download.wml:161
 msgid ""
 "There is no fee for installing Tor, or using the Tor network, but if you "
 "want Tor to become faster and more usable please consider <a href=\"<page "
@@ -234,7 +234,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download.wml:170
+#: /home/runa/tor/website/en/download.wml:170
 msgid ""
 "To keep informed of security advisories and new stable releases, subscribe "
 "to the <a href=\"http://archives.seul.org/or/announce/\">or-announce mailing "
@@ -244,12 +244,12 @@
 msgstr ""
 
 #. type: Attribute 'title' of: <div><div><link>
-#: /home/runa/code/website/en/download.wml:177
+#: /home/runa/tor/website/en/download.wml:177
 msgid "Tor Project OR-announce"
 msgstr ""
 
 #. type: Content of: <div><div><form>
-#: /home/runa/code/website/en/download.wml:180
+#: /home/runa/tor/website/en/download.wml:180
 msgid ""
 "<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
 "\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
@@ -258,18 +258,18 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/code/website/en/download.wml:190
+#: /home/runa/tor/website/en/download.wml:190
 msgid "<a id=\"Warning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/code/website/en/download.wml:191
+#: /home/runa/tor/website/en/download.wml:191
 msgid ""
 "<a class=\"anchor\" href=\"#Warning\">Warning: Want Tor to really work?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download.wml:195
+#: /home/runa/tor/website/en/download.wml:195
 msgid ""
 "...then please don't just install it and go on.  You need to change some of "
 "your habits, and reconfigure your software! Tor by itself is <em>NOT</em> "
@@ -278,7 +278,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/code/website/en/download.wml:203
+#: /home/runa/tor/website/en/download.wml:203
 msgid ""
 "Tor only protects Internet applications that are configured to send their "
 "traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
@@ -288,7 +288,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/code/website/en/download.wml:211
+#: /home/runa/tor/website/en/download.wml:211
 msgid ""
 "Torbutton blocks browser plugins such as Java, Flash, ActiveX, RealPlayer, "
 "Quicktime, Adobe's PDF plugin, and others: they can be manipulated into "
@@ -302,7 +302,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/code/website/en/download.wml:224
+#: /home/runa/tor/website/en/download.wml:224
 msgid ""
 "Beware of cookies: if you ever browse without Tor and a site gives you a "
 "cookie, that cookie could identify you even when you start using Tor again. "
@@ -312,20 +312,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/code/website/en/download.wml:232
+#: /home/runa/tor/website/en/download.wml:232
 msgid ""
 "Tor anonymizes the origin of your traffic, and it encrypts everything "
 "between you and the Tor network and everything inside the Tor network, but "
-"<a href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/"
-"TorFAQ#SoImtotallyanonymousifIuseTor\">it can't encrypt your traffic between "
-"the Tor network and its final destination.</a> If you are communicating "
-"sensitive information, you should use as much care as you would on the "
-"normal scary Internet &mdash; use HTTPS or other end-to-end encryption and "
-"authentication."
+"<a href=\"<wiki>TorFAQ#SoImtotallyanonymousifIuseTor\">it can't encrypt your "
+"traffic between the Tor network and its final destination.</a> If you are "
+"communicating sensitive information, you should use as much care as you "
+"would on the normal scary Internet &mdash; use HTTPS or other end-to-end "
+"encryption and authentication."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/code/website/en/download.wml:243
+#: /home/runa/tor/website/en/download.wml:243
 msgid ""
 "While Tor blocks attackers on your local network from discovering or "
 "influencing your destination, it opens new risks: malicious or misconfigured "
@@ -336,12 +335,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/code/website/en/download.wml:252
+#: /home/runa/tor/website/en/download.wml:252
 msgid "<br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download.wml:254
+#: /home/runa/tor/website/en/download.wml:254
 msgid ""
 "Be smart and learn more. Understand what Tor does and does not offer.  This "
 "list of pitfalls isn't complete, and we need your help <a href=\"<page "
@@ -349,7 +348,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download.wml:264
+#: /home/runa/tor/website/en/download.wml:264
 msgid ""
 "See our <a href=\"<page verifying-signatures>\">instructions on verifying "
 "package signatures</a>, which allows you to make sure you've downloaded the "
@@ -357,7 +356,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download.wml:270
+#: /home/runa/tor/website/en/download.wml:270
 msgid ""
 "If you would like to research any past release of Tor source, packages, or "
 "other binaries, see <a href=\"http://archive.torproject.org/tor-package-"
@@ -365,7 +364,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download.wml:276
+#: /home/runa/tor/website/en/download.wml:276
 msgid ""
 "See the <a href=\"<page documentation>#Developers\">developer documentation</"
 "a> for instructions on fetching Tor from Git to get the very latest "
@@ -375,19 +374,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download.wml:287
+#: /home/runa/tor/website/en/download.wml:287
 msgid ""
 "If you have trouble downloading Tor from this site, here is a <a href="
 "\"<page mirrors>\">list of sites mirroring the Tor site</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/code/website/en/download.wml:291
+#: /home/runa/tor/website/en/download.wml:291
 msgid "<a id=\"ChangeLog\"></a> <a id=\"Stable\"></a> <a id=\"Testing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download.wml:295
+#: /home/runa/tor/website/en/download.wml:295
 msgid ""
 "For a list of what has changed in each stable Tor release, see the <a href="
 "\"<gitblobstable>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in "
@@ -396,106 +395,106 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/download.wml:303
+#: /home/runa/tor/website/en/download.wml:303
 msgid "<a id=\"Dev\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/download.wml:304
+#: /home/runa/tor/website/en/download.wml:304
 msgid "<a class=\"anchor\" href=\"#Dev\">Expert Packages &amp; Source Code</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/download.wml:307
+#: /home/runa/tor/website/en/download.wml:307
 msgid ""
 "Expert packages only contain Tor.  In all cases, you must configure Tor on "
 "your own."
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:322
+#: /home/runa/tor/website/en/download.wml:322
 msgid ""
 "<img src=\"images/ico-win.png\" /> Windows (Contains only Tor)<br /> "
 "<small><em>Windows 7, Vista, XP, 2000, 2003 Server</em></small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:326
+#: /home/runa/tor/website/en/download.wml:326
 msgid ""
 "<a href=\"<package-win32-stable>\"><version-win32-stable></a> (<a href="
 "\"<package-win32-stable-sig>\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:329
+#: /home/runa/tor/website/en/download.wml:329
 msgid ""
 "<a href=\"<package-win32-alpha>\"><version-win32-alpha></a> (<a href="
 "\"<package-win32-alpha-sig>\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:339
+#: /home/runa/tor/website/en/download.wml:339
 msgid ""
 "<img src=\"images/ico-osx-uni.png\" /> Mac (Contains only Tor)<br /> "
 "<small><em>Intel Only, no Snow Leopard (10.6) support</em></small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:343
+#: /home/runa/tor/website/en/download.wml:343
 msgid ""
 "<a href=\"<package-osx-stable>\"><version-osx-stable></a> (<a href="
 "\"<package-osx-stable-sig>\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:346
+#: /home/runa/tor/website/en/download.wml:346
 msgid ""
 "<a href=\"<package-osx-alpha>\"><version-osx-alpha></a> (<a href=\"<package-"
 "osx-alpha-sig>\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:356
+#: /home/runa/tor/website/en/download.wml:356
 msgid "Mac (Contains only Tor)<br /> <small><em>PowerPC Only</em></small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:360
+#: /home/runa/tor/website/en/download.wml:360
 msgid ""
 "<a href=\"<package-oldosx-stable>\"><version-oldosx-stable></a> (<a href="
 "\"<package-oldosx-stable-sig>\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:363
+#: /home/runa/tor/website/en/download.wml:363
 msgid ""
 "<a href=\"<package-oldosx-alpha>\"><version-oldosx-alpha></a> (<a href="
 "\"<package-oldosx-alpha-sig>\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:373
+#: /home/runa/tor/website/en/download.wml:373
 msgid ""
 "<img src=\"images/ico-tux.png\" /> Linux/Unix packages (Contains only Tor)"
 "<br /> <small><em>Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE</em></small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:386
+#: /home/runa/tor/website/en/download.wml:386
 msgid ""
 "Source tarballs<br /> <kbd>./configure &amp;&amp; make &amp;&amp; src/or/"
 "tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:390
+#: /home/runa/tor/website/en/download.wml:390
 msgid ""
 "<a href=\"<package-source-stable>\"><version-stable></a> (<a href=\"<package-"
 "source-stable-sig>\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download.wml:394
+#: /home/runa/tor/website/en/download.wml:394
 msgid ""
 "<a href=\"<package-source-alpha>\"><version-alpha></a> (<a href=\"<package-"
 "source-alpha-sig>\">sig</a>)"

Modified: translation/trunk/projects/website/templates/1-high.index.pot
===================================================================
--- translation/trunk/projects/website/templates/1-high.index.pot	2010-08-23 19:40:14 UTC (rev 23029)
+++ translation/trunk/projects/website/templates/1-high.index.pot	2010-08-23 19:47:54 UTC (rev 23030)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-08-23 20:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,42 +17,42 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/index.wml:11
+#: /home/runa/tor/website/en/index.wml:11
 msgid "Tor: anonymity online"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/code/website/en/index.wml:15
+#: /home/runa/tor/website/en/index.wml:15
 msgid "Summary"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/index.wml:17
+#: /home/runa/tor/website/en/index.wml:17
 msgid "<a href=\"<page overview>#overview\">Why Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/index.wml:18
+#: /home/runa/tor/website/en/index.wml:18
 msgid "<a href=\"<page torusers>\">Who uses Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/index.wml:19
+#: /home/runa/tor/website/en/index.wml:19
 msgid "<a href=\"<page overview>#thesolution\">What is Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><p>
-#: /home/runa/code/website/en/index.wml:22
+#: /home/runa/tor/website/en/index.wml:22
 msgid "<a href=\"<page easy-download>\">Download Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><p>
-#: /home/runa/code/website/en/index.wml:25
+#: /home/runa/tor/website/en/index.wml:25
 msgid "<a href=\"<page donate>\">Donate to support Tor!</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/index.wml:32
+#: /home/runa/tor/website/en/index.wml:32
 msgid ""
 "Tor is free software and an open network that helps you defend against a "
 "form of network surveillance that threatens personal freedom and privacy, "
@@ -61,7 +61,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/index.wml:37
+#: /home/runa/tor/website/en/index.wml:37
 msgid ""
 "Tor protects you by bouncing your communications around a distributed "
 "network of relays run by volunteers all around the world: it prevents "
@@ -73,7 +73,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/index.wml:45
+#: /home/runa/tor/website/en/index.wml:45
 msgid ""
 "Hundreds of thousands of people around the world use Tor for a wide variety "
 "of reasons: journalists and bloggers, human rights workers, law enforcement "
@@ -85,7 +85,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/index.wml:53
+#: /home/runa/tor/website/en/index.wml:53
 msgid ""
 "Tor doesn't magically encrypt all of your Internet activities, though. You "
 "should <a href=\"<page download>#Warning\">understand what Tor does and does "
@@ -93,20 +93,19 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/index.wml:58
+#: /home/runa/tor/website/en/index.wml:58
 msgid ""
 "Tor's security improves as its user base grows and as more people volunteer "
 "to <a href=\"<page docs/tor-doc-relay>\">run relays</a>. (It isn't nearly as "
-"hard to set up as you might think, and can significantly <a href=\"https://"
-"trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#RelayAnonymity"
-"\"> enhance your own security</a>.)  If running a relay isn't for you, we "
-"need <a href=\"<page volunteer>\">help with many other aspects of the "
-"project</a>, and we need funds to continue making the Tor network faster and "
-"easier to use while maintaining good security."
+"hard to set up as you might think, and can significantly <a href="
+"\"<wiki>TorFAQ#RelayAnonymity\"> enhance your own security</a>.)  If running "
+"a relay isn't for you, we need <a href=\"<page volunteer>\">help with many "
+"other aspects of the project</a>, and we need funds to continue making the "
+"Tor network faster and easier to use while maintaining good security."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/index.wml:69
+#: /home/runa/tor/website/en/index.wml:69
 msgid ""
 "Tor is a registered 501(c)(3) U.S. non-profit whose mission is to allow you "
 "to protect your Internet traffic from analysis. Please make a <a href="
@@ -114,26 +113,26 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/index.wml:74
+#: /home/runa/tor/website/en/index.wml:74
 msgid "<a id=\"News\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/index.wml:75
+#: /home/runa/tor/website/en/index.wml:75
 msgid "<a class=\"anchor\" href=\"#News\">News</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/index.wml:79
+#: /home/runa/tor/website/en/index.wml:79
 msgid ""
 "02 May 2010: Tor 0.2.1.26 released as stable.  Fixes yet more OpenSSL "
 "compatibility issues and lets relays defend themselves from connection "
-"floods.  Read the <a href=\"https://blog.torproject.org/blog/tor-02126-"
-"stable-released\">full announcement</a> for the list of changes."
+"floods.  Read the <a href=\"<blog>tor-02126-stable-released\">full "
+"announcement</a> for the list of changes."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/index.wml:84
+#: /home/runa/tor/website/en/index.wml:84
 msgid ""
 "29 March 2010: Tor and Printfection announce The Tor Store.  More details "
 "are available in the <a href=\"<page press/2010-03-25-tor-store-press-"
@@ -141,7 +140,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/index.wml:87
+#: /home/runa/tor/website/en/index.wml:87
 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, "
@@ -152,7 +151,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/index.wml:96
+#: /home/runa/tor/website/en/index.wml:96
 msgid ""
 "<a href=\"<page news>\">More news</a>&nbsp;|&nbsp;<a href=\"<page press/"
 "index>\">Press Releases</a>&nbsp;|&nbsp;<a href=\"<page tormedia>\">Tor in "

Modified: translation/trunk/projects/website/templates/2-medium.documentation.pot
===================================================================
--- translation/trunk/projects/website/templates/2-medium.documentation.pot	2010-08-23 19:40:14 UTC (rev 23029)
+++ translation/trunk/projects/website/templates/2-medium.documentation.pot	2010-08-23 19:47:54 UTC (rev 23030)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-08-23 20:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,69 +17,69 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/documentation.wml:9
+#: /home/runa/tor/website/en/documentation.wml:9
 msgid "<a id=\"RunningTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/documentation.wml:10
+#: /home/runa/tor/website/en/documentation.wml:10
 msgid "<a class=\"anchor\" href=\"#RunningTor\">Running Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:12
+#: /home/runa/tor/website/en/documentation.wml:12
 msgid "<a href=\"<page docs/tor-doc-windows>\">Installing Tor on Win32</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:14
+#: /home/runa/tor/website/en/documentation.wml:14
 msgid "<a href=\"<page docs/tor-doc-osx>\">Installing Tor on Mac OS X</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:16
+#: /home/runa/tor/website/en/documentation.wml:16
 msgid ""
 "<a href=\"<page docs/tor-doc-unix>\">Installing Tor on Linux/BSD/Unix</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:18
+#: /home/runa/tor/website/en/documentation.wml:18
 msgid "<a href=\"<page torbutton/index>\">Installing Torbutton for Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:20
+#: /home/runa/tor/website/en/documentation.wml:20
 msgid "<a href=\"<page docs/tor-doc-relay>\">Configuring a Tor relay</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:22
+#: /home/runa/tor/website/en/documentation.wml:22
 msgid ""
 "<a href=\"<page docs/tor-hidden-service>\">Configuring a Tor hidden service</"
 "a>"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/documentation.wml:26
+#: /home/runa/tor/website/en/documentation.wml:26
 msgid "<a id=\"Support\"></a> <a id=\"UpToSpeed\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/documentation.wml:28
+#: /home/runa/tor/website/en/documentation.wml:28
 msgid ""
 "<a class=\"anchor\" href=\"#UpToSpeed\">Getting up to speed on Tor's past, "
 "present, and future</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/documentation.wml:33
+#: /home/runa/tor/website/en/documentation.wml:33
 msgid ""
 "First, read the <a href=\"<page overview>\">overview page</a> to get a basic "
 "idea of how Tor works, what it's for, and who uses it."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/documentation.wml:38
+#: /home/runa/tor/website/en/documentation.wml:38
 msgid ""
 "<a href=\"<page download>\">Install the Tor bundle</a> and try it out.  Make "
 "sure you've got Firefox installed first, and be sure to read the <a href="
@@ -88,51 +88,49 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/documentation.wml:45
+#: /home/runa/tor/website/en/documentation.wml:45
 msgid ""
-"Our <a href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/"
-"TorFAQ\">FAQ</a> covers all sorts of topics, including questions about "
-"setting up a client or relay, concerns about anonymity attacks, why we "
-"didn't build Tor in other ways, etc.  There's a separate <a href=\"<page faq-"
-"abuse>\">Abuse FAQ</a> to answer common questions from or for relay "
-"operators.  The <a href=\"<page eff/tor-legal-faq>\">Tor Legal FAQ</a> is "
-"written by EFF lawyers, and aims to give you an overview of some of the "
-"legal issues that arise from the Tor project in the US."
+"Our <a href=\"<wiki>TorFAQ\">FAQ</a> covers all sorts of topics, including "
+"questions about setting up a client or relay, concerns about anonymity "
+"attacks, why we didn't build Tor in other ways, etc.  There's a separate <a "
+"href=\"<page faq-abuse>\">Abuse FAQ</a> to answer common questions from or "
+"for relay operators.  The <a href=\"<page eff/tor-legal-faq>\">Tor Legal "
+"FAQ</a> is written by EFF lawyers, and aims to give you an overview of some "
+"of the legal issues that arise from the Tor project in the US."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/documentation.wml:57
+#: /home/runa/tor/website/en/documentation.wml:56
 msgid ""
 "The <a href=\"<page tor-manual>\">manual</a> lists all the possible entries "
-"you can put in your <a href=\"https://trac.torproject.org/projects/tor/wiki/"
-"TheOnionRouter/TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean\">torrc file</"
-"a>. We also provide a <a href=\"<page tor-manual-dev>\">manual for the "
-"development version of Tor</a>."
+"you can put in your <a href=\"<wiki>TorFAQ#Imsupposedtoeditmytorrc."
+"Whatdoesthatmean\">torrc file</a>. We also provide a <a href=\"<page tor-"
+"manual-dev>\">manual for the development version of Tor</a>."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/documentation.wml:63
+#: /home/runa/tor/website/en/documentation.wml:62
 msgid ""
 "If you have questions, we have an IRC channel (for users, relay operators, "
 "and developers)  at <a href=\"irc://irc.oftc.net/tor\">#tor on irc.oftc.net</"
-"a>. If you have a bug, especially a crash bug, read <a href=\"https://trac."
-"torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#MyTorkeepscrashing."
-"\">how to report a Tor bug</a> first and then tell us as much information "
-"about it as you can in <a href=\"https://bugs.torproject.org/tor\">our "
-"bugtracker</a>.  (If your bug is with Polipo, your browser, or some other "
-"application, please don't put it in our bugtracker.) The <a href="
-"\"#MailingLists\">or-talk mailing list</a> can also be useful."
+"a>. If you have a bug, especially a crash bug, read <a href="
+"\"<wiki>TorFAQ#MyTorkeepscrashing.\">how to report a Tor bug</a> first and "
+"then tell us as much information about it as you can in <a href=\"https://"
+"bugs.torproject.org/tor\">our bugtracker</a>.  (If your bug is with Polipo, "
+"your browser, or some other application, please don't put it in our "
+"bugtracker.) The <a href=\"#MailingLists\">or-talk mailing list</a> can also "
+"be useful."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/documentation.wml:78
+#: /home/runa/tor/website/en/documentation.wml:77
 msgid ""
-"<a href=\"https://blog.torproject.org/\">Tor has a blog now</a>.  We try to "
-"keep it updated every week or two with the latest news."
+"<a href=\"<blog>\">Tor has a blog now</a>.  We try to keep it updated every "
+"week or two with the latest news."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/documentation.wml:83
+#: /home/runa/tor/website/en/documentation.wml:82
 msgid ""
 "Download and watch Roger's overview talk from What The Hack (<a href="
 "\"http://freehaven.net/~arma/wth-anonymous-communication-58.mp4\">video</a>, "
@@ -145,14 +143,14 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/documentation.wml:93
+#: /home/runa/tor/website/en/documentation.wml:92
 msgid ""
 "Look through our <a href=\"#DesignDoc\">Design Documents</a>. Notice that we "
 "have RFC-style specs to tell you exactly how Tor is built."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/documentation.wml:99
+#: /home/runa/tor/website/en/documentation.wml:98
 msgid ""
 "There's a skeletal <a href=\"https://svn.torproject.org/svn/projects/"
 "roadmaps/2008-12-19-roadmap-full.pdf\">list of items we'd like to tackle in "
@@ -162,7 +160,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/documentation.wml:108
+#: /home/runa/tor/website/en/documentation.wml:107
 msgid ""
 "Download and watch Nick's \"Technical changes since 2004\" talk from Defcon "
 "in July 2007 (<a href=\"http://freehaven.net/~arma/Defcon15-Mathewson-"
@@ -184,7 +182,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/documentation.wml:129
+#: /home/runa/tor/website/en/documentation.wml:128
 msgid ""
 "See Mike's \"Securing the Tor network\" talk from Defcon in July 2007 (<a "
 "href=\"http://freehaven.net/~arma/Defcon15-Mike_Perry-"
@@ -196,7 +194,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/documentation.wml:139
+#: /home/runa/tor/website/en/documentation.wml:138
 msgid ""
 "Learn about the <a href=\"<gitblob>doc/spec/proposals/001-process.txt\">Tor "
 "proposal process for changing our design</a>, and look over the <a href="
@@ -204,7 +202,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/documentation.wml:146
+#: /home/runa/tor/website/en/documentation.wml:145
 msgid ""
 "Our <a href=\"<gitblob>doc/TODO\">developer TODO file</a> starts with a "
 "timeline for external promises &mdash; things <a href=\"<page sponsors>"
@@ -213,7 +211,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/documentation.wml:153
+#: /home/runa/tor/website/en/documentation.wml:152
 msgid ""
 "Once you're up to speed, things will continue to change surprisingly fast.  "
 "The <a href=\"#MailingLists\">or-dev mailing list</a> is where the complex "
@@ -222,17 +220,17 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/documentation.wml:161
+#: /home/runa/tor/website/en/documentation.wml:160
 msgid "<a id=\"MailingLists\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/documentation.wml:162
+#: /home/runa/tor/website/en/documentation.wml:161
 msgid "<a class=\"anchor\" href=\"#MailingLists\">Mailing List Information</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:164
+#: /home/runa/tor/website/en/documentation.wml:163
 msgid ""
 "The <a href=\"http://archives.seul.org/or/announce/\">or-announce mailing "
 "list</a> is a low volume list for announcements of new releases and critical "
@@ -242,7 +240,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:170
+#: /home/runa/tor/website/en/documentation.wml:169
 msgid ""
 "The <a href=\"http://archives.seul.org/or/talk/\">or-talk list</a> is where "
 "a lot of discussion happens, and is where we send notifications of "
@@ -250,7 +248,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:173
+#: /home/runa/tor/website/en/documentation.wml:172
 msgid ""
 "The <a href=\"http://archives.seul.org/tor/relays/\">tor-relays list</a> is "
 "where discussions about running, configuring, and handling your tor relay "
@@ -259,14 +257,14 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:177
+#: /home/runa/tor/website/en/documentation.wml:176
 msgid ""
 "The <a href=\"http://archives.seul.org/or/dev/\">or-dev list</a> is for "
 "posting by developers only, and is very low traffic."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:179
+#: /home/runa/tor/website/en/documentation.wml:178
 msgid ""
 "A list for <a href=\"http://archives.seul.org/tor/mirrors/\">mirror "
 "operators</a> for new website mirrors, and supporting <a href=\"<page "
@@ -274,31 +272,31 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:182
+#: /home/runa/tor/website/en/documentation.wml:181
 msgid ""
 "A list for <a href=\"http://archives.seul.org/or/cvs/\">svn and git commits</"
 "a> may be interesting for developers."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:184
+#: /home/runa/tor/website/en/documentation.wml:183
 msgid ""
 "An automated list for <a href=\"http://archives.seul.org/tor/bugs/\">bug "
 "reports from trac</a> may be interesting for users and developers."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/documentation.wml:188
+#: /home/runa/tor/website/en/documentation.wml:187
 msgid "<a id=\"DesignDoc\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/documentation.wml:189
+#: /home/runa/tor/website/en/documentation.wml:188
 msgid "<a class=\"anchor\" href=\"#DesignDoc\">Design Documents</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:191
+#: /home/runa/tor/website/en/documentation.wml:190
 msgid ""
 "The <b>design document</b> (published at Usenix Security 2004)  gives our "
 "justifications and security analysis for the Tor design: <a href=\"https://"
@@ -308,7 +306,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:196
+#: /home/runa/tor/website/en/documentation.wml:195
 msgid ""
 "Our follow-up paper on <b>challenges in low-latency anonymity</b> (still in "
 "draft form) details more recent experiences and directions: <a href="
@@ -317,7 +315,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:200
+#: /home/runa/tor/website/en/documentation.wml:199
 msgid ""
 "Our paper at WEIS 2006 &mdash; <b>Anonymity Loves Company: Usability and the "
 "Network Effect</b> &mdash; explains why usability in anonymity systems "
@@ -326,7 +324,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:204
+#: /home/runa/tor/website/en/documentation.wml:203
 msgid ""
 "Our preliminary design to make it harder for large firewalls to prevent "
 "access to the Tor network is described in <b>design of a blocking-resistant "
@@ -337,19 +335,19 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:210
+#: /home/runa/tor/website/en/documentation.wml:209
 msgid ""
 "The <b>specifications</b> aim to give developers enough information to build "
 "a compatible version of Tor:"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/code/website/en/documentation.wml:213
+#: /home/runa/tor/website/en/documentation.wml:212
 msgid "<a href=\"<gitblob>doc/spec/tor-spec.txt\">Main Tor specification</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/code/website/en/documentation.wml:214
+#: /home/runa/tor/website/en/documentation.wml:213
 msgid ""
 "<a href=\"<gitblob>doc/spec/dir-spec.txt\">Tor version 3 directory server "
 "specification</a> (and older <a href=\"<gitblob>doc/spec/dir-spec-v1.txt"
@@ -358,79 +356,78 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/code/website/en/documentation.wml:219
+#: /home/runa/tor/website/en/documentation.wml:218
 msgid ""
 "<a href=\"<gitblob>doc/spec/control-spec.txt\">Tor control protocol "
 "specification</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/code/website/en/documentation.wml:221
+#: /home/runa/tor/website/en/documentation.wml:220
 msgid ""
 "<a href=\"<gitblob>doc/spec/rend-spec.txt\">Tor rendezvous specification</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/code/website/en/documentation.wml:223
+#: /home/runa/tor/website/en/documentation.wml:222
 msgid ""
 "<a href=\"<gitblob>doc/spec/path-spec.txt\">Tor path selection "
 "specification</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/code/website/en/documentation.wml:225
+#: /home/runa/tor/website/en/documentation.wml:224
 msgid ""
 "<a href=\"<gitblob>doc/spec/address-spec.txt\">Special hostnames in Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/code/website/en/documentation.wml:227
+#: /home/runa/tor/website/en/documentation.wml:226
 msgid ""
 "<a href=\"<gitblob>doc/spec/socks-extensions.txt\">Tor's SOCKS support and "
 "extensions</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/code/website/en/documentation.wml:229
+#: /home/runa/tor/website/en/documentation.wml:228
 msgid ""
 "<a href=\"<gitblob>doc/spec/version-spec.txt\">How Tor version numbers work</"
 "a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/code/website/en/documentation.wml:231
+#: /home/runa/tor/website/en/documentation.wml:230
 msgid ""
-"<a href=\"<gitblob>doc/spec/proposals\">In-progress drafts of new "
+"<a href=\"<gittree>doc/spec/proposals\">In-progress drafts of new "
 "specifications and proposed changes</a>"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/documentation.wml:237
+#: /home/runa/tor/website/en/documentation.wml:236
 msgid "<a id=\"NeatLinks\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/documentation.wml:238
+#: /home/runa/tor/website/en/documentation.wml:237
 msgid "<a class=\"anchor\" href=\"#NeatLinks\">Neat Links</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:240
+#: /home/runa/tor/website/en/documentation.wml:239
 msgid ""
-"The <a href=\"https://trac.torproject.org/projects/tor/wiki\">Tor wiki</a> "
-"provides a plethora of helpful contributions from Tor users. Check it out!"
+"The <a href=\"<wiki>\">Tor wiki</a> provides a plethora of helpful "
+"contributions from Tor users. Check it out!"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:243
+#: /home/runa/tor/website/en/documentation.wml:242
 msgid ""
-"<a href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/"
-"SupportPrograms\">A list of supporting programs you might want to use in "
-"association with Tor</a>."
+"<a href=\"<wiki>SupportPrograms\">A list of supporting programs you might "
+"want to use in association with Tor</a>."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:247
+#: /home/runa/tor/website/en/documentation.wml:246
 msgid ""
 "<a href=\"https://check.torproject.org/\">The Tor detector</a> or <a href="
 "\"http://torcheck.xenobite.eu/\">the other Tor detector</a> try to guess if "
@@ -438,7 +435,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:250
+#: /home/runa/tor/website/en/documentation.wml:249
 msgid ""
 "Check out one of the Tor status pages, such as <a href=\"http://torstatus."
 "blutmagie.de/\">blutmagie's</a>, or <a href=\"http://trunk.torstatus.kgprog."
@@ -449,7 +446,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:257
+#: /home/runa/tor/website/en/documentation.wml:256
 msgid ""
 "Read <a href=\"http://freehaven.net/anonbib/topic."
 "html#Anonymous_20communication\">these papers</a> (especially the ones in "
@@ -457,50 +454,50 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/documentation.wml:263
+#: /home/runa/tor/website/en/documentation.wml:262
 msgid "<a id=\"Developers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/documentation.wml:264
+#: /home/runa/tor/website/en/documentation.wml:263
 msgid "<a class=\"anchor\" href=\"#Developers\">For Developers</a>"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/documentation.wml:265
+#: /home/runa/tor/website/en/documentation.wml:264
 msgid "Browse the Tor <b>source repository</b>:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:267
+#: /home/runa/tor/website/en/documentation.wml:266
 msgid "<a href=\"<gitrepo>\">Browse the repository's source tree directly</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:268
+#: /home/runa/tor/website/en/documentation.wml:267
 msgid "Git and SVN access:"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/code/website/en/documentation.wml:270
+#: /home/runa/tor/website/en/documentation.wml:269
 msgid "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/code/website/en/documentation.wml:271
+#: /home/runa/tor/website/en/documentation.wml:270
 msgid ""
 "The development branch is <kbd>master</kbd>.  The active maintenance "
 "branches are <kbd>maint-0.2.0</kbd> and <kbd>maint-0.2.1</kbd>."
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/code/website/en/documentation.wml:272
+#: /home/runa/tor/website/en/documentation.wml:271
 msgid ""
 "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/documentation.wml:275
+#: /home/runa/tor/website/en/documentation.wml:274
 msgid ""
 "<a href=\"https://gitweb.torproject.org//githax.git?a=blob;f=doc/Howto.txt;"
 "hb=HEAD\">Basic instructions for using Git to contribute to Tor software.</a>"

Modified: translation/trunk/projects/website/templates/2-medium.faq.pot
===================================================================
--- translation/trunk/projects/website/templates/2-medium.faq.pot	2010-08-23 19:40:14 UTC (rev 23029)
+++ translation/trunk/projects/website/templates/2-medium.faq.pot	2010-08-23 19:47:54 UTC (rev 23030)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-08-23 20:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,228 +17,227 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/faq.wml:11
+#: /home/runa/tor/website/en/faq.wml:11
 msgid "Tor FAQ"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:12 /tmp/aw6XJ9Z0UB.xml:1185
+#: /home/runa/tor/website/en/faq.wml:12 /tmp/iNgxx82_XW.xml:1185
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:14
+#: /home/runa/tor/website/en/faq.wml:14
 msgid "General questions:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:16
+#: /home/runa/tor/website/en/faq.wml:16
 msgid "<a href=\"#WhatIsTor\">What is Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:17
+#: /home/runa/tor/website/en/faq.wml:17
 msgid ""
 "<a href=\"#Torisdifferent\">How is Tor different from other proxies?</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:18
+#: /home/runa/tor/website/en/faq.wml:18
 msgid ""
 "<a href=\"#CompatibleApplications\">What programs can I use with Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:20
+#: /home/runa/tor/website/en/faq.wml:20
 msgid "<a href=\"#WhyCalledTor\">Why is it called Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:21
+#: /home/runa/tor/website/en/faq.wml:21
 msgid "<a href=\"#Backdoor\">Is there a backdoor in Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:22
+#: /home/runa/tor/website/en/faq.wml:22
 msgid ""
 "<a href=\"#DistributingTor\">Can I distribute Tor on my magazine's CD?</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:24
+#: /home/runa/tor/website/en/faq.wml:24
 msgid ""
 "<a href=\"#SupportMail\">How can I get an answer to my Tor support mail?</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:26
+#: /home/runa/tor/website/en/faq.wml:26
 msgid "<a href=\"#WhySlow\">Why is Tor so slow?</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:27
+#: /home/runa/tor/website/en/faq.wml:27
 msgid ""
 "<a href=\"#Funding\">What would The Tor Project do with more funding?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:31
+#: /home/runa/tor/website/en/faq.wml:31
 msgid "Compilation and Installation:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:33
+#: /home/runa/tor/website/en/faq.wml:33
 msgid "<a href=\"#HowUninstallTor\">How do I uninstall Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:34
+#: /home/runa/tor/website/en/faq.wml:34
 msgid ""
 "<a href=\"#PGPSigs\">What are these \"sig\" files on the download page?</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:36
+#: /home/runa/tor/website/en/faq.wml:36
 msgid "<a href=\"#CompileTorWindows\">How do I compile Tor under Windows?</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:37
+#: /home/runa/tor/website/en/faq.wml:37
 msgid ""
 "<a href=\"#VirusFalsePositives\">Why does my Tor executable appear to have a "
 "virus or spyware?</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:39
+#: /home/runa/tor/website/en/faq.wml:39
 msgid ""
 "<a href=\"#LiveCD\">Is there a LiveCD or other bundle that includes Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:42
+#: /home/runa/tor/website/en/faq.wml:42
 msgid "Running Tor:"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:44
+#: /home/runa/tor/website/en/faq.wml:44
 msgid "Running a Tor client:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:46
+#: /home/runa/tor/website/en/faq.wml:46
 msgid ""
 "<a href=\"#VidaliaPassword\">Tor/Vidalia prompts for a password at start</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:47
+#: /home/runa/tor/website/en/faq.wml:47
 msgid ""
 "<a href=\"#ChooseEntryExit\">Can I control which nodes (or country) are used "
 "for entry/exit?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:50
+#: /home/runa/tor/website/en/faq.wml:50
 msgid "Running a Tor relay:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:52
+#: /home/runa/tor/website/en/faq.wml:52
 msgid "<a href=\"#RelayFlexible\">How stable does my relay need to be?</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:53
+#: /home/runa/tor/website/en/faq.wml:53
 msgid ""
 "<a href=\"#ExitPolicies\">I'd run a relay, but I don't want to deal with "
 "abuse issues.</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:55
+#: /home/runa/tor/website/en/faq.wml:55
 msgid ""
 "<a href=\"#RelayOrBridge\">Should I be a normal relay or bridge relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:57
+#: /home/runa/tor/website/en/faq.wml:57
 msgid "<a href=\"#RelayMemory\">Why is my Tor relay using so much memory?</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:58
+#: /home/runa/tor/website/en/faq.wml:58
 msgid "<a href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:61
+#: /home/runa/tor/website/en/faq.wml:61
 msgid "Running a Tor hidden service:"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:63
+#: /home/runa/tor/website/en/faq.wml:63
 msgid "Anonymity and Security:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:65
+#: /home/runa/tor/website/en/faq.wml:65
 msgid "<a href=\"#KeyManagement\">Tell me about all the keys Tor uses.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:68
+#: /home/runa/tor/website/en/faq.wml:68
 msgid "Alternate designs that we don't do (yet):"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:70
+#: /home/runa/tor/website/en/faq.wml:70
 msgid ""
 "<a href=\"#EverybodyARelay\">You should make every Tor user be a relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:74
+#: /home/runa/tor/website/en/faq.wml:74
 msgid "Abuse"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:76
+#: /home/runa/tor/website/en/faq.wml:76
 msgid ""
 "<a href=\"#Criminals\">Doesn't Tor enable criminals to do bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:77
+#: /home/runa/tor/website/en/faq.wml:77
 msgid ""
 "<a href=\"#RespondISP\">How do I respond to my ISP about my exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:81
+#: /home/runa/tor/website/en/faq.wml:81
 msgid ""
 "For other questions not yet on this version of the FAQ, see the <a href="
-"\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ\">wiki "
-"FAQ</a> for now."
+"\"<wiki>TorFAQ\">wiki FAQ</a> for now."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:85
+#: /home/runa/tor/website/en/faq.wml:85
 msgid "<hr /> <a id=\"General\"></a> <a id=\"WhatIsTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:90
+#: /home/runa/tor/website/en/faq.wml:90
 msgid "<a class=\"anchor\" href=\"#WhatIsTor\">What is Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:93
+#: /home/runa/tor/website/en/faq.wml:93
 msgid "The name \"Tor\" can refer to several different components."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:97
+#: /home/runa/tor/website/en/faq.wml:97
 msgid ""
 "The Tor software is a program you can run on your computer that helps keep "
 "you safe on the Internet. Tor protects you by bouncing your communications "
@@ -251,26 +250,26 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:108
+#: /home/runa/tor/website/en/faq.wml:108
 msgid ""
 "The Tor Project is a non-profit (charity) organization that maintains and "
 "develops the Tor software."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:112
+#: /home/runa/tor/website/en/faq.wml:112
 msgid "<hr /> <a id=\"Torisdifferent\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:115
+#: /home/runa/tor/website/en/faq.wml:115
 msgid ""
 "<a class=\"anchor\" href=\"#Torisdifferent\">How is Tor different from other "
 "proxies?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:117
+#: /home/runa/tor/website/en/faq.wml:117
 msgid ""
 "A typical proxy provider sets up a server somewhere on the Internet and "
 "allows you to use it to relay your traffic.  This creates a simple, easy to "
@@ -286,7 +285,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:120
+#: /home/runa/tor/website/en/faq.wml:120
 msgid ""
 "Simple proxy providers also create a single point of failure.  The provider "
 "knows who you are and where you browse on the Internet.  They can see your "
@@ -298,7 +297,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:123
+#: /home/runa/tor/website/en/faq.wml:123
 msgid ""
 "Tor passes your traffic through at least 3 different servers before sending "
 "it on to the destination.  Tor does not modify, or even know, what you are "
@@ -311,12 +310,12 @@
 msgstr ""
 
 #. type: Content of: <div><p><dl><dt>
-#: /home/runa/code/website/en/faq.wml:126
+#: /home/runa/tor/website/en/faq.wml:126
 msgid "Doesn't the first server see who I am?"
 msgstr ""
 
 #. type: Content of: <div><p><dl><dd>
-#: /home/runa/code/website/en/faq.wml:126
+#: /home/runa/tor/website/en/faq.wml:126
 msgid ""
 "Possibly. A bad first of three servers can see encrypted Tor traffic coming "
 "from your computer.  It still doesn't know who you are and what you are "
@@ -327,12 +326,12 @@
 msgstr ""
 
 #. type: Content of: <div><p><dl><dt>
-#: /home/runa/code/website/en/faq.wml:127
+#: /home/runa/tor/website/en/faq.wml:127
 msgid "Can't the third server see my traffic?"
 msgstr ""
 
 #. type: Content of: <div><p><dl><dd>
-#: /home/runa/code/website/en/faq.wml:127
+#: /home/runa/tor/website/en/faq.wml:127
 msgid ""
 "Possibly.  A bad third of three servers can see the traffic you sent into "
 "Tor.  It won't know who sent this traffic.  If you're using encryption, such "
@@ -344,19 +343,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:131
+#: /home/runa/tor/website/en/faq.wml:131
 msgid "<hr /> <a id=\"CompatibleApplications\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:134
+#: /home/runa/tor/website/en/faq.wml:134
 msgid ""
 "<a class=\"anchor\" href=\"#CompatibleApplications\">What programs can I use "
 "with Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:138
+#: /home/runa/tor/website/en/faq.wml:138
 msgid ""
 "There are two pieces to \"Torifying\" a program: connection-level anonymity "
 "and application-level anonymity. Connection-level anonymity focuses on "
@@ -372,7 +371,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:152
+#: /home/runa/tor/website/en/faq.wml:152
 msgid ""
 "Most of our work so far has focused on the Firefox web browser. The bundles "
 "on the <a href=\"<page download>\">download page</a> automatically install "
@@ -382,30 +381,29 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:161
+#: /home/runa/tor/website/en/faq.wml:161
 msgid ""
 "There are plenty of other programs you can use with Tor, but we haven't "
 "researched the application-level anonymity issues on them well enough to be "
 "able to recommend a safe configuration. Our wiki has a list of instructions "
-"for <a href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/"
-"TorifyHOWTO\">Torifying specific applications</a>. There's also a <a href="
-"\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/"
-"SupportPrograms\">list of applications that help you direct your traffic "
-"through Tor</a>.  Please add to these lists and help us keep them accurate!"
+"for <a href=\"<wiki>TorifyHOWTO\">Torifying specific applications</a>. "
+"There's also a <a href=\"<wiki>SupportPrograms\">list of applications that "
+"help you direct your traffic through Tor</a>.  Please add to these lists and "
+"help us keep them accurate!"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:172
+#: /home/runa/tor/website/en/faq.wml:172
 msgid "<hr /> <a id=\"WhyCalledTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:175
+#: /home/runa/tor/website/en/faq.wml:175
 msgid "<a class=\"anchor\" href=\"#WhyCalledTor\">Why is it called Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:178
+#: /home/runa/tor/website/en/faq.wml:178
 msgid ""
 "Because Tor is the onion routing network. When we were starting the new next-"
 "generation design and implementation of onion routing in 2001-2002, we would "
@@ -416,12 +414,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:188
+#: /home/runa/tor/website/en/faq.wml:188
 msgid "(It's also got a fine translation from German and Turkish.)"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:192
+#: /home/runa/tor/website/en/faq.wml:192
 msgid ""
 "Note: even though it originally came from an acronym, Tor is not spelled "
 "\"TOR\". Only the first letter is capitalized. In fact, we can usually spot "
@@ -431,17 +429,17 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:199
+#: /home/runa/tor/website/en/faq.wml:199
 msgid "<hr /> <a id=\"Backdoor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:202
+#: /home/runa/tor/website/en/faq.wml:202
 msgid "<a class=\"anchor\" href=\"#Backdoor\">Is there a backdoor in Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:205
+#: /home/runa/tor/website/en/faq.wml:205
 msgid ""
 "There is absolutely no backdoor in Tor. Nobody has asked us to put one in, "
 "and we know some smart lawyers who say that it's unlikely that anybody will "
@@ -450,7 +448,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:212
+#: /home/runa/tor/website/en/faq.wml:212
 msgid ""
 "We think that putting a backdoor in Tor would be tremendously irresponsible "
 "to our users, and a bad precedent for security software in general. If we "
@@ -460,7 +458,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:220
+#: /home/runa/tor/website/en/faq.wml:220
 msgid ""
 "But that said, there are still plenty of subtle attacks people might try. "
 "Somebody might impersonate us, or break into our computers, or something "
@@ -473,7 +471,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:232
+#: /home/runa/tor/website/en/faq.wml:232
 msgid ""
 "Also, there might be accidental bugs in Tor that could affect your "
 "anonymity. We periodically find and fix anonymity-related bugs, so make sure "
@@ -481,24 +479,24 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:237
+#: /home/runa/tor/website/en/faq.wml:237
 msgid "<hr /> <a id=\"DistributingTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:240
+#: /home/runa/tor/website/en/faq.wml:240
 msgid ""
 "<a class=\"anchor\" href=\"#DistributingTor\">Can I distribute Tor on my "
 "magazine's CD?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:244
+#: /home/runa/tor/website/en/faq.wml:244
 msgid "Yes."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:248
+#: /home/runa/tor/website/en/faq.wml:248
 msgid ""
 "The Tor software is <a href=\"https://www.fsf.org/\">free software</a>. This "
 "means we give you the rights to redistribute the Tor software, either "
@@ -507,7 +505,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:255
+#: /home/runa/tor/website/en/faq.wml:255
 msgid ""
 "However, if you want to redistribute the Tor software you must follow our <a "
 "href=\"<gitblob>LICENSE\">LICENSE</a>.  Essentially this means that you need "
@@ -516,7 +514,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:262
+#: /home/runa/tor/website/en/faq.wml:262
 msgid ""
 "Most people who ask us this question don't want to distribute just the Tor "
 "software, though. They want to distribute the Tor bundles, which typically "
@@ -532,7 +530,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:278
+#: /home/runa/tor/website/en/faq.wml:278
 msgid ""
 "Also, you should make sure not to confuse your readers about what Tor is, "
 "who makes it, and what properties it provides (and doesn't provide). See our "
@@ -540,7 +538,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:284
+#: /home/runa/tor/website/en/faq.wml:284
 msgid ""
 "Lastly, you should realize that we release new versions of the Tor software "
 "frequently, and sometimes we make backward incompatible changes. So if you "
@@ -550,19 +548,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:291
+#: /home/runa/tor/website/en/faq.wml:291
 msgid "<hr /> <a id=\"SupportMail\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:294
+#: /home/runa/tor/website/en/faq.wml:294
 msgid ""
 "<a class=\"anchor\" href=\"#SupportMail\">How can I get an answer to my Tor "
 "support mail?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:298
+#: /home/runa/tor/website/en/faq.wml:298
 msgid ""
 "Many people send the Tor developers mail privately, or send mail to our "
 "internal <a href=\"<page contact>\">lists</a>, with questions about their "
@@ -575,7 +573,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:309
+#: /home/runa/tor/website/en/faq.wml:309
 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 "
@@ -592,7 +590,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:324
+#: /home/runa/tor/website/en/faq.wml:324
 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="
@@ -602,29 +600,29 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:332
+#: /home/runa/tor/website/en/faq.wml:332
 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/code/website/en/faq.wml:336
+#: /home/runa/tor/website/en/faq.wml:336
 msgid "<hr /> <a id=\"WhySlow\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:339
+#: /home/runa/tor/website/en/faq.wml:339
 msgid "<a class=\"anchor\" href=\"#WhySlow\">Why is Tor so slow?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:342
+#: /home/runa/tor/website/en/faq.wml:342
 msgid "There are many reasons why the Tor network is currently slow."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:346
+#: /home/runa/tor/website/en/faq.wml:346
 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 "
@@ -634,7 +632,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:354
+#: /home/runa/tor/website/en/faq.wml:354
 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 "
@@ -643,20 +641,20 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:361
+#: /home/runa/tor/website/en/faq.wml:361
 msgid ""
-"For the much more in-depth answer, see <a href=\"https://blog.torproject.org/"
-"blog/why-tor-is-slow\">Roger's blog post on the topic</a>, which includes "
-"both a detailed PDF and a video to go with it."
+"For the much more in-depth answer, see <a href=\"<blog>why-tor-is-slow"
+"\">Roger's blog post on the topic</a>, which includes both a detailed PDF "
+"and a video to go with it."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:368
+#: /home/runa/tor/website/en/faq.wml:368
 msgid "What can you do to help?"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:374
+#: /home/runa/tor/website/en/faq.wml:374
 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 "
@@ -664,7 +662,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:380
+#: /home/runa/tor/website/en/faq.wml:380
 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, "
@@ -673,7 +671,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:387
+#: /home/runa/tor/website/en/faq.wml:387
 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 "
@@ -681,19 +679,19 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:393
+#: /home/runa/tor/website/en/faq.wml:393
 msgid ""
 "There are some steps that individuals can take to improve their Tor "
-"performance. <a href=\"https://trac.torproject.org/projects/tor/wiki/"
-"TheOnionRouter/FireFoxTorPerf\">You can configure your Firefox to handle Tor "
-"better</a>, <a href=\"http://www.pps.jussieu.fr/~jch/software/polipo/tor.html"
-"\">you can use Polipo with Tor</a>, or you can try <a href=\"<page download>"
-"\">upgrading to the latest version of Tor</a>.  If this works well, please "
-"help by documenting what you did, and letting us know about it."
+"performance. <a href=\"<wiki>FireFoxTorPerf\">You can configure your Firefox "
+"to handle Tor better</a>, <a href=\"http://www.pps.jussieu.fr/~jch/software/"
+"polipo/tor.html\">you can use Polipo with Tor</a>, or you can try <a href="
+"\"<page download>\">upgrading to the latest version of Tor</a>.  If this "
+"works well, please help by documenting what you did, and letting us know "
+"about it."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:404
+#: /home/runa/tor/website/en/faq.wml:404
 msgid ""
 "Tor needs some architectural changes too. One important change is to start "
 "providing <a href=\"#EverybodyARelay\">better service to people who relay "
@@ -702,7 +700,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:411
+#: /home/runa/tor/website/en/faq.wml:411
 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 "
@@ -710,7 +708,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:417
+#: /home/runa/tor/website/en/faq.wml:417
 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 "
@@ -721,7 +719,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:426
+#: /home/runa/tor/website/en/faq.wml:426
 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 "
@@ -729,19 +727,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:433
+#: /home/runa/tor/website/en/faq.wml:433
 msgid "<hr /> <a id=\"Funding\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:436
+#: /home/runa/tor/website/en/faq.wml:436
 msgid ""
 "<a class=\"anchor\" href=\"#Funding\">What would The Tor Project do with "
 "more funding?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:440
+#: /home/runa/tor/website/en/faq.wml:440
 msgid ""
 "We have about 1800 relays right now, pushing over 150 MB/s average traffic. "
 "We have several hundred thousand active users. But the Tor network is not "
@@ -749,12 +747,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:446
+#: /home/runa/tor/website/en/faq.wml:446
 msgid "There are six main development/maintenance pushes that need attention:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:452
+#: /home/runa/tor/website/en/faq.wml:452
 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 "
@@ -763,7 +761,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:459
+#: /home/runa/tor/website/en/faq.wml:459
 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 "
@@ -771,7 +769,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:465
+#: /home/runa/tor/website/en/faq.wml:465
 msgid ""
 "Relay support: the Tor network is run by volunteers, but they still need "
 "attention with prompt bug fixes, explanations when things go wrong, "
@@ -782,7 +780,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:474
+#: /home/runa/tor/website/en/faq.wml:474
 msgid ""
 "Usability: Beyond documentation, we also need to work on usability of the "
 "software itself. This includes installers, clean GUIs, easy configuration to "
@@ -793,7 +791,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:483
+#: /home/runa/tor/website/en/faq.wml:483
 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="
@@ -802,7 +800,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:490
+#: /home/runa/tor/website/en/faq.wml:490
 msgid ""
 "Research: The anonymous communications field is full of surprises and "
 "gotchas. In our copious free time, we also help run top anonymity and "
@@ -814,7 +812,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:503
+#: /home/runa/tor/website/en/faq.wml:503
 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 "
@@ -823,14 +821,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:511
+#: /home/runa/tor/website/en/faq.wml:511
 msgid ""
 "We are also excited about tackling related problems, such as censorship-"
 "resistance."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:516
+#: /home/runa/tor/website/en/faq.wml:516
 msgid ""
 "We are proud to have <a href=\"<page sponsors>\">sponsorship and support</a> "
 "from the Omidyar Network, the International Broadcasting Bureau, Bell "
@@ -839,7 +837,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:523
+#: /home/runa/tor/website/en/faq.wml:523
 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 "
@@ -848,18 +846,18 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:529
+#: /home/runa/tor/website/en/faq.wml:529
 msgid "<hr /> <a id=\"HowUninstallTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:532
+#: /home/runa/tor/website/en/faq.wml:532
 msgid ""
 "<a class=\"anchor\" href=\"#HowUninstallTor\">How do I uninstall Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:535
+#: /home/runa/tor/website/en/faq.wml:535
 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 "
@@ -869,35 +867,35 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/faq.wml:543
+#: /home/runa/tor/website/en/faq.wml:543
 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/code/website/en/faq.wml:545
+#: /home/runa/tor/website/en/faq.wml:545
 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/code/website/en/faq.wml:547
+#: /home/runa/tor/website/en/faq.wml:547
 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/code/website/en/faq.wml:549
+#: /home/runa/tor/website/en/faq.wml:549
 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/code/website/en/faq.wml:554
+#: /home/runa/tor/website/en/faq.wml:554
 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 "
@@ -905,14 +903,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:560
+#: /home/runa/tor/website/en/faq.wml:560
 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/code/website/en/faq.wml:565
+#: /home/runa/tor/website/en/faq.wml:565
 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 "
@@ -920,52 +918,52 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:570
+#: /home/runa/tor/website/en/faq.wml:570
 msgid "<hr /> <a id=\"PGPSigs\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:573
+#: /home/runa/tor/website/en/faq.wml:573
 msgid ""
 "<a class=\"anchor\" href=\"#PGPSigs\">What are these \"sig\" files on the "
 "download page?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:577
+#: /home/runa/tor/website/en/faq.wml:577
 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/code/website/en/faq.wml:582
+#: /home/runa/tor/website/en/faq.wml:582
 msgid ""
 "Please read the <a href=\"<page verifying-signatures>\">verifying "
 "signatures</a> page for details."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:586
+#: /home/runa/tor/website/en/faq.wml:586
 msgid "<hr /> <a id=\"CompileTorWindows\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:589
+#: /home/runa/tor/website/en/faq.wml:589
 msgid ""
 "<a class=\"anchor\" href=\"#CompileTorWindows\">How do I compile Tor under "
 "Windows?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:593
+#: /home/runa/tor/website/en/faq.wml:593
 msgid ""
 "Try following the steps at <a href=\"<gitblob>doc/tor-win32-mingw-creation."
 "txt\"> tor-win32-mingw-creation.txt</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:598
+#: /home/runa/tor/website/en/faq.wml:598
 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>"
@@ -973,19 +971,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:603
+#: /home/runa/tor/website/en/faq.wml:603
 msgid "<hr /> <a id=\"VirusFalsePositives\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:606
+#: /home/runa/tor/website/en/faq.wml:606
 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/code/website/en/faq.wml:610
+#: /home/runa/tor/website/en/faq.wml:610
 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 "
@@ -996,7 +994,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:618
+#: /home/runa/tor/website/en/faq.wml:618
 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="
@@ -1004,19 +1002,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:623
+#: /home/runa/tor/website/en/faq.wml:623
 msgid "<hr /> <a id=\"LiveCD\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:626
+#: /home/runa/tor/website/en/faq.wml:626
 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/code/website/en/faq.wml:630
+#: /home/runa/tor/website/en/faq.wml:630
 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 "
@@ -1025,45 +1023,45 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:637
+#: /home/runa/tor/website/en/faq.wml:637
 msgid "LiveCDs:"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/faq.wml:641
+#: /home/runa/tor/website/en/faq.wml:641
 msgid ""
 "<a href=\"https://amnesia.boum.org/\">The (Amnesic) Incognito Live System</"
 "a> is a Live System aimed at preserving your privacy and anonymity:"
 msgstr ""
 
 #. type: Content of: <div><ol><li><ul><li>
-#: /home/runa/code/website/en/faq.wml:645
+#: /home/runa/tor/website/en/faq.wml:645
 msgid ""
 "All outgoing connections to the Internet are forced to go through the Tor "
 "network."
 msgstr ""
 
 #. type: Content of: <div><ol><li><ul><li>
-#: /home/runa/code/website/en/faq.wml:647
+#: /home/runa/tor/website/en/faq.wml:647
 msgid "No trace is left on local storage devices unless explicitely asked."
 msgstr ""
 
 #. type: Content of: <div><ol><li><ul><li>
-#: /home/runa/code/website/en/faq.wml:648
+#: /home/runa/tor/website/en/faq.wml:648
 msgid ""
 "It includes Firefox, Tor, Torbutton, Vidalia graphical Tor controller, "
 "Pidgin Instant Messaging client, and lots of other software."
 msgstr ""
 
 #. type: Content of: <div><ol><li><ul><li>
-#: /home/runa/code/website/en/faq.wml:651
+#: /home/runa/tor/website/en/faq.wml:651
 msgid ""
 "It's based upon Debian gnu/linux and comes with the GNOME desktop "
 "environment."
 msgstr ""
 
 #. type: Content of: <div><ol><li><li>
-#: /home/runa/code/website/en/faq.wml:654
+#: /home/runa/tor/website/en/faq.wml:654
 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 "
@@ -1073,7 +1071,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li><li>
-#: /home/runa/code/website/en/faq.wml:659
+#: /home/runa/tor/website/en/faq.wml:659
 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 "
@@ -1081,12 +1079,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:666
+#: /home/runa/tor/website/en/faq.wml:666
 msgid "Windows bundles:"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/faq.wml:670
+#: /home/runa/tor/website/en/faq.wml:670
 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 "
@@ -1094,7 +1092,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/faq.wml:673
+#: /home/runa/tor/website/en/faq.wml:673
 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, "
@@ -1102,12 +1100,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:679
+#: /home/runa/tor/website/en/faq.wml:679
 msgid "Not currently maintained as far as we know:"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/faq.wml:683
+#: /home/runa/tor/website/en/faq.wml:683
 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 "
@@ -1115,7 +1113,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/faq.wml:686
+#: /home/runa/tor/website/en/faq.wml:686
 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."
@@ -1124,7 +1122,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/faq.wml:690
+#: /home/runa/tor/website/en/faq.wml:690
 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 "
@@ -1135,7 +1133,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/faq.wml:695
+#: /home/runa/tor/website/en/faq.wml:695
 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. "
@@ -1144,24 +1142,24 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:702
+#: /home/runa/tor/website/en/faq.wml:702
 msgid "Please contact us if you know any others."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:705
+#: /home/runa/tor/website/en/faq.wml:705
 msgid "<hr /> <a id=\"VidaliaPassword\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:708
+#: /home/runa/tor/website/en/faq.wml:708
 msgid ""
 "<a class=\"anchor\" href=\"#VidaliaPassword\">Tor/Vidalia prompts for a "
 "password at start</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:712
+#: /home/runa/tor/website/en/faq.wml:712
 msgid ""
 "Vidalia interacts with the Tor software via Tor's \"control port\". The "
 "control port lets Vidalia receive status updates from Tor, request a new "
@@ -1172,7 +1170,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:721
+#: /home/runa/tor/website/en/faq.wml:721
 msgid ""
 "Usually this process of generating and setting a random control password "
 "happens in the background. There are three common situations, though, where "
@@ -1180,7 +1178,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/faq.wml:727
+#: /home/runa/tor/website/en/faq.wml:727
 msgid ""
 "You're already running Vidalia and Tor. For example, this situation can "
 "happen if you installed the Vidalia bundle and now you're trying to run the "
@@ -1189,7 +1187,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/faq.wml:732
+#: /home/runa/tor/website/en/faq.wml:732
 msgid ""
 "Vidalia crashed, but left Tor running with the last known random password. "
 "After you restart Vidalia, it generates a new random password, but Vidalia "
@@ -1203,7 +1201,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/faq.wml:745
+#: /home/runa/tor/website/en/faq.wml:745
 msgid ""
 "You had previously set Tor to run as a Windows NT service. When Tor is set "
 "to run as a service, it starts up when the system boots. If you configured "
@@ -1212,26 +1210,25 @@
 "saved. You login and start up Vidalia. Vidalia attempts to talk to the "
 "already running Tor. Vidalia generates a random password, but it is "
 "different than the saved password in the Tor service.  <br /> You need to "
-"reconfigure Tor to not be a service. See the FAQ entry on <a href=\"https://"
-"trac.torproject.org/projects/tor/wiki/TheOnionRouter/"
-"TorFAQ#HowdoIrunmyTorrelayasanNTservice\">running Tor as a Windows NT "
-"service</a> for more information on how to remove the Tor service."
+"reconfigure Tor to not be a service. See the FAQ entry on <a href="
+"\"<wiki>TorFAQ#HowdoIrunmyTorrelayasanNTservice\">running Tor as a Windows "
+"NT service</a> for more information on how to remove the Tor service."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:760
+#: /home/runa/tor/website/en/faq.wml:760
 msgid "<hr /> <a id=\"ChooseEntryExit\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:763
+#: /home/runa/tor/website/en/faq.wml:763
 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/code/website/en/faq.wml:766
+#: /home/runa/tor/website/en/faq.wml:766
 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 "
@@ -1239,53 +1236,53 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/faq.wml:772
+#: /home/runa/tor/website/en/faq.wml:772
 msgid "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/faq.wml:773
+#: /home/runa/tor/website/en/faq.wml:773
 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/code/website/en/faq.wml:775
+#: /home/runa/tor/website/en/faq.wml:775
 msgid "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/faq.wml:776
+#: /home/runa/tor/website/en/faq.wml:776
 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/code/website/en/faq.wml:778
+#: /home/runa/tor/website/en/faq.wml:778
 msgid "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/faq.wml:779
+#: /home/runa/tor/website/en/faq.wml:779
 msgid "A list of nodes to never use when building a circuit."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/faq.wml:781
+#: /home/runa/tor/website/en/faq.wml:781
 msgid "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/faq.wml:782
+#: /home/runa/tor/website/en/faq.wml:782
 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/code/website/en/faq.wml:787
+#: /home/runa/tor/website/en/faq.wml:787
 msgid ""
 "<em>We recommend you do not use these</em> &mdash; they are intended for "
 "testing and may disappear in future versions.  You get the best security "
@@ -1295,19 +1292,19 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:793
+#: /home/runa/tor/website/en/faq.wml:793
 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 "
 "them.  You can make the option mandatory by setting <tt>StrictExitNodes 1</"
 "tt> or <tt>StrictEntryNodes 1</tt> &mdash; but if you do, your Tor "
 "connections will stop working if all of the nodes you have specified become "
-"unreachable.  See the <a href=\"https://www.torproject.org/documentation."
-"html.en#NeatLinks\">Tor status pages</a> for some nodes you might pick."
+"unreachable.  See the <a href=\"<page documentation>#NeatLinks\">Tor status "
+"pages</a> for some nodes you might pick."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:803
+#: /home/runa/tor/website/en/faq.wml:803
 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 "
@@ -1316,7 +1313,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:811
+#: /home/runa/tor/website/en/faq.wml:811
 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 "
@@ -1325,35 +1322,33 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:817
+#: /home/runa/tor/website/en/faq.wml:817
 msgid "<hr /> <a id=\"RelayFlexible\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:820
+#: /home/runa/tor/website/en/faq.wml:820
 msgid ""
 "<a class=\"anchor\" href=\"#RelayFlexible\">How stable does my relay need to "
 "be?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:824
+#: /home/runa/tor/website/en/faq.wml:824
 msgid "We aim to make setting up a Tor relay easy and convenient:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:828
+#: /home/runa/tor/website/en/faq.wml:828
 msgid ""
-"Tor has built-in support for <a href=\"https://trac.torproject.org/projects/"
-"tor/wiki/TheOnionRouter/TorFAQ#LimitBandwidth\"> rate limiting</a>. Further, "
-"if you have a fast link but want to limit the number of bytes per day (or "
-"week or month) that you donate, check out the <a href=\"https://trac."
-"torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Hibernation"
-"\">hibernation feature</a>."
+"Tor has built-in support for <a href=\"<wiki>TorFAQ#LimitBandwidth\"> rate "
+"limiting</a>. Further, if you have a fast link but want to limit the number "
+"of bytes per day (or week or month) that you donate, check out the <a href="
+"\"<wiki>TorFAQ#Hibernation\">hibernation feature</a>."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:836
+#: /home/runa/tor/website/en/faq.wml:836
 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 "
@@ -1362,7 +1357,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:841
+#: /home/runa/tor/website/en/faq.wml:841
 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 "
@@ -1370,24 +1365,24 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:846
+#: /home/runa/tor/website/en/faq.wml:846
 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/code/website/en/faq.wml:849
+#: /home/runa/tor/website/en/faq.wml:849
 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 "
-"connections is system dependent but <a href=\"https://trac.torproject.org/"
-"projects/tor/wiki/TheOnionRouter/TorFAQ#ServerForFirewalledClients\">this "
-"FAQ entry</a> offers some examples on how to do this."
+"connections is system dependent but <a href="
+"\"<wiki>TorFAQ#ServerForFirewalledClients\">this FAQ entry</a> offers some "
+"examples on how to do this."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:855
+#: /home/runa/tor/website/en/faq.wml:855
 msgid ""
 "Your relay will passively estimate and advertise its recent bandwidth "
 "capacity, so high-bandwidth relays will attract more users than low-"
@@ -1395,24 +1390,24 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:861
+#: /home/runa/tor/website/en/faq.wml:861
 msgid "<hr /> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:865
+#: /home/runa/tor/website/en/faq.wml:865
 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/code/website/en/faq.wml:869
+#: /home/runa/tor/website/en/faq.wml:869
 msgid "Great. That's exactly why we implemented exit policies."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:873
+#: /home/runa/tor/website/en/faq.wml:873
 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 "
@@ -1422,29 +1417,27 @@
 "networks he wants to allow connections to, based on abuse potential and his "
 "own situation. Read the FAQ entry on <a href=\"<page faq-abuse>#TypicalAbuses"
 "\">issues you might encounter</a> if you use the default exit policy, and "
-"then read Mike Perry's <a href=\"https://blog.torproject.org/blog/tips-"
-"running-exit-node-minimal-harassment\">tips for running an exit node with "
-"minimal harassment</a>."
+"then read Mike Perry's <a href=\"<blog>tips-running-exit-node-minimal-"
+"harassment\">tips for running an exit node with minimal harassment</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:887
+#: /home/runa/tor/website/en/faq.wml:887
 msgid ""
 "The default exit policy allows access to many popular services (e.g. web "
-"browsing), but <a href=\"https://trac.torproject.org/projects/tor/wiki/"
-"TheOnionRouter/TorFAQ#DefaultPorts\">restricts</a> some due to abuse "
-"potential (e.g. mail) and some since the Tor network can't handle the load "
-"(e.g. default file-sharing ports). You can change your exit policy using "
-"Vidalia's \"Sharing\" tab, or by manually editing your <a href=\"https://"
-"trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#torrc\">torrc</"
-"a> file. If you want to avoid most if not all abuse potential, set it to "
-"\"reject *:*\" (or un-check all the boxes in Vidalia). This setting means "
-"that your relay will be used for relaying traffic inside the Tor network, "
-"but not for connections to external websites or other services."
+"browsing), but <a href=\"<wiki>TorFAQ#DefaultPorts\">restricts</a> some due "
+"to abuse potential (e.g. mail) and some since the Tor network can't handle "
+"the load (e.g. default file-sharing ports). You can change your exit policy "
+"using Vidalia's \"Sharing\" tab, or by manually editing your <a href="
+"\"<wiki>TorFAQ#torrc\">torrc</a> file. If you want to avoid most if not all "
+"abuse potential, set it to \"reject *:*\" (or un-check all the boxes in "
+"Vidalia). This setting means that your relay will be used for relaying "
+"traffic inside the Tor network, but not for connections to external websites "
+"or other services."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:901
+#: /home/runa/tor/website/en/faq.wml:901
 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 "
@@ -1454,19 +1447,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:909
+#: /home/runa/tor/website/en/faq.wml:909
 msgid "<hr /> <a id=\"RelayOrBridge\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:912
+#: /home/runa/tor/website/en/faq.wml:912
 msgid ""
 "<a class=\"anchor\" href=\"#RelayOrBridge\">Should I be a normal relay or "
 "bridge relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:915
+#: /home/runa/tor/website/en/faq.wml:915
 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 "
@@ -1476,7 +1469,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:922
+#: /home/runa/tor/website/en/faq.wml:922
 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 "
@@ -1484,7 +1477,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:927
+#: /home/runa/tor/website/en/faq.wml:927
 msgid ""
 "Right now, there are a small number of places in the world that filter "
 "connections to the Tor network. So getting a lot of bridges running right "
@@ -1495,7 +1488,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:935
+#: /home/runa/tor/website/en/faq.wml:935
 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 "
@@ -1506,26 +1499,26 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:943
+#: /home/runa/tor/website/en/faq.wml:943
 msgid "<hr /> <a id=\"RelayMemory\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:946
+#: /home/runa/tor/website/en/faq.wml:946
 msgid ""
 "<a class=\"anchor\" href=\"#RelayMemory\">Why is my Tor relay using so much "
 "memory?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:949
+#: /home/runa/tor/website/en/faq.wml:949
 msgid ""
 "If your Tor relay is using more memory than you'd like, here are some tips "
 "for reducing its footprint:"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/faq.wml:954
+#: /home/runa/tor/website/en/faq.wml:954
 msgid ""
 "If you're on Linux, you may be encountering memory fragmentation bugs in "
 "glibc's malloc implementation. That is, when Tor releases memory back to the "
@@ -1537,7 +1530,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/faq.wml:962
+#: /home/runa/tor/website/en/faq.wml:962
 msgid ""
 "If you're running a fast relay, meaning you have many TLS connections open, "
 "you are probably losing a lot of memory to OpenSSL's internal buffers (38KB+ "
@@ -1548,16 +1541,15 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/faq.wml:970
+#: /home/runa/tor/website/en/faq.wml:970
 msgid ""
 "If you're running on Solaris, OpenBSD, NetBSD, or old FreeBSD, Tor is "
 "probably forking separate processes rather than using threads. Consider "
-"switching to a <a href=\"https://trac.torproject.org/projects/tor/wiki/"
-"TheOnionRouter/TorFAQ#RelayOS\">better operating system</a>."
+"switching to a <a href=\"<wiki>TorFAQ#RelayOS\">better operating system</a>."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/faq.wml:976
+#: /home/runa/tor/website/en/faq.wml:976
 msgid ""
 "If you still can't handle the memory load, consider reducing the amount of "
 "bandwidth your relay advertises. Advertising less bandwidth means you will "
@@ -1566,61 +1558,61 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:985
+#: /home/runa/tor/website/en/faq.wml:985
 msgid ""
 "All of this said, fast Tor relays do use a lot of ram. It is not unusual for "
 "a fast exit relay to use 500-1000 MB of memory."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:989
+#: /home/runa/tor/website/en/faq.wml:989
 msgid "<hr /> <a id=\"WhyNotNamed\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:992
+#: /home/runa/tor/website/en/faq.wml:992
 msgid ""
 "<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:995
+#: /home/runa/tor/website/en/faq.wml:995
 msgid ""
 "We currently use these metrics to determine if your relay should be named:"
 "<br />"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:998
+#: /home/runa/tor/website/en/faq.wml:998
 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/code/website/en/faq.wml:1000
+#: /home/runa/tor/website/en/faq.wml:1000
 msgid "The relay must have been around for at least two weeks."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq.wml:1001
+#: /home/runa/tor/website/en/faq.wml:1001
 msgid "No other router may have wanted the same name in the past month."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:1004
+#: /home/runa/tor/website/en/faq.wml:1004
 msgid "<hr /> <a id=\"KeyManagement\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:1007
+#: /home/runa/tor/website/en/faq.wml:1007
 msgid ""
 "<a class=\"anchor\" href=\"#KeyManagement\">Tell me about all the keys Tor "
 "uses.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:1011
+#: /home/runa/tor/website/en/faq.wml:1011
 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)  "
@@ -1630,7 +1622,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:1019
+#: /home/runa/tor/website/en/faq.wml:1019
 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 "
@@ -1641,7 +1633,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:1029
+#: /home/runa/tor/website/en/faq.wml:1029
 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 "
@@ -1652,7 +1644,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:1039
+#: /home/runa/tor/website/en/faq.wml:1039
 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 "
@@ -1667,7 +1659,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:1053
+#: /home/runa/tor/website/en/faq.wml:1053
 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 "
@@ -1676,7 +1668,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:1060
+#: /home/runa/tor/website/en/faq.wml:1060
 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."
@@ -1685,7 +1677,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:1068
+#: /home/runa/tor/website/en/faq.wml:1068
 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 "
@@ -1695,34 +1687,33 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:1075
+#: /home/runa/tor/website/en/faq.wml:1075
 msgid "<hr /> <a id=\"EverybodyARelay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:1078
+#: /home/runa/tor/website/en/faq.wml:1078
 msgid ""
 "<a class=\"anchor\" href=\"#EverybodyARelay\">You should make every Tor user "
 "be a relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:1082
+#: /home/runa/tor/website/en/faq.wml:1082
 msgid ""
 "Requiring every Tor user to be a relay would help with scaling the network "
-"to handle all our users, and <a href=\"https://trac.torproject.org/projects/"
-"tor/wiki/TheOnionRouter/TorFAQ#RelayAnonymity\">running a Tor relay may help "
-"your anonymity</a>. However, many Tor users cannot be good relays &mdash; "
-"for example, some Tor clients operate from behind restrictive firewalls, "
-"connect via modem, or otherwise aren't in a position where they can relay "
-"traffic. Providing service to these clients is a critical part of providing "
-"effective anonymity for everyone, since many Tor users are subject to these "
-"or similar constraints and including these clients increases the size of the "
-"anonymity set."
+"to handle all our users, and <a href=\"<wiki>TorFAQ#RelayAnonymity\">running "
+"a Tor relay may help your anonymity</a>. However, many Tor users cannot be "
+"good relays &mdash; for example, some Tor clients operate from behind "
+"restrictive firewalls, connect via modem, or otherwise aren't in a position "
+"where they can relay traffic. Providing service to these clients is a "
+"critical part of providing effective anonymity for everyone, since many Tor "
+"users are subject to these or similar constraints and including these "
+"clients increases the size of the anonymity set."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:1094
+#: /home/runa/tor/website/en/faq.wml:1094
 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 "
@@ -1733,12 +1724,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:1103
+#: /home/runa/tor/website/en/faq.wml:1103
 msgid "There are five steps we need to address before we can do this though:"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:1107
+#: /home/runa/tor/website/en/faq.wml:1107
 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 "
@@ -1747,20 +1738,19 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:1115
+#: /home/runa/tor/website/en/faq.wml:1115
 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 "
 "volunteer>#Research\">research section of the volunteer page</a>: \"Tor "
 "doesn't work very well when relays have asymmetric bandwidth (e.g. cable or "
-"DSL)\". It might be that <a href=\"https://trac.torproject.org/projects/tor/"
-"wiki/TheOnionRouter/TorFAQ#TransportIPnotTCP\">switching to UDP transport</"
-"a> is the simplest answer here &mdash; which alas is not a very simple "
-"answer at all."
+"DSL)\". It might be that <a href=\"<wiki>TorFAQ#TransportIPnotTCP"
+"\">switching to UDP transport</a> is the simplest answer here &mdash; which "
+"alas is not a very simple answer at all."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:1126
+#: /home/runa/tor/website/en/faq.wml:1126
 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 "
@@ -1772,7 +1762,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:1136
+#: /home/runa/tor/website/en/faq.wml:1136
 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 "
@@ -1789,54 +1779,52 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:1152
+#: /home/runa/tor/website/en/faq.wml:1152
 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="
-"\"https://blog.torproject.org/blog/two-incentive-designs-tor\">current "
-"thoughts on Tor incentives</a>."
+"\"<blog>two-incentive-designs-tor\">current thoughts on Tor incentives</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:1159
+#: /home/runa/tor/website/en/faq.wml:1159
 msgid "Please help on all of these!"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq.wml:1162
+#: /home/runa/tor/website/en/faq.wml:1162
 msgid "<hr /> <a id=\"Criminals\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:1165
+#: /home/runa/tor/website/en/faq.wml:1165
 msgid ""
 "<a class=\"anchor\" href=\"#Criminals\">Doesn't Tor enable criminals to do "
 "bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq.wml:1169
+#: /home/runa/tor/website/en/faq.wml:1169
 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/code/website/en/faq.wml:1173
+#: /home/runa/tor/website/en/faq.wml:1173
 msgid "<hr /> <a id=\"RespondISP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq.wml:1176
+#: /home/runa/tor/website/en/faq.wml:1176
 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/code/website/en/faq.wml:1180
+#: /home/runa/tor/website/en/faq.wml:1180
 msgid ""
 "A collection of templates for successfully responding to ISPs is <a href="
-"\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/"
-"TorAbuseTemplates\">collected here</a>."
+"\"<wiki>TorAbuseTemplates\">collected here</a>."
 msgstr ""

Modified: translation/trunk/projects/website/templates/3-low.contact.pot
===================================================================
--- translation/trunk/projects/website/templates/3-low.contact.pot	2010-08-23 19:40:14 UTC (rev 23029)
+++ translation/trunk/projects/website/templates/3-low.contact.pot	2010-08-23 19:47:54 UTC (rev 23030)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-08-23 20:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,22 +17,22 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/contact.wml:9
+#: /home/runa/tor/website/en/contact.wml:9
 msgid "Tor: Contact"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/code/website/en/contact.wml:14
+#: /home/runa/tor/website/en/contact.wml:14
 msgid "With the Press or Media?"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/code/website/en/contact.wml:15
+#: /home/runa/tor/website/en/contact.wml:15
 msgid "<a href=\"<page press/index>\">See our Press page</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/contact.wml:18
+#: /home/runa/tor/website/en/contact.wml:18
 msgid ""
 "First, if you have a problem or question about using Tor, go look at the <a "
 "href=\"<page documentation>#Support\">Support section</a> for how to "
@@ -42,7 +42,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/contact.wml:25
+#: /home/runa/tor/website/en/contact.wml:25
 msgid ""
 "If you really do need to reach us, here are some approaches. All of these "
 "addresses are @torproject.org. Note that in practice most of them go to the "
@@ -52,14 +52,14 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/contact.wml:32
+#: /home/runa/tor/website/en/contact.wml:32
 msgid ""
 "<tt>tor-assistants</tt> is the catch-all address for everything. If you'd "
 "like to ask a more directed question, please see the descriptions below."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/contact.wml:35
+#: /home/runa/tor/website/en/contact.wml:35
 msgid ""
 "<tt>tor-ops</tt> gets to the people who manage the directory authorities. "
 "Use this if you run a Tor relay and have a question or problem with your "
@@ -67,16 +67,16 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/contact.wml:38
+#: /home/runa/tor/website/en/contact.wml:38
 msgid ""
 "<tt>tor-webmaster</tt> can fix typos on the website, change wrong statements "
 "or directions on the website, and add new sections and paragraphs that you "
 "send us. You might want to make a draft of your new sections on <a href="
-"\"https://trac.torproject.org/projects/tor/wiki\">the Tor wiki</a> first."
+"\"<wiki>\">the Tor wiki</a> first."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/contact.wml:43
+#: /home/runa/tor/website/en/contact.wml:42
 msgid ""
 "<tt>tor-volunteer</tt> wants to hear about your documents, patches, testing, "
 "experiences with supporting applications, and so forth inspired by our <a "
@@ -88,7 +88,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/contact.wml:50
+#: /home/runa/tor/website/en/contact.wml:49
 msgid ""
 "<tt>tor-translation</tt> can put new <a href=\"<page translation>\">website "
 "translations</a> into place, and help answer questions about existing and "
@@ -96,14 +96,14 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/contact.wml:53
+#: /home/runa/tor/website/en/contact.wml:52
 msgid ""
 "<tt>tordnsel</tt> is the alias for the people responsible for the tordns "
 "exitlist."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/contact.wml:55
+#: /home/runa/tor/website/en/contact.wml:54
 msgid ""
 "<tt>donations</tt> is for questions and comments about <a href=\"<page "
 "donate>\">getting money to the developers</a>. More donations means <a href="
@@ -112,7 +112,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/contact.wml:59
+#: /home/runa/tor/website/en/contact.wml:58
 msgid ""
 "<tt>execdir</tt> is for press/media, questions and comments about Tor the "
 "non-profit corporation: trademark questions, affiliation and coordination, "

Modified: translation/trunk/projects/website/templates/3-low.download-unix.pot
===================================================================
--- translation/trunk/projects/website/templates/3-low.download-unix.pot	2010-08-23 19:40:14 UTC (rev 23029)
+++ translation/trunk/projects/website/templates/3-low.download-unix.pot	2010-08-23 19:47:54 UTC (rev 23030)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-08-23 20:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,12 +17,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/download-unix.wml:9
+#: /home/runa/tor/website/en/download-unix.wml:9
 msgid "Available Linux/Unix Packages"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/code/website/en/download-unix.wml:12
+#: /home/runa/tor/website/en/download-unix.wml:12
 msgid ""
 "Warning: Want Tor to really work? ...then please don't just install it and "
 "go on. You need to change some of your habits, and reconfigure your "
@@ -32,27 +32,27 @@
 msgstr ""
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/code/website/en/download-unix.wml:23
+#: /home/runa/tor/website/en/download-unix.wml:23
 msgid "Platform"
 msgstr ""
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/code/website/en/download-unix.wml:24
+#: /home/runa/tor/website/en/download-unix.wml:24
 msgid "Download Stable"
 msgstr ""
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/code/website/en/download-unix.wml:25
+#: /home/runa/tor/website/en/download-unix.wml:25
 msgid "Download Unstable"
 msgstr ""
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/code/website/en/download-unix.wml:26
+#: /home/runa/tor/website/en/download-unix.wml:26
 msgid "Installation and Configuration"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:30
+#: /home/runa/tor/website/en/download-unix.wml:30
 msgid ""
 "<img src=\"images/distros/debian.png\" alt=\"Debian\" /> <img src=\"images/"
 "distros/ubuntu.png\" alt=\"Ubuntu\" /> <img src=\"images/distros/knoppix.png"
@@ -60,23 +60,23 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:31
+#: /home/runa/tor/website/en/download-unix.wml:31
 msgid "Debian, Ubuntu, Knoppix"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:32
+#: /home/runa/tor/website/en/download-unix.wml:32
 msgid "<a href=\"<page docs/debian>\">repository packages</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:33 /tmp/CdlHMrTKgA.xml:40
-#: /tmp/CdlHMrTKgA.xml:56 /tmp/CdlHMrTKgA.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/jyieazaAb0.xml:40
+#: /tmp/jyieazaAb0.xml:56 /tmp/jyieazaAb0.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:37
+#: /home/runa/tor/website/en/download-unix.wml:37
 msgid ""
 "<img src=\"images/distros/centos.png\" alt=\"CentOS\" /> <img src=\"images/"
 "distros/fedora.png\" alt=\"Fedora\" /> <img src=\"images/distros/suse.png\" "
@@ -84,197 +84,196 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:38
+#: /home/runa/tor/website/en/download-unix.wml:38
 msgid "CentOS, Fedora, OpenSUSE"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:39
+#: /home/runa/tor/website/en/download-unix.wml:39
 msgid "<a href=\"<page docs/rpms>\">repository packages</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:44
+#: /home/runa/tor/website/en/download-unix.wml:44
 msgid "<img src=\"images/distros/gentoo.png\" alt=\"Gentoo Linux\" />"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:45
+#: /home/runa/tor/website/en/download-unix.wml:45
 msgid "Gentoo Linux"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:46
+#: /home/runa/tor/website/en/download-unix.wml:46
 msgid "<kbd>emerge tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:48
+#: /home/runa/tor/website/en/download-unix.wml:48
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a><br />"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:53
+#: /home/runa/tor/website/en/download-unix.wml:53
 msgid "<img src=\"images/distros/freebsd.png\" alt=\"FreeBSD\" />"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:54
+#: /home/runa/tor/website/en/download-unix.wml:54
 msgid "FreeBSD"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:55
+#: /home/runa/tor/website/en/download-unix.wml:55
 msgid "<kbd>portinstall -s security/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:60
+#: /home/runa/tor/website/en/download-unix.wml:60
 msgid "<img src=\"images/distros/openbsd.png\" alt=\"OpenBSD\" />"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:61
+#: /home/runa/tor/website/en/download-unix.wml:61
 msgid "OpenBSD"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:62
+#: /home/runa/tor/website/en/download-unix.wml:62
 msgid ""
 "<kbd>cd /usr/ports/net/tor &amp;&amp; make &amp;&amp; make install</kbd>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:64
+#: /home/runa/tor/website/en/download-unix.wml:64
 msgid ""
 "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a><br /> <a href="
-"\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/"
-"OpenbsdChrootedTor\">Guide to chrooting Tor in OpenBSD</a>"
+"\"<wiki>OpenbsdChrootedTor\">Guide to chrooting Tor in OpenBSD</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:70
+#: /home/runa/tor/website/en/download-unix.wml:70
 msgid "<img src=\"images/distros/netbsd.png\" alt=\"NetBSD\" />"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:71
+#: /home/runa/tor/website/en/download-unix.wml:71
 msgid "NetBSD"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:72
+#: /home/runa/tor/website/en/download-unix.wml:72
 msgid "<kbd>cd /usr/pkgsrc/net/tor &amp;&amp; make install</kbd>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:77
+#: /home/runa/tor/website/en/download-unix.wml:77
 msgid ""
 "<img src=\"images/distros/200px-Maemo_logo_color.svg.png\" alt=\"Maemo\" />"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:78
+#: /home/runa/tor/website/en/download-unix.wml:78
 msgid "Maemo / N900"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:79
+#: /home/runa/tor/website/en/download-unix.wml:79
 msgid "<a href=\"<page docs/N900>\">Experimental instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:84
+#: /home/runa/tor/website/en/download-unix.wml:84
 msgid ""
 "<img src=\"images/distros/android-market.gif\" alt=\"Android\" width=\"32\" "
 "height=\"32\"/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:85
+#: /home/runa/tor/website/en/download-unix.wml:85
 msgid "Android"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:87
+#: /home/runa/tor/website/en/download-unix.wml:87
 msgid ""
 "<a href=\"<package-androidbundle-alpha>\"><version-androidbundle-tor></a> "
 "(<a href=\"<package-androidbundle-alpha-sig>\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:88
+#: /home/runa/tor/website/en/download-unix.wml:88
 msgid ""
 "<a href=\"<page docs/android>\">Android instructions and information</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:92
+#: /home/runa/tor/website/en/download-unix.wml:92
 msgid ""
 "<img src=\"images/distros/apple.png\" alt=\"Apple iPhone/iPod Touch\" />"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:93
+#: /home/runa/tor/website/en/download-unix.wml:93
 msgid "Apple iPhone/iPod Touch"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:94
+#: /home/runa/tor/website/en/download-unix.wml:94
 msgid ""
 "<a href=\"http://sid77.slackware.it/iphone/\">Test packages by Marco</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:99
+#: /home/runa/tor/website/en/download-unix.wml:99
 msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:100
+#: /home/runa/tor/website/en/download-unix.wml:100
 msgid "Source tarballs"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:102
+#: /home/runa/tor/website/en/download-unix.wml:102
 msgid ""
 "<a href=\"<package-source-stable>\"><version-stable></a> (<a href=\"<package-"
 "source-stable-sig>\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:106
+#: /home/runa/tor/website/en/download-unix.wml:106
 msgid ""
 "<a href=\"<package-source-alpha>\"><version-alpha></a> (<a href=\"<package-"
 "source-alpha-sig>\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/download-unix.wml:109
+#: /home/runa/tor/website/en/download-unix.wml:109
 msgid "<kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/code/website/en/download-unix.wml:116
+#: /home/runa/tor/website/en/download-unix.wml:116
 msgid "<a id=\"packagediff\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/code/website/en/download-unix.wml:117
+#: /home/runa/tor/website/en/download-unix.wml:117
 msgid ""
 "<a class=\"anchor\" href=\"#packagediff\">What's the difference between "
 "Stable &amp; Unstable?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download-unix.wml:120
+#: /home/runa/tor/website/en/download-unix.wml:120
 msgid ""
 "Stable packages are released when we believe the features and code will not "
 "change for many months."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download-unix.wml:124
+#: /home/runa/tor/website/en/download-unix.wml:124
 msgid ""
 "Unstable packages are released so you can help us test new features and "
 "bugfixes. Even though they have a higher version number than the stable "
@@ -284,7 +283,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download-unix.wml:133
+#: /home/runa/tor/website/en/download-unix.wml:133
 msgid ""
 "Tor is distributed as <a href=\"http://www.fsf.org/\">Free Software</a> "
 "under the <a href=\"<gitblob>LICENSE\">3-clause BSD license</a>. The bundles "
@@ -294,7 +293,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download-unix.wml:140
+#: /home/runa/tor/website/en/download-unix.wml:140
 msgid ""
 "There is no fee for installing Tor, or using the Tor network, but if you "
 "want Tor to become faster and more usable please consider <a href=\"<page "
@@ -302,7 +301,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download-unix.wml:149
+#: /home/runa/tor/website/en/download-unix.wml:149
 msgid ""
 "To keep informed of security advisories and new stable releases, subscribe "
 "to the <a href=\"http://archives.seul.org/or/announce/\">or-announce mailing "
@@ -312,7 +311,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><form>
-#: /home/runa/code/website/en/download-unix.wml:157
+#: /home/runa/tor/website/en/download-unix.wml:157
 msgid ""
 "<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
 "\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
@@ -321,18 +320,18 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/code/website/en/download-unix.wml:167
+#: /home/runa/tor/website/en/download-unix.wml:167
 msgid "<a id=\"Warning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/code/website/en/download-unix.wml:168
+#: /home/runa/tor/website/en/download-unix.wml:168
 msgid ""
 "<a class=\"anchor\" href=\"#Warning\">Warning: Want Tor to really work?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download-unix.wml:172
+#: /home/runa/tor/website/en/download-unix.wml:172
 msgid ""
 "...then please don't just install it and go on.  You need to change some of "
 "your habits, and reconfigure your software! Tor by itself is <em>NOT</em> "
@@ -341,7 +340,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/code/website/en/download-unix.wml:180
+#: /home/runa/tor/website/en/download-unix.wml:180
 msgid ""
 "Tor only protects Internet applications that are configured to send their "
 "traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
@@ -351,7 +350,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/code/website/en/download-unix.wml:188
+#: /home/runa/tor/website/en/download-unix.wml:188
 msgid ""
 "Browser plugins such as Java, Flash, ActiveX, RealPlayer, Quicktime, Adobe's "
 "PDF plugin, and others can be manipulated into revealing your IP address. "
@@ -367,7 +366,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/code/website/en/download-unix.wml:204
+#: /home/runa/tor/website/en/download-unix.wml:204
 msgid ""
 "Beware of cookies: if you ever browse without Tor and a site gives you a "
 "cookie, that cookie could identify you even when you start using Tor again. "
@@ -377,19 +376,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/code/website/en/download-unix.wml:212
+#: /home/runa/tor/website/en/download-unix.wml:212
 msgid ""
 "Tor anonymizes the origin of your traffic, and it encrypts everything inside "
-"the Tor network, but <a href=\"https://trac.torproject.org/projects/tor/wiki/"
-"TheOnionRouter/TorFAQ#ExitEavesdroppers\">it can't encrypt your traffic "
-"between the Tor network and its final destination.</a> If you are "
-"communicating sensitive information, you should use as much care as you "
-"would on the normal scary Internet &mdash; use HTTPS or other end-to-end "
-"encryption and authentication."
+"the Tor network, but <a href=\"<wiki>TorFAQ#ExitEavesdroppers\">it can't "
+"encrypt your traffic between the Tor network and its final destination.</a> "
+"If you are communicating sensitive information, you should use as much care "
+"as you would on the normal scary Internet &mdash; use HTTPS or other end-to-"
+"end encryption and authentication."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/code/website/en/download-unix.wml:223
+#: /home/runa/tor/website/en/download-unix.wml:223
 msgid ""
 "While Tor blocks attackers on your local network from discovering or "
 "influencing your destination, it opens new risks: malicious or misconfigured "
@@ -398,12 +396,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/code/website/en/download-unix.wml:231
+#: /home/runa/tor/website/en/download-unix.wml:231
 msgid "<br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download-unix.wml:233
+#: /home/runa/tor/website/en/download-unix.wml:233
 msgid ""
 "Be smart and learn more. Understand what Tor does and does not offer.  This "
 "list of pitfalls isn't complete, and we need your help <a href=\"<page "
@@ -411,7 +409,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download-unix.wml:243
+#: /home/runa/tor/website/en/download-unix.wml:243
 msgid ""
 "See our <a href=\"<page verifying-signatures>\">instructions on verifying "
 "package signatures</a>, which allows you to make sure you've downloaded the "
@@ -419,7 +417,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download-unix.wml:249
+#: /home/runa/tor/website/en/download-unix.wml:249
 msgid ""
 "If you would like to research any past release of Tor source, packages, or "
 "other binaries, see <a href=\"http://archive.torproject.org/\">the archive</"
@@ -427,7 +425,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download-unix.wml:255
+#: /home/runa/tor/website/en/download-unix.wml:255
 msgid ""
 "See the <a href=\"<page documentation>#Developers\">developer documentation</"
 "a> for instructions on fetching Tor from Git to get the very latest "
@@ -437,19 +435,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download-unix.wml:267
+#: /home/runa/tor/website/en/download-unix.wml:267
 msgid ""
 "If you have trouble downloading Tor from this site, here is a <a href="
 "\"<page mirrors>\">list of sites mirroring the Tor site</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/code/website/en/download-unix.wml:271
+#: /home/runa/tor/website/en/download-unix.wml:271
 msgid "<a id=\"ChangeLog\"></a> <a id=\"Stable\"></a> <a id=\"Testing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/en/download-unix.wml:275
+#: /home/runa/tor/website/en/download-unix.wml:275
 msgid ""
 "For a list of what has changed in each stable Tor release, see the <a href="
 "\"<gitblobstable>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in "

Modified: translation/trunk/projects/website/templates/3-low.faq-abuse.pot
===================================================================
--- translation/trunk/projects/website/templates/3-low.faq-abuse.pot	2010-08-23 19:40:14 UTC (rev 23029)
+++ translation/trunk/projects/website/templates/3-low.faq-abuse.pot	2010-08-23 19:47:54 UTC (rev 23030)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-08-23 20:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,83 +17,83 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/faq-abuse.wml:11
+#: /home/runa/tor/website/en/faq-abuse.wml:11
 msgid "Abuse FAQ"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/code/website/en/faq-abuse.wml:14
+#: /home/runa/tor/website/en/faq-abuse.wml:14
 msgid "Questions"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/code/website/en/faq-abuse.wml:16
+#: /home/runa/tor/website/en/faq-abuse.wml:16
 msgid ""
 "<a href=\"<page faq-abuse>#WhatAboutCriminals\">Doesn't Tor enable criminals "
 "to do bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/code/website/en/faq-abuse.wml:17
+#: /home/runa/tor/website/en/faq-abuse.wml:17
 msgid ""
 "<a href=\"<page faq-abuse>#DDoS\">What about distributed denial of service "
 "attacks?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/code/website/en/faq-abuse.wml:18
+#: /home/runa/tor/website/en/faq-abuse.wml:18
 msgid "<a href=\"<page faq-abuse>#WhatAboutSpammers\">What about spammers?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/code/website/en/faq-abuse.wml:19
+#: /home/runa/tor/website/en/faq-abuse.wml:19
 msgid "<a href=\"<page faq-abuse>#HowMuchAbuse\">Does Tor get much abuse?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/code/website/en/faq-abuse.wml:20
+#: /home/runa/tor/website/en/faq-abuse.wml:20
 msgid ""
 "<a href=\"<page faq-abuse>#TypicalAbuses\">So what should I expect if I run "
 "an exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/code/website/en/faq-abuse.wml:21
+#: /home/runa/tor/website/en/faq-abuse.wml:21
 msgid ""
 "<a href=\"<page faq-abuse>#IrcBans\">Tor is banned from the IRC network I "
 "want to use.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/code/website/en/faq-abuse.wml:22
+#: /home/runa/tor/website/en/faq-abuse.wml:22
 msgid ""
 "<a href=\"<page faq-abuse>#SMTPBans\">Your nodes are banned from the mail "
 "server I want to use.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/code/website/en/faq-abuse.wml:23
+#: /home/runa/tor/website/en/faq-abuse.wml:23
 msgid ""
 "<a href=\"<page faq-abuse>#Bans\">I want to ban the Tor network from my "
 "service.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/code/website/en/faq-abuse.wml:24
+#: /home/runa/tor/website/en/faq-abuse.wml:24
 msgid ""
 "<a href=\"<page faq-abuse>#TracingUsers\">I have a compelling reason to "
 "trace a Tor user. Can you help?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/code/website/en/faq-abuse.wml:25
+#: /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/code/website/en/faq-abuse.wml:26
+#: /home/runa/tor/website/en/faq-abuse.wml:26
 msgid ""
 "<a href=\"<page faq-abuse>#LegalQuestions\">I have legal questions about Tor "
 "abuse.</a>"
@@ -101,19 +101,19 @@
 
 #.  END SIDEBAR 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq-abuse.wml:30
+#: /home/runa/tor/website/en/faq-abuse.wml:30
 msgid "<hr /> <a id=\"WhatAboutCriminals\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq-abuse.wml:33
+#: /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/code/website/en/faq-abuse.wml:35
+#: /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> "
@@ -125,14 +125,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:43
+#: /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/code/website/en/faq-abuse.wml:46
+#: /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 "
@@ -145,7 +145,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:56
+#: /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 "
@@ -161,19 +161,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/code/website/en/faq-abuse.wml:68
+#: /home/runa/tor/website/en/faq-abuse.wml:68
 msgid "<a id=\"DDoS\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq-abuse.wml:69
+#: /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/code/website/en/faq-abuse.wml:71
+#: /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. "
@@ -182,7 +182,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:76
+#: /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 "
@@ -195,18 +195,18 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq-abuse.wml:85
+#: /home/runa/tor/website/en/faq-abuse.wml:85
 msgid "<a id=\"WhatAboutSpammers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq-abuse.wml:86
+#: /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/code/website/en/faq-abuse.wml:88
+#: /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 "
@@ -218,7 +218,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:96
+#: /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 "
@@ -228,7 +228,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:104
+#: /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 "
@@ -237,33 +237,33 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq-abuse.wml:110
+#: /home/runa/tor/website/en/faq-abuse.wml:110
 msgid "<a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq-abuse.wml:111
+#: /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/code/website/en/faq-abuse.wml:114
+#: /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/code/website/en/faq-abuse.wml:117
+#: /home/runa/tor/website/en/faq-abuse.wml:117
 msgid "<a id=\"HowMuchAbuse\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq-abuse.wml:118
+#: /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/code/website/en/faq-abuse.wml:120
+#: /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 "
@@ -275,26 +275,26 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:128
+#: /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/code/website/en/faq-abuse.wml:133
+#: /home/runa/tor/website/en/faq-abuse.wml:133
 msgid "<a id=\"TypicalAbuses\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq-abuse.wml:134
+#: /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/code/website/en/faq-abuse.wml:136
+#: /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 "
@@ -302,7 +302,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq-abuse.wml:141
+#: /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 "
@@ -310,7 +310,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq-abuse.wml:145
+#: /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 "
@@ -318,7 +318,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq-abuse.wml:148
+#: /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 "
@@ -326,7 +326,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq-abuse.wml:151
+#: /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 "
@@ -335,7 +335,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:158
+#: /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, "
@@ -345,7 +345,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq-abuse.wml:165
+#: /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 "
@@ -357,7 +357,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/faq-abuse.wml:174
+#: /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 "
@@ -369,19 +369,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq-abuse.wml:185
+#: /home/runa/tor/website/en/faq-abuse.wml:185
 msgid "<a id=\"IrcBans\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq-abuse.wml:186
+#: /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/code/website/en/faq-abuse.wml:188
+#: /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 "
@@ -389,7 +389,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:192
+#: /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 "
@@ -403,7 +403,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:202
+#: /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 "
@@ -417,7 +417,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:212
+#: /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 "
@@ -426,7 +426,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:217
+#: /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 "
@@ -437,7 +437,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:224
+#: /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 "
@@ -449,30 +449,29 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:232
+#: /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="
-"\"https://wiki.torproject.org/wiki/TheOnionRouter/BlockingIrc\">The Tor IRC "
-"block tracker</a> so that others can share.  At least one IRC network "
-"consults that page to unblock exit nodes that have been blocked "
-"inadvertently."
+"\"<wiki>BlockingIrc\">The Tor IRC block tracker</a> so that others can "
+"share.  At least one IRC network consults that page to unblock exit nodes "
+"that have been blocked inadvertently."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq-abuse.wml:239
+#: /home/runa/tor/website/en/faq-abuse.wml:238
 msgid "<a id=\"SMTPBans\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq-abuse.wml:240
+#: /home/runa/tor/website/en/faq-abuse.wml:239
 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/code/website/en/faq-abuse.wml:242
+#: /home/runa/tor/website/en/faq-abuse.wml:241
 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 "
@@ -481,7 +480,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:248
+#: /home/runa/tor/website/en/faq-abuse.wml:247
 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 "
@@ -489,19 +488,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq-abuse.wml:252
+#: /home/runa/tor/website/en/faq-abuse.wml:251
 msgid "<a id=\"Bans\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq-abuse.wml:253
+#: /home/runa/tor/website/en/faq-abuse.wml:252
 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/code/website/en/faq-abuse.wml:255
+#: /home/runa/tor/website/en/faq-abuse.wml:254
 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 "
@@ -510,7 +509,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:260
+#: /home/runa/tor/website/en/faq-abuse.wml:259
 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 "
@@ -522,7 +521,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:269
+#: /home/runa/tor/website/en/faq-abuse.wml:268
 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 "
@@ -533,7 +532,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:277
+#: /home/runa/tor/website/en/faq-abuse.wml:276
 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-"
@@ -548,7 +547,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:290
+#: /home/runa/tor/website/en/faq-abuse.wml:289
 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 "
@@ -556,7 +555,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:294
+#: /home/runa/tor/website/en/faq-abuse.wml:293
 msgid ""
 "Lastly, please remember that Tor relays have <a href=\"<page "
 "faq>#ExitPolicies\">individual exit policies</a>. Many Tor relays do not "
@@ -568,7 +567,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:303
+#: /home/runa/tor/website/en/faq-abuse.wml:302
 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 "
@@ -576,7 +575,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:310
+#: /home/runa/tor/website/en/faq-abuse.wml:309
 msgid ""
 "(Some system administrators block ranges of IP addresses because of official "
 "policy or some abuse pattern, but some have also asked about whitelisting "
@@ -585,19 +584,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq-abuse.wml:316
+#: /home/runa/tor/website/en/faq-abuse.wml:315
 msgid "<a id=\"TracingUsers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq-abuse.wml:317
+#: /home/runa/tor/website/en/faq-abuse.wml:316
 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/code/website/en/faq-abuse.wml:320
+#: /home/runa/tor/website/en/faq-abuse.wml:319
 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 "
@@ -605,7 +604,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:326
+#: /home/runa/tor/website/en/faq-abuse.wml:325
 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, "
@@ -619,7 +618,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:339
+#: /home/runa/tor/website/en/faq-abuse.wml:338
 msgid ""
 "But remember that this doesn't mean that Tor is invulnerable. Traditional "
 "police techniques can still be very effective against Tor, such as "
@@ -628,19 +627,19 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq-abuse.wml:345
+#: /home/runa/tor/website/en/faq-abuse.wml:344
 msgid "<a id=\"RemoveContent\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq-abuse.wml:346
+#: /home/runa/tor/website/en/faq-abuse.wml:345
 msgid ""
 "<a class=\"anchor\" href=\"#RemoveContent\">I want some content removed from "
 "a .onion address.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:347
+#: /home/runa/tor/website/en/faq-abuse.wml:346
 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 "
@@ -654,7 +653,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:356
+#: /home/runa/tor/website/en/faq-abuse.wml:355
 msgid ""
 "But remember that this doesn't mean that hidden services are invulnerable. "
 "Traditional police techniques can still be very effective against them, such "
@@ -663,7 +662,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:361
+#: /home/runa/tor/website/en/faq-abuse.wml:360
 msgid ""
 "If you have a complaint about child pornography, you may wish to report it "
 "to the National Center for Missing and Exploited Children, which serves as a "
@@ -673,26 +672,26 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/faq-abuse.wml:367
+#: /home/runa/tor/website/en/faq-abuse.wml:366
 msgid "<a id=\"LegalQuestions\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/faq-abuse.wml:368
+#: /home/runa/tor/website/en/faq-abuse.wml:367
 msgid ""
 "<a class=\"anchor\" href=\"#LegalQuestions\">I have legal questions about "
 "Tor abuse.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/faq-abuse.wml:370
+#: /home/runa/tor/website/en/faq-abuse.wml:369
 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/code/website/en/faq-abuse.wml:373
+#: /home/runa/tor/website/en/faq-abuse.wml:372
 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/templates/3-low.hidden-services.pot
===================================================================
--- translation/trunk/projects/website/templates/3-low.hidden-services.pot	2010-08-23 19:40:14 UTC (rev 23029)
+++ translation/trunk/projects/website/templates/3-low.hidden-services.pot	2010-08-23 19:47:54 UTC (rev 23030)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-08-23 20:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,17 +17,17 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/hidden-services.wml:9
+#: /home/runa/tor/website/en/hidden-services.wml:9
 msgid "Tor: Hidden Service Protocol"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/hidden-services.wml:10
+#: /home/runa/tor/website/en/hidden-services.wml:10
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/hidden-services.wml:13
+#: /home/runa/tor/website/en/hidden-services.wml:13
 msgid ""
 "Tor makes it possible for users to hide their locations while offering "
 "various kinds of services, such as web publishing or an instant messaging "
@@ -39,7 +39,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/hidden-services.wml:24
+#: /home/runa/tor/website/en/hidden-services.wml:24
 msgid ""
 "A hidden service needs to advertise its existence in the Tor network before "
 "clients will be able to contact it. Therefore, the service randomly picks "
@@ -56,13 +56,13 @@
 #. PO4ASHARPBEGIN maybe add a speech bubble containing "PK" to Bob, because that's whatPO4ASHARPEND
 #. PO4ASHARPBEGIN Bob tells to his introduction pointsPO4ASHARPEND
 #. type: Content of: <div>
-#: /home/runa/code/website/en/hidden-services.wml:36
+#: /home/runa/tor/website/en/hidden-services.wml:36
 msgid ""
 "<img alt=\"Tor hidden service step one\" src=\"$(IMGROOT)/THS-1.png\" />"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/hidden-services.wml:41
+#: /home/runa/tor/website/en/hidden-services.wml:41
 msgid ""
 "Step two: the hidden service assembles a <em>hidden service descriptor</em>, "
 "containing its public key and a summary of each introduction point, and "
@@ -73,7 +73,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/hidden-services.wml:51
+#: /home/runa/tor/website/en/hidden-services.wml:51
 msgid ""
 "Although it might seem impractical to use an automatically-generated service "
 "name, it serves an important goal: Everyone &ndash; including the "
@@ -90,13 +90,13 @@
 #. PO4ASHARPBEGIN is it to *not* add DB to the Tor cloud, now that begin dir cells are inPO4ASHARPEND
 #. PO4ASHARPBEGIN use?PO4ASHARPEND
 #. type: Content of: <div>
-#: /home/runa/code/website/en/hidden-services.wml:62
+#: /home/runa/tor/website/en/hidden-services.wml:62
 msgid ""
 "<img alt=\"Tor hidden service step two\" src=\"$(IMGROOT)/THS-2.png\" />"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/hidden-services.wml:68
+#: /home/runa/tor/website/en/hidden-services.wml:68
 msgid ""
 "Step three: A client that wants to contact a hidden service needs to learn "
 "about its onion address first. After that, the client can initiate "
@@ -112,13 +112,13 @@
 #. PO4ASHARPBEGIN maybe add "cookie" to speech bubble, separated from the surroundedPO4ASHARPEND
 #. PO4ASHARPBEGIN "IP1-3" and "PK"PO4ASHARPEND
 #. type: Content of: <div>
-#: /home/runa/code/website/en/hidden-services.wml:81
+#: /home/runa/tor/website/en/hidden-services.wml:81
 msgid ""
 "<img alt=\"Tor hidden service step three\" src=\"$(IMGROOT)/THS-3.png\" />"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/hidden-services.wml:86
+#: /home/runa/tor/website/en/hidden-services.wml:86
 msgid ""
 "Step four: When the descriptor is present and the rendezvous point is ready, "
 "the client assembles an <em>introduce</em> message (encrypted to the hidden "
@@ -131,13 +131,13 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/hidden-services.wml:96
+#: /home/runa/tor/website/en/hidden-services.wml:96
 msgid ""
 "<img alt=\"Tor hidden service step four\" src=\"$(IMGROOT)/THS-4.png\" />"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/hidden-services.wml:99
+#: /home/runa/tor/website/en/hidden-services.wml:99
 msgid ""
 "Step five: The hidden service decrypts the client's introduce message and "
 "finds the address of the rendezvous point and the one-time secret in it. The "
@@ -146,28 +146,28 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/hidden-services.wml:107
+#: /home/runa/tor/website/en/hidden-services.wml:107
 msgid ""
 "At this point it is of special importance that the hidden service sticks to "
-"the same set of <a href=\"https://trac.torproject.org/projects/tor/wiki/"
-"TheOnionRouter/TorFAQ#Whatsthisaboutentryguardformerlyknownashelpernodes"
-"\">entry guards</a> when creating new circuits. Otherwise an attacker could "
-"run his own relay and force a hidden service to create an arbitrary number "
-"of circuits in the hope that the corrupt relay is picked as entry node and "
-"he learns the hidden server's IP address via timing analysis. This attack "
-"was described by &Oslash;verlier and Syverson in their paper titled <a href="
+"the same set of <a href="
+"\"<wiki>TorFAQ#Whatsthisaboutentryguardformerlyknownashelpernodes\">entry "
+"guards</a> when creating new circuits. Otherwise an attacker could run his "
+"own relay and force a hidden service to create an arbitrary number of "
+"circuits in the hope that the corrupt relay is picked as entry node and he "
+"learns the hidden server's IP address via timing analysis. This attack was "
+"described by &Oslash;verlier and Syverson in their paper titled <a href="
 "\"http://freehaven.net/anonbib/#hs-attack06\">Locating Hidden Servers</a>."
 msgstr ""
 
 #. PO4ASHARPBEGIN it should say "Bob connects to Alice's ..."PO4ASHARPEND
 #. type: Content of: <div>
-#: /home/runa/code/website/en/hidden-services.wml:119
+#: /home/runa/tor/website/en/hidden-services.wml:119
 msgid ""
 "<img alt=\"Tor hidden service step five\" src=\"$(IMGROOT)/THS-5.png\" />"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/hidden-services.wml:123
+#: /home/runa/tor/website/en/hidden-services.wml:123
 msgid ""
 "In the last step, the rendezvous point notifies the client about successful "
 "connection establishment. After that, both client and hidden service can use "
@@ -177,7 +177,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/hidden-services.wml:131
+#: /home/runa/tor/website/en/hidden-services.wml:131
 msgid ""
 "One of the reasons for not using the introduction circuit for actual "
 "communication is that no single relay should appear to be responsible for a "
@@ -186,7 +186,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/hidden-services.wml:138
+#: /home/runa/tor/website/en/hidden-services.wml:138
 msgid ""
 "In general, the complete connection between client and hidden service "
 "consists of 6 relays: 3 of them were picked by the client with the third "
@@ -194,13 +194,13 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/hidden-services.wml:144
+#: /home/runa/tor/website/en/hidden-services.wml:144
 msgid ""
 "<img alt=\"Tor hidden service step six\" src=\"$(IMGROOT)/THS-6.png\" />"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/hidden-services.wml:147
+#: /home/runa/tor/website/en/hidden-services.wml:147
 msgid ""
 "There are more detailed descriptions about the hidden service protocol than "
 "this one. See the <a href=\"<svnprojects>design-paper/tor-design.pdf\">Tor "

Modified: translation/trunk/projects/website/templates/3-low.news.pot
===================================================================
--- translation/trunk/projects/website/templates/3-low.news.pot	2010-08-23 19:40:14 UTC (rev 23029)
+++ translation/trunk/projects/website/templates/3-low.news.pot	2010-08-23 19:47:54 UTC (rev 23030)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-08-23 20:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,26 +18,26 @@
 
 #.  PUT CONTENT AFTER THIS TAG 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/news.wml:11
+#: /home/runa/tor/website/en/news.wml:11
 msgid "<a id=\"News\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/news.wml:12
+#: /home/runa/tor/website/en/news.wml:12
 msgid "<a class=\"anchor\" href=\"#News\">Tor: News</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:16
+#: /home/runa/tor/website/en/news.wml:16
 msgid ""
 "02 May 2010: Tor 0.2.1.26 released as stable.  Fixes yet more OpenSSL "
 "compatibility issues and lets relays defend themselves from connection "
-"floods.  Read the <a href=\"https://blog.torproject.org/blog/tor-02126-"
-"stable-released\">full announcement</a> for the list of changes."
+"floods.  Read the <a href=\"<blog>tor-02126-stable-released\">full "
+"announcement</a> for the list of changes."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:21
+#: /home/runa/tor/website/en/news.wml:21
 msgid ""
 "29 March 2010: Tor and Printfection announce The Tor Store.  More details "
 "are available in the <a href=\"<page press/2010-03-25-tor-store-press-"
@@ -45,7 +45,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:24
+#: /home/runa/tor/website/en/news.wml:24
 msgid ""
 "16 March 2010: Tor 0.2.1.25 released as stable.  Fixes a regression "
 "introduced in 0.2.1.23 that could prevent relays from guessing their IP "
@@ -55,7 +55,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:30
+#: /home/runa/tor/website/en/news.wml:30
 msgid ""
 "21 February 2010: Tor 0.2.1.24 released as stable.  Fixes compatibility with "
 "recent Apple OSX openssl changes and adds some performance enhancements.  "
@@ -64,7 +64,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:35
+#: /home/runa/tor/website/en/news.wml:35
 msgid ""
 "19 January 2010: Tor 0.2.1.22 released as stable.  Fixes a critical privacy "
 "problem in bridge directory authorities.  This stable update also rotates "
@@ -74,7 +74,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:41
+#: /home/runa/tor/website/en/news.wml:41
 msgid ""
 "21 December 2009: Tor 0.2.1.21 released as stable.  Fixes issues with "
 "OpenSSL and helps exit relays.  Read the <a href=\"http://archives.seul.org/"
@@ -83,15 +83,14 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:42
+#: /home/runa/tor/website/en/news.wml:42
 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."
+"\"<blog>tor-02120-released\">announcement</a> for the updates and changes."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:43
+#: /home/runa/tor/website/en/news.wml:43
 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 "
@@ -99,7 +98,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:46
+#: /home/runa/tor/website/en/news.wml:46
 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 "
@@ -107,7 +106,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:48
+#: /home/runa/tor/website/en/news.wml:48
 msgid ""
 "12 March 2009: Tor launches performance roadmap and campaign.  Read the <a "
 "href=\"<page press/2009-03-12-performance-roadmap-press-release>\">Press "
@@ -115,7 +114,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:49
+#: /home/runa/tor/website/en/news.wml:49
 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"
@@ -124,7 +123,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:52
+#: /home/runa/tor/website/en/news.wml:52
 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 "
@@ -132,7 +131,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:55
+#: /home/runa/tor/website/en/news.wml:55
 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 "
@@ -140,7 +139,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:58
+#: /home/runa/tor/website/en/news.wml:58
 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"
@@ -148,7 +147,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:61
+#: /home/runa/tor/website/en/news.wml:61
 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"
@@ -156,16 +155,16 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:64
+#: /home/runa/tor/website/en/news.wml:64
 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 "
-"<a href=\"https://blog.torproject.org/blog/tor-0.2.0.30-released-stable"
-"\">blog post</a> for the numerous updates and changes."
+"<a href=\"<blog>tor-02030-released-stable\">blog post</a> for the numerous "
+"updates and changes."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:69
+#: /home/runa/tor/website/en/news.wml:69
 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 "
@@ -175,7 +174,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:76
+#: /home/runa/tor/website/en/news.wml:76
 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 "
@@ -186,38 +185,37 @@
 "Also, all servers running any version of Tor whose keys were generated by "
 "Debian, Ubuntu, or any derived distribution may have to replace their "
 "identity keys.  See our <a href=\"http://archives.seul.org/or/announce/"
-"May-2008/msg00000.html\">security advisory</a> or the <a href=\"https://blog."
-"torproject.org/blog/debian-openssl-flaw%3A-what-does-it-mean-tor-clients%3F"
-"\">blog follow-up</a> for full details.  As always, you can find Tor "
-"0.2.0.26-rc on the <a href=\"https://www.torproject.org/download#Dev"
-"\">downloads page</a>."
+"May-2008/msg00000.html\">security advisory</a> or the <a href=\"<blog>debian-"
+"openssl-flaw%3A-what-does-it-mean-tor-clients%3F\">blog follow-up</a> for "
+"full details.  As always, you can find Tor 0.2.0.26-rc on the <a href="
+"\"<page download>#Dev\">downloads page</a>."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:89
+#: /home/runa/tor/website/en/news.wml:89
 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>"
+"Mar 2008: <a href=\"<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/code/website/en/news.wml:93
+#: /home/runa/tor/website/en/news.wml:93
 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-"
-"elected-one-our-new-directors\">Isaac Mao</a> to the board.  We thank "
-"Rebecca McKinnon for her support and contributions to the project."
+"Feb 2008: The <a href=\"<page people>#Board\">Board of Directors</a> "
+"welcomes <a href=\"<blog>isaac-mao-elected-one-our-new-directors\">Isaac "
+"Mao</a> to the board.  We thank Rebecca McKinnon for her support and "
+"contributions to the project."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:99
+#: /home/runa/tor/website/en/news.wml:99
 msgid ""
-"Feb 2008: Tor is happy to announce the <a href=\"https://blog.torproject.org"
-"\">official Tor blog</a>."
+"Feb 2008: Tor is happy to announce the <a href=\"<blog>\">official Tor blog</"
+"a>."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:102
+#: /home/runa/tor/website/en/news.wml:102
 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 "
@@ -228,7 +226,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:110
+#: /home/runa/tor/website/en/news.wml:110
 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 "
@@ -242,7 +240,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:120
+#: /home/runa/tor/website/en/news.wml:120
 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 "
@@ -256,7 +254,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:132
+#: /home/runa/tor/website/en/news.wml:132
 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="
@@ -264,7 +262,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:136
+#: /home/runa/tor/website/en/news.wml:136
 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 "
@@ -274,7 +272,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:142
+#: /home/runa/tor/website/en/news.wml:142
 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 "
@@ -283,7 +281,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:147
+#: /home/runa/tor/website/en/news.wml:147
 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 "
@@ -291,7 +289,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/news.wml:151
+#: /home/runa/tor/website/en/news.wml:151
 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/templates/3-low.people.pot
===================================================================
--- translation/trunk/projects/website/templates/3-low.people.pot	2010-08-23 19:40:14 UTC (rev 23029)
+++ translation/trunk/projects/website/templates/3-low.people.pot	2010-08-23 19:47:54 UTC (rev 23030)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-08-23 20:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,61 +17,61 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/people.wml:9
+#: /home/runa/tor/website/en/people.wml:9
 msgid "Tor: People"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/code/website/en/people.wml:14
+#: /home/runa/tor/website/en/people.wml:14
 msgid "Sections"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/code/website/en/people.wml:16
+#: /home/runa/tor/website/en/people.wml:16
 msgid "<a href=\"<page people>#Core\">Core Tor People</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/code/website/en/people.wml:17
+#: /home/runa/tor/website/en/people.wml:17
 msgid "<a href=\"<page people>#Board\">Board of Directors</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/code/website/en/people.wml:18
+#: /home/runa/tor/website/en/people.wml:18
 msgid "<a href=\"<page people>#GSoC\">Summer Students</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/code/website/en/people.wml:19
+#: /home/runa/tor/website/en/people.wml:19
 msgid "<a href=\"<page people>#Translators\">Translators</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/code/website/en/people.wml:20
+#: /home/runa/tor/website/en/people.wml:20
 msgid "<a href=\"<page people>#Volunteers\">Volunteers</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/code/website/en/people.wml:21
+#: /home/runa/tor/website/en/people.wml:21
 msgid "<a href=\"<page people>#Past\">Past Contributors</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/people.wml:26
+#: /home/runa/tor/website/en/people.wml:26
 msgid ""
 "The Tor Project is a 501(c)(3) non-profit based in the United States. The "
 "official address of the organization is:"
 msgstr ""
 
 #. type: Content of: <div><address>
-#: /home/runa/code/website/en/people.wml:31
+#: /home/runa/tor/website/en/people.wml:31
 msgid ""
 "The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 "
 "USA<br /><br />"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/people.wml:36
+#: /home/runa/tor/website/en/people.wml:36
 msgid ""
 "The organization consists of many volunteers and a few employees.  Please "
 "don't contact us individually about Tor topics &mdash; if you have a problem "
@@ -80,32 +80,32 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/people.wml:42
+#: /home/runa/tor/website/en/people.wml:42
 msgid "<a id=\"Core\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/people.wml:43
+#: /home/runa/tor/website/en/people.wml:43
 msgid "<a class=\"anchor\" href=\"#Core\">Core Tor people:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:46
+#: /home/runa/tor/website/en/people.wml:46
 msgid "Carolyn Anhalt (Community and Translation Coordinator)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:47
+#: /home/runa/tor/website/en/people.wml:47
 msgid "Responsible for growing Tor's community moderators and translators."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:50
+#: /home/runa/tor/website/en/people.wml:50
 msgid "Jacob Appelbaum (Developer and Advocate)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:50
+#: /home/runa/tor/website/en/people.wml:50
 msgid ""
 "Runs the <a href=\"https://check.torproject.org/\">Tor DNSEL</a> <a href="
 "\"http://exitlist.torproject.org/\">site</a>, and also the in-progress Tor "
@@ -113,12 +113,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:55
+#: /home/runa/tor/website/en/people.wml:55
 msgid "Erinn Clark (Packaging and Build Automation)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:55
+#: /home/runa/tor/website/en/people.wml:55
 msgid ""
 "Erinn is tackling the growing needs for easy to install and configure "
 "packages on a variety of operating systems.  Also working on automating the "
@@ -127,60 +127,60 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:60
+#: /home/runa/tor/website/en/people.wml:60
 msgid "Christopher Davis"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:60
+#: /home/runa/tor/website/en/people.wml:60
 msgid ""
 "Worked during Google Summer of Code 2009 on porting Polipo to Windows and on "
 "helping with the libevent bufferevent code. Now he's the Polipo maintainer."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:64
+#: /home/runa/tor/website/en/people.wml:64
 msgid "Roger Dingledine (Project Leader; Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:64
+#: /home/runa/tor/website/en/people.wml:64
 msgid ""
 "Original developer of Tor; now plays pretty much all the roles to keep "
 "everything on track."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:68
+#: /home/runa/tor/website/en/people.wml:68
 msgid "Matt Edman (Developer)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:68
+#: /home/runa/tor/website/en/people.wml:68
 msgid ""
 "Lead developer for <a href=\"<page vidalia/index>\">Vidalia</a>, a cross-"
 "platform Tor GUI included in the Windows and OS X bundles."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:72
+#: /home/runa/tor/website/en/people.wml:72
 msgid "Nathan Freitas"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:72
+#: /home/runa/tor/website/en/people.wml:72
 msgid ""
 "The driving force behind Tor on the Android platform in the form of <a href="
 "\"<page docs/android>\">Orbot</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:75
+#: /home/runa/tor/website/en/people.wml:75
 msgid "Christian Fromme (Developer)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:75
+#: /home/runa/tor/website/en/people.wml:75
 msgid ""
 "Christian works on all things python for Tor.  He enhanced and maintains a "
 "slew of codebases for us, such as the get-tor email auto-responder, check."
@@ -188,12 +188,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:80
+#: /home/runa/tor/website/en/people.wml:80
 msgid "Melissa Gilroy (CFO and Internal Audit)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:80
+#: /home/runa/tor/website/en/people.wml:80
 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 "
@@ -201,12 +201,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:85
+#: /home/runa/tor/website/en/people.wml:85
 msgid "Sebastian Hahn"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:85
+#: /home/runa/tor/website/en/people.wml:85
 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 "
@@ -215,12 +215,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:90
+#: /home/runa/tor/website/en/people.wml:90
 msgid "Damian Johnson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:90
+#: /home/runa/tor/website/en/people.wml:90
 msgid ""
 "Builds a command-line application for monitoring Tor relays, providing real-"
 "time status information such as the current configuration, bandwidth usage, "
@@ -229,14 +229,14 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:95
+#: /home/runa/tor/website/en/people.wml:95
 msgid ""
 "Andrew Lewman (Executive Director; Director; <a href=\"<page press/index>"
 "\">press contact</a>)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:96
+#: /home/runa/tor/website/en/people.wml:96
 msgid ""
 "Manages the business operations of The Tor Project, Inc.  Plays roles of "
 "finance, advocacy, project management, and general support.  General package "
@@ -244,12 +244,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:101
+#: /home/runa/tor/website/en/people.wml:101
 msgid "Karsten Loesing (Developer)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:102
+#: /home/runa/tor/website/en/people.wml:102
 msgid ""
 "Worked during the 2007 Google Summer of Code on <a href=\"<gitblob>doc/spec/"
 "proposals/114-distributed-storage.txt\">distributing and securing the "
@@ -260,24 +260,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:109
+#: /home/runa/tor/website/en/people.wml:109
 msgid "Nick Mathewson (Chief architect; Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:109
+#: /home/runa/tor/website/en/people.wml:109
 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/code/website/en/people.wml:113
+#: /home/runa/tor/website/en/people.wml:113
 msgid "Steven Murdoch (Researcher and Developer)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:113
+#: /home/runa/tor/website/en/people.wml:113
 msgid ""
 "Researcher at the University of Cambridge, currently funded by The Tor "
 "Project to improve the security, performance, and usability of Tor. Creator "
@@ -285,24 +285,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:118
+#: /home/runa/tor/website/en/people.wml:118
 msgid "Peter Palfrader"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:118
+#: /home/runa/tor/website/en/people.wml:118
 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/code/website/en/people.wml:122
+#: /home/runa/tor/website/en/people.wml:122
 msgid "Mike Perry (Developer)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:122
+#: /home/runa/tor/website/en/people.wml:122
 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 "
@@ -311,24 +311,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:128
+#: /home/runa/tor/website/en/people.wml:128
 msgid "Karen Reilly (Development Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:128
+#: /home/runa/tor/website/en/people.wml:128
 msgid ""
 "Responsible for fundraising, advocacy, and general marketing and outreach "
 "programs for Tor."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:132
+#: /home/runa/tor/website/en/people.wml:132
 msgid "Runa A. Sandvik"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:132
+#: /home/runa/tor/website/en/people.wml:132
 msgid ""
 "Maintains the <a href=\"https://translation.torproject.org/\">Tor "
 "Translation Portal</a>, and works on automatically converting our website "
@@ -337,12 +337,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:138
+#: /home/runa/tor/website/en/people.wml:138
 msgid "Paul Syverson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:138
+#: /home/runa/tor/website/en/people.wml:138
 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 "
@@ -351,23 +351,23 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/people.wml:146
+#: /home/runa/tor/website/en/people.wml:146
 msgid "<a id=\"Board\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/people.wml:147
+#: /home/runa/tor/website/en/people.wml:147
 msgid ""
 "<a class=\"anchor\" href=\"#Board\">The Tor Project Board of Directors:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:151
+#: /home/runa/tor/website/en/people.wml:151
 msgid "Meredith Hoban Dunn (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:151
+#: /home/runa/tor/website/en/people.wml:151
 msgid ""
 "Our audit committee chair. Her role is to help us make sure we're able to "
 "pass our upcoming corporate audits correctly, watch for internal fraud, tell "
@@ -375,86 +375,86 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:156
+#: /home/runa/tor/website/en/people.wml:156
 msgid "Ian Goldberg (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:156
+#: /home/runa/tor/website/en/people.wml:156
 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/code/website/en/people.wml:160
+#: /home/runa/tor/website/en/people.wml:160
 msgid "Xianghui (Isaac) Mao (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:160
+#: /home/runa/tor/website/en/people.wml:160
 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/code/website/en/people.wml:164
+#: /home/runa/tor/website/en/people.wml:164
 msgid "Frank Rieger (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:164
+#: /home/runa/tor/website/en/people.wml:164
 msgid "CTO of <a href=\"http://www.gsmk.de/\">GSMK Cryptophone</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:167
+#: /home/runa/tor/website/en/people.wml:167
 msgid "Wendy Seltzer (Director)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:167
+#: /home/runa/tor/website/en/people.wml:167
 msgid ""
 "Lawyer, cyberlaw professor, and founder of <a href=\"http://chillingeffects."
 "org/\">ChillingEffects.org</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:171
+#: /home/runa/tor/website/en/people.wml:171
 msgid "Along with Roger, Nick, and Andrew listed above as Directors."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/people.wml:175
+#: /home/runa/tor/website/en/people.wml:175
 msgid "<a id=\"GSoC\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/people.wml:176
+#: /home/runa/tor/website/en/people.wml:176
 msgid ""
 "<a class=\"anchor\" href=\"#GSoC\">Google Summer of Code 2010 students:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:179
+#: /home/runa/tor/website/en/people.wml:179
 msgid "Kevin Berry"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:179
+#: /home/runa/tor/website/en/people.wml:179
 msgid ""
 "Working on a database schema to support better node churn metrics and on a "
 "more dynamic metrics website. Mentored by Karsten Loesing."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:182
+#: /home/runa/tor/website/en/people.wml:182
 msgid "Harry Bock"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:182
+#: /home/runa/tor/website/en/people.wml:182
 msgid ""
 "Working on TorBEL, a Tor bulk exit list tracker and service designed to "
 "replace TorDNSEL. TorBEL is written in Python using the torflow API. "
@@ -462,12 +462,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:185
+#: /home/runa/tor/website/en/people.wml:185
 msgid "Kory Kirk"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:185
+#: /home/runa/tor/website/en/people.wml:185
 msgid ""
 "Worked during Google Summer of Code 2009 on extending Torbutton. Now he's "
 "working on implementing hidden services for our java Tor client. Mentored by "
@@ -475,158 +475,158 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:188
+#: /home/runa/tor/website/en/people.wml:188
 msgid "John Schanck"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:188
+#: /home/runa/tor/website/en/people.wml:188
 msgid ""
 "Works on improving the automated detection of misconfigured or malicious "
 "exit nodes. Mentored by Mike Perry."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/people.wml:193
+#: /home/runa/tor/website/en/people.wml:193
 msgid "<a id=\"Translators\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/people.wml:194
+#: /home/runa/tor/website/en/people.wml:194
 msgid "<a class=\"anchor\" href=\"#Translators\">Core translators:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:197
+#: /home/runa/tor/website/en/people.wml:197
 msgid "Bogdan Drozdowski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:197
+#: /home/runa/tor/website/en/people.wml:197
 msgid "<a href=\"https://www.torproject.org/index.html.pl\">Polish</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:199
+#: /home/runa/tor/website/en/people.wml:199
 msgid "Tiago Faria"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:199
+#: /home/runa/tor/website/en/people.wml:199
 msgid "Portuguese."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:200
+#: /home/runa/tor/website/en/people.wml:200
 msgid "fredzupy"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:200
+#: /home/runa/tor/website/en/people.wml:200
 msgid "<a href=\"https://www.torproject.org/index.html.fr\">French</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:202
+#: /home/runa/tor/website/en/people.wml:202
 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/code/website/en/people.wml:203
+#: /home/runa/tor/website/en/people.wml:203
 msgid "<a href=\"https://www.torproject.org/index.html.es\">Spanish</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:205
+#: /home/runa/tor/website/en/people.wml:205
 msgid "Jens Kubieziel and Oliver Knapp"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:205
+#: /home/runa/tor/website/en/people.wml:205
 msgid "<a href=\"https://www.torproject.org/index.html.de\">German</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:207
+#: /home/runa/tor/website/en/people.wml:207
 msgid "Pei Hanru and bridgefish"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:207
+#: /home/runa/tor/website/en/people.wml:207
 msgid ""
 "<a href=\"https://www.torproject.org/index.html.zh-cn\">Simplified Chinese</"
 "a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:209
+#: /home/runa/tor/website/en/people.wml:209
 msgid "Jan Reister"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:209
+#: /home/runa/tor/website/en/people.wml:209
 msgid "<a href=\"https://www.torproject.org/index.html.it\">Italian</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:211
+#: /home/runa/tor/website/en/people.wml:211
 msgid "Masaki Taniguchi"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:211
+#: /home/runa/tor/website/en/people.wml:211
 msgid "<a href=\"https://www.torproject.org/index.html.ja\">Japanese</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:213
+#: /home/runa/tor/website/en/people.wml:213
 msgid "Jan Woning"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:213
+#: /home/runa/tor/website/en/people.wml:213
 msgid "<a href=\"https://www.torproject.org/index.html.nl\">Dutch</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:215
 msgid "ygrek"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:215
 msgid "<a href=\"https://www.torproject.org/index.html.ru\">Russian</a>."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/people.wml:220
+#: /home/runa/tor/website/en/people.wml:220
 msgid "<a id=\"Volunteers\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:221
 msgid "<a class=\"anchor\" href=\"#Volunteers\">More volunteers:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:224
+#: /home/runa/tor/website/en/people.wml:224
 msgid "Anonym"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:224
+#: /home/runa/tor/website/en/people.wml:224
 msgid "Maintainer of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:225
+#: /home/runa/tor/website/en/people.wml:225
 msgid "Kevin Bankston"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:225
+#: /home/runa/tor/website/en/people.wml:225
 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 "
@@ -634,165 +634,164 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:229
+#: /home/runa/tor/website/en/people.wml:229
 msgid "Marco Bonetti"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:229
+#: /home/runa/tor/website/en/people.wml:229
 msgid "Focusing on MobileTor for the iPhone."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:230
+#: /home/runa/tor/website/en/people.wml:230
 msgid "Kasimir Gabert"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:230
+#: /home/runa/tor/website/en/people.wml:230
 msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\">TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:232
+#: /home/runa/tor/website/en/people.wml:232
 msgid "Robert Hogan"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:232
+#: /home/runa/tor/website/en/people.wml:232
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\">TorK</a> Tor controller."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:234
+#: /home/runa/tor/website/en/people.wml:234
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:234
+#: /home/runa/tor/website/en/people.wml:234
 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/code/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:236
 msgid "Bruce Leidl"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:236
 msgid "Working on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:237
+#: /home/runa/tor/website/en/people.wml:237
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:237
+#: /home/runa/tor/website/en/people.wml:237
 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/code/website/en/people.wml:240
+#: /home/runa/tor/website/en/people.wml:240
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:240
+#: /home/runa/tor/website/en/people.wml:240
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:242
+#: /home/runa/tor/website/en/people.wml:242
 msgid "Linus Nordberg"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:242
+#: /home/runa/tor/website/en/people.wml:242
 msgid ""
 "Enjoys measuring the Tor network and helps with outreach in the Nordic "
 "countries."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:244
+#: /home/runa/tor/website/en/people.wml:244
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:244
+#: /home/runa/tor/website/en/people.wml:244
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:246
+#: /home/runa/tor/website/en/people.wml:246
 msgid "Martin Peck"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:246
+#: /home/runa/tor/website/en/people.wml:246
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:248
+#: /home/runa/tor/website/en/people.wml:248
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:249
+#: /home/runa/tor/website/en/people.wml:249
 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/code/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:251
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:251
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a href="
-"\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/"
-"TransparentProxy\">transparent proxy</a>. Also maintains the <a href="
+"\"<wiki>TransparentProxy\">transparent proxy</a>. Also maintains the <a href="
 "\"http://p56soo2ibjkx23xo.onion/\">TorDNSEL code</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:256
+#: /home/runa/tor/website/en/people.wml:256
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:256
+#: /home/runa/tor/website/en/people.wml:256
 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/code/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:259
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:259
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?"
 "p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/"
@@ -801,7 +800,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:264
+#: /home/runa/tor/website/en/people.wml:264
 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, "
@@ -809,32 +808,32 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/people.wml:270
+#: /home/runa/tor/website/en/people.wml:270
 msgid "<a id=\"Past\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/people.wml:271
+#: /home/runa/tor/website/en/people.wml:271
 msgid "<a class=\"anchor\" href=\"#Past\">Past thanks to:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:274
+#: /home/runa/tor/website/en/people.wml:274
 msgid "John Bashinski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:274
+#: /home/runa/tor/website/en/people.wml:274
 msgid "Contributed the initial rpm spec file."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:275
 msgid "Domenik Bork"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:275
 msgid ""
 "Worked on Configuration of Hidden Services with User Authorization in "
 "Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches/"
@@ -842,12 +841,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:278
 msgid "Benedikt Boss"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:278
 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 "
@@ -855,56 +854,56 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:281
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Ren Bucholz"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:281
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Our fine logo and images."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:282
+#: /home/runa/tor/website/en/people.wml:282
 msgid "Fallon Chen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:282
+#: /home/runa/tor/website/en/people.wml:282
 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="
+"cgi-bin/viewvc.cgi/torflow/branches/gsoc2008/\">svn</a>)  and <a href="
 "\"<gitblob>doc/spec/proposals/151-path-selection-improvements.txt\">proposal "
 "151</a> as part of Google Summer of Code 2008."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:288
 msgid "Bram Cohen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:288
 msgid "Helped design our congestion control mechanisms, in Tor's early days."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:290
 msgid "Pat Double"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:290
 msgid "Creator of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:291
+#: /home/runa/tor/website/en/people.wml:291
 msgid "Geoff Goodell"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:291
+#: /home/runa/tor/website/en/people.wml:291
 msgid ""
 "Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/"
 "\">Blossom project</a> which uses Tor as its overlay network; also helped "
@@ -912,65 +911,65 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:295
+#: /home/runa/tor/website/en/people.wml:295
 msgid "Aleksei Gorny"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:295
+#: /home/runa/tor/website/en/people.wml:295
 msgid ""
 "Working on Tor exit scanner improvements (<a href=\"https://svn.torproject."
-"org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
+"org/cgi-bin/viewvc.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
 "started as part of Google Summer of Code 2008."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:298
+#: /home/runa/tor/website/en/people.wml:298
 msgid "Christian Grothoff"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:298
+#: /home/runa/tor/website/en/people.wml:298
 msgid "Contributed better daemonizing behavior."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:299
 msgid "Steven Hazel"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:299
 msgid "Made 'make install' do the right thing."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:300
+#: /home/runa/tor/website/en/people.wml:300
 msgid "Justin Hipple"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:300
+#: /home/runa/tor/website/en/people.wml:300
 msgid "The other developer for Vidalia."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:301
 msgid "Jason Holt"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:301
 msgid "Contributed patches to the instructions and the man page."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:303
 msgid "Christian King"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:303
 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-"
@@ -978,70 +977,70 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:308
+#: /home/runa/tor/website/en/people.wml:308
 msgid "Joe Kowalski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:308
+#: /home/runa/tor/website/en/people.wml:308
 msgid ""
 "Original author and provider of the torstatus script formerly run on "
 "nighteffect."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:310
 msgid "Adam Langley"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:310
 msgid "Our fine eventdns code."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:311
+#: /home/runa/tor/website/en/people.wml:311
 msgid "Rebecca MacKinnon"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:311
+#: /home/runa/tor/website/en/people.wml:311
 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/code/website/en/people.wml:313
+#: /home/runa/tor/website/en/people.wml:313
 msgid "Chris Palmer"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:313
+#: /home/runa/tor/website/en/people.wml:313
 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/code/website/en/people.wml:315
+#: /home/runa/tor/website/en/people.wml:315
 msgid "Matej Pfajfar"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:315
+#: /home/runa/tor/website/en/people.wml:315
 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/code/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:317
 msgid "Johannes Renner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:317
 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 "
@@ -1049,33 +1048,33 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:322
+#: /home/runa/tor/website/en/people.wml:322
 msgid "Scott Squires"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:322
+#: /home/runa/tor/website/en/people.wml:322
 msgid ""
 "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:324
+#: /home/runa/tor/website/en/people.wml:324
 msgid "Aaron Turner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:324
+#: /home/runa/tor/website/en/people.wml:324
 msgid "Contributed the first version of the tor.sh initscripts shell script."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:326
+#: /home/runa/tor/website/en/people.wml:326
 msgid "Stephen Tyree"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:326
+#: /home/runa/tor/website/en/people.wml:326
 msgid ""
 "Worked during Google Summer of Code 2009 to develop a plugin API for <a href="
 "\"<page vidalia/index>\">Vidalia</a> and create a plugin to allow HerdictWeb "
@@ -1084,12 +1083,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:330
+#: /home/runa/tor/website/en/people.wml:330
 msgid "Camilo Viecco"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:330
+#: /home/runa/tor/website/en/people.wml:330
 msgid ""
 "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac."
 "vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
@@ -1097,12 +1096,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:333
+#: /home/runa/tor/website/en/people.wml:333
 msgid "Fred von Lohmann"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:333
+#: /home/runa/tor/website/en/people.wml:333
 msgid ""
 "Fred served on our Board of Directors from 2006 through 2009.  His complete "
 "bio can be found at the <a href=\"http://www.eff.org/about/staff/?"
@@ -1110,25 +1109,25 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:337
+#: /home/runa/tor/website/en/people.wml:337
 msgid "Christian Wilms"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:337
+#: /home/runa/tor/website/en/people.wml:337
 msgid ""
 "Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
-"\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/"
+"\"https://svn.torproject.org/cgi-bin/viewvs.cgi/tor/branches/hidserv-perf/"
 "\">svn</a>) as part of Google Summer of Code 2008."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/code/website/en/people.wml:340
+#: /home/runa/tor/website/en/people.wml:340
 msgid "Jillian C. York"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/code/website/en/people.wml:340
+#: /home/runa/tor/website/en/people.wml:340
 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/templates/3-low.tshirt.pot
===================================================================
--- translation/trunk/projects/website/templates/3-low.tshirt.pot	2010-08-23 19:40:14 UTC (rev 23029)
+++ translation/trunk/projects/website/templates/3-low.tshirt.pot	2010-08-23 19:47:54 UTC (rev 23030)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-08-23 20:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,31 +17,31 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/tshirt.wml:9
+#: /home/runa/tor/website/en/tshirt.wml:9
 msgid "Tor: T-shirt for Contributing"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/tshirt.wml:10
+#: /home/runa/tor/website/en/tshirt.wml:10
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/tshirt.wml:12
+#: /home/runa/tor/website/en/tshirt.wml:12
 msgid ""
 "You can get one of these fine Tor T-shirts for contributing to the Tor "
 "project. There are three primary ways of contributing:"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/tshirt.wml:16
+#: /home/runa/tor/website/en/tshirt.wml:16
 msgid ""
 "A large enough ($65+) <a href=\"<page donate>\">donation</a> to the Tor "
 "Project."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/tshirt.wml:18
+#: /home/runa/tor/website/en/tshirt.wml:18
 msgid ""
 "Operate a fast <a href=\"<page docs/tor-doc-relay>\">Tor relay</a> that's "
 "been running for the past two months: you are eligible if you allow exits to "
@@ -50,18 +50,18 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/tshirt.wml:22
+#: /home/runa/tor/website/en/tshirt.wml:22
 msgid ""
 "Help out in <a href=\"<page volunteer>\">other ways</a>. <a href=\"<page "
 "translation>\">Maintain a translation for the website</a>. Write a good <a "
-"href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/"
-"SupportPrograms\">support program and get a lot of people to use it</a>. Do "
-"research on Tor and anonymity, solve some of <a href=\"https://bugs."
-"torproject.org/\">our bugs</a>, or establish yourself as a Tor advocate."
+"href=\"<wiki>SupportPrograms\">support program and get a lot of people to "
+"use it</a>. Do research on Tor and anonymity, solve some of <a href="
+"\"https://bugs.torproject.org/\">our bugs</a>, or establish yourself as a "
+"Tor advocate."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/tshirt.wml:32
+#: /home/runa/tor/website/en/tshirt.wml:32
 msgid ""
 "If you qualify, send mail to donations at torproject dot org with a brief "
 "explanation. Be sure to specify a color preference, a size (S/M/L/XL/XXL), a "
@@ -69,16 +69,15 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/tshirt.wml:39
+#: /home/runa/tor/website/en/tshirt.wml:39
 msgid ""
 "You can choose between the traditional black and our conversation-starting "
-"bright green. You can also see the shirts <a href=\"https://trac.torproject."
-"org/projects/tor/wiki/TheOnionRouter/TorShirt\">in action</a> &mdash; add "
-"your own photos there too."
+"bright green. You can also see the shirts <a href=\"<wiki>TorShirt\">in "
+"action</a> &mdash; add your own photos there too."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/code/website/en/tshirt.wml:46
+#: /home/runa/tor/website/en/tshirt.wml:46
 msgid ""
 "<a href=\"tshirt/black-tor-tshirt.png\"><img src=\"tshirt/black-tor-tshirt."
 "png\" /></a> <a href=\"tshirt/green-tor-tshirt.png\"><img src=\"tshirt/green-"

Modified: translation/trunk/projects/website/templates/4-optional.open-positions.pot
===================================================================
--- translation/trunk/projects/website/templates/4-optional.open-positions.pot	2010-08-23 19:40:14 UTC (rev 23029)
+++ translation/trunk/projects/website/templates/4-optional.open-positions.pot	2010-08-23 19:47:54 UTC (rev 23030)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-08-23 20:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,17 +17,17 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/open-positions.wml:9
+#: /home/runa/tor/website/en/open-positions.wml:9
 msgid "Tor: Open Positions"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/open-positions.wml:10
+#: /home/runa/tor/website/en/open-positions.wml:10
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/open-positions.wml:12
+#: /home/runa/tor/website/en/open-positions.wml:12
 msgid ""
 "Tor is hiring! We're looking for self-motivated individuals who are able to "
 "work independently and want to help make Tor better.  These are short-term "
@@ -35,48 +35,48 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/open-positions.wml:16
+#: /home/runa/tor/website/en/open-positions.wml:16
 msgid "In particular, we're looking for a few people:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/open-positions.wml:18
+#: /home/runa/tor/website/en/open-positions.wml:18
 msgid "<a href=\"#vidaliadev\">Vidalia Developer</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/open-positions.wml:19
+#: /home/runa/tor/website/en/open-positions.wml:19
 msgid "<a href=\"#windowsdev\">Microsoft Windows Developer</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/open-positions.wml:22
+#: /home/runa/tor/website/en/open-positions.wml:22
 msgid "Working on Tor is rewarding because:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/open-positions.wml:24
+#: /home/runa/tor/website/en/open-positions.wml:24
 msgid ""
 "You can work your own hours in your own locations. As long as you get the "
 "job done, we don't care about the process."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/open-positions.wml:26
+#: /home/runa/tor/website/en/open-positions.wml:26
 msgid ""
 "We only write free (open source) software. The tools you make won't be "
 "locked down or rot on a shelf."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/open-positions.wml:28
+#: /home/runa/tor/website/en/open-positions.wml:28
 msgid ""
 "You will work with a world-class team of anonymity experts and developers on "
 "what is already the largest and most active strong anonymity network ever."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/open-positions.wml:33
+#: /home/runa/tor/website/en/open-positions.wml:33
 msgid ""
 "We want you to have good communication and writing skills (in particular, "
 "you should know how to keep other project members informed of your "
@@ -86,7 +86,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/open-positions.wml:39
+#: /home/runa/tor/website/en/open-positions.wml:39
 msgid ""
 "The best way to get noticed as a good developer is to join the community and "
 "start helping out. Smart code commits and ideas are welcome anytime.  We "
@@ -96,48 +96,47 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/open-positions.wml:45
+#: /home/runa/tor/website/en/open-positions.wml:45
 msgid "<a id=\"vidaliadev\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/open-positions.wml:46
+#: /home/runa/tor/website/en/open-positions.wml:46
 msgid "<a class=\"anchor\" href=\"#vidaliadev\">Vidalia Developer</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/open-positions.wml:47
+#: /home/runa/tor/website/en/open-positions.wml:47
 msgid ""
-"<a href=\"https://www.torproject.org/vidalia/\">Vidalia</a> is the cross-"
-"platform graphical user interface to Tor written in C++ using the Qt "
-"libraries.  It is used by millions of people successfully.  Our current "
-"developer is a volunteer and otherwise occupied with finishing his PhD.  "
-"We're looking for someone who knows C++, Qt, and would like to kickstart "
-"development on the next generation of Vidalia.  Some suggested next steps "
-"involve:"
+"<a href=\"<page vidalia/index>\">Vidalia</a> is the cross-platform graphical "
+"user interface to Tor written in C++ using the Qt libraries.  It is used by "
+"millions of people successfully.  Our current developer is a volunteer and "
+"otherwise occupied with finishing his PhD.  We're looking for someone who "
+"knows C++, Qt, and would like to kickstart development on the next "
+"generation of Vidalia.  Some suggested next steps involve:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/open-positions.wml:54
+#: /home/runa/tor/website/en/open-positions.wml:54
 msgid ""
 "Implementing the KDE Marble interface into Vidalia for better and more "
 "accurate mappings of relays to countries.  Plus, it just looks cool."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/open-positions.wml:57
+#: /home/runa/tor/website/en/open-positions.wml:57
 msgid ""
 "Implementing the ability to click a country and instruct Tor to either start "
 "or end circuits in that country."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/open-positions.wml:59
+#: /home/runa/tor/website/en/open-positions.wml:59
 msgid "Work on bug fixes and enhancements as suggested by users."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/open-positions.wml:60
+#: /home/runa/tor/website/en/open-positions.wml:60
 msgid ""
 "Give Vidalia the ability to control the http proxy included, to start, stop, "
 "and possibly configure either privoxy, polipo, or an http shim we ship in "
@@ -145,7 +144,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/open-positions.wml:63
+#: /home/runa/tor/website/en/open-positions.wml:63
 msgid ""
 "Possibly re-design the Vidalia interface to have different modes for "
 "different levels of user sophistication.  Many users see a button or a "
@@ -155,18 +154,18 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/open-positions.wml:70
+#: /home/runa/tor/website/en/open-positions.wml:70
 msgid "<a id=\"windowsdev\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/code/website/en/open-positions.wml:71
+#: /home/runa/tor/website/en/open-positions.wml:71
 msgid ""
 "<a class=\"anchor\" href=\"#windowsdev\">Microsoft Windows Developer</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/open-positions.wml:72
+#: /home/runa/tor/website/en/open-positions.wml:72
 msgid ""
 "This person needs to be very familiar with Windows at a system and network "
 "level.  We're looking or someone to help make Tor on Windows more compatible "
@@ -175,7 +174,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/open-positions.wml:78
+#: /home/runa/tor/website/en/open-positions.wml:78
 msgid ""
 "Develop a Tor network shim to redirect all traffic through Tor.  OpenVPN has "
 "a network layer device for Windows that redirects traffic through the "
@@ -184,7 +183,7 @@
 msgstr ""
 
 #. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/open-positions.wml:82
+#: /home/runa/tor/website/en/open-positions.wml:82
 msgid ""
 "Tor relays under non-server editions of Windows run into WSAENOBUFS problems "
 "after a short while.  This problem is described in detail in <a href="
@@ -194,7 +193,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/open-positions.wml:89
+#: /home/runa/tor/website/en/open-positions.wml:89
 msgid ""
 "Periodically we get new funding to work on more development projects.  Your "
 "goal should be to get into the list of <a href=\"<page people>#Core\">core "

Modified: translation/trunk/projects/website/templates/4-optional.tormedia.pot
===================================================================
--- translation/trunk/projects/website/templates/4-optional.tormedia.pot	2010-08-23 19:40:14 UTC (rev 23029)
+++ translation/trunk/projects/website/templates/4-optional.tormedia.pot	2010-08-23 19:47:54 UTC (rev 23030)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-08-23 20:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,17 +17,17 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h1>
-#: /home/runa/code/website/en/tormedia.wml:9
+#: /home/runa/tor/website/en/tormedia.wml:9
 msgid "Media Appearances"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/tormedia.wml:11
+#: /home/runa/tor/website/en/tormedia.wml:11
 msgid "Interviews &amp; Appearances"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/tormedia.wml:13
+#: /home/runa/tor/website/en/tormedia.wml:13
 msgid ""
 "Major news organizations including the New York Times, Forbes, and the CBS "
 "Evening News have sought out or quoted Tor Project members due to their "
@@ -36,83 +36,83 @@
 msgstr ""
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/code/website/en/tormedia.wml:21 /tmp/SfyCeGZrzr.xml:124
+#: /home/runa/tor/website/en/tormedia.wml:21 /tmp/rRQUO8qSHx.xml:124
 msgid "Date"
 msgstr ""
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/code/website/en/tormedia.wml:22 /tmp/SfyCeGZrzr.xml:125
+#: /home/runa/tor/website/en/tormedia.wml:22 /tmp/rRQUO8qSHx.xml:125
 msgid "Publication"
 msgstr ""
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/code/website/en/tormedia.wml:23 /tmp/SfyCeGZrzr.xml:126
+#: /home/runa/tor/website/en/tormedia.wml:23 /tmp/rRQUO8qSHx.xml:126
 msgid "Topic"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:28
+#: /home/runa/tor/website/en/tormedia.wml:28
 msgid "2010 Mar 11"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:29
+#: /home/runa/tor/website/en/tormedia.wml:29
 msgid "ABC Australia"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:30
+#: /home/runa/tor/website/en/tormedia.wml:30
 msgid ""
 "<a href=\"http://www.abc.net.au/rn/futuretense/stories/2010/2837736.htm"
 "\">Future Tense: The Deep Web</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:33
+#: /home/runa/tor/website/en/tormedia.wml:33
 msgid "2009 Jul 02"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:34
+#: /home/runa/tor/website/en/tormedia.wml:34
 msgid "NED/CIMA"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:35
+#: /home/runa/tor/website/en/tormedia.wml:35
 msgid ""
 "<a href=\"http://cima.ned.org/events/new-media-in-iran.html\">The Role of "
 "New Media in the Iranian Elections</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:38 /tmp/SfyCeGZrzr.xml:280
+#: /home/runa/tor/website/en/tormedia.wml:38 /tmp/rRQUO8qSHx.xml:280
 msgid "2009 Apr 06"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:39
+#: /home/runa/tor/website/en/tormedia.wml:39
 msgid "Al Jazeera"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:40
+#: /home/runa/tor/website/en/tormedia.wml:40
 msgid ""
 "<a href=\"http://www.youtube.com/watch?v=vuatxUN2cUQ\">Global Village Voices "
 "showcases Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:44
+#: /home/runa/tor/website/en/tormedia.wml:44
 msgid "2009 Mar 12"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:45
+#: /home/runa/tor/website/en/tormedia.wml:45
 msgid "BBC World Service"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:46
+#: /home/runa/tor/website/en/tormedia.wml:46
 msgid ""
 "<a href=\"http://bbcworldservicetrust.wordpress.com/2009/03/12/12-march-"
 "world-day-against-cyber-censorship/\">Steven J Murdoch interviewed about Tor "
@@ -120,86 +120,86 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:49
+#: /home/runa/tor/website/en/tormedia.wml:49
 msgid "2009 Feb 13"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:50
+#: /home/runa/tor/website/en/tormedia.wml:50
 msgid "Hearsay Culture"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:51
+#: /home/runa/tor/website/en/tormedia.wml:51
 msgid ""
 "<a href=\"http://www.hearsayculture.com/?p=307\">Hearsay Culture Radio "
 "Interview/Podcast</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:54
+#: /home/runa/tor/website/en/tormedia.wml:54
 msgid "2008 Dec 29"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:55
+#: /home/runa/tor/website/en/tormedia.wml:55
 msgid "nu.nl"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:56
+#: /home/runa/tor/website/en/tormedia.wml:56
 msgid ""
 "<a href=\"http://www.nu.nl/internet/1891289/anoniem-browsen-voor-gsm-in-de-"
 "maak.html\">Anoniem browsen voor gsm in de maak</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:59
+#: /home/runa/tor/website/en/tormedia.wml:59
 msgid "2006 Apr 11"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:60
+#: /home/runa/tor/website/en/tormedia.wml:60
 msgid "PBS Frontline"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:61
+#: /home/runa/tor/website/en/tormedia.wml:61
 msgid ""
 "<a href=\"http://pbs.gen.in/wgbh/pages/frontline/tankman/internet/tech.html"
 "\">Chipping Away at China's Great Firewall</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:64
+#: /home/runa/tor/website/en/tormedia.wml:64
 msgid "2006 Feb 28"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:65 /tmp/SfyCeGZrzr.xml:359
-#: /tmp/SfyCeGZrzr.xml:407 /tmp/SfyCeGZrzr.xml:694
+#: /home/runa/tor/website/en/tormedia.wml:65 /tmp/rRQUO8qSHx.xml:359
+#: /tmp/rRQUO8qSHx.xml:407 /tmp/rRQUO8qSHx.xml:694
 msgid "PC World"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:66
+#: /home/runa/tor/website/en/tormedia.wml:66
 msgid ""
 "<a href=\"http://www.pcworld.com/article/id,124891-page,1/article.html\"> "
 "Outsmarting the Online Privacy Snoops</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:70
+#: /home/runa/tor/website/en/tormedia.wml:70
 msgid "2006 Feb 27"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:71
+#: /home/runa/tor/website/en/tormedia.wml:71
 msgid "Forbes"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:72
+#: /home/runa/tor/website/en/tormedia.wml:72
 msgid ""
 "<a href=\"http://members.forbes.com/global/2006/0227/018A_2.html\"> Cracks "
 "In the Wall</a>.  Discussion of Tor being used for evading censorship by "
@@ -207,35 +207,35 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:77
+#: /home/runa/tor/website/en/tormedia.wml:77
 msgid "2006 Feb 20"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:78
+#: /home/runa/tor/website/en/tormedia.wml:78
 msgid "The Boston Globe"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:79
+#: /home/runa/tor/website/en/tormedia.wml:79
 msgid ""
 "<a href=\"http://members.forbes.com/global/2006/0227/018A_2.html\"> Beating "
 "censorship on the Internet</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:83 /tmp/SfyCeGZrzr.xml:90
-#: /tmp/SfyCeGZrzr.xml:544 /tmp/SfyCeGZrzr.xml:603
+#: /home/runa/tor/website/en/tormedia.wml:83 /tmp/rRQUO8qSHx.xml:90
+#: /tmp/rRQUO8qSHx.xml:544 /tmp/rRQUO8qSHx.xml:603
 msgid "2006 Feb 15"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:84
+#: /home/runa/tor/website/en/tormedia.wml:84
 msgid "CBS Evening News"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:85
+#: /home/runa/tor/website/en/tormedia.wml:85
 msgid ""
 "<a href=\"http://www.cbsnews.com/stories/2006/02/15/eveningnews/main1321785."
 "shtml?source=search_story\"> Cracking The 'Great Firewall Of China'</a>.  "
@@ -244,45 +244,45 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:91
+#: /home/runa/tor/website/en/tormedia.wml:91
 msgid "CNBC - Closing Bell"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:92
+#: /home/runa/tor/website/en/tormedia.wml:92
 msgid "TV Appearance by Roger Dingledine at 4:25pm. (no link)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:95
+#: /home/runa/tor/website/en/tormedia.wml:95
 msgid "2006 Jan 27"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:96
+#: /home/runa/tor/website/en/tormedia.wml:96
 msgid "Fox News/eWeek"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:97
+#: /home/runa/tor/website/en/tormedia.wml:97
 msgid ""
 "<a href=\"http://www.foxnews.com/story/0,2933,183005,00.html\"> Web "
 "Anonymizers Suddenly Get Very Popular</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:101
+#: /home/runa/tor/website/en/tormedia.wml:101
 msgid "2006 Jan 25"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:102 /tmp/SfyCeGZrzr.xml:266
-#: /tmp/SfyCeGZrzr.xml:582
+#: /home/runa/tor/website/en/tormedia.wml:102 /tmp/rRQUO8qSHx.xml:266
+#: /tmp/rRQUO8qSHx.xml:582
 msgid "New York Times"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:103
+#: /home/runa/tor/website/en/tormedia.wml:103
 msgid ""
 "<a href=\"http://www.nytimes.com/2006/01/25/technology/"
 "techspecial2/25privacy.html?_r=1&amp;oref=slogin\"> Privacy for People Who "
@@ -290,34 +290,34 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:107
+#: /home/runa/tor/website/en/tormedia.wml:107
 msgid "2005 Aug 6"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:108
+#: /home/runa/tor/website/en/tormedia.wml:108
 msgid "New Scientist"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:109
+#: /home/runa/tor/website/en/tormedia.wml:109
 msgid ""
 "<a href=\"http://www.eurekalert.org/pub_releases/2005-08/ns-wwa080305.php"
 "\">Why we all need pornography</a>"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/tormedia.wml:113
+#: /home/runa/tor/website/en/tormedia.wml:113
 msgid "<br/>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/tormedia.wml:115
+#: /home/runa/tor/website/en/tormedia.wml:115
 msgid "Articles"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/tormedia.wml:117
+#: /home/runa/tor/website/en/tormedia.wml:117
 msgid ""
 "Since Tor is widely used throughout the world, it is mentioned regularly in "
 "the press.  This list is not comprehensive, but illustrates some of the "
@@ -325,17 +325,17 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:131
+#: /home/runa/tor/website/en/tormedia.wml:131
 msgid "2010 August 01"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:132
+#: /home/runa/tor/website/en/tormedia.wml:132
 msgid "PC Format - Poland"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:133
+#: /home/runa/tor/website/en/tormedia.wml:133
 msgid ""
 "<a href=\"http://www.pcformat.pl/index.php/artykul/aid/1236/t/google-"
 "facebook-nas-szpieguj-jak-chroni-prywatno-w-sieci\">Google and Facebook are "
@@ -343,17 +343,17 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:138
+#: /home/runa/tor/website/en/tormedia.wml:138
 msgid "2010 July 14"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:139
+#: /home/runa/tor/website/en/tormedia.wml:139
 msgid "China Rights Forum"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:140
+#: /home/runa/tor/website/en/tormedia.wml:140
 msgid ""
 "<a href=\"http://www.hrichina.org/public/contents/category?"
 "cid=175033\">China Rights Forum, No. 2 - “China’s Internet”: Staking Digital "
@@ -361,17 +361,17 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:146
+#: /home/runa/tor/website/en/tormedia.wml:146
 msgid "2010 May 25"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:147
+#: /home/runa/tor/website/en/tormedia.wml:147
 msgid "The Australian"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:148
+#: /home/runa/tor/website/en/tormedia.wml:148
 msgid ""
 "<a href=\"http://www.theaustralian.com.au/australian-it/call-to-join-tor-"
 "network-to-fight-censorship/story-e6frgakx-1225870756466\"> Call to join Tor "
@@ -379,51 +379,51 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:153
+#: /home/runa/tor/website/en/tormedia.wml:153
 msgid "2010 Mar 17"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:154
+#: /home/runa/tor/website/en/tormedia.wml:154
 msgid "PC World Poland"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:155
+#: /home/runa/tor/website/en/tormedia.wml:155
 msgid ""
 "<a href=\"http://www.idg.pl/news/356993/Anonimowosc.w.Sieci.html\">Anonymity "
 "in the Web</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:158
+#: /home/runa/tor/website/en/tormedia.wml:158
 msgid "2010 Mar 09"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:159
+#: /home/runa/tor/website/en/tormedia.wml:159
 msgid "PC Pro UK"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:160
+#: /home/runa/tor/website/en/tormedia.wml:160
 msgid ""
 "<a href=\"http://www.pcpro.co.uk/features/356254/the-dark-side-of-the-web"
 "\">The dark side of the web</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:163
+#: /home/runa/tor/website/en/tormedia.wml:163
 msgid "2009 Dec 29"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:164
+#: /home/runa/tor/website/en/tormedia.wml:164
 msgid "Times Online"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:165
+#: /home/runa/tor/website/en/tormedia.wml:165
 msgid ""
 "<a href=\"http://www.timesonline.co.uk/tol/news/world/middle_east/"
 "article6969958.ece\">When Iran’s regime falls this will be remembered as the "
@@ -431,52 +431,52 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:170
+#: /home/runa/tor/website/en/tormedia.wml:170
 msgid "2009 Oct 15"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:171 /tmp/SfyCeGZrzr.xml:186
-#: /tmp/SfyCeGZrzr.xml:241 /tmp/SfyCeGZrzr.xml:271 /tmp/SfyCeGZrzr.xml:571
+#: /home/runa/tor/website/en/tormedia.wml:171 /tmp/rRQUO8qSHx.xml:186
+#: /tmp/rRQUO8qSHx.xml:241 /tmp/rRQUO8qSHx.xml:271 /tmp/rRQUO8qSHx.xml:571
 msgid "Technology Review"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:172
+#: /home/runa/tor/website/en/tormedia.wml:172
 msgid ""
 "<a href=\"http://www.technologyreview.com/web/23736/?a=f\">China Cracks Down "
 "on Tor Anonymity Network</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:175
+#: /home/runa/tor/website/en/tormedia.wml:175
 msgid "2009 Sep 30"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:176
+#: /home/runa/tor/website/en/tormedia.wml:176
 msgid "BusinessWeek"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:177
+#: /home/runa/tor/website/en/tormedia.wml:177
 msgid ""
 "<a href=\"http://www.businessweek.com/globalbiz/content/sep2009/"
 "gb20090930_620354.htm\">China's Online Censors Work Overtime</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:180
+#: /home/runa/tor/website/en/tormedia.wml:180
 msgid "2009 Aug 19"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:181
+#: /home/runa/tor/website/en/tormedia.wml:181
 msgid "Reuters"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:182
+#: /home/runa/tor/website/en/tormedia.wml:182
 msgid ""
 "<a href=\"http://www.reuters.com/article/internetNews/idUSTRE57I4IE20090819?"
 "pageNumber=1&amp;virtualBrandChannel=0&amp;sp=true\">Web tools help protect "
@@ -484,41 +484,41 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:185
+#: /home/runa/tor/website/en/tormedia.wml:185
 msgid "2009 Aug 10"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:187
+#: /home/runa/tor/website/en/tormedia.wml:187
 msgid ""
 "<a href=\"http://www.technologyreview.com/blog/editors/23958/?"
 "nlid=2255\">How to Build Anonymity Into the Internet</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:190 /tmp/SfyCeGZrzr.xml:195
+#: /home/runa/tor/website/en/tormedia.wml:190 /tmp/rRQUO8qSHx.xml:195
 msgid "2009 Jul 26"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:191 /tmp/SfyCeGZrzr.xml:211
+#: /home/runa/tor/website/en/tormedia.wml:191 /tmp/rRQUO8qSHx.xml:211
 msgid "Washington Times"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:192
+#: /home/runa/tor/website/en/tormedia.wml:192
 msgid ""
 "<a href=\"http://www.washingtontimes.com/news/2009/jul/26/senate-help-iran-"
 "dodge-internet-censorship/\">Senate OKs funds to thwart Iran Web censors</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:196
+#: /home/runa/tor/website/en/tormedia.wml:196
 msgid "Boston Globe"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:197
+#: /home/runa/tor/website/en/tormedia.wml:197
 msgid ""
 "<a href=\"http://www.boston.com/news/nation/washington/articles/2009/07/26/"
 "us_to_increase_funding_for_hackivists_aiding_iranians/\">US set to hike aid "
@@ -526,17 +526,17 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:200
+#: /home/runa/tor/website/en/tormedia.wml:200
 msgid "2009 Jul 24"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:201
+#: /home/runa/tor/website/en/tormedia.wml:201
 msgid "Associated Press"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:202
+#: /home/runa/tor/website/en/tormedia.wml:202
 msgid ""
 "<a href=\"http://www.google.com/hostednews/ap/article/ALeqM5hTf-"
 "p6Iy3sWHK8BRR58npGosLC3AD99L01QO0\">Iran activists work to elude crackdown "
@@ -544,29 +544,29 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:205
+#: /home/runa/tor/website/en/tormedia.wml:205
 msgid "2009 Jul 08"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:206
+#: /home/runa/tor/website/en/tormedia.wml:206
 msgid "Tehran Bureau"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:207
+#: /home/runa/tor/website/en/tormedia.wml:207
 msgid ""
 "<a href=\"http://tehranbureau.com/geeks-globe-rally-iranians-online/\">Geeks "
 "Around the Globe Rally to Help Iranians Online</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:210
+#: /home/runa/tor/website/en/tormedia.wml:210
 msgid "2009 Jun 26"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:212
+#: /home/runa/tor/website/en/tormedia.wml:212
 msgid ""
 "<a href=\"http://www.washingtontimes.com/news/2009/jun/26/protesters-use-"
 "navy-technology-to-avoid-censorship/?feat=home_headlines\">Iranian "
@@ -574,70 +574,70 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:215
+#: /home/runa/tor/website/en/tormedia.wml:215
 msgid "2009 Jun 29"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:216
+#: /home/runa/tor/website/en/tormedia.wml:216
 msgid "EFF"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:217
+#: /home/runa/tor/website/en/tormedia.wml:217
 msgid ""
 "<a href=\"http://www.eff.org/deeplinks/2009/06/help-protesters-iran-run-tor-"
 "relays-bridges\">Help Protesters in Iran: Run a Tor Bridge or a Tor Relay</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:220
+#: /home/runa/tor/website/en/tormedia.wml:220
 msgid "2009 Jun 24"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:221
+#: /home/runa/tor/website/en/tormedia.wml:221
 msgid "Daily Finance"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:222
+#: /home/runa/tor/website/en/tormedia.wml:222
 msgid ""
 "<a href=\"http://www.dailyfinance.com/2009/06/24/nokia-and-siemens-in-iran-"
 "controversy/\">Nokia and Siemens in Iran controversy</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:225 /tmp/SfyCeGZrzr.xml:235
-#: /tmp/SfyCeGZrzr.xml:240
+#: /home/runa/tor/website/en/tormedia.wml:225 /tmp/rRQUO8qSHx.xml:235
+#: /tmp/rRQUO8qSHx.xml:240
 msgid "2009 Jun 18"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:226 /tmp/SfyCeGZrzr.xml:291
-#: /tmp/SfyCeGZrzr.xml:558
+#: /home/runa/tor/website/en/tormedia.wml:226 /tmp/rRQUO8qSHx.xml:291
+#: /tmp/rRQUO8qSHx.xml:558
 msgid "Wall Street Journal"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:227
+#: /home/runa/tor/website/en/tormedia.wml:227
 msgid ""
 "<a href=\"http://blogs.wsj.com/digits/2009/06/18/iranians-using-tor-to-"
 "anonymize-web-use/\">Iranians Using Tor to Anonymize Web Use</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:230
+#: /home/runa/tor/website/en/tormedia.wml:230
 msgid "2009 Jun 19"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:231
+#: /home/runa/tor/website/en/tormedia.wml:231
 msgid "O'Reilly Radar"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:232
+#: /home/runa/tor/website/en/tormedia.wml:232
 msgid ""
 "<a href=\"http://radar.oreilly.com/2009/06/tor-and-the-legality-of-runnin."
 "html\">Dramatic Increase in Number of Tor Clients from Iran: Interview with "
@@ -645,48 +645,48 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:236
+#: /home/runa/tor/website/en/tormedia.wml:236
 msgid "Deutsche Welle"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:237
+#: /home/runa/tor/website/en/tormedia.wml:237
 msgid ""
 "<a href=\"http://www.dw-world.de/dw/article/0,,4400882,00.html\">Internet "
 "proxies let Iranians and others connect to blocked Web sites</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:242
+#: /home/runa/tor/website/en/tormedia.wml:242
 msgid ""
 "<a href=\"http://www.technologyreview.com/web/22893/\">The Web vs. the "
 "Republic of Iran</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:245 /tmp/SfyCeGZrzr.xml:250
+#: /home/runa/tor/website/en/tormedia.wml:245 /tmp/rRQUO8qSHx.xml:250
 msgid "2009 Jun 17"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:246
+#: /home/runa/tor/website/en/tormedia.wml:246
 msgid "CNet News"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:247
+#: /home/runa/tor/website/en/tormedia.wml:247
 msgid ""
 "<a href=\"http://news.cnet.com/8301-13578_3-10267287-38.html\">Iranians find "
 "ways to bypass Net censors</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:251
+#: /home/runa/tor/website/en/tormedia.wml:251
 msgid "ComputerWorld"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:252
+#: /home/runa/tor/website/en/tormedia.wml:252
 msgid ""
 "<a href=\"http://www.computerworld.com/action/article.do?"
 "command=viewArticleBasic&amp;articleId=9134471&amp;intsrc=news_ts_head"
@@ -694,34 +694,34 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:255
+#: /home/runa/tor/website/en/tormedia.wml:255
 msgid "2009 May 29"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:256 /tmp/SfyCeGZrzr.xml:276
+#: /home/runa/tor/website/en/tormedia.wml:256 /tmp/rRQUO8qSHx.xml:276
 msgid "Le Monde"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:257
+#: /home/runa/tor/website/en/tormedia.wml:257
 msgid ""
 "<a href=\"http://www.lemonde.fr/actualite-medias/article/2009/05/29/les-"
 "censeurs-du-net_1199993_3236.html\">Les censeurs du Net</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:260
+#: /home/runa/tor/website/en/tormedia.wml:260
 msgid "2009 May 15"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:261
+#: /home/runa/tor/website/en/tormedia.wml:261
 msgid "Mass High Tech"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:262
+#: /home/runa/tor/website/en/tormedia.wml:262
 msgid ""
 "<a href=\"http://www.masshightech.com/stories/2009/05/11/newscolumn2-Tor-"
 "tackles-Net-privacy-game-makers-flock-to-Hub.html\">Tor tackles Net privacy</"
@@ -729,24 +729,24 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:265
+#: /home/runa/tor/website/en/tormedia.wml:265
 msgid "2009 May 01"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:267
+#: /home/runa/tor/website/en/tormedia.wml:267
 msgid ""
 "<a href=\"http://www.nytimes.com/2009/05/01/technology/01filter.html"
 "\">Iranians and Others Outwit Net Censors</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:270
+#: /home/runa/tor/website/en/tormedia.wml:270
 msgid "2009 Apr 23"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:272
+#: /home/runa/tor/website/en/tormedia.wml:272
 msgid ""
 "<a href=\"http://www.technologyreview.com/computing/22427/?a=f\">Dissent "
 "Made Safer: How anonymity technology could save free speech on the Internet."
@@ -754,189 +754,189 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:275
+#: /home/runa/tor/website/en/tormedia.wml:275
 msgid "2009 Apr 22"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:277
+#: /home/runa/tor/website/en/tormedia.wml:277
 msgid ""
 "<a href=\"http://bugbrother.blog.lemonde.fr/2009/04/22/comment-contourner-la-"
 "cybersurveillance/\">How to circumvent cybersurveillance</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:281
+#: /home/runa/tor/website/en/tormedia.wml:281
 msgid "Reader's Digest"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:282
+#: /home/runa/tor/website/en/tormedia.wml:282
 msgid ""
 "<a href=\"http://www.rd.com/advice-and-know-how/how-to-hide-anything/"
 "article122219.html\">How to Hide Anything</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:285
+#: /home/runa/tor/website/en/tormedia.wml:285
 msgid "2009 Mar 18"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:286
+#: /home/runa/tor/website/en/tormedia.wml:286
 msgid "Marie Claire"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:287
+#: /home/runa/tor/website/en/tormedia.wml:287
 msgid ""
 "<a href=\"http://www.marieclaire.com/career-money/career-coach/manage-"
 "online--web-image\">How to Manage Your Web Footprint</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:290
+#: /home/runa/tor/website/en/tormedia.wml:290
 msgid "2009 Mar 13"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:292
+#: /home/runa/tor/website/en/tormedia.wml:292
 msgid ""
 "<a href=\"http://online.wsj.com/article/SB123567809587886053.html\">The "
 "Kindness of Strangers</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:297
+#: /home/runa/tor/website/en/tormedia.wml:297
 msgid "2009 Mar 03"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:298
+#: /home/runa/tor/website/en/tormedia.wml:298
 msgid "Orf Austria"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:299
+#: /home/runa/tor/website/en/tormedia.wml:299
 msgid ""
 "<a href=\"http://futurezone.orf.at/stories/1503028/\">WIRTSCHAFTSKAMMER "
 "column</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:302
+#: /home/runa/tor/website/en/tormedia.wml:302
 msgid "2009 Feb 18"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:303 /tmp/SfyCeGZrzr.xml:475
+#: /home/runa/tor/website/en/tormedia.wml:303 /tmp/rRQUO8qSHx.xml:475
 msgid "Bangkok Post"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:304
+#: /home/runa/tor/website/en/tormedia.wml:304
 msgid ""
 "<a href=\"http://www.bangkokpost.com/tech/technews/11872/the-old-fake-404-"
 "not-found-routine\">The old fake \"404 not found\" routine</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:307
+#: /home/runa/tor/website/en/tormedia.wml:307
 msgid "2008 Dec 14"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:308
+#: /home/runa/tor/website/en/tormedia.wml:308
 msgid "PC Magazine: Middle &amp; Near East"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:309
+#: /home/runa/tor/website/en/tormedia.wml:309
 msgid ""
 "<a href=\"http://www.pcmag-mideast.com/FeatureDetail.aspx?ID=1039\">How To "
 "Reclaim Your Online Privacy</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:314
+#: /home/runa/tor/website/en/tormedia.wml:314
 msgid "2008 Aug 21"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:315
+#: /home/runa/tor/website/en/tormedia.wml:315
 msgid "CNN"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:316
+#: /home/runa/tor/website/en/tormedia.wml:316
 msgid ""
 "<a href=\"http://www.cnn.com/2008/TECH/08/21/internet.filtering/index.html"
 "\">Experts: Internet filtering and censorship rife</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:321
+#: /home/runa/tor/website/en/tormedia.wml:321
 msgid "2008 Aug 22"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:322
+#: /home/runa/tor/website/en/tormedia.wml:322
 msgid "The Sydney Morning Herald"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:323
+#: /home/runa/tor/website/en/tormedia.wml:323
 msgid ""
 "<a href=\"http://www.smh.com.au/news/web/the-china-"
 "syndrome/2008/08/20/1218911800889.html\">The China Syndrome</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:328
+#: /home/runa/tor/website/en/tormedia.wml:328
 msgid "2008 Aug 20"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:329
+#: /home/runa/tor/website/en/tormedia.wml:329
 msgid "Scientific American"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:330
+#: /home/runa/tor/website/en/tormedia.wml:330
 msgid ""
 "<a href=\"http://www.sciam.com/article.cfm?id=cryptography-how-to-keep-your-"
 "secrets-safe\">Cryptography: How to Keep Your Secrets Safe</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:335
+#: /home/runa/tor/website/en/tormedia.wml:335
 msgid "2008 Aug 05"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:336
+#: /home/runa/tor/website/en/tormedia.wml:336
 msgid "Guardian UK"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:337
+#: /home/runa/tor/website/en/tormedia.wml:337
 msgid ""
 "<a href=\"http://www.guardian.co.uk/commentisfree/2008/aug/05/china."
 "censorship\">Vaulting the great firewall</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:342
+#: /home/runa/tor/website/en/tormedia.wml:342
 msgid "2008 Aug 10"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:343
+#: /home/runa/tor/website/en/tormedia.wml:343
 msgid "Tech Radar UK"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:344
+#: /home/runa/tor/website/en/tormedia.wml:344
 msgid ""
 "<a href=\"http://www.techradar.com/news/internet/web/freedom-stick-"
 "highlights-chinese-net-censorship-449233\">Freedom Stick highlights Chinese "
@@ -944,25 +944,25 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:350 /tmp/SfyCeGZrzr.xml:358
-#: /tmp/SfyCeGZrzr.xml:366 /tmp/SfyCeGZrzr.xml:374
+#: /home/runa/tor/website/en/tormedia.wml:350 /tmp/rRQUO8qSHx.xml:358
+#: /tmp/rRQUO8qSHx.xml:366 /tmp/rRQUO8qSHx.xml:374
 msgid "2008 Aug 07"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:351
+#: /home/runa/tor/website/en/tormedia.wml:351
 msgid "Spiegel"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:352
+#: /home/runa/tor/website/en/tormedia.wml:352
 msgid ""
 "<a href=\"http://www.spiegel.de/netzwelt/tech/0,1518,570421,00.html\">Tricks "
 "gegen Zensur und Überwachung</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:360
+#: /home/runa/tor/website/en/tormedia.wml:360
 msgid ""
 "<a href=\"http://www.pcworld.com/"
 "article/149399-3/15_great_free_privacy_downloads.html\">15 Great, Free "
@@ -970,41 +970,41 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:367
+#: /home/runa/tor/website/en/tormedia.wml:367
 msgid "The Guardian UK"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:368
+#: /home/runa/tor/website/en/tormedia.wml:368
 msgid ""
 "<a href=\"http://www.guardian.co.uk/technology/2008/aug/07/censorship.hacking"
 "\">Chaos aims to crack China's wall</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:375
+#: /home/runa/tor/website/en/tormedia.wml:375
 msgid "The Register UK"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:376
+#: /home/runa/tor/website/en/tormedia.wml:376
 msgid ""
 "<a href=\"http://www.theregister.co.uk/2008/08/07/torbrowser_olympics/"
 "\">German hackers poke hole in great firewall of China</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:382
+#: /home/runa/tor/website/en/tormedia.wml:382
 msgid "2008 May 24"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:383
+#: /home/runa/tor/website/en/tormedia.wml:383
 msgid "Groupo Estado"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:384
+#: /home/runa/tor/website/en/tormedia.wml:384
 msgid ""
 "<a href=\"http://blog.estadao.com.br/blog/cruz/?"
 "title=cfp08_navegacao_anonima_na_rede&amp;more=1&amp;c=1&amp;tb=1&amp;"
@@ -1013,17 +1013,17 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:390
+#: /home/runa/tor/website/en/tormedia.wml:390
 msgid "2008 Mar 12"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:391
+#: /home/runa/tor/website/en/tormedia.wml:391
 msgid "SearchSecurity.com"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:392
+#: /home/runa/tor/website/en/tormedia.wml:392
 msgid ""
 "<a href=\"http://searchsecurity.techtarget.com/news/article/0,289142,"
 "sid14_gci1305120,00.html\"> Tor network 'bridges' help evade blockers</a>.  "
@@ -1032,51 +1032,51 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:399
+#: /home/runa/tor/website/en/tormedia.wml:399
 msgid "2008 Feb 14"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:400
+#: /home/runa/tor/website/en/tormedia.wml:400
 msgid "Wired: Compiler Blog"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:401
+#: /home/runa/tor/website/en/tormedia.wml:401
 msgid ""
 "<a href=\"http://blog.wired.com/monkeybites/2008/02/how-to-set-up-a.html\"> "
 "How To: Set Up Anonymous Browsing in 30 Seconds or Less</a>."
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:406
+#: /home/runa/tor/website/en/tormedia.wml:406
 msgid "2008 Feb 01"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:408
+#: /home/runa/tor/website/en/tormedia.wml:408
 msgid ""
 "<a href=\"http://www.pcworld.com/article/id,142094-pg,1/article.html\"> "
 "Hackers Can Expose Masked Surfers, Study Says</a> A report on <a href="
 "\"http://www.lightbluetouchpaper.org/2007/12/10/covert-channel-"
 "vulnerabilities-in-anonymity-systems/\"> Steven Murdoch's recent PhD thesis</"
-"a>. Steven <a href=\"http://blog.torproject.org/blog/media-coverage-%2526quot"
-"%3Bcovert-channel-vulnerabilities-anonymity-systems%2526quot%3B\"> responds "
-"on the Tor Blog</a>."
+"a>. Steven <a href=\"<blog>media-coverage-%2526quot%3Bcovert-channel-"
+"vulnerabilities-anonymity-systems%2526quot%3B\"> responds on the Tor Blog</"
+"a>."
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:416
+#: /home/runa/tor/website/en/tormedia.wml:416
 msgid "2007 Sep 21"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:417
+#: /home/runa/tor/website/en/tormedia.wml:417
 msgid "Wired HowTo Blog"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:418
+#: /home/runa/tor/website/en/tormedia.wml:418
 msgid ""
 "<a href=\"http://howto.wired.com/wiredhowtos/index.cgi?"
 "page_name=be_a_whistle_blower;action=display;category=Work\"> Be a "
@@ -1085,17 +1085,17 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:424
+#: /home/runa/tor/website/en/tormedia.wml:424
 msgid "2007 Sep 16"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:425
+#: /home/runa/tor/website/en/tormedia.wml:425
 msgid "Cnet"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:426
+#: /home/runa/tor/website/en/tormedia.wml:426
 msgid ""
 "<a href=\"http://news.cnet.com/8301-13739_3-9779225-46.html\"> Tor anonymity "
 "server admin arrested</a>.  A Tor exit node operator from Germany was "
@@ -1109,18 +1109,18 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:435
+#: /home/runa/tor/website/en/tormedia.wml:435
 msgid "2007 Sep 10"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:436 /tmp/SfyCeGZrzr.xml:617
-#: /tmp/SfyCeGZrzr.xml:750 /tmp/SfyCeGZrzr.xml:949 /tmp/SfyCeGZrzr.xml:972
+#: /home/runa/tor/website/en/tormedia.wml:436 /tmp/rRQUO8qSHx.xml:617
+#: /tmp/rRQUO8qSHx.xml:750 /tmp/rRQUO8qSHx.xml:949 /tmp/rRQUO8qSHx.xml:972
 msgid "Wired"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:437
+#: /home/runa/tor/website/en/tormedia.wml:437
 msgid ""
 "<a href=\"http://www.wired.com/politics/security/news/2007/09/embassy_hacks"
 "\"> Rogue Nodes Turn Tor Anonymizer Into Eavesdropper's Paradise</a><br/> "
@@ -1153,17 +1153,17 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:464
+#: /home/runa/tor/website/en/tormedia.wml:464
 msgid "2007 Jul 27"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:465
+#: /home/runa/tor/website/en/tormedia.wml:465
 msgid "Wired Blog"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:466
+#: /home/runa/tor/website/en/tormedia.wml:466
 msgid ""
 "<a href=\"http://blog.wired.com/27bstroke6/2007/07/cyber-jihadists.html\"> "
 "Cyber Jihadists Embrace Tor</a><br/> A pointer to a <a href=\"http://"
@@ -1174,12 +1174,12 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:474
+#: /home/runa/tor/website/en/tormedia.wml:474
 msgid "2007 Jun 22"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:476
+#: /home/runa/tor/website/en/tormedia.wml:476
 msgid ""
 "<a href=\"http://www.asiamedia.ucla.edu/article-southeastasia.asp?"
 "parentid=72388\"> The problems with censorship</a>.  Mentions anecdotes that "
@@ -1187,17 +1187,17 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:482
+#: /home/runa/tor/website/en/tormedia.wml:482
 msgid "2007 Mar 15"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:483
+#: /home/runa/tor/website/en/tormedia.wml:483
 msgid "World Changing"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:484
+#: /home/runa/tor/website/en/tormedia.wml:484
 msgid ""
 "<a href=\"http://www.worldchanging.com/archives/006309.html\"> Blogging "
 "Where Speech Isn’t Free</a><br/> Coverage of former Tor Executive Director "
@@ -1207,17 +1207,17 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:493
+#: /home/runa/tor/website/en/tormedia.wml:493
 msgid "2007 Mar 8"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:494
+#: /home/runa/tor/website/en/tormedia.wml:494
 msgid "Security Focus"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:495
+#: /home/runa/tor/website/en/tormedia.wml:495
 msgid ""
 "<a href=\"http://www.securityfocus.com/news/11447/1\"> Tor hack proposed to "
 "catch criminals</a>.  Coverage of a toolset called \"Torment\" for "
@@ -1226,17 +1226,17 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:503
+#: /home/runa/tor/website/en/tormedia.wml:503
 msgid "2007 Feb 1"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:504
+#: /home/runa/tor/website/en/tormedia.wml:504
 msgid "Dr Dobb's"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:505
+#: /home/runa/tor/website/en/tormedia.wml:505
 msgid ""
 "<a href=\"http://www.ddj.com/security/197002414\"> Tor Project Protects "
 "Anonymous Sources</a>.  An introduction to Tor, including technical and "
@@ -1244,17 +1244,17 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:512
+#: /home/runa/tor/website/en/tormedia.wml:512
 msgid "2006 Oct 19"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:513
+#: /home/runa/tor/website/en/tormedia.wml:513
 msgid "Wired Threat Level"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:514
+#: /home/runa/tor/website/en/tormedia.wml:514
 msgid ""
 "<a href=\"http://blog.wired.com/27bstroke6/2006/10/the_onion_route.html\"> "
 "The Onion Router (TOR) is Leaky (Leeky)</a>.  Explains why you need "
@@ -1264,17 +1264,17 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:524
+#: /home/runa/tor/website/en/tormedia.wml:524
 msgid "2006 Aug 18"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:525 /tmp/SfyCeGZrzr.xml:628
+#: /home/runa/tor/website/en/tormedia.wml:525 /tmp/rRQUO8qSHx.xml:628
 msgid "NPR"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:526
+#: /home/runa/tor/website/en/tormedia.wml:526
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\"> "
 "Tips for Protecting Privacy Online</a>.  Kevin Bankston of the EFF "
@@ -1283,17 +1283,17 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:534
+#: /home/runa/tor/website/en/tormedia.wml:534
 msgid "2006 Jul 5"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:535
+#: /home/runa/tor/website/en/tormedia.wml:535
 msgid "MSNBC"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:536
+#: /home/runa/tor/website/en/tormedia.wml:536
 msgid ""
 "<a href=\"http://www.msnbc.msn.com/id/13718446/page/2/\"> Defending "
 "liberties in high-tech world</a>.  Mentions EFF funding for Tor as one of "
@@ -1301,12 +1301,12 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:547
+#: /home/runa/tor/website/en/tormedia.wml:547
 msgid "Network Secure"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:548
+#: /home/runa/tor/website/en/tormedia.wml:548
 msgid ""
 "<a href=\"http://www.network-secure.de/index.php?option=com_content&amp;"
 "task=view&amp;id=3909\"> Tor: Anonymisierungswerkzeug entwickelt</a> (German)"
@@ -1314,12 +1314,12 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:555
+#: /home/runa/tor/website/en/tormedia.wml:555
 msgid "2006 Feb 13"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:559
+#: /home/runa/tor/website/en/tormedia.wml:559
 msgid ""
 "<a href=\"http://online.wsj.com/article/SB113979965346572150.html\"> Chinese "
 "Censors Of Internet Face 'Hacktivists' in U.S.</a><br/> Full article text "
@@ -1328,41 +1328,41 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:568
+#: /home/runa/tor/website/en/tormedia.wml:568
 msgid "2006 Jan 31"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:572
+#: /home/runa/tor/website/en/tormedia.wml:572
 msgid ""
 "<a href=\"http://www.technologyreview.com/Infotech/16216/page2/\"> Evading "
 "the Google Eye</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:579
+#: /home/runa/tor/website/en/tormedia.wml:579
 msgid "2006 Jan 29"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:583
+#: /home/runa/tor/website/en/tormedia.wml:583
 msgid ""
 "<a href=\"http://www.nytimes.com/2006/01/29/weekinreview/29basic.html\"> How "
 "to Outwit the World's Internet Censors</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:590
+#: /home/runa/tor/website/en/tormedia.wml:590
 msgid "2006 Jan 23"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:593
+#: /home/runa/tor/website/en/tormedia.wml:593
 msgid "NPR Talk of the Nation"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:594
+#: /home/runa/tor/website/en/tormedia.wml:594
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\"> "
 "Search Engines and Privacy Rights on the Web</a><br/> <a href=\"http://xeni."
@@ -1370,99 +1370,99 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:606
+#: /home/runa/tor/website/en/tormedia.wml:606
 msgid "Punto Informatico"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:607
+#: /home/runa/tor/website/en/tormedia.wml:607
 msgid ""
 "<a href=\"http://punto-informatico.it/p.aspx?i=1430903\"> TOR c'è</a> "
 "(Italian)<br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:614 /tmp/SfyCeGZrzr.xml:625
+#: /home/runa/tor/website/en/tormedia.wml:614 /tmp/rRQUO8qSHx.xml:625
 msgid "2006 Jan 20"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:618
+#: /home/runa/tor/website/en/tormedia.wml:618
 msgid ""
 "<a href=\"http://www.wired.com/science/discoveries/news/2006/01/70051?"
 "currentPage=2\"> How to Foil Search Engine Snoops</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:629
+#: /home/runa/tor/website/en/tormedia.wml:629
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5165854\"> "
 "Google Records Subpoena Raises Privacy Fears</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:636
+#: /home/runa/tor/website/en/tormedia.wml:636
 msgid "2005 Sep 30"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:639
+#: /home/runa/tor/website/en/tormedia.wml:639
 msgid "Viva o Linux"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:640
+#: /home/runa/tor/website/en/tormedia.wml:640
 msgid ""
 "<a href=\"http://www.vivaolinux.com.br/artigos/verArtigo.php?codigo=2759\"> "
 "TOR: A Internet sem rastreabilidade</a> (Portuguese)<br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:647
+#: /home/runa/tor/website/en/tormedia.wml:647
 msgid "2005 Jul 12"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:650
+#: /home/runa/tor/website/en/tormedia.wml:650
 msgid "IEEE Computer Society's Technical Committee on Security and Privacy"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:651
+#: /home/runa/tor/website/en/tormedia.wml:651
 msgid ""
 "<a href=\"http://www.ieee-security.org/Cipher/Newsbriefs/2005/071805.html#TOR"
 "\"> Onion routing application Tor makes PCWorld's top 100</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:658
+#: /home/runa/tor/website/en/tormedia.wml:658
 msgid "2005 Jun 22"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:661
+#: /home/runa/tor/website/en/tormedia.wml:661
 msgid "The Unofficial Apple Blog"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:662
+#: /home/runa/tor/website/en/tormedia.wml:662
 msgid ""
 "<a href=\"http://www.tuaw.com/2005/06/22/privacy-watch-tor/\"> Privacy "
 "Watch: Tor</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:669
+#: /home/runa/tor/website/en/tormedia.wml:669
 msgid "2005 Jun 10"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:672
+#: /home/runa/tor/website/en/tormedia.wml:672
 msgid "The New Zealand Herald"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:673
+#: /home/runa/tor/website/en/tormedia.wml:673
 msgid ""
 "<a href=\"http://www.nzherald.co.nz/section/story.cfm?c_id=5&amp;"
 "objectid=10329896\"> China's internet censorship stranglehold can't last</"
@@ -1470,104 +1470,104 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:680
+#: /home/runa/tor/website/en/tormedia.wml:680
 msgid "2005 Jun 8"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:683
+#: /home/runa/tor/website/en/tormedia.wml:683
 msgid "American Public Radio"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:684
+#: /home/runa/tor/website/en/tormedia.wml:684
 msgid ""
 "<a href=\"http://www.publicradio.org/columns/futuretense/2005/06/08.shtml\"> "
 "An Internet privacy tool called \"Tor\"</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:691 /tmp/SfyCeGZrzr.xml:703
+#: /home/runa/tor/website/en/tormedia.wml:691 /tmp/rRQUO8qSHx.xml:703
 msgid "2005 Jun 1"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:695
+#: /home/runa/tor/website/en/tormedia.wml:695
 msgid ""
 "<a href=\"http://www.pcworld.com/article/id,120763-page,4/article.html\"> "
 "The 100 Best Products of 2005</a><br/> Tor is ranked #40 on the list."
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:706
+#: /home/runa/tor/website/en/tormedia.wml:706
 msgid "Linux Weekly News"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:707
+#: /home/runa/tor/website/en/tormedia.wml:707
 msgid ""
 "<a href=\"http://lwn.net/Articles/138242/\"> A Look at The Onion Router (Tor)"
 "</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:714
+#: /home/runa/tor/website/en/tormedia.wml:714
 msgid "2005 May 22"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:717 /tmp/SfyCeGZrzr.xml:873
+#: /home/runa/tor/website/en/tormedia.wml:717 /tmp/rRQUO8qSHx.xml:873
 msgid "Slashdot"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:718
+#: /home/runa/tor/website/en/tormedia.wml:718
 msgid ""
 "<a href=\"http://yro.slashdot.org/article.pl?sid=05/05/22/0113244\"> Tor "
 "Anonymity Network Reaches 100 Verified Nodes</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:725
+#: /home/runa/tor/website/en/tormedia.wml:725
 msgid "2005 May 20"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:728
+#: /home/runa/tor/website/en/tormedia.wml:728
 msgid "Security.uz"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:729
+#: /home/runa/tor/website/en/tormedia.wml:729
 msgid ""
 "<a href=\"http://security.uz/news/default.asp?id=10541\"> Tor - мощный "
 "анонимайзер для всех ОС</a> (Russian)<br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:736
+#: /home/runa/tor/website/en/tormedia.wml:736
 msgid "2005 May 19"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:739
+#: /home/runa/tor/website/en/tormedia.wml:739
 msgid "WebPlanet"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:740
+#: /home/runa/tor/website/en/tormedia.wml:740
 msgid ""
 "<a href=\"http://webplanet.ru/news/security/2005/5/19/tor.html\"> Tor: "
 "распределенная система анонимного серфинга</a> (Russian)<br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:747 /tmp/SfyCeGZrzr.xml:760
+#: /home/runa/tor/website/en/tormedia.wml:747 /tmp/rRQUO8qSHx.xml:760
 msgid "2005 May 17"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:751
+#: /home/runa/tor/website/en/tormedia.wml:751
 msgid ""
 "<a href=\"http://www.wired.com/politics/security/news/2005/05/67542?"
 "currentPage=all\"> Tor Torches Online Tracking</a><br/> Also available in <a "
@@ -1575,170 +1575,170 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:763
+#: /home/runa/tor/website/en/tormedia.wml:763
 msgid "XBiz"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:764
+#: /home/runa/tor/website/en/tormedia.wml:764
 msgid ""
 "<a href=\"http://xbiz.com/news/8761\"> Navy Project Allows Anonymous "
 "Browsing</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:771
+#: /home/runa/tor/website/en/tormedia.wml:771
 msgid "2005 Apr 13"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:774
+#: /home/runa/tor/website/en/tormedia.wml:774
 msgid "Heise online"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:775
+#: /home/runa/tor/website/en/tormedia.wml:775
 msgid ""
 "<a href=\"http://www.heise.de/newsticker/meldung/58506\"> CFP: Vom "
 "kafkaesken Schwinden der Anonymität</a> (German)<br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:782
+#: /home/runa/tor/website/en/tormedia.wml:782
 msgid "2005 Apr 5"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:785
+#: /home/runa/tor/website/en/tormedia.wml:785
 msgid "Libero"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:786
+#: /home/runa/tor/website/en/tormedia.wml:786
 msgid ""
 "<a href=\"http://magazine.libero.it/internetlife/scienzaeweb/ne208.phtml\"> "
 "Anonimato on line, ecco Tor</a> (Italian)<br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:793
+#: /home/runa/tor/website/en/tormedia.wml:793
 msgid "2005 Jan 4"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:796
+#: /home/runa/tor/website/en/tormedia.wml:796
 msgid "Internetnews"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:797
+#: /home/runa/tor/website/en/tormedia.wml:797
 msgid ""
 "<a href=\"http://www.internetnews.com/dev-news/article.php/3454521\"> EFF "
 "Throws Support to 'Anonymous' Internet Project</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:804
+#: /home/runa/tor/website/en/tormedia.wml:804
 msgid "2005 Mar 31"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:807
+#: /home/runa/tor/website/en/tormedia.wml:807
 msgid "Linux.com"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:808
+#: /home/runa/tor/website/en/tormedia.wml:808
 msgid ""
 "<a href=\"http://www.linux.com/articles/43713?tid=19&amp;tid=78\"> Securing "
 "your online privacy with Tor</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:815
+#: /home/runa/tor/website/en/tormedia.wml:815
 msgid "2004 Dec 27"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:818
+#: /home/runa/tor/website/en/tormedia.wml:818
 msgid "BoingBoing"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:819
+#: /home/runa/tor/website/en/tormedia.wml:819
 msgid ""
 "<a href=\"http://www.boingboing.net/2004/12/27/eff-helping-produce-.html\"> "
 "EFF helping produce anonymizing software</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:826
+#: /home/runa/tor/website/en/tormedia.wml:826
 msgid "2004 Dec 25"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:829
+#: /home/runa/tor/website/en/tormedia.wml:829
 msgid "Kansas City infozine"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:830
+#: /home/runa/tor/website/en/tormedia.wml:830
 msgid ""
 "<a href=\"http://www.infozine.com/news/stories/op/storiesView/sid/4933/\"> "
 "EFF Joins Forces with Tor Software Project</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:837 /tmp/SfyCeGZrzr.xml:848
+#: /home/runa/tor/website/en/tormedia.wml:837 /tmp/rRQUO8qSHx.xml:848
 msgid "2004 Dec 23"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:840
+#: /home/runa/tor/website/en/tormedia.wml:840
 msgid "golem.de"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:841
+#: /home/runa/tor/website/en/tormedia.wml:841
 msgid ""
 "<a href=\"http://www.golem.de/0412/35340.html\"> EFF unterstützt "
 "Anonymisierer Tor</a> (German)<br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:851
+#: /home/runa/tor/website/en/tormedia.wml:851
 msgid "SuicideGirls"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:852
+#: /home/runa/tor/website/en/tormedia.wml:852
 msgid ""
 "<a href=\"http://suicidegirls.com/news/technology/6150/\"> New Routing "
 "Software Allows Anonymous Internet Use</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:859
+#: /home/runa/tor/website/en/tormedia.wml:859
 msgid "2004 Dec 18"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:862
+#: /home/runa/tor/website/en/tormedia.wml:862
 msgid "P2Pnet"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:863
+#: /home/runa/tor/website/en/tormedia.wml:863
 msgid "<a href=\"http://p2pnet.net/story/3357\"> EFF to sponsor Tor</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:870
+#: /home/runa/tor/website/en/tormedia.wml:870
 msgid "2004 Dec 22"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:874
+#: /home/runa/tor/website/en/tormedia.wml:874
 msgid ""
 "<a href=\"http://yro.slashdot.org/article.pl?sid=04/12/22/2031229&amp;"
 "tid=95&amp;tid=158&amp;tid=153&amp;tid=17\"> EFF Promotes Freenet-like "
@@ -1746,107 +1746,107 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:881
+#: /home/runa/tor/website/en/tormedia.wml:881
 msgid "2004 Nov 16"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:884
+#: /home/runa/tor/website/en/tormedia.wml:884
 msgid "AlterNet"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:885
+#: /home/runa/tor/website/en/tormedia.wml:885
 msgid ""
 "<a href=\"http://www.alternet.org/columnists/story/20523/\"> Heavy Traffic</"
 "a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:892
+#: /home/runa/tor/website/en/tormedia.wml:892
 msgid "2004 Aug 30"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:895
+#: /home/runa/tor/website/en/tormedia.wml:895
 msgid "Newsweek"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:896
+#: /home/runa/tor/website/en/tormedia.wml:896
 msgid "Technology: Instant Security (no link)<br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:902
+#: /home/runa/tor/website/en/tormedia.wml:902
 msgid "2004 Aug 16"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:905
+#: /home/runa/tor/website/en/tormedia.wml:905
 msgid "Eweek"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:906
+#: /home/runa/tor/website/en/tormedia.wml:906
 msgid ""
 "<a href=\"http://www.eweek.com/c/a/Security/Dont-Fear-Internet-Anonymity-"
 "Tools/\"> Don't Fear Internet Anonymity Tools</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:913 /tmp/SfyCeGZrzr.xml:924
+#: /home/runa/tor/website/en/tormedia.wml:913 /tmp/rRQUO8qSHx.xml:924
 msgid "2004 Aug 6"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:916
+#: /home/runa/tor/website/en/tormedia.wml:916
 msgid "HCC magazine"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:917
+#: /home/runa/tor/website/en/tormedia.wml:917
 msgid ""
 "<a href=\"http://www.hcc.nl/eCache/DEF/21/083.html\"> Anoniem surfen met "
 "hulp van marine VS</a> (Dutch)<br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:927
+#: /home/runa/tor/website/en/tormedia.wml:927
 msgid "Golem"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:928
+#: /home/runa/tor/website/en/tormedia.wml:928
 msgid ""
 "<a href=\"http://www.golem.de/0408/32835.html\"> Tor: Anonymisierer nutzt "
 "Onion-Routing</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:935
+#: /home/runa/tor/website/en/tormedia.wml:935
 msgid "2004 Aug 5"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:938
+#: /home/runa/tor/website/en/tormedia.wml:938
 msgid "Network World Security"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:939
+#: /home/runa/tor/website/en/tormedia.wml:939
 msgid ""
 "<a href=\"http://www.networkworld.com/details/7088.html\"> Onion routing</"
 "a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:946
+#: /home/runa/tor/website/en/tormedia.wml:946
 msgid "2004 May 8"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:950
+#: /home/runa/tor/website/en/tormedia.wml:950
 msgid ""
 "<a href=\"http://www.wired.com/politics/security/news/2004/08/64464\"> Onion "
 "Routing Averts Prying Eyes</a><br/> Also in <a href=\"http://hotwired.goo.ne."
@@ -1854,29 +1854,29 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:958
+#: /home/runa/tor/website/en/tormedia.wml:958
 msgid "2004 Mar 8"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:961
+#: /home/runa/tor/website/en/tormedia.wml:961
 msgid "CNET Japan blog"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:962
+#: /home/runa/tor/website/en/tormedia.wml:962
 msgid ""
 "<a href=\"http://japan.cnet.com/blog/umeda/2004/03/08/entry_post_126/\"> "
 "Yearning of hackers and insecurity</a> (Japanese)<br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:969
+#: /home/runa/tor/website/en/tormedia.wml:969
 msgid "1999 Apr 13"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/code/website/en/tormedia.wml:973
+#: /home/runa/tor/website/en/tormedia.wml:973
 msgid ""
 "<a href=\"http://www.wired.com/science/discoveries/news/1999/04/19091\"> "
 "Anonymous Web Surfing? Uh-Uh</a><br/>"

Modified: translation/trunk/projects/website/templates/4-optional.translation-overview.pot
===================================================================
--- translation/trunk/projects/website/templates/4-optional.translation-overview.pot	2010-08-23 19:40:14 UTC (rev 23029)
+++ translation/trunk/projects/website/templates/4-optional.translation-overview.pot	2010-08-23 19:47:54 UTC (rev 23030)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-08-23 20:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,18 +17,18 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h1>
-#: /home/runa/code/website/en/translation-overview.wml:9
+#: /home/runa/tor/website/en/translation-overview.wml:9
 msgid "Tor: Translation Overview"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/translation-overview.wml:10
-#: /tmp/_qOGrfk1Lg.xml:25
+#: /home/runa/tor/website/en/translation-overview.wml:10
+#: /tmp/CEWL_oDzev.xml:25
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/translation-overview.wml:13
+#: /home/runa/tor/website/en/translation-overview.wml:13
 msgid ""
 "The Tor bundles include several different programs, all of which need "
 "translation help. In order of importance they are: <a href=\"<page vidalia/"
@@ -39,17 +39,17 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/translation-overview.wml:22
+#: /home/runa/tor/website/en/translation-overview.wml:22
 msgid "<a id=\"TTP\"></a> <a id=\"TTPVidalia\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/translation-overview.wml:24
+#: /home/runa/tor/website/en/translation-overview.wml:24
 msgid "<a class=\"anchor\" href=\"#TTP\">Using The Tor Translation Portal</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/translation-overview.wml:28
+#: /home/runa/tor/website/en/translation-overview.wml:28
 msgid ""
 "The <a href=\"https://translation.torproject.org/\">Tor Translation Portal</"
 "a> is a website that lets users contribute translations online using their "
@@ -59,7 +59,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/translation-overview.wml:36
+#: /home/runa/tor/website/en/translation-overview.wml:36
 msgid ""
 "You can check the status of all translations for a given project by visiting "
 "each project page.  The following statuses are updated in real time when new "
@@ -70,18 +70,18 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/translation-overview.wml:46
+#: /home/runa/tor/website/en/translation-overview.wml:46
 msgid ""
 "To get started using our translation website, you need to sign up for an "
-"account. Visit the <a href=\"https://translation.torproject.org/register.html"
-"\">account registration page</a> to get started. Be sure to enter a proper "
-"email address and a strong password. After you fill in the form and use the "
-"'Register Account' button, you should see some text indicating that things "
-"worked out:"
+"account. Visit the <a href=\"https://translation.torproject.org/accounts/"
+"register/\">account registration page</a> to get started. Be sure to enter a "
+"proper email address and a strong password. After you fill in the form and "
+"use the 'Register Account' button, you should see some text indicating that "
+"things worked out:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/code/website/en/translation-overview.wml:54
+#: /home/runa/tor/website/en/translation-overview.wml:54
 #, no-wrap
 msgid ""
 "Account created. You will be emailed login details and an activation code.\n"
@@ -89,14 +89,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/translation-overview.wml:59
+#: /home/runa/tor/website/en/translation-overview.wml:59
 msgid ""
 "Shortly after you see this text an email will be sent to the email address "
 "you provided. The email should look something like the following:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/code/website/en/translation-overview.wml:62
+#: /home/runa/tor/website/en/translation-overview.wml:62
 #, no-wrap
 msgid ""
 "A Pootle account has been created for you using this email address.\n"
@@ -110,7 +110,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/translation-overview.wml:73
+#: /home/runa/tor/website/en/translation-overview.wml:73
 msgid ""
 "Once you've received the email, you'll need to activate your account by "
 "visiting the <a href=\"https://translation.torproject.org/activate.html"
@@ -120,7 +120,7 @@
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/code/website/en/translation-overview.wml:81
+#: /home/runa/tor/website/en/translation-overview.wml:81
 #, no-wrap
 msgid ""
 "Redirecting to login Page...\n"
@@ -128,7 +128,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/translation-overview.wml:86
+#: /home/runa/tor/website/en/translation-overview.wml:86
 msgid ""
 "When you login to your new account, you'll be prompted to configure your "
 "basic language preferences on the <a href=\"https://translation.torproject."
@@ -140,12 +140,12 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/translation-overview.wml:96
+#: /home/runa/tor/website/en/translation-overview.wml:96
 msgid "You're ready to translate!"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/translation-overview.wml:100
+#: /home/runa/tor/website/en/translation-overview.wml:100
 msgid ""
 "At this point, you can select a project, such as <a href=\"https://"
 "translation.torproject.org/projects/vidalia/\">Vidalia</a>. You'll see a "
@@ -165,7 +165,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/translation-overview.wml:119
+#: /home/runa/tor/website/en/translation-overview.wml:119
 msgid ""
 "If you're able, please translate the string you see and click the 'Submit' "
 "button. If you're unsure, click the 'Suggest' button. Feel free to leave "
@@ -174,35 +174,35 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/translation-overview.wml:126
+#: /home/runa/tor/website/en/translation-overview.wml:126
 msgid ""
 "When you're finished, you need to commit your changes. Return to the page "
 "with the <a href=\"https://translation.torproject.org/de/vidalia/index.html?"
 "editing=1\">Editing Functions</a>, and click on the \"<a href='https://"
 "translation.torproject.org/de/vidalia/index.html?editing=1&amp;"
 "docommit=1&amp;commitfile=vidalia_de.po'>Commit</a>\" link. This will commit "
-"your changes into the <a href=\"https://svn.torproject.org/svn/translation/"
-"trunk/projects/vidalia/de/\">Translation subversion module</a> in the "
+"your changes into the <a href=\"https://trac.vidalia-project.net/browser/"
+"vidalia/trunk/src/vidalia/i18n\">Translation subversion module</a> in the "
 "specific area as specified by your choices of language and project (Vidalia "
 "and German, for this example)."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/translation-overview.wml:138
+#: /home/runa/tor/website/en/translation-overview.wml:138
 msgid ""
 "That's all there is to it! Be sure to go through the steps again and "
 "contribute to Torbutton and Torcheck too."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/translation-overview.wml:143
+#: /home/runa/tor/website/en/translation-overview.wml:143
 msgid ""
 "If your language isn't in the list of options yet, send mail to <tt>tor-"
 "translation AT torproject.org</tt> and we'll add it for you."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/translation-overview.wml:148
+#: /home/runa/tor/website/en/translation-overview.wml:148
 msgid ""
 "For more advanced users who like to translate without a web browser, you can "
 "also download the .po file directly. You'll find this option after clicking "

Modified: translation/trunk/projects/website/templates/4-optional.translation.pot
===================================================================
--- translation/trunk/projects/website/templates/4-optional.translation.pot	2010-08-23 19:40:14 UTC (rev 23029)
+++ translation/trunk/projects/website/templates/4-optional.translation.pot	2010-08-23 19:47:54 UTC (rev 23030)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-08-23 20:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,17 +17,17 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/translation.wml:9
+#: /home/runa/tor/website/en/translation.wml:9
 msgid "Tor Website Translation Guidelines"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/translation.wml:10
+#: /home/runa/tor/website/en/translation.wml:10
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/translation.wml:13
+#: /home/runa/tor/website/en/translation.wml:13
 msgid ""
 "If you want to help translate the Tor website and documentation into other "
 "languages, here are some guidelines to help you do this as efficiently as "
@@ -35,7 +35,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/translation.wml:19
+#: /home/runa/tor/website/en/translation.wml:19
 msgid ""
 "If you would like to help translate other Tor project related information, "
 "please visit our <a href=\"<page translation-overview>\">Translation "
@@ -45,15 +45,8 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/translation.wml:26
+#: /home/runa/tor/website/en/translation.wml:26
 msgid ""
-"To get an idea how current our translations are, we have created a page with "
-"the current <a href=\"<page translation-status>\">translation status</a>."
-msgstr ""
-
-#. type: Content of: <div><p>
-#: /home/runa/code/website/en/translation.wml:31
-msgid ""
 "Note that even if you can't translate many pages for your language, a few "
 "pages will still be helpful.  Also, rather than just translating each page "
 "word by word, please try to translate the ideas so they make the most sense "
@@ -61,7 +54,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/translation.wml:38
+#: /home/runa/tor/website/en/translation.wml:33
 msgid ""
 "We would also like some translations for the diagrams on <a href=\"<page "
 "overview>\">the overview page</a>. You can just send us the text that should "
@@ -70,7 +63,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/translation.wml:43
+#: /home/runa/tor/website/en/translation.wml:38
 msgid ""
 "When you have some pages ready, send them to the <tt>tor-translation</tt> "
 "alias on the <a href=\"<page contact>\">contact page</a>.  (If you have "
@@ -80,7 +73,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/translation.wml:51
+#: /home/runa/tor/website/en/translation.wml:46
 msgid ""
 "Other projects related to Tor also need translators. Please see our "
 "translation portal for <a href=\"<page translation-overview>\">translating "

Modified: translation/trunk/projects/website/templates/4-optional.volunteer.pot
===================================================================
--- translation/trunk/projects/website/templates/4-optional.volunteer.pot	2010-08-23 19:40:14 UTC (rev 23029)
+++ translation/trunk/projects/website/templates/4-optional.volunteer.pot	2010-08-23 19:47:54 UTC (rev 23030)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-08-23 20:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,26 +17,26 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/volunteer.wml:10
+#: /home/runa/tor/website/en/volunteer.wml:10
 msgid "A few things everyone can do now:"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:12
+#: /home/runa/tor/website/en/volunteer.wml:12
 msgid ""
 "Please consider <a href=\"<page docs/tor-doc-relay>\">running a relay</a> to "
 "help the Tor network grow."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:14
+#: /home/runa/tor/website/en/volunteer.wml:14
 msgid ""
 "Tell your friends! Get them to run relays. Get them to run hidden services. "
 "Get them to tell their friends."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:16
+#: /home/runa/tor/website/en/volunteer.wml:16
 msgid ""
 "If you like Tor's goals, please <a href=\"<page donate>\">take a moment to "
 "donate to support further Tor development</a>. We're also looking for more "
@@ -46,7 +46,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:21
+#: /home/runa/tor/website/en/volunteer.wml:21
 msgid ""
 "We're looking for more <a href=\"<page torusers>\">good examples of Tor "
 "users and Tor use cases</a>. If you use Tor for a scenario or purpose not "
@@ -55,24 +55,24 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/volunteer.wml:27
+#: /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/code/website/en/volunteer.wml:30
+#: /home/runa/tor/website/en/volunteer.wml:30
 msgid "<a id=\"Documentation\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/volunteer.wml:31
+#: /home/runa/tor/website/en/volunteer.wml:31
 msgid "<a class=\"anchor\" href=\"#Documentation\">Documentation</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:33
+#: /home/runa/tor/website/en/volunteer.wml:33
 msgid ""
 "Help translate the web page and documentation into other languages. See the "
 "<a href=\"<page translation>\">translation guidelines</a> if you want to "
@@ -81,34 +81,32 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:37
+#: /home/runa/tor/website/en/volunteer.wml:37
 msgid ""
-"Evaluate and document <a href=\"https://trac.torproject.org/projects/tor/"
-"wiki/TheOnionRouter/TorifyHOWTO\">our list of programs</a> that can be "
-"configured to use Tor."
+"Evaluate and document <a href=\"<wiki>TorifyHOWTO\">our list of programs</a> "
+"that can be configured to use Tor."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:40
+#: /home/runa/tor/website/en/volunteer.wml:40
 msgid ""
-"We have a huge list of <a href=\"https://trac.torproject.org/projects/tor/"
-"wiki/TheOnionRouter/SupportPrograms\">potentially useful programs that "
-"interface to Tor</a>. Which ones are useful in which situations? Please help "
-"us test them out and document your results."
+"We have a huge list of <a href=\"<wiki>SupportPrograms\">potentially useful "
+"programs that interface to Tor</a>. Which ones are useful in which "
+"situations? Please help us test them out and document your results."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/volunteer.wml:46
+#: /home/runa/tor/website/en/volunteer.wml:46
 msgid "<a id=\"Advocacy\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/volunteer.wml:47
+#: /home/runa/tor/website/en/volunteer.wml:47
 msgid "<a class=\"anchor\" href=\"#Advocacy\">Advocacy</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:49
+#: /home/runa/tor/website/en/volunteer.wml:49
 msgid ""
 "Create a <a href=\"https://trac.torproject.org/projects/tor/wiki/"
 "CommunityLogos\">community logo</a> under a Creative Commons license that "
@@ -116,14 +114,14 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:50
+#: /home/runa/tor/website/en/volunteer.wml:50
 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/code/website/en/volunteer.wml:51
+#: /home/runa/tor/website/en/volunteer.wml:51
 msgid ""
 "Create a video about the positive uses of Tor, what Tor is, or how to use "
 "it.  Some have already started on <a href=\"http://media.torproject.org/"
@@ -133,24 +131,24 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:57
+#: /home/runa/tor/website/en/volunteer.wml:57
 msgid ""
 "Create a poster, or a set of posters, around a theme, such as \"Tor for "
 "Freedom!\""
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/volunteer.wml:61
+#: /home/runa/tor/website/en/volunteer.wml:61
 msgid "<a id=\"Coding\"></a> <a id=\"Summer\"></a> <a id=\"Projects\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/volunteer.wml:64
+#: /home/runa/tor/website/en/volunteer.wml:64
 msgid "<a class=\"anchor\" href=\"#Projects\">Good Coding Projects</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/volunteer.wml:67
+#: /home/runa/tor/website/en/volunteer.wml:67
 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 "
@@ -165,7 +163,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:82
+#: /home/runa/tor/website/en/volunteer.wml:82
 msgid ""
 "<b>Tor Browser Bundle for Mac OS X</b> <br /> Priority: <i>High</i> <br /> "
 "Effort Level: <i>High</i> <br /> Skill Level: <i>Medium</i> <br /> Likely "
@@ -197,7 +195,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:124
+#: /home/runa/tor/website/en/volunteer.wml:124
 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: "
@@ -220,7 +218,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:154
+#: /home/runa/tor/website/en/volunteer.wml:154
 msgid ""
 "<b>Rewrite TorDNSEL, this time with a spec!</b> <br /> Priority: <i>High</i> "
 "<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Medium</i> <br /> "
@@ -255,7 +253,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:199
+#: /home/runa/tor/website/en/volunteer.wml:199
 msgid ""
 "<b>Improving Tor's ability to resist censorship</b> <br /> Priority: "
 "<i>Medium to High</i> <br /> Effort Level: <i>Medium to High</i> <br /> "
@@ -269,24 +267,24 @@
 "bridges>\">bridge relay addresses</a> to users that can't reach the Tor "
 "network directly, but there's an arms race between algorithms for "
 "distributing addresses and algorithms for gathering and blocking them. See "
-"<a href=\"https://blog.torproject.org/blog/bridge-distribution-strategies"
-"\">our blog post on the topic</a> as an overview, and then look at <a href="
-"\"http://archives.seul.org/or/dev/Dec-2009/msg00000.html\">Roger's or-dev "
-"post</a> from December for more recent thoughts &mdash; lots of design work "
-"remains.  <br /> If you want to get more into the guts of Tor itself (C), a "
-"more minor problem we should address is that current Tors can only listen on "
-"a single address/port combination at a time. There's <a href=\"<gitblob>doc/"
-"spec/proposals/118-multiple-orports.txt\">a proposal to address this "
-"limitation</a> and allow clients to connect to any given Tor on multiple "
-"addresses and ports, but it needs more work.  <br /> This project could "
-"involve a lot of research and design. One of the big challenges will be "
-"identifying and crafting approaches that can still resist an adversary even "
-"after the adversary knows the design, and then trading off censorship "
-"resistance with usability and robustness."
+"<a href=\"<blog>bridge-distribution-strategies\">our blog post on the topic</"
+"a> as an overview, and then look at <a href=\"http://archives.seul.org/or/"
+"dev/Dec-2009/msg00000.html\">Roger's or-dev post</a> from December for more "
+"recent thoughts &mdash; lots of design work remains.  <br /> If you want to "
+"get more into the guts of Tor itself (C), a more minor problem we should "
+"address is that current Tors can only listen on a single address/port "
+"combination at a time. There's <a href=\"<gitblob>doc/spec/proposals/118-"
+"multiple-orports.txt\">a proposal to address this limitation</a> and allow "
+"clients to connect to any given Tor on multiple addresses and ports, but it "
+"needs more work.  <br /> This project could involve a lot of research and "
+"design. One of the big challenges will be identifying and crafting "
+"approaches that can still resist an adversary even after the adversary knows "
+"the design, and then trading off censorship resistance with usability and "
+"robustness."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:242
+#: /home/runa/tor/website/en/volunteer.wml:242
 msgid ""
 "<b>Tor Controller Status Event Interface for Vidalia</b> <br /> Priority: "
 "<i>Medium</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low "
@@ -319,7 +317,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:285
+#: /home/runa/tor/website/en/volunteer.wml:285
 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 /> "
@@ -338,7 +336,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:312
+#: /home/runa/tor/website/en/volunteer.wml:312
 msgid ""
 "<b>Help with independent Tor client implementations</b> <br /> Priority: "
 "<i>Medium</i> <br /> Effort Level: <i>High</i> <br /> Skill Level: <i>Medium "
@@ -359,7 +357,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:340
+#: /home/runa/tor/website/en/volunteer.wml:340
 msgid ""
 "<b>More on Orbot &amp; Android OS-specific development</b> <br/> <br /> "
 "Priority: <i>Medium</i> <br /> Effort Level: <i>High</i> <br /> Skill Level: "
@@ -399,7 +397,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:365
+#: /home/runa/tor/website/en/volunteer.wml:365
 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: "
@@ -421,7 +419,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:429
+#: /home/runa/tor/website/en/volunteer.wml:429
 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 /"
@@ -442,7 +440,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:459
+#: /home/runa/tor/website/en/volunteer.wml:459
 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: "
@@ -466,7 +464,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:493
+#: /home/runa/tor/website/en/volunteer.wml:493
 msgid ""
 "<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Medium</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> "
@@ -479,7 +477,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:511
+#: /home/runa/tor/website/en/volunteer.wml:511
 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 "
@@ -502,7 +500,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:541
+#: /home/runa/tor/website/en/volunteer.wml:541
 msgid ""
 "<b>Improvements for Tor+Vidalia interaction on Linux/Unix platforms</b> <br /"
 "> Priority: <i>Medium</i> <br /> Effort Level: <i>Medium</i> <br /> Skill "
@@ -541,7 +539,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:591
+#: /home/runa/tor/website/en/volunteer.wml:591
 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 "
@@ -552,7 +550,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:608
+#: /home/runa/tor/website/en/volunteer.wml:608
 msgid ""
 "<b>An authenticating IRC proxy</b> <br /> Priority: <i>Low</i> <br /> Effort "
 "Level: <i>Medium to High</i> <br /> Skill Level: <i>Medium to High</i> <br /"
@@ -582,7 +580,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:644
+#: /home/runa/tor/website/en/volunteer.wml:644
 msgid ""
 "<b>Make torsocks/dsocks work on OS X</b> <br /> Priority: <i>Medium</i> <br /"
 "> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Medium</i> <br /> "
@@ -604,44 +602,44 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:673
+#: /home/runa/tor/website/en/volunteer.wml:673
 msgid ""
 "<b>Bring up new ideas!</b> <br /> Don't like any of these? Look at the <a "
-"href=\"<gitblob>doc/roadmaps/2008-12-19-roadmap-full.pdf\">Tor development "
+"href=\"<svnprojects>roadmaps/2008-12-19-roadmap-full.pdf\">Tor development "
 "roadmap</a> for more ideas, or just try out Tor, Vidalia, and Torbutton, and "
 "find out what you think needs fixing.  Some of the <a href=\"<gittree>doc/"
 "spec/proposals\">current proposals</a> might also be short on developers."
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/volunteer.wml:685
+#: /home/runa/tor/website/en/volunteer.wml:685
 msgid "<a id=\"OtherCoding\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/volunteer.wml:686
+#: /home/runa/tor/website/en/volunteer.wml:686
 msgid ""
 "<a class=\"anchor\" href=\"#OtherCoding\">Other Coding and Design related "
 "ideas</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:688
+#: /home/runa/tor/website/en/volunteer.wml:688
 msgid ""
 "Tor relays don't work well on Windows XP. On Windows, Tor uses the standard "
 "<tt>select()</tt> system call, which uses space in the non-page pool. This "
 "means that a medium sized Tor relay will empty the non-page pool, <a href="
-"\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/"
-"WindowsBufferProblems\">causing havoc and system crashes</a>. We should "
-"probably be using overlapped IO instead. One solution would be to teach <a "
-"href=\"http://www.monkey.org/~provos/libevent/\">libevent</a> how to use "
-"overlapped IO rather than select() on Windows, and then adapt Tor to the new "
-"libevent interface. Christian King made a <a href=\"https://svn.torproject."
-"org/svn/libevent-urz/trunk/\">good start</a> on this in the summer of 2007."
+"\"<wiki>WindowsBufferProblems\">causing havoc and system crashes</a>. We "
+"should probably be using overlapped IO instead. One solution would be to "
+"teach <a href=\"http://www.monkey.org/~provos/libevent/\">libevent</a> how "
+"to use overlapped IO rather than select() on Windows, and then adapt Tor to "
+"the new libevent interface. Christian King made a <a href=\"https://svn."
+"torproject.org/svn/libevent-urz/trunk/\">good start</a> on this in the "
+"summer of 2007."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:701
+#: /home/runa/tor/website/en/volunteer.wml:701
 msgid ""
 "We need to actually start building our <a href=\"<page "
 "documentation>#DesignDoc\">blocking-resistance design</a>. This involves "
@@ -651,7 +649,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:707
+#: /home/runa/tor/website/en/volunteer.wml:707
 msgid ""
 "We need a flexible simulator framework for studying end-to-end traffic "
 "confirmation attacks. Many researchers have whipped up ad hoc simulators to "
@@ -665,7 +663,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:717
+#: /home/runa/tor/website/en/volunteer.wml:717
 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 "
@@ -674,7 +672,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:720
+#: /home/runa/tor/website/en/volunteer.wml:720
 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 "
@@ -683,21 +681,21 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:725
+#: /home/runa/tor/website/en/volunteer.wml:725
 msgid ""
 "Tor uses TCP for transport and TLS for link encryption. This is nice and "
 "simple, but it means all cells on a link are delayed when a single packet "
 "gets dropped, and it means we can only reasonably support TCP streams. We "
-"have a <a href=\"https://trac.torproject.org/projects/tor/wiki/"
-"TheOnionRouter/TorFAQ#YoushouldtransportallIPpacketsnotjustTCPpackets."
-"\">list of reasons why we haven't shifted to UDP transport</a>, but it would "
-"be great to see that list get shorter. We also have a proposed <a href="
-"\"<gitblob>doc/spec/proposals/100-tor-spec-udp.txt\">specification for Tor "
-"and UDP</a> &mdash; please let us know what's wrong with it."
+"have a <a href="
+"\"<wiki>TorFAQ#YoushouldtransportallIPpacketsnotjustTCPpackets.\">list of "
+"reasons why we haven't shifted to UDP transport</a>, but it would be great "
+"to see that list get shorter. We also have a proposed <a href=\"<gitblob>doc/"
+"spec/proposals/100-tor-spec-udp.txt\">specification for Tor and UDP</a> "
+"&mdash; please let us know what's wrong with it."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:736
+#: /home/runa/tor/website/en/volunteer.wml:736
 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 "
@@ -705,7 +703,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:740
+#: /home/runa/tor/website/en/volunteer.wml:740
 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 "
@@ -716,7 +714,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:747
+#: /home/runa/tor/website/en/volunteer.wml:747
 msgid ""
 "How can we make the various LiveCD/USB systems easier to maintain, improve, "
 "and document? One example is <a href=\"https://amnesia.boum.org/\">The "
@@ -724,7 +722,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:754
+#: /home/runa/tor/website/en/volunteer.wml:754
 msgid ""
 "Another anti-censorship project is to try to make Tor more scanning-"
 "resistant.  Right now, an adversary can identify <a href=\"<gitblob>doc/spec/"
@@ -738,17 +736,17 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/code/website/en/volunteer.wml:768
+#: /home/runa/tor/website/en/volunteer.wml:768
 msgid "<a id=\"Research\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h2>
-#: /home/runa/code/website/en/volunteer.wml:769
+#: /home/runa/tor/website/en/volunteer.wml:769
 msgid "<a class=\"anchor\" href=\"#Research\">Research</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:771
+#: /home/runa/tor/website/en/volunteer.wml:771
 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:"
@@ -762,7 +760,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:781
+#: /home/runa/tor/website/en/volunteer.wml:781
 msgid ""
 "A related question is: Does running a relay/bridge provide additional "
 "protection against these timing attacks? Can an external adversary that "
@@ -782,7 +780,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:796
+#: /home/runa/tor/website/en/volunteer.wml:796
 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 "
@@ -801,7 +799,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:811
+#: /home/runa/tor/website/en/volunteer.wml:811
 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 "
@@ -816,7 +814,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:821
+#: /home/runa/tor/website/en/volunteer.wml:821
 msgid ""
 "Other research questions regarding geographic diversity consider the "
 "tradeoff between choosing an efficient circuit and choosing a random "
@@ -828,7 +826,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:828
+#: /home/runa/tor/website/en/volunteer.wml:828
 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 "
@@ -845,7 +843,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:840
+#: /home/runa/tor/website/en/volunteer.wml:840
 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 "
@@ -856,7 +854,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:847
+#: /home/runa/tor/website/en/volunteer.wml:847
 msgid ""
 "Our censorship-resistance goals include preventing an attacker who's looking "
 "at Tor traffic on the wire from <a href=\"<svnprojects>design-paper/blocking."
@@ -872,7 +870,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:858
+#: /home/runa/tor/website/en/volunteer.wml:858
 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 "
@@ -883,7 +881,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:865
+#: /home/runa/tor/website/en/volunteer.wml:865
 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 "
@@ -891,7 +889,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:868
+#: /home/runa/tor/website/en/volunteer.wml:868
 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 "
@@ -911,7 +909,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:885
+#: /home/runa/tor/website/en/volunteer.wml:885
 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 "
@@ -928,7 +926,7 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/code/website/en/volunteer.wml:898
+#: /home/runa/tor/website/en/volunteer.wml:898
 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 "
@@ -936,7 +934,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/code/website/en/volunteer.wml:906
+#: /home/runa/tor/website/en/volunteer.wml:906
 msgid ""
 "<a href=\"<page contact>\">Let us know</a> if you've made progress on any of "
 "these!"

Modified: translation/trunk/projects/website/templates/docs/3-low.rpms.pot
===================================================================
--- translation/trunk/projects/website/templates/docs/3-low.rpms.pot	2010-08-23 19:40:14 UTC (rev 23029)
+++ translation/trunk/projects/website/templates/docs/3-low.rpms.pot	2010-08-23 19:47:54 UTC (rev 23030)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-08-23 20:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,31 +17,31 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/rpms.wml:11
+#: /home/runa/tor/website/docs/en/rpms.wml:11
 msgid "<a id=\"rpms\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/code/website/docs/en/rpms.wml:12
+#: /home/runa/tor/website/docs/en/rpms.wml:12
 msgid ""
 "<a class=\"anchor\" href=\"#rpms\">Tor packages for rpm-based linux "
 "distributions.</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/rpms.wml:14 /tmp/cqc6B254uq.xml:64
+#: /home/runa/tor/website/docs/en/rpms.wml:14 /tmp/ZK26lRe3za.xml:65
 msgid "<br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/rpms.wml:16
+#: /home/runa/tor/website/docs/en/rpms.wml:16
 msgid ""
 "Do not use the packages in the native repositories. They are frequently out "
 "of date. That means you'll be missing stability and security fixes."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/rpms.wml:22
+#: /home/runa/tor/website/docs/en/rpms.wml:22
 msgid ""
 "You'll need to set up our package repository before you can fetch Tor.  "
 "Assuming yum, in /etc/yum.repos.d/, create a file called torproject.repo.  "
@@ -49,7 +49,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p><pre>
-#: /home/runa/code/website/docs/en/rpms.wml:25
+#: /home/runa/tor/website/docs/en/rpms.wml:25
 #, no-wrap
 msgid ""
 "[torproject]\n"
@@ -63,30 +63,37 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/rpms.wml:35
+#: /home/runa/tor/website/docs/en/rpms.wml:35
 msgid ""
 "If you wish to track the stable releases of Tor, you should substitute "
-"DISTRIBUTION with one of the following: centos4, centos5, fc10, fc11, fc12, "
+"DISTRIBUTION with one of the following: centos4, centos5, fc11, fc12, fc13, "
 "suse"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/rpms.wml:39
+#: /home/runa/tor/website/docs/en/rpms.wml:39
 msgid ""
 "To track experimental releases, substitute DISTRIBUTION with one of these: "
-"centos4-experimental, centos5-experimental, fc10-experimental, fc11-"
-"experimental, fc12-experimental, suse-experimental"
+"centos4-experimental, centos5-experimental, fc11-experimental, fc12-"
+"experimental, fc13-experimental, suse-experimental"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/rpms.wml:44
+#: /home/runa/tor/website/docs/en/rpms.wml:43
 msgid ""
+"To install tor from your non-root user account, type \"sudo yum install tor"
+"\" or use your favorite package manager."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/rpms.wml:46
+msgid ""
 "Now Tor is installed and running. Move on to <a href=\"<page docs/tor-doc-"
 "unix>#polipo\">step two</a> of the \"Tor on Linux/Unix\" instructions."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/rpms.wml:50
+#: /home/runa/tor/website/docs/en/rpms.wml:51
 msgid ""
 "The DNS name <code>deb.torproject.org</code> is actually a set of "
 "independent servers in a DNS round robin configuration.  If you for some "
@@ -96,29 +103,29 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/rpms.wml:58
+#: /home/runa/tor/website/docs/en/rpms.wml:59
 msgid "<hr /> <hr /> <a id=\"source\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/code/website/docs/en/rpms.wml:63
+#: /home/runa/tor/website/docs/en/rpms.wml:64
 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/rpms.wml:67
+#: /home/runa/tor/website/docs/en/rpms.wml:68
 msgid ""
 "If you'd like to build from source, please follow the <a href=\"<gitblob>doc/"
 "tor-rpm-creation.txt\">rpm creation instructions</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/rpms.wml:71
+#: /home/runa/tor/website/docs/en/rpms.wml:72
 msgid "<hr />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/rpms.wml:73
+#: /home/runa/tor/website/docs/en/rpms.wml:74
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "contact>\">send them to us</a>. Thanks!"



More information about the tor-commits mailing list