December 2013 - tor-commits - lists.torproject.org

r26488: {website} fix the download-easy page so the donation box is in the rig (website/trunk/download/en)
by Erinn Clark 19 Dec '13

19 Dec '13

Author: erinn Date: 2013-12-19 00:32:47 +0000 (Thu, 19 Dec 2013) New Revision: 26488 Modified: website/trunk/download/en/download-easy.wml Log: fix the download-easy page so the donation box is in the right place Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2013-12-19 00:10:44 UTC (rev 26487) +++ website/trunk/download/en/download-easy.wml 2013-12-19 00:32:47 UTC (rev 26488) @@ -13,7 +13,6 @@ <define-tag button-win-tbb32>Tor Browser Bundle</define-tag> <define-tag button-win-tbb64>Currently Unused</define-tag> <define-tag button-osx-tbb32>Tor Browser Bundle</define-tag> -# <define-tag button-lin-tbb32>Tor Browser Bundle</define-tag> <define-tag button-lin-tbb64>GNU/Linux 64-bit</define-tag> @@ -72,31 +71,8 @@ <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> <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p> - </div> + </div> </div> - - - <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p> - </div> - </div>  <div id="linux" class="easy linux"> <div class="package" style="padding-top: 13px; border-top: 0px;">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 19 Dec '13

19 Dec '13

commit 621aabf0e1adc761e3c52ff8480b47497787d7db Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 19 00:15:53 2013 +0000 Update translations for https_everywhere --- nb/https-everywhere.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nb/https-everywhere.dtd b/nb/https-everywhere.dtd index 8f3a5f9..1f4c664 100644 --- a/nb/https-everywhere.dtd +++ b/nb/https-everywhere.dtd @@ -36,11 +36,11 @@ <!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification"> <!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release."> -<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?"> +<!ENTITY https-everywhere.popup.paragraph2 "Vil du gå tilbake til den stabile?"> <!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere(a)eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere."> -<!ENTITY https-everywhere.popup.keep "Keep me on the development version"> -<!ENTITY https-everywhere.popup.revert "Download the latest stable version"> +<!ENTITY https-everywhere.popup.keep "Hold meg på utvikler versjonen"> +<!ENTITY https-everywhere.popup.revert "Last ned den siste stabile versjonen"> -<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests"> +<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Regelsett Test"> <!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Avbryt"> <!ENTITY https-everywhere.ruleset-tests.status_start_button "Start">

1 0

r26487: {website} update the website for the big TBB 3.x release! (in website/trunk: download/en include projects/en)
by Erinn Clark 19 Dec '13

19 Dec '13

