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.

8 files changed, 417 insertions, 401 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>
diff --git a/langs/en/3.en.lang b/langs/en/3.en.lang
index 6afaf5e95..97c8107c7 100644
--- a/langs/en/3.en.lang
+++ b/langs/en/3.en.lang
@@ -1,4 +1,4 @@
-# Generated by extract2lang.php on 2013-05-18T00:15:25+02:00
+# Generated by extract2lang.php on 2013-05-19T14:56:15+00:00
 # Domain 3
 
 # en/3/download_index.php +14
@@ -56,7 +56,7 @@ link
 dualarch
 
 
-# manually added
+# en/3/download_index.php +64
 ;Notes:
 Notes:
 
@@ -105,224 +105,432 @@ Use LiveCDs and LiveDVDs for fresh new installs ONLY.
 ;DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 2!
 DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 2!
 
-# added manually
+
+# en/3/download_index.php +83
 ;Use above DVD or CD and see <a href="%s" hreflang="en">upgrade guide</a>.
 Use above DVD or CD and see <a href="%s" hreflang="en">upgrade guide</a>.
 
-# added manually
-;see the <a href="%s" hreflang="en">upgrade guide</a>
-see the <a href="%s" hreflang="en">upgrade guide</a>
 
-# en/3/download_index.php +88
+# en/3/download_index.php +87
 ;Desktop
 Desktop
 
 
-# en/3/download_index.php +91
+# en/3/download_index.php +90
 ;BitTorrent
 BitTorrent
 
 
-# en/3/download_index.php +96
+# en/3/download_index.php +95
 ;LiveDVD KDE
 LiveDVD KDE
 
 
-# en/3/download_index.php +97
+# en/3/download_index.php +96
 ;All languages
 All languages
 
 
-# en/3/download_index.php +105
+# en/3/download_index.php +104
 ;LiveDVD GNOME
 LiveDVD GNOME
 
 
-# en/3/download_index.php +113
+# en/3/download_index.php +112
 ;LiveCD KDE
 LiveCD KDE
 
 
-# en/3/download_index.php +114
+# en/3/download_index.php +113
 ;English only
 English only
 
 
-# en/3/download_index.php +120
+# en/3/download_index.php +119
 ;LiveCD GNOME
 LiveCD GNOME
 
 
-# en/3/download_index.php +133
+# en/3/download_index.php +132
 ;Wired Network-based Installation CD
 Wired Network-based Installation CD
 
 
-# en/3/download_index.php +134
+# en/3/download_index.php +133
 ;Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk.
 Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk.
 
 
-# en/3/download_index.php +146
+# en/3/download_index.php +145
 ;Network installer, Free Software CD
 Network installer, Free Software CD
 
 
-# en/3/download_index.php +152
+# en/3/download_index.php +151
 ;Network installer + nonfree firmware CD
 Network installer + nonfree firmware CD
 
 
-# en/3/download_index.php +153
+# en/3/download_index.php +152
 ;needed for some disc controllers, some network cards, etc.
 needed for some disc controllers, some network cards, etc.
 
 
-# en/3/download_index.php +167
+# en/3/download_index.php +166
 ;May 19<sup>th</sup> 2013
 May 19<sup>th</sup> 2013
 
 
+# en/3/download_index.php +168
+;<a href="%s">Release notes</a>
+<a href="%s">Release notes</a>
+
+
 # en/3/download_index.php +169
-;Release notes
-Release notes
+;<a href="%s">Errata</a>
+<a href="%s">Errata</a>
 
 
-# en/3/download_index.php +174
+# en/3/download_index.php +173
 ;Upgrading<br>from Mageia 2?
 Upgrading<br>from Mageia 2?
 
 
-# en/3/download_index.php +176
+# en/3/download_index.php +175
 ;<strong>do not</strong> use LiveCDs;
 <strong>do not</strong> use LiveCDs;
 
 
-# en/3/download_index.php +183
+# en/3/download_index.php +176
+;see the <a href="%s" hreflang="en">upgrade guide</a>
+see the <a href="%s" hreflang="en">upgrade guide</a>
+
+
+# en/3/download_index.php +181
 ;Looking for Mageia 2?
 Looking for Mageia 2?
 
 
-# en/3/download_index.php +185
+# en/3/download_index.php +183
 ;It is <a href="%s">here now</a>.
 It is <a href="%s">here now</a>.
 
 
-# en/3/download_index.php +191
+# en/3/download_index.php +189
 ;Looking for Mageia 1?
 Looking for Mageia 1?
 
 
