diff options
| author | Romain d'Alverny <rda@mageia.org> | 2012-05-19 10:35:04 +0000 |
|---|---|---|
| committer | Romain d'Alverny <rda@mageia.org> | 2012-05-19 10:35:04 +0000 |
| commit | 6176a55fff94bf950913c7c1cea1bd5e476b6292 (patch) | |
| tree | d21f35e109c622ee5c139c01a53322faf2744cea | |
| parent | 409ea85c0569cabf2cacdc4f1e18285cd3b5f94b (diff) | |
| download | www-6176a55fff94bf950913c7c1cea1bd5e476b6292.tar www-6176a55fff94bf950913c7c1cea1bd5e476b6292.tar.gz www-6176a55fff94bf950913c7c1cea1bd5e476b6292.tar.bz2 www-6176a55fff94bf950913c7c1cea1bd5e476b6292.tar.xz www-6176a55fff94bf950913c7c1cea1bd5e476b6292.zip | |
updated support pages
| -rw-r--r-- | en/support/index.php | 29 | ||||
| -rw-r--r-- | en/support/locales.php | 11 | ||||
| -rw-r--r-- | en/support/report-a-bug/index.php | 7 |
3 files changed, 30 insertions, 17 deletions
diff --git a/en/support/index.php b/en/support/index.php index 52f31ea33..f7e16d5eb 100644 --- a/en/support/index.php +++ b/en/support/index.php @@ -17,27 +17,23 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); <link rel="stylesheet" type="text/css" href="/g/style/all.css"> <?php include '../../analytics.php'; ?> </head> -<body> +<body class="support"> <?php echo $hsnav; ?> - + <h1 id="mgnavt"><?php _e('h1_title')?></h1> <div id="doc" class="yui-t7"> - <div id="hd" role="banner"><h1><a id="logo" href="/<?php echo $locale; ?>/"><span>Mageia</span></a> <span class="lsep">|</span> <span class="subh"><?php echo $_t['h1_title']; ?></span></h1></div> <div id="bd" role="main"> <div class="yui-g"> - <div class="para donate"> + <div class="para donate" style="padding-top: 2em;"> <div class="qsidesummary"> <ul> - <li><a href="#updates"><?php echo $_t['h2_updates']; ?></a></li> <li><a href="#comm"><?php echo $_t['h2_comm_support']; ?></a></li> <li><a href="#pro"><?php echo $_t['h2_pro_support']; ?></a></li> + <li><a href="#updates"><?php echo $_t['h2_updates']; ?></a></li> + <li><a href="#lifecycle"><?php _e('Lifecycle')?></a></li> <li><a href="#hw"><?php echo $_t['h2_hw_reqs']; ?></a></li> </ul> </div> - <h2 id="updates"><?php echo $_t['h2_updates']; ?></h2> - <p><?php echo sprintf($_t['updates_1'], '<a href="../1/">Mageia 1</a>'); ?></p> - <p><?php echo $_t['updates_3']; ?></p> - <p><?php echo sprintf($_t['updates_2'], '<a href="https://ml.mageia.org/wwsympa-wrapper.fcgi/info/updates-announce">updates-announce</a>'); ?></p> - <hr> + <h2 id="comm"><?php echo $_t['h2_comm_support']; ?></h2> <p><?php echo $_t['comm_1']; ?></p> <ul class="hl"><?php foreach ($_t['comm_list'] as $commi): @@ -50,6 +46,19 @@ $_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules); <p><?php echo sprintf($_t['pro_2'], 'https://wiki.mageia.org/en/Commercial_vendors'); ?></p> <hr> + <h2 id="updates"><?php echo $_t['h2_updates']; ?></h2> + <p><?php echo sprintf($_t['updates_1'], '<a href="../1/">Mageia 1</a>', '<a href="../2/">Mageia 2</a>'); ?></p> + <p><?php echo $_t['updates_3']; ?></p> + <p><?php echo sprintf($_t['updates_2'], '<a href="https://ml.mageia.org/wwsympa-wrapper.fcgi/info/updates-announce">updates-announce</a>'); ?></p> + <hr> + <h3><?php _e('Lifecycle')?></h3> + <p><?php _e('Mageia releases are supported at least for 18 months.');?></p> + <ul> + <li><?php _e('Mageia 1 will be supported until December 2012.')?></li> + <li><?php _e('Mageia 2 may have a longer lifecycle, this will be decided once released in May.')?></li> + </ul> + <hr> + <h2 id="hw"><?php echo $_t['h2_hw_reqs']; ?></h2> <p><?php echo $_t['hw_1']; ?></p> diff --git a/en/support/locales.php b/en/support/locales.php index e39ee0ba2..8810d4782 100644 --- a/en/support/locales.php +++ b/en/support/locales.php @@ -11,7 +11,7 @@ $_t = array( 'h2_hw_reqs' => 'Hardware Requirements', 'h2_updates' => 'Updates', - 'updates_1' => 'Updates are available for %s (security and bug fixes) and published on an ongoing basis.', + 'updates_1' => 'Updates are available for %s and %s (security and bug fixes) and published on an ongoing basis.', 'updates_2' => 'You may subscribe to our %s announce list to be notified of these.', 'updates_3' => 'You can install these from the Mageia Control Center.', @@ -65,7 +65,7 @@ $_t = array( 'h2_hw_reqs' => 'Configuration requise', 'h2_updates' => 'Mises à jour', - 'updates_1' => 'Des mises à jour sont régulièrement publiées pour %s (corrections de bugs ou de sécurité).', + 'updates_1' => 'Des mises à jour sont régulièrement publiées pour %s et %s (corrections de bugs ou de sécurité).', 'updates_2' => 'Vous pouvez vous inscrire à la liste %s pour en être informé.', 'updates_3' => 'Vous pouvez les installer à partir du centre de contrôle Mageia.', @@ -85,6 +85,7 @@ $_t = array( 'les <a href="http://www.mageia.org/mailman/" hreflang="en">listes de discussion</a> (en anglais pour le moment) ;', 'des événements locaux ; surveillez le <a href="http://blog.mageia.org/fr/">blog</a> et le <a href="http://www.mageia.org/en/calendar/">calendrier</a>.', + ), 'pro_1' => 'L’association Mageia.Org ne propose pas de service commercial (assistance, formation, autre) @@ -112,7 +113,11 @@ $_t = array( et certification matérielles, ainsi qu’un process de certification. Mais ça n’est encore qu’un projet – si cela vous intéresse et que vous pensez pouvoir y contribuer, - n’hésitez pas à contacter les équipes <a href="%s">Web</a> et <a href="%s">QA</a>.' + n’hésitez pas à contacter les équipes <a href="%s">Web</a> et <a href="%s">QA</a>.', + + 'Lifecycle' => 'Cycle de vie', + 'Mageia releases are supported at least for 18 months.' => 'Les versions de Mageia sont maintenues pendant au moins 18 mois.', + 'Mageia 1 will be supported until December 2012.' => 'Mageia 1 sera maintenue jusqu’à fin décembre 2012.', ), 'pt' => array( 'page_title' => 'Suporte para a distribuição Mageia', diff --git a/en/support/report-a-bug/index.php b/en/support/report-a-bug/index.php index 7e8492784..f8b64964e 100644 --- a/en/support/report-a-bug/index.php +++ b/en/support/report-a-bug/index.php @@ -9,14 +9,13 @@ <link rel="stylesheet" type="text/css" href="/g/style/all.css" > <?php include '../../../analytics.php'; ?> </head> -<body class="report-a-bug"> +<body class="support report-a-bug"> <?php include '../../../langs.php'; ?> - + <h1 id="mgnavt"><a href="../">Support</a> » How to Report a Bug</h1> <div id="doc" class="yui-t7"> - <div id="hd" role="banner"><h1><a id="logo" href="/"><span>Mageia</span></a> <span class="lsep">|</span> <span class="subh">How to Report a Bug</span></h1></div> <div id="bd" role="main"> <div class="yui-g"> - <div class="para donate"> + <div class="para donate" style="padding-top: 2em;"> <div class="qsidesummary"> <ol> <li><a href="#update">Update your system</a></li> |