[or-cvs] r20303: {translation} quick update of the .pot files (in translation/trunk/projects/website/templates: . docs press projects torbrowser torbutton tordnsel)

runa at seul.org runa at seul.org
Sat Aug 15 11:30:23 UTC 2009


Author: runa
Date: 2009-08-15 07:30:22 -0400 (Sat, 15 Aug 2009)
New Revision: 20303

Modified:
   translation/trunk/projects/website/templates/1-high.bridges.pot
   translation/trunk/projects/website/templates/1-high.download.pot
   translation/trunk/projects/website/templates/1-high.easy-download.pot
   translation/trunk/projects/website/templates/1-high.finding-tor.pot
   translation/trunk/projects/website/templates/1-high.index.pot
   translation/trunk/projects/website/templates/2-medium.documentation.pot
   translation/trunk/projects/website/templates/2-medium.donate.pot
   translation/trunk/projects/website/templates/2-medium.faq.pot
   translation/trunk/projects/website/templates/2-medium.overview.pot
   translation/trunk/projects/website/templates/2-medium.torusers.pot
   translation/trunk/projects/website/templates/2-medium.verifying-signatures.pot
   translation/trunk/projects/website/templates/3-low.contact.pot
   translation/trunk/projects/website/templates/3-low.download-unix.pot
   translation/trunk/projects/website/templates/3-low.faq-abuse.pot
   translation/trunk/projects/website/templates/3-low.hidden-services.pot
   translation/trunk/projects/website/templates/3-low.mirrors.pot
   translation/trunk/projects/website/templates/3-low.news.pot
   translation/trunk/projects/website/templates/3-low.people.pot
   translation/trunk/projects/website/templates/3-low.sponsors.pot
   translation/trunk/projects/website/templates/3-low.trademark-faq.pot
   translation/trunk/projects/website/templates/3-low.tshirt.pot
   translation/trunk/projects/website/templates/4-optional.gsoc.pot
   translation/trunk/projects/website/templates/4-optional.open-positions.pot
   translation/trunk/projects/website/templates/4-optional.research.pot
   translation/trunk/projects/website/templates/4-optional.running-a-mirror.pot
   translation/trunk/projects/website/templates/4-optional.tormedia.pot
   translation/trunk/projects/website/templates/4-optional.translation-overview.pot
   translation/trunk/projects/website/templates/4-optional.translation.pot
   translation/trunk/projects/website/templates/4-optional.volunteer.pot
   translation/trunk/projects/website/templates/docs/1-high.tor-doc-windows.pot
   translation/trunk/projects/website/templates/docs/2-medium.tor-doc-osx.pot
   translation/trunk/projects/website/templates/docs/2-medium.tor-doc-relay.pot
   translation/trunk/projects/website/templates/docs/3-low.debian.pot
   translation/trunk/projects/website/templates/docs/3-low.tor-doc-unix.pot
   translation/trunk/projects/website/templates/docs/3-low.tor-doc-web.pot
   translation/trunk/projects/website/templates/docs/3-low.tor-hidden-service.pot
   translation/trunk/projects/website/templates/press/3-low.index.pot
   translation/trunk/projects/website/templates/press/4-optional.2008-12-19-roadmap-press-release.pot
   translation/trunk/projects/website/templates/press/4-optional.2009-03-12-performance-roadmap-press-release.pot
   translation/trunk/projects/website/templates/projects/3-low.index.pot
   translation/trunk/projects/website/templates/projects/4-optional.google.pot
   translation/trunk/projects/website/templates/projects/4-optional.hidserv.pot
   translation/trunk/projects/website/templates/projects/4-optional.lowbandwidth.pot
   translation/trunk/projects/website/templates/projects/4-optional.metrics.pot
   translation/trunk/projects/website/templates/torbrowser/1-high.index.pot
   translation/trunk/projects/website/templates/torbrowser/1-high.split.pot
   translation/trunk/projects/website/templates/torbrowser/4-optional.details.pot
   translation/trunk/projects/website/templates/torbutton/3-low.faq.pot
   translation/trunk/projects/website/templates/torbutton/3-low.index.pot
   translation/trunk/projects/website/templates/torbutton/3-low.options.pot
   translation/trunk/projects/website/templates/tordnsel/3-low.index.pot
Log:
quick update of the .pot files

Modified: translation/trunk/projects/website/templates/1-high.bridges.pot
===================================================================
--- translation/trunk/projects/website/templates/1-high.bridges.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/1-high.bridges.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/bridges.wml:9
@@ -26,7 +26,8 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/bridges.wml:11 /tmp/XFMIcg85od.xml:65 /tmp/XFMIcg85od.xml:88 /tmp/XFMIcg85od.xml:111 /tmp/XFMIcg85od.xml:137
+#: /home/runa/tor/website/en/bridges.wml:11 /tmp/ERN3uY345s.xml:65
+#: /tmp/ERN3uY345s.xml:88 /tmp/ERN3uY345s.xml:111 /tmp/ERN3uY345s.xml:137
 msgid "<hr />"
 msgstr ""
 
@@ -57,16 +58,16 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:33
 msgid ""
-"Note that it's also possible that Tor is non-functional for other "
-"reasons. The latest version of <a href=\"<page torbrowser/index>\">The Tor "
-"Browser Bundle</a> on Windows tries to give you better hints about why Tor "
-"is having problems connecting. You should also read <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">the "
-"FAQ about problems with running Tor properly</a> when you have issues.  If "
-"you feel that the issue is clearly blocking, or you'd simply like to try "
-"because you're unsure or feeling adventurous, please read on. Ensure that "
-"you're using the <a href=\"<page download>#Dev\">latest 0.2.0.x or 0.2.1.x "
-"bundle for your platform</a>."
+"Note that it's also possible that Tor is non-functional for other reasons. "
+"The latest version of <a href=\"<page torbrowser/index>\">The Tor Browser "
+"Bundle</a> on Windows tries to give you better hints about why Tor is having "
+"problems connecting. You should also read <a href=\"https://wiki.torproject."
+"org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">the FAQ about problems with "
+"running Tor properly</a> when you have issues.  If you feel that the issue "
+"is clearly blocking, or you'd simply like to try because you're unsure or "
+"feeling adventurous, please read on. Ensure that you're using the <a href="
+"\"<page download>#Dev\">latest 0.2.0.x or 0.2.1.x bundle for your platform</"
+"a>."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -83,11 +84,11 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:56
 msgid ""
-"At the moment, you can get a bridge by visiting <a "
-"href=\"https://bridges.torproject.org/\">https://bridges.torproject.org/</a> "
-"with your web browser. If this page is filtered for you, and you don't have "
-"any other proxies or ways to reach it, there are <a "
-"href=\"#FindingMore\">other ways to find bridges</a> too."
+"At the moment, you can get a bridge by visiting <a href=\"https://bridges."
+"torproject.org/\">https://bridges.torproject.org/</a> with your web browser. "
+"If this page is filtered for you, and you don't have any other proxies or "
+"ways to reach it, there are <a href=\"#FindingMore\">other ways to find "
+"bridges</a> too."
 msgstr ""
 
 #. type: Content of: <div>
@@ -169,7 +170,8 @@
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/bridges.wml:110
-msgid "<a class=\"anchor\" href=\"#FindingMore\">Finding more bridges for Tor</a>"
+msgid ""
+"<a class=\"anchor\" href=\"#FindingMore\">Finding more bridges for Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -215,12 +217,11 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/bridges.wml:140
 msgid ""
-"If you want to help out and you can't run a <a href=\"<page "
-"docs/tor-doc-relay>\">normal Tor relay</a>, you should run a bridge "
-"relay. You can configure it <a href=\"<page docs/tor-doc-relay>\">using "
-"Vidalia</a>, or you can manually <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc\">edit "
-"your torrc file</a> to be just these four lines:"
+"If you want to help out and you can't run a <a href=\"<page docs/tor-doc-"
+"relay>\">normal Tor relay</a>, you should run a bridge relay. You can "
+"configure it <a href=\"<page docs/tor-doc-relay>\">using Vidalia</a>, or you "
+"can manually <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
+"TorFAQ#torrc\">edit your torrc file</a> to be just these four lines:"
 msgstr ""
 
 #. type: Content of: <div><pre>
@@ -239,9 +240,9 @@
 #: /home/runa/tor/website/en/bridges.wml:156
 msgid ""
 "If you get \"Could not bind to 0.0.0.0:443: Permission denied\" errors on "
-"startup, you'll need to pick a higher ORPort (e.g. 8080) or do <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ServerForFirewalledClients\">some "
-"complex port forwarding</a>."
+"startup, you'll need to pick a higher ORPort (e.g. 8080) or do <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/"
+"TorFAQ#ServerForFirewalledClients\">some complex port forwarding</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -268,8 +269,8 @@
 #: /home/runa/tor/website/en/bridges.wml:179
 msgid ""
 "If you would like to learn more about our bridge design from a technical "
-"standpoint, please read the <a "
-"href=\"<svnsandbox>doc/spec/bridges-spec.txt\">Tor bridges "
-"specification</a>. If you're interested in running an unpublished bridge or "
-"other non-standard uses, please do read the specification."
+"standpoint, please read the <a href=\"<svnsandbox>doc/spec/bridges-spec.txt"
+"\">Tor bridges specification</a>. If you're interested in running an "
+"unpublished bridge or other non-standard uses, please do read the "
+"specification."
 msgstr ""

Modified: translation/trunk/projects/website/templates/1-high.download.pot
===================================================================
--- translation/trunk/projects/website/templates/1-high.download.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/1-high.download.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/download.wml:9
@@ -31,22 +31,22 @@
 msgstr ""
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:25 /tmp/YVABh1quVY.xml:307
+#: /home/runa/tor/website/en/download.wml:25 /tmp/Y0VEhOyCeG.xml:307
 msgid "Operating System"
 msgstr ""
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:26 /tmp/YVABh1quVY.xml:308
+#: /home/runa/tor/website/en/download.wml:26 /tmp/Y0VEhOyCeG.xml:308
 msgid "Download Stable"
 msgstr ""
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:27 /tmp/YVABh1quVY.xml:309
+#: /home/runa/tor/website/en/download.wml:27 /tmp/Y0VEhOyCeG.xml:309
 msgid "Download Unstable"
 msgstr ""
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:28 /tmp/YVABh1quVY.xml:310
+#: /home/runa/tor/website/en/download.wml:28 /tmp/Y0VEhOyCeG.xml:310
 msgid "Installation and Configuration"
 msgstr ""
 
@@ -68,12 +68,12 @@
 #: /home/runa/tor/website/en/download.wml:42
 msgid ""
 "<a href=\"<package-win32-bundle-alpha>\"><version-win32-bundle-alpha></a> "
-"(<a href=\"<package-win32-bundle-alpha-sig>\">sig</a>/<a "
-"href=\"<package-win32-bundle-alpha-sha1>\">sha1</a>)"
+"(<a href=\"<package-win32-bundle-alpha-sig>\">sig</a>/<a href=\"<package-"
+"win32-bundle-alpha-sha1>\">sha1</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:46 /tmp/YVABh1quVY.xml:327
+#: /home/runa/tor/website/en/download.wml:46 /tmp/Y0VEhOyCeG.xml:327
 msgid "<a href=\"<page docs/tor-doc-windows>\">Windows</a>"
 msgstr ""
 
@@ -89,10 +89,9 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:59
 msgid ""
-"<a "
-"href=\"torbrowser/dist/tor-browser-<version-torbrowserbundle>_en-US.exe\"><version-torbrowser-tor></a> "
-"(<a "
-"href=\"torbrowser/dist/tor-browser-<version-torbrowserbundle>_en-US.exe.asc\">sig</a>)"
+"<a href=\"torbrowser/dist/tor-browser-<version-torbrowserbundle>_en-US.exe"
+"\"><version-torbrowser-tor></a> (<a href=\"torbrowser/dist/tor-browser-"
+"<version-torbrowserbundle>_en-US.exe.asc\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -112,10 +111,9 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:76
 msgid ""
-"<a "
-"href=\"torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-US.exe\"><version-torbrowser-tor></a> "
-"(<a "
-"href=\"torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-US.exe.asc\">sig</a>)"
+"<a href=\"torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-US."
+"exe\"><version-torbrowser-tor></a> (<a href=\"torbrowser/dist/tor-im-browser-"
+"<version-torimbrowserbundle>_en-US.exe.asc\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -141,12 +139,13 @@
 #: /home/runa/tor/website/en/download.wml:93
 msgid ""
 "<a href=\"<package-osx-bundle-alpha>\"><version-osx-bundle-alpha></a> (<a "
-"href=\"<package-osx-bundle-alpha-sig>\">sig</a>/<a "
-"href=\"<package-osx-bundle-alpha-sha1>\">sha1</a>)"
+"href=\"<package-osx-bundle-alpha-sig>\">sig</a>/<a href=\"<package-osx-"
+"bundle-alpha-sha1>\">sha1</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:97 /tmp/YVABh1quVY.xml:115 /tmp/YVABh1quVY.xml:344 /tmp/YVABh1quVY.xml:361
+#: /home/runa/tor/website/en/download.wml:97 /tmp/Y0VEhOyCeG.xml:115
+#: /tmp/Y0VEhOyCeG.xml:344 /tmp/Y0VEhOyCeG.xml:361
 msgid "<a href=\"<page docs/tor-doc-osx>\">Mac OS X</a>"
 msgstr ""
 
@@ -160,17 +159,16 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:107
 msgid ""
-"<a "
-"href=\"<package-oldosx-bundle-stable>\"><version-oldosx-bundle-stable></a> "
-"(<a href=\"<package-oldosx-bundle-stable-sig>\">sig</a>)"
+"<a href=\"<package-oldosx-bundle-stable>\"><version-oldosx-bundle-stable></"
+"a> (<a href=\"<package-oldosx-bundle-stable-sig>\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:111
 msgid ""
 "<a href=\"<package-oldosx-bundle-alpha>\"><version-oldosx-bundle-alpha></a> "
-"(<a href=\"<package-oldosx-bundle-alpha-sig>\">sig</a>/<a "
-"href=\"<package-oldosx-bundle-alpha-sha1>\">sha1</a>)"
+"(<a href=\"<package-oldosx-bundle-alpha-sig>\">sig</a>/<a href=\"<package-"
+"oldosx-bundle-alpha-sha1>\">sha1</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -181,12 +179,12 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:125 /tmp/YVABh1quVY.xml:371
+#: /home/runa/tor/website/en/download.wml:125 /tmp/Y0VEhOyCeG.xml:371
 msgid "<a href=\"<page download-unix>\">Linux/Unix download page</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:128 /tmp/YVABh1quVY.xml:374
+#: /home/runa/tor/website/en/download.wml:128 /tmp/Y0VEhOyCeG.xml:374
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
@@ -215,8 +213,8 @@
 "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 "
 "versions listed above, there is a much higher chance of serious reliability "
-"and security bugs in these downloads.  Please be prepared to <a "
-"href=\"https://bugs.torproject.org/\">report bugs</a>."
+"and security bugs in these downloads.  Please be prepared to <a href="
+"\"https://bugs.torproject.org/\">report bugs</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -242,8 +240,8 @@
 msgid ""
 "To keep informed of security advisories and new stable releases, subscribe "
 "to the <a href=\"http://archives.seul.org/or/announce/\">or-announce mailing "
-"list</a> (you will be asked to confirm via email). You can also <a "
-"href=\"http://rss.gmane.org/gmane.network.onion-routing.announce\">watch the "
+"list</a> (you will be asked to confirm via email). You can also <a href="
+"\"http://rss.gmane.org/gmane.network.onion-routing.announce\">watch the "
 "list's RSS feed</a>."
 msgstr ""
 
@@ -255,9 +253,9 @@
 #. type: Content of: <div><div><form>
 #: /home/runa/tor/website/en/download.wml:178
 msgid ""
-"<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input "
-"type=\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" "
-"name=\"host\" value=\"freehaven.net\"/> <input name=\"email\" size=\"15\"/> "
+"<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
+"\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
+"\"host\" value=\"freehaven.net\"/> <input name=\"email\" size=\"15\"/> "
 "<input type=\"submit\" value=\"subscribe to or-announce\"/>"
 msgstr ""
 
@@ -268,7 +266,8 @@
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/en/download.wml:189
-msgid "<a class=\"anchor\" href=\"#Warning\">Warning: Want Tor to really work?</a>"
+msgid ""
+"<a class=\"anchor\" href=\"#Warning\">Warning: Want Tor to really work?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -285,9 +284,9 @@
 msgid ""
 "Tor only protects Internet applications that are configured to send their "
 "traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
-"just because you install it.  We recommend you use <a "
-"href=\"http://www.mozilla.org/firefox\">Firefox</a> with the <a "
-"href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton</a> extension."
+"just because you install it.  We recommend you use <a href=\"http://www."
+"mozilla.org/firefox\">Firefox</a> with the <a href=\"https://addons.mozilla."
+"org/firefox/2275/\">Torbutton</a> extension."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
@@ -296,22 +295,22 @@
 "Torbutton blocks browser plugins such as Java, Flash, ActiveX, RealPlayer, "
 "Quicktime, Adobe's PDF plugin, and others: they can be manipulated into "
 "revealing your IP address. For example, that means Youtube is disabled. If "
-"you really need your Youtube, you can <a href=\"<page "
-"torbutton/faq>#noflash\">reconfigure Torbutton</a> to allow it; but be aware "
-"that you're opening yourself up to potential attack. Also, extensions like "
-"Google toolbar look up more information about the websites you type in: they "
-"may bypass Tor and/or broadcast sensitive information. Some people prefer "
-"using two browsers (one for Tor, one for unsafe browsing)."
+"you really need your Youtube, you can <a href=\"<page torbutton/faq>#noflash"
+"\">reconfigure Torbutton</a> to allow it; but be aware that you're opening "
+"yourself up to potential attack. Also, extensions like Google toolbar look "
+"up more information about the websites you type in: they may bypass Tor and/"
+"or broadcast sensitive information. Some people prefer using two browsers "
+"(one for Tor, one for unsafe browsing)."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
 #: /home/runa/tor/website/en/download.wml:222
 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. Torbutton tries to handle your cookies safely. <a "
-"href=\"https://addons.mozilla.org/firefox/82/\">CookieCuller</a> can help "
-"protect any cookies you do not want to lose."
+"cookie, that cookie could identify you even when you start using Tor again. "
+"Torbutton tries to handle your cookies safely. <a href=\"https://addons."
+"mozilla.org/firefox/82/\">CookieCuller</a> can help protect any cookies you "
+"do not want to lose."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
@@ -319,12 +318,11 @@
 msgid ""
 "Tor anonymizes the origin of your traffic, and it encrypts everything "
 "between you and the Tor network and everything inside the Tor network, but "
-"<a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers\">it "
-"can't encrypt your traffic between the Tor network and its final "
-"destination.</a> If you are communicating sensitive information, you should "
-"use as much care as you would on the normal scary Internet &mdash; use HTTPS "
-"or other end-to-end encryption and authentication."
+"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
+"TorFAQ#ExitEavesdroppers\">it can't encrypt your traffic between the Tor "
+"network and its final destination.</a> If you are communicating sensitive "
+"information, you should use as much care as you would on the normal scary "
+"Internet &mdash; use HTTPS or other end-to-end encryption and authentication."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
@@ -362,18 +360,18 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/en/download.wml:270
 msgid ""
-"See the <a href=\"<page documentation>#Developers\">developer "
-"documentation</a> for instructions on fetching Tor from Git to get the very "
-"latest development version source code.  You can also download the <a "
-"href=\"dist/\">Privoxy source</a> or <a "
-"href=\"dist/vidalia-bundles/?C=M;O=D\">Vidalia source</a>."
+"See the <a href=\"<page documentation>#Developers\">developer documentation</"
+"a> for instructions on fetching Tor from Git to get the very latest "
+"development version source code.  You can also download the <a href=\"dist/"
+"\">Privoxy source</a> or <a href=\"dist/vidalia-bundles/?C=M;O=D\">Vidalia "
+"source</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/en/download.wml:281
 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>."
+"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>
@@ -384,10 +382,10 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/en/download.wml:289
 msgid ""
-"For a list of what has changed in each stable Tor release, see the <a "
-"href=\"<svnsandbox>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in "
-"both stable and development versions, see the <a "
-"href=\"<svnsandbox>ChangeLog\">ChangeLog</a>."
+"For a list of what has changed in each stable Tor release, see the <a href="
+"\"<svnsandbox>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in both "
+"stable and development versions, see the <a href=\"<svnsandbox>ChangeLog"
+"\">ChangeLog</a>."
 msgstr ""
 
 #. type: Content of: <div>
@@ -417,16 +415,16 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:320
 msgid ""
-"<a href=\"<package-win32-stable>\"><version-win32-stable></a> (<a "
-"href=\"<package-win32-stable-sig>\">sig</a>)"
+"<a href=\"<package-win32-stable>\"><version-win32-stable></a> (<a href="
+"\"<package-win32-stable-sig>\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:323
 msgid ""
-"<a href=\"<package-win32-alpha>\"><version-win32-alpha></a> (<a "
-"href=\"<package-win32-alpha-sig>\">sig</a>/<a "
-"href=\"<package-win32-alpha-sha1>\">sha1</a>)"
+"<a href=\"<package-win32-alpha>\"><version-win32-alpha></a> (<a href="
+"\"<package-win32-alpha-sig>\">sig</a>/<a href=\"<package-win32-alpha-sha1>"
+"\">sha1</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -439,65 +437,62 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:337
 msgid ""
-"<a href=\"<package-osx-stable>\"><version-osx-stable></a> (<a "
-"href=\"<package-osx-stable-sig>\">sig</a>)"
+"<a href=\"<package-osx-stable>\"><version-osx-stable></a> (<a href="
+"\"<package-osx-stable-sig>\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:340
 msgid ""
-"<a href=\"<package-osx-alpha>\"><version-osx-alpha></a> (<a "
-"href=\"<package-osx-alpha-sig>\">sig</a>/<a "
-"href=\"<package-osx-alpha-sha1>\">sha1</a>)"
+"<a href=\"<package-osx-alpha>\"><version-osx-alpha></a> (<a href=\"<package-"
+"osx-alpha-sig>\">sig</a>/<a href=\"<package-osx-alpha-sha1>\">sha1</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:350
 msgid ""
-"Mac (Contains only Tor)<br /> <small><em>PowerPC Only (OSX "
-"10.3)</em></small>"
+"Mac (Contains only Tor)<br /> <small><em>PowerPC Only (OSX 10.3)</em></small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:354
 msgid ""
-"<a href=\"<package-oldosx-stable>\"><version-oldosx-stable></a> (<a "
-"href=\"<package-oldosx-stable-sig>\">sig</a>)"
+"<a href=\"<package-oldosx-stable>\"><version-oldosx-stable></a> (<a href="
+"\"<package-oldosx-stable-sig>\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:357
 msgid ""
-"<a href=\"<package-oldosx-alpha>\"><version-oldosx-alpha></a> (<a "
-"href=\"<package-oldosx-alpha-sig>\">sig</a>/<a "
-"href=\"<package-oldosx-alpha-sha1>\">sha1</a>)"
+"<a href=\"<package-oldosx-alpha>\"><version-oldosx-alpha></a> (<a href="
+"\"<package-oldosx-alpha-sig>\">sig</a>/<a href=\"<package-oldosx-alpha-sha1>"
+"\">sha1</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:367
 msgid ""
-"<img src=\"images/ico-tux.png\" /> Linux/Unix packages (Contains only "
-"Tor)<br /> <small><em>Redhat/CentOS, Fedora, Debian, Ubuntu, "
-"SUSE</em></small>"
+"<img src=\"images/ico-tux.png\" /> Linux/Unix packages (Contains only Tor)"
+"<br /> <small><em>Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE</em></small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:380
 msgid ""
-"Source tarballs<br /> <kbd>./configure &amp;&amp; make &amp;&amp; "
-"src/or/tor</kbd>"
+"Source tarballs<br /> <kbd>./configure &amp;&amp; make &amp;&amp; src/or/"
+"tor</kbd>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download.wml:384
 msgid ""
-"<a href=\"<package-source-stable>\"><version-stable></a> (<a "
-"href=\"<package-source-stable-sig>\">sig</a>)"
+"<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.wml:388
 msgid ""
-"<a href=\"<package-source-alpha>\"><version-alpha></a> (<a "
-"href=\"<package-source-alpha-sig>\">sig</a>)"
+"<a href=\"<package-source-alpha>\"><version-alpha></a> (<a href=\"<package-"
+"source-alpha-sig>\">sig</a>)"
 msgstr ""

Modified: translation/trunk/projects/website/templates/1-high.easy-download.pot
===================================================================
--- translation/trunk/projects/website/templates/1-high.easy-download.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/1-high.easy-download.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h3>
 #: /home/runa/tor/website/en/easy-download.wml:9
@@ -26,7 +26,7 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><th>
-#: /home/runa/tor/website/en/easy-download.wml:13 /tmp/JqW6Qa0oxM.xml:15
+#: /home/runa/tor/website/en/easy-download.wml:13 /tmp/IhEnG9xF8X.xml:15
 msgid "<img src=\"images/logo.windows-header.gif\"/>"
 msgstr ""
 
@@ -38,9 +38,9 @@
 #. type: Content of: <div><table><tr><th>
 #: /home/runa/tor/website/en/easy-download.wml:16
 msgid ""
-"<img src=\"images/distros/generic.png\"/><img "
-"src=\"images/distros/freebsd.png\"/><img "
-"src=\"images/distros/package.png\"/><img src=\"images/distros/src.png\"/>"
+"<img src=\"images/distros/generic.png\"/><img src=\"images/distros/freebsd."
+"png\"/><img src=\"images/distros/package.png\"/><img src=\"images/distros/"
+"src.png\"/>"
 msgstr ""
 
 #. PO4ASHARPBEGIN Translators: please point to the version of TBB in your language,PO4ASHARPEND
@@ -48,23 +48,21 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/easy-download.wml:22
 msgid ""
-"<a "
-"href=\"torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-US.exe\">Tor "
-"Browser Bundle for Windows</a>"
+"<a href=\"torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-US."
+"exe\">Tor Browser Bundle for Windows</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/easy-download.wml:25
 msgid ""
-"<a href=\"<package-osx-bundle-stable>\">Installation Bundle for Apple OS "
-"X</a>"
+"<a href=\"<package-osx-bundle-stable>\">Installation Bundle for Apple OS X</"
+"a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/easy-download.wml:28
 msgid ""
-"<a href=\"<package-win32-bundle-stable>\">Installation Bundle for "
-"Windows</a>"
+"<a href=\"<package-win32-bundle-stable>\">Installation Bundle for Windows</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -93,8 +91,8 @@
 #: /home/runa/tor/website/en/easy-download.wml:46
 msgid ""
 "Tor does <strong>not</strong> magically encrypt all of your Internet "
-"activities.  Understand what Tor does and does not do for you. <a "
-"href=\"<page download>#Warning\">Read more about this topic</a>."
+"activities.  Understand what Tor does and does not do for you. <a href="
+"\"<page download>#Warning\">Read more about this topic</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -107,16 +105,15 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/en/easy-download.wml:58
 msgid ""
-"Verify the signatures for the downloads above (<a href=\"<page "
-"verifying-signatures>\">How?</a>):"
+"Verify the signatures for the downloads above (<a href=\"<page verifying-"
+"signatures>\">How?</a>):"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/easy-download.wml:60
 msgid ""
-"<a "
-"href=\"torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-US.exe.asc\">Tor "
-"Browser Bundle for Windows signature</a>"
+"<a href=\"torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-US."
+"exe.asc\">Tor Browser Bundle for Windows signature</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
@@ -145,17 +142,17 @@
 msgid ""
 "To keep informed of security advisories and new stable releases, subscribe "
 "to the <a href=\"http://archives.seul.org/or/announce/\">or-announce mailing "
-"list</a> (you will be asked to confirm via email). You can also <a "
-"href=\"http://rss.gmane.org/gmane.network.onion-routing.announce\">watch the "
+"list</a> (you will be asked to confirm via email). You can also <a href="
+"\"http://rss.gmane.org/gmane.network.onion-routing.announce\">watch the "
 "list's RSS feed</a>."
 msgstr ""
 
 #. type: Content of: <div><div><form>
 #: /home/runa/tor/website/en/easy-download.wml:82
 msgid ""
-"<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input "
-"type=\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" "
-"name=\"host\" value=\"freehaven.net\"/> <input name=\"email\" size=\"15\"/> "
+"<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
+"\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
+"\"host\" value=\"freehaven.net\"/> <input name=\"email\" size=\"15\"/> "
 "<input type=\"submit\" value=\"subscribe to or-announce\"/>"
 msgstr ""
 

Modified: translation/trunk/projects/website/templates/1-high.finding-tor.pot
===================================================================
--- translation/trunk/projects/website/templates/1-high.finding-tor.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/1-high.finding-tor.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h1>
 #: /home/runa/tor/website/en/finding-tor.wml:8
@@ -21,7 +21,8 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/finding-tor.wml:9 /tmp/ThFb3nB3fX.xml:24 /tmp/ThFb3nB3fX.xml:39 /tmp/ThFb3nB3fX.xml:60 /tmp/ThFb3nB3fX.xml:81
+#: /home/runa/tor/website/en/finding-tor.wml:9 /tmp/kHiL5Trbtp.xml:24
+#: /tmp/kHiL5Trbtp.xml:39 /tmp/kHiL5Trbtp.xml:60 /tmp/kHiL5Trbtp.xml:81
 msgid "<hr />"
 msgstr ""
 
@@ -54,9 +55,9 @@
 msgid ""
 "If you're already running Tor, you should be able to download a new Tor "
 "securely with your current Tor. You should do this for your friends who "
-"don't already have Tor. You can do this from our <a href=\"<page "
-"download>\">download page</a> or from a download page on one of the many Tor "
-"<a href=\"<page mirrors>\">mirrors</a>.  Please take care to <a href=\"<page "
+"don't already have Tor. You can do this from our <a href=\"<page download>"
+"\">download page</a> or from a download page on one of the many Tor <a href="
+"\"<page mirrors>\">mirrors</a>.  Please take care to <a href=\"<page "
 "verifying-signatures>\">verify the signature</a> of any downloaded package "
 "when possible."
 msgstr ""
@@ -116,9 +117,9 @@
 msgid ""
 "To avoid spamming people accidentally, we only answer emails that are sent "
 "from email services that support <a href=\"http://www.dkim.org/\">DKIM</a>, "
-"which is an email feature that lets us verify that the address in the "
-"\"From\" line is actually the one who sent the mail. Gmail is an example of "
-"a mail service that is known to work. If we get an email from a service that "
+"which is an email feature that lets us verify that the address in the \"From"
+"\" line is actually the one who sent the mail. Gmail is an example of a mail "
+"service that is known to work. If we get an email from a service that "
 "doesn't use DKIM, we'll send a short explanation and then ignore the email "
 "address for the next day or so."
 msgstr ""
@@ -141,15 +142,15 @@
 "only if you connect to the IRC server using SSL. Currently <tt>gettor</tt> "
 "is known to spend time on Freenode, 2600, Indymedia and OFTC.  <br/><br/> If "
 "you're currently able to connect to one of those IRC networks, look for a "
-"user named '<tt>gettor</tt>' that is connected from the host "
-"'<tt>check.torproject.org</tt>'. Send the user a private message like so: "
-"<br/> <br/> '<tt>/msg gettor xdcc list</tt>' <br/> <br/> The <tt>gettor</tt> "
-"user should respond with a list of files available for download. If there is "
-"no response, something has gone wrong. Some IRC networks require that you "
-"are registered before you can send private queries to other users (this is "
-"often to reduce spam). You may need to register with the NickServ before you "
-"can talk to the <tt>'gettor'</tt> user.  <br/> An example response returned "
-"by <tt>gettor</tt> is presented below:<br/>"
+"user named '<tt>gettor</tt>' that is connected from the host '<tt>check."
+"torproject.org</tt>'. Send the user a private message like so: <br/> <br/> "
+"'<tt>/msg gettor xdcc list</tt>' <br/> <br/> The <tt>gettor</tt> user should "
+"respond with a list of files available for download. If there is no "
+"response, something has gone wrong. Some IRC networks require that you are "
+"registered before you can send private queries to other users (this is often "
+"to reduce spam). You may need to register with the NickServ before you can "
+"talk to the <tt>'gettor'</tt> user.  <br/> An example response returned by "
+"<tt>gettor</tt> is presented below:<br/>"
 msgstr ""
 
 #. type: Content of: <div><p><pre>

Modified: translation/trunk/projects/website/templates/1-high.index.pot
===================================================================
--- translation/trunk/projects/website/templates/1-high.index.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/1-high.index.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/index.wml:11
@@ -41,7 +41,8 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/index.wml:20 /tmp/3jH2lpQ3UL.xml:30 /tmp/3jH2lpQ3UL.xml:74
+#: /home/runa/tor/website/en/index.wml:20 /tmp/t2Gp191l5S.xml:30
+#: /tmp/t2Gp191l5S.xml:74
 msgid "<hr />"
 msgstr ""
 
@@ -83,9 +84,9 @@
 "of reasons: journalists and bloggers, human rights workers, law enforcement "
 "officers, soldiers, corporations, citizens of repressive regimes, and just "
 "ordinary citizens.  See the <a href=\"<page torusers>\">Who Uses Tor?</a> "
-"page for examples of typical Tor users. See the <a href=\"<page "
-"overview>\">overview page</a> for a more detailed explanation of what Tor "
-"does, and why this diversity of users is important."
+"page for examples of typical Tor users. See the <a href=\"<page overview>"
+"\">overview page</a> for a more detailed explanation of what Tor does, and "
+"why this diversity of users is important."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -101,12 +102,12 @@
 msgid ""
 "Tor's security improves as its user base grows and as more people volunteer "
 "to <a href=\"<page docs/tor-doc-relay>\">run relays</a>. (It isn't nearly as "
-"hard to set up as you might think, and can significantly <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity\"> "
-"enhance your own security</a>.)  If running a relay isn't for you, we need "
-"<a href=\"<page volunteer>\">help with many other aspects of the "
-"project</a>, and we need funds to continue making the Tor network faster and "
-"easier to use while maintaining good security."
+"hard to set up as you might think, and can significantly <a href=\"https://"
+"wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity\"> enhance "
+"your own security</a>.)  If running a relay isn't for you, we need <a href="
+"\"<page volunteer>\">help with many other aspects of the project</a>, and we "
+"need funds to continue making the Tor network faster and easier to use while "
+"maintaining good security."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -130,17 +131,17 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/index.wml:77
 msgid ""
-"28 July 2009: Tor 0.2.1.19 released as stable.  Read the <a "
-"href=\"http://archives.seul.org/or/announce/Aug-2009/msg00000.html\">announcement</a> "
-"for the updates and changes."
+"28 July 2009: Tor 0.2.1.19 released as stable.  Read the <a href=\"http://"
+"archives.seul.org/or/announce/Aug-2009/msg00000.html\">announcement</a> for "
+"the updates and changes."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/index.wml:79
 msgid ""
-"25 June 2009: Tor 0.2.0.35 released as stable.  Read the <a "
-"href=\"http://archives.seul.org/or/announce/Jun-2009/msg00000.html\">announcement</a> "
-"for the updates and changes."
+"25 June 2009: Tor 0.2.0.35 released as stable.  Read the <a href=\"http://"
+"archives.seul.org/or/announce/Jun-2009/msg00000.html\">announcement</a> for "
+"the updates and changes."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -154,9 +155,9 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/index.wml:82
 msgid ""
-"19 December 2008: Tor releases 3-year development roadmap.  Read the <a "
-"href=\"<page press/2008-12-19-roadmap-press-release>\">Press Release</a> for "
-"more information."
+"19 December 2008: Tor releases 3-year development roadmap.  Read the <a href="
+"\"<page press/2008-12-19-roadmap-press-release>\">Press Release</a> for more "
+"information."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -164,8 +165,8 @@
 msgid ""
 "<b>We are actively looking for new sponsors and funding.</b> If your "
 "organization has an interest in keeping the Tor network usable and fast, "
-"please <a href=\"<page contact>\">contact us</a>.  <a href=\"<page "
-"sponsors>\">Sponsors of Tor</a> also get personal attention, better support, "
+"please <a href=\"<page contact>\">contact us</a>.  <a href=\"<page sponsors>"
+"\">Sponsors of Tor</a> also get personal attention, better support, "
 "publicity (if they want it), and get to influence the direction of our "
 "research and development.  <a href=\"<page donate>\">Please donate.</a>"
 msgstr ""
@@ -173,7 +174,7 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/index.wml:94
 msgid ""
-"<a href=\"<page news>\">More news</a>&nbsp;|&nbsp;<a href=\"<page "
-"press/index>\">Press Releases</a>&nbsp;|&nbsp;<a href=\"<page "
-"tormedia>\">Tor in the News</a>"
+"<a href=\"<page news>\">More news</a>&nbsp;|&nbsp;<a href=\"<page press/"
+"index>\">Press Releases</a>&nbsp;|&nbsp;<a href=\"<page tormedia>\">Tor in "
+"the News</a>"
 msgstr ""

Modified: translation/trunk/projects/website/templates/2-medium.documentation.pot
===================================================================
--- translation/trunk/projects/website/templates/2-medium.documentation.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/2-medium.documentation.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/documentation.wml:9
@@ -37,7 +37,8 @@
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:16
-msgid "<a href=\"<page docs/tor-doc-unix>\">Installing Tor on Linux/BSD/Unix</a>"
+msgid ""
+"<a href=\"<page docs/tor-doc-unix>\">Installing Tor on Linux/BSD/Unix</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -53,8 +54,8 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:22
 msgid ""
-"<a href=\"<page docs/tor-hidden-service>\">Configuring a Tor hidden "
-"service</a>"
+"<a href=\"<page docs/tor-hidden-service>\">Configuring a Tor hidden service</"
+"a>"
 msgstr ""
 
 #. type: Content of: <div>
@@ -80,47 +81,45 @@
 #: /home/runa/tor/website/en/documentation.wml:38
 msgid ""
 "<a href=\"<page download>\">Install the Tor bundle</a> and try it out.  Make "
-"sure you've got Firefox installed first, and be sure to read the <a "
-"href=\"<page download>#Warning\">list of warnings</a> about ways you can "
-"screw up your anonymity."
+"sure you've got Firefox installed first, and be sure to read the <a href="
+"\"<page download>#Warning\">list of warnings</a> about ways you can screw up "
+"your anonymity."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/documentation.wml:45
 msgid ""
-"Our <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\">FAQ</a> "
-"covers all sorts of topics, including questions about setting up a client or "
-"relay, concerns about anonymity attacks, why we didn't build Tor in other "
-"ways, etc.  There's a separate <a href=\"<page faq-abuse>\">Abuse FAQ</a> to "
-"answer common questions from or for relay operators.  The <a href=\"<page "
-"eff/tor-legal-faq>\">Tor Legal FAQ</a> is written by EFF lawyers, and aims "
-"to give you an overview of some of the legal issues that arise from the Tor "
-"project in the US."
+"Our <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ"
+"\">FAQ</a> covers all sorts of topics, including questions about setting up "
+"a client or relay, concerns about anonymity attacks, why we didn't build Tor "
+"in other ways, etc.  There's a separate <a href=\"<page faq-abuse>\">Abuse "
+"FAQ</a> to answer common questions from or for relay operators.  The <a href="
+"\"<page eff/tor-legal-faq>\">Tor Legal FAQ</a> is written by EFF lawyers, "
+"and aims to give you an overview of some of the legal issues that arise from "
+"the Tor project in the US."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/documentation.wml:57
 msgid ""
 "The <a href=\"<page tor-manual>\">manual</a> lists all the possible entries "
-"you can put in your <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc\">torrc "
-"file</a>. We also provide a <a href=\"<page tor-manual-dev>\">manual for the "
-"development version of Tor</a>."
+"you can put in your <a href=\"https://wiki.torproject.org/noreply/"
+"TheOnionRouter/TorFAQ#torrc\">torrc file</a>. We also provide a <a href="
+"\"<page tor-manual-dev>\">manual for the development version of Tor</a>."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/documentation.wml:63
 msgid ""
 "If you have questions, we have an IRC channel (for users, relay operators, "
-"and developers)  at <a href=\"irc://irc.oftc.net/tor\">#tor on "
-"irc.oftc.net</a>. If you have a bug, especially a crash bug, read <a "
-"href=\"https://wiki.torproject.org/wiki/TheOnionRouter/TorFAQ#RelayCrashing\">how "
-"to report a Tor bug</a> first and then tell us as much information about it "
-"as you can in <a href=\"https://bugs.torproject.org/tor\">our "
-"bugtracker</a>.  (If your bug is with Privoxy, your browser, or some other "
-"application, please don't put it in our bugtracker.) The <a "
-"href=\"#MailingLists\">or-talk mailing list</a> can also be useful."
+"and developers)  at <a href=\"irc://irc.oftc.net/tor\">#tor on irc.oftc.net</"
+"a>. If you have a bug, especially a crash bug, read <a href=\"https://wiki."
+"torproject.org/wiki/TheOnionRouter/TorFAQ#RelayCrashing\">how to report a "
+"Tor bug</a> first and then tell us as much information about it as you can "
+"in <a href=\"https://bugs.torproject.org/tor\">our bugtracker</a>.  (If your "
+"bug is with Privoxy, your browser, or some other application, please don't "
+"put it in our bugtracker.) The <a href=\"#MailingLists\">or-talk mailing "
+"list</a> can also be useful."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -133,13 +132,14 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/documentation.wml:83
 msgid ""
-"Download and watch Roger's overview talk from What The Hack (<a "
-"href=\"http://freehaven.net/~arma/wth-anonymous-communication-58.mp4\">video</a>, "
-"<a href=\"http://freehaven.net/~arma/wth1.pdf\">slides</a>, <a "
-"href=\"http://wiki.whatthehack.org/index.php/Anonymous_communication_for_the_United_States_Department_of_Defense...and_you\">abstract</a>).  "
-"This talk was given in July 2005, back when we were funded by EFF and back "
-"when the network was quite small, but it still provides good background on "
-"how Tor works and what it's for."
+"Download and watch Roger's overview talk from What The Hack (<a href="
+"\"http://freehaven.net/~arma/wth-anonymous-communication-58.mp4\">video</a>, "
+"<a href=\"http://freehaven.net/~arma/wth1.pdf\">slides</a>, <a href=\"http://"
+"wiki.whatthehack.org/index.php/"
+"Anonymous_communication_for_the_United_States_Department_of_Defense...and_you"
+"\">abstract</a>).  This talk was given in July 2005, back when we were "
+"funded by EFF and back when the network was quite small, but it still "
+"provides good background on how Tor works and what it's for."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -152,56 +152,52 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/documentation.wml:99
 msgid ""
-"There's a skeletal <a "
-"href=\"<svnsandbox>doc/roadmaps/2008-12-19-roadmap-full.pdf\">list of items "
-"we'd like to tackle in the future</a>. Alas, many of those items need to be "
-"fleshed out more before they'll make sense to people who aren't Tor "
-"developers, but you can still get a general sense of what issues need to be "
-"resolved next."
+"There's a skeletal <a href=\"<svnsandbox>doc/roadmaps/2008-12-19-roadmap-"
+"full.pdf\">list of items we'd like to tackle in the future</a>. Alas, many "
+"of those items need to be fleshed out more before they'll make sense to "
+"people who aren't Tor developers, but you can still get a general sense of "
+"what issues need to be resolved next."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/documentation.wml:108
 msgid ""
 "Download and watch Nick's \"Technical changes since 2004\" talk from Defcon "
-"in July 2007 (<a "
-"href=\"http://freehaven.net/~arma/Defcon15-Mathewson-Technical_Changes_since_you_Last_Heard_about_Tor.mp4\">video</a>, "
-"<a "
-"href=\"http://freehaven.net/~nickm/slides/Defcon07/TorChanges.pdf\">slides</a>), "
+"in July 2007 (<a href=\"http://freehaven.net/~arma/Defcon15-Mathewson-"
+"Technical_Changes_since_you_Last_Heard_about_Tor.mp4\">video</a>, <a href="
+"\"http://freehaven.net/~nickm/slides/Defcon07/TorChanges.pdf\">slides</a>), "
 "Roger's \"blocking-resistance and circumvention\" talk from 23C3 in December "
-"2006 (<a "
-"href=\"http://freehaven.net/~arma/23C3-1444-en-tor_and_china.m4v\">video</a>, "
-"<a href=\"http://freehaven.net/~arma/slides-23c3.pdf\">slides</a>, <a "
-"href=\"http://events.ccc.de/congress/2006/Fahrplan/events/1444.en.html\">abstract</a>, "
-"<a href=\"<svnsandbox>doc/design-paper/blocking.html\">design paper</a>), "
-"and Roger's \"Current events in 2007\" talk from 24C3 in December 2007 (<a "
-"href=\"http://freehaven.net/~arma/24c3-2325-en-current_events_in_tor_development.mp4\">video</a>, "
-"<a href=\"http://freehaven.net/~arma/slides-24c3.pdf\">slides</a>, <a "
-"href=\"http://events.ccc.de/congress/2007/Fahrplan/events/2325.en.html\">abstract</a>).  "
-"We also have the What The Hack tutorial on hidden services (<a "
-"href=\"http://freehaven.net/~arma/wth_tor_hidden_services.mp4\">video</a>, "
-"<a href=\"http://freehaven.net/~arma/wth3.pdf\">slides</a>)."
+"2006 (<a href=\"http://freehaven.net/~arma/23C3-1444-en-tor_and_china.m4v"
+"\">video</a>, <a href=\"http://freehaven.net/~arma/slides-23c3.pdf\">slides</"
+"a>, <a href=\"http://events.ccc.de/congress/2006/Fahrplan/events/1444.en.html"
+"\">abstract</a>, <a href=\"<svnsandbox>doc/design-paper/blocking.html"
+"\">design paper</a>), and Roger's \"Current events in 2007\" talk from 24C3 "
+"in December 2007 (<a href=\"http://freehaven.net/~arma/24c3-2325-en-"
+"current_events_in_tor_development.mp4\">video</a>, <a href=\"http://"
+"freehaven.net/~arma/slides-24c3.pdf\">slides</a>, <a href=\"http://events."
+"ccc.de/congress/2007/Fahrplan/events/2325.en.html\">abstract</a>).  We also "
+"have the What The Hack tutorial on hidden services (<a href=\"http://"
+"freehaven.net/~arma/wth_tor_hidden_services.mp4\">video</a>, <a href="
+"\"http://freehaven.net/~arma/wth3.pdf\">slides</a>)."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/documentation.wml:129
 msgid ""
 "See Mike's \"Securing the Tor network\" talk from Defcon in July 2007 (<a "
-"href=\"http://freehaven.net/~arma/Defcon15-Mike_Perry-Securing_the_Tor_Network.mp4\">video</a>, "
-"<a "
-"href=\"http://freehaven.net/~arma/SecuringTheTorNetwork.pdf\">slides</a>).  "
-"It describes common ways to attack networks like Tor and how we try to "
-"defend against them, and it introduces the <a "
-"href=\"https://svn.torproject.org/svn/torflow/trunk/README\">Torflow</a> "
-"script collection."
+"href=\"http://freehaven.net/~arma/Defcon15-Mike_Perry-"
+"Securing_the_Tor_Network.mp4\">video</a>, <a href=\"http://freehaven.net/"
+"~arma/SecuringTheTorNetwork.pdf\">slides</a>).  It describes common ways to "
+"attack networks like Tor and how we try to defend against them, and it "
+"introduces the <a href=\"https://svn.torproject.org/svn/torflow/trunk/README"
+"\">Torflow</a> script collection."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/documentation.wml:139
 msgid ""
-"Learn about the <a "
-"href=\"<svnsandbox>doc/spec/proposals/001-process.txt\">Tor proposal process "
-"for changing our design</a>, and look over the <a "
+"Learn about the <a href=\"<svnsandbox>doc/spec/proposals/001-process.txt"
+"\">Tor proposal process for changing our design</a>, and look over the <a "
 "href=\"<svnsandbox>doc/spec/proposals/\">existing proposals</a>."
 msgstr ""
 
@@ -209,9 +205,9 @@
 #: /home/runa/tor/website/en/documentation.wml:146
 msgid ""
 "Our <a href=\"<svnsandbox>doc/TODO\">developer TODO file</a> starts with a "
-"timeline for external promises &mdash; things <a href=\"<page "
-"sponsors>\">our sponsors</a> have paid to see done. It also lists many other "
-"tasks and topics we'd like to tackle next."
+"timeline for external promises &mdash; things <a href=\"<page sponsors>"
+"\">our sponsors</a> have paid to see done. It also lists many other tasks "
+"and topics we'd like to tackle next."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -239,8 +235,8 @@
 "The <a href=\"http://archives.seul.org/or/announce/\">or-announce mailing "
 "list</a> is a low volume list for announcements of new releases and critical "
 "security updates. Everybody should be on this list.  There is also an <a "
-"href=\"http://rss.gmane.org/gmane.network.onion-routing.announce\">RSS "
-"feed</a> of or-announce at <a href=\"http://gmane.org\">gmane.org</a>."
+"href=\"http://rss.gmane.org/gmane.network.onion-routing.announce\">RSS feed</"
+"a> of or-announce at <a href=\"http://gmane.org\">gmane.org</a>."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -269,8 +265,8 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:178
 msgid ""
-"A list for <a href=\"http://archives.seul.org/or/cvs/\">svn and git "
-"commits</a> may be interesting for developers."
+"A list for <a href=\"http://archives.seul.org/or/cvs/\">svn and git commits</"
+"a> may be interesting for developers."
 msgstr ""
 
 #. type: Content of: <div>
@@ -287,18 +283,17 @@
 #: /home/runa/tor/website/en/documentation.wml:185
 msgid ""
 "The <b>design document</b> (published at Usenix Security 2004)  gives our "
-"justifications and security analysis for the Tor design: <a "
-"href=\"<svnsandbox>doc/design-paper/tor-design.pdf\">PDF</a> and <a "
-"href=\"<svnsandbox>doc/design-paper/tor-design.html\">HTML</a> versions "
-"available."
+"justifications and security analysis for the Tor design: <a href="
+"\"<svnsandbox>doc/design-paper/tor-design.pdf\">PDF</a> and <a href="
+"\"<svnsandbox>doc/design-paper/tor-design.html\">HTML</a> versions available."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:190
 msgid ""
 "Our follow-up paper on <b>challenges in low-latency anonymity</b> (still in "
-"draft form) details more recent experiences and directions: <a "
-"href=\"<svnsandbox>doc/design-paper/challenges.pdf\">PDF draft</a>."
+"draft form) details more recent experiences and directions: <a href="
+"\"<svnsandbox>doc/design-paper/challenges.pdf\">PDF draft</a>."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -306,8 +301,8 @@
 msgid ""
 "Our paper at WEIS 2006 &mdash; <b>Anonymity Loves Company: Usability and the "
 "Network Effect</b> &mdash; explains why usability in anonymity systems "
-"matters for their security: <a "
-"href=\"http://freehaven.net/anonbib/cache/usability:weis2006.pdf\">PDF</a>."
+"matters for their security: <a href=\"http://freehaven.net/anonbib/cache/"
+"usability:weis2006.pdf\">PDF</a>."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -315,10 +310,10 @@
 msgid ""
 "Our preliminary design to make it harder for large firewalls to prevent "
 "access to the Tor network is described in <b>design of a blocking-resistant "
-"anonymity system</b>: <a "
-"href=\"<svnsandbox>doc/design-paper/blocking.pdf\">PDF draft</a> and <a "
-"href=\"<svnsandbox>doc/design-paper/blocking.html\">HTML draft</a>.  Want to "
-"<a href=\"<page volunteer>#Coding\">help us build it</a>?"
+"anonymity system</b>: <a href=\"<svnsandbox>doc/design-paper/blocking.pdf"
+"\">PDF draft</a> and <a href=\"<svnsandbox>doc/design-paper/blocking.html"
+"\">HTML draft</a>.  Want to <a href=\"<page volunteer>#Coding\">help us "
+"build it</a>?"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -330,17 +325,17 @@
 
 #. type: Content of: <div><ul><li><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:207
-msgid "<a href=\"<svnsandbox>doc/spec/tor-spec.txt\">Main Tor specification</a>"
+msgid ""
+"<a href=\"<svnsandbox>doc/spec/tor-spec.txt\">Main Tor specification</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:208
 msgid ""
 "<a href=\"<svnsandbox>doc/spec/dir-spec.txt\">Tor version 3 directory server "
-"specification</a> (and older <a "
-"href=\"<svnsandbox>doc/spec/dir-spec-v1.txt\">version 1</a> and <a "
-"href=\"<svnsandbox>doc/spec/dir-spec-v2.txt\">version 2</a> directory "
-"specifications)"
+"specification</a> (and older <a href=\"<svnsandbox>doc/spec/dir-spec-v1.txt"
+"\">version 1</a> and <a href=\"<svnsandbox>doc/spec/dir-spec-v2.txt"
+"\">version 2</a> directory specifications)"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
@@ -353,8 +348,8 @@
 #. type: Content of: <div><ul><li><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:215
 msgid ""
-"<a href=\"<svnsandbox>doc/spec/rend-spec.txt\">Tor rendezvous "
-"specification</a>"
+"<a href=\"<svnsandbox>doc/spec/rend-spec.txt\">Tor rendezvous specification</"
+"a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
@@ -367,8 +362,8 @@
 #. type: Content of: <div><ul><li><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:219
 msgid ""
-"<a href=\"<svnsandbox>doc/spec/address-spec.txt\">Special hostnames in "
-"Tor</a>"
+"<a href=\"<svnsandbox>doc/spec/address-spec.txt\">Special hostnames in Tor</"
+"a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
@@ -405,26 +400,24 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:234
 msgid ""
-"The <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\">Tor "
-"wiki</a> provides a plethora of helpful contributions from Tor users. Check "
-"it out!"
+"The <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\">Tor wiki</"
+"a> provides a plethora of helpful contributions from Tor users. Check it out!"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:237
 msgid ""
-"<a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/SupportPrograms\">A "
-"list of supporting programs you might want to use in association with "
+"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/SupportPrograms"
+"\">A list of supporting programs you might want to use in association with "
 "Tor</a>."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:241
 msgid ""
-"<a href=\"http://check.torproject.org/\">The Tor detector</a> or <a "
-"href=\"http://torcheck.xenobite.eu/\">the other Tor detector</a> try to "
-"guess if you're using Tor or not."
+"<a href=\"http://check.torproject.org/\">The Tor detector</a> or <a href="
+"\"http://torcheck.xenobite.eu/\">the other Tor detector</a> try to guess if "
+"you're using Tor or not."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -440,10 +433,9 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:250
 msgid ""
-"Read <a "
-"href=\"http://freehaven.net/anonbib/topic.html#Anonymous_20communication\">these "
-"papers</a> (especially the ones in boxes) to get up to speed on the field of "
-"anonymous communication systems."
+"Read <a href=\"http://freehaven.net/anonbib/topic."
+"html#Anonymous_20communication\">these papers</a> (especially the ones in "
+"boxes) to get up to speed on the field of anonymous communication systems."
 msgstr ""
 
 #. type: Content of: <div>
@@ -463,7 +455,8 @@
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:260
-msgid "<a href=\"<svnsandbox>\">Browse the repository's source tree directly</a>"
+msgid ""
+"<a href=\"<svnsandbox>\">Browse the repository's source tree directly</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -486,13 +479,14 @@
 #. type: Content of: <div><ul><li><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:265
 msgid ""
-"<b>Git HTTPS certificate fingerprint:</b> "
-"8D:58:41:85:9C:2B:82:84:7C:84:0E:B9:BB:58:16:AC"
+"<b>Git HTTPS certificate fingerprint:</b> 8D:58:41:85:9C:2B:82:84:7C:84:0E:"
+"B9:BB:58:16:AC"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:266
-msgid "<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
+msgid ""
+"<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -503,21 +497,20 @@
 #. type: Content of: <div><ul><li><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:271
 msgid ""
-"<kbd>svn checkout https://tor-svn.freehaven.net/svn/website/trunk "
-"website</kbd>"
+"<kbd>svn checkout https://tor-svn.freehaven.net/svn/website/trunk website</"
+"kbd>"
 msgstr ""
 
 #. type: Content of: <div><ul><li><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:272
 msgid ""
-"<b>SVN HTTPS certificate fingerprint:</b> "
-"11:34:5c:b1:c4:12:76:10:86:ce:df:69:3d:06:a9:57:fa:dc:c9:29"
+"<b>SVN HTTPS certificate fingerprint:</b> 11:34:5c:b1:c4:12:76:10:86:ce:"
+"df:69:3d:06:a9:57:fa:dc:c9:29"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/documentation.wml:275
 msgid ""
-"<a "
-"href=\"https://git.torproject.org/checkout/githax/master/doc/Howto.txt\">Basic "
-"instructions for using Git to contribute to Tor software.</a>"
+"<a href=\"https://git.torproject.org/checkout/githax/master/doc/Howto.txt"
+"\">Basic instructions for using Git to contribute to Tor software.</a>"
 msgstr ""

Modified: translation/trunk/projects/website/templates/2-medium.donate.pot
===================================================================
--- translation/trunk/projects/website/templates/2-medium.donate.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/2-medium.donate.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/donate.wml:9
@@ -70,8 +70,8 @@
 "development, and education of online anonymity and privacy.  Donations to "
 "The Tor Project may be tax deductible to persons who are in the US; or who "
 "pay taxes in countries with reciprocity with the US on charitable "
-"donations.  If you can't donate, but want to help raise funds please <a "
-"href=\"mailto:donations at torproject.org\">contact us</a> directly."
+"donations.  If you can't donate, but want to help raise funds please <a href="
+"\"mailto:donations at torproject.org\">contact us</a> directly."
 msgstr ""
 
 #. type: Content of: <div>
@@ -90,10 +90,10 @@
 "One of our core fundraising goals is not to annoy donors with repeated "
 "requests.  Therefore, we advocate for a subscription-based approach: simply "
 "sign up for recurring monthly donations. Consistent donations let us worry "
-"less about fund-raising and focus on improving the Tor software and "
-"network. You can cancel your subscription at any time. You can become a "
-"member by clicking on this button (you will need a <a "
-"href=\"http://paypal.com/\">PayPal</a> account):"
+"less about fund-raising and focus on improving the Tor software and network. "
+"You can cancel your subscription at any time. You can become a member by "
+"clicking on this button (you will need a <a href=\"http://paypal.com/"
+"\">PayPal</a> account):"
 msgstr ""
 
 #. type: Content of: <div><form><select>
@@ -102,17 +102,17 @@
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:45 /tmp/RfzjRcmskq.xml:87
+#: /home/runa/tor/website/en/donate.wml:45 /tmp/6yMp6WROGY.xml:87
 msgid "$"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:46 /tmp/RfzjRcmskq.xml:88
+#: /home/runa/tor/website/en/donate.wml:46 /tmp/6yMp6WROGY.xml:88
 msgid "€"
 msgstr ""
 
 #. type: Content of: <div><form><p><select><option>
-#: /home/runa/tor/website/en/donate.wml:47 /tmp/RfzjRcmskq.xml:89
+#: /home/runa/tor/website/en/donate.wml:47 /tmp/6yMp6WROGY.xml:89
 msgid "£"
 msgstr ""
 
@@ -139,8 +139,8 @@
 #. type: Content of: <div><form><dl><dt>
 #: /home/runa/tor/website/en/donate.wml:54
 msgid ""
-"<input type=\"radio\" name=\"a3\" value=\"20.00\" checked=\"checked\" "
-"/>20/month"
+"<input type=\"radio\" name=\"a3\" value=\"20.00\" checked=\"checked\" />20/"
+"month"
 msgstr ""
 
 #. type: Content of: <div><form><dl><dt>
@@ -157,18 +157,17 @@
 #: /home/runa/tor/website/en/donate.wml:59
 msgid ""
 "<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=\"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=\"Make payments with PayPal - it's fast, free and "
-"secure!\"/> <input type=\"hidden\" name=\"cmd\" "
-"value=\"_xclick-subscriptions\" /> <input type=\"hidden\" name=\"business\" "
-"value=\"donations at torproject.org\" /> <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=\"Make payments with PayPal - it's fast, free and secure!\"/> "
+"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" /> "
+"<input type=\"hidden\" name=\"business\" value=\"donations at torproject.org\" /"
+"> <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\"/>"
 msgstr ""
 
 #. type: Content of: <div>
@@ -185,12 +184,12 @@
 #: /home/runa/tor/website/en/donate.wml:78
 msgid ""
 "You can also make a <b>one-time donation</b> (via PayPal, but doesn't "
-"require any account):<br /> <input type=\"radio\" name=\"amount\" "
-"value=\"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=\"\" "
-"/>other amount <select name=\"currency_code\">"
+"require any account):<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=\"\" />other amount <select name="
+"\"currency_code\">"
 msgstr ""
 
 #. type: Content of: <div><form><p>
@@ -198,13 +197,12 @@
 msgid ""
 "</select> <input type=\"hidden\" name=\"no_shipping\" value=\"1\" /> <input "
 "type=\"image\" src=\"images/btn_donateCC_LG.gif\" name=\"submit\" alt=\"Make "
-"payments with PayPal - it's fast, free and secure!\"/> <input "
-"type=\"hidden\" name=\"cmd\" value=\"_xclick\" /> <input type=\"hidden\" "
-"name=\"business\" value=\"donations at torproject.org\" /> <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\"/>"
+"payments with PayPal - it's fast, free and secure!\"/> <input type=\"hidden"
+"\" name=\"cmd\" value=\"_xclick\" /> <input type=\"hidden\" name=\"business"
+"\" value=\"donations at torproject.org\" /> <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\"/>"
 msgstr ""
 
 #. type: Content of: <div>
@@ -215,8 +213,8 @@
 #. type: Content of: <div><h3>
 #: /home/runa/tor/website/en/donate.wml:107
 msgid ""
-"<a class=\"anchor\" href=\"#check\">Checks, Money Orders, and Postal "
-"Orders</a>"
+"<a class=\"anchor\" href=\"#check\">Checks, Money Orders, and Postal Orders</"
+"a>"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -291,13 +289,13 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/donate.wml:151
 msgid ""
-"In Europe, we have a funding arrangement with the <a "
-"href=\"http://www.ccc.de/\">Chaos Computer Club</a>.  Your donations go into "
-"a separate bank account managed by the CCC, and they use the funds to do "
-"beneficial activities for Tor in Europe.  Residents from any of the <a "
-"href=\"http://en.wikipedia.org/wiki/Single_Euro_Payments_Area\">31 SEPA "
-"member states</a> can wire up to 50.000 Euro at the cost of a domestic "
-"transaction (i.e., usually free if submitted electronically)."
+"In Europe, we have a funding arrangement with the <a href=\"http://www.ccc."
+"de/\">Chaos Computer Club</a>.  Your donations go into a separate bank "
+"account managed by the CCC, and they use the funds to do beneficial "
+"activities for Tor in Europe.  Residents from any of the <a href=\"http://en."
+"wikipedia.org/wiki/Single_Euro_Payments_Area\">31 SEPA member states</a> can "
+"wire up to 50.000 Euro at the cost of a domestic transaction (i.e., usually "
+"free if submitted electronically)."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -336,18 +334,17 @@
 #: /home/runa/tor/website/en/donate.wml:179
 msgid ""
 "If you've just donated, thank you for your donation.  Your funds are "
-"deposited into our general fund.  You join our <a href=\"<page "
-"sponsors>\">many sponsors</a> in funding the future of Tor and online "
-"anonymity.  In 2008, the Tor Project spent and received its funds as "
-"follows:"
+"deposited into our general fund.  You join our <a href=\"<page sponsors>"
+"\">many sponsors</a> in funding the future of Tor and online anonymity.  In "
+"2008, the Tor Project spent and received its funds as follows:"
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/donate.wml:182
 msgid ""
-"<img src=\"images/2008-funding-chart.png\" alt=\"Who funds the Tor "
-"Project?\"/> <img src=\"images/2008-expenses-chart.png\" alt=\"How is the "
-"money spent?\"/>"
+"<img src=\"images/2008-funding-chart.png\" alt=\"Who funds the Tor Project?"
+"\"/> <img src=\"images/2008-expenses-chart.png\" alt=\"How is the money "
+"spent?\"/>"
 msgstr ""
 
 #. type: Content of: <div>

Modified: translation/trunk/projects/website/templates/2-medium.faq.pot
===================================================================
--- translation/trunk/projects/website/templates/2-medium.faq.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/2-medium.faq.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/faq.wml:11
@@ -21,7 +21,7 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/faq.wml:12 /tmp/CmVfrBmofZ.xml:1027
+#: /home/runa/tor/website/en/faq.wml:12 /tmp/X2pn00l4KU.xml:1027
 msgid "<hr />"
 msgstr ""
 
@@ -37,12 +37,14 @@
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:17
-msgid "<a href=\"#Torisdifferent\">How is Tor different from other proxies?</a>"
+msgid ""
+"<a href=\"#Torisdifferent\">How is Tor different from other proxies?</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:18
-msgid "<a href=\"#CompatibleApplications\">What programs can I use with Tor?</a>"
+msgid ""
+"<a href=\"#CompatibleApplications\">What programs can I use with Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -57,12 +59,14 @@
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:22
-msgid "<a href=\"#DistributingTor\">Can I distribute Tor on my magazine's CD?</a>"
+msgid ""
+"<a href=\"#DistributingTor\">Can I distribute Tor on my magazine's CD?</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:24
-msgid "<a href=\"#SupportMail\">How can I get an answer to my Tor support mail?</a>"
+msgid ""
+"<a href=\"#SupportMail\">How can I get an answer to my Tor support mail?</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -72,7 +76,8 @@
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:27
-msgid "<a href=\"#Funding\">What would The Tor Project do with more funding?</a>"
+msgid ""
+"<a href=\"#Funding\">What would The Tor Project do with more funding?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -87,7 +92,8 @@
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:34
-msgid "<a href=\"#PGPSigs\">What are these \"sig\" files on the download page?</a>"
+msgid ""
+"<a href=\"#PGPSigs\">What are these \"sig\" files on the download page?</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -104,7 +110,8 @@
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:39
-msgid "<a href=\"#LiveCD\">Is there a LiveCD or other bundle that includes Tor?</a>"
+msgid ""
+"<a href=\"#LiveCD\">Is there a LiveCD or other bundle that includes Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -136,7 +143,8 @@
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:51
-msgid "<a href=\"#RelayOrBridge\">Should I be a normal relay or bridge relay?</a>"
+msgid ""
+"<a href=\"#RelayOrBridge\">Should I be a normal relay or bridge relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -166,7 +174,8 @@
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:65
-msgid "<a href=\"#EverybodyARelay\">You should make every Tor user be a relay.</a>"
+msgid ""
+"<a href=\"#EverybodyARelay\">You should make every Tor user be a relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -176,20 +185,22 @@
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:71
-msgid "<a href=\"#Criminals\">Doesn't Tor enable criminals to do bad things?</a>"
+msgid ""
+"<a href=\"#Criminals\">Doesn't Tor enable criminals to do bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:72
-msgid "<a href=\"#RespondISP\">How do I respond to my ISP about my exit relay?</a>"
+msgid ""
+"<a href=\"#RespondISP\">How do I respond to my ISP about my exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:76
 msgid ""
-"For other questions not yet on this version of the FAQ, see the <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\">wiki "
-"FAQ</a> for now."
+"For other questions not yet on this version of the FAQ, see the <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\">wiki FAQ</a> "
+"for now."
 msgstr ""
 
 #. type: Content of: <div>
@@ -215,9 +226,9 @@
 "around a distributed network of relays run by volunteers all around the "
 "world: it prevents somebody watching your Internet connection from learning "
 "what sites you visit, and it prevents the sites you visit from learning your "
-"physical location. This set of volunteer relays is called the Tor "
-"network. You can read more about how Tor works on the <a href=\"<page "
-"overview>\">overview page</a>."
+"physical location. This set of volunteer relays is called the Tor network. "
+"You can read more about how Tor works on the <a href=\"<page overview>"
+"\">overview page</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -309,8 +320,7 @@
 "as visiting a bank or ecommerce website, or encrypted mail connections, etc, "
 "it will only know the destination.  It won't be able to see the data inside "
 "the traffic stream.  You are still protected from this node figuring out who "
-"you are and if using encryption, what data you're sending to the "
-"destination."
+"you are and if using encryption, what data you're sending to the destination."
 msgstr ""
 
 #. type: Content of: <div>
@@ -332,13 +342,13 @@
 "and application-level anonymity. Connection-level anonymity focuses on "
 "making sure the application's Internet connections get sent through Tor.  "
 "This step is normally done by configuring the program to use your Tor client "
-"as a \"socks\" proxy, but there are other ways to do it too. For "
-"application-level anonymity, you need to make sure that the information the "
-"application sends out doesn't hurt your privacy. (Even if the connections "
-"are being routed through Tor, you still don't want to include sensitive "
-"information like your name.) This second step needs to be done on a "
-"program-by-program basis, which is why we don't yet recommend very many "
-"programs for safe use with Tor."
+"as a \"socks\" proxy, but there are other ways to do it too. For application-"
+"level anonymity, you need to make sure that the information the application "
+"sends out doesn't hurt your privacy. (Even if the connections are being "
+"routed through Tor, you still don't want to include sensitive information "
+"like your name.) This second step needs to be done on a program-by-program "
+"basis, which is why we don't yet recommend very many programs for safe use "
+"with Tor."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -357,12 +367,11 @@
 "There are plenty of other programs you can use with Tor, but we haven't "
 "researched the application-level anonymity issues on them well enough to be "
 "able to recommend a safe configuration. Our wiki has a list of instructions "
-"for <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torifying "
-"specific applications</a>. There's also a <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/SupportPrograms\">list "
-"of applications that help you direct your traffic through Tor</a>.  Please "
-"add to these lists and help us keep them accurate!"
+"for <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO"
+"\">Torifying specific applications</a>. There's also a <a href=\"https://"
+"wiki.torproject.org/noreply/TheOnionRouter/SupportPrograms\">list of "
+"applications that help you direct your traffic through Tor</a>.  Please add "
+"to these lists and help us keep them accurate!"
 msgstr ""
 
 #. type: Content of: <div>
@@ -378,13 +387,12 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:173
 msgid ""
-"Because Tor is the onion routing network. When we were starting the new "
-"next-generation design and implementation of onion routing in 2001-2002, we "
-"would tell people we were working on onion routing, and they would say "
-"\"Neat. Which one?\" Even if onion routing has become a standard household "
-"term, Tor was born out of the actual <a "
-"href=\"http://www.onion-router.net/\">onion routing project</a> run by the "
-"Naval Research Lab."
+"Because Tor is the onion routing network. When we were starting the new next-"
+"generation design and implementation of onion routing in 2001-2002, we would "
+"tell people we were working on onion routing, and they would say \"Neat. "
+"Which one?\" Even if onion routing has become a standard household term, Tor "
+"was born out of the actual <a href=\"http://www.onion-router.net/\">onion "
+"routing project</a> run by the Naval Research Lab."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -434,14 +442,14 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:215
 msgid ""
-"But that said, there are still plenty of subtle attacks people might "
-"try. Somebody might impersonate us, or break into our computers, or "
-"something like that. Tor is open source, and you should always check the "
-"source (or at least the diffs since the last release)  for suspicious "
-"things. If we (or the distributors) don't give you source, that's a sure "
-"sign something funny might be going on. You should also check the <a "
-"href=\"<page verifying-signatures>\">PGP signatures</a> on the releases, to "
-"make sure nobody messed with the distribution sites."
+"But that said, there are still plenty of subtle attacks people might try. "
+"Somebody might impersonate us, or break into our computers, or something "
+"like that. Tor is open source, and you should always check the source (or at "
+"least the diffs since the last release)  for suspicious things. If we (or "
+"the distributors) don't give you source, that's a sure sign something funny "
+"might be going on. You should also check the <a href=\"<page verifying-"
+"signatures>\">PGP signatures</a> on the releases, to make sure nobody messed "
+"with the distribution sites."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -494,14 +502,13 @@
 "software, though. They want to distribute the Tor bundles, which typically "
 "include <a href=\"http://www.privoxy.org/\">Privoxy</a> and <a href=\"<page "
 "vidalia/index>\">Vidalia</a>.  You will need to follow the licenses for "
-"those programs as well. Both of them are distributed under the <a "
-"href=\"https://www.fsf.org/licensing/licenses/gpl.html\">GNU General Public "
+"those programs as well. Both of them are distributed under the <a href="
+"\"https://www.fsf.org/licensing/licenses/gpl.html\">GNU General Public "
 "License</a>. The simplest way to obey their licenses is to include the "
 "source code for these programs everywhere you include the bundles "
-"themselves. Look for \"source\" packages on the <a href=\"<page "
-"vidalia/index>\">Vidalia page</a> and the <a "
-"href=\"http://sourceforge.net/project/showfiles.php?group_id=11118\">Privoxy "
-"download page</a>."
+"themselves. Look for \"source\" packages on the <a href=\"<page vidalia/"
+"index>\">Vidalia page</a> and the <a href=\"http://sourceforge.net/project/"
+"showfiles.php?group_id=11118\">Privoxy download page</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -543,9 +550,8 @@
 "can't configure Privoxy correctly, or so on. Sometimes our volunteers can "
 "answer these mails, but typically they need to spend most of their time on "
 "development tasks that will benefit more people.  This is especially true if "
-"your question is already covered in the <a href=\"<page "
-"documentation>\">documentation</a> or on this FAQ. We don't hate you; we're "
-"just busy."
+"your question is already covered in the <a href=\"<page documentation>"
+"\">documentation</a> or on this FAQ. We don't hate you; we're just busy."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -553,26 +559,26 @@
 msgid ""
 "So if we don't answer your mail, first check the <a href=\"<page "
 "documentation>\">documentation</a> page, along with this FAQ, to make sure "
-"your question isn't already answered.  Then read <a "
-"href=\"http://www.catb.org/~esr/faqs/smart-questions.html\">\"How to ask "
-"questions the smart way\"</a>. If this doesn't help you, note that we have "
-"<a href=\"<page documentation>#Support\">an IRC channel</a> where you can "
-"ask your questions (but if they are still open-ended, ill-formed, or not "
-"about Tor, you likely won't get much help there either). Lastly, people on "
-"the <a href=\"<page documentation>#MailingLists\">or-talk mailing list</a> "
-"may be able to provide some hints for you, if others have experienced your "
-"problems too. Be sure to look over <a "
-"href=\"http://archives.seul.org/or/talk/\">the archives</a> first."
+"your question isn't already answered.  Then read <a href=\"http://www.catb."
+"org/~esr/faqs/smart-questions.html\">\"How to ask questions the smart way\"</"
+"a>. If this doesn't help you, note that we have <a href=\"<page "
+"documentation>#Support\">an IRC channel</a> where you can ask your questions "
+"(but if they are still open-ended, ill-formed, or not about Tor, you likely "
+"won't get much help there either). Lastly, people on the <a href=\"<page "
+"documentation>#MailingLists\">or-talk mailing list</a> may be able to "
+"provide some hints for you, if others have experienced your problems too. Be "
+"sure to look over <a href=\"http://archives.seul.org/or/talk/\">the "
+"archives</a> first."
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:320
 msgid ""
 "Another strategy is to <a href=\"<page docs/tor-doc-relay>\">run a Tor relay "
-"for a while</a>, and/or <a href=\"<page donate>\">donate money</a> <a "
-"href=\"<page volunteer>\">or time</a> to the effort. We're more likely to "
-"pay attention to people who have demonstrated interest and commitment to "
-"giving back to the Tor community."
+"for a while</a>, and/or <a href=\"<page donate>\">donate money</a> <a href="
+"\"<page volunteer>\">or time</a> to the effort. We're more likely to pay "
+"attention to people who have demonstrated interest and commitment to giving "
+"back to the Tor community."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -612,8 +618,8 @@
 msgid ""
 "But that doesn't mean that it can't be improved. The current Tor network is "
 "quite small compared to the number of people trying to use it, and many of "
-"these users don't understand or care that Tor can't currently handle "
-"file-sharing traffic load."
+"these users don't understand or care that Tor can't currently handle file-"
+"sharing traffic load."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -650,9 +656,8 @@
 #: /home/runa/tor/website/en/faq.wml:382
 msgid ""
 "There are some steps that individuals can take to improve their Tor "
-"performance. <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/FireFoxTorPerf\">You "
-"can configure your Firefox to handle Tor better</a>, <a "
+"performance. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
+"FireFoxTorPerf\">You can configure your Firefox to handle Tor better</a>, <a "
 "href=\"http://www.pps.jussieu.fr/~jch/software/polipo/tor.html\">you can use "
 "Polipo with Tor</a>, or you can try <a href=\"<page download>\">upgrading to "
 "the latest version of Tor</a>.  If this works well, please help by "
@@ -710,9 +715,9 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:430
 msgid ""
-"We have about 1500 relays right now, pushing over 150 MB/s average "
-"traffic. We have several hundred thousand active users. But the Tor network "
-"is not yet self-sustaining."
+"We have about 1500 relays right now, pushing over 150 MB/s average traffic. "
+"We have several hundred thousand active users. But the Tor network is not "
+"yet self-sustaining."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -763,9 +768,9 @@
 #: /home/runa/tor/website/en/faq.wml:473
 msgid ""
 "Incentives: We need to work on ways to encourage people to configure their "
-"Tors as relays and exit nodes rather than just clients.  <a "
-"href=\"#EverybodyARelay\">We need to make it easy to become a relay, and we "
-"need to give people incentives to do it.</a>"
+"Tors as relays and exit nodes rather than just clients.  <a href="
+"\"#EverybodyARelay\">We need to make it easy to become a relay, and we need "
+"to give people incentives to do it.</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -773,28 +778,27 @@
 msgid ""
 "Research: The anonymous communications field is full of surprises and "
 "gotchas. In our copious free time, we also help run top anonymity and "
-"privacy conferences like <a "
-"href=\"http://petsymposium.org/\">PETS</a>. We've identified a set of "
-"critical <a href=\"<page volunteer>#Research\">Tor research questions</a> "
-"that will help us figure out how to make Tor secure against the variety of "
-"attacks out there. Of course, there are more research questions waiting "
-"behind these."
+"privacy conferences like <a href=\"http://petsymposium.org/\">PETS</a>. "
+"We've identified a set of critical <a href=\"<page volunteer>#Research\">Tor "
+"research questions</a> that will help us figure out how to make Tor secure "
+"against the variety of attacks out there. Of course, there are more research "
+"questions waiting behind these."
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:493
 msgid ""
-"We're continuing to move forward on all of these, but at this rate <a "
-"href=\"#WhySlow\">the Tor network is growing faster than the developers can "
-"keep 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."
+"We're continuing to move forward on all of these, but at this rate <a href="
+"\"#WhySlow\">the Tor network is growing faster than the developers can keep "
+"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 ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:501
 msgid ""
-"We are also excited about tackling related problems, such as "
-"censorship-resistance."
+"We are also excited about tackling related problems, such as censorship-"
+"resistance."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -822,7 +826,8 @@
 
 #. type: Content of: <div><h3>
 #: /home/runa/tor/website/en/faq.wml:522
-msgid "<a class=\"anchor\" href=\"#HowUninstallTor\">How do I uninstall Tor?</a>"
+msgid ""
+"<a class=\"anchor\" href=\"#HowUninstallTor\">How do I uninstall Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -881,16 +886,16 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:552
 msgid ""
-"For Mac OS X, follow the <a href=\"<page "
-"docs/tor-doc-osx>#uninstall\">uninstall directions</a>."
+"For Mac OS X, follow the <a href=\"<page docs/tor-doc-osx>#uninstall"
+"\">uninstall directions</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:557
 msgid ""
-"If you installed by source, I'm afraid there is no easy uninstall "
-"method. But on the bright side, by default it only installs into /usr/local/ "
-"and it should be pretty easy to notice things there."
+"If you installed by source, I'm afraid there is no easy uninstall method. "
+"But on the bright side, by default it only installs into /usr/local/ and it "
+"should be pretty easy to notice things there."
 msgstr ""
 
 #. type: Content of: <div>
@@ -934,16 +939,16 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:585
 msgid ""
-"Try following the steps at <a "
-"href=\"<svnsandbox>doc/tor-win32-mingw-creation.txt\"><svnsandbox>doc/tor-win32-mingw-creation.txt</a>."
+"Try following the steps at <a href=\"<svnsandbox>doc/tor-win32-mingw-"
+"creation.txt\"><svnsandbox>doc/tor-win32-mingw-creation.txt</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:590
 msgid ""
 "(Note that you don't need to compile Tor yourself in order to use it. Most "
-"people just use the packages available on the <a href=\"<page "
-"download>\">download page</a>.)"
+"people just use the packages available on the <a href=\"<page download>"
+"\">download page</a>.)"
 msgstr ""
 
 #. type: Content of: <div>
@@ -973,8 +978,8 @@
 #: /home/runa/tor/website/en/faq.wml:610
 msgid ""
 "In the meantime, we encourage you to not just take our word for it. Our job "
-"is to provide the source; if you're concerned, please do <a "
-"href=\"#CompileTorWindows\">recompile it yourself</a>."
+"is to provide the source; if you're concerned, please do <a href="
+"\"#CompileTorWindows\">recompile it yourself</a>."
 msgstr ""
 
 #. type: Content of: <div>
@@ -1016,11 +1021,11 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/faq.wml:638
 msgid ""
-"<a href=\"http://tork.sourceforge.net/wiki/index.php/LiveCD\">TorK "
-"LiveCD</a> is Knoppix-based with an emphasis on user-friendliness. You can "
-"work anonymously or non-anonymously while TorK tries to keep you informed of "
-"the consequences of your activity. The TorK LiveCD is experimental, so the "
-"aim is to provide regular releases through 2007 and beyond."
+"<a href=\"http://tork.sourceforge.net/wiki/index.php/LiveCD\">TorK LiveCD</"
+"a> is Knoppix-based with an emphasis on user-friendliness. You can work "
+"anonymously or non-anonymously while TorK tries to keep you informed of the "
+"consequences of your activity. The TorK LiveCD is experimental, so the aim "
+"is to provide regular releases through 2007 and beyond."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -1084,8 +1089,9 @@
 #: /home/runa/tor/website/en/faq.wml:674
 msgid ""
 "ELE is a Linux LiveCD which is focused on privacy related software. It "
-"includes Tor and you can download it at <a "
-"href=\"http://www.northernsecurity.net/download/ele/\">http://www.northernsecurity.net/download/ele/</a>."
+"includes Tor and you can download it at <a href=\"http://www."
+"northernsecurity.net/download/ele/\">http://www.northernsecurity.net/"
+"download/ele/</a>."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -1094,8 +1100,9 @@
 "Virtual Privacy Machine is a Linux LiveCD that includes Firefox, Privoxy, "
 "Tor, some IRC and IM applications, and a set of ipchains rules aimed to "
 "prevent non-Tor traffic from accidentally leaving your computer. More "
-"information at <a "
-"href=\"https://wiki.torproject.org/noreply/VirtualPrivacyMachine\">https://wiki.torproject.org/noreply/VirtualPrivacyMachine</a>."
+"information at <a href=\"https://wiki.torproject.org/noreply/"
+"VirtualPrivacyMachine\">https://wiki.torproject.org/noreply/"
+"VirtualPrivacyMachine</a>."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -1105,8 +1112,8 @@
 "than Linux for maximum security. It was designed to be anonymous and secure "
 "from the ground up, and thus has some features and limitations not found in "
 "other LiveCDs (Tor related or otherwise). You can obtain more information "
-"and download Anonym.OS from <a "
-"href=\"http://theory.kaos.to/projects.html\">Kaos.Theory</a>."
+"and download Anonym.OS from <a href=\"http://theory.kaos.to/projects.html"
+"\">Kaos.Theory</a>."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -1143,12 +1150,11 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:710
 msgid ""
-"Tor has built-in support for <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#LimitBandwidth\"> "
-"rate limiting</a>. Further, if you have a fast link but want to limit the "
-"number of bytes per day (or week or month) that you donate, check out the <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#Hibernation\">hib "
-"ernation feature</a>."
+"Tor has built-in support for <a href=\"https://wiki.torproject.org/noreply/"
+"TheOnionRouter/TorFAQ#LimitBandwidth\"> rate limiting</a>. Further, if you "
+"have a fast link but want to limit the number of bytes per day (or week or "
+"month) that you donate, check out the <a href=\"https://wiki.torproject.org/"
+"noreply/TheOnionRouter/TorFAQ#Hibernation\">hib ernation feature</a>."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -1180,17 +1186,17 @@
 msgid ""
 "If your relay is behind a NAT and it doesn't know its public IP (e.g. it has "
 "an IP of 192.168.x.y), you'll need to set up port forwarding. Forwarding TCP "
-"connections is system dependent but <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ServerForFirewal "
-"ledClients\">this FAQ entry</a> offers some examples on how to do this."
+"connections is system dependent but <a href=\"https://wiki.torproject.org/"
+"noreply/TheOnionRouter/TorFAQ#ServerForFirewal ledClients\">this FAQ entry</"
+"a> offers some examples on how to do this."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/faq.wml:742
 msgid ""
 "Your relay will passively estimate and advertise its recent bandwidth "
-"capacity, so high-bandwidth relays will attract more users than "
-"low-bandwidth ones. Therefore having low-bandwidth relays is useful too."
+"capacity, so high-bandwidth relays will attract more users than low-"
+"bandwidth ones. Therefore having low-bandwidth relays is useful too."
 msgstr ""
 
 #. type: Content of: <div>
@@ -1219,27 +1225,27 @@
 "avoid picking exit relays that would refuse to exit to their intended "
 "destination. This way each relay can decide the services, hosts, and "
 "networks he wants to allow connections to, based on abuse potential and his "
-"own situation. Read the FAQ entry on <a href=\"<page "
-"faq-abuse>#TypicalAbuses\">issues you might encounter if you use the default "
-"exit policy</a>, and then read Mike Perry's <a "
-"href=\"https://blog.torproject.org/blog/tips-running-exit-node-minimal-harassment\">tips "
-"for running an exit node with minimal harassment</a>."
+"own situation. Read the FAQ entry on <a href=\"<page faq-abuse>#TypicalAbuses"
+"\">issues you might encounter if you use the default exit policy</a>, and "
+"then read Mike Perry's <a href=\"https://blog.torproject.org/blog/tips-"
+"running-exit-node-minimal-harassment\">tips for running an exit node with "
+"minimal harassment</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:774
 msgid ""
 "The default exit policy allows access to many popular services (e.g. web "
-"browsing), but <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#DefaultPorts\">restricts</a> "
-"some due to abuse potential (e.g. mail) and some since the Tor network can't "
-"handle the load (e.g. default file-sharing ports). You can change your exit "
-"policy using Vidalia's \"Sharing\" tab, or by manually editing your <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc\">torrc</a> "
-"file. If you want to avoid most if not all abuse potential, set it to "
-"\"reject *:*\" (or un-check all the boxes in Vidalia). This setting means "
-"that your relay will be used for relaying traffic inside the Tor network, "
-"but not for connections to external websites or other services."
+"browsing), but <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
+"TorFAQ#DefaultPorts\">restricts</a> some due to abuse potential (e.g. mail) "
+"and some since the Tor network can't handle the load (e.g. default file-"
+"sharing ports). You can change your exit policy using Vidalia's \"Sharing\" "
+"tab, or by manually editing your <a href=\"https://wiki.torproject.org/"
+"noreply/TheOnionRouter/TorFAQ#torrc\">torrc</a> file. If you want to avoid "
+"most if not all abuse potential, set it to \"reject *:*\" (or un-check all "
+"the boxes in Vidalia). This setting means that your relay will be used for "
+"relaying traffic inside the Tor network, but not for connections to external "
+"websites or other services."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -1298,10 +1304,10 @@
 msgid ""
 "So should you run a normal relay or bridge relay? If you have lots of "
 "bandwidth, you should definitely run a normal relay &mdash; bridge relays "
-"see very little use these days. If you're willing to <a "
-"href=\"#ExitPolicies\">be an exit</a>, you should definitely run a normal "
-"relay, since we need more exits. If you can't be an exit and only have a "
-"little bit of bandwidth, then flip a coin. Thanks for volunteering!"
+"see very little use these days. If you're willing to <a href=\"#ExitPolicies"
+"\">be an exit</a>, you should definitely run a normal relay, since we need "
+"more exits. If you can't be an exit and only have a little bit of bandwidth, "
+"then flip a coin. Thanks for volunteering!"
 msgstr ""
 
 #. type: Content of: <div>
@@ -1311,14 +1317,15 @@
 
 #. type: Content of: <div><h3>
 #: /home/runa/tor/website/en/faq.wml:834
-msgid "<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
+msgid ""
+"<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:837
 msgid ""
-"We currently use these metrics to determine if your relay should be "
-"named:<br />"
+"We currently use these metrics to determine if your relay should be named:"
+"<br />"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -1376,11 +1383,10 @@
 msgid ""
 "<b>Authentication</b>: Every Tor relay has a public decryption key called "
 "the \"onion key\".  When the Tor client establishes circuits, at each step "
-"it <a "
-"href=\"<svnsandbox>doc/design-paper/tor-design.html#subsec:circuits\">demands "
-"that the Tor relay prove knowledge of its onion key</a>. That way the first "
-"node in the path can't just spoof the rest of the path.  Each relay rotates "
-"its onion key once a week."
+"it <a href=\"<svnsandbox>doc/design-paper/tor-design.html#subsec:circuits"
+"\">demands that the Tor relay prove knowledge of its onion key</a>. That way "
+"the first node in the path can't just spoof the rest of the path.  Each "
+"relay rotates its onion key once a week."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -1411,10 +1417,9 @@
 #: /home/runa/tor/website/en/faq.wml:902
 msgid ""
 "How do users know they've got the right software? When we distribute the "
-"source code or a package, we digitally sign it with <a "
-"href=\"http://www.gnupg.org/\">GNU Privacy Guard</a>. See the <a "
-"href=\"<page verifying-signatures>\">instructions on how to check Tor's "
-"signatures</a>."
+"source code or a package, we digitally sign it with <a href=\"http://www."
+"gnupg.org/\">GNU Privacy Guard</a>. See the <a href=\"<page verifying-"
+"signatures>\">instructions on how to check Tor's signatures</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -1443,15 +1448,15 @@
 #: /home/runa/tor/website/en/faq.wml:924
 msgid ""
 "Requiring every Tor user to be a relay would help with scaling the network "
-"to handle all our users, and <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity\">running "
-"a Tor relay may help your anonymity</a>. However, many Tor users cannot be "
-"good relays &mdash; for example, some Tor clients operate from behind "
-"restrictive firewalls, connect via modem, or otherwise aren't in a position "
-"where they can relay traffic. Providing service to these clients is a "
-"critical part of providing effective anonymity for everyone, since many Tor "
-"users are subject to these or similar constraints and including these "
-"clients increases the size of the anonymity set."
+"to handle all our users, and <a href=\"https://wiki.torproject.org/noreply/"
+"TheOnionRouter/TorFAQ#RelayAnonymity\">running a Tor relay may help your "
+"anonymity</a>. However, many Tor users cannot be good relays &mdash; for "
+"example, some Tor clients operate from behind restrictive firewalls, connect "
+"via modem, or otherwise aren't in a position where they can relay traffic. "
+"Providing service to these clients is a critical part of providing effective "
+"anonymity for everyone, since many Tor users are subject to these or similar "
+"constraints and including these clients increases the size of the anonymity "
+"set."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -1475,9 +1480,8 @@
 msgid ""
 "First, we need to make Tor stable as a relay on all common operating "
 "systems. The main remaining platform is Windows, and we plan to finally "
-"address that in 2009. See Section 4.1 of <a "
-"href=\"https://www.torproject.org/press/2008-12-19-roadmap-press-release\">our "
-"development roadmap</a>."
+"address that in 2009. See Section 4.1 of <a href=\"https://www.torproject."
+"org/press/2008-12-19-roadmap-press-release\">our development roadmap</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -1487,10 +1491,10 @@
 "amount of bandwidth to allow. See item #7 on the <a href=\"<page "
 "volunteer>#Research\">research section of the volunteer page</a>: \"Tor "
 "doesn't work very well when relays have asymmetric bandwidth (e.g. cable or "
-"DSL)\". It might be that <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#TransportIPnotTCP\">switching "
-"to UDP transport</a> is the simplest answer here &mdash; which alas is not a "
-"very simple answer at all."
+"DSL)\". It might be that <a href=\"https://wiki.torproject.org/noreply/"
+"TheOnionRouter/TorFAQ#TransportIPnotTCP\">switching to UDP transport</a> is "
+"the simplest answer here &mdash; which alas is not a very simple answer at "
+"all."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -1500,9 +1504,9 @@
 "requiring that all Tor relays be able to connect to all Tor relays) and of "
 "the directory (how to stop requiring that all Tor users know about all Tor "
 "relays). Changes like this can have large impact on potential and actual "
-"anonymity. See Section 5 of the <a "
-"href=\"<svnsandbox>doc/design-paper/challenges.pdf\">Challenges</a> paper "
-"for details. Again, UDP transport would help here."
+"anonymity. See Section 5 of the <a href=\"<svnsandbox>doc/design-paper/"
+"challenges.pdf\">Challenges</a> paper for details. Again, UDP transport "
+"would help here."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -1510,9 +1514,8 @@
 msgid ""
 "Fourth, we need to better understand the risks from letting the attacker "
 "send traffic through your relay while you're also initiating your own "
-"anonymized traffic. <a "
-"href=\"http://freehaven.net/anonbib/#back01\">Three</a> <a "
-"href=\"http://freehaven.net/anonbib/#clog-the-queue\">different</a> <a "
+"anonymized traffic. <a href=\"http://freehaven.net/anonbib/#back01\">Three</"
+"a> <a href=\"http://freehaven.net/anonbib/#clog-the-queue\">different</a> <a "
 "href=\"http://freehaven.net/anonbib/#torta05\">research</a> papers describe "
 "ways to identify the relays in a circuit by running traffic through "
 "candidate relays and looking for dips in the traffic while the circuit is "
@@ -1527,8 +1530,8 @@
 #: /home/runa/tor/website/en/faq.wml:994
 msgid ""
 "Fifth, we might need some sort of incentive scheme to encourage people to "
-"relay traffic for others, and/or to become exit nodes. Here are our <a "
-"href=\"https://blog.torproject.org/blog/two-incentive-designs-tor\">current "
+"relay traffic for others, and/or to become exit nodes. Here are our <a href="
+"\"https://blog.torproject.org/blog/two-incentive-designs-tor\">current "
 "thoughts on Tor incentives</a>."
 msgstr ""
 
@@ -1571,7 +1574,7 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq.wml:1022
 msgid ""
-"A collection of templates for successfully responding to ISPs is <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorAbuseTemplates\">collected "
-"here</a>."
+"A collection of templates for successfully responding to ISPs is <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/TorAbuseTemplates"
+"\">collected here</a>."
 msgstr ""

Modified: translation/trunk/projects/website/templates/2-medium.overview.pot
===================================================================
--- translation/trunk/projects/website/templates/2-medium.overview.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/2-medium.overview.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/overview.wml:9
@@ -107,32 +107,31 @@
 "online privacy and security. Activist groups like the Electronic Frontier "
 "Foundation (EFF) recommend Tor as a mechanism for maintaining civil "
 "liberties online. Corporations use Tor as a safe way to conduct competitive "
-"analysis, and to protect sensitive procurement patterns from "
-"eavesdroppers. They also use it to replace traditional VPNs, which reveal "
-"the exact amount and timing of communication. Which locations have employees "
-"working late? Which locations have employees consulting job-hunting "
-"websites? Which research divisions are communicating with the company's "
-"patent lawyers?"
+"analysis, and to protect sensitive procurement patterns from eavesdroppers. "
+"They also use it to replace traditional VPNs, which reveal the exact amount "
+"and timing of communication. Which locations have employees working late? "
+"Which locations have employees consulting job-hunting websites? Which "
+"research divisions are communicating with the company's patent lawyers?"
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/overview.wml:70
 msgid ""
 "A branch of the U.S. Navy uses Tor for open source intelligence gathering, "
-"and one of its teams used Tor while deployed in the Middle East "
-"recently. Law enforcement uses Tor for visiting or surveilling web sites "
-"without leaving government IP addresses in their web logs, and for security "
-"during sting operations."
+"and one of its teams used Tor while deployed in the Middle East recently. "
+"Law enforcement uses Tor for visiting or surveilling web sites without "
+"leaving government IP addresses in their web logs, and for security during "
+"sting operations."
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/overview.wml:78
 msgid ""
-"The variety of people who use Tor is actually <a "
-"href=\"http://freehaven.net/doc/fc03/econymics.pdf\">part of what makes it "
-"so secure</a>.  Tor hides you among <a href=\"<page torusers>\">the other "
-"users on the network</a>, so the more populous and diverse the user base for "
-"Tor is, the more your anonymity will be protected."
+"The variety of people who use Tor is actually <a href=\"http://freehaven.net/"
+"doc/fc03/econymics.pdf\">part of what makes it so secure</a>.  Tor hides you "
+"among <a href=\"<page torusers>\">the other users on the network</a>, so the "
+"more populous and diverse the user base for Tor is, the more your anonymity "
+"will be protected."
 msgstr ""
 
 #. type: Content of: <div>
@@ -340,14 +339,14 @@
 msgid ""
 "Providing a usable anonymizing network on the Internet today is an ongoing "
 "challenge. We want software that meets users' needs. We also want to keep "
-"the network up and running in a way that handles as many users as "
-"possible. Security and usability don't have to be at odds: As Tor's "
-"usability increases, it will attract more users, which will increase the "
-"possible sources and destinations of each communication, thus increasing "
-"security for everyone.  We're making progress, but we need your help.  "
-"Please consider <a href=\"<page docs/tor-doc-relay>\">running a relay</a> or "
-"<a href=\"<page volunteer>\">volunteering</a> as a <a href=\"<page "
-"documentation>#Developers\">developer</a>."
+"the network up and running in a way that handles as many users as possible. "
+"Security and usability don't have to be at odds: As Tor's usability "
+"increases, it will attract more users, which will increase the possible "
+"sources and destinations of each communication, thus increasing security for "
+"everyone.  We're making progress, but we need your help.  Please consider <a "
+"href=\"<page docs/tor-doc-relay>\">running a relay</a> or <a href=\"<page "
+"volunteer>\">volunteering</a> as a <a href=\"<page documentation>#Developers"
+"\">developer</a>."
 msgstr ""
 
 #. type: Content of: <div><p>

Modified: translation/trunk/projects/website/templates/2-medium.torusers.pot
===================================================================
--- translation/trunk/projects/website/templates/2-medium.torusers.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/2-medium.torusers.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/torusers.wml:9
@@ -45,8 +45,8 @@
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/torusers.wml:18
 msgid ""
-"<a href=\"<page torusers>#lawenforcement\">Law enforcement officers use "
-"Tor</a>"
+"<a href=\"<page torusers>#lawenforcement\">Law enforcement officers use Tor</"
+"a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
@@ -59,8 +59,8 @@
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/torusers.wml:20
 msgid ""
-"<a href=\"<page torusers>#spotlight\">High &amp; low profile people use "
-"Tor</a>"
+"<a href=\"<page torusers>#spotlight\">High &amp; low profile people use Tor</"
+"a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
@@ -75,11 +75,15 @@
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/en/torusers.wml:23
-msgid "<a href=\"<page torusers>#itprofessionals\">IT Professionals use Tor</a>"
+msgid ""
+"<a href=\"<page torusers>#itprofessionals\">IT Professionals use Tor</a>"
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/torusers.wml:28 /tmp/1YRZ5EK3E5.xml:38 /tmp/1YRZ5EK3E5.xml:69 /tmp/1YRZ5EK3E5.xml:96 /tmp/1YRZ5EK3E5.xml:121 /tmp/1YRZ5EK3E5.xml:147 /tmp/1YRZ5EK3E5.xml:214 /tmp/1YRZ5EK3E5.xml:245 /tmp/1YRZ5EK3E5.xml:282 /tmp/1YRZ5EK3E5.xml:294
+#: /home/runa/tor/website/en/torusers.wml:28 /tmp/SPpOamM8BH.xml:38
+#: /tmp/SPpOamM8BH.xml:69 /tmp/SPpOamM8BH.xml:96 /tmp/SPpOamM8BH.xml:121
+#: /tmp/SPpOamM8BH.xml:147 /tmp/SPpOamM8BH.xml:214 /tmp/SPpOamM8BH.xml:245
+#: /tmp/SPpOamM8BH.xml:282 /tmp/SPpOamM8BH.xml:294
 msgid "<hr />"
 msgstr ""
 
@@ -109,14 +113,14 @@
 #: /home/runa/tor/website/en/torusers.wml:40
 msgid ""
 "<strong>They protect their privacy from unscrupulous marketers and identity "
-"thieves.</strong> Internet Service Providers (ISPs) <a "
-"href=\"http://seekingalpha.com/article/29449-compete-ceo-isps-sell-clickstreams-for-5-a-month\"> "
-"sell your Internet browsing records</a> to marketers or anyone else willing "
-"to pay for it. ISPs typically say that they anonymize the data by not "
-"providing personally identifiable information, but <a "
-"href=\"http://www.wired.com/politics/security/news/2006/08/71579?currentPage=all\">this "
-"has proven incorrect</a>.  A full record of every site you visit, the text "
-"of every search you perform, and potentially userid and even password "
+"thieves.</strong> Internet Service Providers (ISPs) <a href=\"http://"
+"seekingalpha.com/article/29449-compete-ceo-isps-sell-clickstreams-for-5-a-"
+"month\"> sell your Internet browsing records</a> to marketers or anyone else "
+"willing to pay for it. ISPs typically say that they anonymize the data by "
+"not providing personally identifiable information, but <a href=\"http://www."
+"wired.com/politics/security/news/2006/08/71579?currentPage=all\">this has "
+"proven incorrect</a>.  A full record of every site you visit, the text of "
+"every search you perform, and potentially userid and even password "
 "information can still be part of this data.  In addition to your ISP, the "
 "websites (<a href=\"http://www.google.com/privacy_faq.html\">and search "
 "engines</a>) you visit have their own logs, containing the same or more "
@@ -126,15 +130,15 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/torusers.wml:49
 msgid ""
-"<strong> They protect their communications from irresponsible "
-"corporations.</strong> All over the Internet, Tor is being recommended to "
-"people newly concerned about their privacy in the face of increasing "
-"breaches and betrayals of private data. From <a "
-"href=\"http://www.securityfocus.com/news/11048\">lost backup tapes</a>, to "
-"<a "
-"href=\"http://www.nytimes.com/2006/08/09/technology/09aol.html?ex=1312776000&amp;en=f6f61949c6da4d38&amp;ei=5090\">giving "
-"away the data to researchers</a>, your data is often not well protected by "
-"those you are supposed to trust to keep it safe."
+"<strong> They protect their communications from irresponsible corporations.</"
+"strong> All over the Internet, Tor is being recommended to people newly "
+"concerned about their privacy in the face of increasing breaches and "
+"betrayals of private data. From <a href=\"http://www.securityfocus.com/"
+"news/11048\">lost backup tapes</a>, to <a href=\"http://www.nytimes."
+"com/2006/08/09/technology/09aol.html?ex=1312776000&amp;"
+"en=f6f61949c6da4d38&amp;ei=5090\">giving away the data to researchers</a>, "
+"your data is often not well protected by those you are supposed to trust to "
+"keep it safe."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -142,13 +146,12 @@
 msgid ""
 "<strong>They protect their children online.</strong> You've told your kids "
 "they shouldn't share personally identifying information online, but they may "
-"be sharing their location simply by not concealing their IP "
-"address. Increasingly, IP addresses can be <a "
-"href=\"http://whatismyipaddress.com/\">literally mapped to a city or even "
-"street location</a>, and can <a href=\"http://whatsmyip.org/more/\">reveal "
-"other information</a> about how you are connecting to the Internet.  In the "
-"United States, the government is pushing to make this mapping increasingly "
-"precise."
+"be sharing their location simply by not concealing their IP address. "
+"Increasingly, IP addresses can be <a href=\"http://whatismyipaddress.com/"
+"\">literally mapped to a city or even street location</a>, and can <a href="
+"\"http://whatsmyip.org/more/\">reveal other information</a> about how you "
+"are connecting to the Internet.  In the United States, the government is "
+"pushing to make this mapping increasingly precise."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -156,9 +159,9 @@
 msgid ""
 "<strong>They research sensitive topics.</strong> There's a wealth of "
 "information available online. But perhaps in your country, access to "
-"information on AIDS, birth control, <a "
-"href=\"http://www.cbsnews.com/stories/2002/12/03/tech/main531567.shtml\">Tibetan "
-"culture</a>, or world religions is behind a national firewall."
+"information on AIDS, birth control, <a href=\"http://www.cbsnews.com/"
+"stories/2002/12/03/tech/main531567.shtml\">Tibetan culture</a>, or world "
+"religions is behind a national firewall."
 msgstr ""
 
 #. type: Content of: <div>
@@ -218,10 +221,10 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/torusers.wml:98
 msgid ""
-"<strong><a href=\"http://www.rsf.org/\">Reporters without "
-"Borders</a></strong> tracks Internet prisoners of conscience and jailed or "
-"harmed journalists all over the world. They advise journalists, sources, "
-"bloggers, and dissidents to use Tor to ensure their privacy and safety."
+"<strong><a href=\"http://www.rsf.org/\">Reporters without Borders</a></"
+"strong> tracks Internet prisoners of conscience and jailed or harmed "
+"journalists all over the world. They advise journalists, sources, bloggers, "
+"and dissidents to use Tor to ensure their privacy and safety."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -246,11 +249,11 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/torusers.wml:111
 msgid ""
-"<strong>Citizens and journalists in <a "
-"href=\"http://www.rsf.org/rubrique.php3?id_rubrique=554\">Internet black "
-"holes</a></strong> use Tor to research state propaganda and opposing "
-"viewpoints, to file stories with non-State controlled media, and to avoid "
-"risking the personal consequences of intellectual curiosity."
+"<strong>Citizens and journalists in <a href=\"http://www.rsf.org/rubrique."
+"php3?id_rubrique=554\">Internet black holes</a></strong> use Tor to research "
+"state propaganda and opposing viewpoints, to file stories with non-State "
+"controlled media, and to avoid risking the personal consequences of "
+"intellectual curiosity."
 msgstr ""
 
 #. type: Content of: <div>
@@ -322,26 +325,24 @@
 #: /home/runa/tor/website/en/torusers.wml:156
 msgid ""
 "When groups such as the <strong>Friends Service Committee and environmental "
-"groups are increasingly <a "
-"href=\"http://www.afsc.org/news/2005/government-spying.htm\">falling under "
-"surveillance</a> in the United States</strong> under laws meant to protect "
-"against terrorism, many peaceful agents of change rely on Tor for basic "
-"privacy during legitimate activities."
+"groups are increasingly <a href=\"http://www.afsc.org/news/2005/government-"
+"spying.htm\">falling under surveillance</a> in the United States</strong> "
+"under laws meant to protect against terrorism, many peaceful agents of "
+"change rely on Tor for basic privacy during legitimate activities."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/torusers.wml:161
 msgid ""
-"<strong><a href=\"http://hrw.org/doc/?t=internet\">Human Rights "
-"Watch</a></strong> recommends Tor in their report, &ldquo; <a "
-"href=\"http://www.hrw.org/reports/2006/china0806/\">Race to the Bottom: "
-"Corporate Complicity in Chinese Internet Censorship</a>.&rdquo; The study "
-"co-author interviewed Roger Dingledine, Tor project leader, on Tor use.  "
-"They cover Tor in the section on how to breach the <a "
-"href=\"http://www.hrw.org/reports/2006/china0806/3.htm#_Toc142395820\">&ldquo;Great "
-"Firewall of China,&rdquo;</a> and recommend that human rights workers "
-"throughout the globe use Tor for &ldquo;secure browsing and "
-"communications.&rdquo;"
+"<strong><a href=\"http://hrw.org/doc/?t=internet\">Human Rights Watch</a></"
+"strong> recommends Tor in their report, &ldquo; <a href=\"http://www.hrw.org/"
+"reports/2006/china0806/\">Race to the Bottom: Corporate Complicity in "
+"Chinese Internet Censorship</a>.&rdquo; The study co-author interviewed "
+"Roger Dingledine, Tor project leader, on Tor use.  They cover Tor in the "
+"section on how to breach the <a href=\"http://www.hrw.org/reports/2006/"
+"china0806/3.htm#_Toc142395820\">&ldquo;Great Firewall of China,&rdquo;</a> "
+"and recommend that human rights workers throughout the globe use Tor for "
+"&ldquo;secure browsing and communications.&rdquo;"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -349,9 +350,9 @@
 msgid ""
 "Tor has consulted with and volunteered help to <strong>Amnesty "
 "International's recent <a href=\"http://irrepressible.info/\">corporate "
-"responsibility campaign</a></strong>.  See also their <a "
-"href=\"http://irrepressible.info/static/pdf/FOE-in-china-2006-lores.pdf\">full "
-"report</a> on China Internet issues."
+"responsibility campaign</a></strong>.  See also their <a href=\"http://"
+"irrepressible.info/static/pdf/FOE-in-china-2006-lores.pdf\">full report</a> "
+"on China Internet issues."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -359,8 +360,8 @@
 msgid ""
 "<a href=\"http://www.globalvoicesonline.org\">Global Voices</a> recommends "
 "Tor, especially for <strong>anonymous blogging</strong>, throughout their <a "
-"href=\"http://advocacy.globalvoicesonline.org/projects/guide/\"> web "
-"site.</a>"
+"href=\"http://advocacy.globalvoicesonline.org/projects/guide/\"> web site.</"
+"a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -391,8 +392,8 @@
 "At a recent conference, a Tor staffer ran into a woman who came from a "
 "&ldquo;company town&rdquo; in the eastern United States. She was attempting "
 "to blog anonymously to rally local residents to <strong>urge reform in the "
-"company</strong> that dominated the town's economic and government "
-"affairs. She is fully cognizant that the kind of organizing she was doing "
+"company</strong> that dominated the town's economic and government affairs. "
+"She is fully cognizant that the kind of organizing she was doing "
 "<strong>could lead to harm or &ldquo;fatal accidents.&rdquo;</strong>"
 msgstr ""
 
@@ -408,10 +409,9 @@
 #: /home/runa/tor/website/en/torusers.wml:205
 msgid ""
 "Tor can help activists avoid government or corporate censorship that hinders "
-"organization.  In one such case, a <a "
-"href=\"http://www.cbc.ca/story/canada/national/2005/07/24/telus-sites050724.html\">Canadian "
-"ISP blocked access to a union website used by their own employees</a> to "
-"help organize a strike."
+"organization.  In one such case, a <a href=\"http://www.cbc.ca/story/canada/"
+"national/2005/07/24/telus-sites050724.html\">Canadian ISP blocked access to "
+"a union website used by their own employees</a> to help organize a strike."
 msgstr ""
 
 #. type: Content of: <div>
@@ -467,7 +467,8 @@
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/torusers.wml:244
-msgid "<a class=\"anchor\" href=\"#executives\">Business executives use Tor</a>"
+msgid ""
+"<a class=\"anchor\" href=\"#executives\">Business executives use Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -529,11 +530,11 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/torusers.wml:284
 msgid ""
-"Frequently we hear about bloggers who are <a "
-"href=\"http://online.wsj.com/public/article/SB112541909221726743-Kl4kLxv0wSbjqrkXg_DieY3c8lg_20050930.html\">sued</a> "
-"or <a "
-"href=\"http://www.usatoday.com/money/workplace/2005-06-14-worker-blogs-usat_x.htm\">fired</a> "
-"for saying perfectly legal things online, in their blog."
+"Frequently we hear about bloggers who are <a href=\"http://online.wsj.com/"
+"public/article/SB112541909221726743-Kl4kLxv0wSbjqrkXg_DieY3c8lg_20050930.html"
+"\">sued</a> or <a href=\"http://www.usatoday.com/money/workplace/2005-06-14-"
+"worker-blogs-usat_x.htm\">fired</a> for saying perfectly legal things "
+"online, in their blog."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -546,9 +547,8 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/torusers.wml:289
 msgid ""
-"Global Voices maintains a <a "
-"href=\"http://advocacy.globalvoicesonline.org/projects/guide/\">guide to "
-"anonymous blogging with Wordpress and Tor</a>."
+"Global Voices maintains a <a href=\"http://advocacy.globalvoicesonline.org/"
+"projects/guide/\">guide to anonymous blogging with Wordpress and Tor</a>."
 msgstr ""
 
 #. type: Content of: <div>
@@ -558,7 +558,8 @@
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/torusers.wml:293
-msgid "<a class=\"anchor\" href=\"#itprofessionals\">IT Professionals use Tor</a>"
+msgid ""
+"<a class=\"anchor\" href=\"#itprofessionals\">IT Professionals use Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -622,30 +623,31 @@
 msgid ""
 "Like any technology, from pencils to cellphones, anonymity can be used for "
 "both good and bad.  You have probably seen some of the vigorous debate (<a "
-"href=\"http://www.wired.com/politics/security/commentary/securitymatters/2006/01/70000\">pro</a>, "
-"<a href=\"http://www.edge.org/q2006/q06_4.html#kelly\">con</a>, and <a "
-"href=\"http://web.mit.edu/gtmarx/www/anon.html\">academic</a>) over "
-"anonymity. The Tor project is based on the belief that anonymity is not just "
-"a good idea some of the time - it is a requirement for a free and "
-"functioning society.  The <a "
-"href=\"http://www.eff.org/issues/anonymity\">EFF maintains a good "
-"overview</a> of how anonymity was crucial to the founding of the United "
-"States.  Anonymity is recognized by US courts as a fundamental and important "
-"right. In fact, governments mandate anonymity in many cases themselves: <a "
-"href=\"https://www.crimeline.co.za/default.asp\">police tip lines</a>, <a "
-"href=\"http://www.texasbar.com/Content/ContentGroups/Public_Information1/Legal_Resources_Consumer_Information/Family_Law1/Adoption_Options.htm#sect2\">adoption "
-"services</a>, <a "
-"href=\"http://writ.news.findlaw.com/aronson/20020827.html\">police officer "
-"identities</a>, and so forth. It would be impossible to rehash the entire "
-"anonymity debate here - it is too large an issue with too many nuances, and "
-"there are plenty of other places where this information can be found. We do "
-"have a <a href=\"<page faq-abuse>\">Tor abuse</a> page describing some of "
-"the possible abuse cases for Tor, but suffice it to say that if you want to "
-"abuse the system, you'll either find it mostly closed for your purposes "
-"(e.g. the majority of Tor relays do not support SMTP in order to prevent "
-"anonymous email spamming), or if you're one of the <a "
-"href=\"http://www.schneier.com/blog/archives/2005/12/computer_crime_1.html\">Four "
-"Horsemen of the Information Apocalypse</a>, you have better options than "
-"Tor. While not dismissing the potential abuses of Tor, this page shows a few "
-"of the many important ways anonymity is used online today."
+"href=\"http://www.wired.com/politics/security/commentary/"
+"securitymatters/2006/01/70000\">pro</a>, <a href=\"http://www.edge.org/q2006/"
+"q06_4.html#kelly\">con</a>, and <a href=\"http://web.mit.edu/gtmarx/www/anon."
+"html\">academic</a>) over anonymity. The Tor project is based on the belief "
+"that anonymity is not just a good idea some of the time - it is a "
+"requirement for a free and functioning society.  The <a href=\"http://www."
+"eff.org/issues/anonymity\">EFF maintains a good overview</a> of how "
+"anonymity was crucial to the founding of the United States.  Anonymity is "
+"recognized by US courts as a fundamental and important right. In fact, "
+"governments mandate anonymity in many cases themselves: <a href=\"https://"
+"www.crimeline.co.za/default.asp\">police tip lines</a>, <a href=\"http://www."
+"texasbar.com/Content/ContentGroups/Public_Information1/"
+"Legal_Resources_Consumer_Information/Family_Law1/Adoption_Options.htm#sect2"
+"\">adoption services</a>, <a href=\"http://writ.news.findlaw.com/"
+"aronson/20020827.html\">police officer identities</a>, and so forth. It "
+"would be impossible to rehash the entire anonymity debate here - it is too "
+"large an issue with too many nuances, and there are plenty of other places "
+"where this information can be found. We do have a <a href=\"<page faq-abuse>"
+"\">Tor abuse</a> page describing some of the possible abuse cases for Tor, "
+"but suffice it to say that if you want to abuse the system, you'll either "
+"find it mostly closed for your purposes (e.g. the majority of Tor relays do "
+"not support SMTP in order to prevent anonymous email spamming), or if you're "
+"one of the <a href=\"http://www.schneier.com/blog/archives/2005/12/"
+"computer_crime_1.html\">Four Horsemen of the Information Apocalypse</a>, you "
+"have better options than Tor. While not dismissing the potential abuses of "
+"Tor, this page shows a few of the many important ways anonymity is used "
+"online today."
 msgstr ""

Modified: translation/trunk/projects/website/templates/2-medium.verifying-signatures.pot
===================================================================
--- translation/trunk/projects/website/templates/2-medium.verifying-signatures.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/2-medium.verifying-signatures.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/verifying-signatures.wml:9
@@ -21,7 +21,8 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/verifying-signatures.wml:10 /tmp/SUZshDQgUn.xml:33 /tmp/SUZshDQgUn.xml:45 /tmp/SUZshDQgUn.xml:92
+#: /home/runa/tor/website/en/verifying-signatures.wml:10
+#: /tmp/hKubeOaOvj.xml:33 /tmp/hKubeOaOvj.xml:45 /tmp/hKubeOaOvj.xml:92
 msgid "<hr />"
 msgstr ""
 
@@ -29,9 +30,9 @@
 #: /home/runa/tor/website/en/verifying-signatures.wml:12
 msgid ""
 "Each file on <a href=\"<page download>\">our download page</a> is "
-"accompanied by a file with the same name as the package and the extension "
-"\".asc\".  For example, the current Installation Bundle for Windows: "
-"<package-win32-bundle-stable-sig>."
+"accompanied by a file with the same name as the package and the extension \"."
+"asc\".  For example, the current Installation Bundle for Windows: <package-"
+"win32-bundle-stable-sig>."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -203,10 +204,8 @@
 "gpg: Good signature from \"Roger Dingledine &lt;arma at mit.edu&gt;\"\n"
 "gpg:                 aka \"Roger Dingledine &lt;arma at mit.edu&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"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -217,9 +216,9 @@
 "signature.  It's up to the user to decide if that key really belongs to the "
 "developers. The best method is to meet them in person and exchange gpg "
 "fingerprints. Keys can also be signed. If you look up Roger or Nick's keys, "
-"other people have essentially said \"we have verified this is "
-"Roger/Nick\". So if you trust that third party, then you have a level of "
-"trust for that arma/nick."
+"other people have essentially said \"we have verified this is Roger/Nick\". "
+"So if you trust that third party, then you have a level of trust for that "
+"arma/nick."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -253,6 +252,6 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/verifying-signatures.wml:131
 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>."
+"If you are running Tor on Debian you should read the instructions on <a href="
+"\"<page docs/debian>#packages\">importing these keys to apt</a>."
 msgstr ""

Modified: translation/trunk/projects/website/templates/3-low.contact.pot
===================================================================
--- translation/trunk/projects/website/templates/3-low.contact.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/3-low.contact.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/contact.wml:9
@@ -45,17 +45,17 @@
 msgid ""
 "If you really do need to reach us, here are some approaches. All of these "
 "addresses are @torproject.org. Note that in practice most of them go to the "
-"same small group of people, so please be patient and <a "
-"href=\"http://www.catb.org/~esr/faqs/smart-questions.html\">helpful</a>, and "
-"please make sure to write your mail in English."
+"same small group of people, so please be patient and <a href=\"http://www."
+"catb.org/~esr/faqs/smart-questions.html\">helpful</a>, and please make sure "
+"to write your mail in English."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/contact.wml:32
 msgid ""
-"<tt>tor-ops</tt> gets to the people who manage the directory "
-"authorities. Use this if you run a Tor relay and have a question or problem "
-"with your relay."
+"<tt>tor-ops</tt> gets to the people who manage the directory authorities. "
+"Use this if you run a Tor relay and have a question or problem with your "
+"relay."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -63,8 +63,8 @@
 msgid ""
 "<tt>tor-webmaster</tt> can fix typos on the website, change wrong statements "
 "or directions on the website, and add new sections and paragraphs that you "
-"send us. You might want to make a draft of your new sections on <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter\">the Tor wiki</a> "
+"send us. You might want to make a draft of your new sections on <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter\">the Tor wiki</a> "
 "first."
 msgstr ""
 
@@ -99,8 +99,8 @@
 #: /home/runa/tor/website/en/contact.wml:52
 msgid ""
 "<tt>donations</tt> is for questions and comments about <a href=\"<page "
-"donate>\">getting money to the developers</a>. More donations means <a "
-"href=\"<page faq>#Funding\">more Tor</a>. We're happy to help think about "
+"donate>\">getting money to the developers</a>. More donations means <a href="
+"\"<page faq>#Funding\">more Tor</a>. We're happy to help think about "
 "creative ways for you to contribute."
 msgstr ""
 

Modified: translation/trunk/projects/website/templates/3-low.download-unix.pot
===================================================================
--- translation/trunk/projects/website/templates/3-low.download-unix.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/3-low.download-unix.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/download-unix.wml:9
@@ -26,9 +26,8 @@
 "Warning: Want Tor to really work? ...then please don't just install it and "
 "go on. You need to change some of your habits, and reconfigure your "
 "software! Tor by itself is NOT all you need to maintain your anonymity.  "
-"Please take time to read the <a href=\"<page "
-"download-unix>#Warning\">warning</a> to familiarize yourself with the "
-"pitfalls and limits of Tor."
+"Please take time to read the <a href=\"<page download-unix>#Warning"
+"\">warning</a> to familiarize yourself with the pitfalls and limits of Tor."
 msgstr ""
 
 #. type: Content of: <div><table><thead><tr><th>
@@ -54,9 +53,9 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:30
 msgid ""
-"<img src=\"images/distros/debian.png\" alt=\"Debian\" /> <img "
-"src=\"images/distros/ubuntu.png\" alt=\"Ubuntu\" /> <img "
-"src=\"images/distros/knoppix.png\" alt=\"Knoppix\" />"
+"<img src=\"images/distros/debian.png\" alt=\"Debian\" /> <img src=\"images/"
+"distros/ubuntu.png\" alt=\"Ubuntu\" /> <img src=\"images/distros/knoppix.png"
+"\" alt=\"Knoppix\" />"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -70,12 +69,16 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:35 /tmp/tS94sWiaRA.xml:51 /tmp/tS94sWiaRA.xml:67 /tmp/tS94sWiaRA.xml:83 /tmp/tS94sWiaRA.xml:99 /tmp/tS94sWiaRA.xml:115 /tmp/tS94sWiaRA.xml:131 /tmp/tS94sWiaRA.xml:147 /tmp/tS94sWiaRA.xml:163 /tmp/tS94sWiaRA.xml:181 /tmp/tS94sWiaRA.xml:198 /tmp/tS94sWiaRA.xml:209
+#: /home/runa/tor/website/en/download-unix.wml:35 /tmp/SJpJ8eC1Hi.xml:51
+#: /tmp/SJpJ8eC1Hi.xml:67 /tmp/SJpJ8eC1Hi.xml:83 /tmp/SJpJ8eC1Hi.xml:99
+#: /tmp/SJpJ8eC1Hi.xml:115 /tmp/SJpJ8eC1Hi.xml:131 /tmp/SJpJ8eC1Hi.xml:147
+#: /tmp/SJpJ8eC1Hi.xml:163 /tmp/SJpJ8eC1Hi.xml:181 /tmp/SJpJ8eC1Hi.xml:198
+#: /tmp/SJpJ8eC1Hi.xml:209
 msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:40 /tmp/tS94sWiaRA.xml:56
+#: /home/runa/tor/website/en/download-unix.wml:40 /tmp/SJpJ8eC1Hi.xml:56
 msgid "<img src=\"images/distros/centos.png\" alt=\"CentOS 4\" />"
 msgstr ""
 
@@ -87,17 +90,17 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:43
 msgid ""
-"<a href=\"<package-rpm4-stable>\"><version-rpm4-stable> RPM</a> (<a "
-"href=\"<package-rpm4-stable-sig>\">sig</a>/<a "
-"href=\"<package-rpm4-stable-sha1>\">sha1</a>)"
+"<a href=\"<package-rpm4-stable>\"><version-rpm4-stable> RPM</a> (<a href="
+"\"<package-rpm4-stable-sig>\">sig</a>/<a href=\"<package-rpm4-stable-sha1>"
+"\">sha1</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:47
 msgid ""
-"<a href=\"<package-rpm4-alpha>\"><version-rpm4-alpha> RPM</a> (<a "
-"href=\"<package-rpm4-alpha-sig>\">sig</a>/<a "
-"href=\"<package-rpm4-alpha-sha1>\">sha1</a>)"
+"<a href=\"<package-rpm4-alpha>\"><version-rpm4-alpha> RPM</a> (<a href="
+"\"<package-rpm4-alpha-sig>\">sig</a>/<a href=\"<package-rpm4-alpha-sha1>"
+"\">sha1</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -108,21 +111,21 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:59
 msgid ""
-"<a href=\"<package-srpm4-stable>\"><version-rpm4-stable> SRPM</a> (<a "
-"href=\"<package-srpm4-stable-sig>\">sig</a>/<a "
-"href=\"<package-srpm4-stable-sha1>\">sha1</a>)"
+"<a href=\"<package-srpm4-stable>\"><version-rpm4-stable> SRPM</a> (<a href="
+"\"<package-srpm4-stable-sig>\">sig</a>/<a href=\"<package-srpm4-stable-sha1>"
+"\">sha1</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:63
 msgid ""
-"<a href=\"<package-srpm4-alpha>\"><version-rpm4-alpha> SRPM</a> (<a "
-"href=\"<package-srpm4-alpha-sig>\">sig</a>/<a "
-"href=\"<package-srpm4-alpha-sha1>\">sha1</a>)"
+"<a href=\"<package-srpm4-alpha>\"><version-rpm4-alpha> SRPM</a> (<a href="
+"\"<package-srpm4-alpha-sig>\">sig</a>/<a href=\"<package-srpm4-alpha-sha1>"
+"\">sha1</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:72 /tmp/tS94sWiaRA.xml:88
+#: /home/runa/tor/website/en/download-unix.wml:72 /tmp/SJpJ8eC1Hi.xml:88
 msgid "<img src=\"images/distros/centos.png\" alt=\"CentOS 5\" />"
 msgstr ""
 
@@ -134,17 +137,17 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:75
 msgid ""
-"<a href=\"<package-rpm5-stable>\"><version-rpm5-stable> RPM</a> (<a "
-"href=\"<package-rpm5-stable-sig>\">sig</a>/<a "
-"href=\"<package-rpm5-stable-sha1>\">sha1</a>)"
+"<a href=\"<package-rpm5-stable>\"><version-rpm5-stable> RPM</a> (<a href="
+"\"<package-rpm5-stable-sig>\">sig</a>/<a href=\"<package-rpm5-stable-sha1>"
+"\">sha1</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:79
 msgid ""
-"<a href=\"<package-rpm5-alpha>\"><version-rpm5-alpha> RPM</a> (<a "
-"href=\"<package-rpm5-alpha-sig>\">sig</a>/<a "
-"href=\"<package-rpm5-alpha-sha1>\">sha1</a>)"
+"<a href=\"<package-rpm5-alpha>\"><version-rpm5-alpha> RPM</a> (<a href="
+"\"<package-rpm5-alpha-sig>\">sig</a>/<a href=\"<package-rpm5-alpha-sha1>"
+"\">sha1</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -155,21 +158,21 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:91
 msgid ""
-"<a href=\"<package-srpm5-stable>\"><version-rpm5-stable> SRPM</a> (<a "
-"href=\"<package-srpm5-stable-sig>\">sig</a>/<a "
-"href=\"<package-srpm5-stable-sha1>\">sha1</a>)"
+"<a href=\"<package-srpm5-stable>\"><version-rpm5-stable> SRPM</a> (<a href="
+"\"<package-srpm5-stable-sig>\">sig</a>/<a href=\"<package-srpm5-stable-sha1>"
+"\">sha1</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:95
 msgid ""
-"<a href=\"<package-srpm5-alpha>\"><version-rpm5-alpha> SRPM</a> (<a "
-"href=\"<package-srpm5-alpha-sig>\">sig</a>/<a "
-"href=\"<package-srpm5-alpha-sha1>\">sha1</a>)"
+"<a href=\"<package-srpm5-alpha>\"><version-rpm5-alpha> SRPM</a> (<a href="
+"\"<package-srpm5-alpha-sig>\">sig</a>/<a href=\"<package-srpm5-alpha-sha1>"
+"\">sha1</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:104 /tmp/tS94sWiaRA.xml:120
+#: /home/runa/tor/website/en/download-unix.wml:104 /tmp/SJpJ8eC1Hi.xml:120
 msgid "<img src=\"images/distros/fedora.png\" alt=\"Fedora Core 10\" />"
 msgstr ""
 
@@ -181,17 +184,17 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:107
 msgid ""
-"<a href=\"<package-rpmfc-stable>\"><version-rpmfc-stable> RPM</a> (<a "
-"href=\"<package-rpmfc-stable-sig>\">sig</a>/<a "
-"href=\"<package-rpmfc-stable-sha1>\">sha1</a>)"
+"<a href=\"<package-rpmfc-stable>\"><version-rpmfc-stable> RPM</a> (<a href="
+"\"<package-rpmfc-stable-sig>\">sig</a>/<a href=\"<package-rpmfc-stable-sha1>"
+"\">sha1</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:111
 msgid ""
-"<a href=\"<package-rpmfc-alpha>\"><version-rpmfc-alpha> RPM</a> (<a "
-"href=\"<package-rpmfc-alpha-sig>\">sig</a>/<a "
-"href=\"<package-rpmfc-alpha-sha1>\">sha1</a>)"
+"<a href=\"<package-rpmfc-alpha>\"><version-rpmfc-alpha> RPM</a> (<a href="
+"\"<package-rpmfc-alpha-sig>\">sig</a>/<a href=\"<package-rpmfc-alpha-sha1>"
+"\">sha1</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -202,21 +205,21 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:123
 msgid ""
-"<a href=\"<package-srpmfc-stable>\"><version-rpmfc-stable> SRPM</a> (<a "
-"href=\"<package-srpmfc-stable-sig>\">sig</a>/<a "
-"href=\"<package-srpmfc-stable-sha1>\">sha1</a>)"
+"<a href=\"<package-srpmfc-stable>\"><version-rpmfc-stable> SRPM</a> (<a href="
+"\"<package-srpmfc-stable-sig>\">sig</a>/<a href=\"<package-srpmfc-stable-"
+"sha1>\">sha1</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:127
 msgid ""
-"<a href=\"<package-srpmfc-alpha>\"><version-rpmfc-alpha> SRPM</a> (<a "
-"href=\"<package-srpmfc-alpha-sig>\">sig</a>/<a "
-"href=\"<package-srpmfc-alpha-sha1>\">sha1</a>)"
+"<a href=\"<package-srpmfc-alpha>\"><version-rpmfc-alpha> SRPM</a> (<a href="
+"\"<package-srpmfc-alpha-sig>\">sig</a>/<a href=\"<package-srpmfc-alpha-sha1>"
+"\">sha1</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download-unix.wml:136 /tmp/tS94sWiaRA.xml:152
+#: /home/runa/tor/website/en/download-unix.wml:136 /tmp/SJpJ8eC1Hi.xml:152
 msgid "<img src=\"images/distros/suse.png\" alt=\"openSUSE 11\" />"
 msgstr ""
 
@@ -229,16 +232,16 @@
 #: /home/runa/tor/website/en/download-unix.wml:139
 msgid ""
 "<a href=\"<package-rpmsuse-stable>\"><version-rpmsuse-stable> RPM</a> (<a "
-"href=\"<package-rpmsuse-stable-sig>\">sig</a>/<a "
-"href=\"<package-rpmsuse-stable-sha1>\">sha1</a>)"
+"href=\"<package-rpmsuse-stable-sig>\">sig</a>/<a href=\"<package-rpmsuse-"
+"stable-sha1>\">sha1</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:143
 msgid ""
-"<a href=\"<package-rpmsuse-alpha>\"><version-rpmsuse-alpha> RPM</a> (<a "
-"href=\"<package-rpmsuse-alpha-sig>\">sig</a>/<a "
-"href=\"<package-rpmsuse-alpha-sha1>\">sha1</a>)"
+"<a href=\"<package-rpmsuse-alpha>\"><version-rpmsuse-alpha> RPM</a> (<a href="
+"\"<package-rpmsuse-alpha-sig>\">sig</a>/<a href=\"<package-rpmsuse-alpha-"
+"sha1>\">sha1</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -250,16 +253,16 @@
 #: /home/runa/tor/website/en/download-unix.wml:155
 msgid ""
 "<a href=\"<package-srpmsuse-stable>\"><version-rpmsuse-stable> SRPM</a> (<a "
-"href=\"<package-srpmsuse-stable-sig>\">sig</a>/<a "
-"href=\"<package-srpmsuse-stable-sha1>\">sha1</a>)"
+"href=\"<package-srpmsuse-stable-sig>\">sig</a>/<a href=\"<package-srpmsuse-"
+"stable-sha1>\">sha1</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:159
 msgid ""
 "<a href=\"<package-srpmsuse-alpha>\"><version-rpmsuse-alpha> SRPM</a> (<a "
-"href=\"<package-srpmsuse-alpha-sig>\">sig</a>/<a "
-"href=\"<package-srpmsuse-alpha-sha1>\">sha1</a>)"
+"href=\"<package-srpmsuse-alpha-sig>\">sig</a>/<a href=\"<package-srpmsuse-"
+"alpha-sha1>\">sha1</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -280,8 +283,8 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:172
 msgid ""
-"<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a><br /> <a "
-"href=\"http://gentoo-wiki.com/HOWTO_Anonymity_with_Tor_and_Privoxy\">Gentoo-wiki "
+"<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a><br /> <a href="
+"\"http://gentoo-wiki.com/HOWTO_Anonymity_with_Tor_and_Privoxy\">Gentoo-wiki "
 "guide</a>"
 msgstr ""
 
@@ -312,15 +315,16 @@
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:187
-msgid "<kbd>cd /usr/ports/net/tor &amp;&amp; make &amp;&amp; make install</kbd>"
+msgid ""
+"<kbd>cd /usr/ports/net/tor &amp;&amp; make &amp;&amp; make install</kbd>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:189
 msgid ""
-"<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a><br /> <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/OpenbsdChrootedTor\">Guide "
-"to chrooting Tor in OpenBSD</a>"
+"<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a><br /> <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/OpenbsdChrootedTor"
+"\">Guide to chrooting Tor in OpenBSD</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -368,15 +372,15 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/download-unix.wml:216
 msgid ""
-"<a href=\"<package-source-stable>\"><version-stable></a> (<a "
-"href=\"<package-source-stable-sig>\">sig</a>)"
+"<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:220
 msgid ""
-"<a href=\"<package-source-alpha>\"><version-alpha></a> (<a "
-"href=\"<package-source-alpha-sig>\">sig</a>)"
+"<a href=\"<package-source-alpha>\"><version-alpha></a> (<a href=\"<package-"
+"source-alpha-sig>\">sig</a>)"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -409,8 +413,8 @@
 "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 "
 "versions listed above, there is a much higher chance of serious reliability "
-"and security bugs in these downloads.  Please be prepared to <a "
-"href=\"https://bugs.torproject.org/\">report bugs</a>."
+"and security bugs in these downloads.  Please be prepared to <a href="
+"\"https://bugs.torproject.org/\">report bugs</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -436,17 +440,17 @@
 msgid ""
 "To keep informed of security advisories and new stable releases, subscribe "
 "to the <a href=\"http://archives.seul.org/or/announce/\">or-announce mailing "
-"list</a> (you will be asked to confirm via email). You can also <a "
-"href=\"http://rss.gmane.org/gmane.network.onion-routing.announce\">watch the "
+"list</a> (you will be asked to confirm via email). You can also <a href="
+"\"http://rss.gmane.org/gmane.network.onion-routing.announce\">watch the "
 "list's RSS feed</a>."
 msgstr ""
 
 #. type: Content of: <div><div><form>
 #: /home/runa/tor/website/en/download-unix.wml:271
 msgid ""
-"<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input "
-"type=\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" "
-"name=\"host\" value=\"freehaven.net\"/> <input name=\"email\" size=\"15\"/> "
+"<input type=\"hidden\" name=\"mlist\" value=\"or-announce\"/> <input type="
+"\"hidden\" name=\"subscribe\" value=\"1\"/> <input type=\"hidden\" name="
+"\"host\" value=\"freehaven.net\"/> <input name=\"email\" size=\"15\"/> "
 "<input type=\"submit\" value=\"subscribe to or-announce\"/>"
 msgstr ""
 
@@ -457,7 +461,8 @@
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/en/download-unix.wml:282
-msgid "<a class=\"anchor\" href=\"#Warning\">Warning: Want Tor to really work?</a>"
+msgid ""
+"<a class=\"anchor\" href=\"#Warning\">Warning: Want Tor to really work?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -474,27 +479,25 @@
 msgid ""
 "Tor only protects Internet applications that are configured to send their "
 "traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
-"just because you install it.  We recommend you use <a "
-"href=\"http://www.mozilla.org/firefox\">Firefox</a> with the <a "
-"href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton</a> extension."
+"just because you install it.  We recommend you use <a href=\"http://www."
+"mozilla.org/firefox\">Firefox</a> with the <a href=\"https://addons.mozilla."
+"org/firefox/2275/\">Torbutton</a> extension."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
 #: /home/runa/tor/website/en/download-unix.wml:302
 msgid ""
 "Browser plugins such as Java, Flash, ActiveX, RealPlayer, Quicktime, Adobe's "
-"PDF plugin, and others can be manipulated into revealing your IP "
-"address. You should probably <a "
-"href=\"http://plugindoc.mozdev.org/faqs/uninstall.html\">uninstall your "
-"plugins</a> (go to \"about:plugins\" to see what is installed), or "
-"investigate <a "
-"href=\"https://addons.mozilla.org/firefox/1237/\">QuickJava</a>, <a "
-"href=\"https://addons.mozilla.org/firefox/433/\">FlashBlock</a>, and <a "
-"href=\"http://noscript.net/\">NoScript</a> if you really need them. Consider "
-"removing extensions that look up more information about the websites you "
-"type in (like Google toolbar), as they may bypass Tor and/or broadcast "
-"sensitive information. Some people prefer using two browsers (one for Tor, "
-"one for unsafe browsing)."
+"PDF plugin, and others can be manipulated into revealing your IP address. "
+"You should probably <a href=\"http://plugindoc.mozdev.org/faqs/uninstall.html"
+"\">uninstall your plugins</a> (go to \"about:plugins\" to see what is "
+"installed), or investigate <a href=\"https://addons.mozilla.org/firefox/1237/"
+"\">QuickJava</a>, <a href=\"https://addons.mozilla.org/firefox/433/"
+"\">FlashBlock</a>, and <a href=\"http://noscript.net/\">NoScript</a> if you "
+"really need them. Consider removing extensions that look up more information "
+"about the websites you type in (like Google toolbar), as they may bypass Tor "
+"and/or broadcast sensitive information. Some people prefer using two "
+"browsers (one for Tor, one for unsafe browsing)."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
@@ -502,21 +505,21 @@
 msgid ""
 "Beware of cookies: if you ever browse without Tor and Privoxy and a site "
 "gives you a cookie, that cookie could identify you even when you start using "
-"Tor again. You should clear your cookies frequently. <a "
-"href=\"https://addons.mozilla.org/firefox/82/\">CookieCuller</a> can help "
-"protect any cookies you do not want to lose."
+"Tor again. You should clear your cookies frequently. <a href=\"https://"
+"addons.mozilla.org/firefox/82/\">CookieCuller</a> can help protect any "
+"cookies you do not want to lose."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
 #: /home/runa/tor/website/en/download-unix.wml:326
 msgid ""
 "Tor anonymizes the origin of your traffic, and it encrypts everything inside "
-"the Tor network, but <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers\">it "
-"can't encrypt your traffic between the Tor network and its final "
-"destination.</a> If you are communicating sensitive information, you should "
-"use as much care as you would on the normal scary Internet &mdash; use HTTPS "
-"or other end-to-end encryption and authentication."
+"the Tor network, but <a href=\"https://wiki.torproject.org/noreply/"
+"TheOnionRouter/TorFAQ#ExitEavesdroppers\">it can't encrypt your traffic "
+"between the Tor network and its final destination.</a> If you are "
+"communicating sensitive information, you should use as much care as you "
+"would on the normal scary Internet &mdash; use HTTPS or other end-to-end "
+"encryption and authentication."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
@@ -552,18 +555,18 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/en/download-unix.wml:363
 msgid ""
-"See the <a href=\"<page documentation>#Developers\">developer "
-"documentation</a> for instructions on fetching Tor from Git to get the very "
-"latest development version source code.  You can also download the <a "
-"href=\"dist/\">Privoxy source</a> or <a "
-"href=\"dist/vidalia-bundles/?C=M;O=D\">Vidalia source</a>."
+"See the <a href=\"<page documentation>#Developers\">developer documentation</"
+"a> for instructions on fetching Tor from Git to get the very latest "
+"development version source code.  You can also download the <a href=\"dist/"
+"\">Privoxy source</a> or <a href=\"dist/vidalia-bundles/?C=M;O=D\">Vidalia "
+"source</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/en/download-unix.wml:374
 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>."
+"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>
@@ -574,8 +577,8 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/en/download-unix.wml:382
 msgid ""
-"For a list of what has changed in each stable Tor release, see the <a "
-"href=\"<svnsandbox>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in "
-"both stable and development versions, see the <a "
-"href=\"<svnsandbox>ChangeLog\">ChangeLog</a>."
+"For a list of what has changed in each stable Tor release, see the <a href="
+"\"<svnsandbox>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in both "
+"stable and development versions, see the <a href=\"<svnsandbox>ChangeLog"
+"\">ChangeLog</a>."
 msgstr ""

Modified: translation/trunk/projects/website/templates/3-low.faq-abuse.pot
===================================================================
--- translation/trunk/projects/website/templates/3-low.faq-abuse.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/3-low.faq-abuse.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/faq-abuse.wml:11
@@ -129,11 +129,11 @@
 "Some advocates of anonymity explain that it's just a tradeoff &mdash; "
 "accepting the bad uses for the good ones &mdash; but there's more to it than "
 "that.  Criminals and other bad people have the motivation to learn how to "
-"get good anonymity, and many have the motivation to pay well to achieve "
-"it. Being able to steal and reuse the identities of innocent victims "
-"(identify theft) makes it even easier. Normal people, on the other hand, "
-"don't have the time or money to spend figuring out how to get privacy "
-"online. This is the worst of all possible worlds."
+"get good anonymity, and many have the motivation to pay well to achieve it. "
+"Being able to steal and reuse the identities of innocent victims (identify "
+"theft) makes it even easier. Normal people, on the other hand, don't have "
+"the time or money to spend figuring out how to get privacy online. This is "
+"the worst of all possible worlds."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -147,11 +147,11 @@
 msgstr ""
 
 #
+#
 #. <a id="Pervasive">
 #. </a>
 #. <h3><a class="anchor" href="#Pervasive">If the whole world starts using
 #. Tor, won't civilization collapse?</a></h3>
-#
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/faq-abuse.wml:67
 msgid "<a id=\"DDoS\"></a>"
@@ -168,10 +168,9 @@
 #: /home/runa/tor/website/en/faq-abuse.wml:70
 msgid ""
 "Distributed denial of service (DDoS) attacks typically rely on having a "
-"group of thousands of computers all sending floods of traffic to a "
-"victim. Since the goal is to overpower the bandwidth of the victim, they "
-"typically send UDP packets since those don't require handshakes or "
-"coordination."
+"group of thousands of computers all sending floods of traffic to a victim. "
+"Since the goal is to overpower the bandwidth of the victim, they typically "
+"send UDP packets since those don't require handshakes or coordination."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -194,7 +193,8 @@
 
 #. type: Content of: <div><h3>
 #: /home/runa/tor/website/en/faq-abuse.wml:85
-msgid "<a class=\"anchor\" href=\"#WhatAboutSpammers\">What about spammers?</a>"
+msgid ""
+"<a class=\"anchor\" href=\"#WhatAboutSpammers\">What about spammers?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -236,8 +236,7 @@
 #. type: Content of: <div><h3>
 #: /home/runa/tor/website/en/faq-abuse.wml:110
 msgid ""
-"<a class=\"anchor\" href=\"#ExitPolicies\">How do Tor exit policies "
-"work?</a>"
+"<a class=\"anchor\" href=\"#ExitPolicies\">How do Tor exit policies work?</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -332,9 +331,9 @@
 msgid ""
 "You might also find that your Tor relay's IP is blocked from accessing some "
 "Internet sites/services. This might happen regardless of your exit policy, "
-"because some groups don't seem to know or care that Tor has exit "
-"policies. (If you have a spare IP not used for other activities, you might "
-"consider running your Tor relay on it.) For example,"
+"because some groups don't seem to know or care that Tor has exit policies. "
+"(If you have a spare IP not used for other activities, you might consider "
+"running your Tor relay on it.) For example,"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -425,8 +424,8 @@
 "quite a few people use Tor to IRC in privacy in order to carry on legitimate "
 "communications without tying them to their real-world identity. Each IRC "
 "network needs to decide for itself if blocking a few more of the millions of "
-"IPs that bad people can use is worth losing the contributions from the "
-"well-behaved Tor users."
+"IPs that bad people can use is worth losing the contributions from the well-"
+"behaved Tor users."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -445,9 +444,9 @@
 #: /home/runa/tor/website/en/faq-abuse.wml:231
 msgid ""
 "Finally, if you become aware of an IRC network that seems to be blocking "
-"Tor, or a single Tor exit node, please put that information on <a "
-"href=\"https://wiki.torproject.org/wiki/TheOnionRouter/BlockingIrc\">The Tor "
-"IRC block tracker</a> so that others can share.  At least one IRC network "
+"Tor, or a single Tor exit node, please put that information on <a href="
+"\"https://wiki.torproject.org/wiki/TheOnionRouter/BlockingIrc\">The Tor IRC "
+"block tracker</a> so that others can share.  At least one IRC network "
 "consults that page to unblock exit nodes that have been blocked "
 "inadvertently."
 msgstr ""
@@ -467,11 +466,10 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq-abuse.wml:241
 msgid ""
-"Even though <a href=\"#WhatAboutSpammers\">Tor isn't useful for "
-"spamming</a>, some over-zealous blacklisters seem to think that all open "
-"networks like Tor are evil &mdash; they attempt to strong-arm network "
-"administrators on policy, service, and routing issues, and then extract "
-"ransoms from victims."
+"Even though <a href=\"#WhatAboutSpammers\">Tor isn't useful for spamming</"
+"a>, some over-zealous blacklisters seem to think that all open networks like "
+"Tor are evil &mdash; they attempt to strong-arm network administrators on "
+"policy, service, and routing issues, and then extract ransoms from victims."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -530,15 +528,15 @@
 #: /home/runa/tor/website/en/faq-abuse.wml:276
 msgid ""
 "Second, consider that hundreds of thousands of people use Tor every day "
-"simply for good data hygiene &mdash; for example, to protect against "
-"data-gathering advertising companies while going about their normal "
-"activities. Others use Tor because it's their only way to get past "
-"restrictive local firewalls. Some Tor users may be legitimately connecting "
-"to your service right now to carry on normal activities. You need to decide "
-"whether banning the Tor network is worth losing the contributions of these "
-"users, as well as potential future legitimate users. (Often people don't "
-"have a good measure of how many polite Tor users are connecting to their "
-"service &mdash; you never notice them until there's an impolite one.)"
+"simply for good data hygiene &mdash; for example, to protect against data-"
+"gathering advertising companies while going about their normal activities. "
+"Others use Tor because it's their only way to get past restrictive local "
+"firewalls. Some Tor users may be legitimately connecting to your service "
+"right now to carry on normal activities. You need to decide whether banning "
+"the Tor network is worth losing the contributions of these users, as well as "
+"potential future legitimate users. (Often people don't have a good measure "
+"of how many polite Tor users are connecting to their service &mdash; you "
+"never notice them until there's an impolite one.)"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -564,10 +562,9 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/faq-abuse.wml:302
 msgid ""
-"If you really want to do this, we provide a <a "
-"href=\"https://check.torproject.org/cgi-bin/TorBulkExitList.py\">Tor exit "
-"relay list</a> or a <a href=\"<page tordnsel/index>\">DNS-based list you can "
-"query</a>."
+"If you really want to do this, we provide a <a href=\"https://check."
+"torproject.org/cgi-bin/TorBulkExitList.py\">Tor exit relay list</a> or a <a "
+"href=\"<page tordnsel/index>\">DNS-based list you can query</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -607,9 +604,9 @@
 "it technically weakens the system too far. Having a central way to link "
 "users to their activities is a gaping hole for all sorts of attackers; and "
 "the policy mechanisms needed to ensure correct handling of this "
-"responsibility are enormous and unsolved. Second, the bad people <a "
-"href=\"#WhatAboutCriminals\">aren't going to get caught by this anyway</a>, "
-"since they will use other means to ensure their anonymity (identity theft, "
+"responsibility are enormous and unsolved. Second, the bad people <a href="
+"\"#WhatAboutCriminals\">aren't going to get caught by this anyway</a>, since "
+"they will use other means to ensure their anonymity (identity theft, "
 "compromising computers and using them as bounce points, etc)."
 msgstr ""
 

Modified: translation/trunk/projects/website/templates/3-low.hidden-services.pot
===================================================================
--- translation/trunk/projects/website/templates/3-low.hidden-services.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/3-low.hidden-services.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/hidden-services.wml:9
@@ -31,10 +31,10 @@
 "Tor makes it possible for users to hide their locations while offering "
 "various kinds of services, such as web publishing or an instant messaging "
 "server.  Using Tor \"rendezvous points,\" other Tor users can connect to "
-"these hidden services, each without knowing the other's network "
-"identity. This page describes the technical details of how this rendezvous "
-"protocol works. For a more direct how-to, see our <a href=\"<page "
-"docs/tor-hidden-service>\">configuring hidden services</a> page."
+"these hidden services, each without knowing the other's network identity. "
+"This page describes the technical details of how this rendezvous protocol "
+"works. For a more direct how-to, see our <a href=\"<page docs/tor-hidden-"
+"service>\">configuring hidden services</a> page."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -56,7 +56,8 @@
 #. PO4ASHARPBEGIN Bob tells to his introduction pointsPO4ASHARPEND
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/hidden-services.wml:36
-msgid "<img alt=\"Tor hidden service step one\" src=\"$(IMGROOT)/THS-1.png\" />"
+msgid ""
+"<img alt=\"Tor hidden service step one\" src=\"$(IMGROOT)/THS-1.png\" />"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -81,9 +82,9 @@
 "&ndash; can verify that they are talking to the right hidden service. See "
 "also <a href=\"https://zooko.com/distnames.html\">Zooko's conjecture</a> "
 "that out of Decentralized, Secure, and Human-Meaningful, you can achieve at "
-"most two. Perhaps one day somebody will implement a <a "
-"href=\"http://www.skyhunter.com/marcs/petnames/IntroPetNames.html\">Petname</a> "
-"design for hidden service names?"
+"most two. Perhaps one day somebody will implement a <a href=\"http://www."
+"skyhunter.com/marcs/petnames/IntroPetNames.html\">Petname</a> design for "
+"hidden service names?"
 msgstr ""
 
 #. PO4ASHARPBEGIN maybe replace "database" with "directory servers"; further: how incorrectPO4ASHARPEND
@@ -91,7 +92,8 @@
 #. PO4ASHARPBEGIN use?PO4ASHARPEND
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/hidden-services.wml:64
-msgid "<img alt=\"Tor hidden service step two\" src=\"$(IMGROOT)/THS-2.png\" />"
+msgid ""
+"<img alt=\"Tor hidden service step two\" src=\"$(IMGROOT)/THS-2.png\" />"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -104,15 +106,16 @@
 "also be offline or have left long ago, or there could be a typo in the onion "
 "address), the client now knows the set of introduction points and the right "
 "public key to use. Around this time, the client also creates a circuit to "
-"another randomly picked relay and asks it to act as <em>rendezvous "
-"point</em> by telling it a one-time secret."
+"another randomly picked relay and asks it to act as <em>rendezvous point</"
+"em> by telling it a one-time secret."
 msgstr ""
 
 #. PO4ASHARPBEGIN maybe add "cookie" to speech bubble, separated from the surroundedPO4ASHARPEND
 #. PO4ASHARPBEGIN "IP1-3" and "PK"PO4ASHARPEND
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/hidden-services.wml:82
-msgid "<img alt=\"Tor hidden service step three\" src=\"$(IMGROOT)/THS-3.png\" />"
+msgid ""
+"<img alt=\"Tor hidden service step three\" src=\"$(IMGROOT)/THS-3.png\" />"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -130,7 +133,8 @@
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/hidden-services.wml:97
-msgid "<img alt=\"Tor hidden service step four\" src=\"$(IMGROOT)/THS-4.png\" />"
+msgid ""
+"<img alt=\"Tor hidden service step four\" src=\"$(IMGROOT)/THS-4.png\" />"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -146,21 +150,21 @@
 #: /home/runa/tor/website/en/hidden-services.wml:108
 msgid ""
 "At this point it is of special importance that the hidden service sticks to "
-"the same set of <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#EntryGuards\">entry "
-"guards</a> when creating new circuits. Otherwise an attacker could run his "
-"own relay and force a hidden service to create an arbitrary number of "
-"circuits in the hope that the corrupt relay is picked as entry node and he "
-"learns the hidden server's IP address via timing analysis. This attack was "
-"described by &Oslash;verlier and Syverson in their paper titled <a "
-"href=\"http://freehaven.net/anonbib/#hs-attack06\">Locating Hidden "
+"the same set of <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
+"TorFAQ#EntryGuards\">entry guards</a> when creating new circuits. Otherwise "
+"an attacker could run his own relay and force a hidden service to create an "
+"arbitrary number of circuits in the hope that the corrupt relay is picked as "
+"entry node and he learns the hidden server's IP address via timing analysis. "
+"This attack was described by &Oslash;verlier and Syverson in their paper "
+"titled <a href=\"http://freehaven.net/anonbib/#hs-attack06\">Locating Hidden "
 "Servers</a>."
 msgstr ""
 
 #. PO4ASHARPBEGIN it should say "Bob connects to Alice's ..."PO4ASHARPEND
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/hidden-services.wml:120
-msgid "<img alt=\"Tor hidden service step five\" src=\"$(IMGROOT)/THS-5.png\" />"
+msgid ""
+"<img alt=\"Tor hidden service step five\" src=\"$(IMGROOT)/THS-5.png\" />"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -168,9 +172,9 @@
 msgid ""
 "In the last step, the rendezvous point notifies the client about successful "
 "connection establishment. After that, both client and hidden service can use "
-"their circuits to the rendezvous point for communicating with each "
-"other. The rendezvous point simply relays (end-to-end encrypted) messages "
-"from client to service and vice versa."
+"their circuits to the rendezvous point for communicating with each other. "
+"The rendezvous point simply relays (end-to-end encrypted) messages from "
+"client to service and vice versa."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -187,22 +191,21 @@
 msgid ""
 "In general, the complete connection between client and hidden service "
 "consists of 6 relays: 3 of them were picked by the client with the third "
-"being the rendezvous point and the other 3 were picked by the hidden "
-"service."
+"being the rendezvous point and the other 3 were picked by the hidden service."
 msgstr ""
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/en/hidden-services.wml:145
-msgid "<img alt=\"Tor hidden service step six\" src=\"$(IMGROOT)/THS-6.png\" />"
+msgid ""
+"<img alt=\"Tor hidden service step six\" src=\"$(IMGROOT)/THS-6.png\" />"
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/hidden-services.wml:148
 msgid ""
 "There are more detailed descriptions about the hidden service protocol than "
-"this one. See the <a "
-"href=\"<svnsandbox>doc/design-paper/tor-design.pdf\">Tor design paper</a> "
-"for an in-depth design description and the <a "
-"href=\"<svnsandbox>doc/spec/rend-spec.txt\">rendezvous specification</a> for "
-"the message formats."
+"this one. See the <a href=\"<svnsandbox>doc/design-paper/tor-design.pdf"
+"\">Tor design paper</a> for an in-depth design description and the <a href="
+"\"<svnsandbox>doc/spec/rend-spec.txt\">rendezvous specification</a> for the "
+"message formats."
 msgstr ""

Modified: translation/trunk/projects/website/templates/3-low.mirrors.pot
===================================================================
--- translation/trunk/projects/website/templates/3-low.mirrors.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/3-low.mirrors.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/mirrors.wml:9
@@ -28,16 +28,16 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/mirrors.wml:13
 msgid ""
-"The canonical URL of this site is <a "
-"href=\"https://www.torproject.org/\">https://www.torproject.org/</a>, but "
-"there are a few mirrors of this site in other places."
+"The canonical URL of this site is <a href=\"https://www.torproject.org/"
+"\">https://www.torproject.org/</a>, but there are a few mirrors of this site "
+"in other places."
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/mirrors.wml:18
 msgid ""
-"If you would like to run a mirror, please <a href=\"<page "
-"running-a-mirror>\">read our instructions for running a mirror</a>."
+"If you would like to run a mirror, please <a href=\"<page running-a-mirror>"
+"\">read our instructions for running a mirror</a>."
 msgstr ""
 
 #. type: Content of: <div><table><tr><th>

Modified: translation/trunk/projects/website/templates/3-low.news.pot
===================================================================
--- translation/trunk/projects/website/templates/3-low.news.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/3-low.news.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #.  PUT CONTENT AFTER THIS TAG 
 #. type: Content of: <div>
@@ -34,17 +34,17 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/news.wml:16
 msgid ""
-"28 July 2009: Tor 0.2.1.19 released as stable.  Read the <a "
-"href=\"http://archives.seul.org/or/announce/Aug-2009/msg00000.html\">announcement</a> "
-"for the updates and changes."
+"28 July 2009: Tor 0.2.1.19 released as stable.  Read the <a href=\"http://"
+"archives.seul.org/or/announce/Aug-2009/msg00000.html\">announcement</a> for "
+"the updates and changes."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/news.wml:19
 msgid ""
-"25 June 2009: Tor 0.2.0.35 released as stable.  Read the <a "
-"href=\"http://archives.seul.org/or/announce/Jun-2009/msg00000.html\">announcement</a> "
-"for the updates and changes."
+"25 June 2009: Tor 0.2.0.35 released as stable.  Read the <a href=\"http://"
+"archives.seul.org/or/announce/Jun-2009/msg00000.html\">announcement</a> for "
+"the updates and changes."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -58,107 +58,103 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/news.wml:22
 msgid ""
-"09 February 2009: Tor 0.2.0.34 released as stable.  Read the <a "
-"href=\"http://archives.seul.org/or/announce/Feb-2009/msg00000.html\">announcement</a> "
-"for the updates and changes.  This release fixes a security issue."
+"09 February 2009: Tor 0.2.0.34 released as stable.  Read the <a href="
+"\"http://archives.seul.org/or/announce/Feb-2009/msg00000.html"
+"\">announcement</a> for the updates and changes.  This release fixes a "
+"security issue."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/news.wml:25
 msgid ""
-"21 January 2009: Tor 0.2.0.33 released as stable.  Read the <a "
-"href=\"http://archives.seul.org/or/announce/Jan-2009/msg00000.html\">announcement</a> "
-"for the updates and changes."
+"21 January 2009: Tor 0.2.0.33 released as stable.  Read the <a href=\"http://"
+"archives.seul.org/or/announce/Jan-2009/msg00000.html\">announcement</a> for "
+"the updates and changes."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/news.wml:28
 msgid ""
-"19 December 2008: Tor releases 3-year development roadmap.  Read the <a "
-"href=\"<page press/2008-12-19-roadmap-press-release>\">Press Release</a> for "
-"more information."
+"19 December 2008: Tor releases 3-year development roadmap.  Read the <a href="
+"\"<page press/2008-12-19-roadmap-press-release>\">Press Release</a> for more "
+"information."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/news.wml:31
 msgid ""
-"05 December 2008: Tor 0.2.0.32 released as stable.  Read the <a "
-"href=\"http://archives.seul.org/or/announce/Dec-2008/msg00000.html\">announcement</a> "
-"for the updates and changes."
+"05 December 2008: Tor 0.2.0.32 released as stable.  Read the <a href="
+"\"http://archives.seul.org/or/announce/Dec-2008/msg00000.html"
+"\">announcement</a> for the updates and changes."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/news.wml:34
 msgid ""
-"08 September 2008: Tor 0.2.0.31 released as stable. Read the <a "
-"href=\"http://archives.seul.org/or/announce/Sep-2008/msg00000.html\">announcement</a> "
-"for the updates and changes."
+"08 September 2008: Tor 0.2.0.31 released as stable. Read the <a href="
+"\"http://archives.seul.org/or/announce/Sep-2008/msg00000.html"
+"\">announcement</a> for the updates and changes."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/news.wml:37
 msgid ""
-"25 August 2008: Tor 0.2.0.30 released as stable.  Read the <a "
-"href=\"http://archives.seul.org/or/announce/Aug-2008/msg00000.html\">announcement</a> "
-"or <a "
-"href=\"https://blog.torproject.org/blog/tor-0.2.0.30-released-stable\">blog "
-"post</a> for the numerous updates and changes."
+"25 August 2008: Tor 0.2.0.30 released as stable.  Read the <a href=\"http://"
+"archives.seul.org/or/announce/Aug-2008/msg00000.html\">announcement</a> or "
+"<a href=\"https://blog.torproject.org/blog/tor-0.2.0.30-released-stable"
+"\">blog post</a> for the numerous updates and changes."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/news.wml:42
 msgid ""
-"25 May 2008: Tor receives two awards from the <a "
-"href=\"http://nlnet.nl/\">NLnet Foundation</a>.  The first is to improve the "
-"performance of hidden services.  The second is to make Tor work better for "
-"low bandwidth clients.  The NLnet <a "
-"href=\"http://nlnet.nl/news/2008/20080514-awards.html\">awards page</a> has "
-"more details about the two projects."
+"25 May 2008: Tor receives two awards from the <a href=\"http://nlnet.nl/"
+"\">NLnet Foundation</a>.  The first is to improve the performance of hidden "
+"services.  The second is to make Tor work better for low bandwidth clients.  "
+"The NLnet <a href=\"http://nlnet.nl/news/2008/20080514-awards.html\">awards "
+"page</a> has more details about the two projects."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/news.wml:49
 msgid ""
-"13 May 2008: <a "
-"href=\"http://archives.seul.org/or/talk/May-2008/msg00048.html\">Tor "
-"0.2.0.26-rc</a> replaces several V3 directory authority keys affected by a "
-"recent <a "
-"href=\"http://lists.debian.org/debian-security-announce/2008/msg00152.html\">Debian "
-"OpenSSL bug</a>.  <strong>This is a security-critical release.</strong> "
-"Everybody running any version in the 0.2.0.x series should upgrade, whether "
-"they are running Debian or not.  Also, all servers running any version of "
-"Tor whose keys were generated by Debian, Ubuntu, or any derived distribution "
-"may have to replace their identity keys.  See our <a "
-"href=\"http://archives.seul.org/or/announce/May-2008/msg00000.html\">security "
-"advisory</a> or the <a "
-"href=\"https://blog.torproject.org/blog/debian-openssl-flaw%3A-what-does-it-mean-tor-clients%3F\">blog "
-"follow-up</a> for full details.  As always, you can find Tor 0.2.0.26-rc on "
-"the <a href=\"https://www.torproject.org/download#Dev\">downloads page</a>."
+"13 May 2008: <a href=\"http://archives.seul.org/or/talk/May-2008/msg00048."
+"html\">Tor 0.2.0.26-rc</a> replaces several V3 directory authority keys "
+"affected by a recent <a href=\"http://lists.debian.org/debian-security-"
+"announce/2008/msg00152.html\">Debian OpenSSL bug</a>.  <strong>This is a "
+"security-critical release.</strong> Everybody running any version in the "
+"0.2.0.x series should upgrade, whether they are running Debian or not.  "
+"Also, all servers running any version of Tor whose keys were generated by "
+"Debian, Ubuntu, or any derived distribution may have to replace their "
+"identity keys.  See our <a href=\"http://archives.seul.org/or/announce/May-"
+"2008/msg00000.html\">security advisory</a> or the <a href=\"https://blog."
+"torproject.org/blog/debian-openssl-flaw%3A-what-does-it-mean-tor-clients%3F"
+"\">blog follow-up</a> for full details.  As always, you can find Tor "
+"0.2.0.26-rc on the <a href=\"https://www.torproject.org/download#Dev"
+"\">downloads page</a>."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/news.wml:62
 msgid ""
-"Mar 2008: <a "
-"href=\"https://blog.torproject.org/blog/tor-project-google-summer-code-2008!\">Tor "
-"Project is in Google Summer of Code 2008!</a>"
+"Mar 2008: <a href=\"https://blog.torproject.org/blog/tor-project-google-"
+"summer-code-2008!\">Tor Project is in Google Summer of Code 2008!</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/news.wml:66
 msgid ""
 "Feb 2008: The <a href=\"https://www.torproject.org/people#Board\">Board of "
-"Directors</a> welcomes <a "
-"href=\"https://blog.torproject.org/blog/isaac-mao-elected-one-our-new-directors\">Isaac "
-"Mao</a> to the board.  We thank Rebecca McKinnon for her support and "
-"contributions to the project."
+"Directors</a> welcomes <a href=\"https://blog.torproject.org/blog/isaac-mao-"
+"elected-one-our-new-directors\">Isaac Mao</a> to the board.  We thank "
+"Rebecca McKinnon for her support and contributions to the project."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/news.wml:72
 msgid ""
-"Feb 2008: Tor is happy to announce the <a "
-"href=\"https://blog.torproject.org\">official Tor blog</a>."
+"Feb 2008: Tor is happy to announce the <a href=\"https://blog.torproject.org"
+"\">official Tor blog</a>."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -168,9 +164,8 @@
 "release) fixes a huge memory leak on exit relays, makes the default exit "
 "policy a little bit more conservative so it's safer to run an exit relay on "
 "a home system, and fixes a variety of smaller issues. Please upgrade.  Full "
-"<a "
-"href=\"http://archives.seul.org/or/announce/Jan-2008/msg00000.html\">release "
-"notes</a> are available."
+"<a href=\"http://archives.seul.org/or/announce/Jan-2008/msg00000.html"
+"\">release notes</a> are available."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -182,9 +177,9 @@
 "causing some servers to disappear from the network status lists for a few "
 "hours each day. We also modified the default Privoxy config files in the "
 "bundles to avoid some security problems, so make sure to leave \"install "
-"Privoxy\" checked when you upgrade. See the <a "
-"href=\"http://archives.seul.org/or/announce/Oct-2007/msg00000.html\">release "
-"announcement</a> for more information."
+"Privoxy\" checked when you upgrade. See the <a href=\"http://archives.seul."
+"org/or/announce/Oct-2007/msg00000.html\">release announcement</a> for more "
+"information."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -194,19 +189,19 @@
 "people>\">independent and official nonprofit</a> this past February. We did "
 "this so we could accept grants from groups who only donate to NGOs, and so "
 "our donors could deduct qualifying <a href=\"<page donate>\">donations</a> "
-"made to us.  <br /> We'd like to extend our profound thanks to the <a "
-"href=\"https://www.eff.org/\">Electronic Frontier Foundation</a> for their "
-"past support, fiscal sponsorship, and help in hosting some of our web pages, "
-"and for their continued mentorship of and counsel to our fledgling nonprofit "
+"made to us.  <br /> We'd like to extend our profound thanks to the <a href="
+"\"https://www.eff.org/\">Electronic Frontier Foundation</a> for their past "
+"support, fiscal sponsorship, and help in hosting some of our web pages, and "
+"for their continued mentorship of and counsel to our fledgling nonprofit "
 "organization."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/news.wml:105
 msgid ""
-"Sep 2007: If you have received email claiming to be Tor, it wasn't from "
-"us. The <a href=\"<page download>\">official Tor bundles</a> can be <a "
-"href=\"<page verifying-signatures>\">verified as authentic</a>."
+"Sep 2007: If you have received email claiming to be Tor, it wasn't from us. "
+"The <a href=\"<page download>\">official Tor bundles</a> can be <a href="
+"\"<page verifying-signatures>\">verified as authentic</a>."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -214,18 +209,18 @@
 msgid ""
 "Aug 2007: <strong>Please update your Tor software!</strong> The latest "
 "versions (stable: 0.1.2.17; development: 0.2.0.6-alpha)  patch a significant "
-"security vulnerability.  See the <a "
-"href=\"http://archives.seul.org/or/announce/Aug-2007/msg00000.html\">release "
-"announcement</a> for more information."
+"security vulnerability.  See the <a href=\"http://archives.seul.org/or/"
+"announce/Aug-2007/msg00000.html\">release announcement</a> for more "
+"information."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/news.wml:115
 msgid ""
-"Feb 2007: The Tor Project and UColo/Boulder <a "
-"href=\"http://blogs.law.harvard.edu/anonymous/2007/02/26/the-rumors-of-our-demise/\">respond</a> "
-"to a recent blogstorm regarding a paper documenting a possible attack "
-"strategy against Tor."
+"Feb 2007: The Tor Project and UColo/Boulder <a href=\"http://blogs.law."
+"harvard.edu/anonymous/2007/02/26/the-rumors-of-our-demise/\">respond</a> to "
+"a recent blogstorm regarding a paper documenting a possible attack strategy "
+"against Tor."
 msgstr ""
 
 #. type: Content of: <div><ul><li>

Modified: translation/trunk/projects/website/templates/3-low.people.pot
===================================================================
--- translation/trunk/projects/website/templates/3-low.people.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/3-low.people.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/people.wml:9
@@ -34,7 +34,8 @@
 
 #. type: Content of: <div><address>
 #: /home/runa/tor/website/en/people.wml:17
-msgid "The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA<br />"
+msgid ""
+"The Tor Project<br /> 122 Scott Circle<br /> Dedham, MA 02026-6416 USA<br />"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -64,10 +65,10 @@
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:31
 msgid ""
-"Runs the <a href=\"https://check.torproject.org/\">Tor DNSEL</a> <a "
-"href=\"http://exitlist.torproject.org/\">site</a>, the <a "
-"href=\"https://translation.torproject.org/\">Tor Translation Portal</a>, and "
-"also the in-progress Tor weather site."
+"Runs the <a href=\"https://check.torproject.org/\">Tor DNSEL</a> <a href="
+"\"http://exitlist.torproject.org/\">site</a>, the <a href=\"https://"
+"translation.torproject.org/\">Tor Translation Portal</a>, and also the in-"
+"progress Tor weather site."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -90,12 +91,12 @@
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:39
 msgid ""
-"Lead developer for <a href=\"<page vidalia/index>\">Vidalia</a>, a "
-"cross-platform Tor GUI included in the Windows and OS X bundles."
+"Lead developer for <a href=\"<page vidalia/index>\">Vidalia</a>, a cross-"
+"platform Tor GUI included in the Windows and OS X bundles."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:42 /tmp/NA73iDQGtl.xml:121
+#: /home/runa/tor/website/en/people.wml:42 /tmp/1pt2aYozGL.xml:121
 msgid "Sebastian Hahn"
 msgstr ""
 
@@ -110,8 +111,8 @@
 #. type: Content of: <div><dl><dt>
 #: /home/runa/tor/website/en/people.wml:46
 msgid ""
-"Andrew Lewman (Executive Director; Director; <a href=\"<page "
-"press/index>\">press contact</a>)"
+"Andrew Lewman (Executive Director; Director; <a href=\"<page press/index>"
+"\">press contact</a>)"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
@@ -129,12 +130,11 @@
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:50
 msgid ""
-"Worked during the 2007 Google Summer of Code on <a "
-"href=\"<svnsandbox>doc/spec/proposals/114-distributed-storage.txt\">distributing "
-"and securing the publishing and fetching of hidden service "
-"descriptors</a>. Currently working on <a href=\"<page "
-"projects/hidserv>\">making hidden services faster and more reliable</a>, and "
-"on <a href=\"<page projects/metrics>\">metrics</a>."
+"Worked during the 2007 Google Summer of Code on <a href=\"<svnsandbox>doc/"
+"spec/proposals/114-distributed-storage.txt\">distributing and securing the "
+"publishing and fetching of hidden service descriptors</a>. Currently working "
+"on <a href=\"<page projects/hidserv>\">making hidden services faster and "
+"more reliable</a>, and on <a href=\"<page projects/metrics>\">metrics</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -194,11 +194,10 @@
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:71
 msgid ""
-"Author of <a "
-"href=\"https://svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a>, a "
-"Tor controller that builds paths through the Tor network and measures "
-"various properties and behaviors, and new author of <a href=\"<page "
-"torbutton/index>\">Torbutton</a>."
+"Author of <a href=\"https://svn.torproject.org/svn/torflow/trunk/README"
+"\">TorFlow</a>, a Tor controller that builds paths through the Tor network "
+"and measures various properties and behaviors, and new author of <a href="
+"\"<page torbutton/index>\">Torbutton</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -225,8 +224,7 @@
 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 "
-"anonymity at <a "
-"href=\"http://www.knightpulse.org/blog/tor\">KnightPulse</a>."
+"anonymity at <a href=\"http://www.knightpulse.org/blog/tor\">KnightPulse</a>."
 msgstr ""
 
 #. type: Content of: <div>
@@ -236,7 +234,8 @@
 
 #. type: Content of: <div><h3>
 #: /home/runa/tor/website/en/people.wml:88
-msgid "<a class=\"anchor\" href=\"#Board\">The Tor Project Board of Directors:</a>"
+msgid ""
+"<a class=\"anchor\" href=\"#Board\">The Tor Project Board of Directors:</a>"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -281,8 +280,8 @@
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:100
 msgid ""
-"Lawyer, cyberlaw professor, and founder of <a "
-"href=\"http://chillingeffects.org/\">ChillingEffects.org</a>."
+"Lawyer, cyberlaw professor, and founder of <a href=\"http://chillingeffects."
+"org/\">ChillingEffects.org</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -294,9 +293,8 @@
 #: /home/runa/tor/website/en/people.wml:103
 msgid ""
 "Fred is a Senior Intellectual Property Attorney at the Electronic Frontier "
-"Foundation (EFF). His complete bio can be found at the <a "
-"href=\"http://www.eff.org/about/staff/?f=fred_von_lohmann.html\">EFF Staff "
-"Site</a>."
+"Foundation (EFF). 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 ""
 
 #. type: Content of: <div><dl><dt>
@@ -323,21 +321,19 @@
 #: /home/runa/tor/website/en/people.wml:115
 msgid ""
 "Adapts Polipo to depend upon the libevent library, making use of its event "
-"loop, asynchronous DNS resolver, and utility library. (<a "
-"href=\"http://www.mangrin.org/~chrisd/polipo_schedule.html\">schedule</a>, "
-"<a href=\"http://www.mangrin.org/~chrisd/polipo-gsoc/\">code</a>). Mentor: "
-"Nick Mathewson"
+"loop, asynchronous DNS resolver, and utility library. (<a href=\"http://www."
+"mangrin.org/~chrisd/polipo_schedule.html\">schedule</a>, <a href=\"http://"
+"www.mangrin.org/~chrisd/polipo-gsoc/\">code</a>). Mentor: Nick Mathewson"
 msgstr ""
 
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:121
 msgid ""
-"Addresses the content distribution issues of <a "
-"href=\"https://git.torproject.org/checkout/thandy/master/\">Thandy, the "
-"secure software updater for Tor</a>, by including libtorrent and setting up "
-"a tracker to learn about new packages (<a "
-"href=\"http://wiki.noreply.org/noreply/TheOnionRouter/Gsoc2009/ThandyTorrents\">schedule</a>).  "
-"Mentor: Martin Peck"
+"Addresses the content distribution issues of <a href=\"https://git."
+"torproject.org/checkout/thandy/master/\">Thandy, the secure software updater "
+"for Tor</a>, by including libtorrent and setting up a tracker to learn about "
+"new packages (<a href=\"http://wiki.noreply.org/noreply/TheOnionRouter/"
+"Gsoc2009/ThandyTorrents\">schedule</a>).  Mentor: Martin Peck"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -348,10 +344,10 @@
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:127
 msgid ""
-"Builds a command-line application for monitoring Tor relays, providing "
-"real-time status information such as the current configuration, bandwidth "
-"usage, message log, etc. (<a "
-"href=\"https://tor-svn.freehaven.net/svn/arm/trunk/readme.txt\">code</a>)."
+"Builds a command-line application for monitoring Tor relays, providing real-"
+"time status information such as the current configuration, bandwidth usage, "
+"message log, etc. (<a href=\"https://tor-svn.freehaven.net/svn/arm/trunk/"
+"readme.txt\">code</a>)."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -363,15 +359,13 @@
 #: /home/runa/tor/website/en/people.wml:131
 msgid ""
 "Extends <a href=\"<page torbutton/index>\">Torbutton</a> by implementing "
-"three feature requests, namely the <a "
-"href=\"https://bugs.torproject.org/flyspray/index.php?do=details&amp;id=462\">tor:// "
-"association</a>, <a "
-"href=\"https://bugs.torproject.org/flyspray/index.php?do=details&amp;id=524\">better "
-"refspoofing</a>, and <a "
-"href=\"https://bugs.torproject.org/flyspray/index.php?do=details&amp;id=637\">more "
-"granular cookie control</a> (<a "
-"href=\"http://korykirk.com/GSoC/blag/index.php\">status "
-"updates</a>). Mentor: Mike Perry"
+"three feature requests, namely the <a href=\"https://bugs.torproject.org/"
+"flyspray/index.php?do=details&amp;id=462\">tor:// association</a>, <a href="
+"\"https://bugs.torproject.org/flyspray/index.php?do=details&amp;id=524"
+"\">better refspoofing</a>, and <a href=\"https://bugs.torproject.org/"
+"flyspray/index.php?do=details&amp;id=637\">more granular cookie control</a> "
+"(<a href=\"http://korykirk.com/GSoC/blag/index.php\">status updates</a>). "
+"Mentor: Mike Perry"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -382,13 +376,11 @@
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:142
 msgid ""
-"Improves usability of <a "
-"href=\"https://translation.torproject.org/\">translating the website</a> by "
-"automatically converting wml files to po files (and back) so that they can "
-"be handled by <a "
-"href=\"http://translate.sourceforge.net/wiki/pootle/index\">Pootle</a> (<a "
-"href=\"http://gsoc-tor.blogspot.com/\">status updates</a>). Mentor: Jacob "
-"Appelbaum"
+"Improves usability of <a href=\"https://translation.torproject.org/"
+"\">translating the website</a> by automatically converting wml files to po "
+"files (and back) so that they can be handled by <a href=\"http://translate."
+"sourceforge.net/wiki/pootle/index\">Pootle</a> (<a href=\"http://gsoc-tor."
+"blogspot.com/\">status updates</a>). Mentor: Jacob Appelbaum"
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -401,10 +393,10 @@
 msgid ""
 "Develops a plugin API for <a href=\"<page vidalia/index>\">Vidalia</a> and "
 "creates a plugin to allow HerdictWeb integration, a project aiming at "
-"identifying website inaccessibility using user submissions (<a "
-"href=\"https://trac.vidalia-project.net/wiki/ExtensionAPI\">schedule</a>, <a "
-"href=\"https://trac.vidalia-project.net/browser/vidalia/branches/extension-api\">code</a>).  "
-"Mentor: Matt Edman"
+"identifying website inaccessibility using user submissions (<a href="
+"\"https://trac.vidalia-project.net/wiki/ExtensionAPI\">schedule</a>, <a href="
+"\"https://trac.vidalia-project.net/browser/vidalia/branches/extension-api"
+"\">code</a>).  Mentor: Matt Edman"
 msgstr ""
 
 #. type: Content of: <div>
@@ -465,8 +457,8 @@
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:172
 msgid ""
-"<a href=\"https://www.torproject.org/index.html.zh-cn\">Simplified "
-"Chinese</a>."
+"<a href=\"https://www.torproject.org/index.html.zh-cn\">Simplified Chinese</"
+"a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -572,10 +564,9 @@
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:197
 msgid ""
-"Started the <a "
-"href=\"https://svn.torproject.org/svn/blossom/trunk/\">Blossom project</a> "
-"which uses Tor as its overlay network; also helped motivate Tor's control "
-"interface to be as flexible as it is."
+"Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/"
+"\">Blossom project</a> which uses Tor as its overlay network; also helped "
+"motivate Tor's control interface to be as flexible as it is."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -586,9 +577,9 @@
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:201
 msgid ""
-"Working on Tor exit scanner improvements (<a "
-"href=\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>), "
-"originally started as part of Google Summer of Code 2008."
+"Working on Tor exit scanner improvements (<a href=\"https://svn.torproject."
+"org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
+"started as part of Google Summer of Code 2008."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -598,7 +589,8 @@
 
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:204
-msgid "Developer for the <a href=\"http://tork.sf.net/\">TorK</a> Tor controller."
+msgid ""
+"Developer for the <a href=\"http://tork.sf.net/\">TorK</a> Tor controller."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -669,10 +661,10 @@
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:218
 msgid ""
-"Periodically adds new features for making Tor easier to use as a <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy\">transparent "
-"proxy</a>. Also maintains the <a "
-"href=\"http://p56soo2ibjkx23xo.onion/\">TorDNSEL code</a>."
+"Periodically adds new features for making Tor easier to use as a <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy"
+"\">transparent proxy</a>. Also maintains the <a href=\"http://"
+"p56soo2ibjkx23xo.onion/\">TorDNSEL code</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -695,19 +687,18 @@
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:226
 msgid ""
-"A blogger who has written some <a "
-"href=\"http://www.ethanzuckerman.com/blog/?p=1019\">interesting</a> <a "
-"href=\"http://advocacy.globalvoicesonline.org/tools/guide/\">tutorials</a> "
-"for how, when, and whether to use Tor. He also teaches activists around the "
-"world about Tor and related tools."
+"A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?"
+"p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/"
+"tools/guide/\">tutorials</a> for how, when, and whether to use Tor. He also "
+"teaches activists around the world about Tor and related tools."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
 #: /home/runa/tor/website/en/people.wml:231
 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, etc."
+"All our relay operators, people who write <a href=\"http://freehaven.net/"
+"anonbib/\">research papers</a> about Tor, people who teach others about Tor, "
+"etc."
 msgstr ""
 
 #. type: Content of: <div>
@@ -729,9 +720,8 @@
 #: /home/runa/tor/website/en/people.wml:240
 msgid ""
 "Worked on Configuration of Hidden Services with User Authorization in "
-"Vidalia (<a "
-"href=\"http://trac.vidalia-project.net/browser/vidalia/branches/hidden-services\">svn</a>) "
-"as part of Google Summer of Code 2008."
+"Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches/"
+"hidden-services\">svn</a>) as part of Google Summer of Code 2008."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -742,9 +732,9 @@
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:243
 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 by Roger."
+"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 "
+"by Roger."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -765,11 +755,11 @@
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:247
 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=\"https://git.torproject.org/checkout/tor/master/doc/spec/proposals/151-path-selection-improvements.txt\">proposal "
-"151</a> as part of Google Summer of Code 2008."
+"Worked on Improving Tor Path Selection (<a href=\"https://svn.torproject.org/"
+"cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/\">svn</a>)  and <a href="
+"\"https://git.torproject.org/checkout/tor/master/doc/spec/proposals/151-path-"
+"selection-improvements.txt\">proposal 151</a> as part of Google Summer of "
+"Code 2008."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -811,9 +801,8 @@
 #: /home/runa/tor/website/en/people.wml:257
 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-urz/trunk/README\">buffer "
-"implementation for libevent</a>; mentored by Nick."
+"Windows, by developing a <a href=\"https://svn.torproject.org/svn/libevent-"
+"urz/trunk/README\">buffer implementation for libevent</a>; mentored by Nick."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -846,8 +835,8 @@
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:265
 msgid ""
-"Former Director of Tor.  Co-Founder of <a "
-"href=\"http://www.globalvoicesonline.org/\">Global Voices Online</a>."
+"Former Director of Tor.  Co-Founder of <a href=\"http://www."
+"globalvoicesonline.org/\">Global Voices Online</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -882,9 +871,9 @@
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:271
 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 properties of the Tor network; mentored by Mike Perry."
+"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 "
+"properties of the Tor network; mentored by Mike Perry."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -894,7 +883,8 @@
 
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:276
-msgid "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
+msgid ""
+"The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -905,9 +895,9 @@
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:278
 msgid ""
-"Worked on Providing Blossom functionality to Vidalia (<a "
-"href=\"http://trac.vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) "
-"as part of Google Summer of Code 2008."
+"Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac."
+"vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
+"of Google Summer of Code 2008."
 msgstr ""
 
 #. type: Content of: <div><dl><dt>
@@ -918,7 +908,7 @@
 #. type: Content of: <div><dl><dd>
 #: /home/runa/tor/website/en/people.wml:281
 msgid ""
-"Worked on Performance Enhancing Measures for Tor Hidden Services (<a "
-"href=\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/\">svn</a>) "
-"as part of Google Summer of Code 2008."
+"Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
+"\"https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/"
+"\">svn</a>) as part of Google Summer of Code 2008."
 msgstr ""

Modified: translation/trunk/projects/website/templates/3-low.sponsors.pot
===================================================================
--- translation/trunk/projects/website/templates/3-low.sponsors.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/3-low.sponsors.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/sponsors.wml:9
@@ -47,8 +47,8 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/sponsors.wml:26
 msgid ""
-"<a href=\"http://www.ibb.gov/\">International Broadcasting Bureau</a> "
-"(2006-2009)"
+"<a href=\"http://www.ibb.gov/\">International Broadcasting Bureau</a> (2006-"
+"2009)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -96,8 +96,7 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/sponsors.wml:44
 msgid ""
-"<a href=\"http://code.google.com/soc/\">Google Summer of Code</a> "
-"(2007-2009)"
+"<a href=\"http://code.google.com/soc/\">Google Summer of Code</a> (2007-2009)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -108,8 +107,8 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/sponsors.wml:46
 msgid ""
-"<a href=\"http://chacs.nrl.navy.mil/\">Naval Research Laboratory</a> "
-"(2006-2009)"
+"<a href=\"http://chacs.nrl.navy.mil/\">Naval Research Laboratory</a> (2006-"
+"2009)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -132,8 +131,8 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/sponsors.wml:53
 msgid ""
-"<a href=\"https://www.eff.org/\">Electronic Frontier Foundation</a> "
-"(2004-2005)"
+"<a href=\"https://www.eff.org/\">Electronic Frontier Foundation</a> (2004-"
+"2005)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -155,22 +154,22 @@
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/sponsors.wml:57
-msgid "<a href=\"http://www.omidyar.net/\">Omidyar Network Enzyme Grant</a> (2006)"
+msgid ""
+"<a href=\"http://www.omidyar.net/\">Omidyar Network Enzyme Grant</a> (2006)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/sponsors.wml:58
 msgid ""
-"<a "
-"href=\"http://seclab.cs.rice.edu/lab/2005/08/01/seclab-awarded-grant-to-study-security-of-p2p/\">NSF "
-"via Rice University</a> (2006-2007)"
+"<a href=\"http://seclab.cs.rice.edu/lab/2005/08/01/seclab-awarded-grant-to-"
+"study-security-of-p2p/\">NSF via Rice University</a> (2006-2007)"
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/sponsors.wml:60
 msgid ""
 "Thank you to all the people and groups who have made Tor possible so far, "
-"and thank you especially to the individual volunteers who have made "
-"non-financial contributions: coding, testing, documenting, educating, "
+"and thank you especially to the individual volunteers who have made non-"
+"financial contributions: coding, testing, documenting, educating, "
 "researching, and running the relays that make up the Tor network."
 msgstr ""

Modified: translation/trunk/projects/website/templates/3-low.trademark-faq.pot
===================================================================
--- translation/trunk/projects/website/templates/3-low.trademark-faq.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/3-low.trademark-faq.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h1>
 #: /home/runa/tor/website/en/trademark-faq.wml:9
@@ -38,13 +38,12 @@
 "If you are building open-source non-commercial software or services that "
 "incorporate or work with The Tor Project's code, you may use the name “Tor” "
 "in an accurate description of your work.  We ask you to include a link to "
-"the official Tor website <a "
-"href=\"https://www.torproject.org/\">https://www.torproject.org/</a> so "
-"users can verify the original source of Tor for themselves, and a note "
-"indicating that your project is not sponsored by The Tor Project. For "
-"example, “This product is produced independently from the Tor&#174; "
-"anonymity software and carries no guarantee from The Tor Project about "
-"quality, suitability or anything else.”"
+"the official Tor website <a href=\"https://www.torproject.org/\">https://www."
+"torproject.org/</a> so users can verify the original source of Tor for "
+"themselves, and a note indicating that your project is not sponsored by The "
+"Tor Project. For example, “This product is produced independently from the "
+"Tor&#174; anonymity software and carries no guarantee from The Tor Project "
+"about quality, suitability or anything else.”"
 msgstr ""
 
 #. type: Content of: <div>
@@ -148,8 +147,7 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/trademark-faq.wml:69
 msgid ""
-"Yes.  A few open source, non-commercial projects are Tor trademark "
-"licensees:"
+"Yes.  A few open source, non-commercial projects are Tor trademark licensees:"
 msgstr ""
 
 #. type: Content of: <div><ul><li>

Modified: translation/trunk/projects/website/templates/3-low.tshirt.pot
===================================================================
--- translation/trunk/projects/website/templates/3-low.tshirt.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/3-low.tshirt.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/tshirt.wml:9
@@ -53,9 +53,9 @@
 msgid ""
 "Help out in <a href=\"<page volunteer>\">other ways</a>. <a href=\"<page "
 "translation>\">Maintain a translation for the website</a>. Write a good <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/SupportPrograms\">support "
-"program and get a lot of people to use it</a>. Do research on Tor and "
-"anonymity, solve some of <a href=\"https://bugs.torproject.org/\">our "
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/SupportPrograms"
+"\">support program and get a lot of people to use it</a>. Do research on Tor "
+"and anonymity, solve some of <a href=\"https://bugs.torproject.org/\">our "
 "bugs</a>, or establish yourself as a Tor advocate."
 msgstr ""
 
@@ -71,16 +71,15 @@
 #: /home/runa/tor/website/en/tshirt.wml:39
 msgid ""
 "You can choose between the traditional black and our conversation-starting "
-"bright green. You can also see the shirts <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorShirt\">in "
-"action</a> &mdash; add your own photos there too."
+"bright green. You can also see the shirts <a href=\"https://wiki.torproject."
+"org/noreply/TheOnionRouter/TorShirt\">in action</a> &mdash; add your own "
+"photos there too."
 msgstr ""
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/en/tshirt.wml:46
 msgid ""
-"<a href=\"tshirt/black-tor-tshirt.png\"><img "
-"src=\"tshirt/black-tor-tshirt.png\" /></a> <a "
-"href=\"tshirt/green-tor-tshirt.png\"><img "
-"src=\"tshirt/green-tor-tshirt.png\" /></a>"
+"<a href=\"tshirt/black-tor-tshirt.png\"><img src=\"tshirt/black-tor-tshirt."
+"png\" /></a> <a href=\"tshirt/green-tor-tshirt.png\"><img src=\"tshirt/green-"
+"tor-tshirt.png\" /></a>"
 msgstr ""

Modified: translation/trunk/projects/website/templates/4-optional.gsoc.pot
===================================================================
--- translation/trunk/projects/website/templates/4-optional.gsoc.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/4-optional.gsoc.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/gsoc.wml:9
@@ -28,22 +28,20 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/gsoc.wml:13
 msgid ""
-"In the last two years, The Tor Project in collaboration with <a "
-"href=\"https://www.eff.org/\">The Electronic Frontier Foundation</a> "
-"successfully took part in <a "
-"href=\"http://code.google.com/soc/2007/eff/about.html\">Google Summer of "
-"Code 2007</a> and <a "
-"href=\"http://code.google.com/soc/2008/eff/about.html\">2008</a>.  In total "
-"we had eleven students as full-time developers for the summers of 2007 and "
-"2008."
+"In the last two years, The Tor Project in collaboration with <a href="
+"\"https://www.eff.org/\">The Electronic Frontier Foundation</a> successfully "
+"took part in <a href=\"http://code.google.com/soc/2007/eff/about.html"
+"\">Google Summer of Code 2007</a> and <a href=\"http://code.google.com/"
+"soc/2008/eff/about.html\">2008</a>.  In total we had eleven students as full-"
+"time developers for the summers of 2007 and 2008."
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/gsoc.wml:23
 msgid ""
-"Google has announced that there will also be a <a "
-"href=\"http://socghop.appspot.com/\">Google Summer of Code 2009</a>, and we "
-"plan to apply.  This page contains some information for interested students."
+"Google has announced that there will also be a <a href=\"http://socghop."
+"appspot.com/\">Google Summer of Code 2009</a>, and we plan to apply.  This "
+"page contains some information for interested students."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -159,7 +157,8 @@
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/gsoc.wml:106
-msgid "Why do you want to work with The Tor Project / Switzerland in particular?"
+msgid ""
+"Why do you want to work with The Tor Project / Switzerland in particular?"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -176,8 +175,8 @@
 "Will you be working full-time on the project for the summer, or will you "
 "have other commitments too (a second job, classes, etc)? If you won't be "
 "available full-time, please explain, and list timing if you know them for "
-"other major deadlines (e.g. exams). Having other activities isn't a "
-"deal-breaker, but we don't want to be surprised."
+"other major deadlines (e.g. exams). Having other activities isn't a deal-"
+"breaker, but we don't want to be surprised."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -199,8 +198,8 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/gsoc.wml:128
 msgid ""
-"What school are you attending? What year are you, and what's your "
-"major/degree/focus? If you're part of a research group, which one?"
+"What school are you attending? What year are you, and what's your major/"
+"degree/focus? If you're part of a research group, which one?"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -227,13 +226,13 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/gsoc.wml:149
 msgid ""
-"If you're interested, you can either contact the <a href=\"<page "
-"contact>\">tor-assistants list</a> with a brief summary of your proposal and "
-"we'll give you feedback, or just jump right in and post your ideas and goals "
-"to the <a href=\"<page documentation>#MailingLists\">or-talk mailing "
-"list</a>. Make sure to be responsive during the application selection "
-"period; if we like your application but you never answer our mails asking "
-"for more information, that's not a good sign."
+"If you're interested, you can either contact the <a href=\"<page contact>"
+"\">tor-assistants list</a> with a brief summary of your proposal and we'll "
+"give you feedback, or just jump right in and post your ideas and goals to "
+"the <a href=\"<page documentation>#MailingLists\">or-talk mailing list</a>. "
+"Make sure to be responsive during the application selection period; if we "
+"like your application but you never answer our mails asking for more "
+"information, that's not a good sign."
 msgstr ""
 
 #. type: Content of: <div><p>

Modified: translation/trunk/projects/website/templates/4-optional.open-positions.pot
===================================================================
--- translation/trunk/projects/website/templates/4-optional.open-positions.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/4-optional.open-positions.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/open-positions.wml:9

Modified: translation/trunk/projects/website/templates/4-optional.research.pot
===================================================================
--- translation/trunk/projects/website/templates/4-optional.research.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/4-optional.research.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/research.wml:9
@@ -28,16 +28,15 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/research.wml:12
 msgid ""
-"Read <a "
-"href=\"http://freehaven.net/anonbib/topic.html#Anonymous_20communication\">these "
-"papers</a> (especially the ones in boxes) to get up to speed on anonymous "
-"communication systems."
+"Read <a href=\"http://freehaven.net/anonbib/topic."
+"html#Anonymous_20communication\">these papers</a> (especially the ones in "
+"boxes) to get up to speed on anonymous communication systems."
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/research.wml:17
 msgid ""
 "We need people to attack the system, quantify defenses, etc. See the "
-"\"Research\" section of the <a href=\"<page "
-"volunteer>#Research\">volunteer</a> page."
+"\"Research\" section of the <a href=\"<page volunteer>#Research\">volunteer</"
+"a> page."
 msgstr ""

Modified: translation/trunk/projects/website/templates/4-optional.running-a-mirror.pot
===================================================================
--- translation/trunk/projects/website/templates/4-optional.running-a-mirror.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/4-optional.running-a-mirror.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/running-a-mirror.wml:9
@@ -44,8 +44,8 @@
 "<br /> <tt> rsync -av --delete rsync://rsync.torproject.org/tor tor-mirror/ "
 "</tt> <br /> <br /> If you would like to run only a dist/ mirror "
 "(distribution only), it's as easy as this command to download everything a "
-"dist mirror should share with the world: <br /> <br /> <tt> rsync -av "
-"--delete rsync://rsync.torproject.org/tor/dist tor-mirror-dist/ </tt>"
+"dist mirror should share with the world: <br /> <br /> <tt> rsync -av --"
+"delete rsync://rsync.torproject.org/tor/dist tor-mirror-dist/ </tt>"
 msgstr ""
 
 #. type: Content of: <div><p><p>
@@ -54,15 +54,15 @@
 "In order to assure the mirrors of of high quility and up to date...  Please "
 "ensure your mirror does at least the following:<br/><br/> Updates no later "
 "than every six hours, but no more frequent than every hour.<br/><br/> Allows "
-"\"Directory Index / Indexes\" (Index viewing) of the /dist "
-"directory.<br/><br/> Allows \"Multiviews\" or equivalent for language "
-"localization.<br/><br/> Have a valid contact email for administrative "
-"communications should your server have issues.<br/><br/> It is highly "
-"recommended for all mirror operators to subscribe to"
+"\"Directory Index / Indexes\" (Index viewing) of the /dist directory.<br/"
+"><br/> Allows \"Multiviews\" or equivalent for language localization.<br/"
+"><br/> Have a valid contact email for administrative communications should "
+"your server have issues.<br/><br/> It is highly recommended for all mirror "
+"operators to subscribe to"
 msgstr ""
 
 #. type: Content of: <div><p><A>
-#: /home/runa/tor/website/en/running-a-mirror.wml:51 /tmp/QZxSUQUiMa.xml:95
+#: /home/runa/tor/website/en/running-a-mirror.wml:51 /tmp/Ah2EnNv2dh.xml:95
 msgid "tor-mirrors mailing list"
 msgstr ""
 
@@ -92,8 +92,7 @@
 #, no-wrap
 msgid ""
 "\n"
-"0 */6 * * * rsync -av --delete rsync://rsync.torproject.org/tor/ "
-"/var/www/mirrors/torproject.org\n"
+"0 */6 * * * rsync -av --delete rsync://rsync.torproject.org/tor/ /var/www/mirrors/torproject.org\n"
 msgstr ""
 
 #. type: Content of: <div><p><p>

Modified: translation/trunk/projects/website/templates/4-optional.tormedia.pot
===================================================================
--- translation/trunk/projects/website/templates/4-optional.tormedia.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/4-optional.tormedia.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h1>
 #: /home/runa/tor/website/en/tormedia.wml:9
@@ -35,17 +35,17 @@
 msgstr ""
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/tormedia.wml:21 /tmp/PK6vo8GxKk.xml:119
+#: /home/runa/tor/website/en/tormedia.wml:21 /tmp/uLd4tw3Mmn.xml:119
 msgid "Date"
 msgstr ""
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/tormedia.wml:22 /tmp/PK6vo8GxKk.xml:120
+#: /home/runa/tor/website/en/tormedia.wml:22 /tmp/uLd4tw3Mmn.xml:120
 msgid "Publication"
 msgstr ""
 
 #. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/tormedia.wml:23 /tmp/PK6vo8GxKk.xml:121
+#: /home/runa/tor/website/en/tormedia.wml:23 /tmp/uLd4tw3Mmn.xml:121
 msgid "Topic"
 msgstr ""
 
@@ -67,7 +67,7 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/tormedia.wml:33 /tmp/PK6vo8GxKk.xml:221
+#: /home/runa/tor/website/en/tormedia.wml:33 /tmp/uLd4tw3Mmn.xml:221
 msgid "2009 Apr 06"
 msgstr ""
 
@@ -96,9 +96,9 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:41
 msgid ""
-"<a "
-"href=\"http://bbcworldservicetrust.wordpress.com/2009/03/12/12-march-world-day-against-cyber-censorship/\">Steven "
-"J Murdoch interviewed about Tor and Censorship</a>"
+"<a href=\"http://bbcworldservicetrust.wordpress.com/2009/03/12/12-march-"
+"world-day-against-cyber-censorship/\">Steven J Murdoch interviewed about Tor "
+"and Censorship</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -131,9 +131,8 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:51
 msgid ""
-"<a "
-"href=\"http://www.nu.nl/internet/1891289/anoniem-browsen-voor-gsm-in-de-maak.html\">Anoniem "
-"browsen voor gsm in de maak</a>"
+"<a href=\"http://www.nu.nl/internet/1891289/anoniem-browsen-voor-gsm-in-de-"
+"maak.html\">Anoniem browsen voor gsm in de maak</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -149,9 +148,8 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:56
 msgid ""
-"<a "
-"href=\"http://pbs.gen.in/wgbh/pages/frontline/tankman/internet/tech.html\">Chipping "
-"Away at China's Great Firewall</a>"
+"<a href=\"http://pbs.gen.in/wgbh/pages/frontline/tankman/internet/tech.html"
+"\">Chipping Away at China's Great Firewall</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -160,7 +158,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/tormedia.wml:60 /tmp/PK6vo8GxKk.xml:300 /tmp/PK6vo8GxKk.xml:348 /tmp/PK6vo8GxKk.xml:635
+#: /home/runa/tor/website/en/tormedia.wml:60 /tmp/uLd4tw3Mmn.xml:300
+#: /tmp/uLd4tw3Mmn.xml:348 /tmp/uLd4tw3Mmn.xml:635
 msgid "PC World"
 msgstr ""
 
@@ -207,7 +206,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/tormedia.wml:78 /tmp/PK6vo8GxKk.xml:85 /tmp/PK6vo8GxKk.xml:485 /tmp/PK6vo8GxKk.xml:544
+#: /home/runa/tor/website/en/tormedia.wml:78 /tmp/uLd4tw3Mmn.xml:85
+#: /tmp/uLd4tw3Mmn.xml:485 /tmp/uLd4tw3Mmn.xml:544
 msgid "2006 Feb 15"
 msgstr ""
 
@@ -219,10 +219,10 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:80
 msgid ""
-"<a "
-"href=\"http://www.cbsnews.com/stories/2006/02/15/eveningnews/main1321785.shtml?source=search_story\"> "
-"Cracking The 'Great Firewall Of China'</a>.  Roger Dingledine appeared on "
-"the show to discuss Tor, starting at 1:04 into the video."
+"<a href=\"http://www.cbsnews.com/stories/2006/02/15/eveningnews/main1321785."
+"shtml?source=search_story\"> Cracking The 'Great Firewall Of China'</a>.  "
+"Roger Dingledine appeared on the show to discuss Tor, starting at 1:04 into "
+"the video."
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -258,16 +258,17 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/tormedia.wml:97 /tmp/PK6vo8GxKk.xml:207 /tmp/PK6vo8GxKk.xml:523
+#: /home/runa/tor/website/en/tormedia.wml:97 /tmp/uLd4tw3Mmn.xml:207
+#: /tmp/uLd4tw3Mmn.xml:523
 msgid "New York Times"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:98
 msgid ""
-"<a "
-"href=\"http://www.nytimes.com/2006/01/25/technology/techspecial2/25privacy.html?_r=1&amp;oref=slogin\"> "
-"Privacy for People Who Don't Show Their Navels</a>"
+"<a href=\"http://www.nytimes.com/2006/01/25/technology/"
+"techspecial2/25privacy.html?_r=1&amp;oref=slogin\"> Privacy for People Who "
+"Don't Show Their Navels</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -283,9 +284,8 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:104
 msgid ""
-"<a "
-"href=\"http://www.eurekalert.org/pub_releases/2005-08/ns-wwa080305.php\">Why "
-"we all need pornography</a>"
+"<a href=\"http://www.eurekalert.org/pub_releases/2005-08/ns-wwa080305.php"
+"\">Why we all need pornography</a>"
 msgstr ""
 
 #. type: Content of: <div>
@@ -312,34 +312,33 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/tormedia.wml:127 /tmp/PK6vo8GxKk.xml:182 /tmp/PK6vo8GxKk.xml:212 /tmp/PK6vo8GxKk.xml:512
+#: /home/runa/tor/website/en/tormedia.wml:127 /tmp/uLd4tw3Mmn.xml:182
+#: /tmp/uLd4tw3Mmn.xml:212 /tmp/uLd4tw3Mmn.xml:512
 msgid "Technology Review"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:128
 msgid ""
-"<a "
-"href=\"http://www.technologyreview.com/blog/editors/23958/?nlid=2255\">How "
-"to Build Anonymity Into the Internet</a>"
+"<a href=\"http://www.technologyreview.com/blog/editors/23958/?nlid=2255"
+"\">How to Build Anonymity Into the Internet</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/tormedia.wml:131 /tmp/PK6vo8GxKk.xml:136
+#: /home/runa/tor/website/en/tormedia.wml:131 /tmp/uLd4tw3Mmn.xml:136
 msgid "2009 Jul 26"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/tormedia.wml:132 /tmp/PK6vo8GxKk.xml:152
+#: /home/runa/tor/website/en/tormedia.wml:132 /tmp/uLd4tw3Mmn.xml:152
 msgid "Washington Times"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:133
 msgid ""
-"<a "
-"href=\"http://www.washingtontimes.com/news/2009/jul/26/senate-help-iran-dodge-internet-censorship/\">Senate "
-"OKs funds to thwart Iran Web censors</a>"
+"<a href=\"http://www.washingtontimes.com/news/2009/jul/26/senate-help-iran-"
+"dodge-internet-censorship/\">Senate OKs funds to thwart Iran Web censors</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -350,9 +349,9 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:138
 msgid ""
-"<a "
-"href=\"http://www.boston.com/news/nation/washington/articles/2009/07/26/us_to_increase_funding_for_hackivists_aiding_iranians/\">US "
-"set to hike aid aimed at Iranians</a>"
+"<a href=\"http://www.boston.com/news/nation/washington/articles/2009/07/26/"
+"us_to_increase_funding_for_hackivists_aiding_iranians/\">US set to hike aid "
+"aimed at Iranians</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -368,9 +367,9 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:143
 msgid ""
-"<a "
-"href=\"http://www.google.com/hostednews/ap/article/ALeqM5hTf-p6Iy3sWHK8BRR58npGosLC3AD99L01QO0\">Iran "
-"activists work to elude crackdown on Internet</a>"
+"<a href=\"http://www.google.com/hostednews/ap/article/ALeqM5hTf-"
+"p6Iy3sWHK8BRR58npGosLC3AD99L01QO0\">Iran activists work to elude crackdown "
+"on Internet</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -398,8 +397,8 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:153
 msgid ""
-"<a "
-"href=\"http://www.washingtontimes.com/news/2009/jun/26/protesters-use-navy-technology-to-avoid-censorship/?feat=home_headlines\">Iranian "
+"<a href=\"http://www.washingtontimes.com/news/2009/jun/26/protesters-use-"
+"navy-technology-to-avoid-censorship/?feat=home_headlines\">Iranian "
 "protesters avoid censorship with Navy technology</a>"
 msgstr ""
 
@@ -416,9 +415,8 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:158
 msgid ""
-"<a "
-"href=\"http://www.eff.org/deeplinks/2009/06/help-protesters-iran-run-tor-relays-bridges\">Help "
-"Protesters in Iran: Run a Tor Bridge or a Tor Relay</a>"
+"<a href=\"http://www.eff.org/deeplinks/2009/06/help-protesters-iran-run-tor-"
+"relays-bridges\">Help Protesters in Iran: Run a Tor Bridge or a Tor Relay</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -434,27 +432,27 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:163
 msgid ""
-"<a "
-"href=\"http://www.dailyfinance.com/2009/06/24/nokia-and-siemens-in-iran-controversy/\">Nokia "
-"and Siemens in Iran controversy</a>"
+"<a href=\"http://www.dailyfinance.com/2009/06/24/nokia-and-siemens-in-iran-"
+"controversy/\">Nokia and Siemens in Iran controversy</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/tormedia.wml:166 /tmp/PK6vo8GxKk.xml:176 /tmp/PK6vo8GxKk.xml:181
+#: /home/runa/tor/website/en/tormedia.wml:166 /tmp/uLd4tw3Mmn.xml:176
+#: /tmp/uLd4tw3Mmn.xml:181
 msgid "2009 Jun 18"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/tormedia.wml:167 /tmp/PK6vo8GxKk.xml:232 /tmp/PK6vo8GxKk.xml:499
+#: /home/runa/tor/website/en/tormedia.wml:167 /tmp/uLd4tw3Mmn.xml:232
+#: /tmp/uLd4tw3Mmn.xml:499
 msgid "Wall Street Journal"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:168
 msgid ""
-"<a "
-"href=\"http://blogs.wsj.com/digits/2009/06/18/iranians-using-tor-to-anonymize-web-use/\">Iranians "
-"Using Tor to Anonymize Web Use</a>"
+"<a href=\"http://blogs.wsj.com/digits/2009/06/18/iranians-using-tor-to-"
+"anonymize-web-use/\">Iranians Using Tor to Anonymize Web Use</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -470,10 +468,9 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:173
 msgid ""
-"<a "
-"href=\"http://radar.oreilly.com/2009/06/tor-and-the-legality-of-runnin.html\">Dramatic "
-"Increase in Number of Tor Clients from Iran: Interview with Tor Project and "
-"the EFF</a>"
+"<a href=\"http://radar.oreilly.com/2009/06/tor-and-the-legality-of-runnin."
+"html\">Dramatic Increase in Number of Tor Clients from Iran: Interview with "
+"Tor Project and the EFF</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -496,7 +493,7 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/tormedia.wml:186 /tmp/PK6vo8GxKk.xml:191
+#: /home/runa/tor/website/en/tormedia.wml:186 /tmp/uLd4tw3Mmn.xml:191
 msgid "2009 Jun 17"
 msgstr ""
 
@@ -520,9 +517,9 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:193
 msgid ""
-"<a "
-"href=\"http://www.computerworld.com/action/article.do?command=viewArticleBasic&amp;articleId=9134471&amp;intsrc=news_ts_head\">Iran's "
-"leaders fight Internet; Internet wins (so far)</a>"
+"<a href=\"http://www.computerworld.com/action/article.do?"
+"command=viewArticleBasic&amp;articleId=9134471&amp;intsrc=news_ts_head"
+"\">Iran's leaders fight Internet; Internet wins (so far)</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -531,16 +528,15 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/tormedia.wml:197 /tmp/PK6vo8GxKk.xml:217
+#: /home/runa/tor/website/en/tormedia.wml:197 /tmp/uLd4tw3Mmn.xml:217
 msgid "Le Monde"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:198
 msgid ""
-"<a "
-"href=\"http://www.lemonde.fr/actualite-medias/article/2009/05/29/les-censeurs-du-net_1199993_3236.html\">Les "
-"censeurs du Net</a>"
+"<a href=\"http://www.lemonde.fr/actualite-medias/article/2009/05/29/les-"
+"censeurs-du-net_1199993_3236.html\">Les censeurs du Net</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -556,9 +552,9 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:203
 msgid ""
-"<a "
-"href=\"http://www.masshightech.com/stories/2009/05/11/newscolumn2-Tor-tackles-Net-privacy-game-makers-flock-to-Hub.html\">Tor "
-"tackles Net privacy</a>"
+"<a href=\"http://www.masshightech.com/stories/2009/05/11/newscolumn2-Tor-"
+"tackles-Net-privacy-game-makers-flock-to-Hub.html\">Tor tackles Net privacy</"
+"a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -569,9 +565,8 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:208
 msgid ""
-"<a "
-"href=\"http://www.nytimes.com/2009/05/01/technology/01filter.html\">Iranians "
-"and Others Outwit Net Censors</a>"
+"<a href=\"http://www.nytimes.com/2009/05/01/technology/01filter.html"
+"\">Iranians and Others Outwit Net Censors</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -583,8 +578,8 @@
 #: /home/runa/tor/website/en/tormedia.wml:213
 msgid ""
 "<a href=\"http://www.technologyreview.com/computing/22427/?a=f\">Dissent "
-"Made Safer: How anonymity technology could save free speech on the "
-"Internet.</a>"
+"Made Safer: How anonymity technology could save free speech on the Internet."
+"</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -595,9 +590,8 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:218
 msgid ""
-"<a "
-"href=\"http://bugbrother.blog.lemonde.fr/2009/04/22/comment-contourner-la-cybersurveillance/\">How "
-"to circumvent cybersurveillance</a>"
+"<a href=\"http://bugbrother.blog.lemonde.fr/2009/04/22/comment-contourner-la-"
+"cybersurveillance/\">How to circumvent cybersurveillance</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -608,9 +602,8 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:223
 msgid ""
-"<a "
-"href=\"http://www.rd.com/advice-and-know-how/how-to-hide-anything/article122219.html\">How "
-"to Hide Anything</a>"
+"<a href=\"http://www.rd.com/advice-and-know-how/how-to-hide-anything/"
+"article122219.html\">How to Hide Anything</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -626,9 +619,8 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:228
 msgid ""
-"<a "
-"href=\"http://www.marieclaire.com/career-money/career-coach/manage-online--web-image\">How "
-"to Manage Your Web Footprint</a>"
+"<a href=\"http://www.marieclaire.com/career-money/career-coach/manage-"
+"online--web-image\">How to Manage Your Web Footprint</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -666,16 +658,15 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/tormedia.wml:244 /tmp/PK6vo8GxKk.xml:416
+#: /home/runa/tor/website/en/tormedia.wml:244 /tmp/uLd4tw3Mmn.xml:416
 msgid "Bangkok Post"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:245
 msgid ""
-"<a "
-"href=\"http://www.bangkokpost.com/tech/technews/11872/the-old-fake-404-not-found-routine\">The "
-"old fake \"404 not found\" routine</a>"
+"<a href=\"http://www.bangkokpost.com/tech/technews/11872/the-old-fake-404-"
+"not-found-routine\">The old fake \"404 not found\" routine</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -708,9 +699,8 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:257
 msgid ""
-"<a "
-"href=\"http://www.cnn.com/2008/TECH/08/21/internet.filtering/index.html\">Experts: "
-"Internet filtering and censorship rife</a>"
+"<a href=\"http://www.cnn.com/2008/TECH/08/21/internet.filtering/index.html"
+"\">Experts: Internet filtering and censorship rife</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -726,9 +716,8 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:264
 msgid ""
-"<a "
-"href=\"http://www.smh.com.au/news/web/the-china-syndrome/2008/08/20/1218911800889.html\">The "
-"China Syndrome</a>"
+"<a href=\"http://www.smh.com.au/news/web/the-china-"
+"syndrome/2008/08/20/1218911800889.html\">The China Syndrome</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -744,9 +733,8 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:271
 msgid ""
-"<a "
-"href=\"http://www.sciam.com/article.cfm?id=cryptography-how-to-keep-your-secrets-safe\">Cryptography: "
-"How to Keep Your Secrets Safe</a>"
+"<a href=\"http://www.sciam.com/article.cfm?id=cryptography-how-to-keep-your-"
+"secrets-safe\">Cryptography: How to Keep Your Secrets Safe</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -762,9 +750,8 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:278
 msgid ""
-"<a "
-"href=\"http://www.guardian.co.uk/commentisfree/2008/aug/05/china.censorship\">Vaulting "
-"the great firewall</a>"
+"<a href=\"http://www.guardian.co.uk/commentisfree/2008/aug/05/china."
+"censorship\">Vaulting the great firewall</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -780,14 +767,14 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:285
 msgid ""
-"<a "
-"href=\"http://www.techradar.com/news/internet/web/freedom-stick-highlights-chinese-net-censorship-449233\">Freedom "
-"Stick highlights Chinese 'net censorship: USB drive promises anonymous "
-"surfing for the paranoid</a>"
+"<a href=\"http://www.techradar.com/news/internet/web/freedom-stick-"
+"highlights-chinese-net-censorship-449233\">Freedom Stick highlights Chinese "
+"'net censorship: USB drive promises anonymous surfing for the paranoid</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/tormedia.wml:291 /tmp/PK6vo8GxKk.xml:299 /tmp/PK6vo8GxKk.xml:307 /tmp/PK6vo8GxKk.xml:315
+#: /home/runa/tor/website/en/tormedia.wml:291 /tmp/uLd4tw3Mmn.xml:299
+#: /tmp/uLd4tw3Mmn.xml:307 /tmp/uLd4tw3Mmn.xml:315
 msgid "2008 Aug 07"
 msgstr ""
 
@@ -806,9 +793,9 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:301
 msgid ""
-"<a "
-"href=\"http://www.pcworld.com/article/149399-3/15_great_free_privacy_downloads.html\">15 "
-"Great, Free Privacy Downloads</a>.  Tor is Number 1."
+"<a href=\"http://www.pcworld.com/article/149399-"
+"3/15_great_free_privacy_downloads.html\">15 Great, Free Privacy Downloads</"
+"a>.  Tor is Number 1."
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -819,9 +806,8 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:309
 msgid ""
-"<a "
-"href=\"http://www.guardian.co.uk/technology/2008/aug/07/censorship.hacking\">Chaos "
-"aims to crack China's wall</a>"
+"<a href=\"http://www.guardian.co.uk/technology/2008/aug/07/censorship.hacking"
+"\">Chaos aims to crack China's wall</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -832,9 +818,8 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:317
 msgid ""
-"<a "
-"href=\"http://www.theregister.co.uk/2008/08/07/torbrowser_olympics/\">German "
-"hackers poke hole in great firewall of China</a>"
+"<a href=\"http://www.theregister.co.uk/2008/08/07/torbrowser_olympics/"
+"\">German hackers poke hole in great firewall of China</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -850,9 +835,10 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:325
 msgid ""
-"<a "
-"href=\"http://blog.estadao.com.br/blog/cruz/?title=cfp08_navegacao_anonima_na_rede&amp;more=1&amp;c=1&amp;tb=1&amp;pb=1&amp;cat=525\">Interview "
-"at Computers, Freedom, and Privacy 2008 Conference</a>"
+"<a href=\"http://blog.estadao.com.br/blog/cruz/?"
+"title=cfp08_navegacao_anonima_na_rede&amp;more=1&amp;c=1&amp;tb=1&amp;"
+"pb=1&amp;cat=525\">Interview at Computers, Freedom, and Privacy 2008 "
+"Conference</a>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -868,11 +854,10 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:333
 msgid ""
-"<a "
-"href=\"http://searchsecurity.techtarget.com/news/article/0,289142,sid14_gci1305120,00.html\"> "
-"Tor network 'bridges' help evade blockers</a>.  Covers new Tor features "
-"designed to overcome filtering and blocking that prevent access to the Tor "
-"network."
+"<a href=\"http://searchsecurity.techtarget.com/news/article/0,289142,"
+"sid14_gci1305120,00.html\"> Tor network 'bridges' help evade blockers</a>.  "
+"Covers new Tor features designed to overcome filtering and blocking that "
+"prevent access to the Tor network."
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -901,11 +886,12 @@
 #: /home/runa/tor/website/en/tormedia.wml:349
 msgid ""
 "<a href=\"http://www.pcworld.com/article/id,142094-pg,1/article.html\"> "
-"Hackers Can Expose Masked Surfers, Study Says</a> A report on <a "
-"href=\"http://www.lightbluetouchpaper.org/2007/12/10/covert-channel-vulnerabilities-in-anonymity-systems/\"> "
-"Steven Murdoch's recent PhD thesis</a>. Steven <a "
-"href=\"http://blog.torproject.org/blog/media-coverage-%2526quot%3Bcovert-channel-vulnerabilities-anonymity-systems%2526quot%3B\"> "
-"responds on the Tor Blog</a>."
+"Hackers Can Expose Masked Surfers, Study Says</a> A report on <a href="
+"\"http://www.lightbluetouchpaper.org/2007/12/10/covert-channel-"
+"vulnerabilities-in-anonymity-systems/\"> Steven Murdoch's recent PhD thesis</"
+"a>. Steven <a href=\"http://blog.torproject.org/blog/media-coverage-%2526quot"
+"%3Bcovert-channel-vulnerabilities-anonymity-systems%2526quot%3B\"> responds "
+"on the Tor Blog</a>."
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -921,9 +907,9 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:359
 msgid ""
-"<a "
-"href=\"http://howto.wired.com/wiredhowtos/index.cgi?page_name=be_a_whistle_blower;action=display;category=Work\"> "
-"Be a Whistleblower</a>.  Wired recommends Tor for whistleblowers who wish to "
+"<a href=\"http://howto.wired.com/wiredhowtos/index.cgi?"
+"page_name=be_a_whistle_blower;action=display;category=Work\"> Be a "
+"Whistleblower</a>.  Wired recommends Tor for whistleblowers who wish to "
 "remain anonymous."
 msgstr ""
 
@@ -942,13 +928,13 @@
 msgid ""
 "<a href=\"http://news.cnet.com/8301-13739_3-9779225-46.html\"> Tor anonymity "
 "server admin arrested</a>.  A Tor exit node operator from Germany was "
-"arrested and then released once the police realized their "
-"mistake. Unfortunately, the hassle <a "
-"href=\"http://arstechnica.com/news.ars/post/20070917-tor-node-operator-after-run-in-with-police-i-cant-do-this-any-more.html\"> "
-"caused this operator to shut down the node</a>.  We have an <a href=\"<page "
-"faq-abuse>\"> Abuse FAQ for Tor Relay Operators</a>, as well as a <a "
-"href=\"<page eff/tor-legal-faq>\"> Legal FAQ for Tor Relay Operators</a> "
-"with advice on how to handle such issues if you are operating a Tor relay."
+"arrested and then released once the police realized their mistake. "
+"Unfortunately, the hassle <a href=\"http://arstechnica.com/news.ars/"
+"post/20070917-tor-node-operator-after-run-in-with-police-i-cant-do-this-any-"
+"more.html\"> caused this operator to shut down the node</a>.  We have an <a "
+"href=\"<page faq-abuse>\"> Abuse FAQ for Tor Relay Operators</a>, as well as "
+"a <a href=\"<page eff/tor-legal-faq>\"> Legal FAQ for Tor Relay Operators</"
+"a> with advice on how to handle such issues if you are operating a Tor relay."
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -957,44 +943,42 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/tormedia.wml:377 /tmp/PK6vo8GxKk.xml:558 /tmp/PK6vo8GxKk.xml:691 /tmp/PK6vo8GxKk.xml:890 /tmp/PK6vo8GxKk.xml:913
+#: /home/runa/tor/website/en/tormedia.wml:377 /tmp/uLd4tw3Mmn.xml:558
+#: /tmp/uLd4tw3Mmn.xml:691 /tmp/uLd4tw3Mmn.xml:890 /tmp/uLd4tw3Mmn.xml:913
 msgid "Wired"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:378
 msgid ""
-"<a "
-"href=\"http://www.wired.com/politics/security/news/2007/09/embassy_hacks\"> "
-"Rogue Nodes Turn Tor Anonymizer Into Eavesdropper's Paradise</a><br/> "
+"<a href=\"http://www.wired.com/politics/security/news/2007/09/embassy_hacks"
+"\"> Rogue Nodes Turn Tor Anonymizer Into Eavesdropper's Paradise</a><br/> "
 "Swedish computer security consultant Dan Egerstad monitored the traffic "
 "going through a Tor exit node he was running, then published unencrypted "
 "account and password information.  Note that the better articles covering "
 "this event correctly indicate that this is not a security flaw or design "
 "problem with Tor - Tor provides anonymity, but does not encrypt anything "
 "going to or from an exit node. You <strong>must</strong> use SSL (https) "
-"while browsing to ensure end-to-end encryption.  Also covered in <a "
-"href=\"http://www.theinquirer.net/en/inquirer/news/2007/09/10/tor-network-exposes-sensitive-information\"> "
-"The Inquirer</a>, <a "
-"href=\"http://www.infoworld.com/article/07/09/10/Security-researcher-intercepts-embassy-passwords_1.html?APPLICATION%20SECURITY\"> "
-"InfoWorld</a>, <a "
-"href=\"http://www.smh.com.au/articles/2007/11/12/1194766589522.html?page=fullpage#contentSwap2\"> "
-"The Sydney Morning Herald</a>, <a "
-"href=\"http://www.securityfocus.com/news/11486\"> Security Focus</a>, <a "
-"href=\"http://arstechnica.com/news.ars/post/20070910-security-expert-used-tor-to-collect-government-e-mail-passwords.html\"> "
-"ars technica</a>, and many others. It was reported as early as August 31, "
-"2007 on the <a "
-"href=\"http://blog.wired.com/27bstroke6/2007/08/embassy-e-mail-.html\"> "
-"Wired Blog</a>, before Mr. Egerstad revealed that he had obtained the "
-"information via his Tor exit node.  In the end, Mr. Egerstad was arrested, "
-"which was covered by <a "
-"href=\"http://www.theregister.co.uk/2007/11/15/tor_hacker_arrest/\"> The "
-"Register</a>, <a "
-"href=\"http://www.smh.com.au/news/security/police-swoop-on-hacker-of-the-year/2007/11/15/1194766821481.html?page=fullpage#contentSwap1\"> "
-"The Sydney Morning Herald</a>, <a "
-"href=\"http://blogs.zdnet.com/Berlind/?p=900\"> ZDNet</a>, and <a "
-"href=\"http://blog.wired.com/27bstroke6/2007/11/swedish-researc.html\"> "
-"Wired Blog</a>."
+"while browsing to ensure end-to-end encryption.  Also covered in <a href="
+"\"http://www.theinquirer.net/en/inquirer/news/2007/09/10/tor-network-exposes-"
+"sensitive-information\"> The Inquirer</a>, <a href=\"http://www.infoworld."
+"com/article/07/09/10/Security-researcher-intercepts-embassy-passwords_1.html?"
+"APPLICATION%20SECURITY\"> InfoWorld</a>, <a href=\"http://www.smh.com.au/"
+"articles/2007/11/12/1194766589522.html?page=fullpage#contentSwap2\"> The "
+"Sydney Morning Herald</a>, <a href=\"http://www.securityfocus.com/news/11486"
+"\"> Security Focus</a>, <a href=\"http://arstechnica.com/news.ars/"
+"post/20070910-security-expert-used-tor-to-collect-government-e-mail-"
+"passwords.html\"> ars technica</a>, and many others. It was reported as "
+"early as August 31, 2007 on the <a href=\"http://blog.wired."
+"com/27bstroke6/2007/08/embassy-e-mail-.html\"> Wired Blog</a>, before Mr. "
+"Egerstad revealed that he had obtained the information via his Tor exit "
+"node.  In the end, Mr. Egerstad was arrested, which was covered by <a href="
+"\"http://www.theregister.co.uk/2007/11/15/tor_hacker_arrest/\"> The "
+"Register</a>, <a href=\"http://www.smh.com.au/news/security/police-swoop-on-"
+"hacker-of-the-year/2007/11/15/1194766821481.html?page=fullpage#contentSwap1"
+"\"> The Sydney Morning Herald</a>, <a href=\"http://blogs.zdnet.com/Berlind/?"
+"p=900\"> ZDNet</a>, and <a href=\"http://blog.wired.com/27bstroke6/2007/11/"
+"swedish-researc.html\"> Wired Blog</a>."
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -1011,11 +995,11 @@
 #: /home/runa/tor/website/en/tormedia.wml:407
 msgid ""
 "<a href=\"http://blog.wired.com/27bstroke6/2007/07/cyber-jihadists.html\"> "
-"Cyber Jihadists Embrace Tor</a><br/> A pointer to a <a "
-"href=\"http://ddanchev.blogspot.com/2007/07/cyber-jihadists-and-tor.html\"> "
-"blog</a> that posted screenshots of Arabic instructions on using Tor, "
-"ostensibly for jihadists. Make sure to read Shava Nerad's reply at the "
-"bottom of the article."
+"Cyber Jihadists Embrace Tor</a><br/> A pointer to a <a href=\"http://"
+"ddanchev.blogspot.com/2007/07/cyber-jihadists-and-tor.html\"> blog</a> that "
+"posted screenshots of Arabic instructions on using Tor, ostensibly for "
+"jihadists. Make sure to read Shava Nerad's reply at the bottom of the "
+"article."
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -1026,10 +1010,9 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:417
 msgid ""
-"<a "
-"href=\"http://www.asiamedia.ucla.edu/article-southeastasia.asp?parentid=72388\"> "
-"The problems with censorship</a>.  Mentions anecdotes that \"everyone\" has "
-"Tor installed in Thailand to avoid censorship."
+"<a href=\"http://www.asiamedia.ucla.edu/article-southeastasia.asp?"
+"parentid=72388\"> The problems with censorship</a>.  Mentions anecdotes that "
+"\"everyone\" has Tor installed in Thailand to avoid censorship."
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -1047,9 +1030,9 @@
 msgid ""
 "<a href=\"http://www.worldchanging.com/archives/006309.html\"> Blogging "
 "Where Speech Isn’t Free</a><br/> Coverage of former Tor Executive Director "
-"Shava Nerad's participation at an <a "
-"href=\"http://2007.sxsw.com/interactive/programming/panels/?action=show&amp;id=IAP060124\"> "
-"SXSW panel</a>, where she explained how Tor can help bloggers."
+"Shava Nerad's participation at an <a href=\"http://2007.sxsw.com/interactive/"
+"programming/panels/?action=show&amp;id=IAP060124\"> SXSW panel</a>, where "
+"she explained how Tor can help bloggers."
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -1115,7 +1098,7 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/tormedia.wml:466 /tmp/PK6vo8GxKk.xml:569
+#: /home/runa/tor/website/en/tormedia.wml:466 /tmp/uLd4tw3Mmn.xml:569
 msgid "NPR"
 msgstr ""
 
@@ -1154,9 +1137,9 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:489
 msgid ""
-"<a "
-"href=\"http://www.network-secure.de/index.php?option=com_content&amp;task=view&amp;id=3909\"> "
-"Tor: Anonymisierungswerkzeug entwickelt</a> (German)<br/>"
+"<a href=\"http://www.network-secure.de/index.php?option=com_content&amp;"
+"task=view&amp;id=3909\"> Tor: Anonymisierungswerkzeug entwickelt</a> (German)"
+"<br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -1169,8 +1152,8 @@
 msgid ""
 "<a href=\"http://online.wsj.com/article/SB113979965346572150.html\"> Chinese "
 "Censors Of Internet Face 'Hacktivists' in U.S.</a><br/> Full article text "
-"can also be found <a "
-"href=\"http://yaleglobal.yale.edu/display.article?id=6981\">here</a>."
+"can also be found <a href=\"http://yaleglobal.yale.edu/display.article?"
+"id=6981\">here</a>."
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -1211,9 +1194,8 @@
 #: /home/runa/tor/website/en/tormedia.wml:535
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\"> "
-"Search Engines and Privacy Rights on the Web</a><br/> <a "
-"href=\"http://xeni.net/\">Xeni Jardin</a> recommends Tor at 33:30 into the "
-"program."
+"Search Engines and Privacy Rights on the Web</a><br/> <a href=\"http://xeni."
+"net/\">Xeni Jardin</a> recommends Tor at 33:30 into the program."
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -1229,16 +1211,15 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/tormedia.wml:555 /tmp/PK6vo8GxKk.xml:566
+#: /home/runa/tor/website/en/tormedia.wml:555 /tmp/uLd4tw3Mmn.xml:566
 msgid "2006 Jan 20"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:559
 msgid ""
-"<a "
-"href=\"http://www.wired.com/science/discoveries/news/2006/01/70051?currentPage=2\"> "
-"How to Foil Search Engine Snoops</a><br/>"
+"<a href=\"http://www.wired.com/science/discoveries/news/2006/01/70051?"
+"currentPage=2\"> How to Foil Search Engine Snoops</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -1278,9 +1259,8 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:592
 msgid ""
-"<a "
-"href=\"http://www.ieee-security.org/Cipher/Newsbriefs/2005/071805.html#TOR\"> "
-"Onion routing application Tor makes PCWorld's top 100</a><br/>"
+"<a href=\"http://www.ieee-security.org/Cipher/Newsbriefs/2005/071805.html#TOR"
+"\"> Onion routing application Tor makes PCWorld's top 100</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -1313,9 +1293,9 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:614
 msgid ""
-"<a "
-"href=\"http://www.nzherald.co.nz/section/story.cfm?c_id=5&amp;objectid=10329896\"> "
-"China's internet censorship stranglehold can't last</a><br/>"
+"<a href=\"http://www.nzherald.co.nz/section/story.cfm?c_id=5&amp;"
+"objectid=10329896\"> China's internet censorship stranglehold can't last</"
+"a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -1336,7 +1316,7 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/tormedia.wml:632 /tmp/PK6vo8GxKk.xml:644
+#: /home/runa/tor/website/en/tormedia.wml:632 /tmp/uLd4tw3Mmn.xml:644
 msgid "2005 Jun 1"
 msgstr ""
 
@@ -1355,8 +1335,8 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:648
 msgid ""
-"<a href=\"http://lwn.net/Articles/138242/\"> A Look at The Onion Router "
-"(Tor)</a><br/>"
+"<a href=\"http://lwn.net/Articles/138242/\"> A Look at The Onion Router (Tor)"
+"</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -1365,7 +1345,7 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/tormedia.wml:658 /tmp/PK6vo8GxKk.xml:814
+#: /home/runa/tor/website/en/tormedia.wml:658 /tmp/uLd4tw3Mmn.xml:814
 msgid "Slashdot"
 msgstr ""
 
@@ -1411,16 +1391,15 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/tormedia.wml:688 /tmp/PK6vo8GxKk.xml:701
+#: /home/runa/tor/website/en/tormedia.wml:688 /tmp/uLd4tw3Mmn.xml:701
 msgid "2005 May 17"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:692
 msgid ""
-"<a "
-"href=\"http://www.wired.com/politics/security/news/2005/05/67542?currentPage=all\"> "
-"Tor Torches Online Tracking</a><br/> Also available in <a "
+"<a href=\"http://www.wired.com/politics/security/news/2005/05/67542?"
+"currentPage=all\"> Tor Torches Online Tracking</a><br/> Also available in <a "
 "href=\"http://wiredvision.jp/archives/200505/2005051904.html\">Japanese</a>."
 msgstr ""
 
@@ -1539,7 +1518,7 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/tormedia.wml:778 /tmp/PK6vo8GxKk.xml:789
+#: /home/runa/tor/website/en/tormedia.wml:778 /tmp/uLd4tw3Mmn.xml:789
 msgid "2004 Dec 23"
 msgstr ""
 
@@ -1590,9 +1569,9 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:815
 msgid ""
-"<a "
-"href=\"http://yro.slashdot.org/article.pl?sid=04/12/22/2031229&amp;tid=95&amp;tid=158&amp;tid=153&amp;tid=17\"> "
-"EFF Promotes Freenet-like System Tor</a><br/>"
+"<a href=\"http://yro.slashdot.org/article.pl?sid=04/12/22/2031229&amp;"
+"tid=95&amp;tid=158&amp;tid=153&amp;tid=17\"> EFF Promotes Freenet-like "
+"System Tor</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -1608,8 +1587,8 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:826
 msgid ""
-"<a href=\"http://www.alternet.org/columnists/story/20523/\"> Heavy "
-"Traffic</a><br/>"
+"<a href=\"http://www.alternet.org/columnists/story/20523/\"> Heavy Traffic</"
+"a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -1640,13 +1619,12 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:847
 msgid ""
-"<a "
-"href=\"http://www.eweek.com/c/a/Security/Dont-Fear-Internet-Anonymity-Tools/\"> "
-"Don't Fear Internet Anonymity Tools</a><br/>"
+"<a href=\"http://www.eweek.com/c/a/Security/Dont-Fear-Internet-Anonymity-"
+"Tools/\"> Don't Fear Internet Anonymity Tools</a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/tormedia.wml:854 /tmp/PK6vo8GxKk.xml:865
+#: /home/runa/tor/website/en/tormedia.wml:854 /tmp/uLd4tw3Mmn.xml:865
 msgid "2004 Aug 6"
 msgstr ""
 
@@ -1687,8 +1665,8 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/en/tormedia.wml:880
 msgid ""
-"<a href=\"http://www.networkworld.com/details/7088.html\"> Onion "
-"routing</a><br/>"
+"<a href=\"http://www.networkworld.com/details/7088.html\"> Onion routing</"
+"a><br/>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -1700,8 +1678,8 @@
 #: /home/runa/tor/website/en/tormedia.wml:891
 msgid ""
 "<a href=\"http://www.wired.com/politics/security/news/2004/08/64464\"> Onion "
-"Routing Averts Prying Eyes</a><br/> Also in <a "
-"href=\"http://hotwired.goo.ne.jp/news/news/technology/story/20040806301.html\">Japanese</a>."
+"Routing Averts Prying Eyes</a><br/> Also in <a href=\"http://hotwired.goo.ne."
+"jp/news/news/technology/story/20040806301.html\">Japanese</a>."
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>

Modified: translation/trunk/projects/website/templates/4-optional.translation-overview.pot
===================================================================
--- translation/trunk/projects/website/templates/4-optional.translation-overview.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/4-optional.translation-overview.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h1>
 #: /home/runa/tor/website/en/translation-overview.wml:9
@@ -21,7 +21,8 @@
 msgstr ""
 
 #. type: Content of: <div>
-#: /home/runa/tor/website/en/translation-overview.wml:10 /tmp/aihbvZFu6p.xml:32 /tmp/aihbvZFu6p.xml:177 /tmp/aihbvZFu6p.xml:235
+#: /home/runa/tor/website/en/translation-overview.wml:10
+#: /tmp/TgtyGxDxve.xml:32 /tmp/TgtyGxDxve.xml:177 /tmp/TgtyGxDxve.xml:235
 msgid "<hr />"
 msgstr ""
 
@@ -29,10 +30,9 @@
 #: /home/runa/tor/website/en/translation-overview.wml:13
 msgid ""
 "The Tor bundles include several different programs, all of which need "
-"translation help. In order of importance they are: <a href=\"<page "
-"vidalia/index>\">Vidalia</a>, <a href=\"<page "
-"torbutton/index>\">Torbutton</a>, and <a "
-"href=\"https://check.torproject.org/\">TorCheck</a>.  Please read the "
+"translation help. In order of importance they are: <a href=\"<page vidalia/"
+"index>\">Vidalia</a>, <a href=\"<page torbutton/index>\">Torbutton</a>, and "
+"<a href=\"https://check.torproject.org/\">TorCheck</a>.  Please read the "
 "sections below and help out. If you need help, please ask; we're always "
 "happy to lend a hand."
 msgstr ""
@@ -50,8 +50,7 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/en/translation-overview.wml:25
 msgid ""
-"<a href=\"#TranslatingTor\">Translating the Tor website and "
-"documentation</a>"
+"<a href=\"#TranslatingTor\">Translating the Tor website and documentation</a>"
 msgstr ""
 
 #. type: Content of: <div>
@@ -67,10 +66,10 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/translation-overview.wml:35
 msgid ""
-"The <a href=\"https://translation.torproject.org/\">Tor Translation "
-"Portal</a> is a website that lets users contribute translations online using "
-"their web browser. It lists all sentences or phrases (called \"strings\") "
-"used by a particular project, and allows interested volunteers to translate "
+"The <a href=\"https://translation.torproject.org/\">Tor Translation Portal</"
+"a> is a website that lets users contribute translations online using their "
+"web browser. It lists all sentences or phrases (called \"strings\") used by "
+"a particular project, and allows interested volunteers to translate "
 "individual sentences or phrases as they are able."
 msgstr ""
 
@@ -79,22 +78,19 @@
 msgid ""
 "You can check the status of all translations for a given project by visiting "
 "each project page.  The following statuses are updated in real time when new "
-"translations are added: <a "
-"href=\"https://translation.torproject.org/projects/vidalia/\">Vidalia</a>, "
-"<a "
-"href=\"https://translation.torproject.org/projects/torbutton/\">Torbutton</a>, "
-"and <a "
-"href=\"https://translation.torproject.org/projects/torcheck/\">TorCheck</a>."
+"translations are added: <a href=\"https://translation.torproject.org/"
+"projects/vidalia/\">Vidalia</a>, <a href=\"https://translation.torproject."
+"org/projects/torbutton/\">Torbutton</a>, and <a href=\"https://translation."
+"torproject.org/projects/torcheck/\">TorCheck</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/translation-overview.wml:53
 msgid ""
 "To get started using our translation website, you need to sign up for an "
-"account. Visit the <a "
-"href=\"https://translation.torproject.org/register.html\">account "
-"registration page</a> to get started. Be sure to enter a proper email "
-"address and a strong password. After you fill in the form and use the "
+"account. Visit the <a href=\"https://translation.torproject.org/register.html"
+"\">account registration page</a> to get started. Be sure to enter a proper "
+"email address and a strong password. After you fill in the form and use the "
 "'Register Account' button, you should see some text indicating that things "
 "worked out:"
 msgstr ""
@@ -121,10 +117,8 @@
 "A Pootle account has been created for you using this email address.\n"
 "Your activation code is:\n"
 "36074ec543c1fa23ceeaf8e187dfa43e\n"
-"This message is sent to verify that the email address is in fact "
-"correct. If\n"
-"you did not want to register an account, you may simply ignore the "
-"message.\n"
+"This message is sent to verify that the email address is in fact correct. If\n"
+"you did not want to register an account, you may simply ignore the message.\n"
 "Your user name is: example_user\n"
 "Your password is: example_user\n"
 "Your registered email address is: username at example.com\n"
@@ -134,11 +128,10 @@
 #: /home/runa/tor/website/en/translation-overview.wml:80
 msgid ""
 "Once you've received the email, you'll need to activate your account by "
-"visiting the <a "
-"href=\"https://translation.torproject.org/activate.html\">activation "
-"page</a>.  Enter your username and activation code into the form and then "
-"submit the form by pressing the \"Activate Account\" button.  You'll see a "
-"message that says:"
+"visiting the <a href=\"https://translation.torproject.org/activate.html"
+"\">activation page</a>.  Enter your username and activation code into the "
+"form and then submit the form by pressing the \"Activate Account\" button.  "
+"You'll see a message that says:"
 msgstr ""
 
 #. type: Content of: <div><pre>
@@ -153,12 +146,12 @@
 #: /home/runa/tor/website/en/translation-overview.wml:93
 msgid ""
 "When you login to your new account, you'll be prompted to configure your "
-"basic language preferences on the <a "
-"href=\"https://translation.torproject.org/home/options.html\">options "
-"page</a>. At the very least, you'll want to select the user interface "
-"language, select any of the projects you're interested in translating, and "
-"additionally the languages you wish to translate. Save your changes by "
-"clicking the \"Save Changes\" button when you're finished."
+"basic language preferences on the <a href=\"https://translation.torproject."
+"org/home/options.html\">options page</a>. At the very least, you'll want to "
+"select the user interface language, select any of the projects you're "
+"interested in translating, and additionally the languages you wish to "
+"translate. Save your changes by clicking the \"Save Changes\" button when "
+"you're finished."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -169,22 +162,21 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/translation-overview.wml:107
 msgid ""
-"At this point, you can select a project, such as <a "
-"href=\"https://translation.torproject.org/projects/vidalia/\">Vidalia</a>. "
-"You'll see a nice list of all of the currently supported languages along "
-"with the current translation progress. Select a language &mdash; in our "
-"example, you'll click <a "
-"href=\"https://translation.torproject.org/de/vidalia/\">German</a>. The next "
-"page should show you a single row of data for the file \"<a "
-"href='https://translation.torproject.org/de/vidalia/vidalia_de.po?translate=1&amp;view=1'>vidalia_de.po</a>\".  "
-"This is the file with all of the currently translated German strings for "
-"Vidalia. You should click on the \"<a "
-"href='https://translation.torproject.org/de/vidalia/index.html?editing=1'>Show "
-"Editing Functions</a>\" link above the 'vidalia_de.po' row. Next you should "
-"click the \"<a "
-"href='https://translation.torproject.org/de/vidalia/translate.html?fuzzy=1&amp;editing=1&amp;blank=1'>Quick "
-"Translate</a>\" link. This will take you to the first untranslated string in "
-"the language group for the current project."
+"At this point, you can select a project, such as <a href=\"https://"
+"translation.torproject.org/projects/vidalia/\">Vidalia</a>. You'll see a "
+"nice list of all of the currently supported languages along with the current "
+"translation progress. Select a language &mdash; in our example, you'll click "
+"<a href=\"https://translation.torproject.org/de/vidalia/\">German</a>. The "
+"next page should show you a single row of data for the file \"<a "
+"href='https://translation.torproject.org/de/vidalia/vidalia_de.po?"
+"translate=1&amp;view=1'>vidalia_de.po</a>\".  This is the file with all of "
+"the currently translated German strings for Vidalia. You should click on the "
+"\"<a href='https://translation.torproject.org/de/vidalia/index.html?"
+"editing=1'>Show Editing Functions</a>\" link above the 'vidalia_de.po' row. "
+"Next you should click the \"<a href='https://translation.torproject.org/de/"
+"vidalia/translate.html?fuzzy=1&amp;editing=1&amp;blank=1'>Quick Translate</a>"
+"\" link. This will take you to the first untranslated string in the language "
+"group for the current project."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -200,14 +192,14 @@
 #: /home/runa/tor/website/en/translation-overview.wml:133
 msgid ""
 "When you're finished, you need to commit your changes. Return to the page "
-"with the <a "
-"href=\"https://translation.torproject.org/de/vidalia/index.html?editing=1\">Editing "
-"Functions</a>, and click on the \"<a "
-"href='https://translation.torproject.org/de/vidalia/index.html?editing=1&amp;docommit=1&amp;commitfile=vidalia_de.po'>Commit</a>\" "
-"link. This will commit your changes into the <a "
-"href=\"https://svn.torproject.org/svn/translation/trunk/projects/vidalia/de/\">Translation "
-"subversion module</a> in the specific area as specified by your choices of "
-"language and project (Vidalia and German, for this example)."
+"with the <a href=\"https://translation.torproject.org/de/vidalia/index.html?"
+"editing=1\">Editing Functions</a>, and click on the \"<a href='https://"
+"translation.torproject.org/de/vidalia/index.html?editing=1&amp;"
+"docommit=1&amp;commitfile=vidalia_de.po'>Commit</a>\" link. This will commit "
+"your changes into the <a href=\"https://svn.torproject.org/svn/translation/"
+"trunk/projects/vidalia/de/\">Translation subversion module</a> in the "
+"specific area as specified by your choices of language and project (Vidalia "
+"and German, for this example)."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -220,9 +212,8 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/translation-overview.wml:150
 msgid ""
-"If your language isn't in the list of options yet, send mail to <a "
-"href=\"<page contact>\">the tor-translations team</a> and we'll add it for "
-"you."
+"If your language isn't in the list of options yet, send mail to <a href="
+"\"<page contact>\">the tor-translations team</a> and we'll add it for you."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -230,20 +221,18 @@
 msgid ""
 "For more advanced users who like to translate without a web browser, you can "
 "also download the .po file directly. You'll find this option after clicking "
-"on the \"<a "
-"href='https://translation.torproject.org/de/vidalia/index.html?editing=1'>Show "
-"Editing Functions</a>\" link. You should see a link to download the \"<a "
-"href=\"https://translation.torproject.org/de/vidalia/vidalia_de.po\">PO "
-"file</a>\".  If this option fits your working habits, by all means, please "
-"use it! You may find a program called <a "
-"href=\"http://www.poedit.net/\">Poedit</a> to make the job easier, "
-"especially for right-to-left languages that don't work as well in text "
-"editors. If you're using Poedit, you should disable compiling .mo files in "
-"Poedit's preferences (File -&gt; Preferences -&gt; Editor -&gt; Behavior, "
-"uncheck \"Automatically compile .mo file on save\").  When you're finished "
-"translating the .po file, you can upload it by using the \"upload file\" "
-"form in the upper right hand corner: simply select the file and click the "
-"'Upload file' button."
+"on the \"<a href='https://translation.torproject.org/de/vidalia/index.html?"
+"editing=1'>Show Editing Functions</a>\" link. You should see a link to "
+"download the \"<a href=\"https://translation.torproject.org/de/vidalia/"
+"vidalia_de.po\">PO file</a>\".  If this option fits your working habits, by "
+"all means, please use it! You may find a program called <a href=\"http://www."
+"poedit.net/\">Poedit</a> to make the job easier, especially for right-to-"
+"left languages that don't work as well in text editors. If you're using "
+"Poedit, you should disable compiling .mo files in Poedit's preferences (File "
+"-&gt; Preferences -&gt; Editor -&gt; Behavior, uncheck \"Automatically "
+"compile .mo file on save\").  When you're finished translating the .po file, "
+"you can upload it by using the \"upload file\" form in the upper right hand "
+"corner: simply select the file and click the 'Upload file' button."
 msgstr ""
 
 #. type: Content of: <div>
@@ -279,20 +268,19 @@
 "translating the original English into.  You can download the NSI "
 "localization files from the Vidalia subversion repository. For more "
 "information on translating the Win32 installer, please see the corresponding "
-"instructional <a "
-"href=\"http://trac.vidalia-project.net/wiki/Translations#TranslateInstallers\"> "
-"page on the Vidalia wiki</a>. It's a useful page that explains step by step "
-"information for translation, encoding and submission for inclusion in the "
-"next release. You'll also notice that the wiki page lists translators - "
-"we're especially in need of Farsi and Hebrew translators. Perhaps you're the "
-"one?"
+"instructional <a href=\"http://trac.vidalia-project.net/wiki/"
+"Translations#TranslateInstallers\"> page on the Vidalia wiki</a>. It's a "
+"useful page that explains step by step information for translation, encoding "
+"and submission for inclusion in the next release. You'll also notice that "
+"the wiki page lists translators - we're especially in need of Farsi and "
+"Hebrew translators. Perhaps you're the one?"
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/translation-overview.wml:204
 msgid ""
-"Last but certainly not least, Vidalia requires diligent <a "
-"href=\"http://trac.vidalia-project.net/wiki/Translations#AvailableHelpTranslations\"> "
+"Last but certainly not least, Vidalia requires diligent <a href=\"http://"
+"trac.vidalia-project.net/wiki/Translations#AvailableHelpTranslations\"> "
 "translation of its <b>help documents</b></a>. This is important to ensure "
 "that users fully understand the choices that they make and so they "
 "understand the choices the software makes on their behalf. We're currently "
@@ -303,27 +291,24 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/translation-overview.wml:213
 msgid ""
-"Torbutton (like Vidalia and TorCheck) translation is managed by the <a "
-"href=\"https://translation.torproject.org/\">Tor Translation Portal</a>. You "
-"can easily view the status of all translations on the <a "
-"href=\"https://translation.torproject.org/projects/torbutton/\">Portal "
-"status page for Torbutton</a>. Torbutton is also <a "
-"href=\"https://svn.torproject.org/svn/translation/trunk/projects/torbutton/\">in "
-"subversion</a> like Vidalia and TorCheck.  Please visit the Portal page for "
-"<a "
-"href=\"https://translation.torproject.org/projects/torbutton/\">Torbutton</a> "
-"and pick a locale to translate.  (You'll have to create an account and log "
-"in.)"
+"Torbutton (like Vidalia and TorCheck) translation is managed by the <a href="
+"\"https://translation.torproject.org/\">Tor Translation Portal</a>. You can "
+"easily view the status of all translations on the <a href=\"https://"
+"translation.torproject.org/projects/torbutton/\">Portal status page for "
+"Torbutton</a>. Torbutton is also <a href=\"https://svn.torproject.org/svn/"
+"translation/trunk/projects/torbutton/\">in subversion</a> like Vidalia and "
+"TorCheck.  Please visit the Portal page for <a href=\"https://translation."
+"torproject.org/projects/torbutton/\">Torbutton</a> and pick a locale to "
+"translate.  (You'll have to create an account and log in.)"
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/translation-overview.wml:225
 msgid ""
-"If you're unsure about how to use the <a "
-"href=\"https://translation.torproject.org/\">Tor Translation Portal</a> to "
-"translate Torbutton, please read <a href=\"#TTPVidalia\">our example "
-"walkthrough with Vidalia</a>. Torbutton uses the same system with the same "
-"processes."
+"If you're unsure about how to use the <a href=\"https://translation."
+"torproject.org/\">Tor Translation Portal</a> to translate Torbutton, please "
+"read <a href=\"#TTPVidalia\">our example walkthrough with Vidalia</a>. "
+"Torbutton uses the same system with the same processes."
 msgstr ""
 
 #. type: Content of: <div>
@@ -345,6 +330,6 @@
 "and documentation on our <a href=\"<page translation>\">main website "
 "translation page</a>. The guidelines there also provide good advice for the "
 "other translation items on this page. The current status of the website "
-"translations can be found on our <a href=\"<page "
-"translation-status>\">website translation status page</a>."
+"translations can be found on our <a href=\"<page translation-status>"
+"\">website translation status page</a>."
 msgstr ""

Modified: translation/trunk/projects/website/templates/4-optional.translation.pot
===================================================================
--- translation/trunk/projects/website/templates/4-optional.translation.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/4-optional.translation.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/translation.wml:9
@@ -39,8 +39,8 @@
 "If you would like to help translate other Tor project related information, "
 "please visit our <a href=\"<page translation-overview>\">Translation "
 "Overview</a> for a clear overview of what needs translation help. If you're "
-"stuck, please contact us via email: <tt>tor-translation AT "
-"torproject.org</tt>."
+"stuck, please contact us via email: <tt>tor-translation AT torproject.org</"
+"tt>."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -62,11 +62,11 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/translation.wml:38
 msgid ""
-"Look in <a href=\"<svnwebsite>en/\"><svnwebsite>en/</a> for a set of "
-"\".wml\" files. The most important ones to translate are listed as \"high "
-"priority\", \"medium priority\", and \"low priority\" on the <a href=\"<page "
-"translation-status>\">translation status</a> page.  You can look at <a "
-"href=\"<svnwebsite>de/\"><svnwebsite>de/</a> for examples of the desired "
+"Look in <a href=\"<svnwebsite>en/\"><svnwebsite>en/</a> for a set of \".wml"
+"\" files. The most important ones to translate are listed as \"high priority"
+"\", \"medium priority\", and \"low priority\" on the <a href=\"<page "
+"translation-status>\">translation status</a> page.  You can look at <a href="
+"\"<svnwebsite>de/\"><svnwebsite>de/</a> for examples of the desired "
 "translation formats."
 msgstr ""
 
@@ -74,12 +74,12 @@
 #: /home/runa/tor/website/en/translation.wml:48
 msgid ""
 "The first line in the translated file should be<br /> \\# Based-On-Revision: "
-"13000<br /> where 13000 is the revision number of the original English "
-"page. This lets you easily spot when a page gets out of date. The revision "
-"number is found at the top on each page -- you can either look at the files "
-"in the <a href=\"<svnwebsite>en/\"><svnwebsite>en/</a> directory, or "
-"manually <a href=\"<page documentation>#Developers\">checkout</a> the latest "
-"version of the website."
+"13000<br /> where 13000 is the revision number of the original English page. "
+"This lets you easily spot when a page gets out of date. The revision number "
+"is found at the top on each page -- you can either look at the files in the "
+"<a href=\"<svnwebsite>en/\"><svnwebsite>en/</a> directory, or manually <a "
+"href=\"<page documentation>#Developers\">checkout</a> the latest version of "
+"the website."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -113,13 +113,12 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/translation.wml:74
 msgid ""
-"Use valid <a "
-"href=\"http://roselli.org/adrian/articles/character_charts.asp\">character "
-"entities</a>.  Even though most browsers display the characters correctly "
-"these days, we want to be on the safe side, so we don't get bug reports from "
-"people who can't read the text. If you need to use a character set other "
-"than ISO-8859-1, add something like <code>CHARSET=\"UTF-8\"</code> to the "
-"end of the line that starts with <code>#include \"head.wmi\"</code>."
+"Use valid <a href=\"http://roselli.org/adrian/articles/character_charts.asp"
+"\">character entities</a>.  Even though most browsers display the characters "
+"correctly these days, we want to be on the safe side, so we don't get bug "
+"reports from people who can't read the text. If you need to use a character "
+"set other than ISO-8859-1, add something like <code>CHARSET=\"UTF-8\"</code> "
+"to the end of the line that starts with <code>#include \"head.wmi\"</code>."
 msgstr ""
 
 #. type: Content of: <div><ol><li>

Modified: translation/trunk/projects/website/templates/4-optional.volunteer.pot
===================================================================
--- translation/trunk/projects/website/templates/4-optional.volunteer.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/4-optional.volunteer.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/en/volunteer.wml:10
@@ -30,8 +30,8 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:14
 msgid ""
-"Tell your friends! Get them to run relays. Get them to run hidden "
-"services. Get them to tell their friends."
+"Tell your friends! Get them to run relays. Get them to run hidden services. "
+"Get them to tell their friends."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -66,10 +66,10 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:30
 msgid ""
-"We need more and better ways to intercept DNS requests so they don't "
-"\"leak\" their request to a local observer while we're trying to be "
-"anonymous. (This happens because the application does the DNS resolve before "
-"going to the SOCKS proxy.)"
+"We need more and better ways to intercept DNS requests so they don't \"leak"
+"\" their request to a local observer while we're trying to be anonymous. "
+"(This happens because the application does the DNS resolve before going to "
+"the SOCKS proxy.)"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -102,8 +102,7 @@
 "day. Rather than coding this inside Tor, we should have a little script that "
 "speaks via the <a href=\"<page gui/index>\">Tor Controller Interface</a>, "
 "and does a setconf to change the bandwidth rate. There is one for Unix and "
-"Mac already (it uses bash and cron), but Windows users still need a "
-"solution."
+"Mac already (it uses bash and cron), but Windows users still need a solution."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -174,9 +173,9 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:76
 msgid ""
-"Evaluate and document <a "
-"href=\"https://wiki.torproject.org/wiki/TheOnionRouter/TorifyHOWTO\">our "
-"list of programs</a> that can be configured to use Tor."
+"Evaluate and document <a href=\"https://wiki.torproject.org/wiki/"
+"TheOnionRouter/TorifyHOWTO\">our list of programs</a> that can be configured "
+"to use Tor."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -191,10 +190,10 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:83
 msgid ""
-"We have a huge list of <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/SupportPrograms\">potentially "
-"useful programs that interface to Tor</a>. Which ones are useful in which "
-"situations? Please help us test them out and document your results."
+"We have a huge list of <a href=\"https://wiki.torproject.org/noreply/"
+"TheOnionRouter/SupportPrograms\">potentially useful programs that interface "
+"to Tor</a>. Which ones are useful in which situations? Please help us test "
+"them out and document your results."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -219,11 +218,11 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/en/volunteer.wml:98
 msgid ""
-"You may find some of these projects to be good <a href=\"<page "
-"gsoc>\">Google Summer of Code 2009</a> ideas. We have labelled each idea "
-"with how useful it would be to the overall Tor project (priority), how much "
-"work we expect it would be (effort level), how much clue you should start "
-"with (skill level), and which of our <a href=\"<page people>#Core\">core "
+"You may find some of these projects to be good <a href=\"<page gsoc>"
+"\">Google Summer of Code 2009</a> ideas. We have labelled each idea with how "
+"useful it would be to the overall Tor project (priority), how much work we "
+"expect it would be (effort level), how much clue you should start with "
+"(skill level), and which of our <a href=\"<page people>#Core\">core "
 "developers</a> would be good mentors.  If one or more of these ideas looks "
 "promising to you, please <a href=\"<page contact>\">contact us</a> to "
 "discuss your plans rather than sending blind applications. You may also want "
@@ -262,12 +261,11 @@
 "Effort Level: <i>Medium</i> <br /> Skill Level: <i>Medium</i> <br /> Likely "
 "Mentors: <i>Jacob</i> <br /> The Tor Project has been working over the past "
 "year to set up web-based tools to help volunteers translate our applications "
-"into other languages.  We finally hit upon Pootle, and we have a fine "
-"web-based translation engine in place for Vidalia, Torbutton, and "
-"Torcheck. However, Pootle only translates strings that are in the \"po\" "
-"format, and our website uses wml files. This project is about finding a way "
-"to convert our wml files into po strings and back, so they can be handled by "
-"Pootle."
+"into other languages.  We finally hit upon Pootle, and we have a fine web-"
+"based translation engine in place for Vidalia, Torbutton, and Torcheck. "
+"However, Pootle only translates strings that are in the \"po\" format, and "
+"our website uses wml files. This project is about finding a way to convert "
+"our wml files into po strings and back, so they can be handled by Pootle."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -284,10 +282,9 @@
 "showing up and relays shutting off? Periodically people collect brief "
 "snapshots, but where it gets really interesting is when we start tracking "
 "data points over time.  <br /> Data could be collected from the Tor Network "
-"Scanners in <a "
-"href=\"https://svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a>, "
-"from the server descriptors that each relay publishes, and from other "
-"sources. Results over time could be integrated into one of the <a "
+"Scanners in <a href=\"https://svn.torproject.org/svn/torflow/trunk/README"
+"\">TorFlow</a>, from the server descriptors that each relay publishes, and "
+"from other sources. Results over time could be integrated into one of the <a "
 "href=\"https://torstatus.blutmagie.de/\">Tor Status</a> web pages, or be "
 "kept separate. Speaking of the Tor Status pages, take a look at Roger's <a "
 "href=\"http://archives.seul.org/or/talk/Jan-2008/msg00300.html\">Tor Status "
@@ -300,27 +297,26 @@
 "<b>Improving Tor's ability to resist censorship</b> <br /> Priority: "
 "<i>Medium to High</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: "
 "<i>High</i> <br /> Likely Mentors: <i>Nick, Roger, Steven</i> <br /> The Tor "
-"0.2.0.x series makes <a "
-"href=\"<svnsandbox>doc/design-paper/blocking.html\">significant "
-"improvements</a> in resisting national and organizational censorship.  But "
-"Tor still needs better mechanisms for some parts of its anti-censorship "
-"design.  For example, current Tors can only listen on a single address/port "
-"combination at a time.  There's <a "
-"href=\"<svnsandbox>doc/spec/proposals/118-multiple-orports.txt\">a proposal "
-"to address this limitation</a> and allow clients to connect to any given Tor "
-"on multiple addresses and ports, but it needs more work.  Another "
-"anti-censorship project (far more difficult) is to try to make Tor more "
-"scanning-resistant.  Right now, an adversary can identify <a "
-"href=\"<svnsandbox>doc/spec/proposals/125-bridges.txt\">Tor bridges</a> just "
-"by trying to connect to them, following the Tor protocol, and seeing if they "
-"respond.  To solve this, bridges could <a "
-"href=\"<svnsandbox>doc/design-paper/blocking.html#tth_sEc9.3\">act like "
-"webservers</a> (HTTP or HTTPS) when contacted by port-scanning tools, and "
-"not act like bridges until the user provides a bridge-specific key.  <br /> "
-"This project involves a lot of research and design. One of the big "
-"challenges will be identifying and crafting approaches that can still resist "
-"an adversary even after the adversary knows the design, and then trading off "
-"censorship resistance with usability and robustness."
+"0.2.0.x series makes <a href=\"<svnsandbox>doc/design-paper/blocking.html"
+"\">significant improvements</a> in resisting national and organizational "
+"censorship.  But Tor still needs better mechanisms for some parts of its "
+"anti-censorship design.  For example, current Tors can only listen on a "
+"single address/port combination at a time.  There's <a href="
+"\"<svnsandbox>doc/spec/proposals/118-multiple-orports.txt\">a proposal to "
+"address this limitation</a> and allow clients to connect to any given Tor on "
+"multiple addresses and ports, but it needs more work.  Another anti-"
+"censorship project (far more difficult) is to try to make Tor more scanning-"
+"resistant.  Right now, an adversary can identify <a href=\"<svnsandbox>doc/"
+"spec/proposals/125-bridges.txt\">Tor bridges</a> just by trying to connect "
+"to them, following the Tor protocol, and seeing if they respond.  To solve "
+"this, bridges could <a href=\"<svnsandbox>doc/design-paper/blocking."
+"html#tth_sEc9.3\">act like webservers</a> (HTTP or HTTPS) when contacted by "
+"port-scanning tools, and not act like bridges until the user provides a "
+"bridge-specific key.  <br /> This project involves a lot of research and "
+"design. One of the big challenges will be identifying and crafting "
+"approaches that can still resist an adversary even after the adversary knows "
+"the design, and then trading off censorship resistance with usability and "
+"robustness."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -349,35 +345,34 @@
 msgid ""
 "<b>Improving Polipo on Windows</b> <br /> Priority: <i>Medium to High</i> "
 "<br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Medium</i> <br /> "
-"Likely Mentors: <i>Martin</i> <br /> Help port <a "
-"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> to "
-"Windows. Example topics to tackle include: 1) the ability to asynchronously "
-"query name servers, find the system nameservers, and manage netbios and dns "
-"queries.  2) manage events and buffers natively (i.e. in Unix-like OSes, "
-"Polipo defaults to 25% of ram, in Windows it's whatever the config "
-"specifies). 3) some sort of GUI config and reporting tool, bonus if it has a "
-"systray icon with right clickable menu options. Double bonus if it's "
-"cross-platform compatible.  4) allow the software to use the Windows "
-"Registry and handle proper Windows directory locations, such as "
-"\"C:\\Program Files\\Polipo\""
+"Likely Mentors: <i>Martin</i> <br /> Help port <a href=\"http://www.pps."
+"jussieu.fr/~jch/software/polipo/\">Polipo</a> to Windows. Example topics to "
+"tackle include: 1) the ability to asynchronously query name servers, find "
+"the system nameservers, and manage netbios and dns queries.  2) manage "
+"events and buffers natively (i.e. in Unix-like OSes, Polipo defaults to 25% "
+"of ram, in Windows it's whatever the config specifies). 3) some sort of GUI "
+"config and reporting tool, bonus if it has a systray icon with right "
+"clickable menu options. Double bonus if it's cross-platform compatible.  4) "
+"allow the software to use the Windows Registry and handle proper Windows "
+"directory locations, such as \"C:\\Program Files\\Polipo\""
 msgstr ""
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:289
 msgid ""
-"<b>Implement a torrent-based scheme for downloading Thandy packages</b> <br "
-"/> Priority: <i>Medium to High</i> <br /> Effort Level: <i>High</i> <br /> "
-"Skill Level: <i>Medium to High</i> <br /> Likely Mentors: <i>Martin, "
-"Nick</i> <br /> <a "
-"href=\"https://git.torproject.org/checkout/thandy/master/specs/thandy-spec.txt\">Thandy</a> "
-"is a relatively new software to allow assisted updates of Tor and related "
-"software. Currently, there are very few users, but we expect Thandy to be "
-"used by almost every Tor user in the future. To avoid crashing servers on "
-"the day of a Tor update, we need new ways to distribute new packages "
-"efficiently, and using libtorrent seems to be a possible solution. If you "
-"think of other good ideas, great - please do let us know!<br /> We also need "
-"to investigate how to include our mirrors better. If possible, there should "
-"be an easy way for them to help distributing the packages."
+"<b>Implement a torrent-based scheme for downloading Thandy packages</b> <br /"
+"> Priority: <i>Medium to High</i> <br /> Effort Level: <i>High</i> <br /> "
+"Skill Level: <i>Medium to High</i> <br /> Likely Mentors: <i>Martin, Nick</"
+"i> <br /> <a href=\"https://git.torproject.org/checkout/thandy/master/specs/"
+"thandy-spec.txt\">Thandy</a> is a relatively new software to allow assisted "
+"updates of Tor and related software. Currently, there are very few users, "
+"but we expect Thandy to be used by almost every Tor user in the future. To "
+"avoid crashing servers on the day of a Tor update, we need new ways to "
+"distribute new packages efficiently, and using libtorrent seems to be a "
+"possible solution. If you think of other good ideas, great - please do let "
+"us know!<br /> We also need to investigate how to include our mirrors "
+"better. If possible, there should be an easy way for them to help "
+"distributing the packages."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -408,29 +403,28 @@
 "some C++ development experience. Previous experience with Qt and Qt's "
 "Designer will be very helpful, but are not required. Some English writing "
 "ability will also be useful, since this project will likely involve writing "
-"small amounts of help documentation that should be understandable by "
-"non-technical users. Bonus points for some graphic design/Photoshop fu, "
-"since we might want/need some shiny new icons too."
+"small amounts of help documentation that should be understandable by non-"
+"technical users. Bonus points for some graphic design/Photoshop fu, since we "
+"might want/need some shiny new icons too."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:355
 msgid ""
-"<b>Improve our unit testing process</b> <br /> Priority: <i>Medium</i> <br "
-"/> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Medium</i> <br /> "
-"Likely Mentors: <i>Nick, Roger</i> <br /> Tor needs to be far more "
-"tested. This is a multi-part effort. To start with, our unit test coverage "
-"should rise substantially, especially in the areas outside the utility "
-"functions. This will require significant refactoring of some parts of Tor, "
-"in order to dissociate as much logic as possible from globals.  <br /> "
-"Additionally, we need to automate our performance testing. We've got "
-"buildbot to automate our regular integration and compile testing already "
-"(though we need somebody to set it up on Windows), but we need to get our "
-"network simulation tests (as built in <a "
-"href=\"https://svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a>)  "
-"updated for more recent versions of Tor, and designed to launch a test "
-"network either on a single machine, or across several, so we can test "
-"changes in performance on machines in different roles automatically."
+"<b>Improve our unit testing process</b> <br /> Priority: <i>Medium</i> <br /"
+"> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Medium</i> <br /> "
+"Likely Mentors: <i>Nick, Roger</i> <br /> Tor needs to be far more tested. "
+"This is a multi-part effort. To start with, our unit test coverage should "
+"rise substantially, especially in the areas outside the utility functions. "
+"This will require significant refactoring of some parts of Tor, in order to "
+"dissociate as much logic as possible from globals.  <br /> Additionally, we "
+"need to automate our performance testing. We've got buildbot to automate our "
+"regular integration and compile testing already (though we need somebody to "
+"set it up on Windows), but we need to get our network simulation tests (as "
+"built in <a href=\"https://svn.torproject.org/svn/torflow/trunk/README"
+"\">TorFlow</a>)  updated for more recent versions of Tor, and designed to "
+"launch a test network either on a single machine, or across several, so we "
+"can test changes in performance on machines in different roles automatically."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -439,10 +433,10 @@
 "<b>Help revive an independent Tor client implementation</b> <br /> Priority: "
 "<i>Medium</i> <br /> Effort Level: <i>High</i> <br /> Skill Level: <i>Medium "
 "to High</i> <br /> Likely Mentors: <i>Karsten, Nick</i> <br /> Reanimate one "
-"of the approaches to implement a Tor client in Java, e.g. the <a "
-"href=\"http://onioncoffee.sourceforge.net/\">OnionCoffee project</a>, and "
-"make it run on <a href=\"http://code.google.com/android/\">Android</a>. The "
-"first step would be to port the existing code and execute it in an Android "
+"of the approaches to implement a Tor client in Java, e.g. the <a href="
+"\"http://onioncoffee.sourceforge.net/\">OnionCoffee project</a>, and make it "
+"run on <a href=\"http://code.google.com/android/\">Android</a>. The first "
+"step would be to port the existing code and execute it in an Android "
 "environment. Next, the code should be updated to support the newer Tor "
 "protocol versions like the <a href=\"<svnsandbox>doc/spec/dir-spec.txt\">v3 "
 "directory protocol</a>. Further, support for requesting or even providing "
@@ -459,24 +453,22 @@
 msgid ""
 "<b>New Torbutton Features</b> <br /> Priority: <i>Medium</i> <br /> Effort "
 "Level: <i>High</i> <br /> Skill Level: <i>High</i> <br /> Likely Mentors: "
-"<i>Mike</i> <br/> There are several <a "
-"href=\"https://bugs.torproject.org/flyspray/index.php?tasks=all&amp;project=5&amp;type=2\">good "
-"feature requests</a> on the Torbutton Flyspray section. In particular, <a "
-"href=\"https://bugs.torproject.org/flyspray/index.php?do=details&amp;id=523\">Integrating "
-"'New Identity' with Vidalia</a>, <a "
-"href=\"https://bugs.torproject.org/flyspray/index.php?do=details&amp;id=940\">ways "
-"of managing multiple cookie jars/identities</a>, <a "
-"href=\"https://bugs.torproject.org/flyspray/index.php?do=details&amp;id=637\">preserving "
-"specific cookies</a> when cookies are cleared, <a "
-"href=\"https://bugs.torproject.org/flyspray/index.php?do=details&amp;id=524\">better "
-"referrer spoofing</a>, <a "
-"href=\"https://bugs.torproject.org/flyspray/index.php?do=details&amp;id=564\">correct "
-"Tor status reporting</a>, and <a "
-"href=\"https://bugs.torproject.org/flyspray/index.php?do=details&amp;id=462\">\"tor://\" "
-"and \"tors://\" urls</a> are all interesting features that could be added.  "
-"<br /> This work would be independent coding in Javascript and the fun world "
-"of <a "
-"href=\"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul\">XUL</a>, "
+"<i>Mike</i> <br/> There are several <a href=\"https://bugs.torproject.org/"
+"flyspray/index.php?tasks=all&amp;project=5&amp;type=2\">good feature "
+"requests</a> on the Torbutton Flyspray section. In particular, <a href="
+"\"https://bugs.torproject.org/flyspray/index.php?do=details&amp;id=523"
+"\">Integrating 'New Identity' with Vidalia</a>, <a href=\"https://bugs."
+"torproject.org/flyspray/index.php?do=details&amp;id=940\">ways of managing "
+"multiple cookie jars/identities</a>, <a href=\"https://bugs.torproject.org/"
+"flyspray/index.php?do=details&amp;id=637\">preserving specific cookies</a> "
+"when cookies are cleared, <a href=\"https://bugs.torproject.org/flyspray/"
+"index.php?do=details&amp;id=524\">better referrer spoofing</a>, <a href="
+"\"https://bugs.torproject.org/flyspray/index.php?do=details&amp;id=564"
+"\">correct Tor status reporting</a>, and <a href=\"https://bugs.torproject."
+"org/flyspray/index.php?do=details&amp;id=462\">\"tor://\" and \"tors://\" "
+"urls</a> are all interesting features that could be added.  <br /> This work "
+"would be independent coding in Javascript and the fun world of <a href="
+"\"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul\">XUL</a>, "
 "with not too much involvement in the Tor internals."
 msgstr ""
 
@@ -488,30 +480,30 @@
 "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: 1) Integration "
-"of the <a "
-"href=\"http://chandlerproject.org/Projects/MeTooCrypto\">MeTooCrypto Python "
-"library</a> for authenticated HTTPS downloads. 2) 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.  3) "
-"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."
+"of the <a href=\"http://chandlerproject.org/Projects/MeTooCrypto"
+"\">MeTooCrypto Python library</a> for authenticated HTTPS downloads. 2) "
+"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.  3) 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:473
 msgid ""
-"<b>Simulator for slow Internet connections</b> <br /> Priority: "
-"<i>Medium</i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: "
-"<i>Medium</i> <br /> Likely Mentors: <i>Steven</i> <br /> Many users of Tor "
-"have poor-quality Internet connections, giving low bandwidth, high latency, "
-"and high packet loss/re-ordering. User experience is that Tor reacts badly "
-"to these conditions, but it is difficult to improve the situation without "
-"being able to repeat the problems in the lab.  <br /> This project would be "
-"to build a simulation environment which replicates the poor connectivity so "
-"that the effect on Tor performance can be measured. Other components would "
-"be a testing utility to establish what are the properties of connections "
+"<b>Simulator for slow Internet connections</b> <br /> Priority: <i>Medium</"
+"i> <br /> Effort Level: <i>Medium</i> <br /> Skill Level: <i>Medium</i> <br /"
+"> Likely Mentors: <i>Steven</i> <br /> Many users of Tor have poor-quality "
+"Internet connections, giving low bandwidth, high latency, and high packet "
+"loss/re-ordering. User experience is that Tor reacts badly to these "
+"conditions, but it is difficult to improve the situation without being able "
+"to repeat the problems in the lab.  <br /> This project would be to build a "
+"simulation environment which replicates the poor connectivity so that the "
+"effect on Tor performance can be measured. Other components would be a "
+"testing utility to establish what are the properties of connections "
 "available, and to measure the effect of performance-improving modifications "
 "to Tor.  <br /> The tools used would be up to the student, but dummynet (for "
 "FreeBSD)  and nistnet (for Linux) are two potential components on which this "
@@ -540,9 +532,8 @@
 "into Vidalia and customize Marble to be better suited for our application, "
 "such as making circuits clickable, storing cached map data in Vidalia's own "
 "data directory, and customizing some of the widget's dialogs.  <br /> A "
-"person undertaking this project should have good C++ development "
-"experience. Previous experience with Qt and CMake is helpful, but not "
-"required."
+"person undertaking this project should have good C++ development experience. "
+"Previous experience with Qt and CMake is helpful, but not required."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -550,26 +541,26 @@
 msgid ""
 "<b>Bring moniTor to life</b> <br /> Priority: <i>Low</i> <br /> Effort "
 "Level: <i>Medium</i> <br /> Skill Level: <i>Low to Medium</i> <br /> Likely "
-"Mentors: <i>Karsten, Jacob</i> <br /> Implement a <a "
-"href=\"http://www.ss64.com/bash/top.html\">top-like</a> management tool for "
-"Tor relays. The purpose of such a tool would be to monitor a local Tor relay "
-"via its control port and include useful system information of the underlying "
-"machine. When running this tool, it would dynamically update its content "
-"like top does for Linux processes.  <a "
-"href=\"http://archives.seul.org/or/dev/Jan-2008/msg00005.html\">This or-dev "
-"post</a> might be a good first read.  <br /> A person interested in this "
-"should be familiar with or willing to learn about administering a Tor relay "
-"and configuring it via its control port. As an initial prototype is written "
-"in Python, some knowledge about writing Python code would be helpful, "
-"too. This project is one part about identifying requirements to such a tool "
-"and designing its interface, and one part lots of coding."
+"Mentors: <i>Karsten, Jacob</i> <br /> Implement a <a href=\"http://www.ss64."
+"com/bash/top.html\">top-like</a> management tool for Tor relays. The purpose "
+"of such a tool would be to monitor a local Tor relay via its control port "
+"and include useful system information of the underlying machine. When "
+"running this tool, it would dynamically update its content like top does for "
+"Linux processes.  <a href=\"http://archives.seul.org/or/dev/Jan-2008/"
+"msg00005.html\">This or-dev post</a> might be a good first read.  <br /> A "
+"person interested in this should be familiar with or willing to learn about "
+"administering a Tor relay and configuring it via its control port. As an "
+"initial prototype is written in Python, some knowledge about writing Python "
+"code would be helpful, too. This project is one part about identifying "
+"requirements to such a tool and designing its interface, and one part lots "
+"of coding."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:564
 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 "
+"<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 "
@@ -583,12 +574,12 @@
 "<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."
+"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 ""
 
 #. type: Content of: <div><ol><li>
@@ -596,20 +587,19 @@
 msgid ""
 "<b>Improve Tor Weather</b> <br /> Priority: <i>Medium</i> <br /> Effort "
 "Level: <i>Medium</i> <br /> Skill Level: <i>Medium</i> <br /> Likely "
-"Mentors: <i>Jake, Roger</i> <br /> <a "
-"href=\"https://weather.torproject.org/\">Tor weather</a> is a tool that "
-"allows signing up to receive notifications via email when the tracked Tor "
-"relay is down. Currently, it isn't really useful for people who use the "
-"hibernation feature of Tor, or for those who have to shut down their relay "
-"regularly. During the project, Tor weather could be extended to allow more "
-"flexible configurations.  Other enhancements are also possible: Weather "
-"could send out warnings when your relay runs an out-of-date version of Tor, "
-"or when its observed bandwith drops below a certain value. It might also be "
-"a nice tool that allows for checking whether your relay has earned you a <a "
-"href=\"<page tshirt>\">T-Shirt</a>, or sending reminders to directory "
-"authorities that their keys are about to expire. Be creative, and consider "
-"how the above project to track overall network status can help you get your "
-"job done more quickly! See also its <a "
+"Mentors: <i>Jake, Roger</i> <br /> <a href=\"https://weather.torproject.org/"
+"\">Tor weather</a> is a tool that allows signing up to receive notifications "
+"via email when the tracked Tor relay is down. Currently, it isn't really "
+"useful for people who use the hibernation feature of Tor, or for those who "
+"have to shut down their relay regularly. During the project, Tor weather "
+"could be extended to allow more flexible configurations.  Other enhancements "
+"are also possible: Weather could send out warnings when your relay runs an "
+"out-of-date version of Tor, or when its observed bandwith drops below a "
+"certain value. It might also be a nice tool that allows for checking whether "
+"your relay has earned you a <a href=\"<page tshirt>\">T-Shirt</a>, or "
+"sending reminders to directory authorities that their keys are about to "
+"expire. Be creative, and consider how the above project to track overall "
+"network status can help you get your job done more quickly! See also its <a "
 "href=\"https://svn.torproject.org/svn/weather/trunk/README\">README</a> and "
 "<a href=\"https://svn.torproject.org/svn/weather/trunk/TODO\">TODO</a>."
 msgstr ""
@@ -619,8 +609,8 @@
 msgid ""
 "<b>Bring up new ideas!</b> <br /> Don't like any of these? Look at the <a "
 "href=\"<svnsandbox>doc/roadmaps/2008-12-19-roadmap-full.pdf\">Tor "
-"development roadmap</a> for more ideas.  Some of the <a "
-"href=\"<svnsandbox>doc/spec/proposals/\">current proposals</a> might also be "
+"development roadmap</a> for more ideas.  Some of the <a href="
+"\"<svnsandbox>doc/spec/proposals/\">current proposals</a> might also be "
 "short on developers."
 msgstr ""
 
@@ -641,15 +631,14 @@
 msgid ""
 "Tor relays don't work well on Windows XP. On Windows, Tor uses the standard "
 "<tt>select()</tt> system call, which uses space in the non-page pool. This "
-"means that a medium sized Tor relay will empty the non-page pool, <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/WindowsBufferProblems\">causing "
-"havoc and system crashes</a>. We should probably be using overlapped IO "
-"instead. One solution would be to teach <a "
-"href=\"http://www.monkey.org/~provos/libevent/\">libevent</a> how to use "
-"overlapped IO rather than select() on Windows, and then adapt Tor to the new "
-"libevent interface. Christian King made a <a "
-"href=\"https://svn.torproject.org/svn/libevent-urz/trunk/\">good start</a> "
-"on this in the summer of 2007."
+"means that a medium sized Tor relay will empty the non-page pool, <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/WindowsBufferProblems"
+"\">causing havoc and system crashes</a>. We should probably be using "
+"overlapped IO instead. One solution would be to teach <a href=\"http://www."
+"monkey.org/~provos/libevent/\">libevent</a> how to use overlapped IO rather "
+"than select() on Windows, and then adapt Tor to the new libevent interface. "
+"Christian King made a <a href=\"https://svn.torproject.org/svn/libevent-urz/"
+"trunk/\">good start</a> on this in the summer of 2007."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -670,10 +659,10 @@
 "support their intuition either that the attacks work really well or that "
 "some defense works great. Can we build a simulator that's clearly documented "
 "and open enough that everybody knows it's giving a reasonable answer? This "
-"will spur a lot of new research.  See the entry <a "
-"href=\"#Research\">below</a> on confirmation attacks for details on the "
-"research side of this task &mdash; who knows, when it's done maybe you can "
-"help write a paper or three also."
+"will spur a lot of new research.  See the entry <a href=\"#Research\">below</"
+"a> on confirmation attacks for details on the research side of this task "
+"&mdash; who knows, when it's done maybe you can help write a paper or three "
+"also."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -688,10 +677,10 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:1000
 msgid ""
-"Perform a security analysis of Tor with <a "
-"href=\"http://en.wikipedia.org/wiki/Fuzz_testing\">\"fuzz\"</a>. Determine "
-"if there are good fuzzing libraries out there for what we want. Win fame by "
-"getting credit when we put out a new release because of you!"
+"Perform a security analysis of Tor with <a href=\"http://en.wikipedia.org/"
+"wiki/Fuzz_testing\">\"fuzz\"</a>. Determine if there are good fuzzing "
+"libraries out there for what we want. Win fame by getting credit when we put "
+"out a new release because of you!"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -700,12 +689,12 @@
 "Tor uses TCP for transport and TLS for link encryption. This is nice and "
 "simple, but it means all cells on a link are delayed when a single packet "
 "gets dropped, and it means we can only reasonably support TCP streams. We "
-"have a <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#TransportIPnotTCP\">list "
-"of reasons why we haven't shifted to UDP transport</a>, but it would be "
-"great to see that list get shorter. We also have a proposed <a "
-"href=\"<svnsandbox>doc/spec/proposals/100-tor-spec-udp.txt\">specification "
-"for Tor and UDP</a> &mdash; please let us know what's wrong with it."
+"have a <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
+"TorFAQ#TransportIPnotTCP\">list of reasons why we haven't shifted to UDP "
+"transport</a>, but it would be great to see that list get shorter. We also "
+"have a proposed <a href=\"<svnsandbox>doc/spec/proposals/100-tor-spec-udp.txt"
+"\">specification for Tor and UDP</a> &mdash; please let us know what's wrong "
+"with it."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -730,9 +719,8 @@
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:1027
 msgid ""
-"How can we make the <a "
-"href=\"http://anonymityanywhere.com/incognito/\">Incognito LiveCD</a> easier "
-"to maintain, improve, and document?"
+"How can we make the <a href=\"http://anonymityanywhere.com/incognito/"
+"\">Incognito LiveCD</a> easier to maintain, improve, and document?"
 msgstr ""
 
 #. type: Content of: <div>
@@ -765,14 +753,14 @@
 #: /home/runa/tor/website/en/volunteer.wml:1047
 msgid ""
 "The \"end-to-end traffic confirmation attack\": by watching traffic at Alice "
-"and at Bob, we can <a "
-"href=\"http://freehaven.net/anonbib/#danezis:pet2004\">compare traffic "
-"signatures and become convinced that we're watching the same stream</a>. So "
-"far Tor accepts this as a fact of life and assumes this attack is trivial in "
-"all cases. First of all, is that actually true? How much traffic of what "
-"sort of distribution is needed before the adversary is confident he has won? "
-"Are there scenarios (e.g. not transmitting much)  that slow down the attack? "
-"Do some traffic padding or traffic shaping schemes work better than others?"
+"and at Bob, we can <a href=\"http://freehaven.net/anonbib/#danezis:pet2004"
+"\">compare traffic signatures and become convinced that we're watching the "
+"same stream</a>. So far Tor accepts this as a fact of life and assumes this "
+"attack is trivial in all cases. First of all, is that actually true? How "
+"much traffic of what sort of distribution is needed before the adversary is "
+"confident he has won? Are there scenarios (e.g. not transmitting much)  that "
+"slow down the attack? Do some traffic padding or traffic shaping schemes "
+"work better than others?"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -781,38 +769,37 @@
 "A related question is: Does running a relay/bridge provide additional "
 "protection against these timing attacks? Can an external adversary that "
 "can't see inside TLS links still recognize individual streams reliably? Does "
-"the amount of traffic carried degrade this ability any? What if the "
-"client-relay deliberately delayed upstream relayed traffic to create a queue "
-"that could be used to mimic timings of client downstream traffic to make it "
-"look like it was also relayed? This same queue could also be used for "
-"masking timings in client upstream traffic with the techniques from <a "
-"href=\"http://www.freehaven.net/anonbib/#ShWa-Timing06\">adaptive "
-"padding</a>, but without the need for additional traffic. Would such an "
-"interleaving of client upstream traffic obscure timings for external "
-"adversaries? Would the strategies need to be adjusted for asymmetric links? "
-"For example, on asymmetric links, is it actually possible to differentiate "
-"client traffic from natural bursts due to their asymmetric capacity? Or is "
-"it easier than symmetric links for some other reason?"
+"the amount of traffic carried degrade this ability any? What if the client-"
+"relay deliberately delayed upstream relayed traffic to create a queue that "
+"could be used to mimic timings of client downstream traffic to make it look "
+"like it was also relayed? This same queue could also be used for masking "
+"timings in client upstream traffic with the techniques from <a href=\"http://"
+"www.freehaven.net/anonbib/#ShWa-Timing06\">adaptive padding</a>, but without "
+"the need for additional traffic. Would such an interleaving of client "
+"upstream traffic obscure timings for external adversaries? Would the "
+"strategies need to be adjusted for asymmetric links? For example, on "
+"asymmetric links, is it actually possible to differentiate client traffic "
+"from natural bursts due to their asymmetric capacity? Or is it easier than "
+"symmetric links for some other reason?"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:1072
 msgid ""
-"Repeat Murdoch and Danezis's <a "
-"href=\"http://www.cl.cam.ac.uk/~sjm217/projects/anon/#torta\">attack from "
-"Oakland 05</a> on the current Tor network. See if you can learn why it works "
-"well on some nodes and not well on others. (My theory is that the fast nodes "
-"with spare capacity resist the attack better.) If that's true, then "
-"experiment with the RelayBandwidthRate and RelayBandwidthBurst options to "
-"run a relay that is used as a client while relaying the attacker's traffic: "
-"as we crank down the RelayBandwidthRate, does the attack get harder? What's "
-"the right ratio of RelayBandwidthRate to actually capacity? Or is it a ratio "
-"at all? While we're at it, does a much larger set of candidate relays "
-"increase the false positive rate or other complexity for the attack? (The "
-"Tor network is now almost two orders of magnitude larger than it was when "
-"they wrote their paper.) Be sure to read <a "
-"href=\"http://freehaven.net/anonbib/#clog-the-queue\">Don't Clog the "
-"Queue</a> too."
+"Repeat Murdoch and Danezis's <a href=\"http://www.cl.cam.ac.uk/~sjm217/"
+"projects/anon/#torta\">attack from Oakland 05</a> on the current Tor "
+"network. See if you can learn why it works well on some nodes and not well "
+"on others. (My theory is that the fast nodes with spare capacity resist the "
+"attack better.) If that's true, then experiment with the RelayBandwidthRate "
+"and RelayBandwidthBurst options to run a relay that is used as a client "
+"while relaying the attacker's traffic: as we crank down the "
+"RelayBandwidthRate, does the attack get harder? What's the right ratio of "
+"RelayBandwidthRate to actually capacity? Or is it a ratio at all? While "
+"we're at it, does a much larger set of candidate relays increase the false "
+"positive rate or other complexity for the attack? (The Tor network is now "
+"almost two orders of magnitude larger than it was when they wrote their "
+"paper.) Be sure to read <a href=\"http://freehaven.net/anonbib/#clog-the-"
+"queue\">Don't Clog the Queue</a> too."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -821,13 +808,13 @@
 "The \"routing zones attack\": most of the literature thinks of the network "
 "path between Alice and her entry node (and between the exit node and Bob) as "
 "a single link on some graph. In practice, though, the path traverses many "
-"autonomous systems (ASes), and <a "
-"href=\"http://freehaven.net/anonbib/#feamster:wpes2004\">it's not uncommon "
-"that the same AS appears on both the entry path and the exit path</a>.  "
-"Unfortunately, to accurately predict whether a given Alice, entry, exit, Bob "
-"quad will be dangerous, we need to download an entire Internet routing zone "
-"and perform expensive operations on it. Are there practical approximations, "
-"such as avoiding IP addresses in the same /8 network?"
+"autonomous systems (ASes), and <a href=\"http://freehaven.net/anonbib/"
+"#feamster:wpes2004\">it's not uncommon that the same AS appears on both the "
+"entry path and the exit path</a>.  Unfortunately, to accurately predict "
+"whether a given Alice, entry, exit, Bob quad will be dangerous, we need to "
+"download an entire Internet routing zone and perform expensive operations on "
+"it. Are there practical approximations, such as avoiding IP addresses in the "
+"same /8 network?"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -835,11 +822,11 @@
 msgid ""
 "Other research questions regarding geographic diversity consider the "
 "tradeoff between choosing an efficient circuit and choosing a random "
-"circuit. Look at Stephen Rollyson's <a "
-"href=\"http://swiki.cc.gatech.edu:8080/ugResearch/uploads/7/ImprovingTor.pdf\">position "
-"paper</a> on how to discard particularly slow choices without hurting "
-"anonymity \"too much\". This line of reasoning needs more work and more "
-"thinking, but it looks very promising."
+"circuit. Look at Stephen Rollyson's <a href=\"http://swiki.cc.gatech."
+"edu:8080/ugResearch/uploads/7/ImprovingTor.pdf\">position paper</a> on how "
+"to discard particularly slow choices without hurting anonymity \"too much\". "
+"This line of reasoning needs more work and more thinking, but it looks very "
+"promising."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -864,26 +851,26 @@
 msgid ""
 "A related topic is congestion control. Is our current design sufficient once "
 "we have heavy use? Maybe we should experiment with variable-sized windows "
-"rather than fixed-size windows? That seemed to go well in an <a "
-"href=\"http://www.psc.edu/networking/projects/hpn-ssh/theory.php\">ssh "
-"throughput experiment</a>. We'll need to measure and tweak, and maybe "
-"overhaul if the results are good."
+"rather than fixed-size windows? That seemed to go well in an <a href="
+"\"http://www.psc.edu/networking/projects/hpn-ssh/theory.php\">ssh throughput "
+"experiment</a>. We'll need to measure and tweak, and maybe overhaul if the "
+"results are good."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/en/volunteer.wml:1123
 msgid ""
 "Our censorship-resistance goals include preventing an attacker who's looking "
-"at Tor traffic on the wire from <a "
-"href=\"<svnsandbox>doc/design-paper/blocking.html#sec:network-fingerprint\">distinguishing "
-"it from normal SSL traffic</a>. Obviously we can't achieve perfect "
-"steganography and still remain usable, but for a first step we'd like to "
-"block any attacks that can win by observing only a few packets. One of the "
-"remaining attacks we haven't examined much is that Tor cells are 512 bytes, "
-"so the traffic on the wire may well be a multiple of 512 bytes.  How much "
-"does the batching and overhead in TLS records blur this on the wire? Do "
-"different buffer flushing strategies in Tor affect this? Could a bit of "
-"padding help a lot, or is this an attack we must accept?"
+"at Tor traffic on the wire from <a href=\"<svnsandbox>doc/design-paper/"
+"blocking.html#sec:network-fingerprint\">distinguishing it from normal SSL "
+"traffic</a>. Obviously we can't achieve perfect steganography and still "
+"remain usable, but for a first step we'd like to block any attacks that can "
+"win by observing only a few packets. One of the remaining attacks we haven't "
+"examined much is that Tor cells are 512 bytes, so the traffic on the wire "
+"may well be a multiple of 512 bytes.  How much does the batching and "
+"overhead in TLS records blur this on the wire? Do different buffer flushing "
+"strategies in Tor affect this? Could a bit of padding help a lot, or is this "
+"an attack we must accept?"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -916,13 +903,13 @@
 "hurt ourselves by periodically updating the version of Firefox that "
 "Torbutton claims to be? If we update it too often, we splinter the anonymity "
 "sets ourselves. If we don't update it often enough, then all the Tor users "
-"stand out because they claim to be running a quite old version of "
-"Firefox. The answer here probably depends on the Firefox versions seen in "
-"the wild. Question two: periodically people ask us to cycle through N "
-"UserAgent strings rather than stick with one. Does this approach help, hurt, "
-"or not matter? Consider: cookies and recognizing Torbutton users by their "
-"rotating UserAgents; malicious websites who only attack certain browsers; "
-"and whether the answers to question one impact this answer."
+"stand out because they claim to be running a quite old version of Firefox. "
+"The answer here probably depends on the Firefox versions seen in the wild. "
+"Question two: periodically people ask us to cycle through N UserAgent "
+"strings rather than stick with one. Does this approach help, hurt, or not "
+"matter? Consider: cookies and recognizing Torbutton users by their rotating "
+"UserAgents; malicious websites who only attack certain browsers; and whether "
+"the answers to question one impact this answer."
 msgstr ""
 
 #. type: Content of: <div><ol><li>

Modified: translation/trunk/projects/website/templates/docs/1-high.tor-doc-windows.pot
===================================================================
--- translation/trunk/projects/website/templates/docs/1-high.tor-doc-windows.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/docs/1-high.tor-doc-windows.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div><h1>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:11
@@ -21,7 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:12 /tmp/GZCCXudMa2.xml:25 /tmp/GZCCXudMa2.xml:63 /tmp/GZCCXudMa2.xml:104 /tmp/GZCCXudMa2.xml:153
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:12
+#: /tmp/6cMCgmih7n.xml:25 /tmp/6cMCgmih7n.xml:63 /tmp/6cMCgmih7n.xml:104
+#: /tmp/6cMCgmih7n.xml:153
 msgid "<br />"
 msgstr ""
 
@@ -42,16 +44,16 @@
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:24
 msgid ""
-"<a class=\"anchor\" href=\"#installing\">Step One: Download and Install "
-"Tor</a>"
+"<a class=\"anchor\" href=\"#installing\">Step One: Download and Install Tor</"
+"a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:28
 msgid ""
-"The install for MS Windows bundles <a href=\"<page index>\">Tor</a>, <a "
-"href=\"http://www.vidalia-project.net/\">Vidalia</a> (a GUI for Tor), and <a "
-"href=\"http://www.privoxy.org\">Privoxy</a> (a filtering web proxy) into one "
+"The install for MS Windows bundles <a href=\"<page index>\">Tor</a>, <a href="
+"\"http://www.vidalia-project.net/\">Vidalia</a> (a GUI for Tor), and <a href="
+"\"http://www.privoxy.org\">Privoxy</a> (a filtering web proxy) into one "
 "package, with the three applications pre-configured to work together.  "
 "Download either the <a href=\"../<package-win32-bundle-stable>\">stable</a> "
 "or the <a href=\"../<package-win32-bundle-alpha>\">experimental</a> version "
@@ -62,8 +64,8 @@
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:38
 msgid ""
-"<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\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -76,8 +78,8 @@
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:46
 msgid ""
-"<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\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -88,12 +90,12 @@
 msgstr ""
 
 #
+#
 #. <p>
 #. Tor comes configured as a client by default. It uses a built-in
 #. default configuration file, and most people won't need to change any of
 #. the settings. Tor is now installed.
 #. </p>
-#
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:60
 msgid "<hr /> <a id=\"using\"></a>"
@@ -124,16 +126,17 @@
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:74
 msgid ""
-"<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 />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:81
 msgid ""
-"If you plan to run Firefox on a different computer than Tor, see the <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SocksListenAddress\">FAQ "
-"entry for running Tor on a different computer</a>."
+"If you plan to run Firefox on a different computer than Tor, see the <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/"
+"TorFAQ#SocksListenAddress\">FAQ entry for running Tor on a different "
+"computer</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -142,19 +145,18 @@
 "To Torify other applications that support HTTP proxies, just point them at "
 "Privoxy (that is, localhost port 8118). To use SOCKS directly (for instant "
 "messaging, Jabber, IRC, etc), you can point your application directly at Tor "
-"(localhost port 9050), but see <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS\">this "
-"FAQ entry</a> for why this may be dangerous. For applications that support "
-"neither SOCKS nor HTTP, take a look at SocksCap or <a "
-"href=\"http://www.freecap.ru/eng/\">FreeCap</a>.  (FreeCap is free software; "
-"SocksCap is proprietary.)"
+"(localhost port 9050), but see <a href=\"https://wiki.torproject.org/noreply/"
+"TheOnionRouter/TorFAQ#SOCKSAndDNS\">this FAQ entry</a> for why this may be "
+"dangerous. For applications that support neither SOCKS nor HTTP, take a look "
+"at SocksCap or <a href=\"http://www.freecap.ru/eng/\">FreeCap</a>.  (FreeCap "
+"is free software; SocksCap is proprietary.)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:96
 msgid ""
-"For information on how to Torify other applications, check out the <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
+"For information on how to Torify other applications, check out the <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
 "HOWTO</a>."
 msgstr ""
 
@@ -165,7 +167,8 @@
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:103
-msgid "<a class=\"anchor\" href=\"#verify\">Step Three: Make sure it's working</a>"
+msgid ""
+"<a class=\"anchor\" href=\"#verify\">Step Three: Make sure it's working</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -181,7 +184,8 @@
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:115
-msgid "<img alt=\"Vidalia Tray Icon\" src=\"../img/screenshot-win32-vidalia.png\"/>"
+msgid ""
+"<img alt=\"Vidalia Tray Icon\" src=\"../img/screenshot-win32-vidalia.png\"/>"
 msgstr ""
 
 #. PO4ASHARPBEGIN<a href="http://ipchicken.com/">
@@ -191,11 +195,11 @@
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:119
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
-"address is being anonymized. Click on <a "
-"href=\"https://check.torproject.org/\">the Tor detector</a> and see whether "
-"it thinks you're using Tor or not.  (If that site is down, see <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate\">this "
-"FAQ entry</a> for more suggestions on how to test your Tor.)"
+"address is being anonymized. Click on <a href=\"https://check.torproject.org/"
+"\">the Tor detector</a> and see whether it thinks you're using Tor or not.  "
+"(If that site is down, see <a href=\"https://wiki.torproject.org/noreply/"
+"TheOnionRouter/TorFAQ#IsMyConnectionPrivate\">this FAQ entry</a> for more "
+"suggestions on how to test your Tor.)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -205,17 +209,15 @@
 "connect to itself, be sure to allow connections from your local applications "
 "to local port 8118 and port 9050. If your firewall blocks outgoing "
 "connections, punch a hole so it can connect to at least TCP ports 80 and "
-"443, and then see <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FirewalledClient\">this "
-"FAQ entry</a>."
+"443, and then see <a href=\"https://wiki.torproject.org/noreply/"
+"TheOnionRouter/TorFAQ#FirewalledClient\">this FAQ entry</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:140
 msgid ""
-"If it's still not working, look at <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this "
-"FAQ entry</a> for hints."
+"If it's still not working, look at <a href=\"https://wiki.torproject.org/"
+"noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -232,7 +234,8 @@
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:152
-msgid "<a class=\"anchor\" href=\"#relay\">Step Four: Configure it as a relay</a>"
+msgid ""
+"<a class=\"anchor\" href=\"#relay\">Step Four: Configure it as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -250,17 +253,17 @@
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:163
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
-"users secure. <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity\">You "
-"may also get stronger anonymity yourself</a>, since remote sites can't know "
-"whether connections originated at your computer or were relayed from others."
+"users secure. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
+"TorFAQ#RelayAnonymity\">You may also get stronger anonymity yourself</a>, "
+"since remote sites can't know whether connections originated at your "
+"computer or were relayed from others."
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-windows.wml:170
 msgid ""
-"Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a "
-"relay</a> guide."
+"Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
+"a> guide."
 msgstr ""
 
 #. type: Content of: <div><div>

Modified: translation/trunk/projects/website/templates/docs/2-medium.tor-doc-osx.pot
===================================================================
--- translation/trunk/projects/website/templates/docs/2-medium.tor-doc-osx.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/docs/2-medium.tor-doc-osx.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div><h1>
 #: /home/runa/tor/website/docs/en/tor-doc-osx.wml:11
@@ -21,7 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:12 /tmp/0CnQPURECr.xml:24 /tmp/0CnQPURECr.xml:71 /tmp/0CnQPURECr.xml:108 /tmp/0CnQPURECr.xml:143 /tmp/0CnQPURECr.xml:166
+#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:12 /tmp/UpyoPwg7MX.xml:24
+#: /tmp/UpyoPwg7MX.xml:71 /tmp/UpyoPwg7MX.xml:108 /tmp/UpyoPwg7MX.xml:143
+#: /tmp/UpyoPwg7MX.xml:166
 msgid "<br />"
 msgstr ""
 
@@ -30,8 +32,8 @@
 msgid ""
 "<b>Note that these are the installation instructions for running a Tor "
 "client on Mac OS X. If you want to relay traffic for others to help the "
-"network grow (please do), read the <a href=\"<page "
-"docs/tor-doc-relay>\">Configuring a relay</a> guide.</b>"
+"network grow (please do), read the <a href=\"<page docs/tor-doc-relay>"
+"\">Configuring a relay</a> guide.</b>"
 msgstr ""
 
 #. type: Content of: <div><div>
@@ -42,8 +44,8 @@
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/tor-doc-osx.wml:23
 msgid ""
-"<a class=\"anchor\" href=\"#installing\">Step One: Download and Install "
-"Tor</a>"
+"<a class=\"anchor\" href=\"#installing\">Step One: Download and Install Tor</"
+"a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -51,13 +53,12 @@
 msgid ""
 "The install for Macintosh OS X bundles <a href=\"<page index>\">Tor</a>, <a "
 "href=\"http://www.vidalia-project.net/\">Vidalia</a> (a GUI for Tor), <a "
-"href=\"<page torbutton/index>\">Torbutton</a>, and <a "
-"href=\"http://www.privoxy.org/\">Privoxy</a> (a filtering web proxy)  into "
-"one package, with the four applications pre-configured to work together.  "
-"Download either the <a href=\"../<package-osx-bundle-stable>\">stable</a> or "
-"the <a href=\"../<package-osx-bundle-alpha>\">experimental</a> version of "
-"the OS X bundle, or look for more options on the <a href=\"<page "
-"download>\">download page</a>."
+"href=\"<page torbutton/index>\">Torbutton</a>, and <a href=\"http://www."
+"privoxy.org/\">Privoxy</a> (a filtering web proxy)  into one package, with "
+"the four applications pre-configured to work together.  Download either the "
+"<a href=\"../<package-osx-bundle-stable>\">stable</a> or the <a href=\"../"
+"<package-osx-bundle-alpha>\">experimental</a> version of the OS X bundle, or "
+"look for more options on the <a href=\"<page download>\">download page</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -70,8 +71,8 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-osx.wml:44
 msgid ""
-"<img alt=\"tor installer splash page\" "
-"src=\"../img/screenshot-osx-installer-splash.png\" border=\"1\"/>"
+"<img alt=\"tor installer splash page\" src=\"../img/screenshot-osx-installer-"
+"splash.png\" border=\"1\"/>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -134,16 +135,17 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-osx.wml:80
 msgid ""
-"<img alt=\"Torbutton plugin for Firefox\" "
-"src=\"../img/screenshot-torbutton.png\" border=\"1\"/>"
+"<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
+"png\" border=\"1\"/>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-osx.wml:85
 msgid ""
-"If you plan to run Firefox on a different computer than Tor, see the <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SocksListenAddress\">FAQ "
-"entry for running Tor on a different computer</a>."
+"If you plan to run Firefox on a different computer than Tor, see the <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/"
+"TorFAQ#SocksListenAddress\">FAQ entry for running Tor on a different "
+"computer</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -152,19 +154,18 @@
 "To Torify other applications that support HTTP proxies, just point them at "
 "Privoxy (that is, localhost port 8118). To use SOCKS directly (for instant "
 "messaging, Jabber, IRC, etc), you can point your application directly at Tor "
-"(localhost port 9050), but see <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS\">this "
-"FAQ entry</a> for why this may be dangerous. For applications that support "
-"neither SOCKS nor HTTP, take a look at <a "
-"href=\"http://www.taiyo.co.jp/~gotoh/ssh/connect.html\">connect</a> or <a "
-"href=\"http://www.dest-unreach.org/socat/\">socat</a>."
+"(localhost port 9050), but see <a href=\"https://wiki.torproject.org/noreply/"
+"TheOnionRouter/TorFAQ#SOCKSAndDNS\">this FAQ entry</a> for why this may be "
+"dangerous. For applications that support neither SOCKS nor HTTP, take a look "
+"at <a href=\"http://www.taiyo.co.jp/~gotoh/ssh/connect.html\">connect</a> or "
+"<a href=\"http://www.dest-unreach.org/socat/\">socat</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-osx.wml:100
 msgid ""
-"For information on how to Torify other applications, check out the <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
+"For information on how to Torify other applications, check out the <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
 "HOWTO</a>."
 msgstr ""
 
@@ -175,18 +176,19 @@
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/tor-doc-osx.wml:107
-msgid "<a class=\"anchor\" href=\"#verify\">Step Three: Make sure it's working</a>"
+msgid ""
+"<a class=\"anchor\" href=\"#verify\">Step Three: Make sure it's working</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-osx.wml:111
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
-"address is being anonymized. Click on <a "
-"href=\"https://check.torproject.org/\">the Tor detector</a> and see whether "
-"it thinks you're using Tor or not.  (If that site is down, see <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate\">this "
-"FAQ entry</a> for more suggestions on how to test your Tor.)"
+"address is being anonymized. Click on <a href=\"https://check.torproject.org/"
+"\">the Tor detector</a> and see whether it thinks you're using Tor or not.  "
+"(If that site is down, see <a href=\"https://wiki.torproject.org/noreply/"
+"TheOnionRouter/TorFAQ#IsMyConnectionPrivate\">this FAQ entry</a> for more "
+"suggestions on how to test your Tor.)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -196,17 +198,15 @@
 "connect to itself, be sure to allow connections from your local applications "
 "to local port 8118 and port 9050. If your firewall blocks outgoing "
 "connections, punch a hole so it can connect to at least TCP ports 80 and "
-"443, and then see <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FirewalledClient\">this "
-"FAQ entry</a>."
+"443, and then see <a href=\"https://wiki.torproject.org/noreply/"
+"TheOnionRouter/TorFAQ#FirewalledClient\">this FAQ entry</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-osx.wml:130
 msgid ""
-"If it's still not working, look at <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this "
-"FAQ entry</a> for hints."
+"If it's still not working, look at <a href=\"https://wiki.torproject.org/"
+"noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -223,7 +223,8 @@
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/tor-doc-osx.wml:142
-msgid "<a class=\"anchor\" href=\"#relay\">Step Four: Configure it as a relay</a>"
+msgid ""
+"<a class=\"anchor\" href=\"#relay\">Step Four: Configure it as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -241,17 +242,17 @@
 #: /home/runa/tor/website/docs/en/tor-doc-osx.wml:153
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
-"users secure. <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity\">You "
-"may also get stronger anonymity yourself</a>, since remote sites can't know "
-"whether connections originated at your computer or were relayed from others."
+"users secure. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
+"TorFAQ#RelayAnonymity\">You may also get stronger anonymity yourself</a>, "
+"since remote sites can't know whether connections originated at your "
+"computer or were relayed from others."
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-osx.wml:160
 msgid ""
-"Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a "
-"relay</a> guide."
+"Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
+"a> guide."
 msgstr ""
 
 #. type: Content of: <div><div>
@@ -261,7 +262,8 @@
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/tor-doc-osx.wml:165
-msgid "<a class=\"anchor\" href=\"#uninstall\">How To Uninstall Tor and Privoxy</a>"
+msgid ""
+"<a class=\"anchor\" href=\"#uninstall\">How To Uninstall Tor and Privoxy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/templates/docs/2-medium.tor-doc-relay.pot
===================================================================
--- translation/trunk/projects/website/templates/docs/2-medium.tor-doc-relay.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/docs/2-medium.tor-doc-relay.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div><h1>
 #: /home/runa/tor/website/docs/en/tor-doc-relay.wml:11
@@ -27,7 +27,8 @@
 
 #. type: Content of: <div><div><div><ol><li>
 #: /home/runa/tor/website/docs/en/tor-doc-relay.wml:17
-msgid "<a href=\"<page docs/tor-doc-relay>#install\">Download &amp; Install</a>"
+msgid ""
+"<a href=\"<page docs/tor-doc-relay>#install\">Download &amp; Install</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><ol><li>
@@ -46,7 +47,7 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:25 /tmp/xn1e8dAtUy.xml:272
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:25 /tmp/Vd3jPwbYib.xml:272
 msgid "<hr />"
 msgstr ""
 
@@ -65,10 +66,10 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37
 msgid ""
-"You can run a Tor relay on <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayOS\">pretty "
-"much any</a> operating system, but Linux, FreeBSD 5.x+, OS X Tiger or later, "
-"and Windows Server 2003 or later work best."
+"You can run a Tor relay on <a href=\"https://wiki.torproject.org/noreply/"
+"TheOnionRouter/TorFAQ#RelayOS\">pretty much any</a> operating system, but "
+"Linux, FreeBSD 5.x+, OS X Tiger or later, and Windows Server 2003 or later "
+"work best."
 msgstr ""
 
 #. type: Content of: <div><div>
@@ -78,11 +79,13 @@
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/tor-doc-relay.wml:46
-msgid "<a class=\"anchor\" href=\"#install\">Step One: Download and Install Tor</a>"
+msgid ""
+"<a class=\"anchor\" href=\"#install\">Step One: Download and Install Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:47 /tmp/xn1e8dAtUy.xml:62 /tmp/xn1e8dAtUy.xml:136 /tmp/xn1e8dAtUy.xml:162
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:47 /tmp/Vd3jPwbYib.xml:62
+#: /tmp/Vd3jPwbYib.xml:136 /tmp/Vd3jPwbYib.xml:162
 msgid "<br />"
 msgstr ""
 
@@ -119,9 +122,8 @@
 #: /home/runa/tor/website/docs/en/tor-doc-relay.wml:64
 msgid ""
 "Verify that your clock and timezone are set correctly. If possible, "
-"synchronize your clock with public <a "
-"href=\"http://en.wikipedia.org/wiki/Network_Time_Protocol\">time "
-"servers</a>."
+"synchronize your clock with public <a href=\"http://en.wikipedia.org/wiki/"
+"Network_Time_Protocol\">time servers</a>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
@@ -132,8 +134,8 @@
 #. type: Content of: <div><div><ol><li><ol><li>
 #: /home/runa/tor/website/docs/en/tor-doc-relay.wml:72
 msgid ""
-"Right click on the Vidalia icon in your task bar.  Choose <tt>Control "
-"Panel</tt>."
+"Right click on the Vidalia icon in your task bar.  Choose <tt>Control Panel</"
+"tt>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li>
@@ -146,9 +148,8 @@
 msgid ""
 "Choose <tt>Relay Traffic for the Tor network</tt> if you want to be a public "
 "relay (recommended), or choose <tt>Help censored users reach the Tor "
-"network</tt> if you want to be a <a href=\"<page "
-"faq>#RelayOrBridge\">bridge</a> for users in countries that censor their "
-"Internet."
+"network</tt> if you want to be a <a href=\"<page faq>#RelayOrBridge"
+"\">bridge</a> for users in countries that censor their Internet."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li>
@@ -198,14 +199,13 @@
 #. type: Content of: <div><div><ol><li><ul><li>
 #: /home/runa/tor/website/docs/en/tor-doc-relay.wml:97
 msgid ""
-"Edit the bottom part of <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc\">your "
-"torrc file</a>. If you want to be a public relay (recommended), make sure to "
-"define ORPort and <a href=\"<page faq>#ExitPolicies\">look at "
-"ExitPolicy</a>; otherwise if you want to be a <a href=\"<page "
-"faq>#RelayOrBridge\">bridge</a> for users in countries that censor their "
-"Internet, just use <a href=\"<page bridges>#RunningABridge\">these "
-"lines</a>."
+"Edit the bottom part of <a href=\"https://wiki.torproject.org/noreply/"
+"TheOnionRouter/TorFAQ#torrc\">your torrc file</a>. If you want to be a "
+"public relay (recommended), make sure to define ORPort and <a href=\"<page "
+"faq>#ExitPolicies\">look at ExitPolicy</a>; otherwise if you want to be a <a "
+"href=\"<page faq>#RelayOrBridge\">bridge</a> for users in countries that "
+"censor their Internet, just use <a href=\"<page bridges>#RunningABridge"
+"\">these lines</a>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
@@ -214,28 +214,26 @@
 "If you are using a firewall, open a hole in your firewall so incoming "
 "connections can reach the ports you configured (ORPort, plus DirPort if you "
 "enabled it). If you have a hardware firewall (Linksys box, cablemodem, etc) "
-"you might like <a "
-"href=\"http://portforward.com/\">portforward.com</a>. Also, make sure you "
-"allow all <em>outgoing</em> connections too, so your relay can reach the "
-"other Tor relays."
+"you might like <a href=\"http://portforward.com/\">portforward.com</a>. "
+"Also, make sure you allow all <em>outgoing</em> connections too, so your "
+"relay can reach the other Tor relays."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
 #: /home/runa/tor/website/docs/en/tor-doc-relay.wml:118
 msgid ""
-"Restart your relay. If it <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#Logs\">logs "
-"any warnings</a>, address them."
+"Restart your relay. If it <a href=\"https://wiki.torproject.org/noreply/"
+"TheOnionRouter/TorFAQ#Logs\">logs any warnings</a>, address them."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
 #: /home/runa/tor/website/docs/en/tor-doc-relay.wml:123
 msgid ""
-"Subscribe to the <a "
-"href=\"http://archives.seul.org/or/announce/\">or-announce</a> mailing "
-"list. It is very low volume, and it will keep you informed of new stable "
-"releases. You might also consider subscribing to <a href=\"<page "
-"documentation>#MailingLists\">the higher-volume Tor lists</a> too."
+"Subscribe to the <a href=\"http://archives.seul.org/or/announce/\">or-"
+"announce</a> mailing list. It is very low volume, and it will keep you "
+"informed of new stable releases. You might also consider subscribing to <a "
+"href=\"<page documentation>#MailingLists\">the higher-volume Tor lists</a> "
+"too."
 msgstr ""
 
 #. type: Content of: <div><div>
@@ -245,17 +243,17 @@
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/tor-doc-relay.wml:135
-msgid "<a class=\"anchor\" href=\"#check\">Step Three: Make sure it is working</a>"
+msgid ""
+"<a class=\"anchor\" href=\"#check\">Step Three: Make sure it is working</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-relay.wml:138
 msgid ""
 "As soon as your relay manages to connect to the network, it will try to "
-"determine whether the ports you configured are reachable from the "
-"outside. This step is usually fast, but may take up to 20 minutes. Look for "
-"a <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#Logs\">log "
+"determine whether the ports you configured are reachable from the outside. "
+"This step is usually fast, but may take up to 20 minutes. Look for a <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#Logs\">log "
 "entry</a> like <tt>Self-testing indicates your ORPort is reachable from the "
 "outside. Excellent.</tt> If you don't see this message, it means that your "
 "relay is not reachable from the outside &mdash; you should re-check your "
@@ -268,11 +266,11 @@
 msgid ""
 "When it decides that it's reachable, it will upload a \"server descriptor\" "
 "to the directories, to let clients know what address, ports, keys, etc your "
-"relay is using. You can <a "
-"href=\"http://moria.seul.org:9032/tor/status/authority\">load one of the "
-"network statuses manually</a> and look through it to find the nickname you "
-"configured, to make sure it's there. You may need to wait a few seconds to "
-"give enough time for it to make a fresh directory."
+"relay is using. You can <a href=\"http://moria.seul.org:9032/tor/status/"
+"authority\">load one of the network statuses manually</a> and look through "
+"it to find the nickname you configured, to make sure it's there. You may "
+"need to wait a few seconds to give enough time for it to make a fresh "
+"directory."
 msgstr ""
 
 #. type: Content of: <div><div>
@@ -293,18 +291,18 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-relay.wml:169
 msgid ""
-"6. Read <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/OperationalSecurity\">about "
-"operational security</a> to get ideas how you can increase the security of "
-"your relay."
+"6. Read <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
+"OperationalSecurity\">about operational security</a> to get ideas how you "
+"can increase the security of your relay."
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-relay.wml:175
 msgid ""
 "7. If you want to run more than one relay that's great, but please set <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#MultipleRelays\">the "
-"MyFamily option</a> in all your relays' configuration files."
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
+"TorFAQ#MultipleRelays\">the MyFamily option</a> in all your relays' "
+"configuration files."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -312,9 +310,9 @@
 msgid ""
 "8. Decide about rate limiting. Cable modem, DSL, and other users who have "
 "asymmetric bandwidth (e.g. more down than up) should rate limit to their "
-"slower bandwidth, to avoid congestion. See the <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#LimitBandwidth\">rate "
-"limiting FAQ entry</a> for details."
+"slower bandwidth, to avoid congestion. See the <a href=\"https://wiki."
+"torproject.org/noreply/TheOnionRouter/TorFAQ#LimitBandwidth\">rate limiting "
+"FAQ entry</a> for details."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -323,9 +321,9 @@
 "9. Back up your Tor relay's private key (stored in \"keys/secret_id_key\" in "
 "your DataDirectory). This is your relay's \"identity,\" and you need to keep "
 "it safe so nobody can read the traffic that goes through your relay. This is "
-"the critical file to keep if you need to <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#UpgradeRelay\">move "
-"or restore your Tor relay</a> if something goes wrong."
+"the critical file to keep if you need to <a href=\"https://wiki.torproject."
+"org/noreply/TheOnionRouter/TorFAQ#UpgradeRelay\">move or restore your Tor "
+"relay</a> if something goes wrong."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -334,10 +332,10 @@
 "10. If you control the name servers for your domain, consider setting your "
 "reverse DNS hostname to 'anonymous-relay', 'proxy' or 'tor-proxy', so when "
 "other people see the address in their web logs, they will more quickly "
-"understand what's going on. Adding the <a "
-"href=\"https://tor-svn.freehaven.net/svn/tor/trunk/contrib/tor-exit-notice.html\">Tor "
-"exit notice</a> on a vhost for this name can go a long way to deterring "
-"abuse complaints to you and your ISP if you are running an exit node."
+"understand what's going on. Adding the <a href=\"https://tor-svn.freehaven."
+"net/svn/tor/trunk/contrib/tor-exit-notice.html\">Tor exit notice</a> on a "
+"vhost for this name can go a long way to deterring abuse complaints to you "
+"and your ISP if you are running an exit node."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -349,11 +347,10 @@
 "reach your Tor relay. Win32 relays can simply change their ORPort and "
 "DirPort directly in their torrc and restart Tor. OS X or Unix relays can't "
 "bind directly to these ports (since they don't run as root), so they will "
-"need to set up some sort of <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ServerForFirewalledClients\"> "
-"port forwarding</a> so connections can reach their Tor relay. If you are "
-"using ports 80 and 443 already but still want to help out, other useful "
-"ports are 22, 110, and 143."
+"need to set up some sort of <a href=\"https://wiki.torproject.org/noreply/"
+"TheOnionRouter/TorFAQ#ServerForFirewalledClients\"> port forwarding</a> so "
+"connections can reach their Tor relay. If you are using ports 80 and 443 "
+"already but still want to help out, other useful ports are 22, 110, and 143."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -363,10 +360,10 @@
 "such as a public webserver &mdash; make sure that connections to the "
 "webserver are allowed from the local host too. You need to allow these "
 "connections because Tor clients will detect that your Tor relay is the <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers\">safest "
-"way to reach that webserver</a>, and always build a circuit that ends at "
-"your relay. If you don't want to allow the connections, you must explicitly "
-"reject them in your exit policy."
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
+"TorFAQ#ExitEavesdroppers\">safest way to reach that webserver</a>, and "
+"always build a circuit that ends at your relay. If you don't want to allow "
+"the connections, you must explicitly reject them in your exit policy."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -377,9 +374,8 @@
 "do it by hand. (The Tor relay doesn't need to be run as root, so it's good "
 "practice to not run it as root. Running as a 'tor' user avoids issues with "
 "identd and other services that detect user name. If you're the paranoid "
-"sort, feel free to <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorInChroot\">put "
-"Tor into a chroot jail</a>.)"
+"sort, feel free to <a href=\"https://wiki.torproject.org/noreply/"
+"TheOnionRouter/TorInChroot\">put Tor into a chroot jail</a>.)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -388,10 +384,10 @@
 "14. (Unix only.) Your operating system probably limits the number of open "
 "file descriptors per process to 1024 (or even less). If you plan to be "
 "running a fast exit node, this is probably not enough. On Linux, you should "
-"add a line like \"toruser hard nofile 8192\" to your "
-"/etc/security/limits.conf file (where toruser is the user that runs the Tor "
-"process), and then restart Tor if it's installed as a package (or log out "
-"and log back in if you run it yourself)."
+"add a line like \"toruser hard nofile 8192\" to your /etc/security/limits."
+"conf file (where toruser is the user that runs the Tor process), and then "
+"restart Tor if it's installed as a package (or log out and log back in if "
+"you run it yourself)."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -409,9 +405,9 @@
 "still works correctly after the change. Be sure to set your \"ContactInfo\" "
 "line in the torrc so we can contact you if you need to upgrade or something "
 "goes wrong. If you have problems or questions, see the <a href=\"<page "
-"documentation>#Support\">Support</a> section or <a href=\"<page "
-"contact>\">contact us</a> on the tor-ops list. Thanks for helping to make "
-"the Tor network grow!"
+"documentation>#Support\">Support</a> section or <a href=\"<page contact>"
+"\">contact us</a> on the tor-ops list. Thanks for helping to make the Tor "
+"network grow!"
 msgstr ""
 
 #. type: Content of: <div><div><p>

Modified: translation/trunk/projects/website/templates/docs/3-low.debian.pot
===================================================================
--- translation/trunk/projects/website/templates/docs/3-low.debian.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/docs/3-low.debian.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/debian.wml:11
@@ -28,7 +28,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/Lbw5xSf0Lp.xml:34 /tmp/Lbw5xSf0Lp.xml:77 /tmp/Lbw5xSf0Lp.xml:113
+#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/IaoiOOcJ3F.xml:34
+#: /tmp/IaoiOOcJ3F.xml:77 /tmp/IaoiOOcJ3F.xml:113
 msgid "<br />"
 msgstr ""
 
@@ -40,11 +41,11 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:23 /tmp/Lbw5xSf0Lp.xml:67 /tmp/Lbw5xSf0Lp.xml:104
+#: /home/runa/tor/website/docs/en/debian.wml:23 /tmp/IaoiOOcJ3F.xml:67
+#: /tmp/IaoiOOcJ3F.xml:104
 msgid ""
-"Now Tor is installed and running. Move on to <a href=\"<page "
-"docs/tor-doc-unix>#privoxy\">step two</a> of the \"Tor on Linux/Unix\" "
-"instructions."
+"Now Tor is installed and running. Move on to <a href=\"<page docs/tor-doc-"
+"unix>#privoxy\">step two</a> of the \"Tor on Linux/Unix\" instructions."
 msgstr ""
 
 #. type: Content of: <div><div>
@@ -69,11 +70,11 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:43
 msgid ""
-"You'll need to set up our package repository before you can fetch "
-"Tor. First, you need to figure out the name of your distribution. If you're "
-"using Ubuntu 9.04, it's \"jaunty\". Ubuntu 8.10 is \"intrepid\", and Ubuntu "
-"8.04 is \"hardy\". If you're using Debian etch, it's \"etch\".  Then add "
-"these lines to your <tt>/etc/apt/sources.list</tt> file:<br />"
+"You'll need to set up our package repository before you can fetch Tor. "
+"First, you need to figure out the name of your distribution. If you're using "
+"Ubuntu 9.04, it's \"jaunty\". Ubuntu 8.10 is \"intrepid\", and Ubuntu 8.04 "
+"is \"hardy\". If you're using Debian etch, it's \"etch\".  Then add these "
+"lines to your <tt>/etc/apt/sources.list</tt> file:<br />"
 msgstr ""
 
 #. type: Content of: <div><div><p><pre>
@@ -92,12 +93,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/debian.wml:57 /tmp/Lbw5xSf0Lp.xml:94
+#: /home/runa/tor/website/docs/en/debian.wml:57 /tmp/IaoiOOcJ3F.xml:94
 msgid "Then run"
 msgstr ""
 
 #. type: Content of: <div><div><p><pre>
-#: /home/runa/tor/website/docs/en/debian.wml:59 /tmp/Lbw5xSf0Lp.xml:96
+#: /home/runa/tor/website/docs/en/debian.wml:59 /tmp/IaoiOOcJ3F.xml:96
 #, no-wrap
 msgid ""
 "gpg --keyserver keys.gnupg.net --recv 94C09C7F\n"
@@ -132,10 +133,8 @@
 msgid ""
 "deb     http://mirror.noreply.org/pub/tor &lt;DISTRIBUTION&gt; main\n"
 "deb-src http://mirror.noreply.org/pub/tor &lt;DISTRIBUTION&gt; main\n"
-"deb http://mirror.noreply.org/pub/tor "
-"experimental-0.2.1.x-&lt;DISTRIBUTION&gt; main\n"
-"deb-src http://mirror.noreply.org/pub/tor "
-"experimental-0.2.1.x-&lt;DISTRIBUTION&gt; main\n"
+"deb http://mirror.noreply.org/pub/tor experimental-0.2.1.x-&lt;DISTRIBUTION&gt; main\n"
+"deb-src http://mirror.noreply.org/pub/tor experimental-0.2.1.x-&lt;DISTRIBUTION&gt; main\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -158,9 +157,9 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:116
 msgid ""
-"If you want to build your own debs from source, see our <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorOnDebian#BuildFromSource\">guide "
-"for building debs</a>."
+"If you want to build your own debs from source, see our <a href=\"https://"
+"wiki.torproject.org/noreply/TheOnionRouter/TorOnDebian#BuildFromSource"
+"\">guide for building debs</a>."
 msgstr ""
 
 #. type: Content of: <div><div>

Modified: translation/trunk/projects/website/templates/docs/3-low.tor-doc-unix.pot
===================================================================
--- translation/trunk/projects/website/templates/docs/3-low.tor-doc-unix.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/docs/3-low.tor-doc-unix.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div><h1>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:11
@@ -21,7 +21,9 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/trL7U54Np8.xml:24 /tmp/trL7U54Np8.xml:53 /tmp/trL7U54Np8.xml:101 /tmp/trL7U54Np8.xml:144 /tmp/trL7U54Np8.xml:182
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/zjsdUdC28n.xml:24
+#: /tmp/zjsdUdC28n.xml:53 /tmp/zjsdUdC28n.xml:101 /tmp/zjsdUdC28n.xml:144
+#: /tmp/zjsdUdC28n.xml:182
 msgid "<br />"
 msgstr ""
 
@@ -42,31 +44,29 @@
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:23
 msgid ""
-"<a class=\"anchor\" href=\"#installing\">Step One: Download and Install "
-"Tor</a>"
+"<a class=\"anchor\" href=\"#installing\">Step One: Download and Install Tor</"
+"a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:27
 msgid ""
-"The latest release of Tor can be found on the <a href=\"<page "
-"download-unix>\">download</a> page. We have packages for Debian, Red Hat, "
-"Gentoo, *BSD, etc there too. If you're using Ubuntu, don't use the default "
-"packages: use <a href=\"<page docs/debian>#ubuntu\">our deb repository</a> "
-"instead."
+"The latest release of Tor can be found on the <a href=\"<page download-unix>"
+"\">download</a> page. We have packages for Debian, Red Hat, Gentoo, *BSD, "
+"etc there too. If you're using Ubuntu, don't use the default packages: use "
+"<a href=\"<page docs/debian>#ubuntu\">our deb repository</a> instead."
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:34
 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>."
+"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>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -91,24 +91,25 @@
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:55
-msgid "After installing Tor, you need to configure your applications to use it."
+msgid ""
+"After installing Tor, you need to configure your applications to use it."
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:59
 msgid ""
-"The first step is to set up web browsing. Start by installing <a "
-"href=\"http://www.privoxy.org/\">Privoxy</a>: click on 'recent releases' and "
-"pick your favorite package or install from source. Privoxy is a filtering "
-"web proxy that integrates well with Tor."
+"The first step is to set up web browsing. Start by installing <a href="
+"\"http://www.privoxy.org/\">Privoxy</a>: click on 'recent releases' and pick "
+"your favorite package or install from source. Privoxy is a filtering web "
+"proxy that integrates well with Tor."
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:65
 msgid ""
 "Once you've installed Privoxy (either from package or from source), <b>you "
-"will need to configure Privoxy to use Tor</b>. You may find <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/PrivoxyConfig\">this "
+"will need to configure Privoxy to use Tor</b>. You may find <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/PrivoxyConfig\">this "
 "sample Privoxy configuration</a> useful. Otherwise, you should configure "
 "Privoxy by hand, using the directions that follow."
 msgstr ""
@@ -136,8 +137,8 @@
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91
 msgid ""
 "Depending on which default config file you have for Privoxy, you may also "
-"need to turn off <tt>enable-remote-toggle</tt>, "
-"<tt>enable-remote-http-toggle</tt>, and <tt>enable-edit-actions</tt>."
+"need to turn off <tt>enable-remote-toggle</tt>, <tt>enable-remote-http-"
+"toggle</tt>, and <tt>enable-edit-actions</tt>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -175,16 +176,17 @@
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:112
 msgid ""
-"<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 />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:119
 msgid ""
-"If you plan to run Firefox on a different computer than Tor, see the <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SocksListenAddress\"> "
-"FAQ entry for running Tor on a different computer</a>."
+"If you plan to run Firefox on a different computer than Tor, see the <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/"
+"TorFAQ#SocksListenAddress\"> FAQ entry for running Tor on a different "
+"computer</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -193,19 +195,19 @@
 "To Torify other applications that support HTTP proxies, just point them at "
 "Privoxy (that is, localhost port 8118). To use SOCKS directly (for instant "
 "messaging, Jabber, IRC, etc), you can point your application directly at Tor "
-"(localhost port 9050), but see <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS\">this "
-"FAQ entry</a> for why this may be dangerous. For applications that support "
-"neither SOCKS nor HTTP, take a look at <a "
-"href=\"http://tsocks.sourceforge.net/\">tsocks</a> or <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO#socat\">socat</a>."
+"(localhost port 9050), but see <a href=\"https://wiki.torproject.org/noreply/"
+"TheOnionRouter/TorFAQ#SOCKSAndDNS\">this FAQ entry</a> for why this may be "
+"dangerous. For applications that support neither SOCKS nor HTTP, take a look "
+"at <a href=\"http://tsocks.sourceforge.net/\">tsocks</a> or <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO#socat"
+"\">socat</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:136
 msgid ""
-"For information on how to Torify other applications, check out the <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
+"For information on how to Torify other applications, check out the <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
 "HOWTO</a>."
 msgstr ""
 
@@ -216,7 +218,8 @@
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:143
-msgid "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
+msgid ""
+"<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
 msgstr ""
 
 #. PO4ASHARPBEGIN<a href="http://ipchicken.com/">
@@ -226,11 +229,11 @@
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:147
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
-"address is being anonymized. Click on <a "
-"href=\"https://check.torproject.org/\">the Tor detector</a> and see whether "
-"it thinks you're using Tor or not.  (If that site is down, see <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate\">this "
-"FAQ entry</a> for more suggestions on how to test your Tor.)"
+"address is being anonymized. Click on <a href=\"https://check.torproject.org/"
+"\">the Tor detector</a> and see whether it thinks you're using Tor or not.  "
+"(If that site is down, see <a href=\"https://wiki.torproject.org/noreply/"
+"TheOnionRouter/TorFAQ#IsMyConnectionPrivate\">this FAQ entry</a> for more "
+"suggestions on how to test your Tor.)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -241,21 +244,19 @@
 "be sure to allow connections from your local applications to Privoxy (local "
 "port 8118) and Tor (local port 9050). If your firewall blocks outgoing "
 "connections, punch a hole so it can connect to at least TCP ports 80 and "
-"443, and then see <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FirewalledClient\">this "
-"FAQ entry</a>.  If your SELinux config is not allowing tor or privoxy to run "
-"correctly, create a file named booleans.local in the directory "
-"/etc/selinux/targeted.  Edit this file in your favorite text editor and "
-"insert \"allow_ypbind=1\".  Restart your machine for this change to take "
-"effect."
+"443, and then see <a href=\"https://wiki.torproject.org/noreply/"
+"TheOnionRouter/TorFAQ#FirewalledClient\">this FAQ entry</a>.  If your "
+"SELinux config is not allowing tor or privoxy to run correctly, create a "
+"file named booleans.local in the directory /etc/selinux/targeted.  Edit this "
+"file in your favorite text editor and insert \"allow_ypbind=1\".  Restart "
+"your machine for this change to take effect."
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:174
 msgid ""
-"If it's still not working, look at <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this "
-"FAQ entry</a> for hints."
+"If it's still not working, look at <a href=\"https://wiki.torproject.org/"
+"noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div>
@@ -265,7 +266,8 @@
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:181
-msgid "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
+msgid ""
+"<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -283,17 +285,17 @@
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:192
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
-"users secure. <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity\">You "
-"may also get stronger anonymity yourself</a>, since remote sites can't know "
-"whether connections originated at your computer or were relayed from others."
+"users secure. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
+"TorFAQ#RelayAnonymity\">You may also get stronger anonymity yourself</a>, "
+"since remote sites can't know whether connections originated at your "
+"computer or were relayed from others."
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:199
 msgid ""
-"Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a "
-"relay</a> guide."
+"Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
+"a> guide."
 msgstr ""
 
 #. type: Content of: <div><div>

Modified: translation/trunk/projects/website/templates/docs/3-low.tor-doc-web.pot
===================================================================
--- translation/trunk/projects/website/templates/docs/3-low.tor-doc-web.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/docs/3-low.tor-doc-web.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div><h1>
 #: /home/runa/tor/website/docs/en/tor-doc-web.wml:11
@@ -36,8 +36,8 @@
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-web.wml:20
 msgid ""
-"<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 />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -47,18 +47,17 @@
 "<br/>In Mozilla and Firefox on Windows, this is in Tools - Options - General "
 "- Connection Settings.  <br/>In Firefox on OS X, it's Firefox - Preferences "
 "- General - Connection Settings.  <br/>In Firefox on Linux, this is in Edit "
-"- Preferences - Advanced - Proxies.  <br/>In Opera it's Tools - "
-"Preferences(Advanced) - Network - Proxy servers.  <br/>While we cannot "
-"advise using IE, for those wishing less-than-real anonymity: In IE, it's "
-"Tools - Internet Options - Connections - LAN Settings - Check Proxy Server - "
-"Advanced."
+"- Preferences - Advanced - Proxies.  <br/>In Opera it's Tools - Preferences"
+"(Advanced) - Network - Proxy servers.  <br/>While we cannot advise using IE, "
+"for those wishing less-than-real anonymity: In IE, it's Tools - Internet "
+"Options - Connections - LAN Settings - Check Proxy Server - Advanced."
 msgstr ""
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/tor-doc-web.wml:38
 msgid ""
-"<img alt=\"Proxy settings in Firefox\" "
-"src=\"../img/screenshot-win32-firefox-proxies.jpg\" />"
+"<img alt=\"Proxy settings in Firefox\" src=\"../img/screenshot-win32-firefox-"
+"proxies.jpg\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -66,11 +65,10 @@
 msgid ""
 "You should fill in \"localhost\" and \"8118\" to point the top four "
 "protocols to Privoxy, as shown here. (Even though Privoxy doesn't support "
-"FTP and Gopher, <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FtpProxy\">you "
-"should set them up anyway</a>.) You should also fill out the socks proxy "
-"entry to point directly to Tor (\"localhost\", \"9050\", and socks5)  to "
-"cover protocols besides the first four. Then click \"OK\"."
+"FTP and Gopher, <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
+"TorFAQ#FtpProxy\">you should set them up anyway</a>.) You should also fill "
+"out the socks proxy entry to point directly to Tor (\"localhost\", \"9050\", "
+"and socks5)  to cover protocols besides the first four. Then click \"OK\"."
 msgstr ""
 
 #. type: Content of: <div><div>

Modified: translation/trunk/projects/website/templates/docs/3-low.tor-hidden-service.pot
===================================================================
--- translation/trunk/projects/website/templates/docs/3-low.tor-hidden-service.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/docs/3-low.tor-hidden-service.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div><h1>
 #: /home/runa/tor/website/docs/en/tor-hidden-service.wml:11
@@ -21,7 +21,8 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:12 /tmp/w2hWgcySQo.xml:260
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:12
+#: /tmp/onBaazsYD7.xml:260
 msgid "<hr />"
 msgstr ""
 
@@ -59,12 +60,12 @@
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/tor-hidden-service.wml:33
 msgid ""
-"<a class=\"anchor\" href=\"#zero\">Step Zero: Get Tor and Privoxy "
-"working</a>"
+"<a class=\"anchor\" href=\"#zero\">Step Zero: Get Tor and Privoxy working</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:34 /tmp/w2hWgcySQo.xml:70 /tmp/w2hWgcySQo.xml:115 /tmp/w2hWgcySQo.xml:215
+#: /home/runa/tor/website/docs/en/tor-hidden-service.wml:34
+#: /tmp/onBaazsYD7.xml:70 /tmp/onBaazsYD7.xml:115 /tmp/onBaazsYD7.xml:215
 msgid "<br />"
 msgstr ""
 
@@ -96,26 +97,25 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-hidden-service.wml:45
 msgid ""
-"Windows users should follow the <a href=\"<page "
-"docs/tor-doc-windows>\">Windows howto</a>, OS X users should follow the <a "
-"href=\"<page docs/tor-doc-osx>\">OS X howto</a>, and Linux/BSD/Unix users "
-"should follow the <a href=\"<page docs/tor-doc-unix>\">Unix howto</a>."
+"Windows users should follow the <a href=\"<page docs/tor-doc-windows>"
+"\">Windows howto</a>, OS X users should follow the <a href=\"<page docs/tor-"
+"doc-osx>\">OS X howto</a>, and Linux/BSD/Unix users should follow the <a "
+"href=\"<page docs/tor-doc-unix>\">Unix howto</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-hidden-service.wml:53
 msgid ""
 "Once you've got Tor and Privoxy installed and configured, you can see hidden "
-"services in action by following this link to <a "
-"href=\"http://duskgytldkxiuqc6.onion/\">our example hidden service</a> or "
-"the <a href=\"http://gaddbiwdftapglkq.onion/\">Wikileaks hidden "
-"service</a>.  It will typically take 10-60 seconds to load (or to decide "
-"that it is currently unreachable). If it fails immediately and your browser "
-"pops up an alert saying that \"www.duskgytldkxiuqc6.onion could not be "
-"found, please check the name and try again\" then you haven't configured Tor "
-"and Privoxy correctly; see <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">the "
-"it-doesn't-work FAQ entry</a> for some help."
+"services in action by following this link to <a href=\"http://"
+"duskgytldkxiuqc6.onion/\">our example hidden service</a> or the <a href="
+"\"http://gaddbiwdftapglkq.onion/\">Wikileaks hidden service</a>.  It will "
+"typically take 10-60 seconds to load (or to decide that it is currently "
+"unreachable). If it fails immediately and your browser pops up an alert "
+"saying that \"www.duskgytldkxiuqc6.onion could not be found, please check "
+"the name and try again\" then you haven't configured Tor and Privoxy "
+"correctly; see <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
+"TorFAQ#ItDoesntWork\">the it-doesn't-work FAQ entry</a> for some help."
 msgstr ""
 
 #. type: Content of: <div><div>
@@ -125,7 +125,8 @@
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/tor-hidden-service.wml:69
-msgid "<a class=\"anchor\" href=\"#one\">Step One: Install a web server locally</a>"
+msgid ""
+"<a class=\"anchor\" href=\"#one\">Step One: Install a web server locally</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -143,23 +144,21 @@
 #: /home/runa/tor/website/docs/en/tor-hidden-service.wml:81
 msgid ""
 "If you're on Unix or OS X and you're comfortable with the command-line, by "
-"far the best way to go is to install <a "
-"href=\"http://www.acme.com/software/thttpd/\">thttpd</a>. Just grab the "
-"latest tarball, untar it (it will create its own directory), and run "
-"<kbd>./configure &amp;&amp; make</kbd>. Then <kbd>mkdir hidserv; cd "
-"hidserv</kbd>, and run <kbd>../thttpd -p 5222 -h localhost</kbd>. It will "
-"give you back your prompt, and now you're running a webserver on port "
-"5222. You can put files to serve in the hidserv directory."
+"far the best way to go is to install <a href=\"http://www.acme.com/software/"
+"thttpd/\">thttpd</a>. Just grab the latest tarball, untar it (it will create "
+"its own directory), and run <kbd>./configure &amp;&amp; make</kbd>. Then "
+"<kbd>mkdir hidserv; cd hidserv</kbd>, and run <kbd>../thttpd -p 5222 -h "
+"localhost</kbd>. It will give you back your prompt, and now you're running a "
+"webserver on port 5222. You can put files to serve in the hidserv directory."
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-hidden-service.wml:92
 msgid ""
-"If you're on Windows, you might pick <a "
-"href=\"http://savant.sourceforge.net/\">Savant</a> or <a "
-"href=\"http://httpd.apache.org/\">Apache</a>, and be sure to configure it to "
-"bind only to localhost. You should also figure out what port you're "
-"listening on, because you'll use it below."
+"If you're on Windows, you might pick <a href=\"http://savant.sourceforge.net/"
+"\">Savant</a> or <a href=\"http://httpd.apache.org/\">Apache</a>, and be "
+"sure to configure it to bind only to localhost. You should also figure out "
+"what port you're listening on, because you'll use it below."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -174,10 +173,9 @@
 #: /home/runa/tor/website/docs/en/tor-hidden-service.wml:105
 msgid ""
 "Once you've got your web server set up, make sure it works: open your "
-"browser and go to <a "
-"href=\"http://localhost:5222/\">http://localhost:5222/</a>, where 5222 is "
-"the port that you picked above. Then try putting a file in the main html "
-"directory, and make sure it shows up when you access the site."
+"browser and go to <a href=\"http://localhost:5222/\">http://localhost:5222/</"
+"a>, where 5222 is the port that you picked above. Then try putting a file in "
+"the main html directory, and make sure it shows up when you access the site."
 msgstr ""
 
 #. type: Content of: <div><div>
@@ -188,8 +186,7 @@
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/tor-hidden-service.wml:114
 msgid ""
-"<a class=\"anchor\" href=\"#two\">Step Two: Configure your hidden "
-"service</a>"
+"<a class=\"anchor\" href=\"#two\">Step Two: Configure your hidden service</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -202,8 +199,8 @@
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-hidden-service.wml:121
 msgid ""
-"First, open your torrc file in your favorite text editor. (See <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc\">the "
+"First, open your torrc file in your favorite text editor. (See <a href="
+"\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc\">the "
 "torrc FAQ entry</a> to learn what this means.) Go to the middle section and "
 "look for the line"
 msgstr ""
@@ -220,8 +217,8 @@
 "This section of the file consists of groups of lines, each representing one "
 "hidden service. Right now they are all commented out (the lines start with "
 "#), so hidden services are disabled. Each group of lines consists of one "
-"<var>HiddenServiceDir</var> line, and one or more "
-"<var>HiddenServicePort</var> lines:"
+"<var>HiddenServiceDir</var> line, and one or more <var>HiddenServicePort</"
+"var> lines:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
@@ -268,8 +265,7 @@
 #: /home/runa/tor/website/docs/en/tor-hidden-service.wml:160
 #, no-wrap
 msgid ""
-"HiddenServiceDir C:\\Documents and Settings\\username\\Application "
-"Data\\hidden_service\\\\\n"
+"HiddenServiceDir C:\\Documents and Settings\\username\\Application Data\\hidden_service\\\\\n"
 "HiddenServicePort 80 127.0.0.1:5222\n"
 msgstr ""
 
@@ -284,18 +280,16 @@
 "If Tor starts up again, great. Otherwise, something is wrong. First look at "
 "your logfiles for hints. It will print some warnings or error messages. That "
 "should give you an idea what went wrong. Typically there are typos in the "
-"torrc or wrong directory permissions (See <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#Logs\">the "
-"logging FAQ entry</a> if you don't know how to enable or find your log "
-"file.)"
+"torrc or wrong directory permissions (See <a href=\"https://wiki.torproject."
+"org/noreply/TheOnionRouter/TorFAQ#Logs\">the logging FAQ entry</a> if you "
+"don't know how to enable or find your log file.)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-hidden-service.wml:177
 msgid ""
-"When Tor starts, it will automatically create the "
-"<var>HiddenServiceDir</var> that you specified (if necessary), and it will "
-"create two files there."
+"When Tor starts, it will automatically create the <var>HiddenServiceDir</"
+"var> that you specified (if necessary), and it will create two files there."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
@@ -339,19 +333,19 @@
 msgid ""
 "Now that you've restarted Tor, it is busy picking introduction points in the "
 "Tor network, and generating a <em>hidden service descriptor</em>. This is a "
-"signed list of introduction points along with the service's full public "
-"key. It anonymously publishes this descriptor to the directory servers, and "
-"other people anonymously fetch it from the directory servers when they're "
-"trying to access your service."
+"signed list of introduction points along with the service's full public key. "
+"It anonymously publishes this descriptor to the directory servers, and other "
+"people anonymously fetch it from the directory servers when they're trying "
+"to access your service."
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/tor-hidden-service.wml:206
 msgid ""
-"Try it now: paste the contents of the hostname file into your web "
-"browser. If it works, you'll get the html page you set up in step one.  If "
-"it doesn't work, look in your logs for some hints, and keep playing with it "
-"until it works."
+"Try it now: paste the contents of the hostname file into your web browser. "
+"If it works, you'll get the html page you set up in step one.  If it doesn't "
+"work, look in your logs for some hints, and keep playing with it until it "
+"works."
 msgstr ""
 
 #. type: Content of: <div><div>
@@ -389,9 +383,9 @@
 "If you want to forward multiple virtual ports for a single hidden service, "
 "just add more <var>HiddenServicePort</var> lines.  If you want to run "
 "multiple hidden services from the same Tor client, just add another "
-"<var>HiddenServiceDir</var> line. All the following "
-"<var>HiddenServicePort</var> lines refer to this <var>HiddenServiceDir</var> "
-"line, until you add another <var>HiddenServiceDir</var> line:"
+"<var>HiddenServiceDir</var> line. All the following <var>HiddenServicePort</"
+"var> lines refer to this <var>HiddenServiceDir</var> line, until you add "
+"another <var>HiddenServiceDir</var> line:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>

Modified: translation/trunk/projects/website/templates/press/3-low.index.pot
===================================================================
--- translation/trunk/projects/website/templates/press/3-low.index.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/press/3-low.index.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/press/en/index.wml:11
@@ -38,16 +38,15 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/press/en/index.wml:27
 msgid ""
-"12 March 2009.  Tor launches a <a href=\"<page "
-"press/2009-03-12-performance-roadmap-press-release>\">performance "
-"roadmap</a> and campaign."
+"12 March 2009.  Tor launches a <a href=\"<page press/2009-03-12-performance-"
+"roadmap-press-release>\">performance roadmap</a> and campaign."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/press/en/index.wml:28
 msgid ""
-"19 December 2008.  Tor announces 3-year <a href=\"<page "
-"press/2008-12-19-roadmap-press-release>\">development roadmap</a>."
+"19 December 2008.  Tor announces 3-year <a href=\"<page press/2008-12-19-"
+"roadmap-press-release>\">development roadmap</a>."
 msgstr ""
 
 #. type: Content of: <div>
@@ -77,9 +76,8 @@
 #. type: Content of: <div><div><ol><li>
 #: /home/runa/tor/website/press/en/index.wml:37
 msgid ""
-"<a "
-"href=\"/press/presskit/2009-General-Background-on-Tor-Project-Inc.pdf\">Who "
-"is the Tor Project, Inc.</a>?"
+"<a href=\"/press/presskit/2009-General-Background-on-Tor-Project-Inc.pdf"
+"\">Who is the Tor Project, Inc.</a>?"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>

Modified: translation/trunk/projects/website/templates/press/4-optional.2008-12-19-roadmap-press-release.pot
===================================================================
--- translation/trunk/projects/website/templates/press/4-optional.2008-12-19-roadmap-press-release.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/press/4-optional.2008-12-19-roadmap-press-release.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/press/en/2008-12-19-roadmap-press-release.wml:11
@@ -22,15 +22,16 @@
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/press/en/2008-12-19-roadmap-press-release.wml:13
-msgid "<strong>THE TOR PROJECT ANNOUNCES THREE-YEAR DEVELOPMENT ROADMAP</strong>"
+msgid ""
+"<strong>THE TOR PROJECT ANNOUNCES THREE-YEAR DEVELOPMENT ROADMAP</strong>"
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/press/en/2008-12-19-roadmap-press-release.wml:15
 msgid ""
-"<strong>DEDHAM, MA</strong> - The Tor Project has published its <a "
-"href=\"/press/presskit/2008-12-19-roadmap-full.pdf\">three year development "
-"roadmap</a>, focused on providing anti-censorship tools and services for the "
+"<strong>DEDHAM, MA</strong> - The Tor Project has published its <a href=\"/"
+"press/presskit/2008-12-19-roadmap-full.pdf\">three year development roadmap</"
+"a>, focused on providing anti-censorship tools and services for the "
 "advancement of Internet freedom in closed societies."
 msgstr ""
 
@@ -52,12 +53,12 @@
 #: /home/runa/tor/website/press/en/2008-12-19-roadmap-press-release.wml:33
 msgid ""
 "While Tor's original goal was to provide this important anonymity, many "
-"people around the world use Tor to get around Internet censorship, as "
-"well.  <a href=\"http://www.hrw.org/\">Human Rights Watch</a> and <a "
-"href=\"http://globalvoicesonline.org/\">Global Voices Online</a> have both "
-"recommended Tor as a tool to circumvent censorship regimes in oppressive "
-"nations. The roadmap is focused on providing anti-censorship tools and "
-"services for the advancement of Internet freedom in closed societies."
+"people around the world use Tor to get around Internet censorship, as well. "
+" <a href=\"http://www.hrw.org/\">Human Rights Watch</a> and <a href=\"http://"
+"globalvoicesonline.org/\">Global Voices Online</a> have both recommended Tor "
+"as a tool to circumvent censorship regimes in oppressive nations. The "
+"roadmap is focused on providing anti-censorship tools and services for the "
+"advancement of Internet freedom in closed societies."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -75,12 +76,12 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/press/en/2008-12-19-roadmap-press-release.wml:51
 msgid ""
-"Tor welcomes additional sponsors to join <a "
-"href=\"https://www.torproject.org/sponsors\">current sponsors</a>; such as "
-"the Broadcasting Board of Governors, the NLnet Foundation, and hundreds of "
-"individual donors. While existing funders are enough to get the items on the "
-"roadmap started, an additional $2.1 million over the next three years will "
-"turn the roadmap into usable tools."
+"Tor welcomes additional sponsors to join <a href=\"https://www.torproject."
+"org/sponsors\">current sponsors</a>; such as the Broadcasting Board of "
+"Governors, the NLnet Foundation, and hundreds of individual donors. While "
+"existing funders are enough to get the items on the roadmap started, an "
+"additional $2.1 million over the next three years will turn the roadmap into "
+"usable tools."
 msgstr ""
 
 #. type: Content of: <div><h2>

Modified: translation/trunk/projects/website/templates/press/4-optional.2009-03-12-performance-roadmap-press-release.pot
===================================================================
--- translation/trunk/projects/website/templates/press/4-optional.2009-03-12-performance-roadmap-press-release.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/press/4-optional.2009-03-12-performance-roadmap-press-release.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/press/en/2009-03-12-performance-roadmap-press-release.wml:11
@@ -28,17 +28,17 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/press/en/2009-03-12-performance-roadmap-press-release.wml:15
 msgid ""
-"<strong>DEDHAM, MA</strong> -The Tor Project has <a "
-"href=\"/press/presskit/2009-03-11-performance.pdf\">launched a roadmap</a> "
-"for dramatically improving the performance of the public Tor network over "
-"the next year.  A combination of existing funding and a needed $1 million "
-"over the next 12 months will ensure success.  This campaign is a direct "
-"result of the recently published <a href=\"<page "
-"press/2008-12-19-roadmap-press-release>\">3-Year Development Roadmap</a>.  "
-"The roadmap incorporates research and actions from a number of sources which "
-"define the next steps for improving performance of the public Tor network.  "
-"The most requested feature by users of the public Tor network is to increase "
-"performance while keeping strong anonymity intact."
+"<strong>DEDHAM, MA</strong> -The Tor Project has <a href=\"/press/"
+"presskit/2009-03-11-performance.pdf\">launched a roadmap</a> for "
+"dramatically improving the performance of the public Tor network over the "
+"next year.  A combination of existing funding and a needed $1 million over "
+"the next 12 months will ensure success.  This campaign is a direct result of "
+"the recently published <a href=\"<page press/2008-12-19-roadmap-press-"
+"release>\">3-Year Development Roadmap</a>.  The roadmap incorporates "
+"research and actions from a number of sources which define the next steps "
+"for improving performance of the public Tor network.  The most requested "
+"feature by users of the public Tor network is to increase performance while "
+"keeping strong anonymity intact."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -75,12 +75,12 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/press/en/2009-03-12-performance-roadmap-press-release.wml:33
 msgid ""
-"Tor welcomes additional sponsors to join our <a href=\"<page "
-"sponsors>\">current sponsors</a>; such as the Broadcasting Board of "
-"Governors, the NLnet Foundation, and hundreds of individual donors. While "
-"existing funders are enough to get the items on the roadmap started, an "
-"additional $1 million over the next year will dramatically increase the "
-"performance of the public Tor network."
+"Tor welcomes additional sponsors to join our <a href=\"<page sponsors>"
+"\">current sponsors</a>; such as the Broadcasting Board of Governors, the "
+"NLnet Foundation, and hundreds of individual donors. While existing funders "
+"are enough to get the items on the roadmap started, an additional $1 million "
+"over the next year will dramatically increase the performance of the public "
+"Tor network."
 msgstr ""
 
 #. type: Content of: <div><h2>

Modified: translation/trunk/projects/website/templates/projects/3-low.index.pot
===================================================================
--- translation/trunk/projects/website/templates/projects/3-low.index.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/projects/3-low.index.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/projects/en/index.wml:11

Modified: translation/trunk/projects/website/templates/projects/4-optional.google.pot
===================================================================
--- translation/trunk/projects/website/templates/projects/4-optional.google.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/projects/4-optional.google.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/projects/en/google.wml:11
@@ -28,8 +28,8 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/projects/en/google.wml:21
 msgid ""
-"This project is generously funded by <a "
-"href=\"http://www.google.com\">Google</a>."
+"This project is generously funded by <a href=\"http://www.google.com"
+"\">Google</a>."
 msgstr ""
 
 #. type: Content of: <div>
@@ -53,7 +53,8 @@
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/projects/en/google.wml:44 /tmp/cZmta1vblz.xml:57 /tmp/cZmta1vblz.xml:70
+#: /home/runa/tor/website/projects/en/google.wml:44 /tmp/kdO5Wblbm3.xml:57
+#: /tmp/kdO5Wblbm3.xml:70
 msgid "November 15, 2008"
 msgstr ""
 
@@ -63,8 +64,8 @@
 "<b>Milestone 2:</b>Vidalia can fetch a new version of Tor from the Tor "
 "website and check its signature.<br /> <small><em>Update either via Tor or "
 "via the directory mirror update protocol (proposal 127) when possible, for "
-"additional privacy.  Check package signatures to ensure package "
-"validity.</em></small>"
+"additional privacy.  Check package signatures to ensure package validity.</"
+"em></small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>

Modified: translation/trunk/projects/website/templates/projects/4-optional.hidserv.pot
===================================================================
--- translation/trunk/projects/website/templates/projects/4-optional.hidserv.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/projects/4-optional.hidserv.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/projects/en/hidserv.wml:11
@@ -67,8 +67,8 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/projects/en/hidserv.wml:53
 msgid ""
-"<a href=\"http://www.nlnet.nl/news/2008/20080514-awards.html\"> <img "
-"src=\"$(IMGROOT)/nlnet-160x60.png\" alt=\"The NLnet foundation\" /></a>"
+"<a href=\"http://www.nlnet.nl/news/2008/20080514-awards.html\"> <img src="
+"\"$(IMGROOT)/nlnet-160x60.png\" alt=\"The NLnet foundation\" /></a>"
 msgstr ""
 
 #. type: Content of: <div><table><thead><tr><th>
@@ -205,20 +205,19 @@
 "hidden service. Furthermore, measurement data from April 2008 could be "
 "leveraged to explore timings of internal substeps of establishing a "
 "connection to a hidden service. The results of this analysis are contained "
-"in a 22-page <a "
-"href=\"http://freehaven.net/~karsten/hidserv/perfanalysis-2008-06-15.pdf\">report</a> "
-"that has been made public on the Tor <a "
-"href=\"http://archives.seul.org/or/dev/Jun-2008/msg00019.html\">developer "
-"mailing list</a>.</em></small> <br/> <small><em>The analysis also unveiled a "
-"few bugs which were responsible for part of the delay in making a hidden "
-"service available for clients. Some bugs have been fixed subsequent to the "
-"analysis, others will be fixed soon. The evaluation has further brought up "
-"several possible approaches to improve Tor Hidden Service performance. Some "
-"of these ideas can be applied immediately, while others require deeper "
-"analysis and new measurements. Finally, in the course of the analysis, we "
-"discovered that some improvements require more in-depth changes to Tor which "
-"are not directly related to hidden services. These changes cannot be "
-"achieved in the time frame of this project.</em></small>"
+"in a 22-page <a href=\"http://freehaven.net/~karsten/hidserv/perfanalysis-"
+"2008-06-15.pdf\">report</a> that has been made public on the Tor <a href="
+"\"http://archives.seul.org/or/dev/Jun-2008/msg00019.html\">developer mailing "
+"list</a>.</em></small> <br/> <small><em>The analysis also unveiled a few "
+"bugs which were responsible for part of the delay in making a hidden service "
+"available for clients. Some bugs have been fixed subsequent to the analysis, "
+"others will be fixed soon. The evaluation has further brought up several "
+"possible approaches to improve Tor Hidden Service performance. Some of these "
+"ideas can be applied immediately, while others require deeper analysis and "
+"new measurements. Finally, in the course of the analysis, we discovered that "
+"some improvements require more in-depth changes to Tor which are not "
+"directly related to hidden services. These changes cannot be achieved in the "
+"time frame of this project.</em></small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -229,22 +228,22 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/projects/en/hidserv.wml:200
 msgid ""
-"<small><em>All bugs that have been found in the analysis have been "
-"fixed. This includes the 2 bugs that have already been fixed during the "
-"analysis and 4 more bugs that were fixed within the past 30 days. While the "
-"bugfixes remove unintended performance bottlenecks due to programming "
-"errors, some of the design changes that have been spotted in the previous "
-"analysis have side-effects on anonymity or overall network load which need "
-"to be evaluated against individual performance gains. A <a "
-"href=\"http://freehaven.net/~karsten/hidserv/discussion-2008-07-15.pdf\">report</a> "
-"has been published to the <a "
-"href=\"http://archives.seul.org/or/dev/Jul-2008/msg00034.html\">developer "
-"mailing list</a> including 7 possible design changes that need to be "
-"discussed. Some evaluations (namely Low-Bandwidth Measurements and the Grand "
-"Scaling Plan) have turned out to require more time than expected and had to "
-"be scheduled for a later time in the project than deliverable B. The current "
-"plan is to perform these evaluations within the timeframe until January 15 "
-"and work with assumptions until final results are available.</em></small>"
+"<small><em>All bugs that have been found in the analysis have been fixed. "
+"This includes the 2 bugs that have already been fixed during the analysis "
+"and 4 more bugs that were fixed within the past 30 days. While the bugfixes "
+"remove unintended performance bottlenecks due to programming errors, some of "
+"the design changes that have been spotted in the previous analysis have side-"
+"effects on anonymity or overall network load which need to be evaluated "
+"against individual performance gains. A <a href=\"http://freehaven.net/"
+"~karsten/hidserv/discussion-2008-07-15.pdf\">report</a> has been published "
+"to the <a href=\"http://archives.seul.org/or/dev/Jul-2008/msg00034.html"
+"\">developer mailing list</a> including 7 possible design changes that need "
+"to be discussed. Some evaluations (namely Low-Bandwidth Measurements and the "
+"Grand Scaling Plan) have turned out to require more time than expected and "
+"had to be scheduled for a later time in the project than deliverable B. The "
+"current plan is to perform these evaluations within the timeframe until "
+"January 15 and work with assumptions until final results are available.</"
+"em></small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -265,10 +264,9 @@
 "upcoming implementation phase are now quite clear: One bug needs to be fixed "
 "and four design changes need to be implemented. Further, evaluations of the "
 "changed design need to be performed in order to verify their usefulness. A "
-"<a "
-"href=\"http://freehaven.net/~karsten/hidserv/design-2008-08-15.pdf\">report</a> "
-"with the results of the design phase has been published to the <a "
-"href=\"http://archives.seul.org/or/dev/Aug-2008/msg00025.html\">developer "
+"<a href=\"http://freehaven.net/~karsten/hidserv/design-2008-08-15.pdf"
+"\">report</a> with the results of the design phase has been published to the "
+"<a href=\"http://archives.seul.org/or/dev/Aug-2008/msg00025.html\">developer "
 "mailing list</a>.</em></small>"
 msgstr ""
 
@@ -281,25 +279,23 @@
 #: /home/runa/tor/website/projects/en/hidserv.wml:252
 msgid ""
 "<small><em>During the first half of the implementation phase two bugs could "
-"be fixed that were related to hidden services: the <a "
-"href=\"http://bugs.noreply.org/flyspray/index.php?do=details&amp;id=767\">first "
-"bug</a> has already been identified in the design phase and was responsible "
-"for an unusual high failure rate when making a hidden service available in "
-"the system; the <a "
-"href=\"http://bugs.noreply.org/flyspray/index.php?id=814&amp;do=details\">second "
-"bug</a> was found during the implementation phase and was responsible for "
-"failure to connect to a working hidden service. Both bugfixes will be "
-"included in the next unstable version and likely be backported to one of the "
-"next stable releases.</em></small> <br/> <small><em>The four design changes "
-"that were proposed as result of the design phase have been implemented in an "
-"<a "
-"href=\"https://tor-svn.freehaven.net/svn/tor/branches/hidserv-design-changes/\">experimental "
-"branch</a> of the unstable development tree. Early function tests have shown "
-"that these changes work and provide better (perceived)  performance. This "
-"needs to be confirmed throughout the next four weeks in internal tests. The "
-"next goal is to prepare a release of this experimental branch that can be "
-"given out to beta testers at the beginning of the upcoming testing "
-"phase.</em></small>"
+"be fixed that were related to hidden services: the <a href=\"http://bugs."
+"noreply.org/flyspray/index.php?do=details&amp;id=767\">first bug</a> has "
+"already been identified in the design phase and was responsible for an "
+"unusual high failure rate when making a hidden service available in the "
+"system; the <a href=\"http://bugs.noreply.org/flyspray/index.php?id=814&amp;"
+"do=details\">second bug</a> was found during the implementation phase and "
+"was responsible for failure to connect to a working hidden service. Both "
+"bugfixes will be included in the next unstable version and likely be "
+"backported to one of the next stable releases.</em></small> <br/> "
+"<small><em>The four design changes that were proposed as result of the "
+"design phase have been implemented in an <a href=\"https://tor-svn.freehaven."
+"net/svn/tor/branches/hidserv-design-changes/\">experimental branch</a> of "
+"the unstable development tree. Early function tests have shown that these "
+"changes work and provide better (perceived)  performance. This needs to be "
+"confirmed throughout the next four weeks in internal tests. The next goal is "
+"to prepare a release of this experimental branch that can be given out to "
+"beta testers at the beginning of the upcoming testing phase.</em></small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -312,22 +308,22 @@
 msgid ""
 "<small><em>The implementation phase has been concluded. The bugfixes that "
 "were found in the past 30 days have been released in developer version <a "
-"href=\"http://archives.seul.org/or/talk/Oct-2008/msg00093.html\">0.2.1.6-alpha</a>.  "
-"The four design changes that were identified in the design phase have been "
-"specified in <a "
-"href=\"https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/155-four-hidden-service-improvements.txt\">proposal "
-"155</a>.  Three design changes have been included in the development "
-"codebase and will automatically be included in the next development "
-"version. The first two design changes improve connection establishment to a "
-"hidden service by reducing a timeout from 60 to 30 seconds and by making a "
-"second attempt in parallel after a delay of 15 seconds. The third design "
-"change affects publication of a hidden service in the network by advertising "
-"the service at 5 rather than 3 points in the network in parallel and "
-"succeeding as soon as 3 points are established. The fourth design change has "
-"turned out to be rather ineffective, but would add considerable code "
-"complexity and was therefore dismissed. By now there are no more open "
-"bugfixes or new designs. All changes are in the development codebase and can "
-"be tested in the next phase.</em></small>"
+"href=\"http://archives.seul.org/or/talk/Oct-2008/msg00093.html\">0.2.1.6-"
+"alpha</a>.  The four design changes that were identified in the design phase "
+"have been specified in <a href=\"https://svn.torproject.org/svn/tor/trunk/"
+"doc/spec/proposals/155-four-hidden-service-improvements.txt\">proposal 155</"
+"a>.  Three design changes have been included in the development codebase and "
+"will automatically be included in the next development version. The first "
+"two design changes improve connection establishment to a hidden service by "
+"reducing a timeout from 60 to 30 seconds and by making a second attempt in "
+"parallel after a delay of 15 seconds. The third design change affects "
+"publication of a hidden service in the network by advertising the service at "
+"5 rather than 3 points in the network in parallel and succeeding as soon as "
+"3 points are established. The fourth design change has turned out to be "
+"rather ineffective, but would add considerable code complexity and was "
+"therefore dismissed. By now there are no more open bugfixes or new designs. "
+"All changes are in the development codebase and can be tested in the next "
+"phase.</em></small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -341,36 +337,34 @@
 "<small><em>The performance improvements that were implemented in the last "
 "phase have been released in Tor version 0.2.1.7-alpha. Users can download "
 "this development version from the Tor homepage and test the improvements "
-"with minimal effort. Further, two bugfixes (<a "
-"href=\"http://bugs.noreply.org/flyspray/index.php?id=767&amp;do=details\">1</a>, "
-"<a "
-"href=\"http://bugs.noreply.org/flyspray/index.php?id=814&amp;do=details\">2</a>)  "
-"that were found in the course of this project have been backported to the "
-"stable branch and will be included with the next stable version "
-"0.2.0.32.</em></small> <br/> <small><em>The main focus of the past 31 days "
-"was to perform new measurements to see whether the improvements are "
-"effective or not.  Measurements were conducted for two days in the time of "
-"November 6th to 8th. Unfortunately, the Tor network suffered a serious "
-"problem in this time: An expired directory authority certificate produced "
-"huge amounts of traffic within the Tor network which <a "
-"href=\"http://archives.seul.org/or/talk/Nov-2008/msg00053.html\">forced many "
-"operators to shut down their relays</a>. A second measurement was performed "
-"between 13th and 15th. The raw data are available <a "
-"href=\"http://freehaven.net/~karsten/hidserv/perfdata-2008-11-13.tar.gz\">here</a> "
-"(40 MB). But results show that the overall network performance is still "
-"worse than in June 2008 when the first hidden service measurements have been "
-"performed. This becomes visible when comparing requests to the Tor "
-"directories which have not been affected by the performance improvements and "
-"which exhibit significantly worse performance than before. The effects of "
-"performance improvements are visible, but absolute values are not comparable "
-"at this time. New measurements will be conducted in December in the hope "
-"that the effects of this problem have mitigated.</em></small> <br/> "
-"<small><em>Further, there might be a <a "
-"href=\"http://bugs.noreply.org/flyspray/index.php?id=847&amp;do=details\">bug</a> "
-"in the way how Tor downloads directory information during "
-"bootstrapping. Even though this is not related to hidden services, an "
-"improvement would benefit hidden service publication, too. Part of the work "
-"during the upcoming 30 days will be to investigate this bug.  </em></small>"
+"with minimal effort. Further, two bugfixes (<a href=\"http://bugs.noreply."
+"org/flyspray/index.php?id=767&amp;do=details\">1</a>, <a href=\"http://bugs."
+"noreply.org/flyspray/index.php?id=814&amp;do=details\">2</a>)  that were "
+"found in the course of this project have been backported to the stable "
+"branch and will be included with the next stable version 0.2.0.32.</em></"
+"small> <br/> <small><em>The main focus of the past 31 days was to perform "
+"new measurements to see whether the improvements are effective or not.  "
+"Measurements were conducted for two days in the time of November 6th to 8th. "
+"Unfortunately, the Tor network suffered a serious problem in this time: An "
+"expired directory authority certificate produced huge amounts of traffic "
+"within the Tor network which <a href=\"http://archives.seul.org/or/talk/Nov-"
+"2008/msg00053.html\">forced many operators to shut down their relays</a>. A "
+"second measurement was performed between 13th and 15th. The raw data are "
+"available <a href=\"http://freehaven.net/~karsten/hidserv/perfdata-2008-11-"
+"13.tar.gz\">here</a> (40 MB). But results show that the overall network "
+"performance is still worse than in June 2008 when the first hidden service "
+"measurements have been performed. This becomes visible when comparing "
+"requests to the Tor directories which have not been affected by the "
+"performance improvements and which exhibit significantly worse performance "
+"than before. The effects of performance improvements are visible, but "
+"absolute values are not comparable at this time. New measurements will be "
+"conducted in December in the hope that the effects of this problem have "
+"mitigated.</em></small> <br/> <small><em>Further, there might be a <a href="
+"\"http://bugs.noreply.org/flyspray/index.php?id=847&amp;do=details\">bug</a> "
+"in the way how Tor downloads directory information during bootstrapping. "
+"Even though this is not related to hidden services, an improvement would "
+"benefit hidden service publication, too. Part of the work during the "
+"upcoming 30 days will be to investigate this bug.  </em></small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -382,34 +376,33 @@
 #: /home/runa/tor/website/projects/en/hidserv.wml:355
 msgid ""
 "<small><em>Part of the last 30 days has been used to fix bugs that have "
-"influenced the previous hidden service measurements. The first <a "
-"href=\"http://archives.seul.org/or/cvs/Nov-2008/msg00100.html\">bugfix</a> "
+"influenced the previous hidden service measurements. The first <a href="
+"\"http://archives.seul.org/or/cvs/Nov-2008/msg00100.html\">bugfix</a> "
 "corrects a possible segmentation fault that was very likely responsible for "
-"a number of failed measurement runs. Another <a "
-"href=\"https://bugs.torproject.org/flyspray/index.php?id=847&amp;do=details\">bug</a> "
-"could be explained that lead to significant delays in bootstrapping: Very "
-"slow directory authorities occupied bootstrapping clients for a long time "
-"before clients finally gave up and bootstrapped using another authority. As "
-"a result, the slowest two directory authorities have dedicated more "
-"bandwidth to their nodes, so that the effect is mitigated. A third <a "
-"href=\"https://bugs.torproject.org/flyspray/index.php?id=874&amp;do=details\">bug</a> "
-"has been introduced with the hidden service performance improvements in "
+"a number of failed measurement runs. Another <a href=\"https://bugs."
+"torproject.org/flyspray/index.php?id=847&amp;do=details\">bug</a> could be "
+"explained that lead to significant delays in bootstrapping: Very slow "
+"directory authorities occupied bootstrapping clients for a long time before "
+"clients finally gave up and bootstrapped using another authority. As a "
+"result, the slowest two directory authorities have dedicated more bandwidth "
+"to their nodes, so that the effect is mitigated. A third <a href=\"https://"
+"bugs.torproject.org/flyspray/index.php?id=874&amp;do=details\">bug</a> has "
+"been introduced with the hidden service performance improvements in "
 "November; the effect was that Tor processes running hidden services would "
 "stop advertising their service upon reloading their configuration. Further, "
 "this bug has uncovered that Tor has re-established its introduction points "
 "upon reloading, which might have affected hidden service stability. This bug "
-"has been fixed and will be included in the upcoming version "
-"0.2.1.9-alpha.</em></small> <br/> <small><em>Apart from fixing bugs, new "
-"measurements have been performed between December 8 and 10. These will very "
-"likely be the final measurements to compare hidden service performance now "
-"with the beginning of the project. The data have not been completely "
-"evaluated, so it is difficult to make a statement about improvements at this "
-"point. However, a <a "
-"href=\"http://freehaven.net/~karsten/hidserv/prelimreport-2008-12-15.pdf\">preliminary "
-"evaluation</a> shows that service publication times have improved "
-"significantly. This is a result of Tor clients bootstrapping faster and of "
-"the performance improvements added in November. In contrast to this, the "
-"results for establishing a connection to a hidden service are less "
+"has been fixed and will be included in the upcoming version 0.2.1.9-alpha.</"
+"em></small> <br/> <small><em>Apart from fixing bugs, new measurements have "
+"been performed between December 8 and 10. These will very likely be the "
+"final measurements to compare hidden service performance now with the "
+"beginning of the project. The data have not been completely evaluated, so it "
+"is difficult to make a statement about improvements at this point. However, "
+"a <a href=\"http://freehaven.net/~karsten/hidserv/prelimreport-2008-12-15.pdf"
+"\">preliminary evaluation</a> shows that service publication times have "
+"improved significantly. This is a result of Tor clients bootstrapping faster "
+"and of the performance improvements added in November. In contrast to this, "
+"the results for establishing a connection to a hidden service are less "
 "promising. While the improvements added in November seem to have a positive "
 "effect on performance, some substeps exhibit significantly worse "
 "performance. One example is fetching hidden service descriptors in order to "
@@ -433,26 +426,27 @@
 "0.2.1.x-alpha series. The result of the public beta phase is a couple of "
 "identified bugs that could already be fixed.</em></small> <br/> "
 "<small><em>Another part of testing was a second set of measurements that was "
-"performed in December. A <a "
-"href=\"http://freehaven.net/~karsten/hidserv/comparison-2009-01-15.pdf\">comparison</a> "
-"of measurements performed in June and December has revealed that the changes "
-"of this project are effective. Service publication times could be more than "
-"halved from 2:12 minutes to 58 seconds in the mean. This improvement is far "
-"better than expected. With this improvement it might even be worthwile to "
-"think about reducing stabilization time from 30 seconds to a lower value in "
-"the future. However, connection establishment remains at approximately 56 "
-"seconds between requesting a hidden service to having established a "
-"connection to the hidden server.  The main reason for missing improvements "
-"is the switch from the centralized to a decentralized storage for hidden "
-"service descriptors.  This deteriorating effect of distributing the hidden "
-"service directory has not been expected before. Future work should focus on "
-"improving downloads from the distributed hidden service directory, for "
-"example by parallelizing requests.</em></small> <br/> <small><em>This report "
-"concludes the series of monthly status updates.  The rollout of the 0.2.1.x "
-"series including the hidden service performance improvements is going to "
-"take place within the next weeks to months.</em></small>"
+"performed in December. A <a href=\"http://freehaven.net/~karsten/hidserv/"
+"comparison-2009-01-15.pdf\">comparison</a> of measurements performed in June "
+"and December has revealed that the changes of this project are effective. "
+"Service publication times could be more than halved from 2:12 minutes to 58 "
+"seconds in the mean. This improvement is far better than expected. With this "
+"improvement it might even be worthwile to think about reducing stabilization "
+"time from 30 seconds to a lower value in the future. However, connection "
+"establishment remains at approximately 56 seconds between requesting a "
+"hidden service to having established a connection to the hidden server.  The "
+"main reason for missing improvements is the switch from the centralized to a "
+"decentralized storage for hidden service descriptors.  This deteriorating "
+"effect of distributing the hidden service directory has not been expected "
+"before. Future work should focus on improving downloads from the distributed "
+"hidden service directory, for example by parallelizing requests.</em></"
+"small> <br/> <small><em>This report concludes the series of monthly status "
+"updates.  The rollout of the 0.2.1.x series including the hidden service "
+"performance improvements is going to take place within the next weeks to "
+"months.</em></small>"
 msgstr ""
 
+#
 #.  Do we want a people section? If so, would it make sense to write what
 #. these people will be doing? And what exactly are these people going to
 #. do? :)
@@ -463,7 +457,6 @@
 #. <li><a href="<page people>#Core">Karsten Loesing</a></li>
 #. <li><a href="<page people>#Core">Steven Murdoch</a></li>
 #. </ul>
-#
 #. type: Content of: <div>
 #: /home/runa/tor/website/projects/en/hidserv.wml:436
 msgid "<br /> <a id=\"Links\"></a>"
@@ -478,9 +471,10 @@
 #: /home/runa/tor/website/projects/en/hidserv.wml:452
 msgid ""
 "Research paper on <b>Performance Measurements and Statistics of Tor Hidden "
-"Services</b> (<a "
-"href=\"http://www.uni-bamberg.de/fileadmin/uni/fakultaeten/wiai_lehrstuehle/praktische_informatik/Dateien/Publikationen/loesing2008performance.pdf\">PDF</a>)  "
-"by Karsten Loesing, Werner Sandmann, Christian Wilms, and Guido Wirtz. In "
-"the Proceedings of the 2008 International Symposium on Applications and the "
-"Internet (SAINT), Turku, Finland, July 2008."
+"Services</b> (<a href=\"http://www.uni-bamberg.de/fileadmin/uni/fakultaeten/"
+"wiai_lehrstuehle/praktische_informatik/Dateien/Publikationen/"
+"loesing2008performance.pdf\">PDF</a>)  by Karsten Loesing, Werner Sandmann, "
+"Christian Wilms, and Guido Wirtz. In the Proceedings of the 2008 "
+"International Symposium on Applications and the Internet (SAINT), Turku, "
+"Finland, July 2008."
 msgstr ""

Modified: translation/trunk/projects/website/templates/projects/4-optional.lowbandwidth.pot
===================================================================
--- translation/trunk/projects/website/templates/projects/4-optional.lowbandwidth.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/projects/4-optional.lowbandwidth.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/projects/en/lowbandwidth.wml:11
@@ -30,19 +30,19 @@
 msgid ""
 "The Tor anonymity system is currently only usable by internet users who have "
 "high-bandwidth connections. Upon the start of the Tor client, a large file "
-"with all Tor server descriptions is being downloaded. This file is the "
-"so-called Tor Directory and enables the client to choose from the available "
-"mix-servers in the Tor network. The download of the full Tor Directory is "
+"with all Tor server descriptions is being downloaded. This file is the so-"
+"called Tor Directory and enables the client to choose from the available mix-"
+"servers in the Tor network. The download of the full Tor Directory is "
 "required by the current Tor protocol. This directory file is too large for "
 "users on modem lines or on mobile data networks like GPRS as the initial "
 "download that is triggered every time an user logs in takes 10 to 30 minutes "
-"over a slow line. As a result, Tor is not usable by modem and mobile "
-"users. One of the major goals of the Tor project is to provide secure "
-"anonymous internet access to users in dictatorships and repressive "
-"states. These locations often have very slow internet connections, either by "
-"modem or due to low-bandwidth links to the outside world. By enabling these "
-"users to use the Tor network, significant progress can be made towards free "
-"communication and information in these countries."
+"over a slow line. As a result, Tor is not usable by modem and mobile users. "
+"One of the major goals of the Tor project is to provide secure anonymous "
+"internet access to users in dictatorships and repressive states. These "
+"locations often have very slow internet connections, either by modem or due "
+"to low-bandwidth links to the outside world. By enabling these users to use "
+"the Tor network, significant progress can be made towards free communication "
+"and information in these countries."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -55,8 +55,8 @@
 "performed over a 14.4 kbps modem line in about three minutes. The work to be "
 "conducted under the proposal has the ultimate goal of getting the protocol "
 "change production ready and propagated to the Tor users within a timeframe "
-"of less then 12 months. The resulting software will be published under the "
-"3-Clause BSD license, as all of the Tor code. All deliverables will be fully "
+"of less then 12 months. The resulting software will be published under the 3-"
+"Clause BSD license, as all of the Tor code. All deliverables will be fully "
 "public."
 msgstr ""
 
@@ -68,8 +68,8 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/projects/en/lowbandwidth.wml:46
 msgid ""
-"<a href=\"http://www.nlnet.nl/news/2008/20080514-awards.html\"> <img "
-"src=\"$(IMGROOT)/nlnet-160x60.png\" alt=\"The NLnet foundation\" /></a>"
+"<a href=\"http://www.nlnet.nl/news/2008/20080514-awards.html\"> <img src="
+"\"$(IMGROOT)/nlnet-160x60.png\" alt=\"The NLnet foundation\" /></a>"
 msgstr ""
 
 #. type: Content of: <div><table><thead><tr><th>
@@ -128,8 +128,8 @@
 "requires extensive testing and debugging in laboratory and real life "
 "conditions. A period of three months is projected for testing and debugging, "
 "where the responsible developer is committed to the testing effort with 1/3 "
-"of its time. Part of the testing phase will be a public beta period.  "
-"</em></small>"
+"of its time. Part of the testing phase will be a public beta period.  </em></"
+"small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -196,32 +196,31 @@
 "<small><em>We did some initial measuring of Tor clients bootstrapping. The "
 "results are not very surprising: a client fetches about 10KB of certs, one "
 "consensus for 140KB (now 90KB, see next paragraph), and about 1.5 megs of "
-"Server Descriptors (after half of which it starts building "
-"circuits).</em></small> <br /> <small><em><a "
-"href=\"https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/138-remove-down-routers-from-consensus.txt\">Proposal "
+"Server Descriptors (after half of which it starts building circuits).</em></"
+"small> <br /> <small><em><a href=\"https://svn.torproject.org/svn/tor/trunk/"
+"doc/spec/proposals/138-remove-down-routers-from-consensus.txt\">Proposal "
 "138</a> shrinks consensus documents by 30% to 40% and has already been "
-"implemented and merged into the spec.  Implementation is part of the "
-"0.2.1.x-alpha tree and the code will take effect once over two-thirds of the "
+"implemented and merged into the spec.  Implementation is part of the 0.2.1.x-"
+"alpha tree and the code will take effect once over two-thirds of the "
 "directory authorities (i.e. 5 out of 6) have upgraded.</em></small> <br /> "
-"<small><em><a "
-"href=\"https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/140-consensus-diffs.txt\">Proposal "
-"140</a> does not directly relate to reducing initial download size, but "
-"instead tries to make subsequent downloads of new consensus documents use "
-"fewer bytes has also been written up and <a "
-"href=\"http://archives.seul.org/or/dev/Jun-2008/msg00013.html\">sent to "
-"or-dev</a>. There are some questions to be answered from other Tor "
-"developers first, but other than that I think it's fine and could be "
-"implemented.</em></small> <br /> <small><em>The Big Thing is making clients "
-"not download all 1.5 megs of server descriptors. <a "
-"href=\"https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/141-jit-sd-downloads.txt\">Proposal "
-"141</a> has been <a "
-"href=\"http://archives.seul.org/or/dev/Jun-2008/msg00017.html\">sent to "
-"or-dev</a>. There are basically 3 things to it, as far as I can see at the "
-"moment: move load balancing info into the consensus (should not be hard), "
-"implement something so that Tor clients can fetch SDs on demand from routers "
-"along their circuit while they are building it (described in the draft), and "
-"deal with exit selection. We're still developing ideas for the last part; "
-"some possibilities are mentioned in the draft.</em></small>"
+"<small><em><a href=\"https://svn.torproject.org/svn/tor/trunk/doc/spec/"
+"proposals/140-consensus-diffs.txt\">Proposal 140</a> does not directly "
+"relate to reducing initial download size, but instead tries to make "
+"subsequent downloads of new consensus documents use fewer bytes has also "
+"been written up and <a href=\"http://archives.seul.org/or/dev/Jun-2008/"
+"msg00013.html\">sent to or-dev</a>. There are some questions to be answered "
+"from other Tor developers first, but other than that I think it's fine and "
+"could be implemented.</em></small> <br /> <small><em>The Big Thing is making "
+"clients not download all 1.5 megs of server descriptors. <a href=\"https://"
+"svn.torproject.org/svn/tor/trunk/doc/spec/proposals/141-jit-sd-downloads.txt"
+"\">Proposal 141</a> has been <a href=\"http://archives.seul.org/or/dev/Jun-"
+"2008/msg00017.html\">sent to or-dev</a>. There are basically 3 things to it, "
+"as far as I can see at the moment: move load balancing info into the "
+"consensus (should not be hard), implement something so that Tor clients can "
+"fetch SDs on demand from routers along their circuit while they are building "
+"it (described in the draft), and deal with exit selection. We're still "
+"developing ideas for the last part; some possibilities are mentioned in the "
+"draft.</em></small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -232,22 +231,22 @@
 #. type: Content of: <div><table><tr><td>
 #: /home/runa/tor/website/projects/en/lowbandwidth.wml:193
 msgid ""
-"<small><em>Work on <a "
-"href=\"https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/141-jit-sd-downloads.txt\">Proposal "
-"141</a> is continuing: There are two basic ideas for how to move load "
-"balancing information into the consensus: One is the authorities generate "
-"the weights that clients should use and put that in the consensus, the other "
-"approach is to just put bandwidth information from the server descriptor "
-"there.  The latter option is probably friendlier when one also considers <a "
-"href=\"https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/140-consensus-diffs.txt\">Proposal "
-"140</a> since it avoids a having number of highly fluctuating numbers in the "
-"consensus.</em></small> <br /> <small><em>For handling exit policies <a "
-"href=\"http://archives.seul.org/or/dev/Jul-2008/msg00022.html\">a post on "
-"the or-dev mailinglist</a> suggests that a hash identifying a node's exit "
-"policy be added to the consensus document.  The addition of another 160 "
-"high-entropy bits per node to the consensus might be a cause for concern but "
-"we think that since a lot of the exit policies are the same the consensus "
-"document will compress nicely.  Measurements pending.</em></small>"
+"<small><em>Work on <a href=\"https://svn.torproject.org/svn/tor/trunk/doc/"
+"spec/proposals/141-jit-sd-downloads.txt\">Proposal 141</a> is continuing: "
+"There are two basic ideas for how to move load balancing information into "
+"the consensus: One is the authorities generate the weights that clients "
+"should use and put that in the consensus, the other approach is to just put "
+"bandwidth information from the server descriptor there.  The latter option "
+"is probably friendlier when one also considers <a href=\"https://svn."
+"torproject.org/svn/tor/trunk/doc/spec/proposals/140-consensus-diffs.txt"
+"\">Proposal 140</a> since it avoids a having number of highly fluctuating "
+"numbers in the consensus.</em></small> <br /> <small><em>For handling exit "
+"policies <a href=\"http://archives.seul.org/or/dev/Jul-2008/msg00022.html"
+"\">a post on the or-dev mailinglist</a> suggests that a hash identifying a "
+"node's exit policy be added to the consensus document.  The addition of "
+"another 160 high-entropy bits per node to the consensus might be a cause for "
+"concern but we think that since a lot of the exit policies are the same the "
+"consensus document will compress nicely.  Measurements pending.</em></small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td>
@@ -292,9 +291,9 @@
 "fetching a relay descriptor from inside a circuit (we probably want to use a "
 "new cell type specifically for this, so we cut out a round-trip), and then "
 "teach clients to do that when the relay they're using is running a recent "
-"enough version. These two steps are written in more detail in <a "
-"href=\"https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/141-jit-sd-downloads.txt\">Section "
-"3.2 of proposal 141</a></em></small>"
+"enough version. These two steps are written in more detail in <a href="
+"\"https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/141-jit-sd-"
+"downloads.txt\">Section 3.2 of proposal 141</a></em></small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td><p>
@@ -302,8 +301,8 @@
 msgid ""
 "<small><em>Our new timing plan is to have both of these pieces in place by "
 "mid Nov, and if that starts looking less likely then we're going to do a "
-"more radical overhaul of our timing plan and maybe also the "
-"design.</em></small>"
+"more radical overhaul of our timing plan and maybe also the design.</em></"
+"small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td><p>
@@ -311,15 +310,15 @@
 msgid ""
 "<small><em>There are several other components we'd like to get to after this "
 "piece of it -- one we've been thinking about a lot lately is downloading "
-"\"diffs\" of the latest consensus: <a "
-"href=\"https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/140-consensus-diffs.txt\">140-consensus-diffs.txt</a>.  "
-"First this could save bandwidth, which is always nice when multiplied by the "
-"total number of clients, but it also means that we can use this saved "
-"bandwidth to fetch the diffs more often than the current \"every 3 to 4 "
-"hours\". If clients learn more up-to-date directory information, then they "
-"can build faster paths because they have better information for each relay's "
-"bandwidth (which ties into the first NLnet project above), but the key new "
-"idea is that it also means that we're better at taking advantage of "
+"\"diffs\" of the latest consensus: <a href=\"https://svn.torproject.org/svn/"
+"tor/trunk/doc/spec/proposals/140-consensus-diffs.txt\">140-consensus-diffs."
+"txt</a>.  First this could save bandwidth, which is always nice when "
+"multiplied by the total number of clients, but it also means that we can use "
+"this saved bandwidth to fetch the diffs more often than the current \"every "
+"3 to 4 hours\". If clients learn more up-to-date directory information, then "
+"they can build faster paths because they have better information for each "
+"relay's bandwidth (which ties into the first NLnet project above), but the "
+"key new idea is that it also means that we're better at taking advantage of "
 "transient relays: right now a relay needs to be up for 3 or 4 hours before "
 "it sees any users, and that rules out a lot of volunteers who want to run a "
 "relay but only want to be up a few hours at a time.</em></small>"
@@ -349,16 +348,17 @@
 #. type: Content of: <div><table><tr><td><p>
 #: /home/runa/tor/website/projects/en/lowbandwidth.wml:294
 msgid ""
-"<small><em> Roger restarted the design discussion on or-dev: <a "
-"href=\"http://archives.seul.org/or/dev/Nov-2008/threads.html\">http://archives.seul.org/or/dev/Nov-2008/threads.html</a>.</em></small>"
+"<small><em> Roger restarted the design discussion on or-dev: <a href="
+"\"http://archives.seul.org/or/dev/Nov-2008/threads.html\">http://archives."
+"seul.org/or/dev/Nov-2008/threads.html</a>.</em></small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td><p>
 #: /home/runa/tor/website/projects/en/lowbandwidth.wml:297
 msgid ""
 "<small><em>I think we now have a better handle on the options and tradeoffs: "
-"<a "
-"href=\"http://archives.seul.org/or/dev/Nov-2008/msg00007.html\">http://archives.seul.org/or/dev/Nov-2008/msg00007.html</a>.</em></small>"
+"<a href=\"http://archives.seul.org/or/dev/Nov-2008/msg00007.html\">http://"
+"archives.seul.org/or/dev/Nov-2008/msg00007.html</a>.</em></small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td><p>
@@ -366,8 +366,8 @@
 msgid ""
 "<small><em>Nick has been buried in other development projects (hopefully "
 "starting to wrap up this month-ish), and I want to get his opinion on how to "
-"proceed; I am hoping we'll pick one of the more simple "
-"approaches.</em></small>"
+"proceed; I am hoping we'll pick one of the more simple approaches.</em></"
+"small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td><p>
@@ -387,10 +387,10 @@
 #: /home/runa/tor/website/projects/en/lowbandwidth.wml:316
 msgid ""
 "<small><em> I wrote up the more detailed version of our new design idea, as "
-"<a "
-"href=\"https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/158-microdescriptors.txt\">Tor "
-"proposal #158</a>, and discussion has started at <a "
-"href=\"http://archives.seul.org/or/dev/Jan-2009/msg00010.html\">http://archives.seul.org/or/dev/Jan-2009/msg00010.html</a>.</em></small>"
+"<a href=\"https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/158-"
+"microdescriptors.txt\">Tor proposal #158</a>, and discussion has started at "
+"<a href=\"http://archives.seul.org/or/dev/Jan-2009/msg00010.html\">http://"
+"archives.seul.org/or/dev/Jan-2009/msg00010.html</a>.</em></small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td><p>
@@ -404,12 +404,12 @@
 #: /home/runa/tor/website/projects/en/lowbandwidth.wml:327
 msgid ""
 "<small><em> One of the big reasons why the project isn't on its original "
-"schedule is that a main conclusion from <a href=\"<page "
-"projects/hidserv>\">Karsten's NLnet project on hidden service "
-"performance</a> was that it's the circuit extension that's the main "
-"killer. Yet this project had proposed to add more round-trips and complexity "
-"into exactly that step. So we needed to build a better plan to achieve the "
-"original goal without screwing up performance even more.  </em></small>"
+"schedule is that a main conclusion from <a href=\"<page projects/hidserv>"
+"\">Karsten's NLnet project on hidden service performance</a> was that it's "
+"the circuit extension that's the main killer. Yet this project had proposed "
+"to add more round-trips and complexity into exactly that step. So we needed "
+"to build a better plan to achieve the original goal without screwing up "
+"performance even more.  </em></small>"
 msgstr ""
 
 #. type: Content of: <div><table><tr><td><p>

Modified: translation/trunk/projects/website/templates/projects/4-optional.metrics.pot
===================================================================
--- translation/trunk/projects/website/templates/projects/4-optional.metrics.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/projects/4-optional.metrics.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/projects/en/metrics.wml:11
@@ -48,13 +48,12 @@
 "report about themselves and which are confirmed in parts by the directory "
 "authorities. The <a href=\"http://torstatus.kgprog.com/\">TorStatus</a> "
 "project evaluates the hourly published directories containing lists of all "
-"running relays and keeps track of their uptimes and advertised "
-"bandwidths. However, an aggregate view of the development of relays over an "
-"extended period of time is still missing. In addition to that, all "
-"information about provided bandwidth capacity as reported by the relays is "
-"not necessarily trustworthy. There has not been a comprehensive measurement "
-"of relay performance so far to validate bandwidth claims and relay "
-"stability."
+"running relays and keeps track of their uptimes and advertised bandwidths. "
+"However, an aggregate view of the development of relays over an extended "
+"period of time is still missing. In addition to that, all information about "
+"provided bandwidth capacity as reported by the relays is not necessarily "
+"trustworthy. There has not been a comprehensive measurement of relay "
+"performance so far to validate bandwidth claims and relay stability."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -85,11 +84,11 @@
 #: /home/runa/tor/website/projects/en/metrics.wml:55
 msgid ""
 "The Metrics Project is planned to run for three years from September 2008 to "
-"August 2011 (see section 5.7 of the <a "
-"href=\"https://svn.torproject.org/svn/tor/trunk/doc/roadmaps/2008-12-19-roadmap-full.pdf\">three-year "
-"development roadmap</a> for more details). Milestones are scheduled for "
-"every six months in this period. The following sections (yet only one) show "
-"progress made in these milestones."
+"August 2011 (see section 5.7 of the <a href=\"https://svn.torproject.org/svn/"
+"tor/trunk/doc/roadmaps/2008-12-19-roadmap-full.pdf\">three-year development "
+"roadmap</a> for more details). Milestones are scheduled for every six months "
+"in this period. The following sections (yet only one) show progress made in "
+"these milestones."
 msgstr ""
 
 #. type: Content of: <div><h3>
@@ -111,16 +110,16 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/projects/en/metrics.wml:75
 msgid ""
-"Evaluation of Relays from Public Directory Data (<a "
-"href=\"https://git.torproject.org/checkout/metrics/master/report/dirarch/dirarch-2009-06-22.pdf\">PDF</a>, "
-"558K, last updated on June 22, 2009)."
+"Evaluation of Relays from Public Directory Data (<a href=\"https://git."
+"torproject.org/checkout/metrics/master/report/dirarch/dirarch-2009-06-22.pdf"
+"\">PDF</a>, 558K, last updated on June 22, 2009)."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/projects/en/metrics.wml:78
 msgid ""
-"Analysis of Bridge Usage in Tor (<a "
-"href=\"https://git.torproject.org/checkout/metrics/master/report/bridges/bridges-2009-06-22.pdf\">PDF</a>, "
+"Analysis of Bridge Usage in Tor (<a href=\"https://git.torproject.org/"
+"checkout/metrics/master/report/bridges/bridges-2009-06-22.pdf\">PDF</a>, "
 "76K, last updated on June 22, 2009)."
 msgstr ""
 
@@ -128,8 +127,8 @@
 #: /home/runa/tor/website/projects/en/metrics.wml:81
 msgid ""
 "Evaluation of Client Requests to the Directories to determine total numbers "
-"and countries of users (<a "
-"href=\"https://git.torproject.org/checkout/metrics/master/report/dirreq/directory-requests-2009-06-25.pdf\">PDF</a>, "
+"and countries of users (<a href=\"https://git.torproject.org/checkout/"
+"metrics/master/report/dirreq/directory-requests-2009-06-25.pdf\">PDF</a>, "
 "207K, last updated on June 25, 2009)."
 msgstr ""
 
@@ -138,8 +137,8 @@
 msgid ""
 "All scripts and sources used in these evaluations (not the data, "
 "unfortunately) are available in a public Git repository that can be cloned "
-"using the following command:<br /> <tt>git clone "
-"git://git.torproject.org/git/metrics/</tt>"
+"using the following command:<br /> <tt>git clone git://git.torproject.org/"
+"git/metrics/</tt>"
 msgstr ""
 
 #. type: Content of: <div><h3>
@@ -156,18 +155,17 @@
 #: /home/runa/tor/website/projects/en/metrics.wml:99
 msgid ""
 "Possible problems of directory authorities assigning Stable and Guard flags "
-"(<a "
-"href=\"https://git.torproject.org/checkout/metrics/master/report/dirarch/relayflags-2009-04-01.pdf\">PDF</a>, "
-"2M from April 1, 2009)."
+"(<a href=\"https://git.torproject.org/checkout/metrics/master/report/dirarch/"
+"relayflags-2009-04-01.pdf\">PDF</a>, 2M from April 1, 2009)."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/projects/en/metrics.wml:102
 msgid ""
 "Simulation of the number of Fast, Stable, and Guard flags for changed "
-"requirements (<a "
-"href=\"https://git.torproject.org/checkout/metrics/master/report/dirarch/flagrequirements-2009-04-11.pdf\">PDF</a>, "
-"229K from April 11, 2009)."
+"requirements (<a href=\"https://git.torproject.org/checkout/metrics/master/"
+"report/dirarch/flagrequirements-2009-04-11.pdf\">PDF</a>, 229K from April "
+"11, 2009)."
 msgstr ""
 
 #. type: Content of: <div>

Modified: translation/trunk/projects/website/templates/torbrowser/1-high.index.pot
===================================================================
--- translation/trunk/projects/website/templates/torbrowser/1-high.index.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/torbrowser/1-high.index.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/torbrowser/en/index.wml:11
@@ -44,8 +44,8 @@
 "with a pre-configured web browser and is self contained.  The <strong>Tor IM "
 "Browser Bundle</strong> additionally allows instant messaging and chat over "
 "Tor.  If you would prefer to use your existing web browser, install Tor "
-"permanently, or if you don't use Windows, see the other ways to <a "
-"href=\"<page download>\">download Tor</a>."
+"permanently, or if you don't use Windows, see the other ways to <a href="
+"\"<page download>\">download Tor</a>."
 msgstr ""
 
 #. type: Content of: <div>
@@ -72,77 +72,74 @@
 #: /home/runa/tor/website/torbrowser/en/index.wml:41
 msgid ""
 "If you have an unreliable Internet connection, it may be easier for you to "
-"download the bundle edition which is <a href=\"<page "
-"torbrowser/split>\">split up</a> into smaller parts."
+"download the bundle edition which is <a href=\"<page torbrowser/split>"
+"\">split up</a> into smaller parts."
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/torbrowser/en/index.wml:43
 msgid ""
-"Tor Browser Bundle for Windows with Firefox (version "
-"<version-torbrowserbundle>, 15 MB)"
+"Tor Browser Bundle for Windows with Firefox (version <version-"
+"torbrowserbundle>, 15 MB)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:47
 msgid ""
 "<a href=\"dist/tor-browser-<version-torbrowserbundle>_en-US.exe\">English "
-"(en-US)</a> (<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>_en-US.exe.asc\" "
-"style=\"font-size: 90%;\">signature</a>)"
+"(en-US)</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_en-US.exe."
+"asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:49
 msgid ""
-"<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>_ar.exe\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; "
-"(ar)</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_ar.exe.asc\" "
-"style=\"font-size: 90%;\">signature</a>)"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_ar.exe\">&#x0627;"
+"&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar)</a> (<a href=\"dist/"
+"tor-browser-<version-torbrowserbundle>_ar.exe.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:51
 msgid ""
-"<a href=\"dist/tor-browser-<version-torbrowserbundle>_de.exe\">Deutsch "
-"(de)</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_de.exe.asc\" "
-"style=\"font-size: 90%;\">signature</a>)"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_de.exe\">Deutsch (de)</"
+"a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_de.exe.asc\" style="
+"\"font-size: 90%;\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:53
 msgid ""
-"<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>_es-ES.exe\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; "
-"(es-ES)</a> (<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>_es-ES.exe.asc\" "
-"style=\"font-size: 90%;\">signature</a>)"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_es-ES.exe\">&#x0045;"
+"&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES)</a> (<a href=\"dist/"
+"tor-browser-<version-torbrowserbundle>_es-ES.exe.asc\" style=\"font-size: "
+"90%;\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:55
 msgid ""
-"<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>_fa-IR.exe\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; "
-"(fa-IR)</a> (<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>_fa-IR.exe.asc\" "
-"style=\"font-size: 90%;\">signature</a>)"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_fa-IR.exe\">&#x0641;"
+"&#x0627;&#x0631;&#x0633;&#x06cc; (fa-IR)</a> (<a href=\"dist/tor-browser-"
+"<version-torbrowserbundle>_fa-IR.exe.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:57
 msgid ""
-"<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>_fr.exe\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; "
-"(fr)</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_fr.exe.asc\" "
-"style=\"font-size: 90%;\">signature</a>)"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_fr.exe\">&#x0046;"
+"&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr)</a> (<a href="
+"\"dist/tor-browser-<version-torbrowserbundle>_fr.exe.asc\" style=\"font-"
+"size: 90%;\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:59
 msgid ""
-"<a href=\"dist/tor-browser-<version-torbrowserbundle>_it.exe\">Italiano "
-"(it)</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_it.exe.asc\" "
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_it.exe\">Italiano (it)"
+"</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_it.exe.asc\" "
 "style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
 
@@ -157,82 +154,74 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:63
 msgid ""
-"<a href=\"dist/tor-browser-<version-torbrowserbundle>_pl.exe\">Polish "
-"(pl)</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_pl.exe.asc\" "
-"style=\"font-size: 90%;\">signature</a>)"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_pl.exe\">Polish (pl)</"
+"a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_pl.exe.asc\" style="
+"\"font-size: 90%;\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:65
 msgid ""
-"<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>_pt-PT.exe\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; "
-"(pt-PT)</a> (<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>_pt-PT.exe.asc\" "
-"style=\"font-size: 90%;\">signature</a>)"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_pt-PT.exe\">&#x0050;"
+"&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; (pt-PT)</a> "
+"(<a href=\"dist/tor-browser-<version-torbrowserbundle>_pt-PT.exe.asc\" style="
+"\"font-size: 90%;\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:67
 msgid ""
-"<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>_ru.exe\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; "
-"(ru)</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_ru.exe.asc\" "
-"style=\"font-size: 90%;\">signature</a>)"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_ru.exe\">&#x0420;"
+"&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru)</a> (<a href=\"dist/"
+"tor-browser-<version-torbrowserbundle>_ru.exe.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:69
 msgid ""
-"<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>_zh-CN.exe\">&#x7b80;&#x4f53;&#x5b57; "
-"(zh-CN)</a> (<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>_zh-CN.exe.asc\" "
-"style=\"font-size: 90%;\">signature</a>)"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_zh-CN.exe\">&#x7b80;"
+"&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"dist/tor-browser-<version-"
+"torbrowserbundle>_zh-CN.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/torbrowser/en/index.wml:73
 msgid ""
-"Tor IM Browser Bundle for Windows with Firefox and Pidgin (version "
-"<version-torimbrowserbundle>, 24 MB)"
+"Tor IM Browser Bundle for Windows with Firefox and Pidgin (version <version-"
+"torimbrowserbundle>, 24 MB)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:77
 msgid ""
-"<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_en-US.exe\">English "
-"(en-US)</a> (<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_en-US.exe.asc\" "
-"style=\"font-size: 90%;\">signature</a>)"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_en-US.exe"
+"\">English (en-US)</a> (<a href=\"dist/tor-im-browser-<version-"
+"torimbrowserbundle>_en-US.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:79
 msgid ""
-"<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_ar.exe\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; "
-"(ar)</a> (<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_ar.exe.asc\" "
-"style=\"font-size: 90%;\">signature</a>)"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_ar.exe\">&#x0627;"
+"&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar)</a> (<a href=\"dist/"
+"tor-im-browser-<version-torimbrowserbundle>_ar.exe.asc\" style=\"font-size: "
+"90%;\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:81
 msgid ""
 "<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_de.exe\">Deutsch "
-"(de)</a> (<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_de.exe.asc\" "
-"style=\"font-size: 90%;\">signature</a>)"
+"(de)</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_de.exe."
+"asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:83
 msgid ""
-"<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_es-ES.exe\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; "
-"(es-ES)</a> (<a "
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_es-ES.exe"
+"\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES)</a> (<a "
 "href=\"dist/tor-im-browser-<version-torimbrowserbundle>_es-ES.exe.asc\" "
 "style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
@@ -240,90 +229,80 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:85
 msgid ""
-"<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_fa-IR.exe\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; "
-"(fa-IR)</a> (<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_fa-IR.exe.asc\" "
-"style=\"font-size: 90%;\">signature</a>)"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_fa-IR.exe"
+"\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa-IR)</a> (<a href=\"dist/tor-"
+"im-browser-<version-torimbrowserbundle>_fa-IR.exe.asc\" style=\"font-size: "
+"90%;\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:87
 msgid ""
-"<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_fr.exe\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; "
-"(fr)</a> (<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_fr.exe.asc\" "
-"style=\"font-size: 90%;\">signature</a>)"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_fr.exe\">&#x0046;"
+"&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr)</a> (<a href="
+"\"dist/tor-im-browser-<version-torimbrowserbundle>_fr.exe.asc\" style=\"font-"
+"size: 90%;\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:89
 msgid ""
 "<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_it.exe\">Italiano "
-"(it)</a> (<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_it.exe.asc\" "
-"style=\"font-size: 90%;\">signature</a>)"
+"(it)</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_it.exe."
+"asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:91
 msgid ""
-"<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_nl.exe\">Nederlands "
-"(nl)</a> (<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_nl.exe.asc\" "
-"style=\"font-size: 90%;\">signature</a>)"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_nl.exe"
+"\">Nederlands (nl)</a> (<a href=\"dist/tor-im-browser-<version-"
+"torimbrowserbundle>_nl.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:93
 msgid ""
 "<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_pl.exe\">Polish "
-"(pl)</a> (<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_pl.exe.asc\" "
-"style=\"font-size: 90%;\">signature</a>)"
+"(pl)</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_pl.exe."
+"asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:95
 msgid ""
-"<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_pt-PT.exe\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; "
-"(pt-PT)</a> (<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_pt-PT.exe.asc\" "
-"style=\"font-size: 90%;\">signature</a>)"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_pt-PT.exe"
+"\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; "
+"(pt-PT)</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_pt-"
+"PT.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:97
 msgid ""
-"<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_ru.exe\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; "
-"(ru)</a> (<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_ru.exe.asc\" "
-"style=\"font-size: 90%;\">signature</a>)"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_ru.exe\">&#x0420;"
+"&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru)</a> (<a href=\"dist/"
+"tor-im-browser-<version-torimbrowserbundle>_ru.exe.asc\" style=\"font-size: "
+"90%;\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/index.wml:99
 msgid ""
-"<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_zh-CN.exe\">&#x7b80;&#x4f53;&#x5b57; "
-"(zh-CN)</a> (<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_zh-CN.exe.asc\" "
-"style=\"font-size: 90%;\">signature</a>)"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_zh-CN.exe"
+"\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"dist/tor-im-browser-"
+"<version-torimbrowserbundle>_zh-CN.exe.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/torbrowser/en/index.wml:103
 msgid ""
-"See our instructions on <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/VerifyingSignatures\">how "
-"to verify package signatures</a>, which allows you to make sure you've "
-"downloaded the file we intended you to get.  Also, note that the Firefox in "
-"our bundle is <a "
-"href=\"https://svn.torproject.org/svn/torbrowser/trunk/build-scripts/config/\">modified</a> "
+"See our instructions on <a href=\"https://wiki.torproject.org/noreply/"
+"TheOnionRouter/VerifyingSignatures\">how to verify package signatures</a>, "
+"which allows you to make sure you've downloaded the file we intended you to "
+"get.  Also, note that the Firefox in our bundle is <a href=\"https://svn."
+"torproject.org/svn/torbrowser/trunk/build-scripts/config/\">modified</a> "
 "from the <a href=\"http://www.mozilla.com/firefox/\">default Firefox</a>; "
 "we're currently working with Mozilla to see if they want us to change the "
 "name to make this clearer."
@@ -360,7 +339,8 @@
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/torbrowser/en/index.wml:128
-msgid "<img src=\"img/screenshot1.png\" alt=\"Screenshot of extraction process\" />"
+msgid ""
+"<img src=\"img/screenshot1.png\" alt=\"Screenshot of extraction process\" />"
 msgstr ""
 
 #. type: Content of: <div>
@@ -394,7 +374,8 @@
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/torbrowser/en/index.wml:140
-msgid "<img src=\"img/screenshot2.png\" alt=\"Screenshot of bundle startup\" />"
+msgid ""
+"<img src=\"img/screenshot2.png\" alt=\"Screenshot of bundle startup\" />"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -454,12 +435,12 @@
 #: /home/runa/tor/website/torbrowser/en/index.wml:164
 msgid ""
 "Remember that Tor anonymizes the origin of your traffic, and it encrypts "
-"everything inside the Tor network, but <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers\">it "
-"can't encrypt your traffic between the Tor network and its final "
-"destination.</a> If you are communicating sensitive information, you should "
-"use as much care as you would on the normal scary Internet &mdash; use HTTPS "
-"or other end-to-end encryption and authentication."
+"everything inside the Tor network, but <a href=\"https://wiki.torproject.org/"
+"noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers\">it can't encrypt your "
+"traffic between the Tor network and its final destination.</a> If you are "
+"communicating sensitive information, you should use as much care as you "
+"would on the normal scary Internet &mdash; use HTTPS or other end-to-end "
+"encryption and authentication."
 msgstr ""
 
 #. type: Content of: <div>
@@ -476,8 +457,8 @@
 #: /home/runa/tor/website/torbrowser/en/index.wml:176
 msgid ""
 "The Tor Browser Bundle is under development and not yet complete.  To "
-"discuss improvements and submit comments, please use the <a "
-"href=\"http://archives.seul.org/or/talk/\">or-talk</a> mailing list."
+"discuss improvements and submit comments, please use the <a href=\"http://"
+"archives.seul.org/or/talk/\">or-talk</a> mailing list."
 msgstr ""
 
 #. type: Content of: <div>
@@ -501,8 +482,8 @@
 #: /home/runa/tor/website/torbrowser/en/index.wml:187
 msgid ""
 "<strong>What is in the Tor Browser Bundle?</strong> It contains Tor, "
-"Vidalia, Polipo, Firefox, and Torbutton (<a href=\"<page "
-"torbrowser/details>#contents\">learn more</a>)."
+"Vidalia, Polipo, Firefox, and Torbutton (<a href=\"<page torbrowser/"
+"details>#contents\">learn more</a>)."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -524,9 +505,8 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/torbrowser/en/index.wml:199
 msgid ""
-"Tor Browser Bundle is partially based on <a "
-"href=\"http://portableapps.com/apps/internet/firefox_portable\">Mozilla "
-"Firefox, Portable Edition</a> and <a "
-"href=\"http://portableapps.com/apps/internet/pidgin_portable\">Pidgin "
+"Tor Browser Bundle is partially based on <a href=\"http://portableapps.com/"
+"apps/internet/firefox_portable\">Mozilla Firefox, Portable Edition</a> and "
+"<a href=\"http://portableapps.com/apps/internet/pidgin_portable\">Pidgin "
 "Portable</a> from <a href=\"http://portableapps.com/\">PortableApps.com</a>."
 msgstr ""

Modified: translation/trunk/projects/website/templates/torbrowser/1-high.split.pot
===================================================================
--- translation/trunk/projects/website/templates/torbrowser/1-high.split.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/torbrowser/1-high.split.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/torbrowser/en/split.wml:11
@@ -35,10 +35,10 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/torbrowser/en/split.wml:16
 msgid ""
-"If you have a reliable Internet connection, you can download the <a "
-"href=\"<page torbrowser/index>\">single-file edition</a> of Tor Browser "
-"Bundle. Alternatively, follow the instructions on this page to download and "
-"install the split-file edition."
+"If you have a reliable Internet connection, you can download the <a href="
+"\"<page torbrowser/index>\">single-file edition</a> of Tor Browser Bundle. "
+"Alternatively, follow the instructions on this page to download and install "
+"the split-file edition."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -49,16 +49,16 @@
 "choice. Download all the files shown in the folder (the single file ending "
 "in <code>.exe</code> and all the files ending in <code>.rar</code>). The "
 "files in <code>signatures</code> allow you to check that you've downloaded "
-"the file we intended you to get. See our instructions on <a "
-"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/VerifyingSignatures\">how "
-"to verify package signatures</a>."
+"the file we intended you to get. See our instructions on <a href=\"https://"
+"wiki.torproject.org/noreply/TheOnionRouter/VerifyingSignatures\">how to "
+"verify package signatures</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/torbrowser/en/split.wml:20
 msgid ""
-"Tor Browser Bundle for Windows with Firefox (version "
-"<version-torbrowserbundle>, split edition, 15 MB total)"
+"Tor Browser Bundle for Windows with Firefox (version <version-"
+"torbrowserbundle>, split edition, 15 MB total)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -71,40 +71,36 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/split.wml:26
 msgid ""
-"<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>_ar_split\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; "
-"(ar)</a>"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_ar_split\">&#x0627;"
+"&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar)</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/split.wml:28
 msgid ""
-"<a href=\"dist/tor-browser-<version-torbrowserbundle>_de_split\">Deutsch "
-"(de)</a>"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_de_split\">Deutsch (de)"
+"</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/split.wml:30
 msgid ""
-"<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>_es-ES_split\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; "
-"(es-ES)</a>"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_es-ES_split\">&#x0045;"
+"&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES)</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/split.wml:32
 msgid ""
-"<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>_fa-IR_split\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; "
-"(fa-IR)</a>"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_fa-IR_split\">&#x0641;"
+"&#x0627;&#x0631;&#x0633;&#x06cc; (fa-IR)</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/split.wml:34
 msgid ""
-"<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>_fr_split\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; "
-"(fr)</a>"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_fr_split\">&#x0046;"
+"&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr)</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -124,130 +120,117 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/split.wml:40
 msgid ""
-"<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>_pt-PT_split\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; "
-"(pt-PT)</a>"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_pt-PT_split\">&#x0050;"
+"&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; (pt-PT)</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/split.wml:42
 msgid ""
-"<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>_ru_split\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; "
-"(ru)</a>"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_ru_split\">&#x0420;"
+"&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru)</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/split.wml:44
 msgid ""
-"<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>_zh-CN_split\">&#x7b80;&#x4f53;&#x5b57; "
-"(zh-CN)</a>"
+"<a href=\"dist/tor-browser-<version-torbrowserbundle>_zh-CN_split\">&#x7b80;"
+"&#x4f53;&#x5b57; (zh-CN)</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/torbrowser/en/split.wml:48
 msgid ""
-"Tor IM Browser Bundle for Windows with Firefox and Pidgin (version "
-"<version-torimbrowserbundle>, split edition, 24 MB total)"
+"Tor IM Browser Bundle for Windows with Firefox and Pidgin (version <version-"
+"torimbrowserbundle>, split edition, 24 MB total)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/split.wml:52
 msgid ""
-"<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_en-US_split\">English "
-"(en-US)</a>"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_en-US_split"
+"\">English (en-US)</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/split.wml:54
 msgid ""
-"<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_ar_split\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; "
-"(ar)</a>"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_ar_split"
+"\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar)</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/split.wml:56
 msgid ""
-"<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_de_split\">Deutsch "
-"(de)</a>"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_de_split"
+"\">Deutsch (de)</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/split.wml:58
 msgid ""
-"<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_es-ES_split\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; "
-"(es-ES)</a>"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_es-ES_split"
+"\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES)</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/split.wml:60
 msgid ""
-"<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_fa-IR_split\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; "
-"(fa-IR)</a>"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_fa-IR_split"
+"\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa-IR)</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/split.wml:62
 msgid ""
-"<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_fr_split\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; "
-"(fr)</a>"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_fr_split"
+"\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr)</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/split.wml:64
 msgid ""
-"<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_it_split\">Italiano "
-"(it)</a>"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_it_split"
+"\">Italiano (it)</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/split.wml:66
 msgid ""
-"<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_nl_split\">Nederlands "
-"(nl)</a>"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_nl_split"
+"\">Nederlands (nl)</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/split.wml:68
 msgid ""
-"<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_pt-PT_split\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; "
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_pt-PT_split"
+"\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; "
 "(pt-PT)</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/split.wml:70
 msgid ""
-"<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_ru_split\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; "
-"(ru)</a>"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_ru_split"
+"\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru)</a>"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/split.wml:72
 msgid ""
-"<a "
-"href=\"dist/tor-im-browser-<version-torimbrowserbundle>_zh-CN_split\">&#x7b80;&#x4f53;&#x5b57; "
-"(zh-CN)</a>"
+"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_zh-CN_split"
+"\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/torbrowser/en/split.wml:77
 msgid ""
-"Note that the Firefox in our bundle is <a "
-"href=\"https://svn.torproject.org/svn/torbrowser/trunk/build-scripts/config/\">modified</a> "
-"from the <a href=\"http://www.mozilla.com/firefox/\">default Firefox</a>; "
-"we're currently working with Mozilla to see if they want us to change the "
-"name to make this clearer."
+"Note that the Firefox in our bundle is <a href=\"https://svn.torproject.org/"
+"svn/torbrowser/trunk/build-scripts/config/\">modified</a> from the <a href="
+"\"http://www.mozilla.com/firefox/\">default Firefox</a>; we're currently "
+"working with Mozilla to see if they want us to change the name to make this "
+"clearer."
 msgstr ""
 
 #. type: Content of: <div>
@@ -295,13 +278,13 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/torbrowser/en/split.wml:101
 msgid ""
-"<img src=\"img/split-screenshot2.png\" alt=\"Screenshot of extraction "
-"process\" />"
+"<img src=\"img/split-screenshot2.png\" alt=\"Screenshot of extraction process"
+"\" />"
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/torbrowser/en/split.wml:103
 msgid ""
-"Once the extraction has completed, see the <a href=\"<page "
-"torbrowser/index>#Usage\">usage instructions</a> for how to start Tor."
+"Once the extraction has completed, see the <a href=\"<page torbrowser/"
+"index>#Usage\">usage instructions</a> for how to start Tor."
 msgstr ""

Modified: translation/trunk/projects/website/templates/torbrowser/4-optional.details.pot
===================================================================
--- translation/trunk/projects/website/templates/torbrowser/4-optional.details.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/torbrowser/4-optional.details.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/torbrowser/en/details.wml:11
@@ -43,8 +43,8 @@
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbrowser/en/details.wml:19
 msgid ""
-"FirefoxPortable <version-torbrowser-firefox> (includes Firefox "
-"<version-torbrowser-firefox> and Torbutton <version-torbrowser-torbutton>)"
+"FirefoxPortable <version-torbrowser-firefox> (includes Firefox <version-"
+"torbrowser-firefox> and Torbutton <version-torbrowser-torbutton>)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -67,13 +67,11 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/torbrowser/en/details.wml:27
 msgid ""
-"To re-build the bundle, download the <a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>-src.tar.gz\">source "
-"distribution</a> (<a "
-"href=\"dist/tor-browser-<version-torbrowserbundle>-src.tar.gz.asc\">signature</a>).  "
-"See <a "
+"To re-build the bundle, download the <a href=\"dist/tor-browser-<version-"
+"torbrowserbundle>-src.tar.gz\">source distribution</a> (<a href=\"dist/tor-"
+"browser-<version-torbrowserbundle>-src.tar.gz.asc\">signature</a>).  See <a "
 "href=\"https://svn.torproject.org/svn/torbrowser/trunk/README\">README</a> "
 "for the directory layout and changelog. Build instructions can be found in "
-"<a "
-"href=\"https://svn.torproject.org/svn/torbrowser/trunk/build-scripts/INSTALL\">build-scripts/INSTALL</a>."
+"<a href=\"https://svn.torproject.org/svn/torbrowser/trunk/build-scripts/"
+"INSTALL\">build-scripts/INSTALL</a>."
 msgstr ""

Modified: translation/trunk/projects/website/templates/torbutton/3-low.faq.pot
===================================================================
--- translation/trunk/projects/website/templates/torbutton/3-low.faq.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/torbutton/3-low.faq.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/torbutton/en/faq.wml:11
@@ -109,8 +109,8 @@
 #. type: Content of: <div>
 #: /home/runa/tor/website/torbutton/en/faq.wml:28
 msgid ""
-"<br /> <a id=\"nojavascript\"></a> <strong><a class=\"anchor\" "
-"href=\"#nojavascript\">When I toggle Tor, my sites that use javascript stop "
+"<br /> <a id=\"nojavascript\"></a> <strong><a class=\"anchor\" href="
+"\"#nojavascript\">When I toggle Tor, my sites that use javascript stop "
 "working. Why?</a></strong>"
 msgstr ""
 
@@ -140,20 +140,19 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/torbutton/en/faq.wml:50
 msgid ""
-"Due to <a "
-"href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=409737\">Firefox Bug "
-"409737</a>, pages can still open popups and perform Javascript redirects and "
-"history access after Tor has been toggled. These popups and redirects can be "
-"blocked, but unfortunately they are indistinguishable from normal user "
-"interactions with the page (such as clicking on links, opening them in new "
-"tabs/windows, or using the history buttons), and so those are blocked as a "
-"side effect. Once that Firefox bug is fixed, this degree of isolation will "
-"become optional (for people who do not want to accidentally click on links "
-"and give away information via referrers). A workaround is to right click on "
-"the link, and open it in a new tab or window. The tab or window won't load "
-"automatically, but you can hit enter in the URL bar, and it will begin "
-"loading. Hitting enter in the URL bar will also reload the page without "
-"clicking the reload button."
+"Due to <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=409737"
+"\">Firefox Bug 409737</a>, pages can still open popups and perform "
+"Javascript redirects and history access after Tor has been toggled. These "
+"popups and redirects can be blocked, but unfortunately they are "
+"indistinguishable from normal user interactions with the page (such as "
+"clicking on links, opening them in new tabs/windows, or using the history "
+"buttons), and so those are blocked as a side effect. Once that Firefox bug "
+"is fixed, this degree of isolation will become optional (for people who do "
+"not want to accidentally click on links and give away information via "
+"referrers). A workaround is to right click on the link, and open it in a new "
+"tab or window. The tab or window won't load automatically, but you can hit "
+"enter in the URL bar, and it will begin loading. Hitting enter in the URL "
+"bar will also reload the page without clicking the reload button."
 msgstr ""
 
 #. type: Content of: <div>
@@ -169,16 +168,15 @@
 "YouTube and similar sites require third party browser plugins such as "
 "Flash.  Plugins operate independently from Firefox and can perform activity "
 "on your computer that ruins your anonymity. This includes but is not limited "
-"to: <a href=\"http://decloak.net\">completely disregarding proxy "
-"settings</a>, querying your <a "
-"href=\"http://forums.sun.com/thread.jspa?threadID=5162138&amp;messageID=9618376\">local "
-"IP address</a>, and <a "
-"href=\"http://epic.org/privacy/cookies/flash.html\">storing their own "
-"cookies</a>. It is possible to use a LiveCD or VMWare-based solution such as "
-"<a href=\"<page torvm/index>\">Tor VM</a> or <a "
-"href=\"http://anonymityanywhere.com/incognito/\">Incognito</a> that creates "
-"a secure, transparent proxy to protect you from proxy bypass, however issues "
-"with local IP address discovery and Flash cookies still remain."
+"to: <a href=\"http://decloak.net\">completely disregarding proxy settings</"
+"a>, querying your <a href=\"http://forums.sun.com/thread.jspa?"
+"threadID=5162138&amp;messageID=9618376\">local IP address</a>, and <a href="
+"\"http://epic.org/privacy/cookies/flash.html\">storing their own cookies</"
+"a>. It is possible to use a LiveCD or VMWare-based solution such as <a href="
+"\"<page torvm/index>\">Tor VM</a> or <a href=\"http://anonymityanywhere.com/"
+"incognito/\">Incognito</a> that creates a secure, transparent proxy to "
+"protect you from proxy bypass, however issues with local IP address "
+"discovery and Flash cookies still remain."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -190,24 +188,24 @@
 "going into the Torbutton Preferences-&gt;Security Settings-&gt;Dynamic "
 "Content tab and unchecking \"Disable plugins during Tor usage\" box. If you "
 "do this without Tor VM, Incognito or appropriate firewall rules, we strongly "
-"suggest you at least use <a "
-"href=\"https://addons.mozilla.org/en-US/firefox/addon/722\">NoScript</a> to "
-"<a href=\"http://noscript.net/features#contentblocking\">block "
-"plugins</a>. You do not need to use the NoScript per-domain permissions if "
-"you check the <b>Apply these restrictions to trusted sites too</b> option "
-"under the NoScript Plugins preference tab. In fact, with this setting you "
-"can even have NoScript allow Javascript globally, but still block all "
-"plugins until you click on their placeholders in a page. We also recommend "
-"<a href=\"https://addons.mozilla.org/en-US/firefox/addon/6623\">Better "
-"Privacy</a> in this case to help you clear your Flash cookies."
+"suggest you at least use <a href=\"https://addons.mozilla.org/en-US/firefox/"
+"addon/722\">NoScript</a> to <a href=\"http://noscript.net/"
+"features#contentblocking\">block plugins</a>. You do not need to use the "
+"NoScript per-domain permissions if you check the <b>Apply these restrictions "
+"to trusted sites too</b> option under the NoScript Plugins preference tab. "
+"In fact, with this setting you can even have NoScript allow Javascript "
+"globally, but still block all plugins until you click on their placeholders "
+"in a page. We also recommend <a href=\"https://addons.mozilla.org/en-US/"
+"firefox/addon/6623\">Better Privacy</a> in this case to help you clear your "
+"Flash cookies."
 msgstr ""
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/torbutton/en/faq.wml:106
 msgid ""
-"<a id=\"oldtorbutton\"></a> <strong><a class=\"anchor\" "
-"href=\"#oldtorbutton\">Torbutton sure seems to do a lot of things, some of "
-"which I find annoying. Can't I just use the old version?</a></strong>"
+"<a id=\"oldtorbutton\"></a> <strong><a class=\"anchor\" href=\"#oldtorbutton"
+"\">Torbutton sure seems to do a lot of things, some of which I find "
+"annoying. Can't I just use the old version?</a></strong>"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -220,22 +218,21 @@
 "endangering yourself.  <b>Simply do not use Tor</b> and you will have the "
 "same (and in some cases, better) security.  For more information on the "
 "types of attacks you are exposed to with a \"homegrown\" solution, please "
-"see <a href=\"design/index.html#adversary\">The Torbutton Adversary "
-"Model</a>, in particular the <a href=\"design/index.html#attacks\">Adversary "
+"see <a href=\"design/index.html#adversary\">The Torbutton Adversary Model</"
+"a>, in particular the <a href=\"design/index.html#attacks\">Adversary "
 "Capabilities - Attacks</a> subsection. If there are any specific Torbutton "
-"behaviors that you do not like, please file a bug on <a "
-"href=\"https://bugs.torproject.org/flyspray/index.php?tasks=all&amp;project=5\">the "
-"bug tracker.</a> Most of Torbutton's security features can also be disabled "
-"via its preferences, if you think you have your own protection for those "
-"specific cases."
+"behaviors that you do not like, please file a bug on <a href=\"https://bugs."
+"torproject.org/flyspray/index.php?tasks=all&amp;project=5\">the bug tracker."
+"</a> Most of Torbutton's security features can also be disabled via its "
+"preferences, if you think you have your own protection for those specific "
+"cases."
 msgstr ""
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/torbutton/en/faq.wml:131
 msgid ""
-"<a id=\"weirdstate\"></a> <strong><a class=\"anchor\" "
-"href=\"#weirdstate\">My browser is in some weird state where nothing works "
-"right!</a></strong>"
+"<a id=\"weirdstate\"></a> <strong><a class=\"anchor\" href=\"#weirdstate"
+"\">My browser is in some weird state where nothing works right!</a></strong>"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -245,17 +242,16 @@
 "that doesn't fix the issue, go to the preferences page and hit 'Restore "
 "Defaults'. This should reset the extension and Firefox to a known good "
 "configuration.  If you can manage to reproduce whatever issue gets your "
-"Firefox wedged, please file details at <a "
-"href=\"https://bugs.torproject.org/flyspray/index.php?tasks=all&amp;project=5\">the "
-"bug tracker</a>."
+"Firefox wedged, please file details at <a href=\"https://bugs.torproject.org/"
+"flyspray/index.php?tasks=all&amp;project=5\">the bug tracker</a>."
 msgstr ""
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/torbutton/en/faq.wml:144
 msgid ""
-"<a id=\"noautocomplete\"></a> <strong><a class=\"anchor\" "
-"href=\"#noautocomplete\">When I use Tor, Firefox is no longer filling in "
-"logins/search boxes for me. Why?</a></strong>"
+"<a id=\"noautocomplete\"></a> <strong><a class=\"anchor\" href="
+"\"#noautocomplete\">When I use Tor, Firefox is no longer filling in logins/"
+"search boxes for me. Why?</a></strong>"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -272,9 +268,9 @@
 #. type: Content of: <div>
 #: /home/runa/tor/website/torbutton/en/faq.wml:157
 msgid ""
-"<a id=\"thunderbird\"></a> <strong><a class=\"anchor\" "
-"href=\"#thunderbird\">What about Thunderbird support? I see a page, but it "
-"is the wrong version?</a></strong>"
+"<a id=\"thunderbird\"></a> <strong><a class=\"anchor\" href=\"#thunderbird"
+"\">What about Thunderbird support? I see a page, but it is the wrong version?"
+"</a></strong>"
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -299,18 +295,18 @@
 #. type: Content of: <div>
 #: /home/runa/tor/website/torbutton/en/faq.wml:177
 msgid ""
-"<a id=\"extensionconflicts\"></a> <strong><a class=\"anchor\" "
-"href=\"#extensionconflicts\">Which Firefox extensions should I avoid "
-"using?</a></strong>"
+"<a id=\"extensionconflicts\"></a> <strong><a class=\"anchor\" href="
+"\"#extensionconflicts\">Which Firefox extensions should I avoid using?</a></"
+"strong>"
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/torbutton/en/faq.wml:181
 msgid ""
 "This is a tough one. There are thousands of Firefox extensions: making a "
-"complete list of ones that are bad for anonymity is near "
-"impossible. However, here are a few examples that should get you started as "
-"to what sorts of behavior are dangerous."
+"complete list of ones that are bad for anonymity is near impossible. "
+"However, here are a few examples that should get you started as to what "
+"sorts of behavior are dangerous."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -339,17 +335,16 @@
 msgid ""
 "While FoxyProxy is a nice idea in theory, in practice it is impossible to "
 "configure securely for Tor usage without Torbutton. Like all vanilla third "
-"party proxy plugins, the main risks are <a "
-"href=\"http://www.metasploit.com/research/projects/decloak/\">plugin "
-"leakage</a> and <a "
-"href=\"http://ha.ckers.org/weird/CSS-history.cgi\">history disclosure</a>, "
-"followed closely by cookie theft by exit nodes and tracking by adservers "
-"(see the <a href=\"design/index.html#adversary\">Torbutton Adversary "
-"Model</a> for more information). However, with Torbutton installed in tandem "
-"and always enabled, it is possible to configure FoxyProxy securely (though "
-"it is tricky). Since FoxyProxy's 'Patterns' mode only applies to specific "
-"urls, and not to an entire tab, setting FoxyProxy to only send specific "
-"sites through Tor will still allow adservers (whose hosts don't match your "
+"party proxy plugins, the main risks are <a href=\"http://www.metasploit.com/"
+"research/projects/decloak/\">plugin leakage</a> and <a href=\"http://ha."
+"ckers.org/weird/CSS-history.cgi\">history disclosure</a>, followed closely "
+"by cookie theft by exit nodes and tracking by adservers (see the <a href="
+"\"design/index.html#adversary\">Torbutton Adversary Model</a> for more "
+"information). However, with Torbutton installed in tandem and always "
+"enabled, it is possible to configure FoxyProxy securely (though it is "
+"tricky). Since FoxyProxy's 'Patterns' mode only applies to specific urls, "
+"and not to an entire tab, setting FoxyProxy to only send specific sites "
+"through Tor will still allow adservers (whose hosts don't match your "
 "filters) to learn your real IP. Worse, when sites use offsite logging "
 "services such as Google Analytics, you will still end up in their logs with "
 "your real IP. Malicious exit nodes can also cooperate with sites to inject "
@@ -357,17 +352,17 @@
 "certain URLs via Non-Tor is much more secure in this regard, but be very "
 "careful with the filters you allow. For example, something as simple as "
 "allowing *google* to go via Non-Tor will still cause you to end up in all "
-"the logs of all websites that use Google Analytics! See <a "
-"href=\"http://foxyproxy.mozdev.org/faq.html#privacy-01\">this question</a> "
-"on the FoxyProxy FAQ for more information."
+"the logs of all websites that use Google Analytics! See <a href=\"http://"
+"foxyproxy.mozdev.org/faq.html#privacy-01\">this question</a> on the "
+"FoxyProxy FAQ for more information."
 msgstr ""
 
 #. type: Content of: <div>
 #: /home/runa/tor/website/torbutton/en/faq.wml:223
 msgid ""
-"<a id=\"recommendedextensions\"></a> <strong><a class=\"anchor\" "
-"href=\"#recommendedextensions\">Which Firefox extensions do you "
-"recommend?</a></strong>"
+"<a id=\"recommendedextensions\"></a> <strong><a class=\"anchor\" href="
+"\"#recommendedextensions\">Which Firefox extensions do you recommend?</a></"
+"strong>"
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -418,17 +413,17 @@
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/torbutton/en/faq.wml:254
-msgid "<a href=\"https://addons.mozilla.org/firefox/addon/1865\">AdBlock Plus</a>"
+msgid ""
+"<a href=\"https://addons.mozilla.org/firefox/addon/1865\">AdBlock Plus</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li><p>
 #: /home/runa/tor/website/torbutton/en/faq.wml:257
 msgid ""
 "AdBlock Plus is an excellent addon for removing annoying, privacy-invading, "
-"and <a "
-"href=\"http://www.wired.com/techbiz/media/news/2007/11/doubleclick\">malware-distributing</a> "
-"advertisements from the web. It provides <a "
-"href=\"http://adblockplus.org/en/subscriptions\">subscriptions</a> that are "
+"and <a href=\"http://www.wired.com/techbiz/media/news/2007/11/doubleclick"
+"\">malware-distributing</a> advertisements from the web. It provides <a href="
+"\"http://adblockplus.org/en/subscriptions\">subscriptions</a> that are "
 "continually updated to catch the latest efforts of ad networks to circumvent "
 "these filters. I recommend the EasyPrivacy+EasyList combination filter "
 "subscription in the Miscellaneous section of the subscriptions page."
@@ -436,7 +431,8 @@
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/torbutton/en/faq.wml:268
-msgid "<a href=\"https://addons.mozilla.org/firefox/addon/82\">Cookie Culler</a>"
+msgid ""
+"<a href=\"https://addons.mozilla.org/firefox/addon/82\">Cookie Culler</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li><p>
@@ -451,7 +447,8 @@
 
 #. type: Content of: <div><ol><li>
 #: /home/runa/tor/website/torbutton/en/faq.wml:278
-msgid "<a href=\"https://addons.mozilla.org/en-US/firefox/addon/722\">NoScript</a>"
+msgid ""
+"<a href=\"https://addons.mozilla.org/en-US/firefox/addon/722\">NoScript</a>"
 msgstr ""
 
 #. type: Content of: <div><ol><li><p>
@@ -461,12 +458,12 @@
 "However, if you are concerned about Javascript exploits against your browser "
 "or against websites you are logged in to, you may want to use NoScript. It "
 "provides the ability to allow Javascript only for particular websites and "
-"also provides mechanisms to force HTTPS urls for sites with <a "
-"href=\"http://fscked.org/category/tags/insecurecookies\">insecure "
-"cookies</a>.<br> It can be difficult to configure such that the most sites "
-"will work properly though. In particular, you want to make sure you do not "
-"remove the Javascript whitelist for addons.mozilla.org, as extensions are "
-"downloaded via http and verified by javascript from the https page."
+"also provides mechanisms to force HTTPS urls for sites with <a href=\"http://"
+"fscked.org/category/tags/insecurecookies\">insecure cookies</a>.<br> It can "
+"be difficult to configure such that the most sites will work properly "
+"though. In particular, you want to make sure you do not remove the "
+"Javascript whitelist for addons.mozilla.org, as extensions are downloaded "
+"via http and verified by javascript from the https page."
 msgstr ""
 
 #. type: Content of: <div><ol><li>
@@ -489,41 +486,39 @@
 #. type: Content of: <div>
 #: /home/runa/tor/website/torbutton/en/faq.wml:310
 msgid ""
-"<a id=\"securityissues\"></a> <strong><a class=\"anchor\" "
-"href=\"#securityissues\">Are there any other issues I should be concerned "
-"about?</a></strong>"
+"<a id=\"securityissues\"></a> <strong><a class=\"anchor\" href="
+"\"#securityissues\">Are there any other issues I should be concerned about?</"
+"a></strong>"
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/torbutton/en/faq.wml:314
 msgid ""
 "There are a few known security issues with Torbutton (all of which are due "
-"to <a href=\"design/index.html#FirefoxBugs\">unfixed Firefox security "
-"bugs</a>). The most important for anonymity is that it is possible to unmask "
-"the javascript hooks that wrap the Date object to conceal your timezone in "
-"Firefox 2, and the timezone masking code does not work at all on Firefox "
-"3. We are working with the Firefox team to fix one of <a "
-"href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=392274\">Bug 399274</a> "
-"or <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=419598\">Bug "
-"419598</a> to address this. In the meantime, it is possible to set the "
-"<b>TZ</b> environment variable to <b>UTC</b> to cause the browser to use UTC "
-"as your timezone. Under Linux, you can add an <b>export TZ=UTC</b> to the "
-"/usr/bin/firefox script, or edit your system bashrc to do the same. Under "
-"Windows, you can set either a <a "
-"href=\"http://support.microsoft.com/kb/310519\">User or System Environment "
-"Variable</a> for TZ via My Computer's properties. In MacOS, the situation is "
-"<a "
-"href=\"http://developer.apple.com/documentation/MacOSX/Conceptual/BPRuntimeConfig/Articles/EnvironmentVars.html#//apple_ref/doc/uid/20002093-BCIJIJBH\">a "
-"lot more complicated</a>, unfortunately."
+"to <a href=\"design/index.html#FirefoxBugs\">unfixed Firefox security bugs</"
+"a>). The most important for anonymity is that it is possible to unmask the "
+"javascript hooks that wrap the Date object to conceal your timezone in "
+"Firefox 2, and the timezone masking code does not work at all on Firefox 3. "
+"We are working with the Firefox team to fix one of <a href=\"https://"
+"bugzilla.mozilla.org/show_bug.cgi?id=392274\">Bug 399274</a> or <a href="
+"\"https://bugzilla.mozilla.org/show_bug.cgi?id=419598\">Bug 419598</a> to "
+"address this. In the meantime, it is possible to set the <b>TZ</b> "
+"environment variable to <b>UTC</b> to cause the browser to use UTC as your "
+"timezone. Under Linux, you can add an <b>export TZ=UTC</b> to the /usr/bin/"
+"firefox script, or edit your system bashrc to do the same. Under Windows, "
+"you can set either a <a href=\"http://support.microsoft.com/kb/310519\">User "
+"or System Environment Variable</a> for TZ via My Computer's properties. In "
+"MacOS, the situation is <a href=\"http://developer.apple.com/documentation/"
+"MacOSX/Conceptual/BPRuntimeConfig/Articles/EnvironmentVars.html#//apple_ref/"
+"doc/uid/20002093-BCIJIJBH\">a lot more complicated</a>, unfortunately."
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/torbutton/en/faq.wml:335
 msgid ""
 "In addition, RSS readers such as Firefox Livemarks can perform periodic "
-"fetches. Due to <a "
-"href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=436250\">Firefox Bug "
-"436250</a>, there is no way to disable Livemark fetches during Tor. This can "
-"be a problem if you have a lot of custom Livemark urls that can give away "
-"information about your identity."
+"fetches. Due to <a href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=436250"
+"\">Firefox Bug 436250</a>, there is no way to disable Livemark fetches "
+"during Tor. This can be a problem if you have a lot of custom Livemark urls "
+"that can give away information about your identity."
 msgstr ""

Modified: translation/trunk/projects/website/templates/torbutton/3-low.index.pot
===================================================================
--- translation/trunk/projects/website/templates/torbutton/3-low.index.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/torbutton/3-low.index.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Attribute 'title' of: <div><link>
 #: /home/runa/tor/website/torbutton/en/index.wml:11
@@ -33,37 +33,34 @@
 #. type: Content of: <div><script>
 #: /home/runa/tor/website/torbutton/en/index.wml:16
 msgid ""
-"function addSearchProvider(prov) { try { "
-"window.external.AddSearchProvider(prov); } catch (e) { alert(\"Search "
-"plugins require Firefox 2\"); return; } } function "
-"addEngine(name,ext,cat,pid)  { if ((typeof window.sidebar == \"object\") && "
-"(typeof window.sidebar.addSearchEngine == \"function\")) { "
-"window.sidebar.addSearchEngine( \"http://mycroft.mozdev.org/install.php/\" + "
-"pid + \"/\" + name + \".src\", \"http://mycroft.mozdev.org/install.php/\" + "
-"pid + \"/\" + name + \".\"+ ext, name, cat ); } else { alert(\"You will need "
-"a browser which supports Sherlock to install this plugin.\"); } } function "
-"addOpenSearch(name,ext,cat,pid,meth)  { if ((typeof window.external == "
-"\"object\") && ((typeof window.external.AddSearchProvider == \"unknown\") || "
-"(typeof window.external.AddSearchProvider == \"function\"))) { if ((typeof "
-"window.external.AddSearchProvider == \"unknown\") && meth == \"p\") { "
-"alert(\"This plugin uses POST which is not currently supported by Internet "
-"Explorer's implementation of OpenSearch.\"); } else { "
-"window.external.AddSearchProvider( "
-"\"http://mycroft.mozdev.org/installos.php/\" + pid + \"/\" + name + "
-"\".xml\"); } } else { alert(\"You will need a browser which supports "
-"OpenSearch to install this plugin.\"); } } function "
+"function addSearchProvider(prov) { try { window.external.AddSearchProvider"
+"(prov); } catch (e) { alert(\"Search plugins require Firefox 2\"); "
+"return; } } function addEngine(name,ext,cat,pid)  { if ((typeof window."
+"sidebar == \"object\") && (typeof window.sidebar.addSearchEngine == "
+"\"function\")) { window.sidebar.addSearchEngine( \"http://mycroft.mozdev.org/"
+"install.php/\" + pid + \"/\" + name + \".src\", \"http://mycroft.mozdev.org/"
+"install.php/\" + pid + \"/\" + name + \".\"+ ext, name, cat ); } else { alert"
+"(\"You will need a browser which supports Sherlock to install this plugin."
+"\"); } } function addOpenSearch(name,ext,cat,pid,meth)  { if ((typeof window."
+"external == \"object\") && ((typeof window.external.AddSearchProvider == "
+"\"unknown\") || (typeof window.external.AddSearchProvider == \"function\"))) "
+"{ if ((typeof window.external.AddSearchProvider == \"unknown\") && meth == "
+"\"p\") { alert(\"This plugin uses POST which is not currently supported by "
+"Internet Explorer's implementation of OpenSearch.\"); } else { window."
+"external.AddSearchProvider( \"http://mycroft.mozdev.org/installos.php/\" + "
+"pid + \"/\" + name + \".xml\"); } } else { alert(\"You will need a browser "
+"which supports OpenSearch to install this plugin.\"); } } function "
 "addOpenSearch2(name,ext,cat,pid,meth)  { if ((typeof window.external == "
 "\"object\") && ((typeof window.external.AddSearchProvider == \"unknown\") || "
 "(typeof window.external.AddSearchProvider == \"function\"))) { if ((typeof "
-"window.external.AddSearchProvider == \"unknown\") && meth == \"p\") { "
-"alert(\"This plugin uses POST which is not currently supported by Internet "
-"Explorer's implementation of OpenSearch.\"); } else { "
-"window.external.AddSearchProvider( "
-"\"http://torbutton.torproject.org/dev/search/\" + name + \".xml\"); } } else "
-"{ alert(\"You will need a browser which supports OpenSearch to install this "
-"plugin.\"); } } function install (aEvent)  { var params = { \"Torbutton\": { "
-"URL: aEvent.target.href, Hash: aEvent.target.getAttribute(\"hash\"), "
-"toString: function () { return this.URL; } } }; "
+"window.external.AddSearchProvider == \"unknown\") && meth == \"p\") { alert"
+"(\"This plugin uses POST which is not currently supported by Internet "
+"Explorer's implementation of OpenSearch.\"); } else { window.external."
+"AddSearchProvider( \"http://torbutton.torproject.org/dev/search/\" + name + "
+"\".xml\"); } } else { alert(\"You will need a browser which supports "
+"OpenSearch to install this plugin.\"); } } function install (aEvent)  { var "
+"params = { \"Torbutton\": { URL: aEvent.target.href, Hash: aEvent.target."
+"getAttribute(\"hash\"), toString: function () { return this.URL; } } }; "
 "InstallTrigger.install(params); return false; }"
 msgstr ""
 
@@ -77,34 +74,29 @@
 msgid ""
 "<hr /> <strong>Current version:</strong><version-torbutton><br/> <br/> "
 "<strong>Authors:</strong> Mike Perry &amp; Scott Squires<br/> <br/> "
-"<strong>Install:</strong> Click to <a "
-"href=\"http://www.torproject.org/torbutton/torbutton-current.xpi\" "
-"hash=\"<version-hash-torbutton>\" onclick=\"return install(event);\">install "
-"from this website</a> or <a "
-"href=\"https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail\">install "
-"from Mozilla's Add-On site</a><br/> <strong>Past Releases:</strong> <a "
-"href=\"releases/\">Local</a><br/> <strong>Developer Documentation:</strong> "
-"<a href=\"design/\">Torbutton Design Document</a> and <a "
-"href=\"design/MozillaBrownBag.pdf\">Slides (Not actively updated)</a><br/> "
-"<strong>Extras:</strong> Google search plugins for <a href=\"/jsreq.html\" "
-"title=\"Ref: 14938 (googleCA)\" "
-"onClick=\"addOpenSearch('GoogleCanada','ico','General','14937','g');return "
-"false\">Google CA</a>, and <a href=\"/jsreq.html\" title=\"Ref: 14938 "
-"(googleCA)\" "
-"onClick=\"addOpenSearch('googleuk_web','png','General','14445','g');return "
-"false\">Google UK</a>.  <br/> <strong>Source:</strong> You can <a "
+"<strong>Install:</strong> Click to <a href=\"http://www.torproject.org/"
+"torbutton/torbutton-current.xpi\" hash=\"<version-hash-torbutton>\" onclick="
+"\"return install(event);\">install from this website</a> or <a href="
+"\"https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-"
+"latest.xpi?src=addondetail\">install from Mozilla's Add-On site</a><br/> "
+"<strong>Past Releases:</strong> <a href=\"releases/\">Local</a><br/> "
+"<strong>Developer Documentation:</strong> <a href=\"design/\">Torbutton "
+"Design Document</a> and <a href=\"design/MozillaBrownBag.pdf\">Slides (Not "
+"actively updated)</a><br/> <strong>Extras:</strong> Google search plugins "
+"for <a href=\"/jsreq.html\" title=\"Ref: 14938 (googleCA)\" onClick="
+"\"addOpenSearch('GoogleCanada','ico','General','14937','g');return false"
+"\">Google CA</a>, and <a href=\"/jsreq.html\" title=\"Ref: 14938 (googleCA)"
+"\" onClick=\"addOpenSearch('googleuk_web','png','General','14445','g');"
+"return false\">Google UK</a>.  <br/> <strong>Source:</strong> You can <a "
 "href=\"https://svn.torproject.org/svn/torbutton/trunk/\">browse the "
 "repository</a> or simply unzip the xpi.  <br/> <strong>Bug Reports:</strong> "
-"<a "
-"href=\"https://bugs.torproject.org/flyspray/index.php?tasks=all&amp;project=5\">Torproject "
-"flyspray</a><br/> <strong>Documents:</strong> <b>[</b> <a href=\"<page "
-"torbutton/faq>\">FAQ</a> <b>|</b> <a "
-"href=\"https://svn.torproject.org/svn/torbutton/trunk/src/CHANGELOG\">changelog</a> "
-"<b>|</b> <a "
-"href=\"https://svn.torproject.org/svn/torbutton/trunk/src/LICENSE\">license</a> "
-"<b>|</b> <a "
-"href=\"https://svn.torproject.org/svn/torbutton/trunk/src/CREDITS\">credits</a> "
-"<b>]</b><br/> <br/>"
+"<a href=\"https://bugs.torproject.org/flyspray/index.php?tasks=all&amp;"
+"project=5\">Torproject flyspray</a><br/> <strong>Documents:</strong> <b>[</"
+"b> <a href=\"<page torbutton/faq>\">FAQ</a> <b>|</b> <a href=\"https://svn."
+"torproject.org/svn/torbutton/trunk/src/CHANGELOG\">changelog</a> <b>|</b> <a "
+"href=\"https://svn.torproject.org/svn/torbutton/trunk/src/LICENSE\">license</"
+"a> <b>|</b> <a href=\"https://svn.torproject.org/svn/torbutton/trunk/src/"
+"CREDITS\">credits</a> <b>]</b><br/> <br/>"
 msgstr ""
 
 #. type: Content of: <div><p>

Modified: translation/trunk/projects/website/templates/torbutton/3-low.options.pot
===================================================================
--- translation/trunk/projects/website/templates/torbutton/3-low.options.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/torbutton/3-low.options.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h2>
 #: /home/runa/tor/website/torbutton/en/options.wml:11
@@ -33,10 +33,10 @@
 "safest!) for most people, but in case you are the tweaker type, or if you "
 "prefer to try to outsource some options to more flexible extensions, here is "
 "the complete list. (In an ideal world, these descriptions should all be "
-"tooltips in the extension itself, but Firefox bugs <a "
-"href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=45375\">45375</a> and <a "
-"href=\"https://bugzilla.mozilla.org/show_bug.cgi?id=218223\">218223</a> "
-"currently prevent this.)"
+"tooltips in the extension itself, but Firefox bugs <a href=\"https://"
+"bugzilla.mozilla.org/show_bug.cgi?id=45375\">45375</a> and <a href=\"https://"
+"bugzilla.mozilla.org/show_bug.cgi?id=218223\">218223</a> currently prevent "
+"this.)"
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -135,12 +135,11 @@
 #: /home/runa/tor/website/torbutton/en/options.wml:71
 msgid ""
 "These settings prevent local html documents from transmitting local files to "
-"arbitrary websites <a "
-"href=\"http://www.gnucitizen.org/blog/content-disposition-hacking/\">under "
-"Firefox 2</a>. Since exit nodes can insert headers that force the browser to "
-"save arbitrary pages locally (and also inject script into arbitrary html "
-"files you save to disk via Tor), it is probably a good idea to leave this "
-"setting on."
+"arbitrary websites <a href=\"http://www.gnucitizen.org/blog/content-"
+"disposition-hacking/\">under Firefox 2</a>. Since exit nodes can insert "
+"headers that force the browser to save arbitrary pages locally (and also "
+"inject script into arbitrary html files you save to disk via Tor), it is "
+"probably a good idea to leave this setting on."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -183,11 +182,11 @@
 #. type: Content of: <div><ul><li><p>
 #: /home/runa/tor/website/torbutton/en/options.wml:96
 msgid ""
-"Based on code contributed by <a "
-"href=\"http://www.collinjackson.com/\">Collin Jackson</a>, when enabled and "
-"Tor is enabled, this setting prevents the rendering engine from knowing if "
-"certain links were visited.  This mechanism defeats all document-based "
-"history disclosure attacks, including CSS-only attacks."
+"Based on code contributed by <a href=\"http://www.collinjackson.com/"
+"\">Collin Jackson</a>, when enabled and Tor is enabled, this setting "
+"prevents the rendering engine from knowing if certain links were visited.  "
+"This mechanism defeats all document-based history disclosure attacks, "
+"including CSS-only attacks."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -272,8 +271,8 @@
 #. type: Content of: <div><ul><li><p>
 #: /home/runa/tor/website/torbutton/en/options.wml:137
 msgid ""
-"This setting entirely blocks the cache during Tor, but preserves it for "
-"Non-Tor usage."
+"This setting entirely blocks the cache during Tor, but preserves it for Non-"
+"Tor usage."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -324,12 +323,12 @@
 #: /home/runa/tor/website/torbutton/en/options.wml:161
 msgid ""
 "This setting allows you to manage your own cookies with an alternate "
-"extension, such as <a "
-"href=\"https://addons.mozilla.org/firefox/addon/82\">CookieCuller</a>. Note "
-"that this is particularly dangerous, since malicious exit nodes can spoof "
-"document elements that appear to be from sites you have preserved cookies "
-"for (and can then do things like fetch your entire gmail inbox, even if you "
-"were not using gmail or visiting any google pages at the time!)."
+"extension, such as <a href=\"https://addons.mozilla.org/firefox/addon/82"
+"\">CookieCuller</a>. Note that this is particularly dangerous, since "
+"malicious exit nodes can spoof document elements that appear to be from "
+"sites you have preserved cookies for (and can then do things like fetch your "
+"entire gmail inbox, even if you were not using gmail or visiting any google "
+"pages at the time!)."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -354,10 +353,9 @@
 #: /home/runa/tor/website/torbutton/en/options.wml:176
 msgid ""
 "Firefox has recently added the ability to store additional state and "
-"identifiers in persistent tables, called <a "
-"href=\"http://developer.mozilla.org/docs/DOM:Storage\">DOM Storage</a>.  "
-"Obviously this can compromise your anonymity if stored content can be "
-"fetched across Tor-state."
+"identifiers in persistent tables, called <a href=\"http://developer.mozilla."
+"org/docs/DOM:Storage\">DOM Storage</a>.  Obviously this can compromise your "
+"anonymity if stored content can be fetched across Tor-state."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -381,9 +379,9 @@
 #. type: Content of: <div><ul><li><p>
 #: /home/runa/tor/website/torbutton/en/options.wml:188
 msgid ""
-"These settings install a shutdown handler to clear cookies on Tor and/or "
-"Non-Tor browser shutdown. It is independent of your Clear Private Data "
-"settings, and does in fact clear the corresponding cookie jars."
+"These settings install a shutdown handler to clear cookies on Tor and/or Non-"
+"Tor browser shutdown. It is independent of your Clear Private Data settings, "
+"and does in fact clear the corresponding cookie jars."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -394,12 +392,12 @@
 #. type: Content of: <div><ul><li><p>
 #: /home/runa/tor/website/torbutton/en/options.wml:194
 msgid ""
-"This option augments the session store to prevent it from writing out "
-"Tor-loaded tabs to disk. Unfortunately, this also disables your ability to "
-"undo closed tabs. The reason why this setting is recommended is because "
-"after a session crash, your browser will be in an undefined Tor state, and "
-"can potentially load a bunch of Tor tabs without Tor. The following option "
-"is another alternative to protect against this."
+"This option augments the session store to prevent it from writing out Tor-"
+"loaded tabs to disk. Unfortunately, this also disables your ability to undo "
+"closed tabs. The reason why this setting is recommended is because after a "
+"session crash, your browser will be in an undefined Tor state, and can "
+"potentially load a bunch of Tor tabs without Tor. The following option is "
+"another alternative to protect against this."
 msgstr ""
 
 #. type: Content of: <div><ul><li>
@@ -416,7 +414,8 @@
 
 #. type: Content of: <div><ul><li>
 #: /home/runa/tor/website/torbutton/en/options.wml:206
-msgid "On crash recovery or session restored startup, restore via: Tor, Non-Tor"
+msgid ""
+"On crash recovery or session restored startup, restore via: Tor, Non-Tor"
 msgstr ""
 
 #. type: Content of: <div><ul><li><p>
@@ -486,7 +485,7 @@
 "where you came from to visit them. This can break some sites, however. <a "
 "href=\"http://www.digg.com\">Digg</a> in particular seemed to be broken by "
 "this.  A more streamlined, less intrusive version of this option should be "
-"available eventually. In the meantime, <a "
-"href=\"https://addons.mozilla.org/firefox/addon/953\">RefControl</a> can "
-"provide this functionality via a default option of <b>Forge</b>."
+"available eventually. In the meantime, <a href=\"https://addons.mozilla.org/"
+"firefox/addon/953\">RefControl</a> can provide this functionality via a "
+"default option of <b>Forge</b>."
 msgstr ""

Modified: translation/trunk/projects/website/templates/tordnsel/3-low.index.pot
===================================================================
--- translation/trunk/projects/website/templates/tordnsel/3-low.index.pot	2009-08-15 11:23:58 UTC (rev 20302)
+++ translation/trunk/projects/website/templates/tordnsel/3-low.index.pot	2009-08-15 11:30:22 UTC (rev 20303)
@@ -7,13 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 13:17+0300\n"
+"POT-Creation-Date: 2009-08-15 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h1>
 #: /home/runa/tor/website/tordnsel/en/index.wml:10
@@ -47,9 +47,9 @@
 #: /home/runa/tor/website/tordnsel/en/index.wml:24
 msgid ""
 "The full background and rationale for TorDNSEL is described in the official "
-"<a href=\"<svnsandbox>doc/contrib/torel-design.txt\">design "
-"document</a>. The current service only supports the first query type "
-"mentioned in that document."
+"<a href=\"<svnsandbox>doc/contrib/torel-design.txt\">design document</a>. "
+"The current service only supports the first query type mentioned in that "
+"document."
 msgstr ""
 
 #. type: Content of: <div><h2>
@@ -76,11 +76,10 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/tordnsel/en/index.wml:37
 msgid ""
-"A request for the A record "
-"\"209.137.169.81.6667.4.3.2.1.ip-port.exitlist.torproject.org\" would return "
-"127.0.0.2 if there's a Tor node that can exit through 81.169.137.209 to port "
-"6667 at 1.2.3.4. If there isn't such an exit node, the DNSEL returns "
-"NXDOMAIN."
+"A request for the A record \"209.137.169.81.6667.4.3.2.1.ip-port.exitlist."
+"torproject.org\" would return 127.0.0.2 if there's a Tor node that can exit "
+"through 81.169.137.209 to port 6667 at 1.2.3.4. If there isn't such an exit "
+"node, the DNSEL returns NXDOMAIN."
 msgstr ""
 
 #. type: Content of: <div><p>
@@ -114,7 +113,8 @@
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/tordnsel/en/index.wml:56
-msgid "An example for an IRC server running on port 6667 at IP address 1.2.3.4:"
+msgid ""
+"An example for an IRC server running on port 6667 at IP address 1.2.3.4:"
 msgstr ""
 
 #. type: Content of: <div><pre>
@@ -146,20 +146,18 @@
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/tordnsel/en/index.wml:69
 msgid ""
-"You can learn all about the code for TorDNSEL by visiting the <a "
-"href=\"http://p56soo2ibjkx23xo.onion/\">official hidden service</a> through "
-"Tor."
+"You can learn all about the code for TorDNSEL by visiting the <a href="
+"\"http://p56soo2ibjkx23xo.onion/\">official hidden service</a> through Tor."
 msgstr ""
 
 #. type: Content of: <div><p>
 #: /home/runa/tor/website/tordnsel/en/index.wml:73
 msgid ""
-"You can download the latest source release from the <a "
-"href=\"http://p56soo2ibjkx23xo.onion/dist/tordnsel-0.0.6.tar.gz\">hidden "
-"service</a> or from a <a "
-"href=\"https://www.torproject.org/tordnsel/dist/tordnsel-0.0.6.tar.gz\"> "
-"local mirror</a>. It's probably wise to check out the current revision from "
-"the darcs repository hosted on the aforementioned hidden service."
+"You can download the latest source release from the <a href=\"http://"
+"p56soo2ibjkx23xo.onion/dist/tordnsel-0.0.6.tar.gz\">hidden service</a> or "
+"from a <a href=\"https://www.torproject.org/tordnsel/dist/tordnsel-0.0.6.tar."
+"gz\"> local mirror</a>. It's probably wise to check out the current revision "
+"from the darcs repository hosted on the aforementioned hidden service."
 msgstr ""
 
 #. type: Content of: <div><p>



More information about the tor-commits mailing list