two new strings, (one is same as mga3 page)

3 files changed, 53 insertions, 37 deletions

diff --git a/en/4/download_index.php b/en/4/download_index.php
index 07f29469c..13e259415 100755
--- a/en/4/download_index.php
+++ b/en/4/download_index.php
@@ -205,7 +205,7 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
                     <div class="para">
                         <h2><?php _e('Wired Network-based Installation CD')?></h2>
 			<p class="dlinfo"><?php _e('Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk.')?>
-                            <span class="warn"><?php _e("These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it's the case, use above one."); ?></span></p>
+                            <span class="warn"><?php _e('These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one.'); ?></span></p>
 
                         <table class="fr-table dlt2">
                         <thead>
diff --git a/langs/en/4.en.lang b/langs/en/4.en.lang
index 6d6155fe4..c0b454d9f 100644
--- a/langs/en/4.en.lang
+++ b/langs/en/4.en.lang
@@ -1,4 +1,4 @@
-# Generated by extract2lang.php on 2013-07-18T22:16:21+02:00
+# Generated by extract2lang.php on 2013-11-03T14:30:39+00:00
 # Domain 4
 # include translation strings from:
 # en/4/download_index.php
@@ -24,177 +24,187 @@ dualarch
 forthcoming
 
 
-# en/4/download_index.php +55
+# en/4/download_index.php +52
 ;Download
 Download
 
 
-# en/4/download_index.php +56
+# en/4/download_index.php +53
 ;Download Mageia 4 DVD, CD, LiveCD, network install ISO images.
 Download Mageia 4 DVD, CD, LiveCD, network install ISO images.
 
 
-# en/4/download_index.php +57
+# en/4/download_index.php +54
 ;mageia, mageia 4, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent
 mageia, mageia 4, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent
 
 
-# en/4/download_index.php +77
+# en/4/download_index.php +73
 ;Be careful! This is an alpha, unstable release.
 Be careful! This is an alpha, unstable release.
 
 
-# en/4/download_index.php +78
+# en/4/download_index.php +74
 ;It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.</strong>
 It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.</strong>
 
 
-# en/4/download_index.php +85
+# en/4/download_index.php +81
 ;Classical Installation Flavours
 Classical Installation Flavours
 
 
-# en/4/download_index.php +89
+# en/4/download_index.php +85
 ;Format
 Format
 
 
-# en/4/download_index.php +90
+# en/4/download_index.php +86
 ;size
 size
 
 
-# en/4/download_index.php +91
+# en/4/download_index.php +87
 ;link
 link
 
 
-# en/4/download_index.php +92
+# en/4/download_index.php +88
 ;BitTorrent
 BitTorrent
 
 
-# en/4/download_index.php +126
+# en/4/download_index.php +122
 ;Notes:
 Notes:
 
 
-# en/4/download_index.php +129
+# en/4/download_index.php +125
 ;Up to 167 locales are supported:
 Up to 167 locales are supported:
 
 
-# en/4/download_index.php +132
+# en/4/download_index.php +128
 ;and so much more!
 and so much more!
 
 
-# en/4/download_index.php +133
+# en/4/download_index.php +129
 ;See the comprehensive list
 See the comprehensive list
 
 
-# en/4/download_index.php +135
+# en/4/download_index.php +131
 ;These DVD and CD ISOs contains Free Software and some proprietary drivers.
 These DVD and CD ISOs contains Free Software and some proprietary drivers.
 
 
-# en/4/download_index.php +136
+# en/4/download_index.php +132
 ;You will be asked of which kind of Software you want to install.
 You will be asked of which kind of Software you want to install.
 
 
-# en/4/download_index.php +138
+# en/4/download_index.php +134
 ;The CD contains only a minimal list of packages.
 The CD contains only a minimal list of packages.
 
 
-# en/4/download_index.php +143
+# en/4/download_index.php +139
 ;LiveCDs and LiveDVDs
 LiveCDs and LiveDVDs
 
 
