[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] r25022: {translation} updated the website template files (in translation/trunk/projects/website/po/templates: . about docs download projects)

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] r25022: {translation} updated the website template files (in translation/trunk/projects/website/po/templates: . about docs download projects)
From: Runa Sandvik <runa.sandvik@xxxxxxxxx>
Date: Sun, 4 Sep 2011 23:03:56 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sun, 04 Sep 2011 19:04:19 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: code repository commits <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Sender: tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx
Author: runa
Date: 2011-09-04 23:03:56 +0000 (Sun, 04 Sep 2011)
New Revision: 25022

Modified:
   translation/trunk/projects/website/po/templates/1-high.index.pot
   translation/trunk/projects/website/po/templates/about/3-low.volunteers.pot
   translation/trunk/projects/website/po/templates/docs/2-medium.verifying-signatures.pot
   translation/trunk/projects/website/po/templates/download/1-high.download-easy.pot
   translation/trunk/projects/website/po/templates/download/3-low.download.pot
   translation/trunk/projects/website/po/templates/projects/1-high.torbrowser.pot
   translation/trunk/projects/website/po/templates/projects/3-low.gettor.pot
   translation/trunk/projects/website/po/templates/projects/4-optional.torbrowser-details.pot
Log:
updated the website template files

Modified: translation/trunk/projects/website/po/templates/1-high.index.pot
===================================================================
--- translation/trunk/projects/website/po/templates/1-high.index.pot	2011-09-04 22:27:54 UTC (rev 25021)
+++ translation/trunk/projects/website/po/templates/1-high.index.pot	2011-09-04 23:03:56 UTC (rev 25022)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-08-30 08:50+0200\n"
+"POT-Creation-Date: 2011-09-05 00:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -47,8 +47,8 @@
 #. type: Content of: <div><div><div><div><div>
 #: /home/runa/tor/website/en/index.wml:20
 msgid ""
-"<a href=\"<page download/download>\"> <span class=\"download-tor\">Download "
-"Tor</span></a>"
+"<a href=\"<page download/download-easy>\"> <span class=\"download-tor"
+"\">Download Tor</span></a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h2>

Modified: translation/trunk/projects/website/po/templates/about/3-low.volunteers.pot
===================================================================
--- translation/trunk/projects/website/po/templates/about/3-low.volunteers.pot	2011-09-04 22:27:54 UTC (rev 25021)
+++ translation/trunk/projects/website/po/templates/about/3-low.volunteers.pot	2011-09-04 23:03:56 UTC (rev 25022)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-07-08 08:44+0200\n"
+"POT-Creation-Date: 2011-09-05 00:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -30,43 +30,62 @@
 
 #. type: Content of: <div><div><dl><dt>
 #: /home/runa/tor/website/about/en/volunteers.wml:15
+msgid "Google Summer of Code, 2011"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/tor/website/about/en/volunteers.wml:16
+msgid ""
+"Brandon Wiley - <a href=\"http://stepthreeprivacy.tumblr.com/\";>Blocking-"
+"resistant Transport Evaluation Framework</a><br /> George Kadianakis - <a "
+"href=\"https://gitorious.org/obfsproxy/pages/Home\";>Pluggable transports</"
+"a><br /> Julien Voisin - <a href=\"http://mat-tor.blogspot.com/\";>Metadata "
+"Anonymisation Toolkit</a><br /> Kamran Khan - <a href=\"http://code.";
+"inspirated.com/gsoc/\">GTK+ Frontend and Client Mode Improvements for arm</"
+"a><br /> Max - <a href=\"https://tails.boum.org/todo/TailsGreeter/blog/";
+"\">Custom GDM3 startup menu, aka. tails-greeter</a><br /> Sathyanarayan "
+"Gunasekaran - <a href=\"http://gsathya.in/blog/\";>GSoC : Orbot + ORLib</a>"
+msgstr ""
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/tor/website/about/en/volunteers.wml:22
 msgid "Anonym, bertagaz, and intrigeri"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:15
+#: /home/runa/tor/website/about/en/volunteers.wml:22
 msgid ""
 "Maintainers of <a href=\"https://tails.boum.org/\";>The Amnesic Incognito "
 "Live System</a>."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:17
+#: /home/runa/tor/website/about/en/volunteers.wml:24
 msgid "Marco Bonetti"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:17
+#: /home/runa/tor/website/about/en/volunteers.wml:24
 msgid "Focusing on MobileTor for the iPhone."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:18
+#: /home/runa/tor/website/about/en/volunteers.wml:25
 msgid "Kasimir Gabert"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:18
+#: /home/runa/tor/website/about/en/volunteers.wml:25
 msgid "Maintains TorStatus."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:19
+#: /home/runa/tor/website/about/en/volunteers.wml:26
 msgid "Marcia Hofmann and Kevin Bankston"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:19
+#: /home/runa/tor/website/about/en/volunteers.wml:26
 msgid ""
 "EFF lawyers who helped write the <a href=\"<page eff/tor-legal-faq>\">Tor "
 "Legal FAQ</a> and tirelessly answers the phone when somebody in the world "
@@ -74,93 +93,93 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:23
+#: /home/runa/tor/website/about/en/volunteers.wml:30
 msgid "Andreas Jonsson"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:23
+#: /home/runa/tor/website/about/en/volunteers.wml:30
 msgid "Works on OS X Tor Browser Bundle sandbox technology."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:25
+#: /home/runa/tor/website/about/en/volunteers.wml:32
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:25
+#: /home/runa/tor/website/about/en/volunteers.wml:32
 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><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:27
+#: /home/runa/tor/website/about/en/volunteers.wml:34
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:27
+#: /home/runa/tor/website/about/en/volunteers.wml:34
 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><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:30
+#: /home/runa/tor/website/about/en/volunteers.wml:37
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:30
+#: /home/runa/tor/website/about/en/volunteers.wml:37
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:32
+#: /home/runa/tor/website/about/en/volunteers.wml:39
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:32
+#: /home/runa/tor/website/about/en/volunteers.wml:39
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:34
+#: /home/runa/tor/website/about/en/volunteers.wml:41
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:35
+#: /home/runa/tor/website/about/en/volunteers.wml:42
 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><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:37
+#: /home/runa/tor/website/about/en/volunteers.wml:44
 msgid "Nart Villeneuve"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:37
+#: /home/runa/tor/website/about/en/volunteers.wml:44
 msgid ""
 "Security researcher who works with Jacob on Internet Censorship research."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:39
+#: /home/runa/tor/website/about/en/volunteers.wml:46
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:39
+#: /home/runa/tor/website/about/en/volunteers.wml:46
 msgid ""
 "A blogger who has written some <a href=\"http://www.ethanzuckerman.com/blog/?";
 "p=1019\">interesting</a> <a href=\"http://advocacy.globalvoicesonline.org/";
@@ -169,7 +188,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:44
+#: /home/runa/tor/website/about/en/volunteers.wml:51
 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, "

Modified: translation/trunk/projects/website/po/templates/docs/2-medium.verifying-signatures.pot
===================================================================
--- translation/trunk/projects/website/po/templates/docs/2-medium.verifying-signatures.pot	2011-09-04 22:27:54 UTC (rev 25021)
+++ translation/trunk/projects/website/po/templates/docs/2-medium.verifying-signatures.pot	2011-09-04 23:03:56 UTC (rev 25022)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-06-21 08:19+0200\n"
+"POT-Creation-Date: 2011-09-05 00:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -30,8 +30,8 @@
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:13
-#: /tmp/dObLGpwp1_.xml:43 /tmp/dObLGpwp1_.xml:59 /tmp/dObLGpwp1_.xml:86
-#: /tmp/dObLGpwp1_.xml:186
+#: /tmp/w7jGkC8yXE.xml:43 /tmp/w7jGkC8yXE.xml:59 /tmp/w7jGkC8yXE.xml:86
+#: /tmp/w7jGkC8yXE.xml:186
 msgid "<hr>"
 msgstr ""
 
@@ -72,7 +72,7 @@
 
 #. type: Content of: <div><div><ul><li>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:29
-msgid "Peter's (0x94C09C7F, or its subkey 0xAFA44BDD)."
+msgid "Peter's (0xC82E0039, or its subkey 0xE1DEC577)."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
@@ -181,7 +181,7 @@
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:64
-#: /tmp/dObLGpwp1_.xml:89 /tmp/dObLGpwp1_.xml:194
+#: /tmp/w7jGkC8yXE.xml:89 /tmp/w7jGkC8yXE.xml:194
 msgid "<b>Windows:</b>"
 msgstr ""
 
@@ -208,7 +208,7 @@
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/verifying-signatures.wml:75
-#: /tmp/dObLGpwp1_.xml:92
+#: /tmp/w7jGkC8yXE.xml:92
 msgid "<b>Mac and Linux</b>"
 msgstr ""
 
@@ -283,8 +283,8 @@
 "    uid                  Andrew Lewman &lt;andrew@xxxxxxxxxxxxxx&gt;\n"
 "    sub   4096g/B77F95F7 2003-07-17\n"
 "\n"
-"    pub   1024D/94C09C7F 1999-11-10\n"
-"          Key fingerprint = 5B00 C96D 5D54 AEE1 206B  AF84 DE7A AF6E 94C0 9C7F\n"
+"    pub   4096R/C82E0039 2003-03-24\n"
+"          Key fingerprint = 25FC 1614 B8F8 7B52 FF2F  99B9 62AF 4031 C82E 0039\n"
 "    uid                  Peter Palfrader\n"
 "    uid                  Peter Palfrader &lt;peter@xxxxxxxxxxxxx&gt;\n"
 "    uid                  Peter Palfrader &lt;weasel@xxxxxxxxxx&gt;\n"

Modified: translation/trunk/projects/website/po/templates/download/1-high.download-easy.pot
===================================================================
--- translation/trunk/projects/website/po/templates/download/1-high.download-easy.pot	2011-09-04 22:27:54 UTC (rev 25021)
+++ translation/trunk/projects/website/po/templates/download/1-high.download-easy.pot	2011-09-04 23:03:56 UTC (rev 25022)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-08-10 08:19+0200\n"
+"POT-Creation-Date: 2011-09-05 00:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -226,65 +226,72 @@
 "a>."
 msgstr ""
 
+#. type: Content of: <div><div><table><tbody><tr><td><p>
+#: /home/runa/tor/website/download/en/download-easy.wml:149
+msgid ""
+"Interested in <a href=\"<page about/overview>\">learning more about Tor in "
+"general</a>?"
+msgstr ""
+
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/download/en/download-easy.wml:161
+#: /home/runa/tor/website/download/en/download-easy.wml:159
 msgid "Advanced Choices:"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download-easy.wml:163
+#: /home/runa/tor/website/download/en/download-easy.wml:161
 msgid "<a href=\"<page download/download>#Windows\">Microsoft Windows</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download-easy.wml:164
+#: /home/runa/tor/website/download/en/download-easy.wml:162
 msgid "<a href=\"<page download/download>#mac\">Apple OS X</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download-easy.wml:165
+#: /home/runa/tor/website/download/en/download-easy.wml:163
 msgid "<a href=\"<page download/download>#linux\">Linux/Unix</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download-easy.wml:166
+#: /home/runa/tor/website/download/en/download-easy.wml:164
 msgid "<a href=\"<page download/download>#smartphones\">Smartphones</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download-easy.wml:167
+#: /home/runa/tor/website/download/en/download-easy.wml:165
 msgid "<a href=\"<page download/download>#source\">Source Code</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/download/en/download-easy.wml:174
