en: more fixes

- Language picker in index, mac and windows: as in workshops;
  NOTE: Language names are in their own language; they shouldn't be
  translated. The "current" class should be moved from English to the
  relevant language.

- Images in section 5: different alt attributes for different images;
  NOTE: Image descriptions are a little more specific in some translations.
  If there were several different translations for the same original string,
  we wouldn't be able to make correct PO files, should we ever need them.

diff --git a/en/index.html b/en/index.html
index 7361dbad7e6d9b9bcf2b35fae5f174d34d8c6eff..bb132fc09208bd4b4f54b4d9662ed38e78c0da19 100644 (file)
--- a/en/index.html
+++ b/en/index.html
@@ -22,22 +22,22 @@
 
                        <!-- Language list for browsers that do not have JS enabled -->
                        <ul id="languages" class="os">
-                               <li><a class="current" href="/en">English - 4.0</a></li>
+                               <li><a class="current" href="/en">English - v4.0</a></li>
                                <!--<li><a href="/ar">العربية</a></li>-->
-                               <li><a href="/de">Deutsch - 3.0</a></li>
-                               <li><a href="/el">ελληνικά - 3.0</a></li>
-                               <li><a href="/es">español - 3.0</a></li>
-                               <li><a href="/fr">français - 4.0</a></li>
-                               <li><a href="/it">italiano - 3.0</a></li>
-                               <li><a href="/ja">日本語 - 4.0</a></li>
+                               <li><a href="/de">Deutsch - v3.0</a></li>
+                               <li><a href="/el">ελληνικά - v3.0</a></li>
+                               <li><a href="/es">español - v3.0</a></li>
+                               <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">한국어</a></li>-->
                                <!--<li><a href="/ml">മലയാളം</a></li>-->
-                               <li><a href="/pt-br">português do Brasil - 3.0</a></li>
-                               <li><a href="/ro">română - 3.0</a></li>
-                               <li><a href="/ru">русский - 4.0</a></li>
-                               <li><a href="/sq">Shqip - 4.0</a></li>
-                               <li><a href="/sv">svenska - 4.0</a></li>
-                               <li><a href="/tr">Türkçe - 4.0</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 style="color: #2F5FAA;">Translate!</span></strong></a></li>
                        </ul>
 
@@ -515,7 +515,7 @@
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-5a" class="step">
                                        <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/section5-01-use-it-well.png" alt="Section 5: Use it Well" /></p>
+                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/section5-01-use-it-well.png" alt="Section 5: Use it Well (1)" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3>When should I encrypt? When should I sign?</h3>
@@ -529,7 +529,7 @@
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-5b" class="step">
                                        <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/section5-02-use-it-well.png" alt="Section 5: Use it Well" /></p>
+                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/section5-02-use-it-well.png" alt="Section 5: Use it Well (2)" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3>Be wary of invalid keys</h3>

diff --git a/en/mac.html b/en/mac.html
index a0856657ef20f5c37abe46a483b11e23eb3085b8..bf8879e1b4db45b13089b9421849611f0b7362ce 100644 (file)
--- a/en/mac.html
+++ b/en/mac.html
@@ -22,22 +22,22 @@
 
                        <!-- Language list for browsers that do not have JS enabled -->
                        <ul id="languages" class="os">
-                               <li><a class="current" href="/en">English - 4.0</a></li>
+                               <li><a class="current" href="/en">English - v4.0</a></li>
                                <!--<li><a href="/ar">العربية</a></li>-->
-                               <li><a href="/de">Deutsch - 3.0</a></li>
-                               <li><a href="/el">ελληνικά - 3.0</a></li>
-                               <li><a href="/es">español - 3.0</a></li>
-                               <li><a href="/fr">français - 4.0</a></li>
-                               <li><a href="/it">italiano - 3.0</a></li>
-                               <li><a href="/ja">日本語 - 4.0</a></li>
+                               <li><a href="/de">Deutsch - v3.0</a></li>
+                               <li><a href="/el">ελληνικά - v3.0</a></li>
+                               <li><a href="/es">español - v3.0</a></li>
+                               <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">한국어</a></li>-->
                                <!--<li><a href="/ml">മലയാളം</a></li>-->