-# en/3/download_index.php +194
+# en/3/download_index.php +192
 ;But please remember that it already <a href="http://blog.mageia.org/en/2012/12/02/mageia-1-eol"/>reached EOL</a>.
 But please remember that it already <a href="http://blog.mageia.org/en/2012/12/02/mageia-1-eol"/>reached EOL</a>.
 
 
-# en/3/download_index.php +200
+# en/3/download_index.php +198
 ;Need more challenge?
 Need more challenge?
 
 
-# en/3/download_index.php +201
+# en/3/download_index.php +199
 ;You can help us <a href="%s">on Mageia 4</a>.
 You can help us <a href="%s">on Mageia 4</a>.
 
 
-# en/3/index.php +12
-;Mageia 3
-Mageia 3
+# en/for-pc/index.php +12
+;Mageia 3, for your PC
+Mageia 3, for your PC
 
 
-# en/3/index.php +35
-;Development roadmap
-Development roadmap
+# en/for-pc/index.php +22
+;for your PC
+for your PC
 
 
-# en/3/index.php +36
-;Features review
-Features review
+# en/for-pc/index.php +27
+;Plenty
+Plenty
 
 
-# en/3/index.php +38
-;Errata
-Errata
+# en/for-pc/index.php +28
+;There are more than 21&nbsp;700&nbsp;packages in our repositories. And that&#39;s just for the 64-bit branch.
+There are more than 21&nbsp;700&nbsp;packages in our repositories. And that&#39;s just for the 64-bit branch.
 
 
-# en/3/index.php +39
-;Bugs Reports
-Bugs Reports
+# en/for-pc/index.php +29
+;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.
+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.
 
 
-# en/3/index.php +43
-;This is a Release Candidate. Release Candidate software is software that has graduated Beta testing, and should be a release-ready product suitable for advanced users and reviewers. However, beginning users and critical-applications users may wish to wait for the final release planned for May 2013.
-This is a Release Candidate. Release Candidate software is software that has graduated Beta testing, and should be a release-ready product suitable for advanced users and reviewers. However, beginning users and critical-applications users may wish to wait for the final release planned for May 2013.
+# en/for-pc/index.php +30
+;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:
+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:
 
 
-# en/3/index.php +44
-;Release Candidate is intended to identify any remaining bugs or missing packages.
-Release Candidate is intended to identify any remaining bugs or missing packages.
+# en/for-pc/index.php +31
+;Environments
+Environments
+
+
+# en/for-pc/index.php +32
+;Mageia 3 has all the major desktop environments:
+Mageia 3 has all the major desktop environments:
+
+
+# en/for-pc/index.php +43
+;And then there are the window managers, including Openbox, WindowMaker, IceWM, Fluxbox, Fvwm2 and Awesome.
+And then there are the window managers, including Openbox, WindowMaker, IceWM, Fluxbox, Fvwm2 and Awesome.
+
+
+# en/for-pc/index.php +44
+;Applications &rarr;
+Applications &rarr;
+
+
+# en/for-pc/index.php +45
+;There are many, many to choose from &ndash; including all the most popular.
+There are many, many to choose from &ndash; including all the most popular.
+
+
+# en/for-pc/index.php +51
+;Web
+Web
+
+
+# en/for-pc/index.php +52
+;Choose your web browser from Firefox ESR 17.0.6, Chromium-browser 26.0.1410.65, Epiphany 3.6.1 or Opera 12.15 &ndash; or one of the many others such as Lynx or Konqueror; then pick an email client from KMail 4.10.2, Thunderbird ESR 17.0.6, Evolution 3.6.3 or maybe Claws-Mail or Mutt.
+Choose your web browser from Firefox ESR 17.0.6, Chromium-browser 26.0.1410.65, Epiphany 3.6.1 or Opera 12.15 &ndash; or one of the many others such as Lynx or Konqueror; then pick an email client from KMail 4.10.2, Thunderbird ESR 17.0.6, Evolution 3.6.3 or maybe Claws-Mail or Mutt.
+
+
+# en/for-pc/index.php +57
+;Messaging
+Messaging
+
+
+# en/for-pc/index.php +58
+;Choose from Kopete, Pidgin, Empathy or Kadu for instant messaging; use Quassel, Konversation, XChat-Gnome or KVIrc for IRC chat; try QuteCom or Ekiga (or even Skype) for VOIP.
+Choose from Kopete, Pidgin, Empathy or Kadu for instant messaging; use Quassel, Konversation, XChat-Gnome or KVIrc for IRC chat; try QuteCom or Ekiga (or even Skype) for VOIP.
+
+
+# en/for-pc/index.php +63
+;Office
+Office
+
+
+# en/for-pc/index.php +64
+;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.
+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.
+
+
+# en/for-pc/index.php +69
+;Image
+Image
+
+
+# en/for-pc/index.php +70
+;Use GIMP for powerful image manipulation, or Inkscape for vector drawing; Blender is there for serious animation. DigiKam or Showfoto will take care of your photos, talk to your camera and give you more basic image editing.
+Use GIMP for powerful image manipulation, or Inkscape for vector drawing; Blender is there for serious animation. DigiKam or Showfoto will take care of your photos, talk to your camera and give you more basic image editing.
+
+
+# en/for-pc/index.php +75
+;Sound
+Sound
+
+
+# en/for-pc/index.php +76
+;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.
+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.
+
+
+# en/for-pc/index.php +81
+;Video
+Video
 
 
-# en/3/index.php +46
-;Download %s
-Download %s
+# en/for-pc/index.php +82
+;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.
+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.
 
 
-# en/3/index.php +54
-;Installer DVD and CD ISOs now contains Free Software and some proprietary drivers.
-Installer DVD and CD ISOs now contains Free Software and some proprietary drivers.
+# en/for-pc/index.php +87
+;Plus
+Plus
 
 
-# en/3/index.php +57
-;The installation CD contains only a minimal list of packages.
-The installation CD contains only a minimal list of packages.
+# en/for-pc/index.php +88
+;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.
+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.
 
 
-# en/3/index.php +58
-;Use LiveCDs or LiveDVDs for fresh new installs ONLY, NOT FOR UPGRADE.
-Use LiveCDs or LiveDVDs for fresh new installs ONLY, NOT FOR UPGRADE.
+# en/for-pc/index.php +93
+;For more information about these and other packages, check the <a href="%s">Mageia 3 Release notes</a>.
+For more information about these and other packages, check the <a href="%s">Mageia 3 Release notes</a>.
 
 
-# en/3/index.php +59
-;If you are looking for a stable version of Mageia, <a href="%s" rel="nofollow">go here</a>.
-If you are looking for a stable version of Mageia, <a href="%s" rel="nofollow">go here</a>.
+# en/for-pc/index.php +94
+;You can take a look at the <a href="%s">Mageia Application Database</a> to get a more complete list of Mageia packages.
+You can take a look at the <a href="%s">Mageia Application Database</a> to get a more complete list of Mageia packages.
 
 
-# en/3/index.php +60
-;Enjoy! And <a href="%s">please report bugs</a> if you find some.
-Enjoy! And <a href="%s">please report bugs</a> if you find some.
+# en/for-server/index.php +12
+;Mageia 3, for your server
+Mageia 3, for your server
 
 
-# en/3/index.php +75
-;Installer DVD
-Installer DVD
+# en/for-server/index.php +22
+;for your server
+for your server
 
 
-# en/3/index.php +76
-;Free Software and some proprietary drivers
-Free Software and some proprietary drivers
+# en/for-server/index.php +27
+;Mageia 3 has all the main services and server packages you will need to run your server.
+Mageia 3 has all the main services and server packages you will need to run your server.
+
+
+# en/for-server/index.php +28
+;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>.
+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>.
+
+
+# en/for-server/index.php +30
+;Administration
+Administration
+
+
+# en/for-server/index.php +31
+;For centralised administration, we include puppet 2.7.21; we use it widely in <a href="%s">our own infrastructure</a>.
+For centralised administration, we include puppet 2.7.21; we use it widely in <a href="%s">our own infrastructure</a>.
+
+
+# en/for-server/index.php +33
+;The entire High Availability stack has been updated, and now includes drbd 8.4.2, Corosync 2.3.0 and Pacemaker 1.1.8.
+The entire High Availability stack has been updated, and now includes drbd 8.4.2, Corosync 2.3.0 and Pacemaker 1.1.8.
+
+
+# en/for-server/index.php +35
+;Databases
+Databases
+
+
+# en/for-server/index.php +36
+;Databases included are PostgreSQL 8.4.17; MariaDB 5.5.28, which replaces MySQL; BDB.
+Databases included are PostgreSQL 8.4.17; MariaDB 5.5.28, which replaces MySQL; BDB.
+
+
+# en/for-server/index.php +37
+;And there are NoSQL servers too: CouchDB 1.2.1, Redis 2.6.5, MongoDB 2.2.2.
+And there are NoSQL servers too: CouchDB 1.2.1, Redis 2.6.5, MongoDB 2.2.2.
+
+
+# en/for-server/index.php +39
+;Servers
+Servers
+
+
+# en/for-server/index.php +40
+;Web servers include Apache 2.4.4, Cherokee 1.2.101 and lighttpd 1.4.32.
+Web servers include Apache 2.4.4, Cherokee 1.2.101 and lighttpd 1.4.32.
+
+
+# en/for-server/index.php +41
+;For file and directory sharing and network printing on heterogeneous networks, we have Samba 3.6.15, OpenLDAP 2.4.33 and Cups 1.5.4.
+For file and directory sharing and network printing on heterogeneous networks, we have Samba 3.6.15, OpenLDAP 2.4.33 and Cups 1.5.4.
+
+
+# en/for-server/index.php +42
+;Mail servers included with Mageia 3 are Postfix 2.9.6, Cyrus-imapd 2.4.17 and Dovecot 2.1.15.
+Mail servers included with Mageia 3 are Postfix 2.9.6, Cyrus-imapd 2.4.17 and Dovecot 2.1.15.
+
+
+# en/for-server/index.php +48
+;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>.
+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>.
+
+
+# en/3/index.php +12
+;Mageia 3
+Mageia 3
+
+
+# en/3/index.php +14
+;Mageia 3 is the new, solid, stable Linux distribution from the Mageia project.
+Mageia 3 is the new, solid, stable Linux distribution from the Mageia project.
+
+
+# en/3/index.php +29
+;Mageia 3 is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>.
+Mageia 3 is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>.
+
+
+# en/3/index.php +31
+;What&#39;s new?
+What&#39;s new?
+
+
+# en/3/index.php +32
+;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é.
+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é.
+
+
+# en/3/index.php +33
+;<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;">Download it right away!</a>
+
+
+# en/3/index.php +35
+;Download it right away!
+Download it right away!
+
+
+# en/3/index.php +37
+;Mageia in context
+Mageia in context
+
+
+# en/3/index.php +38
+;Mageia is both a Community and a Linux Distribution, with Mageia 3 being our third release.
+Mageia is both a Community and a Linux Distribution, with Mageia 3 being our third release.
+
+
+# en/3/index.php +39
+;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>.
+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>.
+
+
+# en/3/index.php +41
+;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.
+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.
+
+
+# en/3/index.php +42
+;Mageia 3 has been made by more than 100 people from all around the world.
+Mageia 3 has been made by more than 100 people from all around the world.
+
+
+# en/3/index.php +44
+;Our work adds to the excellent work of the wider Linux and Free Software community. We aim to bring one of the best, most stable, reliable and enjoyable experience and platform we can make; for regular users, developers and businesses.
+Our work adds to the excellent work of the wider Linux and Free Software community. We aim to bring one of the best, most stable, reliable and enjoyable experience and platform we can make; for regular users, developers and businesses.
 
 
-# en/3/index.php +84
-;Installer CD
-Installer CD
+# en/3/index.php +45
+;We welcome new contributors to any of the many different teams that go to make up Mageia the Community, and we encourage you to join us.
+We welcome new contributors to any of the many different teams that go to make up Mageia the Community, and we encourage you to join us.
 
 
-# en/3/index.php +85
-;100% Free Software
-100% Free Software
+# en/3/nav.php +27
+;Mageia&nbsp;3
+Mageia&nbsp;3
 
 
-# en/3/index.php +93
-;not suitable for upgrade
-not suitable for upgrade
+# en/3/nav.php +28
+;Download
+Download
 
 
-# en/3/index.php +111
-;LiveCD KDE, English-only
-LiveCD KDE, English-only
+# en/3/nav.php +29
+;For PC
+For PC
 
 
-# en/3/index.php +118
-;LiveCD GNOME, English-only
-LiveCD GNOME, English-only
+# en/3/nav.php +30
+;For server
+For server
diff --git a/langs/fr/3.fr.lang b/langs/fr/3.fr.lang
index 812afd6d5..4c6675444 100644
--- a/langs/fr/3.fr.lang
+++ b/langs/fr/3.fr.lang
@@ -56,7 +56,7 @@ Lien
 dualarch {ok}
 
 