+#: /home/runa/tor/website/download/en/download-easy.wml:172
 msgid "What is the (sig) link?"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><p>
-#: /home/runa/tor/website/download/en/download-easy.wml:175
+#: /home/runa/tor/website/download/en/download-easy.wml:173
 msgid ""
 "These are GPG signatures to allow you to verify that your downloaded file is "
 "really from The Tor Project and not an imposter."
 msgstr ""
 
 #. type: Content of: <div><div><div><div>
-#: /home/runa/tor/website/download/en/download-easy.wml:178
+#: /home/runa/tor/website/download/en/download-easy.wml:176
 msgid "<a href=\"<page docs/verifying-signatures>\">Learn more &raquo;</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/download/en/download-easy.wml:184
+#: /home/runa/tor/website/download/en/download-easy.wml:182
 msgid "Having Trouble?"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download-easy.wml:186
+#: /home/runa/tor/website/download/en/download-easy.wml:184
 msgid "<a href=\"<page docs/documentation>\">Read the fine manuals</a>"
 msgstr ""
 
 #. type: Content of: <div><p>
-#: /home/runa/tor/website/download/en/download-easy.wml:194
+#: /home/runa/tor/website/download/en/download-easy.wml:192
 msgid ""
 "<small>All trademarks are the property of their respective owners.</small>"
 msgstr ""

Modified: translation/trunk/projects/website/po/templates/download/3-low.download.pot
===================================================================
--- translation/trunk/projects/website/po/templates/download/3-low.download.pot	2011-09-04 22:27:54 UTC (rev 25021)
+++ translation/trunk/projects/website/po/templates/download/3-low.download.pot	2011-09-04 23:03:56 UTC (rev 25022)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-08-10 08:19+0200\n"
+"POT-Creation-Date: 2011-09-05 00:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,25 +16,38 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. PO4ASHARPBEGIN# translation metadataPO4ASHARPEND
+#. PO4ASHARPBEGIN Revision: $Revision: 25014 $PO4ASHARPEND
+#. PO4ASHARPBEGIN Translation-Priority: 3-lowPO4ASHARPEND
+#. PO4ASHARPBEGINinclude "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes"PO4ASHARPEND
+#. PO4ASHARPBEGIN<!-- ATTENTION TRANSLATOR 
+#. PO4ASHARPBEGIN<!-- You MUST copy 'dlhead.wmi' and 'lang.wmi' along with this file! 
+#. PO4ASHARPBEGIN<!-- TBB DEFAULT LANGUAGE: Change 'en-US' below to your language code (if package exists)
+#. PO4ASHARPBEGIN<!-- IMPORTANT: You MUST also change the default selection in 'lang.wmi' 
+#. type: Content of: outside any tag (error?)
+#: /home/runa/tor/website/download/en/download.wml:6
+msgid "PO4ASHARPEND--> PO4ASHARPEND--> PO4ASHARPEND--> PO4ASHARPEND-->"
+msgstr ""
+
+#. type: Content of: <define-tag>
+#: /home/runa/tor/website/download/en/download.wml:11
+msgid "en-US"
+msgstr ""
+
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/download/en/download.wml:7
+#: /home/runa/tor/website/download/en/download.wml:14
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a><a href=\"<page download/download>"
 "\">Download</a>"
 msgstr ""
 
-#. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/download/en/download.wml:9
-msgid "Download Tor"
-msgstr ""
-
 #. type: Content of: <div><div><div><h2>
-#: /home/runa/tor/website/download/en/download.wml:12
+#: /home/runa/tor/website/download/en/download.wml:18
 msgid "Want Tor to really work?"
 msgstr ""
 
 #. type: Content of: <div><div><div><p>
-#: /home/runa/tor/website/download/en/download.wml:13
+#: /home/runa/tor/website/download/en/download.wml:19
 msgid ""
 "...then please don't just install it and go on.  You need to change some of "
 "your habits, and reconfigure your software! Tor by itself is <em>NOT</em> "
@@ -42,495 +55,528 @@
 "list of warnings</a>."
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><div>
-#: /home/runa/tor/website/download/en/download.wml:20
-msgid "<a name=\"Windows\">Microsoft Windows</a>"
+#. type: Content of: <div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:26
+msgid "<span class=\"windows24\">Microsoft Windows</span>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><script>
-#: /home/runa/tor/website/download/en/download.wml:27
+#. PO4ASHARPBEGINinclude <lang.wmi>
+#. PO4ASHARPEND
+#. type: Content of: <div><div><div><div><form>
+#: /home/runa/tor/website/download/en/download.wml:33
 msgid ""
-"function displayVals() { var t3 = jQuery(\"#t3\").val(); var amount = jQuery"
-"(\"#amount\").val(); if(t3 != 0){ jQuery('#a3').val(amount); jQuery('#p3')."
-"val(1); jQuery('#cmd').val('_xclick-subscriptions'); jQuery('#item_name').val"
-"('Tor Project Membership'); jQuery('#ppinfo').replaceWith('"
+"<a class=\"button win-tbb\" href=\"../dist/torbrowser/tor-browser-<version-"
+"torbrowserbundle>_<lang>.exe\"><span class=\"strong\">Download</span><span "
+"class=\"normal\">Tor Browser Bundle</span></a> <select name=\"language\" id="
+"\"win-tbb\" class=\"lang\"> </select>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><script><h6>
-#: /home/runa/tor/website/download/en/download.wml:35
-msgid "<small>(Requires a PayPal Account)</small>"
+#. type: Content of: <div><div><div><div><form><div>
+#: /home/runa/tor/website/download/en/download.wml:38
+msgid ""
+"(<a class=\"win-tbb-sig\" href=\"../dist/torbrowser/tor-browser-<version-"
+"torbrowserbundle>_<lang>.exe.asc\">sig</a>) <a class=\"siginfo\" href="
+"\"<page docs/verifying-signatures>\">What's This?</a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><script>
-#: /home/runa/tor/website/download/en/download.wml:35
+#. type: Content of: <div><div><div><div><form>
+#: /home/runa/tor/website/download/en/download.wml:40 /tmp/9274UDVCYT.xml:188
 msgid ""
-"'); }else{ jQuery('#a3').val(0); jQuery('#p3').val(0); jQuery('#cmd').val"
-"('_donations'); jQuery('#item_name').val('Donation to the Tor Project'); "
-"jQuery('#ppinfo').replaceWith('"
+"<a class=\"additional\" href=\"<page projects/torbrowser-details>#build"
+"\">Source Code</a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><script>
-#: /home/runa/tor/website/download/en/download.wml:41
+#. type: Content of: <div><div><div><div><h2>
+#: /home/runa/tor/website/download/en/download.wml:43 /tmp/9274UDVCYT.xml:141
+#: /tmp/9274UDVCYT.xml:191
+msgid "Tor Browser Bundle"
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:44
+msgid "<em>Version <version-torbrowserbundle> - Windows 7, Vista, and XP</em>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/tor/website/download/en/download.wml:45 /tmp/9274UDVCYT.xml:143
+#: /tmp/9274UDVCYT.xml:193
 msgid ""
-"'); } if( !t3 ) { jQuery('#cmd').val('_donations'); jQuery('#item_name').val"
-"('Donation to the Tor Project'); jQuery('#ppinfo').replaceWith('"
+"Everything you need to safely browse the Internet. This package requires no "
+"installation. Just extract it and run. <a href=\"<page projects/torbrowser>"
+"\">Learn more &raquo;</a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><script>
-#: /home/runa/tor/website/download/en/download.wml:46
+#. type: Content of: <div><div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:50
 msgid ""
-"'); } } jQuery(function(){ jQuery(\"#amount\").change(displayVals); jQuery"
-"(\"#t3\").change(displayVals); displayVals(); });"
+"<a class=\"button\" href=\"<package-win32-bundle-stable>\"><span class="
+"\"strong\">Download</span><span class=\"normal\">Vidalia Bundle</span></a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><form><h2>
-#: /home/runa/tor/website/download/en/download.wml:58
-msgid "Donate to Tor"
+#. type: Content of: <div><div><div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:52
+msgid ""
+"(<a href=\"<package-win32-bundle-stable>.asc\">sig</a>) <a class=\"siginfo\" "
+"href=\"<page docs/verifying-signatures>\">What's This?</a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><form><p><select>
-#: /home/runa/tor/website/download/en/download.wml:60
-msgid "<select name=\"currency_code\" class=\"cur\">"
+#. type: Content of: <div><div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:54
+msgid ""
+"<a class=\"additional\" href=\"<package-win32-bundle-alpha>\">Download "
+"Unstable</a> (<a href=\"<package-win32-bundle-alpha>.asc\">sig</a>)"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><form><p><select><option>
-#: /home/runa/tor/website/download/en/download.wml:61
-msgid "$"
+#. type: Content of: <div><div><div><div><h2>
+#: /home/runa/tor/website/download/en/download.wml:57 /tmp/9274UDVCYT.xml:159
+msgid "Vidalia Bundle"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><form><p><select><option>
-#: /home/runa/tor/website/download/en/download.wml:62
-msgid "&euro;"
+#. type: Content of: <div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:58 /tmp/9274UDVCYT.xml:71
+#: /tmp/9274UDVCYT.xml:84 /tmp/9274UDVCYT.xml:97
+msgid "<em>Windows 7, Vista, and XP</em>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><form><p><select><option>
-#: /home/runa/tor/website/download/en/download.wml:63
-msgid "&pound;"
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/tor/website/download/en/download.wml:59
+msgid ""
+"Contains Tor, <a href=\"<page projects/vidalia>\">Vidalia</a>, Polipo, and "
+"Torbutton for installation on your system. You need your own Firefox, and "
+"you'll need to configure other applications if you want them to use Tor. <a "
+"href=\"<page docs/tor-doc-windows>\">Installation Guide &raquo;</a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><form><p><select><option>
+#. type: Content of: <div><div><div><div><div>
 #: /home/runa/tor/website/download/en/download.wml:64
-msgid "&yen;"
+msgid ""
+"<a class=\"button\" href=\"../dist/vidalia-bundles/vidalia-bridge-bundle-"
+"<version-win32-bridge-bundle-stable>.exe\"><span class=\"strong\">Download</"
+"span><span class=\"normal\">Vidalia Bridge Bundle (Beta)</span></a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><form><p>
-#: /home/runa/tor/website/download/en/download.wml:65
+#. type: Content of: <div><div><div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:66
 msgid ""
-"</select> <input type=\"text\" id=\"amount\" class=\"amount\" name=\"amount"
-"\" value=\"5\" size=\"10\">"
+"(<a href=\"../dist/vidalia-bundles/vidalia-bridge-bundle-<version-win32-"
+"bridge-bundle-stable>.exe.asc\">sig</a>) <a class=\"siginfo\" href=\"<page "
+"docs/verifying-signatures>\">What's This?</a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><form><p><select>
-#: /home/runa/tor/website/download/en/download.wml:69
+#. type: Content of: <div><div><div><div><h2>
+#: /home/runa/tor/website/download/en/download.wml:70
+msgid "Vidalia Bridge Bundle"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/tor/website/download/en/download.wml:72
 msgid ""
