diff options
| -rw-r--r-- | downloads.php | 2 | ||||
| -rw-r--r-- | downloads_locales.php | 24 | ||||
| -rw-r--r-- | en/downloads/index.php | 3 |
3 files changed, 25 insertions, 4 deletions
diff --git a/downloads.php b/downloads.php index c67f5e65b..a594e92bb 100644 --- a/downloads.php +++ b/downloads.php @@ -80,7 +80,7 @@ foreach ($prods2 as $flavour => $prods3) { $flavour = null; $i++; - if ($p['flavour'] == 'LiveCD 32bit') + if ($p['flavour'] == 'LiveCD 32-bit') $s2 .= $s; elseif ($p['flavour'] == 'DVD' || $p['flavour'] == 'CD') diff --git a/downloads_locales.php b/downloads_locales.php index 29bb14972..8f5d762fe 100644 --- a/downloads_locales.php +++ b/downloads_locales.php @@ -74,7 +74,9 @@ Note that translations are on their way.', Thai, Vietnamese, Chinese Simplified, Chinese Traditional.', 'def-Africa/India set' => 'Africa/India set of languages: Afrikaans, Amharic, Arabic, Assamese, Berber, Bengali, American English, Hausa, Hebrew, Hindi, Igbo, Kannada, Malayalam, Marathi, - Punjabi, Tamil, Tswana, Tsonga, Venda, Xhosa, Yoruba, Zulu.' + Punjabi, Tamil, Tswana, Tsonga, Venda, Xhosa, Yoruba, Zulu.', + 'dl_migrate_instead' => 'If you are using Mandriva Linux 2010.1 or 2010.2, + you may directly <a href="/en/1/migrate/">upgrade your system to Mageia 1</a> as well.</p>' ), 'fr' => array( 'download' => 'télécharger', @@ -127,7 +129,25 @@ Note that translations are on their way.', 'limited_languages' => 'Limité : biélo-russe, catalan, allemand, anglais, espagnol, français, hongrois, italien, polonais, portugais, ukrainien.', 'English' => 'Anglais', 'Limited' => 'Limité', - 'European set' => 'Langues européennes' + 'European set' => 'Langues européennes', + 'Europa set 1' => 'Europe / Amérique', + 'Europa set 2' => 'Europe de l\'est', + 'Asia set' => 'Asie', + 'Africa/India set' => 'Afrique / Inde', + 'popularity' => 'Popularité', + 'for_full_install' => 'Pour une installation complète :', + 'for_test_live' => 'LiveCD 32 bits pour essayer et installer :', + 'for_network' => 'Pour installer via le réseau :', + 'def-Europa set 1' => 'Europe / Amérique : allemand, anglais, grec, espagnol, français, italien, hollandais, portugais, brésilien, turque.', + 'def-Europa set 2' => 'Europe de l\'est :: bulgare, tchèque, danois, anglais, estonien, + finnois, croate, hongrois, lituanien, latvian, norvégien (Bokmaal & Nynorsk), polonais, + roumain, russe, suédois, ukrainien, ouzbèque (latin & cyrillique).', + 'def-Asia set' => 'Asie : anglais, indonésien, japonais, coréen, thaïlandais, vietnamien, chinois simplifé et traditionnel.', + 'def-Africa/India set' => 'Afrique / Inde :: afrikaans, amharic, arabe, Assamese, berbère, bengali, anglais, + Hausa, hébreu, hindi, Igbo, Kannada, Malayalam, marathi, + punjab, tamil, Tswana, tsonga, Venda, Xhosa, Yoruba, zoulou.', + 'dl_migrate_instead' => 'Si vous utilisez Mandriva Linux 2010.1 ou 2010.2, + vous pouvez aussi <a href="/fr/1/migrate/">migrer votre système vers Mageia 1</a>.</p>' ), 'de' => array( 'download' => 'herunterladen', diff --git a/en/downloads/index.php b/en/downloads/index.php index 6483d70aa..34fcd21dc 100644 --- a/en/downloads/index.php +++ b/en/downloads/index.php @@ -21,7 +21,8 @@ $_t['page_title'] = sprintf($_t['page_title'], 'Mageia 1'); <div id="bd" role="main"> <div class="yui-g"> <div class="para"> - <p><?php echo $_t['dl_help']; ?></p> + <p><?php echo $_t['dl_help']; ?> + <?php echo $_t['dl_migrate_instead']; ?></p> <br /> <?php echo $dl_table; ?> </div></div> |