-                               <li><a href="/pt-br">português do Brasil - 3.0</a></li>
-                               <li><a href="/ro">română - 3.0</a></li>
-                               <li><a href="/ru">русский - 4.0</a></li>
-                               <li><a href="/sq">Shqip - 4.0</a></li>
-                               <li><a href="/sv">svenska - 4.0</a></li>
-                               <li><a href="/tr">Türkçe - 4.0</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 style="color: #2F5FAA;">Translate!</span></strong></a></li>
                        </ul>
 
@@ -516,7 +516,7 @@
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-5a" class="step">
                                        <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/section5-01-use-it-well.png" alt="Section 5: Use it Well" /></p>
+                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/section5-01-use-it-well.png" alt="Section 5: Use it Well (1)" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3>When should I encrypt? When should I sign?</h3>
@@ -530,7 +530,7 @@
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-5b" class="step">
                                        <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/section5-02-use-it-well.png" alt="Section 5: Use it Well" /></p>
+                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/section5-02-use-it-well.png" alt="Section 5: Use it Well (2)" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3>Be wary of invalid keys</h3>

diff --git a/en/windows.html b/en/windows.html
index 7eae56aa3410e3b4661aaf74991e42491838b362..b46b4cc09277b63cb52685acf0a616ecfdabbe93 100644 (file)
--- a/en/windows.html
+++ b/en/windows.html
@@ -22,22 +22,22 @@
 
                        <!-- Language list for browsers that do not have JS enabled -->
                        <ul id="languages" class="os">
-                               <li><a class="current" href="/en">English - 4.0</a></li>
+                               <li><a class="current" href="/en">English - v4.0</a></li>
                                <!--<li><a href="/ar">العربية</a></li>-->
-                               <li><a href="/de">Deutsch - 3.0</a></li>
-                               <li><a href="/el">ελληνικά - 3.0</a></li>
-                               <li><a href="/es">español - 3.0</a></li>
-                               <li><a href="/fr">français - 4.0</a></li>
-                               <li><a href="/it">italiano - 3.0</a></li>
-                               <li><a href="/ja">日本語 - 4.0</a></li>
+                               <li><a href="/de">Deutsch - v3.0</a></li>
+                               <li><a href="/el">ελληνικά - v3.0</a></li>
+                               <li><a href="/es">español - v3.0</a></li>
+                               <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">한국어</a></li>-->
                                <!--<li><a href="/ml">മലയാളം</a></li>-->
-                               <li><a href="/pt-br">português do Brasil - 3.0</a></li>
-                               <li><a href="/ro">română - 3.0</a></li>
-                               <li><a href="/ru">русский - 4.0</a></li>
-                               <li><a href="/sq">Shqip - 4.0</a></li>
-                               <li><a href="/sv">svenska - 4.0</a></li>
-                               <li><a href="/tr">Türkçe - 4.0</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 style="color: #2F5FAA;">Translate!</span></strong></a></li>
                        </ul>
 
@@ -511,7 +511,7 @@
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-5a" class="step">
                                        <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/section5-01-use-it-well.png" alt="Section 5: Use it Well" /></p>
+                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/section5-01-use-it-well.png" alt="Section 5: Use it Well (1)" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3>When should I encrypt? When should I sign?</h3>
@@ -525,7 +525,7 @@
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-5b" class="step">
                                        <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/section5-02-use-it-well.png" alt="Section 5: Use it Well" /></p>
+                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/section5-02-use-it-well.png" alt="Section 5: Use it Well (2)" /></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3>Be wary of invalid keys</h3>