-"<input type=\"hidden\" id=\"a3\" name=\"a3\" value=\"0\"> <select id=\"t3\" "
-"name=\"t3\">"
+"A Vidalia Bundle which is configured to be a <a href=\"<page docs/bridges>"
+"\">bridge</a> by default. This helps censored users reach the Tor network."
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><form><p><select><option>
-#: /home/runa/tor/website/download/en/download.wml:71
-msgid "One-time Donation"
+#. type: Content of: <div><div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:77
+msgid ""
+"<a class=\"button\" href=\"https://archive.torproject.org/tor-package-";
+"archive/technology-preview/vidalia-relay-bundle-<version-win32-relay-bundle-"
+"stable>.exe\"><span class=\"strong\">Download</span><span class=\"normal"
+"\">Vidalia Relay Bundle (Beta)</span></a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><form><p><select><option>
-#: /home/runa/tor/website/download/en/download.wml:72
-msgid "Monthly Subscription"
+#. type: Content of: <div><div><div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:79
+msgid ""
+"(<a href=\"https://archive.torproject.org/tor-package-archive/technology-";
+"preview/vidalia-relay-bundle-<version-win32-relay-bundle-stable>.exe.asc"
+"\">sig</a>) <a class=\"siginfo\" href=\"<page docs/verifying-signatures>"
+"\">What's This?</a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><form><p>
-#: /home/runa/tor/website/download/en/download.wml:73
-msgid "</select>"
+#. type: Content of: <div><div><div><div><h2>
+#: /home/runa/tor/website/download/en/download.wml:83
+msgid "Vidalia Relay Bundle"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><form><p>
-#: /home/runa/tor/website/download/en/download.wml:78
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/tor/website/download/en/download.wml:85
 msgid ""
-"<input type=\"hidden\" id=\"p3\" name=\"p3\" value=\"1\"> <input type="
-"\"hidden\" name=\"sra\" value=\"1\"> <input type=\"hidden\" name=\"src\" "
-"value=\"1\"> <input type=\"hidden\" name=\"no_shipping\" value=\"1\"> <input "
-"type=\"hidden\" name=\"no_note\" value=\"1\"> <input type=\"hidden\" id=\"cmd"
-"\" name=\"cmd\" value=\"_donations\"> <input type=\"hidden\" name=\"business"
-"\" value=\"donations@xxxxxxxxxxxxxx\"> <input type=\"hidden\" id=\"item_name"
-"\" name=\"item_name\" value=\"Donation to the Tor Project\"> <input type="
-"\"hidden\" name=\"return\" value=\"https://www.torproject.org/donate/thankyou";
-"\"> <input type=\"hidden\" name=\"cancel_return\" value=\"https://www.";
-"torproject.org/download\">"
+"A Vidalia Bundle which is configured to be a non-exit <a href=\"<page docs/"
+"tor-doc-relay>\">relay</a> by default. This helps grow the Tor network."
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><form><p>
-#: /home/runa/tor/website/download/en/download.wml:93
+#. type: Content of: <div><div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:90
 msgid ""
-"<input class=\"donate-btn\" type=\"submit\" name=\"donate\" value=\"Donate\">"
+"<a class=\"button\" href=\"https://archive.torproject.org/tor-package-";
+"archive/technology-preview/vidalia-exit-bundle-<version-win32-exit-bundle-"
+"stable>.exe\"><span class=\"strong\">Download</span><span class=\"normal"
+"\">Vidalia Exit Bundle (Beta)</span></a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><form><p>
-#: /home/runa/tor/website/download/en/download.wml:95
-msgid "<a href=\"<page donate/donate>\">Other donation options...</a>"
+#. type: Content of: <div><div><div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:92
+msgid ""
+"(<a href=\"https://archive.torproject.org/tor-package-archive/technology-";
+"preview/vidalia-exit-bundle-<version-win32-exit-bundle-stable>.exe.asc"
+"\">sig</a>) <a class=\"siginfo\" href=\"<page docs/verifying-signatures>"
+"\">What's This?</a>"
 msgstr ""
 
-#.  DONATION WIDGET END 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:100
-msgid "The Tor Software for Windows comes bundled in four different ways:"
+#. type: Content of: <div><div><div><div><h2>
+#: /home/runa/tor/website/download/en/download.wml:96
+msgid "Vidalia Exit Bundle"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:102 /tmp/HFMkO3TRB0.xml:165
-#: /tmp/HFMkO3TRB0.xml:203
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/tor/website/download/en/download.wml:98
 msgid ""
-"The <strong>Tor Browser Bundle</strong> contains everything you need to "
-"safely browse the Internet. This package requires no installation. Just "
-"extract it and run. <a href=\"<page projects/torbrowser>\">Learn more &raquo;"
-"</a>"
+"A Vidalia Bundle which is configured to be an <a href=\"<page docs/tor-doc-"
+"relay>\">exit relay</a> by default. <strong>Please read these <a href="
+"\"https://blog.torproject.org/running-exit-node\";>tips for running an exit "
+"node with minimal harassment</a> before you get started!</strong>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><ul><li>
+#. type: Content of: <div><div><div><div><div>
 #: /home/runa/tor/website/download/en/download.wml:103
 msgid ""
-"The <strong>Vidalia Bundle</strong> contains Tor, <a href=\"<page projects/"
-"vidalia>\">Vidalia</a>, Polipo, and Torbutton for installation on your "
-"system. You need your own Firefox, and you'll need to configure other "
-"applications if you want them to use Tor."
+"<a class=\"button\" href=\"../dist/win32/tor-<version-win32-stable>-win32.exe"
+"\"><span class=\"strong\">Download</span><span class=\"normal\">Expert "
+"Bundle</span></a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:104
+#. type: Content of: <div><div><div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:105
 msgid ""
-"The <strong>Bridge-by-Default Vidalia Bundle</strong> is a <strong>Vidalia "
-"Bundle</strong> which is configured to be a <a href=\"<page docs/bridges>"
-"\">bridge</a> in order to help censored users reach the Tor network."
+"(<a href=\"../dist/win32/tor-<version-win32-stable>-win32.exe.asc\">sig</a>) "
+"<a class=\"siginfo\" href=\"<page docs/verifying-signatures>\">What's This?</"
+"a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:108
+#. type: Content of: <div><div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:107
 msgid ""
-"The <strong>Expert Bundle</strong> contains just Tor and nothing else.  "
-"You'll need to configure Tor and all of your applications manually."
+"<a class=\"additional\" href=\"../dist/win32/tor-<version-win32-alpha>-win32."
+"exe\">Download Unstable</a> (<a href=\"../dist/win32/tor-<version-win32-"
+"alpha>-win32.exe.asc\">sig</a>)"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><p>
-#: /home/runa/tor/website/download/en/download.wml:110 /tmp/HFMkO3TRB0.xml:168
-msgid ""
-"There are two versions of each package, a stable and alpha release.  Stable "
-"packages are released when we believe the features and code will not change "
-"for many months.  Alpha or unstable packages are released so you can help us "
-"test new features and bugfixes. Even though they have a higher version "
-"number than the stable versions listed above, there is a much higher chance "
-"of serious reliability and security bugs in these downloads.  Please be "
-"prepared to <a href=\"https://bugs.torproject.org/\";>report bugs</a>."
+#. type: Content of: <div><div><div><div><h2>
+#: /home/runa/tor/website/download/en/download.wml:110
+msgid "Expert Bundle"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><p>
+#. type: Content of: <div><div><div><div>
 #: /home/runa/tor/website/download/en/download.wml:111
-msgid ""
-"The current stable version of Tor for Windows is <version-win32-stable>.  "
-"The current alpha/unstable version of Tor for Windows is <version-win32-"
-"alpha>."
+msgid "<em>Windows 7, Vista, XP, 2000, 2003 Server, ME, and Windows 98SE</em>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:115
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/tor/website/download/en/download.wml:112
 msgid ""
-"<span class=\"windows\"> Tor Browser Bundle (English) version <version-"
-"torbrowserbundle>, works with Windows 7, Vista, and XP. <a href=\"../dist/"
-"torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe\">Download</"
-"a>&nbsp;(<a href=\"../dist/torbrowser/tor-browser-<version-"
-"torbrowserbundle>_en-US.exe.asc\">sig</a>)  </span>"
+"Contains just Tor and nothing else. You'll need to configure Tor and all of "
+"your applications manually."
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:122
+#. type: Content of: <div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:118
+msgid "<span class=\"mac24\">Apple OS X</span>"
+msgstr ""
+
+#. PO4ASHARPBEGINinclude <lang.wmi>
+#. PO4ASHARPEND
+#. type: Content of: <div><div><div><div><form>
+#: /home/runa/tor/website/download/en/download.wml:124
 msgid ""
-"<span class=\"windows\"> Tor Browser Instant Messaging Bundle (English) has "
-"been <a href=\"https://blog.torproject.org/blog/tor-im-browser-bundle-";
-"discontinued-temporarily\">temporarily discontinued</a>.  </span>"
+"<a class=\"button osx-tbb\" href=\"../dist/torbrowser/osx/TorBrowser-"
+"<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip\"><span class=\"strong"
+"\">Download</span><span class=\"normal\">Tor Browser Bundle (32-bit Beta)</"
+"span></a> <select name=\"language\" id=\"osx-tbb\" class=\"lang\"> </select>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
+#. type: Content of: <div><div><div><div><form><div>
 #: /home/runa/tor/website/download/en/download.wml:129
 msgid ""
-"<span class=\"windows\"> Download <a href=\"<page projects/torbrowser>"
-"\">other language versions and the source code</a> of the Tor Browser "
-"Bundle.  </span>"
+"(<a class=\"osx-tbb-sig\" href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-<lang>.zip.asc\">sig</a>) <a class="
+"\"siginfo\" href=\"<page docs/verifying-signatures>\">What's This?</a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:134
+#. PO4ASHARPBEGINinclude <lang.wmi>
+#. PO4ASHARPEND
+#. type: Content of: <div><div><div><div><form>
+#: /home/runa/tor/website/download/en/download.wml:131
 msgid ""
-"<span class=\"windows\"> Stable Vidalia Bundle works with Windows 7, Vista, "
-"XP, <a href=\"<package-win32-bundle-stable>\">Download Stable</a>&nbsp;(<a "
-"href=\"<package-win32-bundle-stable>.asc\">sig</a>)  </span>"
+"<a class=\"button osx-tbb\" href=\"../dist/torbrowser/osx/TorBrowser-"
+"<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip\"><span class="
+"\"strong\">Download</span><span class=\"normal\">Tor Browser Bundle (64-bit "
+"Beta)</span></a> <select name=\"language\" id=\"osx-tbb\" class=\"lang\"> </"
+"select>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:138
+#. type: Content of: <div><div><div><div><form><div>
+#: /home/runa/tor/website/download/en/download.wml:136
 msgid ""
-"<span class=\"windows\">Unstable Vidalia Bundle works with Windows 7, Vista, "
-"XP, <a href=\"<package-win32-bundle-alpha>\">Download Unstable</a>&nbsp;(<a "
-"href=\"<package-win32-bundle-alpha>.asc\">sig</a>)</span>"
+"(<a class=\"osx-tbb-sig\" href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip.asc\">sig</a>) <a class="
+"\"siginfo\" href=\"<page docs/verifying-signatures>\">What's This?</a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:140
-msgid ""
-"<span class=\"windows\">Unstable Bridge-by-Default Vidalia Bundle works with "
-"Windows 7, Vista, XP, <a href=\"../dist/vidalia-bundles/vidalia-bridge-"
-"bundle-<version-win32-bridge-bundle-alpha>.exe\">Download Unstable</a>&nbsp;"
-"(<a href=\"../dist/vidalia-bundles/vidalia-bridge-bundle-<version-win32-"
-"bridge-bundle-alpha>.asc\">sig</a>)</span>"
+#. type: Content of: <div><div><div><div><form>
+#: /home/runa/tor/website/download/en/download.wml:138
+msgid "<a href=\"<page projects/torbrowser-details>#build\">Source Code</a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:143
+#. type: Content of: <div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:142
+msgid "<em>Version <version-torbrowserbundleosx> - OS X Intel</em>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:148
 msgid ""