-# manually added
+# en/3/download_index.php +64
 ;Notes:
 Remarques&nbsp;:
 
@@ -106,7 +106,7 @@ N'utilisez les LiveCD ou LiveDVD QUE pour de nouvelles installations.
 N'utilisez PAS ces LiveCD ou LiveDVD pour une mise à niveau depuis Mageia 2 !
 
 
-# added manually
+# en/3/download_index.php +83
 ;Use above DVD or CD and see <a href="%s" hreflang="en">upgrade guide</a>.
 Utilisez l'un des DVD ou CD ci-dessus et consultez le <a href="https://wiki.mageia.org/en/Mageia_3_:_Notes_de_Version_-_FR#Mise_.C3.A0_niveau_de_Mageia_2">guide de migration</a>.
 
@@ -186,7 +186,7 @@ nécessaires pour certains contrôleurs de disques ou cartes réseaux, etc.
 <a href="https://wiki.mageia.org/en/Mageia_3_:_Notes_de_Version_-_FR">Notes de publication</a>
 
 
-# added manually
+# en/3/download_index.php +169
 ;<a href="%s">Errata</a>
 <a href="https://wiki.mageia.org/en/Mageia_3_Errata_Fr">Errata</a>
 
@@ -200,10 +200,12 @@ Mise à niveau<br>depuis Mageia 2&nbsp;?
 ;<strong>do not</strong> use LiveCDs;
 <strong>ne pas</strong> utiliser de LiveCD ou LiveDVD&nbsp;;
 