Author: erinn Date: 2013-12-19 00:10:44 +0000 (Thu, 19 Dec 2013) New Revision: 26487 Modified: website/trunk/download/en/download-easy.wml website/trunk/download/en/download.wml website/trunk/include/versions.wmi website/trunk/projects/en/torbrowser.wml Log: update the website for the big TBB 3.x release! Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2013-12-18 21:10:36 UTC (rev 26486) +++ website/trunk/download/en/download-easy.wml 2013-12-19 00:10:44 UTC (rev 26487) @@ -13,7 +13,7 @@ <define-tag button-win-tbb32>Tor Browser Bundle</define-tag> <define-tag button-win-tbb64>Currently Unused</define-tag> <define-tag button-osx-tbb32>Tor Browser Bundle</define-tag> -<define-tag button-osx-tbb64>Mac 64-bit</define-tag> +# <define-tag button-lin-tbb32>Tor Browser Bundle</define-tag> <define-tag button-lin-tbb64>GNU/Linux 64-bit</define-tag> @@ -36,13 +36,13 @@ <div id="windows" class="easy windows"> <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <a class="button win-tbb" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a> + <a class="button win-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a> <select name="language" id="win-tbb" class="lang"> #include <lang.wmi> </select> <div class="sig" style="margin-bottom: 5px;"> <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundle">Other Languages</a> - (<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> + (<a class="win-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> <div class="desc"> @@ -57,13 +57,13 @@ <div id="mac" class="easy mac"> <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-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/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-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" style="margin-bottom: 5px;"> <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a> - (<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-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/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> <div class="desc"> @@ -74,17 +74,18 @@ <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p> </div> </div> - + + <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p> </div> </div> @@ -99,13 +101,13 @@ <div id="linux" class="easy linux"> <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <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"><button-lin-tbb32></span></a> + <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a> <select name="language" id="lin-tbb32" class="lang"> #include <lang.wmi> </select> <div class="sig" style="margin-bottom: 5px;"> <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a> - (<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> + (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> <div class="desc"> @@ -120,13 +122,13 @@ <div class="easy linux"> <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <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"><button-lin-tbb64></span></a> + <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a> <select name="language" id="lin-tbb64" class="lang"> #include <lang.wmi> </select> <div class="sig" style="margin-bottom: 5px;"> <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a> - (<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> + (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> <div class="desc"> Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2013-12-18 21:10:36 UTC (rev 26486) +++ website/trunk/download/en/download.wml 2013-12-19 00:10:44 UTC (rev 26487) @@ -13,7 +13,7 @@ <define-tag button-win-tbb32>Tor Browser Bundle</define-tag> <define-tag button-win-tbb64>Currently Unused</define-tag> <define-tag button-osx-tbb32>Tor Browser Bundle</define-tag> -<define-tag button-osx-tbb64>64-bit</define-tag> +# <define-tag button-lin-tbb32>Tor Browser Bundle</define-tag> <define-tag button-lin-tbb64>64-bit</define-tag> @@ -41,16 +41,16 @@ # <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <a class="button win-tbb" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a> + <a class="button win-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a> <select name="language" id="win-tbb" class="lang"> #include <lang.wmi> </select> <div class="sig"> <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundle">Other Languages</a> - (<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> + (<a class="win-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> <a class="additional" href="<page projects/torbrowser-details>#build">Source Code</a><br /> - + </form> <h2>Tor Browser Bundle</h2> @@ -124,24 +124,27 @@ # <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-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/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_<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-torbrowserbundleosx32>-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/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_<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-torbrowserbundleosx64>-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a> + #include <lang.wmi> + + <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip.asc">sig</a>)--> </form> <h2>Tor Browser Bundle</h2> @@ -159,26 +162,26 @@ # <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <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"><button-lin-tbb32></span></a> + <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a> <select name="language" id="lin-tbb32" class="lang"> #include <lang.wmi> </select> <div class="sig"> <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a> - (<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> + (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> - + - <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"><button-lin-tbb64></span></a> + <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a> <select name="language" id="lin-tbb64" class="lang"> #include <lang.wmi> </select> <div class="sig"> <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a> - (<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> + (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> <a class="additional" href="<page projects/torbrowser-details>#build">Source Code</a><br /> - + </form> <h2>Tor Browser Bundle</h2> Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2013-12-18 21:10:36 UTC (rev 26486) +++ website/trunk/include/versions.wmi 2013-12-19 00:10:44 UTC (rev 26487) @@ -23,10 +23,12 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.3.25-15</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>3.5</define-tag> + +<define-tag version-torbrowserbundle whitespace=delete>3.5</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> -<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>17.0.11esr</define-tag> +<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> @@ -35,11 +37,11 @@ <define-tag version-torbrowserbundlealpha whitespace=delete>2.4.18-rc-1</define-tag> <define-tag version-torobfsbundlealpha whitespace=delete>2.4.18-rc-1-pt1</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.3.25-15</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.3.25-16</define-tag> -<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>3.5</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>3.5</define-tag> +<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>17.0.11esr</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> <define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.4.18-rc-1</define-tag> @@ -47,10 +49,10 @@ <define-tag version-torobfsbundlelinux32alpha whitespace=delete>2.4.18-rc-1-pt1</define-tag> <define-tag version-torobfsbundlelinux64alpha whitespace=delete>2.4.18-rc-2-pt1</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>2.3.25-15</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>3.5</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-15</define-tag> -<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>17.0.11esr</define-tag> +<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> <define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.4.18-rc-1</define-tag> Modified: website/trunk/projects/en/torbrowser.wml =================================================================== --- website/trunk/projects/en/torbrowser.wml 2013-12-18 21:10:36 UTC (rev 26486) +++ website/trunk/projects/en/torbrowser.wml 2013-12-19 00:10:44 UTC (rev 26487) @@ -96,189 +96,190 @@ <tbody> <tr> <td>English (en-US)</td> - <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe">32-bit</a> - <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-en-US.zip">32-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-en-US.zip.asc">sig</a>)</em> - • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-en-US.zip">64-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-en-US.zip.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz">32-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz.asc">sig</a>)</em> - • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-en-US.tar.gz">64-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-en-US.tar.gz.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_en-US.exe">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_en-US.exe.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_en-US.zip">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_en-US.zip.asc">sig</a>)</em> +  + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.gz">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.gz.asc">sig</a>)</em> + • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_en-US.tar.gz">64-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_en-US.tar.gz.asc">sig</a>)</em></td> </tr> <tr class="alt"> <td>العربية (ar)</td> - <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ar.exe">32-bit</a> - <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ar.exe.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-ar.zip">32-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-ar.zip.asc">sig</a>)</em> - • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ar.zip">64-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ar.zip.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-ar.tar.gz">32-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-ar.tar.gz.asc">sig</a>)</em> - • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-ar.tar.gz">64-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-ar.tar.gz.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_ar.exe">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_ar.exe.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ar.zip">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ar.zip.asc">sig</a>)</em> +  + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_ar.tar.gz">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_ar.tar.gz.asc">sig</a>)</em> + • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_ar.tar.gz">64-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_ar.tar.gz.asc">sig</a>)</em></td> </tr> <tr> <td>Deutsch (de)</td> - <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_de.exe">32-bit</a> - <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_de.exe.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-de.zip">32-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-de.zip.asc">sig</a>)</em> - • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-de.zip">64-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-de.zip.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-de.tar.gz">32-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-de.tar.gz.asc">sig</a>)</em> - • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-de.tar.gz">64-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-de.tar.gz.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_de.exe">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_de.exe.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_de.zip">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_de.zip.asc">sig</a>)</em> +  + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_de.tar.gz">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_de.tar.gz.asc">sig</a>)</em> + • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_de.tar.gz">64-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_de.tar.gz.asc">sig</a>)</em></td> </tr> <tr class="alt"> <td>Español (es-ES)</td> - <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_es-ES.exe">32-bit</a> - <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_es-ES.exe.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-es-ES.zip">32-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-es-ES.zip.asc">sig</a>)</em> - • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-es-ES.zip">64-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-es-ES.zip.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-es-ES.tar.gz">32-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-es-ES.tar.gz.asc">sig</a>)</em> - • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-es-ES.tar.gz">64-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-es-ES.tar.gz.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_es-ES.exe">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_es-ES.exe.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_es-ES.zip">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_es-ES.zip.asc">sig</a>)</em> +  + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_es-ES.tar.gz">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_es-ES.tar.gz.asc">sig</a>)</em> + • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_es-ES.tar.gz">64-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_es-ES.tar.gz.asc">sig</a>)</em></td> </tr> <tr> <td>فارسی (fa)</td> - <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_fa.exe">32-bit</a> - <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_fa.exe.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-fa.zip">32-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-fa.zip.asc">sig</a>)</em> - • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-fa.zip">64-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-fa.zip.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-fa.tar.gz">32-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-fa.tar.gz.asc">sig</a>)</em> - • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-fa.tar.gz">64-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-fa.tar.gz.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_fa.exe">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_fa.exe.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_fa.zip">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_fa.zip.asc">sig</a>)</em> +  + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_fa.tar.gz">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_fa.tar.gz.asc">sig</a>)</em> + • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_fa.tar.gz">64-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_fa.tar.gz.asc">sig</a>)</em></td> </tr> <tr class="alt"> <td>Français (fr)</td> - <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_fr.exe">32-bit</a> - <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_fr.exe.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-fr.zip">32-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-fr.zip.asc">sig</a>)</em> - • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-fr.zip">64-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-fr.zip.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-fr.tar.gz">32-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-fr.tar.gz.asc">sig</a>)</em> - • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-fr.tar.gz">64-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-fr.tar.gz.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_fr.exe">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_fr.exe.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_fr.zip">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_fr.zip.asc">sig</a>)</em> +  + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_fr.tar.gz">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_fr.tar.gz.asc">sig</a>)</em> + • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_fr.tar.gz">64-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_fr.tar.gz.asc">sig</a>)</em></td> </tr> <tr> <td>Italiano (it)</td> - <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_it.exe">32-bit</a> - <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_it.exe.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-it.zip">32-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-it.zip.asc">sig</a>)</em> - • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-it.zip">64-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-it.zip.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-it.tar.gz">32-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-it.tar.gz.asc">sig</a>)</em> - • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-it.tar.gz">64-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-it.tar.gz.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_it.exe">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_it.exe.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_it.zip">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_it.zip.asc">sig</a>)</em> +  + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_it.tar.gz">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_it.tar.gz.asc">sig</a>)</em> + • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_it.tar.gz">64-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_it.tar.gz.asc">sig</a>)</em></td> </tr> <tr class="alt"> <td>Korean (ko)</td> - <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ko.exe">32-bit</a> - <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ko.exe.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-ko.zip">32-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-ko.zip.asc">sig</a>)</em> - • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ko.zip">64-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ko.zip.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-ko.tar.gz">32-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-ko.tar.gz.asc">sig</a>)</em> - • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-ko.tar.gz">64-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-ko.tar.gz.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_ko.exe">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_ko.exe.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ko.zip">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ko.zip.asc">sig</a>)</em> +  + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_ko.tar.gz">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_ko.tar.gz.asc">sig</a>)</em> + • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_ko.tar.gz">64-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_ko.tar.gz.asc">sig</a>)</em></td> </tr> <tr> <td>Nederlands (nl)</td> - <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_nl.exe">32-bit</a> - <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_nl.exe.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-nl.zip">32-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-nl.zip.asc">sig</a>)</em> - • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-nl.zip">64-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-nl.zip.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-nl.tar.gz">32-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-nl.tar.gz.asc">sig</a>)</em> - • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-nl.tar.gz">64-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-nl.tar.gz.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_nl.exe">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_nl.exe.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_nl.zip">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_nl.zip.asc">sig</a>)</em> +  + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_nl.tar.gz">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_nl.tar.gz.asc">sig</a>)</em> + • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_nl.tar.gz">64-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_nl.tar.gz.asc">sig</a>)</em></td> </tr> <tr class="alt"> <td>Polish (pl)</td> - <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_pl.exe">32-bit</a> - <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_pl.exe.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-pl.zip">32-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-pl.zip.asc">sig</a>)</em> - • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-pl.zip">64-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-pl.zip.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-pl.tar.gz">32-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-pl.tar.gz.asc">sig</a>)</em> - • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-pl.tar.gz">64-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-pl.tar.gz.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_pl.exe">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_pl.exe.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_pl.zip">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_pl.zip.asc">sig</a>)</em> +  + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_pl.tar.gz">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_pl.tar.gz.asc">sig</a>)</em> + • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_pl.tar.gz">64-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_pl.tar.gz.asc">sig</a>)</em></td> </tr> <tr> <td>Português (pt-PT)</td> - <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_pt-PT.exe">32-bit</a> - <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_pt-PT.exe.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-pt-PT.zip">32-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-pt-PT.zip.asc">sig</a>)</em> - • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-pt-PT.zip">64-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-pt-PT.zip.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-pt-PT.tar.gz">32-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-pt-PT.tar.gz.asc">sig</a>)</em> - • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-pt-PT.tar.gz">64-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-pt-PT.tar.gz.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_pt-PT.exe">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_pt-PT.exe.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_pt-PT.zip">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_pt-PT.zip.asc">sig</a>)</em> +  + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_pt-PT.tar.gz">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_pt-PT.tar.gz.asc">sig</a>)</em> + • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_pt-PT.tar.gz">64-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_pt-PT.tar.gz.asc">sig</a>)</em></td> </tr> <tr class="alt"> <td>Русский (ru)</td> - <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ru.exe">32-bit</a> - <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ru.exe.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-ru.zip">32-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-ru.zip.asc">sig</a>)</em> - • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ru.zip">64-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ru.zip.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-ru.tar.gz">32-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-ru.tar.gz.asc">sig</a>)</em> - • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-ru.tar.gz">64-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-ru.tar.gz.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_ru.exe">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_ru.exe.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ru.zip">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ru.zip.asc">sig</a>)</em> +  + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_ru.tar.gz">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_ru.tar.gz.asc">sig</a>)</em> + • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_ru.tar.gz">64-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_ru.tar.gz.asc">sig</a>)</em></td> </tr> <tr> <td>Vietnamese (vi)</td> - <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_vi.exe">32-bit</a> - <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_vi.exe.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-vi.zip">32-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-vi.zip.asc">sig</a>)</em> - • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-vi.zip">64-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-vi.zip.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-vi.tar.gz">32-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-vi.tar.gz.asc">sig</a>)</em> - • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-vi.tar.gz">64-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-vi.tar.gz.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_vi.exe">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_vi.exe.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_vi.zip">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_vi.zip.asc">sig</a>)</em> +  + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_vi.tar.gz">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_vi.tar.gz.asc">sig</a>)</em> + • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_vi.tar.gz">64-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_vi.tar.gz.asc">sig</a>)</em></td> </tr> <tr class="alt"> <td>简体字 (zh-CN)</td> - <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_zh-CN.exe">32-bit</a> - <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_zh-CN.exe.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-zh-CN.zip">32-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-zh-CN.zip.asc">sig</a>)</em> - • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-zh-CN.zip">64-bit</a> - <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-zh-CN.zip.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-zh-CN.tar.gz">32-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-zh-CN.tar.gz.asc">sig</a>)</em> - • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-zh-CN.tar.gz">64-bit</a> - <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-zh-CN.tar.gz.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_zh-CN.exe">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_zh-CN.exe.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_zh-CN.zip">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_zh-CN.zip.asc">sig</a>)</em> +  + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_zh-CN.tar.gz">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_zh-CN.tar.gz.asc">sig</a>)</em> + • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_zh-CN.tar.gz">64-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_zh-CN.tar.gz.asc">sig</a>)</em></td> </tr> </tbody> </table> </div> + + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz.asc">sig</a>)</em> + • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz">64-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz.asc">sig</a>)</em></td> </tr> </tbody> </table> </div> +--> <p>See our instructions on <a href="<page docs/verifying-signatures>">how to verify package signatures</a>, which allows you to make sure you've downloaded the file we intended @@ -322,8 +324,7 @@ <p>Download the file above, save it somewhere, then click on it. Mac OS X will automatically unarchive it and you will have a TorBrowser application in your chosen language. <em>(e.g. TorBrowser_en-US.app)</em></p> - <p>Click the TorBrowser application to launch Vidalia.</p> - <p>Once Vidalia connects to the Tor Network, it will launch TorBrowser.</p> + <p>Click the TorBrowserBundle application to launch TorBrowser.</p> </div> <div class="pjimage"><img src="$(IMGROOT)/screenshot-osx-torbrowser-icon.png" alt="Screenshot Mac OS X bundle" width="414" height="315"></div> </div> @@ -333,16 +334,16 @@ <div class="pjtext"> <p>Download the architecture-appropriate file above, save it somewhere, then run one of the following two commands to extract the package archive:</p> - <p><code>tar -xvzf tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<var>LANG</var>.tar.gz</code></p> + <p><code>tar -xvJf tor-browser-linux32-<version-torbrowserbundlelinux32>_<var>LANG</var>.tar.gz</code></p> <p>or (for the 64-bit version):</p> - <p><code>tar -xvzf tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<var>LANG</var>.tar.gz</code></p> + <p><code>tar -xvJf tor-browser-linux64-<version-torbrowserbundlelinux64>_<var>LANG</var>.tar.gz</code></p> <p><em>(where <var>LANG</var> is the language listed in the filename).</em></p> <p>Once that's done, switch to the Tor browser directory by running:</p> <p><code>cd tor-browser_<var>LANG</var></code></p> <p><em>(where <var>LANG</var> is the language listed in the filename).</em><p> <p>To run the Tor Browser Bundle, execute the <strong>start-tor-browser</strong> script:</p> <p><code>./start-tor-browser</code></p> - <p>This will launch Vidalia and once that connects to Tor, it will launch + <p>This will launch Tor Launcher and once that connects to Tor, it will launch Firefox. <strong><em>Do not unpack or run TBB as root.</em></strong></p> </div> </div> @@ -365,7 +366,7 @@ <p>Once extraction is complete, open the folder <strong>Tor Browser</strong> from the location you saved the bundle.</p> <p>Double click on the <strong>Start Tor Browser</strong> (4) application (it may be called <strong>Start Tor Browser.exe</strong> on some systems.)</p> - <p>The Vidalia window will shortly appear.</p> + <p>The TorBrowser window will shortly appear.</p> <p><a href="$(IMGROOT)/tbb-screenshot2.png"><img src="$(IMGROOT)/tbb-screenshot2.png" alt="Screenshot of bundle startup" width="860" height="538"></a></p> <p>Once Tor is ready, Tor Browser will automatically be opened. Only web pages @@ -402,7 +403,7 @@ <p><strong><em>What is Tor and why do I need it?</em></strong> <br>To learn more about Tor, visit the <a href="<page index>">Tor Project website</a>.</p> <p><strong><em>What is in the Tor Browser Bundle?</em></strong> - <br>It contains Tor, Vidalia, a modified Firefox ESR, and Torbutton + <br>It contains Tor, a modified Firefox ESR, and Torbutton (<a href="https://www.torproject.org/torbrowser/design/">design</a>) (<a href="<page projects/torbrowser-details>#contents">version details</a>).</p> <p><strong><em>How can I make my own bundle?</em></strong>

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 18 Dec '13