-"<span class=\"windows\">Stable Expert Bundle works with Windows 98SE, ME, "
-"Windows 7, Vista, XP, 2000, 2003 Server, <a href=\"../dist/win32/tor-"
-"<version-win32-stable>-win32.exe\">Download Stable</a>&nbsp;(<a href=\"../"
-"dist/win32/tor-<version-win32-stable>-win32.exe.asc\">sig</a>)</span>"
+"<a class=\"button\" href=\"<package-osx-x86-bundle-stable>\"><span class="
+"\"strong\">Download</span><span class=\"normal\">OS X Intel</span></a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:146
+#. type: Content of: <div><div><div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:150
 msgid ""
-"<span class=\"windows\">Unstable Expert Bundle works with Windows 98SE, ME, "
-"Windows 7, Vista, XP, 2000, 2003 Server, <a href=\"../dist/win32/tor-"
-"<version-win32-alpha>-win32.exe\">Download Unstable</a>&nbsp;(<a href=\"../"
-"dist/win32/tor-<version-win32-alpha>-win32.exe.asc\">sig</a>)  </span>"
+"(<a href=\"<package-osx-x86-bundle-stable>.asc\">sig</a>) <a class=\"siginfo"
+"\" href=\"<page docs/verifying-signatures>\">What's This?</a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
+#. type: Content of: <div><div><div><div><div>
 #: /home/runa/tor/website/download/en/download.wml:152
 msgid ""
-"<a href=\"<page docs/tor-doc-windows>\">Documentation for Microsoft Windows "
-"clients</a>"
+"<a class=\"button\" href=\"<package-osx-ppc-bundle-stable>\"><span class="
+"\"strong\">Download</span><span class=\"normal\">OS X Power PC</span></a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><div>
-#: /home/runa/tor/website/download/en/download.wml:160
-msgid "<a name=\"mac\">Apple OS X</a>"
+#. type: Content of: <div><div><div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:154
+msgid ""
+"(<a href=\"<package-osx-ppc-bundle-stable>.asc\">sig</a>) <a class=\"siginfo"
+"\" href=\"<page docs/verifying-signatures>\">What's This?</a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:163
-msgid "The Tor Software for OS X comes bundled in two different ways:"
+#. type: Content of: <div><div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:156
+msgid ""
+"Download Unstable<br /><a class=\"additional\" href=\"<package-osx-x86-"
+"bundle-alpha>\">OS X Intel</a> (<a href=\"<package-osx-x86-bundle-alpha>.asc"
+"\">sig</a>)<br /><a class=\"additional\" href=\"<package-osx-ppc-bundle-"
+"alpha>\">OS X PowerPC</a> (<a href=\"<package-osx-ppc-bundle-alpha>.asc"
+"\">sig</a>)"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:166
-msgid ""
-"The <strong>Vidalia Bundle</strong> contains Tor, <a href=\"<page projects/"
-"vidalia>\">Vidalia</a>, Polipo, and Torbutton for installation on your "
-"system.  You need your own Firefox, and you'll need to configure other "
-"applications if you want them to use Tor."
+#. type: Content of: <div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:160
+msgid "<em>OS X Intel, OS X Power PC</em>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><p>
-#: /home/runa/tor/website/download/en/download.wml:169
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/tor/website/download/en/download.wml:161
 msgid ""
-"The current stable version of Tor for OS X is <version-osx-x86-stable>.  The "
-"current alpha/unstable version of Tor for OS X is <version-osx-x86-alpha>."
+"Contains Tor, <a href=\"<page projects/vidalia>\">Vidalia</a>, Polipo, and "
+"Torbutton for installation on your system. You need your own Firefox, and "
+"you'll need to configure other applications if you want them to use Tor. <a "
+"href=\"<page docs/tor-doc-osx>\">Installation Guide &raquo;</a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
+#. type: Content of: <div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:167
+msgid "<span class=\"linux24\">Linux, BSD, &amp; Unix</span>"
+msgstr ""
+
+#. PO4ASHARPBEGINinclude <lang.wmi>
+#. PO4ASHARPEND
+#. type: Content of: <div><div><div><div><form>
 #: /home/runa/tor/website/download/en/download.wml:173
 msgid ""
-"<span class=\"mac\">Tor Browser Bundle for OS X Intel (beta version), <a "
-"href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
-"osx-i386-en-US.zip\">Download</a>&nbsp; (<a href=\"../dist/torbrowser/osx/"
-"TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc\">sig</"
-"a>)  </span>"
+"<a class=\"button lin-tbb32\" href=\"../dist/torbrowser/linux/tor-browser-"
+"gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz\"><span "
+"class=\"strong\">Download</span><span class=\"normal\">i686 / 32-bit (Beta)</"
+"span></a> <select name=\"language\" id=\"lin-tbb32\" class=\"lang\"> </"
+"select>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:180
+#. type: Content of: <div><div><div><div><form><div>
+#: /home/runa/tor/website/download/en/download.wml:178
 msgid ""
-"<span class=\"mac\">Stable Vidalia Bundle for OS X Intel, <a href=\"<package-"
-"osx-x86-bundle-stable>\">Download Stable</a>&nbsp;(<a href=\"<package-osx-"
-"x86-bundle-stable>.asc\">sig</a>)</span>"
+"(<a class=\"lin-tbb32-sig\" href=\"../dist/torbrowser/linux/tor-browser-gnu-"
+"linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz.asc\">sig</"
+"a>) <a class=\"siginfo\" href=\"<page docs/verifying-signatures>\">What's "
+"This?</a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:183
+#. PO4ASHARPBEGINinclude <lang.wmi>
+#. PO4ASHARPEND
+#. type: Content of: <div><div><div><div><form>
+#: /home/runa/tor/website/download/en/download.wml:181
 msgid ""
-"<span class=\"mac\">Unstable Vidalia Bundle for OS X Intel, <a href="
-"\"<package-osx-x86-bundle-alpha>\">Download Unstable</a>&nbsp;(<a href="
-"\"<package-osx-x86-bundle-alpha>.asc\">sig</a>)</span>"
+"<a class=\"button lin-tbb64\" href=\"../dist/torbrowser/linux/tor-browser-"
+"gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz\"><span "
+"class=\"strong\">Download</span><span class=\"normal\">x86_64 / 64-bit (Beta)"
+"</span></a> <select name=\"language\" id=\"lin-tbb64\" class=\"lang\"> </"
+"select>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
+#. type: Content of: <div><div><div><div><form><div>
 #: /home/runa/tor/website/download/en/download.wml:186
 msgid ""
-"<span class=\"mac\">Stable Vidalia Bundle for OS X PowerPC, <a href="
-"\"<package-osx-ppc-bundle-stable>\">Download Stable</a>&nbsp;(<a href="
-"\"<package-osx-ppc-bundle-stable>.asc\">sig</a>)</span>"
+"(<a class=\"lin-tbb64-sig\" href=\"../dist/torbrowser/linux/tor-browser-gnu-"
+"linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz.asc\">sig</"
+"a>) <a class=\"siginfo\" href=\"<page docs/verifying-signatures>\">What's "
+"This?</a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:189
+#. type: Content of: <div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:192
 msgid ""
-"<span class=\"mac\">Unstable Vidalia Bundle for OS X PowerPC, <a href="
-"\"<package-osx-ppc-bundle-alpha>\">Download Unstable</a>&nbsp;(<a href="
-"\"<package-osx-ppc-bundle-alpha>.asc\">sig</a>)</span>"
+"<em>Version <version-torbrowserbundlelinux32> - Linux, BSD, and Unix</em>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:192
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/tor/website/download/en/download.wml:194
 msgid ""
-"<a href=\"<page docs/tor-doc-osx>\">Documentation for Apple OS X clients</a>."
+"Use <a href=\"<page download/download-unix>\">our repositories</a> for all "
+"other Tor-related software."
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><div>
-#: /home/runa/tor/website/download/en/download.wml:199
-msgid "<a name=\"linux\">Linux/Unix</a>"
+#. type: Content of: <div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:200
+msgid "<span class=\"smartphone24\">Tor for Smartphones</span>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:201
-msgid "The Tor Software comes bundled in two different ways:"
+#. type: Content of: <div><div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:206
+msgid ""
+"<a class=\"button\" style=\"margin-bottom: 5px;\" href=\"../dist/android/"
+"<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk\"><span "
+"class=\"strong\">Download</span><span class=\"normal\">Android Bundle</"
+"span></a> <a class=\"additional\" href=\"<page docs/android>\">Installation "
+"Instructions</a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:204
-msgid ""
-"Read how to use <a href=\"<page download/download-unix>\">our repositories "
-"for the Tor software</a>."
+#. type: Content of: <div><div><div><div><h2>
+#: /home/runa/tor/website/download/en/download.wml:210
+msgid "Android Bundle"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:209
-msgid ""
-"<span class=\"linux\">Tor Browser Bundle for GNU/Linux (beta version) on "
-"i686, <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
-"torbrowserbundlelinux32>-dev-en-US.tar.gz\">Download</a>&nbsp; (<a href=\"../"
-"dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
-"torbrowserbundlelinux32>-dev-en-US.tar.gz.asc\">sig</a>)</span>"
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/tor/website/download/en/download.wml:211
+msgid "For Android-based phones, tablets, and computers."
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:214
+#. type: Content of: <div><div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:216
 msgid ""
-"<span class=\"linux\">Tor Browser Bundle for GNU/Linux (beta version) on "
-"x86_64, <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-"
-"<version-torbrowserbundlelinux64>-dev-en-US.tar.gz\">Download</a>&nbsp; (<a "
-"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
-"torbrowserbundlelinux64>-dev-en-US.tar.gz.asc\">sig</a>)</span>"
+"<a class=\"additional\" style=\"font-weight: bold;\" href=\"http://sid77.";
+"slackware.it/iphone/\">Test Packages by Marco</a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
+#. type: Content of: <div><div><div><div><h2>
 #: /home/runa/tor/website/download/en/download.wml:219
-msgid ""
-"<span class=\"linux\">Use <a href=\"<page download/download-unix>\">our "
-"repositories</a> for all other Tor-related software.</span>"
+msgid "Tor for Apple iOS"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><div>
-#: /home/runa/tor/website/download/en/download.wml:224
-msgid "<a name=\"smartphones\">Tor for Smartphones</a>"
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/tor/website/download/en/download.wml:220
+msgid "For iPhone, iPod Touch, and iPad."
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:227
-msgid "Android-based phones, tablets, computers"
+#. type: Content of: <div><div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:225
+msgid ""
+"<a class=\"additional\" style=\"font-weight: bold;\" href=\"<page docs/N900>"
+"\">Experimental Instructions</a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
+#. type: Content of: <div><div><div><div><h2>
 #: /home/runa/tor/website/download/en/download.wml:228
-msgid ""
-"<a href=\"../dist/android/<version-androidbundle-tor>-orbot-<version-"
-"androidbundle-orbot>.apk\">Android Bundle</a>"
+msgid "Nokia Maemo/N900"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:229
-msgid "<a href=\"<page docs/android>\">Android Instructions</a>"
+#. type: Content of: <div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:234
+msgid "<span class=\"sourcecode24\">Source Code</span>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:232
-msgid "iPhone, iPod Touch, iPad"
+#. type: Content of: <div><div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:239
+msgid ""
+"<a class=\"button\" href=\"../dist/tor-<version-stable>.tar.gz\"><span class="
+"\"strong\">Download</span><span class=\"normal\">Source Code</span></a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:233
+#. type: Content of: <div><div><div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:241
 msgid ""
