[or-cvs] r23483: {translation} new and updated website template files (in translation/trunk/projects/website/po/templates: . docs press torbrowser torbutton)
Runa Sandvik
runa.sandvik at gmail.com
Sat Oct 9 12:48:34 UTC 2010
Author: runa
Date: 2010-10-09 12:48:34 +0000 (Sat, 09 Oct 2010)
New Revision: 23483
Added:
translation/trunk/projects/website/po/templates/press/4-optional.2010-09-16-ten-things-circumvention-tools.pot
Modified:
translation/trunk/projects/website/po/templates/1-high.bridges.pot
translation/trunk/projects/website/po/templates/1-high.download.pot
translation/trunk/projects/website/po/templates/1-high.index.pot
translation/trunk/projects/website/po/templates/2-medium.documentation.pot
translation/trunk/projects/website/po/templates/3-low.news.pot
translation/trunk/projects/website/po/templates/3-low.people.pot
translation/trunk/projects/website/po/templates/4-optional.research.pot
translation/trunk/projects/website/po/templates/4-optional.volunteer.pot
translation/trunk/projects/website/po/templates/docs/1-high.tor-doc-windows.pot
translation/trunk/projects/website/po/templates/docs/2-medium.tor-doc-relay.pot
translation/trunk/projects/website/po/templates/docs/3-low.debian-vidalia.pot
translation/trunk/projects/website/po/templates/docs/3-low.debian.pot
translation/trunk/projects/website/po/templates/docs/3-low.tor-doc-unix.pot
translation/trunk/projects/website/po/templates/press/3-low.index.pot
translation/trunk/projects/website/po/templates/torbrowser/1-high.index.pot
translation/trunk/projects/website/po/templates/torbrowser/1-high.split.pot
translation/trunk/projects/website/po/templates/torbrowser/4-optional.details.pot
translation/trunk/projects/website/po/templates/torbutton/3-low.index.pot
Log:
new and updated website template files
Modified: translation/trunk/projects/website/po/templates/1-high.bridges.pot
===================================================================
--- translation/trunk/projects/website/po/templates/1-high.bridges.pot 2010-10-09 12:46:21 UTC (rev 23482)
+++ translation/trunk/projects/website/po/templates/1-high.bridges.pot 2010-10-09 12:48:34 UTC (rev 23483)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-23 20:45+0200\n"
+"POT-Creation-Date: 2010-10-09 13:47+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -27,8 +27,8 @@
msgstr ""
#. type: Content of: <div>
-#: /home/runa/tor/website/en/bridges.wml:11 /tmp/w2MltrQGFU.xml:71
-#: /tmp/w2MltrQGFU.xml:94 /tmp/w2MltrQGFU.xml:117 /tmp/w2MltrQGFU.xml:141
+#: /home/runa/tor/website/en/bridges.wml:11 /tmp/6FtQRb7jWX.xml:71
+#: /tmp/6FtQRb7jWX.xml:94 /tmp/6FtQRb7jWX.xml:117 /tmp/6FtQRb7jWX.xml:141
msgid "<hr />"
msgstr ""
@@ -85,8 +85,8 @@
#. type: Content of: <div><p>
#: /home/runa/tor/website/en/bridges.wml:55
msgid ""
-"Freedom House has produced a video on how to get and use Tor bridges. You "
-"can view it at <a href=\"http://www.youtube.com/thetorproject\">Youtube: "
+"Freedom4Internet has produced a video on how to get and use Tor bridges. "
+"You can view it at <a href=\"http://www.youtube.com/thetorproject\">Youtube: "
"Freedom4Internet</a> or download it <a href=\"http://media.torproject.org/"
"video/2009-using-a-bridge-relay-to-access-tor.ogv\">directly</a>. Know of a "
"better video, or one translated into your language? Let us know!"
Modified: translation/trunk/projects/website/po/templates/1-high.download.pot
===================================================================
--- translation/trunk/projects/website/po/templates/1-high.download.pot 2010-10-09 12:46:21 UTC (rev 23482)
+++ translation/trunk/projects/website/po/templates/1-high.download.pot 2010-10-09 12:48:34 UTC (rev 23483)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-23 20:45+0200\n"
+"POT-Creation-Date: 2010-10-09 13:46+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -32,22 +32,22 @@
msgstr ""
#. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:25 /tmp/WAHNsuaupO.xml:313
+#: /home/runa/tor/website/en/download.wml:25 /tmp/qVNFB6v6Ze.xml:324
msgid "Operating System"
msgstr ""
#. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:26 /tmp/WAHNsuaupO.xml:314
+#: /home/runa/tor/website/en/download.wml:26 /tmp/qVNFB6v6Ze.xml:325
msgid "Download Stable"
msgstr ""
#. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:27 /tmp/WAHNsuaupO.xml:315
+#: /home/runa/tor/website/en/download.wml:27 /tmp/qVNFB6v6Ze.xml:326
msgid "Download Unstable"
msgstr ""
#. type: Content of: <div><table><thead><tr><th>
-#: /home/runa/tor/website/en/download.wml:28 /tmp/WAHNsuaupO.xml:316
+#: /home/runa/tor/website/en/download.wml:28 /tmp/qVNFB6v6Ze.xml:327
msgid "Installation and Configuration"
msgstr ""
@@ -73,7 +73,7 @@
msgstr ""
#. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:46 /tmp/WAHNsuaupO.xml:333
+#: /home/runa/tor/website/en/download.wml:46 /tmp/qVNFB6v6Ze.xml:344
msgid "<a href=\"<page docs/tor-doc-windows>\">Windows</a>"
msgstr ""
@@ -143,8 +143,8 @@
msgstr ""
#. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:97 /tmp/WAHNsuaupO.xml:115
-#: /tmp/WAHNsuaupO.xml:350 /tmp/WAHNsuaupO.xml:367
+#: /home/runa/tor/website/en/download.wml:97 /tmp/qVNFB6v6Ze.xml:115
+#: /tmp/qVNFB6v6Ze.xml:361 /tmp/qVNFB6v6Ze.xml:378
msgid "<a href=\"<page docs/tor-doc-osx>\">Mac OS X</a>"
msgstr ""
@@ -177,12 +177,12 @@
msgstr ""
#. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:125 /tmp/WAHNsuaupO.xml:377
+#: /home/runa/tor/website/en/download.wml:125 /tmp/qVNFB6v6Ze.xml:388
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/WAHNsuaupO.xml:380
+#: /home/runa/tor/website/en/download.wml:128 /tmp/qVNFB6v6Ze.xml:391
msgid "<a href=\"<page docs/tor-doc-unix>\">Linux/BSD/Unix</a>"
msgstr ""
@@ -334,13 +334,26 @@
"integrity."
msgstr ""
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/tor/website/en/download.wml:252
+msgid ""
+"Tor tries to prevent attackers from learning what destinations you connect "
+"to. It doesn't prevent somebody watching your traffic from learning that "
+"you're using Tor. You can mitigate (but not fully resolve) the risk by using "
+"a <a href=\"<page bridges>\">Tor bridge relay</a> rather than connecting "
+"directly to the public Tor network, but ultimately the best protection here "
+"is a social approach: the more Tor users there are near you and the more <a "
+"href=\"<page torusers>\">diverse</a> their interests, the less dangerous it "
+"will be that you are one of them."
+msgstr ""
+
#. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download.wml:252
+#: /home/runa/tor/website/en/download.wml:263
msgid "<br />"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download.wml:254
+#: /home/runa/tor/website/en/download.wml:265
msgid ""
"Be smart and learn more. Understand what Tor does and does not offer. This "
"list of pitfalls isn't complete, and we need your help <a href=\"<page "
@@ -348,7 +361,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download.wml:264
+#: /home/runa/tor/website/en/download.wml:275
msgid ""
"See our <a href=\"<page verifying-signatures>\">instructions on verifying "
"package signatures</a>, which allows you to make sure you've downloaded the "
@@ -356,7 +369,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download.wml:270
+#: /home/runa/tor/website/en/download.wml:281
msgid ""
"If you would like to research any past release of Tor source, packages, or "
"other binaries, see <a href=\"http://archive.torproject.org/tor-package-"
@@ -364,7 +377,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download.wml:276
+#: /home/runa/tor/website/en/download.wml:287
msgid ""
"See the <a href=\"<page documentation>#Developers\">developer documentation</"
"a> for instructions on fetching Tor from Git to get the very latest "
@@ -374,19 +387,19 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download.wml:287
+#: /home/runa/tor/website/en/download.wml:298
msgid ""
"If you have trouble downloading Tor from this site, here is a <a href="
"\"<page mirrors>\">list of sites mirroring the Tor site</a>."
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/tor/website/en/download.wml:291
+#: /home/runa/tor/website/en/download.wml:302
msgid "<a id=\"ChangeLog\"></a> <a id=\"Stable\"></a> <a id=\"Testing\"></a>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/tor/website/en/download.wml:295
+#: /home/runa/tor/website/en/download.wml:306
msgid ""
"For a list of what has changed in each stable Tor release, see the <a href="
"\"<gitblobstable>ReleaseNotes\">ReleaseNotes</a>. For a list of changes in "
@@ -395,106 +408,106 @@
msgstr ""
#. type: Content of: <div>
-#: /home/runa/tor/website/en/download.wml:303
+#: /home/runa/tor/website/en/download.wml:314
msgid "<a id=\"Dev\"></a>"
msgstr ""
#. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/download.wml:304
+#: /home/runa/tor/website/en/download.wml:315
msgid "<a class=\"anchor\" href=\"#Dev\">Expert Packages & Source Code</a>"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/download.wml:307
+#: /home/runa/tor/website/en/download.wml:318
msgid ""
"Expert packages only contain Tor. In all cases, you must configure Tor on "
"your own."
msgstr ""
#. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:322
+#: /home/runa/tor/website/en/download.wml:333
msgid ""
"<img src=\"images/ico-win.png\" /> Windows (Contains only Tor)<br /> "
"<small><em>Windows 7, Vista, XP, 2000, 2003 Server</em></small>"
msgstr ""
#. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:326
+#: /home/runa/tor/website/en/download.wml:337
msgid ""
"<a href=\"<package-win32-stable>\"><version-win32-stable></a> (<a href="
"\"<package-win32-stable-sig>\">sig</a>)"
msgstr ""
#. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:329
+#: /home/runa/tor/website/en/download.wml:340
msgid ""
"<a href=\"<package-win32-alpha>\"><version-win32-alpha></a> (<a href="
"\"<package-win32-alpha-sig>\">sig</a>)"
msgstr ""
#. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:339
+#: /home/runa/tor/website/en/download.wml:350
msgid ""
"<img src=\"images/ico-osx-uni.png\" /> Mac (Contains only Tor)<br /> "
"<small><em>Intel Only, no Snow Leopard (10.6) support</em></small>"
msgstr ""
#. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:343
+#: /home/runa/tor/website/en/download.wml:354
msgid ""
"<a href=\"<package-osx-stable>\"><version-osx-stable></a> (<a href="
"\"<package-osx-stable-sig>\">sig</a>)"
msgstr ""
#. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:346
+#: /home/runa/tor/website/en/download.wml:357
msgid ""
"<a href=\"<package-osx-alpha>\"><version-osx-alpha></a> (<a href=\"<package-"
"osx-alpha-sig>\">sig</a>)"
msgstr ""
#. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:356
+#: /home/runa/tor/website/en/download.wml:367
msgid "Mac (Contains only Tor)<br /> <small><em>PowerPC Only</em></small>"
msgstr ""
#. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:360
+#: /home/runa/tor/website/en/download.wml:371
msgid ""
"<a href=\"<package-oldosx-stable>\"><version-oldosx-stable></a> (<a href="
"\"<package-oldosx-stable-sig>\">sig</a>)"
msgstr ""
#. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:363
+#: /home/runa/tor/website/en/download.wml:374
msgid ""
"<a href=\"<package-oldosx-alpha>\"><version-oldosx-alpha></a> (<a href="
"\"<package-oldosx-alpha-sig>\">sig</a>)"
msgstr ""
#. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:373
+#: /home/runa/tor/website/en/download.wml:384
msgid ""
"<img src=\"images/ico-tux.png\" /> Linux/Unix packages (Contains only Tor)"
"<br /> <small><em>Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE</em></small>"
msgstr ""
#. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:386
+#: /home/runa/tor/website/en/download.wml:397
msgid ""
"Source tarballs<br /> <kbd>./configure && make && src/or/"
"tor</kbd>"
msgstr ""
#. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:390
+#: /home/runa/tor/website/en/download.wml:401
msgid ""
"<a href=\"<package-source-stable>\"><version-stable></a> (<a href=\"<package-"
"source-stable-sig>\">sig</a>)"
msgstr ""
#. type: Content of: <div><table><tr><td>
-#: /home/runa/tor/website/en/download.wml:394
+#: /home/runa/tor/website/en/download.wml:405
msgid ""
"<a href=\"<package-source-alpha>\"><version-alpha></a> (<a href=\"<package-"
"source-alpha-sig>\">sig</a>)"
Modified: translation/trunk/projects/website/po/templates/1-high.index.pot
===================================================================
--- translation/trunk/projects/website/po/templates/1-high.index.pot 2010-10-09 12:46:21 UTC (rev 23482)
+++ translation/trunk/projects/website/po/templates/1-high.index.pot 2010-10-09 12:48:34 UTC (rev 23483)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-23 20:45+0200\n"
+"POT-Creation-Date: 2010-10-09 13:46+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -125,6 +125,13 @@
#. type: Content of: <div><ul><li>
#: /home/runa/tor/website/en/index.wml:79
msgid ""
+"16 September 2010: Tor announces <a href=\"<page press/2010-09-16-ten-things-"
+"circumvention-tools>\">Ten Things to Look for in a Circumvention Tool</a>."
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/index.wml:82
+msgid ""
"02 May 2010: Tor 0.2.1.26 released as stable. Fixes yet more OpenSSL "
"compatibility issues and lets relays defend themselves from connection "
"floods. Read the <a href=\"<blog>tor-02126-stable-released\">full "
@@ -132,7 +139,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/index.wml:84
+#: /home/runa/tor/website/en/index.wml:87
msgid ""
"29 March 2010: Tor and Printfection announce The Tor Store. More details "
"are available in the <a href=\"<page press/2010-03-25-tor-store-press-"
@@ -140,7 +147,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/index.wml:87
+#: /home/runa/tor/website/en/index.wml:90
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, "
@@ -151,7 +158,7 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/index.wml:96
+#: /home/runa/tor/website/en/index.wml:99
msgid ""
"<a href=\"<page news>\">More news</a> | <a href=\"<page press/"
"index>\">Press Releases</a> | <a href=\"<page tormedia>\">Tor in "
Modified: translation/trunk/projects/website/po/templates/2-medium.documentation.pot
===================================================================
--- translation/trunk/projects/website/po/templates/2-medium.documentation.pot 2010-10-09 12:46:21 UTC (rev 23482)
+++ translation/trunk/projects/website/po/templates/2-medium.documentation.pot 2010-10-09 12:48:34 UTC (rev 23483)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-30 17:39+0200\n"
+"POT-Creation-Date: 2010-10-09 13:47+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -116,7 +116,7 @@
"a>. If you have a bug, especially a crash bug, read <a href="
"\"<wiki>TorFAQ#MyTorkeepscrashing.\">how to report a Tor bug</a> first and "
"then tell us as much information about it as you can in <a href=\"https://"
-"bugs.torproject.org/tor\">our bugtracker</a>. (If your bug is with Polipo, "
+"bugs.torproject.org/\">our bugtracker</a>. (If your bug is with Polipo, "
"your browser, or some other application, please don't put it in our "
"bugtracker.) The <a href=\"#MailingLists\">or-talk mailing list</a> can also "
"be useful."
@@ -125,17 +125,17 @@
#. type: Content of: <div><ol><li>
#: /home/runa/tor/website/en/documentation.wml:77
msgid ""
-"<a href=\"<blog>\">Tor has a blog now</a>. We try to keep it updated every "
-"week or two with the latest news."
+"We try to keep <a href=\"<blog>\">our blog</a> updated every week with the "
+"latest news."
msgstr ""
#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/documentation.wml:82
+#: /home/runa/tor/website/en/documentation.wml:81
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/"
+"\"http://media.torproject.org/video/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 "
@@ -143,58 +143,59 @@
msgstr ""
#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/documentation.wml:92
+#: /home/runa/tor/website/en/documentation.wml:91
msgid ""
"Look through our <a href=\"#DesignDoc\">Design Documents</a>. Notice that we "
"have RFC-style specs to tell you exactly how Tor is built."
msgstr ""
#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/documentation.wml:98
+#: /home/runa/tor/website/en/documentation.wml:97
msgid ""
-"There's a skeletal <a href=\"https://svn.torproject.org/svn/projects/"
-"roadmaps/2008-12-19-roadmap-full.pdf\">list of items we'd like to tackle in "
-"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=\"/press/presskit/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:107
+#: /home/runa/tor/website/en/documentation.wml:106
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>), "
"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=\"https://svn.torproject.org/svn/projects/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://media.torproject.org/video/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=\"https://svn.torproject.org/svn/"
+"projects/design-paper/blocking.html\">design paper</a>), and Roger's "
+"\"Current events in 2007\" talk from 24C3 in December 2007 (<a href=\"http://"
+"media.torproject.org/video/24c3-2325-en-current_events_in_tor_development."
+"mp4\">video</a>, <a href=\"https://svn.torproject.org/svn/projects/"
+"presentations/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://media."
+"torproject.org/video/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:128
+#: /home/runa/tor/website/en/documentation.wml:126
msgid ""
"See Mike's \"Securing the Tor network\" talk from Defcon in July 2007 (<a "
-"href=\"http://freehaven.net/~arma/Defcon15-Mike_Perry-"
+"href=\"http://media.torproject.org/video/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."
+"introduces the <a href=\"https://gitweb.torproject.org/torflow.git/"
+"blob_plain/HEAD:/README\">Torflow</a> script collection."
msgstr ""
#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/documentation.wml:138
+#: /home/runa/tor/website/en/documentation.wml:137
msgid ""
"Learn about the <a href=\"<gitblob>doc/spec/proposals/001-process.txt\">Tor "
"proposal process for changing our design</a>, and look over the <a href="
@@ -202,17 +203,25 @@
msgstr ""
#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/documentation.wml:145
+#: /home/runa/tor/website/en/documentation.wml:144
msgid ""
-"Our <a href=\"<gitblob>doc/TODO\">developer TODO file</a> starts with a "
-"timeline for external promises — 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."
+"Our <a href=\"<wiki>wiki/projects\">project list</a> starts with a timeline "
+"for external promises — 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>
-#: /home/runa/tor/website/en/documentation.wml:152
+#: /home/runa/tor/website/en/documentation.wml:151
msgid ""
+"Through funding from the National Science Foundation, we maintain analysis, "
+"statistics, and provide the raw data of the Tor network from 2004 to today "
+"at <a href=\"https://metrics.torproject.org/\">The Tor Metrics</a> site."
+msgstr ""
+
+#. type: Content of: <div><ol><li>
+#: /home/runa/tor/website/en/documentation.wml:158
+msgid ""
"Once you're up to speed, things will continue to change surprisingly fast. "
"The <a href=\"#MailingLists\">or-dev mailing list</a> is where the complex "
"discussion happens, and the #tor IRC channel is where the less complex "
@@ -220,17 +229,17 @@
msgstr ""
#. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:160
+#: /home/runa/tor/website/en/documentation.wml:166
msgid "<a id=\"MailingLists\"></a>"
msgstr ""
#. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/documentation.wml:161
+#: /home/runa/tor/website/en/documentation.wml:167
msgid "<a class=\"anchor\" href=\"#MailingLists\">Mailing List Information</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:163
+#: /home/runa/tor/website/en/documentation.wml:169
msgid ""
"The <a href=\"http://archives.seul.org/or/announce/\">or-announce mailing "
"list</a> is a low volume list for announcements of new releases and critical "
@@ -240,7 +249,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:169
+#: /home/runa/tor/website/en/documentation.wml:175
msgid ""
"The <a href=\"http://archives.seul.org/or/talk/\">or-talk list</a> is where "
"a lot of discussion happens, and is where we send notifications of "
@@ -248,7 +257,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:172
+#: /home/runa/tor/website/en/documentation.wml:178
msgid ""
"The <a href=\"http://archives.seul.org/tor/relays/\">tor-relays list</a> is "
"where discussions about running, configuring, and handling your tor relay "
@@ -257,14 +266,14 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:176
+#: /home/runa/tor/website/en/documentation.wml:182
msgid ""
"The <a href=\"http://archives.seul.org/or/dev/\">or-dev list</a> is for "
"posting by developers only, and is very low traffic."
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:178
+#: /home/runa/tor/website/en/documentation.wml:184
msgid ""
"A list for <a href=\"http://archives.seul.org/tor/mirrors/\">mirror "
"operators</a> for new website mirrors, and supporting <a href=\"<page "
@@ -272,31 +281,31 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:181
+#: /home/runa/tor/website/en/documentation.wml:187
msgid ""
"A list for <a href=\"http://archives.seul.org/or/cvs/\">svn and git commits</"
"a> may be interesting for developers."
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:183
+#: /home/runa/tor/website/en/documentation.wml:189
msgid ""
"An automated list for <a href=\"http://archives.seul.org/tor/bugs/\">bug "
"reports from trac</a> may be interesting for users and developers."
msgstr ""
#. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:187
+#: /home/runa/tor/website/en/documentation.wml:193
msgid "<a id=\"DesignDoc\"></a>"
msgstr ""
#. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/documentation.wml:188
+#: /home/runa/tor/website/en/documentation.wml:194
msgid "<a class=\"anchor\" href=\"#DesignDoc\">Design Documents</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:190
+#: /home/runa/tor/website/en/documentation.wml:196
msgid ""
"The <b>design document</b> (published at Usenix Security 2004) gives our "
"justifications and security analysis for the Tor design: <a href=\"https://"
@@ -306,7 +315,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:195
+#: /home/runa/tor/website/en/documentation.wml:201
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="
@@ -315,7 +324,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:199
+#: /home/runa/tor/website/en/documentation.wml:205
msgid ""
"Our paper at WEIS 2006 — <b>Anonymity Loves Company: Usability and the "
"Network Effect</b> — explains why usability in anonymity systems "
@@ -324,7 +333,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:203
+#: /home/runa/tor/website/en/documentation.wml:209
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 "
@@ -335,19 +344,19 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:209
+#: /home/runa/tor/website/en/documentation.wml:215
msgid ""
"The <b>specifications</b> aim to give developers enough information to build "
"a compatible version of Tor:"
msgstr ""
#. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:212
+#: /home/runa/tor/website/en/documentation.wml:218
msgid "<a href=\"<gitblob>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:213
+#: /home/runa/tor/website/en/documentation.wml:219
msgid ""
"<a href=\"<gitblob>doc/spec/dir-spec.txt\">Tor version 3 directory server "
"specification</a> (and older <a href=\"<gitblob>doc/spec/dir-spec-v1.txt"
@@ -356,78 +365,78 @@
msgstr ""
#. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:218
+#: /home/runa/tor/website/en/documentation.wml:224
msgid ""
"<a href=\"<gitblob>doc/spec/control-spec.txt\">Tor control protocol "
"specification</a>"
msgstr ""
#. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:220
+#: /home/runa/tor/website/en/documentation.wml:226
msgid ""
"<a href=\"<gitblob>doc/spec/rend-spec.txt\">Tor rendezvous specification</a>"
msgstr ""
#. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:222
+#: /home/runa/tor/website/en/documentation.wml:228
msgid ""
"<a href=\"<gitblob>doc/spec/path-spec.txt\">Tor path selection "
"specification</a>"
msgstr ""
#. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:224
+#: /home/runa/tor/website/en/documentation.wml:230
msgid ""
"<a href=\"<gitblob>doc/spec/address-spec.txt\">Special hostnames in Tor</a>"
msgstr ""
#. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:226
+#: /home/runa/tor/website/en/documentation.wml:232
msgid ""
"<a href=\"<gitblob>doc/spec/socks-extensions.txt\">Tor's SOCKS support and "
"extensions</a>"
msgstr ""
#. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:228
+#: /home/runa/tor/website/en/documentation.wml:234
msgid ""
"<a href=\"<gitblob>doc/spec/version-spec.txt\">How Tor version numbers work</"
"a>"
msgstr ""
#. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:230
+#: /home/runa/tor/website/en/documentation.wml:236
msgid ""
"<a href=\"<gittree>doc/spec/proposals\">In-progress drafts of new "
"specifications and proposed changes</a>"
msgstr ""
#. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:236
+#: /home/runa/tor/website/en/documentation.wml:242
msgid "<a id=\"NeatLinks\"></a>"
msgstr ""
#. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/documentation.wml:237
+#: /home/runa/tor/website/en/documentation.wml:243
msgid "<a class=\"anchor\" href=\"#NeatLinks\">Neat Links</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:239
+#: /home/runa/tor/website/en/documentation.wml:245
msgid ""
"The <a href=\"https://trac.torproject.org/projects/tor\">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:242
+#: /home/runa/tor/website/en/documentation.wml:248
msgid ""
"<a href=\"<wiki>SupportPrograms\">A list of supporting programs you might "
"want to use in association with Tor</a>."
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:246
+#: /home/runa/tor/website/en/documentation.wml:252
msgid ""
"<a href=\"https://check.torproject.org/\">The Tor detector</a> or <a href="
"\"http://torcheck.xenobite.eu/\">the other Tor detector</a> try to guess if "
@@ -435,7 +444,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:249
+#: /home/runa/tor/website/en/documentation.wml:255
msgid ""
"Check out one of the Tor status pages, such as <a href=\"http://torstatus."
"blutmagie.de/\">blutmagie's</a>, or <a href=\"http://trunk.torstatus.kgprog."
@@ -446,7 +455,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:256
+#: /home/runa/tor/website/en/documentation.wml:262
msgid ""
"Read <a href=\"http://freehaven.net/anonbib/topic."
"html#Anonymous_20communication\">these papers</a> (especially the ones in "
@@ -454,50 +463,50 @@
msgstr ""
#. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:262
+#: /home/runa/tor/website/en/documentation.wml:268
msgid "<a id=\"Developers\"></a>"
msgstr ""
#. type: Content of: <div><h2>
-#: /home/runa/tor/website/en/documentation.wml:263
+#: /home/runa/tor/website/en/documentation.wml:269
msgid "<a class=\"anchor\" href=\"#Developers\">For Developers</a>"
msgstr ""
#. type: Content of: <div>
-#: /home/runa/tor/website/en/documentation.wml:264
+#: /home/runa/tor/website/en/documentation.wml:270
msgid "Browse the Tor <b>source repository</b>:"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:266
+#: /home/runa/tor/website/en/documentation.wml:272
msgid "<a href=\"<gitrepo>\">Browse the repository's source tree directly</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:267
+#: /home/runa/tor/website/en/documentation.wml:273
msgid "Git and SVN access:"
msgstr ""
#. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:269
+#: /home/runa/tor/website/en/documentation.wml:275
msgid "<kbd>git clone git://git.torproject.org/git/tor</kbd>"
msgstr ""
#. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:270
+#: /home/runa/tor/website/en/documentation.wml:276
msgid ""
"The development branch is <kbd>master</kbd>. The active maintenance "
"branches are <kbd>maint-0.2.0</kbd> and <kbd>maint-0.2.1</kbd>."
msgstr ""
#. type: Content of: <div><ul><li><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:271
+#: /home/runa/tor/website/en/documentation.wml:277
msgid ""
"<kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/documentation.wml:274
+#: /home/runa/tor/website/en/documentation.wml:280
msgid ""
"<a href=\"https://gitweb.torproject.org//githax.git?a=blob;f=doc/Howto.txt;"
"hb=HEAD\">Basic instructions for using Git to contribute to Tor software.</a>"
Modified: translation/trunk/projects/website/po/templates/3-low.news.pot
===================================================================
--- translation/trunk/projects/website/po/templates/3-low.news.pot 2010-10-09 12:46:21 UTC (rev 23482)
+++ translation/trunk/projects/website/po/templates/3-low.news.pot 2010-10-09 12:48:34 UTC (rev 23483)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-23 20:45+0200\n"
+"POT-Creation-Date: 2010-10-09 13:46+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -30,6 +30,13 @@
#. type: Content of: <div><ul><li>
#: /home/runa/tor/website/en/news.wml:16
msgid ""
+"16 September 2010: Tor announces <a href=\"<page press/2010-09-16-ten-things-"
+"circumvention-tools>\">Ten Things to Look for in a Circumvention Tool</a>."
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/news.wml:19
+msgid ""
"02 May 2010: Tor 0.2.1.26 released as stable. Fixes yet more OpenSSL "
"compatibility issues and lets relays defend themselves from connection "
"floods. Read the <a href=\"<blog>tor-02126-stable-released\">full "
@@ -37,7 +44,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:21
+#: /home/runa/tor/website/en/news.wml:24
msgid ""
"29 March 2010: Tor and Printfection announce The Tor Store. More details "
"are available in the <a href=\"<page press/2010-03-25-tor-store-press-"
@@ -45,7 +52,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:24
+#: /home/runa/tor/website/en/news.wml:27
msgid ""
"16 March 2010: Tor 0.2.1.25 released as stable. Fixes a regression "
"introduced in 0.2.1.23 that could prevent relays from guessing their IP "
@@ -55,7 +62,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:30
+#: /home/runa/tor/website/en/news.wml:33
msgid ""
"21 February 2010: Tor 0.2.1.24 released as stable. Fixes compatibility with "
"recent Apple OSX openssl changes and adds some performance enhancements. "
@@ -64,7 +71,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:35
+#: /home/runa/tor/website/en/news.wml:38
msgid ""
"19 January 2010: Tor 0.2.1.22 released as stable. Fixes a critical privacy "
"problem in bridge directory authorities. This stable update also rotates "
@@ -74,7 +81,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:41
+#: /home/runa/tor/website/en/news.wml:44
msgid ""
"21 December 2009: Tor 0.2.1.21 released as stable. Fixes issues with "
"OpenSSL and helps exit relays. Read the <a href=\"http://archives.seul.org/"
@@ -83,14 +90,14 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:42
+#: /home/runa/tor/website/en/news.wml:45
msgid ""
"10 October 2009: Tor 0.2.1.20 released as stable. Read the <a href="
"\"<blog>tor-02120-released\">announcement</a> for the updates and changes."
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:43
+#: /home/runa/tor/website/en/news.wml:46
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 "
@@ -98,7 +105,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:46
+#: /home/runa/tor/website/en/news.wml:49
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 "
@@ -106,7 +113,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:48
+#: /home/runa/tor/website/en/news.wml:51
msgid ""
"12 March 2009: Tor launches performance roadmap and campaign. Read the <a "
"href=\"<page press/2009-03-12-performance-roadmap-press-release>\">Press "
@@ -114,7 +121,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:49
+#: /home/runa/tor/website/en/news.wml:52
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"
@@ -123,7 +130,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:52
+#: /home/runa/tor/website/en/news.wml:55
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 "
@@ -131,7 +138,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:55
+#: /home/runa/tor/website/en/news.wml:58
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 "
@@ -139,7 +146,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:58
+#: /home/runa/tor/website/en/news.wml:61
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"
@@ -147,7 +154,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:61
+#: /home/runa/tor/website/en/news.wml:64
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"
@@ -155,7 +162,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:64
+#: /home/runa/tor/website/en/news.wml:67
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 "
@@ -164,7 +171,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:69
+#: /home/runa/tor/website/en/news.wml:72
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 "
@@ -174,7 +181,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:76
+#: /home/runa/tor/website/en/news.wml:79
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 "
@@ -192,14 +199,14 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:89
+#: /home/runa/tor/website/en/news.wml:92
msgid ""
"Mar 2008: <a href=\"<blog>tor-project-google-summer-code-2008!\">Tor Project "
"is in Google Summer of Code 2008!</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:93
+#: /home/runa/tor/website/en/news.wml:96
msgid ""
"Feb 2008: The <a href=\"<page people>#Board\">Board of Directors</a> "
"welcomes <a href=\"<blog>isaac-mao-elected-one-our-new-directors\">Isaac "
@@ -208,14 +215,14 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:99
+#: /home/runa/tor/website/en/news.wml:102
msgid ""
"Feb 2008: Tor is happy to announce the <a href=\"<blog>\">official Tor blog</"
"a>."
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:102
+#: /home/runa/tor/website/en/news.wml:105
msgid ""
"Jan 2008: <a href=\"<page download>\">Tor 0.1.2.19</a> (the latest stable "
"release) fixes a huge memory leak on exit relays, makes the default exit "
@@ -226,7 +233,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:110
+#: /home/runa/tor/website/en/news.wml:113
msgid ""
"Oct 2007: <a href=\"<page download>\">Tor 0.1.2.18</a> (the new stable "
"release) fixes many problems including crash bugs, problems with hidden "
@@ -240,7 +247,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:120
+#: /home/runa/tor/website/en/news.wml:123
msgid ""
"Oct 2007: As many of you know, The Tor Project became an <a href=\"<page "
"people>\">independent and official nonprofit</a> this past February. We did "
@@ -254,7 +261,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:132
+#: /home/runa/tor/website/en/news.wml:135
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="
@@ -262,7 +269,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:136
+#: /home/runa/tor/website/en/news.wml:139
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 "
@@ -272,7 +279,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:142
+#: /home/runa/tor/website/en/news.wml:145
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 "
@@ -281,7 +288,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:147
+#: /home/runa/tor/website/en/news.wml:150
msgid ""
"Jan 2007: The Tor network has grown to hundreds of thousands of users. The "
"developers can't do all the new features, bug fixes, and documentation. <a "
@@ -289,7 +296,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/tor/website/en/news.wml:151
+#: /home/runa/tor/website/en/news.wml:154
msgid ""
"<b>We are actively looking for new sponsors and funding.</b> If your "
"organization has an interest in keeping the Tor network usable and fast, "
Modified: translation/trunk/projects/website/po/templates/3-low.people.pot
===================================================================
--- translation/trunk/projects/website/po/templates/3-low.people.pot 2010-10-09 12:46:21 UTC (rev 23482)
+++ translation/trunk/projects/website/po/templates/3-low.people.pot 2010-10-09 12:48:34 UTC (rev 23483)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-30 17:38+0200\n"
+"POT-Creation-Date: 2010-10-09 13:46+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -216,27 +216,41 @@
#. type: Content of: <div><dl><dt>
#: /home/runa/tor/website/en/people.wml:90
-msgid "Damian Johnson"
+msgid "Robert Hogan"
msgstr ""
#. type: Content of: <div><dl><dd>
#: /home/runa/tor/website/en/people.wml:90
msgid ""
-"Builds a command-line application for monitoring Tor relays, providing real-"
-"time status information such as the current configuration, bandwidth usage, "
-"message log, etc. (<a href=\"https://svn.torproject.org/svn/arm/trunk/README"
-"\">code</a>)."
+"Developer for the <a href=\"http://tork.sf.net/\">TorK</a> Tor controller, a "
+"<a href=\"http://code.google.com/p/torora/\">privacy-oriented Arora fork</"
+"a>, the <a href=\"http://code.google.com/p/torsocks/\">torsocks scripts</a>, "
+"and other useful peripheral tools."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:95
+#: /home/runa/tor/website/en/people.wml:96
+msgid "Damian Johnson (Developer)"
+msgstr ""
+
+#. type: Content of: <div><dl><dd>
+#: /home/runa/tor/website/en/people.wml:96
msgid ""
+"Develops arm (the anonymizing relay monitor), a command-line application for "
+"tracking the real-time status of Tor relays including information like the "
+"traffic volume, configuration, connections, message log, etc (<a href="
+"\"http://www.atagar.com/arm/\">project page</a>)."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
+#: /home/runa/tor/website/en/people.wml:102
+msgid ""
"Andrew Lewman (Executive Director; Director; <a href=\"<page press/index>"
"\">press contact</a>)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:96
+#: /home/runa/tor/website/en/people.wml:103
msgid ""
"Manages the business operations of The Tor Project, Inc. Plays roles of "
"finance, advocacy, project management, and general support. General package "
@@ -244,12 +258,12 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:101
+#: /home/runa/tor/website/en/people.wml:108
msgid "Karsten Loesing (Developer)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:102
+#: /home/runa/tor/website/en/people.wml:109
msgid ""
"Worked during the 2007 Google Summer of Code on <a href=\"<gitblob>doc/spec/"
"proposals/114-distributed-storage.txt\">distributing and securing the "
@@ -260,24 +274,24 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:109
+#: /home/runa/tor/website/en/people.wml:116
msgid "Nick Mathewson (Chief architect; Director)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:109
+#: /home/runa/tor/website/en/people.wml:116
msgid ""
"One of the three original designers of Tor; does a lot of the ongoing design "
"work. One of the two main developers, along with Roger."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:113
+#: /home/runa/tor/website/en/people.wml:120
msgid "Steven Murdoch (Researcher and Developer)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:113
+#: /home/runa/tor/website/en/people.wml:120
msgid ""
"Researcher at the University of Cambridge, currently funded by The Tor "
"Project to improve the security, performance, and usability of Tor. Creator "
@@ -285,24 +299,24 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:118
+#: /home/runa/tor/website/en/people.wml:125
msgid "Peter Palfrader"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:118
+#: /home/runa/tor/website/en/people.wml:125
msgid ""
"Manages the Debian packages, runs one of the directory authorities, runs the "
"website and the wiki, and generally helps out a lot."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:122
+#: /home/runa/tor/website/en/people.wml:129
msgid "Mike Perry (Developer)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:122
+#: /home/runa/tor/website/en/people.wml:129
msgid ""
"Author of <a href=\"https://svn.torproject.org/svn/torflow/trunk/README"
"\">TorFlow</a>, a Tor controller that builds paths through the Tor network "
@@ -311,24 +325,24 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:128
+#: /home/runa/tor/website/en/people.wml:135
msgid "Karen Reilly (Development Director)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:128
+#: /home/runa/tor/website/en/people.wml:135
msgid ""
"Responsible for fundraising, advocacy, and general marketing and outreach "
"programs for Tor."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:132
+#: /home/runa/tor/website/en/people.wml:139
msgid "Runa A. Sandvik"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:132
+#: /home/runa/tor/website/en/people.wml:139
msgid ""
"Maintains the <a href=\"https://translation.torproject.org/\">Tor "
"Translation Portal</a>, and works on automatically converting our website "
@@ -337,12 +351,12 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:138
+#: /home/runa/tor/website/en/people.wml:145
msgid "Paul Syverson"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:138
+#: /home/runa/tor/website/en/people.wml:145
msgid ""
"Inventor of <a href=\"http://www.onion-router.net/\">Onion Routing</a>, "
"original designer of Tor along with Roger and Nick, and project leader for "
@@ -351,23 +365,23 @@
msgstr ""
#. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:146
+#: /home/runa/tor/website/en/people.wml:153
msgid "<a id=\"Board\"></a>"
msgstr ""
#. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:147
+#: /home/runa/tor/website/en/people.wml:154
msgid ""
"<a class=\"anchor\" href=\"#Board\">The Tor Project Board of Directors:</a>"
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:151
+#: /home/runa/tor/website/en/people.wml:158
msgid "Meredith Hoban Dunn (Director)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:151
+#: /home/runa/tor/website/en/people.wml:158
msgid ""
"Our audit committee chair. Her role is to help us make sure we're able to "
"pass our upcoming corporate audits correctly, watch for internal fraud, tell "
@@ -375,86 +389,86 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:156
+#: /home/runa/tor/website/en/people.wml:163
msgid "Ian Goldberg (Director)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:156
+#: /home/runa/tor/website/en/people.wml:163
msgid ""
"Cryptographer, privacy expert, and professor; one of the designers of <a "
"href=\"http://www.cypherpunks.ca/otr/\">Off-the-Record Messaging</a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:160
+#: /home/runa/tor/website/en/people.wml:167
msgid "Xianghui (Isaac) Mao (Director)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:160
+#: /home/runa/tor/website/en/people.wml:167
msgid ""
"Chinese blogging and privacy activist. His current activities can be found "
"at <a href=\"http://isaacmao.com/\">his website</a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:164
+#: /home/runa/tor/website/en/people.wml:171
msgid "Frank Rieger (Director)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:164
+#: /home/runa/tor/website/en/people.wml:171
msgid "CTO of <a href=\"http://www.gsmk.de/\">GSMK Cryptophone</a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:167
+#: /home/runa/tor/website/en/people.wml:174
msgid "Wendy Seltzer (Director)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:167
+#: /home/runa/tor/website/en/people.wml:174
msgid ""
"Lawyer, cyberlaw professor, and founder of <a href=\"http://chillingeffects."
"org/\">ChillingEffects.org</a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:171
+#: /home/runa/tor/website/en/people.wml:178
msgid "Along with Roger, Nick, and Andrew listed above as Directors."
msgstr ""
#. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:175
+#: /home/runa/tor/website/en/people.wml:182
msgid "<a id=\"GSoC\"></a>"
msgstr ""
#. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:176
+#: /home/runa/tor/website/en/people.wml:183
msgid ""
"<a class=\"anchor\" href=\"#GSoC\">Google Summer of Code 2010 students:</a>"
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:179
+#: /home/runa/tor/website/en/people.wml:186
msgid "Kevin Berry"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:179
+#: /home/runa/tor/website/en/people.wml:186
msgid ""
"Working on a database schema to support better node churn metrics and on a "
"more dynamic metrics website. Mentored by Karsten Loesing."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:182
+#: /home/runa/tor/website/en/people.wml:189
msgid "Harry Bock"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:182
+#: /home/runa/tor/website/en/people.wml:189
msgid ""
"Working on TorBEL, a Tor bulk exit list tracker and service designed to "
"replace TorDNSEL. TorBEL is written in Python using the torflow API. "
@@ -462,12 +476,12 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:185
+#: /home/runa/tor/website/en/people.wml:192
msgid "Kory Kirk"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:185
+#: /home/runa/tor/website/en/people.wml:192
msgid ""
"Worked during Google Summer of Code 2009 on extending Torbutton. Now he's "
"working on implementing hidden services for our java Tor client. Mentored by "
@@ -475,122 +489,90 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:188
+#: /home/runa/tor/website/en/people.wml:195
msgid "John Schanck"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:188
+#: /home/runa/tor/website/en/people.wml:195
msgid ""
"Works on improving the automated detection of misconfigured or malicious "
"exit nodes. Mentored by Mike Perry."
msgstr ""
#. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:193
+#: /home/runa/tor/website/en/people.wml:200
msgid "<a id=\"Translators\"></a>"
msgstr ""
#. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:194
+#: /home/runa/tor/website/en/people.wml:201
msgid "<a class=\"anchor\" href=\"#Translators\">Core translators:</a>"
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:197
+#: /home/runa/tor/website/en/people.wml:204
msgid "Bogdan Drozdowski"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:197
+#: /home/runa/tor/website/en/people.wml:204
msgid "<a href=\"https://www.torproject.org/index.html.pl\">Polish</a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:199
+#: /home/runa/tor/website/en/people.wml:206
msgid "Tiago Faria"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:199
+#: /home/runa/tor/website/en/people.wml:206
msgid "Portuguese."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:200
+#: /home/runa/tor/website/en/people.wml:207
msgid "fredzupy"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:200
+#: /home/runa/tor/website/en/people.wml:207
msgid "<a href=\"https://www.torproject.org/index.html.fr\">French</a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:202
-msgid ""
-"Ruben Garcia, Médéric RIBREUX, plus further pages by <a href=\"http://www."
-"greentranslations.com/\">Green Crescent</a>"
-msgstr ""
-
-#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:203
-msgid "<a href=\"https://www.torproject.org/index.html.es\">Spanish</a>."
-msgstr ""
-
-#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:205
+#: /home/runa/tor/website/en/people.wml:209
msgid "Jens Kubieziel and Oliver Knapp"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:205
+#: /home/runa/tor/website/en/people.wml:209
msgid "<a href=\"https://www.torproject.org/index.html.de\">German</a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:207
+#: /home/runa/tor/website/en/people.wml:211
msgid "Pei Hanru and bridgefish"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:207
+#: /home/runa/tor/website/en/people.wml:211
msgid ""
"<a href=\"https://www.torproject.org/index.html.zh-cn\">Simplified Chinese</"
"a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:209
+#: /home/runa/tor/website/en/people.wml:213
msgid "Jan Reister"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:209
+#: /home/runa/tor/website/en/people.wml:213
msgid "<a href=\"https://www.torproject.org/index.html.it\">Italian</a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:211
-msgid "Masaki Taniguchi"
-msgstr ""
-
-#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:211
-msgid "<a href=\"https://www.torproject.org/index.html.ja\">Japanese</a>."
-msgstr ""
-
-#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:213
-msgid "Jan Woning"
-msgstr ""
-
-#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:213
-msgid "<a href=\"https://www.torproject.org/index.html.nl\">Dutch</a>."
-msgstr ""
-
-#. type: Content of: <div><dl><dt>
#: /home/runa/tor/website/en/people.wml:215
msgid "ygrek"
msgstr ""
@@ -657,116 +639,105 @@
#. type: Content of: <div><dl><dt>
#: /home/runa/tor/website/en/people.wml:232
-msgid "Robert Hogan"
+msgid "Fabian Keil"
msgstr ""
#. type: Content of: <div><dl><dd>
#: /home/runa/tor/website/en/people.wml:232
msgid ""
-"Developer for the <a href=\"http://tork.sf.net/\">TorK</a> Tor controller."
-msgstr ""
-
-#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:234
-msgid "Fabian Keil"
-msgstr ""
-
-#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:234
-msgid ""
"One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
"and Privoxy still work well together."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:234
msgid "Bruce Leidl"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:236
+#: /home/runa/tor/website/en/people.wml:234
msgid "Working on a Tor client in Java."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:237
+#: /home/runa/tor/website/en/people.wml:235
msgid "Julius Mittenzwei"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:237
+#: /home/runa/tor/website/en/people.wml:235
msgid ""
"A lawyer with the CCC in Germany. Coordinates the German Tor community with "
"respect to legal questions and concerns."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:240
+#: /home/runa/tor/website/en/people.wml:238
msgid "Shava Nerad"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:240
+#: /home/runa/tor/website/en/people.wml:238
msgid ""
"Our former Development Director. She still works on PR and community "
"relations."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:242
+#: /home/runa/tor/website/en/people.wml:240
msgid "Linus Nordberg"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:242
+#: /home/runa/tor/website/en/people.wml:240
msgid ""
"Enjoys measuring the Tor network and helps with outreach in the Nordic "
"countries."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:244
+#: /home/runa/tor/website/en/people.wml:242
msgid "Lasse Øverlier"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:244
+#: /home/runa/tor/website/en/people.wml:242
msgid ""
"Writes research papers on Tor: attacks, defenses, and resource management, "
"especially for hidden services."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:246
+#: /home/runa/tor/website/en/people.wml:244
msgid "Martin Peck"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:246
+#: /home/runa/tor/website/en/people.wml:244
msgid ""
"Working on a VM-based transparent proxying approach for Tor clients on "
"Windows."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:248
+#: /home/runa/tor/website/en/people.wml:246
msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:249
+#: /home/runa/tor/website/en/people.wml:247
msgid ""
"The most dedicated bug reporter we've ever heard from. He must read Tor "
"source code every day over breakfast."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:249
msgid "tup (another pseudonym)"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:251
+#: /home/runa/tor/website/en/people.wml:249
msgid ""
"Periodically adds new features for making Tor easier to use as a <a href="
"\"<wiki>TransparentProxy\">transparent proxy</a>. Also maintains the <a href="
@@ -774,24 +745,24 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:256
+#: /home/runa/tor/website/en/people.wml:254
msgid "Kyle Williams"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:256
+#: /home/runa/tor/website/en/people.wml:254
msgid ""
"Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
"easier to set up and use."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:257
msgid "Ethan Zuckerman"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:259
+#: /home/runa/tor/website/en/people.wml:257
msgid ""
"A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?"
"p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/"
@@ -800,7 +771,7 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:264
+#: /home/runa/tor/website/en/people.wml:262
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, "
@@ -808,32 +779,32 @@
msgstr ""
#. type: Content of: <div>
-#: /home/runa/tor/website/en/people.wml:270
+#: /home/runa/tor/website/en/people.wml:268
msgid "<a id=\"Past\"></a>"
msgstr ""
#. type: Content of: <div><h3>
-#: /home/runa/tor/website/en/people.wml:271
+#: /home/runa/tor/website/en/people.wml:269
msgid "<a class=\"anchor\" href=\"#Past\">Past thanks to:</a>"
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:274
+#: /home/runa/tor/website/en/people.wml:272
msgid "John Bashinski"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:274
+#: /home/runa/tor/website/en/people.wml:272
msgid "Contributed the initial rpm spec file."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:273
msgid "Domenik Bork"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:275
+#: /home/runa/tor/website/en/people.wml:273
msgid ""
"Worked on Configuration of Hidden Services with User Authorization in "
"Vidalia (<a href=\"http://trac.vidalia-project.net/browser/vidalia/branches/"
@@ -841,12 +812,12 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:276
msgid "Benedikt Boss"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:278
+#: /home/runa/tor/website/en/people.wml:276
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 "
@@ -854,22 +825,22 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:281
+#: /home/runa/tor/website/en/people.wml:279
msgid "Ren Bucholz"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:281
+#: /home/runa/tor/website/en/people.wml:279
msgid "Our fine logo and images."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:282
+#: /home/runa/tor/website/en/people.wml:280
msgid "Fallon Chen"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:282
+#: /home/runa/tor/website/en/people.wml:280
msgid ""
"Worked on Improving Tor Path Selection (<a href=\"https://svn.torproject.org/"
"cgi-bin/viewvc.cgi/torflow/branches/gsoc2008/\">svn</a>) and <a href="
@@ -878,32 +849,32 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:286
msgid "Bram Cohen"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:288
+#: /home/runa/tor/website/en/people.wml:286
msgid "Helped design our congestion control mechanisms, in Tor's early days."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:288
msgid "Pat Double"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:290
+#: /home/runa/tor/website/en/people.wml:288
msgid "Creator of the Incognito LiveCD."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:291
+#: /home/runa/tor/website/en/people.wml:289
msgid "Geoff Goodell"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:291
+#: /home/runa/tor/website/en/people.wml:289
msgid ""
"Started the <a href=\"https://svn.torproject.org/svn/blossom/trunk/"
"\">Blossom project</a> which uses Tor as its overlay network; also helped "
@@ -911,12 +882,12 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:295
+#: /home/runa/tor/website/en/people.wml:293
msgid "Aleksei Gorny"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:295
+#: /home/runa/tor/website/en/people.wml:293
msgid ""
"Working on Tor exit scanner improvements (<a href=\"https://svn.torproject."
"org/cgi-bin/viewvc.cgi/torflow/branches/gsoc2008/\">svn</a>), originally "
@@ -924,52 +895,52 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:298
+#: /home/runa/tor/website/en/people.wml:296
msgid "Christian Grothoff"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:298
+#: /home/runa/tor/website/en/people.wml:296
msgid "Contributed better daemonizing behavior."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:297
msgid "Steven Hazel"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:299
+#: /home/runa/tor/website/en/people.wml:297
msgid "Made 'make install' do the right thing."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:300
+#: /home/runa/tor/website/en/people.wml:298
msgid "Justin Hipple"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:300
+#: /home/runa/tor/website/en/people.wml:298
msgid "The other developer for Vidalia."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:299
msgid "Jason Holt"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:301
+#: /home/runa/tor/website/en/people.wml:299
msgid "Contributed patches to the instructions and the man page."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:301
msgid "Christian King"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:303
+#: /home/runa/tor/website/en/people.wml:301
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-"
@@ -977,70 +948,70 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:308
+#: /home/runa/tor/website/en/people.wml:306
msgid "Joe Kowalski"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:308
+#: /home/runa/tor/website/en/people.wml:306
msgid ""
"Original author and provider of the torstatus script formerly run on "
"nighteffect."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:308
msgid "Adam Langley"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:310
+#: /home/runa/tor/website/en/people.wml:308
msgid "Our fine eventdns code."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:311
+#: /home/runa/tor/website/en/people.wml:309
msgid "Rebecca MacKinnon"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:311
+#: /home/runa/tor/website/en/people.wml:309
msgid ""
"Former Director of Tor. Co-Founder of <a href=\"http://www."
"globalvoicesonline.org/\">Global Voices Online</a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:313
+#: /home/runa/tor/website/en/people.wml:311
msgid "Chris Palmer"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:313
+#: /home/runa/tor/website/en/people.wml:311
msgid ""
"Our liaison and tech guy with EFF while EFF was funding us. Also helped "
"advocate and write end-user docs."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:315
+#: /home/runa/tor/website/en/people.wml:313
msgid "Matej Pfajfar"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:315
+#: /home/runa/tor/website/en/people.wml:313
msgid ""
"Author of the original onion routing code that Tor is based on, so we didn't "
"have to start from scratch."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:315
msgid "Johannes Renner"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:317
+#: /home/runa/tor/website/en/people.wml:315
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 "
@@ -1048,33 +1019,33 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:322
+#: /home/runa/tor/website/en/people.wml:320
msgid "Scott Squires"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:322
+#: /home/runa/tor/website/en/people.wml:320
msgid ""
"The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:324
+#: /home/runa/tor/website/en/people.wml:322
msgid "Aaron Turner"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:324
+#: /home/runa/tor/website/en/people.wml:322
msgid "Contributed the first version of the tor.sh initscripts shell script."
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:326
+#: /home/runa/tor/website/en/people.wml:324
msgid "Stephen Tyree"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:326
+#: /home/runa/tor/website/en/people.wml:324
msgid ""
"Worked during Google Summer of Code 2009 to develop a plugin API for <a href="
"\"<page vidalia/index>\">Vidalia</a> and create a plugin to allow HerdictWeb "
@@ -1083,12 +1054,12 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:330
+#: /home/runa/tor/website/en/people.wml:328
msgid "Camilo Viecco"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:330
+#: /home/runa/tor/website/en/people.wml:328
msgid ""
"Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac."
"vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as part "
@@ -1096,12 +1067,12 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:333
+#: /home/runa/tor/website/en/people.wml:331
msgid "Fred von Lohmann"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:333
+#: /home/runa/tor/website/en/people.wml:331
msgid ""
"Fred served on our Board of Directors from 2006 through 2009. His complete "
"bio can be found at the <a href=\"http://www.eff.org/about/staff/?"
@@ -1109,12 +1080,12 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:337
+#: /home/runa/tor/website/en/people.wml:335
msgid "Christian Wilms"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:337
+#: /home/runa/tor/website/en/people.wml:335
msgid ""
"Worked on Performance Enhancing Measures for Tor Hidden Services (<a href="
"\"https://svn.torproject.org/cgi-bin/viewvs.cgi/tor/branches/hidserv-perf/"
@@ -1122,12 +1093,12 @@
msgstr ""
#. type: Content of: <div><dl><dt>
-#: /home/runa/tor/website/en/people.wml:340
+#: /home/runa/tor/website/en/people.wml:338
msgid "Jillian C. York"
msgstr ""
#. type: Content of: <div><dl><dd>
-#: /home/runa/tor/website/en/people.wml:340
+#: /home/runa/tor/website/en/people.wml:338
msgid ""
"<a href=\"http://jilliancyork.com/\">Jillian C. York</a> is a writer, "
"blogger, and activist based in Boston. She blogs on the uses of Tor and "
Modified: translation/trunk/projects/website/po/templates/4-optional.research.pot
===================================================================
--- translation/trunk/projects/website/po/templates/4-optional.research.pot 2010-10-09 12:46:21 UTC (rev 23482)
+++ translation/trunk/projects/website/po/templates/4-optional.research.pot 2010-10-09 12:48:34 UTC (rev 23483)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-10-09 13:46+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,17 +17,17 @@
"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <div><h2>
-#: /home/runa/code/website/en/research.wml:9
+#: /home/runa/tor/website/en/research.wml:9
msgid "Tor: Research"
msgstr ""
#. type: Content of: <div>
-#: /home/runa/code/website/en/research.wml:10
+#: /home/runa/tor/website/en/research.wml:10
msgid "<hr />"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/en/research.wml:13
+#: /home/runa/tor/website/en/research.wml:13
msgid ""
"Many people around the world are doing research on how to improve the Tor "
"design, what's going on in the Tor network, and more generally on attacks "
@@ -38,7 +38,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/research.wml:24
+#: /home/runa/tor/website/en/research.wml:24
msgid ""
"<b>Data.</b> We've been <a href=\"http://metrics.torproject.org/data.html"
"\">collecting data to learn more about the Tor network</a>: how many relays "
@@ -55,7 +55,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/research.wml:42
+#: /home/runa/tor/website/en/research.wml:42
msgid ""
"<b>Analysis.</b> If you're investigating Tor, or solving a Tor-related "
"problem, <i>_please_</i> talk to us somewhere along the way — the "
@@ -71,7 +71,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/research.wml:58
+#: /home/runa/tor/website/en/research.wml:58
msgid ""
"<b>Measurement and attack tools.</b> We're building a <a href=\"http://"
"metrics.torproject.org/tools.html\">repository</a> of tools that can be used "
@@ -86,7 +86,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/research.wml:72
+#: /home/runa/tor/website/en/research.wml:72
msgid ""
"<b>We need defenses too — not just attacks.</b> Most researchers find "
"it easy and fun to come up with novel attacks on anonymity systems. We've "
@@ -100,7 +100,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/research.wml:85
+#: /home/runa/tor/website/en/research.wml:85
msgid ""
"<b>In-person help.</b> If you're doing interesting and important Tor "
"research and need help understanding how the Tor network or design works, "
@@ -111,60 +111,60 @@
msgstr ""
#. type: Content of: <div>
-#: /home/runa/code/website/en/research.wml:96
+#: /home/runa/tor/website/en/research.wml:96
msgid "<a id=\"Groups\"></a>"
msgstr ""
#. type: Content of: <div><h2>
-#: /home/runa/code/website/en/research.wml:97
+#: /home/runa/tor/website/en/research.wml:97
msgid "<a class=\"anchor\" href=\"#Groups\">Research Groups</a>"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/en/research.wml:99
+#: /home/runa/tor/website/en/research.wml:99
msgid ""
"Interested to find other anonymity researchers? Here are some research "
"groups you should take a look at."
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/research.wml:103
+#: /home/runa/tor/website/en/research.wml:103
msgid ""
"Ian Goldberg's <a href=\"http://crysp.uwaterloo.ca/\">CrySP</a> group at "
"Waterloo."
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/research.wml:106
+#: /home/runa/tor/website/en/research.wml:106
msgid ""
"<a href=\"http://www-users.cs.umn.edu/~hopper/\">Nick Hopper</a>'s group at "
"UMN."
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/research.wml:109
+#: /home/runa/tor/website/en/research.wml:109
msgid ""
"<a href=\"http://www.hatswitch.org/~nikita/\">Nikita Borisov</a>'s group at "
"Illinois."
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/research.wml:112
+#: /home/runa/tor/website/en/research.wml:112
msgid "Matt Wright's <a href=\"http://isec.uta.edu/\">iSec</a> group at UTA."
msgstr ""
#. type: Content of: <div>
-#: /home/runa/code/website/en/research.wml:117
+#: /home/runa/tor/website/en/research.wml:117
msgid "<a id=\"Ideas\"></a>"
msgstr ""
#. type: Content of: <div><h2>
-#: /home/runa/code/website/en/research.wml:118
+#: /home/runa/tor/website/en/research.wml:118
msgid "<a class=\"anchor\" href=\"#Ideas\">Research Ideas</a>"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/en/research.wml:121
+#: /home/runa/tor/website/en/research.wml:121
msgid ""
"If you're interested in anonymity research, you must make it to the <a href="
"\"http://petsymposium.org/\">Privacy Enhancing Technologies Symposium</a>. "
@@ -174,22 +174,54 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/en/research.wml:128
+#: /home/runa/tor/website/en/research.wml:128
msgid ""
"To get up to speed on anonymity research, read <a href=\"http://freehaven."
"net/anonbib/\">these papers</a> (especially the ones in boxes)."
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/en/research.wml:132
+#: /home/runa/tor/website/en/research.wml:132
msgid ""
"We need people to attack the system, quantify defenses, etc. Here are some "
"example projects:"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/research.wml:137
+#: /home/runa/tor/website/en/research.wml:137
msgid ""
+"If we prevent the really loud users from using too much of the Tor network, "
+"how much can it help? We've instrumented Tor's entry relays so they can rate-"
+"limit connections from users, and we've instrumented the directory "
+"authorities so they can change the rate-limiting parameters globally across "
+"the network. Which parameter values improve performance for the Tor network "
+"as a whole? How should relays adapt their rate-limiting parameters based on "
+"their capacity and based on the network load they see, and what rate-"
+"limiting algorithms will work best? See the <a href=\"https://blog."
+"torproject.org/blog/research-problem-adaptive-throttling-tor-clients-entry-"
+"guards\">blog post</a> for details."
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/research.wml:150
+msgid ""
+"Right now Tor clients are willing to reuse a given circuit for ten minutes "
+"after it's first used. The goal is to avoid loading down the network with "
+"too many circuit creations, yet to also avoid having clients use the same "
+"circuit for so long that the exit node can build a useful pseudonymous "
+"profile of them. Alas, ten minutes is probably way too long, especially if "
+"connections from multiple protocols (e.g. IM and web browsing) are put on "
+"the same circuit. If we keep fixed the overall number of circuit extends "
+"that the network needs to do, are there more efficient and/or safer ways for "
+"clients to allocate streams to circuits, or for clients to build preemptive "
+"circuits? Perhaps this research item needs to start with gathering some "
+"traces of what requests typical clients try to launch, so you have something "
+"realistic to try to optimize."
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/en/research.wml:164
+msgid ""
"The \"website fingerprinting attack\": make a list of a few hundred popular "
"websites, download their pages, and make a set of \"signatures\" for each "
"site. Then observe a Tor client's traffic. As you watch him receive data, "
@@ -210,7 +242,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/en/research.wml:167
+#: /home/runa/tor/website/en/research.wml:191
msgid ""
"More coming soon. See also the \"Research\" section of the <a href=\"<page "
"volunteer>#Research\">volunteer</a> page for other topics."
Modified: translation/trunk/projects/website/po/templates/4-optional.volunteer.pot
===================================================================
--- translation/trunk/projects/website/po/templates/4-optional.volunteer.pot 2010-10-09 12:46:21 UTC (rev 23482)
+++ translation/trunk/projects/website/po/templates/4-optional.volunteer.pot 2010-10-09 12:48:34 UTC (rev 23483)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-23 20:45+0200\n"
+"POT-Creation-Date: 2010-10-09 13:47+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -911,30 +911,13 @@
#. type: Content of: <div><ol><li>
#: /home/runa/tor/website/en/volunteer.wml:885
msgid ""
-"Right now Tor clients are willing to reuse a given circuit for ten minutes "
-"after it's first used. The goal is to avoid loading down the network with "
-"too many circuit extend operations, yet to also avoid having clients use the "
-"same circuit for so long that the exit node can build a useful pseudonymous "
-"profile of them. Alas, ten minutes is probably way too long, especially if "
-"connections from multiple protocols (e.g. IM and web browsing) are put on "
-"the same circuit. If we keep fixed the overall number of circuit extends "
-"that the network needs to do, are there more efficient and/or safer ways for "
-"clients to allocate streams to circuits, or for clients to build preemptive "
-"circuits? Perhaps this research item needs to start with gathering some "
-"traces of what connections typical clients try to launch, so you have "
-"something realistic to try to optimize."
-msgstr ""
-
-#. type: Content of: <div><ol><li>
-#: /home/runa/tor/website/en/volunteer.wml:898
-msgid ""
"How many bridge relays do you need to know to maintain reachability? We "
"should measure the churn in our bridges. If there is lots of churn, are "
"there ways to keep bridge users more likely to stay connected?"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/tor/website/en/volunteer.wml:906
+#: /home/runa/tor/website/en/volunteer.wml:893
msgid ""
"<a href=\"<page contact>\">Let us know</a> if you've made progress on any of "
"these!"
Modified: translation/trunk/projects/website/po/templates/docs/1-high.tor-doc-windows.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/1-high.tor-doc-windows.pot 2010-10-09 12:46:21 UTC (rev 23482)
+++ translation/trunk/projects/website/po/templates/docs/1-high.tor-doc-windows.pot 2010-10-09 12:48:34 UTC (rev 23483)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-10-09 13:47+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,20 +17,20 @@
"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <div><div><h1>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:11
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:11
msgid ""
"Running the <a href=\"<page index>\">Tor</a> client on Microsoft Windows"
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:12
-#: /tmp/9aXjvbD5id.xml:34 /tmp/9aXjvbD5id.xml:70 /tmp/9aXjvbD5id.xml:109
-#: /tmp/9aXjvbD5id.xml:152
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:12
+#: /tmp/o_bvcOVs24.xml:34 /tmp/o_bvcOVs24.xml:70 /tmp/o_bvcOVs24.xml:109
+#: /tmp/o_bvcOVs24.xml:152
msgid "<br />"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:15
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:15
msgid ""
"<b>Note that these are the installation instructions for running a Tor "
"client on Microsoft Windows (2000, XP, Vista, 7, and Server Editions). If "
@@ -40,28 +40,28 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:22
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:22
msgid ""
-"Freedom House has produced a video on how to install Tor. You can view it "
-"at <a href=\"http://media.torproject.org/video/2009-install-and-use-tor.ogv"
-"\">How to install Tor on Windows</a>. Know of a better video, or one "
+"Freedom4Internet has produced a video on how to install Tor. You can view "
+"it at <a href=\"http://media.torproject.org/video/2009-install-and-use-tor."
+"ogv\">How to install Tor on Windows</a>. Know of a better video, or one "
"translated into your language? Let us know!"
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:31
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:31
msgid "<hr /> <a id=\"installing\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:33
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:33
msgid ""
"<a class=\"anchor\" href=\"#installing\">Step One: Download and Install Tor</"
"a>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:37
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:37
msgid ""
"Microsoft Windows bundles contain <a href=\"<page index>\">Tor</a>, <a href="
"\"<page vidalia/index>\">Vidalia</a> (a GUI for Tor), <a href=\"https://"
@@ -75,35 +75,35 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:49
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:49
msgid ""
"<img alt=\"tor installer splash page\" src=\"../img/screenshot-win32-"
"installer-splash.png\" />"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:51
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:51
msgid ""
"If you have previously installed Tor, Vidalia, or Polipo you can deselect "
"whichever components you do not need to install in the dialog shown below."
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:56
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:56
msgid ""
"<img alt=\"select components to install\" src=\"../img/screenshot-win32-"
"installer-components.png\" />"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:58
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:58
msgid ""
"After you have completed the installer, the components you selected will "
"automatically be started for you."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:62
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:62
msgid ""
"Tor comes configured as a client by default. It uses a built-in default "
"configuration file, and most people won't need to change any of the "
@@ -111,26 +111,26 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:67
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:67
msgid "<hr /> <a id=\"using\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:69
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:69
msgid ""
"<a class=\"anchor\" href=\"#using\">Step Two: Configure your applications to "
"use Tor</a>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:72
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:72
msgid ""
"After installing Tor and Polipo, you need to configure your applications to "
"use them. The first step is to set up web browsing."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:75
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:75
msgid ""
"You should use Tor with Firefox and Torbutton, for best safety. The bundle "
"installs the <a href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton "
@@ -138,14 +138,14 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:81
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:81
msgid ""
"<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
"png\" border=\"1\"/> <br />"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:86
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:86
msgid ""
"If you plan to run Firefox on a different computer than Tor, see the <a href="
"\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -154,7 +154,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:91
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:91
msgid ""
"To Torify other applications that support HTTP proxies, just point them at "
"Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
@@ -167,7 +167,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:101
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:101
msgid ""
"For information on how to Torify other applications, check out the <a href="
"\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
@@ -175,18 +175,18 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:106
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:106
msgid "<hr /> <a id=\"verify\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:108
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:108
msgid ""
"<a class=\"anchor\" href=\"#verify\">Step Three: Make sure it's working</a>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:112
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:112
msgid ""
"Check to see that Vidalia is running. Vidalia uses a small green onion to "
"indicate Tor is running or a dark onion with a red \"X\" when Tor is not "
@@ -196,13 +196,13 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:119
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:119
msgid ""
"<img alt=\"Vidalia Tray Icon\" src=\"../img/screenshot-win32-vidalia.png\"/>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:122
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:122
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/"
@@ -213,7 +213,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:130
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:130
msgid ""
"If you have a personal firewall that limits your computer's ability to "
"connect to itself, be sure to allow connections from your local applications "
@@ -224,32 +224,32 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:139
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:139
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."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:144
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:144
msgid ""
"Once it's working, learn more about <a href=\"<page download>#Warning\">what "
"Tor does and does not offer</a>."
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:148
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:148
msgid "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:151
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:151
msgid ""
"<a class=\"anchor\" href=\"#relay\">Step Four: Configure it as a relay</a>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:154
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:154
msgid ""
"The Tor network relies on volunteers to donate bandwidth. The more people "
"who run relays, the faster the Tor network will be. If you have at least 20 "
@@ -260,7 +260,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:162
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:162
msgid ""
"Having relays in many different places on the Internet is what makes Tor "
"users secure. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -270,19 +270,19 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:169
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:169
msgid ""
"Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
"a> guide."
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:172
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:172
msgid "<hr />"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-windows.wml:174
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:174
msgid ""
"If you have suggestions for improving this document, please <a href=\"<page "
"contact>\">send them to us</a>. Thanks!"
Modified: translation/trunk/projects/website/po/templates/docs/2-medium.tor-doc-relay.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/2-medium.tor-doc-relay.pot 2010-10-09 12:46:21 UTC (rev 23482)
+++ translation/trunk/projects/website/po/templates/docs/2-medium.tor-doc-relay.pot 2010-10-09 12:48:34 UTC (rev 23483)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-10-09 13:47+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,44 +17,43 @@
"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <div><div><h1>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:11
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:11
msgid "Configuring a Tor relay"
msgstr ""
#. type: Content of: <div><div><div><h3>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:15
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:15
msgid "Config Steps"
msgstr ""
#. type: Content of: <div><div><div><ol><li>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:17
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:17
msgid ""
"<a href=\"<page docs/tor-doc-relay>#install\">Download & Install</a>"
msgstr ""
#. type: Content of: <div><div><div><ol><li>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:18
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:18
msgid "<a href=\"<page docs/tor-doc-relay>#setup\">Configuration</a>"
msgstr ""
#. type: Content of: <div><div><div><ol><li>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:19
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:19
msgid "<a href=\"<page docs/tor-doc-relay>#check\">Check & Confirm</a>"
msgstr ""
#. type: Content of: <div><div><div><ol><li>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:20
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:20
msgid "<a href=\"<page docs/tor-doc-relay>#after\">Final Steps</a>"
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:25
-#: /tmp/fQgmBq00kF.xml:285
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:25 /tmp/INvuM6pgtZ.xml:280
msgid "<hr />"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:28
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:28
msgid ""
"The Tor network relies on volunteers to donate bandwidth. The more people "
"who run relays, the faster the Tor network will be. If you have at least 20 "
@@ -66,62 +65,62 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:37
+#: /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. Tor "
-"relays work best on Linux, OS X Tiger or later, FreeBSD 5.x+, NetBSD 5.x+, "
-"and Windows Server 2003 or later."
+"You can run a Tor relay on <a href=\"<wiki>/"
+"TorFAQ#WhydoesntmyWindowsorotherOSTorrelayrunwell\">pretty much any</a> "
+"operating system. Tor relays work best on Linux, OS X Tiger or later, "
+"FreeBSD 5.x+, NetBSD 5.x+, and Windows Server 2003 or later."
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:43
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:42
msgid "<hr /> <a id=\"zero\"></a> <a id=\"install\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:46
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:45
msgid ""
"<a class=\"anchor\" href=\"#install\">Step One: Download and Install Tor</a>"
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:47 /tmp/fQgmBq00kF.xml:62
-#: /tmp/fQgmBq00kF.xml:149 /tmp/fQgmBq00kF.xml:175
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:46 /tmp/INvuM6pgtZ.xml:61
+#: /tmp/INvuM6pgtZ.xml:148 /tmp/INvuM6pgtZ.xml:172
msgid "<br />"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:49
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:48
msgid "Before you start, you need to make sure that Tor is up and running."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:52
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:51
msgid ""
"Visit our <a href=\"<page easy-download>\">download page</a> and install the "
"\"Installation Bundle\" for your OS."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:56
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:55
msgid ""
"If it's convenient, you might also want to use it as a client for a while to "
"make sure it's actually working."
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:59
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:58
msgid "<hr /> <a id=\"setup\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:61
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:60
msgid "<a class=\"anchor\" href=\"#setup\">Step Two: Set it up as a relay</a>"
msgstr ""
#. type: Content of: <div><div><ol><li>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:64
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:63
msgid ""
"Verify that your clock and timezone are set correctly. If possible, "
"synchronize your clock with public <a href=\"http://en.wikipedia.org/wiki/"
@@ -129,31 +128,31 @@
msgstr ""
#. type: Content of: <div><div><ol><li>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:70
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:69
msgid "<strong>Configuring Tor with the Vidalia Graphical Interface</strong>:"
msgstr ""
#. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:74
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:73
msgid ""
"Right click on the Vidalia icon in your task bar. Choose <tt>Control Panel</"
"tt>."
msgstr ""
#. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:75
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:74
msgid ""
"<img alt=\"vidalia right click menu\" src=\"../img/screenshot-win32-vidalia."
"png\">"
msgstr ""
#. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:78
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:77
msgid "Click <tt>Setup Relaying</tt>."
msgstr ""
#. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:81
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:80
msgid ""
"Choose <tt>Relay Traffic for the Tor network</tt> if you want to be a public "
"relay (recommended), or choose \t\t<tt>Help censored users reach the Tor "
@@ -162,21 +161,21 @@
msgstr ""
#. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:82
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:81
msgid ""
"<img alt=\"vidalia basic settings\" src=\"../img/screenshot-win32-configure-"
"relay-1.png\">"
msgstr ""
#. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:85
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:84
msgid ""
"Enter a nickname for your relay, and enter contact information in case we "
"need to contact you about problems."
msgstr ""
#. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:88
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:87
msgid ""
"Leave <tt>Attempt to automatically configure port forwarding</tt> clicked. "
"Push the <tt>Test</tt> button to see if it works. If it does work, great. "
@@ -184,21 +183,21 @@
msgstr ""
#. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:92
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:91
msgid ""
"Choose the <tt>Bandwidth Limits</tt> tab. Select how much bandwidth you "
"want to provide for Tor users like yourself."
msgstr ""
#. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:93
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:92
msgid ""
"<img alt=\"vidalia bandwidth limits\" src=\"../img/screenshot-win32-"
"configure-relay-2.png\">"
msgstr ""
#. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:96
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:95
msgid ""
"Choose the <tt>Exit Policies</tt> tab. If you want to allow others to use "
"your relay for these services, don't change anything. Un-check the services "
@@ -208,30 +207,30 @@
msgstr ""
#. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:100
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:99
msgid ""
"<img alt=\"vidalia exit policies\" src=\"../img/screenshot-win32-configure-"
"relay-3.png\">"
msgstr ""
#. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:103
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:102
msgid ""
"Click the <tt>Ok</tt> button. See Step Three below for confirmation that "
"the relay is working correctly."
msgstr ""
#. type: Content of: <div><div><ol><li>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:107
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:106
msgid "<br /> <strong>Manual Configuration</strong>:"
msgstr ""
#. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:110
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:109
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 "
+"Edit the bottom part of <a href=\"<wiki>/TorFAQ#Imsupposedtoeditmytorrc."
+"Whatdoesthatmean\">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"
@@ -239,7 +238,7 @@
msgstr ""
#. type: Content of: <div><div><ol><li>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:122
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:121
msgid ""
"If you are using a firewall, open a hole in your firewall so incoming "
"connections can reach the ports you configured (ORPort, plus DirPort if you "
@@ -250,14 +249,14 @@
msgstr ""
#. type: Content of: <div><div><ol><li>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:131
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:130
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=\"<wiki>/TorFAQ#WhatloglevelshouldIuse"
+"\">logs any warnings</a>, address them."
msgstr ""
#. type: Content of: <div><div><ol><li>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:136
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:135
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 "
@@ -267,97 +266,92 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:146
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:145
msgid "<hr /> <a id=\"check\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:148
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:147
msgid ""
"<a class=\"anchor\" href=\"#check\">Step Three: Make sure it is working</a>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:151
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:150
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 "
-"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 — you should re-check your "
-"firewalls, check that it's testing the IP and port you think it should be "
-"testing, etc."
+"\"<wiki>/TorFAQ#WhatloglevelshouldIuse\">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 — you should re-check your firewalls, check that it's testing "
+"the IP and port you think it should be testing, etc."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:163
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:162
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://194.109.206.212/tor/status-vote/"
-"current/consensus\">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 up to one hour to give enough time for it to make a fresh "
-"directory."
+"relay is using. You can look in your data directory for a cached-consensus "
+"file to see if your relay is online in the Tor Network. You may need to "
+"wait up to one hour to give enough time for it to make a fresh directory."
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:172
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:169
msgid "<hr /> <a id=\"after\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:174
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:171
msgid "<a class=\"anchor\" href=\"#after\">Step Four: Once it is working</a>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:178
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:175
msgid "We recommend the following steps as well:"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:182
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:179
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=\"<wiki>/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/code/website/docs/en/tor-doc-relay.wml:188
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:185
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=\"<wiki>/TorFAQ#MultipleRelays\">the MyFamily option</a> in all your "
+"relays' configuration files."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:194
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:191
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 "
+"slower bandwidth, to avoid congestion. See the <a href=\"<wiki>/"
+"TorFAQ#HowcanIlimitthetotalamountofbandwidthusedbymyTorrelay\">rate limiting "
"FAQ entry</a> for details."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:202
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:199
msgid ""
"9. Back up your Tor relay's private key (stored in \"keys/secret_id_key\" in "
"your DataDirectory). This is your relay's \"identity,\" and you need to keep "
"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=\"<wiki>/"
+"TorFAQ#Iwanttoupgrademovemyrelay.HowdoIkeepthesamekey\">move or restore your "
+"Tor relay</a> if something goes wrong."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:212
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:209
msgid ""
"10. If you control the name servers for your domain, consider setting your "
"reverse DNS hostname to 'anonymous-relay', 'proxy' or 'tor-proxy', so when "
@@ -369,7 +363,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:223
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:220
msgid ""
"11. If your computer isn't running a webserver, please consider changing "
"your ORPort to 443 and your DirPort to 80. Many Tor users are stuck behind "
@@ -377,39 +371,38 @@
"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=\"<wiki>/"
+"TorFAQ#HowcanImakemyrelayaccessibletopeoplestuckbehindrestrictivefirewalls"
+"\"> 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>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:238
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:235
msgid ""
"12. If your Tor relay provides other services on the same IP address — "
"such as a public webserver — 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=\"<wiki>/TorFAQ#WhatisExitEnclaving\">safest way to reach that "
+"webserver</a>, and always build a circuit that ends at your relay."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:249
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:244
msgid ""
"13. (Unix only). Make a separate user to run the relay. If you installed the "
"OS X package or the deb or the rpm, this is already done. Otherwise, you can "
"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=\"<wiki>/TorInChroot\">put Tor into a chroot "
+"jail</a>.)"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:260
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:255
msgid ""
"14. (Unix only.) Your operating system probably limits the number of open "
"file descriptors per process to 1024 (or even less). If you plan to be "
@@ -421,7 +414,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:270
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:265
msgid ""
"15. If you installed Tor via some package or installer, it probably starts "
"Tor for you automatically on boot. But if you installed from source, you may "
@@ -429,7 +422,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:276
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:271
msgid ""
"When you change your Tor configuration, remember to verify that your relay "
"still works correctly after the change. Be sure to set your \"ContactInfo\" "
@@ -441,7 +434,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-relay.wml:287
+#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:282
msgid ""
"If you have suggestions for improving this document, please <a href=\"<page "
"contact>\">send them to us</a>. Thanks!"
Modified: translation/trunk/projects/website/po/templates/docs/3-low.debian-vidalia.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/3-low.debian-vidalia.pot 2010-10-09 12:46:21 UTC (rev 23482)
+++ translation/trunk/projects/website/po/templates/docs/3-low.debian-vidalia.pot 2010-10-09 12:48:34 UTC (rev 23483)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-10-09 13:47+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,61 +17,97 @@
"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:11
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:11
msgid "<a id=\"debian\"></a> <a id=\"packages\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:13
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:13
msgid "<a class=\"anchor\" href=\"#debian\">Vidalia on Ubuntu or Debian</a>"
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:14
-#: /tmp/j8wbYmFBrh.xml:71
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:14 /tmp/OVfukIW41F.xml:80
msgid "<br />"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:17
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:17
msgid ""
"<b>Do not use the packages in Ubuntu's universe.</b> They are unmaintained "
"and out of date. That means you'll be missing stability and security fixes."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:23
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:23
msgid ""
-"You'll need to set up our package repository before you can fetch Vidalia. "
-"First, you need to figure out the name of your distribution. If you're using "
-"Ubuntu 9.10 or 10.04, it's \"karmic\", while 9.04 is \"jaunty\", 8.10 is "
-"\"intrepid\", and 8.04 is \"hardy\". If you're using Debian Etch, it's \"etch"
-"\", and Debian Lenny is \"lenny\". Then add this line 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. Here's a quick "
+"mapping:"
msgstr ""
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:27
+msgid "Ubuntu 10.04 or Trisquel 4.0 is \"lucid\""
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:28
+msgid "Ubuntu 9.10 or Trisquel 3.5 is \"karmic\""
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:29
+msgid "Ubuntu 9.04 is \"jaunty\""
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:30
+msgid "Ubuntu 8.10 is \"intrepid\""
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:31
+msgid "Ubuntu 8.04 is \"hardy\""
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:32
+msgid "Debian Etch is \"etch\""
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:33
+msgid "Debian Lenny is \"lenny\""
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:36
+msgid "Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br />"
+msgstr ""
+
#. type: Content of: <div><div><p><pre>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:31
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:40
#, no-wrap
msgid "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:33
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:42
msgid ""
"where you substitute the above word (etch, lenny, sid, karmic, jaunty, "
"intrepid, hardy) in place of <DISTRIBUTION>."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:38
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:47
msgid ""
"Then add the gpg key used to sign the packages by running the following "
"commands at your command prompt:"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:41
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:50
#, no-wrap
msgid ""
"gpg --keyserver keys.gnupg.net --recv 886DDD89\n"
@@ -79,14 +115,14 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:44
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:53
msgid ""
"Now refresh your sources and install Vidalia by running the following "
"commands at your command prompt:"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:47
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:56
#, no-wrap
msgid ""
"apt-get update\n"
@@ -94,8 +130,8 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:53
-#: /tmp/j8wbYmFBrh.xml:100
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:62
+#: /tmp/OVfukIW41F.xml:109
msgid ""
"Now Vidalia is installed and running. Move on to <a href=\"<page docs/tor-"
"doc-unix>#polipo\">step two</a> of the \"Vidalia on Linux/Unix\" "
@@ -103,7 +139,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:59
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:68
msgid ""
"The DNS name <code>deb.torproject.org</code> is actually a set of "
"independent servers in a DNS round robin configuration. If you for some "
@@ -113,37 +149,37 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:67
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:76
msgid "<hr /> <a id=\"source\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:70
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:79
msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:74
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:83
msgid ""
"If you want to build your own debs from source you must first add an "
"appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>."
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:77
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:86
#, no-wrap
msgid "deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:79
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:88
msgid ""
"You also need to install the necessary packages to build your own debs and "
"the packages needed to build Vidalia:"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:82
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:91
#, no-wrap
msgid ""
"apt-get install build-essential fakeroot devscripts qt4-dev-tools qt4-designer libqt4-dev g++ cmake\n"
@@ -151,12 +187,12 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:85
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:94
msgid "Then you can build Vidalia in ~/debian-packages:"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:87
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:96
#, no-wrap
msgid ""
"mkdir ~/debian-packages; cd ~/debian-packages\n"
@@ -167,23 +203,23 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:93
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:102
msgid "Now you can install the new package:"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:95
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:104
#, no-wrap
msgid "sudo dpkg -i vidalia_*.deb\n"
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:105
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:114
msgid "<hr />"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian-vidalia.wml:107
+#: /home/runa/tor/website/docs/en/debian-vidalia.wml:116
msgid ""
"If you have suggestions for improving this document, please <a href=\"<page "
"contact>\">send them to us</a>. Thanks!"
Modified: translation/trunk/projects/website/po/templates/docs/3-low.debian.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/3-low.debian.pot 2010-10-09 12:46:21 UTC (rev 23482)
+++ translation/trunk/projects/website/po/templates/docs/3-low.debian.pot 2010-10-09 12:48:34 UTC (rev 23483)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-10-09 13:47+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,32 +17,32 @@
"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/debian.wml:11
+#: /home/runa/tor/website/docs/en/debian.wml:11
msgid "<a id=\"debian\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/code/website/docs/en/debian.wml:12
+#: /home/runa/tor/website/docs/en/debian.wml:12
msgid ""
"<a class=\"anchor\" href=\"#debian\">Option one: Tor on Debian lenny, Debian "
"sid, or Debian testing</a>"
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/debian.wml:14 /tmp/LoR_C_qp1J.xml:41
-#: /tmp/LoR_C_qp1J.xml:100 /tmp/LoR_C_qp1J.xml:135
+#: /home/runa/tor/website/docs/en/debian.wml:14 /tmp/48vw1i6Sdr.xml:41
+#: /tmp/48vw1i6Sdr.xml:107 /tmp/48vw1i6Sdr.xml:142
msgid "<br />"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian.wml:17
+#: /home/runa/tor/website/docs/en/debian.wml:17
msgid ""
"If you're using Debian stable (lenny), unstable (sid), or testing (squeeze), "
"just run<br /> <tt>apt-get install tor tor-geoipdb</tt> as root."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian.wml:24
+#: /home/runa/tor/website/docs/en/debian.wml:24
msgid ""
"Note that this might not always give you the latest stable Tor version, but "
"you will receive important security fixes. To make sure that you're running "
@@ -50,50 +50,87 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian.wml:30 /tmp/LoR_C_qp1J.xml:81
-#: /tmp/LoR_C_qp1J.xml:126 /tmp/LoR_C_qp1J.xml:169
+#: /home/runa/tor/website/docs/en/debian.wml:30 /tmp/48vw1i6Sdr.xml:88
+#: /tmp/48vw1i6Sdr.xml:133 /tmp/48vw1i6Sdr.xml:176
msgid ""
"Now Tor is installed and running. Move on to <a href=\"<page docs/tor-doc-"
"unix>#polipo\">step two</a> of the \"Tor on Linux/Unix\" instructions."
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/debian.wml:35
+#: /home/runa/tor/website/docs/en/debian.wml:35
msgid "<hr /> <a id=\"ubuntu\"></a> <a id=\"packages\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/code/website/docs/en/debian.wml:39
+#: /home/runa/tor/website/docs/en/debian.wml:39
msgid ""
"<a class=\"anchor\" href=\"#ubuntu\">Option two: Tor on Ubuntu or Debian</a>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian.wml:44
+#: /home/runa/tor/website/docs/en/debian.wml:44
msgid ""
"<b>Do not use the packages in Ubuntu's universe.</b> They are unmaintained "
"and out of date. That means you'll be missing stability and security fixes."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian.wml:50
+#: /home/runa/tor/website/docs/en/debian.wml:50
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 10.04 it's \"lucid\", 9.10 is \"karmic\", 9.04 is \"jaunty\", 8.10 is "
-"\"intrepid\", and 8.04 is \"hardy\". If you're using Debian Etch, it's \"etch"
-"\", and Debian Lenny is \"lenny\". Then add this line to your <tt>/etc/apt/"
-"sources.list</tt> file:<br />"
+"First, you need to figure out the name of your distribution. Here's a quick "
+"mapping:"
msgstr ""
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/debian.wml:54
+msgid "Ubuntu 10.04 or Trisquel 4.0 is \"lucid\""
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/debian.wml:55
+msgid "Ubuntu 9.10 or Trisquel 3.5 is \"karmic\""
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/debian.wml:56
+msgid "Ubuntu 9.04 is \"jaunty\""
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/debian.wml:57
+msgid "Ubuntu 8.10 is \"intrepid\""
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/debian.wml:58
+msgid "Ubuntu 8.04 is \"hardy\""
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/debian.wml:59
+msgid "Debian Etch is \"etch\""
+msgstr ""
+
+#. type: Content of: <div><div><p><ul><li>
+#: /home/runa/tor/website/docs/en/debian.wml:60
+msgid "Debian Lenny is \"lenny\""
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/debian.wml:63
+msgid "Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br />"
+msgstr ""
+
#. type: Content of: <div><div><p><pre>
-#: /home/runa/code/website/docs/en/debian.wml:58
+#: /home/runa/tor/website/docs/en/debian.wml:67
#, no-wrap
msgid "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian.wml:60
+#: /home/runa/tor/website/docs/en/debian.wml:69
msgid ""
"where you put the codename of your distribution (i.e. etch, lenny, sid, "
"lucid, karmic, jaunty, intrepid, hardy or whatever it is) in place of <"
@@ -101,14 +138,14 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian.wml:66
+#: /home/runa/tor/website/docs/en/debian.wml:73
msgid ""
"Then add the gpg key used to sign the packages by running the following "
"commands at your command prompt:"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/code/website/docs/en/debian.wml:69
+#: /home/runa/tor/website/docs/en/debian.wml:76
#, no-wrap
msgid ""
"gpg --keyserver keys.gnupg.net --recv 886DDD89\n"
@@ -116,14 +153,14 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian.wml:72
+#: /home/runa/tor/website/docs/en/debian.wml:79
msgid ""
"Now refresh your sources and install Tor by running the following commands "
"(as root) at your command prompt:"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/code/website/docs/en/debian.wml:75
+#: /home/runa/tor/website/docs/en/debian.wml:82
#, no-wrap
msgid ""
"apt-get update\n"
@@ -131,7 +168,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian.wml:87
+#: /home/runa/tor/website/docs/en/debian.wml:94
msgid ""
"The DNS name <code>deb.torproject.org</code> is actually a set of "
"independent servers in a DNS round robin configuration. If you for some "
@@ -141,19 +178,19 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/debian.wml:95
+#: /home/runa/tor/website/docs/en/debian.wml:102
msgid "<hr /> <a id=\"development\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/code/website/docs/en/debian.wml:98
+#: /home/runa/tor/website/docs/en/debian.wml:105
msgid ""
"<a class=\"anchor\" href=\"#development\">Option three: Using the "
"development branch of Tor on Debian or Ubuntu</a>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian.wml:102
+#: /home/runa/tor/website/docs/en/debian.wml:109
msgid ""
"If you want to use the <a href=\"<page download>#packagediff\">development "
"branch</a> of Tor instead (more features and more bugs), you need to add a "
@@ -161,7 +198,7 @@
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/code/website/docs/en/debian.wml:107
+#: /home/runa/tor/website/docs/en/debian.wml:114
#, no-wrap
msgid ""
"deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n"
@@ -169,19 +206,19 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian.wml:110
+#: /home/runa/tor/website/docs/en/debian.wml:117
msgid ""
"where you again substitute the name of your distro (etch, lenny, sid, lucid, "
"karmic, jaunty, intrepid, hardy) in place of <DISTRIBUTION>."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian.wml:116
+#: /home/runa/tor/website/docs/en/debian.wml:123
msgid "Then run the following commands at your command prompt:"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/code/website/docs/en/debian.wml:118
+#: /home/runa/tor/website/docs/en/debian.wml:125
#, no-wrap
msgid ""
"gpg --keyserver keys.gnupg.net --recv 886DDD89\n"
@@ -191,17 +228,17 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/debian.wml:131
+#: /home/runa/tor/website/docs/en/debian.wml:138
msgid "<hr /> <a id=\"source\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/code/website/docs/en/debian.wml:134
+#: /home/runa/tor/website/docs/en/debian.wml:141
msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian.wml:138
+#: /home/runa/tor/website/docs/en/debian.wml:145
msgid ""
"If you want to build your own debs from source you must first add an "
"appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>."
@@ -210,7 +247,7 @@
#. PO4ASHARPBEGIN For the stable version.PO4ASHARPEND
#. PO4ASHARPBEGIN For the unstable version.PO4ASHARPEND
#. type: Content of: <div><div><p><pre>
-#: /home/runa/code/website/docs/en/debian.wml:141
+#: /home/runa/tor/website/docs/en/debian.wml:148
#, no-wrap
msgid ""
"\n"
@@ -222,14 +259,14 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian.wml:148
+#: /home/runa/tor/website/docs/en/debian.wml:155
msgid ""
"You also need to install the necessary packages to build your own debs and "
"the packages needed to build Tor:"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/code/website/docs/en/debian.wml:151
+#: /home/runa/tor/website/docs/en/debian.wml:158
#, no-wrap
msgid ""
"apt-get install build-essential fakeroot devscripts\n"
@@ -237,12 +274,12 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian.wml:154
+#: /home/runa/tor/website/docs/en/debian.wml:161
msgid "Then you can build Tor in ~/debian-packages:"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/code/website/docs/en/debian.wml:156
+#: /home/runa/tor/website/docs/en/debian.wml:163
#, no-wrap
msgid ""
"mkdir ~/debian-packages; cd ~/debian-packages\n"
@@ -253,23 +290,23 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian.wml:162
+#: /home/runa/tor/website/docs/en/debian.wml:169
msgid "Now you can install the new package:"
msgstr ""
#. type: Content of: <div><div><p><pre>
-#: /home/runa/code/website/docs/en/debian.wml:164
+#: /home/runa/tor/website/docs/en/debian.wml:171
#, no-wrap
msgid "sudo dpkg -i tor_*.deb\n"
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/debian.wml:174
+#: /home/runa/tor/website/docs/en/debian.wml:181
msgid "<hr />"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/debian.wml:176
+#: /home/runa/tor/website/docs/en/debian.wml:183
msgid ""
"If you have suggestions for improving this document, please <a href=\"<page "
"contact>\">send them to us</a>. Thanks!"
Modified: translation/trunk/projects/website/po/templates/docs/3-low.tor-doc-unix.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/3-low.tor-doc-unix.pot 2010-10-09 12:46:21 UTC (rev 23482)
+++ translation/trunk/projects/website/po/templates/docs/3-low.tor-doc-unix.pot 2010-10-09 12:48:34 UTC (rev 23483)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-10-09 13:47+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,19 +17,19 @@
"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <div><div><h1>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:11
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:11
msgid "Running the <a href=\"<page index>\">Tor</a> client on Linux/BSD/Unix"
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:12 /tmp/kYur0Tibp0.xml:24
-#: /tmp/kYur0Tibp0.xml:54 /tmp/kYur0Tibp0.xml:88 /tmp/kYur0Tibp0.xml:131
-#: /tmp/kYur0Tibp0.xml:169
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:12 /tmp/weSMLJ2Cmo.xml:24
+#: /tmp/weSMLJ2Cmo.xml:54 /tmp/weSMLJ2Cmo.xml:88 /tmp/weSMLJ2Cmo.xml:131
+#: /tmp/weSMLJ2Cmo.xml:169
msgid "<br />"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:15
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:15
msgid ""
"<b>Note that these are the installation instructions for running a Tor "
"client. If you want to relay traffic for others to help the network grow "
@@ -38,19 +38,19 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:21
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:21
msgid "<hr /> <a id=\"installing\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:23
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:23
msgid ""
"<a class=\"anchor\" href=\"#installing\">Step One: Download and Install Tor</"
"a>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:27
+#: /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, "
@@ -59,7 +59,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:34
+#: /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 "
@@ -71,7 +71,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:45
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:45
msgid ""
"Tor comes configured as a client by default. It uses a built-in default "
"configuration file, and most people won't need to change any of the "
@@ -79,25 +79,25 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:50
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:50
msgid "<hr /> <a id=\"privoxy\"></a> <a id=\"polipo\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:53
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:53
msgid ""
"<a class=\"anchor\" href=\"#polipo\">Step Two: Install Polipo for Web "
"Browsing</a>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:56
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:56
msgid ""
"After installing Tor, you need to configure your applications to use it."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:60
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:60
msgid ""
"The first step is to set up web browsing. Start by installing <a href="
"\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> from your "
@@ -109,19 +109,19 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:70
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:70
msgid ""
"Once you've installed Polipo (either from package or from source), <b>you "
-"will need to configure Polipo to use Tor</b>. Grab our <a href=\"https://svn."
-"torproject.org/svn/torbrowser/trunk/build-scripts/config/polipo.conf"
-"\">Polipo configuration for Tor</a> and put it in place of your current "
-"polipo config file (e.g. /etc/polipo/config or ~/.polipo). You'll need to "
-"restart Polipo for the changes to take effect. For example:<br /> <tt>/etc/"
-"init.d/polipo restart</tt>"
+"will need to configure Polipo to use Tor</b>. Grab our <a href="
+"\"<torbrowserrepo>/build-scripts/config/polipo.conf\">Polipo configuration "
+"for Tor</a> and put it in place of your current polipo config file (e.g. /"
+"etc/polipo/config or ~/.polipo). You'll need to restart Polipo for the "
+"changes to take effect. For example:<br /> <tt>/etc/init.d/polipo restart</"
+"tt>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:80
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:80
msgid ""
"If you prefer, you can instead use Privoxy with <a href=\"https://wiki."
"torproject.org/noreply/TheOnionRouter/PrivoxyConfig\">this sample Privoxy "
@@ -130,26 +130,26 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:85
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:85
msgid "<hr /> <a id=\"using\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:87
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:87
msgid ""
"<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications "
"to use Tor</a>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:90
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:90
msgid ""
"After installing Tor and Polipo, you need to configure your applications to "
"use them. The first step is to set up web browsing."
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:93
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93
msgid ""
"You should use Tor with Firefox and Torbutton, for best safety. Simply "
"install the <a href=\"https://addons.mozilla.org/firefox/2275/\">Torbutton "
@@ -157,14 +157,14 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:99
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99
msgid ""
"<img alt=\"Torbutton plugin for Firefox\" src=\"../img/screenshot-torbutton."
"png\" border=\"1\"> <br />"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:106
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:106
msgid ""
"If you plan to run Firefox on a different computer than Tor, see the <a href="
"\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -173,7 +173,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:112
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:112
msgid ""
"To Torify other applications that support HTTP proxies, just point them at "
"Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
@@ -187,7 +187,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:123
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:123
msgid ""
"For information on how to Torify other applications, check out the <a href="
"\"https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO\">Torify "
@@ -195,12 +195,12 @@
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:128
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:128
msgid "<hr /> <a id=\"verify\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:130
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:130
msgid ""
"<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
msgstr ""
@@ -209,7 +209,7 @@
#. this site</a>PO4ASHARPEND
#. PO4ASHARPBEGINto see what IP address it thinks you're using.PO4ASHARPEND
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:134
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:134
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/"
@@ -220,7 +220,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:146
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146
msgid ""
"If you have a personal firewall that limits your computer's ability to "
"connect to itself (this includes something like SELinux on Fedora Core 4), "
@@ -236,25 +236,25 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:161
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:161
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."
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:165
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165
msgid "<hr /> <a id=\"server\"></a> <a id=\"relay\"></a>"
msgstr ""
#. type: Content of: <div><div><h2>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:168
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:168
msgid ""
"<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:171
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:171
msgid ""
"The Tor network relies on volunteers to donate bandwidth. The more people "
"who run relays, the faster the Tor network will be. If you have at least 20 "
@@ -265,7 +265,7 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:179
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:179
msgid ""
"Having relays in many different places on the Internet is what makes Tor "
"users secure. <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/"
@@ -275,19 +275,19 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:186
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:186
msgid ""
"Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</"
"a> guide."
msgstr ""
#. type: Content of: <div><div>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:189
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:189
msgid "<hr />"
msgstr ""
#. type: Content of: <div><div><p>
-#: /home/runa/code/website/docs/en/tor-doc-unix.wml:191
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:191
msgid ""
"If you have suggestions for improving this document, please <a href=\"<page "
"contact>\">send them to us</a>. Thanks!"
Modified: translation/trunk/projects/website/po/templates/press/3-low.index.pot
===================================================================
--- translation/trunk/projects/website/po/templates/press/3-low.index.pot 2010-10-09 12:46:21 UTC (rev 23482)
+++ translation/trunk/projects/website/po/templates/press/3-low.index.pot 2010-10-09 12:48:34 UTC (rev 23483)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-10-09 13:47+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,79 +17,87 @@
"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <div><h2>
-#: /home/runa/code/website/press/en/index.wml:11
+#: /home/runa/tor/website/press/en/index.wml:11
msgid "Tor Press and Media Information"
msgstr ""
#. type: Content of: <div><div><h3>
-#: /home/runa/code/website/press/en/index.wml:16
+#: /home/runa/tor/website/press/en/index.wml:16
msgid "Press Contact"
msgstr ""
#. type: Content of: <div><div><address>
-#: /home/runa/code/website/press/en/index.wml:18
+#: /home/runa/tor/website/press/en/index.wml:18
msgid "Andrew Lewman execdir at torproject.org +1-781-352-0568"
msgstr ""
#. type: Content of: <div><h3>
-#: /home/runa/code/website/press/en/index.wml:25
+#: /home/runa/tor/website/press/en/index.wml:25
msgid "Press Releases"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/press/en/index.wml:27
+#: /home/runa/tor/website/press/en/index.wml:27
msgid ""
+"16 September 2010. Tor announces an article discussing <a href=\"<page "
+"press/2010-09-16-ten-things-circumvention-tools>\">Ten Things to Look for in "
+"a Circumvention Tool</a>."
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/press/en/index.wml:28
+msgid ""
"25 March 2010. Tor and Printfection launch <a href=\"<page press/2010-03-25-"
"tor-store-press-release>\">The Tor Store</a>."
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/press/en/index.wml:28
+#: /home/runa/tor/website/press/en/index.wml:29
msgid ""
"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/code/website/press/en/index.wml:29
+#: /home/runa/tor/website/press/en/index.wml:30
msgid ""
"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>
-#: /home/runa/code/website/press/en/index.wml:32
+#: /home/runa/tor/website/press/en/index.wml:33
msgid "<br />"
msgstr ""
#. type: Content of: <div><div><h3>
-#: /home/runa/code/website/press/en/index.wml:34
+#: /home/runa/tor/website/press/en/index.wml:35
msgid "Quick links to better understand Tor"
msgstr ""
#. type: Content of: <div><div><ol><li>
-#: /home/runa/code/website/press/en/index.wml:36
+#: /home/runa/tor/website/press/en/index.wml:37
msgid ""
"How is Tor <a href=\"<page faq>#Torisdifferent\">different than other proxy "
"solutions</a>?"
msgstr ""
#. type: Content of: <div><div><ol><li>
-#: /home/runa/code/website/press/en/index.wml:37
+#: /home/runa/tor/website/press/en/index.wml:38
msgid ""
"<a href=\"/press/presskit/2009-General-Online-Anonymity-with-Tor.pdf\">Why "
"Online Privacy and Anonymity</a>?"
msgstr ""
#. type: Content of: <div><div><ol><li>
-#: /home/runa/code/website/press/en/index.wml:38
+#: /home/runa/tor/website/press/en/index.wml:39
msgid ""
"<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>
-#: /home/runa/code/website/press/en/index.wml:39
+#: /home/runa/tor/website/press/en/index.wml:40
msgid ""
"<a href=\"https://blog.torproject.org/blog/circumvention-and-anonymity\">Why "
"anonymity matters for circumvention</a>."
Added: translation/trunk/projects/website/po/templates/press/4-optional.2010-09-16-ten-things-circumvention-tools.pot
===================================================================
--- translation/trunk/projects/website/po/templates/press/4-optional.2010-09-16-ten-things-circumvention-tools.pot (rev 0)
+++ translation/trunk/projects/website/po/templates/press/4-optional.2010-09-16-ten-things-circumvention-tools.pot 2010-10-09 12:48:34 UTC (rev 23483)
@@ -0,0 +1,122 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR The Tor Project, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-10-09 13:47+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <div><h2>
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:11
+msgid "FOR IMMEDIATE RELEASE"
+msgstr ""
+
+#. type: Content of: <div><h2>
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:13
+msgid "<strong>TOR PROJECT RELEASES CIRCUMVENTION TOOL ARTICLE</strong>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:15
+msgid ""
+"<strong>WALPOLE, MA</strong> The Tor Project releases an article about the "
+"<a href=\"/press/presskit/2010-09-16-circumvention-features.pdf\">\"Ten "
+"Things to Look for in a Circumvention Tool\"</a>. As more countries crack "
+"down on Internet use, people around the world are turning to anti-censorship "
+"software that lets them reach blocked websites. Many types of software, also "
+"known as circumvention tools, have been created to answer the threat to "
+"freedom online. These tools provide different features and levels of "
+"security, and it's important for users to understand the tradeoffs."
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:25
+msgid ""
+"This article lays out ten features you should consider when evaluating a "
+"circumvention tool. The goal isn't to advocate for any specific tool, but to "
+"point out what kind of tools are useful for different situations."
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:30
+msgid ""
+"Tor's tools and technologies are already used by millions of people to "
+"protect their activities online. These users include journalists and human "
+"rights workers in politically rigid countries communicating with "
+"whistleblowers and dissidents. Law enforcement officers on Internet sting "
+"operations stay anonymous with Tor, as do people wanting to post socially "
+"sensitive information in chat rooms, like rape or abuse survivors and those "
+"with illnesses. The Tor network also provides protection for people looking "
+"for another layer of privacy from the millions of websites and ISPs bent on "
+"collecting private information and tracking their moves online."
+msgstr ""
+
+#. type: Content of: <div><h2>
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:41
+msgid "ABOUT THE TOR PROJECT"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:43
+msgid ""
+"Based in Walpole, MA, The Tor Project develops free and open-source software "
+"that provides online anonymity to the everyday Internet user. Tor was born "
+"out of a collaboration with the U.S. Naval Research Lab starting in 2001, "
+"and it became an official U.S. 501(c)(3) non-profit in 2006. The Tor Project "
+"now works with many individuals, NGOs, law enforcement agencies, and "
+"businesses globally to help them protect their anonymity online."
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:51
+msgid ""
+"In addition to its efforts developing and maintaining the Tor anonymity "
+"software and the Tor network, The Tor Project also helps to lead the "
+"research community in understanding how to build and measure scalable and "
+"secure anonymity networks. The Tor developers publish several new research "
+"papers each year in major academic security conferences, and just about "
+"every major security conference these days includes a Tor-related paper. "
+"Tor is a project-funded organization with a staff of 15."
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:59
+msgid ""
+"The \"Onion Logo\" and \"Tor\" wordmark are registered trademarks of The Tor "
+"Project, Inc."
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:62
+msgid "Contact: Andrew Lewman"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:63
+msgid "Tel: +1-781-424-9877"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:64
+msgid "Email: execdir at torproject.org"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:65
+msgid "<a href=\"https://www.torproject.org/\">Website: Tor Project</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/press/en/2010-09-16-ten-things-circumvention-tools.wml:66
+msgid "###"
+msgstr ""
Modified: translation/trunk/projects/website/po/templates/torbrowser/1-high.index.pot
===================================================================
--- translation/trunk/projects/website/po/templates/torbrowser/1-high.index.pot 2010-10-09 12:46:21 UTC (rev 23482)
+++ translation/trunk/projects/website/po/templates/torbrowser/1-high.index.pot 2010-10-09 12:48:34 UTC (rev 23483)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-10-09 13:47+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,17 +17,17 @@
"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <div><h2>
-#: /home/runa/code/website/torbrowser/en/index.wml:11
+#: /home/runa/tor/website/torbrowser/en/index.wml:11
msgid "Tor Browser Bundle"
msgstr ""
#. type: Content of: <div>
-#: /home/runa/code/website/torbrowser/en/index.wml:12
+#: /home/runa/tor/website/torbrowser/en/index.wml:12
msgid "<hr/>"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:14
+#: /home/runa/tor/website/torbrowser/en/index.wml:14
msgid ""
"The <strong>Tor</strong> software protects you by bouncing your "
"communications around a distributed network of relays run by volunteers all "
@@ -38,40 +38,40 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:21
+#: /home/runa/tor/website/torbrowser/en/index.wml:21
msgid ""
-"The <strong>Tor Browser Bundle</strong> lets you use Tor on Windows or Linux "
-"without needing to install any software. It can run off a USB flash drive, "
-"comes 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>."
+"The <strong>Tor Browser Bundle</strong> lets you use Tor on Windows, Linux, "
+"or Mac OS X without needing to install any software. It can run off a USB "
+"flash drive, comes 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>."
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:33
+#: /home/runa/tor/website/torbrowser/en/index.wml:32
msgid ""
-"Freedom House has produced a video on how to find and use the Tor Browser "
+"Freedom4Internet has produced a video on how to find and use the Tor Browser "
"Bundle. If you don't see a video below, view it at <a href=\"http://www."
"youtube.com/thetorproject\">Youtube </a>. Know of a better video or one "
"translated into your language? Let us know!"
msgstr ""
#. type: Content of: <div>
-#: /home/runa/code/website/torbrowser/en/index.wml:43
+#: /home/runa/tor/website/torbrowser/en/index.wml:42
msgid "<a id=\"Download\"></a>"
msgstr ""
#. type: Content of: <div><h3>
-#: /home/runa/code/website/torbrowser/en/index.wml:44
+#: /home/runa/tor/website/torbrowser/en/index.wml:43
msgid ""
"<a class=\"anchor\" href=\"#Download\">Download Tor Browser Bundle and Tor "
"IM Browser Bundle</a>"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:46
+#: /home/runa/tor/website/torbrowser/en/index.wml:45
msgid ""
"To start using the Tor Browser Bundle or Tor IM Browser Bundle, download the "
"file for your preferred language. This file can be saved wherever is "
@@ -79,7 +79,7 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:50
+#: /home/runa/tor/website/torbrowser/en/index.wml:49
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>"
@@ -87,14 +87,14 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:52
+#: /home/runa/tor/website/torbrowser/en/index.wml:51
msgid ""
"Tor Browser Bundle for Windows with Firefox (version <version-"
"torbrowserbundle>, 16 MB)"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:56
+#: /home/runa/tor/website/torbrowser/en/index.wml:55
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."
@@ -102,7 +102,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:58
+#: /home/runa/tor/website/torbrowser/en/index.wml:57
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_ar.exe\">ا"
"لعربية (ar)</a> (<a href=\"dist/"
@@ -111,7 +111,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:60
+#: /home/runa/tor/website/torbrowser/en/index.wml:59
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_de.exe\">Deutsch (de)</"
"a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_de.exe.asc\" style="
@@ -119,7 +119,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:62
+#: /home/runa/tor/website/torbrowser/en/index.wml:61
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_es-ES.exe\">E"
"spañol (es-ES)</a> (<a href=\"dist/"
@@ -128,7 +128,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:64
+#: /home/runa/tor/website/torbrowser/en/index.wml:63
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_fa.exe\">ف"
"ارسی (fa)</a> (<a href=\"dist/tor-browser-"
@@ -137,7 +137,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:66
+#: /home/runa/tor/website/torbrowser/en/index.wml:65
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_fr.exe\">F"
"rançais (fr)</a> (<a href="
@@ -146,7 +146,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:68
+#: /home/runa/tor/website/torbrowser/en/index.wml:67
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_it.exe\">Italiano (it)"
"</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_it.exe.asc\" "
@@ -154,7 +154,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:70
+#: /home/runa/tor/website/torbrowser/en/index.wml:69
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_nl.exe\">Nederlands "
"(nl)</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_nl.exe.asc\" "
@@ -162,7 +162,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:72
+#: /home/runa/tor/website/torbrowser/en/index.wml:71
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_pl.exe\">Polish (pl)</"
"a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_pl.exe.asc\" style="
@@ -170,7 +170,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:74
+#: /home/runa/tor/website/torbrowser/en/index.wml:73
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_pt-PT.exe\">P"
"ortuguês (pt-PT)</a> "
@@ -179,7 +179,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:76
+#: /home/runa/tor/website/torbrowser/en/index.wml:75
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_ru.exe\">Р"
"усский (ru)</a> (<a href=\"dist/"
@@ -188,7 +188,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:78
+#: /home/runa/tor/website/torbrowser/en/index.wml:77
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_vi.exe\">Vietnamese "
"(vi)</a> (<a href=\"dist/tor-browser-<version-torbrowserbundle>_vi.exe.asc\" "
@@ -196,7 +196,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:80
+#: /home/runa/tor/website/torbrowser/en/index.wml:79
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_zh-CN.exe\">简"
"体字 (zh-CN)</a> (<a href=\"dist/tor-browser-<version-"
@@ -204,14 +204,14 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:84
+#: /home/runa/tor/website/torbrowser/en/index.wml:83
msgid ""
"Tor IM Browser Bundle for Windows with Firefox and Pidgin (version <version-"
"torimbrowserbundle>, 25 MB)"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:88
+#: /home/runa/tor/website/torbrowser/en/index.wml:87
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_en-US.exe"
"\">English (en-US)</a> (<a href=\"dist/tor-im-browser-<version-"
@@ -219,7 +219,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:90
+#: /home/runa/tor/website/torbrowser/en/index.wml:89
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_ar.exe\">ا"
"لعربية (ar)</a> (<a href=\"dist/"
@@ -228,7 +228,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:92
+#: /home/runa/tor/website/torbrowser/en/index.wml:91
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_de.exe\">Deutsch "
"(de)</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_de.exe."
@@ -236,7 +236,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:94
+#: /home/runa/tor/website/torbrowser/en/index.wml:93
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_es-ES.exe"
"\">Español (es-ES)</a> (<a "
@@ -245,7 +245,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:96
+#: /home/runa/tor/website/torbrowser/en/index.wml:95
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_fa.exe\">ف"
"ارسی (fa)</a> (<a href=\"dist/tor-im-browser-"
@@ -254,7 +254,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:98
+#: /home/runa/tor/website/torbrowser/en/index.wml:97
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_fr.exe\">F"
"rançais (fr)</a> (<a href="
@@ -263,7 +263,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:100
+#: /home/runa/tor/website/torbrowser/en/index.wml:99
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_it.exe\">Italiano "
"(it)</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_it.exe."
@@ -271,7 +271,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:102
+#: /home/runa/tor/website/torbrowser/en/index.wml:101
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_nl.exe"
"\">Nederlands (nl)</a> (<a href=\"dist/tor-im-browser-<version-"
@@ -279,7 +279,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:104
+#: /home/runa/tor/website/torbrowser/en/index.wml:103
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_pl.exe\">Polish "
"(pl)</a> (<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_pl.exe."
@@ -287,7 +287,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:106
+#: /home/runa/tor/website/torbrowser/en/index.wml:105
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_pt-PT.exe"
"\">Português "
@@ -296,7 +296,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:108
+#: /home/runa/tor/website/torbrowser/en/index.wml:107
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_ru.exe\">Р"
"усский (ru)</a> (<a href=\"dist/"
@@ -305,7 +305,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:110
+#: /home/runa/tor/website/torbrowser/en/index.wml:109
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_vi.exe"
"\">Vietnamese (vi)</a> (<a href=\"dist/tor-im-browser-<version-"
@@ -313,7 +313,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:112
+#: /home/runa/tor/website/torbrowser/en/index.wml:111
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_zh-CN.exe"
"\">简体字 (zh-CN)</a> (<a href=\"dist/tor-im-browser-"
@@ -322,14 +322,14 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:116
+#: /home/runa/tor/website/torbrowser/en/index.wml:115
msgid ""
"BETA: Tor Browser Bundle for Linux with Firefox (version <version-"
"torbrowserbundlelinux>, 22 MB)"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:119
+#: /home/runa/tor/website/torbrowser/en/index.wml:118
msgid ""
"English (en-US): <a href=\"dist/linux/tor-browser-gnu-linux-i686-<version-"
"torbrowserbundlelinux>-dev-en-US.tar.gz\">i386</a> (<a href=\"dist/linux/tor-"
@@ -342,7 +342,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:121
+#: /home/runa/tor/website/torbrowser/en/index.wml:120
msgid ""
"العربية (ar): <a href="
"\"dist/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-"
@@ -355,7 +355,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:123
+#: /home/runa/tor/website/torbrowser/en/index.wml:122
msgid ""
"Deutsch (de): <a href=\"dist/linux/tor-browser-gnu-linux-i686-<version-"
"torbrowserbundlelinux>-dev-de.tar.gz\">i386</a> (<a href=\"dist/linux/tor-"
@@ -367,7 +367,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:125
+#: /home/runa/tor/website/torbrowser/en/index.wml:124
msgid ""
"Español (es-ES): <a href="
"\"dist/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-"
@@ -380,7 +380,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:127
+#: /home/runa/tor/website/torbrowser/en/index.wml:126
msgid ""
"فارسی (fa): <a href=\"dist/linux/tor-"
"browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-fa.tar.gz\">i386</"
@@ -393,7 +393,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:129
+#: /home/runa/tor/website/torbrowser/en/index.wml:128
msgid ""
"Français (fr): <a "
"href=\"dist/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-"
@@ -406,7 +406,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:131
+#: /home/runa/tor/website/torbrowser/en/index.wml:130
msgid ""
"Italiano (it): <a href=\"dist/linux/tor-browser-gnu-linux-i686-<version-"
"torbrowserbundlelinux>-dev-it.tar.gz\">i386</a> (<a href=\"dist/linux/tor-"
@@ -418,7 +418,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:133
+#: /home/runa/tor/website/torbrowser/en/index.wml:132
msgid ""
"Nederlands (nl): <a href=\"dist/linux/tor-browser-gnu-linux-i686-<version-"
"torbrowserbundlelinux>-dev-nl.tar.gz\">i386</a> (<a href=\"dist/linux/tor-"
@@ -430,7 +430,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:135
+#: /home/runa/tor/website/torbrowser/en/index.wml:134
msgid ""
"Polish (pl): <a href=\"dist/linux/tor-browser-gnu-linux-i686-<version-"
"torbrowserbundlelinux>-dev-pl.tar.gz\">i386</a> (<a href=\"dist/linux/tor-"
@@ -442,7 +442,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:137
+#: /home/runa/tor/website/torbrowser/en/index.wml:136
msgid ""
"Português (pt-"
"PT): <a href=\"dist/linux/tor-browser-gnu-linux-i686-<version-"
@@ -456,7 +456,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:139
+#: /home/runa/tor/website/torbrowser/en/index.wml:138
msgid ""
"Русский (ru): <a href="
"\"dist/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-"
@@ -469,7 +469,7 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/index.wml:141
+#: /home/runa/tor/website/torbrowser/en/index.wml:140
msgid ""
"简体字 (zh-CN): <a href=\"dist/linux/tor-browser-gnu-linux-"
"i686-<version-torbrowserbundlelinux>-dev-zh-CN.tar.gz\">i386</a> (<a href="
@@ -482,29 +482,145 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:147
+#: /home/runa/tor/website/torbrowser/en/index.wml:144
msgid ""
+"BETA: Tor Browser Bundle for i386 Mac OS X with Firefox/Namoroka (custom-"
+"built Firefox) (version <version-torbrowserbundleosx>, 26 MB)"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/torbrowser/en/index.wml:147
+msgid ""
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-"
+"US.zip\">English (en-US)</a> (<a href=\"dist/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/torbrowser/en/index.wml:149
+msgid ""
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar."
+"zip\">العربية (ar)</a> (<a "
+"href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar.zip."
+"asc\" style=\"font-size: 90%;\">signature</a>)"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/torbrowser/en/index.wml:151
+msgid ""
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-de."
+"zip\">Deutsch (de)</a> (<a href=\"dist/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-de.zip.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/torbrowser/en/index.wml:153
+msgid ""
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-es-"
+"ES.zip\">Español (es-ES)</"
+"a> (<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-"
+"es-ES.zip.asc\" style=\"font-size: 90%;\">signature</a>)"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/torbrowser/en/index.wml:155
+msgid ""
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa."
+"zip\">فارسی (fa) </a> (<a href=\"dist/osx/"
+"TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa.zip.asc\" style="
+"\"font-size: 90%;\">signature</a>)"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/torbrowser/en/index.wml:157
+msgid ""
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr."
+"zip\">Français (fr)</"
+"a> (<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-"
+"fr.zip.asc\" style=\"font-size: 90%;\">signature</a>)"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/torbrowser/en/index.wml:159
+msgid ""
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-it."
+"zip\">Italiano (it)</a> (<a href=\"dist/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-it.zip.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/torbrowser/en/index.wml:161
+msgid ""
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-nl."
+"zip\">Nederlands (nl)</a> (<a href=\"dist/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-nl.zip.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/torbrowser/en/index.wml:163
+msgid ""
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pl."
+"zip\">Polish (pl)</a> (<a href=\"dist/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-pl.zip.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/torbrowser/en/index.wml:165
+msgid ""
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-"
+"PT.zip\">Portuguê"
+"s (pt-PT)</a> (<a href=\"dist/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-pt-PT.zip.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/torbrowser/en/index.wml:167
+msgid ""
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru."
+"zip\">Русский (ru)</a> (<a "
+"href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru.zip."
+"asc\" style=\"font-size: 90%;\">signature</a>)"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#: /home/runa/tor/website/torbrowser/en/index.wml:169
+msgid ""
+"<a href=\"dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-zh-"
+"CN.zip\">简体字 (zh-CN)</a> (<a href=\"dist/osx/TorBrowser-"
+"<version-torbrowserbundleosx>-dev-osx-i386-zh-CN.zip.asc\" style=\"font-"
+"size: 90%;\">signature</a>)"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/torbrowser/en/index.wml:175
+msgid ""
"See our instructions on <a href=\"<page verifying-signatures>\">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 bundles 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."
+"our bundles is <a href=\"<torbrowserrepo>/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>
-#: /home/runa/code/website/torbrowser/en/index.wml:157
+#: /home/runa/tor/website/torbrowser/en/index.wml:185
msgid "<a id=\"Linux\"></a>"
msgstr ""
#. type: Content of: <div><h3>
-#: /home/runa/code/website/torbrowser/en/index.wml:158
+#: /home/runa/tor/website/torbrowser/en/index.wml:186
msgid "<a class=\"anchor\" href=\"#Linux\">Linux instructions</a>"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:159
+#: /home/runa/tor/website/torbrowser/en/index.wml:187
msgid ""
"Download the architecture-appropriate file above, save it somewhere, then "
"run:<br /> tar -xvzf tor-browser-gnu-linux-<version-torbrowserbundlelinux>-"
@@ -515,17 +631,36 @@
msgstr ""
#. type: Content of: <div>
-#: /home/runa/code/website/torbrowser/en/index.wml:167
+#: /home/runa/tor/website/torbrowser/en/index.wml:195
+msgid "<a id=\"Mac OS X\"></a>"
+msgstr ""
+
+#. type: Content of: <div><h3>
+#: /home/runa/tor/website/torbrowser/en/index.wml:196
+msgid "<a class=\"anchor\" href=\"#Linux\">Mac OS X instructions</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#: /home/runa/tor/website/torbrowser/en/index.wml:197
+msgid ""
+"Download the file above, save it somewhere, then click on it. Mac OS X will "
+"automatically unarchive it and you will have a TorBrowser application in "
+"your chosen language (for example, TorBrowser_en-US.app). Click the file to "
+"launch Vidalia. Once Vidalia connects to Tor, it will launch Firefox."
+msgstr ""
+
+#. type: Content of: <div>
+#: /home/runa/tor/website/torbrowser/en/index.wml:202
msgid "<a id=\"Extraction\"></a>"
msgstr ""
#. type: Content of: <div><h3>
-#: /home/runa/code/website/torbrowser/en/index.wml:168
+#: /home/runa/tor/website/torbrowser/en/index.wml:203
msgid "<a class=\"anchor\" href=\"#Extraction\">Extraction</a>"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:170
+#: /home/runa/tor/website/torbrowser/en/index.wml:205
msgid ""
"Download the file above, and save it somewhere, then double click on it. "
"Click on the button labelled <strong>\"...\"</strong> (1) and select where "
@@ -537,55 +672,55 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:178
+#: /home/runa/tor/website/torbrowser/en/index.wml:213
msgid ""
"Click <strong>Extract</strong> (3) to begin extraction. This may take a few "
"minutes to complete."
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:181
+#: /home/runa/tor/website/torbrowser/en/index.wml:216
msgid ""
"<img src=\"img/screenshot1.png\" alt=\"Screenshot of extraction process\" />"
msgstr ""
#. type: Content of: <div>
-#: /home/runa/code/website/torbrowser/en/index.wml:183
+#: /home/runa/tor/website/torbrowser/en/index.wml:218
msgid "<a id=\"Usage\"></a>"
msgstr ""
#. type: Content of: <div><h3>
-#: /home/runa/code/website/torbrowser/en/index.wml:184
+#: /home/runa/tor/website/torbrowser/en/index.wml:219
msgid "<a class=\"anchor\" href=\"#Usage\">Usage</a>"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:186
+#: /home/runa/tor/website/torbrowser/en/index.wml:221
msgid ""
"Once extraction is complete, open the folder <strong>Tor Browser</strong> "
"from the location you saved the bundle."
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:188
+#: /home/runa/tor/website/torbrowser/en/index.wml:223
msgid ""
"Double click on the <strong>Start Tor Browser</strong> (4) application (it "
"may be called <strong>Start Tor Browser.exe</strong> on some systems.)"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:191
+#: /home/runa/tor/website/torbrowser/en/index.wml:226
msgid "The Vidalia window will shortly appear."
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:193
+#: /home/runa/tor/website/torbrowser/en/index.wml:228
msgid ""
"<img src=\"img/screenshot2.png\" alt=\"Screenshot of bundle startup\" />"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:195
+#: /home/runa/tor/website/torbrowser/en/index.wml:230
msgid ""
"Once Tor is ready, Firefox will automatically be opened. Only web pages "
"visited through the included Firefox browser will be sent via Tor. Other web "
@@ -597,14 +732,14 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:202
+#: /home/runa/tor/website/torbrowser/en/index.wml:237
msgid ""
"If you installed the Tor IM Browser Bundle, the Pidgin instant messaging "
"client will also be automatically opened."
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:204
+#: /home/runa/tor/website/torbrowser/en/index.wml:239
msgid ""
"Once you are finished browsing, close any open Firefox windows by clicking "
"on the <img src=\"img/close-button.png\" alt=\"Close button (×)\" /> "
@@ -613,12 +748,12 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:209
+#: /home/runa/tor/website/torbrowser/en/index.wml:244
msgid "<img src=\"img/screenshot3a.png\" alt=\"Screenshot of Firefox\" />"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:211
+#: /home/runa/tor/website/torbrowser/en/index.wml:246
msgid ""
"With the Tor Browser Bundle, Vidalia and Tor will automatically close. With "
"the Tor IM Browser Bundle you need to also close Pidgin by right-clicking on "
@@ -626,19 +761,19 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:213
+#: /home/runa/tor/website/torbrowser/en/index.wml:248
msgid "<img src=\"img/screenshot3b.png\" alt=\"Screenshot of Pidgin\" />"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:215
+#: /home/runa/tor/website/torbrowser/en/index.wml:250
msgid ""
"To use the Tor Browser Bundle or Tor IM Browser Bundle again, repeat the "
"steps in <a href=\"#Usage\">\"Usage\"</a>."
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:217
+#: /home/runa/tor/website/torbrowser/en/index.wml:252
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/"
@@ -650,17 +785,17 @@
msgstr ""
#. type: Content of: <div>
-#: /home/runa/code/website/torbrowser/en/index.wml:226
+#: /home/runa/tor/website/torbrowser/en/index.wml:261
msgid "<a id=\"Feedback\"></a>"
msgstr ""
#. type: Content of: <div><h3>
-#: /home/runa/code/website/torbrowser/en/index.wml:227
+#: /home/runa/tor/website/torbrowser/en/index.wml:262
msgid "<a class=\"anchor\" href=\"#Feedback\">Comments and suggestions</a>"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:229
+#: /home/runa/tor/website/torbrowser/en/index.wml:264
msgid ""
"The Tor Browser Bundle is under development and not yet complete. To "
"discuss improvements and submit comments, please use the <a href=\"http://"
@@ -668,24 +803,24 @@
msgstr ""
#. type: Content of: <div>
-#: /home/runa/code/website/torbrowser/en/index.wml:233
+#: /home/runa/tor/website/torbrowser/en/index.wml:268
msgid "<a id=\"More\"></a>"
msgstr ""
#. type: Content of: <div><h3>
-#: /home/runa/code/website/torbrowser/en/index.wml:234
+#: /home/runa/tor/website/torbrowser/en/index.wml:269
msgid "<a class=\"anchor\" href=\"#More\">More information</a>"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:236
+#: /home/runa/tor/website/torbrowser/en/index.wml:271
msgid ""
"<strong>What is Tor and why do I need it?</strong> To learn more about Tor, "
"visit the <a href=\"<page index>\">Tor Project website</a>."
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:240
+#: /home/runa/tor/website/torbrowser/en/index.wml:275
msgid ""
"<strong>What is in the Tor Browser Bundle?</strong> It contains Tor, "
"Vidalia, Polipo, Firefox, and Torbutton (<a href=\"<page torbrowser/"
@@ -693,7 +828,7 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:244
+#: /home/runa/tor/website/torbrowser/en/index.wml:279
msgid ""
"<strong>What is in the Tor IM Browser Bundle?</strong> It contains Tor, "
"Vidalia, Polipo, Firefox, Torbutton, Pidgin and OTR (<a href=\"<page "
@@ -701,7 +836,7 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:248
+#: /home/runa/tor/website/torbrowser/en/index.wml:283
msgid ""
"<strong>How can I make my own bundle?</strong> To download the source code "
"and learn how to build the bundle yourself, read the <a href=\"<page "
@@ -709,7 +844,7 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/index.wml:252
+#: /home/runa/tor/website/torbrowser/en/index.wml:287
msgid ""
"Tor Browser Bundle is partially based on <a href=\"http://portableapps.com/"
"apps/internet/firefox_portable\">Mozilla Firefox, Portable Edition</a> and "
Modified: translation/trunk/projects/website/po/templates/torbrowser/1-high.split.pot
===================================================================
--- translation/trunk/projects/website/po/templates/torbrowser/1-high.split.pot 2010-10-09 12:46:21 UTC (rev 23482)
+++ translation/trunk/projects/website/po/templates/torbrowser/1-high.split.pot 2010-10-09 12:48:34 UTC (rev 23483)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-10-09 13:47+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,24 +17,24 @@
"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <div><h2>
-#: /home/runa/code/website/torbrowser/en/split.wml:11
+#: /home/runa/tor/website/torbrowser/en/split.wml:11
msgid "Tor Browser Bundle (split edition)"
msgstr ""
#. type: Content of: <div>
-#: /home/runa/code/website/torbrowser/en/split.wml:12
+#: /home/runa/tor/website/torbrowser/en/split.wml:12
msgid "<hr>"
msgstr ""
#. type: Content of: <div><h3>
-#: /home/runa/code/website/torbrowser/en/split.wml:14
+#: /home/runa/tor/website/torbrowser/en/split.wml:14
msgid ""
"<a class=\"anchor\" href=\"#Download\">Download Tor Browser Bundle and Tor "
"IM Browser Bundle</a>"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/split.wml:16
+#: /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. "
@@ -43,7 +43,7 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/split.wml:18
+#: /home/runa/tor/website/torbrowser/en/split.wml:18
msgid ""
"Choose the language you would like, and whether you also need the Pidgin "
"instant messaging client, then click on the link corresponding to your "
@@ -55,154 +55,154 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/split.wml:27
+#: /home/runa/tor/website/torbrowser/en/split.wml:27
msgid ""
"Tor Browser Bundle for Windows with Firefox (version <version-"
"torbrowserbundle>, split edition, 15 MB total)"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/split.wml:31
+#: /home/runa/tor/website/torbrowser/en/split.wml:31
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_en-US_split\">English "
"(en-US)</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/split.wml:33
+#: /home/runa/tor/website/torbrowser/en/split.wml:33
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_ar_split\">ا"
"لعربية (ar)</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/split.wml:35
+#: /home/runa/tor/website/torbrowser/en/split.wml:35
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_de_split\">Deutsch (de)"
"</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/split.wml:37
+#: /home/runa/tor/website/torbrowser/en/split.wml:37
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_es-ES_split\">E"
"spañol (es-ES)</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/split.wml:39
+#: /home/runa/tor/website/torbrowser/en/split.wml:39
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_fa_split\">ف"
"ارسی (fa)</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/split.wml:41
+#: /home/runa/tor/website/torbrowser/en/split.wml:41
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_fr_split\">F"
"rançais (fr)</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/split.wml:43
+#: /home/runa/tor/website/torbrowser/en/split.wml:43
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_it_split\">Italiano "
"(it)</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/split.wml:45
+#: /home/runa/tor/website/torbrowser/en/split.wml:45
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_nl_split\">Nederlands "
"(nl)</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/split.wml:47
+#: /home/runa/tor/website/torbrowser/en/split.wml:47
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_pt-PT_split\">P"
"ortuguês (pt-PT)</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/split.wml:49
+#: /home/runa/tor/website/torbrowser/en/split.wml:49
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_ru_split\">Р"
"усский (ru)</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/split.wml:51
+#: /home/runa/tor/website/torbrowser/en/split.wml:51
msgid ""
"<a href=\"dist/tor-browser-<version-torbrowserbundle>_zh-CN_split\">简"
"体字 (zh-CN)</a>"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/split.wml:55
+#: /home/runa/tor/website/torbrowser/en/split.wml:55
msgid ""
"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/code/website/torbrowser/en/split.wml:59
+#: /home/runa/tor/website/torbrowser/en/split.wml:59
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_en-US_split"
"\">English (en-US)</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/split.wml:61
+#: /home/runa/tor/website/torbrowser/en/split.wml:61
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_ar_split"
"\">العربية (ar)</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/split.wml:63
+#: /home/runa/tor/website/torbrowser/en/split.wml:63
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_de_split"
"\">Deutsch (de)</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/split.wml:65
+#: /home/runa/tor/website/torbrowser/en/split.wml:65
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_es-ES_split"
"\">Español (es-ES)</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/split.wml:67
+#: /home/runa/tor/website/torbrowser/en/split.wml:67
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_fa_split"
"\">فارسی (fa)</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/split.wml:69
+#: /home/runa/tor/website/torbrowser/en/split.wml:69
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_fr_split"
"\">Français (fr)</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/split.wml:71
+#: /home/runa/tor/website/torbrowser/en/split.wml:71
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_it_split"
"\">Italiano (it)</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/split.wml:73
+#: /home/runa/tor/website/torbrowser/en/split.wml:73
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_nl_split"
"\">Nederlands (nl)</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/split.wml:75
+#: /home/runa/tor/website/torbrowser/en/split.wml:75
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_pt-PT_split"
"\">Português "
@@ -210,55 +210,54 @@
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/split.wml:77
+#: /home/runa/tor/website/torbrowser/en/split.wml:77
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_ru_split"
"\">Русский (ru)</a>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/split.wml:79
+#: /home/runa/tor/website/torbrowser/en/split.wml:79
msgid ""
"<a href=\"dist/tor-im-browser-<version-torimbrowserbundle>_zh-CN_split"
"\">简体字 (zh-CN)</a>"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/split.wml:84
+#: /home/runa/tor/website/torbrowser/en/split.wml:84
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=\"<torbrowserrepo>/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>
-#: /home/runa/code/website/torbrowser/en/split.wml:91
+#: /home/runa/tor/website/torbrowser/en/split.wml:91
msgid "<a id=\"Extraction\"></a>"
msgstr ""
#. type: Content of: <div><h3>
-#: /home/runa/code/website/torbrowser/en/split.wml:92
+#: /home/runa/tor/website/torbrowser/en/split.wml:92
msgid "<a class=\"anchor\" href=\"#Extraction\">Extraction</a>"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/split.wml:94
+#: /home/runa/tor/website/torbrowser/en/split.wml:94
msgid ""
"After you have downloaded all the files above, double click on the file with "
"the icon of a box (1)."
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/split.wml:96
+#: /home/runa/tor/website/torbrowser/en/split.wml:96
msgid ""
"<img src=\"img/split-screenshot1.png\" alt=\"Screenshot of starting "
"extraction process\" />"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/split.wml:98
+#: /home/runa/tor/website/torbrowser/en/split.wml:98
msgid ""
"Click on the button labelled <strong>Browse...</strong> (2) and select where "
"you want to save the bundle then click <strong>OK</strong> (3). At least "
@@ -269,21 +268,21 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/split.wml:105
+#: /home/runa/tor/website/torbrowser/en/split.wml:105
msgid ""
"Click <strong>Install</strong> (4) to begin extraction. This may take a few "
"minutes to complete."
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/split.wml:108
+#: /home/runa/tor/website/torbrowser/en/split.wml:108
msgid ""
"<img src=\"img/split-screenshot2.png\" alt=\"Screenshot of extraction process"
"\" />"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/split.wml:110
+#: /home/runa/tor/website/torbrowser/en/split.wml:110
msgid ""
"Once the extraction has completed, see the <a href=\"<page torbrowser/"
"index>#Usage\">usage instructions</a> for how to start Tor."
Modified: translation/trunk/projects/website/po/templates/torbrowser/4-optional.details.pot
===================================================================
--- translation/trunk/projects/website/po/templates/torbrowser/4-optional.details.pot 2010-10-09 12:46:21 UTC (rev 23482)
+++ translation/trunk/projects/website/po/templates/torbrowser/4-optional.details.pot 2010-10-09 12:48:34 UTC (rev 23483)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-10-09 13:47+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,62 +17,61 @@
"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <div><h2>
-#: /home/runa/code/website/torbrowser/en/details.wml:11
+#: /home/runa/tor/website/torbrowser/en/details.wml:11
msgid "Tor Browser Bundle: Details"
msgstr ""
#. type: Content of: <div>
-#: /home/runa/code/website/torbrowser/en/details.wml:12
+#: /home/runa/tor/website/torbrowser/en/details.wml:12
msgid "<hr>"
msgstr ""
#. type: Content of: <div><h3>
-#: /home/runa/code/website/torbrowser/en/details.wml:14
+#: /home/runa/tor/website/torbrowser/en/details.wml:14
msgid "Bundle contents"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/details.wml:17
+#: /home/runa/tor/website/torbrowser/en/details.wml:17
msgid "Vidalia <version-torbrowser-vidalia>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/details.wml:18
+#: /home/runa/tor/website/torbrowser/en/details.wml:18
msgid "Tor <version-torbrowser-tor> (with <version-torbrowser-tor-components>)"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/details.wml:19
+#: /home/runa/tor/website/torbrowser/en/details.wml:19
msgid ""
"FirefoxPortable <version-torbrowser-firefox> (includes Firefox <version-"
"torbrowser-firefox> and Torbutton <version-torbrowser-torbutton>)"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/details.wml:21
+#: /home/runa/tor/website/torbrowser/en/details.wml:21
msgid "Polipo <version-torbrowser-polipo>"
msgstr ""
#. type: Content of: <div><ul><li>
-#: /home/runa/code/website/torbrowser/en/details.wml:22
+#: /home/runa/tor/website/torbrowser/en/details.wml:22
msgid ""
"Pidgin <version-torbrowser-pidgin> and OTR <version-torbrowser-otr> (only in "
"Tor IM Browser Bundle)"
msgstr ""
#. type: Content of: <div><h3>
-#: /home/runa/code/website/torbrowser/en/details.wml:25
+#: /home/runa/tor/website/torbrowser/en/details.wml:25
msgid "Building the bundle"
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbrowser/en/details.wml:27
+#: /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 "
-"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>."
+"href=\"<torbrowserrepo>/README\">README</a> for the directory layout and "
+"changelog. Build instructions can be found in <a href=\"<torbrowserrepo>/"
+"build-scripts/INSTALL\">build-scripts/INSTALL</a>."
msgstr ""
Modified: translation/trunk/projects/website/po/templates/torbutton/3-low.index.pot
===================================================================
--- translation/trunk/projects/website/po/templates/torbutton/3-low.index.pot 2010-10-09 12:46:21 UTC (rev 23482)
+++ translation/trunk/projects/website/po/templates/torbutton/3-low.index.pot 2010-10-09 12:48:34 UTC (rev 23483)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-15 17:57+0200\n"
+"POT-Creation-Date: 2010-10-09 13:47+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,22 +17,22 @@
"Content-Transfer-Encoding: 8bit\n"
#. type: Attribute 'title' of: <div><link>
-#: /home/runa/code/website/torbutton/en/index.wml:11
+#: /home/runa/tor/website/torbutton/en/index.wml:11
msgid "Google Canada"
msgstr ""
#. type: Attribute 'title' of: <div><link>
-#: /home/runa/code/website/torbutton/en/index.wml:12
+#: /home/runa/tor/website/torbutton/en/index.wml:12
msgid "Google UK"
msgstr ""
#. type: Attribute 'title' of: <div><link>
-#: /home/runa/code/website/torbutton/en/index.wml:13
+#: /home/runa/tor/website/torbutton/en/index.wml:13
msgid "Google USA"
msgstr ""
#. type: Content of: <div><script>
-#: /home/runa/code/website/torbutton/en/index.wml:16
+#: /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\"); "
@@ -66,20 +66,24 @@
msgstr ""
#. type: Content of: <div><h2>
-#: /home/runa/code/website/torbutton/en/index.wml:83
+#: /home/runa/tor/website/torbutton/en/index.wml:83
msgid "Torbutton"
msgstr ""
#. type: Content of: <div>
-#: /home/runa/code/website/torbutton/en/index.wml:84
+#: /home/runa/tor/website/torbutton/en/index.wml:84
msgid ""
-"<hr /> <strong>Current version:</strong><version-torbutton><br/> <br/> "
+"<hr /> <strong>Current stable version:</strong><version-torbutton><br/> "
+"<strong>Current alpha version:</strong><version-torbutton-alpha><br/> <br/> "
"<strong>Authors:</strong> Mike Perry & 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="
+"<strong>Install Stable:</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>Install Alpha:</strong> Click to <a href=\"http://www.torproject.org/"
+"torbutton/torbutton-current-alpha.xpi\" hash=\"<version-hash-torbutton-alpha>"
+"\" onclick=\"return install(event);\">install from this website</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 "
@@ -102,7 +106,7 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbutton/en/index.wml:120
+#: /home/runa/tor/website/torbutton/en/index.wml:126
msgid ""
"Torbutton is a 1-click way for Firefox users to enable or disable the "
"browser's use of <a href=\"<page index>\">Tor</a>. It adds a panel to the "
@@ -113,7 +117,7 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbutton/en/index.wml:129
+#: /home/runa/tor/website/torbutton/en/index.wml:135
msgid ""
"To keep you safe, Torbutton disables many types of active content. You can "
"learn more from the <a href=\"<page torbutton/faq>\">Torbutton FAQ</a>, or "
@@ -122,7 +126,7 @@
msgstr ""
#. type: Content of: <div><p>
-#: /home/runa/code/website/torbutton/en/index.wml:136
+#: /home/runa/tor/website/torbutton/en/index.wml:142
msgid ""
"Some users may prefer a toolbar button instead of a statusbar panel. "
"Torbutton lets you add a toolbar button by right-clicking on the desired "
More information about the tor-commits
mailing list