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

[or-cvs] r21886: {translation} updated files for pootle (in translation/trunk/projects/website: ar ar/docs bms bms/docs de de/docs es es/docs et et/docs fa fa/docs fr fr/docs it it/docs nb nb/docs nl nl/docs pl pl/docs pt pt/docs ru ru/docs sv sv/docs tr tr/docs zh_CN zh_CN/docs)



Author: runa
Date: 2010-03-09 08:27:12 +0000 (Tue, 09 Mar 2010)
New Revision: 21886

Modified:
   translation/trunk/projects/website/ar/2-medium.donate.po
   translation/trunk/projects/website/ar/2-medium.verifying-signatures.po
   translation/trunk/projects/website/ar/3-low.download-unix.po
   translation/trunk/projects/website/ar/3-low.people.po
   translation/trunk/projects/website/ar/4-optional.volunteer.po
   translation/trunk/projects/website/ar/docs/3-low.debian.po
   translation/trunk/projects/website/ar/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/bms/2-medium.donate.po
   translation/trunk/projects/website/bms/2-medium.verifying-signatures.po
   translation/trunk/projects/website/bms/3-low.download-unix.po
   translation/trunk/projects/website/bms/3-low.people.po
   translation/trunk/projects/website/bms/4-optional.volunteer.po
   translation/trunk/projects/website/bms/docs/3-low.debian.po
   translation/trunk/projects/website/bms/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/de/1-high.bridges.po
   translation/trunk/projects/website/de/1-high.download.po
   translation/trunk/projects/website/de/2-medium.donate.po
   translation/trunk/projects/website/de/2-medium.verifying-signatures.po
   translation/trunk/projects/website/de/3-low.download-unix.po
   translation/trunk/projects/website/de/3-low.people.po
   translation/trunk/projects/website/de/4-optional.translation-overview.po
   translation/trunk/projects/website/de/4-optional.volunteer.po
   translation/trunk/projects/website/de/docs/3-low.debian.po
   translation/trunk/projects/website/de/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/es/2-medium.donate.po
   translation/trunk/projects/website/es/2-medium.verifying-signatures.po
   translation/trunk/projects/website/es/3-low.download-unix.po
   translation/trunk/projects/website/es/3-low.people.po
   translation/trunk/projects/website/es/4-optional.volunteer.po
   translation/trunk/projects/website/es/docs/3-low.debian.po
   translation/trunk/projects/website/es/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/et/2-medium.donate.po
   translation/trunk/projects/website/et/2-medium.verifying-signatures.po
   translation/trunk/projects/website/et/3-low.download-unix.po
   translation/trunk/projects/website/et/3-low.people.po
   translation/trunk/projects/website/et/4-optional.volunteer.po
   translation/trunk/projects/website/et/docs/3-low.debian.po
   translation/trunk/projects/website/et/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/fa/2-medium.donate.po
   translation/trunk/projects/website/fa/2-medium.verifying-signatures.po
   translation/trunk/projects/website/fa/3-low.download-unix.po
   translation/trunk/projects/website/fa/3-low.people.po
   translation/trunk/projects/website/fa/4-optional.volunteer.po
   translation/trunk/projects/website/fa/docs/3-low.debian.po
   translation/trunk/projects/website/fa/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/fr/1-high.bridges.po
   translation/trunk/projects/website/fr/1-high.download.po
   translation/trunk/projects/website/fr/1-high.easy-download.po
   translation/trunk/projects/website/fr/1-high.finding-tor.po
   translation/trunk/projects/website/fr/2-medium.donate.po
   translation/trunk/projects/website/fr/2-medium.faq.po
   translation/trunk/projects/website/fr/2-medium.verifying-signatures.po
   translation/trunk/projects/website/fr/3-low.download-unix.po
   translation/trunk/projects/website/fr/3-low.people.po
   translation/trunk/projects/website/fr/4-optional.volunteer.po
   translation/trunk/projects/website/fr/docs/3-low.debian.po
   translation/trunk/projects/website/fr/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/it/2-medium.donate.po
   translation/trunk/projects/website/it/2-medium.verifying-signatures.po
   translation/trunk/projects/website/it/3-low.download-unix.po
   translation/trunk/projects/website/it/3-low.people.po
   translation/trunk/projects/website/it/4-optional.volunteer.po
   translation/trunk/projects/website/it/docs/3-low.debian.po
   translation/trunk/projects/website/it/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/nb/2-medium.donate.po
   translation/trunk/projects/website/nb/2-medium.verifying-signatures.po
   translation/trunk/projects/website/nb/3-low.download-unix.po
   translation/trunk/projects/website/nb/3-low.people.po
   translation/trunk/projects/website/nb/4-optional.volunteer.po
   translation/trunk/projects/website/nb/docs/3-low.debian.po
   translation/trunk/projects/website/nb/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/nl/2-medium.donate.po
   translation/trunk/projects/website/nl/2-medium.verifying-signatures.po
   translation/trunk/projects/website/nl/3-low.download-unix.po
   translation/trunk/projects/website/nl/3-low.people.po
   translation/trunk/projects/website/nl/4-optional.volunteer.po
   translation/trunk/projects/website/nl/docs/3-low.debian.po
   translation/trunk/projects/website/nl/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/pl/2-medium.donate.po
   translation/trunk/projects/website/pl/2-medium.faq.po
   translation/trunk/projects/website/pl/2-medium.verifying-signatures.po
   translation/trunk/projects/website/pl/3-low.download-unix.po
   translation/trunk/projects/website/pl/3-low.people.po
   translation/trunk/projects/website/pl/4-optional.volunteer.po
   translation/trunk/projects/website/pl/docs/3-low.debian.po
   translation/trunk/projects/website/pl/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/pt/2-medium.donate.po
   translation/trunk/projects/website/pt/2-medium.verifying-signatures.po
   translation/trunk/projects/website/pt/3-low.download-unix.po
   translation/trunk/projects/website/pt/3-low.people.po
   translation/trunk/projects/website/pt/4-optional.volunteer.po
   translation/trunk/projects/website/pt/docs/3-low.debian.po
   translation/trunk/projects/website/pt/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/ru/2-medium.donate.po
   translation/trunk/projects/website/ru/2-medium.verifying-signatures.po
   translation/trunk/projects/website/ru/3-low.download-unix.po
   translation/trunk/projects/website/ru/3-low.people.po
   translation/trunk/projects/website/ru/4-optional.volunteer.po
   translation/trunk/projects/website/ru/docs/1-high.tor-doc-windows.po
   translation/trunk/projects/website/ru/docs/3-low.debian.po
   translation/trunk/projects/website/ru/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/sv/2-medium.donate.po
   translation/trunk/projects/website/sv/2-medium.verifying-signatures.po
   translation/trunk/projects/website/sv/3-low.download-unix.po
   translation/trunk/projects/website/sv/3-low.people.po
   translation/trunk/projects/website/sv/4-optional.volunteer.po
   translation/trunk/projects/website/sv/docs/3-low.debian.po
   translation/trunk/projects/website/sv/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/tr/2-medium.donate.po
   translation/trunk/projects/website/tr/2-medium.verifying-signatures.po
   translation/trunk/projects/website/tr/3-low.download-unix.po
   translation/trunk/projects/website/tr/3-low.people.po
   translation/trunk/projects/website/tr/4-optional.volunteer.po
   translation/trunk/projects/website/tr/docs/3-low.debian.po
   translation/trunk/projects/website/tr/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/zh_CN/2-medium.donate.po
   translation/trunk/projects/website/zh_CN/2-medium.verifying-signatures.po
   translation/trunk/projects/website/zh_CN/3-low.download-unix.po
   translation/trunk/projects/website/zh_CN/3-low.people.po
   translation/trunk/projects/website/zh_CN/4-optional.volunteer.po
   translation/trunk/projects/website/zh_CN/docs/3-low.debian.po
   translation/trunk/projects/website/zh_CN/docs/3-low.tor-doc-unix.po
Log:
updated files for pootle

Modified: translation/trunk/projects/website/ar/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/ar/2-medium.donate.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/ar/2-medium.donate.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:00+0100\n"
+"POT-Creation-Date: 2010-03-09 09:17+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -61,7 +61,7 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:32 /tmp/qCj61mtJS6.xml:102
+#: /home/runa/tor/website/en/donate.wml:32 /tmp/jjOcmfbIuG.xml:102
 msgid "<br />"
 msgstr ""
 
@@ -143,17 +143,17 @@
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:72 /tmp/qCj61mtJS6.xml:114
+#: /home/runa/tor/website/en/donate.wml:72 /tmp/jjOcmfbIuG.xml:114
 msgid "$"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:73 /tmp/qCj61mtJS6.xml:115
+#: /home/runa/tor/website/en/donate.wml:73 /tmp/jjOcmfbIuG.xml:115
 msgid "â"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:74 /tmp/qCj61mtJS6.xml:116
+#: /home/runa/tor/website/en/donate.wml:74 /tmp/jjOcmfbIuG.xml:116
 msgid "Â"
 msgstr ""
 
@@ -248,7 +248,8 @@
 
 #. type: Content of: <div><p><address>
 #: /home/runa/tor/website/en/donate.wml:136
-msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
+msgid ""
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 USA"
 msgstr ""
 
 #. type: Content of: <div><p>

Modified: translation/trunk/projects/website/ar/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/ar/2-medium.verifying-signatures.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/ar/2-medium.verifying-signatures.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 23:43+0100\n"
+"POT-Creation-Date: 2010-03-09 09:17+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -22,7 +22,7 @@
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/verifying-signatures.wml:10
-#: /tmp/fO93INnD1I.xml:33 /tmp/fO93INnD1I.xml:45 /tmp/fO93INnD1I.xml:92
+#: /tmp/YqO6_FFHr9.xml:34 /tmp/YqO6_FFHr9.xml:46 /tmp/YqO6_FFHr9.xml:93
 msgid "<hr />"
 msgstr ""
 
@@ -80,61 +80,66 @@
 msgid "Jacob's (0x9D0FACE4)"
 msgstr ""
 
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/verifying-signatures.wml:30
+msgid "Erinn's (0x63FEE659) and (0xF1F5C9B5)"
+msgstr ""
+
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:32
+#: /home/runa/tor/website/en/verifying-signatures.wml:33
 msgid "Step One: Import the keys"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:34
+#: /home/runa/tor/website/en/verifying-signatures.wml:35
 msgid "You can import keys directly from GnuPG as well:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:36
+#: /home/runa/tor/website/en/verifying-signatures.wml:37
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --recv-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:38
+#: /home/runa/tor/website/en/verifying-signatures.wml:39
 msgid "or search for keys with"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:40
+#: /home/runa/tor/website/en/verifying-signatures.wml:41
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --search-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:42
+#: /home/runa/tor/website/en/verifying-signatures.wml:43
 msgid "and when you select one, it will be added to your keyring."
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:44
+#: /home/runa/tor/website/en/verifying-signatures.wml:45
 msgid "Step Two: Verify the fingerprints"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:46
+#: /home/runa/tor/website/en/verifying-signatures.wml:47
 msgid "Verify the pgp fingerprints using:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:47
+#: /home/runa/tor/website/en/verifying-signatures.wml:48
 #, no-wrap
 msgid "gpg --fingerprint (insert keyid here)"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/verifying-signatures.wml:48
+#: /home/runa/tor/website/en/verifying-signatures.wml:49
 msgid "The fingerprints for the keys should be:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:51
+#: /home/runa/tor/website/en/verifying-signatures.wml:52
 #, no-wrap
 msgid ""
 "pub   1024D/28988BF5 2000-02-27\n"
@@ -174,7 +179,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:87
+#: /home/runa/tor/website/en/verifying-signatures.wml:88
 msgid ""
 "(Of course if you want to be really certain that those are the real ones "
 "then you should check this from more places or even better get into key "
@@ -182,12 +187,12 @@
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:91
+#: /home/runa/tor/website/en/verifying-signatures.wml:92
 msgid "Step Three: Verify the downloaded package"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:93
+#: /home/runa/tor/website/en/verifying-signatures.wml:94
 msgid ""
 "If you're using GnuPG, then put the .asc and the download in the same "
 "directory and type \"gpg --verify (whatever).asc (whatever)\". It will say "
@@ -196,7 +201,7 @@
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:99
+#: /home/runa/tor/website/en/verifying-signatures.wml:100
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc tor-0.1.0.17.tar.gz\n"
@@ -209,7 +214,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:109
+#: /home/runa/tor/website/en/verifying-signatures.wml:110
 msgid ""
 "Notice that there is a warning because you haven't assigned a trust index to "
 "this user. This means that your program verified the key made that "
@@ -222,19 +227,19 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:118
+#: /home/runa/tor/website/en/verifying-signatures.wml:119
 msgid "All this means is you can ignore the message or assign a trust level."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:120
+#: /home/runa/tor/website/en/verifying-signatures.wml:121
 msgid ""
 "For your reference, this is an example of a <em>BAD</em> verification. It "
 "means that the signature and file contents do not match:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:124
+#: /home/runa/tor/website/en/verifying-signatures.wml:125
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc\n"
@@ -243,14 +248,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:129
+#: /home/runa/tor/website/en/verifying-signatures.wml:130
 msgid ""
 "If you see a message like the above one, then you should not trust the file "
 "contents."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:131
+#: /home/runa/tor/website/en/verifying-signatures.wml:132
 msgid ""
 "If you are running Tor on Debian you should read the instructions on <a href="
 "\"<page docs/debian>#packages\">importing these keys to apt</a>."

Modified: translation/trunk/projects/website/ar/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/ar/3-low.download-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/ar/3-low.download-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:30+0100\n"
+"POT-Creation-Date: 2010-03-09 09:17+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/MWiFwqexE9.xml:40
-#: /tmp/MWiFwqexE9.xml:56 /tmp/MWiFwqexE9.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/jagXXiwvSv.xml:40
+#: /tmp/jagXXiwvSv.xml:56 /tmp/jagXXiwvSv.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -184,54 +184,79 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:84
-msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgid ""
+"<img src=\"images/distros/android-market.gif\" alt=\"Android\" width=\"32\" "
+"height=\"32\"/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:85
-msgid "Source tarballs"
+msgid "Android"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /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/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/tor/website/en/download-unix.wml:92
+msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:93
+msgid "Source tarballs"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:95
+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/tor/website/en/download-unix.wml:91
+#: /home/runa/tor/website/en/download-unix.wml:99
 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/tor/website/en/download-unix.wml:94
+#: /home/runa/tor/website/en/download-unix.wml:102
 msgid "<kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:101
+#: /home/runa/tor/website/en/download-unix.wml:109
 msgid "<a id=\"packagediff\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:102
+#: /home/runa/tor/website/en/download-unix.wml:110
 msgid ""
 "<a class=\"anchor\" href=\"#packagediff\">What's the difference between "
 "Stable &amp; Unstable?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:105
+#: /home/runa/tor/website/en/download-unix.wml:113
 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/tor/website/en/download-unix.wml:109
+#: /home/runa/tor/website/en/download-unix.wml:117
 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 "
@@ -241,7 +266,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:118
+#: /home/runa/tor/website/en/download-unix.wml:126
 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 "
@@ -251,7 +276,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:125
+#: /home/runa/tor/website/en/download-unix.wml:133
 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 "
@@ -259,7 +284,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:134
+#: /home/runa/tor/website/en/download-unix.wml:142
 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 "
@@ -269,7 +294,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><form>
-#: /home/runa/tor/website/en/download-unix.wml:142
+#: /home/runa/tor/website/en/download-unix.wml:150
 msgid ""
 "<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
 "\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
@@ -278,18 +303,18 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:152
+#: /home/runa/tor/website/en/download-unix.wml:160
 msgid "<a id=\"Warning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:153
+#: /home/runa/tor/website/en/download-unix.wml:161
 msgid ""
 "<a class=\"anchor\" href=\"#Warning\">Warning: Want Tor to really work?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:157
+#: /home/runa/tor/website/en/download-unix.wml:165
 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> "
@@ -298,7 +323,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:165
+#: /home/runa/tor/website/en/download-unix.wml:173
 msgid ""
 "Tor only protects Internet applications that are configured to send their "
 "traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
@@ -308,7 +333,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:173
+#: /home/runa/tor/website/en/download-unix.wml:181
 msgid ""
 "Browser plugins such as Java, Flash, ActiveX, RealPlayer, Quicktime, Adobe's "
 "PDF plugin, and others can be manipulated into revealing your IP address. "
@@ -324,7 +349,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:189
+#: /home/runa/tor/website/en/download-unix.wml:197
 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. "
@@ -334,7 +359,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:197
+#: /home/runa/tor/website/en/download-unix.wml:205
 msgid ""
 "Tor anonymizes the origin of your traffic, and it encrypts everything inside "
 "the Tor network, but <a href=\"https://wiki.torproject.org/noreply/";
@@ -346,7 +371,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:208
+#: /home/runa/tor/website/en/download-unix.wml:216
 msgid ""
 "While Tor blocks attackers on your local network from discovering or "
 "influencing your destination, it opens new risks: malicious or misconfigured "
@@ -355,12 +380,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:216
+#: /home/runa/tor/website/en/download-unix.wml:224
 msgid "<br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:218
+#: /home/runa/tor/website/en/download-unix.wml:226
 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 "
@@ -368,7 +393,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:228
+#: /home/runa/tor/website/en/download-unix.wml:236
 msgid ""
 "See our <a href=\"<page verifying-signatures>\">FAQ entry on verifying "
 "package signatures</a>, which allows you to make sure you've downloaded the "
@@ -376,7 +401,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:234
+#: /home/runa/tor/website/en/download-unix.wml:242
 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</"
@@ -384,7 +409,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:240
+#: /home/runa/tor/website/en/download-unix.wml:248
 msgid ""
 "See the <a href=\"<page documentation>#Developers\">developer documentation</"
 "a> for instructions on fetching Tor from Git to get the very latest "
@@ -394,19 +419,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:252
+#: /home/runa/tor/website/en/download-unix.wml:260
 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/tor/website/en/download-unix.wml:256
+#: /home/runa/tor/website/en/download-unix.wml:264
 msgid "<a id=\"ChangeLog\"></a> <a id=\"Stable\"></a> <a id=\"Testing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:260
+#: /home/runa/tor/website/en/download-unix.wml:268
 msgid ""
 "For a list of what has changed in each stable Tor release, see the <a href="
 "\"<gitblob>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in both "

Modified: translation/trunk/projects/website/ar/3-low.people.po
===================================================================
--- translation/trunk/projects/website/ar/3-low.people.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/ar/3-low.people.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:00+0100\n"
+"POT-Creation-Date: 2010-03-09 09:17+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -60,8 +60,8 @@
 #. type: Content of: <div><address>
 #: /home/runa/tor/website/en/people.wml:30
 msgid ""
-"The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA<br /"
-"><br />"
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 "
+"USA<br /><br />"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -542,34 +542,56 @@
 
 #. type: Content of: <div><dl><dt>
 #: /home/runa/tor/website/en/people.wml:202
-msgid "Kasimir Gabert"
+msgid "Marco Bonetti"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:202
+msgid "Focusing on MobileTor for the iPhone."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:203
+msgid "Nathan Freitas"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:203
 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/tor/website/en/people.wml:205
+msgid "Kasimir Gabert"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:205
+msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\";>TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid "Robert Hogan"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\";>TorK</a> Tor controller."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid "Damian Johnson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid ""
 "Builds a command-line application for monitoring Tor relays, providing real-"
 "time status information such as the current configuration, bandwidth usage, "
@@ -578,106 +600,118 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid ""
 "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
 "and Privoxy still work well together."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid "Kory Kirk"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid ""
 "Worked during Google Summer of Code 2009 on extending Torbutton. Now he's "
 "working with Bruce Leidl on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Bruce Leidl"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Working on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid ""
 "A lawyer with the CCC in Germany. Coordinates the German Tor community with "
 "respect to legal questions and concerns."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:224
+msgid "Linus Nordberg"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:224
+msgid ""
+"Enjoys measuring the Tor network and helps with outreach in the Nordic "
+"countries."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:226
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:226
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid "Martin Peck"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:225
+#: /home/runa/tor/website/en/people.wml:230
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:231
 msgid ""
 "The most dedicated bug reporter we've ever heard from. He must read Tor "
 "source code every day over breakfast."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy";
@@ -686,24 +720,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?";
 "p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/";
@@ -712,7 +746,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:241
+#: /home/runa/tor/website/en/people.wml:246
 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, "
@@ -720,32 +754,32 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:252
 msgid "<a id=\"Past\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:248
+#: /home/runa/tor/website/en/people.wml:253
 msgid "<a class=\"anchor\" href=\"#Past\">Past thanks to:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "John Bashinski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "Contributed the initial rpm spec file."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid "Domenik Bork"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid ""
 "Worked on Configuration of Hidden Services with User Authorization in "
 "Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches/";
@@ -753,12 +787,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 msgid "Benedikt Boss"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 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 "
@@ -766,22 +800,22 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Ren Bucholz"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Our fine logo and images."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 msgid "Fallon Chen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 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="
@@ -790,32 +824,32 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Bram Cohen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Helped design our congestion control mechanisms, in Tor's early days."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Pat Double"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Creator of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid "Geoff Goodell"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid ""
 "Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/";
 "\">Blossom project</a> which uses Tor as its overlay network; also helped "
@@ -823,12 +857,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid "Aleksei Gorny"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid ""
 "Working on Tor exit scanner improvements (<a href=\"https://svn.torproject.";
 "org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
@@ -836,52 +870,52 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Christian Grothoff"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Contributed better daemonizing behavior."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Steven Hazel"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Made 'make install' do the right thing."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "Justin Hipple"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "The other developer for Vidalia."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Jason Holt"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Contributed patches to the instructions and the man page."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 msgid "Christian King"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 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-";
@@ -889,70 +923,70 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid "Joe Kowalski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid ""
 "Original author and provider of the torstatus script formerly run on "
 "nighteffect."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Adam Langley"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Our fine eventdns code."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid "Rebecca MacKinnon"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid ""
 "Former Director of Tor.  Co-Founder of <a href=\"http://www.";
 "globalvoicesonline.org/\">Global Voices Online</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid "Chris Palmer"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid ""
 "Our liaison and tech guy with EFF while EFF was funding us. Also helped "
 "advocate and write end-user docs."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid "Matej Pfajfar"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid ""
 "Author of the original onion routing code that Tor is based on, so we didn't "
 "have to start from scratch."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 msgid "Johannes Renner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 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 "
@@ -960,33 +994,33 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid "Scott Squires"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid ""
 "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Aaron Turner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Contributed the first version of the tor.sh initscripts shell script."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 msgid "Stephen Tyree"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 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 "
@@ -995,12 +1029,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid "Camilo Viecco"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid ""
 "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac.";
 "vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
@@ -1008,12 +1042,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 msgid "Fred von Lohmann"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 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/?";
@@ -1021,12 +1055,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid "Christian Wilms"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid ""
 "Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
 "\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";
@@ -1034,12 +1068,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 msgid "Jillian C. York"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 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/ar/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/ar/4-optional.volunteer.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/ar/4-optional.volunteer.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:00+0100\n"
+"POT-Creation-Date: 2010-03-09 09:17+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,21 +252,22 @@
 "Messaging client). Components are pre-configured to operate in a secure way, "
 "and it has very few dependencies on the installed operating system. It has "
 "therefore become one of the most easy to use, and popular, ways to use Tor "
-"on Windows.  <br /> However, there is currently no working package for Linux "
-"and Mac OS X, so this project would be to implement Tor Browser Bundle for "
-"these platforms. This will involve modifications to Vidalia (C++), possibly "
-"Firefox (C) then creating and testing the launcher on a range of operating "
-"system versions and configurations to verify portability.  Some work on this "
-"was completed as part of the Google Summer of Code 2009. Another part of "
-"this project is to identify all of the traces left behind by using a Tor "
-"Browser Bundle on Mac OS X or Linux.  Developing ways to stop, counter, or "
-"remove these traces is a final step.  <br /> Students should be familiar "
-"with application development on one or preferably both of Linux and Mac OS "
-"X, and be comfortable with C/C++ and shell scripting.  <br /> Part of this "
-"project could be usability testing of Tor Browser Bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
+"on Windows.  <br /> However, there is currently no released package for "
+"Linux and Mac OS X, so this project would be to implement Tor Browser Bundle "
+"for OS X and continue work on the Tor Browser Bundle for Linux. This will "
+"involve modifications to Vidalia (C++), possibly Firefox (C) then creating "
+"and testing the launcher on a range of operating system versions and "
+"configurations to verify portability.  Some work on this was completed as "
+"part of the Google Summer of Code 2009. Another part of this project is to "
+"identify all of the traces left behind by using a Tor Browser Bundle on Mac "
+"OS X or Linux.  Developing ways to stop, counter, or remove these traces is "
+"a final step.  <br /> Students should be familiar with application "
+"development on one or preferably both of Linux and Mac OS X, and be "
+"comfortable with C/C++ and shell scripting.  <br /> Part of this project "
+"could be usability testing of Tor Browser Bundle, ideally amongst our target "
+"demographic.  That would help a lot in knowing what needs to be done in "
+"terms of bug fixes or new features. We get this informally at the moment, "
+"but a more structured process would be better."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -320,27 +321,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:225
-msgid ""
-"<b>Tuneup Tor!</b> <br /> Priority: <i>Medium to High</i> <br /> Effort "
-"Level: <i>Medium to High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Nick, Roger, Mike, Karsten</i> <br /> Right now, Tor relays "
-"measure and report their own bandwidth, and Tor clients choose which relays "
-"to use in part based on that bandwidth.  This approach is vulnerable to <a "
-"href=\"http://freehaven.net/anonbib/#bauer:wpes2007\";>attacks where relays "
-"lie about their bandwidth</a>; to address this, Tor currently caps the "
-"maximum bandwidth it's willing to believe any relay provides.  This is a "
-"limited fix, and a waste of bandwidth capacity to boot.  Instead, Tor should "
-"possibly measure bandwidth in a more distributed way, perhaps as described "
-"in the <a href=\"http://freehaven.net/anonbib/author.html#snader08\";>\"A "
-"Tune-up for Tor\"</a> paper by Snader and Borisov. One could use current "
-"testing code to double-check this paper's findings and verify the extent to "
-"which they dovetail with Tor as deployed in the wild, and determine good "
-"ways to incorporate them into their suggestions Tor network without adding "
-"too much communications overhead between relays and directory authorities."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:256
 msgid ""
 "<b>Improving Polipo on Windows</b> <br /> Priority: <i>Medium to High</i> "
@@ -382,17 +362,17 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:283
 msgid ""
-"<b>Tor Controller Status Event Interface</b> <br /> Priority: <i>Medium</i> "
-"<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> "
-"<br /> Likely Mentors: <i>Matt</i> <br /> There are a number of status "
-"changes inside Tor of which the user may need to be informed. For example, "
-"if the user is trying to set up his Tor as a relay and Tor decides that its "
-"ports are not reachable from outside the user's network, we should alert the "
-"user. Currently, all the user gets is a couple log messages in Vidalia's "
-"'message log' window, which they likely never see since they don't receive a "
-"notification that something has gone wrong. Even if the user does actually "
-"look at the message log, most of the messages make little sense to the "
-"novice user.  <br /> Tor has the ability to inform Vidalia of many such "
+"<b>Tor Controller Status Event Interface for Vidalia</b> <br /> Priority: "
+"<i>Medium</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low "
+"to Medium</i> <br /> Likely Mentors: <i>Matt</i> <br /> There are a number "
+"of status changes inside Tor of which the user may need to be informed. For "
+"example, if the user is trying to set up his Tor as a relay and Tor decides "
+"that its ports are not reachable from outside the user's network, we should "
+"alert the user. Currently, all the user gets is a couple log messages in "
+"Vidalia's 'message log' window, which they likely never see since they don't "
+"receive a notification that something has gone wrong. Even if the user does "
+"actually look at the message log, most of the messages make little sense to "
+"the novice user.  <br /> Tor has the ability to inform Vidalia of many such "
 "status changes, and we recently implemented support for a couple of these "
 "events. Still, there are many more status events the user should be informed "
 "of and we need a better UI for actually displaying them to the user.  <br /> "
@@ -477,40 +457,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:415
-msgid ""
-"<b>New Thandy Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Medium to High</i> <br /> Likely "
-"Mentors: <i>Martin</i> <br /> Additional capabilities are needed for "
-"assisted updates of all the Tor related software for Windows and other "
-"operating systems. Some of the features to consider include:"
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:429
-msgid ""
-"Integration of the <a href=\"http://chandlerproject.org/Projects/MeTooCrypto";
-"\">MeTooCrypto Python library</a> for authenticated HTTPS downloads."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:433
-msgid ""
-"Adding a level of indirection between the timestamp signatures and the "
-"package files included in an update. See the \"Thandy attacks / suggestions"
-"\" thread on or-dev."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:436
-msgid ""
-"Support locale specific installation and configuration of assisted updates "
-"based on preference, host, or user account language settings.  Familiarity "
-"with Windows codepages, unicode, and other character sets is helpful in "
-"addition to general win32 and posix API experience and Python proficiency."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:445
 msgid ""
 "<b>Simulator for slow Internet connections</b> <br /> Priority: <i>Medium</"
@@ -558,27 +504,14 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:509
 msgid ""
-"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Low</i> <br /"
-"> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Mike</i> <br /> We're hearing from an increasing number of users "
-"that they want to use Thunderbird with Tor. However, there are plenty of "
-"application-level concerns, for example, by default Thunderbird will put "
-"your hostname in the outgoing mail that it sends. At some point we should "
-"start a new push to build a Thunderbird extension similar to Torbutton."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:527
-msgid ""
-"<b>Intermediate Level Network Device Driver</b> <br /> Priority: <i>Low</i> "
+"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Medium</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> "
-"Likely Mentors: <i>Martin</i> <br /> The WinPCAP device driver used by Tor "
-"VM for bridged networking does not support a number of wireless and non-"
-"Ethernet network adapters.  Implementation of a intermediate level network "
-"device driver for win32 and 64bit would provide a way to intercept and route "
-"traffic over such networks. This project will require knowledge of and "
-"experience with Windows kernel device driver development and testing. "
-"Familiarity with Winsock and Qemu would also be helpful."
+"Likely Mentors: <i>Mike</i> <br /> We're hearing from an increasing number "
+"of users that they want to use Thunderbird with Tor. However, there are "
+"plenty of application-level concerns, for example, by default Thunderbird "
+"will put your hostname in the outgoing mail that it sends. At some point we "
+"should start a new push to build a Thunderbird extension similar to "
+"Torbutton."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -643,35 +576,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:621
-msgid ""
-"<b>Tor/Polipo/Vidalia Auto-Update Framework</b> <br /> We're in need of a "
-"good authenticated-update framework.  Vidalia already has the ability to "
-"notice when the user is running an outdated or unrecommended version of Tor, "
-"using signed statements inside the Tor directory information. Currently, "
-"Vidalia simply pops up a little message box that lets the user know they "
-"should manually upgrade. The goal of this project would be to extend Vidalia "
-"with the ability to also fetch and install the updated Tor software for the "
-"user. We should do the fetches via Tor when possible, but also fall back to "
-"direct fetches in a smart way. Time permitting, we would also like to be "
-"able to update other applications included in the bundled installers, such "
-"as Polipo and Vidalia itself.  <br /> To complete this project, the student "
-"will first need to first investigate the existing auto-update frameworks (e."
-"g., Sparkle on OS X) to evaluate their strengths, weaknesses, security "
-"properties, and ability to be integrated into Vidalia. If none are found to "
-"be suitable, the student will design their own auto-update framework, "
-"document the design, and then discuss the design with other developers to "
-"assess any security issues. The student will then implement their framework "
-"(or integrate an existing one) and test it.  <br /> A person undertaking "
-"this project should have good C++ development experience. Previous "
-"experience with Qt is helpful, but not required. One should also have a good "
-"understanding of common security practices, such as package signature "
-"verification. Good writing ability is also important for this project, since "
-"a vital step of the project will be producing a design document to review "
-"and discuss with others prior to implementation."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:655
 msgid ""
 "<b>Improving the Tor QA process: Continuous Integration for builds</b> <br /"
@@ -699,17 +603,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:683
-msgid ""
-"<b>Usability testing of Tor</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> <br /> Likely "
-"Mentors: <i>Andrew</i> <br /> Especially the browser bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:700
 msgid ""
 "<b>An authenticating IRC proxy</b> <br /> Priority: <i>Medium</i> <br /> "

Modified: translation/trunk/projects/website/ar/docs/3-low.debian.po
===================================================================
--- translation/trunk/projects/website/ar/docs/3-low.debian.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/ar/docs/3-low.debian.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 23:43+0100\n"
+"POT-Creation-Date: 2010-03-09 09:17+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -28,8 +28,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/SvcTwiyJOg.xml:40
-#: /tmp/SvcTwiyJOg.xml:96 /tmp/SvcTwiyJOg.xml:130
+#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/ve25T948YN.xml:40
+#: /tmp/ve25T948YN.xml:96 /tmp/ve25T948YN.xml:130
 msgid "<br />"
 msgstr ""
 
@@ -49,8 +49,8 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/SvcTwiyJOg.xml:77
-#: /tmp/SvcTwiyJOg.xml:121 /tmp/SvcTwiyJOg.xml:164
+#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/ve25T948YN.xml:77
+#: /tmp/ve25T948YN.xml:121 /tmp/ve25T948YN.xml:164
 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."
@@ -94,8 +94,9 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:59
 msgid ""
-"where you substitute the above word (etch, lenny, sid, karmic, jaunty, "
-"intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you put the codename of your distribution (i.e. etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy or whatever it is) in place of &lt;"
+"DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -165,8 +166,8 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:106
 msgid ""
-"where you substitute the name of your distro (etch, lenny, sid, karmic, "
-"jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you again substitute the name of your distro (etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/ar/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/ar/docs/3-low.tor-doc-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/ar/docs/3-low.tor-doc-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:29+0100\n"
+"POT-Creation-Date: 2010-03-09 09:17+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/r16kK3PRwK.xml:24
-#: /tmp/r16kK3PRwK.xml:54 /tmp/r16kK3PRwK.xml:88 /tmp/r16kK3PRwK.xml:131
-#: /tmp/r16kK3PRwK.xml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/ickLbg5aDg.xml:24
+#: /tmp/ickLbg5aDg.xml:54 /tmp/ickLbg5aDg.xml:88 /tmp/ickLbg5aDg.xml:131
+#: /tmp/ickLbg5aDg.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -63,10 +63,10 @@
 "If you're building from source, first install <a href=\"http://www.monkey.";
 "org/~provos/libevent/\">libevent</a>, and make sure you have openssl and "
 "zlib (including the -devel packages if applicable). Then run:<br /> <tt>tar "
-"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable><br /> ./configure "
-"&amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</tt>, or "
-"you can run <tt>make install</tt> (as root if necessary) to install it into /"
-"usr/local/, and then you can start it just by running <tt>tor</tt>."
+"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable></tt><br /> <tt>./"
+"configure &amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</"
+"tt>, or you can run <tt>make install</tt> (as root if necessary) to install "
+"it into /usr/local/, and then you can start it just by running <tt>tor</tt>."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/bms/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/bms/2-medium.donate.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/bms/2-medium.donate.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:07+0100\n"
+"POT-Creation-Date: 2010-03-09 09:24+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -61,7 +61,7 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:32 /tmp/y_QjM43xE8.xml:102
+#: /home/runa/tor/website/en/donate.wml:32 /tmp/yQeBtuKWJ4.xml:102
 msgid "<br />"
 msgstr ""
 
@@ -143,17 +143,17 @@
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:72 /tmp/y_QjM43xE8.xml:114
+#: /home/runa/tor/website/en/donate.wml:72 /tmp/yQeBtuKWJ4.xml:114
 msgid "$"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:73 /tmp/y_QjM43xE8.xml:115
+#: /home/runa/tor/website/en/donate.wml:73 /tmp/yQeBtuKWJ4.xml:115
 msgid "â"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:74 /tmp/y_QjM43xE8.xml:116
+#: /home/runa/tor/website/en/donate.wml:74 /tmp/yQeBtuKWJ4.xml:116
 msgid "Â"
 msgstr ""
 
@@ -248,7 +248,8 @@
 
 #. type: Content of: <div><p><address>
 #: /home/runa/tor/website/en/donate.wml:136
-msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
+msgid ""
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 USA"
 msgstr ""
 
 #. type: Content of: <div><p>

Modified: translation/trunk/projects/website/bms/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/bms/2-medium.verifying-signatures.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/bms/2-medium.verifying-signatures.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:07+0100\n"
+"POT-Creation-Date: 2010-03-09 09:24+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -22,7 +22,7 @@
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/verifying-signatures.wml:10
-#: /tmp/zPTW8Fb7FR.xml:33 /tmp/zPTW8Fb7FR.xml:45 /tmp/zPTW8Fb7FR.xml:92
+#: /tmp/JC827mA9gz.xml:34 /tmp/JC827mA9gz.xml:46 /tmp/JC827mA9gz.xml:93
 msgid "<hr />"
 msgstr ""
 
@@ -80,61 +80,66 @@
 msgid "Jacob's (0x9D0FACE4)"
 msgstr ""
 
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/verifying-signatures.wml:30
+msgid "Erinn's (0x63FEE659) and (0xF1F5C9B5)"
+msgstr ""
+
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:32
+#: /home/runa/tor/website/en/verifying-signatures.wml:33
 msgid "Step One: Import the keys"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:34
+#: /home/runa/tor/website/en/verifying-signatures.wml:35
 msgid "You can import keys directly from GnuPG as well:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:36
+#: /home/runa/tor/website/en/verifying-signatures.wml:37
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --recv-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:38
+#: /home/runa/tor/website/en/verifying-signatures.wml:39
 msgid "or search for keys with"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:40
+#: /home/runa/tor/website/en/verifying-signatures.wml:41
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --search-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:42
+#: /home/runa/tor/website/en/verifying-signatures.wml:43
 msgid "and when you select one, it will be added to your keyring."
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:44
+#: /home/runa/tor/website/en/verifying-signatures.wml:45
 msgid "Step Two: Verify the fingerprints"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:46
+#: /home/runa/tor/website/en/verifying-signatures.wml:47
 msgid "Verify the pgp fingerprints using:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:47
+#: /home/runa/tor/website/en/verifying-signatures.wml:48
 #, no-wrap
 msgid "gpg --fingerprint (insert keyid here)"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/verifying-signatures.wml:48
+#: /home/runa/tor/website/en/verifying-signatures.wml:49
 msgid "The fingerprints for the keys should be:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:51
+#: /home/runa/tor/website/en/verifying-signatures.wml:52
 #, no-wrap
 msgid ""
 "pub   1024D/28988BF5 2000-02-27\n"
@@ -174,7 +179,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:87
+#: /home/runa/tor/website/en/verifying-signatures.wml:88
 msgid ""
 "(Of course if you want to be really certain that those are the real ones "
 "then you should check this from more places or even better get into key "
@@ -182,12 +187,12 @@
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:91
+#: /home/runa/tor/website/en/verifying-signatures.wml:92
 msgid "Step Three: Verify the downloaded package"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:93
+#: /home/runa/tor/website/en/verifying-signatures.wml:94
 msgid ""
 "If you're using GnuPG, then put the .asc and the download in the same "
 "directory and type \"gpg --verify (whatever).asc (whatever)\". It will say "
@@ -196,7 +201,7 @@
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:99
+#: /home/runa/tor/website/en/verifying-signatures.wml:100
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc tor-0.1.0.17.tar.gz\n"
@@ -209,7 +214,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:109
+#: /home/runa/tor/website/en/verifying-signatures.wml:110
 msgid ""
 "Notice that there is a warning because you haven't assigned a trust index to "
 "this user. This means that your program verified the key made that "
@@ -222,19 +227,19 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:118
+#: /home/runa/tor/website/en/verifying-signatures.wml:119
 msgid "All this means is you can ignore the message or assign a trust level."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:120
+#: /home/runa/tor/website/en/verifying-signatures.wml:121
 msgid ""
 "For your reference, this is an example of a <em>BAD</em> verification. It "
 "means that the signature and file contents do not match:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:124
+#: /home/runa/tor/website/en/verifying-signatures.wml:125
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc\n"
@@ -243,14 +248,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:129
+#: /home/runa/tor/website/en/verifying-signatures.wml:130
 msgid ""
 "If you see a message like the above one, then you should not trust the file "
 "contents."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:131
+#: /home/runa/tor/website/en/verifying-signatures.wml:132
 msgid ""
 "If you are running Tor on Debian you should read the instructions on <a href="
 "\"<page docs/debian>#packages\">importing these keys to apt</a>."

Modified: translation/trunk/projects/website/bms/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/bms/3-low.download-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/bms/3-low.download-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:37+0100\n"
+"POT-Creation-Date: 2010-03-09 09:24+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/VK3JllCHMH.xml:40
-#: /tmp/VK3JllCHMH.xml:56 /tmp/VK3JllCHMH.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/gp3qi_mmU_.xml:40
+#: /tmp/gp3qi_mmU_.xml:56 /tmp/gp3qi_mmU_.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -184,54 +184,79 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:84
-msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgid ""
+"<img src=\"images/distros/android-market.gif\" alt=\"Android\" width=\"32\" "
+"height=\"32\"/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:85
-msgid "Source tarballs"
+msgid "Android"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /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/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/tor/website/en/download-unix.wml:92
+msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:93
+msgid "Source tarballs"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:95
+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/tor/website/en/download-unix.wml:91
+#: /home/runa/tor/website/en/download-unix.wml:99
 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/tor/website/en/download-unix.wml:94
+#: /home/runa/tor/website/en/download-unix.wml:102
 msgid "<kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:101
+#: /home/runa/tor/website/en/download-unix.wml:109
 msgid "<a id=\"packagediff\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:102
+#: /home/runa/tor/website/en/download-unix.wml:110
 msgid ""
 "<a class=\"anchor\" href=\"#packagediff\">What's the difference between "
 "Stable &amp; Unstable?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:105
+#: /home/runa/tor/website/en/download-unix.wml:113
 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/tor/website/en/download-unix.wml:109
+#: /home/runa/tor/website/en/download-unix.wml:117
 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 "
@@ -241,7 +266,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:118
+#: /home/runa/tor/website/en/download-unix.wml:126
 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 "
@@ -251,7 +276,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:125
+#: /home/runa/tor/website/en/download-unix.wml:133
 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 "
@@ -259,7 +284,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:134
+#: /home/runa/tor/website/en/download-unix.wml:142
 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 "
@@ -269,7 +294,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><form>
-#: /home/runa/tor/website/en/download-unix.wml:142
+#: /home/runa/tor/website/en/download-unix.wml:150
 msgid ""
 "<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
 "\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
@@ -278,18 +303,18 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:152
+#: /home/runa/tor/website/en/download-unix.wml:160
 msgid "<a id=\"Warning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:153
+#: /home/runa/tor/website/en/download-unix.wml:161
 msgid ""
 "<a class=\"anchor\" href=\"#Warning\">Warning: Want Tor to really work?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:157
+#: /home/runa/tor/website/en/download-unix.wml:165
 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> "
@@ -298,7 +323,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:165
+#: /home/runa/tor/website/en/download-unix.wml:173
 msgid ""
 "Tor only protects Internet applications that are configured to send their "
 "traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
@@ -308,7 +333,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:173
+#: /home/runa/tor/website/en/download-unix.wml:181
 msgid ""
 "Browser plugins such as Java, Flash, ActiveX, RealPlayer, Quicktime, Adobe's "
 "PDF plugin, and others can be manipulated into revealing your IP address. "
@@ -324,7 +349,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:189
+#: /home/runa/tor/website/en/download-unix.wml:197
 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. "
@@ -334,7 +359,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:197
+#: /home/runa/tor/website/en/download-unix.wml:205
 msgid ""
 "Tor anonymizes the origin of your traffic, and it encrypts everything inside "
 "the Tor network, but <a href=\"https://wiki.torproject.org/noreply/";
@@ -346,7 +371,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:208
+#: /home/runa/tor/website/en/download-unix.wml:216
 msgid ""
 "While Tor blocks attackers on your local network from discovering or "
 "influencing your destination, it opens new risks: malicious or misconfigured "
@@ -355,12 +380,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:216
+#: /home/runa/tor/website/en/download-unix.wml:224
 msgid "<br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:218
+#: /home/runa/tor/website/en/download-unix.wml:226
 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 "
@@ -368,7 +393,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:228
+#: /home/runa/tor/website/en/download-unix.wml:236
 msgid ""
 "See our <a href=\"<page verifying-signatures>\">FAQ entry on verifying "
 "package signatures</a>, which allows you to make sure you've downloaded the "
@@ -376,7 +401,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:234
+#: /home/runa/tor/website/en/download-unix.wml:242
 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</"
@@ -384,7 +409,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:240
+#: /home/runa/tor/website/en/download-unix.wml:248
 msgid ""
 "See the <a href=\"<page documentation>#Developers\">developer documentation</"
 "a> for instructions on fetching Tor from Git to get the very latest "
@@ -394,19 +419,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:252
+#: /home/runa/tor/website/en/download-unix.wml:260
 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/tor/website/en/download-unix.wml:256
+#: /home/runa/tor/website/en/download-unix.wml:264
 msgid "<a id=\"ChangeLog\"></a> <a id=\"Stable\"></a> <a id=\"Testing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:260
+#: /home/runa/tor/website/en/download-unix.wml:268
 msgid ""
 "For a list of what has changed in each stable Tor release, see the <a href="
 "\"<gitblob>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in both "

Modified: translation/trunk/projects/website/bms/3-low.people.po
===================================================================
--- translation/trunk/projects/website/bms/3-low.people.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/bms/3-low.people.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:07+0100\n"
+"POT-Creation-Date: 2010-03-09 09:24+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -60,8 +60,8 @@
 #. type: Content of: <div><address>
 #: /home/runa/tor/website/en/people.wml:30
 msgid ""
-"The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA<br /"
-"><br />"
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 "
+"USA<br /><br />"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -542,34 +542,56 @@
 
 #. type: Content of: <div><dl><dt>
 #: /home/runa/tor/website/en/people.wml:202
-msgid "Kasimir Gabert"
+msgid "Marco Bonetti"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:202
+msgid "Focusing on MobileTor for the iPhone."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:203
+msgid "Nathan Freitas"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:203
 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/tor/website/en/people.wml:205
+msgid "Kasimir Gabert"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:205
+msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\";>TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid "Robert Hogan"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\";>TorK</a> Tor controller."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid "Damian Johnson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid ""
 "Builds a command-line application for monitoring Tor relays, providing real-"
 "time status information such as the current configuration, bandwidth usage, "
@@ -578,106 +600,118 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid ""
 "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
 "and Privoxy still work well together."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid "Kory Kirk"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid ""
 "Worked during Google Summer of Code 2009 on extending Torbutton. Now he's "
 "working with Bruce Leidl on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Bruce Leidl"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Working on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid ""
 "A lawyer with the CCC in Germany. Coordinates the German Tor community with "
 "respect to legal questions and concerns."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:224
+msgid "Linus Nordberg"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:224
+msgid ""
+"Enjoys measuring the Tor network and helps with outreach in the Nordic "
+"countries."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:226
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:226
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid "Martin Peck"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:225
+#: /home/runa/tor/website/en/people.wml:230
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:231
 msgid ""
 "The most dedicated bug reporter we've ever heard from. He must read Tor "
 "source code every day over breakfast."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy";
@@ -686,24 +720,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?";
 "p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/";
@@ -712,7 +746,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:241
+#: /home/runa/tor/website/en/people.wml:246
 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, "
@@ -720,32 +754,32 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:252
 msgid "<a id=\"Past\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:248
+#: /home/runa/tor/website/en/people.wml:253
 msgid "<a class=\"anchor\" href=\"#Past\">Past thanks to:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "John Bashinski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "Contributed the initial rpm spec file."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid "Domenik Bork"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid ""
 "Worked on Configuration of Hidden Services with User Authorization in "
 "Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches/";
@@ -753,12 +787,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 msgid "Benedikt Boss"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 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 "
@@ -766,22 +800,22 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Ren Bucholz"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Our fine logo and images."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 msgid "Fallon Chen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 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="
@@ -790,32 +824,32 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Bram Cohen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Helped design our congestion control mechanisms, in Tor's early days."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Pat Double"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Creator of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid "Geoff Goodell"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid ""
 "Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/";
 "\">Blossom project</a> which uses Tor as its overlay network; also helped "
@@ -823,12 +857,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid "Aleksei Gorny"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid ""
 "Working on Tor exit scanner improvements (<a href=\"https://svn.torproject.";
 "org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
@@ -836,52 +870,52 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Christian Grothoff"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Contributed better daemonizing behavior."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Steven Hazel"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Made 'make install' do the right thing."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "Justin Hipple"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "The other developer for Vidalia."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Jason Holt"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Contributed patches to the instructions and the man page."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 msgid "Christian King"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 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-";
@@ -889,70 +923,70 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid "Joe Kowalski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid ""
 "Original author and provider of the torstatus script formerly run on "
 "nighteffect."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Adam Langley"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Our fine eventdns code."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid "Rebecca MacKinnon"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid ""
 "Former Director of Tor.  Co-Founder of <a href=\"http://www.";
 "globalvoicesonline.org/\">Global Voices Online</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid "Chris Palmer"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid ""
 "Our liaison and tech guy with EFF while EFF was funding us. Also helped "
 "advocate and write end-user docs."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid "Matej Pfajfar"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid ""
 "Author of the original onion routing code that Tor is based on, so we didn't "
 "have to start from scratch."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 msgid "Johannes Renner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 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 "
@@ -960,33 +994,33 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid "Scott Squires"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid ""
 "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Aaron Turner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Contributed the first version of the tor.sh initscripts shell script."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 msgid "Stephen Tyree"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 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 "
@@ -995,12 +1029,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid "Camilo Viecco"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid ""
 "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac.";
 "vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
@@ -1008,12 +1042,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 msgid "Fred von Lohmann"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 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/?";
@@ -1021,12 +1055,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid "Christian Wilms"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid ""
 "Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
 "\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";
@@ -1034,12 +1068,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 msgid "Jillian C. York"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 msgid ""
 "<a href=\"http://jilliancyork.com/\";>Jillian C. York</a> is a writer, "
 "blogger, and activist based in Boston.  She blogs on the uses of Tor and "

Modified: translation/trunk/projects/website/bms/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/bms/4-optional.volunteer.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/bms/4-optional.volunteer.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:07+0100\n"
+"POT-Creation-Date: 2010-03-09 09:24+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,21 +252,22 @@
 "Messaging client). Components are pre-configured to operate in a secure way, "
 "and it has very few dependencies on the installed operating system. It has "
 "therefore become one of the most easy to use, and popular, ways to use Tor "
-"on Windows.  <br /> However, there is currently no working package for Linux "
-"and Mac OS X, so this project would be to implement Tor Browser Bundle for "
-"these platforms. This will involve modifications to Vidalia (C++), possibly "
-"Firefox (C) then creating and testing the launcher on a range of operating "
-"system versions and configurations to verify portability.  Some work on this "
-"was completed as part of the Google Summer of Code 2009. Another part of "
-"this project is to identify all of the traces left behind by using a Tor "
-"Browser Bundle on Mac OS X or Linux.  Developing ways to stop, counter, or "
-"remove these traces is a final step.  <br /> Students should be familiar "
-"with application development on one or preferably both of Linux and Mac OS "
-"X, and be comfortable with C/C++ and shell scripting.  <br /> Part of this "
-"project could be usability testing of Tor Browser Bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
+"on Windows.  <br /> However, there is currently no released package for "
+"Linux and Mac OS X, so this project would be to implement Tor Browser Bundle "
+"for OS X and continue work on the Tor Browser Bundle for Linux. This will "
+"involve modifications to Vidalia (C++), possibly Firefox (C) then creating "
+"and testing the launcher on a range of operating system versions and "
+"configurations to verify portability.  Some work on this was completed as "
+"part of the Google Summer of Code 2009. Another part of this project is to "
+"identify all of the traces left behind by using a Tor Browser Bundle on Mac "
+"OS X or Linux.  Developing ways to stop, counter, or remove these traces is "
+"a final step.  <br /> Students should be familiar with application "
+"development on one or preferably both of Linux and Mac OS X, and be "
+"comfortable with C/C++ and shell scripting.  <br /> Part of this project "
+"could be usability testing of Tor Browser Bundle, ideally amongst our target "
+"demographic.  That would help a lot in knowing what needs to be done in "
+"terms of bug fixes or new features. We get this informally at the moment, "
+"but a more structured process would be better."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -320,27 +321,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:225
-msgid ""
-"<b>Tuneup Tor!</b> <br /> Priority: <i>Medium to High</i> <br /> Effort "
-"Level: <i>Medium to High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Nick, Roger, Mike, Karsten</i> <br /> Right now, Tor relays "
-"measure and report their own bandwidth, and Tor clients choose which relays "
-"to use in part based on that bandwidth.  This approach is vulnerable to <a "
-"href=\"http://freehaven.net/anonbib/#bauer:wpes2007\";>attacks where relays "
-"lie about their bandwidth</a>; to address this, Tor currently caps the "
-"maximum bandwidth it's willing to believe any relay provides.  This is a "
-"limited fix, and a waste of bandwidth capacity to boot.  Instead, Tor should "
-"possibly measure bandwidth in a more distributed way, perhaps as described "
-"in the <a href=\"http://freehaven.net/anonbib/author.html#snader08\";>\"A "
-"Tune-up for Tor\"</a> paper by Snader and Borisov. One could use current "
-"testing code to double-check this paper's findings and verify the extent to "
-"which they dovetail with Tor as deployed in the wild, and determine good "
-"ways to incorporate them into their suggestions Tor network without adding "
-"too much communications overhead between relays and directory authorities."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:256
 msgid ""
 "<b>Improving Polipo on Windows</b> <br /> Priority: <i>Medium to High</i> "
@@ -382,17 +362,17 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:283
 msgid ""
-"<b>Tor Controller Status Event Interface</b> <br /> Priority: <i>Medium</i> "
-"<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> "
-"<br /> Likely Mentors: <i>Matt</i> <br /> There are a number of status "
-"changes inside Tor of which the user may need to be informed. For example, "
-"if the user is trying to set up his Tor as a relay and Tor decides that its "
-"ports are not reachable from outside the user's network, we should alert the "
-"user. Currently, all the user gets is a couple log messages in Vidalia's "
-"'message log' window, which they likely never see since they don't receive a "
-"notification that something has gone wrong. Even if the user does actually "
-"look at the message log, most of the messages make little sense to the "
-"novice user.  <br /> Tor has the ability to inform Vidalia of many such "
+"<b>Tor Controller Status Event Interface for Vidalia</b> <br /> Priority: "
+"<i>Medium</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low "
+"to Medium</i> <br /> Likely Mentors: <i>Matt</i> <br /> There are a number "
+"of status changes inside Tor of which the user may need to be informed. For "
+"example, if the user is trying to set up his Tor as a relay and Tor decides "
+"that its ports are not reachable from outside the user's network, we should "
+"alert the user. Currently, all the user gets is a couple log messages in "
+"Vidalia's 'message log' window, which they likely never see since they don't "
+"receive a notification that something has gone wrong. Even if the user does "
+"actually look at the message log, most of the messages make little sense to "
+"the novice user.  <br /> Tor has the ability to inform Vidalia of many such "
 "status changes, and we recently implemented support for a couple of these "
 "events. Still, there are many more status events the user should be informed "
 "of and we need a better UI for actually displaying them to the user.  <br /> "
@@ -477,40 +457,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:415
-msgid ""
-"<b>New Thandy Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Medium to High</i> <br /> Likely "
-"Mentors: <i>Martin</i> <br /> Additional capabilities are needed for "
-"assisted updates of all the Tor related software for Windows and other "
-"operating systems. Some of the features to consider include:"
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:429
-msgid ""
-"Integration of the <a href=\"http://chandlerproject.org/Projects/MeTooCrypto";
-"\">MeTooCrypto Python library</a> for authenticated HTTPS downloads."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:433
-msgid ""
-"Adding a level of indirection between the timestamp signatures and the "
-"package files included in an update. See the \"Thandy attacks / suggestions"
-"\" thread on or-dev."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:436
-msgid ""
-"Support locale specific installation and configuration of assisted updates "
-"based on preference, host, or user account language settings.  Familiarity "
-"with Windows codepages, unicode, and other character sets is helpful in "
-"addition to general win32 and posix API experience and Python proficiency."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:445
 msgid ""
 "<b>Simulator for slow Internet connections</b> <br /> Priority: <i>Medium</"
@@ -558,27 +504,14 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:509
 msgid ""
-"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Low</i> <br /"
-"> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Mike</i> <br /> We're hearing from an increasing number of users "
-"that they want to use Thunderbird with Tor. However, there are plenty of "
-"application-level concerns, for example, by default Thunderbird will put "
-"your hostname in the outgoing mail that it sends. At some point we should "
-"start a new push to build a Thunderbird extension similar to Torbutton."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:527
-msgid ""
-"<b>Intermediate Level Network Device Driver</b> <br /> Priority: <i>Low</i> "
+"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Medium</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> "
-"Likely Mentors: <i>Martin</i> <br /> The WinPCAP device driver used by Tor "
-"VM for bridged networking does not support a number of wireless and non-"
-"Ethernet network adapters.  Implementation of a intermediate level network "
-"device driver for win32 and 64bit would provide a way to intercept and route "
-"traffic over such networks. This project will require knowledge of and "
-"experience with Windows kernel device driver development and testing. "
-"Familiarity with Winsock and Qemu would also be helpful."
+"Likely Mentors: <i>Mike</i> <br /> We're hearing from an increasing number "
+"of users that they want to use Thunderbird with Tor. However, there are "
+"plenty of application-level concerns, for example, by default Thunderbird "
+"will put your hostname in the outgoing mail that it sends. At some point we "
+"should start a new push to build a Thunderbird extension similar to "
+"Torbutton."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -643,35 +576,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:621
-msgid ""
-"<b>Tor/Polipo/Vidalia Auto-Update Framework</b> <br /> We're in need of a "
-"good authenticated-update framework.  Vidalia already has the ability to "
-"notice when the user is running an outdated or unrecommended version of Tor, "
-"using signed statements inside the Tor directory information. Currently, "
-"Vidalia simply pops up a little message box that lets the user know they "
-"should manually upgrade. The goal of this project would be to extend Vidalia "
-"with the ability to also fetch and install the updated Tor software for the "
-"user. We should do the fetches via Tor when possible, but also fall back to "
-"direct fetches in a smart way. Time permitting, we would also like to be "
-"able to update other applications included in the bundled installers, such "
-"as Polipo and Vidalia itself.  <br /> To complete this project, the student "
-"will first need to first investigate the existing auto-update frameworks (e."
-"g., Sparkle on OS X) to evaluate their strengths, weaknesses, security "
-"properties, and ability to be integrated into Vidalia. If none are found to "
-"be suitable, the student will design their own auto-update framework, "
-"document the design, and then discuss the design with other developers to "
-"assess any security issues. The student will then implement their framework "
-"(or integrate an existing one) and test it.  <br /> A person undertaking "
-"this project should have good C++ development experience. Previous "
-"experience with Qt is helpful, but not required. One should also have a good "
-"understanding of common security practices, such as package signature "
-"verification. Good writing ability is also important for this project, since "
-"a vital step of the project will be producing a design document to review "
-"and discuss with others prior to implementation."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:655
 msgid ""
 "<b>Improving the Tor QA process: Continuous Integration for builds</b> <br /"
@@ -699,17 +603,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:683
-msgid ""
-"<b>Usability testing of Tor</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> <br /> Likely "
-"Mentors: <i>Andrew</i> <br /> Especially the browser bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:700
 msgid ""
 "<b>An authenticating IRC proxy</b> <br /> Priority: <i>Medium</i> <br /> "

Modified: translation/trunk/projects/website/bms/docs/3-low.debian.po
===================================================================
--- translation/trunk/projects/website/bms/docs/3-low.debian.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/bms/docs/3-low.debian.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:07+0100\n"
+"POT-Creation-Date: 2010-03-09 09:24+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -28,8 +28,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/Hy4jDm859D.xml:40
-#: /tmp/Hy4jDm859D.xml:96 /tmp/Hy4jDm859D.xml:130
+#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/zRUjNeRiPT.xml:40
+#: /tmp/zRUjNeRiPT.xml:96 /tmp/zRUjNeRiPT.xml:130
 msgid "<br />"
 msgstr ""
 
@@ -49,8 +49,8 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/Hy4jDm859D.xml:77
-#: /tmp/Hy4jDm859D.xml:121 /tmp/Hy4jDm859D.xml:164
+#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/zRUjNeRiPT.xml:77
+#: /tmp/zRUjNeRiPT.xml:121 /tmp/zRUjNeRiPT.xml:164
 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."
@@ -94,8 +94,9 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:59
 msgid ""
-"where you substitute the above word (etch, lenny, sid, karmic, jaunty, "
-"intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you put the codename of your distribution (i.e. etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy or whatever it is) in place of &lt;"
+"DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -165,8 +166,8 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:106
 msgid ""
-"where you substitute the name of your distro (etch, lenny, sid, karmic, "
-"jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you again substitute the name of your distro (etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/bms/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/bms/docs/3-low.tor-doc-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/bms/docs/3-low.tor-doc-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:37+0100\n"
+"POT-Creation-Date: 2010-03-09 09:24+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/s6WcaBtZ3_.xml:24
-#: /tmp/s6WcaBtZ3_.xml:54 /tmp/s6WcaBtZ3_.xml:88 /tmp/s6WcaBtZ3_.xml:131
-#: /tmp/s6WcaBtZ3_.xml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/Yp6cqPqzVQ.xml:24
+#: /tmp/Yp6cqPqzVQ.xml:54 /tmp/Yp6cqPqzVQ.xml:88 /tmp/Yp6cqPqzVQ.xml:131
+#: /tmp/Yp6cqPqzVQ.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -63,10 +63,10 @@
 "If you're building from source, first install <a href=\"http://www.monkey.";
 "org/~provos/libevent/\">libevent</a>, and make sure you have openssl and "
 "zlib (including the -devel packages if applicable). Then run:<br /> <tt>tar "
-"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable><br /> ./configure "
-"&amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</tt>, or "
-"you can run <tt>make install</tt> (as root if necessary) to install it into /"
-"usr/local/, and then you can start it just by running <tt>tor</tt>."
+"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable></tt><br /> <tt>./"
+"configure &amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</"
+"tt>, or you can run <tt>make install</tt> (as root if necessary) to install "
+"it into /usr/local/, and then you can start it just by running <tt>tor</tt>."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/de/1-high.bridges.po
===================================================================
--- translation/trunk/projects/website/de/1-high.bridges.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/de/1-high.bridges.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-03-03 22:15+0100\n"
+"POT-Creation-Date: 2010-03-09 09:23+0100\n"
 "PO-Revision-Date: 2010-03-08 23:56-0700\n"
 "Last-Translator: CS <cs@xxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -26,8 +26,8 @@
 msgstr "<a class=\"anchor\" href=\"#BridgeIntroduction\">Tor: BrÃcken</a>"
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/bridges.wml:11 /tmp/ki6sGf0hVv.xml:75
-#: /tmp/ki6sGf0hVv.xml:98 /tmp/ki6sGf0hVv.xml:121 /tmp/ki6sGf0hVv.xml:145
+#: /home/runa/tor/website/en/bridges.wml:11 /tmp/X8ooXTAff7.xml:75
+#: /tmp/X8ooXTAff7.xml:98 /tmp/X8ooXTAff7.xml:121 /tmp/X8ooXTAff7.xml:145
 msgid "<hr />"
 msgstr "<hr />"
 
@@ -84,16 +84,16 @@
 "a>."
 msgstr ""
 "Es kann auch sein, dass Tor aus anderen GrÃnden nicht funktioniert. Die "
-"neueste Version des <a href=\"<page torbrowser/index>\">Tor-Browser-Pakets</a> "
-"auf Windows versucht Ihnen bessere Hinweise auf Verbindungsprobleme zu "
-"geben. Ebenfalls sollten Sie die <a href=\"https://wiki.torproject.org/norepl";
-"y/TheOnionRouter/TorFAQ#ItDoesntWork\">FAQ Ãber Probleme mit Tor</a> lesen, "
-"falls UnregelmÃssigkeiten auftauchen. Wenn Sie dass GefÃhl haben, dass "
-"dieses Problem eindeutig blockiert oder falls Sie es einfach einmal "
+"neueste Version des <a href=\"<page torbrowser/index>\">Tor-Browser-Pakets</"
+"a> auf Windows versucht Ihnen bessere Hinweise auf Verbindungsprobleme zu "
+"geben. Ebenfalls sollten Sie die <a href=\"https://wiki.torproject.org/";
+"noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">FAQ Ãber Probleme mit Tor</a> "
+"lesen, falls UnregelmÃssigkeiten auftauchen. Wenn Sie dass GefÃhl haben, "
+"dass dieses Problem eindeutig blockiert oder falls Sie es einfach einmal "
 "ausprobieren mÃchten, weil Sie unsicher sind oder abenteuerlustig, dann "
 "lesen Sie weiter. Stellen Sie sicher dass Sie das <a href=\"<page "
-"download>#Dev\">neueste Paket 0.2.1.x oder 0.2.2.x fÃr Ihre Plattform "
-"haben</a>."
+"download>#Dev\">neueste Paket 0.2.1.x oder 0.2.2.x fÃr Ihre Plattform haben</"
+"a>."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:46
@@ -123,9 +123,9 @@
 msgstr ""
 "Freedom House hat ein Video Ãber die Beschaffung und Verwendung von Tor "
 "Bridges erstellt.  Falls sie es unten auf der Seite nicht anschauen kÃnnen, "
-"schauen Sie unter <a href=\"http://www.youtube.com/freedom4internet\";>Youtube: "
-"Freedom4Internet</a>. Falls Sie ein besseres Video, womÃglich sogar in "
-"deutscher Sprache, kennen, kontaktieren Sie uns bitte."
+"schauen Sie unter <a href=\"http://www.youtube.com/freedom4internet";
+"\">Youtube: Freedom4Internet</a>. Falls Sie ein besseres Video, womÃglich "
+"sogar in deutscher Sprache, kennen, kontaktieren Sie uns bitte."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:66
@@ -136,11 +136,11 @@
 "ways to reach it, there are <a href=\"#FindingMore\">other ways to find "
 "bridges</a> too."
 msgstr ""
-"Zur Zeit kÃnnen Sie Adressen von BrÃcken-Servern unter <a "
-"href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</a> "
-"mit Ihrem Webbrowser holen. Wenn diese Seite fÃr Sie nicht erreichbar ist, "
-"und Sie keine andere MÃglichkeit haben an diese Seite zu kommen, dann gibt "
-"es <a href=\"#FindingMore\">weitere Wege um BrÃcken-Server zu finden.</a> "
+"Zur Zeit kÃnnen Sie Adressen von BrÃcken-Servern unter <a href=\"https://";
+"bridges.torproject.org/\">https://bridges.torproject.org/</a> mit Ihrem "
+"Webbrowser holen. Wenn diese Seite fÃr Sie nicht erreichbar ist, und Sie "
+"keine andere MÃglichkeit haben an diese Seite zu kommen, dann gibt es <a "
+"href=\"#FindingMore\">weitere Wege um BrÃcken-Server zu finden.</a> "
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/bridges.wml:73
@@ -181,9 +181,9 @@
 "Die einzelnen Komponenten eines solchen Eintrages zu verstehen ist nicht "
 "unbedingt notwendig, aber vielleicht nÃtzlich. Sie kÃnnen diesen Teil "
 "Ãberspringen wenn Sie mÃchten.<br /> Das erste Element ist die IP Addresse: "
-"<tt>'141.201.27.48'</tt><br /> Das zweite Element ist der Port: "
-"<tt>'443'</tt><br /> Das dritte Element, der elektronische Fingerabdruck, "
-"ist optional: <tt>'4352e58420e68f5e40bf7c74faddccd9d1349413'</t><br />"
+"<tt>'141.201.27.48'</tt><br /> Das zweite Element ist der Port: <tt>'443'</"
+"tt><br /> Das dritte Element, der elektronische Fingerabdruck, ist optional: "
+"<tt>'4352e58420e68f5e40bf7c74faddccd9d1349413'</t><br />"
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/bridges.wml:95
@@ -246,7 +246,8 @@
 #: /home/runa/tor/website/en/bridges.wml:120
 msgid ""
 "<a class=\"anchor\" href=\"#FindingMore\">Finding more bridges for Tor</a>"
-msgstr "<a class=\"anchor\" href=\"#FindingMore\">Mehr BrÃcken fÃr Tor finden</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#FindingMore\">Mehr BrÃcken fÃr Tor finden</a>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:124
@@ -260,10 +261,10 @@
 msgstr ""
 "Eine weitere MÃglichkeit, Ãffentliche Addressen von BrÃcken zu finden "
 "besteht darin, ein E-Mail an bridges@xxxxxxxxxxxxxx zu senden mit dem "
-"Textinhalt \"get bridges\". Wie mÃssen diese Anfrage zwingend von einem gmail "
-"Konto aus durchfÃhren. Andererseits wÃrden wir es einem Angreifer zu einfach "
-"machen, viele E-Mails zu versenden und so alle Addressen von BrÃcken zu "
-"sammeln.  Fast sofort werden Sie eine Antwort erhalten, welche folgenden "
+"Textinhalt \"get bridges\". Wie mÃssen diese Anfrage zwingend von einem "
+"gmail Konto aus durchfÃhren. Andererseits wÃrden wir es einem Angreifer zu "
+"einfach machen, viele E-Mails zu versenden und so alle Addressen von BrÃcken "
+"zu sammeln.  Fast sofort werden Sie eine Antwort erhalten, welche folgenden "
 "Text beinhaltet:"
 
 #. type: Content of: <div><pre>
@@ -313,9 +314,9 @@
 "relay>\">normal Tor relay</a>, you should run a bridge relay. You can "
 "configure it either way:"
 msgstr ""
-"Wenn Sie helfen mÃchten, aber keinen <a href=\"<page docs/tor-doc-"
-"relay>\">normalen Tor Knoten</a> betreiben kÃnnen, dann sollten Sie einen Br"
-"Ãcken-Server betreiben. Sie kÃnnen diesen auf folgende Arten konfigurieren:"
+"Wenn Sie helfen mÃchten, aber keinen <a href=\"<page docs/tor-doc-relay>"
+"\">normalen Tor Knoten</a> betreiben kÃnnen, dann sollten Sie einen BrÃcken-"
+"Server betreiben. Sie kÃnnen diesen auf folgende Arten konfigurieren:"
 
 #. type: Content of: <div><p><ul><li>
 #: /home/runa/tor/website/en/bridges.wml:152
@@ -323,9 +324,9 @@
 "manually <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
 "TorFAQ#torrc\">edit your torrc file</a> to be just these four lines:<br />"
 msgstr ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc\";>Ãn"
-"dern Sie von Hand die torrc Datei</a> indem Sie lediglich diese vier Zeilen "
-"einfÃgen:<br />"
+"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc";
+"\">Ãndern Sie von Hand die torrc Datei</a> indem Sie lediglich diese vier "
+"Zeilen einfÃgen:<br />"
 
 #. type: Content of: <div><p><ul><li><pre>
 #: /home/runa/tor/website/en/bridges.wml:155
@@ -353,8 +354,8 @@
 "\"$(IMGROOT)/vidalia-bridges-setup.png\" alt=\"Vidalia's Sharing settings "
 "page\" />"
 msgstr ""
-"<a href=\"<page docs/tor-doc-relay>\">oder Ãber Vidalia</a>:<br /> <img "
-"src=\"$(IMGROOT)/vidalia-bridges-setup.png\" alt=\"Vidalia's Sharing settings "
+"<a href=\"<page docs/tor-doc-relay>\">oder Ãber Vidalia</a>:<br /> <img src="
+"\"$(IMGROOT)/vidalia-bridges-setup.png\" alt=\"Vidalia's Sharing settings "
 "page\" />"
 
 #. type: Content of: <div><p>
@@ -366,9 +367,9 @@
 "TorFAQ#ServerForFirewalledClients\">some complex port forwarding</a>."
 msgstr ""
 "Wenn Sie beim Starten von Tor Fehlermeldungen wie  \"Could not bind to "
-"0.0.0.0:443: Permission denied\" erhalten, mÃssen Sie einen anderen Port "
-"(z.B. 8080) als ORPort angeben oder <a href=\"https://wiki.torproject.org/nor";
-"eply/TheOnionRouter/TorFAQ#ServerForFirewalledClients\">Port-Forwarding "
+"0.0.0.0:443: Permission denied\" erhalten, mÃssen Sie einen anderen Port (z."
+"B. 8080) als ORPort angeben oder <a href=\"https://wiki.torproject.org/";
+"noreply/TheOnionRouter/TorFAQ#ServerForFirewalledClients\">Port-Forwarding "
 "einrichten</a>."
 
 #. type: Content of: <div><p>
@@ -394,13 +395,13 @@
 msgstr ""
 "Ihre Bridge wird sich automatisch beim BrÃcken-Verzeichnis anmelden, von wo "
 "Leute sich die Adresse z.B. per E-Mail oder HTTPS abholen kÃnnen. Sie kÃnnen "
-"auch anderen Nutzern die Daten Ihrer Bridge direkt angeben. Wenn Sie "
-"Vidalia benutzen, kÃnnen Sie die entsprechenden Angaben einfach aus dem "
-"Fenster rauskopieren.Wenn Sie unter Linux oder BSD arbeiten, kÃnnen Sie die "
-"Adresse manuell zusammensetzen. Sehen Sie sich dazu <a "
-"href=\"#Understanding\">das oben beschriebene Format</a>an. (Den Fingerabdruck "
-"finden Sie in den Logdateien oder in <tt>/var/lib/tor/fingerprint</tt> "
-"abhÃngig von Ihrer Plattform)."
+"auch anderen Nutzern die Daten Ihrer Bridge direkt angeben. Wenn Sie Vidalia "
+"benutzen, kÃnnen Sie die entsprechenden Angaben einfach aus dem Fenster "
+"rauskopieren.Wenn Sie unter Linux oder BSD arbeiten, kÃnnen Sie die Adresse "
+"manuell zusammensetzen. Sehen Sie sich dazu <a href=\"#Understanding\">das "
+"oben beschriebene Format</a>an. (Den Fingerabdruck finden Sie in den "
+"Logdateien oder in <tt>/var/lib/tor/fingerprint</tt> abhÃngig von Ihrer "
+"Plattform)."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:190

Modified: translation/trunk/projects/website/de/1-high.download.po
===================================================================
--- translation/trunk/projects/website/de/1-high.download.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/de/1-high.download.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-03-03 22:15+0100\n"
+"POT-Creation-Date: 2010-03-09 09:23+0100\n"
 "PO-Revision-Date: 2010-03-07 10:10-0700\n"
 "Last-Translator: Ijan <yournamehere@xxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -37,24 +37,24 @@
 "mÃglichen Gefahren und EinschrÃnkungen von Tor auseinanderzusetzen."
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:25 /tmp/leVvklDkbl.xml:313
+#: /home/runa/tor/website/en/download.wml:25 /tmp/cOuBecT7wZ.xml:313
 msgid "Operating System"
 msgstr "Betriebssystem"
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:26 /tmp/leVvklDkbl.xml:314
+#: /home/runa/tor/website/en/download.wml:26 /tmp/cOuBecT7wZ.xml:314
 #, fuzzy
 msgid "Download Stable"
 msgstr "Herunterladen der stabilen Version"
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:27 /tmp/leVvklDkbl.xml:315
+#: /home/runa/tor/website/en/download.wml:27 /tmp/cOuBecT7wZ.xml:315
 #, fuzzy
 msgid "Download Unstable"
 msgstr "Herunterladen der Testversion"
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:28 /tmp/leVvklDkbl.xml:316
+#: /home/runa/tor/website/en/download.wml:28 /tmp/cOuBecT7wZ.xml:316
 msgid "Installation and Configuration"
 msgstr "Installation und Konfiguration"
 
@@ -86,7 +86,7 @@
 "(<a href=\"<package-win32-bundle-alpha-sig>\">sig</a>)"
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:46 /tmp/leVvklDkbl.xml:333
+#: /home/runa/tor/website/en/download.wml:46 /tmp/cOuBecT7wZ.xml:333
 msgid "<a href=\"<page docs/tor-doc-windows>\">Windows</a>"
 msgstr "<a href=\"<page docs/tor-doc-windows>\">Windows</a>"
 
@@ -179,8 +179,8 @@
 "bundle-alpha-sha1>\">sha1</a>)"
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:97 /tmp/leVvklDkbl.xml:115
-#: /tmp/leVvklDkbl.xml:350 /tmp/leVvklDkbl.xml:367
+#: /home/runa/tor/website/en/download.wml:97 /tmp/cOuBecT7wZ.xml:115
+#: /tmp/cOuBecT7wZ.xml:350 /tmp/cOuBecT7wZ.xml:367
 msgid "<a href=\"<page docs/tor-doc-osx>\">Mac OS X</a>"
 msgstr "<a href=\"<page docs/tor-doc-osx>\">Mac OS X</a>"
 
@@ -225,13 +225,13 @@
 "<small><em>Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE</em></small>"
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:125 /tmp/leVvklDkbl.xml:377
+#: /home/runa/tor/website/en/download.wml:125 /tmp/cOuBecT7wZ.xml:377
 #, fuzzy
 msgid "<a href=\"<page download-unix>\">Linux/Unix download page</a>"
 msgstr "<a href=\"<page download-unix>\">Linux/Unix Downloadseite</a>"
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:128 /tmp/leVvklDkbl.xml:380
+#: /home/runa/tor/website/en/download.wml:128 /tmp/cOuBecT7wZ.xml:380
 #, fuzzy
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
@@ -507,8 +507,8 @@
 "archive/\">the archive</a>."
 msgstr ""
 "Falls Sie eine Ãltere Version des Quellcodes von Tor untersuchen mÃchten "
-"oder andere BinÃrdateien, besuchen Sie das <a "
-"href=\"http://archive.torproject.org/tor-package-archive/\";>Archiv</a>."
+"oder andere BinÃrdateien, besuchen Sie das <a href=\"http://archive.";
+"torproject.org/tor-package-archive/\">Archiv</a>."
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/en/download.wml:276

Modified: translation/trunk/projects/website/de/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/de/2-medium.donate.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/de/2-medium.donate.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:05+0100\n"
+"POT-Creation-Date: 2010-03-09 09:23+0100\n"
 "PO-Revision-Date: 2010-02-27 22:44-0700\n"
 "Last-Translator: CS <cs@xxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -61,7 +61,7 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:32 /tmp/aQzlRIcDDK.xml:102
+#: /home/runa/tor/website/en/donate.wml:32 /tmp/xzd81Jcwlu.xml:102
 msgid "<br />"
 msgstr "<br />"
 
@@ -143,17 +143,17 @@
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:72 /tmp/aQzlRIcDDK.xml:114
+#: /home/runa/tor/website/en/donate.wml:72 /tmp/xzd81Jcwlu.xml:114
 msgid "$"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:73 /tmp/aQzlRIcDDK.xml:115
+#: /home/runa/tor/website/en/donate.wml:73 /tmp/xzd81Jcwlu.xml:115
 msgid "â"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:74 /tmp/aQzlRIcDDK.xml:116
+#: /home/runa/tor/website/en/donate.wml:74 /tmp/xzd81Jcwlu.xml:116
 msgid "Â"
 msgstr ""
 
@@ -248,7 +248,8 @@
 
 #. type: Content of: <div><p><address>
 #: /home/runa/tor/website/en/donate.wml:136
-msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
+msgid ""
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 USA"
 msgstr ""
 
 #. type: Content of: <div><p>

Modified: translation/trunk/projects/website/de/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/de/2-medium.verifying-signatures.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/de/2-medium.verifying-signatures.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 23:31+0100\n"
+"POT-Creation-Date: 2010-03-09 09:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -23,7 +23,7 @@
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/verifying-signatures.wml:10
-#: /tmp/JJ01AWc7xf.xml:33 /tmp/JJ01AWc7xf.xml:45 /tmp/JJ01AWc7xf.xml:92
+#: /tmp/RLxPyjEzhe.xml:34 /tmp/RLxPyjEzhe.xml:46 /tmp/RLxPyjEzhe.xml:93
 #, fuzzy
 msgid "<hr />"
 msgstr "<hr />"
@@ -101,38 +101,43 @@
 msgid "Jacob's (0x9D0FACE4)"
 msgstr "Jacobs (0x9D0FACE4)"
 
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/verifying-signatures.wml:30
+msgid "Erinn's (0x63FEE659) and (0xF1F5C9B5)"
+msgstr ""
+
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:32
+#: /home/runa/tor/website/en/verifying-signatures.wml:33
 #, fuzzy
 msgid "Step One: Import the keys"
 msgstr "Schritt Eins: Importiere die SchlÃssel"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:34
+#: /home/runa/tor/website/en/verifying-signatures.wml:35
 #, fuzzy
 msgid "You can import keys directly from GnuPG as well:"
 msgstr "Man kann die SchlÃssel auch direkt in sein GnuPG importieren:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:36
+#: /home/runa/tor/website/en/verifying-signatures.wml:37
 #, fuzzy, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --recv-keys 0x28988BF5"
 msgstr "gpg --keyserver subkeys.pgp.net --recv-keys 0x28988BF5"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:38
+#: /home/runa/tor/website/en/verifying-signatures.wml:39
 #, fuzzy
 msgid "or search for keys with"
 msgstr "oder mittels folgender Zeile nach den SchlÃsseln suchen:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:40
+#: /home/runa/tor/website/en/verifying-signatures.wml:41
 #, fuzzy, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --search-keys 0x28988BF5"
 msgstr "gpg --keyserver subkeys.pgp.net --search-keys 0x28988BF5"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:42
+#: /home/runa/tor/website/en/verifying-signatures.wml:43
 #, fuzzy
 msgid "and when you select one, it will be added to your keyring."
 msgstr ""
@@ -140,31 +145,31 @@
 "hinzugefÃgt."
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:44
+#: /home/runa/tor/website/en/verifying-signatures.wml:45
 #, fuzzy
 msgid "Step Two: Verify the fingerprints"
 msgstr "Schritt Zwei: ÃbreprÃfe die FingerabdrÃcke"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:46
+#: /home/runa/tor/website/en/verifying-signatures.wml:47
 #, fuzzy
 msgid "Verify the pgp fingerprints using:"
 msgstr "ÃberpÃfe die FingerabdrÃcke der SchlÃssel folgendermaÃen:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:47
+#: /home/runa/tor/website/en/verifying-signatures.wml:48
 #, fuzzy, no-wrap
 msgid "gpg --fingerprint (insert keyid here)"
 msgstr "gpg --fingerprint (insert keyid here)"
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/verifying-signatures.wml:48
+#: /home/runa/tor/website/en/verifying-signatures.wml:49
 #, fuzzy
 msgid "The fingerprints for the keys should be:"
 msgstr "Die FingerabdrÃcke der SchlÃssel sollten folgende sein:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:51
+#: /home/runa/tor/website/en/verifying-signatures.wml:52
 #, fuzzy, no-wrap
 msgid ""
 "pub   1024D/28988BF5 2000-02-27\n"
@@ -238,7 +243,7 @@
 "sub   4096g/D5E87583 2008-03-11 [expires: 2010-03-11]\n"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:87
+#: /home/runa/tor/website/en/verifying-signatures.wml:88
 #, fuzzy
 msgid ""
 "(Of course if you want to be really certain that those are the real ones "
@@ -251,13 +256,13 @@
 "Vertrauenspfad zu den SchlÃsseln zu bekommen.)"
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:91
+#: /home/runa/tor/website/en/verifying-signatures.wml:92
 #, fuzzy
 msgid "Step Three: Verify the downloaded package"
 msgstr "Schritt Drei: ÃberprÃfe das heruntergeladene Paket"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:93
+#: /home/runa/tor/website/en/verifying-signatures.wml:94
 #, fuzzy
 msgid ""
 "If you're using GnuPG, then put the .asc and the download in the same "
@@ -272,7 +277,7 @@
 "Ausgabe:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:99
+#: /home/runa/tor/website/en/verifying-signatures.wml:100
 #, fuzzy, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc tor-0.1.0.17.tar.gz\n"
@@ -292,7 +297,7 @@
 "Primary key fingerprint: B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:109
+#: /home/runa/tor/website/en/verifying-signatures.wml:110
 #, fuzzy
 msgid ""
 "Notice that there is a warning because you haven't assigned a trust index to "
@@ -317,7 +322,7 @@
 "oder Nick."
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:118
+#: /home/runa/tor/website/en/verifying-signatures.wml:119
 #, fuzzy
 msgid "All this means is you can ignore the message or assign a trust level."
 msgstr ""
@@ -325,7 +330,7 @@
 "oder du legst ein Vertrauenslevel fÃr die SchlÃssel fest."
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:120
+#: /home/runa/tor/website/en/verifying-signatures.wml:121
 #, fuzzy
 msgid ""
 "For your reference, this is an example of a <em>BAD</em> verification. It "
@@ -336,7 +341,7 @@
 "Unterschrift Ãbereinstimmt:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:124
+#: /home/runa/tor/website/en/verifying-signatures.wml:125
 #, fuzzy, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc\n"
@@ -348,7 +353,7 @@
 "gpg: BAD signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:129
+#: /home/runa/tor/website/en/verifying-signatures.wml:130
 #, fuzzy
 msgid ""
 "If you see a message like the above one, then you should not trust the file "
@@ -358,7 +363,7 @@
 "keinen Fall vertrauen!"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:131
+#: /home/runa/tor/website/en/verifying-signatures.wml:132
 #, fuzzy
 msgid ""
 "If you are running Tor on Debian you should read the instructions on <a href="

Modified: translation/trunk/projects/website/de/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/de/3-low.download-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/de/3-low.download-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:36+0100\n"
+"POT-Creation-Date: 2010-03-09 09:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/Tneig8MPSl.xml:40
-#: /tmp/Tneig8MPSl.xml:56 /tmp/Tneig8MPSl.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/PRGjOdn85V.xml:40
+#: /tmp/PRGjOdn85V.xml:56 /tmp/PRGjOdn85V.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -184,54 +184,79 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:84
-msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgid ""
+"<img src=\"images/distros/android-market.gif\" alt=\"Android\" width=\"32\" "
+"height=\"32\"/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:85
-msgid "Source tarballs"
+msgid "Android"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /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/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/tor/website/en/download-unix.wml:92
+msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:93
+msgid "Source tarballs"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:95
+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/tor/website/en/download-unix.wml:91
+#: /home/runa/tor/website/en/download-unix.wml:99
 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/tor/website/en/download-unix.wml:94
+#: /home/runa/tor/website/en/download-unix.wml:102
 msgid "<kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:101
+#: /home/runa/tor/website/en/download-unix.wml:109
 msgid "<a id=\"packagediff\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:102
+#: /home/runa/tor/website/en/download-unix.wml:110
 msgid ""
 "<a class=\"anchor\" href=\"#packagediff\">What's the difference between "
 "Stable &amp; Unstable?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:105
+#: /home/runa/tor/website/en/download-unix.wml:113
 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/tor/website/en/download-unix.wml:109
+#: /home/runa/tor/website/en/download-unix.wml:117
 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 "
@@ -241,7 +266,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:118
+#: /home/runa/tor/website/en/download-unix.wml:126
 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 "
@@ -251,7 +276,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:125
+#: /home/runa/tor/website/en/download-unix.wml:133
 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 "
@@ -259,7 +284,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:134
+#: /home/runa/tor/website/en/download-unix.wml:142
 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 "
@@ -269,7 +294,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><form>
-#: /home/runa/tor/website/en/download-unix.wml:142
+#: /home/runa/tor/website/en/download-unix.wml:150
 msgid ""
 "<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
 "\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
@@ -278,18 +303,18 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:152
+#: /home/runa/tor/website/en/download-unix.wml:160
 msgid "<a id=\"Warning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:153
+#: /home/runa/tor/website/en/download-unix.wml:161
 msgid ""
 "<a class=\"anchor\" href=\"#Warning\">Warning: Want Tor to really work?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:157
+#: /home/runa/tor/website/en/download-unix.wml:165
 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> "
@@ -298,7 +323,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:165
+#: /home/runa/tor/website/en/download-unix.wml:173
 msgid ""
 "Tor only protects Internet applications that are configured to send their "
 "traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
@@ -308,7 +333,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:173
+#: /home/runa/tor/website/en/download-unix.wml:181
 msgid ""
 "Browser plugins such as Java, Flash, ActiveX, RealPlayer, Quicktime, Adobe's "
 "PDF plugin, and others can be manipulated into revealing your IP address. "
@@ -324,7 +349,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:189
+#: /home/runa/tor/website/en/download-unix.wml:197
 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. "
@@ -334,7 +359,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:197
+#: /home/runa/tor/website/en/download-unix.wml:205
 msgid ""
 "Tor anonymizes the origin of your traffic, and it encrypts everything inside "
 "the Tor network, but <a href=\"https://wiki.torproject.org/noreply/";
@@ -346,7 +371,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:208
+#: /home/runa/tor/website/en/download-unix.wml:216
 msgid ""
 "While Tor blocks attackers on your local network from discovering or "
 "influencing your destination, it opens new risks: malicious or misconfigured "
@@ -355,12 +380,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:216
+#: /home/runa/tor/website/en/download-unix.wml:224
 msgid "<br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:218
+#: /home/runa/tor/website/en/download-unix.wml:226
 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 "
@@ -368,7 +393,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:228
+#: /home/runa/tor/website/en/download-unix.wml:236
 msgid ""
 "See our <a href=\"<page verifying-signatures>\">FAQ entry on verifying "
 "package signatures</a>, which allows you to make sure you've downloaded the "
@@ -376,7 +401,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:234
+#: /home/runa/tor/website/en/download-unix.wml:242
 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</"
@@ -384,7 +409,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:240
+#: /home/runa/tor/website/en/download-unix.wml:248
 msgid ""
 "See the <a href=\"<page documentation>#Developers\">developer documentation</"
 "a> for instructions on fetching Tor from Git to get the very latest "
@@ -394,19 +419,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:252
+#: /home/runa/tor/website/en/download-unix.wml:260
 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/tor/website/en/download-unix.wml:256
+#: /home/runa/tor/website/en/download-unix.wml:264
 msgid "<a id=\"ChangeLog\"></a> <a id=\"Stable\"></a> <a id=\"Testing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:260
+#: /home/runa/tor/website/en/download-unix.wml:268
 msgid ""
 "For a list of what has changed in each stable Tor release, see the <a href="
 "\"<gitblob>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in both "

Modified: translation/trunk/projects/website/de/3-low.people.po
===================================================================
--- translation/trunk/projects/website/de/3-low.people.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/de/3-low.people.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:05+0100\n"
+"POT-Creation-Date: 2010-03-09 09:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -60,8 +60,8 @@
 #. type: Content of: <div><address>
 #: /home/runa/tor/website/en/people.wml:30
 msgid ""
-"The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA<br /"
-"><br />"
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 "
+"USA<br /><br />"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -542,34 +542,56 @@
 
 #. type: Content of: <div><dl><dt>
 #: /home/runa/tor/website/en/people.wml:202
-msgid "Kasimir Gabert"
+msgid "Marco Bonetti"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:202
+msgid "Focusing on MobileTor for the iPhone."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:203
+msgid "Nathan Freitas"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:203
 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/tor/website/en/people.wml:205
+msgid "Kasimir Gabert"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:205
+msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\";>TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid "Robert Hogan"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\";>TorK</a> Tor controller."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid "Damian Johnson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid ""
 "Builds a command-line application for monitoring Tor relays, providing real-"
 "time status information such as the current configuration, bandwidth usage, "
@@ -578,106 +600,118 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid ""
 "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
 "and Privoxy still work well together."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid "Kory Kirk"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid ""
 "Worked during Google Summer of Code 2009 on extending Torbutton. Now he's "
 "working with Bruce Leidl on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Bruce Leidl"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Working on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid ""
 "A lawyer with the CCC in Germany. Coordinates the German Tor community with "
 "respect to legal questions and concerns."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:224
+msgid "Linus Nordberg"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:224
+msgid ""
+"Enjoys measuring the Tor network and helps with outreach in the Nordic "
+"countries."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:226
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:226
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid "Martin Peck"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:225
+#: /home/runa/tor/website/en/people.wml:230
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:231
 msgid ""
 "The most dedicated bug reporter we've ever heard from. He must read Tor "
 "source code every day over breakfast."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy";
@@ -686,24 +720,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?";
 "p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/";
@@ -712,7 +746,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:241
+#: /home/runa/tor/website/en/people.wml:246
 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, "
@@ -720,32 +754,32 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:252
 msgid "<a id=\"Past\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:248
+#: /home/runa/tor/website/en/people.wml:253
 msgid "<a class=\"anchor\" href=\"#Past\">Past thanks to:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "John Bashinski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "Contributed the initial rpm spec file."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid "Domenik Bork"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid ""
 "Worked on Configuration of Hidden Services with User Authorization in "
 "Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches/";
@@ -753,12 +787,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 msgid "Benedikt Boss"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 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 "
@@ -766,22 +800,22 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Ren Bucholz"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Our fine logo and images."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 msgid "Fallon Chen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 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="
@@ -790,32 +824,32 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Bram Cohen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Helped design our congestion control mechanisms, in Tor's early days."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Pat Double"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Creator of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid "Geoff Goodell"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid ""
 "Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/";
 "\">Blossom project</a> which uses Tor as its overlay network; also helped "
@@ -823,12 +857,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid "Aleksei Gorny"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid ""
 "Working on Tor exit scanner improvements (<a href=\"https://svn.torproject.";
 "org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
@@ -836,52 +870,52 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Christian Grothoff"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Contributed better daemonizing behavior."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Steven Hazel"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Made 'make install' do the right thing."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "Justin Hipple"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "The other developer for Vidalia."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Jason Holt"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Contributed patches to the instructions and the man page."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 msgid "Christian King"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 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-";
@@ -889,70 +923,70 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid "Joe Kowalski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid ""
 "Original author and provider of the torstatus script formerly run on "
 "nighteffect."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Adam Langley"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Our fine eventdns code."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid "Rebecca MacKinnon"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid ""
 "Former Director of Tor.  Co-Founder of <a href=\"http://www.";
 "globalvoicesonline.org/\">Global Voices Online</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid "Chris Palmer"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid ""
 "Our liaison and tech guy with EFF while EFF was funding us. Also helped "
 "advocate and write end-user docs."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid "Matej Pfajfar"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid ""
 "Author of the original onion routing code that Tor is based on, so we didn't "
 "have to start from scratch."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 msgid "Johannes Renner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 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 "
@@ -960,33 +994,33 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid "Scott Squires"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid ""
 "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Aaron Turner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Contributed the first version of the tor.sh initscripts shell script."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 msgid "Stephen Tyree"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 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 "
@@ -995,12 +1029,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid "Camilo Viecco"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid ""
 "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac.";
 "vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
@@ -1008,12 +1042,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 msgid "Fred von Lohmann"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 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/?";
@@ -1021,12 +1055,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid "Christian Wilms"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid ""
 "Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
 "\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";
@@ -1034,12 +1068,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 msgid "Jillian C. York"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 msgid ""
 "<a href=\"http://jilliancyork.com/\";>Jillian C. York</a> is a writer, "
 "blogger, and activist based in Boston.  She blogs on the uses of Tor and "

Modified: translation/trunk/projects/website/de/4-optional.translation-overview.po
===================================================================
--- translation/trunk/projects/website/de/4-optional.translation-overview.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/de/4-optional.translation-overview.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 23:31+0100\n"
+"POT-Creation-Date: 2010-03-09 09:23+0100\n"
 "PO-Revision-Date: 2010-03-05 04:24-0700\n"
 "Last-Translator: CS <cs@xxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -22,7 +22,7 @@
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/translation-overview.wml:10
-#: /tmp/Ar9A8FU2Ai.xml:25
+#: /tmp/dKZ81igD5d.xml:25
 msgid "<hr />"
 msgstr "<hr />"
 
@@ -45,7 +45,8 @@
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/translation-overview.wml:24
 msgid "<a class=\"anchor\" href=\"#TTP\">Using The Tor Translation Portal</a>"
-msgstr "<a class=\"anchor\" href=\"#TTP\">Das Tor Ãbersetzungsportal verwenden</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#TTP\">Das Tor Ãbersetzungsportal verwenden</a>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/translation-overview.wml:28

Modified: translation/trunk/projects/website/de/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/de/4-optional.volunteer.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/de/4-optional.volunteer.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:05+0100\n"
+"POT-Creation-Date: 2010-03-09 09:23+0100\n"
 "PO-Revision-Date: 2010-03-05 04:23-0700\n"
 "Last-Translator: CS <cs@xxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -26,8 +26,8 @@
 "Please consider <a href=\"<page docs/tor-doc-relay>\">running a relay</a> to "
 "help the Tor network grow."
 msgstr ""
-"Bitte lassen Sie ein <a href=\"<page docs/tor-doc-relay>\">Relais</a> laufen, "
-"damit das Tor Netzwerk wachsen kann."
+"Bitte lassen Sie ein <a href=\"<page docs/tor-doc-relay>\">Relais</a> "
+"laufen, damit das Tor Netzwerk wachsen kann."
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:14
@@ -75,7 +75,8 @@
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/volunteer.wml:31
 msgid "<a class=\"anchor\" href=\"#Usability\">Supporting Applications</a>"
-msgstr "<a class=\"anchor\" href=\"#Usability\">UnterstÃtzende Applikationen</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#Usability\">UnterstÃtzende Applikationen</a>"
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:33
@@ -259,21 +260,22 @@
 "Messaging client). Components are pre-configured to operate in a secure way, "
 "and it has very few dependencies on the installed operating system. It has "
 "therefore become one of the most easy to use, and popular, ways to use Tor "
-"on Windows.  <br /> However, there is currently no working package for Linux "
-"and Mac OS X, so this project would be to implement Tor Browser Bundle for "
-"these platforms. This will involve modifications to Vidalia (C++), possibly "
-"Firefox (C) then creating and testing the launcher on a range of operating "
-"system versions and configurations to verify portability.  Some work on this "
-"was completed as part of the Google Summer of Code 2009. Another part of "
-"this project is to identify all of the traces left behind by using a Tor "
-"Browser Bundle on Mac OS X or Linux.  Developing ways to stop, counter, or "
-"remove these traces is a final step.  <br /> Students should be familiar "
-"with application development on one or preferably both of Linux and Mac OS "
-"X, and be comfortable with C/C++ and shell scripting.  <br /> Part of this "
-"project could be usability testing of Tor Browser Bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
+"on Windows.  <br /> However, there is currently no released package for "
+"Linux and Mac OS X, so this project would be to implement Tor Browser Bundle "
+"for OS X and continue work on the Tor Browser Bundle for Linux. This will "
+"involve modifications to Vidalia (C++), possibly Firefox (C) then creating "
+"and testing the launcher on a range of operating system versions and "
+"configurations to verify portability.  Some work on this was completed as "
+"part of the Google Summer of Code 2009. Another part of this project is to "
+"identify all of the traces left behind by using a Tor Browser Bundle on Mac "
+"OS X or Linux.  Developing ways to stop, counter, or remove these traces is "
+"a final step.  <br /> Students should be familiar with application "
+"development on one or preferably both of Linux and Mac OS X, and be "
+"comfortable with C/C++ and shell scripting.  <br /> Part of this project "
+"could be usability testing of Tor Browser Bundle, ideally amongst our target "
+"demographic.  That would help a lot in knowing what needs to be done in "
+"terms of bug fixes or new features. We get this informally at the moment, "
+"but a more structured process would be better."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -327,27 +329,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:225
-msgid ""
-"<b>Tuneup Tor!</b> <br /> Priority: <i>Medium to High</i> <br /> Effort "
-"Level: <i>Medium to High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Nick, Roger, Mike, Karsten</i> <br /> Right now, Tor relays "
-"measure and report their own bandwidth, and Tor clients choose which relays "
-"to use in part based on that bandwidth.  This approach is vulnerable to <a "
-"href=\"http://freehaven.net/anonbib/#bauer:wpes2007\";>attacks where relays "
-"lie about their bandwidth</a>; to address this, Tor currently caps the "
-"maximum bandwidth it's willing to believe any relay provides.  This is a "
-"limited fix, and a waste of bandwidth capacity to boot.  Instead, Tor should "
-"possibly measure bandwidth in a more distributed way, perhaps as described "
-"in the <a href=\"http://freehaven.net/anonbib/author.html#snader08\";>\"A "
-"Tune-up for Tor\"</a> paper by Snader and Borisov. One could use current "
-"testing code to double-check this paper's findings and verify the extent to "
-"which they dovetail with Tor as deployed in the wild, and determine good "
-"ways to incorporate them into their suggestions Tor network without adding "
-"too much communications overhead between relays and directory authorities."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:256
 msgid ""
 "<b>Improving Polipo on Windows</b> <br /> Priority: <i>Medium to High</i> "
@@ -389,17 +370,17 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:283
 msgid ""
-"<b>Tor Controller Status Event Interface</b> <br /> Priority: <i>Medium</i> "
-"<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> "
-"<br /> Likely Mentors: <i>Matt</i> <br /> There are a number of status "
-"changes inside Tor of which the user may need to be informed. For example, "
-"if the user is trying to set up his Tor as a relay and Tor decides that its "
-"ports are not reachable from outside the user's network, we should alert the "
-"user. Currently, all the user gets is a couple log messages in Vidalia's "
-"'message log' window, which they likely never see since they don't receive a "
-"notification that something has gone wrong. Even if the user does actually "
-"look at the message log, most of the messages make little sense to the "
-"novice user.  <br /> Tor has the ability to inform Vidalia of many such "
+"<b>Tor Controller Status Event Interface for Vidalia</b> <br /> Priority: "
+"<i>Medium</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low "
+"to Medium</i> <br /> Likely Mentors: <i>Matt</i> <br /> There are a number "
+"of status changes inside Tor of which the user may need to be informed. For "
+"example, if the user is trying to set up his Tor as a relay and Tor decides "
+"that its ports are not reachable from outside the user's network, we should "
+"alert the user. Currently, all the user gets is a couple log messages in "
+"Vidalia's 'message log' window, which they likely never see since they don't "
+"receive a notification that something has gone wrong. Even if the user does "
+"actually look at the message log, most of the messages make little sense to "
+"the novice user.  <br /> Tor has the ability to inform Vidalia of many such "
 "status changes, and we recently implemented support for a couple of these "
 "events. Still, there are many more status events the user should be informed "
 "of and we need a better UI for actually displaying them to the user.  <br /> "
@@ -484,40 +465,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:415
-msgid ""
-"<b>New Thandy Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Medium to High</i> <br /> Likely "
-"Mentors: <i>Martin</i> <br /> Additional capabilities are needed for "
-"assisted updates of all the Tor related software for Windows and other "
-"operating systems. Some of the features to consider include:"
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:429
-msgid ""
-"Integration of the <a href=\"http://chandlerproject.org/Projects/MeTooCrypto";
-"\">MeTooCrypto Python library</a> for authenticated HTTPS downloads."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:433
-msgid ""
-"Adding a level of indirection between the timestamp signatures and the "
-"package files included in an update. See the \"Thandy attacks / suggestions"
-"\" thread on or-dev."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:436
-msgid ""
-"Support locale specific installation and configuration of assisted updates "
-"based on preference, host, or user account language settings.  Familiarity "
-"with Windows codepages, unicode, and other character sets is helpful in "
-"addition to general win32 and posix API experience and Python proficiency."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:445
 msgid ""
 "<b>Simulator for slow Internet connections</b> <br /> Priority: <i>Medium</"
@@ -565,27 +512,14 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:509
 msgid ""
-"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Low</i> <br /"
-"> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Mike</i> <br /> We're hearing from an increasing number of users "
-"that they want to use Thunderbird with Tor. However, there are plenty of "
-"application-level concerns, for example, by default Thunderbird will put "
-"your hostname in the outgoing mail that it sends. At some point we should "
-"start a new push to build a Thunderbird extension similar to Torbutton."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:527
-msgid ""
-"<b>Intermediate Level Network Device Driver</b> <br /> Priority: <i>Low</i> "
+"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Medium</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> "
-"Likely Mentors: <i>Martin</i> <br /> The WinPCAP device driver used by Tor "
-"VM for bridged networking does not support a number of wireless and non-"
-"Ethernet network adapters.  Implementation of a intermediate level network "
-"device driver for win32 and 64bit would provide a way to intercept and route "
-"traffic over such networks. This project will require knowledge of and "
-"experience with Windows kernel device driver development and testing. "
-"Familiarity with Winsock and Qemu would also be helpful."
+"Likely Mentors: <i>Mike</i> <br /> We're hearing from an increasing number "
+"of users that they want to use Thunderbird with Tor. However, there are "
+"plenty of application-level concerns, for example, by default Thunderbird "
+"will put your hostname in the outgoing mail that it sends. At some point we "
+"should start a new push to build a Thunderbird extension similar to "
+"Torbutton."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -650,35 +584,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:621
-msgid ""
-"<b>Tor/Polipo/Vidalia Auto-Update Framework</b> <br /> We're in need of a "
-"good authenticated-update framework.  Vidalia already has the ability to "
-"notice when the user is running an outdated or unrecommended version of Tor, "
-"using signed statements inside the Tor directory information. Currently, "
-"Vidalia simply pops up a little message box that lets the user know they "
-"should manually upgrade. The goal of this project would be to extend Vidalia "
-"with the ability to also fetch and install the updated Tor software for the "
-"user. We should do the fetches via Tor when possible, but also fall back to "
-"direct fetches in a smart way. Time permitting, we would also like to be "
-"able to update other applications included in the bundled installers, such "
-"as Polipo and Vidalia itself.  <br /> To complete this project, the student "
-"will first need to first investigate the existing auto-update frameworks (e."
-"g., Sparkle on OS X) to evaluate their strengths, weaknesses, security "
-"properties, and ability to be integrated into Vidalia. If none are found to "
-"be suitable, the student will design their own auto-update framework, "
-"document the design, and then discuss the design with other developers to "
-"assess any security issues. The student will then implement their framework "
-"(or integrate an existing one) and test it.  <br /> A person undertaking "
-"this project should have good C++ development experience. Previous "
-"experience with Qt is helpful, but not required. One should also have a good "
-"understanding of common security practices, such as package signature "
-"verification. Good writing ability is also important for this project, since "
-"a vital step of the project will be producing a design document to review "
-"and discuss with others prior to implementation."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:655
 msgid ""
 "<b>Improving the Tor QA process: Continuous Integration for builds</b> <br /"
@@ -706,17 +611,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:683
-msgid ""
-"<b>Usability testing of Tor</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> <br /> Likely "
-"Mentors: <i>Andrew</i> <br /> Especially the browser bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:700
 msgid ""
 "<b>An authenticating IRC proxy</b> <br /> Priority: <i>Medium</i> <br /> "

Modified: translation/trunk/projects/website/de/docs/3-low.debian.po
===================================================================
--- translation/trunk/projects/website/de/docs/3-low.debian.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/de/docs/3-low.debian.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:07+0100\n"
+"POT-Creation-Date: 2010-03-09 09:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -28,8 +28,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/U2L7h34hRJ.xml:40
-#: /tmp/U2L7h34hRJ.xml:96 /tmp/U2L7h34hRJ.xml:130
+#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/3ZzkznR_p8.xml:40
+#: /tmp/3ZzkznR_p8.xml:96 /tmp/3ZzkznR_p8.xml:130
 msgid "<br />"
 msgstr ""
 
@@ -49,8 +49,8 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/U2L7h34hRJ.xml:77
-#: /tmp/U2L7h34hRJ.xml:121 /tmp/U2L7h34hRJ.xml:164
+#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/3ZzkznR_p8.xml:77
+#: /tmp/3ZzkznR_p8.xml:121 /tmp/3ZzkznR_p8.xml:164
 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."
@@ -94,8 +94,9 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:59
 msgid ""
-"where you substitute the above word (etch, lenny, sid, karmic, jaunty, "
-"intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you put the codename of your distribution (i.e. etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy or whatever it is) in place of &lt;"
+"DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -165,8 +166,8 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:106
 msgid ""
-"where you substitute the name of your distro (etch, lenny, sid, karmic, "
-"jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you again substitute the name of your distro (etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/de/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/de/docs/3-low.tor-doc-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/de/docs/3-low.tor-doc-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:35+0100\n"
+"POT-Creation-Date: 2010-03-09 09:22+0100\n"
 "PO-Revision-Date: 2010-03-03 16:27-0700\n"
 "Last-Translator: CS <cs@xxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -22,9 +22,9 @@
 "Einen <a href=\"<page index>\">Tor</a> Benutzer auf Linux/BSD/Unix betreiben"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/3Hm3IzCw9A.xml:24
-#: /tmp/3Hm3IzCw9A.xml:54 /tmp/3Hm3IzCw9A.xml:88 /tmp/3Hm3IzCw9A.xml:131
-#: /tmp/3Hm3IzCw9A.xml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/LP3nyJSsjB.xml:24
+#: /tmp/LP3nyJSsjB.xml:54 /tmp/LP3nyJSsjB.xml:88 /tmp/LP3nyJSsjB.xml:131
+#: /tmp/LP3nyJSsjB.xml:169
 msgid "<br />"
 msgstr "<br />"
 
@@ -64,10 +64,10 @@
 "If you're building from source, first install <a href=\"http://www.monkey.";
 "org/~provos/libevent/\">libevent</a>, and make sure you have openssl and "
 "zlib (including the -devel packages if applicable). Then run:<br /> <tt>tar "
-"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable><br /> ./configure "
-"&amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</tt>, or "
-"you can run <tt>make install</tt> (as root if necessary) to install it into /"
-"usr/local/, and then you can start it just by running <tt>tor</tt>."
+"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable></tt><br /> <tt>./"
+"configure &amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</"
+"tt>, or you can run <tt>make install</tt> (as root if necessary) to install "
+"it into /usr/local/, and then you can start it just by running <tt>tor</tt>."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/es/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/es/2-medium.donate.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/es/2-medium.donate.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:06+0100\n"
+"POT-Creation-Date: 2010-03-09 09:24+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -61,7 +61,7 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:32 /tmp/WJI7Cluruh.xml:102
+#: /home/runa/tor/website/en/donate.wml:32 /tmp/5KRwAHs_pz.xml:102
 msgid "<br />"
 msgstr ""
 
@@ -143,17 +143,17 @@
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:72 /tmp/WJI7Cluruh.xml:114
+#: /home/runa/tor/website/en/donate.wml:72 /tmp/5KRwAHs_pz.xml:114
 msgid "$"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:73 /tmp/WJI7Cluruh.xml:115
+#: /home/runa/tor/website/en/donate.wml:73 /tmp/5KRwAHs_pz.xml:115
 msgid "â"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:74 /tmp/WJI7Cluruh.xml:116
+#: /home/runa/tor/website/en/donate.wml:74 /tmp/5KRwAHs_pz.xml:116
 msgid "Â"
 msgstr ""
 
@@ -248,7 +248,8 @@
 
 #. type: Content of: <div><p><address>
 #: /home/runa/tor/website/en/donate.wml:136
-msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
+msgid ""
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 USA"
 msgstr ""
 
 #. type: Content of: <div><p>

Modified: translation/trunk/projects/website/es/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/es/2-medium.verifying-signatures.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/es/2-medium.verifying-signatures.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 23:44+0100\n"
+"POT-Creation-Date: 2010-03-09 09:24+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -22,7 +22,7 @@
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/verifying-signatures.wml:10
-#: /tmp/Hfzmcega9z.xml:33 /tmp/Hfzmcega9z.xml:45 /tmp/Hfzmcega9z.xml:92
+#: /tmp/GlROxAS3nu.xml:34 /tmp/GlROxAS3nu.xml:46 /tmp/GlROxAS3nu.xml:93
 msgid "<hr />"
 msgstr ""
 
@@ -80,61 +80,66 @@
 msgid "Jacob's (0x9D0FACE4)"
 msgstr ""
 
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/verifying-signatures.wml:30
+msgid "Erinn's (0x63FEE659) and (0xF1F5C9B5)"
+msgstr ""
+
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:32
+#: /home/runa/tor/website/en/verifying-signatures.wml:33
 msgid "Step One: Import the keys"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:34
+#: /home/runa/tor/website/en/verifying-signatures.wml:35
 msgid "You can import keys directly from GnuPG as well:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:36
+#: /home/runa/tor/website/en/verifying-signatures.wml:37
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --recv-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:38
+#: /home/runa/tor/website/en/verifying-signatures.wml:39
 msgid "or search for keys with"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:40
+#: /home/runa/tor/website/en/verifying-signatures.wml:41
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --search-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:42
+#: /home/runa/tor/website/en/verifying-signatures.wml:43
 msgid "and when you select one, it will be added to your keyring."
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:44
+#: /home/runa/tor/website/en/verifying-signatures.wml:45
 msgid "Step Two: Verify the fingerprints"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:46
+#: /home/runa/tor/website/en/verifying-signatures.wml:47
 msgid "Verify the pgp fingerprints using:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:47
+#: /home/runa/tor/website/en/verifying-signatures.wml:48
 #, no-wrap
 msgid "gpg --fingerprint (insert keyid here)"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/verifying-signatures.wml:48
+#: /home/runa/tor/website/en/verifying-signatures.wml:49
 msgid "The fingerprints for the keys should be:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:51
+#: /home/runa/tor/website/en/verifying-signatures.wml:52
 #, no-wrap
 msgid ""
 "pub   1024D/28988BF5 2000-02-27\n"
@@ -174,7 +179,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:87
+#: /home/runa/tor/website/en/verifying-signatures.wml:88
 msgid ""
 "(Of course if you want to be really certain that those are the real ones "
 "then you should check this from more places or even better get into key "
@@ -182,12 +187,12 @@
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:91
+#: /home/runa/tor/website/en/verifying-signatures.wml:92
 msgid "Step Three: Verify the downloaded package"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:93
+#: /home/runa/tor/website/en/verifying-signatures.wml:94
 msgid ""
 "If you're using GnuPG, then put the .asc and the download in the same "
 "directory and type \"gpg --verify (whatever).asc (whatever)\". It will say "
@@ -196,7 +201,7 @@
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:99
+#: /home/runa/tor/website/en/verifying-signatures.wml:100
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc tor-0.1.0.17.tar.gz\n"
@@ -209,7 +214,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:109
+#: /home/runa/tor/website/en/verifying-signatures.wml:110
 msgid ""
 "Notice that there is a warning because you haven't assigned a trust index to "
 "this user. This means that your program verified the key made that "
@@ -222,19 +227,19 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:118
+#: /home/runa/tor/website/en/verifying-signatures.wml:119
 msgid "All this means is you can ignore the message or assign a trust level."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:120
+#: /home/runa/tor/website/en/verifying-signatures.wml:121
 msgid ""
 "For your reference, this is an example of a <em>BAD</em> verification. It "
 "means that the signature and file contents do not match:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:124
+#: /home/runa/tor/website/en/verifying-signatures.wml:125
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc\n"
@@ -243,14 +248,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:129
+#: /home/runa/tor/website/en/verifying-signatures.wml:130
 msgid ""
 "If you see a message like the above one, then you should not trust the file "
 "contents."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:131
+#: /home/runa/tor/website/en/verifying-signatures.wml:132
 msgid ""
 "If you are running Tor on Debian you should read the instructions on <a href="
 "\"<page docs/debian>#packages\">importing these keys to apt</a>."

Modified: translation/trunk/projects/website/es/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/es/3-low.download-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/es/3-low.download-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:36+0100\n"
+"POT-Creation-Date: 2010-03-09 09:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/bOo0edfLSX.xml:40
-#: /tmp/bOo0edfLSX.xml:56 /tmp/bOo0edfLSX.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/9Y3wpf3PrJ.xml:40
+#: /tmp/9Y3wpf3PrJ.xml:56 /tmp/9Y3wpf3PrJ.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -184,54 +184,79 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:84
-msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgid ""
+"<img src=\"images/distros/android-market.gif\" alt=\"Android\" width=\"32\" "
+"height=\"32\"/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:85
-msgid "Source tarballs"
+msgid "Android"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /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/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/tor/website/en/download-unix.wml:92
+msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:93
+msgid "Source tarballs"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:95
+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/tor/website/en/download-unix.wml:91
+#: /home/runa/tor/website/en/download-unix.wml:99
 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/tor/website/en/download-unix.wml:94
+#: /home/runa/tor/website/en/download-unix.wml:102
 msgid "<kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:101
+#: /home/runa/tor/website/en/download-unix.wml:109
 msgid "<a id=\"packagediff\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:102
+#: /home/runa/tor/website/en/download-unix.wml:110
 msgid ""
 "<a class=\"anchor\" href=\"#packagediff\">What's the difference between "
 "Stable &amp; Unstable?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:105
+#: /home/runa/tor/website/en/download-unix.wml:113
 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/tor/website/en/download-unix.wml:109
+#: /home/runa/tor/website/en/download-unix.wml:117
 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 "
@@ -241,7 +266,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:118
+#: /home/runa/tor/website/en/download-unix.wml:126
 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 "
@@ -251,7 +276,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:125
+#: /home/runa/tor/website/en/download-unix.wml:133
 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 "
@@ -259,7 +284,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:134
+#: /home/runa/tor/website/en/download-unix.wml:142
 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 "
@@ -269,7 +294,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><form>
-#: /home/runa/tor/website/en/download-unix.wml:142
+#: /home/runa/tor/website/en/download-unix.wml:150
 msgid ""
 "<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
 "\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
@@ -278,18 +303,18 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:152
+#: /home/runa/tor/website/en/download-unix.wml:160
 msgid "<a id=\"Warning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:153
+#: /home/runa/tor/website/en/download-unix.wml:161
 msgid ""
 "<a class=\"anchor\" href=\"#Warning\">Warning: Want Tor to really work?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:157
+#: /home/runa/tor/website/en/download-unix.wml:165
 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> "
@@ -298,7 +323,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:165
+#: /home/runa/tor/website/en/download-unix.wml:173
 msgid ""
 "Tor only protects Internet applications that are configured to send their "
 "traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
@@ -308,7 +333,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:173
+#: /home/runa/tor/website/en/download-unix.wml:181
 msgid ""
 "Browser plugins such as Java, Flash, ActiveX, RealPlayer, Quicktime, Adobe's "
 "PDF plugin, and others can be manipulated into revealing your IP address. "
@@ -324,7 +349,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:189
+#: /home/runa/tor/website/en/download-unix.wml:197
 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. "
@@ -334,7 +359,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:197
+#: /home/runa/tor/website/en/download-unix.wml:205
 msgid ""
 "Tor anonymizes the origin of your traffic, and it encrypts everything inside "
 "the Tor network, but <a href=\"https://wiki.torproject.org/noreply/";
@@ -346,7 +371,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:208
+#: /home/runa/tor/website/en/download-unix.wml:216
 msgid ""
 "While Tor blocks attackers on your local network from discovering or "
 "influencing your destination, it opens new risks: malicious or misconfigured "
@@ -355,12 +380,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:216
+#: /home/runa/tor/website/en/download-unix.wml:224
 msgid "<br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:218
+#: /home/runa/tor/website/en/download-unix.wml:226
 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 "
@@ -368,7 +393,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:228
+#: /home/runa/tor/website/en/download-unix.wml:236
 msgid ""
 "See our <a href=\"<page verifying-signatures>\">FAQ entry on verifying "
 "package signatures</a>, which allows you to make sure you've downloaded the "
@@ -376,7 +401,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:234
+#: /home/runa/tor/website/en/download-unix.wml:242
 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</"
@@ -384,7 +409,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:240
+#: /home/runa/tor/website/en/download-unix.wml:248
 msgid ""
 "See the <a href=\"<page documentation>#Developers\">developer documentation</"
 "a> for instructions on fetching Tor from Git to get the very latest "
@@ -394,19 +419,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:252
+#: /home/runa/tor/website/en/download-unix.wml:260
 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/tor/website/en/download-unix.wml:256
+#: /home/runa/tor/website/en/download-unix.wml:264
 msgid "<a id=\"ChangeLog\"></a> <a id=\"Stable\"></a> <a id=\"Testing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:260
+#: /home/runa/tor/website/en/download-unix.wml:268
 msgid ""
 "For a list of what has changed in each stable Tor release, see the <a href="
 "\"<gitblob>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in both "

Modified: translation/trunk/projects/website/es/3-low.people.po
===================================================================
--- translation/trunk/projects/website/es/3-low.people.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/es/3-low.people.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:06+0100\n"
+"POT-Creation-Date: 2010-03-09 09:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -60,8 +60,8 @@
 #. type: Content of: <div><address>
 #: /home/runa/tor/website/en/people.wml:30
 msgid ""
-"The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA<br /"
-"><br />"
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 "
+"USA<br /><br />"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -542,34 +542,56 @@
 
 #. type: Content of: <div><dl><dt>
 #: /home/runa/tor/website/en/people.wml:202
-msgid "Kasimir Gabert"
+msgid "Marco Bonetti"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:202
+msgid "Focusing on MobileTor for the iPhone."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:203
+msgid "Nathan Freitas"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:203
 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/tor/website/en/people.wml:205
+msgid "Kasimir Gabert"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:205
+msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\";>TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid "Robert Hogan"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\";>TorK</a> Tor controller."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid "Damian Johnson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid ""
 "Builds a command-line application for monitoring Tor relays, providing real-"
 "time status information such as the current configuration, bandwidth usage, "
@@ -578,106 +600,118 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid ""
 "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
 "and Privoxy still work well together."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid "Kory Kirk"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid ""
 "Worked during Google Summer of Code 2009 on extending Torbutton. Now he's "
 "working with Bruce Leidl on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Bruce Leidl"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Working on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid ""
 "A lawyer with the CCC in Germany. Coordinates the German Tor community with "
 "respect to legal questions and concerns."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:224
+msgid "Linus Nordberg"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:224
+msgid ""
+"Enjoys measuring the Tor network and helps with outreach in the Nordic "
+"countries."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:226
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:226
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid "Martin Peck"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:225
+#: /home/runa/tor/website/en/people.wml:230
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:231
 msgid ""
 "The most dedicated bug reporter we've ever heard from. He must read Tor "
 "source code every day over breakfast."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy";
@@ -686,24 +720,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?";
 "p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/";
@@ -712,7 +746,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:241
+#: /home/runa/tor/website/en/people.wml:246
 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, "
@@ -720,32 +754,32 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:252
 msgid "<a id=\"Past\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:248
+#: /home/runa/tor/website/en/people.wml:253
 msgid "<a class=\"anchor\" href=\"#Past\">Past thanks to:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "John Bashinski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "Contributed the initial rpm spec file."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid "Domenik Bork"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid ""
 "Worked on Configuration of Hidden Services with User Authorization in "
 "Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches/";
@@ -753,12 +787,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 msgid "Benedikt Boss"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 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 "
@@ -766,22 +800,22 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Ren Bucholz"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Our fine logo and images."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 msgid "Fallon Chen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 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="
@@ -790,32 +824,32 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Bram Cohen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Helped design our congestion control mechanisms, in Tor's early days."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Pat Double"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Creator of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid "Geoff Goodell"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid ""
 "Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/";
 "\">Blossom project</a> which uses Tor as its overlay network; also helped "
@@ -823,12 +857,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid "Aleksei Gorny"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid ""
 "Working on Tor exit scanner improvements (<a href=\"https://svn.torproject.";
 "org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
@@ -836,52 +870,52 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Christian Grothoff"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Contributed better daemonizing behavior."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Steven Hazel"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Made 'make install' do the right thing."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "Justin Hipple"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "The other developer for Vidalia."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Jason Holt"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Contributed patches to the instructions and the man page."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 msgid "Christian King"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 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-";
@@ -889,70 +923,70 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid "Joe Kowalski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid ""
 "Original author and provider of the torstatus script formerly run on "
 "nighteffect."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Adam Langley"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Our fine eventdns code."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid "Rebecca MacKinnon"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid ""
 "Former Director of Tor.  Co-Founder of <a href=\"http://www.";
 "globalvoicesonline.org/\">Global Voices Online</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid "Chris Palmer"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid ""
 "Our liaison and tech guy with EFF while EFF was funding us. Also helped "
 "advocate and write end-user docs."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid "Matej Pfajfar"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid ""
 "Author of the original onion routing code that Tor is based on, so we didn't "
 "have to start from scratch."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 msgid "Johannes Renner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 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 "
@@ -960,33 +994,33 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid "Scott Squires"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid ""
 "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Aaron Turner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Contributed the first version of the tor.sh initscripts shell script."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 msgid "Stephen Tyree"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 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 "
@@ -995,12 +1029,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid "Camilo Viecco"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid ""
 "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac.";
 "vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
@@ -1008,12 +1042,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 msgid "Fred von Lohmann"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 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/?";
@@ -1021,12 +1055,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid "Christian Wilms"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid ""
 "Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
 "\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";
@@ -1034,12 +1068,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 msgid "Jillian C. York"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 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/es/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/es/4-optional.volunteer.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/es/4-optional.volunteer.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:06+0100\n"
+"POT-Creation-Date: 2010-03-09 09:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,21 +252,22 @@
 "Messaging client). Components are pre-configured to operate in a secure way, "
 "and it has very few dependencies on the installed operating system. It has "
 "therefore become one of the most easy to use, and popular, ways to use Tor "
-"on Windows.  <br /> However, there is currently no working package for Linux "
-"and Mac OS X, so this project would be to implement Tor Browser Bundle for "
-"these platforms. This will involve modifications to Vidalia (C++), possibly "
-"Firefox (C) then creating and testing the launcher on a range of operating "
-"system versions and configurations to verify portability.  Some work on this "
-"was completed as part of the Google Summer of Code 2009. Another part of "
-"this project is to identify all of the traces left behind by using a Tor "
-"Browser Bundle on Mac OS X or Linux.  Developing ways to stop, counter, or "
-"remove these traces is a final step.  <br /> Students should be familiar "
-"with application development on one or preferably both of Linux and Mac OS "
-"X, and be comfortable with C/C++ and shell scripting.  <br /> Part of this "
-"project could be usability testing of Tor Browser Bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
+"on Windows.  <br /> However, there is currently no released package for "
+"Linux and Mac OS X, so this project would be to implement Tor Browser Bundle "
+"for OS X and continue work on the Tor Browser Bundle for Linux. This will "
+"involve modifications to Vidalia (C++), possibly Firefox (C) then creating "
+"and testing the launcher on a range of operating system versions and "
+"configurations to verify portability.  Some work on this was completed as "
+"part of the Google Summer of Code 2009. Another part of this project is to "
+"identify all of the traces left behind by using a Tor Browser Bundle on Mac "
+"OS X or Linux.  Developing ways to stop, counter, or remove these traces is "
+"a final step.  <br /> Students should be familiar with application "
+"development on one or preferably both of Linux and Mac OS X, and be "
+"comfortable with C/C++ and shell scripting.  <br /> Part of this project "
+"could be usability testing of Tor Browser Bundle, ideally amongst our target "
+"demographic.  That would help a lot in knowing what needs to be done in "
+"terms of bug fixes or new features. We get this informally at the moment, "
+"but a more structured process would be better."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -320,27 +321,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:225
-msgid ""
-"<b>Tuneup Tor!</b> <br /> Priority: <i>Medium to High</i> <br /> Effort "
-"Level: <i>Medium to High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Nick, Roger, Mike, Karsten</i> <br /> Right now, Tor relays "
-"measure and report their own bandwidth, and Tor clients choose which relays "
-"to use in part based on that bandwidth.  This approach is vulnerable to <a "
-"href=\"http://freehaven.net/anonbib/#bauer:wpes2007\";>attacks where relays "
-"lie about their bandwidth</a>; to address this, Tor currently caps the "
-"maximum bandwidth it's willing to believe any relay provides.  This is a "
-"limited fix, and a waste of bandwidth capacity to boot.  Instead, Tor should "
-"possibly measure bandwidth in a more distributed way, perhaps as described "
-"in the <a href=\"http://freehaven.net/anonbib/author.html#snader08\";>\"A "
-"Tune-up for Tor\"</a> paper by Snader and Borisov. One could use current "
-"testing code to double-check this paper's findings and verify the extent to "
-"which they dovetail with Tor as deployed in the wild, and determine good "
-"ways to incorporate them into their suggestions Tor network without adding "
-"too much communications overhead between relays and directory authorities."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:256
 msgid ""
 "<b>Improving Polipo on Windows</b> <br /> Priority: <i>Medium to High</i> "
@@ -382,17 +362,17 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:283
 msgid ""
-"<b>Tor Controller Status Event Interface</b> <br /> Priority: <i>Medium</i> "
-"<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> "
-"<br /> Likely Mentors: <i>Matt</i> <br /> There are a number of status "
-"changes inside Tor of which the user may need to be informed. For example, "
-"if the user is trying to set up his Tor as a relay and Tor decides that its "
-"ports are not reachable from outside the user's network, we should alert the "
-"user. Currently, all the user gets is a couple log messages in Vidalia's "
-"'message log' window, which they likely never see since they don't receive a "
-"notification that something has gone wrong. Even if the user does actually "
-"look at the message log, most of the messages make little sense to the "
-"novice user.  <br /> Tor has the ability to inform Vidalia of many such "
+"<b>Tor Controller Status Event Interface for Vidalia</b> <br /> Priority: "
+"<i>Medium</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low "
+"to Medium</i> <br /> Likely Mentors: <i>Matt</i> <br /> There are a number "
+"of status changes inside Tor of which the user may need to be informed. For "
+"example, if the user is trying to set up his Tor as a relay and Tor decides "
+"that its ports are not reachable from outside the user's network, we should "
+"alert the user. Currently, all the user gets is a couple log messages in "
+"Vidalia's 'message log' window, which they likely never see since they don't "
+"receive a notification that something has gone wrong. Even if the user does "
+"actually look at the message log, most of the messages make little sense to "
+"the novice user.  <br /> Tor has the ability to inform Vidalia of many such "
 "status changes, and we recently implemented support for a couple of these "
 "events. Still, there are many more status events the user should be informed "
 "of and we need a better UI for actually displaying them to the user.  <br /> "
@@ -477,40 +457,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:415
-msgid ""
-"<b>New Thandy Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Medium to High</i> <br /> Likely "
-"Mentors: <i>Martin</i> <br /> Additional capabilities are needed for "
-"assisted updates of all the Tor related software for Windows and other "
-"operating systems. Some of the features to consider include:"
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:429
-msgid ""
-"Integration of the <a href=\"http://chandlerproject.org/Projects/MeTooCrypto";
-"\">MeTooCrypto Python library</a> for authenticated HTTPS downloads."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:433
-msgid ""
-"Adding a level of indirection between the timestamp signatures and the "
-"package files included in an update. See the \"Thandy attacks / suggestions"
-"\" thread on or-dev."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:436
-msgid ""
-"Support locale specific installation and configuration of assisted updates "
-"based on preference, host, or user account language settings.  Familiarity "
-"with Windows codepages, unicode, and other character sets is helpful in "
-"addition to general win32 and posix API experience and Python proficiency."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:445
 msgid ""
 "<b>Simulator for slow Internet connections</b> <br /> Priority: <i>Medium</"
@@ -558,27 +504,14 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:509
 msgid ""
-"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Low</i> <br /"
-"> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Mike</i> <br /> We're hearing from an increasing number of users "
-"that they want to use Thunderbird with Tor. However, there are plenty of "
-"application-level concerns, for example, by default Thunderbird will put "
-"your hostname in the outgoing mail that it sends. At some point we should "
-"start a new push to build a Thunderbird extension similar to Torbutton."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:527
-msgid ""
-"<b>Intermediate Level Network Device Driver</b> <br /> Priority: <i>Low</i> "
+"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Medium</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> "
-"Likely Mentors: <i>Martin</i> <br /> The WinPCAP device driver used by Tor "
-"VM for bridged networking does not support a number of wireless and non-"
-"Ethernet network adapters.  Implementation of a intermediate level network "
-"device driver for win32 and 64bit would provide a way to intercept and route "
-"traffic over such networks. This project will require knowledge of and "
-"experience with Windows kernel device driver development and testing. "
-"Familiarity with Winsock and Qemu would also be helpful."
+"Likely Mentors: <i>Mike</i> <br /> We're hearing from an increasing number "
+"of users that they want to use Thunderbird with Tor. However, there are "
+"plenty of application-level concerns, for example, by default Thunderbird "
+"will put your hostname in the outgoing mail that it sends. At some point we "
+"should start a new push to build a Thunderbird extension similar to "
+"Torbutton."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -643,35 +576,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:621
-msgid ""
-"<b>Tor/Polipo/Vidalia Auto-Update Framework</b> <br /> We're in need of a "
-"good authenticated-update framework.  Vidalia already has the ability to "
-"notice when the user is running an outdated or unrecommended version of Tor, "
-"using signed statements inside the Tor directory information. Currently, "
-"Vidalia simply pops up a little message box that lets the user know they "
-"should manually upgrade. The goal of this project would be to extend Vidalia "
-"with the ability to also fetch and install the updated Tor software for the "
-"user. We should do the fetches via Tor when possible, but also fall back to "
-"direct fetches in a smart way. Time permitting, we would also like to be "
-"able to update other applications included in the bundled installers, such "
-"as Polipo and Vidalia itself.  <br /> To complete this project, the student "
-"will first need to first investigate the existing auto-update frameworks (e."
-"g., Sparkle on OS X) to evaluate their strengths, weaknesses, security "
-"properties, and ability to be integrated into Vidalia. If none are found to "
-"be suitable, the student will design their own auto-update framework, "
-"document the design, and then discuss the design with other developers to "
-"assess any security issues. The student will then implement their framework "
-"(or integrate an existing one) and test it.  <br /> A person undertaking "
-"this project should have good C++ development experience. Previous "
-"experience with Qt is helpful, but not required. One should also have a good "
-"understanding of common security practices, such as package signature "
-"verification. Good writing ability is also important for this project, since "
-"a vital step of the project will be producing a design document to review "
-"and discuss with others prior to implementation."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:655
 msgid ""
 "<b>Improving the Tor QA process: Continuous Integration for builds</b> <br /"
@@ -699,17 +603,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:683
-msgid ""
-"<b>Usability testing of Tor</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> <br /> Likely "
-"Mentors: <i>Andrew</i> <br /> Especially the browser bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:700
 msgid ""
 "<b>An authenticating IRC proxy</b> <br /> Priority: <i>Medium</i> <br /> "

Modified: translation/trunk/projects/website/es/docs/3-low.debian.po
===================================================================
--- translation/trunk/projects/website/es/docs/3-low.debian.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/es/docs/3-low.debian.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 23:44+0100\n"
+"POT-Creation-Date: 2010-03-09 09:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -28,8 +28,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/60jBQmsauL.xml:40
-#: /tmp/60jBQmsauL.xml:96 /tmp/60jBQmsauL.xml:130
+#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/fjNHxb5I7n.xml:40
+#: /tmp/fjNHxb5I7n.xml:96 /tmp/fjNHxb5I7n.xml:130
 msgid "<br />"
 msgstr ""
 
@@ -49,8 +49,8 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/60jBQmsauL.xml:77
-#: /tmp/60jBQmsauL.xml:121 /tmp/60jBQmsauL.xml:164
+#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/fjNHxb5I7n.xml:77
+#: /tmp/fjNHxb5I7n.xml:121 /tmp/fjNHxb5I7n.xml:164
 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."
@@ -94,8 +94,9 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:59
 msgid ""
-"where you substitute the above word (etch, lenny, sid, karmic, jaunty, "
-"intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you put the codename of your distribution (i.e. etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy or whatever it is) in place of &lt;"
+"DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -165,8 +166,8 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:106
 msgid ""
-"where you substitute the name of your distro (etch, lenny, sid, karmic, "
-"jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you again substitute the name of your distro (etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/es/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/es/docs/3-low.tor-doc-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/es/docs/3-low.tor-doc-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:36+0100\n"
+"POT-Creation-Date: 2010-03-09 09:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/kE5aeATk55.xml:24
-#: /tmp/kE5aeATk55.xml:54 /tmp/kE5aeATk55.xml:88 /tmp/kE5aeATk55.xml:131
-#: /tmp/kE5aeATk55.xml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/IuKy6zlurb.xml:24
+#: /tmp/IuKy6zlurb.xml:54 /tmp/IuKy6zlurb.xml:88 /tmp/IuKy6zlurb.xml:131
+#: /tmp/IuKy6zlurb.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -63,10 +63,10 @@
 "If you're building from source, first install <a href=\"http://www.monkey.";
 "org/~provos/libevent/\">libevent</a>, and make sure you have openssl and "
 "zlib (including the -devel packages if applicable). Then run:<br /> <tt>tar "
-"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable><br /> ./configure "
-"&amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</tt>, or "
-"you can run <tt>make install</tt> (as root if necessary) to install it into /"
-"usr/local/, and then you can start it just by running <tt>tor</tt>."
+"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable></tt><br /> <tt>./"
+"configure &amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</"
+"tt>, or you can run <tt>make install</tt> (as root if necessary) to install "
+"it into /usr/local/, and then you can start it just by running <tt>tor</tt>."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/et/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/et/2-medium.donate.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/et/2-medium.donate.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:04+0100\n"
+"POT-Creation-Date: 2010-03-09 09:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -61,7 +61,7 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:32 /tmp/w4_RHGXkGA.xml:102
+#: /home/runa/tor/website/en/donate.wml:32 /tmp/FaTUElFmdy.xml:102
 msgid "<br />"
 msgstr ""
 
@@ -143,17 +143,17 @@
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:72 /tmp/w4_RHGXkGA.xml:114
+#: /home/runa/tor/website/en/donate.wml:72 /tmp/FaTUElFmdy.xml:114
 msgid "$"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:73 /tmp/w4_RHGXkGA.xml:115
+#: /home/runa/tor/website/en/donate.wml:73 /tmp/FaTUElFmdy.xml:115
 msgid "â"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:74 /tmp/w4_RHGXkGA.xml:116
+#: /home/runa/tor/website/en/donate.wml:74 /tmp/FaTUElFmdy.xml:116
 msgid "Â"
 msgstr ""
 
@@ -248,7 +248,8 @@
 
 #. type: Content of: <div><p><address>
 #: /home/runa/tor/website/en/donate.wml:136
-msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
+msgid ""
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 USA"
 msgstr ""
 
 #. type: Content of: <div><p>

Modified: translation/trunk/projects/website/et/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/et/2-medium.verifying-signatures.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/et/2-medium.verifying-signatures.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-12 12:21+0100\n"
+"POT-Creation-Date: 2010-03-09 09:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -22,7 +22,7 @@
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/verifying-signatures.wml:10
-#: /tmp/T7WN3cRUnb.xml:33 /tmp/T7WN3cRUnb.xml:45 /tmp/T7WN3cRUnb.xml:92
+#: /tmp/avJv7Dbtye.xml:34 /tmp/avJv7Dbtye.xml:46 /tmp/avJv7Dbtye.xml:93
 msgid "<hr />"
 msgstr ""
 
@@ -80,61 +80,66 @@
 msgid "Jacob's (0x9D0FACE4)"
 msgstr ""
 
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/verifying-signatures.wml:30
+msgid "Erinn's (0x63FEE659) and (0xF1F5C9B5)"
+msgstr ""
+
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:32
+#: /home/runa/tor/website/en/verifying-signatures.wml:33
 msgid "Step One: Import the keys"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:34
+#: /home/runa/tor/website/en/verifying-signatures.wml:35
 msgid "You can import keys directly from GnuPG as well:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:36
+#: /home/runa/tor/website/en/verifying-signatures.wml:37
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --recv-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:38
+#: /home/runa/tor/website/en/verifying-signatures.wml:39
 msgid "or search for keys with"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:40
+#: /home/runa/tor/website/en/verifying-signatures.wml:41
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --search-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:42
+#: /home/runa/tor/website/en/verifying-signatures.wml:43
 msgid "and when you select one, it will be added to your keyring."
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:44
+#: /home/runa/tor/website/en/verifying-signatures.wml:45
 msgid "Step Two: Verify the fingerprints"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:46
+#: /home/runa/tor/website/en/verifying-signatures.wml:47
 msgid "Verify the pgp fingerprints using:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:47
+#: /home/runa/tor/website/en/verifying-signatures.wml:48
 #, no-wrap
 msgid "gpg --fingerprint (insert keyid here)"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/verifying-signatures.wml:48
+#: /home/runa/tor/website/en/verifying-signatures.wml:49
 msgid "The fingerprints for the keys should be:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:51
+#: /home/runa/tor/website/en/verifying-signatures.wml:52
 #, no-wrap
 msgid ""
 "pub   1024D/28988BF5 2000-02-27\n"
@@ -174,7 +179,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:87
+#: /home/runa/tor/website/en/verifying-signatures.wml:88
 msgid ""
 "(Of course if you want to be really certain that those are the real ones "
 "then you should check this from more places or even better get into key "
@@ -182,12 +187,12 @@
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:91
+#: /home/runa/tor/website/en/verifying-signatures.wml:92
 msgid "Step Three: Verify the downloaded package"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:93
+#: /home/runa/tor/website/en/verifying-signatures.wml:94
 msgid ""
 "If you're using GnuPG, then put the .asc and the download in the same "
 "directory and type \"gpg --verify (whatever).asc (whatever)\". It will say "
@@ -196,7 +201,7 @@
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:99
+#: /home/runa/tor/website/en/verifying-signatures.wml:100
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc tor-0.1.0.17.tar.gz\n"
@@ -209,7 +214,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:109
+#: /home/runa/tor/website/en/verifying-signatures.wml:110
 msgid ""
 "Notice that there is a warning because you haven't assigned a trust index to "
 "this user. This means that your program verified the key made that "
@@ -222,19 +227,19 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:118
+#: /home/runa/tor/website/en/verifying-signatures.wml:119
 msgid "All this means is you can ignore the message or assign a trust level."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:120
+#: /home/runa/tor/website/en/verifying-signatures.wml:121
 msgid ""
 "For your reference, this is an example of a <em>BAD</em> verification. It "
 "means that the signature and file contents do not match:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:124
+#: /home/runa/tor/website/en/verifying-signatures.wml:125
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc\n"
@@ -243,14 +248,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:129
+#: /home/runa/tor/website/en/verifying-signatures.wml:130
 msgid ""
 "If you see a message like the above one, then you should not trust the file "
 "contents."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:131
+#: /home/runa/tor/website/en/verifying-signatures.wml:132
 msgid ""
 "If you are running Tor on Debian you should read the instructions on <a href="
 "\"<page docs/debian>#packages\">importing these keys to apt</a>."

Modified: translation/trunk/projects/website/et/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/et/3-low.download-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/et/3-low.download-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:34+0100\n"
+"POT-Creation-Date: 2010-03-09 09:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/FJT54elJbE.xml:40
-#: /tmp/FJT54elJbE.xml:56 /tmp/FJT54elJbE.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/bbeogCdTx2.xml:40
+#: /tmp/bbeogCdTx2.xml:56 /tmp/bbeogCdTx2.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -184,54 +184,79 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:84
-msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgid ""
+"<img src=\"images/distros/android-market.gif\" alt=\"Android\" width=\"32\" "
+"height=\"32\"/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:85
-msgid "Source tarballs"
+msgid "Android"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /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/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/tor/website/en/download-unix.wml:92
+msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:93
+msgid "Source tarballs"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:95
+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/tor/website/en/download-unix.wml:91
+#: /home/runa/tor/website/en/download-unix.wml:99
 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/tor/website/en/download-unix.wml:94
+#: /home/runa/tor/website/en/download-unix.wml:102
 msgid "<kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:101
+#: /home/runa/tor/website/en/download-unix.wml:109
 msgid "<a id=\"packagediff\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:102
+#: /home/runa/tor/website/en/download-unix.wml:110
 msgid ""
 "<a class=\"anchor\" href=\"#packagediff\">What's the difference between "
 "Stable &amp; Unstable?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:105
+#: /home/runa/tor/website/en/download-unix.wml:113
 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/tor/website/en/download-unix.wml:109
+#: /home/runa/tor/website/en/download-unix.wml:117
 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 "
@@ -241,7 +266,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:118
+#: /home/runa/tor/website/en/download-unix.wml:126
 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 "
@@ -251,7 +276,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:125
+#: /home/runa/tor/website/en/download-unix.wml:133
 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 "
@@ -259,7 +284,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:134
+#: /home/runa/tor/website/en/download-unix.wml:142
 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 "
@@ -269,7 +294,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><form>
-#: /home/runa/tor/website/en/download-unix.wml:142
+#: /home/runa/tor/website/en/download-unix.wml:150
 msgid ""
 "<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
 "\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
@@ -278,18 +303,18 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:152
+#: /home/runa/tor/website/en/download-unix.wml:160
 msgid "<a id=\"Warning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:153
+#: /home/runa/tor/website/en/download-unix.wml:161
 msgid ""
 "<a class=\"anchor\" href=\"#Warning\">Warning: Want Tor to really work?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:157
+#: /home/runa/tor/website/en/download-unix.wml:165
 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> "
@@ -298,7 +323,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:165
+#: /home/runa/tor/website/en/download-unix.wml:173
 msgid ""
 "Tor only protects Internet applications that are configured to send their "
 "traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
@@ -308,7 +333,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:173
+#: /home/runa/tor/website/en/download-unix.wml:181
 msgid ""
 "Browser plugins such as Java, Flash, ActiveX, RealPlayer, Quicktime, Adobe's "
 "PDF plugin, and others can be manipulated into revealing your IP address. "
@@ -324,7 +349,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:189
+#: /home/runa/tor/website/en/download-unix.wml:197
 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. "
@@ -334,7 +359,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:197
+#: /home/runa/tor/website/en/download-unix.wml:205
 msgid ""
 "Tor anonymizes the origin of your traffic, and it encrypts everything inside "
 "the Tor network, but <a href=\"https://wiki.torproject.org/noreply/";
@@ -346,7 +371,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:208
+#: /home/runa/tor/website/en/download-unix.wml:216
 msgid ""
 "While Tor blocks attackers on your local network from discovering or "
 "influencing your destination, it opens new risks: malicious or misconfigured "
@@ -355,12 +380,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:216
+#: /home/runa/tor/website/en/download-unix.wml:224
 msgid "<br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:218
+#: /home/runa/tor/website/en/download-unix.wml:226
 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 "
@@ -368,7 +393,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:228
+#: /home/runa/tor/website/en/download-unix.wml:236
 msgid ""
 "See our <a href=\"<page verifying-signatures>\">FAQ entry on verifying "
 "package signatures</a>, which allows you to make sure you've downloaded the "
@@ -376,7 +401,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:234
+#: /home/runa/tor/website/en/download-unix.wml:242
 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</"
@@ -384,7 +409,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:240
+#: /home/runa/tor/website/en/download-unix.wml:248
 msgid ""
 "See the <a href=\"<page documentation>#Developers\">developer documentation</"
 "a> for instructions on fetching Tor from Git to get the very latest "
@@ -394,19 +419,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:252
+#: /home/runa/tor/website/en/download-unix.wml:260
 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/tor/website/en/download-unix.wml:256
+#: /home/runa/tor/website/en/download-unix.wml:264
 msgid "<a id=\"ChangeLog\"></a> <a id=\"Stable\"></a> <a id=\"Testing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:260
+#: /home/runa/tor/website/en/download-unix.wml:268
 msgid ""
 "For a list of what has changed in each stable Tor release, see the <a href="
 "\"<gitblob>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in both "

Modified: translation/trunk/projects/website/et/3-low.people.po
===================================================================
--- translation/trunk/projects/website/et/3-low.people.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/et/3-low.people.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:04+0100\n"
+"POT-Creation-Date: 2010-03-09 09:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -60,8 +60,8 @@
 #. type: Content of: <div><address>
 #: /home/runa/tor/website/en/people.wml:30
 msgid ""
-"The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA<br /"
-"><br />"
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 "
+"USA<br /><br />"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -542,34 +542,56 @@
 
 #. type: Content of: <div><dl><dt>
 #: /home/runa/tor/website/en/people.wml:202
-msgid "Kasimir Gabert"
+msgid "Marco Bonetti"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:202
+msgid "Focusing on MobileTor for the iPhone."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:203
+msgid "Nathan Freitas"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:203
 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/tor/website/en/people.wml:205
+msgid "Kasimir Gabert"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:205
+msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\";>TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid "Robert Hogan"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\";>TorK</a> Tor controller."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid "Damian Johnson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid ""
 "Builds a command-line application for monitoring Tor relays, providing real-"
 "time status information such as the current configuration, bandwidth usage, "
@@ -578,106 +600,118 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid ""
 "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
 "and Privoxy still work well together."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid "Kory Kirk"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid ""
 "Worked during Google Summer of Code 2009 on extending Torbutton. Now he's "
 "working with Bruce Leidl on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Bruce Leidl"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Working on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid ""
 "A lawyer with the CCC in Germany. Coordinates the German Tor community with "
 "respect to legal questions and concerns."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:224
+msgid "Linus Nordberg"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:224
+msgid ""
+"Enjoys measuring the Tor network and helps with outreach in the Nordic "
+"countries."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:226
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:226
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid "Martin Peck"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:225
+#: /home/runa/tor/website/en/people.wml:230
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:231
 msgid ""
 "The most dedicated bug reporter we've ever heard from. He must read Tor "
 "source code every day over breakfast."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy";
@@ -686,24 +720,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?";
 "p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/";
@@ -712,7 +746,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:241
+#: /home/runa/tor/website/en/people.wml:246
 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, "
@@ -720,32 +754,32 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:252
 msgid "<a id=\"Past\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:248
+#: /home/runa/tor/website/en/people.wml:253
 msgid "<a class=\"anchor\" href=\"#Past\">Past thanks to:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "John Bashinski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "Contributed the initial rpm spec file."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid "Domenik Bork"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid ""
 "Worked on Configuration of Hidden Services with User Authorization in "
 "Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches/";
@@ -753,12 +787,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 msgid "Benedikt Boss"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 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 "
@@ -766,22 +800,22 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Ren Bucholz"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Our fine logo and images."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 msgid "Fallon Chen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 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="
@@ -790,32 +824,32 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Bram Cohen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Helped design our congestion control mechanisms, in Tor's early days."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Pat Double"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Creator of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid "Geoff Goodell"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid ""
 "Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/";
 "\">Blossom project</a> which uses Tor as its overlay network; also helped "
@@ -823,12 +857,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid "Aleksei Gorny"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid ""
 "Working on Tor exit scanner improvements (<a href=\"https://svn.torproject.";
 "org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
@@ -836,52 +870,52 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Christian Grothoff"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Contributed better daemonizing behavior."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Steven Hazel"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Made 'make install' do the right thing."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "Justin Hipple"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "The other developer for Vidalia."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Jason Holt"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Contributed patches to the instructions and the man page."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 msgid "Christian King"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 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-";
@@ -889,70 +923,70 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid "Joe Kowalski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid ""
 "Original author and provider of the torstatus script formerly run on "
 "nighteffect."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Adam Langley"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Our fine eventdns code."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid "Rebecca MacKinnon"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid ""
 "Former Director of Tor.  Co-Founder of <a href=\"http://www.";
 "globalvoicesonline.org/\">Global Voices Online</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid "Chris Palmer"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid ""
 "Our liaison and tech guy with EFF while EFF was funding us. Also helped "
 "advocate and write end-user docs."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid "Matej Pfajfar"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid ""
 "Author of the original onion routing code that Tor is based on, so we didn't "
 "have to start from scratch."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 msgid "Johannes Renner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 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 "
@@ -960,33 +994,33 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid "Scott Squires"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid ""
 "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Aaron Turner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Contributed the first version of the tor.sh initscripts shell script."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 msgid "Stephen Tyree"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 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 "
@@ -995,12 +1029,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid "Camilo Viecco"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid ""
 "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac.";
 "vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
@@ -1008,12 +1042,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 msgid "Fred von Lohmann"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 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/?";
@@ -1021,12 +1055,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid "Christian Wilms"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid ""
 "Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
 "\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";
@@ -1034,12 +1068,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 msgid "Jillian C. York"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 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/et/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/et/4-optional.volunteer.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/et/4-optional.volunteer.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:04+0100\n"
+"POT-Creation-Date: 2010-03-09 09:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,21 +252,22 @@
 "Messaging client). Components are pre-configured to operate in a secure way, "
 "and it has very few dependencies on the installed operating system. It has "
 "therefore become one of the most easy to use, and popular, ways to use Tor "
-"on Windows.  <br /> However, there is currently no working package for Linux "
-"and Mac OS X, so this project would be to implement Tor Browser Bundle for "
-"these platforms. This will involve modifications to Vidalia (C++), possibly "
-"Firefox (C) then creating and testing the launcher on a range of operating "
-"system versions and configurations to verify portability.  Some work on this "
-"was completed as part of the Google Summer of Code 2009. Another part of "
-"this project is to identify all of the traces left behind by using a Tor "
-"Browser Bundle on Mac OS X or Linux.  Developing ways to stop, counter, or "
-"remove these traces is a final step.  <br /> Students should be familiar "
-"with application development on one or preferably both of Linux and Mac OS "
-"X, and be comfortable with C/C++ and shell scripting.  <br /> Part of this "
-"project could be usability testing of Tor Browser Bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
+"on Windows.  <br /> However, there is currently no released package for "
+"Linux and Mac OS X, so this project would be to implement Tor Browser Bundle "
+"for OS X and continue work on the Tor Browser Bundle for Linux. This will "
+"involve modifications to Vidalia (C++), possibly Firefox (C) then creating "
+"and testing the launcher on a range of operating system versions and "
+"configurations to verify portability.  Some work on this was completed as "
+"part of the Google Summer of Code 2009. Another part of this project is to "
+"identify all of the traces left behind by using a Tor Browser Bundle on Mac "
+"OS X or Linux.  Developing ways to stop, counter, or remove these traces is "
+"a final step.  <br /> Students should be familiar with application "
+"development on one or preferably both of Linux and Mac OS X, and be "
+"comfortable with C/C++ and shell scripting.  <br /> Part of this project "
+"could be usability testing of Tor Browser Bundle, ideally amongst our target "
+"demographic.  That would help a lot in knowing what needs to be done in "
+"terms of bug fixes or new features. We get this informally at the moment, "
+"but a more structured process would be better."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -320,27 +321,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:225
-msgid ""
-"<b>Tuneup Tor!</b> <br /> Priority: <i>Medium to High</i> <br /> Effort "
-"Level: <i>Medium to High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Nick, Roger, Mike, Karsten</i> <br /> Right now, Tor relays "
-"measure and report their own bandwidth, and Tor clients choose which relays "
-"to use in part based on that bandwidth.  This approach is vulnerable to <a "
-"href=\"http://freehaven.net/anonbib/#bauer:wpes2007\";>attacks where relays "
-"lie about their bandwidth</a>; to address this, Tor currently caps the "
-"maximum bandwidth it's willing to believe any relay provides.  This is a "
-"limited fix, and a waste of bandwidth capacity to boot.  Instead, Tor should "
-"possibly measure bandwidth in a more distributed way, perhaps as described "
-"in the <a href=\"http://freehaven.net/anonbib/author.html#snader08\";>\"A "
-"Tune-up for Tor\"</a> paper by Snader and Borisov. One could use current "
-"testing code to double-check this paper's findings and verify the extent to "
-"which they dovetail with Tor as deployed in the wild, and determine good "
-"ways to incorporate them into their suggestions Tor network without adding "
-"too much communications overhead between relays and directory authorities."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:256
 msgid ""
 "<b>Improving Polipo on Windows</b> <br /> Priority: <i>Medium to High</i> "
@@ -382,17 +362,17 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:283
 msgid ""
-"<b>Tor Controller Status Event Interface</b> <br /> Priority: <i>Medium</i> "
-"<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> "
-"<br /> Likely Mentors: <i>Matt</i> <br /> There are a number of status "
-"changes inside Tor of which the user may need to be informed. For example, "
-"if the user is trying to set up his Tor as a relay and Tor decides that its "
-"ports are not reachable from outside the user's network, we should alert the "
-"user. Currently, all the user gets is a couple log messages in Vidalia's "
-"'message log' window, which they likely never see since they don't receive a "
-"notification that something has gone wrong. Even if the user does actually "
-"look at the message log, most of the messages make little sense to the "
-"novice user.  <br /> Tor has the ability to inform Vidalia of many such "
+"<b>Tor Controller Status Event Interface for Vidalia</b> <br /> Priority: "
+"<i>Medium</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low "
+"to Medium</i> <br /> Likely Mentors: <i>Matt</i> <br /> There are a number "
+"of status changes inside Tor of which the user may need to be informed. For "
+"example, if the user is trying to set up his Tor as a relay and Tor decides "
+"that its ports are not reachable from outside the user's network, we should "
+"alert the user. Currently, all the user gets is a couple log messages in "
+"Vidalia's 'message log' window, which they likely never see since they don't "
+"receive a notification that something has gone wrong. Even if the user does "
+"actually look at the message log, most of the messages make little sense to "
+"the novice user.  <br /> Tor has the ability to inform Vidalia of many such "
 "status changes, and we recently implemented support for a couple of these "
 "events. Still, there are many more status events the user should be informed "
 "of and we need a better UI for actually displaying them to the user.  <br /> "
@@ -477,40 +457,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:415
-msgid ""
-"<b>New Thandy Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Medium to High</i> <br /> Likely "
-"Mentors: <i>Martin</i> <br /> Additional capabilities are needed for "
-"assisted updates of all the Tor related software for Windows and other "
-"operating systems. Some of the features to consider include:"
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:429
-msgid ""
-"Integration of the <a href=\"http://chandlerproject.org/Projects/MeTooCrypto";
-"\">MeTooCrypto Python library</a> for authenticated HTTPS downloads."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:433
-msgid ""
-"Adding a level of indirection between the timestamp signatures and the "
-"package files included in an update. See the \"Thandy attacks / suggestions"
-"\" thread on or-dev."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:436
-msgid ""
-"Support locale specific installation and configuration of assisted updates "
-"based on preference, host, or user account language settings.  Familiarity "
-"with Windows codepages, unicode, and other character sets is helpful in "
-"addition to general win32 and posix API experience and Python proficiency."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:445
 msgid ""
 "<b>Simulator for slow Internet connections</b> <br /> Priority: <i>Medium</"
@@ -558,27 +504,14 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:509
 msgid ""
-"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Low</i> <br /"
-"> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Mike</i> <br /> We're hearing from an increasing number of users "
-"that they want to use Thunderbird with Tor. However, there are plenty of "
-"application-level concerns, for example, by default Thunderbird will put "
-"your hostname in the outgoing mail that it sends. At some point we should "
-"start a new push to build a Thunderbird extension similar to Torbutton."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:527
-msgid ""
-"<b>Intermediate Level Network Device Driver</b> <br /> Priority: <i>Low</i> "
+"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Medium</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> "
-"Likely Mentors: <i>Martin</i> <br /> The WinPCAP device driver used by Tor "
-"VM for bridged networking does not support a number of wireless and non-"
-"Ethernet network adapters.  Implementation of a intermediate level network "
-"device driver for win32 and 64bit would provide a way to intercept and route "
-"traffic over such networks. This project will require knowledge of and "
-"experience with Windows kernel device driver development and testing. "
-"Familiarity with Winsock and Qemu would also be helpful."
+"Likely Mentors: <i>Mike</i> <br /> We're hearing from an increasing number "
+"of users that they want to use Thunderbird with Tor. However, there are "
+"plenty of application-level concerns, for example, by default Thunderbird "
+"will put your hostname in the outgoing mail that it sends. At some point we "
+"should start a new push to build a Thunderbird extension similar to "
+"Torbutton."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -643,35 +576,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:621
-msgid ""
-"<b>Tor/Polipo/Vidalia Auto-Update Framework</b> <br /> We're in need of a "
-"good authenticated-update framework.  Vidalia already has the ability to "
-"notice when the user is running an outdated or unrecommended version of Tor, "
-"using signed statements inside the Tor directory information. Currently, "
-"Vidalia simply pops up a little message box that lets the user know they "
-"should manually upgrade. The goal of this project would be to extend Vidalia "
-"with the ability to also fetch and install the updated Tor software for the "
-"user. We should do the fetches via Tor when possible, but also fall back to "
-"direct fetches in a smart way. Time permitting, we would also like to be "
-"able to update other applications included in the bundled installers, such "
-"as Polipo and Vidalia itself.  <br /> To complete this project, the student "
-"will first need to first investigate the existing auto-update frameworks (e."
-"g., Sparkle on OS X) to evaluate their strengths, weaknesses, security "
-"properties, and ability to be integrated into Vidalia. If none are found to "
-"be suitable, the student will design their own auto-update framework, "
-"document the design, and then discuss the design with other developers to "
-"assess any security issues. The student will then implement their framework "
-"(or integrate an existing one) and test it.  <br /> A person undertaking "
-"this project should have good C++ development experience. Previous "
-"experience with Qt is helpful, but not required. One should also have a good "
-"understanding of common security practices, such as package signature "
-"verification. Good writing ability is also important for this project, since "
-"a vital step of the project will be producing a design document to review "
-"and discuss with others prior to implementation."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:655
 msgid ""
 "<b>Improving the Tor QA process: Continuous Integration for builds</b> <br /"
@@ -699,17 +603,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:683
-msgid ""
-"<b>Usability testing of Tor</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> <br /> Likely "
-"Mentors: <i>Andrew</i> <br /> Especially the browser bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:700
 msgid ""
 "<b>An authenticating IRC proxy</b> <br /> Priority: <i>Medium</i> <br /> "

Modified: translation/trunk/projects/website/et/docs/3-low.debian.po
===================================================================
--- translation/trunk/projects/website/et/docs/3-low.debian.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/et/docs/3-low.debian.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-12 12:21+0100\n"
+"POT-Creation-Date: 2010-03-09 09:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -28,8 +28,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/0kcpjqbGem.xml:40
-#: /tmp/0kcpjqbGem.xml:96 /tmp/0kcpjqbGem.xml:130
+#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/BunabMPctV.xml:40
+#: /tmp/BunabMPctV.xml:96 /tmp/BunabMPctV.xml:130
 msgid "<br />"
 msgstr ""
 
@@ -49,8 +49,8 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/0kcpjqbGem.xml:77
-#: /tmp/0kcpjqbGem.xml:121 /tmp/0kcpjqbGem.xml:164
+#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/BunabMPctV.xml:77
+#: /tmp/BunabMPctV.xml:121 /tmp/BunabMPctV.xml:164
 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."
@@ -94,8 +94,9 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:59
 msgid ""
-"where you substitute the above word (etch, lenny, sid, karmic, jaunty, "
-"intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you put the codename of your distribution (i.e. etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy or whatever it is) in place of &lt;"
+"DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -165,8 +166,8 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:106
 msgid ""
-"where you substitute the name of your distro (etch, lenny, sid, karmic, "
-"jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you again substitute the name of your distro (etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/et/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/et/docs/3-low.tor-doc-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/et/docs/3-low.tor-doc-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:34+0100\n"
+"POT-Creation-Date: 2010-03-09 09:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/TDl3WYkB9Q.xml:24
-#: /tmp/TDl3WYkB9Q.xml:54 /tmp/TDl3WYkB9Q.xml:88 /tmp/TDl3WYkB9Q.xml:131
-#: /tmp/TDl3WYkB9Q.xml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/knFcIPRsfg.xml:24
+#: /tmp/knFcIPRsfg.xml:54 /tmp/knFcIPRsfg.xml:88 /tmp/knFcIPRsfg.xml:131
+#: /tmp/knFcIPRsfg.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -63,10 +63,10 @@
 "If you're building from source, first install <a href=\"http://www.monkey.";
 "org/~provos/libevent/\">libevent</a>, and make sure you have openssl and "
 "zlib (including the -devel packages if applicable). Then run:<br /> <tt>tar "
-"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable><br /> ./configure "
-"&amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</tt>, or "
-"you can run <tt>make install</tt> (as root if necessary) to install it into /"
-"usr/local/, and then you can start it just by running <tt>tor</tt>."
+"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable></tt><br /> <tt>./"
+"configure &amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</"
+"tt>, or you can run <tt>make install</tt> (as root if necessary) to install "
+"it into /usr/local/, and then you can start it just by running <tt>tor</tt>."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/fa/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/fa/2-medium.donate.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/fa/2-medium.donate.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:05+0100\n"
+"POT-Creation-Date: 2010-03-09 09:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -61,7 +61,7 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:32 /tmp/iVBPYJmp_I.xml:102
+#: /home/runa/tor/website/en/donate.wml:32 /tmp/3GL7tFJEbV.xml:102
 msgid "<br />"
 msgstr ""
 
@@ -143,17 +143,17 @@
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:72 /tmp/iVBPYJmp_I.xml:114
+#: /home/runa/tor/website/en/donate.wml:72 /tmp/3GL7tFJEbV.xml:114
 msgid "$"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:73 /tmp/iVBPYJmp_I.xml:115
+#: /home/runa/tor/website/en/donate.wml:73 /tmp/3GL7tFJEbV.xml:115
 msgid "â"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:74 /tmp/iVBPYJmp_I.xml:116
+#: /home/runa/tor/website/en/donate.wml:74 /tmp/3GL7tFJEbV.xml:116
 msgid "Â"
 msgstr ""
 
@@ -248,7 +248,8 @@
 
 #. type: Content of: <div><p><address>
 #: /home/runa/tor/website/en/donate.wml:136
-msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
+msgid ""
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 USA"
 msgstr ""
 
 #. type: Content of: <div><p>

Modified: translation/trunk/projects/website/fa/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/fa/2-medium.verifying-signatures.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/fa/2-medium.verifying-signatures.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 23:47+0100\n"
+"POT-Creation-Date: 2010-03-09 09:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -22,7 +22,7 @@
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/verifying-signatures.wml:10
-#: /tmp/TEfWMrYuAG.xml:33 /tmp/TEfWMrYuAG.xml:45 /tmp/TEfWMrYuAG.xml:92
+#: /tmp/H6nqc_pkJM.xml:34 /tmp/H6nqc_pkJM.xml:46 /tmp/H6nqc_pkJM.xml:93
 msgid "<hr />"
 msgstr ""
 
@@ -80,61 +80,66 @@
 msgid "Jacob's (0x9D0FACE4)"
 msgstr ""
 
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/verifying-signatures.wml:30
+msgid "Erinn's (0x63FEE659) and (0xF1F5C9B5)"
+msgstr ""
+
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:32
+#: /home/runa/tor/website/en/verifying-signatures.wml:33
 msgid "Step One: Import the keys"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:34
+#: /home/runa/tor/website/en/verifying-signatures.wml:35
 msgid "You can import keys directly from GnuPG as well:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:36
+#: /home/runa/tor/website/en/verifying-signatures.wml:37
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --recv-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:38
+#: /home/runa/tor/website/en/verifying-signatures.wml:39
 msgid "or search for keys with"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:40
+#: /home/runa/tor/website/en/verifying-signatures.wml:41
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --search-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:42
+#: /home/runa/tor/website/en/verifying-signatures.wml:43
 msgid "and when you select one, it will be added to your keyring."
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:44
+#: /home/runa/tor/website/en/verifying-signatures.wml:45
 msgid "Step Two: Verify the fingerprints"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:46
+#: /home/runa/tor/website/en/verifying-signatures.wml:47
 msgid "Verify the pgp fingerprints using:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:47
+#: /home/runa/tor/website/en/verifying-signatures.wml:48
 #, no-wrap
 msgid "gpg --fingerprint (insert keyid here)"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/verifying-signatures.wml:48
+#: /home/runa/tor/website/en/verifying-signatures.wml:49
 msgid "The fingerprints for the keys should be:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:51
+#: /home/runa/tor/website/en/verifying-signatures.wml:52
 #, no-wrap
 msgid ""
 "pub   1024D/28988BF5 2000-02-27\n"
@@ -174,7 +179,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:87
+#: /home/runa/tor/website/en/verifying-signatures.wml:88
 msgid ""
 "(Of course if you want to be really certain that those are the real ones "
 "then you should check this from more places or even better get into key "
@@ -182,12 +187,12 @@
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:91
+#: /home/runa/tor/website/en/verifying-signatures.wml:92
 msgid "Step Three: Verify the downloaded package"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:93
+#: /home/runa/tor/website/en/verifying-signatures.wml:94
 msgid ""
 "If you're using GnuPG, then put the .asc and the download in the same "
 "directory and type \"gpg --verify (whatever).asc (whatever)\". It will say "
@@ -196,7 +201,7 @@
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:99
+#: /home/runa/tor/website/en/verifying-signatures.wml:100
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc tor-0.1.0.17.tar.gz\n"
@@ -209,7 +214,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:109
+#: /home/runa/tor/website/en/verifying-signatures.wml:110
 msgid ""
 "Notice that there is a warning because you haven't assigned a trust index to "
 "this user. This means that your program verified the key made that "
@@ -222,19 +227,19 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:118
+#: /home/runa/tor/website/en/verifying-signatures.wml:119
 msgid "All this means is you can ignore the message or assign a trust level."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:120
+#: /home/runa/tor/website/en/verifying-signatures.wml:121
 msgid ""
 "For your reference, this is an example of a <em>BAD</em> verification. It "
 "means that the signature and file contents do not match:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:124
+#: /home/runa/tor/website/en/verifying-signatures.wml:125
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc\n"
@@ -243,14 +248,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:129
+#: /home/runa/tor/website/en/verifying-signatures.wml:130
 msgid ""
 "If you see a message like the above one, then you should not trust the file "
 "contents."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:131
+#: /home/runa/tor/website/en/verifying-signatures.wml:132
 msgid ""
 "If you are running Tor on Debian you should read the instructions on <a href="
 "\"<page docs/debian>#packages\">importing these keys to apt</a>."

Modified: translation/trunk/projects/website/fa/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/fa/3-low.download-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/fa/3-low.download-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:35+0100\n"
+"POT-Creation-Date: 2010-03-09 09:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/J61ficH_Tp.xml:40
-#: /tmp/J61ficH_Tp.xml:56 /tmp/J61ficH_Tp.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/ZKm6B4xXaL.xml:40
+#: /tmp/ZKm6B4xXaL.xml:56 /tmp/ZKm6B4xXaL.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -184,54 +184,79 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:84
-msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgid ""
+"<img src=\"images/distros/android-market.gif\" alt=\"Android\" width=\"32\" "
+"height=\"32\"/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:85
-msgid "Source tarballs"
+msgid "Android"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /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/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/tor/website/en/download-unix.wml:92
+msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:93
+msgid "Source tarballs"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:95
+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/tor/website/en/download-unix.wml:91
+#: /home/runa/tor/website/en/download-unix.wml:99
 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/tor/website/en/download-unix.wml:94
+#: /home/runa/tor/website/en/download-unix.wml:102
 msgid "<kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:101
+#: /home/runa/tor/website/en/download-unix.wml:109
 msgid "<a id=\"packagediff\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:102
+#: /home/runa/tor/website/en/download-unix.wml:110
 msgid ""
 "<a class=\"anchor\" href=\"#packagediff\">What's the difference between "
 "Stable &amp; Unstable?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:105
+#: /home/runa/tor/website/en/download-unix.wml:113
 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/tor/website/en/download-unix.wml:109
+#: /home/runa/tor/website/en/download-unix.wml:117
 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 "
@@ -241,7 +266,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:118
+#: /home/runa/tor/website/en/download-unix.wml:126
 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 "
@@ -251,7 +276,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:125
+#: /home/runa/tor/website/en/download-unix.wml:133
 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 "
@@ -259,7 +284,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:134
+#: /home/runa/tor/website/en/download-unix.wml:142
 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 "
@@ -269,7 +294,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><form>
-#: /home/runa/tor/website/en/download-unix.wml:142
+#: /home/runa/tor/website/en/download-unix.wml:150
 msgid ""
 "<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
 "\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
@@ -278,18 +303,18 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:152
+#: /home/runa/tor/website/en/download-unix.wml:160
 msgid "<a id=\"Warning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:153
+#: /home/runa/tor/website/en/download-unix.wml:161
 msgid ""
 "<a class=\"anchor\" href=\"#Warning\">Warning: Want Tor to really work?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:157
+#: /home/runa/tor/website/en/download-unix.wml:165
 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> "
@@ -298,7 +323,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:165
+#: /home/runa/tor/website/en/download-unix.wml:173
 msgid ""
 "Tor only protects Internet applications that are configured to send their "
 "traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
@@ -308,7 +333,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:173
+#: /home/runa/tor/website/en/download-unix.wml:181
 msgid ""
 "Browser plugins such as Java, Flash, ActiveX, RealPlayer, Quicktime, Adobe's "
 "PDF plugin, and others can be manipulated into revealing your IP address. "
@@ -324,7 +349,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:189
+#: /home/runa/tor/website/en/download-unix.wml:197
 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. "
@@ -334,7 +359,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:197
+#: /home/runa/tor/website/en/download-unix.wml:205
 msgid ""
 "Tor anonymizes the origin of your traffic, and it encrypts everything inside "
 "the Tor network, but <a href=\"https://wiki.torproject.org/noreply/";
@@ -346,7 +371,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:208
+#: /home/runa/tor/website/en/download-unix.wml:216
 msgid ""
 "While Tor blocks attackers on your local network from discovering or "
 "influencing your destination, it opens new risks: malicious or misconfigured "
@@ -355,12 +380,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:216
+#: /home/runa/tor/website/en/download-unix.wml:224
 msgid "<br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:218
+#: /home/runa/tor/website/en/download-unix.wml:226
 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 "
@@ -368,7 +393,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:228
+#: /home/runa/tor/website/en/download-unix.wml:236
 msgid ""
 "See our <a href=\"<page verifying-signatures>\">FAQ entry on verifying "
 "package signatures</a>, which allows you to make sure you've downloaded the "
@@ -376,7 +401,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:234
+#: /home/runa/tor/website/en/download-unix.wml:242
 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</"
@@ -384,7 +409,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:240
+#: /home/runa/tor/website/en/download-unix.wml:248
 msgid ""
 "See the <a href=\"<page documentation>#Developers\">developer documentation</"
 "a> for instructions on fetching Tor from Git to get the very latest "
@@ -394,19 +419,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:252
+#: /home/runa/tor/website/en/download-unix.wml:260
 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/tor/website/en/download-unix.wml:256
+#: /home/runa/tor/website/en/download-unix.wml:264
 msgid "<a id=\"ChangeLog\"></a> <a id=\"Stable\"></a> <a id=\"Testing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:260
+#: /home/runa/tor/website/en/download-unix.wml:268
 msgid ""
 "For a list of what has changed in each stable Tor release, see the <a href="
 "\"<gitblob>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in both "

Modified: translation/trunk/projects/website/fa/3-low.people.po
===================================================================
--- translation/trunk/projects/website/fa/3-low.people.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/fa/3-low.people.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:05+0100\n"
+"POT-Creation-Date: 2010-03-09 09:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -60,8 +60,8 @@
 #. type: Content of: <div><address>
 #: /home/runa/tor/website/en/people.wml:30
 msgid ""
-"The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA<br /"
-"><br />"
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 "
+"USA<br /><br />"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -542,34 +542,56 @@
 
 #. type: Content of: <div><dl><dt>
 #: /home/runa/tor/website/en/people.wml:202
-msgid "Kasimir Gabert"
+msgid "Marco Bonetti"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:202
+msgid "Focusing on MobileTor for the iPhone."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:203
+msgid "Nathan Freitas"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:203
 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/tor/website/en/people.wml:205
+msgid "Kasimir Gabert"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:205
+msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\";>TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid "Robert Hogan"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\";>TorK</a> Tor controller."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid "Damian Johnson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid ""
 "Builds a command-line application for monitoring Tor relays, providing real-"
 "time status information such as the current configuration, bandwidth usage, "
@@ -578,106 +600,118 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid ""
 "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
 "and Privoxy still work well together."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid "Kory Kirk"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid ""
 "Worked during Google Summer of Code 2009 on extending Torbutton. Now he's "
 "working with Bruce Leidl on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Bruce Leidl"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Working on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid ""
 "A lawyer with the CCC in Germany. Coordinates the German Tor community with "
 "respect to legal questions and concerns."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:224
+msgid "Linus Nordberg"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:224
+msgid ""
+"Enjoys measuring the Tor network and helps with outreach in the Nordic "
+"countries."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:226
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:226
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid "Martin Peck"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:225
+#: /home/runa/tor/website/en/people.wml:230
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:231
 msgid ""
 "The most dedicated bug reporter we've ever heard from. He must read Tor "
 "source code every day over breakfast."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy";
@@ -686,24 +720,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?";
 "p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/";
@@ -712,7 +746,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:241
+#: /home/runa/tor/website/en/people.wml:246
 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, "
@@ -720,32 +754,32 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:252
 msgid "<a id=\"Past\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:248
+#: /home/runa/tor/website/en/people.wml:253
 msgid "<a class=\"anchor\" href=\"#Past\">Past thanks to:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "John Bashinski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "Contributed the initial rpm spec file."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid "Domenik Bork"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid ""
 "Worked on Configuration of Hidden Services with User Authorization in "
 "Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches/";
@@ -753,12 +787,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 msgid "Benedikt Boss"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 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 "
@@ -766,22 +800,22 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Ren Bucholz"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Our fine logo and images."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 msgid "Fallon Chen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 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="
@@ -790,32 +824,32 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Bram Cohen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Helped design our congestion control mechanisms, in Tor's early days."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Pat Double"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Creator of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid "Geoff Goodell"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid ""
 "Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/";
 "\">Blossom project</a> which uses Tor as its overlay network; also helped "
@@ -823,12 +857,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid "Aleksei Gorny"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid ""
 "Working on Tor exit scanner improvements (<a href=\"https://svn.torproject.";
 "org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
@@ -836,52 +870,52 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Christian Grothoff"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Contributed better daemonizing behavior."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Steven Hazel"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Made 'make install' do the right thing."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "Justin Hipple"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "The other developer for Vidalia."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Jason Holt"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Contributed patches to the instructions and the man page."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 msgid "Christian King"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 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-";
@@ -889,70 +923,70 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid "Joe Kowalski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid ""
 "Original author and provider of the torstatus script formerly run on "
 "nighteffect."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Adam Langley"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Our fine eventdns code."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid "Rebecca MacKinnon"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid ""
 "Former Director of Tor.  Co-Founder of <a href=\"http://www.";
 "globalvoicesonline.org/\">Global Voices Online</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid "Chris Palmer"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid ""
 "Our liaison and tech guy with EFF while EFF was funding us. Also helped "
 "advocate and write end-user docs."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid "Matej Pfajfar"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid ""
 "Author of the original onion routing code that Tor is based on, so we didn't "
 "have to start from scratch."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 msgid "Johannes Renner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 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 "
@@ -960,33 +994,33 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid "Scott Squires"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid ""
 "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Aaron Turner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Contributed the first version of the tor.sh initscripts shell script."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 msgid "Stephen Tyree"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 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 "
@@ -995,12 +1029,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid "Camilo Viecco"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid ""
 "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac.";
 "vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
@@ -1008,12 +1042,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 msgid "Fred von Lohmann"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 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/?";
@@ -1021,12 +1055,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid "Christian Wilms"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid ""
 "Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
 "\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";
@@ -1034,12 +1068,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 msgid "Jillian C. York"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 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/fa/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/fa/4-optional.volunteer.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/fa/4-optional.volunteer.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:04+0100\n"
+"POT-Creation-Date: 2010-03-09 09:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,21 +252,22 @@
 "Messaging client). Components are pre-configured to operate in a secure way, "
 "and it has very few dependencies on the installed operating system. It has "
 "therefore become one of the most easy to use, and popular, ways to use Tor "
-"on Windows.  <br /> However, there is currently no working package for Linux "
-"and Mac OS X, so this project would be to implement Tor Browser Bundle for "
-"these platforms. This will involve modifications to Vidalia (C++), possibly "
-"Firefox (C) then creating and testing the launcher on a range of operating "
-"system versions and configurations to verify portability.  Some work on this "
-"was completed as part of the Google Summer of Code 2009. Another part of "
-"this project is to identify all of the traces left behind by using a Tor "
-"Browser Bundle on Mac OS X or Linux.  Developing ways to stop, counter, or "
-"remove these traces is a final step.  <br /> Students should be familiar "
-"with application development on one or preferably both of Linux and Mac OS "
-"X, and be comfortable with C/C++ and shell scripting.  <br /> Part of this "
-"project could be usability testing of Tor Browser Bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
+"on Windows.  <br /> However, there is currently no released package for "
+"Linux and Mac OS X, so this project would be to implement Tor Browser Bundle "
+"for OS X and continue work on the Tor Browser Bundle for Linux. This will "
+"involve modifications to Vidalia (C++), possibly Firefox (C) then creating "
+"and testing the launcher on a range of operating system versions and "
+"configurations to verify portability.  Some work on this was completed as "
+"part of the Google Summer of Code 2009. Another part of this project is to "
+"identify all of the traces left behind by using a Tor Browser Bundle on Mac "
+"OS X or Linux.  Developing ways to stop, counter, or remove these traces is "
+"a final step.  <br /> Students should be familiar with application "
+"development on one or preferably both of Linux and Mac OS X, and be "
+"comfortable with C/C++ and shell scripting.  <br /> Part of this project "
+"could be usability testing of Tor Browser Bundle, ideally amongst our target "
+"demographic.  That would help a lot in knowing what needs to be done in "
+"terms of bug fixes or new features. We get this informally at the moment, "
+"but a more structured process would be better."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -320,27 +321,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:225
-msgid ""
-"<b>Tuneup Tor!</b> <br /> Priority: <i>Medium to High</i> <br /> Effort "
-"Level: <i>Medium to High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Nick, Roger, Mike, Karsten</i> <br /> Right now, Tor relays "
-"measure and report their own bandwidth, and Tor clients choose which relays "
-"to use in part based on that bandwidth.  This approach is vulnerable to <a "
-"href=\"http://freehaven.net/anonbib/#bauer:wpes2007\";>attacks where relays "
-"lie about their bandwidth</a>; to address this, Tor currently caps the "
-"maximum bandwidth it's willing to believe any relay provides.  This is a "
-"limited fix, and a waste of bandwidth capacity to boot.  Instead, Tor should "
-"possibly measure bandwidth in a more distributed way, perhaps as described "
-"in the <a href=\"http://freehaven.net/anonbib/author.html#snader08\";>\"A "
-"Tune-up for Tor\"</a> paper by Snader and Borisov. One could use current "
-"testing code to double-check this paper's findings and verify the extent to "
-"which they dovetail with Tor as deployed in the wild, and determine good "
-"ways to incorporate them into their suggestions Tor network without adding "
-"too much communications overhead between relays and directory authorities."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:256
 msgid ""
 "<b>Improving Polipo on Windows</b> <br /> Priority: <i>Medium to High</i> "
@@ -382,17 +362,17 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:283
 msgid ""
-"<b>Tor Controller Status Event Interface</b> <br /> Priority: <i>Medium</i> "
-"<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> "
-"<br /> Likely Mentors: <i>Matt</i> <br /> There are a number of status "
-"changes inside Tor of which the user may need to be informed. For example, "
-"if the user is trying to set up his Tor as a relay and Tor decides that its "
-"ports are not reachable from outside the user's network, we should alert the "
-"user. Currently, all the user gets is a couple log messages in Vidalia's "
-"'message log' window, which they likely never see since they don't receive a "
-"notification that something has gone wrong. Even if the user does actually "
-"look at the message log, most of the messages make little sense to the "
-"novice user.  <br /> Tor has the ability to inform Vidalia of many such "
+"<b>Tor Controller Status Event Interface for Vidalia</b> <br /> Priority: "
+"<i>Medium</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low "
+"to Medium</i> <br /> Likely Mentors: <i>Matt</i> <br /> There are a number "
+"of status changes inside Tor of which the user may need to be informed. For "
+"example, if the user is trying to set up his Tor as a relay and Tor decides "
+"that its ports are not reachable from outside the user's network, we should "
+"alert the user. Currently, all the user gets is a couple log messages in "
+"Vidalia's 'message log' window, which they likely never see since they don't "
+"receive a notification that something has gone wrong. Even if the user does "
+"actually look at the message log, most of the messages make little sense to "
+"the novice user.  <br /> Tor has the ability to inform Vidalia of many such "
 "status changes, and we recently implemented support for a couple of these "
 "events. Still, there are many more status events the user should be informed "
 "of and we need a better UI for actually displaying them to the user.  <br /> "
@@ -477,40 +457,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:415
-msgid ""
-"<b>New Thandy Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Medium to High</i> <br /> Likely "
-"Mentors: <i>Martin</i> <br /> Additional capabilities are needed for "
-"assisted updates of all the Tor related software for Windows and other "
-"operating systems. Some of the features to consider include:"
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:429
-msgid ""
-"Integration of the <a href=\"http://chandlerproject.org/Projects/MeTooCrypto";
-"\">MeTooCrypto Python library</a> for authenticated HTTPS downloads."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:433
-msgid ""
-"Adding a level of indirection between the timestamp signatures and the "
-"package files included in an update. See the \"Thandy attacks / suggestions"
-"\" thread on or-dev."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:436
-msgid ""
-"Support locale specific installation and configuration of assisted updates "
-"based on preference, host, or user account language settings.  Familiarity "
-"with Windows codepages, unicode, and other character sets is helpful in "
-"addition to general win32 and posix API experience and Python proficiency."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:445
 msgid ""
 "<b>Simulator for slow Internet connections</b> <br /> Priority: <i>Medium</"
@@ -558,27 +504,14 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:509
 msgid ""
-"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Low</i> <br /"
-"> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Mike</i> <br /> We're hearing from an increasing number of users "
-"that they want to use Thunderbird with Tor. However, there are plenty of "
-"application-level concerns, for example, by default Thunderbird will put "
-"your hostname in the outgoing mail that it sends. At some point we should "
-"start a new push to build a Thunderbird extension similar to Torbutton."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:527
-msgid ""
-"<b>Intermediate Level Network Device Driver</b> <br /> Priority: <i>Low</i> "
+"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Medium</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> "
-"Likely Mentors: <i>Martin</i> <br /> The WinPCAP device driver used by Tor "
-"VM for bridged networking does not support a number of wireless and non-"
-"Ethernet network adapters.  Implementation of a intermediate level network "
-"device driver for win32 and 64bit would provide a way to intercept and route "
-"traffic over such networks. This project will require knowledge of and "
-"experience with Windows kernel device driver development and testing. "
-"Familiarity with Winsock and Qemu would also be helpful."
+"Likely Mentors: <i>Mike</i> <br /> We're hearing from an increasing number "
+"of users that they want to use Thunderbird with Tor. However, there are "
+"plenty of application-level concerns, for example, by default Thunderbird "
+"will put your hostname in the outgoing mail that it sends. At some point we "
+"should start a new push to build a Thunderbird extension similar to "
+"Torbutton."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -643,35 +576,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:621
-msgid ""
-"<b>Tor/Polipo/Vidalia Auto-Update Framework</b> <br /> We're in need of a "
-"good authenticated-update framework.  Vidalia already has the ability to "
-"notice when the user is running an outdated or unrecommended version of Tor, "
-"using signed statements inside the Tor directory information. Currently, "
-"Vidalia simply pops up a little message box that lets the user know they "
-"should manually upgrade. The goal of this project would be to extend Vidalia "
-"with the ability to also fetch and install the updated Tor software for the "
-"user. We should do the fetches via Tor when possible, but also fall back to "
-"direct fetches in a smart way. Time permitting, we would also like to be "
-"able to update other applications included in the bundled installers, such "
-"as Polipo and Vidalia itself.  <br /> To complete this project, the student "
-"will first need to first investigate the existing auto-update frameworks (e."
-"g., Sparkle on OS X) to evaluate their strengths, weaknesses, security "
-"properties, and ability to be integrated into Vidalia. If none are found to "
-"be suitable, the student will design their own auto-update framework, "
-"document the design, and then discuss the design with other developers to "
-"assess any security issues. The student will then implement their framework "
-"(or integrate an existing one) and test it.  <br /> A person undertaking "
-"this project should have good C++ development experience. Previous "
-"experience with Qt is helpful, but not required. One should also have a good "
-"understanding of common security practices, such as package signature "
-"verification. Good writing ability is also important for this project, since "
-"a vital step of the project will be producing a design document to review "
-"and discuss with others prior to implementation."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:655
 msgid ""
 "<b>Improving the Tor QA process: Continuous Integration for builds</b> <br /"
@@ -699,17 +603,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:683
-msgid ""
-"<b>Usability testing of Tor</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> <br /> Likely "
-"Mentors: <i>Andrew</i> <br /> Especially the browser bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:700
 msgid ""
 "<b>An authenticating IRC proxy</b> <br /> Priority: <i>Medium</i> <br /> "

Modified: translation/trunk/projects/website/fa/docs/3-low.debian.po
===================================================================
--- translation/trunk/projects/website/fa/docs/3-low.debian.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/fa/docs/3-low.debian.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 23:47+0100\n"
+"POT-Creation-Date: 2010-03-09 09:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -28,8 +28,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/cUbvHGBsdP.xml:40
-#: /tmp/cUbvHGBsdP.xml:96 /tmp/cUbvHGBsdP.xml:130
+#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/srjGbu02Wb.xml:40
+#: /tmp/srjGbu02Wb.xml:96 /tmp/srjGbu02Wb.xml:130
 msgid "<br />"
 msgstr ""
 
@@ -49,8 +49,8 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/cUbvHGBsdP.xml:77
-#: /tmp/cUbvHGBsdP.xml:121 /tmp/cUbvHGBsdP.xml:164
+#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/srjGbu02Wb.xml:77
+#: /tmp/srjGbu02Wb.xml:121 /tmp/srjGbu02Wb.xml:164
 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."
@@ -94,8 +94,9 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:59
 msgid ""
-"where you substitute the above word (etch, lenny, sid, karmic, jaunty, "
-"intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you put the codename of your distribution (i.e. etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy or whatever it is) in place of &lt;"
+"DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -165,8 +166,8 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:106
 msgid ""
-"where you substitute the name of your distro (etch, lenny, sid, karmic, "
-"jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you again substitute the name of your distro (etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/fa/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/fa/docs/3-low.tor-doc-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/fa/docs/3-low.tor-doc-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:34+0100\n"
+"POT-Creation-Date: 2010-03-09 09:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/yKrlSpV1cX.xml:24
-#: /tmp/yKrlSpV1cX.xml:54 /tmp/yKrlSpV1cX.xml:88 /tmp/yKrlSpV1cX.xml:131
-#: /tmp/yKrlSpV1cX.xml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/RgAM2xFKG2.xml:24
+#: /tmp/RgAM2xFKG2.xml:54 /tmp/RgAM2xFKG2.xml:88 /tmp/RgAM2xFKG2.xml:131
+#: /tmp/RgAM2xFKG2.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -63,10 +63,10 @@
 "If you're building from source, first install <a href=\"http://www.monkey.";
 "org/~provos/libevent/\">libevent</a>, and make sure you have openssl and "
 "zlib (including the -devel packages if applicable). Then run:<br /> <tt>tar "
-"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable><br /> ./configure "
-"&amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</tt>, or "
-"you can run <tt>make install</tt> (as root if necessary) to install it into /"
-"usr/local/, and then you can start it just by running <tt>tor</tt>."
+"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable></tt><br /> <tt>./"
+"configure &amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</"
+"tt>, or you can run <tt>make install</tt> (as root if necessary) to install "
+"it into /usr/local/, and then you can start it just by running <tt>tor</tt>."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/fr/1-high.bridges.po
===================================================================
--- translation/trunk/projects/website/fr/1-high.bridges.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/fr/1-high.bridges.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-07 07:59+0100\n"
+"POT-Creation-Date: 2010-03-09 09:20+0100\n"
 "PO-Revision-Date: 2010-03-04 11:14-0700\n"
 "Last-Translator: MÃdÃric RIBREUX <mederic.ribreux@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -26,8 +26,8 @@
 msgstr "<a class=\"anchor\" href=\"#BridgeIntroduction\">Tor: Passerelles</a>"
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/bridges.wml:11 /tmp/3mAjfyz9iq.xml:75
-#: /tmp/3mAjfyz9iq.xml:98 /tmp/3mAjfyz9iq.xml:121 /tmp/3mAjfyz9iq.xml:145
+#: /home/runa/tor/website/en/bridges.wml:11 /tmp/dfaa3wBjWa.xml:75
+#: /tmp/dfaa3wBjWa.xml:98 /tmp/dfaa3wBjWa.xml:121 /tmp/dfaa3wBjWa.xml:145
 msgid "<hr />"
 msgstr "<hr />"
 
@@ -41,12 +41,12 @@
 "to the Tor network is being blocked, you may want to use the bridge feature "
 "of Tor."
 msgstr ""
-"Les relais-passerelles (ou \"passerelles\" en plus court) sont des relais Tor "
-"qui ne sont pas listÃs dans l'annuaire principal de Tor. Puisqu'il n'existe "
-"aucune liste complÃte publique de ces relais, mÃme si votre FAI filtre les "
-"connexions vers tous les relais Tor connus, il ne sera pas en mesure de "
-"bloquer toutes les passerelles. Si vous suspectez que votre accÃs au rÃseau "
-"Tor est bloquÃ, vous pouvez utiliser la fonction passerelle de Tor."
+"Les relais-passerelles (ou \"passerelles\" en plus court) sont des relais "
+"Tor qui ne sont pas listÃs dans l'annuaire principal de Tor. Puisqu'il "
+"n'existe aucune liste complÃte publique de ces relais, mÃme si votre FAI "
+"filtre les connexions vers tous les relais Tor connus, il ne sera pas en "
+"mesure de bloquer toutes les passerelles. Si vous suspectez que votre accÃs "
+"au rÃseau Tor est bloquÃ, vous pouvez utiliser la fonction passerelle de Tor."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:22
@@ -85,17 +85,16 @@
 "a>."
 msgstr ""
 "A noter qu'il est Ãgalement possible que Tor soit non-opÃrant pour d'autres "
-"raisons. La derniÃre version du <a href=\"<page torbrowser/index>\">\"Tout en "
-"un\" Navigateur+Tor </a> pour Windows essaye de vous donner les causes "
+"raisons. La derniÃre version du <a href=\"<page torbrowser/index>\">\"Tout "
+"en un\" Navigateur+Tor </a> pour Windows essaye de vous donner les causes "
 "possibles des problÃmes que Tor rencontre pour se connecter. Vous devriez "
-"Ãgalement lire <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/T";
-"orFAQ#ItDoesntWork\">la FAQ sur les problÃmes de fonctionnement de Tor</a> "
+"Ãgalement lire <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
+"TorFAQ#ItDoesntWork\">la FAQ sur les problÃmes de fonctionnement de Tor</a> "
 "lorsque ces derniers surviennent.  Si vous avez l'intuition que le problÃme "
 "vient d'un bloquage Ãvident ou si vous avez envie d'essayer parce que vous "
 "n'Ãtes pas sÃr ou tout simplement, si vous voulez tenter l'aventure, merci "
-"de lire ce qui suit. Assurez-vous d'utiliser la <a href=\"<page "
-"download>#Dev\">derniÃre version 0.2.1.x ou 0.2.2.x pour votre "
-"plateforme</a>."
+"de lire ce qui suit. Assurez-vous d'utiliser la <a href=\"<page download>#Dev"
+"\">derniÃre version 0.2.1.x ou 0.2.2.x pour votre plateforme</a>."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:46
@@ -126,10 +125,10 @@
 "one translated into your language? Let us know!"
 msgstr ""
 "Freedom House a crÃÃ une vidÃo qui montre comment rÃcupÃrer et utiliser des "
-"passerelles Tor. Vous pouvez visionner cette vidÃo sur <a "
-"href=\"http://www.youtube.com/freedom4internet\";>Youtube: "
-"Freedom4Internet</a>.  Vous connaissez une meilleure vidÃo ou bien une autre "
-"qui est traduite dans votre langue ? FaÃtes-le nous savoir !"
+"passerelles Tor. Vous pouvez visionner cette vidÃo sur <a href=\"http://www.";
+"youtube.com/freedom4internet\">Youtube: Freedom4Internet</a>.  Vous "
+"connaissez une meilleure vidÃo ou bien une autre qui est traduite dans votre "
+"langue ? FaÃtes-le nous savoir !"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:66
@@ -240,8 +239,8 @@
 msgstr ""
 "Vous pouvez ajouter toutes les adresses de passerelles que vous connaissez "
 "car plus y en a, plus la connexion sera fiable. Une seule passerelle devrait "
-"Ãtre suffisante pour atteindre le rÃseau Tor. Mais si vous n'en disposez "
-"que d'une seule et qu'elle s'Ãteint, vous serez coupà du rÃseau Tor."
+"Ãtre suffisante pour atteindre le rÃseau Tor. Mais si vous n'en disposez que "
+"d'une seule et qu'elle s'Ãteint, vous serez coupà du rÃseau Tor."
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/bridges.wml:119
@@ -322,9 +321,9 @@
 "configure it either way:"
 msgstr ""
 "Si vous dÃsirez apporter votre contribution mais que vous ne pouvez pas "
-"faire tourner un <a href=\"<page docs/tor-doc-relay>\">relais Tor normal</a>, "
-"vous pouvez faire fonctionner un relais-passerelle à la place. Vous pouvez "
-"la configurer de la maniÃre suivante:"
+"faire tourner un <a href=\"<page docs/tor-doc-relay>\">relais Tor normal</"
+"a>, vous pouvez faire fonctionner un relais-passerelle à la place. Vous "
+"pouvez la configurer de la maniÃre suivante:"
 
 #. type: Content of: <div><p><ul><li>
 #: /home/runa/tor/website/en/bridges.wml:152
@@ -332,9 +331,9 @@
 "manually <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
 "TorFAQ#torrc\">edit your torrc file</a> to be just these four lines:<br />"
 msgstr ""
-"editer manuellement <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc\";>votre "
-"fichier torrc</a> avec les quatre lignes qui suivent:<br />"
+"editer manuellement <a href=\"https://wiki.torproject.org/noreply/";
+"TheOnionRouter/TorFAQ#torrc\">votre fichier torrc</a> avec les quatre lignes "
+"qui suivent:<br />"
 
 #. type: Content of: <div><p><ul><li><pre>
 #: /home/runa/tor/website/en/bridges.wml:155
@@ -374,10 +373,10 @@
 "TorFAQ#ServerForFirewalledClients\">some complex port forwarding</a>."
 msgstr ""
 "Si vous rÃcupÃrez des erreurs au dÃmarrage du type: \"Could not bind to "
-"0.0.0.0:443: Permission denied\", vous aurez besoin d'utiliser un ORPort plus "
-"grand (ex: 8080) ou de mettre en place <a href=\"https://wiki.torproject.org";
-"/noreply/TheOnionRouter/TorFAQ#ServerForFirewalledClients\">des routages de "
-"port complexes<a>."
+"0.0.0.0:443: Permission denied\", vous aurez besoin d'utiliser un ORPort "
+"plus grand (ex: 8080) ou de mettre en place <a href=\"https://wiki.";
+"torproject.org/noreply/TheOnionRouter/TorFAQ#ServerForFirewalledClients"
+"\">des routages de port complexes<a>."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:174

Modified: translation/trunk/projects/website/fr/1-high.download.po
===================================================================
--- translation/trunk/projects/website/fr/1-high.download.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/fr/1-high.download.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-03-03 22:12+0100\n"
+"POT-Creation-Date: 2010-03-09 09:19+0100\n"
 "PO-Revision-Date: 2010-03-04 11:58-0700\n"
 "Last-Translator: MÃdÃric RIBREUX <mederic.ribreux@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -37,22 +37,22 @@
 "limitations de Tor."
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:25 /tmp/_6Q59B8tpp.xml:313
+#: /home/runa/tor/website/en/download.wml:25 /tmp/GPpBmwGfbN.xml:313
 msgid "Operating System"
 msgstr "SystÃme d'exploitation"
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:26 /tmp/_6Q59B8tpp.xml:314
+#: /home/runa/tor/website/en/download.wml:26 /tmp/GPpBmwGfbN.xml:314
 msgid "Download Stable"
 msgstr "TÃlÃchargement version stable"
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:27 /tmp/_6Q59B8tpp.xml:315
+#: /home/runa/tor/website/en/download.wml:27 /tmp/GPpBmwGfbN.xml:315
 msgid "Download Unstable"
 msgstr "TÃlÃchargement version non-stable"
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:28 /tmp/_6Q59B8tpp.xml:316
+#: /home/runa/tor/website/en/download.wml:28 /tmp/GPpBmwGfbN.xml:316
 msgid "Installation and Configuration"
 msgstr "Installation et Configuration"
 
@@ -62,8 +62,8 @@
 "<img src=\"images/distros/windows.png\" /> Windows<br /> <small><em>Windows "
 "7, Vista, XP, 2000, 2003 Server</em></small>"
 msgstr ""
-"<img src=\"images/distros/windows.png\" /> Windows<br /> <small><em>Windows 7, "
-"Vista, XP, 2000, 2003 Server</em></small>"
+"<img src=\"images/distros/windows.png\" /> Windows<br /> <small><em>Windows "
+"7, Vista, XP, 2000, 2003 Server</em></small>"
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:38
@@ -84,7 +84,7 @@
 "(<a href=\"<package-win32-bundle-alpha-sig>\">sig</a>)"
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:46 /tmp/_6Q59B8tpp.xml:333
+#: /home/runa/tor/website/en/download.wml:46 /tmp/GPpBmwGfbN.xml:333
 msgid "<a href=\"<page docs/tor-doc-windows>\">Windows</a>"
 msgstr "<a href=\"<page docs/tor-doc-windows>\">Windows</a>"
 
@@ -94,8 +94,8 @@
 "<img src=\"images/distros/windows.png\" /> Tor Browser Bundle for Windows "
 "<br /> (Contains Tor, Vidalia, Torbutton, Polipo, and Firefox)"
 msgstr ""
-"<img src=\"images/distros/windows.png\" /> Pack de navigation Tor pour Windows "
-"<br /> (Contient Tor, Vidalia, Torbutton, Polipo, et Firefox)"
+"<img src=\"images/distros/windows.png\" /> Pack de navigation Tor pour "
+"Windows <br /> (Contient Tor, Vidalia, Torbutton, Polipo, et Firefox)"
 
 #. PO4ASHARPBEGIN Translators should link to the Browser Bundle for their language,PO4ASHARPEND
 #. PO4ASHARPBEGIN e.g. _ru.exe Russian, _de.exe for Deutsch, etc.PO4ASHARPEND
@@ -113,7 +113,8 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:63
 msgid "<a href=\"<page torbrowser/index>\">Windows Browser Bundle</a>"
-msgstr "<a href=\"<page torbrowser/index>\">Pack de navigation pour Windows</a>"
+msgstr ""
+"<a href=\"<page torbrowser/index>\">Pack de navigation pour Windows</a>"
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:69
@@ -121,9 +122,9 @@
 "<img src=\"images/distros/windows.png\" /> Tor IM Browser Bundle for Windows "
 "<br />(Contains Tor, Vidalia, Torbutton, Polipo, Firefox, and Pidgin)"
 msgstr ""
-"<img src=\"images/distros/windows.png\" /> Pack de navigation et de messagerie "
-"instantanÃe Tor <br/>(Contient Tor, Vidalia, Torbutton, Polipo, Firefox, et "
-"Pidgin)"
+"<img src=\"images/distros/windows.png\" /> Pack de navigation et de "
+"messagerie instantanÃe Tor <br/>(Contient Tor, Vidalia, Torbutton, Polipo, "
+"Firefox, et Pidgin)"
 
 #. 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
@@ -173,8 +174,8 @@
 "href=\"<package-osx-bundle-alpha-sig>\">sig</a>)"
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:97 /tmp/_6Q59B8tpp.xml:115
-#: /tmp/_6Q59B8tpp.xml:350 /tmp/_6Q59B8tpp.xml:367
+#: /home/runa/tor/website/en/download.wml:97 /tmp/GPpBmwGfbN.xml:115
+#: /tmp/GPpBmwGfbN.xml:350 /tmp/GPpBmwGfbN.xml:367
 msgid "<a href=\"<page docs/tor-doc-osx>\">Mac OS X</a>"
 msgstr "<a href=\"<page docs/tor-doc-osx>\">Mac OS X</a>"
 
@@ -215,12 +216,12 @@
 "<small><em>Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE</em></small>"
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:125 /tmp/_6Q59B8tpp.xml:377
+#: /home/runa/tor/website/en/download.wml:125 /tmp/GPpBmwGfbN.xml:377
 msgid "<a href=\"<page download-unix>\">Linux/Unix download page</a>"
 msgstr "<a href=\"<page download-unix>\">page de tÃlÃchargement Linux/Unix</a>"
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:128 /tmp/_6Q59B8tpp.xml:380
+#: /home/runa/tor/website/en/download.wml:128 /tmp/GPpBmwGfbN.xml:380
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 
@@ -260,8 +261,8 @@
 "tester de nouvelles options et à corriger des bugs.  MÃme s'ils ont un "
 "numÃro de version plus Ãlevà que les versions stables listÃes ci-dessus, il "
 "y a de grandes chances d'avoir de sÃrieux problÃmes de stabilità et de "
-"sÃcurità qu'avec les versions stables. Soyez prÃt à <a "
-"href=\"https://bugs.torproject.org/\";>nous faire remonter les bugs</a>."
+"sÃcurità qu'avec les versions stables. Soyez prÃt à <a href=\"https://bugs.";
+"torproject.org/\">nous faire remonter les bugs</a>."
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/en/download.wml:154
@@ -275,8 +276,8 @@
 "Tor est distribuà en tant que <a href=\"http://www.fsf.org/\";>Logiciel "
 "Libre</a> sous la <a href=\"<gitglob>LICENSE\">licence 3-clause BSD</a>. Les "
 "Packs incluent Ãgalement <a href=\"<page vidalia/index>\">Vidalia</a> et <a "
-"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\";>Polipo</a>, qui sont "
-"des applications complÃmentaires distribuÃes sous licence GNU GPL."
+"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\";>Polipo</a>, qui "
+"sont des applications complÃmentaires distribuÃes sous licence GNU GPL."
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/en/download.wml:161
@@ -300,11 +301,11 @@
 "list's RSS feed</a>."
 msgstr ""
 "Pour vous tenir informà des alertes de sÃcurità et des nouvelles versions "
-"stables, abonnez-vous à la <a "
-"href=\"http://archives.seul.org/or/announce/\";>liste de diffusion or-"
-"announce</a> (Vous serez amenà à confirmer votre inscription par courriel). "
-"Vous pouvez Ãgalement <a href=\"http://rss.gmane.org/gmane.network.onion-";
-"routing.announce\">consulter cette liste par flux RSS</a>."
+"stables, abonnez-vous à la <a href=\"http://archives.seul.org/or/announce/";
+"\">liste de diffusion or-announce</a> (Vous serez amenà à confirmer votre "
+"inscription par courriel). Vous pouvez Ãgalement <a href=\"http://rss.gmane.";
+"org/gmane.network.onion-routing.announce\">consulter cette liste par flux "
+"RSS</a>."
 
 #. type: Attribute 'title' of: <div><div><link>
 #: /home/runa/tor/website/en/download.wml:177
@@ -380,9 +381,9 @@
 "(one for Tor, one for unsafe browsing)."
 msgstr ""
 "Torbutton bloque les extensions du navigateur tels que Java, Flash, ActiveX, "
-"RealPlayer, Quicktime, l'extension PDF d'Adobe, et autresÂ: ils peuvent "
-"Ãtre manipulÃs de maniÃre à rÃvÃler votre adresse IP. Ainsi, cela signifie "
-"que Youtube est dÃsactivÃ. Si vous avez rÃellement besoin de Youtube, vous "
+"RealPlayer, Quicktime, l'extension PDF d'Adobe, et autresÂ: ils peuvent Ãtre "
+"manipulÃs de maniÃre à rÃvÃler votre adresse IP. Ainsi, cela signifie que "
+"Youtube est dÃsactivÃ. Si vous avez rÃellement besoin de Youtube, vous "
 "pouvez <a href=\"<page torbutton/faq>#noflash\">reconfigurer Torbutton</a> "
 "pour l'autoriser; mais gardez bien à l'esprit que vous vous exposez à une "
 "attaque potentielle. De plus, les extensions comme la barre d'outils Google "
@@ -480,8 +481,8 @@
 "archive/\">the archive</a>."
 msgstr ""
 "Si vous dÃsirez trouver une version antÃrieure du code source de Tor, des "
-"paquets ou d'autres binaires, consultez <a "
-"href=\"http://archive.torproject.org/tor-package-archive/\";>l'archive</a>."
+"paquets ou d'autres binaires, consultez <a href=\"http://archive.torproject.";
+"org/tor-package-archive/\">l'archive</a>."
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/en/download.wml:276
@@ -494,8 +495,8 @@
 msgstr ""
 "Consultez la <a href=\"<page documentation>#Developers\">documentation des "
 "dÃveloppeurs</a> pour savoir comment rapatrier Tor à partir de Git dans le "
-"but d'obtenir les toutes derniÃres version du code source de dÃveloppement. "
-" Vous pouvez aussi tÃlÃcharger les <a href=\"dist/\">sources de Privoxy</a> "
+"but d'obtenir les toutes derniÃres version du code source de dÃveloppement.  "
+"Vous pouvez aussi tÃlÃcharger les <a href=\"dist/\">sources de Privoxy</a> "
 "ou <a href=\"dist/vidalia-bundles/?C=M;O=D\">les sources de Vidalia</a>."
 
 #. type: Content of: <div><div><p>
@@ -521,10 +522,10 @@
 "\">ChangeLog</a>."
 msgstr ""
 "Pour obtenir une liste des Ãvolutions de chaque version stable de Tor, "
-"consultez les <a href=\"<gitglob>ReleaseNotes\">Notes de publication</a>. Pour "
-"la liste des changements concernant à la fois les versions stables et les "
-"versions de dÃveloppement, consultez le <a href=\"<gitglob>ChangeLog\">fichier "
-"ChangeLog</a>."
+"consultez les <a href=\"<gitglob>ReleaseNotes\">Notes de publication</a>. "
+"Pour la liste des changements concernant à la fois les versions stables et "
+"les versions de dÃveloppement, consultez le <a href=\"<gitglob>ChangeLog"
+"\">fichier ChangeLog</a>."
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/download.wml:303
@@ -604,8 +605,8 @@
 #: /home/runa/tor/website/en/download.wml:356
 msgid "Mac (Contains only Tor)<br /> <small><em>PowerPC Only</em></small>"
 msgstr ""
-"Mac (Contient seulement Tor)<br /> <small><em>uniquement pour "
-"PowerPC</em></small>"
+"Mac (Contient seulement Tor)<br /> <small><em>uniquement pour PowerPC</em></"
+"small>"
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:360
@@ -641,8 +642,8 @@
 "Source tarballs<br /> <kbd>./configure &amp;&amp; make &amp;&amp; src/or/"
 "tor</kbd>"
 msgstr ""
-"Archives Tar du code source<br /> <kbd>./configure &amp;&amp; make "
-"&amp;&amp; src/or/tor</kbd>"
+"Archives Tar du code source<br /> <kbd>./configure &amp;&amp; make &amp;"
+"&amp; src/or/tor</kbd>"
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:390

Modified: translation/trunk/projects/website/fr/1-high.easy-download.po
===================================================================
--- translation/trunk/projects/website/fr/1-high.easy-download.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/fr/1-high.easy-download.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-03-03 22:12+0100\n"
+"POT-Creation-Date: 2010-03-09 09:20+0100\n"
 "PO-Revision-Date: 2010-03-04 11:28-0700\n"
 "Last-Translator: MÃdÃric RIBREUX <mederic.ribreux@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -26,7 +26,7 @@
 msgstr "<hr />"
 
 #. type: Content of: <div><table><tr><th>
-#: /home/runa/tor/website/en/easy-download.wml:13 /tmp/n6BEVncUXj.xml:15
+#: /home/runa/tor/website/en/easy-download.wml:13 /tmp/lMycei1gpB.xml:15
 msgid "<img src=\"images/logo.windows-header.gif\"/>"
 msgstr "<img src=\"images/logo.windows-header.gif\">"
 
@@ -54,8 +54,8 @@
 "<a href=\"torbrowser/dist/tor-browser-<version-torbrowserbundle>_en-US.exe"
 "\">Tor Browser Bundle for Windows</a>"
 msgstr ""
-"<a href=\"torbrowser/dist/tor-browser-<version-torbrowserbundle>_fr.exe\">Pack "
-"de navigation pour Windows</a>"
+"<a href=\"torbrowser/dist/tor-browser-<version-torbrowserbundle>_fr.exe"
+"\">Pack de navigation pour Windows</a>"
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/easy-download.wml:25
@@ -129,8 +129,8 @@
 "Verify the signatures for the downloads above (<a href=\"<page verifying-"
 "signatures>\">How?</a>):"
 msgstr ""
-"VÃrifiez les signatures des tÃlÃchargements prÃsentÃs ci-dessus (<a "
-"href=\"<page verifying-signatures>\">CommentÂfaire ?</a>): "
+"VÃrifiez les signatures des tÃlÃchargements prÃsentÃs ci-dessus (<a href="
+"\"<page verifying-signatures>\">CommentÂfaire ?</a>): "
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/easy-download.wml:61
@@ -138,9 +138,8 @@
 "<a href=\"torbrowser/dist/tor-browser-<version-torbrowserbundle>_en-US.exe."
 "asc\">Tor Browser Bundle for Windows signature</a>"
 msgstr ""
-"<a href=\"torbrowser/dist/tor-browser-<version-"
-"torbrowserbundle>_fr.exe.asc\">Signature du Pack de navigation pour "
-"Windows</a>"
+"<a href=\"torbrowser/dist/tor-browser-<version-torbrowserbundle>_fr.exe.asc"
+"\">Signature du Pack de navigation pour Windows</a>"
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/easy-download.wml:62
@@ -166,8 +165,8 @@
 "Interested in <a href=\"<page overview>#overview\">learning more about Tor "
 "in general</a>?"
 msgstr ""
-"Vous dÃsirez <a href=\"<page overview>#overview\">en savoir plus sur Tor</a> ? "
-""
+"Vous dÃsirez <a href=\"<page overview>#overview\">en savoir plus sur Tor</"
+"a> ? "
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/en/easy-download.wml:75
@@ -181,8 +180,8 @@
 "Pour vous tenir informà des alertes de sÃcurità et des nouvelles versions, "
 "abonnez-vous à la <a href=\"http://archives.seul.org/or/announce/\";>liste de "
 "diffusion or-announce</a> (vous devrez confirmer votre inscription par "
-"email). Vous pouvez Ãgalement <a href=\"http://rss.gmane.org/gmane.network";
-".onion-routing.announce\">suivre le flux RSS de la liste</a>."
+"email). Vous pouvez Ãgalement <a href=\"http://rss.gmane.org/gmane.network.";
+"onion-routing.announce\">suivre le flux RSS de la liste</a>."
 
 #. type: Content of: <div><div><form>
 #: /home/runa/tor/website/en/easy-download.wml:83

Modified: translation/trunk/projects/website/fr/1-high.finding-tor.po
===================================================================
--- translation/trunk/projects/website/fr/1-high.finding-tor.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/fr/1-high.finding-tor.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:02+0100\n"
+"POT-Creation-Date: 2010-03-09 09:19+0100\n"
 "PO-Revision-Date: 2010-03-04 12:10-0700\n"
 "Last-Translator: MÃdÃric RIBREUX <mederic.ribreux@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -21,8 +21,8 @@
 msgstr "Tor: Trouver Tor"
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/finding-tor.wml:9 /tmp/kS22RjCKgy.xml:24
-#: /tmp/kS22RjCKgy.xml:39 /tmp/kS22RjCKgy.xml:60
+#: /home/runa/tor/website/en/finding-tor.wml:9 /tmp/GFOG7qiH9R.xml:24
+#: /tmp/GFOG7qiH9R.xml:39 /tmp/GFOG7qiH9R.xml:60
 msgid "<hr />"
 msgstr "<hr />"
 
@@ -116,11 +116,11 @@
 "without a signature. It's probably safe, but a cautious user should check "
 "signatures when possible."
 msgstr ""
-"Il est trÃs important de <a href=\"<page verifying-signatures>\">verifier les "
-"signatures de chiffrement</a> du logiciel Tor quand vous utilisez un miroir. "
-" Nous ne pouvons assurer la suretà ou la sÃcurità d'aucun paquet hÃbergà "
-"sur un miroir distant sans une signature. Ce paquet est probablement sÃr "
-"mais un utilisateur consciencieux devrait vÃrifier les signatures quand "
+"Il est trÃs important de <a href=\"<page verifying-signatures>\">verifier "
+"les signatures de chiffrement</a> du logiciel Tor quand vous utilisez un "
+"miroir.  Nous ne pouvons assurer la suretà ou la sÃcurità d'aucun paquet "
+"hÃbergà sur un miroir distant sans une signature. Ce paquet est probablement "
+"sÃr mais un utilisateur consciencieux devrait vÃrifier les signatures quand "
 "c'est possible."
 
 #. type: Content of: <div>

Modified: translation/trunk/projects/website/fr/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/fr/2-medium.donate.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/fr/2-medium.donate.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:02+0100\n"
+"POT-Creation-Date: 2010-03-09 09:20+0100\n"
 "PO-Revision-Date: 2010-03-05 09:53-0700\n"
 "Last-Translator: MÃdÃric RIBREUX <mederic.ribreux@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -61,14 +61,14 @@
 "privacy continue to exist in the world."
 msgstr ""
 "Nous offrons plusieurs moyens de prÃserver la vie privÃe et l'anonymat grÃce "
-"aux dons. Vous pouvez donner <a href=\"#money\">de l'argent</a>, <a "
-"href=\"#services\">des services</a>, <a href=\"#hardware\">du matÃriel</a> et <a "
+"aux dons. Vous pouvez donner <a href=\"#money\">de l'argent</a>, <a href="
+"\"#services\">des services</a>, <a href=\"#hardware\">du matÃriel</a> et <a "
 "href=\"#time\">du temps</a>.  Votre donation dÃductible des impÃts (Ndt: aux "
 "USA) permet d'assurer la continuation dans le monde entier de la "
 "prÃservation de la vie privÃe et de l'anonymat en ligne."
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:32 /tmp/_gdOK_xYBS.xml:102
+#: /home/runa/tor/website/en/donate.wml:32 /tmp/MjG_200dlU.xml:102
 msgid "<br />"
 msgstr "<br />"
 
@@ -119,11 +119,12 @@
 msgstr ""
 "Le moyen le plus simple d'amÃliorer la protection de la vie privÃe et de "
 "l'anonymat en ligne dans le monde est de faire fonctionner un relais.  Vous "
-"rejoindrez alors une communautà de personnes rÃparties sur toute la planÃte. "
-" Le moyen le plus simple d'accÃlÃrer Tor est d'ajouter plus de relais au "
-"rÃseau.  Faire fonctionner un relais est aussi simple que de <a href=\"<page "
-"docs/tor-doc-relay>\">cliquer sur un bouton</a>.  Rejoignez le rÃseau.  "
-"Encouragez votre anonymat en ligne et la protection de votre vie privÃe !"
+"rejoindrez alors une communautà de personnes rÃparties sur toute la "
+"planÃte.  Le moyen le plus simple d'accÃlÃrer Tor est d'ajouter plus de "
+"relais au rÃseau.  Faire fonctionner un relais est aussi simple que de <a "
+"href=\"<page docs/tor-doc-relay>\">cliquer sur un bouton</a>.  Rejoignez le "
+"rÃseau.  Encouragez votre anonymat en ligne et la protection de votre vie "
+"privÃe !"
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/donate.wml:54
@@ -180,17 +181,17 @@
 msgstr "<br /> Choisissez votre devise: <select name=\"currency_code\">"
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:72 /tmp/_gdOK_xYBS.xml:114
+#: /home/runa/tor/website/en/donate.wml:72 /tmp/MjG_200dlU.xml:114
 msgid "$"
 msgstr "$"
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:73 /tmp/_gdOK_xYBS.xml:115
+#: /home/runa/tor/website/en/donate.wml:73 /tmp/MjG_200dlU.xml:115
 msgid "â"
 msgstr "â"
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:74 /tmp/_gdOK_xYBS.xml:116
+#: /home/runa/tor/website/en/donate.wml:74 /tmp/MjG_200dlU.xml:116
 msgid "Â"
 msgstr "Â"
 
@@ -280,12 +281,12 @@
 "\"currency_code\">"
 msgstr ""
 "Vous pouvez Ãgalement effectuer un <b>don unique</b> (par PayPal, mais vous "
-"n'avez pas besoin d'un compte pour cela):<br /> <input type=\"radio\" "
-"name=\"amount\" value=\"100.00\" />100 <input type=\"radio\" name=\"amount\" "
+"n'avez pas besoin d'un compte pour cela):<br /> <input type=\"radio\" name="
+"\"amount\" value=\"100.00\" />100 <input type=\"radio\" name=\"amount\" "
 "value=\"50.00\" />50 <input type=\"radio\" name=\"amount\" value=\"20.00\" "
-"checked=\"checked\" />20 <input type=\"radio\" name=\"amount\" value=\"10.00\" />10 "
-"<input type=\"radio\" name=\"amount\" value=\"\" />autre montant <select "
-"name=\"currency_code\">"
+"checked=\"checked\" />20 <input type=\"radio\" name=\"amount\" value=\"10.00"
+"\" />10 <input type=\"radio\" name=\"amount\" value=\"\" />autre montant "
+"<select name=\"currency_code\">"
 
 #. type: Content of: <div><form><p>
 #: /home/runa/tor/website/en/donate.wml:117
@@ -317,7 +318,9 @@
 
 #. type: Content of: <div><p><address>
 #: /home/runa/tor/website/en/donate.wml:136
-msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
+#, fuzzy
+msgid ""
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 USA"
 msgstr "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
 
 # Proofreading: minor corrections.
@@ -355,12 +358,12 @@
 "Le Projet Tor est toujours à la recherche de services liÃs à des besoins "
 "techniques tels que la bande passante, l'hÃbergement collectif, les services "
 "hÃbergÃs, les reprÃsentations lÃgales ou le consulting.  En donnant des "
-"services, vous rejoindrez nos <a href=\"<page sponsors>\">nombreux "
-"sponsors</a> tout en permettant la protection de la vie privÃe et de "
-"l'anonymat en ligne.  Nous sommes à la recherche de services d'hÃbergement "
-"adaptÃs à la remontÃe d'un grand volume de donnÃes et Ãgalement d'un "
-"hÃbergement fiable à large bande-passante.  Nous disposons de matÃriel que "
-"nous pouvons vous fournir dans le cadre de votre don de service."
+"services, vous rejoindrez nos <a href=\"<page sponsors>\">nombreux sponsors</"
+"a> tout en permettant la protection de la vie privÃe et de l'anonymat en "
+"ligne.  Nous sommes à la recherche de services d'hÃbergement adaptÃs à la "
+"remontÃe d'un grand volume de donnÃes et Ãgalement d'un hÃbergement fiable à "
+"large bande-passante.  Nous disposons de matÃriel que nous pouvons vous "
+"fournir dans le cadre de votre don de service."
 
 # Proofreading: minor corrections.
 #. type: Content of: <div><p>
@@ -372,10 +375,10 @@
 "coding projects</a>."
 msgstr ""
 "Vous savez Ãcrire du code ? Nous sommes toujours en quÃte de codeurs motivÃs "
-"et dÃbrouillards soit pour porter Tor vers de nouveaux ou d'anciens "
-"systÃmes d'exploitation, soit pour rÃsoudre les problÃmes d'anonymat en "
-"ligne.  Merci de de jeter un coup d'oeil à <a href=\"<page "
-"volunteer>#Coding\">nos projets de code</a>."
+"et dÃbrouillards soit pour porter Tor vers de nouveaux ou d'anciens systÃmes "
+"d'exploitation, soit pour rÃsoudre les problÃmes d'anonymat en ligne.  Merci "
+"de de jeter un coup d'oeil à <a href=\"<page volunteer>#Coding\">nos projets "
+"de code</a>."
 
 # Proofreading: minor corrections.
 #. type: Content of: <div><p>
@@ -452,11 +455,11 @@
 "the hardware and operating system to us.  Contact us at donations@torproject."
 "org for more details."
 msgstr ""
-"En donnant du matÃriel, vous rejoindrez nos <a href=\"<page "
-"sponsors>\">nombreux sponsors</a> qui participent à la protection de la vie "
-"privÃe et de l'anonymat en ligne.  Si vous dÃsirez que Tor fonctionne sur "
-"votre architecture ou votre matÃriel, un moyen efficace est de nous donner "
-"ce matÃriel et ce systÃme d'exploitation.  Contactez-nous à l'adresse "
+"En donnant du matÃriel, vous rejoindrez nos <a href=\"<page sponsors>"
+"\">nombreux sponsors</a> qui participent à la protection de la vie privÃe et "
+"de l'anonymat en ligne.  Si vous dÃsirez que Tor fonctionne sur votre "
+"architecture ou votre matÃriel, un moyen efficace est de nous donner ce "
+"matÃriel et ce systÃme d'exploitation.  Contactez-nous à l'adresse "
 "donations@xxxxxxxxxxxxxx pour davantage de dÃtails."
 
 #. type: Content of: <div>
@@ -511,8 +514,8 @@
 "2008, The Tor Project spent and received its funds as follows:"
 msgstr ""
 "Si vous venez de faire un don, merci de l'avoir fait.  Votre somme est "
-"dÃposÃe dans notre fond gÃnÃral.  Vous venez de rejoindre nos <a href=\"<page "
-"sponsors>\">nombreux sponsors</a> en finanÃant le futur de Tor et de "
+"dÃposÃe dans notre fond gÃnÃral.  Vous venez de rejoindre nos <a href="
+"\"<page sponsors>\">nombreux sponsors</a> en finanÃant le futur de Tor et de "
 "l'anomymat en ligne.  En 2008, le Projet Tor a dÃpensà et reÃu les montants "
 "suivants:"
 

Modified: translation/trunk/projects/website/fr/2-medium.faq.po
===================================================================
--- translation/trunk/projects/website/fr/2-medium.faq.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/fr/2-medium.faq.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-03 22:12+0100\n"
+"POT-Creation-Date: 2010-03-09 09:20+0100\n"
 "PO-Revision-Date: 2010-03-04 10:32-0700\n"
 "Last-Translator: MÃdÃric RIBREUX <mederic.ribreux@xxxxxxxxx>\n"
 "Language-Team: fr_FR <tor-translate@xxxxxxxxxxxxxx>\n"
@@ -22,7 +22,7 @@
 msgstr "FAQ Tor"
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:12 /tmp/AHLCDd9q4d.xml:1141
+#: /home/runa/tor/website/en/faq.wml:12 /tmp/3GNQBYUoTk.xml:1141
 msgid "<hr />"
 msgstr "<hr />"
 
@@ -180,8 +180,8 @@
 #: /home/runa/tor/website/en/faq.wml:56
 msgid "<a href=\"#RelayMemory\">Why is my Tor relay using so much memory?</a>"
 msgstr ""
-"<a href=\"#RelayMemory\">Pourquoi mon relais Tor consomme autant de mÃmoire "
-"?</a>"
+"<a href=\"#RelayMemory\">Pourquoi mon relais Tor consomme autant de mÃmoire ?"
+"</a>"
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:57
@@ -1728,11 +1728,11 @@
 "understand."
 msgstr ""
 "<em>Nous vous recommandons de ne pas les utiliser</em> &mdash; ils sont "
-"prÃsents à fin de tests et peuvent disparaÃtre dans les prochaines versions. "
-" Vous disposez de la meilleure protection quand vous laissez le soin à Tor "
-"de choisir sa propre route. Modifier les prÃfÃrences sur les noeuds "
-"d'entrÃe/sortie peut mettre en danger votre anonymat par des moyens non "
-"encore identifiÃs à ce jour."
+"prÃsents à fin de tests et peuvent disparaÃtre dans les prochaines "
+"versions.  Vous disposez de la meilleure protection quand vous laissez le "
+"soin à Tor de choisir sa propre route. Modifier les prÃfÃrences sur les "
+"noeuds d'entrÃe/sortie peut mettre en danger votre anonymat par des moyens "
+"non encore identifiÃs à ce jour."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:751
@@ -1751,10 +1751,9 @@
 "en ajoutant <tt>StrictExitNodes 1</tt> ou <tt>StrictEntryNodes 1</tt> "
 "&mdash; mais si vous le faites, vos connexions Tor vont cesser de "
 "fonctionner si tous les nÅuds que vous avez spÃcifià deviennent "
-"inaccessibles. Consultez les <a "
-"href=\"https://www.torproject.org/documentation.html.fr#NeatLinks\";>pages de "
-"statut de Tor</a> pour prendre connaissance des nÅuds que vous pouvez "
-"choisir."
+"inaccessibles. Consultez les <a href=\"https://www.torproject.org/";
+"documentation.html.fr#NeatLinks\">pages de statut de Tor</a> pour prendre "
+"connaissance des nÅuds que vous pouvez choisir."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:761
@@ -2065,8 +2064,8 @@
 "<a class=\"anchor\" href=\"#RelayMemory\">Why is my Tor relay using so much "
 "memory?</a>"
 msgstr ""
-"<a class=\"anchor\" href=\"#RelayMemory\">Pourquoi mon noeud Tor consomme-t-il "
-"autant de mÃmoire ?</a>"
+"<a class=\"anchor\" href=\"#RelayMemory\">Pourquoi mon noeud Tor consomme-t-"
+"il autant de mÃmoire ?</a>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:907
@@ -2091,12 +2090,12 @@
 "Si vous Ãtes sous Linux, vous pouvez rencontrer des bugs de fragmentation "
 "mÃmoire dans les diffÃrentes implÃmentations de la fonction malloc de la "
 "glibc. Ainsi, lorsque Tor libÃre de la mÃmoire vers le systÃme, les morceaux "
-"libÃrÃs sont fragmentÃs ce qui ne facilite pas leur rÃutilisation. "
-"L'archive Tar de Tor utilise l'implÃmentation OpenBSD de la fonction malloc, "
-"qui souffre de moins de problÃmes de fragmentation (aux dÃpends d'une plus "
+"libÃrÃs sont fragmentÃs ce qui ne facilite pas leur rÃutilisation. L'archive "
+"Tar de Tor utilise l'implÃmentation OpenBSD de la fonction malloc, qui "
+"souffre de moins de problÃmes de fragmentation (aux dÃpends d'une plus "
 "grande charge processeur). Vous pouvez indiquer à Tor d'utiliser cette "
-"implÃmentation de la fonction malloc en utilisant à la place: "
-"<tt>./configure --enable-openbsd-malloc</tt>"
+"implÃmentation de la fonction malloc en utilisant à la place: <tt>./"
+"configure --enable-openbsd-malloc</tt>"
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/faq.wml:920
@@ -2125,8 +2124,8 @@
 msgstr ""
 "Si vous utilisez Solaris, OpenBSD, NetBSD ou un vieux FreeBSD, Tor \"forke\" "
 "probablement ses processus plutÃt que d'utiliser des \"threads\". Pensez à "
-"migrer vers un <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/T";
-"orFAQ#RelayOS\">meilleur systÃme d'exploitation</a>."
+"migrer vers un <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
+"TorFAQ#RelayOS\">meilleur systÃme d'exploitation</a>."
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/faq.wml:932

Modified: translation/trunk/projects/website/fr/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/fr/2-medium.verifying-signatures.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/fr/2-medium.verifying-signatures.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-01-21 11:14+0100\n"
+"POT-Creation-Date: 2010-03-09 09:20+0100\n"
 "PO-Revision-Date: 2010-03-05 09:58-0700\n"
 "Last-Translator: MÃdÃric RIBREUX <mederic.ribreux@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -22,7 +22,7 @@
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/verifying-signatures.wml:10
-#: /tmp/o8tczjp8xS.xml:33 /tmp/o8tczjp8xS.xml:45 /tmp/o8tczjp8xS.xml:92
+#: /tmp/P40MmHMxy_.xml:34 /tmp/P40MmHMxy_.xml:46 /tmp/P40MmHMxy_.xml:93
 msgid "<hr />"
 msgstr "<hr />"
 
@@ -35,10 +35,10 @@
 "asc\".  For example, the current Installation Bundle for Windows: <package-"
 "win32-bundle-stable-sig>."
 msgstr ""
-"Chaque fichier sur notre <a href=\"<page download>\">page de "
-"tÃlÃchargement</a> est accompagnà par un fichier du mÃme nom que le paquet "
-"avec l'extension ÂÂ.ascÂÂ.  Par exemple, l'actuel Pack d'installation pour "
-"Windows est: <package-win32-bundle-stable-sig>."
+"Chaque fichier sur notre <a href=\"<page download>\">page de tÃlÃchargement</"
+"a> est accompagnà par un fichier du mÃme nom que le paquet avec l'extension "
+"ÂÂ.ascÂÂ.  Par exemple, l'actuel Pack d'installation pour Windows est: "
+"<package-win32-bundle-stable-sig>."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/verifying-signatures.wml:17
@@ -93,62 +93,67 @@
 msgid "Jacob's (0x9D0FACE4)"
 msgstr "Celle de Jacob (0x9D0FACE4)"
 
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/verifying-signatures.wml:30
+msgid "Erinn's (0x63FEE659) and (0xF1F5C9B5)"
+msgstr ""
+
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:32
+#: /home/runa/tor/website/en/verifying-signatures.wml:33
 msgid "Step One: Import the keys"
 msgstr "Ãtape UnÂ: Importer les clÃs"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:34
+#: /home/runa/tor/website/en/verifying-signatures.wml:35
 msgid "You can import keys directly from GnuPG as well:"
 msgstr "Vous pouvez tout aussi bien importer les clÃs directement de GnuPG :"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:36
+#: /home/runa/tor/website/en/verifying-signatures.wml:37
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --recv-keys 0x28988BF5"
 msgstr "gpg --keyserver subkeys.pgp.net --recv-keys 0x28988BF5"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:38
+#: /home/runa/tor/website/en/verifying-signatures.wml:39
 msgid "or search for keys with"
 msgstr "ou chercher les clÃs avec"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:40
+#: /home/runa/tor/website/en/verifying-signatures.wml:41
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --search-keys 0x28988BF5"
 msgstr "gpg --keyserver subkeys.pgp.net --search-keys 0x28988BF5"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:42
+#: /home/runa/tor/website/en/verifying-signatures.wml:43
 msgid "and when you select one, it will be added to your keyring."
 msgstr ""
 "et lorsque vous en sÃlectionnez une, elle sera ajoutÃe à votre trousseau."
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:44
+#: /home/runa/tor/website/en/verifying-signatures.wml:45
 msgid "Step Two: Verify the fingerprints"
 msgstr "Ãtape deuxÂ: VÃrifier les empreintes"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:46
+#: /home/runa/tor/website/en/verifying-signatures.wml:47
 msgid "Verify the pgp fingerprints using:"
 msgstr "VÃrifier les empreintes pgp en utilisantÂ:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:47
+#: /home/runa/tor/website/en/verifying-signatures.wml:48
 #, no-wrap
 msgid "gpg --fingerprint (insert keyid here)"
 msgstr "gpg --fingerprint (inserez les id de clef ici)"
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/verifying-signatures.wml:48
+#: /home/runa/tor/website/en/verifying-signatures.wml:49
 msgid "The fingerprints for the keys should be:"
 msgstr "Les empreintes pour les clÃs devraient ÃtreÂ:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:51
+#: /home/runa/tor/website/en/verifying-signatures.wml:52
 #, no-wrap
 msgid ""
 "pub   1024D/28988BF5 2000-02-27\n"
@@ -222,7 +227,7 @@
 "sub   4096g/D5E87583 2008-03-11 [expires: 2010-03-11]\n"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:87
+#: /home/runa/tor/website/en/verifying-signatures.wml:88
 msgid ""
 "(Of course if you want to be really certain that those are the real ones "
 "then you should check this from more places or even better get into key "
@@ -233,13 +238,13 @@
 "signer et ce faisant, construire un chemin de confiance pour celles-ci.)"
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:91
+#: /home/runa/tor/website/en/verifying-signatures.wml:92
 msgid "Step Three: Verify the downloaded package"
 msgstr "Ãtape troisÂ: VÃrifier les fichiers tÃlÃchargÃs"
 
 # Proofreading: minor corrections.
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:93
+#: /home/runa/tor/website/en/verifying-signatures.wml:94
 msgid ""
 "If you're using GnuPG, then put the .asc and the download in the same "
 "directory and type \"gpg --verify (whatever).asc (whatever)\". It will say "
@@ -248,11 +253,11 @@
 msgstr ""
 "Si vous utilisez GnuPG, il vous suffit de mettre le fichier .asc et le "
 "tÃlÃchargement dans le mÃme rÃpertoire et taper \"gpg --verify (fichier).asc "
-"(fichier)\". Il devrait afficher quelque-chose comme \"Good signature\" ou \"BAD "
-"signature\" en utilisant ce type de commandeÂ:"
+"(fichier)\". Il devrait afficher quelque-chose comme \"Good signature\" ou "
+"\"BAD signature\" en utilisant ce type de commandeÂ:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:99
+#: /home/runa/tor/website/en/verifying-signatures.wml:100
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc tor-0.1.0.17.tar.gz\n"
@@ -272,7 +277,7 @@
 "Primary key fingerprint: B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:109
+#: /home/runa/tor/website/en/verifying-signatures.wml:110
 msgid ""
 "Notice that there is a warning because you haven't assigned a trust index to "
 "this user. This means that your program verified the key made that "
@@ -294,14 +299,14 @@
 "vous avez un degrà de confiance pour arma/nick."
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:118
+#: /home/runa/tor/website/en/verifying-signatures.wml:119
 msgid "All this means is you can ignore the message or assign a trust level."
 msgstr ""
 "Tout ceci signifie que vous pouvez ignorer ce message ou assigner un niveau "
 "de confiance."
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:120
+#: /home/runa/tor/website/en/verifying-signatures.wml:121
 msgid ""
 "For your reference, this is an example of a <em>BAD</em> verification. It "
 "means that the signature and file contents do not match:"
@@ -311,7 +316,7 @@
 "correspondent pasÂ:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:124
+#: /home/runa/tor/website/en/verifying-signatures.wml:125
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc\n"
@@ -323,7 +328,7 @@
 "gpg: BAD signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:129
+#: /home/runa/tor/website/en/verifying-signatures.wml:130
 msgid ""
 "If you see a message like the above one, then you should not trust the file "
 "contents."
@@ -332,7 +337,7 @@
 "faire confiance au contenu du fichier."
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:131
+#: /home/runa/tor/website/en/verifying-signatures.wml:132
 msgid ""
 "If you are running Tor on Debian you should read the instructions on <a href="
 "\"<page docs/debian>#packages\">importing these keys to apt</a>."

Modified: translation/trunk/projects/website/fr/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/fr/3-low.download-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/fr/3-low.download-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-23 20:32+0100\n"
+"POT-Creation-Date: 2010-03-09 09:19+0100\n"
 "PO-Revision-Date: 2010-02-24 09:35-0700\n"
 "Last-Translator: MÃdÃric RIBREUX <mederic.ribreux@xxxxxxxxx>\n"
 "Language-Team: fr_FR <tor-translate@xxxxxxxxxxxxxx>\n"
@@ -79,8 +79,8 @@
 msgstr "<a href=\"<page docs/debian>\">Archive de paquets</a>"
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/nacm28Lpar.xml:40
-#: /tmp/nacm28Lpar.xml:56 /tmp/nacm28Lpar.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/ADYAunlxao.xml:40
+#: /tmp/ADYAunlxao.xml:56 /tmp/ADYAunlxao.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 
@@ -202,16 +202,46 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:84
+#, fuzzy
+msgid ""
+"<img src=\"images/distros/android-market.gif\" alt=\"Android\" width=\"32\" "
+"height=\"32\"/>"
+msgstr "<img src=\"images/distros/fedora.png\" alt=\"Fedora Core 10\" />"
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:85
+msgid "Android"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:87
+#, fuzzy
+msgid ""
+"<a href=\"<package-androidbundle-alpha>\"><version-androidbundle-tor></a> "
+"(<a href=\"<package-androidbundle-alpha-sig>\">sig</a>)"
+msgstr ""
+"<a href=\"<package-source-alpha>\"><version-alpha></a> (<a href=\"<package-"
+"source-alpha-sig>\">sig</a>)"
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:88
+#, fuzzy
+msgid ""
+"<a href=\"<page docs/android>\">Android instructions and information</a>"
+msgstr "<a href=\"<page docs/N900>\">Instructions expÃrimentales</a>"
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:92
 msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
 msgstr "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:85
+#: /home/runa/tor/website/en/download-unix.wml:93
 msgid "Source tarballs"
 msgstr "Archives Tar de code source"
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:87
+#: /home/runa/tor/website/en/download-unix.wml:95
 msgid ""
 "<a href=\"<package-source-stable>\"><version-stable></a> (<a href=\"<package-"
 "source-stable-sig>\">sig</a>)"
@@ -220,7 +250,7 @@
 "source-stable-sig>\">sig</a>)"
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:91
+#: /home/runa/tor/website/en/download-unix.wml:99
 msgid ""
 "<a href=\"<package-source-alpha>\"><version-alpha></a> (<a href=\"<package-"
 "source-alpha-sig>\">sig</a>)"
@@ -229,17 +259,17 @@
 "source-alpha-sig>\">sig</a>)"
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:94
+#: /home/runa/tor/website/en/download-unix.wml:102
 msgid "<kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd>"
 msgstr "<kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd>"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:101
+#: /home/runa/tor/website/en/download-unix.wml:109
 msgid "<a id=\"packagediff\"></a>"
 msgstr "<a id=\"packagediff\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:102
+#: /home/runa/tor/website/en/download-unix.wml:110
 msgid ""
 "<a class=\"anchor\" href=\"#packagediff\">What's the difference between "
 "Stable &amp; Unstable?</a>"
@@ -248,7 +278,7 @@
 "Stable & Non-stable ?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:105
+#: /home/runa/tor/website/en/download-unix.wml:113
 msgid ""
 "Stable packages are released when we believe the features and code will not "
 "change for many months."
@@ -257,7 +287,7 @@
 "options et le code ne changeront plus pendant plusieurs mois."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:109
+#: /home/runa/tor/website/en/download-unix.wml:117
 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 "
@@ -273,7 +303,7 @@
 "de bug."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:118
+#: /home/runa/tor/website/en/download-unix.wml:126
 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 "
@@ -288,7 +318,7 @@
 "applications support distribuÃes sous la licence GNU GPL."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:125
+#: /home/runa/tor/website/en/download-unix.wml:133
 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 "
@@ -300,7 +330,7 @@
 "impÃts (NDT: aux USA) au projet Tor</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:134
+#: /home/runa/tor/website/en/download-unix.wml:142
 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 "
@@ -316,7 +346,7 @@
 "a>."
 
 #. type: Content of: <div><div><form>
-#: /home/runa/tor/website/en/download-unix.wml:142
+#: /home/runa/tor/website/en/download-unix.wml:150
 msgid ""
 "<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
 "\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
@@ -329,12 +359,12 @@
 "<input type=\"submit\" value=\"subscribe to or-announce\"/>"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:152
+#: /home/runa/tor/website/en/download-unix.wml:160
 msgid "<a id=\"Warning\"></a>"
 msgstr "<a id=\"Warning\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:153
+#: /home/runa/tor/website/en/download-unix.wml:161
 msgid ""
 "<a class=\"anchor\" href=\"#Warning\">Warning: Want Tor to really work?</a>"
 msgstr ""
@@ -342,7 +372,7 @@
 "que Tor fonctionne ?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:157
+#: /home/runa/tor/website/en/download-unix.wml:165
 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> "
@@ -355,7 +385,7 @@
 "importants à regarder : "
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:165
+#: /home/runa/tor/website/en/download-unix.wml:173
 msgid ""
 "Tor only protects Internet applications that are configured to send their "
 "traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
@@ -371,7 +401,7 @@
 "mozilla.org/firefox/2275/\">Torbutton</a>."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:173
+#: /home/runa/tor/website/en/download-unix.wml:181
 msgid ""
 "Browser plugins such as Java, Flash, ActiveX, RealPlayer, Quicktime, Adobe's "
 "PDF plugin, and others can be manipulated into revealing your IP address. "
@@ -399,7 +429,7 @@
 "deux navigateurs (l'un pour Tor, l'autre pour la navigation normale). "
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:189
+#: /home/runa/tor/website/en/download-unix.wml:197
 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. "
@@ -415,7 +445,7 @@
 "souhaitez pas perdre. "
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:197
+#: /home/runa/tor/website/en/download-unix.wml:205
 msgid ""
 "Tor anonymizes the origin of your traffic, and it encrypts everything inside "
 "the Tor network, but <a href=\"https://wiki.torproject.org/noreply/";
@@ -434,7 +464,7 @@
 "chiffrement final similaire et des mÃcanismes d'autentification. "
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:208
+#: /home/runa/tor/website/en/download-unix.wml:216
 msgid ""
 "While Tor blocks attackers on your local network from discovering or "
 "influencing your destination, it opens new risks: malicious or misconfigured "
@@ -448,12 +478,12 @@
 "confiance."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:216
+#: /home/runa/tor/website/en/download-unix.wml:224
 msgid "<br />"
 msgstr "<br />"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:218
+#: /home/runa/tor/website/en/download-unix.wml:226
 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 "
@@ -465,7 +495,7 @@
 "\">pour identifier et documenter tous ces dÃfauts</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:228
+#: /home/runa/tor/website/en/download-unix.wml:236
 msgid ""
 "See our <a href=\"<page verifying-signatures>\">FAQ entry on verifying "
 "package signatures</a>, which allows you to make sure you've downloaded the "
@@ -476,7 +506,7 @@
 "que vous avez tÃlÃchargà le fichier que vous aviez l'intention d'obtenir. "
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:234
+#: /home/runa/tor/website/en/download-unix.wml:242
 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</"
@@ -487,7 +517,7 @@
 "org/\">l'archive</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:240
+#: /home/runa/tor/website/en/download-unix.wml:248
 msgid ""
 "See the <a href=\"<page documentation>#Developers\">developer documentation</"
 "a> for instructions on fetching Tor from Git to get the very latest "
@@ -503,7 +533,7 @@
 "\">sources de Vidalia</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:252
+#: /home/runa/tor/website/en/download-unix.wml:260
 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>."
@@ -512,12 +542,12 @@
 "<a href=\"<page mirrors>\">une liste de sites miroir du site Tor</a>. "
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:256
+#: /home/runa/tor/website/en/download-unix.wml:264
 msgid "<a id=\"ChangeLog\"></a> <a id=\"Stable\"></a> <a id=\"Testing\"></a>"
 msgstr "<a id=\"ChangeLog\"></a> <a id=\"Stable\"></a> <a id=\"Testing\"></a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:260
+#: /home/runa/tor/website/en/download-unix.wml:268
 msgid ""
 "For a list of what has changed in each stable Tor release, see the <a href="
 "\"<gitblob>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in both "
@@ -613,9 +643,6 @@
 #~ "<a href=\"<package-srpm5-alpha>\"><version-rpm5-alpha> SRPM</a> (<a href="
 #~ "\"<package-srpm5-alpha-sig>\">sig</a>)"
 
-#~ msgid "<img src=\"images/distros/fedora.png\" alt=\"Fedora Core 10\" />"
-#~ msgstr "<img src=\"images/distros/fedora.png\" alt=\"Fedora Core 10\" />"
-
 #~ msgid "Fedora Core 10 binary"
 #~ msgstr "Fedora Core 10 binaires"
 

Modified: translation/trunk/projects/website/fr/3-low.people.po
===================================================================
--- translation/trunk/projects/website/fr/3-low.people.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/fr/3-low.people.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 10:02+0100\n"
+"POT-Creation-Date: 2010-03-09 09:20+0100\n"
 "PO-Revision-Date: 2010-02-22 10:01-0700\n"
 "Last-Translator: MÃdÃric RIBREUX <mederic.ribreux@xxxxxxxxx>\n"
 "Language-Team: fr_FR <tor-translate@xxxxxxxxxxxxxx>\n"
@@ -62,9 +62,10 @@
 
 #. type: Content of: <div><address>
 #: /home/runa/tor/website/en/people.wml:30
+#, fuzzy
 msgid ""
-"The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA<br /"
-"><br />"
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 "
+"USA<br /><br />"
 msgstr ""
 "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA<br /"
 "><br />"
@@ -271,13 +272,12 @@
 "more reliable</a>, and on <a href=\"http://metrics.torproject.org/";
 "\">metrics</a>."
 msgstr ""
-"A travaillà durant le  Google Summer of Code  de 2007 sur <a "
-"href=\"<gitblob>doc/spec/proposals/114-distributed-storage.txt\">la "
-"distribution et la sÃcurisation de la publication et du rapatriement des "
-"descripteurs de service cachÃ</a>. Il travaille en ce moment à <a "
-"href=\"<page projects/hidserv>\">rendre les services cachÃs plus rapides et "
-"plus fiables</a> et sur la <a "
-"href=\"http://metrics.torproject.org/\";>mÃtrique</a>."
+"A travaillà durant le  Google Summer of Code  de 2007 sur <a href="
+"\"<gitblob>doc/spec/proposals/114-distributed-storage.txt\">la distribution "
+"et la sÃcurisation de la publication et du rapatriement des descripteurs de "
+"service cachÃ</a>. Il travaille en ce moment à <a href=\"<page projects/"
+"hidserv>\">rendre les services cachÃs plus rapides et plus fiables</a> et "
+"sur la <a href=\"http://metrics.torproject.org/\";>mÃtrique</a>."
 
 #. type: Content of: <div><dl><dt>
 #: /home/runa/tor/website/en/people.wml:100
@@ -642,11 +642,33 @@
 
 #. type: Content of: <div><dl><dt>
 #: /home/runa/tor/website/en/people.wml:202
+msgid "Marco Bonetti"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:202
+msgid "Focusing on MobileTor for the iPhone."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:203
+msgid "Nathan Freitas"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:203
+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/tor/website/en/people.wml:205
 msgid "Kasimir Gabert"
 msgstr "Kasimir Gabert"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:202
+#: /home/runa/tor/website/en/people.wml:205
 msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\";>TorStatus</a> "
 "statistics pages."
@@ -655,24 +677,24 @@
 "statistiques."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid "Robert Hogan"
 msgstr "Robert Hogan"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\";>TorK</a> Tor controller."
 msgstr ""
 "DÃveloppeur pour le controleur Tor <a href=\"http://tork.sf.net/\";>TorK</a>."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid "Damian Johnson"
 msgstr "Damian Johnson"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid ""
 "Builds a command-line application for monitoring Tor relays, providing real-"
 "time status information such as the current configuration, bandwidth usage, "
@@ -685,12 +707,12 @@
 "\"https://svn.torproject.org/svn/arm/trunk/README\";>code</a>)."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid "Fabian Keil"
 msgstr "Fabian Keil"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid ""
 "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
 "and Privoxy still work well together."
@@ -700,12 +722,12 @@
 "ensemble."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid "Kory Kirk"
 msgstr "Kory Kirk"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid ""
 "Worked during Google Summer of Code 2009 on extending Torbutton. Now he's "
 "working with Bruce Leidl on a Tor client in Java."
@@ -715,22 +737,22 @@
 "client Tor en Java."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Bruce Leidl"
 msgstr "Bruce Leidl"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Working on a Tor client in Java."
 msgstr "Travaille à la rÃalisation d'un client Tor en Java."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid "Julius Mittenzwei"
 msgstr "Julius Mittenzwei"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid ""
 "A lawyer with the CCC in Germany. Coordinates the German Tor community with "
 "respect to legal questions and concerns."
@@ -739,12 +761,12 @@
 "au regard des aspects et questions lÃgales."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid "Shava Nerad"
 msgstr "Shava Nerad"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
@@ -753,12 +775,24 @@
 "publiques et les relations communautaires."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:224
+msgid "Linus Nordberg"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:224
+msgid ""
+"Enjoys measuring the Tor network and helps with outreach in the Nordic "
+"countries."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:226
 msgid "Lasse &Oslash;verlier"
 msgstr "Lasse &Oslash;verlier"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:226
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
@@ -767,12 +801,12 @@
 "ressources, spÃcialement pour les services cachÃs."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid "Martin Peck"
 msgstr "Martin Peck"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
@@ -781,12 +815,12 @@
 "virtuelle pour les clients Tor sous Windows."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:225
+#: /home/runa/tor/website/en/people.wml:230
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr "row (un pseudonyme -- il tient à rester anonyme, mÃme de nous !)"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:231
 msgid ""
 "The most dedicated bug reporter we've ever heard from. He must read Tor "
 "source code every day over breakfast."
@@ -795,12 +829,12 @@
 "source de Tor chaque jour au petit dÃjeuner."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid "tup (another pseudonym)"
 msgstr "tup (un autre pseudonyme)"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy";
@@ -813,12 +847,12 @@
 "Ãgalement <a href=\"http://p56soo2ibjkx23xo.onion/\";>le code de TorDNSEL</a>."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid "Kyle Williams"
 msgstr "Kyle Williams"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
@@ -827,12 +861,12 @@
 "Tor plus facile à configurer et à utiliser."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid "Ethan Zuckerman"
 msgstr "Ethan Zuckerman"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?";
 "p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/";
@@ -846,7 +880,7 @@
 "propos de Tor et ses outils."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:241
+#: /home/runa/tor/website/en/people.wml:246
 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, "
@@ -857,32 +891,32 @@
 "ceux qui militent pour Tor, etc."
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:252
 msgid "<a id=\"Past\"></a>"
 msgstr "<a id=\"Past\"></a>"
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:248
+#: /home/runa/tor/website/en/people.wml:253
 msgid "<a class=\"anchor\" href=\"#Past\">Past thanks to:</a>"
 msgstr "<a class=\"anchor\" href=\"#Past\">Anciens remerciements Ã:</a>"
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "John Bashinski"
 msgstr "John Bashinski"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "Contributed the initial rpm spec file."
 msgstr "Contributeur initial du fichier de spÃcification rpm."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid "Domenik Bork"
 msgstr "Domenik Bork"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid ""
 "Worked on Configuration of Hidden Services with User Authorization in "
 "Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches/";
@@ -894,12 +928,12 @@
 "Code 2008."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 msgid "Benedikt Boss"
 msgstr "Benedikt Boss"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 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 "
@@ -910,22 +944,22 @@
 "pour Tor; encadrà par Roger."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Ren Bucholz"
 msgstr "Ren Bucholz"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Our fine logo and images."
 msgstr "Nos superbes logos et images."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 msgid "Fallon Chen"
 msgstr "Fallon Chen"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 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="
@@ -939,34 +973,34 @@
 "2008."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Bram Cohen"
 msgstr "Bram Cohen"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Helped design our congestion control mechanisms, in Tor's early days."
 msgstr ""
 "Nous a aidà à concevoir nos mÃcanismes de contrÃle de congestion au dÃbut du "
 "projet."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Pat Double"
 msgstr "Pat Double"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Creator of the Incognito LiveCD."
 msgstr "CrÃateur du LiveCD Incognito."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid "Geoff Goodell"
 msgstr "Geoff Goodell"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid ""
 "Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/";
 "\">Blossom project</a> which uses Tor as its overlay network; also helped "
@@ -977,12 +1011,12 @@
 "rendre l'interface de contrÃle de Tor la plus souple possible."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid "Aleksei Gorny"
 msgstr "Aleksei Gorny"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid ""
 "Working on Tor exit scanner improvements (<a href=\"https://svn.torproject.";
 "org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
@@ -993,52 +1027,52 @@
 "\">svn</a>), dÃmarrà originellement lors du Google Summer of Code 2008."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Christian Grothoff"
 msgstr "Christian Grothoff"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Contributed better daemonizing behavior."
 msgstr "A contribuà à l'amÃlioration de la mise en dÃmon."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Steven Hazel"
 msgstr "Steven Hazel"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Made 'make install' do the right thing."
 msgstr "A fait en sorte que 'make install' fasse ce qu'on attende de lui."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "Justin Hipple"
 msgstr "Justin Hipple"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "The other developer for Vidalia."
 msgstr "L'autre dÃveloppeur de Vidalia."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Jason Holt"
 msgstr "Jason Holt"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Contributed patches to the instructions and the man page."
 msgstr "A fourni des patchs pour les instructions et la page de manuel."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 msgid "Christian King"
 msgstr "Christian King"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 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-";
@@ -1049,12 +1083,12 @@
 "libevent, encadrà par Nick."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid "Joe Kowalski"
 msgstr "Joe Kowalski"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid ""
 "Original author and provider of the torstatus script formerly run on "
 "nighteffect."
@@ -1063,22 +1097,22 @@
 "nighteffect."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Adam Langley"
 msgstr "Adam Langley"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Our fine eventdns code."
 msgstr "Notre excellent codeur eventdns."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid "Rebecca MacKinnon"
 msgstr "Rebecca MacKinnon"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid ""
 "Former Director of Tor.  Co-Founder of <a href=\"http://www.";
 "globalvoicesonline.org/\">Global Voices Online</a>."
@@ -1087,12 +1121,12 @@
 "globalvoicesonline.org/\">Global Voices Online</a>."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid "Chris Palmer"
 msgstr "Chris Palmer"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid ""
 "Our liaison and tech guy with EFF while EFF was funding us. Also helped "
 "advocate and write end-user docs."
@@ -1102,12 +1136,12 @@
 "les utilisateurs finaux."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid "Matej Pfajfar"
 msgstr "Matej Pfajfar"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid ""
 "Author of the original onion routing code that Tor is based on, so we didn't "
 "have to start from scratch."
@@ -1116,12 +1150,12 @@
 "s'est basÃ, ainsi nous n'avons pas eu à partir de zÃro."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 msgid "Johannes Renner"
 msgstr "Johannes Renner"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 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 "
@@ -1133,36 +1167,36 @@
 "Perry."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid "Scott Squires"
 msgstr "Scott Squires"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid ""
 "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
 msgstr ""
 "Le dÃveloppeur original de <a href=\"<page torbutton/index>\">Torbutton</a>."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Aaron Turner"
 msgstr "Aaron Turner"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Contributed the first version of the tor.sh initscripts shell script."
 msgstr ""
 "A travaillà sur la premiÃre version du script shell d'initialisation de "
 "services tor.sh"
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 msgid "Stephen Tyree"
 msgstr "Stephen Tyree"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 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 "
@@ -1176,12 +1210,12 @@
 "des utilisateurs."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid "Camilo Viecco"
 msgstr "Camilo Viecco"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid ""
 "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac.";
 "vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
@@ -1192,29 +1226,28 @@
 "\">svn</a>) lors du Google Summer of Code 2008."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 msgid "Fred von Lohmann"
 msgstr "Fred von Lohmann"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 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/?";
 "f=fred_von_lohmann.html\">EFF Staff Site</a>."
 msgstr ""
 "Fred a Ãtà membre de notre Bureau de 2006 à 2008.  Vous pouvez trouver sa "
-"biographie complÃte sur <a "
-"href=\"http://www.eff.org/about/staff/?f=fred_von_lohmann.html\";>le site du "
-"personnel de l'EFF</a>."
+"biographie complÃte sur <a href=\"http://www.eff.org/about/staff/?";
+"f=fred_von_lohmann.html\">le site du personnel de l'EFF</a>."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid "Christian Wilms"
 msgstr "Christian Wilms"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid ""
 "Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
 "\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";
@@ -1225,12 +1258,12 @@
 "hidserv-perf/\">svn</a>) lors du Google Summer of Code 2008."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 msgid "Jillian C. York"
 msgstr "Jillian C. York"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 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/fr/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/fr/4-optional.volunteer.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/fr/4-optional.volunteer.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-23 20:32+0100\n"
+"POT-Creation-Date: 2010-03-09 09:19+0100\n"
 "PO-Revision-Date: 2010-02-24 09:31-0700\n"
 "Last-Translator: MÃdÃric RIBREUX <mederic.ribreux@xxxxxxxxx>\n"
 "Language-Team: french <tor-translation@xxxxxxxxxxxxxx>\n"
@@ -323,6 +323,7 @@
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:122
+#, fuzzy
 msgid ""
 "<b>Tor Browser Bundle for Linux/Mac OS X</b> <br /> Priority: <i>High</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>Medium</i> <br /> "
@@ -332,21 +333,22 @@
 "Messaging client). Components are pre-configured to operate in a secure way, "
 "and it has very few dependencies on the installed operating system. It has "
 "therefore become one of the most easy to use, and popular, ways to use Tor "
-"on Windows.  <br /> However, there is currently no working package for Linux "
-"and Mac OS X, so this project would be to implement Tor Browser Bundle for "
-"these platforms. This will involve modifications to Vidalia (C++), possibly "
-"Firefox (C) then creating and testing the launcher on a range of operating "
-"system versions and configurations to verify portability.  Some work on this "
-"was completed as part of the Google Summer of Code 2009. Another part of "
-"this project is to identify all of the traces left behind by using a Tor "
-"Browser Bundle on Mac OS X or Linux.  Developing ways to stop, counter, or "
-"remove these traces is a final step.  <br /> Students should be familiar "
-"with application development on one or preferably both of Linux and Mac OS "
-"X, and be comfortable with C/C++ and shell scripting.  <br /> Part of this "
-"project could be usability testing of Tor Browser Bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
+"on Windows.  <br /> However, there is currently no released package for "
+"Linux and Mac OS X, so this project would be to implement Tor Browser Bundle "
+"for OS X and continue work on the Tor Browser Bundle for Linux. This will "
+"involve modifications to Vidalia (C++), possibly Firefox (C) then creating "
+"and testing the launcher on a range of operating system versions and "
+"configurations to verify portability.  Some work on this was completed as "
+"part of the Google Summer of Code 2009. Another part of this project is to "
+"identify all of the traces left behind by using a Tor Browser Bundle on Mac "
+"OS X or Linux.  Developing ways to stop, counter, or remove these traces is "
+"a final step.  <br /> Students should be familiar with application "
+"development on one or preferably both of Linux and Mac OS X, and be "
+"comfortable with C/C++ and shell scripting.  <br /> Part of this project "
+"could be usability testing of Tor Browser Bundle, ideally amongst our target "
+"demographic.  That would help a lot in knowing what needs to be done in "
+"terms of bug fixes or new features. We get this informally at the moment, "
+"but a more structured process would be better."
 msgstr ""
 "<b>Pack de Navigation Tor pour Linux/Mac OS X</b> <br /> PrioritÃ: <i>Haute</"
 "i> <br /> Effort à fournir: <i>Haut</i> <br /> CompÃtences requises: <i> "
@@ -471,44 +473,6 @@
 "rÃsistance à la censure avec facilità d'utilisation et robustesse."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:225
-msgid ""
-"<b>Tuneup Tor!</b> <br /> Priority: <i>Medium to High</i> <br /> Effort "
-"Level: <i>Medium to High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Nick, Roger, Mike, Karsten</i> <br /> Right now, Tor relays "
-"measure and report their own bandwidth, and Tor clients choose which relays "
-"to use in part based on that bandwidth.  This approach is vulnerable to <a "
-"href=\"http://freehaven.net/anonbib/#bauer:wpes2007\";>attacks where relays "
-"lie about their bandwidth</a>; to address this, Tor currently caps the "
-"maximum bandwidth it's willing to believe any relay provides.  This is a "
-"limited fix, and a waste of bandwidth capacity to boot.  Instead, Tor should "
-"possibly measure bandwidth in a more distributed way, perhaps as described "
-"in the <a href=\"http://freehaven.net/anonbib/author.html#snader08\";>\"A "
-"Tune-up for Tor\"</a> paper by Snader and Borisov. One could use current "
-"testing code to double-check this paper's findings and verify the extent to "
-"which they dovetail with Tor as deployed in the wild, and determine good "
-"ways to incorporate them into their suggestions Tor network without adding "
-"too much communications overhead between relays and directory authorities."
-msgstr ""
-"<b>Tuner Tor !</b> <br /> PrioritÃ: <i>Moyenne à Haute</i> <br /> Effort à "
-"fournir: <i>Moyen à Important</i> <br /> CompÃtences requises: <i>Hautes</i> "
-"<br /> Tuteurs potentiels: <i>Nick, Roger, Mike, Karsten</i> <br />Pour le "
-"moment, les relais Tor mesurent et remontent leur propre bande passante, les "
-"clients choisissent quels relais ils vont utiliser en partie selon cette "
-"bande passante.  Cette approche prÃsent des vulnÃrabilitÃs <a href=\"http://";
-"freehaven.net/anonbib/#bauer:wpes2007\">aux attaques dans lesquelles le "
-"relais ment sur sa bande passante</a>. Pour rÃgler ce problÃme, Tor plafonne "
-"la bande passante maximale affichÃe par un relais.  C'est une correction "
-"limitÃe et une perte de bande passante.  A la place, Tor devrait mesure la "
-"bande passante selon un mode distribuÃ, peut-Ãtre comme dÃcrit dans le "
-"document <a href=\"http://freehaven.net/anonbib/author.html#snader08\";>\"A "
-"Tune-up for Tor\"</a> de Snader et Borisov. On pourrait utiliser du code "
-"source en test pour confirmer les trouvailles de ce document et vÃrifier la "
-"maniÃre dont elles concordent avec le fonctionnement rÃel de Tor. On "
-"pourrait trouver les bons moyens d'incorporer ces suggestions dans le rÃseau "
-"Tor sans ajouter trop de trafic entre les relais et les autoritÃs d'annuaire."
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:256
 msgid ""
 "<b>Improving Polipo on Windows</b> <br /> Priority: <i>Medium to High</i> "
@@ -566,18 +530,19 @@
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:283
+#, fuzzy
 msgid ""
-"<b>Tor Controller Status Event Interface</b> <br /> Priority: <i>Medium</i> "
-"<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> "
-"<br /> Likely Mentors: <i>Matt</i> <br /> There are a number of status "
-"changes inside Tor of which the user may need to be informed. For example, "
-"if the user is trying to set up his Tor as a relay and Tor decides that its "
-"ports are not reachable from outside the user's network, we should alert the "
-"user. Currently, all the user gets is a couple log messages in Vidalia's "
-"'message log' window, which they likely never see since they don't receive a "
-"notification that something has gone wrong. Even if the user does actually "
-"look at the message log, most of the messages make little sense to the "
-"novice user.  <br /> Tor has the ability to inform Vidalia of many such "
+"<b>Tor Controller Status Event Interface for Vidalia</b> <br /> Priority: "
+"<i>Medium</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low "
+"to Medium</i> <br /> Likely Mentors: <i>Matt</i> <br /> There are a number "
+"of status changes inside Tor of which the user may need to be informed. For "
+"example, if the user is trying to set up his Tor as a relay and Tor decides "
+"that its ports are not reachable from outside the user's network, we should "
+"alert the user. Currently, all the user gets is a couple log messages in "
+"Vidalia's 'message log' window, which they likely never see since they don't "
+"receive a notification that something has gone wrong. Even if the user does "
+"actually look at the message log, most of the messages make little sense to "
+"the novice user.  <br /> Tor has the ability to inform Vidalia of many such "
 "status changes, and we recently implemented support for a couple of these "
 "events. Still, there are many more status events the user should be informed "
 "of and we need a better UI for actually displaying them to the user.  <br /> "
@@ -725,80 +690,30 @@
 "\"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul\";>XUL</a>, "
 "with not too much involvement in the Tor internals."
 msgstr ""
-"<b>Nouvelles fonctionnalitÃs dans Torbutton<b> <br /> PrioritÃ: "
-"<i>Moyenne</i> <br /> Effort à fournir: <i>Important</i> <br /> CompÃtences "
-"requises: <i>Hautes</i> <br /> Tuteurs potentiels: <i>Mike</i> <br /> Il "
-"existe plusieurs <a href=\"https://bugs.torproject.org/flyspray/index.php?tas";
-"ks=all&amp;project=5&amp;type=2\">demandes d'amÃlioration</a> dans la section "
-"Torbutton de Flyspray. En particulier, <a href=\"https://bugs.torproject.org";
-"/flyspray/index.php?do=details&amp;id=523\">l'intÃgration de la 'Nouvelle "
-"IdentitÃ' avec Vidalia</a>, <a href=\"https://bugs.torproject.org/flyspray/in";
-"dex.php?do=details&amp;id=940\">les moyens de gÃrer plusieurs conteneurs de "
-"cookies par identitÃ</a>, <a href=\"https://bugs.torproject.org/flyspray/inde";
-"x.php?do=details&amp;id=637\">la prÃservation de certains cookies</a> lorsque "
-"ceux-ci sont effacÃs, <a href=\"https://bugs.torproject.org/flyspray/index.p";
-"hp?do=details&amp;id=524\">une meilleure injection du champ referrer</a>, <a h"
-"ref=\"https://bugs.torproject.org/flyspray/index.php?do=details&amp;id=564\";>u"
-"ne remontÃe correcte du statut de Tor</a>, et <a href=\"https://bugs.torproje";
-"ct.org/flyspray/index.php?do=details&amp;id=462\">la gestion des urls "
-"\"tor://\" et \"tors://\"</a> sont toutes des fonctionnalitÃs intÃressantes qui "
-"pourraient Ãtre ajoutÃes.  <br /> Ce travail devrait Ãtre rÃalisà en tant "
-"que code source indÃpendant rÃalisà en Javascript et en <a "
-"href=\"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul\";>XUL</a> "
-"sans trop interfÃrer avec le fonctionnement interne de Tor."
+"<b>Nouvelles fonctionnalitÃs dans Torbutton<b> <br /> PrioritÃ: <i>Moyenne</"
+"i> <br /> Effort à fournir: <i>Important</i> <br /> CompÃtences requises: "
+"<i>Hautes</i> <br /> Tuteurs potentiels: <i>Mike</i> <br /> Il existe "
+"plusieurs <a href=\"https://bugs.torproject.org/flyspray/index.php?";
+"tasks=all&amp;project=5&amp;type=2\">demandes d'amÃlioration</a> dans la "
+"section Torbutton de Flyspray. En particulier, <a href=\"https://bugs.";
+"torproject.org/flyspray/index.php?do=details&amp;id=523\">l'intÃgration de "
+"la 'Nouvelle IdentitÃ' avec Vidalia</a>, <a href=\"https://bugs.torproject.";
+"org/flyspray/index.php?do=details&amp;id=940\">les moyens de gÃrer plusieurs "
+"conteneurs de cookies par identitÃ</a>, <a href=\"https://bugs.torproject.";
+"org/flyspray/index.php?do=details&amp;id=637\">la prÃservation de certains "
+"cookies</a> lorsque ceux-ci sont effacÃs, <a href=\"https://bugs.torproject.";
+"org/flyspray/index.php?do=details&amp;id=524\">une meilleure injection du "
+"champ referrer</a>, <a href=\"https://bugs.torproject.org/flyspray/index.php?";
+"do=details&amp;id=564\">une remontÃe correcte du statut de Tor</a>, et <a "
+"href=\"https://bugs.torproject.org/flyspray/index.php?do=details&amp;id=462";
+"\">la gestion des urls \"tor://\" et \"tors://\"</a> sont toutes des "
+"fonctionnalitÃs intÃressantes qui pourraient Ãtre ajoutÃes.  <br /> Ce "
+"travail devrait Ãtre rÃalisà en tant que code source indÃpendant rÃalisà en "
+"Javascript et en <a href=\"http://www.mozilla.org/keymaster/gatekeeper/there.";
+"is.only.xul\">XUL</a> sans trop interfÃrer avec le fonctionnement interne de "
+"Tor."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:415
-msgid ""
-"<b>New Thandy Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Medium to High</i> <br /> Likely "
-"Mentors: <i>Martin</i> <br /> Additional capabilities are needed for "
-"assisted updates of all the Tor related software for Windows and other "
-"operating systems. Some of the features to consider include:"
-msgstr ""
-"<b>Nouvelles fonctionnalitÃs</b> PrioritÃ: <i>Moyenne</i> <br /> Effort à "
-"fournir: <i>Moyen</i> <br /> CompÃtences requises: <i>Moyennes à Hautes</i> "
-"<br /> Tuteurs potentiels: <i>Martin</i> <br /> De nouvelles fonctionnalitÃs "
-"doivent Ãtre implÃmentÃes en ce qui concerne les assistants de mises à jour "
-"de l'ensemble des logiciels Tor sous Windows et sous les autres systÃmes "
-"d'exploitation. Ces fonctionnalità incluent:"
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:429
-msgid ""
-"Integration of the <a href=\"http://chandlerproject.org/Projects/MeTooCrypto";
-"\">MeTooCrypto Python library</a> for authenticated HTTPS downloads."
-msgstr ""
-"IntÃgration de <a href=\"http://chandlerproject.org/Projects/MeTooCrypto";
-"\">la bibliohthÃque Python MeTooCrypto</a> pour les tÃlÃchargements HTTPS "
-"authentifiÃs."
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:433
-msgid ""
-"Adding a level of indirection between the timestamp signatures and the "
-"package files included in an update. See the \"Thandy attacks / suggestions"
-"\" thread on or-dev."
-msgstr ""
-"Ajouter un systÃme de pointeurs entre les singatures d'horodatage et les "
-"fichiers de paquets inclus dans une mise à jour. Consultez le fil de "
-"discussion \"Thandy attacks / suggestions\" sur la liste de diffusion or-dev."
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:436
-msgid ""
-"Support locale specific installation and configuration of assisted updates "
-"based on preference, host, or user account language settings.  Familiarity "
-"with Windows codepages, unicode, and other character sets is helpful in "
-"addition to general win32 and posix API experience and Python proficiency."
-msgstr ""
-"Le support des langues dans les assistants d'installation et de "
-"configuration, basÃes sur les prÃfÃrences rÃgionales de la machine ou compte "
-"utilisateur.  Nous avons besoin de compÃtences sur les codepages Windows, "
-"sur unicode et les autres jeux de caractÃres ainsi que d'une expÃrience dans "
-"les API win32 et posix ainsi que dans Python."
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:445
 msgid ""
 "<b>Simulator for slow Internet connections</b> <br /> Priority: <i>Medium</"
@@ -883,14 +798,16 @@
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:509
+#, fuzzy
 msgid ""
-"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Low</i> <br /"
-"> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Mike</i> <br /> We're hearing from an increasing number of users "
-"that they want to use Thunderbird with Tor. However, there are plenty of "
-"application-level concerns, for example, by default Thunderbird will put "
-"your hostname in the outgoing mail that it sends. At some point we should "
-"start a new push to build a Thunderbird extension similar to Torbutton."
+"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Medium</i> "
+"<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> "
+"Likely Mentors: <i>Mike</i> <br /> We're hearing from an increasing number "
+"of users that they want to use Thunderbird with Tor. However, there are "
+"plenty of application-level concerns, for example, by default Thunderbird "
+"will put your hostname in the outgoing mail that it sends. At some point we "
+"should start a new push to build a Thunderbird extension similar to "
+"Torbutton."
 msgstr ""
 "<b>Ãquivalent de Torbutton pour Thunderbird</b> <br /> PrioritÃ: <i>Faible</"
 "i> <br /> Effort à fournir: <i>Important</i> <br /> CompÃtences requises: "
@@ -902,30 +819,6 @@
 "pousser la rÃalisation d'une extension Thunderbird similaire à Torbutton."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:527
-msgid ""
-"<b>Intermediate Level Network Device Driver</b> <br /> Priority: <i>Low</i> "
-"<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> "
-"Likely Mentors: <i>Martin</i> <br /> The WinPCAP device driver used by Tor "
-"VM for bridged networking does not support a number of wireless and non-"
-"Ethernet network adapters.  Implementation of a intermediate level network "
-"device driver for win32 and 64bit would provide a way to intercept and route "
-"traffic over such networks. This project will require knowledge of and "
-"experience with Windows kernel device driver development and testing. "
-"Familiarity with Winsock and Qemu would also be helpful."
-msgstr ""
-"<b>Pilote rÃseau de niveau intermÃdiaire</b> <br /> PrioritÃ: <i>Faible</i> "
-"<br /> Effort à fournir: <i>Important</i> <br /> CompÃtences requises: "
-"<i>Hautes</i> <br /> Tuteurs potentiels: <i>Martin</i> <br /> Le pilote "
-"WinPCAP utilisà par la Machine Virtuelle Tor pour les rÃseaux translatÃs ne "
-"supporte pas un certain nombre d'adaptateurs de rÃseaux sans-fil ou non-"
-"Ethernet.  L'implÃmentation d'un pilote rÃseau de niveau intermÃdiaire pour "
-"win32 et win64 fournirait un moyen d'intercepter et de router du trafic sur "
-"ces rÃseaux. Ce projet nÃcessite des connaissances et de l'expÃrience dans "
-"le dÃveloppement de pilote de pÃriphÃriques du noyau Windows ainsi que des "
-"tests. ConnaÃtre Winsock et Qemu serait un plus."
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:547
 msgid ""
 "<b>Improve Tor Weather</b> <br /> Priority: <i>Medium</i> <br /> Effort "
@@ -1045,62 +938,6 @@
 "avoir une expÃrience en C++. Des compÃtences en QT seraient un vrai plus."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:621
-msgid ""
-"<b>Tor/Polipo/Vidalia Auto-Update Framework</b> <br /> We're in need of a "
-"good authenticated-update framework.  Vidalia already has the ability to "
-"notice when the user is running an outdated or unrecommended version of Tor, "
-"using signed statements inside the Tor directory information. Currently, "
-"Vidalia simply pops up a little message box that lets the user know they "
-"should manually upgrade. The goal of this project would be to extend Vidalia "
-"with the ability to also fetch and install the updated Tor software for the "
-"user. We should do the fetches via Tor when possible, but also fall back to "
-"direct fetches in a smart way. Time permitting, we would also like to be "
-"able to update other applications included in the bundled installers, such "
-"as Polipo and Vidalia itself.  <br /> To complete this project, the student "
-"will first need to first investigate the existing auto-update frameworks (e."
-"g., Sparkle on OS X) to evaluate their strengths, weaknesses, security "
-"properties, and ability to be integrated into Vidalia. If none are found to "
-"be suitable, the student will design their own auto-update framework, "
-"document the design, and then discuss the design with other developers to "
-"assess any security issues. The student will then implement their framework "
-"(or integrate an existing one) and test it.  <br /> A person undertaking "
-"this project should have good C++ development experience. Previous "
-"experience with Qt is helpful, but not required. One should also have a good "
-"understanding of common security practices, such as package signature "
-"verification. Good writing ability is also important for this project, since "
-"a vital step of the project will be producing a design document to review "
-"and discuss with others prior to implementation."
-msgstr ""
-"<b>Framework de mise à jour automatique pour Tor/Polipo/Vidalia</b> <br /"
-">Nous avons besoin d'un bon framework pour les mises à jour authentifiÃes.  "
-"Vidalia dispose dÃjà de la capacità à avertir l'utilisateur qu'il utilise "
-"une version pÃrimÃe ou non recommandÃe de Tor en utilisant des annonces "
-"signÃes issue des information d'annuaire. Pour le moment, Vidalia affiche "
-"simplement une petit boÃte de dialogue qui informe l'utilisateur qu'il doit "
-"manuellement mettre à jour ses logiciels. L'objectif du projet serait "
-"d'offrir la possibilità à Vidalia de rÃcupÃrer et installer les logiciels "
-"Tor mis à jour pour le compte de l'utilisateur. Nous devrions rÃcupÃrer les "
-"fichiers via Tor si possible mais Ãgalement par des moyens plus directs. Si "
-"le temps le permet, nous aimerions mettre à jour les autres applications "
-"incluses dans les installeurs telles que Polipo et Vidalia lui-mÃme.  <br /> "
-"Pour mener à bien ce projet, l'Ãtudient devra d'abord se renseigner sur les "
-"frameworks de mise à jour automatique (e.g. Sparkle sur OS X) pour Ãvaluer "
-"leurs avantages/inconvÃnients ainsi que leurs failles de sÃcurità et leur "
-"capacità à s'intÃgrer à Vidalia. Si aucun de ces framworks ne convient, "
-"l'Ãtudiant concevra sont propre framework, documentera les spÃcifications et "
-"en discutera avec les autres dÃveloppeurs pour gÃrer les problÃmes de "
-"sÃcuritÃ. L'Ãtudiant implÃmentera ensuite le framework (ou intÃgrera un de "
-"ceux qui existent) et procÃdera aux tests.  <br /> Une personne motivÃe par "
-"ce projet doit disposer d'une bonne expÃrience en C++. Une expÃrience "
-"antÃrieure avec Qt serait un vrai plus. Il est Ãgalement important de bien "
-"comprendre les bonnes pratiques de sÃcurità telles que la vÃrification de "
-"signature des paquets. De bonnes capacitÃs de rÃdaction sont Ãgalement "
-"importantes pour ce projet car une des Ãtapes vitales est de produire la "
-"documentation des spÃcifications à relire et à discuter avec les autres "
-"avant l'implÃmentation."
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:655
 msgid ""
 "<b>Improving the Tor QA process: Continuous Integration for builds</b> <br /"
@@ -1152,25 +989,6 @@
 "les changement de performance avec des rÃles diffÃrents."
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:683
-msgid ""
-"<b>Usability testing of Tor</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> <br /> Likely "
-"Mentors: <i>Andrew</i> <br /> Especially the browser bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
-msgstr ""
-"<b>Tests d'utilisation de Tor</b> <br /> PrioritÃ: <i>Moyenne</i> <br /> "
-"Effort à fournir: <i>Moyen</i> <br /> CompÃtences requises: <i>Faibles à "
-"Moyennes</i> <br /> Tuteurs potentiels: <i>Andrew</i> <br /> SpÃcialement le "
-"Pack de Navigation, idÃalement parmi notre coeur de cible.  Cela nous "
-"aiderait beaucoup à comprendre ce qui doit Ãtre rÃalisà en terme de "
-"correction de bugs ou de nouvelles fonctionnalitÃs. Nous rÃcupÃrons "
-"l'information de maniÃre informelle pour le moment mais un processus plus "
-"structurà serait meilleur."
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:700
 msgid ""
 "<b>An authenticating IRC proxy</b> <br /> Priority: <i>Medium</i> <br /> "
@@ -1792,6 +1610,186 @@
 "pointsÂ!"
 
 #~ msgid ""
+#~ "<b>Tuneup Tor!</b> <br /> Priority: <i>Medium to High</i> <br /> Effort "
+#~ "Level: <i>Medium to High</i> <br /> Skill Level: <i>High</i> <br /> "
+#~ "Likely Mentors: <i>Nick, Roger, Mike, Karsten</i> <br /> Right now, Tor "
+#~ "relays measure and report their own bandwidth, and Tor clients choose "
+#~ "which relays to use in part based on that bandwidth.  This approach is "
+#~ "vulnerable to <a href=\"http://freehaven.net/anonbib/#bauer:wpes2007";
+#~ "\">attacks where relays lie about their bandwidth</a>; to address this, "
+#~ "Tor currently caps the maximum bandwidth it's willing to believe any "
+#~ "relay provides.  This is a limited fix, and a waste of bandwidth capacity "
+#~ "to boot.  Instead, Tor should possibly measure bandwidth in a more "
+#~ "distributed way, perhaps as described in the <a href=\"http://freehaven.";
+#~ "net/anonbib/author.html#snader08\">\"A Tune-up for Tor\"</a> paper by "
+#~ "Snader and Borisov. One could use current testing code to double-check "
+#~ "this paper's findings and verify the extent to which they dovetail with "
+#~ "Tor as deployed in the wild, and determine good ways to incorporate them "
+#~ "into their suggestions Tor network without adding too much communications "
+#~ "overhead between relays and directory authorities."
+#~ msgstr ""
+#~ "<b>Tuner Tor !</b> <br /> PrioritÃ: <i>Moyenne à Haute</i> <br /> Effort "
+#~ "à fournir: <i>Moyen à Important</i> <br /> CompÃtences requises: "
+#~ "<i>Hautes</i> <br /> Tuteurs potentiels: <i>Nick, Roger, Mike, Karsten</"
+#~ "i> <br />Pour le moment, les relais Tor mesurent et remontent leur propre "
+#~ "bande passante, les clients choisissent quels relais ils vont utiliser en "
+#~ "partie selon cette bande passante.  Cette approche prÃsent des "
+#~ "vulnÃrabilitÃs <a href=\"http://freehaven.net/anonbib/#bauer:wpes2007";
+#~ "\">aux attaques dans lesquelles le relais ment sur sa bande passante</a>. "
+#~ "Pour rÃgler ce problÃme, Tor plafonne la bande passante maximale affichÃe "
+#~ "par un relais.  C'est une correction limitÃe et une perte de bande "
+#~ "passante.  A la place, Tor devrait mesure la bande passante selon un mode "
+#~ "distribuÃ, peut-Ãtre comme dÃcrit dans le document <a href=\"http://";
+#~ "freehaven.net/anonbib/author.html#snader08\">\"A Tune-up for Tor\"</a> de "
+#~ "Snader et Borisov. On pourrait utiliser du code source en test pour "
+#~ "confirmer les trouvailles de ce document et vÃrifier la maniÃre dont "
+#~ "elles concordent avec le fonctionnement rÃel de Tor. On pourrait trouver "
+#~ "les bons moyens d'incorporer ces suggestions dans le rÃseau Tor sans "
+#~ "ajouter trop de trafic entre les relais et les autoritÃs d'annuaire."
+
+#~ msgid ""
+#~ "<b>New Thandy Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
+#~ "Level: <i>Medium</i> <br /> Skill Level: <i>Medium to High</i> <br /> "
+#~ "Likely Mentors: <i>Martin</i> <br /> Additional capabilities are needed "
+#~ "for assisted updates of all the Tor related software for Windows and "
+#~ "other operating systems. Some of the features to consider include:"
+#~ msgstr ""
+#~ "<b>Nouvelles fonctionnalitÃs</b> PrioritÃ: <i>Moyenne</i> <br /> Effort à "
+#~ "fournir: <i>Moyen</i> <br /> CompÃtences requises: <i>Moyennes à Hautes</"
+#~ "i> <br /> Tuteurs potentiels: <i>Martin</i> <br /> De nouvelles "
+#~ "fonctionnalitÃs doivent Ãtre implÃmentÃes en ce qui concerne les "
+#~ "assistants de mises à jour de l'ensemble des logiciels Tor sous Windows "
+#~ "et sous les autres systÃmes d'exploitation. Ces fonctionnalità incluent:"
+
+#~ msgid ""
+#~ "Integration of the <a href=\"http://chandlerproject.org/Projects/";
+#~ "MeTooCrypto\">MeTooCrypto Python library</a> for authenticated HTTPS "
+#~ "downloads."
+#~ msgstr ""
+#~ "IntÃgration de <a href=\"http://chandlerproject.org/Projects/MeTooCrypto";
+#~ "\">la bibliohthÃque Python MeTooCrypto</a> pour les tÃlÃchargements HTTPS "
+#~ "authentifiÃs."
+
+#~ msgid ""
+#~ "Adding a level of indirection between the timestamp signatures and the "
+#~ "package files included in an update. See the \"Thandy attacks / "
+#~ "suggestions\" thread on or-dev."
+#~ msgstr ""
+#~ "Ajouter un systÃme de pointeurs entre les singatures d'horodatage et les "
+#~ "fichiers de paquets inclus dans une mise à jour. Consultez le fil de "
+#~ "discussion \"Thandy attacks / suggestions\" sur la liste de diffusion or-"
+#~ "dev."
+
+#~ msgid ""
+#~ "Support locale specific installation and configuration of assisted "
+#~ "updates based on preference, host, or user account language settings.  "
+#~ "Familiarity with Windows codepages, unicode, and other character sets is "
+#~ "helpful in addition to general win32 and posix API experience and Python "
+#~ "proficiency."
+#~ msgstr ""
+#~ "Le support des langues dans les assistants d'installation et de "
+#~ "configuration, basÃes sur les prÃfÃrences rÃgionales de la machine ou "
+#~ "compte utilisateur.  Nous avons besoin de compÃtences sur les codepages "
+#~ "Windows, sur unicode et les autres jeux de caractÃres ainsi que d'une "
+#~ "expÃrience dans les API win32 et posix ainsi que dans Python."
+
+#~ msgid ""
+#~ "<b>Intermediate Level Network Device Driver</b> <br /> Priority: <i>Low</"
+#~ "i> <br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /"
+#~ "> Likely Mentors: <i>Martin</i> <br /> The WinPCAP device driver used by "
+#~ "Tor VM for bridged networking does not support a number of wireless and "
+#~ "non-Ethernet network adapters.  Implementation of a intermediate level "
+#~ "network device driver for win32 and 64bit would provide a way to "
+#~ "intercept and route traffic over such networks. This project will require "
+#~ "knowledge of and experience with Windows kernel device driver development "
+#~ "and testing. Familiarity with Winsock and Qemu would also be helpful."
+#~ msgstr ""
+#~ "<b>Pilote rÃseau de niveau intermÃdiaire</b> <br /> PrioritÃ: <i>Faible</"
+#~ "i> <br /> Effort à fournir: <i>Important</i> <br /> CompÃtences requises: "
+#~ "<i>Hautes</i> <br /> Tuteurs potentiels: <i>Martin</i> <br /> Le pilote "
+#~ "WinPCAP utilisà par la Machine Virtuelle Tor pour les rÃseaux translatÃs "
+#~ "ne supporte pas un certain nombre d'adaptateurs de rÃseaux sans-fil ou "
+#~ "non-Ethernet.  L'implÃmentation d'un pilote rÃseau de niveau "
+#~ "intermÃdiaire pour win32 et win64 fournirait un moyen d'intercepter et de "
+#~ "router du trafic sur ces rÃseaux. Ce projet nÃcessite des connaissances "
+#~ "et de l'expÃrience dans le dÃveloppement de pilote de pÃriphÃriques du "
+#~ "noyau Windows ainsi que des tests. ConnaÃtre Winsock et Qemu serait un "
+#~ "plus."
+
+#~ msgid ""
+#~ "<b>Tor/Polipo/Vidalia Auto-Update Framework</b> <br /> We're in need of a "
+#~ "good authenticated-update framework.  Vidalia already has the ability to "
+#~ "notice when the user is running an outdated or unrecommended version of "
+#~ "Tor, using signed statements inside the Tor directory information. "
+#~ "Currently, Vidalia simply pops up a little message box that lets the user "
+#~ "know they should manually upgrade. The goal of this project would be to "
+#~ "extend Vidalia with the ability to also fetch and install the updated Tor "
+#~ "software for the user. We should do the fetches via Tor when possible, "
+#~ "but also fall back to direct fetches in a smart way. Time permitting, we "
+#~ "would also like to be able to update other applications included in the "
+#~ "bundled installers, such as Polipo and Vidalia itself.  <br /> To "
+#~ "complete this project, the student will first need to first investigate "
+#~ "the existing auto-update frameworks (e.g., Sparkle on OS X) to evaluate "
+#~ "their strengths, weaknesses, security properties, and ability to be "
+#~ "integrated into Vidalia. If none are found to be suitable, the student "
+#~ "will design their own auto-update framework, document the design, and "
+#~ "then discuss the design with other developers to assess any security "
+#~ "issues. The student will then implement their framework (or integrate an "
+#~ "existing one) and test it.  <br /> A person undertaking this project "
+#~ "should have good C++ development experience. Previous experience with Qt "
+#~ "is helpful, but not required. One should also have a good understanding "
+#~ "of common security practices, such as package signature verification. "
+#~ "Good writing ability is also important for this project, since a vital "
+#~ "step of the project will be producing a design document to review and "
+#~ "discuss with others prior to implementation."
+#~ msgstr ""
+#~ "<b>Framework de mise à jour automatique pour Tor/Polipo/Vidalia</b> <br /"
+#~ ">Nous avons besoin d'un bon framework pour les mises à jour "
+#~ "authentifiÃes.  Vidalia dispose dÃjà de la capacità à avertir "
+#~ "l'utilisateur qu'il utilise une version pÃrimÃe ou non recommandÃe de Tor "
+#~ "en utilisant des annonces signÃes issue des information d'annuaire. Pour "
+#~ "le moment, Vidalia affiche simplement une petit boÃte de dialogue qui "
+#~ "informe l'utilisateur qu'il doit manuellement mettre à jour ses "
+#~ "logiciels. L'objectif du projet serait d'offrir la possibilità à Vidalia "
+#~ "de rÃcupÃrer et installer les logiciels Tor mis à jour pour le compte de "
+#~ "l'utilisateur. Nous devrions rÃcupÃrer les fichiers via Tor si possible "
+#~ "mais Ãgalement par des moyens plus directs. Si le temps le permet, nous "
+#~ "aimerions mettre à jour les autres applications incluses dans les "
+#~ "installeurs telles que Polipo et Vidalia lui-mÃme.  <br /> Pour mener à "
+#~ "bien ce projet, l'Ãtudient devra d'abord se renseigner sur les frameworks "
+#~ "de mise à jour automatique (e.g. Sparkle sur OS X) pour Ãvaluer leurs "
+#~ "avantages/inconvÃnients ainsi que leurs failles de sÃcurità et leur "
+#~ "capacità à s'intÃgrer à Vidalia. Si aucun de ces framworks ne convient, "
+#~ "l'Ãtudiant concevra sont propre framework, documentera les spÃcifications "
+#~ "et en discutera avec les autres dÃveloppeurs pour gÃrer les problÃmes de "
+#~ "sÃcuritÃ. L'Ãtudiant implÃmentera ensuite le framework (ou intÃgrera un "
+#~ "de ceux qui existent) et procÃdera aux tests.  <br /> Une personne "
+#~ "motivÃe par ce projet doit disposer d'une bonne expÃrience en C++. Une "
+#~ "expÃrience antÃrieure avec Qt serait un vrai plus. Il est Ãgalement "
+#~ "important de bien comprendre les bonnes pratiques de sÃcurità telles que "
+#~ "la vÃrification de signature des paquets. De bonnes capacitÃs de "
+#~ "rÃdaction sont Ãgalement importantes pour ce projet car une des Ãtapes "
+#~ "vitales est de produire la documentation des spÃcifications à relire et à "
+#~ "discuter avec les autres avant l'implÃmentation."
+
+#~ msgid ""
+#~ "<b>Usability testing of Tor</b> <br /> Priority: <i>Medium</i> <br /> "
+#~ "Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> <br /"
+#~ "> Likely Mentors: <i>Andrew</i> <br /> Especially the browser bundle, "
+#~ "ideally amongst our target demographic.  That would help a lot in knowing "
+#~ "what needs to be done in terms of bug fixes or new features. We get this "
+#~ "informally at the moment, but a more structured process would be better."
+#~ msgstr ""
+#~ "<b>Tests d'utilisation de Tor</b> <br /> PrioritÃ: <i>Moyenne</i> <br /> "
+#~ "Effort à fournir: <i>Moyen</i> <br /> CompÃtences requises: <i>Faibles à "
+#~ "Moyennes</i> <br /> Tuteurs potentiels: <i>Andrew</i> <br /> SpÃcialement "
+#~ "le Pack de Navigation, idÃalement parmi notre coeur de cible.  Cela nous "
+#~ "aiderait beaucoup à comprendre ce qui doit Ãtre rÃalisà en terme de "
+#~ "correction de bugs ou de nouvelles fonctionnalitÃs. Nous rÃcupÃrons "
+#~ "l'information de maniÃre informelle pour le moment mais un processus plus "
+#~ "structurà serait meilleur."
+
+#~ msgid ""
 #~ "How can we make the <a href=\"http://anonymityanywhere.com/incognito/";
 #~ "\">Incognito LiveCD</a> easier to maintain, improve, and document?"
 #~ msgstr ""

Modified: translation/trunk/projects/website/fr/docs/3-low.debian.po
===================================================================
--- translation/trunk/projects/website/fr/docs/3-low.debian.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/fr/docs/3-low.debian.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-01-21 11:14+0100\n"
+"POT-Creation-Date: 2010-03-09 09:19+0100\n"
 "PO-Revision-Date: 2010-01-17 09:51-0700\n"
 "Last-Translator: MÃdÃric RIBREUX <mederic.ribreux@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -30,8 +30,8 @@
 "sid, ou Debian testing</a>"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/WxL9epzRQR.xml:40
-#: /tmp/WxL9epzRQR.xml:96 /tmp/WxL9epzRQR.xml:130
+#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/iqkQ7Bjssj.xml:40
+#: /tmp/iqkQ7Bjssj.xml:96 /tmp/iqkQ7Bjssj.xml:130
 msgid "<br />"
 msgstr "<br />"
 
@@ -57,8 +57,8 @@
 "derniÃre version stable de Tor, consultez la deuxiÃme option ci-dessous."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/WxL9epzRQR.xml:77
-#: /tmp/WxL9epzRQR.xml:121 /tmp/WxL9epzRQR.xml:164
+#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/iqkQ7Bjssj.xml:77
+#: /tmp/iqkQ7Bjssj.xml:121 /tmp/iqkQ7Bjssj.xml:164
 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."
@@ -116,12 +116,14 @@
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:59
+#, fuzzy
 msgid ""
-"where you substitute the above word (etch, lenny, sid, karmic, jaunty, "
-"intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you put the codename of your distribution (i.e. etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy or whatever it is) in place of &lt;"
+"DISTRIBUTION&gt;."
 msgstr ""
-"oà vous substituez le mot adaptà (etch, lenny, sid, karmic, jaunty, "
-"intrepid, hardy) Ã la place de &lt;DISTRIBUTION&gt;."
+"ou vous substituez le nom de votre distribution (etch, lenny, sid, karmic, "
+"jaunty, intrepid, hardy) Ã la place de &lt;DISTRIBUTION&gt;."
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:64
@@ -208,9 +210,10 @@
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:106
+#, fuzzy
 msgid ""
-"where you substitute the name of your distro (etch, lenny, sid, karmic, "
-"jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you again substitute the name of your distro (etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
 msgstr ""
 "ou vous substituez le nom de votre distribution (etch, lenny, sid, karmic, "
 "jaunty, intrepid, hardy) Ã la place de &lt;DISTRIBUTION&gt;."
@@ -340,3 +343,10 @@
 msgstr ""
 "Si vous avez des suggestions pour amÃliorer ce document, merci de <a href="
 "\"<page contact>\">nous en faire part</a>. Merci !"
+
+#~ msgid ""
+#~ "where you substitute the above word (etch, lenny, sid, karmic, jaunty, "
+#~ "intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+#~ msgstr ""
+#~ "oà vous substituez le mot adaptà (etch, lenny, sid, karmic, jaunty, "
+#~ "intrepid, hardy) Ã la place de &lt;DISTRIBUTION&gt;."

Modified: translation/trunk/projects/website/fr/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/fr/docs/3-low.tor-doc-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/fr/docs/3-low.tor-doc-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-03 22:11+0100\n"
+"POT-Creation-Date: 2010-03-09 09:19+0100\n"
 "PO-Revision-Date: 2010-02-24 10:35-0700\n"
 "Last-Translator: MÃdÃric RIBREUX <mederic.ribreux@xxxxxxxxx>\n"
 "Language-Team: fr_FR <tor-translate@xxxxxxxxxxxxxx>\n"
@@ -24,9 +24,9 @@
 "Unix"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/cQicSI1lge.xml:24
-#: /tmp/cQicSI1lge.xml:54 /tmp/cQicSI1lge.xml:88 /tmp/cQicSI1lge.xml:131
-#: /tmp/cQicSI1lge.xml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/qeeIw9Ad2I.xml:24
+#: /tmp/qeeIw9Ad2I.xml:54 /tmp/qeeIw9Ad2I.xml:88 /tmp/qeeIw9Ad2I.xml:131
+#: /tmp/qeeIw9Ad2I.xml:169
 msgid "<br />"
 msgstr "<br />"
 
@@ -73,14 +73,15 @@
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:34
+#, fuzzy
 msgid ""
 "If you're building from source, first install <a href=\"http://www.monkey.";
 "org/~provos/libevent/\">libevent</a>, and make sure you have openssl and "
 "zlib (including the -devel packages if applicable). Then run:<br /> <tt>tar "
-"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable><br /> ./configure "
-"&amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</tt>, or "
-"you can run <tt>make install</tt> (as root if necessary) to install it into /"
-"usr/local/, and then you can start it just by running <tt>tor</tt>."
+"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable></tt><br /> <tt>./"
+"configure &amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</"
+"tt>, or you can run <tt>make install</tt> (as root if necessary) to install "
+"it into /usr/local/, and then you can start it just by running <tt>tor</tt>."
 msgstr ""
 "Si vous installez depuis le code source, installez d'abord <a href=\"http://";
 "www.monkey.org/~provos/libevent/\">libevent</a>, et assurez vous de disposer "

Modified: translation/trunk/projects/website/it/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/it/2-medium.donate.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/it/2-medium.donate.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:01+0100\n"
+"POT-Creation-Date: 2010-03-09 09:18+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -61,7 +61,7 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:32 /tmp/3SDPRnO0Hu.xml:102
+#: /home/runa/tor/website/en/donate.wml:32 /tmp/_YLRl6kX6p.xml:102
 msgid "<br />"
 msgstr ""
 
@@ -143,17 +143,17 @@
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:72 /tmp/3SDPRnO0Hu.xml:114
+#: /home/runa/tor/website/en/donate.wml:72 /tmp/_YLRl6kX6p.xml:114
 msgid "$"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:73 /tmp/3SDPRnO0Hu.xml:115
+#: /home/runa/tor/website/en/donate.wml:73 /tmp/_YLRl6kX6p.xml:115
 msgid "â"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:74 /tmp/3SDPRnO0Hu.xml:116
+#: /home/runa/tor/website/en/donate.wml:74 /tmp/_YLRl6kX6p.xml:116
 msgid "Â"
 msgstr ""
 
@@ -248,7 +248,8 @@
 
 #. type: Content of: <div><p><address>
 #: /home/runa/tor/website/en/donate.wml:136
-msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
+msgid ""
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 USA"
 msgstr ""
 
 #. type: Content of: <div><p>

Modified: translation/trunk/projects/website/it/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/it/2-medium.verifying-signatures.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/it/2-medium.verifying-signatures.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-21 20:19+0100\n"
+"POT-Creation-Date: 2010-03-09 09:18+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -23,7 +23,7 @@
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/verifying-signatures.wml:10
-#: /tmp/kBAOTlXKsF.xml:33 /tmp/kBAOTlXKsF.xml:45 /tmp/kBAOTlXKsF.xml:92
+#: /tmp/aqiNycla3P.xml:34 /tmp/aqiNycla3P.xml:46 /tmp/aqiNycla3P.xml:93
 #, fuzzy
 msgid "<hr />"
 msgstr "<hr />"
@@ -100,68 +100,73 @@
 msgid "Jacob's (0x9D0FACE4)"
 msgstr "Jacob (0x9D0FACE4)"
 
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/verifying-signatures.wml:30
+msgid "Erinn's (0x63FEE659) and (0xF1F5C9B5)"
+msgstr ""
+
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:32
+#: /home/runa/tor/website/en/verifying-signatures.wml:33
 #, fuzzy
 msgid "Step One: Import the keys"
 msgstr "Primo: Importa le chiavi"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:34
+#: /home/runa/tor/website/en/verifying-signatures.wml:35
 #, fuzzy
 msgid "You can import keys directly from GnuPG as well:"
 msgstr "Puoi anche importare le chiavi direttamente da GnuPG:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:36
+#: /home/runa/tor/website/en/verifying-signatures.wml:37
 #, fuzzy, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --recv-keys 0x28988BF5"
 msgstr "gpg --keyserver subkeys.pgp.net --recv-keys 0x28988BF5"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:38
+#: /home/runa/tor/website/en/verifying-signatures.wml:39
 #, fuzzy
 msgid "or search for keys with"
 msgstr "o cercarle con"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:40
+#: /home/runa/tor/website/en/verifying-signatures.wml:41
 #, fuzzy, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --search-keys 0x28988BF5"
 msgstr "gpg --keyserver subkeys.pgp.net --search-keys 0x28988BF5"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:42
+#: /home/runa/tor/website/en/verifying-signatures.wml:43
 #, fuzzy
 msgid "and when you select one, it will be added to your keyring."
 msgstr "e quando ne scegli una, verr&agrave; aggiunta al tuo keyring."
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:44
+#: /home/runa/tor/website/en/verifying-signatures.wml:45
 #, fuzzy
 msgid "Step Two: Verify the fingerprints"
 msgstr "Secondo: verifica i fingerprint"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:46
+#: /home/runa/tor/website/en/verifying-signatures.wml:47
 #, fuzzy
 msgid "Verify the pgp fingerprints using:"
 msgstr "Verifica i fingerprint pgp con il comando:i"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:47
+#: /home/runa/tor/website/en/verifying-signatures.wml:48
 #, fuzzy, no-wrap
 msgid "gpg --fingerprint (insert keyid here)"
 msgstr "gpg --fingerprint (metti qui il keyid)"
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/verifying-signatures.wml:48
+#: /home/runa/tor/website/en/verifying-signatures.wml:49
 #, fuzzy
 msgid "The fingerprints for the keys should be:"
 msgstr "I fingerprint delle chiavi devono essere:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:51
+#: /home/runa/tor/website/en/verifying-signatures.wml:52
 #, fuzzy, no-wrap
 msgid ""
 "pub   1024D/28988BF5 2000-02-27\n"
@@ -235,7 +240,7 @@
 "sub   4096g/D5E87583 2008-03-11 [expires: 2010-03-11]\n"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:87
+#: /home/runa/tor/website/en/verifying-signatures.wml:88
 #, fuzzy
 msgid ""
 "(Of course if you want to be really certain that those are the real ones "
@@ -247,13 +252,13 @@
 "un percorso di fiducia a queste chiavi.)"
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:91
+#: /home/runa/tor/website/en/verifying-signatures.wml:92
 #, fuzzy
 msgid "Step Three: Verify the downloaded package"
 msgstr "Terzo: verifica i pacchetti scaricati"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:93
+#: /home/runa/tor/website/en/verifying-signatures.wml:94
 #, fuzzy
 msgid ""
 "If you're using GnuPG, then put the .asc and the download in the same "
@@ -266,7 +271,7 @@
 "qualcosa come \"Good signature\" o \"BAD signature\" usando questi comandi:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:99
+#: /home/runa/tor/website/en/verifying-signatures.wml:100
 #, fuzzy, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc tor-0.1.0.17.tar.gz\n"
@@ -286,7 +291,7 @@
 "Primary key fingerprint: B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:109
+#: /home/runa/tor/website/en/verifying-signatures.wml:110
 #, fuzzy
 msgid ""
 "Notice that there is a warning because you haven't assigned a trust index to "
@@ -308,7 +313,7 @@
 "quella terza parte, hai stabilito un livello di fiducia per arma/nick."
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:118
+#: /home/runa/tor/website/en/verifying-signatures.wml:119
 #, fuzzy
 msgid "All this means is you can ignore the message or assign a trust level."
 msgstr ""
@@ -316,7 +321,7 @@
 "livello di fiducia."
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:120
+#: /home/runa/tor/website/en/verifying-signatures.wml:121
 #, fuzzy
 msgid ""
 "For your reference, this is an example of a <em>BAD</em> verification. It "
@@ -326,7 +331,7 @@
 "Significa che la firma ed il contenuto del file non corrispondono:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:124
+#: /home/runa/tor/website/en/verifying-signatures.wml:125
 #, fuzzy, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc\n"
@@ -338,7 +343,7 @@
 "gpg: BAD signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:129
+#: /home/runa/tor/website/en/verifying-signatures.wml:130
 #, fuzzy
 msgid ""
 "If you see a message like the above one, then you should not trust the file "
@@ -348,7 +353,7 @@
 "file."
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:131
+#: /home/runa/tor/website/en/verifying-signatures.wml:132
 #, fuzzy
 msgid ""
 "If you are running Tor on Debian you should read the instructions on <a href="

Modified: translation/trunk/projects/website/it/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/it/3-low.download-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/it/3-low.download-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:30+0100\n"
+"POT-Creation-Date: 2010-03-09 09:18+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/SUiumU65Oi.xml:40
-#: /tmp/SUiumU65Oi.xml:56 /tmp/SUiumU65Oi.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/d2eAaZWjCq.xml:40
+#: /tmp/d2eAaZWjCq.xml:56 /tmp/d2eAaZWjCq.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -184,54 +184,79 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:84
-msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgid ""
+"<img src=\"images/distros/android-market.gif\" alt=\"Android\" width=\"32\" "
+"height=\"32\"/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:85
-msgid "Source tarballs"
+msgid "Android"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /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/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/tor/website/en/download-unix.wml:92
+msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:93
+msgid "Source tarballs"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:95
+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/tor/website/en/download-unix.wml:91
+#: /home/runa/tor/website/en/download-unix.wml:99
 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/tor/website/en/download-unix.wml:94
+#: /home/runa/tor/website/en/download-unix.wml:102
 msgid "<kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:101
+#: /home/runa/tor/website/en/download-unix.wml:109
 msgid "<a id=\"packagediff\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:102
+#: /home/runa/tor/website/en/download-unix.wml:110
 msgid ""
 "<a class=\"anchor\" href=\"#packagediff\">What's the difference between "
 "Stable &amp; Unstable?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:105
+#: /home/runa/tor/website/en/download-unix.wml:113
 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/tor/website/en/download-unix.wml:109
+#: /home/runa/tor/website/en/download-unix.wml:117
 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 "
@@ -241,7 +266,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:118
+#: /home/runa/tor/website/en/download-unix.wml:126
 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 "
@@ -251,7 +276,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:125
+#: /home/runa/tor/website/en/download-unix.wml:133
 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 "
@@ -259,7 +284,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:134
+#: /home/runa/tor/website/en/download-unix.wml:142
 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 "
@@ -269,7 +294,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><form>
-#: /home/runa/tor/website/en/download-unix.wml:142
+#: /home/runa/tor/website/en/download-unix.wml:150
 msgid ""
 "<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
 "\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
@@ -278,18 +303,18 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:152
+#: /home/runa/tor/website/en/download-unix.wml:160
 msgid "<a id=\"Warning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:153
+#: /home/runa/tor/website/en/download-unix.wml:161
 msgid ""
 "<a class=\"anchor\" href=\"#Warning\">Warning: Want Tor to really work?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:157
+#: /home/runa/tor/website/en/download-unix.wml:165
 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> "
@@ -298,7 +323,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:165
+#: /home/runa/tor/website/en/download-unix.wml:173
 msgid ""
 "Tor only protects Internet applications that are configured to send their "
 "traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
@@ -308,7 +333,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:173
+#: /home/runa/tor/website/en/download-unix.wml:181
 msgid ""
 "Browser plugins such as Java, Flash, ActiveX, RealPlayer, Quicktime, Adobe's "
 "PDF plugin, and others can be manipulated into revealing your IP address. "
@@ -324,7 +349,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:189
+#: /home/runa/tor/website/en/download-unix.wml:197
 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. "
@@ -334,7 +359,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:197
+#: /home/runa/tor/website/en/download-unix.wml:205
 msgid ""
 "Tor anonymizes the origin of your traffic, and it encrypts everything inside "
 "the Tor network, but <a href=\"https://wiki.torproject.org/noreply/";
@@ -346,7 +371,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:208
+#: /home/runa/tor/website/en/download-unix.wml:216
 msgid ""
 "While Tor blocks attackers on your local network from discovering or "
 "influencing your destination, it opens new risks: malicious or misconfigured "
@@ -355,12 +380,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:216
+#: /home/runa/tor/website/en/download-unix.wml:224
 msgid "<br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:218
+#: /home/runa/tor/website/en/download-unix.wml:226
 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 "
@@ -368,7 +393,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:228
+#: /home/runa/tor/website/en/download-unix.wml:236
 msgid ""
 "See our <a href=\"<page verifying-signatures>\">FAQ entry on verifying "
 "package signatures</a>, which allows you to make sure you've downloaded the "
@@ -376,7 +401,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:234
+#: /home/runa/tor/website/en/download-unix.wml:242
 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</"
@@ -384,7 +409,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:240
+#: /home/runa/tor/website/en/download-unix.wml:248
 msgid ""
 "See the <a href=\"<page documentation>#Developers\">developer documentation</"
 "a> for instructions on fetching Tor from Git to get the very latest "
@@ -394,19 +419,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:252
+#: /home/runa/tor/website/en/download-unix.wml:260
 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/tor/website/en/download-unix.wml:256
+#: /home/runa/tor/website/en/download-unix.wml:264
 msgid "<a id=\"ChangeLog\"></a> <a id=\"Stable\"></a> <a id=\"Testing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:260
+#: /home/runa/tor/website/en/download-unix.wml:268
 msgid ""
 "For a list of what has changed in each stable Tor release, see the <a href="
 "\"<gitblob>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in both "

Modified: translation/trunk/projects/website/it/3-low.people.po
===================================================================
--- translation/trunk/projects/website/it/3-low.people.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/it/3-low.people.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:01+0100\n"
+"POT-Creation-Date: 2010-03-09 09:18+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -60,8 +60,8 @@
 #. type: Content of: <div><address>
 #: /home/runa/tor/website/en/people.wml:30
 msgid ""
-"The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA<br /"
-"><br />"
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 "
+"USA<br /><br />"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -542,34 +542,56 @@
 
 #. type: Content of: <div><dl><dt>
 #: /home/runa/tor/website/en/people.wml:202
-msgid "Kasimir Gabert"
+msgid "Marco Bonetti"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:202
+msgid "Focusing on MobileTor for the iPhone."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:203
+msgid "Nathan Freitas"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:203
 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/tor/website/en/people.wml:205
+msgid "Kasimir Gabert"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:205
+msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\";>TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid "Robert Hogan"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\";>TorK</a> Tor controller."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid "Damian Johnson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid ""
 "Builds a command-line application for monitoring Tor relays, providing real-"
 "time status information such as the current configuration, bandwidth usage, "
@@ -578,106 +600,118 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid ""
 "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
 "and Privoxy still work well together."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid "Kory Kirk"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid ""
 "Worked during Google Summer of Code 2009 on extending Torbutton. Now he's "
 "working with Bruce Leidl on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Bruce Leidl"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Working on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid ""
 "A lawyer with the CCC in Germany. Coordinates the German Tor community with "
 "respect to legal questions and concerns."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:224
+msgid "Linus Nordberg"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:224
+msgid ""
+"Enjoys measuring the Tor network and helps with outreach in the Nordic "
+"countries."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:226
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:226
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid "Martin Peck"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:225
+#: /home/runa/tor/website/en/people.wml:230
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:231
 msgid ""
 "The most dedicated bug reporter we've ever heard from. He must read Tor "
 "source code every day over breakfast."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy";
@@ -686,24 +720,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?";
 "p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/";
@@ -712,7 +746,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:241
+#: /home/runa/tor/website/en/people.wml:246
 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, "
@@ -720,32 +754,32 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:252
 msgid "<a id=\"Past\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:248
+#: /home/runa/tor/website/en/people.wml:253
 msgid "<a class=\"anchor\" href=\"#Past\">Past thanks to:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "John Bashinski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "Contributed the initial rpm spec file."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid "Domenik Bork"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid ""
 "Worked on Configuration of Hidden Services with User Authorization in "
 "Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches/";
@@ -753,12 +787,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 msgid "Benedikt Boss"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 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 "
@@ -766,22 +800,22 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Ren Bucholz"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Our fine logo and images."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 msgid "Fallon Chen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 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="
@@ -790,32 +824,32 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Bram Cohen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Helped design our congestion control mechanisms, in Tor's early days."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Pat Double"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Creator of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid "Geoff Goodell"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid ""
 "Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/";
 "\">Blossom project</a> which uses Tor as its overlay network; also helped "
@@ -823,12 +857,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid "Aleksei Gorny"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid ""
 "Working on Tor exit scanner improvements (<a href=\"https://svn.torproject.";
 "org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
@@ -836,52 +870,52 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Christian Grothoff"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Contributed better daemonizing behavior."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Steven Hazel"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Made 'make install' do the right thing."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "Justin Hipple"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "The other developer for Vidalia."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Jason Holt"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Contributed patches to the instructions and the man page."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 msgid "Christian King"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 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-";
@@ -889,70 +923,70 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid "Joe Kowalski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid ""
 "Original author and provider of the torstatus script formerly run on "
 "nighteffect."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Adam Langley"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Our fine eventdns code."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid "Rebecca MacKinnon"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid ""
 "Former Director of Tor.  Co-Founder of <a href=\"http://www.";
 "globalvoicesonline.org/\">Global Voices Online</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid "Chris Palmer"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid ""
 "Our liaison and tech guy with EFF while EFF was funding us. Also helped "
 "advocate and write end-user docs."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid "Matej Pfajfar"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid ""
 "Author of the original onion routing code that Tor is based on, so we didn't "
 "have to start from scratch."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 msgid "Johannes Renner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 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 "
@@ -960,33 +994,33 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid "Scott Squires"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid ""
 "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Aaron Turner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Contributed the first version of the tor.sh initscripts shell script."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 msgid "Stephen Tyree"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 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 "
@@ -995,12 +1029,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid "Camilo Viecco"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid ""
 "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac.";
 "vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
@@ -1008,12 +1042,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 msgid "Fred von Lohmann"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 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/?";
@@ -1021,12 +1055,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid "Christian Wilms"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid ""
 "Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
 "\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";
@@ -1034,12 +1068,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 msgid "Jillian C. York"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 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/it/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/it/4-optional.volunteer.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/it/4-optional.volunteer.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:01+0100\n"
+"POT-Creation-Date: 2010-03-09 09:18+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,21 +252,22 @@
 "Messaging client). Components are pre-configured to operate in a secure way, "
 "and it has very few dependencies on the installed operating system. It has "
 "therefore become one of the most easy to use, and popular, ways to use Tor "
-"on Windows.  <br /> However, there is currently no working package for Linux "
-"and Mac OS X, so this project would be to implement Tor Browser Bundle for "
-"these platforms. This will involve modifications to Vidalia (C++), possibly "
-"Firefox (C) then creating and testing the launcher on a range of operating "
-"system versions and configurations to verify portability.  Some work on this "
-"was completed as part of the Google Summer of Code 2009. Another part of "
-"this project is to identify all of the traces left behind by using a Tor "
-"Browser Bundle on Mac OS X or Linux.  Developing ways to stop, counter, or "
-"remove these traces is a final step.  <br /> Students should be familiar "
-"with application development on one or preferably both of Linux and Mac OS "
-"X, and be comfortable with C/C++ and shell scripting.  <br /> Part of this "
-"project could be usability testing of Tor Browser Bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
+"on Windows.  <br /> However, there is currently no released package for "
+"Linux and Mac OS X, so this project would be to implement Tor Browser Bundle "
+"for OS X and continue work on the Tor Browser Bundle for Linux. This will "
+"involve modifications to Vidalia (C++), possibly Firefox (C) then creating "
+"and testing the launcher on a range of operating system versions and "
+"configurations to verify portability.  Some work on this was completed as "
+"part of the Google Summer of Code 2009. Another part of this project is to "
+"identify all of the traces left behind by using a Tor Browser Bundle on Mac "
+"OS X or Linux.  Developing ways to stop, counter, or remove these traces is "
+"a final step.  <br /> Students should be familiar with application "
+"development on one or preferably both of Linux and Mac OS X, and be "
+"comfortable with C/C++ and shell scripting.  <br /> Part of this project "
+"could be usability testing of Tor Browser Bundle, ideally amongst our target "
+"demographic.  That would help a lot in knowing what needs to be done in "
+"terms of bug fixes or new features. We get this informally at the moment, "
+"but a more structured process would be better."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -320,27 +321,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:225
-msgid ""
-"<b>Tuneup Tor!</b> <br /> Priority: <i>Medium to High</i> <br /> Effort "
-"Level: <i>Medium to High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Nick, Roger, Mike, Karsten</i> <br /> Right now, Tor relays "
-"measure and report their own bandwidth, and Tor clients choose which relays "
-"to use in part based on that bandwidth.  This approach is vulnerable to <a "
-"href=\"http://freehaven.net/anonbib/#bauer:wpes2007\";>attacks where relays "
-"lie about their bandwidth</a>; to address this, Tor currently caps the "
-"maximum bandwidth it's willing to believe any relay provides.  This is a "
-"limited fix, and a waste of bandwidth capacity to boot.  Instead, Tor should "
-"possibly measure bandwidth in a more distributed way, perhaps as described "
-"in the <a href=\"http://freehaven.net/anonbib/author.html#snader08\";>\"A "
-"Tune-up for Tor\"</a> paper by Snader and Borisov. One could use current "
-"testing code to double-check this paper's findings and verify the extent to "
-"which they dovetail with Tor as deployed in the wild, and determine good "
-"ways to incorporate them into their suggestions Tor network without adding "
-"too much communications overhead between relays and directory authorities."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:256
 msgid ""
 "<b>Improving Polipo on Windows</b> <br /> Priority: <i>Medium to High</i> "
@@ -382,17 +362,17 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:283
 msgid ""
-"<b>Tor Controller Status Event Interface</b> <br /> Priority: <i>Medium</i> "
-"<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> "
-"<br /> Likely Mentors: <i>Matt</i> <br /> There are a number of status "
-"changes inside Tor of which the user may need to be informed. For example, "
-"if the user is trying to set up his Tor as a relay and Tor decides that its "
-"ports are not reachable from outside the user's network, we should alert the "
-"user. Currently, all the user gets is a couple log messages in Vidalia's "
-"'message log' window, which they likely never see since they don't receive a "
-"notification that something has gone wrong. Even if the user does actually "
-"look at the message log, most of the messages make little sense to the "
-"novice user.  <br /> Tor has the ability to inform Vidalia of many such "
+"<b>Tor Controller Status Event Interface for Vidalia</b> <br /> Priority: "
+"<i>Medium</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low "
+"to Medium</i> <br /> Likely Mentors: <i>Matt</i> <br /> There are a number "
+"of status changes inside Tor of which the user may need to be informed. For "
+"example, if the user is trying to set up his Tor as a relay and Tor decides "
+"that its ports are not reachable from outside the user's network, we should "
+"alert the user. Currently, all the user gets is a couple log messages in "
+"Vidalia's 'message log' window, which they likely never see since they don't "
+"receive a notification that something has gone wrong. Even if the user does "
+"actually look at the message log, most of the messages make little sense to "
+"the novice user.  <br /> Tor has the ability to inform Vidalia of many such "
 "status changes, and we recently implemented support for a couple of these "
 "events. Still, there are many more status events the user should be informed "
 "of and we need a better UI for actually displaying them to the user.  <br /> "
@@ -477,40 +457,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:415
-msgid ""
-"<b>New Thandy Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Medium to High</i> <br /> Likely "
-"Mentors: <i>Martin</i> <br /> Additional capabilities are needed for "
-"assisted updates of all the Tor related software for Windows and other "
-"operating systems. Some of the features to consider include:"
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:429
-msgid ""
-"Integration of the <a href=\"http://chandlerproject.org/Projects/MeTooCrypto";
-"\">MeTooCrypto Python library</a> for authenticated HTTPS downloads."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:433
-msgid ""
-"Adding a level of indirection between the timestamp signatures and the "
-"package files included in an update. See the \"Thandy attacks / suggestions"
-"\" thread on or-dev."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:436
-msgid ""
-"Support locale specific installation and configuration of assisted updates "
-"based on preference, host, or user account language settings.  Familiarity "
-"with Windows codepages, unicode, and other character sets is helpful in "
-"addition to general win32 and posix API experience and Python proficiency."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:445
 msgid ""
 "<b>Simulator for slow Internet connections</b> <br /> Priority: <i>Medium</"
@@ -558,27 +504,14 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:509
 msgid ""
-"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Low</i> <br /"
-"> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Mike</i> <br /> We're hearing from an increasing number of users "
-"that they want to use Thunderbird with Tor. However, there are plenty of "
-"application-level concerns, for example, by default Thunderbird will put "
-"your hostname in the outgoing mail that it sends. At some point we should "
-"start a new push to build a Thunderbird extension similar to Torbutton."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:527
-msgid ""
-"<b>Intermediate Level Network Device Driver</b> <br /> Priority: <i>Low</i> "
+"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Medium</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> "
-"Likely Mentors: <i>Martin</i> <br /> The WinPCAP device driver used by Tor "
-"VM for bridged networking does not support a number of wireless and non-"
-"Ethernet network adapters.  Implementation of a intermediate level network "
-"device driver for win32 and 64bit would provide a way to intercept and route "
-"traffic over such networks. This project will require knowledge of and "
-"experience with Windows kernel device driver development and testing. "
-"Familiarity with Winsock and Qemu would also be helpful."
+"Likely Mentors: <i>Mike</i> <br /> We're hearing from an increasing number "
+"of users that they want to use Thunderbird with Tor. However, there are "
+"plenty of application-level concerns, for example, by default Thunderbird "
+"will put your hostname in the outgoing mail that it sends. At some point we "
+"should start a new push to build a Thunderbird extension similar to "
+"Torbutton."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -643,35 +576,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:621
-msgid ""
-"<b>Tor/Polipo/Vidalia Auto-Update Framework</b> <br /> We're in need of a "
-"good authenticated-update framework.  Vidalia already has the ability to "
-"notice when the user is running an outdated or unrecommended version of Tor, "
-"using signed statements inside the Tor directory information. Currently, "
-"Vidalia simply pops up a little message box that lets the user know they "
-"should manually upgrade. The goal of this project would be to extend Vidalia "
-"with the ability to also fetch and install the updated Tor software for the "
-"user. We should do the fetches via Tor when possible, but also fall back to "
-"direct fetches in a smart way. Time permitting, we would also like to be "
-"able to update other applications included in the bundled installers, such "
-"as Polipo and Vidalia itself.  <br /> To complete this project, the student "
-"will first need to first investigate the existing auto-update frameworks (e."
-"g., Sparkle on OS X) to evaluate their strengths, weaknesses, security "
-"properties, and ability to be integrated into Vidalia. If none are found to "
-"be suitable, the student will design their own auto-update framework, "
-"document the design, and then discuss the design with other developers to "
-"assess any security issues. The student will then implement their framework "
-"(or integrate an existing one) and test it.  <br /> A person undertaking "
-"this project should have good C++ development experience. Previous "
-"experience with Qt is helpful, but not required. One should also have a good "
-"understanding of common security practices, such as package signature "
-"verification. Good writing ability is also important for this project, since "
-"a vital step of the project will be producing a design document to review "
-"and discuss with others prior to implementation."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:655
 msgid ""
 "<b>Improving the Tor QA process: Continuous Integration for builds</b> <br /"
@@ -699,17 +603,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:683
-msgid ""
-"<b>Usability testing of Tor</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> <br /> Likely "
-"Mentors: <i>Andrew</i> <br /> Especially the browser bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:700
 msgid ""
 "<b>An authenticating IRC proxy</b> <br /> Priority: <i>Medium</i> <br /> "

Modified: translation/trunk/projects/website/it/docs/3-low.debian.po
===================================================================
--- translation/trunk/projects/website/it/docs/3-low.debian.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/it/docs/3-low.debian.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-19 14:17+0100\n"
+"POT-Creation-Date: 2010-03-09 09:18+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -28,8 +28,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/EhZbo0wLVH.xml:40
-#: /tmp/EhZbo0wLVH.xml:96 /tmp/EhZbo0wLVH.xml:130
+#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/0pFgSzwhvR.xml:40
+#: /tmp/0pFgSzwhvR.xml:96 /tmp/0pFgSzwhvR.xml:130
 msgid "<br />"
 msgstr ""
 
@@ -49,8 +49,8 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/EhZbo0wLVH.xml:77
-#: /tmp/EhZbo0wLVH.xml:121 /tmp/EhZbo0wLVH.xml:164
+#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/0pFgSzwhvR.xml:77
+#: /tmp/0pFgSzwhvR.xml:121 /tmp/0pFgSzwhvR.xml:164
 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."
@@ -94,8 +94,9 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:59
 msgid ""
-"where you substitute the above word (etch, lenny, sid, karmic, jaunty, "
-"intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you put the codename of your distribution (i.e. etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy or whatever it is) in place of &lt;"
+"DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -165,8 +166,8 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:106
 msgid ""
-"where you substitute the name of your distro (etch, lenny, sid, karmic, "
-"jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you again substitute the name of your distro (etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/it/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/it/docs/3-low.tor-doc-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/it/docs/3-low.tor-doc-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:30+0100\n"
+"POT-Creation-Date: 2010-03-09 09:18+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/gZUpio8RsS.xml:24
-#: /tmp/gZUpio8RsS.xml:54 /tmp/gZUpio8RsS.xml:88 /tmp/gZUpio8RsS.xml:131
-#: /tmp/gZUpio8RsS.xml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/s_9awnVci7.xml:24
+#: /tmp/s_9awnVci7.xml:54 /tmp/s_9awnVci7.xml:88 /tmp/s_9awnVci7.xml:131
+#: /tmp/s_9awnVci7.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -63,10 +63,10 @@
 "If you're building from source, first install <a href=\"http://www.monkey.";
 "org/~provos/libevent/\">libevent</a>, and make sure you have openssl and "
 "zlib (including the -devel packages if applicable). Then run:<br /> <tt>tar "
-"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable><br /> ./configure "
-"&amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</tt>, or "
-"you can run <tt>make install</tt> (as root if necessary) to install it into /"
-"usr/local/, and then you can start it just by running <tt>tor</tt>."
+"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable></tt><br /> <tt>./"
+"configure &amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</"
+"tt>, or you can run <tt>make install</tt> (as root if necessary) to install "
+"it into /usr/local/, and then you can start it just by running <tt>tor</tt>."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/nb/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/nb/2-medium.donate.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/nb/2-medium.donate.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 09:59+0100\n"
+"POT-Creation-Date: 2010-03-09 09:16+0100\n"
 "PO-Revision-Date: 2010-01-21 07:49-0700\n"
 "Last-Translator: Runa Sandvik <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -61,7 +61,7 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:32 /tmp/DQ5oaHCEXT.xml:102
+#: /home/runa/tor/website/en/donate.wml:32 /tmp/GC25gqLEXv.xml:102
 msgid "<br />"
 msgstr "<br />"
 
@@ -145,17 +145,17 @@
 msgstr "<br /> <br /> Velg din valuta: <select name=\"currency_code\">"
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:72 /tmp/DQ5oaHCEXT.xml:114
+#: /home/runa/tor/website/en/donate.wml:72 /tmp/GC25gqLEXv.xml:114
 msgid "$"
 msgstr "$"
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:73 /tmp/DQ5oaHCEXT.xml:115
+#: /home/runa/tor/website/en/donate.wml:73 /tmp/GC25gqLEXv.xml:115
 msgid "â"
 msgstr "â"
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:74 /tmp/DQ5oaHCEXT.xml:116
+#: /home/runa/tor/website/en/donate.wml:74 /tmp/GC25gqLEXv.xml:116
 msgid "Â"
 msgstr "Â"
 
@@ -272,7 +272,9 @@
 
 #. type: Content of: <div><p><address>
 #: /home/runa/tor/website/en/donate.wml:136
-msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
+#, fuzzy
+msgid ""
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 USA"
 msgstr "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
 
 #. type: Content of: <div><p>

Modified: translation/trunk/projects/website/nb/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/nb/2-medium.verifying-signatures.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/nb/2-medium.verifying-signatures.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-01 17:53+0100\n"
+"POT-Creation-Date: 2010-03-09 09:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -22,7 +22,7 @@
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/verifying-signatures.wml:10
-#: /tmp/La5RZJGxmg.xml:33 /tmp/La5RZJGxmg.xml:45 /tmp/La5RZJGxmg.xml:92
+#: /tmp/WFP9sv_jQm.xml:34 /tmp/WFP9sv_jQm.xml:46 /tmp/WFP9sv_jQm.xml:93
 msgid "<hr />"
 msgstr ""
 
@@ -80,61 +80,66 @@
 msgid "Jacob's (0x9D0FACE4)"
 msgstr ""
 
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/verifying-signatures.wml:30
+msgid "Erinn's (0x63FEE659) and (0xF1F5C9B5)"
+msgstr ""
+
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:32
+#: /home/runa/tor/website/en/verifying-signatures.wml:33
 msgid "Step One: Import the keys"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:34
+#: /home/runa/tor/website/en/verifying-signatures.wml:35
 msgid "You can import keys directly from GnuPG as well:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:36
+#: /home/runa/tor/website/en/verifying-signatures.wml:37
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --recv-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:38
+#: /home/runa/tor/website/en/verifying-signatures.wml:39
 msgid "or search for keys with"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:40
+#: /home/runa/tor/website/en/verifying-signatures.wml:41
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --search-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:42
+#: /home/runa/tor/website/en/verifying-signatures.wml:43
 msgid "and when you select one, it will be added to your keyring."
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:44
+#: /home/runa/tor/website/en/verifying-signatures.wml:45
 msgid "Step Two: Verify the fingerprints"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:46
+#: /home/runa/tor/website/en/verifying-signatures.wml:47
 msgid "Verify the pgp fingerprints using:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:47
+#: /home/runa/tor/website/en/verifying-signatures.wml:48
 #, no-wrap
 msgid "gpg --fingerprint (insert keyid here)"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/verifying-signatures.wml:48
+#: /home/runa/tor/website/en/verifying-signatures.wml:49
 msgid "The fingerprints for the keys should be:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:51
+#: /home/runa/tor/website/en/verifying-signatures.wml:52
 #, no-wrap
 msgid ""
 "pub   1024D/28988BF5 2000-02-27\n"
@@ -174,7 +179,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:87
+#: /home/runa/tor/website/en/verifying-signatures.wml:88
 msgid ""
 "(Of course if you want to be really certain that those are the real ones "
 "then you should check this from more places or even better get into key "
@@ -182,12 +187,12 @@
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:91
+#: /home/runa/tor/website/en/verifying-signatures.wml:92
 msgid "Step Three: Verify the downloaded package"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:93
+#: /home/runa/tor/website/en/verifying-signatures.wml:94
 msgid ""
 "If you're using GnuPG, then put the .asc and the download in the same "
 "directory and type \"gpg --verify (whatever).asc (whatever)\". It will say "
@@ -196,7 +201,7 @@
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:99
+#: /home/runa/tor/website/en/verifying-signatures.wml:100
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc tor-0.1.0.17.tar.gz\n"
@@ -209,7 +214,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:109
+#: /home/runa/tor/website/en/verifying-signatures.wml:110
 msgid ""
 "Notice that there is a warning because you haven't assigned a trust index to "
 "this user. This means that your program verified the key made that "
@@ -222,19 +227,19 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:118
+#: /home/runa/tor/website/en/verifying-signatures.wml:119
 msgid "All this means is you can ignore the message or assign a trust level."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:120
+#: /home/runa/tor/website/en/verifying-signatures.wml:121
 msgid ""
 "For your reference, this is an example of a <em>BAD</em> verification. It "
 "means that the signature and file contents do not match:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:124
+#: /home/runa/tor/website/en/verifying-signatures.wml:125
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc\n"
@@ -243,14 +248,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:129
+#: /home/runa/tor/website/en/verifying-signatures.wml:130
 msgid ""
 "If you see a message like the above one, then you should not trust the file "
 "contents."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:131
+#: /home/runa/tor/website/en/verifying-signatures.wml:132
 msgid ""
 "If you are running Tor on Debian you should read the instructions on <a href="
 "\"<page docs/debian>#packages\">importing these keys to apt</a>."

Modified: translation/trunk/projects/website/nb/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/nb/3-low.download-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/nb/3-low.download-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:28+0100\n"
+"POT-Creation-Date: 2010-03-09 09:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/IlZ5As1n4t.xml:40
-#: /tmp/IlZ5As1n4t.xml:56 /tmp/IlZ5As1n4t.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/eh0IyZphoa.xml:40
+#: /tmp/eh0IyZphoa.xml:56 /tmp/eh0IyZphoa.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -184,54 +184,79 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:84
-msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgid ""
+"<img src=\"images/distros/android-market.gif\" alt=\"Android\" width=\"32\" "
+"height=\"32\"/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:85
-msgid "Source tarballs"
+msgid "Android"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /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/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/tor/website/en/download-unix.wml:92
+msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:93
+msgid "Source tarballs"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:95
+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/tor/website/en/download-unix.wml:91
+#: /home/runa/tor/website/en/download-unix.wml:99
 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/tor/website/en/download-unix.wml:94
+#: /home/runa/tor/website/en/download-unix.wml:102
 msgid "<kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:101
+#: /home/runa/tor/website/en/download-unix.wml:109
 msgid "<a id=\"packagediff\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:102
+#: /home/runa/tor/website/en/download-unix.wml:110
 msgid ""
 "<a class=\"anchor\" href=\"#packagediff\">What's the difference between "
 "Stable &amp; Unstable?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:105
+#: /home/runa/tor/website/en/download-unix.wml:113
 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/tor/website/en/download-unix.wml:109
+#: /home/runa/tor/website/en/download-unix.wml:117
 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 "
@@ -241,7 +266,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:118
+#: /home/runa/tor/website/en/download-unix.wml:126
 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 "
@@ -251,7 +276,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:125
+#: /home/runa/tor/website/en/download-unix.wml:133
 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 "
@@ -259,7 +284,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:134
+#: /home/runa/tor/website/en/download-unix.wml:142
 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 "
@@ -269,7 +294,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><form>
-#: /home/runa/tor/website/en/download-unix.wml:142
+#: /home/runa/tor/website/en/download-unix.wml:150
 msgid ""
 "<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
 "\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
@@ -278,18 +303,18 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:152
+#: /home/runa/tor/website/en/download-unix.wml:160
 msgid "<a id=\"Warning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:153
+#: /home/runa/tor/website/en/download-unix.wml:161
 msgid ""
 "<a class=\"anchor\" href=\"#Warning\">Warning: Want Tor to really work?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:157
+#: /home/runa/tor/website/en/download-unix.wml:165
 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> "
@@ -298,7 +323,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:165
+#: /home/runa/tor/website/en/download-unix.wml:173
 msgid ""
 "Tor only protects Internet applications that are configured to send their "
 "traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
@@ -308,7 +333,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:173
+#: /home/runa/tor/website/en/download-unix.wml:181
 msgid ""
 "Browser plugins such as Java, Flash, ActiveX, RealPlayer, Quicktime, Adobe's "
 "PDF plugin, and others can be manipulated into revealing your IP address. "
@@ -324,7 +349,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:189
+#: /home/runa/tor/website/en/download-unix.wml:197
 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. "
@@ -334,7 +359,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:197
+#: /home/runa/tor/website/en/download-unix.wml:205
 msgid ""
 "Tor anonymizes the origin of your traffic, and it encrypts everything inside "
 "the Tor network, but <a href=\"https://wiki.torproject.org/noreply/";
@@ -346,7 +371,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:208
+#: /home/runa/tor/website/en/download-unix.wml:216
 msgid ""
 "While Tor blocks attackers on your local network from discovering or "
 "influencing your destination, it opens new risks: malicious or misconfigured "
@@ -355,12 +380,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:216
+#: /home/runa/tor/website/en/download-unix.wml:224
 msgid "<br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:218
+#: /home/runa/tor/website/en/download-unix.wml:226
 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 "
@@ -368,7 +393,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:228
+#: /home/runa/tor/website/en/download-unix.wml:236
 msgid ""
 "See our <a href=\"<page verifying-signatures>\">FAQ entry on verifying "
 "package signatures</a>, which allows you to make sure you've downloaded the "
@@ -376,7 +401,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:234
+#: /home/runa/tor/website/en/download-unix.wml:242
 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</"
@@ -384,7 +409,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:240
+#: /home/runa/tor/website/en/download-unix.wml:248
 msgid ""
 "See the <a href=\"<page documentation>#Developers\">developer documentation</"
 "a> for instructions on fetching Tor from Git to get the very latest "
@@ -394,19 +419,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:252
+#: /home/runa/tor/website/en/download-unix.wml:260
 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/tor/website/en/download-unix.wml:256
+#: /home/runa/tor/website/en/download-unix.wml:264
 msgid "<a id=\"ChangeLog\"></a> <a id=\"Stable\"></a> <a id=\"Testing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:260
+#: /home/runa/tor/website/en/download-unix.wml:268
 msgid ""
 "For a list of what has changed in each stable Tor release, see the <a href="
 "\"<gitblob>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in both "

Modified: translation/trunk/projects/website/nb/3-low.people.po
===================================================================
--- translation/trunk/projects/website/nb/3-low.people.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/nb/3-low.people.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 09:58+0100\n"
+"POT-Creation-Date: 2010-03-09 09:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -60,8 +60,8 @@
 #. type: Content of: <div><address>
 #: /home/runa/tor/website/en/people.wml:30
 msgid ""
-"The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA<br /"
-"><br />"
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 "
+"USA<br /><br />"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -542,34 +542,56 @@
 
 #. type: Content of: <div><dl><dt>
 #: /home/runa/tor/website/en/people.wml:202
-msgid "Kasimir Gabert"
+msgid "Marco Bonetti"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:202
+msgid "Focusing on MobileTor for the iPhone."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:203
+msgid "Nathan Freitas"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:203
 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/tor/website/en/people.wml:205
+msgid "Kasimir Gabert"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:205
+msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\";>TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid "Robert Hogan"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\";>TorK</a> Tor controller."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid "Damian Johnson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid ""
 "Builds a command-line application for monitoring Tor relays, providing real-"
 "time status information such as the current configuration, bandwidth usage, "
@@ -578,106 +600,118 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid ""
 "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
 "and Privoxy still work well together."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid "Kory Kirk"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid ""
 "Worked during Google Summer of Code 2009 on extending Torbutton. Now he's "
 "working with Bruce Leidl on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Bruce Leidl"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Working on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid ""
 "A lawyer with the CCC in Germany. Coordinates the German Tor community with "
 "respect to legal questions and concerns."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:224
+msgid "Linus Nordberg"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:224
+msgid ""
+"Enjoys measuring the Tor network and helps with outreach in the Nordic "
+"countries."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:226
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:226
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid "Martin Peck"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:225
+#: /home/runa/tor/website/en/people.wml:230
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:231
 msgid ""
 "The most dedicated bug reporter we've ever heard from. He must read Tor "
 "source code every day over breakfast."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy";
@@ -686,24 +720,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?";
 "p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/";
@@ -712,7 +746,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:241
+#: /home/runa/tor/website/en/people.wml:246
 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, "
@@ -720,32 +754,32 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:252
 msgid "<a id=\"Past\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:248
+#: /home/runa/tor/website/en/people.wml:253
 msgid "<a class=\"anchor\" href=\"#Past\">Past thanks to:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "John Bashinski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "Contributed the initial rpm spec file."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid "Domenik Bork"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid ""
 "Worked on Configuration of Hidden Services with User Authorization in "
 "Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches/";
@@ -753,12 +787,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 msgid "Benedikt Boss"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 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 "
@@ -766,22 +800,22 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Ren Bucholz"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Our fine logo and images."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 msgid "Fallon Chen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 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="
@@ -790,32 +824,32 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Bram Cohen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Helped design our congestion control mechanisms, in Tor's early days."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Pat Double"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Creator of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid "Geoff Goodell"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid ""
 "Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/";
 "\">Blossom project</a> which uses Tor as its overlay network; also helped "
@@ -823,12 +857,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid "Aleksei Gorny"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid ""
 "Working on Tor exit scanner improvements (<a href=\"https://svn.torproject.";
 "org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
@@ -836,52 +870,52 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Christian Grothoff"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Contributed better daemonizing behavior."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Steven Hazel"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Made 'make install' do the right thing."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "Justin Hipple"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "The other developer for Vidalia."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Jason Holt"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Contributed patches to the instructions and the man page."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 msgid "Christian King"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 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-";
@@ -889,70 +923,70 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid "Joe Kowalski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid ""
 "Original author and provider of the torstatus script formerly run on "
 "nighteffect."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Adam Langley"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Our fine eventdns code."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid "Rebecca MacKinnon"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid ""
 "Former Director of Tor.  Co-Founder of <a href=\"http://www.";
 "globalvoicesonline.org/\">Global Voices Online</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid "Chris Palmer"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid ""
 "Our liaison and tech guy with EFF while EFF was funding us. Also helped "
 "advocate and write end-user docs."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid "Matej Pfajfar"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid ""
 "Author of the original onion routing code that Tor is based on, so we didn't "
 "have to start from scratch."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 msgid "Johannes Renner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 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 "
@@ -960,33 +994,33 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid "Scott Squires"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid ""
 "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Aaron Turner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Contributed the first version of the tor.sh initscripts shell script."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 msgid "Stephen Tyree"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 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 "
@@ -995,12 +1029,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid "Camilo Viecco"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid ""
 "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac.";
 "vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
@@ -1008,12 +1042,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 msgid "Fred von Lohmann"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 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/?";
@@ -1021,12 +1055,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid "Christian Wilms"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid ""
 "Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
 "\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";
@@ -1034,12 +1068,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 msgid "Jillian C. York"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 msgid ""
 "<a href=\"http://jilliancyork.com/\";>Jillian C. York</a> is a writer, "
 "blogger, and activist based in Boston.  She blogs on the uses of Tor and "

Modified: translation/trunk/projects/website/nb/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/nb/4-optional.volunteer.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/nb/4-optional.volunteer.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 09:58+0100\n"
+"POT-Creation-Date: 2010-03-09 09:15+0100\n"
 "PO-Revision-Date: 2010-01-23 08:30-0700\n"
 "Last-Translator: Runa Sandvik <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -253,21 +253,22 @@
 "Messaging client). Components are pre-configured to operate in a secure way, "
 "and it has very few dependencies on the installed operating system. It has "
 "therefore become one of the most easy to use, and popular, ways to use Tor "
-"on Windows.  <br /> However, there is currently no working package for Linux "
-"and Mac OS X, so this project would be to implement Tor Browser Bundle for "
-"these platforms. This will involve modifications to Vidalia (C++), possibly "
-"Firefox (C) then creating and testing the launcher on a range of operating "
-"system versions and configurations to verify portability.  Some work on this "
-"was completed as part of the Google Summer of Code 2009. Another part of "
-"this project is to identify all of the traces left behind by using a Tor "
-"Browser Bundle on Mac OS X or Linux.  Developing ways to stop, counter, or "
-"remove these traces is a final step.  <br /> Students should be familiar "
-"with application development on one or preferably both of Linux and Mac OS "
-"X, and be comfortable with C/C++ and shell scripting.  <br /> Part of this "
-"project could be usability testing of Tor Browser Bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
+"on Windows.  <br /> However, there is currently no released package for "
+"Linux and Mac OS X, so this project would be to implement Tor Browser Bundle "
+"for OS X and continue work on the Tor Browser Bundle for Linux. This will "
+"involve modifications to Vidalia (C++), possibly Firefox (C) then creating "
+"and testing the launcher on a range of operating system versions and "
+"configurations to verify portability.  Some work on this was completed as "
+"part of the Google Summer of Code 2009. Another part of this project is to "
+"identify all of the traces left behind by using a Tor Browser Bundle on Mac "
+"OS X or Linux.  Developing ways to stop, counter, or remove these traces is "
+"a final step.  <br /> Students should be familiar with application "
+"development on one or preferably both of Linux and Mac OS X, and be "
+"comfortable with C/C++ and shell scripting.  <br /> Part of this project "
+"could be usability testing of Tor Browser Bundle, ideally amongst our target "
+"demographic.  That would help a lot in knowing what needs to be done in "
+"terms of bug fixes or new features. We get this informally at the moment, "
+"but a more structured process would be better."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -321,27 +322,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:225
-msgid ""
-"<b>Tuneup Tor!</b> <br /> Priority: <i>Medium to High</i> <br /> Effort "
-"Level: <i>Medium to High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Nick, Roger, Mike, Karsten</i> <br /> Right now, Tor relays "
-"measure and report their own bandwidth, and Tor clients choose which relays "
-"to use in part based on that bandwidth.  This approach is vulnerable to <a "
-"href=\"http://freehaven.net/anonbib/#bauer:wpes2007\";>attacks where relays "
-"lie about their bandwidth</a>; to address this, Tor currently caps the "
-"maximum bandwidth it's willing to believe any relay provides.  This is a "
-"limited fix, and a waste of bandwidth capacity to boot.  Instead, Tor should "
-"possibly measure bandwidth in a more distributed way, perhaps as described "
-"in the <a href=\"http://freehaven.net/anonbib/author.html#snader08\";>\"A "
-"Tune-up for Tor\"</a> paper by Snader and Borisov. One could use current "
-"testing code to double-check this paper's findings and verify the extent to "
-"which they dovetail with Tor as deployed in the wild, and determine good "
-"ways to incorporate them into their suggestions Tor network without adding "
-"too much communications overhead between relays and directory authorities."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:256
 msgid ""
 "<b>Improving Polipo on Windows</b> <br /> Priority: <i>Medium to High</i> "
@@ -383,17 +363,17 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:283
 msgid ""
-"<b>Tor Controller Status Event Interface</b> <br /> Priority: <i>Medium</i> "
-"<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> "
-"<br /> Likely Mentors: <i>Matt</i> <br /> There are a number of status "
-"changes inside Tor of which the user may need to be informed. For example, "
-"if the user is trying to set up his Tor as a relay and Tor decides that its "
-"ports are not reachable from outside the user's network, we should alert the "
-"user. Currently, all the user gets is a couple log messages in Vidalia's "
-"'message log' window, which they likely never see since they don't receive a "
-"notification that something has gone wrong. Even if the user does actually "
-"look at the message log, most of the messages make little sense to the "
-"novice user.  <br /> Tor has the ability to inform Vidalia of many such "
+"<b>Tor Controller Status Event Interface for Vidalia</b> <br /> Priority: "
+"<i>Medium</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low "
+"to Medium</i> <br /> Likely Mentors: <i>Matt</i> <br /> There are a number "
+"of status changes inside Tor of which the user may need to be informed. For "
+"example, if the user is trying to set up his Tor as a relay and Tor decides "
+"that its ports are not reachable from outside the user's network, we should "
+"alert the user. Currently, all the user gets is a couple log messages in "
+"Vidalia's 'message log' window, which they likely never see since they don't "
+"receive a notification that something has gone wrong. Even if the user does "
+"actually look at the message log, most of the messages make little sense to "
+"the novice user.  <br /> Tor has the ability to inform Vidalia of many such "
 "status changes, and we recently implemented support for a couple of these "
 "events. Still, there are many more status events the user should be informed "
 "of and we need a better UI for actually displaying them to the user.  <br /> "
@@ -478,40 +458,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:415
-msgid ""
-"<b>New Thandy Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Medium to High</i> <br /> Likely "
-"Mentors: <i>Martin</i> <br /> Additional capabilities are needed for "
-"assisted updates of all the Tor related software for Windows and other "
-"operating systems. Some of the features to consider include:"
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:429
-msgid ""
-"Integration of the <a href=\"http://chandlerproject.org/Projects/MeTooCrypto";
-"\">MeTooCrypto Python library</a> for authenticated HTTPS downloads."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:433
-msgid ""
-"Adding a level of indirection between the timestamp signatures and the "
-"package files included in an update. See the \"Thandy attacks / suggestions"
-"\" thread on or-dev."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:436
-msgid ""
-"Support locale specific installation and configuration of assisted updates "
-"based on preference, host, or user account language settings.  Familiarity "
-"with Windows codepages, unicode, and other character sets is helpful in "
-"addition to general win32 and posix API experience and Python proficiency."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:445
 msgid ""
 "<b>Simulator for slow Internet connections</b> <br /> Priority: <i>Medium</"
@@ -559,27 +505,14 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:509
 msgid ""
-"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Low</i> <br /"
-"> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Mike</i> <br /> We're hearing from an increasing number of users "
-"that they want to use Thunderbird with Tor. However, there are plenty of "
-"application-level concerns, for example, by default Thunderbird will put "
-"your hostname in the outgoing mail that it sends. At some point we should "
-"start a new push to build a Thunderbird extension similar to Torbutton."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:527
-msgid ""
-"<b>Intermediate Level Network Device Driver</b> <br /> Priority: <i>Low</i> "
+"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Medium</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> "
-"Likely Mentors: <i>Martin</i> <br /> The WinPCAP device driver used by Tor "
-"VM for bridged networking does not support a number of wireless and non-"
-"Ethernet network adapters.  Implementation of a intermediate level network "
-"device driver for win32 and 64bit would provide a way to intercept and route "
-"traffic over such networks. This project will require knowledge of and "
-"experience with Windows kernel device driver development and testing. "
-"Familiarity with Winsock and Qemu would also be helpful."
+"Likely Mentors: <i>Mike</i> <br /> We're hearing from an increasing number "
+"of users that they want to use Thunderbird with Tor. However, there are "
+"plenty of application-level concerns, for example, by default Thunderbird "
+"will put your hostname in the outgoing mail that it sends. At some point we "
+"should start a new push to build a Thunderbird extension similar to "
+"Torbutton."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -644,35 +577,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:621
-msgid ""
-"<b>Tor/Polipo/Vidalia Auto-Update Framework</b> <br /> We're in need of a "
-"good authenticated-update framework.  Vidalia already has the ability to "
-"notice when the user is running an outdated or unrecommended version of Tor, "
-"using signed statements inside the Tor directory information. Currently, "
-"Vidalia simply pops up a little message box that lets the user know they "
-"should manually upgrade. The goal of this project would be to extend Vidalia "
-"with the ability to also fetch and install the updated Tor software for the "
-"user. We should do the fetches via Tor when possible, but also fall back to "
-"direct fetches in a smart way. Time permitting, we would also like to be "
-"able to update other applications included in the bundled installers, such "
-"as Polipo and Vidalia itself.  <br /> To complete this project, the student "
-"will first need to first investigate the existing auto-update frameworks (e."
-"g., Sparkle on OS X) to evaluate their strengths, weaknesses, security "
-"properties, and ability to be integrated into Vidalia. If none are found to "
-"be suitable, the student will design their own auto-update framework, "
-"document the design, and then discuss the design with other developers to "
-"assess any security issues. The student will then implement their framework "
-"(or integrate an existing one) and test it.  <br /> A person undertaking "
-"this project should have good C++ development experience. Previous "
-"experience with Qt is helpful, but not required. One should also have a good "
-"understanding of common security practices, such as package signature "
-"verification. Good writing ability is also important for this project, since "
-"a vital step of the project will be producing a design document to review "
-"and discuss with others prior to implementation."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:655
 msgid ""
 "<b>Improving the Tor QA process: Continuous Integration for builds</b> <br /"
@@ -700,17 +604,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:683
-msgid ""
-"<b>Usability testing of Tor</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> <br /> Likely "
-"Mentors: <i>Andrew</i> <br /> Especially the browser bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:700
 msgid ""
 "<b>An authenticating IRC proxy</b> <br /> Priority: <i>Medium</i> <br /> "

Modified: translation/trunk/projects/website/nb/docs/3-low.debian.po
===================================================================
--- translation/trunk/projects/website/nb/docs/3-low.debian.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/nb/docs/3-low.debian.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-18 19:06+0100\n"
+"POT-Creation-Date: 2010-03-09 09:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -28,8 +28,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/SsDvjK73RA.xml:40
-#: /tmp/SsDvjK73RA.xml:96 /tmp/SsDvjK73RA.xml:130
+#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/LXyzr6gyA7.xml:40
+#: /tmp/LXyzr6gyA7.xml:96 /tmp/LXyzr6gyA7.xml:130
 msgid "<br />"
 msgstr ""
 
@@ -49,8 +49,8 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/SsDvjK73RA.xml:77
-#: /tmp/SsDvjK73RA.xml:121 /tmp/SsDvjK73RA.xml:164
+#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/LXyzr6gyA7.xml:77
+#: /tmp/LXyzr6gyA7.xml:121 /tmp/LXyzr6gyA7.xml:164
 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."
@@ -94,8 +94,9 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:59
 msgid ""
-"where you substitute the above word (etch, lenny, sid, karmic, jaunty, "
-"intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you put the codename of your distribution (i.e. etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy or whatever it is) in place of &lt;"
+"DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -165,8 +166,8 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:106
 msgid ""
-"where you substitute the name of your distro (etch, lenny, sid, karmic, "
-"jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you again substitute the name of your distro (etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/nb/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/nb/docs/3-low.tor-doc-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/nb/docs/3-low.tor-doc-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:28+0100\n"
+"POT-Creation-Date: 2010-03-09 09:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/jSgzQclamJ.xml:24
-#: /tmp/jSgzQclamJ.xml:54 /tmp/jSgzQclamJ.xml:88 /tmp/jSgzQclamJ.xml:131
-#: /tmp/jSgzQclamJ.xml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/KhVKGTF9Uv.xml:24
+#: /tmp/KhVKGTF9Uv.xml:54 /tmp/KhVKGTF9Uv.xml:88 /tmp/KhVKGTF9Uv.xml:131
+#: /tmp/KhVKGTF9Uv.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -63,10 +63,10 @@
 "If you're building from source, first install <a href=\"http://www.monkey.";
 "org/~provos/libevent/\">libevent</a>, and make sure you have openssl and "
 "zlib (including the -devel packages if applicable). Then run:<br /> <tt>tar "
-"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable><br /> ./configure "
-"&amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</tt>, or "
-"you can run <tt>make install</tt> (as root if necessary) to install it into /"
-"usr/local/, and then you can start it just by running <tt>tor</tt>."
+"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable></tt><br /> <tt>./"
+"configure &amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</"
+"tt>, or you can run <tt>make install</tt> (as root if necessary) to install "
+"it into /usr/local/, and then you can start it just by running <tt>tor</tt>."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/nl/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/nl/2-medium.donate.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/nl/2-medium.donate.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 09:56+0100\n"
+"POT-Creation-Date: 2010-03-09 09:12+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -61,7 +61,7 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:32 /tmp/QnQuAX51u2.xml:102
+#: /home/runa/tor/website/en/donate.wml:32 /tmp/eJNyhYnNw_.xml:102
 msgid "<br />"
 msgstr ""
 
@@ -143,17 +143,17 @@
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:72 /tmp/QnQuAX51u2.xml:114
+#: /home/runa/tor/website/en/donate.wml:72 /tmp/eJNyhYnNw_.xml:114
 msgid "$"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:73 /tmp/QnQuAX51u2.xml:115
+#: /home/runa/tor/website/en/donate.wml:73 /tmp/eJNyhYnNw_.xml:115
 msgid "â"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:74 /tmp/QnQuAX51u2.xml:116
+#: /home/runa/tor/website/en/donate.wml:74 /tmp/eJNyhYnNw_.xml:116
 msgid "Â"
 msgstr ""
 
@@ -248,7 +248,8 @@
 
 #. type: Content of: <div><p><address>
 #: /home/runa/tor/website/en/donate.wml:136
-msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
+msgid ""
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 USA"
 msgstr ""
 
 #. type: Content of: <div><p>

Modified: translation/trunk/projects/website/nl/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/nl/2-medium.verifying-signatures.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/nl/2-medium.verifying-signatures.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-21 18:13+0100\n"
+"POT-Creation-Date: 2010-03-09 09:12+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -22,7 +22,7 @@
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/verifying-signatures.wml:10
-#: /tmp/JcNku1ijp0.xml:33 /tmp/JcNku1ijp0.xml:45 /tmp/JcNku1ijp0.xml:92
+#: /tmp/znJECBEwSN.xml:34 /tmp/znJECBEwSN.xml:46 /tmp/znJECBEwSN.xml:93
 msgid "<hr />"
 msgstr ""
 
@@ -80,61 +80,66 @@
 msgid "Jacob's (0x9D0FACE4)"
 msgstr ""
 
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/verifying-signatures.wml:30
+msgid "Erinn's (0x63FEE659) and (0xF1F5C9B5)"
+msgstr ""
+
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:32
+#: /home/runa/tor/website/en/verifying-signatures.wml:33
 msgid "Step One: Import the keys"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:34
+#: /home/runa/tor/website/en/verifying-signatures.wml:35
 msgid "You can import keys directly from GnuPG as well:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:36
+#: /home/runa/tor/website/en/verifying-signatures.wml:37
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --recv-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:38
+#: /home/runa/tor/website/en/verifying-signatures.wml:39
 msgid "or search for keys with"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:40
+#: /home/runa/tor/website/en/verifying-signatures.wml:41
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --search-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:42
+#: /home/runa/tor/website/en/verifying-signatures.wml:43
 msgid "and when you select one, it will be added to your keyring."
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:44
+#: /home/runa/tor/website/en/verifying-signatures.wml:45
 msgid "Step Two: Verify the fingerprints"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:46
+#: /home/runa/tor/website/en/verifying-signatures.wml:47
 msgid "Verify the pgp fingerprints using:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:47
+#: /home/runa/tor/website/en/verifying-signatures.wml:48
 #, no-wrap
 msgid "gpg --fingerprint (insert keyid here)"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/verifying-signatures.wml:48
+#: /home/runa/tor/website/en/verifying-signatures.wml:49
 msgid "The fingerprints for the keys should be:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:51
+#: /home/runa/tor/website/en/verifying-signatures.wml:52
 #, no-wrap
 msgid ""
 "pub   1024D/28988BF5 2000-02-27\n"
@@ -174,7 +179,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:87
+#: /home/runa/tor/website/en/verifying-signatures.wml:88
 msgid ""
 "(Of course if you want to be really certain that those are the real ones "
 "then you should check this from more places or even better get into key "
@@ -182,12 +187,12 @@
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:91
+#: /home/runa/tor/website/en/verifying-signatures.wml:92
 msgid "Step Three: Verify the downloaded package"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:93
+#: /home/runa/tor/website/en/verifying-signatures.wml:94
 msgid ""
 "If you're using GnuPG, then put the .asc and the download in the same "
 "directory and type \"gpg --verify (whatever).asc (whatever)\". It will say "
@@ -196,7 +201,7 @@
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:99
+#: /home/runa/tor/website/en/verifying-signatures.wml:100
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc tor-0.1.0.17.tar.gz\n"
@@ -209,7 +214,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:109
+#: /home/runa/tor/website/en/verifying-signatures.wml:110
 msgid ""
 "Notice that there is a warning because you haven't assigned a trust index to "
 "this user. This means that your program verified the key made that "
@@ -222,19 +227,19 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:118
+#: /home/runa/tor/website/en/verifying-signatures.wml:119
 msgid "All this means is you can ignore the message or assign a trust level."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:120
+#: /home/runa/tor/website/en/verifying-signatures.wml:121
 msgid ""
 "For your reference, this is an example of a <em>BAD</em> verification. It "
 "means that the signature and file contents do not match:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:124
+#: /home/runa/tor/website/en/verifying-signatures.wml:125
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc\n"
@@ -243,14 +248,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:129
+#: /home/runa/tor/website/en/verifying-signatures.wml:130
 msgid ""
 "If you see a message like the above one, then you should not trust the file "
 "contents."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:131
+#: /home/runa/tor/website/en/verifying-signatures.wml:132
 msgid ""
 "If you are running Tor on Debian you should read the instructions on <a href="
 "\"<page docs/debian>#packages\">importing these keys to apt</a>."

Modified: translation/trunk/projects/website/nl/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/nl/3-low.download-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/nl/3-low.download-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:25+0100\n"
+"POT-Creation-Date: 2010-03-09 09:12+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/0CgGvnH5V9.xml:40
-#: /tmp/0CgGvnH5V9.xml:56 /tmp/0CgGvnH5V9.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/hmZ27ANONW.xml:40
+#: /tmp/hmZ27ANONW.xml:56 /tmp/hmZ27ANONW.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -184,54 +184,79 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:84
-msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgid ""
+"<img src=\"images/distros/android-market.gif\" alt=\"Android\" width=\"32\" "
+"height=\"32\"/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:85
-msgid "Source tarballs"
+msgid "Android"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /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/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/tor/website/en/download-unix.wml:92
+msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:93
+msgid "Source tarballs"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:95
+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/tor/website/en/download-unix.wml:91
+#: /home/runa/tor/website/en/download-unix.wml:99
 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/tor/website/en/download-unix.wml:94
+#: /home/runa/tor/website/en/download-unix.wml:102
 msgid "<kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:101
+#: /home/runa/tor/website/en/download-unix.wml:109
 msgid "<a id=\"packagediff\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:102
+#: /home/runa/tor/website/en/download-unix.wml:110
 msgid ""
 "<a class=\"anchor\" href=\"#packagediff\">What's the difference between "
 "Stable &amp; Unstable?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:105
+#: /home/runa/tor/website/en/download-unix.wml:113
 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/tor/website/en/download-unix.wml:109
+#: /home/runa/tor/website/en/download-unix.wml:117
 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 "
@@ -241,7 +266,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:118
+#: /home/runa/tor/website/en/download-unix.wml:126
 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 "
@@ -251,7 +276,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:125
+#: /home/runa/tor/website/en/download-unix.wml:133
 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 "
@@ -259,7 +284,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:134
+#: /home/runa/tor/website/en/download-unix.wml:142
 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 "
@@ -269,7 +294,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><form>
-#: /home/runa/tor/website/en/download-unix.wml:142
+#: /home/runa/tor/website/en/download-unix.wml:150
 msgid ""
 "<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
 "\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
@@ -278,18 +303,18 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:152
+#: /home/runa/tor/website/en/download-unix.wml:160
 msgid "<a id=\"Warning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:153
+#: /home/runa/tor/website/en/download-unix.wml:161
 msgid ""
 "<a class=\"anchor\" href=\"#Warning\">Warning: Want Tor to really work?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:157
+#: /home/runa/tor/website/en/download-unix.wml:165
 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> "
@@ -298,7 +323,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:165
+#: /home/runa/tor/website/en/download-unix.wml:173
 msgid ""
 "Tor only protects Internet applications that are configured to send their "
 "traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
@@ -308,7 +333,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:173
+#: /home/runa/tor/website/en/download-unix.wml:181
 msgid ""
 "Browser plugins such as Java, Flash, ActiveX, RealPlayer, Quicktime, Adobe's "
 "PDF plugin, and others can be manipulated into revealing your IP address. "
@@ -324,7 +349,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:189
+#: /home/runa/tor/website/en/download-unix.wml:197
 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. "
@@ -334,7 +359,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:197
+#: /home/runa/tor/website/en/download-unix.wml:205
 msgid ""
 "Tor anonymizes the origin of your traffic, and it encrypts everything inside "
 "the Tor network, but <a href=\"https://wiki.torproject.org/noreply/";
@@ -346,7 +371,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:208
+#: /home/runa/tor/website/en/download-unix.wml:216
 msgid ""
 "While Tor blocks attackers on your local network from discovering or "
 "influencing your destination, it opens new risks: malicious or misconfigured "
@@ -355,12 +380,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:216
+#: /home/runa/tor/website/en/download-unix.wml:224
 msgid "<br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:218
+#: /home/runa/tor/website/en/download-unix.wml:226
 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 "
@@ -368,7 +393,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:228
+#: /home/runa/tor/website/en/download-unix.wml:236
 msgid ""
 "See our <a href=\"<page verifying-signatures>\">FAQ entry on verifying "
 "package signatures</a>, which allows you to make sure you've downloaded the "
@@ -376,7 +401,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:234
+#: /home/runa/tor/website/en/download-unix.wml:242
 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</"
@@ -384,7 +409,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:240
+#: /home/runa/tor/website/en/download-unix.wml:248
 msgid ""
 "See the <a href=\"<page documentation>#Developers\">developer documentation</"
 "a> for instructions on fetching Tor from Git to get the very latest "
@@ -394,19 +419,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:252
+#: /home/runa/tor/website/en/download-unix.wml:260
 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/tor/website/en/download-unix.wml:256
+#: /home/runa/tor/website/en/download-unix.wml:264
 msgid "<a id=\"ChangeLog\"></a> <a id=\"Stable\"></a> <a id=\"Testing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:260
+#: /home/runa/tor/website/en/download-unix.wml:268
 msgid ""
 "For a list of what has changed in each stable Tor release, see the <a href="
 "\"<gitblob>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in both "

Modified: translation/trunk/projects/website/nl/3-low.people.po
===================================================================
--- translation/trunk/projects/website/nl/3-low.people.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/nl/3-low.people.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 09:55+0100\n"
+"POT-Creation-Date: 2010-03-09 09:12+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -60,8 +60,8 @@
 #. type: Content of: <div><address>
 #: /home/runa/tor/website/en/people.wml:30
 msgid ""
-"The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA<br /"
-"><br />"
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 "
+"USA<br /><br />"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -542,34 +542,56 @@
 
 #. type: Content of: <div><dl><dt>
 #: /home/runa/tor/website/en/people.wml:202
-msgid "Kasimir Gabert"
+msgid "Marco Bonetti"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:202
+msgid "Focusing on MobileTor for the iPhone."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:203
+msgid "Nathan Freitas"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:203
 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/tor/website/en/people.wml:205
+msgid "Kasimir Gabert"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:205
+msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\";>TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid "Robert Hogan"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\";>TorK</a> Tor controller."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid "Damian Johnson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid ""
 "Builds a command-line application for monitoring Tor relays, providing real-"
 "time status information such as the current configuration, bandwidth usage, "
@@ -578,106 +600,118 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid ""
 "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
 "and Privoxy still work well together."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid "Kory Kirk"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid ""
 "Worked during Google Summer of Code 2009 on extending Torbutton. Now he's "
 "working with Bruce Leidl on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Bruce Leidl"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Working on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid ""
 "A lawyer with the CCC in Germany. Coordinates the German Tor community with "
 "respect to legal questions and concerns."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:224
+msgid "Linus Nordberg"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:224
+msgid ""
+"Enjoys measuring the Tor network and helps with outreach in the Nordic "
+"countries."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:226
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:226
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid "Martin Peck"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:225
+#: /home/runa/tor/website/en/people.wml:230
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:231
 msgid ""
 "The most dedicated bug reporter we've ever heard from. He must read Tor "
 "source code every day over breakfast."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy";
@@ -686,24 +720,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?";
 "p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/";
@@ -712,7 +746,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:241
+#: /home/runa/tor/website/en/people.wml:246
 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, "
@@ -720,32 +754,32 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:252
 msgid "<a id=\"Past\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:248
+#: /home/runa/tor/website/en/people.wml:253
 msgid "<a class=\"anchor\" href=\"#Past\">Past thanks to:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "John Bashinski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "Contributed the initial rpm spec file."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid "Domenik Bork"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid ""
 "Worked on Configuration of Hidden Services with User Authorization in "
 "Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches/";
@@ -753,12 +787,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 msgid "Benedikt Boss"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 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 "
@@ -766,22 +800,22 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Ren Bucholz"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Our fine logo and images."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 msgid "Fallon Chen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 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="
@@ -790,32 +824,32 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Bram Cohen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Helped design our congestion control mechanisms, in Tor's early days."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Pat Double"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Creator of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid "Geoff Goodell"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid ""
 "Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/";
 "\">Blossom project</a> which uses Tor as its overlay network; also helped "
@@ -823,12 +857,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid "Aleksei Gorny"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid ""
 "Working on Tor exit scanner improvements (<a href=\"https://svn.torproject.";
 "org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
@@ -836,52 +870,52 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Christian Grothoff"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Contributed better daemonizing behavior."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Steven Hazel"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Made 'make install' do the right thing."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "Justin Hipple"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "The other developer for Vidalia."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Jason Holt"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Contributed patches to the instructions and the man page."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 msgid "Christian King"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 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-";
@@ -889,70 +923,70 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid "Joe Kowalski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid ""
 "Original author and provider of the torstatus script formerly run on "
 "nighteffect."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Adam Langley"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Our fine eventdns code."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid "Rebecca MacKinnon"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid ""
 "Former Director of Tor.  Co-Founder of <a href=\"http://www.";
 "globalvoicesonline.org/\">Global Voices Online</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid "Chris Palmer"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid ""
 "Our liaison and tech guy with EFF while EFF was funding us. Also helped "
 "advocate and write end-user docs."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid "Matej Pfajfar"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid ""
 "Author of the original onion routing code that Tor is based on, so we didn't "
 "have to start from scratch."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 msgid "Johannes Renner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 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 "
@@ -960,33 +994,33 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid "Scott Squires"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid ""
 "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Aaron Turner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Contributed the first version of the tor.sh initscripts shell script."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 msgid "Stephen Tyree"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 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 "
@@ -995,12 +1029,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid "Camilo Viecco"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid ""
 "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac.";
 "vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
@@ -1008,12 +1042,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 msgid "Fred von Lohmann"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 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/?";
@@ -1021,12 +1055,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid "Christian Wilms"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid ""
 "Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
 "\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";
@@ -1034,12 +1068,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 msgid "Jillian C. York"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 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/nl/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/nl/4-optional.volunteer.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/nl/4-optional.volunteer.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 09:55+0100\n"
+"POT-Creation-Date: 2010-03-09 09:12+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,21 +252,22 @@
 "Messaging client). Components are pre-configured to operate in a secure way, "
 "and it has very few dependencies on the installed operating system. It has "
 "therefore become one of the most easy to use, and popular, ways to use Tor "
-"on Windows.  <br /> However, there is currently no working package for Linux "
-"and Mac OS X, so this project would be to implement Tor Browser Bundle for "
-"these platforms. This will involve modifications to Vidalia (C++), possibly "
-"Firefox (C) then creating and testing the launcher on a range of operating "
-"system versions and configurations to verify portability.  Some work on this "
-"was completed as part of the Google Summer of Code 2009. Another part of "
-"this project is to identify all of the traces left behind by using a Tor "
-"Browser Bundle on Mac OS X or Linux.  Developing ways to stop, counter, or "
-"remove these traces is a final step.  <br /> Students should be familiar "
-"with application development on one or preferably both of Linux and Mac OS "
-"X, and be comfortable with C/C++ and shell scripting.  <br /> Part of this "
-"project could be usability testing of Tor Browser Bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
+"on Windows.  <br /> However, there is currently no released package for "
+"Linux and Mac OS X, so this project would be to implement Tor Browser Bundle "
+"for OS X and continue work on the Tor Browser Bundle for Linux. This will "
+"involve modifications to Vidalia (C++), possibly Firefox (C) then creating "
+"and testing the launcher on a range of operating system versions and "
+"configurations to verify portability.  Some work on this was completed as "
+"part of the Google Summer of Code 2009. Another part of this project is to "
+"identify all of the traces left behind by using a Tor Browser Bundle on Mac "
+"OS X or Linux.  Developing ways to stop, counter, or remove these traces is "
+"a final step.  <br /> Students should be familiar with application "
+"development on one or preferably both of Linux and Mac OS X, and be "
+"comfortable with C/C++ and shell scripting.  <br /> Part of this project "
+"could be usability testing of Tor Browser Bundle, ideally amongst our target "
+"demographic.  That would help a lot in knowing what needs to be done in "
+"terms of bug fixes or new features. We get this informally at the moment, "
+"but a more structured process would be better."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -320,27 +321,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:225
-msgid ""
-"<b>Tuneup Tor!</b> <br /> Priority: <i>Medium to High</i> <br /> Effort "
-"Level: <i>Medium to High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Nick, Roger, Mike, Karsten</i> <br /> Right now, Tor relays "
-"measure and report their own bandwidth, and Tor clients choose which relays "
-"to use in part based on that bandwidth.  This approach is vulnerable to <a "
-"href=\"http://freehaven.net/anonbib/#bauer:wpes2007\";>attacks where relays "
-"lie about their bandwidth</a>; to address this, Tor currently caps the "
-"maximum bandwidth it's willing to believe any relay provides.  This is a "
-"limited fix, and a waste of bandwidth capacity to boot.  Instead, Tor should "
-"possibly measure bandwidth in a more distributed way, perhaps as described "
-"in the <a href=\"http://freehaven.net/anonbib/author.html#snader08\";>\"A "
-"Tune-up for Tor\"</a> paper by Snader and Borisov. One could use current "
-"testing code to double-check this paper's findings and verify the extent to "
-"which they dovetail with Tor as deployed in the wild, and determine good "
-"ways to incorporate them into their suggestions Tor network without adding "
-"too much communications overhead between relays and directory authorities."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:256
 msgid ""
 "<b>Improving Polipo on Windows</b> <br /> Priority: <i>Medium to High</i> "
@@ -382,17 +362,17 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:283
 msgid ""
-"<b>Tor Controller Status Event Interface</b> <br /> Priority: <i>Medium</i> "
-"<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> "
-"<br /> Likely Mentors: <i>Matt</i> <br /> There are a number of status "
-"changes inside Tor of which the user may need to be informed. For example, "
-"if the user is trying to set up his Tor as a relay and Tor decides that its "
-"ports are not reachable from outside the user's network, we should alert the "
-"user. Currently, all the user gets is a couple log messages in Vidalia's "
-"'message log' window, which they likely never see since they don't receive a "
-"notification that something has gone wrong. Even if the user does actually "
-"look at the message log, most of the messages make little sense to the "
-"novice user.  <br /> Tor has the ability to inform Vidalia of many such "
+"<b>Tor Controller Status Event Interface for Vidalia</b> <br /> Priority: "
+"<i>Medium</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low "
+"to Medium</i> <br /> Likely Mentors: <i>Matt</i> <br /> There are a number "
+"of status changes inside Tor of which the user may need to be informed. For "
+"example, if the user is trying to set up his Tor as a relay and Tor decides "
+"that its ports are not reachable from outside the user's network, we should "
+"alert the user. Currently, all the user gets is a couple log messages in "
+"Vidalia's 'message log' window, which they likely never see since they don't "
+"receive a notification that something has gone wrong. Even if the user does "
+"actually look at the message log, most of the messages make little sense to "
+"the novice user.  <br /> Tor has the ability to inform Vidalia of many such "
 "status changes, and we recently implemented support for a couple of these "
 "events. Still, there are many more status events the user should be informed "
 "of and we need a better UI for actually displaying them to the user.  <br /> "
@@ -477,40 +457,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:415
-msgid ""
-"<b>New Thandy Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Medium to High</i> <br /> Likely "
-"Mentors: <i>Martin</i> <br /> Additional capabilities are needed for "
-"assisted updates of all the Tor related software for Windows and other "
-"operating systems. Some of the features to consider include:"
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:429
-msgid ""
-"Integration of the <a href=\"http://chandlerproject.org/Projects/MeTooCrypto";
-"\">MeTooCrypto Python library</a> for authenticated HTTPS downloads."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:433
-msgid ""
-"Adding a level of indirection between the timestamp signatures and the "
-"package files included in an update. See the \"Thandy attacks / suggestions"
-"\" thread on or-dev."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:436
-msgid ""
-"Support locale specific installation and configuration of assisted updates "
-"based on preference, host, or user account language settings.  Familiarity "
-"with Windows codepages, unicode, and other character sets is helpful in "
-"addition to general win32 and posix API experience and Python proficiency."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:445
 msgid ""
 "<b>Simulator for slow Internet connections</b> <br /> Priority: <i>Medium</"
@@ -558,27 +504,14 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:509
 msgid ""
-"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Low</i> <br /"
-"> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Mike</i> <br /> We're hearing from an increasing number of users "
-"that they want to use Thunderbird with Tor. However, there are plenty of "
-"application-level concerns, for example, by default Thunderbird will put "
-"your hostname in the outgoing mail that it sends. At some point we should "
-"start a new push to build a Thunderbird extension similar to Torbutton."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:527
-msgid ""
-"<b>Intermediate Level Network Device Driver</b> <br /> Priority: <i>Low</i> "
+"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Medium</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> "
-"Likely Mentors: <i>Martin</i> <br /> The WinPCAP device driver used by Tor "
-"VM for bridged networking does not support a number of wireless and non-"
-"Ethernet network adapters.  Implementation of a intermediate level network "
-"device driver for win32 and 64bit would provide a way to intercept and route "
-"traffic over such networks. This project will require knowledge of and "
-"experience with Windows kernel device driver development and testing. "
-"Familiarity with Winsock and Qemu would also be helpful."
+"Likely Mentors: <i>Mike</i> <br /> We're hearing from an increasing number "
+"of users that they want to use Thunderbird with Tor. However, there are "
+"plenty of application-level concerns, for example, by default Thunderbird "
+"will put your hostname in the outgoing mail that it sends. At some point we "
+"should start a new push to build a Thunderbird extension similar to "
+"Torbutton."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -643,35 +576,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:621
-msgid ""
-"<b>Tor/Polipo/Vidalia Auto-Update Framework</b> <br /> We're in need of a "
-"good authenticated-update framework.  Vidalia already has the ability to "
-"notice when the user is running an outdated or unrecommended version of Tor, "
-"using signed statements inside the Tor directory information. Currently, "
-"Vidalia simply pops up a little message box that lets the user know they "
-"should manually upgrade. The goal of this project would be to extend Vidalia "
-"with the ability to also fetch and install the updated Tor software for the "
-"user. We should do the fetches via Tor when possible, but also fall back to "
-"direct fetches in a smart way. Time permitting, we would also like to be "
-"able to update other applications included in the bundled installers, such "
-"as Polipo and Vidalia itself.  <br /> To complete this project, the student "
-"will first need to first investigate the existing auto-update frameworks (e."
-"g., Sparkle on OS X) to evaluate their strengths, weaknesses, security "
-"properties, and ability to be integrated into Vidalia. If none are found to "
-"be suitable, the student will design their own auto-update framework, "
-"document the design, and then discuss the design with other developers to "
-"assess any security issues. The student will then implement their framework "
-"(or integrate an existing one) and test it.  <br /> A person undertaking "
-"this project should have good C++ development experience. Previous "
-"experience with Qt is helpful, but not required. One should also have a good "
-"understanding of common security practices, such as package signature "
-"verification. Good writing ability is also important for this project, since "
-"a vital step of the project will be producing a design document to review "
-"and discuss with others prior to implementation."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:655
 msgid ""
 "<b>Improving the Tor QA process: Continuous Integration for builds</b> <br /"
@@ -699,17 +603,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:683
-msgid ""
-"<b>Usability testing of Tor</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> <br /> Likely "
-"Mentors: <i>Andrew</i> <br /> Especially the browser bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:700
 msgid ""
 "<b>An authenticating IRC proxy</b> <br /> Priority: <i>Medium</i> <br /> "

Modified: translation/trunk/projects/website/nl/docs/3-low.debian.po
===================================================================
--- translation/trunk/projects/website/nl/docs/3-low.debian.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/nl/docs/3-low.debian.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-21 18:13+0100\n"
+"POT-Creation-Date: 2010-03-09 09:12+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -28,8 +28,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/ukb2qMd8l2.xml:40
-#: /tmp/ukb2qMd8l2.xml:96 /tmp/ukb2qMd8l2.xml:130
+#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/r8vvCANave.xml:40
+#: /tmp/r8vvCANave.xml:96 /tmp/r8vvCANave.xml:130
 msgid "<br />"
 msgstr ""
 
@@ -49,8 +49,8 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/ukb2qMd8l2.xml:77
-#: /tmp/ukb2qMd8l2.xml:121 /tmp/ukb2qMd8l2.xml:164
+#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/r8vvCANave.xml:77
+#: /tmp/r8vvCANave.xml:121 /tmp/r8vvCANave.xml:164
 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."
@@ -94,8 +94,9 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:59
 msgid ""
-"where you substitute the above word (etch, lenny, sid, karmic, jaunty, "
-"intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you put the codename of your distribution (i.e. etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy or whatever it is) in place of &lt;"
+"DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -165,8 +166,8 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:106
 msgid ""
-"where you substitute the name of your distro (etch, lenny, sid, karmic, "
-"jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you again substitute the name of your distro (etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/nl/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/nl/docs/3-low.tor-doc-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/nl/docs/3-low.tor-doc-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:24+0100\n"
+"POT-Creation-Date: 2010-03-09 09:12+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/o7eeJSPKJ3.xml:24
-#: /tmp/o7eeJSPKJ3.xml:54 /tmp/o7eeJSPKJ3.xml:88 /tmp/o7eeJSPKJ3.xml:131
-#: /tmp/o7eeJSPKJ3.xml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/s9LyYTfCpR.xml:24
+#: /tmp/s9LyYTfCpR.xml:54 /tmp/s9LyYTfCpR.xml:88 /tmp/s9LyYTfCpR.xml:131
+#: /tmp/s9LyYTfCpR.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -63,10 +63,10 @@
 "If you're building from source, first install <a href=\"http://www.monkey.";
 "org/~provos/libevent/\">libevent</a>, and make sure you have openssl and "
 "zlib (including the -devel packages if applicable). Then run:<br /> <tt>tar "
-"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable><br /> ./configure "
-"&amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</tt>, or "
-"you can run <tt>make install</tt> (as root if necessary) to install it into /"
-"usr/local/, and then you can start it just by running <tt>tor</tt>."
+"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable></tt><br /> <tt>./"
+"configure &amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</"
+"tt>, or you can run <tt>make install</tt> (as root if necessary) to install "
+"it into /usr/local/, and then you can start it just by running <tt>tor</tt>."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/pl/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/pl/2-medium.donate.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/pl/2-medium.donate.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor\n"
-"POT-Creation-Date: 2009-12-18 21:29+0100\n"
+"POT-Creation-Date: 2010-03-09 09:14+0100\n"
 "PO-Revision-Date: 2010-03-06 12:00+0100\n"
 "Last-Translator: Bogdan Drozdowski <bogdandr / op . pl>\n"
 "Language-Team: Polish\n"
@@ -59,13 +59,13 @@
 "privacy continue to exist in the world."
 msgstr ""
 "Dajemy moÅliwoÅci wspierania prywatnoÅci i anonimowoÅci on-line poprzez "
-"dotacje. MoÅesz podarowaÄ  <a href=\"#money\">pieniÄdze</a>, <a "
-"href=\"#services\">usÅugi</a>, <a href=\"#hardware\">sprzÄt</a>, i <a "
-"href=\"#time\">czas</a>. Twoja odpisywalna od podatku darowizna pomoÅe "
-"zapewniÄ istnienie na Åwiecie prywatnoÅci i anonimowoÅci on-line."
+"dotacje. MoÅesz podarowaÄ  <a href=\"#money\">pieniÄdze</a>, <a href="
+"\"#services\">usÅugi</a>, <a href=\"#hardware\">sprzÄt</a>, i <a href=\"#time"
+"\">czas</a>. Twoja odpisywalna od podatku darowizna pomoÅe zapewniÄ "
+"istnienie na Åwiecie prywatnoÅci i anonimowoÅci on-line."
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:32 /tmp/aMIDo1YjNX.xml:102
+#: /home/runa/tor/website/en/donate.wml:32 /tmp/fIR96Hg1VS.xml:102
 msgid "<br />"
 msgstr "<br />"
 
@@ -172,17 +172,17 @@
 msgstr "<br /> Wybierz jednostkÄ monetarnÄ: <select name=\"currency_code\">"
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:72 /tmp/aMIDo1YjNX.xml:114
+#: /home/runa/tor/website/en/donate.wml:72 /tmp/fIR96Hg1VS.xml:114
 msgid "$"
 msgstr "$"
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:73 /tmp/aMIDo1YjNX.xml:115
+#: /home/runa/tor/website/en/donate.wml:73 /tmp/fIR96Hg1VS.xml:115
 msgid "â"
 msgstr "â"
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:74 /tmp/aMIDo1YjNX.xml:116
+#: /home/runa/tor/website/en/donate.wml:74 /tmp/fIR96Hg1VS.xml:116
 msgid "Â"
 msgstr "Â"
 
@@ -212,7 +212,8 @@
 "<input type=\"radio\" name=\"a3\" value=\"20.00\" checked=\"checked\" />20/"
 "month"
 msgstr ""
-"<input type=\"radio\" name=\"a3\" value=\"20.00\" checked=\"checked\" />20/miesiÄc"
+"<input type=\"radio\" name=\"a3\" value=\"20.00\" checked=\"checked\" />20/"
+"miesiÄc"
 
 #. type: Content of: <div><form><dl><dt>
 #: /home/runa/tor/website/en/donate.wml:82
@@ -240,23 +241,24 @@
 "org/donate#funds\"/> <input type=\"hidden\" name=\"cancel_return\" value="
 "\"https://www.torproject.org/donate\"/>"
 msgstr ""
-"<input type=\"hidden\" name=\"p3\" value=\"1\" /> <input type=\"hidden\" name=\"t3\" "
-"value=\"M\" /> <input type=\"hidden\" name=\"sra\" value=\"1\" /> <input "
-"type=\"hidden\" name=\"src\" value=\"1\" /> <input type=\"hidden\" "
+"<input type=\"hidden\" name=\"p3\" value=\"1\" /> <input type=\"hidden\" "
+"name=\"t3\" value=\"M\" /> <input type=\"hidden\" name=\"sra\" value=\"1\" /"
+"> <input type=\"hidden\" name=\"src\" value=\"1\" /> <input type=\"hidden\" "
 "name=\"no_shipping\" value=\"1\" /> <input type=\"hidden\" name=\"no_note\" "
-"value=\"1\" /> <input type=\"image\" src=\"images/btn_donateCC_LG.gif\" "
-"name=\"submit\" alt=\"PÅaÄ z PayPal - szybkie, darmowe i bezpieczne!\"/> <input "
-"type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" /> <input "
-"type=\"hidden\" name=\"business\" value=\"donations@xxxxxxxxxxxxxx\" /> <input "
-"type=\"hidden\" name=\"item_name\" value=\"Tor Project Membership\" /> <input "
-"type=\"hidden\" name=\"return\" "
-"value=\"https://www.torproject.org/donate#funds\"/> <input type=\"hidden\" "
-"name=\"cancel_return\" value=\"https://www.torproject.org/donate\"/>"
+"value=\"1\" /> <input type=\"image\" src=\"images/btn_donateCC_LG.gif\" name="
+"\"submit\" alt=\"PÅaÄ z PayPal - szybkie, darmowe i bezpieczne!\"/> <input "
+"type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" /> <input type="
+"\"hidden\" name=\"business\" value=\"donations@xxxxxxxxxxxxxx\" /> <input "
+"type=\"hidden\" name=\"item_name\" value=\"Tor Project Membership\" /> "
+"<input type=\"hidden\" name=\"return\" value=\"https://www.torproject.org/";
+"donate#funds\"/> <input type=\"hidden\" name=\"cancel_return\" value="
+"\"https://www.torproject.org/donate\"/>"
 
 #. type: Content of: <div><h3>
 #: /home/runa/tor/website/en/donate.wml:103
 msgid "<a class=\"anchor\" href=\"#paypal\">Single donation via PayPal</a>"
-msgstr "<a class=\"anchor\" href=\"#paypal\">Pojedyncza dotacja przez PayPal</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#paypal\">Pojedyncza dotacja przez PayPal</a>"
 
 #. type: Content of: <div><form><p><select>
 #: /home/runa/tor/website/en/donate.wml:105
@@ -270,11 +272,11 @@
 "\"currency_code\">"
 msgstr ""
 "MoÅesz teÅ dokonaÄ <b>jednorazowej wpÅaty</b> (poprzez PayPal, ale nie "
-"wymaga konta):<br /> <input type=\"radio\" name=\"amount\" value=\"100.00\" />100 "
-"<input type=\"radio\" name=\"amount\" value=\"50.00\" />50 <input type=\"radio\" "
-"name=\"amount\" value=\"20.00\" checked=\"checked\" />20 <input type=\"radio\" "
-"name=\"amount\" value=\"10.00\" />10 <input type=\"radio\" name=\"amount\" value=\"\" "
-"/>inna kwota <select name=\"currency_code\">"
+"wymaga konta):<br /> <input type=\"radio\" name=\"amount\" value=\"100.00\" /"
+">100 <input type=\"radio\" name=\"amount\" value=\"50.00\" />50 <input type="
+"\"radio\" name=\"amount\" value=\"20.00\" checked=\"checked\" />20 <input "
+"type=\"radio\" name=\"amount\" value=\"10.00\" />10 <input type=\"radio\" "
+"name=\"amount\" value=\"\" />inna kwota <select name=\"currency_code\">"
 
 #. type: Content of: <div><form><p>
 #: /home/runa/tor/website/en/donate.wml:117
@@ -292,10 +294,10 @@
 "type=\"image\" src=\"images/btn_donateCC_LG.gif\" name=\"submit\" alt=\"PÅaÄ "
 "poprzez PayPal - szybkie, darmowe i bezpieczne!\" /> <input type=\"hidden\" "
 "name=\"cmd\" value=\"_xclick\" /> <input type=\"hidden\" name=\"business\" "
-"value=\"donations@xxxxxxxxxxxxxx\" /> <input type=\"hidden\" name=\"item_name\" "
-"value=\"Tor\" /> <input type=\"hidden\" name=\"return\" "
-"value=\"https://www.torproject.org/donate#funds\"; /> <input type=\"hidden\" "
-"name=\"cancel_return\" value=\"https://www.torproject.org/donate\"; />"
+"value=\"donations@xxxxxxxxxxxxxx\" /> <input type=\"hidden\" name=\"item_name"
+"\" value=\"Tor\" /> <input type=\"hidden\" name=\"return\" value=\"https://";
+"www.torproject.org/donate#funds\" /> <input type=\"hidden\" name="
+"\"cancel_return\" value=\"https://www.torproject.org/donate\"; />"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/donate.wml:133
@@ -306,7 +308,9 @@
 
 #. type: Content of: <div><p><address>
 #: /home/runa/tor/website/en/donate.wml:136
-msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
+#, fuzzy
+msgid ""
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 USA"
 msgstr "The Tor Project<br />122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
 
 #. type: Content of: <div><p>
@@ -341,8 +345,8 @@
 msgstr ""
 "Projekt Tor ciÄgle poszukuje usÅug zwiÄzanych z potrzebami technicznymi, "
 "takimi jak ÅÄcze, rozmieszczenie, usÅugi hostingowe, reprezentacjÄ prawnÄ "
-"lub konsultacjami. Poprzez dotacje usÅug, doÅÄczasz do naszych <a "
-"href=\"<page sponsors>\">wielu sponsorÃw</a> w dostarczaniu prywatnoÅci i "
+"lub konsultacjami. Poprzez dotacje usÅug, doÅÄczasz do naszych <a href="
+"\"<page sponsors>\">wielu sponsorÃw</a> w dostarczaniu prywatnoÅci i "
 "anonimowoÅci on-line. W tej chwili szukamy skalowalnych usÅug hostingowych "
 "dla potrzeb raportowania z wielkich zestawÃw danych i wiarygodnego hostingu "
 "o szerokim ÅÄczu. MoÅemy mieÄ sprzÄt, ktÃry damy Ci w zamian za dotacjÄ "
@@ -430,12 +434,11 @@
 "the hardware and operating system to us.  Contact us at donations@torproject."
 "org for more details."
 msgstr ""
-"Poprzez dotacje sprzÄtu, doÅÄczasz do naszych <a href=\"<page "
-"sponsors>\">wielu sponsorÃw</a> w dostarczaniu prywatnoÅci i anonimowoÅci on-"
-"line. JeÅli chcesz, by Tor dziaÅaÅ na Twojej architekturze lub sprzÄcie, "
-"dobrym na to sposobem jest podarowanie nam sprzÄtu i systemu operacyjnego. "
-"Skontaktuj siÄ z nami pod adresem donations@xxxxxxxxxxxxxx, by poznaÄ "
-"szczegÃÅy."
+"Poprzez dotacje sprzÄtu, doÅÄczasz do naszych <a href=\"<page sponsors>"
+"\">wielu sponsorÃw</a> w dostarczaniu prywatnoÅci i anonimowoÅci on-line. "
+"JeÅli chcesz, by Tor dziaÅaÅ na Twojej architekturze lub sprzÄcie, dobrym na "
+"to sposobem jest podarowanie nam sprzÄtu i systemu operacyjnego. Skontaktuj "
+"siÄ z nami pod adresem donations@xxxxxxxxxxxxxx, by poznaÄ szczegÃÅy."
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/donate.wml:173
@@ -469,12 +472,14 @@
 "<a id=\"outcome\"></a> <a id=\"funds\"></a><a class=\"anchor\" href=\"#funds"
 "\"></a>"
 msgstr ""
-"<a id=\"outcome\"></a> <a id=\"funds\"></a><a class=\"anchor\" href=\"#funds\"></a>"
+"<a id=\"outcome\"></a> <a id=\"funds\"></a><a class=\"anchor\" href=\"#funds"
+"\"></a>"
 
 #. type: Content of: <div><h3>
 #: /home/runa/tor/website/en/donate.wml:180
 msgid "<a class=\"anchor\" href=\"#outcome\">What happens to my donation?</a>"
-msgstr "<a class=\"anchor\" href=\"#outcome\">Co dzieje siÄ z moimi dotacjami?</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#outcome\">Co dzieje siÄ z moimi dotacjami?</a>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/donate.wml:181
@@ -496,9 +501,9 @@
 "\"/> <img src=\"images/2008-expenses-chart.png\" alt=\"How is the money "
 "spent?\"/>"
 msgstr ""
-"<img src=\"images/2008-funding-chart.png\" alt=\"Kto wspiera Projekt Tor?\" /> "
-"<img src=\"images/2008-expenses-chart.png\" alt=\"Jak Projekt Tor inwestuje "
-"fundusze?\" />"
+"<img src=\"images/2008-funding-chart.png\" alt=\"Kto wspiera Projekt Tor?\" /"
+"> <img src=\"images/2008-expenses-chart.png\" alt=\"Jak Projekt Tor "
+"inwestuje fundusze?\" />"
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/donate.wml:188

Modified: translation/trunk/projects/website/pl/2-medium.faq.po
===================================================================
--- translation/trunk/projects/website/pl/2-medium.faq.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/pl/2-medium.faq.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor\n"
-"POT-Creation-Date: 2009-12-18 21:29+0100\n"
+"POT-Creation-Date: 2010-03-09 09:14+0100\n"
 "PO-Revision-Date: 2010-03-06 12:00+0100\n"
 "Last-Translator: Bogdan Drozdowski <bogdandr / op . pl>\n"
 "Language-Team: Polish\n"
@@ -20,7 +20,7 @@
 msgstr "FAQ Tora"
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:12 /tmp/d6WP5Kgo1R.xml:1141
+#: /home/runa/tor/website/en/faq.wml:12 /tmp/uOL5q2iA8W.xml:1141
 msgid "<hr />"
 msgstr "<hr />"
 
@@ -82,7 +82,8 @@
 #: /home/runa/tor/website/en/faq.wml:27
 msgid ""
 "<a href=\"#Funding\">What would The Tor Project do with more funding?</a>"
-msgstr "<a href=\"#Funding\">Co Projekt Tor zrobiÅby z wiÄkszymi funduszami?</a>"
+msgstr ""
+"<a href=\"#Funding\">Co Projekt Tor zrobiÅby z wiÄkszymi funduszami?</a>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:31
@@ -98,7 +99,8 @@
 #: /home/runa/tor/website/en/faq.wml:34
 msgid ""
 "<a href=\"#PGPSigs\">What are these \"sig\" files on the download page?</a>"
-msgstr "<a href=\"#PGPSigs\">Czym sÄ te pliki \"sig\" na stronie pobierania?</a>"
+msgstr ""
+"<a href=\"#PGPSigs\">Czym sÄ te pliki \"sig\" na stronie pobierania?</a>"
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:36
@@ -138,8 +140,8 @@
 "<a href=\"#ChooseEntryExit\">Can I control which nodes (or country) are used "
 "for entry/exit?</a>"
 msgstr ""
-"<a href=\"#ChooseEntryExit\">Czy mogÄ kontrolowaÄ, ktÃre wÄzÅy (lub kraje) sÄ "
-"uÅywane do wchodzenia/wychodzenia?</a>"
+"<a href=\"#ChooseEntryExit\">Czy mogÄ kontrolowaÄ, ktÃre wÄzÅy (lub kraje) "
+"sÄ uÅywane do wchodzenia/wychodzenia?</a>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:49
@@ -157,8 +159,8 @@
 "<a href=\"#ExitPolicies\">I'd run a relay, but I don't want to deal with "
 "abuse issues.</a>"
 msgstr ""
-"<a href=\"#ExitPolicies\">ProwadziÅbym/prowadziÅabym przekaÅnik, ale nie chcÄ "
-"mieÄ do czynienia z przypadkami naduÅyÄ.</a>"
+"<a href=\"#ExitPolicies\">ProwadziÅbym/prowadziÅabym przekaÅnik, ale nie "
+"chcÄ mieÄ do czynienia z przypadkami naduÅyÄ.</a>"
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:54
@@ -206,8 +208,8 @@
 msgid ""
 "<a href=\"#EverybodyARelay\">You should make every Tor user be a relay.</a>"
 msgstr ""
-"<a href=\"#EverybodyARelay\">Powinno siÄ sprawiÄ, by kaÅdy uÅytkownik Tora byÅ "
-"przekaÅnikiem.</a>"
+"<a href=\"#EverybodyARelay\">Powinno siÄ sprawiÄ, by kaÅdy uÅytkownik Tora "
+"byÅ przekaÅnikiem.</a>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:73
@@ -238,9 +240,8 @@
 "for now."
 msgstr ""
 "JeÅli chcecie poznaÄ odpowiedzi na inne pytania, nie znajdujÄce siÄ jeszcze "
-"w tej wersji FAQ, spÃjrzcie na razie na <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\";>wiki "
-"FAQ</a>."
+"w tej wersji FAQ, spÃjrzcie na razie na <a href=\"https://wiki.torproject.";
+"org/noreply/TheOnionRouter/TorFAQ\">wiki FAQ</a>."
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/faq.wml:84
@@ -276,8 +277,8 @@
 "Twojego ÅÄcza internetowego w celu poznania listy stron, ktÃre odwiedzasz, i "
 "zapobiega poznaniu Twojej fizycznej lokalizacji przez strony, ktÃre "
 "odwiedzasz. Ten zestaw przekaÅnikÃw jest nazywany sieciÄ Tora. MoÅesz "
-"dowiedzieÄ siÄ wiÄcej o tym, jak dziaÅa Tor na <a href=\"<page "
-"overview>\">stronie wprowadzenia</a>."
+"dowiedzieÄ siÄ wiÄcej o tym, jak dziaÅa Tor na <a href=\"<page overview>"
+"\">stronie wprowadzenia</a>."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:107
@@ -343,8 +344,8 @@
 msgstr ""
 "Dostawcy prostych proxy dajÄ teÅ pojedynczy niedobry punkt. WiedzÄ, kim "
 "jesteÅ i co oglÄdasz w Internecie. MogÄ obserwowaÄ TwÃj ruch, jak przechodzi "
-"przez ich serwer. W niektÃrych przypadkach mogÄ obserwowaÄ TwÃj "
-"zaszyfrowany ruch, gdy przekierowujÄ go do strony Twojego banku lub sklepÃw "
+"przez ich serwer. W niektÃrych przypadkach mogÄ obserwowaÄ TwÃj zaszyfrowany "
+"ruch, gdy przekierowujÄ go do strony Twojego banku lub sklepÃw "
 "internetowych. Musisz im ufaÄ, Åe nie robiÄ Åadnej z takich rzeczy jak "
 "obserwacja ruchu, wstrzykiwanie wÅasnych reklam w TwÃj ruch czy zapisywanie "
 "szczegÃÅÃw o Tobie."
@@ -366,8 +367,8 @@
 "wysyÅasz. Tylko przekierowuje TwÃj ruch, caÅkowicie zaszyfrowany, przez sieÄ "
 "Tora i sprawia, Åe wyskakuje gdzieÅ indziej na Åwiecie, caÅkowicie "
 "nienaruszony. Klient Tora jest wymagany, gdyÅ zakÅadamy, Åe masz zaufanie do "
-"swojego komputera. Klient Tora zarzÄdza szyfrowaniem i wybranÄ ÅcieÅkÄ "
-"przez sieÄ Tora. PrzekaÅniki rozmieszczone na caÅym Åwiecie tylko przekazujÄ "
+"swojego komputera. Klient Tora zarzÄdza szyfrowaniem i wybranÄ ÅcieÅkÄ przez "
+"sieÄ Tora. PrzekaÅniki rozmieszczone na caÅym Åwiecie tylko przekazujÄ "
 "zaszyfrowane pakiety miÄdzy sobÄ."
 
 #. type: Content of: <div><p><dl><dt>
@@ -387,10 +388,10 @@
 msgstr ""
 "ByÄ moÅe. ZÅy pierwszy z trzech serwerÃw moÅe widzieÄ zaszyfrowany ruch Tora "
 "pochodzÄcy z Twojego komputera. Ale ciÄgle nie wie, kim jesteÅ i co robisz "
-"przez Tora. Po prostu widzi \"Ten adres IP uÅywa Tora\". Tor nie jest nigdzie "
-"nielegalny, wiÄc korzystanie z samego Tora jest w porzÄdku. JesteÅ ciÄgle "
-"chroniony/a przed tym, by ten wÄzeÅ odkryÅ, kim jesteÅ i dokÄd idziesz w "
-"Internecie."
+"przez Tora. Po prostu widzi \"Ten adres IP uÅywa Tora\". Tor nie jest "
+"nigdzie nielegalny, wiÄc korzystanie z samego Tora jest w porzÄdku. JesteÅ "
+"ciÄgle chroniony/a przed tym, by ten wÄzeÅ odkryÅ, kim jesteÅ i dokÄd "
+"idziesz w Internecie."
 
 #. type: Content of: <div><p><dl><dt>
 #: /home/runa/tor/website/en/faq.wml:126
@@ -445,12 +446,12 @@
 "basis, which is why we don't yet recommend very many programs for safe use "
 "with Tor."
 msgstr ""
-"SÄ dwa elementy \"toryfikacji\" programu: anonimowoÅÄ na poziomie poÅÄczenia i "
-"anonimowoÅÄ na poziomie aplikacji. AnonimowoÅÄ na poziomie poÅÄczenia "
+"SÄ dwa elementy \"toryfikacji\" programu: anonimowoÅÄ na poziomie poÅÄczenia "
+"i anonimowoÅÄ na poziomie aplikacji. AnonimowoÅÄ na poziomie poÅÄczenia "
 "skupia siÄ na zapewnianiu tego, by ruch sieciowy aplikacji byÅ wysyÅany "
 "przez Tora. Jest to zazwyczaj robione tak, Åe program jest konfigurowany do "
-"uÅywania Twojego klienta Tora jako serwer poÅredniczÄcy (proxy) typu "
-"\"socks\", ale sÄ teÅ inne sposoby. JeÅli chodzi o anonimowoÅÄ na poziomie "
+"uÅywania Twojego klienta Tora jako serwer poÅredniczÄcy (proxy) typu \"socks"
+"\", ale sÄ teÅ inne sposoby. JeÅli chodzi o anonimowoÅÄ na poziomie "
 "aplikacji, musisz upewniÄ siÄ, Åe informacje wysyÅane przez aplikacjÄ nie "
 "szkodzÄ Twojej prywatnoÅci. (Nawet jeÅli poÅÄczenia sÄ przekierowywane przez "
 "Tora, nie jest wskazane przekazywanie takich informacji jak nazwisko.) Ten "
@@ -469,10 +470,10 @@
 msgstr ""
 "WiÄkszoÅÄ naszej dotychczasowej pracy skupiÅa siÄ na przeglÄdarce "
 "internetowej Firefox. Paczki na <a href=\"<page download>\">stronie "
-"pobierania</a> automatycznie instalujÄ <a href=\"<page "
-"torbutton/index>\">rozszerzenie Torbutton do Firefoksa</a>, jeÅli masz "
-"zainstalowanego Firefoksa. Od wersji 1.2.0 Torbutton usuwa wiele problemÃw "
-"poziomÃw poÅÄczenia i aplikacji."
+"pobierania</a> automatycznie instalujÄ <a href=\"<page torbutton/index>"
+"\">rozszerzenie Torbutton do Firefoksa</a>, jeÅli masz zainstalowanego "
+"Firefoksa. Od wersji 1.2.0 Torbutton usuwa wiele problemÃw poziomÃw "
+"poÅÄczenia i aplikacji."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:160
@@ -489,12 +490,12 @@
 "Jest wiele innych programÃw, ktÃrych moÅna uÅywaÄ z Torem, ale nie "
 "zbadaliÅmy problemÃw anonimowoÅci poziomu aplikacji w tych programach doÅÄ "
 "dobrze, by mÃc poleciÄ bezpiecznÄ konfiguracjÄ. Nasze wiki ma listÄ "
-"instrukcji <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/Torif";
-"yHOWTO\">toryfikacji poszczegÃlnych aplikacji</a>. Jest teÅ <a href=\"https://";
-"wiki.torproject.org/noreply/TheOnionRouter/SupportPrograms\">lista aplikacji "
-"pomagajÄcych w przekierowaniu ruchu sieciowego przez Tora</a>. Prosimy o "
-"dodawanie wpisÃw do tej listy i pomaganie nam w utrzymaniu jej w zgodnoÅci "
-"ze stanem faktycznym!"
+"instrukcji <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
+"TorifyHOWTO\">toryfikacji poszczegÃlnych aplikacji</a>. Jest teÅ <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/SupportPrograms\";>lista "
+"aplikacji pomagajÄcych w przekierowaniu ruchu sieciowego przez Tora</a>. "
+"Prosimy o dodawanie wpisÃw do tej listy i pomaganie nam w utrzymaniu jej w "
+"zgodnoÅci ze stanem faktycznym!"
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/faq.wml:171
@@ -504,7 +505,8 @@
 #. type: Content of: <div><h3>
 #: /home/runa/tor/website/en/faq.wml:174
 msgid "<a class=\"anchor\" href=\"#WhyCalledTor\">Why is it called Tor?</a>"
-msgstr "<a class=\"anchor\" href=\"#WhyCalledTor\">Czemu siÄ to nazywa Tor?</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#WhyCalledTor\">Czemu siÄ to nazywa Tor?</a>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:177
@@ -551,7 +553,8 @@
 #. type: Content of: <div><h3>
 #: /home/runa/tor/website/en/faq.wml:201
 msgid "<a class=\"anchor\" href=\"#Backdoor\">Is there a backdoor in Tor?</a>"
-msgstr "<a class=\"anchor\" href=\"#Backdoor\">Czy jest tylna furtka w Torze?</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#Backdoor\">Czy jest tylna furtka w Torze?</a>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:204
@@ -601,9 +604,9 @@
 "powinieneÅ/aÅ sprawdzaÄ kod (lub chociaÅ pliki rÃÅnic od ostatniego "
 "wydania), czy nie ma tam czegoÅ podejrzanego. JeÅli my (lub inni "
 "dystrybutorzy) nie damy Ci kodu, jest to pewny znak, Åe dzieje siÄ coÅ "
-"dziwnego. PowinieneÅ/aÅ teÅ sprawdzaÄ <a href=\"<page verifying-"
-"signatures>\">sygnatury PGP</a>, by upewniÄ siÄ, Åe nikt nie grzebaÅ w "
-"miejscach dystrybucji."
+"dziwnego. PowinieneÅ/aÅ teÅ sprawdzaÄ <a href=\"<page verifying-signatures>"
+"\">sygnatury PGP</a>, by upewniÄ siÄ, Åe nikt nie grzebaÅ w miejscach "
+"dystrybucji."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:231
@@ -657,8 +660,8 @@
 "you're distributing."
 msgstr ""
 "Lecz jeÅli planujesz rozpowszechniaÄ program Tor, musisz trzymaÄ siÄ naszej "
-"<a href=\"<gitblob>LICENSE\">licencji</a>. W skrÃcie znaczy to tyle, Åe musisz "
-"doÅÄczyÄ nasz plik LICENSE z jakÄkolwiek czÄÅciÄ programu Tor, ktÃrÄ "
+"<a href=\"<gitblob>LICENSE\">licencji</a>. W skrÃcie znaczy to tyle, Åe "
+"musisz doÅÄczyÄ nasz plik LICENSE z jakÄkolwiek czÄÅciÄ programu Tor, ktÃrÄ "
 "rozpowszechniasz."
 
 #. type: Content of: <div><p>
@@ -678,17 +681,15 @@
 msgstr ""
 "WiÄkszoÅÄ ludzi zadajÄca nam to pytanie nie chce rozpowszechniaÄ tylko "
 "programu Tor. ChcÄ dystrybuowaÄ paczki z Torem, ktÃre zazwyczaj zawierajÄ "
-"programy <a "
-"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\";>Polipo</a> i <a "
-"href=\"<page vidalia/index>\">Vidalia</a>. Musisz siÄ wtedy trzymaÄ teÅ "
-"licencji tych programÃw. Oba sÄ pod licencjÄ <a "
-"href=\"https://www.fsf.org/licensing/licenses/gpl.html\";>GNU General Public "
-"License</a>. Najprostszym sposobem na speÅnienie licencji jest doÅÄczenie "
-"kodu ÅrÃdÅowego tych programÃw gdziekolwiek, gdzie umieszczasz paczki. "
-"Szukaj paczek \"source\" (\"kod ÅrÃdÅowy\") na <a href=\"<page "
-"vidalia/index>\">stronie Vidalii</a> i <a "
-"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\";>stronie pobierania "
-"Polipo</a>."
+"programy <a href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\";>Polipo</"
+"a> i <a href=\"<page vidalia/index>\">Vidalia</a>. Musisz siÄ wtedy trzymaÄ "
+"teÅ licencji tych programÃw. Oba sÄ pod licencjÄ <a href=\"https://www.fsf.";
+"org/licensing/licenses/gpl.html\">GNU General Public License</a>. "
+"Najprostszym sposobem na speÅnienie licencji jest doÅÄczenie kodu ÅrÃdÅowego "
+"tych programÃw gdziekolwiek, gdzie umieszczasz paczki. Szukaj paczek \"source"
+"\" (\"kod ÅrÃdÅowy\") na <a href=\"<page vidalia/index>\">stronie Vidalii</"
+"a> i <a href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\";>stronie "
+"pobierania Polipo</a>."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:277
@@ -699,8 +700,8 @@
 msgstr ""
 "Ponadto, powinieneÅ/aÅ uwaÅaÄ, by nie wprowadzaÄ w bÅÄd swoich czytelnikÃw "
 "odnoÅnie tego, czym jest Tor, kto go robi i co on daje (a czego nie). "
-"Przeczytaj nasze <a href=\"<page trademark-faq>\">FAQ o znaku handlowym</a> po "
-"wiÄcej szczegÃÅÃw."
+"Przeczytaj nasze <a href=\"<page trademark-faq>\">FAQ o znaku handlowym</a> "
+"po wiÄcej szczegÃÅÃw."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:283
@@ -729,8 +730,8 @@
 "<a class=\"anchor\" href=\"#SupportMail\">How can I get an answer to my Tor "
 "support mail?</a>"
 msgstr ""
-"<a class=\"anchor\" href=\"#SupportMail\">Jak mogÄ dostaÄ odpowiedÅ na mÃj list "
-"o Torze?</a>"
+"<a class=\"anchor\" href=\"#SupportMail\">Jak mogÄ dostaÄ odpowiedÅ na mÃj "
+"list o Torze?</a>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:297
@@ -770,10 +771,10 @@
 "archives</a> first."
 msgstr ""
 "Tak wiÄc, jeÅli nie odpowiadamy na TwÃj list, najpierw sprawdÅ stronÄ z <a "
-"href=\"<page documentation>\">dokumentacjÄ</a>, oraz to FAQ, by sprawdziÄ, czy "
-"na Twoje pytanie nie ma juÅ gotowej odpowiedzi. Potem przeczytaj <a "
-"href=\"http://www.catb.org/~esr/faqs/smart-questions.html\";>\"Jak mÄdrze "
-"zadawaÄ mÄdre pytania\"</a>. JeÅli to nie pomoÅe, mamy <a href=\"<page "
+"href=\"<page documentation>\">dokumentacjÄ</a>, oraz to FAQ, by sprawdziÄ, "
+"czy na Twoje pytanie nie ma juÅ gotowej odpowiedzi. Potem przeczytaj <a href="
+"\"http://www.catb.org/~esr/faqs/smart-questions.html\";>\"Jak mÄdrze zadawaÄ "
+"mÄdre pytania\"</a>. JeÅli to nie pomoÅe, mamy <a href=\"<page "
 "documentation>#Support\">kanaÅ IRC</a>, gdzie moÅesz zadawaÄ pytania (ale "
 "jeÅli ciagle bÄdÄ Åle sformuÅowane lub nie o Torze, tam teÅ pewnie nie "
 "dostaniesz wielu odpowiedzi). W ostatecznoÅci, ludzie na <a href=\"<page "
@@ -791,8 +792,8 @@
 "back to the Tor community."
 msgstr ""
 "InnÄ strategiÄ jest <a href=\"<page docs/tor-doc-relay>\">prowadzenie "
-"przekaÅnika sieci Tor przez jakiÅ czas</a>, lub <a href=\"<page "
-"donate>\">dotacja pieniÄdzy</a> <a href=\"<page volunteer>\">albo czasu</a> na "
+"przekaÅnika sieci Tor przez jakiÅ czas</a>, lub <a href=\"<page donate>"
+"\">dotacja pieniÄdzy</a> <a href=\"<page volunteer>\">albo czasu</a> na "
 "naszÄ sprawÄ. ChÄtniej zwrÃcimy uwagÄ na pytania osÃb, ktÃre pokazaÅy "
 "zainteresowanie i poÅwiÄcenie, by daÄ coÅ spoÅecznoÅci Tora."
 
@@ -856,10 +857,9 @@
 "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 ""
-"JeÅli chcesz bardziej wyczerpujÄcÄ odpowiedÅ, przeczytaj <a "
-"href=\"https://blog.torproject.org/blog/why-tor-is-slow\";>wiadomoÅÄ na blogu "
-"Rogera o tym temacie</a>, ktÃra zawiera zarÃwno szczegÃÅowy PDF, jak i "
-"towarzyszÄce wideo."
+"JeÅli chcesz bardziej wyczerpujÄcÄ odpowiedÅ, przeczytaj <a href=\"https://";
+"blog.torproject.org/blog/why-tor-is-slow\">wiadomoÅÄ na blogu Rogera o tym "
+"temacie</a>, ktÃra zawiera zarÃwno szczegÃÅowy PDF, jak i towarzyszÄce wideo."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:367
@@ -873,9 +873,10 @@
 "for others</a>. Help make the Tor network large enough that we can handle "
 "all the users who want privacy and security on the Internet."
 msgstr ""
-"<a href=\"<page docs/tor-doc-relay>\">Skonfiguruj swojego Tora, by przekazywaÅ "
-"ruch innych</a>. PomÃÅ uczyniÄ sieÄ Tora doÅÄ duÅÄ, byÅmy mogli obsÅuÅyÄ "
-"wszystkich ludzi, ktÃrzy chcÄ prywatnoÅci i bezpieczeÅstwa w Internecie."
+"<a href=\"<page docs/tor-doc-relay>\">Skonfiguruj swojego Tora, by "
+"przekazywaÅ ruch innych</a>. PomÃÅ uczyniÄ sieÄ Tora doÅÄ duÅÄ, byÅmy mogli "
+"obsÅuÅyÄ wszystkich ludzi, ktÃrzy chcÄ prywatnoÅci i bezpieczeÅstwa w "
+"Internecie."
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:379
@@ -912,13 +913,13 @@
 "the latest version of Tor</a>.  If this works well, please help by "
 "documenting what you did, and letting us know about it."
 msgstr ""
-"Jest kilka krokÃw, ktÃre kaÅdy moÅe podjÄÄ, by polepszyÄ wydajnoÅÄ Tora. <a h"
-"ref=\"https://wiki.torproject.org/noreply/TheOnionRouter/FireFoxTorPerf\";>MoÅe"
-"sz skonfigurowaÄ Firefoksa, by lepiej radziÅ sobie z Torem</a>, <a "
-"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/tor.html\";>moÅesz uÅywaÄ "
-"Polipo z Torem</a>, lub sprÃbowaÄ <a href=\"<page download>\">zainstalowaÄ "
-"najnowszÄ wersjÄ Tora</a>. JeÅli to podziaÅa, pomÃÅ innym, dokumentujÄc, co "
-"zrobiÅeÅ, i daj nam o tym znaÄ."
+"Jest kilka krokÃw, ktÃre kaÅdy moÅe podjÄÄ, by polepszyÄ wydajnoÅÄ Tora. <a "
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/FireFoxTorPerf";
+"\">MoÅesz skonfigurowaÄ Firefoksa, by lepiej radziÅ sobie z Torem</a>, <a "
+"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/tor.html\";>moÅesz "
+"uÅywaÄ Polipo z Torem</a>, lub sprÃbowaÄ <a href=\"<page download>"
+"\">zainstalowaÄ najnowszÄ wersjÄ Tora</a>. JeÅli to podziaÅa, pomÃÅ innym, "
+"dokumentujÄc, co zrobiÅeÅ, i daj nam o tym znaÄ."
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:403
@@ -929,9 +930,9 @@
 "spend more time on it."
 msgstr ""
 "Tor wymaga teÅ trochÄ zmian architektury. JednÄ z waÅnych zmian jest "
-"rozpoczÄcie dostarczania <a href=\"#EverybodyARelay\">lepszej obsÅugi ludziom, "
-"ktÃrzy prowadzÄ przekaÅniki sieci</a>. Pracujemy nad tym, a skoÅczymy "
-"szybciej, jeÅli uda nam siÄ spÄdziÄ przy tym wiÄcej czasu."
+"rozpoczÄcie dostarczania <a href=\"#EverybodyARelay\">lepszej obsÅugi "
+"ludziom, ktÃrzy prowadzÄ przekaÅniki sieci</a>. Pracujemy nad tym, a "
+"skoÅczymy szybciej, jeÅli uda nam siÄ spÄdziÄ przy tym wiÄcej czasu."
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:410
@@ -941,8 +942,8 @@
 "volunteer>\">look at our volunteer page</a>."
 msgstr ""
 "PomÃÅ robiÄ inne rzeczy, abyÅmy my mogli siÄ zajÄÄ tym, co trudne. ZastanÃw "
-"siÄ chwilÄ nad swoimi umiejÄtnoÅciami i zainteresowaniami, po czym <a "
-"href=\"<page volunteer>\">zajrzyj na naszÄ stronÄ dla ochotnikÃw</a>."
+"siÄ chwilÄ nad swoimi umiejÄtnoÅciami i zainteresowaniami, po czym <a href="
+"\"<page volunteer>\">zajrzyj na naszÄ stronÄ dla ochotnikÃw</a>."
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:416
@@ -970,8 +971,8 @@
 "cause</a>. It adds up!"
 msgstr ""
 "JeÅli nie moÅesz pomÃc na Åaden z powyÅszych sposobÃw, moÅesz pomÃc "
-"indywidualnie, poprzez <a href=\"<page donate>\">zÅoÅenie skromnej dotacji dla "
-"naszej sprawy</a>. To siÄ przydaje!"
+"indywidualnie, poprzez <a href=\"<page donate>\">zÅoÅenie skromnej dotacji "
+"dla naszej sprawy</a>. To siÄ przydaje!"
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/faq.wml:432
@@ -995,8 +996,8 @@
 "yet self-sustaining."
 msgstr ""
 "W tej chwili mamy okoÅo 1800 przekaÅnikÃw sieci, ze Årednim ruchem 150 MB/s. "
-"Mamy kilkaset tysiÄcy aktywnych uÅytkownikÃw. Ale sieÄ Tora nie jest "
-"jeszcze samopodtrzymujÄca siÄ."
+"Mamy kilkaset tysiÄcy aktywnych uÅytkownikÃw. Ale sieÄ Tora nie jest jeszcze "
+"samopodtrzymujÄca siÄ."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:445
@@ -1043,8 +1044,8 @@
 "ale oni wymagajÄ uwagi z usuwaniem bÅÄdÃw, tÅumaczeniem, czemu coÅ nie "
 "dziaÅa, przypominaniem o aktualizacjach itd. Sama sieÄ jest czymÅ wspÃlnym i "
 "ktoÅ musi poÅwiÄciÄ trochÄ energii, by operatorzy przekaÅnikÃw byli "
-"zadowoleni. Musimy teÅ popracowaÄ nad <a href=\"#RelayOS\">stabilnoÅciÄ</a> na "
-"niektÃrych systemach &mdash; np. przekaÅniki Tora majÄ aktualnie problemy "
+"zadowoleni. Musimy teÅ popracowaÄ nad <a href=\"#RelayOS\">stabilnoÅciÄ</a> "
+"na niektÃrych systemach &mdash; np. przekaÅniki Tora majÄ aktualnie problemy "
 "na Win XP."
 
 #. type: Content of: <div><ul><li>
@@ -1061,8 +1062,8 @@
 "samego oprogramowania. W skÅad tego punktu wchodzÄ: instalatory, przejrzyste "
 "GUI, Åatwa konfiguracja do wspÃÅpracy z innymi aplikacjami, i generalnie "
 "zautomatyzowanie wszystkich trudnych i mylÄcych krokÃw w Torze. ZaczÄliÅmy "
-"juÅ pracÄ nad tym poprzez <a href=\"<page gui/index>\">konkurs na GUI</a>, ale "
-"znacznie wiÄcej pracy pozostaÅo &mdash; uÅytecznoÅÄ oprogramowania do "
+"juÅ pracÄ nad tym poprzez <a href=\"<page gui/index>\">konkurs na GUI</a>, "
+"ale znacznie wiÄcej pracy pozostaÅo &mdash; uÅytecznoÅÄ oprogramowania do "
 "prywatnoÅci nigdy nie byÅa Åatwa."
 
 #. type: Content of: <div><ul><li>
@@ -1075,8 +1076,8 @@
 msgstr ""
 "BodÅce: Musimy popracowaÄ nad sposobami zachÄcania ludzi do konfigurowania "
 "swoich TorÃw jako przekaÅnikÃw sieci i wÄzÅÃw wyjÅciowych, zamiast tylko "
-"jako klientÃw. <a href=\"#EverybodyARelay\">Musimy sprawiÄ, by Åatwo byÅo staÄ "
-"siÄ przekaÅnikiem i musimy daÄ ludziom bodÅce, by to robili.</a>"
+"jako klientÃw. <a href=\"#EverybodyARelay\">Musimy sprawiÄ, by Åatwo byÅo "
+"staÄ siÄ przekaÅnikiem i musimy daÄ ludziom bodÅce, by to robili.</a>"
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:489
@@ -1091,11 +1092,11 @@
 msgstr ""
 "Badania: Obszar komunikacji anonimowej jest peÅen niespodzianek i puÅapek. W "
 "naszym wolnym czasie pomagamy prowadziÄ najwaÅniejsze konferencje o "
-"anonimowoÅci i prywatnoÅci, jak <a href=\"http://petsymposium.org/\";>PETS</a>. "
-"ZidentyfikowaliÅmy zestaw kluczowych <a href=\"<page "
-"volunteer>#Research\">pytaÅ badawczych do Tora</a>, ktÃre pomogÄ nam "
-"dowiedzieÄ siÄ, jak zabezpieczyÄ Tora przed rÃÅnymi istniejÄcymi atakami. "
-"OczywiÅcie, za tymi pytaniami kryjÄ siÄ dalsze."
+"anonimowoÅci i prywatnoÅci, jak <a href=\"http://petsymposium.org/\";>PETS</"
+"a>. ZidentyfikowaliÅmy zestaw kluczowych <a href=\"<page volunteer>#Research"
+"\">pytaÅ badawczych do Tora</a>, ktÃre pomogÄ nam dowiedzieÄ siÄ, jak "
+"zabezpieczyÄ Tora przed rÃÅnymi istniejÄcymi atakami. OczywiÅcie, za tymi "
+"pytaniami kryjÄ siÄ dalsze."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:502
@@ -1105,10 +1106,10 @@
 "up</a>.  Now would be an excellent time to add a few more developers to the "
 "effort so we can continue to grow the network."
 msgstr ""
-"Robimy postÄpy w kaÅdej z tych rzeczy, ale w tym tempie <a "
-"href=\"#WhySlow\">sieÄ Tora roÅnie szybciej niÅ deweloperzy mogÄ nadÄÅyÄ</a>. "
-"Teraz jest idealny moment na dodanie kilku deweloperÃw do sprawy, byÅmy "
-"mogli kontynuowaÄ wzrost sieci."
+"Robimy postÄpy w kaÅdej z tych rzeczy, ale w tym tempie <a href=\"#WhySlow"
+"\">sieÄ Tora roÅnie szybciej niÅ deweloperzy mogÄ nadÄÅyÄ</a>. Teraz jest "
+"idealny moment na dodanie kilku deweloperÃw do sprawy, byÅmy mogli "
+"kontynuowaÄ wzrost sieci."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:510
@@ -1156,7 +1157,8 @@
 #: /home/runa/tor/website/en/faq.wml:531
 msgid ""
 "<a class=\"anchor\" href=\"#HowUninstallTor\">How do I uninstall Tor?</a>"
-msgstr "<a class=\"anchor\" href=\"#HowUninstallTor\">Jak odinstaloawÄ Tora?</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#HowUninstallTor\">Jak odinstaloawÄ Tora?</a>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:534
@@ -1219,7 +1221,8 @@
 msgstr ""
 "JeÅli nie bÄdziesz trzymaÄ tych krokÃw (na przykÅad prÃbujÄc odinstalowaÄ "
 "Vidalia, Tor i Polipo gdy jeszcze dziaÅajÄ), bÄdziesz musiaÅ/a ponownie "
-"uruchomiÄ komputer i rÄcznie usunÄÄ katalog \"Program Files\\Vidalia Bundle\"."
+"uruchomiÄ komputer i rÄcznie usunÄÄ katalog \"Program Files\\Vidalia Bundle"
+"\"."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:559
@@ -1227,8 +1230,8 @@
 "For Mac OS X, follow the <a href=\"<page docs/tor-doc-osx>#uninstall"
 "\">uninstall directions</a>."
 msgstr ""
-"Na systemie Mac OS X, trzymaj siÄ <a href=\"<page docs/tor-doc-"
-"osx>#uninstall\">instrukcji odinstalowania</a>."
+"Na systemie Mac OS X, trzymaj siÄ <a href=\"<page docs/tor-doc-osx>#uninstall"
+"\">instrukcji odinstalowania</a>."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:564
@@ -1270,8 +1273,8 @@
 "Please read the <a href=\"<page verifying-signatures>\">verifying "
 "signatures</a> page for details."
 msgstr ""
-"ProszÄ przeczytaÄ stronÄ o <a href=\"<page verifying-signatures>\">weryfikacji "
-"podpisÃw</a>, by dowiedzieÄ siÄ wiÄcej."
+"ProszÄ przeczytaÄ stronÄ o <a href=\"<page verifying-signatures>"
+"\">weryfikacji podpisÃw</a>, by dowiedzieÄ siÄ wiÄcej."
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/faq.wml:585
@@ -1318,8 +1321,8 @@
 "<a class=\"anchor\" href=\"#VirusFalsePositives\">Why does my Tor executable "
 "appear to have a virus or spyware?</a>"
 msgstr ""
-"<a class=\"anchor\" href=\"#VirusFalsePositives\">Czemu mÃj program Tor zdaje "
-"siÄ mieÄ wirusa lub oprogramowanie szpiegujÄce?</a>"
+"<a class=\"anchor\" href=\"#VirusFalsePositives\">Czemu mÃj program Tor "
+"zdaje siÄ mieÄ wirusa lub oprogramowanie szpiegujÄce?</a>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:609
@@ -1360,8 +1363,8 @@
 "<a class=\"anchor\" href=\"#LiveCD\">Is there a LiveCD or other bundle that "
 "includes Tor?</a>"
 msgstr ""
-"<a class=\"anchor\" href=\"#LiveCD\">Czy jest LiveCD lub inna dystrybucja/paczka "
-"zawierajÄca Tora?</a>"
+"<a class=\"anchor\" href=\"#LiveCD\">Czy jest LiveCD lub inna dystrybucja/"
+"paczka zawierajÄca Tora?</a>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:629
@@ -1435,9 +1438,9 @@
 "<a href=\"http://incognito.anonymityanywhere.com/\";>Incognito LiveCD/USB</a> "
 "to pÅyta, z ktÃrej moÅna uruchomiÄ komputer, posiadajÄca kilka aplikacji "
 "internetowych (Firefox, IRC, poczta, itp.) prekonfigurowanych do korzystania "
-"z Tora. Dla wiÄkszoÅci komputerÃw wszystko jest automatycznie "
-"skonfigurowane i moÅesz od razu uÅywaÄ. MoÅesz nawet skopiowaÄ pÅytÄ na dysk "
-"USB. Zawiera TorK."
+"z Tora. Dla wiÄkszoÅci komputerÃw wszystko jest automatycznie skonfigurowane "
+"i moÅesz od razu uÅywaÄ. MoÅesz nawet skopiowaÄ pÅytÄ na dysk USB. Zawiera "
+"TorK."
 
 #. type: Content of: <div><ol><li><li>
 #: /home/runa/tor/website/en/faq.wml:657
@@ -1448,10 +1451,10 @@
 "consequences of your activity. The TorK LiveCD is experimental, so the aim "
 "is to provide regular releases through 2007 and beyond."
 msgstr ""
-"<a href=\"http://tork.sourceforge.net/wiki/index.php/LiveCD\";>TorK LiveCD</a> "
-"jest oparta na Knoppiksie z naciskiem na przyjaznoÅÄ dla uÅytkownika. MoÅesz "
-"pracowaÄ anonimowo lub nie-anonimowo, podczas gdy TorK prÃbuje ciÄgle CiÄ "
-"informowaÄ o konsekwencjach Twoich dziaÅaÅ. TorK LiveCD jest "
+"<a href=\"http://tork.sourceforge.net/wiki/index.php/LiveCD\";>TorK LiveCD</"
+"a> jest oparta na Knoppiksie z naciskiem na przyjaznoÅÄ dla uÅytkownika. "
+"MoÅesz pracowaÄ anonimowo lub nie-anonimowo, podczas gdy TorK prÃbuje ciÄgle "
+"CiÄ informowaÄ o konsekwencjach Twoich dziaÅaÅ. TorK LiveCD jest "
 "eksperymentalne, wiÄc celem jest dostarczanie regularnie kolejnych wersji "
 "przez rok 2007 i pÃÅniej."
 
@@ -1479,9 +1482,9 @@
 "with a pre-configured web browser and is self contained so you can run it "
 "from a USB stick."
 msgstr ""
-"<a href=\"<page torbrowser/index>\">Paczka Tora z przeglÄdarkÄ</a> dla Windows "
-"zawiera prekonfigurowanÄ przeglÄdarkÄ internetowÄ i zawiera wszystkie "
-"niezbÄdne elementy, wiÄc moÅesz jej uÅywaÄ z dysku USB."
+"<a href=\"<page torbrowser/index>\">Paczka Tora z przeglÄdarkÄ</a> dla "
+"Windows zawiera prekonfigurowanÄ przeglÄdarkÄ internetowÄ i zawiera "
+"wszystkie niezbÄdne elementy, wiÄc moÅesz jej uÅywaÄ z dysku USB."
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/faq.wml:676
@@ -1499,10 +1502,10 @@
 "running in VMWare that sits between your Windows computer and the Internet, "
 "making sure that your Internet traffic is scrubbed and anonymized."
 msgstr ""
-"<a href=\"http://janusvm.com/\";>JanusVM</a> to jÄdro Linuksa i oprogramowanie "
-"dziaÅajÄcej w VMWare, ktÃre siedzi miÄdzy Twoim komputerem z Windowsem a "
-"Internetem, upewniajÄc siÄ, Åe TwÃj ruch internetowy jest wymazywany i "
-"anonimizowany."
+"<a href=\"http://janusvm.com/\";>JanusVM</a> to jÄdro Linuksa i "
+"oprogramowanie dziaÅajÄcej w VMWare, ktÃre siedzi miÄdzy Twoim komputerem z "
+"Windowsem a Internetem, upewniajÄc siÄ, Åe TwÃj ruch internetowy jest "
+"wymazywany i anonimizowany."
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/faq.wml:681
@@ -1528,8 +1531,8 @@
 "download</a>."
 msgstr ""
 "Polippix / Privatlivets Fred jest duÅskim, opartym na Knoppiksie LiveCD z "
-"Torem i programami do szyfrowania telefonii IP. <a "
-"href=\"http://polippix.org/\";>Informacje i pobieranie</a>."
+"Torem i programami do szyfrowania telefonii IP. <a href=\"http://polippix.";
+"org/\">Informacje i pobieranie</a>."
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/faq.wml:694
@@ -1556,8 +1559,9 @@
 "Virtual Privacy Machine to Linux LiveCD zawierajÄce Firefoksa, Privoxy, Tor, "
 "klika aplikacji do IRC i IM, i zestaw reguÅek ipchains majÄcych na celu "
 "uniemoÅliwienie danym nie chronionym Torem na opuszczenie Twojego komputera. "
-"WiÄcej informacji na <a href=\"https://wiki.torproject.org/noreply/VirtualPr";
-"ivacyMachine\">https://wiki.torproject.org/noreply/VirtualPrivacyMachine</a>."
+"WiÄcej informacji na <a href=\"https://wiki.torproject.org/noreply/";
+"VirtualPrivacyMachine\">https://wiki.torproject.org/noreply/";
+"VirtualPrivacyMachine</a>."
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/faq.wml:703
@@ -1573,8 +1577,8 @@
 "Linuksie, by zapewniÄ maksymalne bezpieczeÅstwo. ZostaÅo zaprojektowane od "
 "podstaw, by zapewniaÄ anonimowoÅÄ i bezpieczeÅstwo, ma wiÄc kilka cech i "
 "ograniczeÅ niespotykanych w innych LiveCD (zwiÄzanych z Torem lub nie). "
-"WiÄcej informacji i pobieranie Anonym.OS jest na stronie <a "
-"href=\"http://theory.kaos.to/projects.html\";>Kaos.Theory</a>."
+"WiÄcej informacji i pobieranie Anonym.OS jest na stronie <a href=\"http://";
+"theory.kaos.to/projects.html\">Kaos.Theory</a>."
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/faq.wml:708
@@ -1586,8 +1590,8 @@
 msgstr ""
 "Phantomix to LiveCD do anonimowego surfowania i czatowania, oparte na "
 "najnowszej wersji systemu KNOPPIX. Zawiera prekonfigurowane Provoxy, Tora i "
-"Polipo. MoÅna je pobraÄ ze <a href=\"http://phantomix.ytternhagen.de/\";>strony "
-"Phantomix</a>."
+"Polipo. MoÅna je pobraÄ ze <a href=\"http://phantomix.ytternhagen.de/";
+"\">strony Phantomix</a>."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:715
@@ -1605,8 +1609,8 @@
 "<a class=\"anchor\" href=\"#ChooseEntryExit\">Can I control which nodes (or "
 "country) are used for entry/exit?</a>"
 msgstr ""
-"<a class=\"anchor\" href=\"#ChooseEntryExit\">Czy mogÄ kontrolowaÄ, ktÃre wÄzÅy "
-"(lub kraje) sÄ uÅywane do wchodzenia/wychodzenia?</a>"
+"<a class=\"anchor\" href=\"#ChooseEntryExit\">Czy mogÄ kontrolowaÄ, ktÃre "
+"wÄzÅy (lub kraje) sÄ uÅywane do wchodzenia/wychodzenia?</a>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:724
@@ -1704,9 +1708,8 @@
 "ustawiajÄc <tt>StrictExitNodes 1</tt> lub <tt>StrictEntryNodes 1</tt> "
 "&mdash; ale jeÅli tak zrobisz, Twoje poÅÄczenia przez Tora przestanÄ "
 "dziaÅaÄ, jeÅli wszystkie podane przez Ciebie wÄzÅy stanÄ siÄ nieosiÄgalne. "
-"Zobacz <a "
-"href=\"https://www.torproject.org/documentation.html.en#NeatLinks\";>strony "
-"statusu Tora</a>, by znaleÅÄ wÄzÅy, ktÃre moÅna wybraÄ."
+"Zobacz <a href=\"https://www.torproject.org/documentation.html.en#NeatLinks";
+"\">strony statusu Tora</a>, by znaleÅÄ wÄzÅy, ktÃre moÅna wybraÄ."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:761
@@ -1764,12 +1767,12 @@
 "month) that you donate, check out the <a href=\"https://wiki.torproject.org/";
 "noreply/TheOnionRouter/TorFAQ#Hibernation\">hibernation feature</a>."
 msgstr ""
-"Tor ma wbudowanÄ obsÅugÄ <a href=\"https://wiki.torproject.org/noreply/TheOni";
-"onRouter/TorFAQ#LimitBandwidth\">ograniczania przepustowoÅci</a>. Ponadto, "
-"jeÅli masz szybkie ÅÄcze, ale chcesz ograniczaÄ liczbÄ bajtÃw na dzieÅ (czy "
-"tydzieÅ, czy miesiÄc), ktÃre dajesz innym, sprawdÅ <a href=\"https://wiki.tor";
-"project.org/noreply/TheOnionRouter/TorFAQ#Hibernation\">moÅliwoÅÄ "
-"hibernacji</a>."
+"Tor ma wbudowanÄ obsÅugÄ <a href=\"https://wiki.torproject.org/noreply/";
+"TheOnionRouter/TorFAQ#LimitBandwidth\">ograniczania przepustowoÅci</a>. "
+"Ponadto, jeÅli masz szybkie ÅÄcze, ale chcesz ograniczaÄ liczbÄ bajtÃw na "
+"dzieÅ (czy tydzieÅ, czy miesiÄc), ktÃre dajesz innym, sprawdÅ <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#Hibernation";
+"\">moÅliwoÅÄ hibernacji</a>."
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:794
@@ -1779,11 +1782,11 @@
 "relay. If you are uncomfortable allowing people to exit from your relay, you "
 "can set it up to only allow connections to other Tor relays."
 msgstr ""
-"KaÅdy przekaÅnik Tora ma <a href=\"#ExitPolicies\">politykÄ wyjÅcia</a>, ktÃra "
-"okreÅla, jakie rodzaje poÅÄczeÅ wychodzÄcych sÄ dozwolone lub zabronione z "
-"danego przekaÅnika. JeÅli nie chcesz pozwalaÄ ludziom na wychodzenie z "
-"Twojego przekaÅnika, moÅesz skonfigurowaÄ go tak, by pozwalaÅ na poÅÄczenia "
-"tylko do innych przekaÅnikÃw Tora."
+"KaÅdy przekaÅnik Tora ma <a href=\"#ExitPolicies\">politykÄ wyjÅcia</a>, "
+"ktÃra okreÅla, jakie rodzaje poÅÄczeÅ wychodzÄcych sÄ dozwolone lub "
+"zabronione z danego przekaÅnika. JeÅli nie chcesz pozwalaÄ ludziom na "
+"wychodzenie z Twojego przekaÅnika, moÅesz skonfigurowaÄ go tak, by pozwalaÅ "
+"na poÅÄczenia tylko do innych przekaÅnikÃw Tora."
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:799
@@ -1874,8 +1877,8 @@
 "wyjÅcia do ich zamierzonych miejsc. W ten sposÃb kaÅdy przekaÅnik moÅe "
 "decydowaÄ o usÅugach, hostach i sieciach, do ktÃrych chce zezwalaÄ na "
 "poÅÄczenia, w oparciu o moÅliwoÅci naduÅyÄ i wÅasnÄ sytuacjÄ. Przeczytaj "
-"wpis do FAQ o <a href=\"<page faq-abuse>#TypicalAbuses\">sprawach, ktÃre moÅna "
-"napotkaÄ w razie uÅywania domyÅlnej polityki wyjÅcia</a>, po czym "
+"wpis do FAQ o <a href=\"<page faq-abuse>#TypicalAbuses\">sprawach, ktÃre "
+"moÅna napotkaÄ w razie uÅywania domyÅlnej polityki wyjÅcia</a>, po czym "
 "przeczytaj <a href=\"https://blog.torproject.org/blog/tips-running-exit-node-";
 "minimal-harassment\">wskazÃwki prowadzenia wÄzÅa wyjÅciowego z minimalnym "
 "naraÅeniem</a> Mike'a Perry'ego."
@@ -1896,13 +1899,13 @@
 "websites or other services."
 msgstr ""
 "DomyÅlna polityka wyjÅcia pozwala na dostÄp do wielu popularnych usÅug (np. "
-"przeglÄdania sieci), ale <a href=\"https://wiki.torproject.org/noreply/TheOni";
-"onRouter/TorFAQ#DefaultPorts\">ogranicza</a> niektÃre ze wzglÄdu na "
+"przeglÄdania sieci), ale <a href=\"https://wiki.torproject.org/noreply/";
+"TheOnionRouter/TorFAQ#DefaultPorts\">ogranicza</a> niektÃre ze wzglÄdu na "
 "moÅliwoÅci naduÅyÄ (np. pocztÄ) i niektÃre, w ktÃrych sieÄ Tora nie mogÅaby "
 "wytrzymaÄ iloÅci danych (np. domyÅlne porty wspÃÅdzielenia plikÃw). MoÅesz "
 "zmieniÄ swojÄ politykÄ wyjÅcia z karty \"Sharing\" (\"WspÃÅdzielenie\") w "
-"programie Vidaila lub poprzez rÄcznÄ edycjÄ swojego pliku <a href=\"https://w";
-"iki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc\">torrc</a>. JeÅli "
+"programie Vidaila lub poprzez rÄcznÄ edycjÄ swojego pliku <a href=\"https://";
+"wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc\">torrc</a>. JeÅli "
 "chcesz uniknÄÄ wiÄkszoÅci, jeÅli nie caÅoÅci, moÅliwoÅci naduÅyÄ, ustaw jÄ "
 "na \"reject *:*\" (lub wyÅÄcz wszystkie opcje w programie Vidalia). To "
 "ustawienie oznacza, Åe TwÃj przekaÅnik bÄdzie wykorzystywany do "
@@ -1936,8 +1939,8 @@
 "<a class=\"anchor\" href=\"#RelayOrBridge\">Should I be a normal relay or "
 "bridge relay?</a>"
 msgstr ""
-"<a class=\"anchor\" href=\"#RelayOrBridge\">Czy powinienem/powinnam prowadziÄ "
-"normalny przekaÅnik, czy przekaÅnik mostkowy?</a>"
+"<a class=\"anchor\" href=\"#RelayOrBridge\">Czy powinienem/powinnam "
+"prowadziÄ normalny przekaÅnik, czy przekaÅnik mostkowy?</a>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:873
@@ -1948,11 +1951,11 @@
 "filter connections to the Tor network probably won't be able to block all "
 "the bridges."
 msgstr ""
-"<a href=\"<page bridges>\">PrzekaÅniki mostkowe</a> (lub w skrÃcie \"mostki\") "
-"sÄ <a href=\"<page docs/tor-doc-relay>\">przekaÅnikami Tora</a>, ktÃre nie sÄ "
-"umieszczane na listach w gÅÃwnym katalogu Tora. To znaczy, Åe nawet jeÅli "
-"dostawca Internetu lub rzÄd prÃbujÄcy filtrowaÄ poÅÄczenia do sieci Tora "
-"prawdopodobnie nie bÄdzie mÃgÅ zablokowaÄ wszystkich mostkÃw."
+"<a href=\"<page bridges>\">PrzekaÅniki mostkowe</a> (lub w skrÃcie \"mostki"
+"\") sÄ <a href=\"<page docs/tor-doc-relay>\">przekaÅnikami Tora</a>, ktÃre "
+"nie sÄ umieszczane na listach w gÅÃwnym katalogu Tora. To znaczy, Åe nawet "
+"jeÅli dostawca Internetu lub rzÄd prÃbujÄcy filtrowaÄ poÅÄczenia do sieci "
+"Tora prawdopodobnie nie bÄdzie mÃgÅ zablokowaÄ wszystkich mostkÃw."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:880
@@ -2010,8 +2013,8 @@
 "<a class=\"anchor\" href=\"#RelayMemory\">Why is my Tor relay using so much "
 "memory?</a>"
 msgstr ""
-"<a class=\"anchor\" href=\"#RelayMemory\">Czemu mÃj przekaÅnik Tora zuÅywa tyle "
-"pamiÄci?</a>"
+"<a class=\"anchor\" href=\"#RelayMemory\">Czemu mÃj przekaÅnik Tora zuÅywa "
+"tyle pamiÄci?</a>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:907
@@ -2053,9 +2056,8 @@
 "JeÅli prowadzisz szybki przekaÅnik, co znaczy, Åe masz otwartych wiele "
 "poÅÄczeÅ TLS, prawdopodobnie tracisz wiele pamiÄci na werwnÄtrzne bufory "
 "OpenSSL (ponad 38kB na gniazdo). ZaÅataliÅmy OpenSSL, by bardziej agresywnie "
-"zwalniaÅ nieuÅywanÄ pamiÄÄ na bufory. JeÅli zainstalujesz OpenSSL "
-"1.0.0-beta5, proces kompilacji Tora automatycznie rozpozna i skorzysta z tej "
-"cechy."
+"zwalniaÅ nieuÅywanÄ pamiÄÄ na bufory. JeÅli zainstalujesz OpenSSL 1.0.0-"
+"beta5, proces kompilacji Tora automatycznie rozpozna i skorzysta z tej cechy."
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/faq.wml:926
@@ -2067,8 +2069,8 @@
 msgstr ""
 "JeÅli jesteÅ na systemie is, OpenBSD, NetBSD, lub starym FreeBSD, Tor "
 "prawdopodobnie uruchamia osobne procesy zamiast uÅywaÄ wÄtkÃw. RozwaÅ zmianÄ "
-"na <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#Relay";
-"OS\">lepszy system operacyjny</a>."
+"na <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
+"TorFAQ#RelayOS\">lepszy system operacyjny</a>."
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/faq.wml:932
@@ -2080,9 +2082,9 @@
 msgstr ""
 "JeÅli dalej nie moÅesz sobie poradziÄ z wykorzystaniem pamiÄci, rozwaÅ "
 "zmniejszenie przepustowoÅci ÅÄcza, ktÃrÄ zgÅasza TwÃj przekaÅnik. ZgÅaszanie "
-"mniejszej przepustowoÅci oznacza, Åe bÄdziesz przyciÄgaÄ mniej "
-"uÅytkownikÃw, wiÄc TwÃj przekaÅnik nie powinien urosnÄÄ aÅ tak bardzo. "
-"SpÃjrz na opcjÄ <tt>MaxAdvertisedBandwidth</tt> na stronie podrÄcznika."
+"mniejszej przepustowoÅci oznacza, Åe bÄdziesz przyciÄgaÄ mniej uÅytkownikÃw, "
+"wiÄc TwÃj przekaÅnik nie powinien urosnÄÄ aÅ tak bardzo. SpÃjrz na opcjÄ "
+"<tt>MaxAdvertisedBandwidth</tt> na stronie podrÄcznika."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:941
@@ -2145,8 +2147,8 @@
 "<a class=\"anchor\" href=\"#KeyManagement\">Tell me about all the keys Tor "
 "uses.</a>"
 msgstr ""
-"<a class=\"anchor\" href=\"#KeyManagement\">Opowiedzcie mi o kluczach uÅywanych "
-"przez Tora.</a>"
+"<a class=\"anchor\" href=\"#KeyManagement\">Opowiedzcie mi o kluczach "
+"uÅywanych przez Tora.</a>"
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:967
@@ -2174,12 +2176,12 @@
 "then breaking into the relay to discover the key won't work."
 msgstr ""
 "<b>Szyfrowanie</b>: po pierwsze, wszystkie poÅÄczenia w sieci Tor korzystajÄ "
-"z szyfrowania TLS, wiÄc obserwatorzy zewnÄtrzni nie mogÄ dowiedzieÄ siÄ, "
-"dla ktÃrego obwodu dana komÃrka jest przeznaczona. Ponadto, klient Tora "
-"uzgadnia efemeryczny klucz szyfrujÄcy z kaÅdym przekaÅnikiem w obwodzie, by "
-"tylko wÄzeÅ wyjÅciowy mÃgÅ przeczytaÄ komÃrki. Obie strony wyrzucajÄ klucz "
-"obwodu, gdy ulega on zamkniÄciu, wiÄc logowanie ruchu i wÅamanie siÄ do "
-"przekaÅnika w celu odkrycia klucza nie podziaÅa."
+"z szyfrowania TLS, wiÄc obserwatorzy zewnÄtrzni nie mogÄ dowiedzieÄ siÄ, dla "
+"ktÃrego obwodu dana komÃrka jest przeznaczona. Ponadto, klient Tora uzgadnia "
+"efemeryczny klucz szyfrujÄcy z kaÅdym przekaÅnikiem w obwodzie, by tylko "
+"wÄzeÅ wyjÅciowy mÃgÅ przeczytaÄ komÃrki. Obie strony wyrzucajÄ klucz obwodu, "
+"gdy ulega on zamkniÄciu, wiÄc logowanie ruchu i wÅamanie siÄ do przekaÅnika "
+"w celu odkrycia klucza nie podziaÅa."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:985
@@ -2192,12 +2194,11 @@
 "relay rotates its onion key once a week."
 msgstr ""
 "<b>Uwierzytelnianie</b>: KaÅdy przekaÅnik sieci Tora ma publiczny klucz "
-"deszyfrujÄcy zwany \"kluczem cebulowym\". Gdy klient Tora uruchamia obwody, na "
-"kaÅdym kroku <a href=\"<gitblob>doc/design-paper/tor-"
-"design.html#subsec:circuits\">ÅÄda, by przekaÅnik sieci udowodniÅ znajomoÅÄ "
-"swojego klucza cebulowego</a>. Tym sposobem, pierwszy wÄzeÅ w ÅcieÅce nie "
-"moÅe podszyÄ siÄ pod resztÄ ÅcieÅki. KaÅdy przekaÅnik zmienia swÃj klucz raz "
-"w tygodniu."
+"deszyfrujÄcy zwany \"kluczem cebulowym\". Gdy klient Tora uruchamia obwody, "
+"na kaÅdym kroku <a href=\"<gitblob>doc/design-paper/tor-design.html#subsec:"
+"circuits\">ÅÄda, by przekaÅnik sieci udowodniÅ znajomoÅÄ swojego klucza "
+"cebulowego</a>. Tym sposobem, pierwszy wÄzeÅ w ÅcieÅce nie moÅe podszyÄ siÄ "
+"pod resztÄ ÅcieÅki. KaÅdy przekaÅnik zmienia swÃj klucz raz w tygodniu."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:995
@@ -2246,10 +2247,9 @@
 "signatures>\">instructions on how to check Tor's signatures</a>."
 msgstr ""
 "SkÄd uÅytkownicy wiedzÄ, Åe dostali wÅaÅciwy program? Gdy wydajemy kod "
-"ÅrÃdÅowy lub paczkÄ, podpisujemy jÄ cyfrowo, uÅywajÄc <a "
-"href=\"http://www.gnupg.org/\";>GNU Privacy Guard</a>. Przeczytaj <a "
-"href=\"<page verifying-signatures>\">instrukcje odnoÅnie weryfikacji podpisÃw "
-"Tora</a>."
+"ÅrÃdÅowy lub paczkÄ, podpisujemy jÄ cyfrowo, uÅywajÄc <a href=\"http://www.";
+"gnupg.org/\">GNU Privacy Guard</a>. Przeczytaj <a href=\"<page verifying-"
+"signatures>\">instrukcje odnoÅnie weryfikacji podpisÃw Tora</a>."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:1024
@@ -2295,8 +2295,8 @@
 "set."
 msgstr ""
 "Wymaganie, by kaÅdy uÅytkownik Tora byÅ przekaÅnikiem pomogÅoby w skalowaniu "
-"sieci, by mogÅa obsÅuÅyÄ wszystkich uÅytkownikÃw, a <a href=\"https://wiki.t";
-"orproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity\">prowadzenie "
+"sieci, by mogÅa obsÅuÅyÄ wszystkich uÅytkownikÃw, a <a href=\"https://wiki.";
+"torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity\">prowadzenie "
 "przekaÅnika Tora moÅe pomÃc Twojej anonimowoÅci</a>. Jednak wielu "
 "uÅytkownikÃw Tora nie moÅe byÄ dobrymi przekaÅnikami &mdash; na przykÅad "
 "czÄÅÄ klientÃw Tora pracuje za restrykcyjnymi zaporami ogniowymi, ÅÄczy siÄ "
@@ -2340,8 +2340,8 @@
 "Po pierwsze, musimy ustabilizowaÄ pracÄ Tora jako przekaÅnika na wszystkich "
 "popularnych systemach. GÅÃwnÄ platformÄ pozostajÄcÄ do zrobienia jest "
 "Windows, planujemy zajÄÄ siÄ tym ostatecznie w 2009. Przeczytaj sekcjÄ 4.1 "
-"<a href=\"https://www.torproject.org/press/2008-12-19-roadmap-press-";
-"release\">naszego planu rozwojowego</a>."
+"<a href=\"https://www.torproject.org/press/2008-12-19-roadmap-press-release";
+"\">naszego planu rozwojowego</a>."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:1071
@@ -2359,8 +2359,8 @@
 "dozwolonej przepustowoÅci ÅÄcza. Przeczytaj punkt 7 w <a href=\"<page "
 "volunteer>#Research\">sekcji badaÅ na stronie wolontariuszy</a>: \"Tor nie "
 "dziaÅa zbyt dobrze, gdy przekaÅniki majÄ asymetryczne ÅÄcze (np. kablÃwka "
-"czy DSL)\". MoÅliwe, Åe <a href=\"https://wiki.torproject.org/noreply/TheOnion";
-"Router/TorFAQ#TransportIPnotTCP\">zmiana na transport UDP</a> jest "
+"czy DSL)\". MoÅliwe, Åe <a href=\"https://wiki.torproject.org/noreply/";
+"TheOnionRouter/TorFAQ#TransportIPnotTCP\">zmiana na transport UDP</a> jest "
 "najprostszÄ odpowiedziÄ &mdash; co z drugiej strony nie jest wcale bardzo "
 "prostÄ odpowiedziÄ."
 
@@ -2379,9 +2379,9 @@
 "wymagaÄ, by kaÅdy przekaÅnik mÃgÅ siÄ poÅÄczyÄ z kaÅdym) i katalogÃw (jak "
 "przestaÄ wymagaÄ, by wszyscy uÅytkownicy Tora wiedzieli o wszystkich "
 "przekaÅnikach). Takie zmiany mogÄ mieÄ wielki wpÅyw na potencjalnÄ i "
-"rzeczywistÄ anonimowoÅÄ. Przeczytaj sekcjÄ 5 dokumentu <a href=\"<gitblob>doc"
-"/design-paper/challenges.pdf\">Wyzwania</a>, by poznaÄ szczegÃÅy. Ponownie, "
-"transport UDP by tu pomÃgÅ."
+"rzeczywistÄ anonimowoÅÄ. Przeczytaj sekcjÄ 5 dokumentu <a href="
+"\"<gitblob>doc/design-paper/challenges.pdf\">Wyzwania</a>, by poznaÄ "
+"szczegÃÅy. Ponownie, transport UDP by tu pomÃgÅ."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:1092
@@ -2401,17 +2401,16 @@
 msgstr ""
 "Po czwarte, musimy lepiej zrozumieÄ ryzyka pÅynÄce z umoÅliwienia "
 "napastnikowi wysyÅania ruchu przez TwÃj przekaÅnik, gdy Ty zaczynasz swÃj "
-"wÅasny ruch anonimowy. <a "
-"href=\"http://freehaven.net/anonbib/#back01\";>Trzy</a> <a "
-"href=\"http://freehaven.net/anonbib/#clog-the-queue\";>rÃÅne</a> dokumenty <a "
-"href=\"http://freehaven.net/anonbib/#torta05\";>badawcze</a> opisujÄ sposoby na "
-"identyfikacjÄ przekaÅnikÃw w obwodzie poprzez kierowanie ruchu przez "
-"wÄzÅy-kandydatÃw i szukanie obniÅania w ruchu w czasie, gdy obwÃd jest "
-"aktywny. Te ataki zatykajÄce nie sÄ tak straszne w kontekÅcie Tora, dopÃki "
-"przekaÅniki nie sÄ klientami. Ale jeÅli prÃbujemy zachÄciÄ wiÄcej klientÃw "
-"do bycia przekaÅnikami (czy jako <a href=\"<page bridges>\">przekaÅniki "
-"mostkowe</a>, czy zwykÅe przekaÅniki), to musimy lepiej zrozumieÄ to "
-"zagroÅenie i nauczyÄ siÄ je ÅagodziÄ."
+"wÅasny ruch anonimowy. <a href=\"http://freehaven.net/anonbib/#back01";
+"\">Trzy</a> <a href=\"http://freehaven.net/anonbib/#clog-the-queue\";>rÃÅne</"
+"a> dokumenty <a href=\"http://freehaven.net/anonbib/#torta05\";>badawcze</a> "
+"opisujÄ sposoby na identyfikacjÄ przekaÅnikÃw w obwodzie poprzez kierowanie "
+"ruchu przez wÄzÅy-kandydatÃw i szukanie obniÅania w ruchu w czasie, gdy "
+"obwÃd jest aktywny. Te ataki zatykajÄce nie sÄ tak straszne w kontekÅcie "
+"Tora, dopÃki przekaÅniki nie sÄ klientami. Ale jeÅli prÃbujemy zachÄciÄ "
+"wiÄcej klientÃw do bycia przekaÅnikami (czy jako <a href=\"<page bridges>"
+"\">przekaÅniki mostkowe</a>, czy zwykÅe przekaÅniki), to musimy lepiej "
+"zrozumieÄ to zagroÅenie i nauczyÄ siÄ je ÅagodziÄ."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:1108
@@ -2423,8 +2422,8 @@
 msgstr ""
 "Po piÄte, moÅemy potrzebowaÄ jakiegoÅ schematu bodÅcÃw do zachÄcana ludzi, "
 "by przekierowywali ruch innych lub zostali wÄzÅami wyjÅciowymi. Tu sÄ nasze "
-"<a href=\"https://blog.torproject.org/blog/two-incentive-designs-tor\";>bieÅÄce "
-"pomysÅy na bodÅce Tora</a>."
+"<a href=\"https://blog.torproject.org/blog/two-incentive-designs-tor";
+"\">bieÅÄce pomysÅy na bodÅce Tora</a>."
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:1115
@@ -2475,6 +2474,6 @@
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TorAbuseTemplates";
 "\">collected here</a>."
 msgstr ""
-"Zestaw szablonÃw dobrych odpowiedzi dostawcom internetu zostaÅ <a href=\"http"
-"s://wiki.torproject.org/noreply/TheOnionRouter/TorAbuseTemplates\">zebrany "
-"tutaj</a>."
+"Zestaw szablonÃw dobrych odpowiedzi dostawcom internetu zostaÅ <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/TorAbuseTemplates";
+"\">zebrany tutaj</a>."

Modified: translation/trunk/projects/website/pl/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/pl/2-medium.verifying-signatures.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/pl/2-medium.verifying-signatures.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 23:31+0100\n"
+"POT-Creation-Date: 2010-03-09 09:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -23,7 +23,7 @@
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/verifying-signatures.wml:10
-#: /tmp/tRmHjYbg9U.xml:33 /tmp/tRmHjYbg9U.xml:45 /tmp/tRmHjYbg9U.xml:92
+#: /tmp/zAnMKHpQll.xml:34 /tmp/zAnMKHpQll.xml:46 /tmp/zAnMKHpQll.xml:93
 #, fuzzy
 msgid "<hr />"
 msgstr "<hr />"
@@ -100,68 +100,73 @@
 msgid "Jacob's (0x9D0FACE4)"
 msgstr "Jacoba (0x9D0FACE4)"
 
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/verifying-signatures.wml:30
+msgid "Erinn's (0x63FEE659) and (0xF1F5C9B5)"
+msgstr ""
+
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:32
+#: /home/runa/tor/website/en/verifying-signatures.wml:33
 #, fuzzy
 msgid "Step One: Import the keys"
 msgstr "Krok pierwszy: Import kluczy"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:34
+#: /home/runa/tor/website/en/verifying-signatures.wml:35
 #, fuzzy
 msgid "You can import keys directly from GnuPG as well:"
 msgstr "MoÅecie importowaÄ klucze takÅe bezpoÅrednio z GnuPG:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:36
+#: /home/runa/tor/website/en/verifying-signatures.wml:37
 #, fuzzy, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --recv-keys 0x28988BF5"
 msgstr "gpg --keyserver subkeys.pgp.net --recv-keys 0x28988BF5"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:38
+#: /home/runa/tor/website/en/verifying-signatures.wml:39
 #, fuzzy
 msgid "or search for keys with"
 msgstr "lub szukaÄ kluczy, wykonujÄc"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:40
+#: /home/runa/tor/website/en/verifying-signatures.wml:41
 #, fuzzy, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --search-keys 0x28988BF5"
 msgstr "gpg --keyserver subkeys.pgp.net --search-keys 0x28988BF5"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:42
+#: /home/runa/tor/website/en/verifying-signatures.wml:43
 #, fuzzy
 msgid "and when you select one, it will be added to your keyring."
 msgstr "a gdy wybierzecie jeden, zostanie on dodany do Waszej bazy kluczy."
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:44
+#: /home/runa/tor/website/en/verifying-signatures.wml:45
 #, fuzzy
 msgid "Step Two: Verify the fingerprints"
 msgstr "Krok drugi: Sprawdzenie \"odciskÃw palcÃw\" (skrÃtÃw) kluczy"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:46
+#: /home/runa/tor/website/en/verifying-signatures.wml:47
 #, fuzzy
 msgid "Verify the pgp fingerprints using:"
 msgstr "SprawdÅcie odciski palcÃw za pomocÄ:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:47
+#: /home/runa/tor/website/en/verifying-signatures.wml:48
 #, fuzzy, no-wrap
 msgid "gpg --fingerprint (insert keyid here)"
 msgstr "gpg --fingerprint (tu id klucza)"
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/verifying-signatures.wml:48
+#: /home/runa/tor/website/en/verifying-signatures.wml:49
 #, fuzzy
 msgid "The fingerprints for the keys should be:"
 msgstr "Odciski palcÃw kluczy powinny byÄ nastÄpujÄce:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:51
+#: /home/runa/tor/website/en/verifying-signatures.wml:52
 #, fuzzy, no-wrap
 msgid ""
 "pub   1024D/28988BF5 2000-02-27\n"
@@ -235,7 +240,7 @@
 "sub   4096g/D5E87583 2008-03-11 [expires: 2010-03-11]\n"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:87
+#: /home/runa/tor/website/en/verifying-signatures.wml:88
 #, fuzzy
 msgid ""
 "(Of course if you want to be really certain that those are the real ones "
@@ -247,13 +252,13 @@
 "w podpisywanie kluczy i zbudowaÄ ÅcieÅkÄ zaufania do tych kluczy.)"
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:91
+#: /home/runa/tor/website/en/verifying-signatures.wml:92
 #, fuzzy
 msgid "Step Three: Verify the downloaded package"
 msgstr "Krok trzeci: weryfikacja pobranej paczki"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:93
+#: /home/runa/tor/website/en/verifying-signatures.wml:94
 #, fuzzy
 msgid ""
 "If you're using GnuPG, then put the .asc and the download in the same "
@@ -267,7 +272,7 @@
 "\" (\"NIEPRAWIDÅOWY podpis\")  po tym typie komendy:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:99
+#: /home/runa/tor/website/en/verifying-signatures.wml:100
 #, fuzzy, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc tor-0.1.0.17.tar.gz\n"
@@ -287,7 +292,7 @@
 "Primary key fingerprint: B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:109
+#: /home/runa/tor/website/en/verifying-signatures.wml:110
 #, fuzzy
 msgid ""
 "Notice that there is a warning because you haven't assigned a trust index to "
@@ -309,7 +314,7 @@
 "WiÄc jeÅli ufasz tej osobie trzeciej, masz stopieÅ zaufania do arma/nick."
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:118
+#: /home/runa/tor/website/en/verifying-signatures.wml:119
 #, fuzzy
 msgid "All this means is you can ignore the message or assign a trust level."
 msgstr ""
@@ -317,7 +322,7 @@
 "zaufania."
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:120
+#: /home/runa/tor/website/en/verifying-signatures.wml:121
 #, fuzzy
 msgid ""
 "For your reference, this is an example of a <em>BAD</em> verification. It "
@@ -327,7 +332,7 @@
 "weryfikacji.  Oznacza ona, Åe podpis i zawartoÅÄ pliku nie pasujÄ:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:124
+#: /home/runa/tor/website/en/verifying-signatures.wml:125
 #, fuzzy, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc\n"
@@ -339,7 +344,7 @@
 "gpg: BAD signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:129
+#: /home/runa/tor/website/en/verifying-signatures.wml:130
 #, fuzzy
 msgid ""
 "If you see a message like the above one, then you should not trust the file "
@@ -348,7 +353,7 @@
 "JeÅli zobaczycie takÄ wiadomoÅÄ, nie powinniÅcie ufaÄ zawartoÅci pliku."
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:131
+#: /home/runa/tor/website/en/verifying-signatures.wml:132
 #, fuzzy
 msgid ""
 "If you are running Tor on Debian you should read the instructions on <a href="

Modified: translation/trunk/projects/website/pl/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/pl/3-low.download-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/pl/3-low.download-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:26+0100\n"
+"POT-Creation-Date: 2010-03-09 09:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/wAfcrUrb_S.xml:40
-#: /tmp/wAfcrUrb_S.xml:56 /tmp/wAfcrUrb_S.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/O9hmGysivx.xml:40
+#: /tmp/O9hmGysivx.xml:56 /tmp/O9hmGysivx.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -184,54 +184,79 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:84
-msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgid ""
+"<img src=\"images/distros/android-market.gif\" alt=\"Android\" width=\"32\" "
+"height=\"32\"/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:85
-msgid "Source tarballs"
+msgid "Android"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /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/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/tor/website/en/download-unix.wml:92
+msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:93
+msgid "Source tarballs"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:95
+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/tor/website/en/download-unix.wml:91
+#: /home/runa/tor/website/en/download-unix.wml:99
 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/tor/website/en/download-unix.wml:94
+#: /home/runa/tor/website/en/download-unix.wml:102
 msgid "<kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:101
+#: /home/runa/tor/website/en/download-unix.wml:109
 msgid "<a id=\"packagediff\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:102
+#: /home/runa/tor/website/en/download-unix.wml:110
 msgid ""
 "<a class=\"anchor\" href=\"#packagediff\">What's the difference between "
 "Stable &amp; Unstable?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:105
+#: /home/runa/tor/website/en/download-unix.wml:113
 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/tor/website/en/download-unix.wml:109
+#: /home/runa/tor/website/en/download-unix.wml:117
 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 "
@@ -241,7 +266,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:118
+#: /home/runa/tor/website/en/download-unix.wml:126
 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 "
@@ -251,7 +276,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:125
+#: /home/runa/tor/website/en/download-unix.wml:133
 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 "
@@ -259,7 +284,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:134
+#: /home/runa/tor/website/en/download-unix.wml:142
 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 "
@@ -269,7 +294,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><form>
-#: /home/runa/tor/website/en/download-unix.wml:142
+#: /home/runa/tor/website/en/download-unix.wml:150
 msgid ""
 "<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
 "\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
@@ -278,18 +303,18 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:152
+#: /home/runa/tor/website/en/download-unix.wml:160
 msgid "<a id=\"Warning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:153
+#: /home/runa/tor/website/en/download-unix.wml:161
 msgid ""
 "<a class=\"anchor\" href=\"#Warning\">Warning: Want Tor to really work?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:157
+#: /home/runa/tor/website/en/download-unix.wml:165
 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> "
@@ -298,7 +323,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:165
+#: /home/runa/tor/website/en/download-unix.wml:173
 msgid ""
 "Tor only protects Internet applications that are configured to send their "
 "traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
@@ -308,7 +333,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:173
+#: /home/runa/tor/website/en/download-unix.wml:181
 msgid ""
 "Browser plugins such as Java, Flash, ActiveX, RealPlayer, Quicktime, Adobe's "
 "PDF plugin, and others can be manipulated into revealing your IP address. "
@@ -324,7 +349,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:189
+#: /home/runa/tor/website/en/download-unix.wml:197
 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. "
@@ -334,7 +359,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:197
+#: /home/runa/tor/website/en/download-unix.wml:205
 msgid ""
 "Tor anonymizes the origin of your traffic, and it encrypts everything inside "
 "the Tor network, but <a href=\"https://wiki.torproject.org/noreply/";
@@ -346,7 +371,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:208
+#: /home/runa/tor/website/en/download-unix.wml:216
 msgid ""
 "While Tor blocks attackers on your local network from discovering or "
 "influencing your destination, it opens new risks: malicious or misconfigured "
@@ -355,12 +380,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:216
+#: /home/runa/tor/website/en/download-unix.wml:224
 msgid "<br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:218
+#: /home/runa/tor/website/en/download-unix.wml:226
 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 "
@@ -368,7 +393,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:228
+#: /home/runa/tor/website/en/download-unix.wml:236
 msgid ""
 "See our <a href=\"<page verifying-signatures>\">FAQ entry on verifying "
 "package signatures</a>, which allows you to make sure you've downloaded the "
@@ -376,7 +401,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:234
+#: /home/runa/tor/website/en/download-unix.wml:242
 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</"
@@ -384,7 +409,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:240
+#: /home/runa/tor/website/en/download-unix.wml:248
 msgid ""
 "See the <a href=\"<page documentation>#Developers\">developer documentation</"
 "a> for instructions on fetching Tor from Git to get the very latest "
@@ -394,19 +419,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:252
+#: /home/runa/tor/website/en/download-unix.wml:260
 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/tor/website/en/download-unix.wml:256
+#: /home/runa/tor/website/en/download-unix.wml:264
 msgid "<a id=\"ChangeLog\"></a> <a id=\"Stable\"></a> <a id=\"Testing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:260
+#: /home/runa/tor/website/en/download-unix.wml:268
 msgid ""
 "For a list of what has changed in each stable Tor release, see the <a href="
 "\"<gitblob>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in both "

Modified: translation/trunk/projects/website/pl/3-low.people.po
===================================================================
--- translation/trunk/projects/website/pl/3-low.people.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/pl/3-low.people.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 09:57+0100\n"
+"POT-Creation-Date: 2010-03-09 09:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -69,8 +69,8 @@
 #: /home/runa/tor/website/en/people.wml:30
 #, fuzzy
 msgid ""
-"The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA<br /"
-"><br />"
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 "
+"USA<br /><br />"
 msgstr ""
 "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA<br /"
 "><br />"
@@ -698,12 +698,34 @@
 
 #. type: Content of: <div><dl><dt>
 #: /home/runa/tor/website/en/people.wml:202
+msgid "Marco Bonetti"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:202
+msgid "Focusing on MobileTor for the iPhone."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:203
+msgid "Nathan Freitas"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:203
+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/tor/website/en/people.wml:205
 #, fuzzy
 msgid "Kasimir Gabert"
 msgstr "Kasimir Gabert"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:202
+#: /home/runa/tor/website/en/people.wml:205
 #, fuzzy
 msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\";>TorStatus</a> "
@@ -713,26 +735,26 @@
 "statystykami."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 #, fuzzy
 msgid "Robert Hogan"
 msgstr "Robert Hogan"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 #, fuzzy
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\";>TorK</a> Tor controller."
 msgstr "Deweloper kontrolera Tora <a href=\"http://tork.sf.net/\";>TorK</a>."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 #, fuzzy
 msgid "Damian Johnson"
 msgstr "Damian Johnson"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 #, fuzzy
 msgid ""
 "Builds a command-line application for monitoring Tor relays, providing real-"
@@ -746,13 +768,13 @@
 "\"https://tor-svn.freehaven.net/svn/arm/trunk/readme.txt\";>kod</a>)."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 #, fuzzy
 msgid "Fabian Keil"
 msgstr "Fabian Keil"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 #, fuzzy
 msgid ""
 "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
@@ -762,36 +784,36 @@
 "dziaÅajÄ dobrze razem."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 #, fuzzy
 msgid "Kory Kirk"
 msgstr "Kory Kirk"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid ""
 "Worked during Google Summer of Code 2009 on extending Torbutton. Now he's "
 "working with Bruce Leidl on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Bruce Leidl"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Working on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 #, fuzzy
 msgid "Julius Mittenzwei"
 msgstr "Julius Mittenzwei"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 #, fuzzy
 msgid ""
 "A lawyer with the CCC in Germany. Coordinates the German Tor community with "
@@ -801,13 +823,13 @@
 "prawnych."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 #, fuzzy
 msgid "Shava Nerad"
 msgstr "Shava Nerad"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 #, fuzzy
 msgid ""
 "Our former Development Director. She still works on PR and community "
@@ -817,13 +839,25 @@
 "relations) i relacjami ze spoÅeczeÅstwem."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:224
+msgid "Linus Nordberg"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:224
+msgid ""
+"Enjoys measuring the Tor network and helps with outreach in the Nordic "
+"countries."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:226
 #, fuzzy
 msgid "Lasse &Oslash;verlier"
 msgstr "Lasse Ãverlier"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:226
 #, fuzzy
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
@@ -833,13 +867,13 @@
 "zarzÄdzanie zasobami, zwÅaszcza dla usÅug ukrytych."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 #, fuzzy
 msgid "Martin Peck"
 msgstr "Martin Peck (Deweloper)"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 #, fuzzy
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
@@ -849,14 +883,14 @@
 "serwerÃw proxy dla klientÃw Tora na Windows."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:225
+#: /home/runa/tor/website/en/people.wml:230
 #, fuzzy
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 "rovv (to jest pseudonim -- udaÅo mu siÄ pozostaÄ anonimowym nawet dla nas!)"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:231
 #, fuzzy
 msgid ""
 "The most dedicated bug reporter we've ever heard from. He must read Tor "
@@ -866,13 +900,13 @@
 "ÅrÃdÅowy Tora codziennie przy Åniadaniu."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 #, fuzzy
 msgid "tup (another pseudonym)"
 msgstr "Tup (to teÅ jest pseudonim)"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 #, fuzzy
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a href="
@@ -886,13 +920,13 @@
 "p56soo2ibjkx23xo.onion/\">kodem TorDNSEL</a>."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 #, fuzzy
 msgid "Kyle Williams"
 msgstr "Kyle Williams"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 #, fuzzy
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
@@ -902,13 +936,13 @@
 "uÅatwia zainstalowanie i uÅywanie Tora."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 #, fuzzy
 msgid "Ethan Zuckerman"
 msgstr "Ethan Zuckerman"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 #, fuzzy
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?";
@@ -922,7 +956,7 @@
 "aktywistÃw z caÅego Åwiata o Torze i podobnych narzÄdziach."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:241
+#: /home/runa/tor/website/en/people.wml:246
 #, fuzzy
 msgid ""
 "All our relay operators, people who write <a href=\"http://freehaven.net/";
@@ -934,35 +968,35 @@
 "ktÃrzy uczÄ innych uÅywaÄ Tora itd."
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:252
 #, fuzzy
 msgid "<a id=\"Past\"></a>"
 msgstr "<a id=\"Past\"></a>"
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:248
+#: /home/runa/tor/website/en/people.wml:253
 #, fuzzy
 msgid "<a class=\"anchor\" href=\"#Past\">Past thanks to:</a>"
 msgstr "<a class=\"anchor\" href=\"#Past\">Dalsze podziÄkowania:</a>"
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "John Bashinski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "Contributed the initial rpm spec file."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 #, fuzzy
 msgid "Domenik Bork"
 msgstr "Domenik Bork"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 #, fuzzy
 msgid ""
 "Worked on Configuration of Hidden Services with User Authorization in "
@@ -974,13 +1008,13 @@
 "services\">svn</a>)  jako czÄÅÄ Google Summer of Code 2008."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 #, fuzzy
 msgid "Benedikt Boss"
 msgstr "Benedikt Boss"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 #, fuzzy
 msgid ""
 "Worked during the 2007 Google Summer of Code on <a href=\"https://svn.";
@@ -992,25 +1026,25 @@
 "dla Tora; prowadzony przez Rogera."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 #, fuzzy
 msgid "Ren Bucholz"
 msgstr "Ren Bucholz"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 #, fuzzy
 msgid "Our fine logo and images."
 msgstr "Nasze Åadne logo i obrazki."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 #, fuzzy
 msgid "Fallon Chen"
 msgstr "Fallon Chen"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 #, fuzzy
 msgid ""
 "Worked on Improving Tor Path Selection (<a href=\"https://svn.torproject.org/";
@@ -1025,13 +1059,13 @@
 "czÄÅÄ Google Summer of Code 2008."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 #, fuzzy
 msgid "Bram Cohen"
 msgstr "Bram Cohen"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 #, fuzzy
 msgid "Helped design our congestion control mechanisms, in Tor's early days."
 msgstr ""
@@ -1039,25 +1073,25 @@
 "Tora."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 #, fuzzy
 msgid "Pat Double"
 msgstr "Pat Double"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 #, fuzzy
 msgid "Creator of the Incognito LiveCD."
 msgstr "TwÃrca Incognito LiveCD."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 #, fuzzy
 msgid "Geoff Goodell"
 msgstr "Geoff Goodell"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 #, fuzzy
 msgid ""
 "Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/";
@@ -1069,13 +1103,13 @@
 "zmotywowaÄ protokÃÅ kontroli Tora, by byÅ tak elastyczny, jak jest dziÅ."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 #, fuzzy
 msgid "Aleksei Gorny"
 msgstr "Aleksei Gorny"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 #, fuzzy
 msgid ""
 "Working on Tor exit scanner improvements (<a href=\"https://svn.torproject.";
@@ -1087,56 +1121,56 @@
 "zaczÄtymi jako czÄÅÄ Google Summer of Code 2008."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 #, fuzzy
 msgid "Christian Grothoff"
 msgstr "Christian King"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Contributed better daemonizing behavior."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Steven Hazel"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Made 'make install' do the right thing."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 #, fuzzy
 msgid "Justin Hipple"
 msgstr "Justin Hipple"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 #, fuzzy
 msgid "The other developer for Vidalia."
 msgstr "Kolejny deweloper programu Vidalia."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Jason Holt"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Contributed patches to the instructions and the man page."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 #, fuzzy
 msgid "Christian King"
 msgstr "Christian King"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 #, fuzzy
 msgid ""
 "Worked during the 2007 Google Summer of Code on making Tor relays stable on "
@@ -1149,13 +1183,13 @@
 "libevent</a>; prowadzony przez Nicka."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 #, fuzzy
 msgid "Joe Kowalski"
 msgstr "Joe Kowalski"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 #, fuzzy
 msgid ""
 "Original author and provider of the torstatus script formerly run on "
@@ -1163,25 +1197,25 @@
 msgstr "Pierwszy autor skryptu torstatus uruchamianego kiedyÅ na nighteffect."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 #, fuzzy
 msgid "Adam Langley"
 msgstr "Adam Langley"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 #, fuzzy
 msgid "Our fine eventdns code."
 msgstr "Nasz dobry kod eventdns."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 #, fuzzy
 msgid "Rebecca MacKinnon"
 msgstr "Rebecca MacKinnon"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 #, fuzzy
 msgid ""
 "Former Director of Tor.  Co-Founder of <a href=\"http://www.";
@@ -1191,13 +1225,13 @@
 "\">Global Voices Online</a>."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 #, fuzzy
 msgid "Chris Palmer"
 msgstr "Chris Palmer"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 #, fuzzy
 msgid ""
 "Our liaison and tech guy with EFF while EFF was funding us. Also helped "
@@ -1208,13 +1242,13 @@
 "dokumentacji uÅytkownika."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 #, fuzzy
 msgid "Matej Pfajfar"
 msgstr "Matej Pfajfar"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 #, fuzzy
 msgid ""
 "Author of the original onion routing code that Tor is based on, so we didn't "
@@ -1224,13 +1258,13 @@
 "dziÄki ktÃremu nie musieliÅmy zaczynaÄ od zera."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 #, fuzzy
 msgid "Johannes Renner"
 msgstr "Johannes Renner"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 #, fuzzy
 msgid ""
 "Worked during the 2007 Google Summer of Code on modifying <a href=\"https://";
@@ -1242,13 +1276,13 @@
 "mierzyÄ rÃÅne wÅaÅciwoÅci sieci Tora; prowadzony przez Mike'a Perry'ego."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 #, fuzzy
 msgid "Scott Squires"
 msgstr "Scott Squires"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 #, fuzzy
 msgid ""
 "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
@@ -1257,23 +1291,23 @@
 "\">Torbutton</a>."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Aaron Turner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Contributed the first version of the tor.sh initscripts shell script."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 #, fuzzy
 msgid "Stephen Tyree"
 msgstr "Stephen Tyree"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 #, fuzzy
 msgid ""
 "Worked during Google Summer of Code 2009 to develop a plugin API for <a href="
@@ -1289,13 +1323,13 @@
 "\">kod</a>).  Mentor: Matt Edman"
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 #, fuzzy
 msgid "Camilo Viecco"
 msgstr "Camilo Viecco"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 #, fuzzy
 msgid ""
 "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac.";
@@ -1307,13 +1341,13 @@
 "\">svn</a>)  jako czÄÅÄ Google Summer of Code 2008."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 #, fuzzy
 msgid "Fred von Lohmann"
 msgstr "Fred von Lohmann (Dyrektor)"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 #, fuzzy
 msgid ""
 "Fred served on our Board of Directors from 2006 through 2009.  His complete "
@@ -1326,13 +1360,13 @@
 "Personelu EFF</a>."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 #, fuzzy
 msgid "Christian Wilms"
 msgstr "Christian Wilms"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 #, fuzzy
 msgid ""
 "Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
@@ -1344,13 +1378,13 @@
 "\">svn</a>)  jako czÄÅÄ Google Summer of Code 2008."
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 #, fuzzy
 msgid "Jillian C. York"
 msgstr "Jillian C. York"
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 #, fuzzy
 msgid ""
 "<a href=\"http://jilliancyork.com/\";>Jillian C. York</a> is a writer, "

Modified: translation/trunk/projects/website/pl/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/pl/4-optional.volunteer.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/pl/4-optional.volunteer.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 09:57+0100\n"
+"POT-Creation-Date: 2010-03-09 09:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,21 +252,22 @@
 "Messaging client). Components are pre-configured to operate in a secure way, "
 "and it has very few dependencies on the installed operating system. It has "
 "therefore become one of the most easy to use, and popular, ways to use Tor "
-"on Windows.  <br /> However, there is currently no working package for Linux "
-"and Mac OS X, so this project would be to implement Tor Browser Bundle for "
-"these platforms. This will involve modifications to Vidalia (C++), possibly "
-"Firefox (C) then creating and testing the launcher on a range of operating "
-"system versions and configurations to verify portability.  Some work on this "
-"was completed as part of the Google Summer of Code 2009. Another part of "
-"this project is to identify all of the traces left behind by using a Tor "
-"Browser Bundle on Mac OS X or Linux.  Developing ways to stop, counter, or "
-"remove these traces is a final step.  <br /> Students should be familiar "
-"with application development on one or preferably both of Linux and Mac OS "
-"X, and be comfortable with C/C++ and shell scripting.  <br /> Part of this "
-"project could be usability testing of Tor Browser Bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
+"on Windows.  <br /> However, there is currently no released package for "
+"Linux and Mac OS X, so this project would be to implement Tor Browser Bundle "
+"for OS X and continue work on the Tor Browser Bundle for Linux. This will "
+"involve modifications to Vidalia (C++), possibly Firefox (C) then creating "
+"and testing the launcher on a range of operating system versions and "
+"configurations to verify portability.  Some work on this was completed as "
+"part of the Google Summer of Code 2009. Another part of this project is to "
+"identify all of the traces left behind by using a Tor Browser Bundle on Mac "
+"OS X or Linux.  Developing ways to stop, counter, or remove these traces is "
+"a final step.  <br /> Students should be familiar with application "
+"development on one or preferably both of Linux and Mac OS X, and be "
+"comfortable with C/C++ and shell scripting.  <br /> Part of this project "
+"could be usability testing of Tor Browser Bundle, ideally amongst our target "
+"demographic.  That would help a lot in knowing what needs to be done in "
+"terms of bug fixes or new features. We get this informally at the moment, "
+"but a more structured process would be better."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -320,27 +321,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:225
-msgid ""
-"<b>Tuneup Tor!</b> <br /> Priority: <i>Medium to High</i> <br /> Effort "
-"Level: <i>Medium to High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Nick, Roger, Mike, Karsten</i> <br /> Right now, Tor relays "
-"measure and report their own bandwidth, and Tor clients choose which relays "
-"to use in part based on that bandwidth.  This approach is vulnerable to <a "
-"href=\"http://freehaven.net/anonbib/#bauer:wpes2007\";>attacks where relays "
-"lie about their bandwidth</a>; to address this, Tor currently caps the "
-"maximum bandwidth it's willing to believe any relay provides.  This is a "
-"limited fix, and a waste of bandwidth capacity to boot.  Instead, Tor should "
-"possibly measure bandwidth in a more distributed way, perhaps as described "
-"in the <a href=\"http://freehaven.net/anonbib/author.html#snader08\";>\"A "
-"Tune-up for Tor\"</a> paper by Snader and Borisov. One could use current "
-"testing code to double-check this paper's findings and verify the extent to "
-"which they dovetail with Tor as deployed in the wild, and determine good "
-"ways to incorporate them into their suggestions Tor network without adding "
-"too much communications overhead between relays and directory authorities."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:256
 msgid ""
 "<b>Improving Polipo on Windows</b> <br /> Priority: <i>Medium to High</i> "
@@ -382,17 +362,17 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:283
 msgid ""
-"<b>Tor Controller Status Event Interface</b> <br /> Priority: <i>Medium</i> "
-"<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> "
-"<br /> Likely Mentors: <i>Matt</i> <br /> There are a number of status "
-"changes inside Tor of which the user may need to be informed. For example, "
-"if the user is trying to set up his Tor as a relay and Tor decides that its "
-"ports are not reachable from outside the user's network, we should alert the "
-"user. Currently, all the user gets is a couple log messages in Vidalia's "
-"'message log' window, which they likely never see since they don't receive a "
-"notification that something has gone wrong. Even if the user does actually "
-"look at the message log, most of the messages make little sense to the "
-"novice user.  <br /> Tor has the ability to inform Vidalia of many such "
+"<b>Tor Controller Status Event Interface for Vidalia</b> <br /> Priority: "
+"<i>Medium</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low "
+"to Medium</i> <br /> Likely Mentors: <i>Matt</i> <br /> There are a number "
+"of status changes inside Tor of which the user may need to be informed. For "
+"example, if the user is trying to set up his Tor as a relay and Tor decides "
+"that its ports are not reachable from outside the user's network, we should "
+"alert the user. Currently, all the user gets is a couple log messages in "
+"Vidalia's 'message log' window, which they likely never see since they don't "
+"receive a notification that something has gone wrong. Even if the user does "
+"actually look at the message log, most of the messages make little sense to "
+"the novice user.  <br /> Tor has the ability to inform Vidalia of many such "
 "status changes, and we recently implemented support for a couple of these "
 "events. Still, there are many more status events the user should be informed "
 "of and we need a better UI for actually displaying them to the user.  <br /> "
@@ -477,40 +457,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:415
-msgid ""
-"<b>New Thandy Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Medium to High</i> <br /> Likely "
-"Mentors: <i>Martin</i> <br /> Additional capabilities are needed for "
-"assisted updates of all the Tor related software for Windows and other "
-"operating systems. Some of the features to consider include:"
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:429
-msgid ""
-"Integration of the <a href=\"http://chandlerproject.org/Projects/MeTooCrypto";
-"\">MeTooCrypto Python library</a> for authenticated HTTPS downloads."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:433
-msgid ""
-"Adding a level of indirection between the timestamp signatures and the "
-"package files included in an update. See the \"Thandy attacks / suggestions"
-"\" thread on or-dev."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:436
-msgid ""
-"Support locale specific installation and configuration of assisted updates "
-"based on preference, host, or user account language settings.  Familiarity "
-"with Windows codepages, unicode, and other character sets is helpful in "
-"addition to general win32 and posix API experience and Python proficiency."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:445
 msgid ""
 "<b>Simulator for slow Internet connections</b> <br /> Priority: <i>Medium</"
@@ -558,27 +504,14 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:509
 msgid ""
-"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Low</i> <br /"
-"> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Mike</i> <br /> We're hearing from an increasing number of users "
-"that they want to use Thunderbird with Tor. However, there are plenty of "
-"application-level concerns, for example, by default Thunderbird will put "
-"your hostname in the outgoing mail that it sends. At some point we should "
-"start a new push to build a Thunderbird extension similar to Torbutton."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:527
-msgid ""
-"<b>Intermediate Level Network Device Driver</b> <br /> Priority: <i>Low</i> "
+"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Medium</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> "
-"Likely Mentors: <i>Martin</i> <br /> The WinPCAP device driver used by Tor "
-"VM for bridged networking does not support a number of wireless and non-"
-"Ethernet network adapters.  Implementation of a intermediate level network "
-"device driver for win32 and 64bit would provide a way to intercept and route "
-"traffic over such networks. This project will require knowledge of and "
-"experience with Windows kernel device driver development and testing. "
-"Familiarity with Winsock and Qemu would also be helpful."
+"Likely Mentors: <i>Mike</i> <br /> We're hearing from an increasing number "
+"of users that they want to use Thunderbird with Tor. However, there are "
+"plenty of application-level concerns, for example, by default Thunderbird "
+"will put your hostname in the outgoing mail that it sends. At some point we "
+"should start a new push to build a Thunderbird extension similar to "
+"Torbutton."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -643,35 +576,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:621
-msgid ""
-"<b>Tor/Polipo/Vidalia Auto-Update Framework</b> <br /> We're in need of a "
-"good authenticated-update framework.  Vidalia already has the ability to "
-"notice when the user is running an outdated or unrecommended version of Tor, "
-"using signed statements inside the Tor directory information. Currently, "
-"Vidalia simply pops up a little message box that lets the user know they "
-"should manually upgrade. The goal of this project would be to extend Vidalia "
-"with the ability to also fetch and install the updated Tor software for the "
-"user. We should do the fetches via Tor when possible, but also fall back to "
-"direct fetches in a smart way. Time permitting, we would also like to be "
-"able to update other applications included in the bundled installers, such "
-"as Polipo and Vidalia itself.  <br /> To complete this project, the student "
-"will first need to first investigate the existing auto-update frameworks (e."
-"g., Sparkle on OS X) to evaluate their strengths, weaknesses, security "
-"properties, and ability to be integrated into Vidalia. If none are found to "
-"be suitable, the student will design their own auto-update framework, "
-"document the design, and then discuss the design with other developers to "
-"assess any security issues. The student will then implement their framework "
-"(or integrate an existing one) and test it.  <br /> A person undertaking "
-"this project should have good C++ development experience. Previous "
-"experience with Qt is helpful, but not required. One should also have a good "
-"understanding of common security practices, such as package signature "
-"verification. Good writing ability is also important for this project, since "
-"a vital step of the project will be producing a design document to review "
-"and discuss with others prior to implementation."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:655
 msgid ""
 "<b>Improving the Tor QA process: Continuous Integration for builds</b> <br /"
@@ -699,17 +603,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:683
-msgid ""
-"<b>Usability testing of Tor</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> <br /> Likely "
-"Mentors: <i>Andrew</i> <br /> Especially the browser bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:700
 msgid ""
 "<b>An authenticating IRC proxy</b> <br /> Priority: <i>Medium</i> <br /> "

Modified: translation/trunk/projects/website/pl/docs/3-low.debian.po
===================================================================
--- translation/trunk/projects/website/pl/docs/3-low.debian.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/pl/docs/3-low.debian.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 21:29+0100\n"
+"POT-Creation-Date: 2010-03-09 09:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -28,8 +28,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/r1nIu4nR_s.xml:40
-#: /tmp/r1nIu4nR_s.xml:96 /tmp/r1nIu4nR_s.xml:130
+#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/j_XgEgNQ6H.xml:40
+#: /tmp/j_XgEgNQ6H.xml:96 /tmp/j_XgEgNQ6H.xml:130
 msgid "<br />"
 msgstr ""
 
@@ -49,8 +49,8 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/r1nIu4nR_s.xml:77
-#: /tmp/r1nIu4nR_s.xml:121 /tmp/r1nIu4nR_s.xml:164
+#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/j_XgEgNQ6H.xml:77
+#: /tmp/j_XgEgNQ6H.xml:121 /tmp/j_XgEgNQ6H.xml:164
 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."
@@ -94,8 +94,9 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:59
 msgid ""
-"where you substitute the above word (etch, lenny, sid, karmic, jaunty, "
-"intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you put the codename of your distribution (i.e. etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy or whatever it is) in place of &lt;"
+"DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -165,8 +166,8 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:106
 msgid ""
-"where you substitute the name of your distro (etch, lenny, sid, karmic, "
-"jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you again substitute the name of your distro (etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/pl/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/pl/docs/3-low.tor-doc-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/pl/docs/3-low.tor-doc-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:26+0100\n"
+"POT-Creation-Date: 2010-03-09 09:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -23,9 +23,9 @@
 "Uruchamianie klienta <a href=\"<page index>\">Tor</a> na Linux/BSD/Unix"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/rAVGZsp_zV.xml:24
-#: /tmp/rAVGZsp_zV.xml:54 /tmp/rAVGZsp_zV.xml:88 /tmp/rAVGZsp_zV.xml:131
-#: /tmp/rAVGZsp_zV.xml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/270GeBhKUq.xml:24
+#: /tmp/270GeBhKUq.xml:54 /tmp/270GeBhKUq.xml:88 /tmp/270GeBhKUq.xml:131
+#: /tmp/270GeBhKUq.xml:169
 #, fuzzy
 msgid "<br />"
 msgstr "<br />"
@@ -82,10 +82,10 @@
 "If you're building from source, first install <a href=\"http://www.monkey.";
 "org/~provos/libevent/\">libevent</a>, and make sure you have openssl and "
 "zlib (including the -devel packages if applicable). Then run:<br /> <tt>tar "
-"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable><br /> ./configure "
-"&amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</tt>, or "
-"you can run <tt>make install</tt> (as root if necessary) to install it into /"
-"usr/local/, and then you can start it just by running <tt>tor</tt>."
+"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable></tt><br /> <tt>./"
+"configure &amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</"
+"tt>, or you can run <tt>make install</tt> (as root if necessary) to install "
+"it into /usr/local/, and then you can start it just by running <tt>tor</tt>."
 msgstr ""
 "JeÅli masz zamiar kompilowaÄ Tora, najpierw zainstaluj <a href=\"http://www.";
 "monkey.org/~provos/libevent/\">libevent</a>, i upewnij siÄ, Åe masz OpenSSL "

Modified: translation/trunk/projects/website/pt/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/pt/2-medium.donate.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/pt/2-medium.donate.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 09:58+0100\n"
+"POT-Creation-Date: 2010-03-09 09:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -61,7 +61,7 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:32 /tmp/oMk9b8SXpl.xml:102
+#: /home/runa/tor/website/en/donate.wml:32 /tmp/Hh_njFJHtf.xml:102
 msgid "<br />"
 msgstr ""
 
@@ -143,17 +143,17 @@
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:72 /tmp/oMk9b8SXpl.xml:114
+#: /home/runa/tor/website/en/donate.wml:72 /tmp/Hh_njFJHtf.xml:114
 msgid "$"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:73 /tmp/oMk9b8SXpl.xml:115
+#: /home/runa/tor/website/en/donate.wml:73 /tmp/Hh_njFJHtf.xml:115
 msgid "â"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:74 /tmp/oMk9b8SXpl.xml:116
+#: /home/runa/tor/website/en/donate.wml:74 /tmp/Hh_njFJHtf.xml:116
 msgid "Â"
 msgstr ""
 
@@ -248,7 +248,8 @@
 
 #. type: Content of: <div><p><address>
 #: /home/runa/tor/website/en/donate.wml:136
-msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
+msgid ""
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 USA"
 msgstr ""
 
 #. type: Content of: <div><p>

Modified: translation/trunk/projects/website/pt/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/pt/2-medium.verifying-signatures.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/pt/2-medium.verifying-signatures.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-13 17:56+0100\n"
+"POT-Creation-Date: 2010-03-09 09:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -22,7 +22,7 @@
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/verifying-signatures.wml:10
-#: /tmp/7bzktAU53o.xml:33 /tmp/7bzktAU53o.xml:45 /tmp/7bzktAU53o.xml:92
+#: /tmp/Y0Ol4tutqi.xml:34 /tmp/Y0Ol4tutqi.xml:46 /tmp/Y0Ol4tutqi.xml:93
 msgid "<hr />"
 msgstr ""
 
@@ -80,61 +80,66 @@
 msgid "Jacob's (0x9D0FACE4)"
 msgstr ""
 
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/verifying-signatures.wml:30
+msgid "Erinn's (0x63FEE659) and (0xF1F5C9B5)"
+msgstr ""
+
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:32
+#: /home/runa/tor/website/en/verifying-signatures.wml:33
 msgid "Step One: Import the keys"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:34
+#: /home/runa/tor/website/en/verifying-signatures.wml:35
 msgid "You can import keys directly from GnuPG as well:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:36
+#: /home/runa/tor/website/en/verifying-signatures.wml:37
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --recv-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:38
+#: /home/runa/tor/website/en/verifying-signatures.wml:39
 msgid "or search for keys with"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:40
+#: /home/runa/tor/website/en/verifying-signatures.wml:41
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --search-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:42
+#: /home/runa/tor/website/en/verifying-signatures.wml:43
 msgid "and when you select one, it will be added to your keyring."
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:44
+#: /home/runa/tor/website/en/verifying-signatures.wml:45
 msgid "Step Two: Verify the fingerprints"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:46
+#: /home/runa/tor/website/en/verifying-signatures.wml:47
 msgid "Verify the pgp fingerprints using:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:47
+#: /home/runa/tor/website/en/verifying-signatures.wml:48
 #, no-wrap
 msgid "gpg --fingerprint (insert keyid here)"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/verifying-signatures.wml:48
+#: /home/runa/tor/website/en/verifying-signatures.wml:49
 msgid "The fingerprints for the keys should be:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:51
+#: /home/runa/tor/website/en/verifying-signatures.wml:52
 #, no-wrap
 msgid ""
 "pub   1024D/28988BF5 2000-02-27\n"
@@ -174,7 +179,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:87
+#: /home/runa/tor/website/en/verifying-signatures.wml:88
 msgid ""
 "(Of course if you want to be really certain that those are the real ones "
 "then you should check this from more places or even better get into key "
@@ -182,12 +187,12 @@
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:91
+#: /home/runa/tor/website/en/verifying-signatures.wml:92
 msgid "Step Three: Verify the downloaded package"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:93
+#: /home/runa/tor/website/en/verifying-signatures.wml:94
 msgid ""
 "If you're using GnuPG, then put the .asc and the download in the same "
 "directory and type \"gpg --verify (whatever).asc (whatever)\". It will say "
@@ -196,7 +201,7 @@
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:99
+#: /home/runa/tor/website/en/verifying-signatures.wml:100
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc tor-0.1.0.17.tar.gz\n"
@@ -209,7 +214,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:109
+#: /home/runa/tor/website/en/verifying-signatures.wml:110
 msgid ""
 "Notice that there is a warning because you haven't assigned a trust index to "
 "this user. This means that your program verified the key made that "
@@ -222,19 +227,19 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:118
+#: /home/runa/tor/website/en/verifying-signatures.wml:119
 msgid "All this means is you can ignore the message or assign a trust level."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:120
+#: /home/runa/tor/website/en/verifying-signatures.wml:121
 msgid ""
 "For your reference, this is an example of a <em>BAD</em> verification. It "
 "means that the signature and file contents do not match:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:124
+#: /home/runa/tor/website/en/verifying-signatures.wml:125
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc\n"
@@ -243,14 +248,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:129
+#: /home/runa/tor/website/en/verifying-signatures.wml:130
 msgid ""
 "If you see a message like the above one, then you should not trust the file "
 "contents."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:131
+#: /home/runa/tor/website/en/verifying-signatures.wml:132
 msgid ""
 "If you are running Tor on Debian you should read the instructions on <a href="
 "\"<page docs/debian>#packages\">importing these keys to apt</a>."

Modified: translation/trunk/projects/website/pt/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/pt/3-low.download-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/pt/3-low.download-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:27+0100\n"
+"POT-Creation-Date: 2010-03-09 09:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/gFZbQSqRlb.xml:40
-#: /tmp/gFZbQSqRlb.xml:56 /tmp/gFZbQSqRlb.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/XnGx_R1M97.xml:40
+#: /tmp/XnGx_R1M97.xml:56 /tmp/XnGx_R1M97.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -184,54 +184,79 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:84
-msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgid ""
+"<img src=\"images/distros/android-market.gif\" alt=\"Android\" width=\"32\" "
+"height=\"32\"/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:85
-msgid "Source tarballs"
+msgid "Android"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /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/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/tor/website/en/download-unix.wml:92
+msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:93
+msgid "Source tarballs"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:95
+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/tor/website/en/download-unix.wml:91
+#: /home/runa/tor/website/en/download-unix.wml:99
 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/tor/website/en/download-unix.wml:94
+#: /home/runa/tor/website/en/download-unix.wml:102
 msgid "<kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:101
+#: /home/runa/tor/website/en/download-unix.wml:109
 msgid "<a id=\"packagediff\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:102
+#: /home/runa/tor/website/en/download-unix.wml:110
 msgid ""
 "<a class=\"anchor\" href=\"#packagediff\">What's the difference between "
 "Stable &amp; Unstable?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:105
+#: /home/runa/tor/website/en/download-unix.wml:113
 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/tor/website/en/download-unix.wml:109
+#: /home/runa/tor/website/en/download-unix.wml:117
 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 "
@@ -241,7 +266,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:118
+#: /home/runa/tor/website/en/download-unix.wml:126
 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 "
@@ -251,7 +276,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:125
+#: /home/runa/tor/website/en/download-unix.wml:133
 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 "
@@ -259,7 +284,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:134
+#: /home/runa/tor/website/en/download-unix.wml:142
 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 "
@@ -269,7 +294,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><form>
-#: /home/runa/tor/website/en/download-unix.wml:142
+#: /home/runa/tor/website/en/download-unix.wml:150
 msgid ""
 "<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
 "\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
@@ -278,18 +303,18 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:152
+#: /home/runa/tor/website/en/download-unix.wml:160
 msgid "<a id=\"Warning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:153
+#: /home/runa/tor/website/en/download-unix.wml:161
 msgid ""
 "<a class=\"anchor\" href=\"#Warning\">Warning: Want Tor to really work?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:157
+#: /home/runa/tor/website/en/download-unix.wml:165
 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> "
@@ -298,7 +323,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:165
+#: /home/runa/tor/website/en/download-unix.wml:173
 msgid ""
 "Tor only protects Internet applications that are configured to send their "
 "traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
@@ -308,7 +333,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:173
+#: /home/runa/tor/website/en/download-unix.wml:181
 msgid ""
 "Browser plugins such as Java, Flash, ActiveX, RealPlayer, Quicktime, Adobe's "
 "PDF plugin, and others can be manipulated into revealing your IP address. "
@@ -324,7 +349,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:189
+#: /home/runa/tor/website/en/download-unix.wml:197
 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. "
@@ -334,7 +359,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:197
+#: /home/runa/tor/website/en/download-unix.wml:205
 msgid ""
 "Tor anonymizes the origin of your traffic, and it encrypts everything inside "
 "the Tor network, but <a href=\"https://wiki.torproject.org/noreply/";
@@ -346,7 +371,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:208
+#: /home/runa/tor/website/en/download-unix.wml:216
 msgid ""
 "While Tor blocks attackers on your local network from discovering or "
 "influencing your destination, it opens new risks: malicious or misconfigured "
@@ -355,12 +380,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:216
+#: /home/runa/tor/website/en/download-unix.wml:224
 msgid "<br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:218
+#: /home/runa/tor/website/en/download-unix.wml:226
 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 "
@@ -368,7 +393,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:228
+#: /home/runa/tor/website/en/download-unix.wml:236
 msgid ""
 "See our <a href=\"<page verifying-signatures>\">FAQ entry on verifying "
 "package signatures</a>, which allows you to make sure you've downloaded the "
@@ -376,7 +401,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:234
+#: /home/runa/tor/website/en/download-unix.wml:242
 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</"
@@ -384,7 +409,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:240
+#: /home/runa/tor/website/en/download-unix.wml:248
 msgid ""
 "See the <a href=\"<page documentation>#Developers\">developer documentation</"
 "a> for instructions on fetching Tor from Git to get the very latest "
@@ -394,19 +419,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:252
+#: /home/runa/tor/website/en/download-unix.wml:260
 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/tor/website/en/download-unix.wml:256
+#: /home/runa/tor/website/en/download-unix.wml:264
 msgid "<a id=\"ChangeLog\"></a> <a id=\"Stable\"></a> <a id=\"Testing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:260
+#: /home/runa/tor/website/en/download-unix.wml:268
 msgid ""
 "For a list of what has changed in each stable Tor release, see the <a href="
 "\"<gitblob>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in both "

Modified: translation/trunk/projects/website/pt/3-low.people.po
===================================================================
--- translation/trunk/projects/website/pt/3-low.people.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/pt/3-low.people.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 09:58+0100\n"
+"POT-Creation-Date: 2010-03-09 09:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -60,8 +60,8 @@
 #. type: Content of: <div><address>
 #: /home/runa/tor/website/en/people.wml:30
 msgid ""
-"The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA<br /"
-"><br />"
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 "
+"USA<br /><br />"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -542,34 +542,56 @@
 
 #. type: Content of: <div><dl><dt>
 #: /home/runa/tor/website/en/people.wml:202
-msgid "Kasimir Gabert"
+msgid "Marco Bonetti"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:202
+msgid "Focusing on MobileTor for the iPhone."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:203
+msgid "Nathan Freitas"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:203
 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/tor/website/en/people.wml:205
+msgid "Kasimir Gabert"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:205
+msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\";>TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid "Robert Hogan"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\";>TorK</a> Tor controller."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid "Damian Johnson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid ""
 "Builds a command-line application for monitoring Tor relays, providing real-"
 "time status information such as the current configuration, bandwidth usage, "
@@ -578,106 +600,118 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid ""
 "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
 "and Privoxy still work well together."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid "Kory Kirk"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid ""
 "Worked during Google Summer of Code 2009 on extending Torbutton. Now he's "
 "working with Bruce Leidl on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Bruce Leidl"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Working on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid ""
 "A lawyer with the CCC in Germany. Coordinates the German Tor community with "
 "respect to legal questions and concerns."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:224
+msgid "Linus Nordberg"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:224
+msgid ""
+"Enjoys measuring the Tor network and helps with outreach in the Nordic "
+"countries."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:226
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:226
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid "Martin Peck"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:225
+#: /home/runa/tor/website/en/people.wml:230
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:231
 msgid ""
 "The most dedicated bug reporter we've ever heard from. He must read Tor "
 "source code every day over breakfast."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy";
@@ -686,24 +720,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?";
 "p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/";
@@ -712,7 +746,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:241
+#: /home/runa/tor/website/en/people.wml:246
 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, "
@@ -720,32 +754,32 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:252
 msgid "<a id=\"Past\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:248
+#: /home/runa/tor/website/en/people.wml:253
 msgid "<a class=\"anchor\" href=\"#Past\">Past thanks to:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "John Bashinski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "Contributed the initial rpm spec file."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid "Domenik Bork"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid ""
 "Worked on Configuration of Hidden Services with User Authorization in "
 "Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches/";
@@ -753,12 +787,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 msgid "Benedikt Boss"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 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 "
@@ -766,22 +800,22 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Ren Bucholz"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Our fine logo and images."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 msgid "Fallon Chen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 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="
@@ -790,32 +824,32 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Bram Cohen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Helped design our congestion control mechanisms, in Tor's early days."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Pat Double"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Creator of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid "Geoff Goodell"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid ""
 "Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/";
 "\">Blossom project</a> which uses Tor as its overlay network; also helped "
@@ -823,12 +857,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid "Aleksei Gorny"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid ""
 "Working on Tor exit scanner improvements (<a href=\"https://svn.torproject.";
 "org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
@@ -836,52 +870,52 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Christian Grothoff"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Contributed better daemonizing behavior."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Steven Hazel"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Made 'make install' do the right thing."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "Justin Hipple"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "The other developer for Vidalia."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Jason Holt"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Contributed patches to the instructions and the man page."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 msgid "Christian King"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 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-";
@@ -889,70 +923,70 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid "Joe Kowalski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid ""
 "Original author and provider of the torstatus script formerly run on "
 "nighteffect."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Adam Langley"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Our fine eventdns code."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid "Rebecca MacKinnon"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid ""
 "Former Director of Tor.  Co-Founder of <a href=\"http://www.";
 "globalvoicesonline.org/\">Global Voices Online</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid "Chris Palmer"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid ""
 "Our liaison and tech guy with EFF while EFF was funding us. Also helped "
 "advocate and write end-user docs."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid "Matej Pfajfar"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid ""
 "Author of the original onion routing code that Tor is based on, so we didn't "
 "have to start from scratch."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 msgid "Johannes Renner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 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 "
@@ -960,33 +994,33 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid "Scott Squires"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid ""
 "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Aaron Turner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Contributed the first version of the tor.sh initscripts shell script."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 msgid "Stephen Tyree"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 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 "
@@ -995,12 +1029,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid "Camilo Viecco"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid ""
 "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac.";
 "vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
@@ -1008,12 +1042,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 msgid "Fred von Lohmann"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 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/?";
@@ -1021,12 +1055,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid "Christian Wilms"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid ""
 "Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
 "\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";
@@ -1034,12 +1068,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 msgid "Jillian C. York"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 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/pt/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/pt/4-optional.volunteer.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/pt/4-optional.volunteer.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 09:58+0100\n"
+"POT-Creation-Date: 2010-03-09 09:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,21 +252,22 @@
 "Messaging client). Components are pre-configured to operate in a secure way, "
 "and it has very few dependencies on the installed operating system. It has "
 "therefore become one of the most easy to use, and popular, ways to use Tor "
-"on Windows.  <br /> However, there is currently no working package for Linux "
-"and Mac OS X, so this project would be to implement Tor Browser Bundle for "
-"these platforms. This will involve modifications to Vidalia (C++), possibly "
-"Firefox (C) then creating and testing the launcher on a range of operating "
-"system versions and configurations to verify portability.  Some work on this "
-"was completed as part of the Google Summer of Code 2009. Another part of "
-"this project is to identify all of the traces left behind by using a Tor "
-"Browser Bundle on Mac OS X or Linux.  Developing ways to stop, counter, or "
-"remove these traces is a final step.  <br /> Students should be familiar "
-"with application development on one or preferably both of Linux and Mac OS "
-"X, and be comfortable with C/C++ and shell scripting.  <br /> Part of this "
-"project could be usability testing of Tor Browser Bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
+"on Windows.  <br /> However, there is currently no released package for "
+"Linux and Mac OS X, so this project would be to implement Tor Browser Bundle "
+"for OS X and continue work on the Tor Browser Bundle for Linux. This will "
+"involve modifications to Vidalia (C++), possibly Firefox (C) then creating "
+"and testing the launcher on a range of operating system versions and "
+"configurations to verify portability.  Some work on this was completed as "
+"part of the Google Summer of Code 2009. Another part of this project is to "
+"identify all of the traces left behind by using a Tor Browser Bundle on Mac "
+"OS X or Linux.  Developing ways to stop, counter, or remove these traces is "
+"a final step.  <br /> Students should be familiar with application "
+"development on one or preferably both of Linux and Mac OS X, and be "
+"comfortable with C/C++ and shell scripting.  <br /> Part of this project "
+"could be usability testing of Tor Browser Bundle, ideally amongst our target "
+"demographic.  That would help a lot in knowing what needs to be done in "
+"terms of bug fixes or new features. We get this informally at the moment, "
+"but a more structured process would be better."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -320,27 +321,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:225
-msgid ""
-"<b>Tuneup Tor!</b> <br /> Priority: <i>Medium to High</i> <br /> Effort "
-"Level: <i>Medium to High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Nick, Roger, Mike, Karsten</i> <br /> Right now, Tor relays "
-"measure and report their own bandwidth, and Tor clients choose which relays "
-"to use in part based on that bandwidth.  This approach is vulnerable to <a "
-"href=\"http://freehaven.net/anonbib/#bauer:wpes2007\";>attacks where relays "
-"lie about their bandwidth</a>; to address this, Tor currently caps the "
-"maximum bandwidth it's willing to believe any relay provides.  This is a "
-"limited fix, and a waste of bandwidth capacity to boot.  Instead, Tor should "
-"possibly measure bandwidth in a more distributed way, perhaps as described "
-"in the <a href=\"http://freehaven.net/anonbib/author.html#snader08\";>\"A "
-"Tune-up for Tor\"</a> paper by Snader and Borisov. One could use current "
-"testing code to double-check this paper's findings and verify the extent to "
-"which they dovetail with Tor as deployed in the wild, and determine good "
-"ways to incorporate them into their suggestions Tor network without adding "
-"too much communications overhead between relays and directory authorities."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:256
 msgid ""
 "<b>Improving Polipo on Windows</b> <br /> Priority: <i>Medium to High</i> "
@@ -382,17 +362,17 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:283
 msgid ""
-"<b>Tor Controller Status Event Interface</b> <br /> Priority: <i>Medium</i> "
-"<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> "
-"<br /> Likely Mentors: <i>Matt</i> <br /> There are a number of status "
-"changes inside Tor of which the user may need to be informed. For example, "
-"if the user is trying to set up his Tor as a relay and Tor decides that its "
-"ports are not reachable from outside the user's network, we should alert the "
-"user. Currently, all the user gets is a couple log messages in Vidalia's "
-"'message log' window, which they likely never see since they don't receive a "
-"notification that something has gone wrong. Even if the user does actually "
-"look at the message log, most of the messages make little sense to the "
-"novice user.  <br /> Tor has the ability to inform Vidalia of many such "
+"<b>Tor Controller Status Event Interface for Vidalia</b> <br /> Priority: "
+"<i>Medium</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low "
+"to Medium</i> <br /> Likely Mentors: <i>Matt</i> <br /> There are a number "
+"of status changes inside Tor of which the user may need to be informed. For "
+"example, if the user is trying to set up his Tor as a relay and Tor decides "
+"that its ports are not reachable from outside the user's network, we should "
+"alert the user. Currently, all the user gets is a couple log messages in "
+"Vidalia's 'message log' window, which they likely never see since they don't "
+"receive a notification that something has gone wrong. Even if the user does "
+"actually look at the message log, most of the messages make little sense to "
+"the novice user.  <br /> Tor has the ability to inform Vidalia of many such "
 "status changes, and we recently implemented support for a couple of these "
 "events. Still, there are many more status events the user should be informed "
 "of and we need a better UI for actually displaying them to the user.  <br /> "
@@ -477,40 +457,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:415
-msgid ""
-"<b>New Thandy Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Medium to High</i> <br /> Likely "
-"Mentors: <i>Martin</i> <br /> Additional capabilities are needed for "
-"assisted updates of all the Tor related software for Windows and other "
-"operating systems. Some of the features to consider include:"
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:429
-msgid ""
-"Integration of the <a href=\"http://chandlerproject.org/Projects/MeTooCrypto";
-"\">MeTooCrypto Python library</a> for authenticated HTTPS downloads."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:433
-msgid ""
-"Adding a level of indirection between the timestamp signatures and the "
-"package files included in an update. See the \"Thandy attacks / suggestions"
-"\" thread on or-dev."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:436
-msgid ""
-"Support locale specific installation and configuration of assisted updates "
-"based on preference, host, or user account language settings.  Familiarity "
-"with Windows codepages, unicode, and other character sets is helpful in "
-"addition to general win32 and posix API experience and Python proficiency."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:445
 msgid ""
 "<b>Simulator for slow Internet connections</b> <br /> Priority: <i>Medium</"
@@ -558,27 +504,14 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:509
 msgid ""
-"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Low</i> <br /"
-"> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Mike</i> <br /> We're hearing from an increasing number of users "
-"that they want to use Thunderbird with Tor. However, there are plenty of "
-"application-level concerns, for example, by default Thunderbird will put "
-"your hostname in the outgoing mail that it sends. At some point we should "
-"start a new push to build a Thunderbird extension similar to Torbutton."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:527
-msgid ""
-"<b>Intermediate Level Network Device Driver</b> <br /> Priority: <i>Low</i> "
+"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Medium</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> "
-"Likely Mentors: <i>Martin</i> <br /> The WinPCAP device driver used by Tor "
-"VM for bridged networking does not support a number of wireless and non-"
-"Ethernet network adapters.  Implementation of a intermediate level network "
-"device driver for win32 and 64bit would provide a way to intercept and route "
-"traffic over such networks. This project will require knowledge of and "
-"experience with Windows kernel device driver development and testing. "
-"Familiarity with Winsock and Qemu would also be helpful."
+"Likely Mentors: <i>Mike</i> <br /> We're hearing from an increasing number "
+"of users that they want to use Thunderbird with Tor. However, there are "
+"plenty of application-level concerns, for example, by default Thunderbird "
+"will put your hostname in the outgoing mail that it sends. At some point we "
+"should start a new push to build a Thunderbird extension similar to "
+"Torbutton."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -643,35 +576,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:621
-msgid ""
-"<b>Tor/Polipo/Vidalia Auto-Update Framework</b> <br /> We're in need of a "
-"good authenticated-update framework.  Vidalia already has the ability to "
-"notice when the user is running an outdated or unrecommended version of Tor, "
-"using signed statements inside the Tor directory information. Currently, "
-"Vidalia simply pops up a little message box that lets the user know they "
-"should manually upgrade. The goal of this project would be to extend Vidalia "
-"with the ability to also fetch and install the updated Tor software for the "
-"user. We should do the fetches via Tor when possible, but also fall back to "
-"direct fetches in a smart way. Time permitting, we would also like to be "
-"able to update other applications included in the bundled installers, such "
-"as Polipo and Vidalia itself.  <br /> To complete this project, the student "
-"will first need to first investigate the existing auto-update frameworks (e."
-"g., Sparkle on OS X) to evaluate their strengths, weaknesses, security "
-"properties, and ability to be integrated into Vidalia. If none are found to "
-"be suitable, the student will design their own auto-update framework, "
-"document the design, and then discuss the design with other developers to "
-"assess any security issues. The student will then implement their framework "
-"(or integrate an existing one) and test it.  <br /> A person undertaking "
-"this project should have good C++ development experience. Previous "
-"experience with Qt is helpful, but not required. One should also have a good "
-"understanding of common security practices, such as package signature "
-"verification. Good writing ability is also important for this project, since "
-"a vital step of the project will be producing a design document to review "
-"and discuss with others prior to implementation."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:655
 msgid ""
 "<b>Improving the Tor QA process: Continuous Integration for builds</b> <br /"
@@ -699,17 +603,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:683
-msgid ""
-"<b>Usability testing of Tor</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> <br /> Likely "
-"Mentors: <i>Andrew</i> <br /> Especially the browser bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:700
 msgid ""
 "<b>An authenticating IRC proxy</b> <br /> Priority: <i>Medium</i> <br /> "

Modified: translation/trunk/projects/website/pt/docs/3-low.debian.po
===================================================================
--- translation/trunk/projects/website/pt/docs/3-low.debian.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/pt/docs/3-low.debian.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-13 17:56+0100\n"
+"POT-Creation-Date: 2010-03-09 09:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -28,8 +28,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/sCZFDMK4NQ.xml:40
-#: /tmp/sCZFDMK4NQ.xml:96 /tmp/sCZFDMK4NQ.xml:130
+#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/d7TR0FjtBg.xml:40
+#: /tmp/d7TR0FjtBg.xml:96 /tmp/d7TR0FjtBg.xml:130
 msgid "<br />"
 msgstr ""
 
@@ -49,8 +49,8 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/sCZFDMK4NQ.xml:77
-#: /tmp/sCZFDMK4NQ.xml:121 /tmp/sCZFDMK4NQ.xml:164
+#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/d7TR0FjtBg.xml:77
+#: /tmp/d7TR0FjtBg.xml:121 /tmp/d7TR0FjtBg.xml:164
 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."
@@ -94,8 +94,9 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:59
 msgid ""
-"where you substitute the above word (etch, lenny, sid, karmic, jaunty, "
-"intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you put the codename of your distribution (i.e. etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy or whatever it is) in place of &lt;"
+"DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -165,8 +166,8 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:106
 msgid ""
-"where you substitute the name of your distro (etch, lenny, sid, karmic, "
-"jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you again substitute the name of your distro (etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/pt/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/pt/docs/3-low.tor-doc-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/pt/docs/3-low.tor-doc-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:27+0100\n"
+"POT-Creation-Date: 2010-03-09 09:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/TziCqTj5X8.xml:24
-#: /tmp/TziCqTj5X8.xml:54 /tmp/TziCqTj5X8.xml:88 /tmp/TziCqTj5X8.xml:131
-#: /tmp/TziCqTj5X8.xml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/qw29Q1cq0O.xml:24
+#: /tmp/qw29Q1cq0O.xml:54 /tmp/qw29Q1cq0O.xml:88 /tmp/qw29Q1cq0O.xml:131
+#: /tmp/qw29Q1cq0O.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -63,10 +63,10 @@
 "If you're building from source, first install <a href=\"http://www.monkey.";
 "org/~provos/libevent/\">libevent</a>, and make sure you have openssl and "
 "zlib (including the -devel packages if applicable). Then run:<br /> <tt>tar "
-"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable><br /> ./configure "
-"&amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</tt>, or "
-"you can run <tt>make install</tt> (as root if necessary) to install it into /"
-"usr/local/, and then you can start it just by running <tt>tor</tt>."
+"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable></tt><br /> <tt>./"
+"configure &amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</"
+"tt>, or you can run <tt>make install</tt> (as root if necessary) to install "
+"it into /usr/local/, and then you can start it just by running <tt>tor</tt>."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/ru/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/ru/2-medium.donate.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/ru/2-medium.donate.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:33+0100\n"
+"POT-Creation-Date: 2010-03-09 09:20+0100\n"
 "PO-Revision-Date: 2010-02-20 23:47-0700\n"
 "Last-Translator: vitaliy <vitolink@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -67,7 +67,7 @@
 "ÐÐÐÑÐÐÐÐÑÐÐÐÑÐÐÑÑÑ Ð ÑÐÑÐ ÐÐÑÐÑÐÐÑ ÐÐ ÐÑÐÐÑ ÐÐÑÑ."
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:32 /tmp/wqQVkq_kAx.xml:102
+#: /home/runa/tor/website/en/donate.wml:32 /tmp/vd1YZleLwW.xml:102
 msgid "<br />"
 msgstr "<br />"
 
@@ -178,17 +178,17 @@
 msgstr "<br /> ÐÑÐÐÑÐÑÐ ÐÐÐÑÑÑ: <select name=\"currency_code\">"
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:72 /tmp/wqQVkq_kAx.xml:114
+#: /home/runa/tor/website/en/donate.wml:72 /tmp/vd1YZleLwW.xml:114
 msgid "$"
 msgstr "$"
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:73 /tmp/wqQVkq_kAx.xml:115
+#: /home/runa/tor/website/en/donate.wml:73 /tmp/vd1YZleLwW.xml:115
 msgid "â"
 msgstr "â"
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:74 /tmp/wqQVkq_kAx.xml:116
+#: /home/runa/tor/website/en/donate.wml:74 /tmp/vd1YZleLwW.xml:116
 msgid "Â"
 msgstr "Â"
 
@@ -315,7 +315,9 @@
 
 #. type: Content of: <div><p><address>
 #: /home/runa/tor/website/en/donate.wml:136
-msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
+#, fuzzy
+msgid ""
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 USA"
 msgstr "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
 
 #. type: Content of: <div><p>

Modified: translation/trunk/projects/website/ru/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/ru/2-medium.verifying-signatures.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/ru/2-medium.verifying-signatures.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 23:29+0100\n"
+"POT-Creation-Date: 2010-03-09 09:20+0100\n"
 "PO-Revision-Date: 2010-03-07 05:31-0700\n"
 "Last-Translator: vitaliy <vitolink@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -22,7 +22,7 @@
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/verifying-signatures.wml:10
-#: /tmp/AWbE0ED0ZB.xml:33 /tmp/AWbE0ED0ZB.xml:45 /tmp/AWbE0ED0ZB.xml:92
+#: /tmp/LawB1TC4Yf.xml:34 /tmp/LawB1TC4Yf.xml:46 /tmp/LawB1TC4Yf.xml:93
 msgid "<hr />"
 msgstr "<hr />"
 
@@ -56,9 +56,9 @@
 "signing keys we use are:"
 msgstr ""
 "ÐÐÐÐÑÐÐ, ÐÐÐ ÐÑÐÐÐÑÑÑ ÐÐÐÐÐÐÑÑ ÐÐÑÐ pgp ÐÐÑÑÐ Ð ÐÐÑ ÐÐÐÐÑ ÐÐÑÑÐÐ: ÐÑÐÐ ÐÑ ÐÐ "
-"ÐÐÐÐÑÐ ÐÐÑÑ pgp, ÐÑ ÐÐ ÐÐÐÐÑÐ ÐÑÑÑ ÑÐÐÑÐÐÐÑ, ÑÑÐ ÑÑÐ ÐÑ, Ð ÐÐ ÐÑÐ-ÑÐ "
-"ÐÑÑÐÐÐ, ÐÐÐÐÐÑÐÐÐ ÑÑÐÑ ÑÐÐÐ. ÐÐÐÐ ÐÑÐÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÑÑÐÐ, ÐÐÑÐÑÑÐ ÐÑ "
-"ÐÑÐÐÐÑÐÑÐÐ ÐÐÑ ÐÐÐÐÐÑÐÐ:"
+"ÐÐÐÐÑÐ ÐÐÑÑ pgp, ÐÑ ÐÐ ÐÐÐÐÑÐ ÐÑÑÑ ÑÐÐÑÐÐÐÑ, ÑÑÐ ÑÑÐ ÐÑ, Ð ÐÐ ÐÑÐ-ÑÐ ÐÑÑÐÐÐ, "
+"ÐÐÐÐÐÑÐÐÐ ÑÑÐÑ ÑÐÐÐ. ÐÐÐÐ ÐÑÐÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÑÑÐÐ, ÐÐÑÐÑÑÐ ÐÑ ÐÑÐÐÐÑÐÑÐÐ ÐÐÑ "
+"ÐÐÐÐÐÑÐÐ:"
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/verifying-signatures.wml:24
@@ -90,65 +90,66 @@
 msgid "Jacob's (0x9D0FACE4)"
 msgstr "ÐÐÑÑ ÐÐÐÐÐ (0x9D0FACE4)"
 
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/verifying-signatures.wml:30
+msgid "Erinn's (0x63FEE659) and (0xF1F5C9B5)"
+msgstr ""
+
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:32
+#: /home/runa/tor/website/en/verifying-signatures.wml:33
 msgid "Step One: Import the keys"
 msgstr "ÐÐÐ ÐÐÑÐÑÐ: ÐÐÐÐÑÑ ÐÐÑÑÐÐ"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:34
+#: /home/runa/tor/website/en/verifying-signatures.wml:35
 msgid "You can import keys directly from GnuPG as well:"
 msgstr "ÐÑ ÐÐÐÐÑÐ ÐÐÐÑÑÐÑÑ ÐÐÐÐÑÑÐÑÐÐÐÑÑ ÐÐÑÑÐ Ð GnuPG:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:36
+#: /home/runa/tor/website/en/verifying-signatures.wml:37
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --recv-keys 0x28988BF5"
-msgstr ""
-"gpg --keyserver subkeys.pgp.net --recv-keys 0x28988BF5 (ÐÐÐÑÑÐÑÑ ÐÐÑÑÐ "
-"0x28988BF5 ÐÐ ÑÐÑÐÐÑÐ subkeys.pgp.net)"
+msgstr "gpg --keyserver subkeys.pgp.net --recv-keys 0x28988BF5 (ÐÐÐÑÑÐÑÑ ÐÐÑÑÐ 0x28988BF5 ÐÐ ÑÐÑÐÐÑÐ subkeys.pgp.net)"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:38
+#: /home/runa/tor/website/en/verifying-signatures.wml:39
 msgid "or search for keys with"
 msgstr "ÐÐÐ ÐÑÐÐÑÑ ÐÐÑÑÐ"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:40
+#: /home/runa/tor/website/en/verifying-signatures.wml:41
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --search-keys 0x28988BF5"
-msgstr ""
-"gpg --keyserver subkeys.pgp.net --search-keys 0x28988BF5 (ÐÑÐÐÑÑ ÐÐÑÑÐ "
-"subkeys.pgp.net ÐÐ ÑÐÑÐÐÑÐ subkeys.pgp.net)"
+msgstr "gpg --keyserver subkeys.pgp.net --search-keys 0x28988BF5 (ÐÑÐÐÑÑ ÐÐÑÑÐ subkeys.pgp.net ÐÐ ÑÐÑÐÐÑÐ subkeys.pgp.net)"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:42
+#: /home/runa/tor/website/en/verifying-signatures.wml:43
 msgid "and when you select one, it will be added to your keyring."
 msgstr "Ð ÐÐÐÐÐ ÐÑ ÐÑÐÐÑÐÑÐ ÐÐÐÐ, ÐÐ ÐÑÐÐÑ ÐÐÐÐÐÐÐÐ Ð ÐÐÑÐÐÑ ÐÐÐÐÑÑ ÐÐÑÑÐÐ."
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:44
+#: /home/runa/tor/website/en/verifying-signatures.wml:45
 msgid "Step Two: Verify the fingerprints"
 msgstr "ÐÐÐ ÐÑÐÑÐÐ: ÐÐÑÐÑÐÐÐÑÐÑ ÐÑÐÐÑÐÑÐÐÐ"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:46
+#: /home/runa/tor/website/en/verifying-signatures.wml:47
 msgid "Verify the pgp fingerprints using:"
 msgstr "ÐÑÐÐÐÑÑÑÐ pgp ÐÑÐÐÑÐÑÐÐ, ÐÑÐÐÐÑÐÑÑ:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:47
+#: /home/runa/tor/website/en/verifying-signatures.wml:48
 #, no-wrap
 msgid "gpg --fingerprint (insert keyid here)"
 msgstr "gpg --fingerprint (ÑÑÐÐ ÐÑÑÐÐÑÑÐ ÐÐÐÐÑÐÑÐÐÐÑÐÐÐÐÑÐ ÐÐÑÑ - keyid)"
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/verifying-signatures.wml:48
+#: /home/runa/tor/website/en/verifying-signatures.wml:49
 msgid "The fingerprints for the keys should be:"
 msgstr "ÐÑÐÐÑÐÑÐÐ ÐÐÑ ÐÐÑÑÐÐ ÐÐÐÐÐÑ ÐÑÑÑ ÑÐÐÐÐÐ:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:51
+#: /home/runa/tor/website/en/verifying-signatures.wml:52
 #, no-wrap
 msgid ""
 "pub   1024D/28988BF5 2000-02-27\n"
@@ -222,7 +223,7 @@
 "sub   4096g/D5E87583 2008-03-11 [expires: 2010-03-11]\n"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:87
+#: /home/runa/tor/website/en/verifying-signatures.wml:88
 msgid ""
 "(Of course if you want to be really certain that those are the real ones "
 "then you should check this from more places or even better get into key "
@@ -234,12 +235,12 @@
 "ÐÐÑÑÐÐ.)"
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:91
+#: /home/runa/tor/website/en/verifying-signatures.wml:92
 msgid "Step Three: Verify the downloaded package"
 msgstr "ÐÐÐ ÑÑÐÑÐÐ: ÐÐÑÐÑÐÐÐÑÐÑ ÑÐÐÑÐÐÐÐÐÐ ÑÑÑÐÐÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐ"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:93
+#: /home/runa/tor/website/en/verifying-signatures.wml:94
 msgid ""
 "If you're using GnuPG, then put the .asc and the download in the same "
 "directory and type \"gpg --verify (whatever).asc (whatever)\". It will say "
@@ -247,12 +248,12 @@
 "type of command:"
 msgstr ""
 "ÐÑÐÐ ÐÑ ÐÑÐÐÐÑÐÑÐÑÐ GnuPG, ÑÐÐÐÐ ÑÐÐÐÐÑÑÐÑÐ .asc Ð ÑÐÐÑÐÐÐÑÐ ÑÐÐÐ Ð ÐÐÐÑ "
-"ÐÐÐÐÑ Ð ÐÐÐÐÐÑÐ \"gpg --verify (whatever).asc (whatever)\". Ð ÐÑÐÐÑ ÐÑÐÐÑÐÐÐÐ "
-"ÐÑÐÐÑÑ ÑÑÐ-ÑÐ ÐÑÐÐÐ \"ÐÐÑÐÑÐÑ ÐÐÐÐÐÑÑ\" (Good signature) ÐÐÐ \"ÐÐÐÑÐÑ ÐÐÐÐÐÑÑ\" "
-"(BAD signature), ÐÐ ÑÐÐÐÑÑÑÐÐÑ ÐÐÑÐÐÑÑ:"
+"ÐÐÐÐÑ Ð ÐÐÐÐÐÑÐ \"gpg --verify (whatever).asc (whatever)\". Ð ÐÑÐÐÑ "
+"ÐÑÐÐÑÐÐÐÐ ÐÑÐÐÑÑ ÑÑÐ-ÑÐ ÐÑÐÐÐ \"ÐÐÑÐÑÐÑ ÐÐÐÐÐÑÑ\" (Good signature) ÐÐÐ "
+"\"ÐÐÐÑÐÑ ÐÐÐÐÐÑÑ\" (BAD signature), ÐÐ ÑÐÐÐÑÑÑÐÐÑ ÐÐÑÐÐÑÑ:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:99
+#: /home/runa/tor/website/en/verifying-signatures.wml:100
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc tor-0.1.0.17.tar.gz\n"
@@ -264,21 +265,16 @@
 "Primary key fingerprint: B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
 msgstr ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc tor-0.1.0.17.tar.gz\n"
-"(ÐÐÑÐÑÐÐÐÑÐÑ Tor ÐÐÑÑÐÐ) gpg: Signature made Wed Feb 23 01:33:29 2005 EST "
-"using DSA key ID 28988BF5\n"
-"(ÐÐÐÐÐÑÐÐÐ, ÐÐÑÐ, ÐÑÐÐÑ... Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÐÐÐÐÐÐ ÐÐÑÑÐ)gpg: "
-"Good signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
-"(ÐÐÑÐÑÐÑ ÐÐÐÐÐÑÑ ÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐÐÐÐ)gpg:                 aka \"Roger "
-"Dingledine &lt;arma@xxxxxxx&gt;\"\n"
+"(ÐÐÑÐÑÐÐÐÑÐÑ Tor ÐÐÑÑÐÐ) gpg: Signature made Wed Feb 23 01:33:29 2005 EST using DSA key ID 28988BF5\n"
+"(ÐÐÐÐÐÑÐÐÐ, ÐÐÑÐ, ÐÑÐÐÑ... Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÐÐÐÐÐÐ ÐÐÑÑÐ)gpg: Good signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
+"(ÐÐÑÐÑÐÑ ÐÐÐÐÐÑÑ ÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐÐÐÐ)gpg:                 aka \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
 "(ÐÐÐ: ...)gpg: WARNING: This key is not certified with a trusted signature!\n"
-"(ÐÐÐÐÐÐÐÐÐÐÐÐÐÐ: ÐÑÐÑ ÐÐÑÑ ÐÐ ÑÐÑÑÐÑÐÑÐÑÐÐÐÐ ÐÐÑÑÐÐÐÑÐÐÐ ÐÐÐÐÐÑÑÑ)gpg: "
-"         There is no indication that the signature belongs to the owner.\n"
-"(ÐÐÑ ÑÐÐÐÐÐÐÐ ÐÐ ÑÐ, ÑÑÐ ÐÐÐÐÐÑÑ ÐÑÐÐÐÐÐÐÐÐÑ ÐÐÐÐÐÐÑÑÑ)Primary key "
-"fingerprint: B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
+"(ÐÐÐÐÐÐÐÐÐÐÐÐÐÐ: ÐÑÐÑ ÐÐÑÑ ÐÐ ÑÐÑÑÐÑÐÑÐÑÐÐÐÐ ÐÐÑÑÐÐÐÑÐÐÐ ÐÐÐÐÐÑÑÑ)gpg:          There is no indication that the signature belongs to the owner.\n"
+"(ÐÐÑ ÑÐÐÐÐÐÐÐ ÐÐ ÑÐ, ÑÑÐ ÐÐÐÐÐÑÑ ÐÑÐÐÐÐÐÐÐÐÑ ÐÐÐÐÐÐÑÑÑ)Primary key fingerprint: B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
 "(ÐÐÑÐÐÑÐÑÐ ÐÑÐÐÑÐÑÐÐ ÐÐÑÑÐ)"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:109
+#: /home/runa/tor/website/en/verifying-signatures.wml:110
 msgid ""
 "Notice that there is a warning because you haven't assigned a trust index to "
 "this user. This means that your program verified the key made that "
@@ -295,19 +291,19 @@
 "ÑÐÐÐÑÑÐÑÑÐÐÑÐÐ ÑÐÑÐÑÑ, ÐÑÐÐÐÐÐÐÐÐÑ ÐÐ ÑÑÐÑ ÐÐÑÑ ÑÐÐÑÐÐÐÑÑÐÐÐÐ. ÐÐÑ ÑÑÐÐÐ "
 "ÐÑÑÑÐ ÐÑÐÐÐ ÐÑÑÑÐÑÐÑÑÑÑ Ñ ÐÐÐÐ ÐÐÑÐÐ Ð ÐÐÐÐÐÑÑÑÑÑ ÐÑÐÐÑÐÑÐÐÐÐ pgp. ÐÐÑÑÐ "
 "ÑÐÐÐ ÐÐÐÑÑ ÐÑÑÑ ÐÐÐÐÐÑÐÐÑ. ÐÑÐÐ ÐÑ ÐÑÐÑÐÐÑÑÐÑÐ ÐÐ ÐÐÑÑÐ ÐÐÐÐÐÑÐ ÐÐÐ ÐÐÐÐ, "
-"ÐÑÑÐÐÐ ÐÑÐÐ ÐÑÐÐÑÐÐÐ ÐÑ ÐÐÐ \"ÐÑ ÐÑÐÐÐÑÐÐÐ, ÑÑÐ ÐÐÐÐÐÑ/ÐÐÐ\". ÐÐÐ ÑÑÐ ÐÑÐÐ ÐÑ "
-"ÐÐÐÐÑÑÐÑÐ ÑÑÐÐ ÑÑÐÑÑÐÐ ÑÑÐÑÐÐÐ, ÑÐÐÐÐ Ñ ÐÐÑ ÐÑÑÑ ÐÐÑÐÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐ Ð "
+"ÐÑÑÐÐÐ ÐÑÐÐ ÐÑÐÐÑÐÐÐ ÐÑ ÐÐÐ \"ÐÑ ÐÑÐÐÐÑÐÐÐ, ÑÑÐ ÐÐÐÐÐÑ/ÐÐÐ\". ÐÐÐ ÑÑÐ ÐÑÐÐ "
+"ÐÑ ÐÐÐÐÑÑÐÑÐ ÑÑÐÐ ÑÑÐÑÑÐÐ ÑÑÐÑÐÐÐ, ÑÐÐÐÐ Ñ ÐÐÑ ÐÑÑÑ ÐÐÑÐÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐ Ð "
 "ÑÑÐÐÑ ÐÐÐÑ."
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:118
+#: /home/runa/tor/website/en/verifying-signatures.wml:119
 msgid "All this means is you can ignore the message or assign a trust level."
 msgstr ""
 "ÐÑÐ ÐÐÐÐÑÐÐÑ, ÑÑÐ ÐÑ ÐÐÐÐÑÐ ÐÐÐÐ ÐÑÐÐÐÐÐÑÐÑÐÐÐÑÑ ÑÑÐ ÑÐÐÐÑÐÐÐÐ, ÐÐÐÐ ÑÐÐÐÐÑÑ "
 "ÑÑÐÐÐÐÑ ÐÐÐÐÑÐÑ."
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:120
+#: /home/runa/tor/website/en/verifying-signatures.wml:121
 msgid ""
 "For your reference, this is an example of a <em>BAD</em> verification. It "
 "means that the signature and file contents do not match:"
@@ -316,7 +312,7 @@
 "ÐÐÐÐÑÐ ÐÐÐÐÑÐÑÑ, ÑÑÐ ÐÐÐÐÐÑÑ Ð ÑÐÐÐÑÐÐÐÐÐ ÑÐÐÐÐ ÐÐ ÑÐÐÑÐÐÑÑÑÐÑÑÑ:"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:124
+#: /home/runa/tor/website/en/verifying-signatures.wml:125
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc\n"
@@ -324,14 +320,12 @@
 "gpg: BAD signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
 msgstr ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc\n"
-" (ÐÐÑÐÑÐÐÐÑÐÑ Tor ÐÐÑÑÐÐ...)gpg: Signature made Wed Feb 23 01:33:29 2005 EST "
-"using DSA key ID 28988BF5\n"
-" (ÐÐÐÐÐÑÐÐÐ, ÐÐÑÐ, ÐÑÐÐÑ... Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÐÐÑÑÐ...)gpg: BAD signature "
-"from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
+" (ÐÐÑÐÑÐÐÐÑÐÑ Tor ÐÐÑÑÐÐ...)gpg: Signature made Wed Feb 23 01:33:29 2005 EST using DSA key ID 28988BF5\n"
+" (ÐÐÐÐÐÑÐÐÐ, ÐÐÑÐ, ÐÑÐÐÑ... Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÐÐÑÑÐ...)gpg: BAD signature from \"Roger Dingledine &lt;arma@xxxxxxx&gt;\"\n"
 " (ÐÐÐÐÐÐ ÐÐÐÐÐÑÑ...)"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:129
+#: /home/runa/tor/website/en/verifying-signatures.wml:130
 msgid ""
 "If you see a message like the above one, then you should not trust the file "
 "contents."
@@ -340,7 +334,7 @@
 "ÑÐÐÐÑÐÐÐÐÐÑ ÑÐÐÐÐ."
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:131
+#: /home/runa/tor/website/en/verifying-signatures.wml:132
 msgid ""
 "If you are running Tor on Debian you should read the instructions on <a href="
 "\"<page docs/debian>#packages\">importing these keys to apt</a>."

Modified: translation/trunk/projects/website/ru/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/ru/3-low.download-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/ru/3-low.download-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:33+0100\n"
+"POT-Creation-Date: 2010-03-09 09:20+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/gseyPZ_gAh.xml:40
-#: /tmp/gseyPZ_gAh.xml:56 /tmp/gseyPZ_gAh.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/n2K8iwR6Zj.xml:40
+#: /tmp/n2K8iwR6Zj.xml:56 /tmp/n2K8iwR6Zj.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -184,54 +184,79 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:84
-msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgid ""
+"<img src=\"images/distros/android-market.gif\" alt=\"Android\" width=\"32\" "
+"height=\"32\"/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:85
-msgid "Source tarballs"
+msgid "Android"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /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/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/tor/website/en/download-unix.wml:92
+msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:93
+msgid "Source tarballs"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:95
+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/tor/website/en/download-unix.wml:91
+#: /home/runa/tor/website/en/download-unix.wml:99
 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/tor/website/en/download-unix.wml:94
+#: /home/runa/tor/website/en/download-unix.wml:102
 msgid "<kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:101
+#: /home/runa/tor/website/en/download-unix.wml:109
 msgid "<a id=\"packagediff\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:102
+#: /home/runa/tor/website/en/download-unix.wml:110
 msgid ""
 "<a class=\"anchor\" href=\"#packagediff\">What's the difference between "
 "Stable &amp; Unstable?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:105
+#: /home/runa/tor/website/en/download-unix.wml:113
 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/tor/website/en/download-unix.wml:109
+#: /home/runa/tor/website/en/download-unix.wml:117
 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 "
@@ -241,7 +266,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:118
+#: /home/runa/tor/website/en/download-unix.wml:126
 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 "
@@ -251,7 +276,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:125
+#: /home/runa/tor/website/en/download-unix.wml:133
 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 "
@@ -259,7 +284,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:134
+#: /home/runa/tor/website/en/download-unix.wml:142
 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 "
@@ -269,7 +294,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><form>
-#: /home/runa/tor/website/en/download-unix.wml:142
+#: /home/runa/tor/website/en/download-unix.wml:150
 msgid ""
 "<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
 "\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
@@ -278,18 +303,18 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:152
+#: /home/runa/tor/website/en/download-unix.wml:160
 msgid "<a id=\"Warning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:153
+#: /home/runa/tor/website/en/download-unix.wml:161
 msgid ""
 "<a class=\"anchor\" href=\"#Warning\">Warning: Want Tor to really work?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:157
+#: /home/runa/tor/website/en/download-unix.wml:165
 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> "
@@ -298,7 +323,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:165
+#: /home/runa/tor/website/en/download-unix.wml:173
 msgid ""
 "Tor only protects Internet applications that are configured to send their "
 "traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
@@ -308,7 +333,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:173
+#: /home/runa/tor/website/en/download-unix.wml:181
 msgid ""
 "Browser plugins such as Java, Flash, ActiveX, RealPlayer, Quicktime, Adobe's "
 "PDF plugin, and others can be manipulated into revealing your IP address. "
@@ -324,7 +349,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:189
+#: /home/runa/tor/website/en/download-unix.wml:197
 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. "
@@ -334,7 +359,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:197
+#: /home/runa/tor/website/en/download-unix.wml:205
 msgid ""
 "Tor anonymizes the origin of your traffic, and it encrypts everything inside "
 "the Tor network, but <a href=\"https://wiki.torproject.org/noreply/";
@@ -346,7 +371,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:208
+#: /home/runa/tor/website/en/download-unix.wml:216
 msgid ""
 "While Tor blocks attackers on your local network from discovering or "
 "influencing your destination, it opens new risks: malicious or misconfigured "
@@ -355,12 +380,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:216
+#: /home/runa/tor/website/en/download-unix.wml:224
 msgid "<br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:218
+#: /home/runa/tor/website/en/download-unix.wml:226
 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 "
@@ -368,7 +393,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:228
+#: /home/runa/tor/website/en/download-unix.wml:236
 msgid ""
 "See our <a href=\"<page verifying-signatures>\">FAQ entry on verifying "
 "package signatures</a>, which allows you to make sure you've downloaded the "
@@ -376,7 +401,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:234
+#: /home/runa/tor/website/en/download-unix.wml:242
 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</"
@@ -384,7 +409,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:240
+#: /home/runa/tor/website/en/download-unix.wml:248
 msgid ""
 "See the <a href=\"<page documentation>#Developers\">developer documentation</"
 "a> for instructions on fetching Tor from Git to get the very latest "
@@ -394,19 +419,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:252
+#: /home/runa/tor/website/en/download-unix.wml:260
 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/tor/website/en/download-unix.wml:256
+#: /home/runa/tor/website/en/download-unix.wml:264
 msgid "<a id=\"ChangeLog\"></a> <a id=\"Stable\"></a> <a id=\"Testing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:260
+#: /home/runa/tor/website/en/download-unix.wml:268
 msgid ""
 "For a list of what has changed in each stable Tor release, see the <a href="
 "\"<gitblob>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in both "

Modified: translation/trunk/projects/website/ru/3-low.people.po
===================================================================
--- translation/trunk/projects/website/ru/3-low.people.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/ru/3-low.people.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:03+0100\n"
+"POT-Creation-Date: 2010-03-09 09:20+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -60,8 +60,8 @@
 #. type: Content of: <div><address>
 #: /home/runa/tor/website/en/people.wml:30
 msgid ""
-"The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA<br /"
-"><br />"
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 "
+"USA<br /><br />"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -542,34 +542,56 @@
 
 #. type: Content of: <div><dl><dt>
 #: /home/runa/tor/website/en/people.wml:202
-msgid "Kasimir Gabert"
+msgid "Marco Bonetti"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:202
+msgid "Focusing on MobileTor for the iPhone."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:203
+msgid "Nathan Freitas"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:203
 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/tor/website/en/people.wml:205
+msgid "Kasimir Gabert"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:205
+msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\";>TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid "Robert Hogan"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\";>TorK</a> Tor controller."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid "Damian Johnson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid ""
 "Builds a command-line application for monitoring Tor relays, providing real-"
 "time status information such as the current configuration, bandwidth usage, "
@@ -578,106 +600,118 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid ""
 "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
 "and Privoxy still work well together."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid "Kory Kirk"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid ""
 "Worked during Google Summer of Code 2009 on extending Torbutton. Now he's "
 "working with Bruce Leidl on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Bruce Leidl"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Working on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid ""
 "A lawyer with the CCC in Germany. Coordinates the German Tor community with "
 "respect to legal questions and concerns."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:224
+msgid "Linus Nordberg"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:224
+msgid ""
+"Enjoys measuring the Tor network and helps with outreach in the Nordic "
+"countries."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:226
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:226
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid "Martin Peck"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:225
+#: /home/runa/tor/website/en/people.wml:230
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:231
 msgid ""
 "The most dedicated bug reporter we've ever heard from. He must read Tor "
 "source code every day over breakfast."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy";
@@ -686,24 +720,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?";
 "p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/";
@@ -712,7 +746,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:241
+#: /home/runa/tor/website/en/people.wml:246
 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, "
@@ -720,32 +754,32 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:252
 msgid "<a id=\"Past\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:248
+#: /home/runa/tor/website/en/people.wml:253
 msgid "<a class=\"anchor\" href=\"#Past\">Past thanks to:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "John Bashinski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "Contributed the initial rpm spec file."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid "Domenik Bork"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid ""
 "Worked on Configuration of Hidden Services with User Authorization in "
 "Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches/";
@@ -753,12 +787,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 msgid "Benedikt Boss"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 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 "
@@ -766,22 +800,22 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Ren Bucholz"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Our fine logo and images."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 msgid "Fallon Chen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 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="
@@ -790,32 +824,32 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Bram Cohen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Helped design our congestion control mechanisms, in Tor's early days."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Pat Double"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Creator of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid "Geoff Goodell"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid ""
 "Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/";
 "\">Blossom project</a> which uses Tor as its overlay network; also helped "
@@ -823,12 +857,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid "Aleksei Gorny"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid ""
 "Working on Tor exit scanner improvements (<a href=\"https://svn.torproject.";
 "org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
@@ -836,52 +870,52 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Christian Grothoff"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Contributed better daemonizing behavior."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Steven Hazel"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Made 'make install' do the right thing."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "Justin Hipple"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "The other developer for Vidalia."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Jason Holt"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Contributed patches to the instructions and the man page."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 msgid "Christian King"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 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-";
@@ -889,70 +923,70 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid "Joe Kowalski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid ""
 "Original author and provider of the torstatus script formerly run on "
 "nighteffect."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Adam Langley"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Our fine eventdns code."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid "Rebecca MacKinnon"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid ""
 "Former Director of Tor.  Co-Founder of <a href=\"http://www.";
 "globalvoicesonline.org/\">Global Voices Online</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid "Chris Palmer"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid ""
 "Our liaison and tech guy with EFF while EFF was funding us. Also helped "
 "advocate and write end-user docs."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid "Matej Pfajfar"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid ""
 "Author of the original onion routing code that Tor is based on, so we didn't "
 "have to start from scratch."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 msgid "Johannes Renner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 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 "
@@ -960,33 +994,33 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid "Scott Squires"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid ""
 "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Aaron Turner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Contributed the first version of the tor.sh initscripts shell script."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 msgid "Stephen Tyree"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 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 "
@@ -995,12 +1029,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid "Camilo Viecco"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid ""
 "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac.";
 "vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
@@ -1008,12 +1042,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 msgid "Fred von Lohmann"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 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/?";
@@ -1021,12 +1055,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid "Christian Wilms"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid ""
 "Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
 "\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";
@@ -1034,12 +1068,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 msgid "Jillian C. York"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 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/ru/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/ru/4-optional.volunteer.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/ru/4-optional.volunteer.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:03+0100\n"
+"POT-Creation-Date: 2010-03-09 09:20+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,21 +252,22 @@
 "Messaging client). Components are pre-configured to operate in a secure way, "
 "and it has very few dependencies on the installed operating system. It has "
 "therefore become one of the most easy to use, and popular, ways to use Tor "
-"on Windows.  <br /> However, there is currently no working package for Linux "
-"and Mac OS X, so this project would be to implement Tor Browser Bundle for "
-"these platforms. This will involve modifications to Vidalia (C++), possibly "
-"Firefox (C) then creating and testing the launcher on a range of operating "
-"system versions and configurations to verify portability.  Some work on this "
-"was completed as part of the Google Summer of Code 2009. Another part of "
-"this project is to identify all of the traces left behind by using a Tor "
-"Browser Bundle on Mac OS X or Linux.  Developing ways to stop, counter, or "
-"remove these traces is a final step.  <br /> Students should be familiar "
-"with application development on one or preferably both of Linux and Mac OS "
-"X, and be comfortable with C/C++ and shell scripting.  <br /> Part of this "
-"project could be usability testing of Tor Browser Bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
+"on Windows.  <br /> However, there is currently no released package for "
+"Linux and Mac OS X, so this project would be to implement Tor Browser Bundle "
+"for OS X and continue work on the Tor Browser Bundle for Linux. This will "
+"involve modifications to Vidalia (C++), possibly Firefox (C) then creating "
+"and testing the launcher on a range of operating system versions and "
+"configurations to verify portability.  Some work on this was completed as "
+"part of the Google Summer of Code 2009. Another part of this project is to "
+"identify all of the traces left behind by using a Tor Browser Bundle on Mac "
+"OS X or Linux.  Developing ways to stop, counter, or remove these traces is "
+"a final step.  <br /> Students should be familiar with application "
+"development on one or preferably both of Linux and Mac OS X, and be "
+"comfortable with C/C++ and shell scripting.  <br /> Part of this project "
+"could be usability testing of Tor Browser Bundle, ideally amongst our target "
+"demographic.  That would help a lot in knowing what needs to be done in "
+"terms of bug fixes or new features. We get this informally at the moment, "
+"but a more structured process would be better."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -320,27 +321,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:225
-msgid ""
-"<b>Tuneup Tor!</b> <br /> Priority: <i>Medium to High</i> <br /> Effort "
-"Level: <i>Medium to High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Nick, Roger, Mike, Karsten</i> <br /> Right now, Tor relays "
-"measure and report their own bandwidth, and Tor clients choose which relays "
-"to use in part based on that bandwidth.  This approach is vulnerable to <a "
-"href=\"http://freehaven.net/anonbib/#bauer:wpes2007\";>attacks where relays "
-"lie about their bandwidth</a>; to address this, Tor currently caps the "
-"maximum bandwidth it's willing to believe any relay provides.  This is a "
-"limited fix, and a waste of bandwidth capacity to boot.  Instead, Tor should "
-"possibly measure bandwidth in a more distributed way, perhaps as described "
-"in the <a href=\"http://freehaven.net/anonbib/author.html#snader08\";>\"A "
-"Tune-up for Tor\"</a> paper by Snader and Borisov. One could use current "
-"testing code to double-check this paper's findings and verify the extent to "
-"which they dovetail with Tor as deployed in the wild, and determine good "
-"ways to incorporate them into their suggestions Tor network without adding "
-"too much communications overhead between relays and directory authorities."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:256
 msgid ""
 "<b>Improving Polipo on Windows</b> <br /> Priority: <i>Medium to High</i> "
@@ -382,17 +362,17 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:283
 msgid ""
-"<b>Tor Controller Status Event Interface</b> <br /> Priority: <i>Medium</i> "
-"<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> "
-"<br /> Likely Mentors: <i>Matt</i> <br /> There are a number of status "
-"changes inside Tor of which the user may need to be informed. For example, "
-"if the user is trying to set up his Tor as a relay and Tor decides that its "
-"ports are not reachable from outside the user's network, we should alert the "
-"user. Currently, all the user gets is a couple log messages in Vidalia's "
-"'message log' window, which they likely never see since they don't receive a "
-"notification that something has gone wrong. Even if the user does actually "
-"look at the message log, most of the messages make little sense to the "
-"novice user.  <br /> Tor has the ability to inform Vidalia of many such "
+"<b>Tor Controller Status Event Interface for Vidalia</b> <br /> Priority: "
+"<i>Medium</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low "
+"to Medium</i> <br /> Likely Mentors: <i>Matt</i> <br /> There are a number "
+"of status changes inside Tor of which the user may need to be informed. For "
+"example, if the user is trying to set up his Tor as a relay and Tor decides "
+"that its ports are not reachable from outside the user's network, we should "
+"alert the user. Currently, all the user gets is a couple log messages in "
+"Vidalia's 'message log' window, which they likely never see since they don't "
+"receive a notification that something has gone wrong. Even if the user does "
+"actually look at the message log, most of the messages make little sense to "
+"the novice user.  <br /> Tor has the ability to inform Vidalia of many such "
 "status changes, and we recently implemented support for a couple of these "
 "events. Still, there are many more status events the user should be informed "
 "of and we need a better UI for actually displaying them to the user.  <br /> "
@@ -477,40 +457,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:415
-msgid ""
-"<b>New Thandy Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Medium to High</i> <br /> Likely "
-"Mentors: <i>Martin</i> <br /> Additional capabilities are needed for "
-"assisted updates of all the Tor related software for Windows and other "
-"operating systems. Some of the features to consider include:"
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:429
-msgid ""
-"Integration of the <a href=\"http://chandlerproject.org/Projects/MeTooCrypto";
-"\">MeTooCrypto Python library</a> for authenticated HTTPS downloads."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:433
-msgid ""
-"Adding a level of indirection between the timestamp signatures and the "
-"package files included in an update. See the \"Thandy attacks / suggestions"
-"\" thread on or-dev."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:436
-msgid ""
-"Support locale specific installation and configuration of assisted updates "
-"based on preference, host, or user account language settings.  Familiarity "
-"with Windows codepages, unicode, and other character sets is helpful in "
-"addition to general win32 and posix API experience and Python proficiency."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:445
 msgid ""
 "<b>Simulator for slow Internet connections</b> <br /> Priority: <i>Medium</"
@@ -558,27 +504,14 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:509
 msgid ""
-"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Low</i> <br /"
-"> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Mike</i> <br /> We're hearing from an increasing number of users "
-"that they want to use Thunderbird with Tor. However, there are plenty of "
-"application-level concerns, for example, by default Thunderbird will put "
-"your hostname in the outgoing mail that it sends. At some point we should "
-"start a new push to build a Thunderbird extension similar to Torbutton."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:527
-msgid ""
-"<b>Intermediate Level Network Device Driver</b> <br /> Priority: <i>Low</i> "
+"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Medium</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> "
-"Likely Mentors: <i>Martin</i> <br /> The WinPCAP device driver used by Tor "
-"VM for bridged networking does not support a number of wireless and non-"
-"Ethernet network adapters.  Implementation of a intermediate level network "
-"device driver for win32 and 64bit would provide a way to intercept and route "
-"traffic over such networks. This project will require knowledge of and "
-"experience with Windows kernel device driver development and testing. "
-"Familiarity with Winsock and Qemu would also be helpful."
+"Likely Mentors: <i>Mike</i> <br /> We're hearing from an increasing number "
+"of users that they want to use Thunderbird with Tor. However, there are "
+"plenty of application-level concerns, for example, by default Thunderbird "
+"will put your hostname in the outgoing mail that it sends. At some point we "
+"should start a new push to build a Thunderbird extension similar to "
+"Torbutton."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -643,35 +576,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:621
-msgid ""
-"<b>Tor/Polipo/Vidalia Auto-Update Framework</b> <br /> We're in need of a "
-"good authenticated-update framework.  Vidalia already has the ability to "
-"notice when the user is running an outdated or unrecommended version of Tor, "
-"using signed statements inside the Tor directory information. Currently, "
-"Vidalia simply pops up a little message box that lets the user know they "
-"should manually upgrade. The goal of this project would be to extend Vidalia "
-"with the ability to also fetch and install the updated Tor software for the "
-"user. We should do the fetches via Tor when possible, but also fall back to "
-"direct fetches in a smart way. Time permitting, we would also like to be "
-"able to update other applications included in the bundled installers, such "
-"as Polipo and Vidalia itself.  <br /> To complete this project, the student "
-"will first need to first investigate the existing auto-update frameworks (e."
-"g., Sparkle on OS X) to evaluate their strengths, weaknesses, security "
-"properties, and ability to be integrated into Vidalia. If none are found to "
-"be suitable, the student will design their own auto-update framework, "
-"document the design, and then discuss the design with other developers to "
-"assess any security issues. The student will then implement their framework "
-"(or integrate an existing one) and test it.  <br /> A person undertaking "
-"this project should have good C++ development experience. Previous "
-"experience with Qt is helpful, but not required. One should also have a good "
-"understanding of common security practices, such as package signature "
-"verification. Good writing ability is also important for this project, since "
-"a vital step of the project will be producing a design document to review "
-"and discuss with others prior to implementation."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:655
 msgid ""
 "<b>Improving the Tor QA process: Continuous Integration for builds</b> <br /"
@@ -699,17 +603,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:683
-msgid ""
-"<b>Usability testing of Tor</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> <br /> Likely "
-"Mentors: <i>Andrew</i> <br /> Especially the browser bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:700
 msgid ""
 "<b>An authenticating IRC proxy</b> <br /> Priority: <i>Medium</i> <br /> "

Modified: translation/trunk/projects/website/ru/docs/1-high.tor-doc-windows.po
===================================================================
--- translation/trunk/projects/website/ru/docs/1-high.tor-doc-windows.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/ru/docs/1-high.tor-doc-windows.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 23:29+0100\n"
+"POT-Creation-Date: 2010-03-09 09:20+0100\n"
 "PO-Revision-Date: 2010-03-08 08:18-0700\n"
 "Last-Translator: vitaliy <vitolink@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -25,8 +25,8 @@
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:12
-#: /tmp/K4I000bhxA.xml:34 /tmp/K4I000bhxA.xml:70 /tmp/K4I000bhxA.xml:109
-#: /tmp/K4I000bhxA.xml:152
+#: /tmp/_fgsa2qB6y.xml:34 /tmp/_fgsa2qB6y.xml:70 /tmp/_fgsa2qB6y.xml:109
+#: /tmp/_fgsa2qB6y.xml:152
 msgid "<br />"
 msgstr "<br />"
 
@@ -55,10 +55,10 @@
 "language? Let us know!"
 msgstr ""
 "ÐÑÐÐÐÐÐÐÑÐÑ Freedom House (ÐÐÐ ÐÐÐÐÐÐÑ) ÑÐÐÐÐÐÐ ÐÐÐÐÐ ÑÐÐÐÐ, ÑÐÑÑÐÐÐÑÐÐÑÑÐÐ "
-"Ð ÑÐÐ, ÐÐÐ ÑÑÑÐÐÐÐÐÑÑ Tor. ÐÑ ÐÐÐÐÑÐ ÐÑÐÑÐÐÑÑÐÑÑ ÐÐÐ ÐÐÐÑÑ: <a "
-"href=\"http://tinyvid.tv/show/3lejztnthk2tm\";>TinyVid: ÐÐÐ ÑÑÑÐÐÐÐÐÑÑ Tor ÐÐÐ "
-"ÐÐ Windows (ÐÐ ÐÐÐÐÐÐÑÐÐÐ ÑÐÑÐÐ)</a>. ÐÐÐ ÐÐÐÐÑÑÐÐ Ð ÐÐÐÐÑÐÐ ÐÐÐÐÐ "
-"ÐÐÐÐÑÐÐÐÐÐ ÑÐÐÐÐÐ ÐÐÐ Ð ÐÐÑÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑ ÑÐÑÐ ÐÐÑÑÐÐ? ÐÐÐÐÑÐÑÐ ÐÐÐ!"
+"Ð ÑÐÐ, ÐÐÐ ÑÑÑÐÐÐÐÐÑÑ Tor. ÐÑ ÐÐÐÐÑÐ ÐÑÐÑÐÐÑÑÐÑÑ ÐÐÐ ÐÐÐÑÑ: <a href=\"http://";
+"tinyvid.tv/show/3lejztnthk2tm\">TinyVid: ÐÐÐ ÑÑÑÐÐÐÐÐÑÑ Tor ÐÐÐ ÐÐ Windows "
+"(ÐÐ ÐÐÐÐÐÐÑÐÐÐ ÑÐÑÐÐ)</a>. ÐÐÐ ÐÐÐÐÑÑÐÐ Ð ÐÐÐÐÑÐÐ ÐÐÐÐÐ ÐÐÐÐÑÐÐÐÐÐ ÑÐÐÐÐÐ "
+"ÐÐÐ Ð ÐÐÑÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑ ÑÐÑÐ ÐÐÑÑÐÐ? ÐÐÐÐÑÐÑÐ ÐÐÐ!"
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:31
@@ -87,18 +87,17 @@
 "win32-bundle-alpha>\">experimental</a> version of the Windows bundle, or "
 "look for more options on the <a href=\"<page download>\">download page</a>."
 msgstr ""
-"ÐÑÑÐÐÐÐÐÑÐÑÐ ÐÐÐÐÑÑ ÐÐÑ Microsoft Windows ÑÐÐÐÑÐÐÑ <a href=\"<page "
-"index>\">Tor</a>, <a href=\"<page vidalia/index>\">Vidalia</a> (ÐÑÐÑÐÑÐÑÐÐÐ "
-"ÐÐÐÑÐÐÐÐÑÐÐÑÑÐÐÐ ÐÐÑÐÑÑÐÐÑ ÐÐÑ Tor), <a "
-"href=\"https://addons.mozilla.org/firefox/2275/\";>Torbutton</a> (ÐÐÐÐÐÐ ÐÐÑ "
-"ÐÑÐÑÐÐÑÐ Mozilla Firefox), Ð <a "
+"ÐÑÑÐÐÐÐÐÑÐÑÐ ÐÐÐÐÑÑ ÐÐÑ Microsoft Windows ÑÐÐÐÑÐÐÑ <a href=\"<page index>"
+"\">Tor</a>, <a href=\"<page vidalia/index>\">Vidalia</a> (ÐÑÐÑÐÑÐÑÐÐÐ "
+"ÐÐÐÑÐÐÐÐÑÐÐÑÑÐÐÐ ÐÐÑÐÑÑÐÐÑ ÐÐÑ Tor), <a href=\"https://addons.mozilla.org/";
+"firefox/2275/\">Torbutton</a> (ÐÐÐÐÐÐ ÐÐÑ ÐÑÐÑÐÐÑÐ Mozilla Firefox), Ð <a "
 "href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\";>Polipo</a> (ÐÐÐ "
 "ÐÑÐÐÑÐ), ÑÐÐÑÐÐÐÑÐ Ð ÐÐÐÐ ÐÐÐÐÑ. ÐÑÐ ÑÐÑÑÑÐ ÐÑÐÐÐÐÐÐÐÑ ÐÑÐÐ-ÐÐÑÑÑÐÐÐÑ ÐÐÑ "
-"ÑÐÐÐÐÑÑÐÐÐ ÑÐÐÐÑÑ.  ÐÐÐÑÐÐÑÐ ÐÐÐÐ <a href=\"../<package-win32-bundle-"
-"stable>\">ÑÑÐÐÐÐÑÐÑÑ</a> ÐÐÐÐ <a href=\"../<package-win32-bundle-"
-"alpha>\">ÑÐÑÐÐÑÐÐÐÐÑÐÐÑÐÑÑ</a> ÐÐÑÑÐÑ ÐÐÐÐÑÐ ÐÐÑ Windows. ÐÑ ÐÐÐÐÑÐ ÑÐÐÐÐ "
-"ÐÐÐÐÐÐÐÐÑÑÑÑ Ñ ÑÐÑÐÐÑÐÑÐÑÑÐÐÐÐÐ ÐÐÑÐÐÐ ÐÑÐÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐÑ ÐÐ <a "
-"href=\"<page download>\">ÑÑÑÐÐÐÑÐ ÐÐÐÐÑÐÐ</a>."
+"ÑÐÐÐÐÑÑÐÐÐ ÑÐÐÐÑÑ.  ÐÐÐÑÐÐÑÐ ÐÐÐÐ <a href=\"../<package-win32-bundle-stable>"
+"\">ÑÑÐÐÐÐÑÐÑÑ</a> ÐÐÐÐ <a href=\"../<package-win32-bundle-alpha>"
+"\">ÑÐÑÐÐÑÐÐÐÐÑÐÐÑÐÑÑ</a> ÐÐÑÑÐÑ ÐÐÐÐÑÐ ÐÐÑ Windows. ÐÑ ÐÐÐÐÑÐ ÑÐÐÐÐ "
+"ÐÐÐÐÐÐÐÐÑÑÑÑ Ñ ÑÐÑÐÐÑÐÑÐÑÑÐÐÐÐÐ ÐÐÑÐÐÐ ÐÑÐÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐÑ ÐÐ <a href="
+"\"<page download>\">ÑÑÑÐÐÐÑÐ ÐÐÐÐÑÐÐ</a>."
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:49
@@ -106,8 +105,8 @@
 "<img alt=\"tor installer splash page\" src=\"../img/screenshot-win32-"
 "installer-splash.png\" />"
 msgstr ""
-"<img alt=\"tor installer splash page\" src=\"../img/screenshot-win32-installer-"
-"splash.png\" />"
+"<img alt=\"tor installer splash page\" src=\"../img/screenshot-win32-"
+"installer-splash.png\" />"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:51
@@ -124,8 +123,8 @@
 "<img alt=\"select components to install\" src=\"../img/screenshot-win32-"
 "installer-components.png\" />"
 msgstr ""
-"<img alt=\"select components to install\" src=\"../img/screenshot-win32"
-"-installer-components.png\" />"
+"<img alt=\"select components to install\" src=\"../img/screenshot-win32-"
+"installer-components.png\" />"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:58
@@ -145,8 +144,7 @@
 msgstr ""
 "ÐÑÐÐÑÐÐÐÐ Tor ÑÑÑÐÐÐÐÐÐÐÐÐÑÑÑ Ð ÐÐÑÐÑÑÐÐ ÐÐÐÐÐÑÑÐÐÐ ÐÑÐÐÑÐÐÐÑ ÐÐ ÑÐÐÐÑÐÐÐÑ. "
 "ÐÐÐ ÐÑÐÐÐÑÐÑÐÑ ÐÑÑÑÐÐÐÐÑÐ ÐÐÐÑÐÐÑÑÐÑÐÐÐÐÑÐ ÑÐÐÐ, Ð ÐÐÐÑÑÐÐÑÑÐÑ ÐÐÐÑÐÐÐÐÑÐÐÐÐ "
-"ÐÐ ÐÑÐÐÐÑÑÑ ÐÐÐÐÐÑÑÑ ÐÐÐÐÐ-ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ. ÐÐÐÑÐÑ ÐÑÐÐÑÐÐÐÐ Tor "
-"ÑÑÑÐÐÐÐÐÐÐÐ."
+"ÐÐ ÐÑÐÐÐÑÑÑ ÐÐÐÐÐÑÑÑ ÐÐÐÐÐ-ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ. ÐÐÐÑÐÑ ÐÑÐÐÑÐÐÐÐ Tor ÑÑÑÐÐÐÐÐÐÐÐ."
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:67
@@ -159,8 +157,8 @@
 "<a class=\"anchor\" href=\"#using\">Step Two: Configure your applications to "
 "use Tor</a>"
 msgstr ""
-"<a class=\"anchor\" href=\"#using\">ÐÐÐ ÐÑÐÑÐÐ: ÐÐÑÑÑÐÐÐÐ ÐÐÑÐÑ ÐÑÐÐÐÐÐÐÐÐ ÐÐ "
-"ÐÑÐÐÐÑÐÐÐÐÐÐÐ ÑÐÑÐÐÑÐ Tor</a>"
+"<a class=\"anchor\" href=\"#using\">ÐÐÐ ÐÑÐÑÐÐ: ÐÐÑÑÑÐÐÐÐ ÐÐÑÐÑ ÐÑÐÐÐÐÐÐÐÐ "
+"ÐÐ ÐÑÐÐÐÑÐÐÐÐÐÐÐ ÑÐÑÐÐÑÐ Tor</a>"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:72
@@ -180,8 +178,8 @@
 "plugin</a> for you. Restart your Firefox, and you're all set:"
 msgstr ""
 "ÐÐÐ ÑÐÐÐÑÐÑ ÐÑÐÐÐÑÐÐÐÐÑÑ Tor Ñ ÐÑÐÑÐÐÑÐÐ Firefox Ð ÐÐÐÐÐÐÐÐÐÐÐ Torbutton ÐÐÑ "
-"ÐÐÐÑÐÐÑÐÐÐÑ ÐÐÐÐÑÑÑÐÐ ÐÐÐÐÐÐÑÐÐÑÑÐ. ÐÐÐÐÑ ÑÑÑÐÐÐÐÐÑ ÐÐÑ ÐÐÑ <a "
-"href=\"https://addons.mozilla.org/firefox/2275/\";>ÐÐÐÐÐÐ Torbutton</a>. "
+"ÐÐÐÑÐÐÑÐÐÐÑ ÐÐÐÐÑÑÑÐÐ ÐÐÐÐÐÐÑÐÐÑÑÐ. ÐÐÐÐÑ ÑÑÑÐÐÐÐÐÑ ÐÐÑ ÐÐÑ <a href="
+"\"https://addons.mozilla.org/firefox/2275/\";>ÐÐÐÐÐÐ Torbutton</a>. "
 "ÐÐÑÐÐÐÐÑÑÑÐÑÐ ÐÐÑ ÐÑÐÑÐÐÑ Firefox, Ð ÐÑÐ ÐÐÑÑÑÐÐÐÐ:"
 
 #. type: Content of: <div><div>
@@ -190,8 +188,8 @@
 "<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
 "png\" border=\"1\"/> <br />"
 msgstr ""
-"<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-"
-"torbutton.png\" border=\"1\"/> <br />"
+"<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
+"png\" border=\"1\"/> <br />"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:86
@@ -202,10 +200,10 @@
 "computer</a>."
 msgstr ""
 "ÐÑÐÐ ÐÑ ÐÐÐÐÐÑÑÐÑÐ ÐÑÐÐÐÑÐÐÐÐÑÑ Firefox ÐÐ ÐÐ ÑÐÐ ÐÐÐÐÑÑÑÐÑÐ, ÐÑÐÐ "
-"ÑÑÑÐÐÐÐÐÐÐ Tor, ÐÐÐÐÐÐÐÑÑÐÑÑ ÑÐ <a href=\"https://wiki.torproject.org/noreply";
-"/TheOnionRouter/TorFAQ#SocksListenAddress\">ÐÐÐÑÐÐÐ ÑÐÑÑÐ ÐÐÐÐÐÐÐÐÑÑ ÐÐÐÑÐÑÐÐ "
-"ÐÐ ÐÑÐÐÐÑÐÐÐÐÐÐÑ Tor ÐÐ ÐÑÑÐÐÐ ÐÐÐÐÑÑÑÐÑÐ (FAQ entry for running Tor on a "
-"different computer)</a>."
+"ÑÑÑÐÐÐÐÐÐÐ Tor, ÐÐÐÐÐÐÐÑÑÐÑÑ ÑÐ <a href=\"https://wiki.torproject.org/";
+"noreply/TheOnionRouter/TorFAQ#SocksListenAddress\">ÐÐÐÑÐÐÐ ÑÐÑÑÐ ÐÐÐÐÐÐÐÐÑÑ "
+"ÐÐÐÑÐÑÐÐ ÐÐ ÐÑÐÐÐÑÐÐÐÐÐÐÑ Tor ÐÐ ÐÑÑÐÐÐ ÐÐÐÐÑÑÑÐÑÐ (FAQ entry for running "
+"Tor on a different computer)</a>."
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:91
@@ -223,12 +221,12 @@
 "ÐÑÐÑÑÐ ÑÐÐÐÐÑÐ ÐÐ ÐÐ Polipo (ÐÐÑÐÑÑÐ ÑÐÑÐÐÐÐÐÐÐ ÐÐÐÑÑ: localhost ÐÐÑÑ 8118). "
 "ÐÑÐÐÑ ÐÑÐÐÐÑÐÐÐÐÑÑ SOCKS ÐÐÐÑÑÐÑÑ (ÐÐÑ ÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐÐ ÑÐÐÐÑÐÐÐÑÐÐ, "
 "Jabber, IRC, Ð Ñ.Ð.), ÐÑ ÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑÑ ÑÐÐÐ ÐÑÐÐÐÐÐÐÐÐ ÐÐ Tor (localhost "
-"ÐÐÑÑ 9050), ÐÐ ÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑÑÐÑÑ Ñ ÑÐÐÐÑÐÐÐÑÐ<a href=\"https://wiki.torproj";
-"ect.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS\">ÑÑÐÐÐ ÐÐÐÑÐÐ ÑÐÑÑÐ "
-"ÐÐÐÐÐÐÐÐÑÑ ÐÐÐÑÐÑÐÐ</a>, ÑÑÐÐÑ ÑÐÐÐÑÑ ÐÐÑÐÐÑ ÑÑÐ ÐÐÐÐÑ ÐÑÑÑ ÐÐÐÑÐÐ. ÐÐÑ "
-"ÐÐÑÑÑÐÐÐÐ ÐÑÐÐÐÐÐÐÐÐ, ÐÐ ÐÐÐÐÐÑÐÐÐÐÑÑÐÑ ÐÐ SOCKS ÐÐ HTTP, ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÐÐ "
-"ÐÐ ÐÑÐÐÐÐÐÐÐÑ SocksCap Ð <a href=\"http://www.freecap.ru/\";>FreeCap</a>.  "
-"(FreeCap - ÑÑÐ ÐÐÑÐÐÐÑÐÐÐ ÐÐ; SocksCap - ÐÐÐÑÐÐÐ.)"
+"ÐÐÑÑ 9050), ÐÐ ÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑÑÐÑÑ Ñ ÑÐÐÐÑÐÐÐÑÐ<a href=\"https://wiki.";
+"torproject.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS\">ÑÑÐÐÐ ÐÐÐÑÐÐ "
+"ÑÐÑÑÐ ÐÐÐÐÐÐÐÐÑÑ ÐÐÐÑÐÑÐÐ</a>, ÑÑÐÐÑ ÑÐÐÐÑÑ ÐÐÑÐÐÑ ÑÑÐ ÐÐÐÐÑ ÐÑÑÑ ÐÐÐÑÐÐ. "
+"ÐÐÑ ÐÐÑÑÑÐÐÐÐ ÐÑÐÐÐÐÐÐÐÐ, ÐÐ ÐÐÐÐÐÑÐÐÐÐÑÑÐÑ ÐÐ SOCKS ÐÐ HTTP, ÐÐÑÐÑÐÑÐ "
+"ÐÐÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐÑ SocksCap Ð <a href=\"http://www.freecap.ru/";
+"\">FreeCap</a>.  (FreeCap - ÑÑÐ ÐÐÑÐÐÐÑÐÐÐ ÐÐ; SocksCap - ÐÐÐÑÐÐÐ.)"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:101
@@ -238,8 +236,8 @@
 "HOWTO</a>."
 msgstr ""
 "ÐÑÐÐÑ ÐÐÐÑÑÐÑÑ ÐÐÑÐÑÐÐÑÐÑ Ð ÑÐÐ, ÐÐÐ \"ÐÐÑÐÑÐÑÐÑÐÐÐÑÑ\" ÐÑÑÐÐÐ ÐÑÐÐÐÐÐÐÐÑ, "
-"ÐÐÐÐÐÐÐÑÑÐÑÑ Ñ <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/T";
-"orifyHOWTO\">ÐÐÑÑÑÑÐÑÐÐÐ ÐÐ \"ÐÐÑÐÑÐÐÐÑÐÐ\"</a>."
+"ÐÐÐÐÐÐÐÑÑÐÑÑ Ñ <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/";
+"TorifyHOWTO\">ÐÐÑÑÑÑÐÑÐÐÐ ÐÐ \"ÐÐÑÐÑÐÐÐÑÐÐ\"</a>."
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:106

Modified: translation/trunk/projects/website/ru/docs/3-low.debian.po
===================================================================
--- translation/trunk/projects/website/ru/docs/3-low.debian.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/ru/docs/3-low.debian.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 23:29+0100\n"
+"POT-Creation-Date: 2010-03-09 09:20+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -28,8 +28,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/MCBM3kRM71.xml:40
-#: /tmp/MCBM3kRM71.xml:96 /tmp/MCBM3kRM71.xml:130
+#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/6uQPlolDeb.xml:40
+#: /tmp/6uQPlolDeb.xml:96 /tmp/6uQPlolDeb.xml:130
 msgid "<br />"
 msgstr ""
 
@@ -49,8 +49,8 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/MCBM3kRM71.xml:77
-#: /tmp/MCBM3kRM71.xml:121 /tmp/MCBM3kRM71.xml:164
+#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/6uQPlolDeb.xml:77
+#: /tmp/6uQPlolDeb.xml:121 /tmp/6uQPlolDeb.xml:164
 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."
@@ -94,8 +94,9 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:59
 msgid ""
-"where you substitute the above word (etch, lenny, sid, karmic, jaunty, "
-"intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you put the codename of your distribution (i.e. etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy or whatever it is) in place of &lt;"
+"DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -165,8 +166,8 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:106
 msgid ""
-"where you substitute the name of your distro (etch, lenny, sid, karmic, "
-"jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you again substitute the name of your distro (etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/ru/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/ru/docs/3-low.tor-doc-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/ru/docs/3-low.tor-doc-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:33+0100\n"
+"POT-Creation-Date: 2010-03-09 09:20+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/c5utUvQbSS.xml:24
-#: /tmp/c5utUvQbSS.xml:54 /tmp/c5utUvQbSS.xml:88 /tmp/c5utUvQbSS.xml:131
-#: /tmp/c5utUvQbSS.xml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/rEChRtToAz.xml:24
+#: /tmp/rEChRtToAz.xml:54 /tmp/rEChRtToAz.xml:88 /tmp/rEChRtToAz.xml:131
+#: /tmp/rEChRtToAz.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -63,10 +63,10 @@
 "If you're building from source, first install <a href=\"http://www.monkey.";
 "org/~provos/libevent/\">libevent</a>, and make sure you have openssl and "
 "zlib (including the -devel packages if applicable). Then run:<br /> <tt>tar "
-"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable><br /> ./configure "
-"&amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</tt>, or "
-"you can run <tt>make install</tt> (as root if necessary) to install it into /"
-"usr/local/, and then you can start it just by running <tt>tor</tt>."
+"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable></tt><br /> <tt>./"
+"configure &amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</"
+"tt>, or you can run <tt>make install</tt> (as root if necessary) to install "
+"it into /usr/local/, and then you can start it just by running <tt>tor</tt>."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/sv/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/sv/2-medium.donate.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/sv/2-medium.donate.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:02+0100\n"
+"POT-Creation-Date: 2010-03-09 09:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -61,7 +61,7 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:32 /tmp/3WriWEribX.xml:102
+#: /home/runa/tor/website/en/donate.wml:32 /tmp/wuFsxKvjA5.xml:102
 msgid "<br />"
 msgstr ""
 
@@ -143,17 +143,17 @@
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:72 /tmp/3WriWEribX.xml:114
+#: /home/runa/tor/website/en/donate.wml:72 /tmp/wuFsxKvjA5.xml:114
 msgid "$"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:73 /tmp/3WriWEribX.xml:115
+#: /home/runa/tor/website/en/donate.wml:73 /tmp/wuFsxKvjA5.xml:115
 msgid "â"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:74 /tmp/3WriWEribX.xml:116
+#: /home/runa/tor/website/en/donate.wml:74 /tmp/wuFsxKvjA5.xml:116
 msgid "Â"
 msgstr ""
 
@@ -248,7 +248,8 @@
 
 #. type: Content of: <div><p><address>
 #: /home/runa/tor/website/en/donate.wml:136
-msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
+msgid ""
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 USA"
 msgstr ""
 
 #. type: Content of: <div><p>

Modified: translation/trunk/projects/website/sv/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/sv/2-medium.verifying-signatures.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/sv/2-medium.verifying-signatures.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-21 18:43+0100\n"
+"POT-Creation-Date: 2010-03-09 09:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -22,7 +22,7 @@
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/verifying-signatures.wml:10
-#: /tmp/eOIqTU11vT.xml:33 /tmp/eOIqTU11vT.xml:45 /tmp/eOIqTU11vT.xml:92
+#: /tmp/Sjwf9npsbe.xml:34 /tmp/Sjwf9npsbe.xml:46 /tmp/Sjwf9npsbe.xml:93
 msgid "<hr />"
 msgstr ""
 
@@ -80,61 +80,66 @@
 msgid "Jacob's (0x9D0FACE4)"
 msgstr ""
 
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/verifying-signatures.wml:30
+msgid "Erinn's (0x63FEE659) and (0xF1F5C9B5)"
+msgstr ""
+
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:32
+#: /home/runa/tor/website/en/verifying-signatures.wml:33
 msgid "Step One: Import the keys"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:34
+#: /home/runa/tor/website/en/verifying-signatures.wml:35
 msgid "You can import keys directly from GnuPG as well:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:36
+#: /home/runa/tor/website/en/verifying-signatures.wml:37
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --recv-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:38
+#: /home/runa/tor/website/en/verifying-signatures.wml:39
 msgid "or search for keys with"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:40
+#: /home/runa/tor/website/en/verifying-signatures.wml:41
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --search-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:42
+#: /home/runa/tor/website/en/verifying-signatures.wml:43
 msgid "and when you select one, it will be added to your keyring."
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:44
+#: /home/runa/tor/website/en/verifying-signatures.wml:45
 msgid "Step Two: Verify the fingerprints"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:46
+#: /home/runa/tor/website/en/verifying-signatures.wml:47
 msgid "Verify the pgp fingerprints using:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:47
+#: /home/runa/tor/website/en/verifying-signatures.wml:48
 #, no-wrap
 msgid "gpg --fingerprint (insert keyid here)"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/verifying-signatures.wml:48
+#: /home/runa/tor/website/en/verifying-signatures.wml:49
 msgid "The fingerprints for the keys should be:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:51
+#: /home/runa/tor/website/en/verifying-signatures.wml:52
 #, no-wrap
 msgid ""
 "pub   1024D/28988BF5 2000-02-27\n"
@@ -174,7 +179,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:87
+#: /home/runa/tor/website/en/verifying-signatures.wml:88
 msgid ""
 "(Of course if you want to be really certain that those are the real ones "
 "then you should check this from more places or even better get into key "
@@ -182,12 +187,12 @@
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:91
+#: /home/runa/tor/website/en/verifying-signatures.wml:92
 msgid "Step Three: Verify the downloaded package"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:93
+#: /home/runa/tor/website/en/verifying-signatures.wml:94
 msgid ""
 "If you're using GnuPG, then put the .asc and the download in the same "
 "directory and type \"gpg --verify (whatever).asc (whatever)\". It will say "
@@ -196,7 +201,7 @@
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:99
+#: /home/runa/tor/website/en/verifying-signatures.wml:100
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc tor-0.1.0.17.tar.gz\n"
@@ -209,7 +214,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:109
+#: /home/runa/tor/website/en/verifying-signatures.wml:110
 msgid ""
 "Notice that there is a warning because you haven't assigned a trust index to "
 "this user. This means that your program verified the key made that "
@@ -222,19 +227,19 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:118
+#: /home/runa/tor/website/en/verifying-signatures.wml:119
 msgid "All this means is you can ignore the message or assign a trust level."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:120
+#: /home/runa/tor/website/en/verifying-signatures.wml:121
 msgid ""
 "For your reference, this is an example of a <em>BAD</em> verification. It "
 "means that the signature and file contents do not match:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:124
+#: /home/runa/tor/website/en/verifying-signatures.wml:125
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc\n"
@@ -243,14 +248,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:129
+#: /home/runa/tor/website/en/verifying-signatures.wml:130
 msgid ""
 "If you see a message like the above one, then you should not trust the file "
 "contents."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:131
+#: /home/runa/tor/website/en/verifying-signatures.wml:132
 msgid ""
 "If you are running Tor on Debian you should read the instructions on <a href="
 "\"<page docs/debian>#packages\">importing these keys to apt</a>."

Modified: translation/trunk/projects/website/sv/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/sv/3-low.download-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/sv/3-low.download-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:31+0100\n"
+"POT-Creation-Date: 2010-03-09 09:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/bwOEmFwv2Q.xml:40
-#: /tmp/bwOEmFwv2Q.xml:56 /tmp/bwOEmFwv2Q.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/fBoYZwCDat.xml:40
+#: /tmp/fBoYZwCDat.xml:56 /tmp/fBoYZwCDat.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -184,54 +184,79 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:84
-msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgid ""
+"<img src=\"images/distros/android-market.gif\" alt=\"Android\" width=\"32\" "
+"height=\"32\"/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:85
-msgid "Source tarballs"
+msgid "Android"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /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/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/tor/website/en/download-unix.wml:92
+msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:93
+msgid "Source tarballs"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:95
+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/tor/website/en/download-unix.wml:91
+#: /home/runa/tor/website/en/download-unix.wml:99
 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/tor/website/en/download-unix.wml:94
+#: /home/runa/tor/website/en/download-unix.wml:102
 msgid "<kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:101
+#: /home/runa/tor/website/en/download-unix.wml:109
 msgid "<a id=\"packagediff\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:102
+#: /home/runa/tor/website/en/download-unix.wml:110
 msgid ""
 "<a class=\"anchor\" href=\"#packagediff\">What's the difference between "
 "Stable &amp; Unstable?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:105
+#: /home/runa/tor/website/en/download-unix.wml:113
 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/tor/website/en/download-unix.wml:109
+#: /home/runa/tor/website/en/download-unix.wml:117
 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 "
@@ -241,7 +266,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:118
+#: /home/runa/tor/website/en/download-unix.wml:126
 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 "
@@ -251,7 +276,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:125
+#: /home/runa/tor/website/en/download-unix.wml:133
 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 "
@@ -259,7 +284,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:134
+#: /home/runa/tor/website/en/download-unix.wml:142
 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 "
@@ -269,7 +294,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><form>
-#: /home/runa/tor/website/en/download-unix.wml:142
+#: /home/runa/tor/website/en/download-unix.wml:150
 msgid ""
 "<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
 "\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
@@ -278,18 +303,18 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:152
+#: /home/runa/tor/website/en/download-unix.wml:160
 msgid "<a id=\"Warning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:153
+#: /home/runa/tor/website/en/download-unix.wml:161
 msgid ""
 "<a class=\"anchor\" href=\"#Warning\">Warning: Want Tor to really work?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:157
+#: /home/runa/tor/website/en/download-unix.wml:165
 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> "
@@ -298,7 +323,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:165
+#: /home/runa/tor/website/en/download-unix.wml:173
 msgid ""
 "Tor only protects Internet applications that are configured to send their "
 "traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
@@ -308,7 +333,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:173
+#: /home/runa/tor/website/en/download-unix.wml:181
 msgid ""
 "Browser plugins such as Java, Flash, ActiveX, RealPlayer, Quicktime, Adobe's "
 "PDF plugin, and others can be manipulated into revealing your IP address. "
@@ -324,7 +349,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:189
+#: /home/runa/tor/website/en/download-unix.wml:197
 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. "
@@ -334,7 +359,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:197
+#: /home/runa/tor/website/en/download-unix.wml:205
 msgid ""
 "Tor anonymizes the origin of your traffic, and it encrypts everything inside "
 "the Tor network, but <a href=\"https://wiki.torproject.org/noreply/";
@@ -346,7 +371,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:208
+#: /home/runa/tor/website/en/download-unix.wml:216
 msgid ""
 "While Tor blocks attackers on your local network from discovering or "
 "influencing your destination, it opens new risks: malicious or misconfigured "
@@ -355,12 +380,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:216
+#: /home/runa/tor/website/en/download-unix.wml:224
 msgid "<br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:218
+#: /home/runa/tor/website/en/download-unix.wml:226
 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 "
@@ -368,7 +393,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:228
+#: /home/runa/tor/website/en/download-unix.wml:236
 msgid ""
 "See our <a href=\"<page verifying-signatures>\">FAQ entry on verifying "
 "package signatures</a>, which allows you to make sure you've downloaded the "
@@ -376,7 +401,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:234
+#: /home/runa/tor/website/en/download-unix.wml:242
 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</"
@@ -384,7 +409,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:240
+#: /home/runa/tor/website/en/download-unix.wml:248
 msgid ""
 "See the <a href=\"<page documentation>#Developers\">developer documentation</"
 "a> for instructions on fetching Tor from Git to get the very latest "
@@ -394,19 +419,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:252
+#: /home/runa/tor/website/en/download-unix.wml:260
 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/tor/website/en/download-unix.wml:256
+#: /home/runa/tor/website/en/download-unix.wml:264
 msgid "<a id=\"ChangeLog\"></a> <a id=\"Stable\"></a> <a id=\"Testing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:260
+#: /home/runa/tor/website/en/download-unix.wml:268
 msgid ""
 "For a list of what has changed in each stable Tor release, see the <a href="
 "\"<gitblob>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in both "

Modified: translation/trunk/projects/website/sv/3-low.people.po
===================================================================
--- translation/trunk/projects/website/sv/3-low.people.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/sv/3-low.people.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:01+0100\n"
+"POT-Creation-Date: 2010-03-09 09:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -60,8 +60,8 @@
 #. type: Content of: <div><address>
 #: /home/runa/tor/website/en/people.wml:30
 msgid ""
-"The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA<br /"
-"><br />"
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 "
+"USA<br /><br />"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -542,34 +542,56 @@
 
 #. type: Content of: <div><dl><dt>
 #: /home/runa/tor/website/en/people.wml:202
-msgid "Kasimir Gabert"
+msgid "Marco Bonetti"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:202
+msgid "Focusing on MobileTor for the iPhone."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:203
+msgid "Nathan Freitas"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:203
 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/tor/website/en/people.wml:205
+msgid "Kasimir Gabert"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:205
+msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\";>TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid "Robert Hogan"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\";>TorK</a> Tor controller."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid "Damian Johnson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid ""
 "Builds a command-line application for monitoring Tor relays, providing real-"
 "time status information such as the current configuration, bandwidth usage, "
@@ -578,106 +600,118 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid ""
 "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
 "and Privoxy still work well together."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid "Kory Kirk"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid ""
 "Worked during Google Summer of Code 2009 on extending Torbutton. Now he's "
 "working with Bruce Leidl on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Bruce Leidl"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Working on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid ""
 "A lawyer with the CCC in Germany. Coordinates the German Tor community with "
 "respect to legal questions and concerns."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:224
+msgid "Linus Nordberg"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:224
+msgid ""
+"Enjoys measuring the Tor network and helps with outreach in the Nordic "
+"countries."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:226
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:226
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid "Martin Peck"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:225
+#: /home/runa/tor/website/en/people.wml:230
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:231
 msgid ""
 "The most dedicated bug reporter we've ever heard from. He must read Tor "
 "source code every day over breakfast."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy";
@@ -686,24 +720,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?";
 "p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/";
@@ -712,7 +746,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:241
+#: /home/runa/tor/website/en/people.wml:246
 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, "
@@ -720,32 +754,32 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:252
 msgid "<a id=\"Past\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:248
+#: /home/runa/tor/website/en/people.wml:253
 msgid "<a class=\"anchor\" href=\"#Past\">Past thanks to:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "John Bashinski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "Contributed the initial rpm spec file."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid "Domenik Bork"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid ""
 "Worked on Configuration of Hidden Services with User Authorization in "
 "Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches/";
@@ -753,12 +787,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 msgid "Benedikt Boss"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 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 "
@@ -766,22 +800,22 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Ren Bucholz"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Our fine logo and images."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 msgid "Fallon Chen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 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="
@@ -790,32 +824,32 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Bram Cohen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Helped design our congestion control mechanisms, in Tor's early days."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Pat Double"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Creator of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid "Geoff Goodell"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid ""
 "Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/";
 "\">Blossom project</a> which uses Tor as its overlay network; also helped "
@@ -823,12 +857,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid "Aleksei Gorny"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid ""
 "Working on Tor exit scanner improvements (<a href=\"https://svn.torproject.";
 "org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
@@ -836,52 +870,52 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Christian Grothoff"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Contributed better daemonizing behavior."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Steven Hazel"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Made 'make install' do the right thing."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "Justin Hipple"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "The other developer for Vidalia."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Jason Holt"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Contributed patches to the instructions and the man page."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 msgid "Christian King"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 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-";
@@ -889,70 +923,70 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid "Joe Kowalski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid ""
 "Original author and provider of the torstatus script formerly run on "
 "nighteffect."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Adam Langley"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Our fine eventdns code."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid "Rebecca MacKinnon"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid ""
 "Former Director of Tor.  Co-Founder of <a href=\"http://www.";
 "globalvoicesonline.org/\">Global Voices Online</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid "Chris Palmer"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid ""
 "Our liaison and tech guy with EFF while EFF was funding us. Also helped "
 "advocate and write end-user docs."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid "Matej Pfajfar"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid ""
 "Author of the original onion routing code that Tor is based on, so we didn't "
 "have to start from scratch."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 msgid "Johannes Renner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 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 "
@@ -960,33 +994,33 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid "Scott Squires"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid ""
 "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Aaron Turner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Contributed the first version of the tor.sh initscripts shell script."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 msgid "Stephen Tyree"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 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 "
@@ -995,12 +1029,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid "Camilo Viecco"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid ""
 "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac.";
 "vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
@@ -1008,12 +1042,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 msgid "Fred von Lohmann"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 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/?";
@@ -1021,12 +1055,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid "Christian Wilms"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid ""
 "Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
 "\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";
@@ -1034,12 +1068,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 msgid "Jillian C. York"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 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/sv/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/sv/4-optional.volunteer.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/sv/4-optional.volunteer.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 10:01+0100\n"
+"POT-Creation-Date: 2010-03-09 09:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,21 +252,22 @@
 "Messaging client). Components are pre-configured to operate in a secure way, "
 "and it has very few dependencies on the installed operating system. It has "
 "therefore become one of the most easy to use, and popular, ways to use Tor "
-"on Windows.  <br /> However, there is currently no working package for Linux "
-"and Mac OS X, so this project would be to implement Tor Browser Bundle for "
-"these platforms. This will involve modifications to Vidalia (C++), possibly "
-"Firefox (C) then creating and testing the launcher on a range of operating "
-"system versions and configurations to verify portability.  Some work on this "
-"was completed as part of the Google Summer of Code 2009. Another part of "
-"this project is to identify all of the traces left behind by using a Tor "
-"Browser Bundle on Mac OS X or Linux.  Developing ways to stop, counter, or "
-"remove these traces is a final step.  <br /> Students should be familiar "
-"with application development on one or preferably both of Linux and Mac OS "
-"X, and be comfortable with C/C++ and shell scripting.  <br /> Part of this "
-"project could be usability testing of Tor Browser Bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
+"on Windows.  <br /> However, there is currently no released package for "
+"Linux and Mac OS X, so this project would be to implement Tor Browser Bundle "
+"for OS X and continue work on the Tor Browser Bundle for Linux. This will "
+"involve modifications to Vidalia (C++), possibly Firefox (C) then creating "
+"and testing the launcher on a range of operating system versions and "
+"configurations to verify portability.  Some work on this was completed as "
+"part of the Google Summer of Code 2009. Another part of this project is to "
+"identify all of the traces left behind by using a Tor Browser Bundle on Mac "
+"OS X or Linux.  Developing ways to stop, counter, or remove these traces is "
+"a final step.  <br /> Students should be familiar with application "
+"development on one or preferably both of Linux and Mac OS X, and be "
+"comfortable with C/C++ and shell scripting.  <br /> Part of this project "
+"could be usability testing of Tor Browser Bundle, ideally amongst our target "
+"demographic.  That would help a lot in knowing what needs to be done in "
+"terms of bug fixes or new features. We get this informally at the moment, "
+"but a more structured process would be better."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -320,27 +321,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:225
-msgid ""
-"<b>Tuneup Tor!</b> <br /> Priority: <i>Medium to High</i> <br /> Effort "
-"Level: <i>Medium to High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Nick, Roger, Mike, Karsten</i> <br /> Right now, Tor relays "
-"measure and report their own bandwidth, and Tor clients choose which relays "
-"to use in part based on that bandwidth.  This approach is vulnerable to <a "
-"href=\"http://freehaven.net/anonbib/#bauer:wpes2007\";>attacks where relays "
-"lie about their bandwidth</a>; to address this, Tor currently caps the "
-"maximum bandwidth it's willing to believe any relay provides.  This is a "
-"limited fix, and a waste of bandwidth capacity to boot.  Instead, Tor should "
-"possibly measure bandwidth in a more distributed way, perhaps as described "
-"in the <a href=\"http://freehaven.net/anonbib/author.html#snader08\";>\"A "
-"Tune-up for Tor\"</a> paper by Snader and Borisov. One could use current "
-"testing code to double-check this paper's findings and verify the extent to "
-"which they dovetail with Tor as deployed in the wild, and determine good "
-"ways to incorporate them into their suggestions Tor network without adding "
-"too much communications overhead between relays and directory authorities."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:256
 msgid ""
 "<b>Improving Polipo on Windows</b> <br /> Priority: <i>Medium to High</i> "
@@ -382,17 +362,17 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:283
 msgid ""
-"<b>Tor Controller Status Event Interface</b> <br /> Priority: <i>Medium</i> "
-"<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> "
-"<br /> Likely Mentors: <i>Matt</i> <br /> There are a number of status "
-"changes inside Tor of which the user may need to be informed. For example, "
-"if the user is trying to set up his Tor as a relay and Tor decides that its "
-"ports are not reachable from outside the user's network, we should alert the "
-"user. Currently, all the user gets is a couple log messages in Vidalia's "
-"'message log' window, which they likely never see since they don't receive a "
-"notification that something has gone wrong. Even if the user does actually "
-"look at the message log, most of the messages make little sense to the "
-"novice user.  <br /> Tor has the ability to inform Vidalia of many such "
+"<b>Tor Controller Status Event Interface for Vidalia</b> <br /> Priority: "
+"<i>Medium</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low "
+"to Medium</i> <br /> Likely Mentors: <i>Matt</i> <br /> There are a number "
+"of status changes inside Tor of which the user may need to be informed. For "
+"example, if the user is trying to set up his Tor as a relay and Tor decides "
+"that its ports are not reachable from outside the user's network, we should "
+"alert the user. Currently, all the user gets is a couple log messages in "
+"Vidalia's 'message log' window, which they likely never see since they don't "
+"receive a notification that something has gone wrong. Even if the user does "
+"actually look at the message log, most of the messages make little sense to "
+"the novice user.  <br /> Tor has the ability to inform Vidalia of many such "
 "status changes, and we recently implemented support for a couple of these "
 "events. Still, there are many more status events the user should be informed "
 "of and we need a better UI for actually displaying them to the user.  <br /> "
@@ -477,40 +457,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:415
-msgid ""
-"<b>New Thandy Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Medium to High</i> <br /> Likely "
-"Mentors: <i>Martin</i> <br /> Additional capabilities are needed for "
-"assisted updates of all the Tor related software for Windows and other "
-"operating systems. Some of the features to consider include:"
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:429
-msgid ""
-"Integration of the <a href=\"http://chandlerproject.org/Projects/MeTooCrypto";
-"\">MeTooCrypto Python library</a> for authenticated HTTPS downloads."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:433
-msgid ""
-"Adding a level of indirection between the timestamp signatures and the "
-"package files included in an update. See the \"Thandy attacks / suggestions"
-"\" thread on or-dev."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:436
-msgid ""
-"Support locale specific installation and configuration of assisted updates "
-"based on preference, host, or user account language settings.  Familiarity "
-"with Windows codepages, unicode, and other character sets is helpful in "
-"addition to general win32 and posix API experience and Python proficiency."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:445
 msgid ""
 "<b>Simulator for slow Internet connections</b> <br /> Priority: <i>Medium</"
@@ -558,27 +504,14 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:509
 msgid ""
-"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Low</i> <br /"
-"> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Mike</i> <br /> We're hearing from an increasing number of users "
-"that they want to use Thunderbird with Tor. However, there are plenty of "
-"application-level concerns, for example, by default Thunderbird will put "
-"your hostname in the outgoing mail that it sends. At some point we should "
-"start a new push to build a Thunderbird extension similar to Torbutton."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:527
-msgid ""
-"<b>Intermediate Level Network Device Driver</b> <br /> Priority: <i>Low</i> "
+"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Medium</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> "
-"Likely Mentors: <i>Martin</i> <br /> The WinPCAP device driver used by Tor "
-"VM for bridged networking does not support a number of wireless and non-"
-"Ethernet network adapters.  Implementation of a intermediate level network "
-"device driver for win32 and 64bit would provide a way to intercept and route "
-"traffic over such networks. This project will require knowledge of and "
-"experience with Windows kernel device driver development and testing. "
-"Familiarity with Winsock and Qemu would also be helpful."
+"Likely Mentors: <i>Mike</i> <br /> We're hearing from an increasing number "
+"of users that they want to use Thunderbird with Tor. However, there are "
+"plenty of application-level concerns, for example, by default Thunderbird "
+"will put your hostname in the outgoing mail that it sends. At some point we "
+"should start a new push to build a Thunderbird extension similar to "
+"Torbutton."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -643,35 +576,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:621
-msgid ""
-"<b>Tor/Polipo/Vidalia Auto-Update Framework</b> <br /> We're in need of a "
-"good authenticated-update framework.  Vidalia already has the ability to "
-"notice when the user is running an outdated or unrecommended version of Tor, "
-"using signed statements inside the Tor directory information. Currently, "
-"Vidalia simply pops up a little message box that lets the user know they "
-"should manually upgrade. The goal of this project would be to extend Vidalia "
-"with the ability to also fetch and install the updated Tor software for the "
-"user. We should do the fetches via Tor when possible, but also fall back to "
-"direct fetches in a smart way. Time permitting, we would also like to be "
-"able to update other applications included in the bundled installers, such "
-"as Polipo and Vidalia itself.  <br /> To complete this project, the student "
-"will first need to first investigate the existing auto-update frameworks (e."
-"g., Sparkle on OS X) to evaluate their strengths, weaknesses, security "
-"properties, and ability to be integrated into Vidalia. If none are found to "
-"be suitable, the student will design their own auto-update framework, "
-"document the design, and then discuss the design with other developers to "
-"assess any security issues. The student will then implement their framework "
-"(or integrate an existing one) and test it.  <br /> A person undertaking "
-"this project should have good C++ development experience. Previous "
-"experience with Qt is helpful, but not required. One should also have a good "
-"understanding of common security practices, such as package signature "
-"verification. Good writing ability is also important for this project, since "
-"a vital step of the project will be producing a design document to review "
-"and discuss with others prior to implementation."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:655
 msgid ""
 "<b>Improving the Tor QA process: Continuous Integration for builds</b> <br /"
@@ -699,17 +603,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:683
-msgid ""
-"<b>Usability testing of Tor</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> <br /> Likely "
-"Mentors: <i>Andrew</i> <br /> Especially the browser bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:700
 msgid ""
 "<b>An authenticating IRC proxy</b> <br /> Priority: <i>Medium</i> <br /> "

Modified: translation/trunk/projects/website/sv/docs/3-low.debian.po
===================================================================
--- translation/trunk/projects/website/sv/docs/3-low.debian.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/sv/docs/3-low.debian.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-21 18:43+0100\n"
+"POT-Creation-Date: 2010-03-09 09:18+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -28,8 +28,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/aP3B70KDCH.xml:40
-#: /tmp/aP3B70KDCH.xml:96 /tmp/aP3B70KDCH.xml:130
+#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/0JtPfRgTot.xml:40
+#: /tmp/0JtPfRgTot.xml:96 /tmp/0JtPfRgTot.xml:130
 msgid "<br />"
 msgstr ""
 
@@ -49,8 +49,8 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/aP3B70KDCH.xml:77
-#: /tmp/aP3B70KDCH.xml:121 /tmp/aP3B70KDCH.xml:164
+#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/0JtPfRgTot.xml:77
+#: /tmp/0JtPfRgTot.xml:121 /tmp/0JtPfRgTot.xml:164
 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."
@@ -94,8 +94,9 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:59
 msgid ""
-"where you substitute the above word (etch, lenny, sid, karmic, jaunty, "
-"intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you put the codename of your distribution (i.e. etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy or whatever it is) in place of &lt;"
+"DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -165,8 +166,8 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:106
 msgid ""
-"where you substitute the name of your distro (etch, lenny, sid, karmic, "
-"jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you again substitute the name of your distro (etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/sv/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/sv/docs/3-low.tor-doc-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/sv/docs/3-low.tor-doc-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:31+0100\n"
+"POT-Creation-Date: 2010-03-09 09:18+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/of1K78wXpj.xml:24
-#: /tmp/of1K78wXpj.xml:54 /tmp/of1K78wXpj.xml:88 /tmp/of1K78wXpj.xml:131
-#: /tmp/of1K78wXpj.xml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/FfnqYejfRe.xml:24
+#: /tmp/FfnqYejfRe.xml:54 /tmp/FfnqYejfRe.xml:88 /tmp/FfnqYejfRe.xml:131
+#: /tmp/FfnqYejfRe.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -63,10 +63,10 @@
 "If you're building from source, first install <a href=\"http://www.monkey.";
 "org/~provos/libevent/\">libevent</a>, and make sure you have openssl and "
 "zlib (including the -devel packages if applicable). Then run:<br /> <tt>tar "
-"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable><br /> ./configure "
-"&amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</tt>, or "
-"you can run <tt>make install</tt> (as root if necessary) to install it into /"
-"usr/local/, and then you can start it just by running <tt>tor</tt>."
+"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable></tt><br /> <tt>./"
+"configure &amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</"
+"tt>, or you can run <tt>make install</tt> (as root if necessary) to install "
+"it into /usr/local/, and then you can start it just by running <tt>tor</tt>."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/tr/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/tr/2-medium.donate.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/tr/2-medium.donate.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 09:56+0100\n"
+"POT-Creation-Date: 2010-03-09 09:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -61,7 +61,7 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:32 /tmp/PeLUDDN54e.xml:102
+#: /home/runa/tor/website/en/donate.wml:32 /tmp/hsZe7vIHQc.xml:102
 msgid "<br />"
 msgstr ""
 
@@ -143,17 +143,17 @@
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:72 /tmp/PeLUDDN54e.xml:114
+#: /home/runa/tor/website/en/donate.wml:72 /tmp/hsZe7vIHQc.xml:114
 msgid "$"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:73 /tmp/PeLUDDN54e.xml:115
+#: /home/runa/tor/website/en/donate.wml:73 /tmp/hsZe7vIHQc.xml:115
 msgid "â"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:74 /tmp/PeLUDDN54e.xml:116
+#: /home/runa/tor/website/en/donate.wml:74 /tmp/hsZe7vIHQc.xml:116
 msgid "Â"
 msgstr ""
 
@@ -248,7 +248,8 @@
 
 #. type: Content of: <div><p><address>
 #: /home/runa/tor/website/en/donate.wml:136
-msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
+msgid ""
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 USA"
 msgstr ""
 
 #. type: Content of: <div><p>

Modified: translation/trunk/projects/website/tr/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/tr/2-medium.verifying-signatures.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/tr/2-medium.verifying-signatures.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-21 19:00+0100\n"
+"POT-Creation-Date: 2010-03-09 09:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -22,7 +22,7 @@
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/verifying-signatures.wml:10
-#: /tmp/60cgI2F2Sx.xml:33 /tmp/60cgI2F2Sx.xml:45 /tmp/60cgI2F2Sx.xml:92
+#: /tmp/VccGS029ur.xml:34 /tmp/VccGS029ur.xml:46 /tmp/VccGS029ur.xml:93
 msgid "<hr />"
 msgstr ""
 
@@ -80,61 +80,66 @@
 msgid "Jacob's (0x9D0FACE4)"
 msgstr ""
 
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/verifying-signatures.wml:30
+msgid "Erinn's (0x63FEE659) and (0xF1F5C9B5)"
+msgstr ""
+
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:32
+#: /home/runa/tor/website/en/verifying-signatures.wml:33
 msgid "Step One: Import the keys"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:34
+#: /home/runa/tor/website/en/verifying-signatures.wml:35
 msgid "You can import keys directly from GnuPG as well:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:36
+#: /home/runa/tor/website/en/verifying-signatures.wml:37
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --recv-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:38
+#: /home/runa/tor/website/en/verifying-signatures.wml:39
 msgid "or search for keys with"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:40
+#: /home/runa/tor/website/en/verifying-signatures.wml:41
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --search-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:42
+#: /home/runa/tor/website/en/verifying-signatures.wml:43
 msgid "and when you select one, it will be added to your keyring."
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:44
+#: /home/runa/tor/website/en/verifying-signatures.wml:45
 msgid "Step Two: Verify the fingerprints"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:46
+#: /home/runa/tor/website/en/verifying-signatures.wml:47
 msgid "Verify the pgp fingerprints using:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:47
+#: /home/runa/tor/website/en/verifying-signatures.wml:48
 #, no-wrap
 msgid "gpg --fingerprint (insert keyid here)"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/verifying-signatures.wml:48
+#: /home/runa/tor/website/en/verifying-signatures.wml:49
 msgid "The fingerprints for the keys should be:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:51
+#: /home/runa/tor/website/en/verifying-signatures.wml:52
 #, no-wrap
 msgid ""
 "pub   1024D/28988BF5 2000-02-27\n"
@@ -174,7 +179,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:87
+#: /home/runa/tor/website/en/verifying-signatures.wml:88
 msgid ""
 "(Of course if you want to be really certain that those are the real ones "
 "then you should check this from more places or even better get into key "
@@ -182,12 +187,12 @@
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:91
+#: /home/runa/tor/website/en/verifying-signatures.wml:92
 msgid "Step Three: Verify the downloaded package"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:93
+#: /home/runa/tor/website/en/verifying-signatures.wml:94
 msgid ""
 "If you're using GnuPG, then put the .asc and the download in the same "
 "directory and type \"gpg --verify (whatever).asc (whatever)\". It will say "
@@ -196,7 +201,7 @@
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:99
+#: /home/runa/tor/website/en/verifying-signatures.wml:100
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc tor-0.1.0.17.tar.gz\n"
@@ -209,7 +214,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:109
+#: /home/runa/tor/website/en/verifying-signatures.wml:110
 msgid ""
 "Notice that there is a warning because you haven't assigned a trust index to "
 "this user. This means that your program verified the key made that "
@@ -222,19 +227,19 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:118
+#: /home/runa/tor/website/en/verifying-signatures.wml:119
 msgid "All this means is you can ignore the message or assign a trust level."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:120
+#: /home/runa/tor/website/en/verifying-signatures.wml:121
 msgid ""
 "For your reference, this is an example of a <em>BAD</em> verification. It "
 "means that the signature and file contents do not match:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:124
+#: /home/runa/tor/website/en/verifying-signatures.wml:125
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc\n"
@@ -243,14 +248,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:129
+#: /home/runa/tor/website/en/verifying-signatures.wml:130
 msgid ""
 "If you see a message like the above one, then you should not trust the file "
 "contents."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:131
+#: /home/runa/tor/website/en/verifying-signatures.wml:132
 msgid ""
 "If you are running Tor on Debian you should read the instructions on <a href="
 "\"<page docs/debian>#packages\">importing these keys to apt</a>."

Modified: translation/trunk/projects/website/tr/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/tr/3-low.download-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/tr/3-low.download-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:25+0100\n"
+"POT-Creation-Date: 2010-03-09 09:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/BLb6biltpP.xml:40
-#: /tmp/BLb6biltpP.xml:56 /tmp/BLb6biltpP.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/xgWxp0aReQ.xml:40
+#: /tmp/xgWxp0aReQ.xml:56 /tmp/xgWxp0aReQ.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -184,54 +184,79 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:84
-msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgid ""
+"<img src=\"images/distros/android-market.gif\" alt=\"Android\" width=\"32\" "
+"height=\"32\"/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:85
-msgid "Source tarballs"
+msgid "Android"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /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/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/tor/website/en/download-unix.wml:92
+msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:93
+msgid "Source tarballs"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:95
+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/tor/website/en/download-unix.wml:91
+#: /home/runa/tor/website/en/download-unix.wml:99
 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/tor/website/en/download-unix.wml:94
+#: /home/runa/tor/website/en/download-unix.wml:102
 msgid "<kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:101
+#: /home/runa/tor/website/en/download-unix.wml:109
 msgid "<a id=\"packagediff\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:102
+#: /home/runa/tor/website/en/download-unix.wml:110
 msgid ""
 "<a class=\"anchor\" href=\"#packagediff\">What's the difference between "
 "Stable &amp; Unstable?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:105
+#: /home/runa/tor/website/en/download-unix.wml:113
 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/tor/website/en/download-unix.wml:109
+#: /home/runa/tor/website/en/download-unix.wml:117
 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 "
@@ -241,7 +266,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:118
+#: /home/runa/tor/website/en/download-unix.wml:126
 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 "
@@ -251,7 +276,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:125
+#: /home/runa/tor/website/en/download-unix.wml:133
 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 "
@@ -259,7 +284,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:134
+#: /home/runa/tor/website/en/download-unix.wml:142
 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 "
@@ -269,7 +294,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><form>
-#: /home/runa/tor/website/en/download-unix.wml:142
+#: /home/runa/tor/website/en/download-unix.wml:150
 msgid ""
 "<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
 "\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
@@ -278,18 +303,18 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:152
+#: /home/runa/tor/website/en/download-unix.wml:160
 msgid "<a id=\"Warning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:153
+#: /home/runa/tor/website/en/download-unix.wml:161
 msgid ""
 "<a class=\"anchor\" href=\"#Warning\">Warning: Want Tor to really work?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:157
+#: /home/runa/tor/website/en/download-unix.wml:165
 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> "
@@ -298,7 +323,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:165
+#: /home/runa/tor/website/en/download-unix.wml:173
 msgid ""
 "Tor only protects Internet applications that are configured to send their "
 "traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
@@ -308,7 +333,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:173
+#: /home/runa/tor/website/en/download-unix.wml:181
 msgid ""
 "Browser plugins such as Java, Flash, ActiveX, RealPlayer, Quicktime, Adobe's "
 "PDF plugin, and others can be manipulated into revealing your IP address. "
@@ -324,7 +349,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:189
+#: /home/runa/tor/website/en/download-unix.wml:197
 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. "
@@ -334,7 +359,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:197
+#: /home/runa/tor/website/en/download-unix.wml:205
 msgid ""
 "Tor anonymizes the origin of your traffic, and it encrypts everything inside "
 "the Tor network, but <a href=\"https://wiki.torproject.org/noreply/";
@@ -346,7 +371,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:208
+#: /home/runa/tor/website/en/download-unix.wml:216
 msgid ""
 "While Tor blocks attackers on your local network from discovering or "
 "influencing your destination, it opens new risks: malicious or misconfigured "
@@ -355,12 +380,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:216
+#: /home/runa/tor/website/en/download-unix.wml:224
 msgid "<br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:218
+#: /home/runa/tor/website/en/download-unix.wml:226
 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 "
@@ -368,7 +393,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:228
+#: /home/runa/tor/website/en/download-unix.wml:236
 msgid ""
 "See our <a href=\"<page verifying-signatures>\">FAQ entry on verifying "
 "package signatures</a>, which allows you to make sure you've downloaded the "
@@ -376,7 +401,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:234
+#: /home/runa/tor/website/en/download-unix.wml:242
 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</"
@@ -384,7 +409,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:240
+#: /home/runa/tor/website/en/download-unix.wml:248
 msgid ""
 "See the <a href=\"<page documentation>#Developers\">developer documentation</"
 "a> for instructions on fetching Tor from Git to get the very latest "
@@ -394,19 +419,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:252
+#: /home/runa/tor/website/en/download-unix.wml:260
 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/tor/website/en/download-unix.wml:256
+#: /home/runa/tor/website/en/download-unix.wml:264
 msgid "<a id=\"ChangeLog\"></a> <a id=\"Stable\"></a> <a id=\"Testing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:260
+#: /home/runa/tor/website/en/download-unix.wml:268
 msgid ""
 "For a list of what has changed in each stable Tor release, see the <a href="
 "\"<gitblob>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in both "

Modified: translation/trunk/projects/website/tr/3-low.people.po
===================================================================
--- translation/trunk/projects/website/tr/3-low.people.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/tr/3-low.people.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 09:56+0100\n"
+"POT-Creation-Date: 2010-03-09 09:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -60,8 +60,8 @@
 #. type: Content of: <div><address>
 #: /home/runa/tor/website/en/people.wml:30
 msgid ""
-"The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA<br /"
-"><br />"
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 "
+"USA<br /><br />"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -542,34 +542,56 @@
 
 #. type: Content of: <div><dl><dt>
 #: /home/runa/tor/website/en/people.wml:202
-msgid "Kasimir Gabert"
+msgid "Marco Bonetti"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:202
+msgid "Focusing on MobileTor for the iPhone."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:203
+msgid "Nathan Freitas"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:203
 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/tor/website/en/people.wml:205
+msgid "Kasimir Gabert"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:205
+msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\";>TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid "Robert Hogan"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\";>TorK</a> Tor controller."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid "Damian Johnson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid ""
 "Builds a command-line application for monitoring Tor relays, providing real-"
 "time status information such as the current configuration, bandwidth usage, "
@@ -578,106 +600,118 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid ""
 "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
 "and Privoxy still work well together."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid "Kory Kirk"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid ""
 "Worked during Google Summer of Code 2009 on extending Torbutton. Now he's "
 "working with Bruce Leidl on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Bruce Leidl"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Working on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid ""
 "A lawyer with the CCC in Germany. Coordinates the German Tor community with "
 "respect to legal questions and concerns."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:224
+msgid "Linus Nordberg"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:224
+msgid ""
+"Enjoys measuring the Tor network and helps with outreach in the Nordic "
+"countries."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:226
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:226
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid "Martin Peck"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:225
+#: /home/runa/tor/website/en/people.wml:230
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:231
 msgid ""
 "The most dedicated bug reporter we've ever heard from. He must read Tor "
 "source code every day over breakfast."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy";
@@ -686,24 +720,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?";
 "p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/";
@@ -712,7 +746,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:241
+#: /home/runa/tor/website/en/people.wml:246
 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, "
@@ -720,32 +754,32 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:252
 msgid "<a id=\"Past\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:248
+#: /home/runa/tor/website/en/people.wml:253
 msgid "<a class=\"anchor\" href=\"#Past\">Past thanks to:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "John Bashinski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "Contributed the initial rpm spec file."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid "Domenik Bork"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid ""
 "Worked on Configuration of Hidden Services with User Authorization in "
 "Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches/";
@@ -753,12 +787,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 msgid "Benedikt Boss"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 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 "
@@ -766,22 +800,22 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Ren Bucholz"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Our fine logo and images."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 msgid "Fallon Chen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 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="
@@ -790,32 +824,32 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Bram Cohen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Helped design our congestion control mechanisms, in Tor's early days."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Pat Double"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Creator of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid "Geoff Goodell"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid ""
 "Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/";
 "\">Blossom project</a> which uses Tor as its overlay network; also helped "
@@ -823,12 +857,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid "Aleksei Gorny"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid ""
 "Working on Tor exit scanner improvements (<a href=\"https://svn.torproject.";
 "org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
@@ -836,52 +870,52 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Christian Grothoff"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Contributed better daemonizing behavior."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Steven Hazel"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Made 'make install' do the right thing."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "Justin Hipple"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "The other developer for Vidalia."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Jason Holt"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Contributed patches to the instructions and the man page."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 msgid "Christian King"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 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-";
@@ -889,70 +923,70 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid "Joe Kowalski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid ""
 "Original author and provider of the torstatus script formerly run on "
 "nighteffect."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Adam Langley"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Our fine eventdns code."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid "Rebecca MacKinnon"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid ""
 "Former Director of Tor.  Co-Founder of <a href=\"http://www.";
 "globalvoicesonline.org/\">Global Voices Online</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid "Chris Palmer"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid ""
 "Our liaison and tech guy with EFF while EFF was funding us. Also helped "
 "advocate and write end-user docs."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid "Matej Pfajfar"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid ""
 "Author of the original onion routing code that Tor is based on, so we didn't "
 "have to start from scratch."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 msgid "Johannes Renner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 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 "
@@ -960,33 +994,33 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid "Scott Squires"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid ""
 "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Aaron Turner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Contributed the first version of the tor.sh initscripts shell script."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 msgid "Stephen Tyree"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 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 "
@@ -995,12 +1029,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid "Camilo Viecco"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid ""
 "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac.";
 "vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
@@ -1008,12 +1042,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 msgid "Fred von Lohmann"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 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/?";
@@ -1021,12 +1055,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid "Christian Wilms"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid ""
 "Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
 "\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";
@@ -1034,12 +1068,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 msgid "Jillian C. York"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 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/tr/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/tr/4-optional.volunteer.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/tr/4-optional.volunteer.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 09:56+0100\n"
+"POT-Creation-Date: 2010-03-09 09:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,21 +252,22 @@
 "Messaging client). Components are pre-configured to operate in a secure way, "
 "and it has very few dependencies on the installed operating system. It has "
 "therefore become one of the most easy to use, and popular, ways to use Tor "
-"on Windows.  <br /> However, there is currently no working package for Linux "
-"and Mac OS X, so this project would be to implement Tor Browser Bundle for "
-"these platforms. This will involve modifications to Vidalia (C++), possibly "
-"Firefox (C) then creating and testing the launcher on a range of operating "
-"system versions and configurations to verify portability.  Some work on this "
-"was completed as part of the Google Summer of Code 2009. Another part of "
-"this project is to identify all of the traces left behind by using a Tor "
-"Browser Bundle on Mac OS X or Linux.  Developing ways to stop, counter, or "
-"remove these traces is a final step.  <br /> Students should be familiar "
-"with application development on one or preferably both of Linux and Mac OS "
-"X, and be comfortable with C/C++ and shell scripting.  <br /> Part of this "
-"project could be usability testing of Tor Browser Bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
+"on Windows.  <br /> However, there is currently no released package for "
+"Linux and Mac OS X, so this project would be to implement Tor Browser Bundle "
+"for OS X and continue work on the Tor Browser Bundle for Linux. This will "
+"involve modifications to Vidalia (C++), possibly Firefox (C) then creating "
+"and testing the launcher on a range of operating system versions and "
+"configurations to verify portability.  Some work on this was completed as "
+"part of the Google Summer of Code 2009. Another part of this project is to "
+"identify all of the traces left behind by using a Tor Browser Bundle on Mac "
+"OS X or Linux.  Developing ways to stop, counter, or remove these traces is "
+"a final step.  <br /> Students should be familiar with application "
+"development on one or preferably both of Linux and Mac OS X, and be "
+"comfortable with C/C++ and shell scripting.  <br /> Part of this project "
+"could be usability testing of Tor Browser Bundle, ideally amongst our target "
+"demographic.  That would help a lot in knowing what needs to be done in "
+"terms of bug fixes or new features. We get this informally at the moment, "
+"but a more structured process would be better."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -320,27 +321,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:225
-msgid ""
-"<b>Tuneup Tor!</b> <br /> Priority: <i>Medium to High</i> <br /> Effort "
-"Level: <i>Medium to High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Nick, Roger, Mike, Karsten</i> <br /> Right now, Tor relays "
-"measure and report their own bandwidth, and Tor clients choose which relays "
-"to use in part based on that bandwidth.  This approach is vulnerable to <a "
-"href=\"http://freehaven.net/anonbib/#bauer:wpes2007\";>attacks where relays "
-"lie about their bandwidth</a>; to address this, Tor currently caps the "
-"maximum bandwidth it's willing to believe any relay provides.  This is a "
-"limited fix, and a waste of bandwidth capacity to boot.  Instead, Tor should "
-"possibly measure bandwidth in a more distributed way, perhaps as described "
-"in the <a href=\"http://freehaven.net/anonbib/author.html#snader08\";>\"A "
-"Tune-up for Tor\"</a> paper by Snader and Borisov. One could use current "
-"testing code to double-check this paper's findings and verify the extent to "
-"which they dovetail with Tor as deployed in the wild, and determine good "
-"ways to incorporate them into their suggestions Tor network without adding "
-"too much communications overhead between relays and directory authorities."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:256
 msgid ""
 "<b>Improving Polipo on Windows</b> <br /> Priority: <i>Medium to High</i> "
@@ -382,17 +362,17 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:283
 msgid ""
-"<b>Tor Controller Status Event Interface</b> <br /> Priority: <i>Medium</i> "
-"<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> "
-"<br /> Likely Mentors: <i>Matt</i> <br /> There are a number of status "
-"changes inside Tor of which the user may need to be informed. For example, "
-"if the user is trying to set up his Tor as a relay and Tor decides that its "
-"ports are not reachable from outside the user's network, we should alert the "
-"user. Currently, all the user gets is a couple log messages in Vidalia's "
-"'message log' window, which they likely never see since they don't receive a "
-"notification that something has gone wrong. Even if the user does actually "
-"look at the message log, most of the messages make little sense to the "
-"novice user.  <br /> Tor has the ability to inform Vidalia of many such "
+"<b>Tor Controller Status Event Interface for Vidalia</b> <br /> Priority: "
+"<i>Medium</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low "
+"to Medium</i> <br /> Likely Mentors: <i>Matt</i> <br /> There are a number "
+"of status changes inside Tor of which the user may need to be informed. For "
+"example, if the user is trying to set up his Tor as a relay and Tor decides "
+"that its ports are not reachable from outside the user's network, we should "
+"alert the user. Currently, all the user gets is a couple log messages in "
+"Vidalia's 'message log' window, which they likely never see since they don't "
+"receive a notification that something has gone wrong. Even if the user does "
+"actually look at the message log, most of the messages make little sense to "
+"the novice user.  <br /> Tor has the ability to inform Vidalia of many such "
 "status changes, and we recently implemented support for a couple of these "
 "events. Still, there are many more status events the user should be informed "
 "of and we need a better UI for actually displaying them to the user.  <br /> "
@@ -477,40 +457,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:415
-msgid ""
-"<b>New Thandy Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Medium to High</i> <br /> Likely "
-"Mentors: <i>Martin</i> <br /> Additional capabilities are needed for "
-"assisted updates of all the Tor related software for Windows and other "
-"operating systems. Some of the features to consider include:"
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:429
-msgid ""
-"Integration of the <a href=\"http://chandlerproject.org/Projects/MeTooCrypto";
-"\">MeTooCrypto Python library</a> for authenticated HTTPS downloads."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:433
-msgid ""
-"Adding a level of indirection between the timestamp signatures and the "
-"package files included in an update. See the \"Thandy attacks / suggestions"
-"\" thread on or-dev."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:436
-msgid ""
-"Support locale specific installation and configuration of assisted updates "
-"based on preference, host, or user account language settings.  Familiarity "
-"with Windows codepages, unicode, and other character sets is helpful in "
-"addition to general win32 and posix API experience and Python proficiency."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:445
 msgid ""
 "<b>Simulator for slow Internet connections</b> <br /> Priority: <i>Medium</"
@@ -558,27 +504,14 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:509
 msgid ""
-"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Low</i> <br /"
-"> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Mike</i> <br /> We're hearing from an increasing number of users "
-"that they want to use Thunderbird with Tor. However, there are plenty of "
-"application-level concerns, for example, by default Thunderbird will put "
-"your hostname in the outgoing mail that it sends. At some point we should "
-"start a new push to build a Thunderbird extension similar to Torbutton."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:527
-msgid ""
-"<b>Intermediate Level Network Device Driver</b> <br /> Priority: <i>Low</i> "
+"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Medium</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> "
-"Likely Mentors: <i>Martin</i> <br /> The WinPCAP device driver used by Tor "
-"VM for bridged networking does not support a number of wireless and non-"
-"Ethernet network adapters.  Implementation of a intermediate level network "
-"device driver for win32 and 64bit would provide a way to intercept and route "
-"traffic over such networks. This project will require knowledge of and "
-"experience with Windows kernel device driver development and testing. "
-"Familiarity with Winsock and Qemu would also be helpful."
+"Likely Mentors: <i>Mike</i> <br /> We're hearing from an increasing number "
+"of users that they want to use Thunderbird with Tor. However, there are "
+"plenty of application-level concerns, for example, by default Thunderbird "
+"will put your hostname in the outgoing mail that it sends. At some point we "
+"should start a new push to build a Thunderbird extension similar to "
+"Torbutton."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -643,35 +576,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:621
-msgid ""
-"<b>Tor/Polipo/Vidalia Auto-Update Framework</b> <br /> We're in need of a "
-"good authenticated-update framework.  Vidalia already has the ability to "
-"notice when the user is running an outdated or unrecommended version of Tor, "
-"using signed statements inside the Tor directory information. Currently, "
-"Vidalia simply pops up a little message box that lets the user know they "
-"should manually upgrade. The goal of this project would be to extend Vidalia "
-"with the ability to also fetch and install the updated Tor software for the "
-"user. We should do the fetches via Tor when possible, but also fall back to "
-"direct fetches in a smart way. Time permitting, we would also like to be "
-"able to update other applications included in the bundled installers, such "
-"as Polipo and Vidalia itself.  <br /> To complete this project, the student "
-"will first need to first investigate the existing auto-update frameworks (e."
-"g., Sparkle on OS X) to evaluate their strengths, weaknesses, security "
-"properties, and ability to be integrated into Vidalia. If none are found to "
-"be suitable, the student will design their own auto-update framework, "
-"document the design, and then discuss the design with other developers to "
-"assess any security issues. The student will then implement their framework "
-"(or integrate an existing one) and test it.  <br /> A person undertaking "
-"this project should have good C++ development experience. Previous "
-"experience with Qt is helpful, but not required. One should also have a good "
-"understanding of common security practices, such as package signature "
-"verification. Good writing ability is also important for this project, since "
-"a vital step of the project will be producing a design document to review "
-"and discuss with others prior to implementation."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:655
 msgid ""
 "<b>Improving the Tor QA process: Continuous Integration for builds</b> <br /"
@@ -699,17 +603,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:683
-msgid ""
-"<b>Usability testing of Tor</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> <br /> Likely "
-"Mentors: <i>Andrew</i> <br /> Especially the browser bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:700
 msgid ""
 "<b>An authenticating IRC proxy</b> <br /> Priority: <i>Medium</i> <br /> "

Modified: translation/trunk/projects/website/tr/docs/3-low.debian.po
===================================================================
--- translation/trunk/projects/website/tr/docs/3-low.debian.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/tr/docs/3-low.debian.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-21 19:00+0100\n"
+"POT-Creation-Date: 2010-03-09 09:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -28,8 +28,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/Hp5I_oEF1y.xml:40
-#: /tmp/Hp5I_oEF1y.xml:96 /tmp/Hp5I_oEF1y.xml:130
+#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/lEDoReAfnS.xml:40
+#: /tmp/lEDoReAfnS.xml:96 /tmp/lEDoReAfnS.xml:130
 msgid "<br />"
 msgstr ""
 
@@ -49,8 +49,8 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/Hp5I_oEF1y.xml:77
-#: /tmp/Hp5I_oEF1y.xml:121 /tmp/Hp5I_oEF1y.xml:164
+#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/lEDoReAfnS.xml:77
+#: /tmp/lEDoReAfnS.xml:121 /tmp/lEDoReAfnS.xml:164
 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."
@@ -94,8 +94,9 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:59
 msgid ""
-"where you substitute the above word (etch, lenny, sid, karmic, jaunty, "
-"intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you put the codename of your distribution (i.e. etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy or whatever it is) in place of &lt;"
+"DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -165,8 +166,8 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:106
 msgid ""
-"where you substitute the name of your distro (etch, lenny, sid, karmic, "
-"jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you again substitute the name of your distro (etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/tr/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/tr/docs/3-low.tor-doc-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/tr/docs/3-low.tor-doc-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:25+0100\n"
+"POT-Creation-Date: 2010-03-09 09:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/OC7lsuF5YL.xml:24
-#: /tmp/OC7lsuF5YL.xml:54 /tmp/OC7lsuF5YL.xml:88 /tmp/OC7lsuF5YL.xml:131
-#: /tmp/OC7lsuF5YL.xml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/yOK_o5SikA.xml:24
+#: /tmp/yOK_o5SikA.xml:54 /tmp/yOK_o5SikA.xml:88 /tmp/yOK_o5SikA.xml:131
+#: /tmp/yOK_o5SikA.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -63,10 +63,10 @@
 "If you're building from source, first install <a href=\"http://www.monkey.";
 "org/~provos/libevent/\">libevent</a>, and make sure you have openssl and "
 "zlib (including the -devel packages if applicable). Then run:<br /> <tt>tar "
-"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable><br /> ./configure "
-"&amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</tt>, or "
-"you can run <tt>make install</tt> (as root if necessary) to install it into /"
-"usr/local/, and then you can start it just by running <tt>tor</tt>."
+"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable></tt><br /> <tt>./"
+"configure &amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</"
+"tt>, or you can run <tt>make install</tt> (as root if necessary) to install "
+"it into /usr/local/, and then you can start it just by running <tt>tor</tt>."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/zh_CN/2-medium.donate.po
===================================================================
--- translation/trunk/projects/website/zh_CN/2-medium.donate.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/zh_CN/2-medium.donate.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:29+0100\n"
+"POT-Creation-Date: 2010-03-09 09:16+0100\n"
 "PO-Revision-Date: 2010-02-18 22:03-0700\n"
 "Last-Translator: yfdyh000 <yfdyh000@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -64,7 +64,7 @@
 "href=\"#time\">æé</a>ãæçæåçääåççååäéçäçåääéã"
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/donate.wml:32 /tmp/XHso_j5JRd.xml:102
+#: /home/runa/tor/website/en/donate.wml:32 /tmp/1UtT3OF1WS.xml:102
 msgid "<br />"
 msgstr "<br />"
 
@@ -164,17 +164,17 @@
 msgstr "<br /><br />éææçèåççï<select name=\"currency_code\">"
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:72 /tmp/XHso_j5JRd.xml:114
+#: /home/runa/tor/website/en/donate.wml:72 /tmp/1UtT3OF1WS.xml:114
 msgid "$"
 msgstr "$"
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:73 /tmp/XHso_j5JRd.xml:115
+#: /home/runa/tor/website/en/donate.wml:73 /tmp/1UtT3OF1WS.xml:115
 msgid "â"
 msgstr "â"
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:74 /tmp/XHso_j5JRd.xml:116
+#: /home/runa/tor/website/en/donate.wml:74 /tmp/1UtT3OF1WS.xml:116
 msgid "Â"
 msgstr "Â"
 
@@ -296,7 +296,9 @@
 
 #. type: Content of: <div><p><address>
 #: /home/runa/tor/website/en/donate.wml:136
-msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA"
+#, fuzzy
+msgid ""
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 USA"
 msgstr "The Tor Project<br />122 Scott Circle<br />Dedham, MA 02026-6416 USA"
 
 #. type: Content of: <div><p>

Modified: translation/trunk/projects/website/zh_CN/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/zh_CN/2-medium.verifying-signatures.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/zh_CN/2-medium.verifying-signatures.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-07 07:56+0100\n"
+"POT-Creation-Date: 2010-03-09 09:16+0100\n"
 "PO-Revision-Date: 2010-02-05 14:39-0700\n"
 "Last-Translator: yfdyh000 <yfdyh000@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -22,7 +22,7 @@
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/verifying-signatures.wml:10
-#: /tmp/fKx69HAz0j.xml:33 /tmp/fKx69HAz0j.xml:45 /tmp/fKx69HAz0j.xml:92
+#: /tmp/C5fJIkcMq3.xml:34 /tmp/C5fJIkcMq3.xml:46 /tmp/C5fJIkcMq3.xml:93
 msgid "<hr />"
 msgstr "<hr />"
 
@@ -85,61 +85,66 @@
 msgid "Jacob's (0x9D0FACE4)"
 msgstr "Jacob's (0x9D0FACE4)"
 
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/verifying-signatures.wml:30
+msgid "Erinn's (0x63FEE659) and (0xF1F5C9B5)"
+msgstr ""
+
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:32
+#: /home/runa/tor/website/en/verifying-signatures.wml:33
 msgid "Step One: Import the keys"
 msgstr "çäæïåååé"
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:34
+#: /home/runa/tor/website/en/verifying-signatures.wml:35
 msgid "You can import keys directly from GnuPG as well:"
 msgstr "æåäçæä GnuPG åååéæäåï"
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:36
+#: /home/runa/tor/website/en/verifying-signatures.wml:37
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --recv-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:38
+#: /home/runa/tor/website/en/verifying-signatures.wml:39
 msgid "or search for keys with"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:40
+#: /home/runa/tor/website/en/verifying-signatures.wml:41
 #, no-wrap
 msgid "gpg --keyserver subkeys.pgp.net --search-keys 0x28988BF5"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:42
+#: /home/runa/tor/website/en/verifying-signatures.wml:43
 msgid "and when you select one, it will be added to your keyring."
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:44
+#: /home/runa/tor/website/en/verifying-signatures.wml:45
 msgid "Step Two: Verify the fingerprints"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:46
+#: /home/runa/tor/website/en/verifying-signatures.wml:47
 msgid "Verify the pgp fingerprints using:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:47
+#: /home/runa/tor/website/en/verifying-signatures.wml:48
 #, no-wrap
 msgid "gpg --fingerprint (insert keyid here)"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/verifying-signatures.wml:48
+#: /home/runa/tor/website/en/verifying-signatures.wml:49
 msgid "The fingerprints for the keys should be:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:51
+#: /home/runa/tor/website/en/verifying-signatures.wml:52
 #, no-wrap
 msgid ""
 "pub   1024D/28988BF5 2000-02-27\n"
@@ -179,7 +184,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:87
+#: /home/runa/tor/website/en/verifying-signatures.wml:88
 msgid ""
 "(Of course if you want to be really certain that those are the real ones "
 "then you should check this from more places or even better get into key "
@@ -187,12 +192,12 @@
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/verifying-signatures.wml:91
+#: /home/runa/tor/website/en/verifying-signatures.wml:92
 msgid "Step Three: Verify the downloaded package"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:93
+#: /home/runa/tor/website/en/verifying-signatures.wml:94
 msgid ""
 "If you're using GnuPG, then put the .asc and the download in the same "
 "directory and type \"gpg --verify (whatever).asc (whatever)\". It will say "
@@ -201,7 +206,7 @@
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:99
+#: /home/runa/tor/website/en/verifying-signatures.wml:100
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc tor-0.1.0.17.tar.gz\n"
@@ -214,7 +219,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:109
+#: /home/runa/tor/website/en/verifying-signatures.wml:110
 msgid ""
 "Notice that there is a warning because you haven't assigned a trust index to "
 "this user. This means that your program verified the key made that "
@@ -227,19 +232,19 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:118
+#: /home/runa/tor/website/en/verifying-signatures.wml:119
 msgid "All this means is you can ignore the message or assign a trust level."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:120
+#: /home/runa/tor/website/en/verifying-signatures.wml:121
 msgid ""
 "For your reference, this is an example of a <em>BAD</em> verification. It "
 "means that the signature and file contents do not match:"
 msgstr ""
 
 #. type: Content of: <div><pre>
-#: /home/runa/tor/website/en/verifying-signatures.wml:124
+#: /home/runa/tor/website/en/verifying-signatures.wml:125
 #, no-wrap
 msgid ""
 "gpg --verify tor-0.1.0.17.tar.gz.asc\n"
@@ -248,14 +253,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:129
+#: /home/runa/tor/website/en/verifying-signatures.wml:130
 msgid ""
 "If you see a message like the above one, then you should not trust the file "
 "contents."
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/en/verifying-signatures.wml:131
+#: /home/runa/tor/website/en/verifying-signatures.wml:132
 msgid ""
 "If you are running Tor on Debian you should read the instructions on <a href="
 "\"<page docs/debian>#packages\">importing these keys to apt</a>."

Modified: translation/trunk/projects/website/zh_CN/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/zh_CN/3-low.download-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/zh_CN/3-low.download-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:29+0100\n"
+"POT-Creation-Date: 2010-03-09 09:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -69,8 +69,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/M6hNZqlL7K.xml:40
-#: /tmp/M6hNZqlL7K.xml:56 /tmp/M6hNZqlL7K.xml:73
+#: /home/runa/tor/website/en/download-unix.wml:33 /tmp/FhgCQjlq6F.xml:40
+#: /tmp/FhgCQjlq6F.xml:56 /tmp/FhgCQjlq6F.xml:73
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -184,54 +184,79 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:84
-msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgid ""
+"<img src=\"images/distros/android-market.gif\" alt=\"Android\" width=\"32\" "
+"height=\"32\"/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:85
-msgid "Source tarballs"
+msgid "Android"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /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/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/tor/website/en/download-unix.wml:92
+msgid "<img src=\"images/distros/terminal.png\" alt=\"Source code\" />"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:93
+msgid "Source tarballs"
+msgstr ""
+
+#. type: Content of: <div><table><tr><td>
+#: /home/runa/tor/website/en/download-unix.wml:95
+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/tor/website/en/download-unix.wml:91
+#: /home/runa/tor/website/en/download-unix.wml:99
 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/tor/website/en/download-unix.wml:94
+#: /home/runa/tor/website/en/download-unix.wml:102
 msgid "<kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:101
+#: /home/runa/tor/website/en/download-unix.wml:109
 msgid "<a id=\"packagediff\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:102
+#: /home/runa/tor/website/en/download-unix.wml:110
 msgid ""
 "<a class=\"anchor\" href=\"#packagediff\">What's the difference between "
 "Stable &amp; Unstable?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:105
+#: /home/runa/tor/website/en/download-unix.wml:113
 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/tor/website/en/download-unix.wml:109
+#: /home/runa/tor/website/en/download-unix.wml:117
 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 "
@@ -241,7 +266,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:118
+#: /home/runa/tor/website/en/download-unix.wml:126
 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 "
@@ -251,7 +276,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:125
+#: /home/runa/tor/website/en/download-unix.wml:133
 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 "
@@ -259,7 +284,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:134
+#: /home/runa/tor/website/en/download-unix.wml:142
 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 "
@@ -269,7 +294,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><form>
-#: /home/runa/tor/website/en/download-unix.wml:142
+#: /home/runa/tor/website/en/download-unix.wml:150
 msgid ""
 "<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
 "\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
@@ -278,18 +303,18 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:152
+#: /home/runa/tor/website/en/download-unix.wml:160
 msgid "<a id=\"Warning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/en/download-unix.wml:153
+#: /home/runa/tor/website/en/download-unix.wml:161
 msgid ""
 "<a class=\"anchor\" href=\"#Warning\">Warning: Want Tor to really work?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:157
+#: /home/runa/tor/website/en/download-unix.wml:165
 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> "
@@ -298,7 +323,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:165
+#: /home/runa/tor/website/en/download-unix.wml:173
 msgid ""
 "Tor only protects Internet applications that are configured to send their "
 "traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
@@ -308,7 +333,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:173
+#: /home/runa/tor/website/en/download-unix.wml:181
 msgid ""
 "Browser plugins such as Java, Flash, ActiveX, RealPlayer, Quicktime, Adobe's "
 "PDF plugin, and others can be manipulated into revealing your IP address. "
@@ -324,7 +349,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:189
+#: /home/runa/tor/website/en/download-unix.wml:197
 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. "
@@ -334,7 +359,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:197
+#: /home/runa/tor/website/en/download-unix.wml:205
 msgid ""
 "Tor anonymizes the origin of your traffic, and it encrypts everything inside "
 "the Tor network, but <a href=\"https://wiki.torproject.org/noreply/";
@@ -346,7 +371,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/en/download-unix.wml:208
+#: /home/runa/tor/website/en/download-unix.wml:216
 msgid ""
 "While Tor blocks attackers on your local network from discovering or "
 "influencing your destination, it opens new risks: malicious or misconfigured "
@@ -355,12 +380,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download-unix.wml:216
+#: /home/runa/tor/website/en/download-unix.wml:224
 msgid "<br />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:218
+#: /home/runa/tor/website/en/download-unix.wml:226
 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 "
@@ -368,7 +393,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:228
+#: /home/runa/tor/website/en/download-unix.wml:236
 msgid ""
 "See our <a href=\"<page verifying-signatures>\">FAQ entry on verifying "
 "package signatures</a>, which allows you to make sure you've downloaded the "
@@ -376,7 +401,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:234
+#: /home/runa/tor/website/en/download-unix.wml:242
 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</"
@@ -384,7 +409,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:240
+#: /home/runa/tor/website/en/download-unix.wml:248
 msgid ""
 "See the <a href=\"<page documentation>#Developers\">developer documentation</"
 "a> for instructions on fetching Tor from Git to get the very latest "
@@ -394,19 +419,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:252
+#: /home/runa/tor/website/en/download-unix.wml:260
 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/tor/website/en/download-unix.wml:256
+#: /home/runa/tor/website/en/download-unix.wml:264
 msgid "<a id=\"ChangeLog\"></a> <a id=\"Stable\"></a> <a id=\"Testing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download-unix.wml:260
+#: /home/runa/tor/website/en/download-unix.wml:268
 msgid ""
 "For a list of what has changed in each stable Tor release, see the <a href="
 "\"<gitblob>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in both "

Modified: translation/trunk/projects/website/zh_CN/3-low.people.po
===================================================================
--- translation/trunk/projects/website/zh_CN/3-low.people.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/zh_CN/3-low.people.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 09:59+0100\n"
+"POT-Creation-Date: 2010-03-09 09:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -60,8 +60,8 @@
 #. type: Content of: <div><address>
 #: /home/runa/tor/website/en/people.wml:30
 msgid ""
-"The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA<br /"
-"><br />"
+"The Tor Project<br /> 969 Main Street, Suite 206<br /> Walpole, MA 02081 "
+"USA<br /><br />"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -542,34 +542,56 @@
 
 #. type: Content of: <div><dl><dt>
 #: /home/runa/tor/website/en/people.wml:202
-msgid "Kasimir Gabert"
+msgid "Marco Bonetti"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:202
+msgid "Focusing on MobileTor for the iPhone."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:203
+msgid "Nathan Freitas"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:203
 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/tor/website/en/people.wml:205
+msgid "Kasimir Gabert"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:205
+msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\";>TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid "Robert Hogan"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:204
+#: /home/runa/tor/website/en/people.wml:207
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\";>TorK</a> Tor controller."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid "Damian Johnson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:206
+#: /home/runa/tor/website/en/people.wml:209
 msgid ""
 "Builds a command-line application for monitoring Tor relays, providing real-"
 "time status information such as the current configuration, bandwidth usage, "
@@ -578,106 +600,118 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:210
+#: /home/runa/tor/website/en/people.wml:213
 msgid ""
 "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
 "and Privoxy still work well together."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid "Kory Kirk"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:212
+#: /home/runa/tor/website/en/people.wml:215
 msgid ""
 "Worked during Google Summer of Code 2009 on extending Torbutton. Now he's "
 "working with Bruce Leidl on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Bruce Leidl"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:215
+#: /home/runa/tor/website/en/people.wml:218
 msgid "Working on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:216
+#: /home/runa/tor/website/en/people.wml:219
 msgid ""
 "A lawyer with the CCC in Germany. Coordinates the German Tor community with "
 "respect to legal questions and concerns."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:219
+#: /home/runa/tor/website/en/people.wml:222
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:224
+msgid "Linus Nordberg"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:224
+msgid ""
+"Enjoys measuring the Tor network and helps with outreach in the Nordic "
+"countries."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:226
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:221
+#: /home/runa/tor/website/en/people.wml:226
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid "Martin Peck"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:223
+#: /home/runa/tor/website/en/people.wml:228
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:225
+#: /home/runa/tor/website/en/people.wml:230
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:226
+#: /home/runa/tor/website/en/people.wml:231
 msgid ""
 "The most dedicated bug reporter we've ever heard from. He must read Tor "
 "source code every day over breakfast."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:228
+#: /home/runa/tor/website/en/people.wml:233
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a href="
 "\"https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy";
@@ -686,24 +720,24 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:233
+#: /home/runa/tor/website/en/people.wml:238
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:241
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?";
 "p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/";
@@ -712,7 +746,7 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:241
+#: /home/runa/tor/website/en/people.wml:246
 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, "
@@ -720,32 +754,32 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:247
+#: /home/runa/tor/website/en/people.wml:252
 msgid "<a id=\"Past\"></a>"
 msgstr ""
 
 #. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:248
+#: /home/runa/tor/website/en/people.wml:253
 msgid "<a class=\"anchor\" href=\"#Past\">Past thanks to:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "John Bashinski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:256
 msgid "Contributed the initial rpm spec file."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid "Domenik Bork"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:252
+#: /home/runa/tor/website/en/people.wml:257
 msgid ""
 "Worked on Configuration of Hidden Services with User Authorization in "
 "Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches/";
@@ -753,12 +787,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 msgid "Benedikt Boss"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:255
+#: /home/runa/tor/website/en/people.wml:260
 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 "
@@ -766,22 +800,22 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Ren Bucholz"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:258
+#: /home/runa/tor/website/en/people.wml:263
 msgid "Our fine logo and images."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 msgid "Fallon Chen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:264
 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="
@@ -790,32 +824,32 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Bram Cohen"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:265
+#: /home/runa/tor/website/en/people.wml:270
 msgid "Helped design our congestion control mechanisms, in Tor's early days."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Pat Double"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:267
+#: /home/runa/tor/website/en/people.wml:272
 msgid "Creator of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid "Geoff Goodell"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:268
+#: /home/runa/tor/website/en/people.wml:273
 msgid ""
 "Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/";
 "\">Blossom project</a> which uses Tor as its overlay network; also helped "
@@ -823,12 +857,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid "Aleksei Gorny"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:272
+#: /home/runa/tor/website/en/people.wml:277
 msgid ""
 "Working on Tor exit scanner improvements (<a href=\"https://svn.torproject.";
 "org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
@@ -836,52 +870,52 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Christian Grothoff"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:280
 msgid "Contributed better daemonizing behavior."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Steven Hazel"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:276
+#: /home/runa/tor/website/en/people.wml:281
 msgid "Made 'make install' do the right thing."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "Justin Hipple"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:277
+#: /home/runa/tor/website/en/people.wml:282
 msgid "The other developer for Vidalia."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Jason Holt"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:283
 msgid "Contributed patches to the instructions and the man page."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 msgid "Christian King"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:280
+#: /home/runa/tor/website/en/people.wml:285
 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-";
@@ -889,70 +923,70 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid "Joe Kowalski"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:285
+#: /home/runa/tor/website/en/people.wml:290
 msgid ""
 "Original author and provider of the torstatus script formerly run on "
 "nighteffect."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Adam Langley"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:287
+#: /home/runa/tor/website/en/people.wml:292
 msgid "Our fine eventdns code."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid "Rebecca MacKinnon"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:293
 msgid ""
 "Former Director of Tor.  Co-Founder of <a href=\"http://www.";
 "globalvoicesonline.org/\">Global Voices Online</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid "Chris Palmer"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:295
 msgid ""
 "Our liaison and tech guy with EFF while EFF was funding us. Also helped "
 "advocate and write end-user docs."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid "Matej Pfajfar"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:292
+#: /home/runa/tor/website/en/people.wml:297
 msgid ""
 "Author of the original onion routing code that Tor is based on, so we didn't "
 "have to start from scratch."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 msgid "Johannes Renner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:294
+#: /home/runa/tor/website/en/people.wml:299
 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 "
@@ -960,33 +994,33 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid "Scott Squires"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:304
 msgid ""
 "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Aaron Turner"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:306
 msgid "Contributed the first version of the tor.sh initscripts shell script."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 msgid "Stephen Tyree"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:308
 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 "
@@ -995,12 +1029,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid "Camilo Viecco"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:307
+#: /home/runa/tor/website/en/people.wml:312
 msgid ""
 "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac.";
 "vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
@@ -1008,12 +1042,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 msgid "Fred von Lohmann"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:315
 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/?";
@@ -1021,12 +1055,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid "Christian Wilms"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:314
+#: /home/runa/tor/website/en/people.wml:319
 msgid ""
 "Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
 "\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";
@@ -1034,12 +1068,12 @@
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 msgid "Jillian C. York"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:322
 msgid ""
 "<a href=\"http://jilliancyork.com/\";>Jillian C. York</a> is a writer, "
 "blogger, and activist based in Boston.  She blogs on the uses of Tor and "

Modified: translation/trunk/projects/website/zh_CN/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/zh_CN/4-optional.volunteer.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/zh_CN/4-optional.volunteer.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-18 09:59+0100\n"
+"POT-Creation-Date: 2010-03-09 09:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,21 +252,22 @@
 "Messaging client). Components are pre-configured to operate in a secure way, "
 "and it has very few dependencies on the installed operating system. It has "
 "therefore become one of the most easy to use, and popular, ways to use Tor "
-"on Windows.  <br /> However, there is currently no working package for Linux "
-"and Mac OS X, so this project would be to implement Tor Browser Bundle for "
-"these platforms. This will involve modifications to Vidalia (C++), possibly "
-"Firefox (C) then creating and testing the launcher on a range of operating "
-"system versions and configurations to verify portability.  Some work on this "
-"was completed as part of the Google Summer of Code 2009. Another part of "
-"this project is to identify all of the traces left behind by using a Tor "
-"Browser Bundle on Mac OS X or Linux.  Developing ways to stop, counter, or "
-"remove these traces is a final step.  <br /> Students should be familiar "
-"with application development on one or preferably both of Linux and Mac OS "
-"X, and be comfortable with C/C++ and shell scripting.  <br /> Part of this "
-"project could be usability testing of Tor Browser Bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
+"on Windows.  <br /> However, there is currently no released package for "
+"Linux and Mac OS X, so this project would be to implement Tor Browser Bundle "
+"for OS X and continue work on the Tor Browser Bundle for Linux. This will "
+"involve modifications to Vidalia (C++), possibly Firefox (C) then creating "
+"and testing the launcher on a range of operating system versions and "
+"configurations to verify portability.  Some work on this was completed as "
+"part of the Google Summer of Code 2009. Another part of this project is to "
+"identify all of the traces left behind by using a Tor Browser Bundle on Mac "
+"OS X or Linux.  Developing ways to stop, counter, or remove these traces is "
+"a final step.  <br /> Students should be familiar with application "
+"development on one or preferably both of Linux and Mac OS X, and be "
+"comfortable with C/C++ and shell scripting.  <br /> Part of this project "
+"could be usability testing of Tor Browser Bundle, ideally amongst our target "
+"demographic.  That would help a lot in knowing what needs to be done in "
+"terms of bug fixes or new features. We get this informally at the moment, "
+"but a more structured process would be better."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -320,27 +321,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:225
-msgid ""
-"<b>Tuneup Tor!</b> <br /> Priority: <i>Medium to High</i> <br /> Effort "
-"Level: <i>Medium to High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Nick, Roger, Mike, Karsten</i> <br /> Right now, Tor relays "
-"measure and report their own bandwidth, and Tor clients choose which relays "
-"to use in part based on that bandwidth.  This approach is vulnerable to <a "
-"href=\"http://freehaven.net/anonbib/#bauer:wpes2007\";>attacks where relays "
-"lie about their bandwidth</a>; to address this, Tor currently caps the "
-"maximum bandwidth it's willing to believe any relay provides.  This is a "
-"limited fix, and a waste of bandwidth capacity to boot.  Instead, Tor should "
-"possibly measure bandwidth in a more distributed way, perhaps as described "
-"in the <a href=\"http://freehaven.net/anonbib/author.html#snader08\";>\"A "
-"Tune-up for Tor\"</a> paper by Snader and Borisov. One could use current "
-"testing code to double-check this paper's findings and verify the extent to "
-"which they dovetail with Tor as deployed in the wild, and determine good "
-"ways to incorporate them into their suggestions Tor network without adding "
-"too much communications overhead between relays and directory authorities."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:256
 msgid ""
 "<b>Improving Polipo on Windows</b> <br /> Priority: <i>Medium to High</i> "
@@ -382,17 +362,17 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:283
 msgid ""
-"<b>Tor Controller Status Event Interface</b> <br /> Priority: <i>Medium</i> "
-"<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> "
-"<br /> Likely Mentors: <i>Matt</i> <br /> There are a number of status "
-"changes inside Tor of which the user may need to be informed. For example, "
-"if the user is trying to set up his Tor as a relay and Tor decides that its "
-"ports are not reachable from outside the user's network, we should alert the "
-"user. Currently, all the user gets is a couple log messages in Vidalia's "
-"'message log' window, which they likely never see since they don't receive a "
-"notification that something has gone wrong. Even if the user does actually "
-"look at the message log, most of the messages make little sense to the "
-"novice user.  <br /> Tor has the ability to inform Vidalia of many such "
+"<b>Tor Controller Status Event Interface for Vidalia</b> <br /> Priority: "
+"<i>Medium</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Low "
+"to Medium</i> <br /> Likely Mentors: <i>Matt</i> <br /> There are a number "
+"of status changes inside Tor of which the user may need to be informed. For "
+"example, if the user is trying to set up his Tor as a relay and Tor decides "
+"that its ports are not reachable from outside the user's network, we should "
+"alert the user. Currently, all the user gets is a couple log messages in "
+"Vidalia's 'message log' window, which they likely never see since they don't "
+"receive a notification that something has gone wrong. Even if the user does "
+"actually look at the message log, most of the messages make little sense to "
+"the novice user.  <br /> Tor has the ability to inform Vidalia of many such "
 "status changes, and we recently implemented support for a couple of these "
 "events. Still, there are many more status events the user should be informed "
 "of and we need a better UI for actually displaying them to the user.  <br /> "
@@ -477,40 +457,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:415
-msgid ""
-"<b>New Thandy Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Medium to High</i> <br /> Likely "
-"Mentors: <i>Martin</i> <br /> Additional capabilities are needed for "
-"assisted updates of all the Tor related software for Windows and other "
-"operating systems. Some of the features to consider include:"
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:429
-msgid ""
-"Integration of the <a href=\"http://chandlerproject.org/Projects/MeTooCrypto";
-"\">MeTooCrypto Python library</a> for authenticated HTTPS downloads."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:433
-msgid ""
-"Adding a level of indirection between the timestamp signatures and the "
-"package files included in an update. See the \"Thandy attacks / suggestions"
-"\" thread on or-dev."
-msgstr ""
-
-#. type: Content of: <div><ol><li><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:436
-msgid ""
-"Support locale specific installation and configuration of assisted updates "
-"based on preference, host, or user account language settings.  Familiarity "
-"with Windows codepages, unicode, and other character sets is helpful in "
-"addition to general win32 and posix API experience and Python proficiency."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:445
 msgid ""
 "<b>Simulator for slow Internet connections</b> <br /> Priority: <i>Medium</"
@@ -558,27 +504,14 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:509
 msgid ""
-"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Low</i> <br /"
-"> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely "
-"Mentors: <i>Mike</i> <br /> We're hearing from an increasing number of users "
-"that they want to use Thunderbird with Tor. However, there are plenty of "
-"application-level concerns, for example, by default Thunderbird will put "
-"your hostname in the outgoing mail that it sends. At some point we should "
-"start a new push to build a Thunderbird extension similar to Torbutton."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:527
-msgid ""
-"<b>Intermediate Level Network Device Driver</b> <br /> Priority: <i>Low</i> "
+"<b>Torbutton equivalent for Thunderbird</b> <br /> Priority: <i>Medium</i> "
 "<br /> Effort Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> "
-"Likely Mentors: <i>Martin</i> <br /> The WinPCAP device driver used by Tor "
-"VM for bridged networking does not support a number of wireless and non-"
-"Ethernet network adapters.  Implementation of a intermediate level network "
-"device driver for win32 and 64bit would provide a way to intercept and route "
-"traffic over such networks. This project will require knowledge of and "
-"experience with Windows kernel device driver development and testing. "
-"Familiarity with Winsock and Qemu would also be helpful."
+"Likely Mentors: <i>Mike</i> <br /> We're hearing from an increasing number "
+"of users that they want to use Thunderbird with Tor. However, there are "
+"plenty of application-level concerns, for example, by default Thunderbird "
+"will put your hostname in the outgoing mail that it sends. At some point we "
+"should start a new push to build a Thunderbird extension similar to "
+"Torbutton."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -643,35 +576,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:621
-msgid ""
-"<b>Tor/Polipo/Vidalia Auto-Update Framework</b> <br /> We're in need of a "
-"good authenticated-update framework.  Vidalia already has the ability to "
-"notice when the user is running an outdated or unrecommended version of Tor, "
-"using signed statements inside the Tor directory information. Currently, "
-"Vidalia simply pops up a little message box that lets the user know they "
-"should manually upgrade. The goal of this project would be to extend Vidalia "
-"with the ability to also fetch and install the updated Tor software for the "
-"user. We should do the fetches via Tor when possible, but also fall back to "
-"direct fetches in a smart way. Time permitting, we would also like to be "
-"able to update other applications included in the bundled installers, such "
-"as Polipo and Vidalia itself.  <br /> To complete this project, the student "
-"will first need to first investigate the existing auto-update frameworks (e."
-"g., Sparkle on OS X) to evaluate their strengths, weaknesses, security "
-"properties, and ability to be integrated into Vidalia. If none are found to "
-"be suitable, the student will design their own auto-update framework, "
-"document the design, and then discuss the design with other developers to "
-"assess any security issues. The student will then implement their framework "
-"(or integrate an existing one) and test it.  <br /> A person undertaking "
-"this project should have good C++ development experience. Previous "
-"experience with Qt is helpful, but not required. One should also have a good "
-"understanding of common security practices, such as package signature "
-"verification. Good writing ability is also important for this project, since "
-"a vital step of the project will be producing a design document to review "
-"and discuss with others prior to implementation."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:655
 msgid ""
 "<b>Improving the Tor QA process: Continuous Integration for builds</b> <br /"
@@ -699,17 +603,6 @@
 msgstr ""
 
 #. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:683
-msgid ""
-"<b>Usability testing of Tor</b> <br /> Priority: <i>Medium</i> <br /> Effort "
-"Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> <br /> Likely "
-"Mentors: <i>Andrew</i> <br /> Especially the browser bundle, ideally amongst "
-"our target demographic.  That would help a lot in knowing what needs to be "
-"done in terms of bug fixes or new features. We get this informally at the "
-"moment, but a more structured process would be better."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:700
 msgid ""
 "<b>An authenticating IRC proxy</b> <br /> Priority: <i>Medium</i> <br /> "

Modified: translation/trunk/projects/website/zh_CN/docs/3-low.debian.po
===================================================================
--- translation/trunk/projects/website/zh_CN/docs/3-low.debian.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/zh_CN/docs/3-low.debian.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-19 09:52+0100\n"
+"POT-Creation-Date: 2010-03-09 09:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -28,8 +28,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/JSEdgDJkYw.xml:40
-#: /tmp/JSEdgDJkYw.xml:96 /tmp/JSEdgDJkYw.xml:130
+#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/UsWOoVbCtL.xml:40
+#: /tmp/UsWOoVbCtL.xml:96 /tmp/UsWOoVbCtL.xml:130
 msgid "<br />"
 msgstr ""
 
@@ -49,8 +49,8 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/JSEdgDJkYw.xml:77
-#: /tmp/JSEdgDJkYw.xml:121 /tmp/JSEdgDJkYw.xml:164
+#: /home/runa/tor/website/docs/en/debian.wml:29 /tmp/UsWOoVbCtL.xml:77
+#: /tmp/UsWOoVbCtL.xml:121 /tmp/UsWOoVbCtL.xml:164
 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."
@@ -94,8 +94,9 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:59
 msgid ""
-"where you substitute the above word (etch, lenny, sid, karmic, jaunty, "
-"intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you put the codename of your distribution (i.e. etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy or whatever it is) in place of &lt;"
+"DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -165,8 +166,8 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:106
 msgid ""
-"where you substitute the name of your distro (etch, lenny, sid, karmic, "
-"jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
+"where you again substitute the name of your distro (etch, lenny, sid, "
+"karmic, jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;."
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/zh_CN/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/zh_CN/docs/3-low.tor-doc-unix.po	2010-03-09 08:11:50 UTC (rev 21885)
+++ translation/trunk/projects/website/zh_CN/docs/3-low.tor-doc-unix.po	2010-03-09 08:27:12 UTC (rev 21886)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-23 20:29+0100\n"
+"POT-Creation-Date: 2010-03-09 09:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -21,9 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/xoeru7o7qx.xml:24
-#: /tmp/xoeru7o7qx.xml:54 /tmp/xoeru7o7qx.xml:88 /tmp/xoeru7o7qx.xml:131
-#: /tmp/xoeru7o7qx.xml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/vjHaCLgfQ9.xml:24
+#: /tmp/vjHaCLgfQ9.xml:54 /tmp/vjHaCLgfQ9.xml:88 /tmp/vjHaCLgfQ9.xml:131
+#: /tmp/vjHaCLgfQ9.xml:169
 msgid "<br />"
 msgstr ""
 
@@ -63,10 +63,10 @@
 "If you're building from source, first install <a href=\"http://www.monkey.";
 "org/~provos/libevent/\">libevent</a>, and make sure you have openssl and "
 "zlib (including the -devel packages if applicable). Then run:<br /> <tt>tar "
-"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable><br /> ./configure "
-"&amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</tt>, or "
-"you can run <tt>make install</tt> (as root if necessary) to install it into /"
-"usr/local/, and then you can start it just by running <tt>tor</tt>."
+"xzf tor-<version-stable>.tar.gz; cd tor-<version-stable></tt><br /> <tt>./"
+"configure &amp;&amp; make</tt><br /> Now you can run tor as <tt>src/or/tor</"
+"tt>, or you can run <tt>make install</tt> (as root if necessary) to install "
+"it into /usr/local/, and then you can start it just by running <tt>tor</tt>."
 msgstr ""
 
 #. type: Content of: <div><div><p>