18 Dec '13

commit b68b5b5d30e1ee29c05388acfe765098178f8de7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 18 23:45:56 2013 +0000 Update translations for liveusb-creator --- de/de.po | 57 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/de/de.po b/de/de.po index 5c93db2..1fefec5 100644 --- a/de/de.po +++ b/de/de.po @@ -18,13 +18,14 @@ # Sacro <Scion(a)T-Online.de>, 2013 # Sacro <Scion(a)T-Online.de>, 2012 # to_ba, 2013 +# to_ba, 2013 # Victor1975 <VKerley75(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-30 15:23+0100\n" -"PO-Revision-Date: 2013-12-05 19:40+0000\n" +"POT-Creation-Date: 2013-12-09 15:17+0100\n" +"PO-Revision-Date: 2013-12-18 23:30+0000\n" "Last-Translator: to_ba\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" @@ -38,17 +39,17 @@ msgstr "" msgid "%(distribution)s installer" msgstr "%(distribution)s Installationsprogramm" -#: ../liveusb/gui.py:807 +#: ../liveusb/gui.py:809 #, python-format msgid "%(filename)s selected" msgstr "%(filename)s ausgewählt" -#: ../liveusb/gui.py:437 +#: ../liveusb/gui.py:439 #, python-format msgid "%(size)s %(label)s" msgstr "%(size)s %(label)s" -#: ../liveusb/gui.py:443 +#: ../liveusb/gui.py:445 #, python-format msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" @@ -143,7 +144,7 @@ msgstr "Klonen\n&&\nAktualisieren" msgid "Creating %sMB persistent overlay" msgstr "Erzeuge %s MB persistentes Overlay" -#: ../liveusb/gui.py:565 +#: ../liveusb/gui.py:567 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." msgstr "Das Gerät ist momentan nicht eingehängt, sodass wir den freien Speicherplatz nicht bestimmen können." @@ -153,11 +154,11 @@ msgstr "Das Gerät ist momentan nicht eingehängt, sodass wir den freien Speiche msgid "Download %(distribution)s" msgstr "%(distribution)s herunterladen" -#: ../liveusb/gui.py:781 +#: ../liveusb/gui.py:783 msgid "Download complete!" msgstr "Herunterladen abgeschlossen!" -#: ../liveusb/gui.py:785 +#: ../liveusb/gui.py:787 msgid "Download failed: " msgstr "Herunterladen fehlgeschlagen:" @@ -218,7 +219,7 @@ msgstr "Wenn Sie kein existierendes Live-ISO auswählen, wird die gewählte Ver msgid "Install Tails" msgstr "Tails installieren" -#: ../liveusb/gui.py:628 +#: ../liveusb/gui.py:630 msgid "Installation complete!" msgstr "Installation abgeschlossen!" @@ -227,7 +228,7 @@ msgstr "Installation abgeschlossen!" msgid "Installation complete! (%s)" msgstr "Installation abgeschlossen! (%s) " -#: ../liveusb/gui.py:629 +#: ../liveusb/gui.py:631 msgid "Installation was completed. Press OK to close this program." msgstr "Installation abgeschlossen. OK drücken um das Programm zu schließen." @@ -255,7 +256,7 @@ msgstr "Stellen Sie sicher, dass Ihr USB-Stick eingesteckt und mit einem FAT-Dat msgid "Mount %s exists after unmounting" msgstr "Mount %s existiert noch nach dem unmounten" -#: ../liveusb/gui.py:571 +#: ../liveusb/gui.py:573 #, python-format msgid "No free space on device %(device)s" msgstr "Kein freier Speicher auf dem Gerät %(device)s " @@ -271,11 +272,11 @@ msgid "" "%dMB ISO + %dMB overlay > %dMB free space" msgstr "Nicht genug Speicherplatz auf Gerät.⏎\n%dMB ISO + %dMB overlay > %dMB free space" -#: ../liveusb/gui.py:552 +#: ../liveusb/gui.py:554 msgid "Partition is FAT16; Restricting overlay size to 2G" msgstr "Partition ist FAT16. Beschränkung der max. Datei-Grösse auf 2 GB" -#: ../liveusb/gui.py:548 +#: ../liveusb/gui.py:550 msgid "Partition is FAT32; Restricting overlay size to 4G" msgstr "Die Partition ist FAT32; max. Datei-Größe wird auf 4G beschränkt" @@ -284,7 +285,7 @@ msgstr "Die Partition ist FAT32; max. Datei-Größe wird auf 4G beschränkt" msgid "Partitioning device %(device)s" msgstr "Partitioniere Gerät %(device)s" -#: ../liveusb/gui.py:619 +#: ../liveusb/gui.py:621 msgid "Persistent Storage" msgstr "Persistenter Speicher" @@ -292,15 +293,15 @@ msgstr "Persistenter Speicher" msgid "Persistent Storage (0 MB)" msgstr "Persistenter Speicher (0 MB)" -#: ../liveusb/gui.py:700 ../liveusb/gui.py:730 +#: ../liveusb/gui.py:702 ../liveusb/gui.py:732 msgid "Please confirm your device selection" msgstr "Bitte bestätige deine Geräteauswahl" -#: ../liveusb/gui.py:465 +#: ../liveusb/gui.py:467 msgid "Refreshing releases..." msgstr "Veröffentlichungen werden aktualisiert …" -#: ../liveusb/gui.py:470 +#: ../liveusb/gui.py:472 msgid "Releases updated!" msgstr "Veröffentlichungen wurden aktualisiert!" @@ -318,7 +319,7 @@ msgstr "Entferne bestehendes Live OS" msgid "Resetting Master Boot Record of %s" msgstr "Setze Master Boot Record von %s zurück" -#: ../liveusb/gui.py:792 +#: ../liveusb/gui.py:794 msgid "Select Live ISO" msgstr "Live ISO-Abbild wählen" @@ -346,13 +347,13 @@ msgstr "Daten auf dem Datenträger werden synchronisiert …" msgid "Target Device" msgstr "Zielgerät" -#: ../liveusb/gui.py:665 +#: ../liveusb/gui.py:667 msgid "" "The Master Boot Record on your device is blank. Pressing 'Install Tails' " "again will reset the MBR on this device." msgstr "Der Master-Boot-Record auf dem Gerät ist leer. Ein weiteres mal »Tails installieren« drücken wird den MBR des Gerätes zurücksetzen. " -#: ../liveusb/gui.py:795 +#: ../liveusb/gui.py:797 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." @@ -432,7 +433,7 @@ msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "Win32_LogicalDisk konnte nicht ermittelt werden; der win32com-Aufruf lieferte keinerlei Resultate" -#: ../liveusb/gui.py:693 +#: ../liveusb/gui.py:695 msgid "Unable to mount device" msgstr "Kann Gerät nicht mounten" @@ -456,7 +457,7 @@ msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "MBR konnte nicht zurückgesetzt werden. Möglicherweise ist das Paket `syslinux` nicht installiert" -#: ../liveusb/gui.py:801 +#: ../liveusb/gui.py:803 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" @@ -543,12 +544,12 @@ msgstr "SHA256-Prüfsumme des LiveCD-Abbildes wird überprüft …" msgid "Verifying filesystem..." msgstr "Dateisystem wird überprüft …" -#: ../liveusb/gui.py:728 +#: ../liveusb/gui.py:730 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." msgstr "Warnung: Das Erzeugen eines neuen persistenten Overlay löscht ein vorhandenes." -#: ../liveusb/gui.py:679 +#: ../liveusb/gui.py:681 msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " @@ -567,14 +568,14 @@ msgstr "Warnung: Dieses Tool muss als Administrator ausgeführt werden. Um dies msgid "Wrote to device at %(speed)d MB/sec" msgstr "Es wurde mit %(speed)d MB/sek auf das Gerät geschrieben" -#: ../liveusb/gui.py:701 +#: ../liveusb/gui.py:703 #, python-format msgid "" "You are going to install Tails on the %(size)s %(vendor)s %(model)s device " "(%(device)s). All data on the selected device will be lost. Continue?" -msgstr "" +msgstr "Sie sind dabei Tails auf folgendem Gerät zu installieren %(size)s %(vendor)s %(model)s (%(device)s). Alle Daten auf dem ausgewählten Gerät gehen verloren. Fortfahren?" -#: ../liveusb/gui.py:718 +#: ../liveusb/gui.py:720 #, python-format msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " @@ -588,7 +589,7 @@ msgid "" "ext4 filesystem" msgstr "Du verwendest eine alte Version von syslinux-extlinux die das ext4 Dateisystem nicht unterstützt" -#: ../liveusb/gui.py:786 +#: ../liveusb/gui.py:788 msgid "You can try again to resume your download" msgstr "Sie können versuchen, das Herunterladen fortzusetzen"

