[tor-commits] [webwml/master] Revert "Test localization"
hiro at torproject.org
hiro at torproject.org
Tue Dec 5 17:11:03 UTC 2017
commit a61cc30e19b50748d287d7a21d97a69be1250fea
Author: hiromipaw <hiro at torproject.org>
Date: Wed Nov 15 17:28:45 2017 +0100
Revert "Test localization"
This reverts commit 11776a41aa5d3c6a84083b667f5cb5f1e4bc4100.
---
Makefile.common | 2 +-
download/es/download.wml | 376 -----------------------------------------------
2 files changed, 1 insertion(+), 377 deletions(-)
diff --git a/Makefile.common b/Makefile.common
index 57e882eb..ce2c22c2 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -18,7 +18,7 @@ WMLOPT = \
-D STABLETAG=$(STABLETAG)
#LANGS=ar bms cy da de en es et fa fi fr hu id it ja ko nl no pl pt pt-br ru se tr vn zh-cn
-LANGS=en es
+LANGS=en
WMLFILES=$(wildcard $(patsubst %, %/*.wml, $(LANGS)))
WMIFILES=$(wildcard $(patsubst %, %/*.wmi, $(LANGS)) $(WMLBASE)/include/*.wmi )
diff --git a/download/es/download.wml b/download/es/download.wml
deleted file mode 100644
index 7a81b62e..00000000
--- a/download/es/download.wml
+++ /dev/null
@@ -1,376 +0,0 @@
-## translation metadata
-# Revision: $Revision$
-# Translation-Priority: 3-low
-
-#<!-- ATTENTION TRANSLATOR -->
-#<!-- You MUST copy '/include/lang.wmi' along with this file! -->
-
-#<!-- TBB DEFAULT LANGUAGE: Change 'en-US' below to your language code (if package exists)-->
-#<!-- IMPORTANT: You MUST also change the default selection in 'lang.wmi' -->
-<define-tag lang>en-US</define-tag>
-
-#<!-- Download button text for language enabled packages -->
-<define-tag button-win-tbb32>Tor Browser</define-tag>
-<define-tag button-win-tbb64>Currently Unused</define-tag>
-<define-tag button-osx-tbb32>Tor Browser</define-tag>
-#<!-- Comment out until it's available again. -EC <define-tag button-osx-tbb64>64-bit</define-tag> -->
-<define-tag button-lin-tbb32>Tor Browser (32-Bit)</define-tag>
-<define-tag button-lin-tbb64>Tor Browser (64-Bit)</define-tag>
-
-#include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8"
-
-<div id="content" class="clearfix">
- <div id="breadcrumbs"><a href="<page index>">Home » </a><a href="<page download/download>">Download</a></div>
- <div id="maincol-left">
-<!-- BEGIN TEASER WARNING -->
- <div class="warning-top">
- <h2>Want Tor to really work?</h2>
- <p>You need to change some of your habits, as some things won't work exactly as
-you are used to. Please read the <a href="#warning">full list of warnings</a> for details.
- </p>
- </div>
-<!-- END TEASER WARNING -->
-<!-- START DOWNLOADS -->
-<!-- START WINDOWS -->
- <div id="windows" style="border-top: 0px;" class="accordionButton on">
- <span class="windows24">Microsoft Windows</span>
- </div>
- <div class="accordionContent">
- <div class="fauxhead"></div>
-<!-- TOR BROWSER BUNDLE -->
-#<!-- 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 win-tbb" href="../dist/torbrowser/<version-torbrowserbundle>/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>#downloads">Other Languages</a>
- (<a class="win-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundle>/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>#downloads-alpha">Download Unstable</a><br />
-<!-- <a class="additional" href="../dist/torbrowser/<version-torbrowserbundlealpha>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundlealpha>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe.asc">sig</a>)-->
- </form>
-
- <h2>Tor Browser</h2>
- <em>Version <version-torbrowserbundle> (<releasedate-torbrowserbundle>) - Windows 10, 8, 7, Vista, and XP</em>
- <p>Everything you need to safely browse the Internet. <a href="<page projects/torbrowser>">Learn more »</a></p>
- </div>
-<!-- EXPERT BUNDLE -->
- <div class="package">
- <div class="downloads">
- <a class="button" href="<package-win32-stable>"><span class="strong">Download</span><span class="normal">Expert Bundle</span></a>
- <div class="sig">
- (<a href="<package-win32-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
- </div>
- </div>
-
- <h2>Expert Bundle</h2>
- <em>Windows 10, 8, 7, Vista, XP, 2000, 2003 Server, ME, and Windows 98SE</em>
- <p>Contains just Tor and nothing else. You'll need to configure Tor and all of your applications manually. This installer must be run as Administrator.</p>
- </div>
- </div>
-<!-- END WINDOWS -->
-<!-- START OS X -->
- <div id="apple" class="accordionButton on">
- <span class="mac24">Apple OS X</span></div>
- <div class="accordionContent">
- <div class="fauxhead"></div>
-<!-- TOR BROWSER BUNDLE -->
-#<!-- 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/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg"><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>#downloads">Other Languages</a>
- (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
- </div>
- <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />
-# Comment out until 64-bit Mac OS X bundles are available again
-# <a class="button osx-tbb64" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-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">
-
-# NO #include <lang.wmi>
-# </select>
-# <div class="sig">
-# <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
-#<!-- Mac OS X 64. -EC
-# (<a class="osx-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-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><br />
-# <a class="additional" href="../dist/torbrowser/<version-torbrowserbundleosx32alpha>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundleosx32alpha>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip.asc">sig</a>)
-
- </form>
-
- <h2>Tor Browser</h2>
- <em>Version <version-torbrowserbundleosx64> (<releasedate-torbrowserbundleosx64>)- 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>
- </div>
- <!-- END OS X -->
- <!-- START UNIX -->
- <div id="linux" class="accordionButton on">
- <span class="linux24">Linux</span></div>
- <div class="accordionContent">
- <div class="fauxhead"></div>
- <!-- TOR BROWSER BUNDLE -->
-#<!-- 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 lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundlelinux64>/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>#downloads">Other Languages</a>
- (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundlelinux64>/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>#downloads-alpha">Download Unstable</a><br />
-<!-- <a class="additional" href="../dist/torbrowser/<version-torbrowserbundlelinux64alpha>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundlelinux64alpha>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz.asc">sig</a>)-->
-
- <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundlelinux32>/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>#downloads">Other Languages</a>
- (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundlelinux32>/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="additional" href="../dist/torbrowser/<version-torbrowserbundlelinux32alpha>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundlelinux32alpha>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz.asc">sig</a>)<p>-->
-
- </form>
-
- <h2>Tor Browser</h2>
- <em>Version <version-torbrowserbundlelinux32> (<releasedate-torbrowserbundlelinux32>) - Linux, BSD, and Unix</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>
-<!-- repo packages -->
- <div class="package" style="border-bottom: 0px;">
- <div class="downloads">
- <a class="additional" style="font-weight: bold;"
-href="<page download/download-unix>">Tor repositories.</a>
- </div>
-
- <h2>Tor (standalone)</h2>
- <p>Install the Tor components yourself, run a relay, create
-custom configurations. All an apt-get or yum install away.</p>
- </div>
- </div>
- </div>
-<!-- END UNIX -->
-<!-- START SMARTPHONES -->
- <div id="smartphone" class="accordionButton on">
- <span class="smartphone24">Tor for Smartphones</span></div>
- <div class="accordionContent">
- <div class="fauxhead"></div>
-<!-- ANDROID -->
- <div class="package" style="padding-top: 13px; border-top: 0px;">
- <div class="downloads">
- <a class="additional" href="<page docs/android>">Installation Instructions</a>
- </div>
-
- <h2>Android Bundle</h2>
- <p>Our software is available for Android-based phones, tablets, and computers from the <a href="https://guardianproject.info/">Guardian Project</a> in their <a href= "https://guardianproject.info/2012/03/15/our-new-f-droid-app-repository/">F-Droid Repository</a> or the <a href="https://play.google.com/store/apps/details?id=org.torproject.android">Google Play Store</a>.</p>
- </div>
- </div>
-<!-- END SMARTPHONES -->
-<!-- BEGIN SOURCE -->
- <div class="accordionButton on">
- <span class="sourcecode24">Source Code</span></div>
- <div class="accordionContent">
- <div class="fauxhead"></div>
- <div class="package" style="padding-top: 13px; border-top: 0px; border-bottom: 1px solid #888888;">
- <div class="downloads">
- <a class="button" href="../dist/tor-<version-stable>.tar.gz"><span class="strong">Download</span><span class="normal">Source Code</span></a>
- <div class="sig">
- (<a href="../dist/tor-<version-stable>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
- </div>
- <a class="button" href="../dist/tor-<version-alpha>.tar.gz"><span class="strong">Download</span><span class="normal">Source Code (Unstable)</span></a>
- <div class="sig">
- (<a href="../dist/tor-<version-alpha>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
- </div>
- </div>
-
- <h2>Source Tarball</h2>
- <p> Configure with: <code style="color: #666666;">./configure && make && src/or/tor</code></p>
- <p>The current stable version of Tor is <version-stable>. Its <a href="<gitblob>ReleaseNotes<cgitstable>">release notes</a> are available.</p>
- <p>The current unstable/alpha version of Tor is <version-alpha>. Its <a href="<gitblob>ChangeLog">Changelog</a> is available.</p>
- </div>
- </div>
- <div class="expander"><a href="javascript:void(0)" class="switch">Expand All</a></div>
-<!-- END SOURCE -->
-<!-- END DOWNLOADS -->
-<br>
-<!-- BEGIN WARNING -->
-<div class="warning">
-<a name="warning"></a>
-<a name="Warning"></a>
-<h2><a class="anchor" href="#warning">Want Tor to really work?</a></h2>
- <p>You need to change some of your habits, as some things won't work exactly as
-you are used to.</p>
-
-<ol>
-<li><b>Use Tor Browser</b>
-
-<p>
-
-Tor does not protect all of your computer's Internet traffic when you
-run it. Tor only protects your applications that are properly configured to
-send their Internet traffic through Tor. To avoid problems with Tor
-configuration, we strongly recommend you use the
-<a href="<page projects/torbrowser>">Tor Browser</a>. It is pre-configured to protect
-your privacy and anonymity on the web as long as you're browsing with Tor
-Browser itself. Almost any other web browser configuration is likely to be
-unsafe to use with Tor.
-
-</p>
-
-</li>
-
-<li><b>Don't torrent over Tor</b>
-<p>
-Torrent file-sharing applications have been observed to ignore proxy
-settings and make direct connections even when they are told to use Tor.
-Even if your torrent application connects only through Tor, you will
-often send out your real IP address in the tracker GET request,
-because that's how torrents work. Not only do you <a
-href="https://blog.torproject.org/blog/bittorrent-over-tor-isnt-good-idea">
-deanonymize your torrent traffic and your other simultaneous Tor web
-traffic</a> this way, you also slow down the entire Tor network for everyone else.
-</p>
-</li>
-
-<li><b>Don't enable or install browser plugins</b>
-
-<p>
-
-Tor Browser will block browser plugins such as Flash, RealPlayer,
-Quicktime, and others: they can be manipulated into revealing your IP address.
-Similarly, we do not recommend installing additional addons or plugins into
-Tor Browser, as these may bypass Tor or otherwise harm your anonymity and
-privacy.
-
-</p>
-
-</li>
-
-<li><b>Use HTTPS versions of websites</b>
-
-<p>
-
-Tor will encrypt your traffic
-<a href="<page about/overview>#thesolution">to and
-within the Tor network</a>, but the encryption of your traffic to the final
-destination website depends upon on that website. To help ensure private
-encryption to websites, Tor Browser includes <a
-href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> to force the
-use of HTTPS encryption with major websites that support it. However, you
-should still watch the browser URL bar to ensure that websites you provide
-sensitive information to display a
-<a href="https://support.mozilla.com/en-US/kb/Site%20Identity%20Button">blue or
-green URL bar button</a>, include <b>https://</b> in the URL, and display the
-proper expected name for the website. Also see EFF's interactive page
-explaining <a href="https://www.eff.org/pages/tor-and-https">how Tor
-and HTTPS relate</a>.
-
-</p>
-
-</li>
-
-<li><b>Don't open documents downloaded through Tor while online</b>
-
-<p>
-
-Tor Browser will warn you before automatically opening documents that are
-handled by external applications. <b>DO NOT IGNORE THIS WARNING</b>. You
-should be very careful when downloading documents via Tor (especially DOC and
-PDF files, unless you use the PDF viewer that's built into Tor Browser) as
-these documents can contain Internet resources that will be downloaded outside
-of Tor by the application that opens them. This will reveal your non-Tor IP
-address. If you must work with DOC and/or PDF files, we strongly recommend
-either using a disconnected computer,
-downloading the free <a href="https://www.virtualbox.org/">VirtualBox</a> and
-using it with a <a href="http://virtualboxes.org/">virtual machine image</a>
-with networking disabled, or using <a href="https://tails.boum.org/">Tails</a>.
-Under no circumstances is it safe to use
-<a href="https://blog.torproject.org/blog/bittorrent-over-tor-isnt-good-idea">BitTorrent
-and Tor</a> together, however.
-
-</p>
-
-</li>
-
-<li><b>Use bridges and/or find company</b>
-
-<p>
-
-Tor tries to prevent attackers from learning what destination websites you
-connect to. However, by default, it does not prevent somebody watching your Internet
-traffic from learning that you're using Tor. If this matters to you, you can
-reduce this risk by configuring Tor to use a <a href="<page docs/bridges>">Tor
-bridge relay</a> rather than connecting directly to the public Tor network.
-Ultimately the best protection is a social approach: the more Tor
-users there are near you and the more
-<a href="<page about/torusers>">diverse</a> their interests, the less
-dangerous it will be that you are one of them. Convince other people to use
-Tor, too!
-
-</p>
-
-</li>
-
-</ol>
-<br>
-<p>
-Be smart and learn more. Understand what Tor does and does not offer.
-This list of pitfalls isn't complete, and we need your
-help <a href="<page getinvolved/volunteer>#Documentation">identifying and documenting
-all the issues</a>.
-</p>
-</div>
-<!-- END WARNING -->
-</div>
-<!-- END MAINCOL -->
-<!-- START SIDECOL -->
-<div id="sidecol-right">
-<div class="img-shadow sidenav">
-<div class="sidenav-sub">
-<h2>Jump To:</h2>
-<ul>
-<li class="dropdown"><a href="<page
-download/download>#windows">Microsoft Windows</a></li>
-<li class="dropdown"><a href="<page download/download>#apple">Apple OS
-X</a></li>
-<li class="dropdown"><a href="<page
-download/download>#linux">Linux/Unix</a></li>
-<li class="dropdown"><a href="<page
-download/download>#smartphone">Smartphones</a></li>
-<li class="dropdown"><a href="<page download/download>#source">Source
-Code</a></li>
-</ul>
-</div>
-</div>
-<!-- START DONATION WIDGET -->
-<a href="<page donate/donate-download>"><img src="../images/btn_donateCC_LG.gif"></a>
-<!-- END DONATION WIDGET -->
-<!-- START INFO -->
-<div class="img-shadow">
-<div class="sidenav-sub">
-<h2>Having Trouble?</h2>
-<ul>
-<li class="dropdown"><a href="<page docs/documentation>">Read the fine manuals</a></li>
-</ul>
-</div>
-</div>
-<!-- END INFO -->
-</div>
-<!-- END SIDECOL -->
-</div>
-<!-- END CONTENT -->
-
-#include <foot.wmi>
More information about the tor-commits
mailing list