Updating 3.en.lang. Fixing some php strings so that the extract2lang.php script can work them out (namely changing escaped single quotes to html '). Some translations may need to be adapted.

3 files changed, 11 insertions, 13 deletions

diff --git a/en/3/download_index.php b/en/3/download_index.php
index 9c23293c8..64d4ee8f1 100755
--- a/en/3/download_index.php
+++ b/en/3/download_index.php
@@ -80,8 +80,7 @@ require '../downloads/get/lib.php';
                         <h2><?php _e('LiveCDs and LiveDVDs');?></h2>
                         <p class="dlinfo"><?php _e('Use LiveCDs and LiveDVDs for fresh new installs ONLY.');?>
                             <span class="warn"><?php _e('DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 2!'); ?></span>
-                            <?php _e('Use above DVD or CD and see <a href="%s" hreflang="en">upgrade guide</a>.',
-                                array('https://wiki.mageia.org/en/Mageia_3_Release_Notes#Upgrading_from_Mageia_2'));?></p>
+                            <?php _e('Use above DVD or CD and see <a href="%s" hreflang="en">upgrade guide</a>.', array('https://wiki.mageia.org/en/Mageia_3_Release_Notes#Upgrading_from_Mageia_2'));?></p>
                         <table class="fr-table dlt2">
                         <thead>
                             <tr>
@@ -174,8 +173,7 @@ require '../downloads/get/lib.php';
                         <?php _h('Upgrading<br>from Mageia 2?', null, 'h3')?>
                         <ul class="hl"><?php
                             _h('<strong>do not</strong> use LiveCDs;', null, 'li');
-                            _h('see the <a href="%s" hreflang="en">upgrade guide</a>',
-                                array('https://wiki.mageia.org/en/Mageia_3_Release_Notes#Upgrading_from_Mageia_2'), 'li');
+                            _h('see the <a href="%s" hreflang="en">upgrade guide</a>', array('https://wiki.mageia.org/en/Mageia_3_Release_Notes#Upgrading_from_Mageia_2'), 'li');
                         ?></ul>
                         <br>
                         <br>
diff --git a/en/3/index.php b/en/3/index.php
index 7596d4e78..057aff183 100644
--- a/en/3/index.php
+++ b/en/3/index.php
@@ -26,17 +26,17 @@ _lang_load($locale, '3');
         <section>
             <a href="../downloads" title="Mageia 3"><img src="/g/3/mageia-3-desktop-550.png" alt="Mageia 3" style="width: 550px; display: block; margin: 2em auto 3em auto; box-shadow: 0 0 5px #aaa;"></a>
             <?php
-            _h('Mageia 3 is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>.',
-                array('../community'));
+            _h('Mageia 3 is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>.', array('../community'));
 
-            _h("What's new?", null, 'h2');
+            _h('What&#39;s new?', null, 'h2');
             _h('Too much to include here! See the <a href="https://wiki.mageia.org/en/Mageia_3_Release_Notes">release notes</a> for an extensive exposé.');
-            _h('<a href="../downloads/" style="background: #1272B1; color: white; padding: 0.9em; margin: 1em; display: inline-block; text-shadow: 0 1px 6px #000; border-radius: 3px;">Download it right away!</a>');
-
+            #_h('<a href="../downloads/" style="background: #1272B1; color: white; padding: 0.9em; margin: 1em; display: inline-block; text-shadow: 0 1px 6px #000; border-radius: 3px;">Download it right away!</a>');
+	    ?>
+	    <a href="../downloads/" style="background: #1272B1; color: white; padding: 0.9em; margin: 1em; display: inline-block; text-shadow: 0 1px 6px #000; border-radius: 3px;"><?php _h('Download it right away!');?></a>
+            <?php
             _h('Mageia in context', null, 'h2');
             _h('Mageia is both a Community and a Linux Distribution, with Mageia 3 being our third release.');
-            _h('Since the release of <a href="../1/">Mageia 1</a>, our offering has been consistently in the <a href="%s">top 10 of Distrowatch\'s most popular distributions</a>.',
-                array('http://distrowatch.com/popularity'));
+            _h('Since the release of <a href="../1/">Mageia 1</a>, our offering has been consistently in the <a href="%s">top 10 of Distrowatch&#39;s most popular distributions</a>.', array('http://distrowatch.com/popularity'));
 
             _h('Mageia 3 is supported by the <a href="../about/">Mageia.org nonprofit organisation</a>, which is governed by a body of recognized and elected contributors.');
             _h('Mageia 3 has been made by more than 100 people from all around the world.');
diff --git a/en/3/nav.php b/en/3/nav.php
index 2b7e4628e..940667a8a 100644
--- a/en/3/nav.php
+++ b/en/3/nav.php
@@ -23,8 +23,8 @@ if (array_key_exists($locale, $_nt))
 else
     $_nt = $_nt['en'];
 
-$nav = array(
-    "/{$locale}/3/"          => _t('Mageia 3'),
+$nav = array( 
+    "/{$locale}/3/"          => _t('Mageia&nbsp;3'),
     "/{$locale}/downloads/"  => _t('Download'),
     "/{$locale}/for-pc/"     => _t('For PC'),
     "/{$locale}/for-server/" => _t('For server'),