Author: arma Date: 2011-11-13 00:36:26 +0000 (Sun, 13 Nov 2011) New Revision: 25208
Modified: website/trunk/download/en/download.wml website/trunk/include/dlhead.wmi website/trunk/include/versions.wmi website/trunk/projects/en/torbrowser.wml Log: break version-torbrowserbundleosx into 32 and 64, so in the future helix can version them separately if she needs to
Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-11-12 22:39:58 UTC (rev 25207) +++ website/trunk/download/en/download.wml 2011-11-13 00:36:26 UTC (rev 25208) @@ -136,27 +136,27 @@ #<!-- NOTE - change language enabled button text at the top of this page --> <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <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"><button-osx-tbb32></span></a> + <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a> <select name="language" id="osx-tbb" class="lang"> #include <lang.wmi> </select> <div class="sig"> <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a> - (<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> + (<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> - <a class="button osx-tbb64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a> + <a class="button osx-tbb64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a> <select name="language" id="osx-tbb64" class="lang"> #include <lang.wmi> </select> <div class="sig"> <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a> - (<a class="osx-tbb64-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> + (<a class="osx-tbb64-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> <a href="<page projects/torbrowser-details>#build">Source Code</a> </form>
<h2>Tor Browser Bundle</h2> - <em>Version <version-torbrowserbundleosx> - OS X Intel</em> + <em>Version <version-torbrowserbundleosx32> - OS X Intel</em> <p>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 »</a></p> </div> <!-- VIDALIA BUNDLE -->
Modified: website/trunk/include/dlhead.wmi =================================================================== --- website/trunk/include/dlhead.wmi 2011-11-12 22:39:58 UTC (rev 25207) +++ website/trunk/include/dlhead.wmi 2011-11-13 00:36:26 UTC (rev 25208) @@ -60,8 +60,8 @@ var pkg = caller.attr('id'); var lang = caller.val(); var wintbb = '../dist/torbrowser/tor-browser-<version-torbrowserbundle>_'+lang+'.exe'; - var osxtbb = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-'+lang+'.zip'; - var osxtbb64 = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-'+lang+'.zip'; + var osxtbb = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-'+lang+'.zip'; + var osxtbb64 = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-'+lang+'.zip'; var lintbb32 = '../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-'+lang+'.tar.gz'; var lintbb64 = '../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-'+lang+'.tar.gz'; if(pkg == 'win-tbb'){
Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-11-12 22:39:58 UTC (rev 25207) +++ website/trunk/include/versions.wmi 2011-11-13 00:36:26 UTC (rev 25208) @@ -45,7 +45,8 @@ <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.4.1</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.15</define-tag>
-<define-tag version-torbrowserbundleosx whitespace=delete>2.2.34-2</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.34-2</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.34-2</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.34</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>8.0</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.4.1</define-tag>
Modified: website/trunk/projects/en/torbrowser.wml =================================================================== --- website/trunk/projects/en/torbrowser.wml 2011-11-12 22:39:58 UTC (rev 25207) +++ website/trunk/projects/en/torbrowser.wml 2011-11-13 00:36:26 UTC (rev 25208) @@ -94,77 +94,77 @@ </p>
<p id="Download-torbrowserbundleosx" style="font-size: 120%; margin: 5mm">BETA: Tor Browser Bundle for Intel Mac OS X 10.5 and higher with Firefox (version -<version-torbrowserbundleosx>, 28 MB)</p> +<version-torbrowserbundleosx32>, 28 MB)</p>
<ul> - <li>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>)</li> + <li>English (en-US): <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-en-US.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-en-US.zip.asc" style="font-size: 90%;">signature</a>) | + <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-en-US.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-en-US.zip.asc" style="font-size: 90%;">signature</a>)</li>
- <li>العربية (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>) | <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>)</li> + <li>العربية (ar):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-ar.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-ar.zip.asc" style="font-size: 90%;">signature</a>) | <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-ar.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-ar.zip.asc" style="font-size: 90%;">signature</a>)</li>
- <li>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>)</li> + <li>Deutsch (de):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-de.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-de.zip.asc" style="font-size: 90%;">signature</a>) | +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-de.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-de.zip.asc" style="font-size: 90%;">signature</a>)</li>
- <li>Español (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>) + <li>Español (es-ES):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-es-ES.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-es-ES.zip.asc" style="font-size: 90%;">signature</a>) | +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-es-ES.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-es-ES.zip.asc" style="font-size: 90%;">signature</a>) </li>
- <li>فارسی (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>) + <li>فارسی (fa):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-fa.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-fa.zip.asc" style="font-size: 90%;">signature</a>) | +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-fa.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-fa.zip.asc" style="font-size: 90%;">signature</a>) </li>
- <li>Français (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>) | -<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>) + <li>Français (fr):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-fr.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-fr.zip.asc" style="font-size: 90%;">signature</a>) | +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-fr.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-fr.zip.asc" style="font-size: 90%;">signature</a>) </li>
- <li>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>) + <li>Italiano (it):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-it.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-it.zip.asc" style="font-size: 90%;">signature</a>) | +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-it.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-it.zip.asc" style="font-size: 90%;">signature</a>)
</li>
- <li>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>) + <li>Nederlands (nl):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-nl.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-nl.zip.asc" style="font-size: 90%;">signature</a>) | +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-nl.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-nl.zip.asc" style="font-size: 90%;">signature</a>) </li>
- <li>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>) + <li>Polish (pl):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-pl.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-pl.zip.asc" style="font-size: 90%;">signature</a>) | +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-pl.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-pl.zip.asc" style="font-size: 90%;">signature</a>) </li>
- <li>Português (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>) + <li>Português (pt-PT):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-pt-PT.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-pt-PT.zip.asc" style="font-size: 90%;">signature</a>) | +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-pt-PT.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-pt-PT.zip.asc" style="font-size: 90%;">signature</a>) </li>
- <li>Русский (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>) | -<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>) + <li>Русский (ru):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-ru.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-ru.zip.asc" style="font-size: 90%;">signature</a>) | +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-ru.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-ru.zip.asc" style="font-size: 90%;">signature</a>) </li>
- <li>简体字 (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>) + <li>简体字 (zh-CN):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-zh-CN.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-zh-CN.zip.asc" style="font-size: 90%;">signature</a>) | +<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-zh-CN.zip">64-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-zh-CN.zip.asc" style="font-size: 90%;">signature</a>) </li>
</ul>