[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r23412: {website} copy all of the images over from trunk, update versions, upd (in website/branches/web20: docs/en download/en images include)
Author: phobos
Date: 2010-10-05 21:12:37 +0000 (Tue, 05 Oct 2010)
New Revision: 23412
Added:
website/branches/web20/images/2008-expenses-chart.png
website/branches/web20/images/2008-funding-chart.png
website/branches/web20/images/THS-1.png
website/branches/web20/images/THS-2.png
website/branches/web20/images/THS-3.png
website/branches/web20/images/THS-4.png
website/branches/web20/images/THS-5.png
website/branches/web20/images/THS-6.png
website/branches/web20/images/beige_medium_donate_withmsg_whitebg.gif
website/branches/web20/images/btn_donateCC_LG.gif
website/branches/web20/images/cc-by-us-80x15.png
website/branches/web20/images/curve.gif
website/branches/web20/images/de.png
website/branches/web20/images/download_tor.png
website/branches/web20/images/eff_badge.png
website/branches/web20/images/en.png
website/branches/web20/images/es.png
website/branches/web20/images/fa.png
website/branches/web20/images/fi.png
website/branches/web20/images/fr.png
website/branches/web20/images/golden_medium_donate_withmsg_whitebg.gif
website/branches/web20/images/green-flagspace.png
website/branches/web20/images/how_tor_works_thumb.png
website/branches/web20/images/how_tor_works_thumb_es.png
website/branches/web20/images/how_tor_works_thumb_zh.png
website/branches/web20/images/htw1_de.png
website/branches/web20/images/htw1_es.png
website/branches/web20/images/htw1_fr.png
website/branches/web20/images/htw1_ja.png
website/branches/web20/images/htw1_nl.png
website/branches/web20/images/htw1_no.png
website/branches/web20/images/htw1_pl.png
website/branches/web20/images/htw1_ru.png
website/branches/web20/images/htw1_zh.jpg
website/branches/web20/images/htw1_zh.png
website/branches/web20/images/htw2_de.png
website/branches/web20/images/htw2_es.png
website/branches/web20/images/htw2_fr.png
website/branches/web20/images/htw2_ja.png
website/branches/web20/images/htw2_nl.png
website/branches/web20/images/htw2_no.png
website/branches/web20/images/htw2_pl.png
website/branches/web20/images/htw2_ru.png
website/branches/web20/images/htw2_zh.jpg
website/branches/web20/images/htw2_zh.png
website/branches/web20/images/htw3_de.png
website/branches/web20/images/htw3_es.png
website/branches/web20/images/htw3_fr.png
website/branches/web20/images/htw3_ja.png
website/branches/web20/images/htw3_nl.png
website/branches/web20/images/htw3_no.png
website/branches/web20/images/htw3_pl.png
website/branches/web20/images/htw3_ru.png
website/branches/web20/images/htw3_zh.jpg
website/branches/web20/images/htw3_zh.png
website/branches/web20/images/ico-osx-uni.png
website/branches/web20/images/ico-tux.png
website/branches/web20/images/ico-win.png
website/branches/web20/images/it.png
website/branches/web20/images/ja.png
website/branches/web20/images/ko.png
website/branches/web20/images/logo.windows-header.gif
website/branches/web20/images/medium-res-sticker-logo.png
website/branches/web20/images/nl.png
website/branches/web20/images/nlnet-160x60.png
website/branches/web20/images/no.png
website/branches/web20/images/onr-logo.jpg
website/branches/web20/images/pl.png
website/branches/web20/images/pt.png
website/branches/web20/images/ref_leopard_box.jpg
website/branches/web20/images/ru.png
website/branches/web20/images/se.png
website/branches/web20/images/spacer.png
website/branches/web20/images/top-left.png
website/branches/web20/images/top-middle.png
website/branches/web20/images/top-right.png
website/branches/web20/images/tor-button.png
website/branches/web20/images/tor_mast.gif
website/branches/web20/images/tor_mast.png
website/branches/web20/images/tr.png
website/branches/web20/images/vidalia-bridges-setup.png
website/branches/web20/images/vidalia-bridges.png
website/branches/web20/images/zh-cn.png
Modified:
website/branches/web20/docs/en/sidenav.wmi
website/branches/web20/download/en/download.wml
website/branches/web20/include/versions.wmi
Log:
copy all of the images over from trunk, update versions, update the docs
sidenav to name the manual pages correctly, clean up download.wml so it
actually works correctly.
Modified: website/branches/web20/docs/en/sidenav.wmi
===================================================================
--- website/branches/web20/docs/en/sidenav.wmi 2010-10-05 16:51:19 UTC (rev 23411)
+++ website/branches/web20/docs/en/sidenav.wmi 2010-10-05 21:12:37 UTC (rev 23412)
@@ -50,17 +50,17 @@
'txt' => 'Configuring a Mirror',
},
{'url' => 'docs/tor-manual',
- 'txt' => 'Tor Manual',
+ 'txt' => 'Tor -stable Manual',
},
{'url' => 'docs/tor-manual-dev',
- 'txt' => 'Tor Developer Manual',
+ 'txt' => 'Tor -alpha Manual',
}],
},
{'url' => 'docs/glossary',
'txt' => 'Glossary',
},
{
- 'url' => 'http://wiki.torproject.org',
+ 'url' => '<wiki>',
'txt' => 'Tor Wiki',
},
{'url' => 'docs/faq',
Modified: website/branches/web20/download/en/download.wml
===================================================================
--- website/branches/web20/download/en/download.wml 2010-10-05 16:51:19 UTC (rev 23411)
+++ website/branches/web20/download/en/download.wml 2010-10-05 21:12:37 UTC (rev 23412)
@@ -19,10 +19,7 @@
<td class="nopad" colspan="4"><div class="title"><a name="wim">Tor Browser Bundle</a></div></td>
</tr>
<tr>
- <td class="intro" colspan="4">The Tor Browser
- Bundle contains Tor, Vidalia, Torbutton, Polipo, and
- Firefox. This package requires no installation. Just
- extract it and run.</td>
+ <td class="intro" colspan="4">The Tor Browser Bundle contains everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.</td>
</tr>
<tr>
<td><span class="column-title">Language</span></td>
@@ -39,9 +36,15 @@
<tr>
<td>English (en-US)</td>
<td><version-torbrowserbundlelinux></td>
- <td><span class="linux"><a href="torbrowser/dist/linux/tor-im-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">Download</a></td></span></td>
+ <td><span class="linux"><a href="torbrowser/dist/linux/tor-im-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">Download</a></span></td>
<td></td>
</tr>
+ <tr class="beige">
+ <td>English (en-US)</td>
+ <td><version-torbrowserbundleosx></td>
+ <td><span class="mac"><a href="torbrowser/dist/osx/tor-browser-<version-torbrowserbundleosx>dev-osx-i386-en-US.zip"></a></span></td>
+ <td></td>
+ </tr>
</table>
<table class="topforty">
<tr>
@@ -60,13 +63,7 @@
<td><span class="windows"><a href="torbrowser/dist/tor-im-browser-<version-torbrowserbundle>_en-US.tar.gz">Download Tarball</a></span></td>
<td></td>
</tr>
- <tr>
- <td>English (en-US)</td>
- <td><version-torbrowserbundlelinux></td>
- <td><span class="linux"><a href="torbrowser/dist/linux/tor-im-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">Download</a></td></span></td>
- <td></td>
- </tr>
- </tr>
+ </tr>
</table>
<table class="topforty">
<tr>
@@ -74,21 +71,21 @@
</tr>
<tr>
<td><span class="column-title">Version</span></td>
- <td><span class="column-title">Platform</span></td>
+ <td colspan="3"><span class="column-title">Platform</span></td>
<td><span class="column-title">Source Code</span></td>
</tr>
<tr class="beige">
<td><version-stable></td>
<td><span class="windows"><a href="<package-win32-bundle-stable>">Download</a></span></td>
<td><span class="mac"><a href="<package-osx-bundle-stable>">Download</a></span>
- <td><span class="linux"><a href="<page download/download-unix/>">Unix Packages</a></span></td>
+ <td><span class="linux"><a href="<page download/download-unix>">Unix Repositories</a></span></td>
<td><a href="<package-source-stable>">Download Tarball</a></td>
</tr>
<tr>
<td><version-alpha></td>
<td><span class="windows"><a href="<package-win32-bundle-alpha>">Download</a></span></td>
<td><span class="mac"><a href="<package-osx-bundle-alpha>">Download</a></span>
- <td><span class="linux"><a href="<page download/download-unix>">Unix Packages</a></span></td>
+ <td><span class="linux"><a href="<page download/download-unix>">Unix Repositories</a></span></td>
<td><a href="<package-source-alpha>">Download Tarball</a></td>
</tr>
</table>
@@ -103,16 +100,13 @@
<td><span class="column-title">Installation Guide</span></td>
</tr>
<tr class="beige">
- <td>Android</td>
- <td></td>
- <td><package-androidbundle-alpha></td>
+ <td colspan="2">Android-based phones, tablets, computers</td>
+ <td><a href="dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk"><version-androidbundle-tor></td>
<td><a href="<page docs/android>">Instructions</a></td>
</tr>
<tr>
- <td>iPhone, iPod Touch, iPad</td>
- <td></td>
- <td><span class="mac"><a href="http://sid77.slackware.it/iphone/";>Test packages by Marco</a></span></td>
- <td></td>
+ <td colspan="2">iPhone, iPod Touch, iPad</td>
+ <td colspan="2"><span class="mac"><a href="http://sid77.slackware.it/iphone/";>Test packages by Marco</a></span></td>
</tr>
<tr class="beige">
<td>Nokia Maemo/N900</td>
@@ -135,37 +129,35 @@
<tr class="beige">
<td><span class="windows">Windows</span></td>
<td>Windows 7, Vista, XP, 2000, 2003 Server</td>
- <td><a href="#">1.3.4</a></td>
- <td><a href="#">1.3.6</a></td>
- <td><a href="#">Windows</a></td>
+ <td><a href="/dist/win32/tor-<version-win32-stable>-win32.exe"<version-win32-stable></a></td>
+ <td><a href="/dist/win32/tor-<version-win32-alpha>-win32.exe"><version-win32-alpha></a></td>
+ <td><a href="<page docs/tor-doc-windows>">Windows</a></td>
</tr>
<tr>
<td><span class="mac">Mac (Intel)</span></td>
<td>Intel only</td>
- <td><a href="#">1.3.4</a></td>
- <td><a href="#">1.3.6</a></td>
- <td><a href="#">Mac (Intel)</a></td>
+ <td><a href="/dist/osx/Tor-<version-osx-stable>-i386-Bundle.dmg"><version-osx-stable></a></td>
+ <td><a href="/dist/osx/Tor-<version-osx-alpha>-i386-Bundle.dmg"></a><version-osx-alpha></td>
+ <td><a href="<page docs/tor-doc-osx>">Mac (Intel)</a></td>
</tr>
<tr class="beige">
<td><span class="mac">Mac (Power PC)</span></td>
<td>Intel only</td>
- <td><a href="#">1.3.4</a></td>
- <td><a href="#">1.3.6</a></td>
- <td><a href="#">Mac (Power PC)</a></td>
+ <td><a href="/dist/osx-old/Tor-<version-oldosx-stable>-ppc-Bundle.dmg"><version-oldosx-stable></a></td>
+ <td><a href="dist/osx-old/Tor-<version-oldosx-alpha>-ppc-Bundle.dmg"><version-oldosx-alpha></a></td>
+ <td><a href="<page docs/tor-doc-osx>">Mac (Power PC)</a></td>
</tr>
<tr>
<td><span class="linux">Linux/Unix</span></td>
<td>Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE</td>
- <td><a href="#">1.3.4</a></td>
- <td><a href="#">1.3.6</a></td>
- <td><a href="#">Linux/Unix</a></td>
+ <td colspan="2">Read how to use <a href="<page download/download-unix>">our repositories</a>.</td>
+ <td><a href="<page download/download-unix>">Linux/Unix</a></td>
</tr>
<tr class="beige">
<td>Source Tarballs</td>
- <td>./configure && make && src/or/tor </td>
- <td><a href="#">1.3.4</a></td>
- <td> </td>
- <td><a href="#">Source Tarballs</a></td>
+ <td>./configure && make && src/or/tor</td>
+ <td><a href="/dist/tor-<version-stable>.tar.gz"><version-stable></a></td>
+ <td><a href="/dist/tor-<version-alpha>.tar.gz"><version-alpha></a></td>
</tr>
</table>
@@ -246,7 +238,7 @@
<ul>
<li class="dropdown"><a href="#wim">TorBrowser with Instant Messenger Client</a></li>
<li class="dropdown"><a href="#tbb">TorBrowser Bundles</a></li>
- <li class="dropdown"><a href="#tor">Tor Bundles</a></li>
+ <li class="dropdown"><a href="#tor">Vidalia Bundles</a></li>
<li class="dropdown"><a href="#smartphones">Tor for Smartphones</a></li>
<li class="dropdown"><a href="#expert">Expert Packages</a></li>
</ul>
@@ -256,11 +248,9 @@
<div class="img-shadow">
<div class="infoblock">
<h2>Verify Signatures</h2>
- <p>Blurb about why you should verify the signatures before you download software off the internet.</p>
- <p><a href="#">Tor Bundle for Windows</a><br />
- <a href="#">TorBrowser Bundle for Windows</a><br />
- <a href="#">Tor Bundle for Mac</a><br />
- <a href="#">Tor Bundle for Linux/Unix</a></p>
+ <p>Verify your downloads with our PGP signatures:</p>
+ <a href="<page docs/verifying-signatures>">Read how to
+verify the signatures</a>.
</div>
</div>
<!-- END INFOBLOCK -->
@@ -278,12 +268,6 @@
</div>
</div>
<!-- END SIDENAV -->
- <div class="img-shadow">
- <div class="infoblock">
- <h2>Disclaimers</h2>
- <p>Blurb about how Tor wants to do right by its users, and list of things user should be aware of, like how if they download the TorBrowser and then use Internet Explorer, that they are not being adequately protected. You can use this space to advocate for knowledge about online security to augment Tor.</p>
- </div>
- </div>
</div>
<!-- END SIDECOL -->
</div>
Added: website/branches/web20/images/2008-expenses-chart.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/2008-expenses-chart.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/2008-funding-chart.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/2008-funding-chart.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/THS-1.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/THS-1.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/THS-2.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/THS-2.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/THS-3.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/THS-3.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/THS-4.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/THS-4.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/THS-5.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/THS-5.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/THS-6.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/THS-6.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/beige_medium_donate_withmsg_whitebg.gif
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/beige_medium_donate_withmsg_whitebg.gif
___________________________________________________________________
Added: svn:mime-type
+ image/gif
Added: website/branches/web20/images/btn_donateCC_LG.gif
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/btn_donateCC_LG.gif
___________________________________________________________________
Added: svn:mime-type
+ image/gif
Added: website/branches/web20/images/cc-by-us-80x15.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/cc-by-us-80x15.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/curve.gif
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/curve.gif
___________________________________________________________________
Added: svn:mime-type
+ image/gif
Added: website/branches/web20/images/de.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/de.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/download_tor.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/download_tor.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/eff_badge.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/eff_badge.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/en.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/en.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/es.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/es.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/fa.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/fa.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/fi.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/fi.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/fr.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/fr.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/golden_medium_donate_withmsg_whitebg.gif
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/golden_medium_donate_withmsg_whitebg.gif
___________________________________________________________________
Added: svn:mime-type
+ image/gif
Added: website/branches/web20/images/green-flagspace.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/green-flagspace.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/how_tor_works_thumb.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/how_tor_works_thumb.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/how_tor_works_thumb_es.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/how_tor_works_thumb_es.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/how_tor_works_thumb_zh.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/how_tor_works_thumb_zh.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw1_de.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw1_de.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw1_es.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw1_es.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw1_fr.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw1_fr.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw1_ja.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw1_ja.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw1_nl.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw1_nl.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw1_no.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw1_no.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw1_pl.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw1_pl.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw1_ru.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw1_ru.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw1_zh.jpg
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw1_zh.jpg
___________________________________________________________________
Added: svn:mime-type
+ image/jpeg
Added: website/branches/web20/images/htw1_zh.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw1_zh.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw2_de.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw2_de.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw2_es.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw2_es.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw2_fr.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw2_fr.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw2_ja.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw2_ja.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw2_nl.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw2_nl.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw2_no.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw2_no.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw2_pl.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw2_pl.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw2_ru.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw2_ru.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw2_zh.jpg
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw2_zh.jpg
___________________________________________________________________
Added: svn:mime-type
+ image/jpeg
Added: website/branches/web20/images/htw2_zh.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw2_zh.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw3_de.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw3_de.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw3_es.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw3_es.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw3_fr.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw3_fr.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw3_ja.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw3_ja.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw3_nl.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw3_nl.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw3_no.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw3_no.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw3_pl.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw3_pl.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw3_ru.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw3_ru.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/htw3_zh.jpg
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw3_zh.jpg
___________________________________________________________________
Added: svn:mime-type
+ image/jpeg
Added: website/branches/web20/images/htw3_zh.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/htw3_zh.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/ico-osx-uni.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/ico-osx-uni.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/ico-tux.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/ico-tux.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/ico-win.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/ico-win.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/it.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/it.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/ja.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/ja.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/ko.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/ko.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/logo.windows-header.gif
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/logo.windows-header.gif
___________________________________________________________________
Added: svn:mime-type
+ image/gif
Added: website/branches/web20/images/medium-res-sticker-logo.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/medium-res-sticker-logo.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/nl.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/nl.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/nlnet-160x60.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/nlnet-160x60.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/no.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/no.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/onr-logo.jpg
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/onr-logo.jpg
___________________________________________________________________
Added: svn:mime-type
+ image/jpeg
Added: website/branches/web20/images/pl.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/pl.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/pt.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/pt.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/ref_leopard_box.jpg
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/ref_leopard_box.jpg
___________________________________________________________________
Added: svn:mime-type
+ image/jpeg
Added: website/branches/web20/images/ru.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/ru.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/se.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/se.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/spacer.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/spacer.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/top-left.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/top-left.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/top-middle.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/top-middle.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/top-right.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/top-right.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/tor-button.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/tor-button.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/tor_mast.gif
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/tor_mast.gif
___________________________________________________________________
Added: svn:mime-type
+ image/gif
Added: website/branches/web20/images/tor_mast.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/tor_mast.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/tr.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/tr.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/vidalia-bridges-setup.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/vidalia-bridges-setup.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/vidalia-bridges.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/vidalia-bridges.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: website/branches/web20/images/zh-cn.png
===================================================================
(Binary files differ)
Property changes on: website/branches/web20/images/zh-cn.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Modified: website/branches/web20/include/versions.wmi
===================================================================
--- website/branches/web20/include/versions.wmi 2010-10-05 16:51:19 UTC (rev 23411)
+++ website/branches/web20/include/versions.wmi 2010-10-05 21:12:37 UTC (rev 23412)
@@ -1,47 +1,55 @@
<define-tag version-stable whitespace=delete>0.2.1.26</define-tag>
-<define-tag version-alpha whitespace=delete>0.2.2.14-alpha</define-tag>
+<define-tag version-alpha whitespace=delete>0.2.2.17-alpha</define-tag>
<define-tag version-win32-stable whitespace=delete>0.2.1.26</define-tag>
-<define-tag version-win32-alpha whitespace=delete>0.2.2.14-alpha</define-tag>
+<define-tag version-win32-alpha whitespace=delete>0.2.2.17-alpha</define-tag>
<define-tag version-win32-bundle-stable whitespace=delete>0.2.1.26</define-tag>
-<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.14-alpha</define-tag>
+<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.17-alpha</define-tag>
<define-tag version-osx-bundle-stable whitespace=delete>0.2.1.26</define-tag>
-<define-tag version-osx-bundle-alpha whitespace=delete>0.2.2.14-alpha</define-tag>
+<define-tag version-osx-bundle-alpha whitespace=delete>0.2.2.16-alpha</define-tag>
<define-tag version-oldosx-bundle-stable whitespace=delete>0.2.1.26</define-tag>
-<define-tag version-oldosx-bundle-alpha whitespace=delete>0.2.2.14-alpha</define-tag>
+<define-tag version-oldosx-bundle-alpha whitespace=delete>0.2.2.15-alpha</define-tag>
<define-tag version-osx-stable whitespace=delete>0.2.1.26</define-tag>
-<define-tag version-osx-alpha whitespace=delete>0.2.2.14-alpha</define-tag>
+<define-tag version-osx-alpha whitespace=delete>0.2.2.16-alpha</define-tag>
<define-tag version-oldosx-stable whitespace=delete>0.2.1.26</define-tag>
-<define-tag version-oldosx-alpha whitespace=delete>0.2.2.14-alpha</define-tag>
+<define-tag version-oldosx-alpha whitespace=delete>0.2.2.15-alpha</define-tag>
-<define-tag version-torbrowserbundle whitespace=delete>1.3.9</define-tag>
+<define-tag version-torbrowserbundle whitespace=delete>1.3.10</define-tag>
<define-tag version-torbrowser-tor whitespace=delete>0.2.1.26</define-tag>
<define-tag version-torbrowser-tor-components whitespace=delete>libevent-1.4.13, zlib-1.2.3, openssl-0.9.8l</define-tag>
-<define-tag version-torbrowser-firefox whitespace=delete>3.5.11</define-tag>
+<define-tag version-torbrowser-firefox whitespace=delete>3.6.10</define-tag>
<define-tag version-torbrowser-torbutton whitespace=delete>1.2.5</define-tag>
<define-tag version-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag>
-<define-tag version-torbrowser-pidgin whitespace=delete>2.7.2</define-tag>
+<define-tag version-torbrowser-pidgin whitespace=delete>2.7.3</define-tag>
<define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag>
-<define-tag version-torbrowser-vidalia whitespace=delete>0.2.9</define-tag>
-<define-tag version-torimbrowserbundle whitespace=delete>1.3.9</define-tag>
+<define-tag version-torbrowser-vidalia whitespace=delete>0.2.10</define-tag>
+<define-tag version-torimbrowserbundle whitespace=delete>1.3.10</define-tag>
-<define-tag version-torbrowserbundlelinux whitespace=delete>1.0.9</define-tag>
-<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.14-alpha</define-tag>
+<define-tag version-torbrowserbundlelinux whitespace=delete>1.0.13</define-tag>
+<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.17-alpha</define-tag>
<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-1.4.13, zlib-1.2.3, openssl-0.9.8l</define-tag>
-<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.5.10</define-tag>
+<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.10</define-tag>
<define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.2.5</define-tag>
<define-tag version-gnu-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag>
-<define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.9</define-tag>
+<define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.10</define-tag>
-<define-tag version-vidalia-stable whitespace=delete>0.2.9</define-tag>
+<define-tag version-torbrowserbundleosx whitespace=delete>1.0.2</define-tag>
+<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.17-alpha</define-tag>
+<define-tag version-osx-torbrowser-tor-components whitespace=delete>libevent-1.4.13, zlib-1.2.3, openssl-0.9.8l</define-tag>
+<define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.10</define-tag>
+<define-tag version-osx-torbrowser-torbutton whitespace=delete>1.2.5</define-tag>
+<define-tag version-osx-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag>
+<define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.10</define-tag>
-<define-tag version-androidbundle-tor whitespace=delete>0.2.2.13-alpha</define-tag>
-<define-tag version-androidbundle-orbot whitespace=delete>0.0.8</define-tag>
+<define-tag version-vidalia-stable whitespace=delete>0.2.10</define-tag>
+
+<define-tag version-androidbundle-tor whitespace=delete>0.2.2.14-alpha</define-tag>
+<define-tag version-androidbundle-orbot whitespace=delete>1.0.4</define-tag>
<define-tag version-androidbundle-privoxy whitespace=delete>privoxy-3.0.12-stable</define-tag>
<define-tag version-androidbundle-libevent whitespace=delete>libevent-1.4.12-stable</define-tag>
<define-tag package-androidbundle-alpha whitespace=delete>dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk</define-tag>
@@ -50,13 +58,13 @@
<define-tag package-win32-stable whitespace=delete>dist/win32/tor-<version-win32-stable>-win32.exe</define-tag>
<define-tag package-win32-alpha whitespace=delete>dist/win32/tor-<version-win32-alpha>-win32.exe</define-tag>
-<define-tag local-win32-bundle-stable whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-win32-bundle-stable>-0.2.9.exe</define-tag>
-<define-tag local-win32-bundle-alpha whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-win32-bundle-alpha>-0.2.9.exe</define-tag>
+<define-tag local-win32-bundle-stable whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-win32-bundle-stable>-0.2.10.exe</define-tag>
+<define-tag local-win32-bundle-alpha whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-win32-bundle-alpha>-0.2.10.exe</define-tag>
<define-tag package-win32-bundle-stable whitespace=delete><local-win32-bundle-stable></define-tag>
<define-tag package-win32-bundle-alpha whitespace=delete><local-win32-bundle-alpha></define-tag>
-<define-tag package-osx-bundle-stable whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-osx-bundle-stable>-0.2.9-i386.dmg</define-tag>
-<define-tag package-osx-bundle-alpha whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-osx-bundle-alpha>-0.2.9-i386.dmg</define-tag>
+<define-tag package-osx-bundle-stable whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-osx-bundle-stable>-0.2.10-i386.dmg</define-tag>
+<define-tag package-osx-bundle-alpha whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-osx-bundle-alpha>-0.2.10-i386.dmg</define-tag>
<define-tag package-oldosx-bundle-stable whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-oldosx-bundle-stable>-0.2.8-ppc.dmg</define-tag>
<define-tag package-oldosx-bundle-alpha whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-oldosx-bundle-alpha>-0.2.9-ppc.dmg</define-tag>
@@ -96,3 +104,6 @@
<define-tag version-torbutton whitespace=delete>1.2.5 (08 April 2010)</define-tag>
<define-tag version-hash-torbutton whitespace=delete>sha1:e84592877593ad6119e829ac7199fd19333e101e</define-tag>
+
+<define-tag version-torbutton-alpha whitespace=delete>1.3.0-alpha (30 September 2010)</define-tag>
+<define-tag version-hash-torbutton-alpha whitespace=delete>sha1:be60421d92a455e6e7c25ade84da19db9f299e7e</define-tag>