diff options
| author | root <root@sucuk.mageia.org> | 2025-06-29 16:30:02 +0200 |
|---|---|---|
| committer | root <root@sucuk.mageia.org> | 2025-06-29 16:30:02 +0200 |
| commit | a027c1b110dc3e5cc33876f059ecc25fad951c85 (patch) | |
| tree | fc0ad1a24fa8e5473188f6ff73337e4d9715e76d | |
| parent | c950afd384ed937064ef0135a83b148cafba8828 (diff) | |
| parent | 0df8005d3bd9ea8ec7e0a6252560d5012fa4c1c8 (diff) | |
| download | www-a027c1b110dc3e5cc33876f059ecc25fad951c85.tar www-a027c1b110dc3e5cc33876f059ecc25fad951c85.tar.gz www-a027c1b110dc3e5cc33876f059ecc25fad951c85.tar.bz2 www-a027c1b110dc3e5cc33876f059ecc25fad951c85.tar.xz www-a027c1b110dc3e5cc33876f059ecc25fad951c85.zip | |
Merge branch 'master' of git://git.mageia.org/web/www
| -rw-r--r-- | en/doc/archive.php | 16 | ||||
| -rw-r--r-- | en/doc/index.php | 16 | ||||
| -rw-r--r-- | langs/en/about.pot | 2 |
3 files changed, 17 insertions, 17 deletions
diff --git a/en/doc/archive.php b/en/doc/archive.php index 96cf76a37..37a326b6d 100644 --- a/en/doc/archive.php +++ b/en/doc/archive.php @@ -29,6 +29,22 @@ $rtl = is_locale_rtl($locale); <?php _g('If you are looking for the current versions, see <a href="index.php">here</a>.')?></p> <?php _g('Documentation built using the <a href="%s">Calenco tool from NeoDoc</a>.', 'http://www.neodoc.biz/', 'p')?> <hr> + <h3>Mageia 8</h3> + <div class="row"> + <div class="col"> + <?php doc_list(_r('Control Center'), 'control_center', 8); ?> + </div> + <div class="col"> + <?php doc_list(_r('Installer'), 'installer', 8); ?> + </div> + <div class="col"> + <?php doc_list(_r('Installation from LIVE medium'), 'draklive', 8); ?> + </div> + <div class="col"> + <?php doc_list(_r('Network installation'), 'netinstall', 8); ?> + </div> + </div> + <hr> <h3>Mageia 7</h3> <div class="row"> <div class="col"> diff --git a/en/doc/index.php b/en/doc/index.php index 163fe8ced..f17a963a0 100644 --- a/en/doc/index.php +++ b/en/doc/index.php @@ -48,22 +48,6 @@ $rtl = is_locale_rtl($locale); </div> </div> <hr> - <h3>Mageia 8</h3> - <div class="row"> - <div class="col"> - <?php doc_list(_r('Control Center'), 'control_center', 8); ?> - </div> - <div class="col"> - <?php doc_list(_r('Installer'), 'installer', 8); ?> - </div> - <div class="col"> - <?php doc_list(_r('Installation from LIVE medium'), 'draklive', 8); ?> - </div> - <div class="col"> - <?php doc_list(_r('Network installation'), 'netinstall', 8); ?> - </div> - </div> - <hr> </div> </div> </div> diff --git a/langs/en/about.pot b/langs/en/about.pot index 8fe105c92..fc95b92c9 100644 --- a/langs/en/about.pot +++ b/langs/en/about.pot @@ -67,7 +67,7 @@ msgid "who coproduce the infrastructure, the distribution itself, <a href=\"http msgstr "" #: "/web/en/about/index.php +50" -msgid "released nine 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>, <a href=\"../7/\">in June 2019</a>, <a href=\"../8/\">in February 2021</a> and <a href=\"../98/\">in August 2023</a>." +msgid "released nine 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>, <a href=\"../7/\">in June 2019</a>, <a href=\"../8/\">in February 2021</a> and <a href=\"../9/\">in August 2023</a>." msgstr "" #: "/web/en/about/index.php +71" |