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.

5 files changed, 21 insertions, 26 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'),
diff --git a/en/for-pc/index.php b/en/for-pc/index.php
index b05ceaa29..24a3963d4 100644
--- a/en/for-pc/index.php
+++ b/en/for-pc/index.php
@@ -25,9 +25,9 @@ _lang_load($locale, '3');
         <section>
             <?php
                 _h('Plenty', null, 'h2');
-                _h('There are more than 21&nbsp;700&nbsp;packages in our repositories. And that\'s just for the 64-bit branch.');
-                _h('The total number is double that &ndash; and then if you consider the backports, and the packages in the Cauldron still testing... you\'ll see that Mageia users are spoiled for choice.');
-                _h('Here\'s a cross-section, first of the working graphical environments, and then of the core applications you could be using on your desktop:');
+                _h('There are more than 21&nbsp;700&nbsp;packages in our repositories. And that&#39;s just for the 64-bit branch.');
+                _h('The total number is double that &ndash; and then if you consider the backports, and the packages in the Cauldron still testing... you&#39;ll see that Mageia users are spoiled for choice.');
+                _h('Here&#39;s a cross-section, first of the working graphical environments, and then of the core applications you could be using on your desktop:');
                 _h('Environments', null, 'h2');
                 _h('Mageia 3 has all the major desktop environments:');
             ?>
@@ -61,7 +61,7 @@ _lang_load($locale, '3');
     <div class="para" style="width: 300px">
         <?php
             _h('Office', null, 'h3');
-            _h('The two full-featured office suites LibreOffice and Calligra are there, as well as AbiWord, and a host of text editors including Kate; for finance there\'s KMyMoney, Skrooge or the professional-level GnuCash.');
+            _h('The two full-featured office suites LibreOffice and Calligra are there, as well as AbiWord, and a host of text editors including Kate; for finance there&#39;s KMyMoney, Skrooge or the professional-level GnuCash.');
         ?>
     </div>
     <div class="para" style="width: 300px">
@@ -73,19 +73,19 @@ _lang_load($locale, '3');
     <div class="para" style="width: 300px">
         <?php
             _h('Sound', null, 'h3');
-            _h('For playing audio files, choose from Amarok 2.7.0 and Rhythmbox, among others; use VLC, Totem or MPlayer for video and for audio, or use the XBMC Media Center as your home entertainment system. Some packages can be found in both the Core and Tainted repositories: the packages in the Core repository support only non-patent-encumbered codecs and the packages in the Tainted repository support all codecs, for users who live in countries where those codecs don\'t infringe local laws.');
+            _h('For playing audio files, choose from Amarok 2.7.0 and Rhythmbox, among others; use VLC, Totem or MPlayer for video and for audio, or use the XBMC Media Center as your home entertainment system. Some packages can be found in both the Core and Tainted repositories: the packages in the Core repository support only non-patent-encumbered codecs and the packages in the Tainted repository support all codecs, for users who live in countries where those codecs don&#39;t infringe local laws.');
         ?>
     </div>
     <div class="para" style="width: 300px">
         <?php
             _h('Video', null, 'h3');
-            _h('For editing video files, try Avidemux, Kino or OpenShot; for subtitles, there\'s Gaupol or Subtitles Composer; use MythTV, Miro, tvtime, FreetuxTV or Me TV for watching or recording TV programmes.');
+            _h('For editing video files, try Avidemux, Kino or OpenShot; for subtitles, there&#39;s Gaupol or Subtitles Composer; use MythTV, Miro, tvtime, FreetuxTV or Me TV for watching or recording TV programmes.');
         ?>
     </div>
     <div class="para" style="width: 300px">
         <?php
             _h('Plus', null, 'h3');
-            _h('Then there\'s ZoneMinder, for CCTV Security; VirtualBox or WINE for virtualisation; and a range of development environments such as Anjuta, Eclipse, Netbeans or KDevelop.');
+            _h('Then there&#39;s ZoneMinder, for CCTV Security; VirtualBox or WINE for virtualisation; and a range of development environments such as Anjuta, Eclipse, Netbeans or KDevelop.');
         ?>
     </div>
     <div class="para">
diff --git a/en/for-server/index.php b/en/for-server/index.php
index 44a145db7..30dec3d97 100644
--- a/en/for-server/index.php
+++ b/en/for-server/index.php
@@ -25,12 +25,10 @@ _lang_load($locale, '3');
         <section>
             <?php
             _h('Mageia 3 has all the main services and server packages you will need to run your server.');
-            _h('Aside from the cross-section included here, you will find many others in the repositories: you can use rpmdrake to search for packages, or check the <a href="%s">Mageia App DB</a>.',
-                array('http://mageia.madb.org'));
+            _h('Aside from the cross-section included here, you will find many others in the repositories: you can use rpmdrake to search for packages, or check the <a href="%s">Mageia App DB</a>.', array('http://mageia.madb.org'));
 
             _h('Administration', null, 'h3');
-            _h('For centralised administration, we include puppet 2.7.21; we use it widely in <a href="%s">our own infrastructure</a>.',
-                array('http://svnweb.mageia.org/adm/puppet/'));
+            _h('For centralised administration, we include puppet 2.7.21; we use it widely in <a href="%s">our own infrastructure</a>.', array('http://svnweb.mageia.org/adm/puppet/'));
 
             _h('The entire High Availability stack has been updated, and now includes drbd 8.4.2, Corosync 2.3.0 and Pacemaker 1.1.8.');
 
@@ -48,8 +46,7 @@ _lang_load($locale, '3');
     <div class="para">
         <?php
         _h('For more information about these and other packages, check the <a href="https://wiki.mageia.org/en/Mageia_3_Release_Notes">Mageia 3 Release notes</a>.');
-        _h('You can take a look at the <a href="%s">Mageia Application Database</a> to get a more complete list of Mageia packages.',
-            array('http://mageia.madb.org/'));
+        _h('You can take a look at the <a href="%s">Mageia Application Database</a> to get a more complete list of Mageia packages.', array('http://mageia.madb.org/'));
         ?>
     </div>
 </body>