-# en/4/download_index.php +144
+# en/4/download_index.php +140
 ;Use LiveCDs and LiveDVDs for fresh new installs ONLY.
 Use LiveCDs and LiveDVDs for fresh new installs ONLY.
 
 
-# en/4/download_index.php +145
+# en/4/download_index.php +141
 ;DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!
 DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!
 
 
-# en/4/download_index.php +149
+# en/4/download_index.php +142
+;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>.
+
+
+# en/4/download_index.php +146
 ;Desktop
 Desktop
 
 
-# en/4/download_index.php +158
+# en/4/download_index.php +155
 ;All languages
 All languages
 
 
-# en/4/download_index.php +185
+# en/4/download_index.php +182
 ;English only
 English only
 
 
-# en/4/download_index.php +209
+# en/4/download_index.php +206
 ;Wired Network-based Installation CD
 Wired Network-based Installation CD
 
 
-# en/4/download_index.php +210
+# en/4/download_index.php +207
 ;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/4/download_index.php +222
+# en/4/download_index.php +208
+;These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one.
+These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one.
+
+
+# en/4/download_index.php +220
 ;Network installer, Free Software CD
 Network installer, Free Software CD
 
 
-# en/4/download_index.php +230
+# en/4/download_index.php +228
 ;Network installer + nonfree firmware CD
 Network installer + nonfree firmware CD
 
 
-# en/4/download_index.php +231
+# en/4/download_index.php +229
 ;needed for some disc controllers, some network cards, etc.
 needed for some disc controllers, some network cards, etc.
 
 
-# en/4/download_index.php +247
+# en/4/download_index.php +245
 ;<a href="%s%s_%s_%s">Release notes</a>
 <a href="%s%s_%s_%s">Release notes</a>
 
 
-# en/4/download_index.php +248
+# en/4/download_index.php +246
 ;<a href="%s">Errata</a>
 <a href="%s">Errata</a>
 
 
-# en/4/download_index.php +249
+# en/4/download_index.php +247
 ;<a href="%s">Which to choose</a>
 <a href="%s">Which to choose</a>
 
 
-# en/4/download_index.php +250
+# en/4/download_index.php +248
 ;<a href="%s">Get ISO on USB flash stick</a>
 <a href="%s">Get ISO on USB flash stick</a>
 
 
-# en/4/download_index.php +251
+# en/4/download_index.php +249
 ;Help us on <a href="%s">Mageia 4</a>
 Help us on <a href="%s">Mageia 4</a>
 
 
-# en/4/download_index.php +256
+# en/4/download_index.php +254
 ;Looking for a stable release?
 Looking for a stable release?
 
 
-# en/4/download_index.php +258
+# en/4/download_index.php +256
 ;It is <a href="%s">here</a>.
 It is <a href="%s">here</a>.
 
diff --git a/langs/fr/4.fr.lang b/langs/fr/4.fr.lang
index 36c5ddabb..3d1c869c1 100644
--- a/langs/fr/4.fr.lang
+++ b/langs/fr/4.fr.lang
@@ -123,6 +123,9 @@ N'utilisez les LiveCD ou LiveDVD QUE pour de nouvelles installations.
 ;DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!
 N'utilisez PAS ces LiveCD ou LiveDVD pour une mise à niveau depuis Mageia 3&nbsp;!
 
+# en/4/download_index.php +142
+;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="%s" hreflang="en">guide de migration</a>.
 
 # en/4/download_index.php +149
 ;Desktop
@@ -148,6 +151,9 @@ CD d'installation en réseau filaire
 ;Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk.
 À télécharger rapidement et démarrer directement en mode installation depuis un réseau <em>filaire</em> ou un disque local.
 
+# en/4/download_index.php +208
+;These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one.
+Ces ISOs changent fréquemment, et comme elles reflètent l'état réel de Cauldron elles peuvent de pas fonctionner. Si telle est le cas, utiliser en une de ci-dessus.
 
 # en/4/download_index.php +222
 ;Network installer, Free Software CD