-# added manually
+
+# en/3/download_index.php +176
 ;see the <a href="%s" hreflang="en">upgrade guide</a>
 consultez le <a href="https://wiki.mageia.org/en/Mageia_3_:_Notes_de_Version_-_FR#Mise_.C3.A0_niveau_de_Mageia_2">guide de migration</a>
 
+
 # en/3/download_index.php +183
 ;Looking for Mageia 2?
 Vous cherchez Mageia&nbsp;2&nbsp;?
@@ -234,279 +236,6 @@ Il vous faut plus de challenge&nbsp;?
 Vous pouvez nous aider <a href="%s">à développer et tester Mageia 4</a>.
 
 
-# ../../svn/web/en/3/index.php +12
-;Mageia 3
-Mageia 3 {ok}
-
-
-# ../../svn/web/en/3/index.php +34
-;Development roadmap
-Feuille de route de développement
-
-
-# ../../svn/web/en/3/index.php +35
-;Features review
-Caractéristiques
-
-
-# ../../svn/web/en/3/index.php +37
-;Release notes
-Notes de publication
-
-
-# ../../svn/web/en/3/index.php +38
-;Errata
-Errata {ok}
-
-
-# ../../svn/web/en/3/index.php +39
-;Bugs Reports
-Rapports de bugs
-
-
-# ../../svn/web/en/3/index.php +43
-;This is a Release Candidate. Release Candidate software is software that has graduated Beta testing, and should be a release-ready product suitable for advanced users and reviewers. However, beginning users and critical-applications users may wish to wait for the final release planned for May 2013.
-Il s'agit d'une version admissible (RC). Un logiciel admissible est un logiciel qui a passé avec succès les tests beta et qui devrait être prêt à être utilisé par les utilisateurs avancés et les critiques (journalistes). Toutefois, les utilisateurs débutants et les utilisateurs d'applications critiques voudront peut-être attendre la sortie de la version finale, prévue pour mai 2013.
-
-
-# ../../svn/web/en/3/index.php +44
-;Release Candidate is intended to identify any remaining bugs or missing packages.
-Cette version est destinée à identifier tous les bogues restants ou les paquetages manquants.
-
-
-# ../../svn/web/en/3/index.php +46
-;Download %s
-Télécharger %s
-
-
-# ../../svn/web/en/3/index.php +48
-;Up to 167 locales are supported:
-Jusqu'à 167 langues sont incluses :
-
-
-# ../../svn/web/en/3/index.php +51
-;and so much more!
-et bien plus encore !
-
-
-# ../../svn/web/en/3/index.php +52
-;See the comprehensive list
-Voir la liste exhaustive
-
-
-# ../../svn/web/en/3/index.php +54
-;Installer DVD and CD ISOs now contains Free Software and some proprietary drivers.
-Le DVD d'installation et les images ISO de CD contiennent désormais, en plus des logiciels libres, quelques pilotes propriétaires.
-
-
-# ../../svn/web/en/3/index.php +55
-;You will be asked of which kind of Software you want to install.
-Il vous sera demandé quels types de logiciels vous souhaitez installer.
-
-
-# ../../svn/web/en/3/index.php +57
-;The installation CD contains only a minimal list of packages.
-Le CD d'installation ne contient qu'un nombre restreint de paquets.
-
-
-# ../../svn/web/en/3/index.php +59
-;Use LiveCDs or LiveDVDs for fresh new installs ONLY, NOT FOR UPGRADE.
-N'utilisez les LiveCD ou LiveDVD QUE pour de nouvelles installations, PAS POUR UNE MISE À NIVEAU.
-
-
-# ../../svn/web/en/3/index.php +60
-;If you are looking for a stable version of Mageia, <a href="%s" rel="nofollow">go here</a>.
-Si vous cherchez une version stable de Mageia, <a href="%s" rel="nofollow">c'est ici</a>.
-
-
-# ../../svn/web/en/3/index.php +61
-;Enjoy! And <a href="%s">please report bugs</a> if you find some.
-Faites-vous plaisir ! Et veuillez <a href="%s">signaler des bugs</a> si vous en rencontrez.
-
-
-# ../../svn/web/en/3/index.php +68
-;Format
-Format {ok}
-
-
-# ../../svn/web/en/3/index.php +69
-;size
-Taille
-
-
-# ../../svn/web/en/3/index.php +70
-;link
-Lien
-
-
-# ../../svn/web/en/3/index.php +71
-;BitTorrent
-BitTorrent {ok}
-
-
-# ../../svn/web/en/3/index.php +76
-;Installer DVD
-DVD d'installation
-
-
-# ../../svn/web/en/3/index.php +77
-;Free Software and some proprietary drivers
-de logiciels libres et quelques pilotes propriétaires
-
-
-# ../../svn/web/en/3/index.php +79
-;32bit
-32bit {ok}
-
-
-# ../../svn/web/en/3/index.php +80
-;64bit
-64bit {ok}
-
-
-# ../../svn/web/en/3/index.php +85
-;Installer CD
-CD d'installation
-
-
-# ../../svn/web/en/3/index.php +88
-;dualarch
-dualarch {ok}
-
-
-# ../../svn/web/en/3/index.php +95
-;LiveDVD KDE
-LiveDVD KDE {ok}
-
-
-# en/3/index.php +85
-;100% Free Software
-100% logiciels libres
-
-
-# ../../svn/web/en/3/index.php +96
-;not suitable for upgrade
-non approprié pour une mise à niveau
-
-
-# ../../svn/web/en/3/index.php +104
-;LiveDVD GNOME
-LiveDVD GNOME {ok}
-
-
-# ../../svn/web/en/3/index.php +114
-;LiveCD KDE, English-only
-LiveCD KDE, anglais uniquement
-
-
-# ../../svn/web/en/3/index.php +121
-;LiveCD GNOME, English-only
-LiveCD GNOME, anglais uniquement
-
-
-# ../../svn/web/en/3/index.php +129
-;Network installer, Free Software CD
-CD d'installation réseau, logiciels libres uniquement
-
-
-# ../../svn/web/en/3/index.php +135
-;Network installer + nonfree firmware CD
-CD d'installation réseau contenant des firmwares non libres.
-
-
-# ../../svn/web/en/3/index.php +136
-;needed for some disc controllers, some network cards, etc.
-nécessaires pour certaines cartes réseaux ou contrôleurs de disques, etc.
-
-
-# en/3/index.php +14
-;Mageia 3
-Mageia 3 {ok}
-
-
-# en/3/index.php +16
-;Mageia 3 is the new, solid, stable Linux distribution from the Mageia project.
-Mageia 3 est la nouvelle distribution Linux stable et sécurisée du projet Mageia.
-
-
-# en/3/index.php +30
-;Mageia 3 is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>.
-Mageia 3 est une distribution GNU/Linux pour votre ordinateur, réalisée par la <a href="%s">communauté Mageia</a>.
-
-
-# en/3/index.php +33
-;What's new?
-Quoi de neuf&nbsp;?
-
-
-# en/3/index.php +35
-;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é.
-Bien trop de choses pour les énumérer ici ! Consultez les <a href="https://wiki.mageia.org/en/Mageia_3_:_Notes_de_Version_-_FR">notes de publication</a> pour une liste exhaustive.
-
-
-# en/3/index.php +37
-;<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;">Téléchargez-la !</a>
-
-
-# en/3/index.php +39
-;Mageia in context
-Mageia en contexte
-
-
-# en/3/index.php +41
-;Mageia is both a Community and a Linux Distribution, with Mageia 3 being our third release.
-Mageia est à la fois une communauté et une distribution Linux. Mageia 3 est notre troisième version majeure.
-
-
-# en/3/index.php +43
-;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>.
-Depuis la sortie de <a href="../1/">Mageia 1</a>, notre distribution a toujours été dans le <a href="%s">top 10 des distributions les plus populaires de Distrowatch</a>.
-
-
-# en/3/index.php +46
-;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.
-Mageia 3 est soutenue par <a href="../about/">l&rsquo;association Mageia.Org</a>, gouvernée par des contributeurs reconnus et élus.
-
-
-# en/3/index.php +47
-;Mageia 3 has been made by more than 100 people from all around the world.
-Mageia 3 a été réalisée par plus de 100&nbsp;personnes du monde entier.
-
-
-# en/3/index.php +49
-;Our work adds to the excellent work of the wider Linux and Free Software community. We aim to bring one of the best, most stable, reliable and enjoyable experience and platform we can make; for regular users, developers and businesses.
-Notre contribution s'ajoute à l'excellent travail de la communauté Linux et du logiciel libre dans son ensemble. Notre but est de fournir la plateforme la plus stable, fiable et agréable que nous puissions réaliser, tant pour les utilisateurs classiques que pour les développeurs et les entreprises.
-
-
-# en/3/index.php +51
-;We welcome new contributors to any of the many different teams that go to make up Mageia the Community, and we encourage you to join us.
-Nous accueillons de nouveaux contributeurs dans chacune des nombreuses équipes qui constituent la communauté Mageia, et nous vous invitons à nous rejoindre.
-
-
-
-# en/3/nav.php +27
-;Mageia 3
-Mageia 3 {ok}
-
-
-# en/3/nav.php +28
-;Download
-Télécharger
-
-
-# en/3/nav.php +29
-;For PC
-Pour PC
-
-
-# en/3/nav.php +30
-;For server
-Pour serveur
-
-
-
-
 # en/for-pc/index.php +12
 ;Mageia 3, for your PC
 Mageia 3, pour votre PC