1 0

[torbrowser/master] fix changelog and README versions in build scripts
by erinn＠torproject.org 18 Dec '13

18 Dec '13

commit 92c2a816caa72ae4e3cdc09abcef43f3fc085e84 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Dec 14 17:46:26 2013 -0200 fix changelog and README versions in build scripts --- build-scripts/linux-alpha.mk | 4 ++-- build-scripts/linux.mk | 4 ++-- build-scripts/osx-alpha.mk | 4 ++-- build-scripts/osx.mk | 4 ++-- build-scripts/windows-alpha.mk | 4 ++-- build-scripts/windows.mk | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 3f831dd..72d4b0a 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -289,9 +289,9 @@ install-docs: cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - cp ../changelog.linux-2.4 $(DOCSDIR)/changelog + cp ../changelog.linux-2.5 $(DOCSDIR)/changelog # This should be updated to be more generic (version-wise) and more Linux specific - cp ../README.LINUX-2.4 $(DOCSDIR)/README-TorBrowserBundle + cp ../README.LINUX-2.5 $(DOCSDIR)/README-TorBrowserBundle ifeq ($(USE_OBFSPROXY),1) mkdir -p $(DOCSDIR)/Obfsproxy cp $(OBFSPROXY_DIR)/LICENSE $(DOCSDIR)/Obfsproxy diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 300357f..d5e82b0 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -268,9 +268,9 @@ install-docs: cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - cp ../changelog.linux-2.3 $(DOCSDIR)/changelog + cp ../changelog.linux-2.4 $(DOCSDIR)/changelog # This should be updated to be more generic (version-wise) and more Linux specific - cp ../README.LINUX-2.3 $(DOCSDIR)/README-TorBrowserBundle + cp ../README.LINUX-2.4 $(DOCSDIR)/README-TorBrowserBundle ## Copy over Firefox install-firefox: diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 00bc7aa..b9d2cce 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -310,9 +310,9 @@ install-docs: cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - cp ../changelog.osx-2.4 $(DOCSDIR)/changelog + cp ../changelog.osx-2.5 $(DOCSDIR)/changelog cp ../LICENSE $(DEST) - cp ../README.OSX-2.4 $(DEST)/README-TorBrowserBundle + cp ../README.OSX-2.5 $(DEST)/README-TorBrowserBundle ## Copy over Firefox install-firefox: diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 4246dc3..36120ae 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -264,9 +264,9 @@ install-docs: cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - cp ../changelog.osx-2.3 $(DOCSDIR)/changelog + cp ../changelog.osx-2.4 $(DOCSDIR)/changelog cp ../LICENSE $(DEST) - cp ../README.OSX-2.3 $(DEST)/README-TorBrowserBundle + cp ../README.OSX-2.4 $(DEST)/README-TorBrowserBundle ## Copy over Firefox install-firefox: diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index da4af92..d087ac2 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -294,8 +294,8 @@ install-docs: cp $(TOR)/LICENSE $(TOR)/README $(DOCSDIR)/Tor cp $(QT_LIB)/../LICENSE.GPL* $(QT_LIB)/../LICENSE.LGPL $(DOCSDIR)/Qt cp $(MING)/../msys/1.0/share/doc/MSYS/COPYING $(DOCSDIR)/MinGW - cp ../changelog.windows-2.4 $(DOCSDIR)/changelog - cp ../README.WIN-2.4 $(DOCSDIR)/README-TorBrowserBundle + cp ../changelog.windows-2.5 $(DOCSDIR)/changelog + cp ../README.WIN-2.5 $(DOCSDIR)/README-TorBrowserBundle ifeq ($(USE_OBFSPROXY),1) mkdir -p $(DOCSDIR)/Obfsproxy cp $(OBFSPROXY_DIR)/LICENSE $(DOCSDIR)/Obfsproxy diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 9b4a557..d7ff4d3 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -265,8 +265,8 @@ install-docs: cp $(TOR)/LICENSE $(TOR)/README $(DOCSDIR)/Tor cp $(QT_LIB)/../LICENSE.GPL* $(QT_LIB)/../LICENSE.LGPL $(DOCSDIR)/Qt cp $(MING)/../msys/1.0/share/doc/MSYS/COPYING $(DOCSDIR)/MinGW - cp ../changelog.windows-2.3 $(DOCSDIR)/changelog - cp ../README.WIN-2.3 $(DOCSDIR)/README-TorBrowserBundle + cp ../changelog.windows-2.4 $(DOCSDIR)/changelog + cp ../README.WIN-2.4 $(DOCSDIR)/README-TorBrowserBundle ## Copy over FirefoxPortable install-firefoxportable:

