Merge branch 'master' into live

diff --git a/en/index.html b/en/index.html
index 8d85e13ea4ba625ca2f797fb05ddf7ceccca2d38..23ca96042d89ced89ae7ae80bd042802d432f4c7 100644 (file)
--- a/en/index.html
+++ b/en/index.html
@@ -25,6 +25,7 @@ href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
 <!-- Language list for browsers that do not have JS enabled -->
 <ul id="languages" class="os">
 <li><a class="current" href="/en">English - v4.0</a></li>
+<li><a href="/ar">العربية <span class="tip">tip</span></a></li>
 <li><a href="/cs">Čeština - v4.0</a></li>
 <li><a href="/de">Deutsch - v3.0</a></li>
 <li><a href="/el">ελληνικά - v3.0</a></li>
@@ -33,14 +34,16 @@ href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
 <li><a href="/fr">français - v4.0</a></li>
 <li><a href="/it">italiano - v3.0</a></li>
 <li><a href="/ja">日本語 - v4.0</a></li>
+<li><a href="/ko">한국어 <span class="tip">tip</span></a></li>
+<li><a href="/ml">മലയാളം <span class="tip">tip</span></a></li>
 <li><a href="/pt-br">português do Brasil - v3.0</a></li>
 <li><a href="/ro">română - v3.0</a></li>
 <li><a href="/ru">русский - v4.0</a></li>
 <li><a href="/sq">Shqip - v4.0</a></li>
 <li><a href="/sv">svenska - v4.0</a></li>
 <li><a href="/tr">Türkçe - v4.0</a></li>
-<li><a
-href="https://libreplanet.org/wiki/GPG_guide/Translation_Guide"><strong><span
+<li><a href="/zh-hans">简体中文 <span class="tip">tip</span></a></li>
+<li><a href="https://libreplanet.org/wiki/GPG_guide/Translation_Guide"><strong><span
 style="color: #2F5FAA;">Translate!</span></strong></a></li>
 </ul>
 
@@ -235,7 +238,7 @@ so, skip this step.</p>
 <p>If not, search "Enigmail" with the search bar in the upper right. You
 can take it from here. Restart your email program when you're done.</p>
 
-<p>Enigmail versions prior to 2.0.5 have serious security issues, so make sure you install version 2.0.5 or later.</p>
+<p>Enigmail versions prior to 2.0.6 have serious security issues. Make sure to install version 2.0.6 or later. The current version is 2.0.6.1.</p>
 
 <!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
 <div class="troubleshooting">
@@ -654,6 +657,11 @@ using GnuPG, even if they can't figure out what you're saying. When you
 send attachments, Enigmail will give you the choice to encrypt them or not,
 independent of the actual email.</p>
 
+<p>For greater security against potential attacks, you can turn off
+HTML. Instead, you can render the message body as plain text. In order
+to do this in Thunderbird, go to View > Message Body As > Plain
+Text.</p>
+
 </div><!-- End .main -->
 </div><!-- End #step-headers_unencrypted .step-->