From d27ea2cb7ccbea6ee528b649e473601ade5a52ae Mon Sep 17 00:00:00 2001
From: filip <filip.komar@gmail.com>
Date: Mon, 17 Jul 2017 01:40:59 +0200
Subject: adding a mga6 release to about, map and timeline page too

+ adding a Seventh General Assembly during FOSDEM
---
 en/about/index.php    | 2 +-
 en/map/index.php      | 2 +-
 en/timeline/index.php | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/en/about/index.php b/en/about/index.php
index b922efe2b..d4eb15a38 100644
--- 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 five 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> and <a href="../5/">in June 2015</a>.',null,'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');
                 ?></ul>
                 <!--
                 <ul>
diff --git a/en/map/index.php b/en/map/index.php
index bcc06f9cc..c20e5846c 100644
--- a/en/map/index.php
+++ b/en/map/index.php
@@ -37,7 +37,7 @@ $map = array(
         't' => _r('Downloads'),
         'l' => '/{L}/downloads/',
         'i' => array(
-            array('t' => _r('6 (in development)'), 'l' => '/{L}/6/'),
+            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/'),
             array('t' => _r('3 (May 2013)'),       'l' => '/{L}/3/'),
diff --git a/en/timeline/index.php b/en/timeline/index.php
index d1cdd250c..093d97d02 100644
--- a/en/timeline/index.php
+++ b/en/timeline/index.php
@@ -36,6 +36,10 @@ function list_events($events = array())
 }
 
 $events = array(
+    _r('2017') => array(
+        _r('July') => array(sprintf(_r('<a href=%s>Mageia 6</a> is released.'), '"../6/"')),
+        _r('February') => array(_r('Seventh General Assembly during FOSDEM in Brussels, Belgium.')),
+    ),
     _r('2016') => array(
         _r('December') => array(sprintf(_r('<a href=%s>Mageia 5</a> updated to 5.1.'), '"../5/"')),
         _r('February') => array(_r('Sixth General Assembly during FOSDEM in Brussels, Belgium.')),
-- 
cgit v1.2.1