1 0

[torbrowser/maint-2.4] OSX: add logic to build standalone Vidalia bundles for TBB
by erinn＠torproject.org 18 Dec '13

18 Dec '13

commit f6780158f0f151735d85d11ef45a07cb1292d5e5 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Dec 18 14:50:02 2013 -0200 OSX: add logic to build standalone Vidalia bundles for TBB --- build-scripts/config/vidalia.conf.standalone-osx | 7 ++++++ build-scripts/osx-alpha.mk | 29 ++++++++++++++++++++++ src/RelativeLink/vidalia/start-vidalia-osx.sh | 3 +++ 3 files changed, 39 insertions(+) diff --git a/build-scripts/config/vidalia.conf.standalone-osx b/build-scripts/config/vidalia.conf.standalone-osx new file mode 100644 index 0000000..7e687c4 --- /dev/null +++ b/build-scripts/config/vidalia.conf.standalone-osx @@ -0,0 +1,7 @@ +[General] +LanguageCode=en + +[Tor] +ControlPort=9151 +Torrc=../../../../../Library/Vidalia/torrc +DataDirectory=../../../../Resources/Data/Tor/ diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index b9d2cce..ac770b2 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -182,6 +182,7 @@ IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- OBFS_COMPRESSED_NAME=$(OBFS_COMPRESSED_BASENAME) DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) +VIDALIA_COMPRESSED_BASENAME=vidalia-standalone-$(VIDALIA_VER)-osx-$(ARCH_TYPE)- ifeq ($(USE_PIDGIN),1) COMPRESSED_NAME=$(IM_COMPRESSED_NAME) @@ -242,6 +243,22 @@ all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_vi \ compressed-bundle_zh-CN +vidalia-standalone-bundles: vidalia-standalone-bundle_ar \ + vidalia-standalone-bundle_de \ + vidalia-standalone-bundle_en-US \ + vidalia-standalone-bundle_es-ES \ + vidalia-standalone-bundle_fa \ + vidalia-standalone-bundle_fr \ + vidalia-standalone-bundle_it \ + vidalia-standalone-bundle_ko \ + vidalia-standalone-bundle_nl \ + vidalia-standalone-bundle_pl \ + vidalia-standalone-bundle_pt-PT \ + vidalia-standalone-bundle_ru \ + vidalia-standalone-bundle_vi \ + vidalia-standalone-bundle_zh-CN + + ## ## Cleanup ## @@ -390,6 +407,9 @@ bundle_%: LANGCODE=$* make -f osx-alpha.mk bundle-localized compressed-bundle_%: LANGCODE=$* make -f osx-alpha.mk compressed-bundle-localized +vidalia-standalone-bundle_%: + LANGCODE=$* make -f osx-alpha.mk vidalia-standalone-bundle-localized + bundle-localized_%.stamp: make -f osx-alpha.mk copy-files_$* install-torbutton \ install-httpseverywhere install-noscript \ @@ -406,6 +426,15 @@ compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp zip -r $(DISTDIR)/$(COMPRESSED_NAME)$(LANGCODE).zip $(NAME)_$(LANGCODE).app -rm -f *.zip *.xpi +vidalia-standalone-bundle-localized: bundle-localized_$(LANGCODE).stamp + rm -rf vidalia-standalone + mkdir -p vidalia-standalone + cp config/vidalia.conf.standalone-osx $(BUNDLE).app/Library/Vidalia/vidalia.conf + cp ../src/RelativeLink/vidalia/start-vidalia-osx.sh $(BUNDLE).app/start-vidalia.sh + ./patch-vidalia-language.sh $(BUNDLE).app/Library/Vidalia/vidalia.conf $(LANGCODE) -e + cd $(BUNDLE).app && zip -r ../vidalia-standalone/$(VIDALIA_COMPRESSED_BASENAME)$(LANGCODE).zip start-vidalia.sh Contents/MacOS/Vidalia.app Library/Vidalia/vidalia.conf Contents/Resources/vidalia.icns Contents/Resources/Docs/Qt Contents/Resources/Docs/Vidalia + + copy-files_%: generic-bundle.stamp rm -fr $(NAME)_$* #mkdir $(NAME)_$* diff --git a/src/RelativeLink/vidalia/start-vidalia-osx.sh b/src/RelativeLink/vidalia/start-vidalia-osx.sh new file mode 100755 index 0000000..a06af38 --- /dev/null +++ b/src/RelativeLink/vidalia/start-vidalia-osx.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +open "Contents/MacOS/Vidalia.app"