@@ -523,17 +252,17 @@ De nombreux logiciels
 
 
 # en/for-pc/index.php +27
-;There are more than 21&nbsp;700&nbsp;packages in our repositories. And that's just for the 64-bit branch.
+;There are more than 21&nbsp;700&nbsp;packages in our repositories. And that&#39;s just for the 64-bit branch.
 Il y a plus de 21&nbsp;700&nbsp;paquets dans nos dépôts, et cela uniquement pour la branche 64-bit.
 
 
 # en/for-pc/index.php +28
-;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.
+;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.
 Leur nombre total est donc le double de celui-ci, et si vous prenez en compte les backports et les paquets testés dans Cauldron, vous verrez que les utilisateurs de Mageia ont l'embarras du choix !
 
 
 # en/for-pc/index.php +29
-;Here's a cross-section, first of the working graphical environments, and then of the core applications you could be using on your desktop:
+;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:
 Voici un échantillon des environnements graphiques que nous proposons, puis des applications principales que vous utiliserez sur votre ordinateur&nbsp;:
 
 
@@ -588,7 +317,7 @@ Bureautique
 
 
 # en/for-pc/index.php +66
-;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.
+;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.
 Les deux suites bureautiques complètes LibreOffice et Calligra sont disponibles, de même qu'AbiWord et de nombreux éditeurs de texte tels que Kate ; pour vos finances vous trouverez KMyMoney, Skrooge ou le logiciel de niveau professionnel GnuCash.
 
 