-"<span class=\"mac\"><a href=\"http://sid77.slackware.it/iphone/\";>Test "
-"packages by Marco</a></span>"
+"(<a href=\"../dist/tor-<version-stable>.tar.gz.asc\">sig</a>) <a class="
+"\"siginfo\" href=\"<page docs/verifying-signatures>\">What's This?</a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:236
-msgid "Nokia Maemo/N900"
+#. type: Content of: <div><div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:243
+msgid ""
+"<a class=\"button\" href=\"../dist/tor-<version-alpha>.tar.gz\"><span class="
+"\"strong\">Download</span><span class=\"normal\">Source Code (Unstable)</"
+"span></a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:238
+#. type: Content of: <div><div><div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:245
 msgid ""
-"<span class=\"nokia\"><a href=\"<page docs/N900>\">Experimental "
-"instructions</a></span>"
+"(<a href=\"../dist/tor-<version-alpha>.tar.gz.asc\">sig</a>) <a class="
+"\"siginfo\" href=\"<page docs/verifying-signatures>\">What's This?</a>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td><div>
-#: /home/runa/tor/website/download/en/download.wml:246
-msgid "<a name=\"source\">Source&nbsp;Code</a>"
-msgstr ""
-
-#. type: Content of: <div><div><table><tr><td>
+#. type: Content of: <div><div><div><div><h2>
 #: /home/runa/tor/website/download/en/download.wml:249
-msgid ""
-"The current stable version of Tor is <version-stable>.  Its <a href="
-"\"https://gitweb.torproject.org/tor.git/blob/release-0.2.1:/ChangeLog";
-"\">release notes</a> are available."
+msgid "Source Tarball"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:252
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/tor/website/download/en/download.wml:250
 msgid ""
-"The current unstable/alpha version of Tor is <version-alpha>.  Its <a href="
-"\"https://gitweb.torproject.org/tor.git/blob/refs/heads/release-0.2.2:/";
-"ChangeLog\">Changelog </a> is available."
+"Configure with: <code style=\"color: #666666;\">./configure &amp;&amp; make "
+"&amp;&amp; src/or/tor</code>"
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:258
-msgid "Source Tarballs"
-msgstr ""
-
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:259
-msgid "./configure &amp;&amp; make &amp;&amp; src/or/tor"
-msgstr ""
-
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:260
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/tor/website/download/en/download.wml:251
 msgid ""
-"<a href=\"../dist/tor-<version-stable>.tar.gz\">Download Stable</a> (<a href="
-"\"../dist/tor-<version-stable>.tar.gz.asc\">sig</a>)"
+"The current stable version of Tor is <version-stable>. Its <a href=\"https://";
+"gitweb.torproject.org/tor.git/blob/release-0.2.2:/ReleaseNotes\">release "
+"notes</a> are available."
 msgstr ""
 
-#. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/download/en/download.wml:261
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/tor/website/download/en/download.wml:252
 msgid ""
-"<a href=\"../dist/tor-<version-alpha>.tar.gz\">Download Unstable</a> (<a "
-"href=\"../dist/tor-<version-alpha>.tar.gz.asc\">sig</a>)"
+"The current unstable/alpha version of Tor is <version-alpha>. Its <a href="
+"\"https://gitweb.torproject.org/tor.git/blob/HEAD:/ChangeLog\";>Changelog</a> "
+"is available."
 msgstr ""
 
 #. type: Content of: <div><div><div>
-#: /home/runa/tor/website/download/en/download.wml:265 /tmp/HFMkO3TRB0.xml:343
+#: /home/runa/tor/website/download/en/download.wml:257 /tmp/9274UDVCYT.xml:335
 msgid "<br>"
 msgstr ""
 
 #. type: Content of: <div><div><div>
-#: /home/runa/tor/website/download/en/download.wml:268
+#: /home/runa/tor/website/download/en/download.wml:260
 msgid "<a name=\"warning\"></a> <a name=\"Warning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><h2>
-#: /home/runa/tor/website/download/en/download.wml:270
+#: /home/runa/tor/website/download/en/download.wml:262
 msgid "<a class=\"anchor\" href=\"#warning\">Want Tor to really work?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><p>
-#: /home/runa/tor/website/download/en/download.wml:271
+#: /home/runa/tor/website/download/en/download.wml:263
 msgid ""
 "...then please don't just install it and go on.  You need to change some of "
 "your habits, and reconfigure your software! Tor by itself is <em>NOT</em> "
@@ -539,7 +585,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><ol><li>
-#: /home/runa/tor/website/download/en/download.wml:276
+#: /home/runa/tor/website/download/en/download.wml:268
 msgid ""
 "Tor only protects Internet applications that are configured to send their "
 "traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
@@ -549,7 +595,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><ol><li>
-#: /home/runa/tor/website/download/en/download.wml:284
+#: /home/runa/tor/website/download/en/download.wml:276
 msgid ""
 "Torbutton blocks browser plugins such as Java, Flash, ActiveX, RealPlayer, "
 "Quicktime, Adobe's PDF plugin, and others: they can be manipulated into "
@@ -563,7 +609,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><ol><li>
-#: /home/runa/tor/website/download/en/download.wml:297
+#: /home/runa/tor/website/download/en/download.wml:289
 msgid ""
 "Beware of cookies: if you ever browse without Tor and a site gives you a "
 "cookie, that cookie could identify you even when you start using Tor again. "
@@ -573,7 +619,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><ol><li>
-#: /home/runa/tor/website/download/en/download.wml:305
+#: /home/runa/tor/website/download/en/download.wml:297
 msgid ""
 "Tor anonymizes the origin of your traffic, and it encrypts everything "
 "between you and the Tor network and everything inside the Tor network, but "
@@ -588,7 +634,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><ol><li>
-#: /home/runa/tor/website/download/en/download.wml:319
+#: /home/runa/tor/website/download/en/download.wml:311
 msgid ""
 "While Tor blocks attackers on your local network from discovering or "
 "influencing your destination, it opens new risks: malicious or misconfigured "
@@ -599,7 +645,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><ol><li>
-#: /home/runa/tor/website/download/en/download.wml:328
+#: /home/runa/tor/website/download/en/download.wml:320
 msgid ""
 "Tor tries to prevent attackers from learning what destinations you connect "
 "to. It doesn't prevent somebody watching your traffic from learning that "
@@ -612,14 +658,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><ol><li>
-#: /home/runa/tor/website/download/en/download.wml:338
+#: /home/runa/tor/website/download/en/download.wml:330
 msgid ""
 "Do not use <a href=\"https://blog.torproject.org/blog/bittorrent-over-tor-";
 "isnt-good-idea\">BitTorrent and Tor</a> together."
 msgstr ""
 
 #. type: Content of: <div><div><div><p>
-#: /home/runa/tor/website/download/en/download.wml:345
+#: /home/runa/tor/website/download/en/download.wml:337
 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 "
@@ -627,59 +673,133 @@
 "issues</a>."
 msgstr ""
 
-#. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/download/en/download.wml:357
-msgid "Jump to:"
+#. type: Content of: <div><div><script>
+#: /home/runa/tor/website/download/en/download.wml:350
+msgid ""
+"function displayVals() { var t3 = $(\"#t3\").val(); var amount = $(\"#amount"
+"\").val(); if(t3 != 0){ $('#a3').val(amount); $('#p3').val(1); $('#cmd').val"
+"('_xclick-subscriptions'); $('#item_name').val('Tor Project Membership'); "
+"$('#ppinfo').replaceWith('"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:359
-msgid "<a href=\"#Windows\">Microsoft Windows</a>"
+#. type: Content of: <div><div><script><h6>
+#: /home/runa/tor/website/download/en/download.wml:358
+msgid "<small>(Requires a PayPal Account)</small>"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:360
-msgid "<a href=\"#mac\">Apple OS X</a>"
+#. type: Content of: <div><div><script>
+#: /home/runa/tor/website/download/en/download.wml:358
+msgid ""
+"'); }else{ $('#a3').val(0); $('#p3').val(0); $('#cmd').val('_donations'); "
+"$('#item_name').val('Donation to the Tor Project'); $('#ppinfo').replaceWith"
+"('"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:361
-msgid "<a href=\"#linux\">Linux/Unix</a>"
+#. type: Content of: <div><div><script>
+#: /home/runa/tor/website/download/en/download.wml:364
+msgid ""
+"'); } if( !t3 ) { $('#cmd').val('_donations'); $('#item_name').val('Donation "
+"to the Tor Project'); $('#ppinfo').replaceWith('"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:362
-msgid "<a href=\"#smartphones\">Smartphones</a>"
+#. type: Content of: <div><div><script>
+#: /home/runa/tor/website/download/en/download.wml:369
+msgid ""
+"'); } } $(function(){ $(\"#amount\").change(displayVals); $(\"#t3\").change"
+"(displayVals); displayVals(); });"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:363
-msgid "<a href=\"#source\">Source Code</a>"
+#. type: Content of: <div><div><form><h2>
+#: /home/runa/tor/website/download/en/download.wml:379
+msgid "Donate to Tor"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/download/en/download.wml:370
-msgid "What is the (sig) link?"
+#. type: Content of: <div><div><form><p><select>
+#: /home/runa/tor/website/download/en/download.wml:381
+msgid "<select name=\"currency_code\" class=\"cur\">"
 msgstr ""
 
-#. type: Content of: <div><div><div><div><p>
-#: /home/runa/tor/website/download/en/download.wml:371
+#. type: Content of: <div><div><form><p><select><option>
+#: /home/runa/tor/website/download/en/download.wml:382
+msgid "$"
+msgstr ""
+
+#. type: Content of: <div><div><form><p><select><option>
+#: /home/runa/tor/website/download/en/download.wml:383
+msgid "&euro;"
+msgstr ""
+
+#. type: Content of: <div><div><form><p><select><option>
+#: /home/runa/tor/website/download/en/download.wml:384
+msgid "&pound;"
+msgstr ""
+
+#. type: Content of: <div><div><form><p><select><option>
+#: /home/runa/tor/website/download/en/download.wml:385
+msgid "&yen;"
+msgstr ""
+
+#. type: Content of: <div><div><form><p>
+#: /home/runa/tor/website/download/en/download.wml:386
 msgid ""
-"These are GPG signatures to allow you to verify that your downloaded file is "
-"really from The Tor Project and not an imposter."
+"</select> <input type=\"text\" id=\"amount\" class=\"amount\" name=\"amount"
+"\" value=\"5\" size=\"10\">"
 msgstr ""
 
-#. type: Content of: <div><div><div><div>
-#: /home/runa/tor/website/download/en/download.wml:374
-msgid "<a href=\"<page docs/verifying-signatures>\">Learn more &raquo;</a>"
+#. type: Content of: <div><div><form><p><select>
+#: /home/runa/tor/website/download/en/download.wml:390
+msgid ""
+"<input type=\"hidden\" id=\"a3\" name=\"a3\" value=\"0\"> <select id=\"t3\" "
+"name=\"t3\">"
 msgstr ""
 