1 0

[torbrowser/maint-2.4] Windows: add logic to build standalone Vidalia bundles for TBB
by erinn＠torproject.org 18 Dec '13

18 Dec '13

commit 525d46b359e9def47b6caf1a7fcda84d541e8a99 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Dec 17 01:09:50 2013 -0200 Windows: add logic to build standalone Vidalia bundles for TBB --- build-scripts/config/vidalia.conf.standalone | 7 +++++++ build-scripts/windows-alpha.mk | 29 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/build-scripts/config/vidalia.conf.standalone b/build-scripts/config/vidalia.conf.standalone new file mode 100644 index 0000000..eed1095 --- /dev/null +++ b/build-scripts/config/vidalia.conf.standalone @@ -0,0 +1,7 @@ +[General] +LanguageCode=en + +[Tor] +ControlPort=9151 +Torrc=..\\Data\\Tor\\torrc +DataDirectory=..\\Data\\Tor diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index d087ac2..a0109b7 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -159,6 +159,7 @@ IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION) OBFS_COMPRESSED_NAME=$(OBFS_COMPRESSED_BASENAME) DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) +VIDALIA_COMPRESSED_BASENAME=vidalia-standalone-$(VIDALIA_VER)-win32 ifeq ($(USE_PIDGIN),1) COMPRESSED_NAME=$(IM_COMPRESSED_NAME) @@ -215,6 +216,22 @@ all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_vi \ compressed-bundle_zh-CN +vidalia-standalone-bundles: vidalia-standalone-bundle_ar \ + vidalia-standalone-bundle_de \ + vidalia-standalone-bundle_en-US \ + vidalia-standalone-bundle_es-ES \ + vidalia-standalone-bundle_fa \ + vidalia-standalone-bundle_fr \ + vidalia-standalone-bundle_it \ + vidalia-standalone-bundle_ko \ + vidalia-standalone-bundle_nl \ + vidalia-standalone-bundle_pl \ + vidalia-standalone-bundle_pt-PT \ + vidalia-standalone-bundle_ru \ + vidalia-standalone-bundle_vi \ + vidalia-standalone-bundle_zh-CN + + ## ## Cleanup ## @@ -388,6 +405,9 @@ bundle_%: LANGCODE=$* make -f windows-alpha.mk bundle-localized compressed-bundle_%: LANGCODE=$* make -f windows-alpha.mk compressed-bundle-localized +vidalia-standalone-bundle_%: + LANGCODE=$* make -f windows-alpha.mk vidalia-standalone-bundle-localized + bundle-localized_%.stamp: make -f windows-alpha.mk copy-files_$* install-extensions \ @@ -402,6 +422,15 @@ compressed-bundle-localized: $(SEVENZIP) bundle-localized_$(LANGCODE).stamp rm -f $(COMPRESSED_NAME)_$(LANGCODE).exe cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx ../$(COMPRESSED_NAME)_$(LANGCODE).exe $(NAME) +vidalia-standalone-bundle-localized: $(SEVENZIP) bundle-localized_$(LANGCODE).stamp + rm -f $(VIDALIA_COMPRESSED_BASENAME)_$(LANGCODE).exe + rm -rf vidalia-standalone + mkdir -p vidalia-standalone + cp config/vidalia.conf.standalone $(BUNDLE)/Data/Vidalia/vidalia.conf + ./patch-vidalia-language.sh $(BUNDLE)/Data/Vidalia/vidalia.conf $(LANGCODE) + cp ../src/RelativeLink/StartTorBrowserBundle.exe Start\ Vidalia.exe + cd $(NAME)_$(LANGCODE)/$(NAME); $(SEVENZIP) a -mx9 -sfx7z.sfx ../../vidalia-standalone/$(VIDALIA_COMPRESSED_BASENAME)_$(LANGCODE).exe ../../Start\ Vidalia.exe App/vidalia.exe App/Qt* Data/Vidalia Docs/Vidalia Docs/Qt + copy-files_%: generic-bundle.stamp rm -fr $(NAME)_$* mkdir $(NAME)_$*