@@ -608,7 +337,7 @@ Multimedia
 
 
 # en/for-pc/index.php +78
-;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.
+;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.
 Pour écouter des fichiers audio, vous avez le choix entre Amarok 2.7.0, Rhythmbox et Clementine, parmi d'autres ; utilisez VLC, Totem ou Mplayer pour la vidéo et pour l'audio, ou utilisez le centre de média XBMC pour gérer vos films, photos et musiques. Notez que certains paquets se trouvent à la fois dans les dépôts Core et Tainted&nbsp;: les paquets du dépôt Core ne contiennent pas de codecs présentant des problèmes de brevet, tandis que les paquets du dépôt Tainted comprennent tous les codecs, pour les utilisateurs qui vivent dans des pays où ces codecs n'enfreignent pas les lois locales.
 
 
@@ -618,7 +347,7 @@ Vidéo
 
 
 # en/for-pc/index.php +84
-;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.
+;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.
 Pour l'édition de fichiers vidéo, essayez Avidemux, Kino ou OpenShot&nbsp; pour le sous-titrage, vous trouverez Gaupol ou Subtitles Composer&nbsp; utilisez MythTV, Miro, tvtime, FreetuxTV ou Me TV pour regarder ou enregistrer des émissions TV.
 
 
@@ -628,7 +357,7 @@ Plus {ok}
 
 
 # en/for-pc/index.php +90