+#. type: Content of: <div><div><form><p><select><option>
+#: /home/runa/tor/website/download/en/download.wml:392
+msgid "One-time Donation"
+msgstr ""
+
+#. type: Content of: <div><div><form><p><select><option>
+#: /home/runa/tor/website/download/en/download.wml:393
+msgid "Monthly Subscription"
+msgstr ""
+
+#. type: Content of: <div><div><form><p>
+#: /home/runa/tor/website/download/en/download.wml:394
+msgid "</select>"
+msgstr ""
+
+#. type: Content of: <div><div><form><p>
+#: /home/runa/tor/website/download/en/download.wml:397
+msgid ""
+"<input type=\"hidden\" id=\"p3\" name=\"p3\" value=\"1\"> <input type="
+"\"hidden\" name=\"sra\" value=\"1\"> <input type=\"hidden\" name=\"src\" "
+"value=\"1\"> <input type=\"hidden\" name=\"no_shipping\" value=\"1\"> <input "
+"type=\"hidden\" name=\"no_note\" value=\"1\"> <input type=\"hidden\" id=\"cmd"
+"\" name=\"cmd\" value=\"_donations\"> <input type=\"hidden\" name=\"business"
+"\" value=\"donations@xxxxxxxxxxxxxx\"> <input type=\"hidden\" id=\"item_name"
+"\" name=\"item_name\" value=\"Donation to the Tor Project\"> <input type="
+"\"hidden\" name=\"return\" value=\"https://www.torproject.org/donate/";
+"thankyou.html\"> <input type=\"hidden\" name=\"cancel_return\" value="
+"\"https://www.torproject.org/download/download.html\";>"
+msgstr ""
+
+#. type: Content of: <div><div><form><p>
+#: /home/runa/tor/website/download/en/download.wml:410
+msgid ""
+"<input class=\"donate-btn\" type=\"submit\" name=\"donate\" value=\"Donate\">"
+msgstr ""
+
+#. type: Content of: <div><div><form><p>
+#: /home/runa/tor/website/download/en/download.wml:412
+msgid "<a href=\"<page donate/donate>\">Other donation options...</a>"
+msgstr ""
+
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/download/en/download.wml:380
+#: /home/runa/tor/website/download/en/download.wml:418
 msgid "Having Trouble?"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/download/en/download.wml:382
+#: /home/runa/tor/website/download/en/download.wml:420
 msgid "<a href=\"<page docs/documentation>\">Read the fine manuals</a>"
 msgstr ""

Modified: translation/trunk/projects/website/po/templates/projects/1-high.torbrowser.pot
===================================================================
--- translation/trunk/projects/website/po/templates/projects/1-high.torbrowser.pot	2011-09-04 22:27:54 UTC (rev 25021)
+++ translation/trunk/projects/website/po/templates/projects/1-high.torbrowser.pot	2011-09-04 23:03:56 UTC (rev 25022)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-08-30 08:50+0200\n"
+"POT-Creation-Date: 2011-09-05 00:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -235,120 +235,164 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:100
+#: /home/runa/tor/website/projects/en/torbrowser.wml:101
 msgid ""
-"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
-"dev-osx-i386-en-US.zip\">English (en-US)</a> (<a href=\"../dist/torbrowser/"
-"osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc\" "
-"style=\"font-size: 90%;\">signature</a>)"
+"English (en-US): <a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-en-US.zip\">32-bit</a> (<a href=\"../dist/"
+"torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US."
+"zip.asc\" style=\"font-size: 90%;\">signature</a>) | <a href=\"../dist/"
+"torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-en-US."
+"zip\">64-bit</a> (<a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-x86_64-en-US.zip.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:103
+#: /home/runa/tor/website/projects/en/torbrowser.wml:106
 msgid ""
-"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
-"dev-osx-i386-ar.zip\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;"
-"&#x0629; (ar)</a> (<a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar):<a href=\"../"
+"dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar."
+"zip\">32-bit</a> (<a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
 "torbrowserbundleosx>-dev-osx-i386-ar.zip.asc\" style=\"font-size: 90%;"
-"\">signature</a>)"
+"\">signature</a>) | <a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-x86_64-ar.zip\">64-bit</a> (<a href=\"../dist/"
+"torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-ar."
+"zip.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:107
+#: /home/runa/tor/website/projects/en/torbrowser.wml:110
 msgid ""
-"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
-"dev-osx-i386-de.zip\">Deutsch (de)</a> (<a href=\"../dist/torbrowser/osx/"
-"TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-de.zip.asc\" style="
-"\"font-size: 90%;\">signature</a>)"
+"Deutsch (de):<a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-de.zip\">32-bit</a> (<a href=\"../dist/"
+"torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-de.zip."
+"asc\" style=\"font-size: 90%;\">signature</a>) | <a href=\"../dist/"
+"torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-de.zip"
+"\">64-bit</a> (<a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-x86_64-de.zip.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:110
+#: /home/runa/tor/website/projects/en/torbrowser.wml:115
 msgid ""
-"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
-"dev-osx-i386-es-ES.zip\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;"
-"&#x006c; (es-ES)</a> (<a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
-"torbrowserbundleosx>-dev-osx-i386-es-ES.zip.asc\" style=\"font-size: 90%;"
-"\">signature</a>)"
+"&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES):<a href="
+"\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-"
+"i386-es-ES.zip\">32-bit</a> (<a href=\"../dist/torbrowser/osx/TorBrowser-"
+"<version-torbrowserbundleosx>-dev-osx-i386-es-ES.zip.asc\" style=\"font-"
+"size: 90%;\">signature</a>) | <a href=\"../dist/torbrowser/osx/TorBrowser-"
+"<version-torbrowserbundleosx>-dev-osx-x86_64-es-ES.zip\">64-bit</a> (<a href="
+"\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-"
+"x86_64-es-ES.zip.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:114
+#: /home/runa/tor/website/projects/en/torbrowser.wml:121
 msgid ""
-"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
-"dev-osx-i386-fa.zip\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa) </a> (<a "
-"href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
-"osx-i386-fa.zip.asc\" style=\"font-size: 90%;\">signature</a>)"
+"&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa):<a href=\"../dist/torbrowser/"
+"osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa.zip\">32-bit</"
+"a> (<a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-fa.zip.asc\" style=\"font-size: 90%;"
+"\">signature</a>) | <a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-x86_64-fa.zip\">64-bit</a> (<a href=\"../dist/"
+"torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-fa."
+"zip.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:117
+#: /home/runa/tor/website/projects/en/torbrowser.wml:127
 msgid ""
-"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
-"dev-osx-i386-fr.zip\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;"
-"&#x0069;&#x0073; (fr)</a> (<a href=\"../dist/torbrowser/osx/TorBrowser-"
+"&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr):<a "
+"href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-fr.zip\">32-bit</a> (<a href=\"../dist/torbrowser/osx/TorBrowser-"
 "<version-torbrowserbundleosx>-dev-osx-i386-fr.zip.asc\" style=\"font-size: "
-"90%;\">signature</a>)"
+"90%;\">signature</a>) | <a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-x86_64-fr.zip\">64-bit</a> (<a href=\"../dist/"
+"torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-fr."
+"zip.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:120
+#: /home/runa/tor/website/projects/en/torbrowser.wml:133
 msgid ""
-"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
-"dev-osx-i386-it.zip\">Italiano (it)</a> (<a href=\"../dist/torbrowser/osx/"
-"TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-it.zip.asc\" style="
-"\"font-size: 90%;\">signature</a>)"
+"Italiano (it):<a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-it.zip\">32-bit</a> (<a href=\"../dist/"
+"torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-it.zip."
+"asc\" style=\"font-size: 90%;\">signature</a>) | <a href=\"../dist/"
+"torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-it.zip"
+"\">64-bit</a> (<a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-x86_64-it.zip.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:123
+#: /home/runa/tor/website/projects/en/torbrowser.wml:140
 msgid ""
-"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
-"dev-osx-i386-nl.zip\">Nederlands (nl)</a> (<a href=\"../dist/torbrowser/osx/"
-"TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-nl.zip.asc\" style="
-"\"font-size: 90%;\">signature</a>)"
+"Nederlands (nl):<a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-nl.zip\">32-bit</a> (<a href=\"../dist/"
+"torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-nl.zip."
+"asc\" style=\"font-size: 90%;\">signature</a>) | <a href=\"../dist/"
+"torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-nl.zip"
+"\">64-bit</a> (<a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-x86_64-nl.zip.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:126
+#: /home/runa/tor/website/projects/en/torbrowser.wml:146
 msgid ""
-"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
-"dev-osx-i386-pl.zip\">Polish (pl)</a> (<a href=\"../dist/torbrowser/osx/"
-"TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pl.zip.asc\" style="
-"\"font-size: 90%;\">signature</a>)"
+"Polish (pl):<a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-pl.zip\">32-bit</a> (<a href=\"../dist/"
+"torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pl.zip."
+"asc\" style=\"font-size: 90%;\">signature</a>) | <a href=\"../dist/"
+"torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-pl.zip"
+"\">64-bit</a> (<a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-x86_64-pl.zip.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:129
+#: /home/runa/tor/website/projects/en/torbrowser.wml:152
 msgid ""
-"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
-"dev-osx-i386-pt-PT.zip\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;"
-"&#x0075;&#x00ea;&#x0073; (pt-PT)</a> (<a href=\"../dist/torbrowser/osx/"
-"TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-PT.zip.asc\" style="
-"\"font-size: 90%;\">signature</a>)"
+"&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; (pt-"
+"PT):<a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-pt-PT.zip\">32-bit</a> (<a href=\"../dist/"
+"torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-PT."
+"zip.asc\" style=\"font-size: 90%;\">signature</a>) | <a href=\"../dist/"
+"torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-pt-PT."
+"zip\">64-bit</a> (<a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-x86_64-pt-PT.zip.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:132
+#: /home/runa/tor/website/projects/en/torbrowser.wml:158
 msgid ""
-"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
-"dev-osx-i386-ru.zip\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;"
-"&#x0439; (ru)</a> (<a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru):<a href=\"../"
+"dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru."
+"zip\">32-bit</a> (<a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
 "torbrowserbundleosx>-dev-osx-i386-ru.zip.asc\" style=\"font-size: 90%;"
-"\">signature</a>)"
+"\">signature</a>) | <a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-x86_64-ru.zip\">64-bit</a> (<a href=\"../dist/"
+"torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-ru."
+"zip.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:136
+#: /home/runa/tor/website/projects/en/torbrowser.wml:164
 msgid ""
-"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-"
-"dev-osx-i386-zh-CN.zip\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"../"
-"dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-zh-"
-"CN.zip.asc\" style=\"font-size: 90%;\">signature</a>)"
+"&#x7b80;&#x4f53;&#x5b57; (zh-CN):<a href=\"../dist/torbrowser/osx/TorBrowser-"
+"<version-torbrowserbundleosx>-dev-osx-i386-zh-CN.zip\">32-bit</a> (<a href="
+"\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-"
+"i386-zh-CN.zip.asc\" style=\"font-size: 90%;\">signature</a>) | <a href=\"../"
+"dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-"
+"zh-CN.zip\">64-bit</a> (<a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-x86_64-zh-CN.zip.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:143
+#: /home/runa/tor/website/projects/en/torbrowser.wml:172
 msgid ""
 "BETA: Tor Browser Bundle for Linux with Firefox (version <version-"
 "torbrowserbundlelinux32> (32-bit), <version-torbrowserbundlelinux64> (64-"