1 0

[torbrowser/maint-2.4] Linux: add logic to build standalone Vidalia bundles for TBB
by erinn＠torproject.org 18 Dec '13

18 Dec '13

commit 1833f26206df7541c5f14ba5d6cbdc9a7567143a Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Dec 18 14:49:17 2013 -0200 Linux: add logic to build standalone Vidalia bundles for TBB --- build-scripts/config/vidalia.conf.standalone-linux | 8 ++++++ build-scripts/linux-alpha.mk | 27 ++++++++++++++++++++ src/RelativeLink/vidalia/start-vidalia.sh | 4 +++ 3 files changed, 39 insertions(+) diff --git a/build-scripts/config/vidalia.conf.standalone-linux b/build-scripts/config/vidalia.conf.standalone-linux new file mode 100644 index 0000000..5a7414c --- /dev/null +++ b/build-scripts/config/vidalia.conf.standalone-linux @@ -0,0 +1,8 @@ +[General] +InterfaceStyle=Cleanlooks +LanguageCode=en + +[Tor] +ControlPort=9151 +Torrc=../Data/Tor/torrc +DataDirectory=../Data/Tor diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 72d4b0a..3c11f32 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -148,6 +148,7 @@ IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)- OBFS_COMPRESSED_NAME=$(OBFS_COMPRESSED_BASENAME) DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) +VIDALIA_COMPRESSED_BASENAME=vidalia-standalone-$(VIDALIA_VER)-gnu-linux-$(ARCH_TYPE)- ifeq ($(USE_PIDGIN),1) COMPRESSED_NAME=$(IM_COMPRESSED_NAME) @@ -205,6 +206,22 @@ all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_vi \ compressed-bundle_zh-CN +vidalia-standalone-bundles: vidalia-standalone-bundle_ar \ + vidalia-standalone-bundle_de \ + vidalia-standalone-bundle_en-US \ + vidalia-standalone-bundle_es-ES \ + vidalia-standalone-bundle_fa \ + vidalia-standalone-bundle_fr \ + vidalia-standalone-bundle_it \ + vidalia-standalone-bundle_ko \ + vidalia-standalone-bundle_nl \ + vidalia-standalone-bundle_pl \ + vidalia-standalone-bundle_pt-PT \ + vidalia-standalone-bundle_ru \ + vidalia-standalone-bundle_vi \ + vidalia-standalone-bundle_zh-CN + + ## ## Cleanup ## @@ -385,6 +402,9 @@ bundle_%: LANGCODE=$* make -f linux-alpha.mk bundle-localized compressed-bundle_%: LANGCODE=$* make -f linux-alpha.mk compressed-bundle-localized +vidalia-standalone-bundle_%: + LANGCODE=$* make -f linux-alpha.mk vidalia-standalone-bundle-localized + bundle-localized_%.stamp: make -f linux-alpha.mk copy-files_$* install-extensions \ @@ -400,6 +420,13 @@ compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp tar -cvf - $(NAME)_$(LANGCODE) |tardy -unu 0 -una root -gnu 0 -gna wheel |gzip -c9 >$(DISTDIR)/$(COMPRESSED_NAME)$(LANGCODE).tar.gz rm -f *.zip *.xpi +vidalia-standalone-bundle-localized: + mkdir -p vidalia-standalone + cp config/vidalia.conf.standalone-linux $(BUNDLE)/Data/Vidalia/vidalia.conf + cp ../src/RelativeLink/vidalia/start-vidalia.sh $(BUNDLE) + ./patch-vidalia-language.sh $(BUNDLE)/Data/Vidalia/vidalia.conf $(LANGCODE) -e + cd $(BUNDLE) && tar -cvzf ../vidalia-standalone/$(VIDALIA_COMPRESSED_BASENAME)$(LANGCODE).tar.gz start-vidalia.sh App/vidalia Data/Vidalia Docs/Qt Docs/Vidalia Lib/libQt* Lib/libpng* + copy-files_%: generic-bundle.stamp rm -fr $(NAME)_$* #mkdir $(NAME)_$* diff --git a/src/RelativeLink/vidalia/start-vidalia.sh b/src/RelativeLink/vidalia/start-vidalia.sh new file mode 100755 index 0000000..3880e76 --- /dev/null +++ b/src/RelativeLink/vidalia/start-vidalia.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +LD_LIBRARY_PATH="./Lib" +./App/vidalia --datadir Data/Vidalia/ -style Cleanlooks