-;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.
+;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.
 Pour finir il y a ZoneMinder pour la vidéosurveillance, VirtualBox ou WINE pour la virtualisation, et une série d'environnements de développement tels qu'Anjuta, Eclipse, Netbeans ou KDevelop.
 
 
@@ -721,3 +450,87 @@ Pour plus d'information sur ces paquets et d'autres non cités, consultez les <a
 ;You can take a look at the <a href="%s">Mageia Application Database</a> to get a more complete list of Mageia packages.
 Vous pouvez consulter la <a href="%s">base de donnée des applications de Mageia</a> (<em>Mageia Application Database</em>) pour une liste exhaustive des paquets de Mageia.
 
+
+# en/3/index.php +14
+;Mageia 3
+Mageia 3 {ok}
+
+
+# en/3/index.php +16
+;Mageia 3 is the new, solid, stable Linux distribution from the Mageia project.
+Mageia 3 est la nouvelle distribution Linux stable et sécurisée du projet Mageia.
+
+
+# en/3/index.php +30
+;Mageia 3 is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>.
+Mageia 3 est une distribution GNU/Linux pour votre ordinateur, réalisée par la <a href="%s">communauté Mageia</a>.
+
+
+# en/3/index.php +33
+;What&#39;s new?
+Quoi de neuf&nbsp;?
+
+
+# en/3/index.php +35
+;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é.
+Bien trop de choses pour les énumérer ici ! Consultez les <a href="https://wiki.mageia.org/en/Mageia_3_:_Notes_de_Version_-_FR">notes de publication</a> pour une liste exhaustive.
+
+
+# en/3/index.php +37
+;Download it right away!
+Téléchargez-la !
+
+
+# en/3/index.php +39
+;Mageia in context
+Mageia en contexte
+
+
+# en/3/index.php +41
+;Mageia is both a Community and a Linux Distribution, with Mageia 3 being our third release.
+Mageia est à la fois une communauté et une distribution Linux. Mageia 3 est notre troisième version majeure.
+
+
+# en/3/index.php +43
+;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>.
+Depuis la sortie de <a href="../1/">Mageia 1</a>, notre distribution a toujours été dans le <a href="%s">top 10 des distributions les plus populaires de Distrowatch</a>.
+
+
+# en/3/index.php +46
+;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.
+Mageia 3 est soutenue par <a href="../about/">l&rsquo;association Mageia.Org</a>, gouvernée par des contributeurs reconnus et élus.
+
+
+# en/3/index.php +47
+;Mageia 3 has been made by more than 100 people from all around the world.
+Mageia 3 a été réalisée par plus de 100&nbsp;personnes du monde entier.
+
+
+# en/3/index.php +49
+;Our work adds to the excellent work of the wider Linux and Free Software community. We aim to bring one of the best, most stable, reliable and enjoyable experience and platform we can make; for regular users, developers and businesses.
+Notre contribution s'ajoute à l'excellent travail de la communauté Linux et du logiciel libre dans son ensemble. Notre but est de fournir la plateforme la plus stable, fiable et agréable que nous puissions réaliser, tant pour les utilisateurs classiques que pour les développeurs et les entreprises.
+
+
+# en/3/index.php +51
+;We welcome new contributors to any of the many different teams that go to make up Mageia the Community, and we encourage you to join us.
+Nous accueillons de nouveaux contributeurs dans chacune des nombreuses équipes qui constituent la communauté Mageia, et nous vous invitons à nous rejoindre.
+
+
+# en/3/nav.php +27
+;Mageia&nbsp;3
+Mageia&nbsp;3
+
+
+# en/3/nav.php +28
+;Download
+Télécharger
+
+
+# en/3/nav.php +29
+;For PC
+Pour PC
+
+
+# en/3/nav.php +30
+;For server
+Pour serveur
\ No newline at end of file
diff --git a/tools/extract2lang.php b/tools/extract2lang.php
index 9636f8c90..661836061 100644
--- a/tools/extract2lang.php
+++ b/tools/extract2lang.php
@@ -39,7 +39,7 @@ U;
 
 echo "ohai!\n";
 
-$path = 'en/3/download_index.php en/3/index.php';
+$path = 'en/3/download_index.php en/for-pc/index.php en/for-server/index.php en/3/index.php en/3/nav.php';
 //$path = realpath(APP_ROOT . '/' . $path);
 
 $domain = '3';