@@ -356,180 +400,180 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:146
+#: /home/runa/tor/website/projects/en/torbrowser.wml:175
 msgid ""
 "English (en-US): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
 "i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz\">32-bit</a> (<a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
 "torbrowserbundlelinux32>-dev-en-US.tar.gz.asc\" style=\"font-size: 90%;"
-"\">sig</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
+"\">signature</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
 "x86_64-<version-torbrowserbundlelinux64>-dev-en-US.tar.gz\">64-bit</a> (<a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
 "torbrowserbundlelinux64>-dev-en-US.tar.gz.asc\" style=\"font-size: 90%;"
-"\">sig</a>)"
+"\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:149
+#: /home/runa/tor/website/projects/en/torbrowser.wml:178
 msgid ""
 "&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar): <a href=\"../"
 "dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
 "torbrowserbundlelinux32>-dev-ar.tar.gz\">32-bit</a> (<a href=\"../dist/"
 "torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
-"torbrowserbundlelinux32>-dev-ar.tar.gz.asc\" style=\"font-size: 90%;\">sig</"
-"a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-"
-"<version-torbrowserbundlelinux64>-dev-ar.tar.gz\">64-bit</a> (<a href=\"../"
-"dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
-"torbrowserbundlelinux64>-dev-ar.tar.gz.asc\" style=\"font-size: 90%;\">sig</"
-"a>)"
+"torbrowserbundlelinux32>-dev-ar.tar.gz.asc\" style=\"font-size: 90%;"
+"\">signature</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
+"x86_64-<version-torbrowserbundlelinux64>-dev-ar.tar.gz\">64-bit</a> (<a href="
+"\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
+"torbrowserbundlelinux64>-dev-ar.tar.gz.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:151
+#: /home/runa/tor/website/projects/en/torbrowser.wml:180
 msgid ""
 "Deutsch (de): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-"
 "<version-torbrowserbundlelinux32>-dev-de.tar.gz\">32-bit</a> (<a href=\"../"
 "dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
-"torbrowserbundlelinux32>-dev-de.tar.gz.asc\" style=\"font-size: 90%;\">sig</"
-"a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-"
-"<version-torbrowserbundlelinux64>-dev-de.tar.gz\">64-bit</a> (<a href=\"../"
-"dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
-"torbrowserbundlelinux64>-dev-de.tar.gz.asc\" style=\"font-size: 90%;\">sig</"
-"a>)"
+"torbrowserbundlelinux32>-dev-de.tar.gz.asc\" style=\"font-size: 90%;"
+"\">signature</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
+"x86_64-<version-torbrowserbundlelinux64>-dev-de.tar.gz\">64-bit</a> (<a href="
+"\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
+"torbrowserbundlelinux64>-dev-de.tar.gz.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:153
+#: /home/runa/tor/website/projects/en/torbrowser.wml:182
 msgid ""
 "&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES): <a href="
 "\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
 "torbrowserbundlelinux32>-dev-es-ES.tar.gz\">32-bit</a> (<a href=\"../dist/"
 "torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
 "torbrowserbundlelinux32>-dev-es-ES.tar.gz.asc\" style=\"font-size: 90%;"
-"\">sig</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
+"\">signature</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
 "x86_64-<version-torbrowserbundlelinux64>-dev-es-ES.tar.gz\">64-bit</a> (<a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
 "torbrowserbundlelinux64>-dev-es-ES.tar.gz.asc\" style=\"font-size: 90%;"
-"\">sig</a>)"
+"\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:155
+#: /home/runa/tor/website/projects/en/torbrowser.wml:184
 msgid ""
 "&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa): <a href=\"../dist/torbrowser/"
 "linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-fa."
 "tar.gz\">32-bit</a> (<a href=\"../dist/torbrowser/linux/tor-browser-gnu-"
 "linux-i686-<version-torbrowserbundlelinux32>-dev-fa.tar.gz.asc\" style="
-"\"font-size: 90%;\">sig</a>) | <a href=\"../dist/torbrowser/linux/tor-"
+"\"font-size: 90%;\">signature</a>) | <a href=\"../dist/torbrowser/linux/tor-"
 "browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-fa.tar.gz"
 "\">64-bit</a> (<a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
 "x86_64-<version-torbrowserbundlelinux64>-dev-fa.tar.gz.asc\" style=\"font-"
-"size: 90%;\">sig</a>)"
+"size: 90%;\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:157
+#: /home/runa/tor/website/projects/en/torbrowser.wml:186
 msgid ""
 "&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
 "torbrowserbundlelinux32>-dev-fr.tar.gz\">32-bit</a> (<a href=\"../dist/"
 "torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
-"torbrowserbundlelinux32>-dev-fr.tar.gz.asc\" style=\"font-size: 90%;\">sig</"
-"a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-"
-"<version-torbrowserbundlelinux64>-dev-fr.tar.gz\">64-bit</a> (<a href=\"../"
-"dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
-"torbrowserbundlelinux64>-dev-fr.tar.gz.asc\" style=\"font-size: 90%;\">sig</"
-"a>)"
+"torbrowserbundlelinux32>-dev-fr.tar.gz.asc\" style=\"font-size: 90%;"
+"\">signature</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
+"x86_64-<version-torbrowserbundlelinux64>-dev-fr.tar.gz\">64-bit</a> (<a href="
+"\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
+"torbrowserbundlelinux64>-dev-fr.tar.gz.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:159
+#: /home/runa/tor/website/projects/en/torbrowser.wml:188
 msgid ""
 "Italiano (it): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-"
 "<version-torbrowserbundlelinux32>-dev-it.tar.gz\">32-bit</a> (<a href=\"../"
 "dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
-"torbrowserbundlelinux32>-dev-it.tar.gz.asc\" style=\"font-size: 90%;\">sig</"
-"a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-"
-"<version-torbrowserbundlelinux64>-dev-it.tar.gz\">64-bit</a> (<a href=\"../"
-"dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
-"torbrowserbundlelinux64>-dev-it.tar.gz.asc\" style=\"font-size: 90%;\">sig</"
-"a>)"
+"torbrowserbundlelinux32>-dev-it.tar.gz.asc\" style=\"font-size: 90%;"
+"\">signature</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
+"x86_64-<version-torbrowserbundlelinux64>-dev-it.tar.gz\">64-bit</a> (<a href="
+"\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
+"torbrowserbundlelinux64>-dev-it.tar.gz.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:161
+#: /home/runa/tor/website/projects/en/torbrowser.wml:190
 msgid ""
 "Nederlands (nl): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
 "i686-<version-torbrowserbundlelinux32>-dev-nl.tar.gz\">32-bit</a> (<a href="
 "\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
-"torbrowserbundlelinux32>-dev-nl.tar.gz.asc\" style=\"font-size: 90%;\">sig</"
-"a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-"
-"<version-torbrowserbundlelinux64>-dev-nl.tar.gz\">64-bit</a> (<a href=\"../"
-"dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
-"torbrowserbundlelinux64>-dev-nl.tar.gz.asc\" style=\"font-size: 90%;\">sig</"
-"a>)"
+"torbrowserbundlelinux32>-dev-nl.tar.gz.asc\" style=\"font-size: 90%;"
+"\">signature</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
+"x86_64-<version-torbrowserbundlelinux64>-dev-nl.tar.gz\">64-bit</a> (<a href="
+"\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
+"torbrowserbundlelinux64>-dev-nl.tar.gz.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:163
+#: /home/runa/tor/website/projects/en/torbrowser.wml:192
 msgid ""
 "Polish (pl): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-"
 "<version-torbrowserbundlelinux32>-dev-pl.tar.gz\">32-bit</a> (<a href=\"../"
 "dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
-"torbrowserbundlelinux32>-dev-pl.tar.gz.asc\" style=\"font-size: 90%;\">sig</"
-"a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-"
-"<version-torbrowserbundlelinux64>-dev-pl.tar.gz\">64-bit</a> (<a href=\"../"
-"dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
-"torbrowserbundlelinux64>-dev-pl.tar.gz.asc\" style=\"font-size: 90%;\">sig</"
-"a>)"
+"torbrowserbundlelinux32>-dev-pl.tar.gz.asc\" style=\"font-size: 90%;"
+"\">signature</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
+"x86_64-<version-torbrowserbundlelinux64>-dev-pl.tar.gz\">64-bit</a> (<a href="
+"\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
+"torbrowserbundlelinux64>-dev-pl.tar.gz.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:165
+#: /home/runa/tor/website/projects/en/torbrowser.wml:194
 msgid ""
 "&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; (pt-"
 "PT): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
 "torbrowserbundlelinux32>-dev-pt-PT.tar.gz\">32-bit</a> (<a href=\"../dist/"
 "torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
 "torbrowserbundlelinux32>-dev-pt-PT.tar.gz.asc\" style=\"font-size: 90%;"
-"\">sig</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
+"\">signature</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
 "x86_64-<version-torbrowserbundlelinux64>-dev-pt-PT.tar.gz\">64-bit</a> (<a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
 "torbrowserbundlelinux64>-dev-pt-PT.tar.gz.asc\" style=\"font-size: 90%;"
-"\">sig</a>)"
+"\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:167
+#: /home/runa/tor/website/projects/en/torbrowser.wml:196
 msgid ""
 "&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru): <a href=\"../"
 "dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
 "torbrowserbundlelinux32>-dev-ru.tar.gz\">32-bit</a> (<a href=\"../dist/"
 "torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
-"torbrowserbundlelinux32>-dev-ru.tar.gz.asc\" style=\"font-size: 90%;\">sig</"
-"a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-"
-"<version-torbrowserbundlelinux64>-dev-ru.tar.gz\">64-bit</a> (<a href=\"../"
-"dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
-"torbrowserbundlelinux64>-dev-ru.tar.gz.asc\" style=\"font-size: 90%;\">sig</"
-"a>)"
+"torbrowserbundlelinux32>-dev-ru.tar.gz.asc\" style=\"font-size: 90%;"
+"\">signature</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
+"x86_64-<version-torbrowserbundlelinux64>-dev-ru.tar.gz\">64-bit</a> (<a href="
+"\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
+"torbrowserbundlelinux64>-dev-ru.tar.gz.asc\" style=\"font-size: 90%;"
+"\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:169
+#: /home/runa/tor/website/projects/en/torbrowser.wml:198
 msgid ""
 "&#x7b80;&#x4f53;&#x5b57; (zh-CN): <a href=\"../dist/torbrowser/linux/tor-"
 "browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-zh-CN.tar.gz"
 "\">32-bit</a> (<a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-"
 "<version-torbrowserbundlelinux32>-dev-zh-CN.tar.gz.asc\" style=\"font-size: "
-"90%;\">sig</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
-"x86_64-<version-torbrowserbundlelinux64>-dev-zh-CN.tar.gz\">64-bit</a> (<a "
-"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
+"90%;\">signature</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-"
+"linux-x86_64-<version-torbrowserbundlelinux64>-dev-zh-CN.tar.gz\">64-bit</a> "
+"(<a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
 "torbrowserbundlelinux64>-dev-zh-CN.tar.gz.asc\" style=\"font-size: 90%;"
-"\">sig</a>)"
+"\">signature</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:175
+#: /home/runa/tor/website/projects/en/torbrowser.wml:204
 msgid ""
 "See our instructions on <a href=\"<page docs/verifying-signatures>\">how to "
 "verify package signatures</a>, which allows you to make sure you've "
@@ -541,17 +585,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:185
+#: /home/runa/tor/website/projects/en/torbrowser.wml:214
 msgid "<a id=\"MacOSX\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:186