1 0

[torbrowser/maint-2.4] bump recommended-versions for TBB 3.5
by erinn＠torproject.org 18 Dec '13

18 Dec '13

commit cde9241d471e70adb7f06cc07eb69c72b06f3200 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Dec 18 20:54:16 2013 -0200 bump recommended-versions for TBB 3.5 --- build-scripts/recommended-versions | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 2ae83cd..aac31f3 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -12,5 +12,8 @@ "2.4.18-rc-2-Linux", "3.5-rc-1-Linux", "3.5-rc-1-MacOS", -"3.5-rc-1-Windows" +"3.5-Windows", +"3.5-Linux", +"3.5-MacOS", +"3.5-Windows" ]

1 0

[torbrowser/master] Windows: add logic to build standalone Vidalia bundles for TBB
by erinn＠torproject.org 18 Dec '13

18 Dec '13

commit 525d46b359e9def47b6caf1a7fcda84d541e8a99 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Dec 17 01:09:50 2013 -0200 Windows: add logic to build standalone Vidalia bundles for TBB --- build-scripts/config/vidalia.conf.standalone | 7 +++++++ build-scripts/windows-alpha.mk | 29 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/build-scripts/config/vidalia.conf.standalone b/build-scripts/config/vidalia.conf.standalone new file mode 100644 index 0000000..eed1095 --- /dev/null +++ b/build-scripts/config/vidalia.conf.standalone @@ -0,0 +1,7 @@ +[General] +LanguageCode=en + +[Tor] +ControlPort=9151 +Torrc=..\\Data\\Tor\\torrc +DataDirectory=..\\Data\\Tor diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index d087ac2..a0109b7 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -159,6 +159,7 @@ IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION) OBFS_COMPRESSED_NAME=$(OBFS_COMPRESSED_BASENAME) DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION) +VIDALIA_COMPRESSED_BASENAME=vidalia-standalone-$(VIDALIA_VER)-win32 ifeq ($(USE_PIDGIN),1) COMPRESSED_NAME=$(IM_COMPRESSED_NAME) @@ -215,6 +216,22 @@ all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_vi \ compressed-bundle_zh-CN +vidalia-standalone-bundles: vidalia-standalone-bundle_ar \ + vidalia-standalone-bundle_de \ + vidalia-standalone-bundle_en-US \ + vidalia-standalone-bundle_es-ES \ + vidalia-standalone-bundle_fa \ + vidalia-standalone-bundle_fr \ + vidalia-standalone-bundle_it \ + vidalia-standalone-bundle_ko \ + vidalia-standalone-bundle_nl \ + vidalia-standalone-bundle_pl \ + vidalia-standalone-bundle_pt-PT \ + vidalia-standalone-bundle_ru \ + vidalia-standalone-bundle_vi \ + vidalia-standalone-bundle_zh-CN + + ## ## Cleanup ## @@ -388,6 +405,9 @@ bundle_%: LANGCODE=$* make -f windows-alpha.mk bundle-localized compressed-bundle_%: LANGCODE=$* make -f windows-alpha.mk compressed-bundle-localized +vidalia-standalone-bundle_%: + LANGCODE=$* make -f windows-alpha.mk vidalia-standalone-bundle-localized + bundle-localized_%.stamp: make -f windows-alpha.mk copy-files_$* install-extensions \ @@ -402,6 +422,15 @@ compressed-bundle-localized: $(SEVENZIP) bundle-localized_$(LANGCODE).stamp rm -f $(COMPRESSED_NAME)_$(LANGCODE).exe cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx ../$(COMPRESSED_NAME)_$(LANGCODE).exe $(NAME) +vidalia-standalone-bundle-localized: $(SEVENZIP) bundle-localized_$(LANGCODE).stamp + rm -f $(VIDALIA_COMPRESSED_BASENAME)_$(LANGCODE).exe + rm -rf vidalia-standalone + mkdir -p vidalia-standalone + cp config/vidalia.conf.standalone $(BUNDLE)/Data/Vidalia/vidalia.conf + ./patch-vidalia-language.sh $(BUNDLE)/Data/Vidalia/vidalia.conf $(LANGCODE) + cp ../src/RelativeLink/StartTorBrowserBundle.exe Start\ Vidalia.exe + cd $(NAME)_$(LANGCODE)/$(NAME); $(SEVENZIP) a -mx9 -sfx7z.sfx ../../vidalia-standalone/$(VIDALIA_COMPRESSED_BASENAME)_$(LANGCODE).exe ../../Start\ Vidalia.exe App/vidalia.exe App/Qt* Data/Vidalia Docs/Vidalia Docs/Qt + copy-files_%: generic-bundle.stamp rm -fr $(NAME)_$* mkdir $(NAME)_$*

1 0