diff options
| -rwxr-xr-x[-rw-r--r--] | en/about/index.php | 2 | ||||
| -rw-r--r-- | en/downloads/index.php | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | en/map/index.php | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | en/support/index.php | 7 |
4 files changed, 7 insertions, 5 deletions
diff --git a/en/about/index.php b/en/about/index.php index 994392c0d..a6fa5599d 100644..100755 --- a/en/about/index.php +++ b/en/about/index.php @@ -46,7 +46,7 @@ $dictionary = read_translation_file($locale, array('about', 'common_footer')); _r('gathered <a href="../community/">hundreds of careful individuals and several companies worldwide</a>,'), _r('who coproduce the infrastructure, the distribution itself, <a href="https://wiki.mageia.org/">documentation</a>, <a href="../downloads/">delivery</a> and <a href="../support/">support</a>, using Free Software tools;'); echo '</li>'; - _g('released six major stable releases <a href="../1/">in June 2011</a>, <a href="../2/">in May 2012</a>, <a href="../3/">in May 2013</a>, <a href="../4/">in February 2014</a>, <a href="../5/">in June 2015</a> and <a href="../6/">in July 2017</a>.',null,'li'); + _g('released seven major stable releases <a href="../1/">in June 2011</a>, <a href="../2/">in May 2012</a>, <a href="../3/">in May 2013</a>, <a href="../4/">in February 2014</a>, <a href="../5/">in June 2015</a>, <a href="../6/">in July 2017</a> and <a href="../7/">in June 2019</a>',null,'li'); ?></ul> <!-- <ul> diff --git a/en/downloads/index.php b/en/downloads/index.php index 0a8f24091..976733afa 100644 --- a/en/downloads/index.php +++ b/en/downloads/index.php @@ -1 +1 @@ -<?php include '../6/download_index.php'; +<?php include '../7/download_index.php'; diff --git a/en/map/index.php b/en/map/index.php index 107ed3ba1..22f3bdb69 100644..100755 --- a/en/map/index.php +++ b/en/map/index.php @@ -37,6 +37,7 @@ $map = array( 't' => _r('Downloads'), 'l' => '/{L}/downloads/', 'i' => array( + array('t' => _r('7 (June 2019)'), 'l' => '/{L}/7/'), array('t' => _r('6 (July 2017)'), 'l' => '/{L}/6/'), array('t' => _r('5 (June 2015)'), 'l' => '/{L}/5/'), array('t' => _r('4 (February 2014)'), 'l' => '/{L}/4/'), diff --git a/en/support/index.php b/en/support/index.php index 41a092209..942160ed6 100644..100755 --- a/en/support/index.php +++ b/en/support/index.php @@ -40,8 +40,8 @@ $dictionary = read_translation_file($locale, array('support', 'common_footer')); '<a href="' . _r('https://wiki.mageia.org') . '">', '</a>'), 'p'); echo '<hr>'; _g('Updates', null, 'h2 id="updates"'); -// _g('Updates are available for %s and %s (security and bug fixes) and published on an ongoing basis.', array('<a href="//advisories.mageia.org/5.html">Mageia 5</a>', '<a href="//advisories.mageia.org/6.html">Mageia 6</a>'), 'p'); - _g('Updates are available for %s (security and bug fixes) and published on an ongoing basis.', array('<a href="//advisories.mageia.org/6.html">Mageia 6</a>'), 'p'); + _g('Updates are available for %s and %s (security and bug fixes) and published on an ongoing basis.', array('<a href="//advisories.mageia.org/6.html">Mageia 6</a>', '<a href="//advisories.mageia.org/7.html">Mageia 7</a>'), 'p'); +// _g('Updates are available for %s (security and bug fixes) and published on an ongoing basis.', array('<a href="//advisories.mageia.org/7.html">Mageia 7</a>'), 'p'); _g('You can install these from the Mageia Control Center.', null, 'p'); _g('You may subscribe to our %s announce list to be notified of these.', array('<a href="https://ml.mageia.org/l/info/updates-announce">updates-announce</a>'), 'p'); echo '<hr>'; @@ -49,7 +49,8 @@ $dictionary = read_translation_file($locale, array('support', 'common_footer')); _g('Lifecycle', null, 'h3 id="lifecycle"'); _g('Mageia releases are supported at least for 18 months.', null, 'p'); echo '<ul class="hl">'; - _g('Mageia 6 will be supported until about 3 months after Mageia 7 is released.', null, 'li'); // _g('Mageia 6 was supported until January 16th, 2019.', null, 'li'); + _g('Mageia 7 will be supported until December 30th, 2020.', null, 'li'); + _g('Mageia 6 will be supported until September 30th, 2019.', null, 'li'); // _g('Mageia 6 was supported until September 30th, 2019.', null, 'li'); echo '<li>'; _g('Mageia 5 was supported until December 31st, 2017.', null, ' '); _g('More details and advice are available on our %swiki page%s and from %sour blog%s.', |