+#: /home/runa/tor/website/projects/en/torbrowser.wml:215
 msgid "<a class=\"anchor\" href=\"#MacOSX\">Mac OS X instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:187
+#: /home/runa/tor/website/projects/en/torbrowser.wml:216
 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 "
@@ -561,24 +605,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:193
+#: /home/runa/tor/website/projects/en/torbrowser.wml:222
 msgid ""
 "<img src=\"$(IMGROOT)/screenshot-osx-torbrowser-icon.png\" alt=\"Screenshot "
 "Mac OS X bundle\" />"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:195
+#: /home/runa/tor/website/projects/en/torbrowser.wml:224
 msgid "<a id=\"Linux\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:196
+#: /home/runa/tor/website/projects/en/torbrowser.wml:225
 msgid "<a class=\"anchor\" href=\"#Linux\">Linux instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:197
+#: /home/runa/tor/website/projects/en/torbrowser.wml:226
 msgid ""
 "Download the architecture-appropriate file above, save it somewhere, then "
 "run:<br> <code>tar -xvzf tor-browser-gnu-linux-i686-<version-"
@@ -592,27 +636,27 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:206
+#: /home/runa/tor/website/projects/en/torbrowser.wml:235
 msgid "<a id=\"Windows\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:207
+#: /home/runa/tor/website/projects/en/torbrowser.wml:236
 msgid "<a class=\"anchor\" href=\"#Windows\">Windows instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:209
+#: /home/runa/tor/website/projects/en/torbrowser.wml:238
 msgid "<a id=\"Extraction\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h4>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:210
+#: /home/runa/tor/website/projects/en/torbrowser.wml:239
 msgid "<a class=\"anchor\" href=\"#Extraction\">Extraction</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:212
+#: /home/runa/tor/website/projects/en/torbrowser.wml:241
 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 "
@@ -624,57 +668,57 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:220
+#: /home/runa/tor/website/projects/en/torbrowser.wml:249
 msgid ""
 "Click <strong>Extract</strong> (3) to begin extraction. This may take a few "
 "minutes to complete."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:223
+#: /home/runa/tor/website/projects/en/torbrowser.wml:252
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot1.jpg\" alt=\"Screenshot of extraction "
 "process\" />"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:226
+#: /home/runa/tor/website/projects/en/torbrowser.wml:255
 msgid "<a id=\"Usage\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h4>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:227
+#: /home/runa/tor/website/projects/en/torbrowser.wml:256
 msgid "<a class=\"anchor\" href=\"#Usage\">Usage</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:229
+#: /home/runa/tor/website/projects/en/torbrowser.wml:258
 msgid ""
 "Once extraction is complete, open the folder <strong>Tor Browser</strong> "
 "from the location you saved the bundle."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:231
+#: /home/runa/tor/website/projects/en/torbrowser.wml:260
 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><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:234
+#: /home/runa/tor/website/projects/en/torbrowser.wml:263
 msgid "The Vidalia window will shortly appear."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:236
+#: /home/runa/tor/website/projects/en/torbrowser.wml:265
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot2.jpg\" alt=\"Screenshot of bundle "
 "startup\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:239
+#: /home/runa/tor/website/projects/en/torbrowser.wml:268
 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 "
@@ -686,14 +730,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:246
+#: /home/runa/tor/website/projects/en/torbrowser.wml:275
 msgid ""
 "If you installed the Tor IM Browser Bundle, the Pidgin instant messaging "
 "client will also be automatically opened."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:248
+#: /home/runa/tor/website/projects/en/torbrowser.wml:277
 msgid ""
 "Once you are finished browsing, close any open Firefox windows by clicking "
 "on the <img src=\"$(IMGROOT)/tbb-close-button.png\" alt=\"Close button "
@@ -702,13 +746,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:254
+#: /home/runa/tor/website/projects/en/torbrowser.wml:283
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot3a.jpg\" alt=\"Screenshot of Firefox\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:257
+#: /home/runa/tor/website/projects/en/torbrowser.wml:286
 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 "
@@ -716,20 +760,20 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:259
+#: /home/runa/tor/website/projects/en/torbrowser.wml:288
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot3b.jpg\" alt=\"Screenshot of Pidgin\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:262
+#: /home/runa/tor/website/projects/en/torbrowser.wml:291
 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><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:264
+#: /home/runa/tor/website/projects/en/torbrowser.wml:293
 msgid ""
 "Remember that Tor anonymizes the origin of your traffic, and it encrypts "
 "everything inside the Tor network, but <a href=\"<wikifaq>#ExitEavesdroppers"
@@ -740,17 +784,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:272
+#: /home/runa/tor/website/projects/en/torbrowser.wml:301
 msgid "<a id=\"Feedback\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:273
+#: /home/runa/tor/website/projects/en/torbrowser.wml:302
 msgid "<a class=\"anchor\" href=\"#Feedback\">Comments and suggestions</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:275
+#: /home/runa/tor/website/projects/en/torbrowser.wml:304
 msgid ""
 "The Tor Browser Bundle is under development and not yet complete.  To "
 "discuss improvements and submit comments, please use the <a href=\"https://";
@@ -759,40 +803,40 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:280
+#: /home/runa/tor/website/projects/en/torbrowser.wml:309
 msgid "<a id=\"More\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:281
+#: /home/runa/tor/website/projects/en/torbrowser.wml:310
 msgid "<a class=\"anchor\" href=\"#More\">More information</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:283
+#: /home/runa/tor/website/projects/en/torbrowser.wml:312
 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><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:287
+#: /home/runa/tor/website/projects/en/torbrowser.wml:316
 msgid ""
 "<strong>What is in the Tor Browser Bundle?</strong> It contains Tor, "
-"Vidalia, Polipo, Firefox, and Torbutton (<a href=\"<page projects/torbrowser-"
+"Vidalia, Firefox, and Torbutton (<a href=\"<page projects/torbrowser-"
 "details>#contents\">learn more</a>)."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:291
+#: /home/runa/tor/website/projects/en/torbrowser.wml:320
 msgid ""
 "<strong>What is in the Tor IM Browser Bundle?</strong> It contains Tor, "
-"Vidalia, Polipo, Firefox, Torbutton, Pidgin and OTR (<a href=\"<page "
-"projects/torbrowser-details>#contents\">learn more</a>)."
+"Vidalia, Firefox, Torbutton, Pidgin and OTR (<a href=\"<page projects/"
+"torbrowser-details>#contents\">learn more</a>)."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:295
+#: /home/runa/tor/website/projects/en/torbrowser.wml:324
 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 "
@@ -800,7 +844,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:299
+#: /home/runa/tor/website/projects/en/torbrowser.wml:328
 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/projects/3-low.gettor.pot
===================================================================
--- translation/trunk/projects/website/po/templates/projects/3-low.gettor.pot	2011-09-04 22:27:54 UTC (rev 25021)
+++ translation/trunk/projects/website/po/templates/projects/3-low.gettor.pot	2011-09-04 23:03:56 UTC (rev 25022)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-08-30 08:50+0200\n"
+"POT-Creation-Date: 2011-09-05 00:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -85,19 +85,19 @@
 "   I am sorry, but your request was not understood. Please select one\n"
 "   of the following package names:\n"
 "\n"
-"       panther-bundle\n"
-"       source-bundle\n"
-"       windows-bundle\n"
-"       tiger-bundle\n"
-"       tor-browser-bundle\n"
-"       tor-im-browser-bundle\n"
+"      windows\n"
+"      macos-i386\n"
+"      macos-ppc\n"
+"      linux-i386\n"
+"      linux-x86_64\n"
+"      source\n"
 "\n"
 "   Please send me another email. It only needs a single package name\n"
 "   anywhere in the body of your email.\n"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/gettor.wml:55 /tmp/tTM9CfkaRF.xml:83
+#: /home/runa/tor/website/projects/en/gettor.wml:55 /tmp/61Gf53htNs.xml:83
 msgid "<br>"
 msgstr ""
 

Modified: translation/trunk/projects/website/po/templates/projects/4-optional.torbrowser-details.pot
===================================================================
--- translation/trunk/projects/website/po/templates/projects/4-optional.torbrowser-details.pot	2011-09-04 22:27:54 UTC (rev 25021)
+++ translation/trunk/projects/website/po/templates/projects/4-optional.torbrowser-details.pot	2011-09-04 23:03:56 UTC (rev 25022)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-12-26 14:32+0000\n"
+"POT-Creation-Date: 2011-09-05 00:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,7 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/projects/en/torbrowser-details.wml:9
+#: /home/runa/tor/website/projects/en/torbrowser-details.wml:9
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page projects/projects>"
 "\">Projects &raquo; </a> <a href=\"<page projects/torbrowser>\">TorBrowser</"
@@ -25,56 +25,51 @@
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/transifex/website/projects/en/torbrowser-details.wml:17
+#: /home/runa/tor/website/projects/en/torbrowser-details.wml:17
 msgid "Tor Browser Bundle: Details"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/transifex/website/projects/en/torbrowser-details.wml:18
+#: /home/runa/tor/website/projects/en/torbrowser-details.wml:18
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/transifex/website/projects/en/torbrowser-details.wml:20
+#: /home/runa/tor/website/projects/en/torbrowser-details.wml:20
 msgid "Bundle contents"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/projects/en/torbrowser-details.wml:23
+#: /home/runa/tor/website/projects/en/torbrowser-details.wml:23
 msgid "Vidalia <version-torbrowser-vidalia>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/projects/en/torbrowser-details.wml:24
+#: /home/runa/tor/website/projects/en/torbrowser-details.wml:24
 msgid "Tor <version-torbrowser-tor> (with <version-torbrowser-tor-components>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/projects/en/torbrowser-details.wml:25
+#: /home/runa/tor/website/projects/en/torbrowser-details.wml:25
 msgid ""
 "FirefoxPortable <version-torbrowser-firefox> (includes Firefox <version-"
 "torbrowser-firefox> and Torbutton <version-torbrowser-torbutton>)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/projects/en/torbrowser-details.wml:27
-msgid "Polipo <version-torbrowser-polipo>"
-msgstr ""
-
-#. type: Content of: <div><div><ul><li>
-#: /home/runa/transifex/website/projects/en/torbrowser-details.wml:28
+#: /home/runa/tor/website/projects/en/torbrowser-details.wml:27
 msgid ""
 "Pidgin <version-torbrowser-pidgin> and OTR <version-torbrowser-otr> (only in "
 "Tor IM Browser Bundle)"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/transifex/website/projects/en/torbrowser-details.wml:31
+#: /home/runa/tor/website/projects/en/torbrowser-details.wml:30
 msgid "Building the bundle"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/transifex/website/projects/en/torbrowser-details.wml:33
+#: /home/runa/tor/website/projects/en/torbrowser-details.wml:32
 msgid ""
 "To re-build the bundle, download the <a href=\"../dist/torbrowser/tor-"
 "browser-<version-torbrowserbundle>-src.tar.gz\">source distribution</a> (<a "

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
Prev by Author: [tor-commits] r25021: {website} fix download.wml when we convert from .po and make sure fa t (website/trunk)
Next by Author: [tor-commits] r25023: {translation} remove unnecessary lines from a .pot file (translation/trunk/projects/website/po/templates/download)
Previous by thread: [tor-commits] r25021: {website} fix download.wml when we convert from .po and make sure fa t (website/trunk)
Next by thread: [tor-commits] r25023: {translation} remove unnecessary lines from a .pot file (translation/trunk/projects/website/po/templates/download)
Index(es):
- Author
- Thread