aboutsummaryrefslogtreecommitdiffstats
path: root/en
diff options
context:
space:
mode:
Diffstat (limited to 'en')
-rw-r--r--en/about/index.php2
-rw-r--r--en/about/reports/index.php6
-rw-r--r--en/doc/archive.php16
-rw-r--r--en/doc/index.php16
-rw-r--r--en/downloads/get/definitions.ini12
-rw-r--r--en/downloads/get/index.php22
-rw-r--r--en/downloads/get/lib.php6
-rw-r--r--en/support/index.php10
8 files changed, 47 insertions, 43 deletions
diff --git a/en/about/index.php b/en/about/index.php
index a03250419..919acf53c 100644
--- a/en/about/index.php
+++ b/en/about/index.php
@@ -47,7 +47,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 eight 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> and <a href="../8/">in February 2021</a>',null,'li');
+ _g('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>.',null,'li');
?></ul>
<!--
<ul>
diff --git a/en/about/reports/index.php b/en/about/reports/index.php
index bd46c1d21..c5b28200a 100644
--- a/en/about/reports/index.php
+++ b/en/about/reports/index.php
@@ -27,9 +27,9 @@ $rtl = is_locale_rtl($locale);
<ul>
<li>2024: <?php _g('%sFinancial report</a>%s.', array('<a href="https://treasurer.mageia.org/y_2024.html">', ' ' . _r('(in progress)')));?></li>
- <li>2023: <?php _g('%sFinancial report</a>%s.', array('<a href="https://treasurer.mageia.org/y_2023.html">', ' ' . _r('(in progress)')));?></li>
- <li>2022: <?php _g('%sFinancial report</a>%s.', array('<a href="https://treasurer.mageia.org/y_2022.html">', ' ' . _r('(in progress)')));?></li>
- <li>2021: <?php _g('%sFinancial report</a>%s.', array('<a href="https://treasurer.mageia.org/y_2021.html">', ' ' . _r('(in progress)')));?></li>
+ <li>2023: <?php _g('%sFinancial report</a>%s.', array('<a href="https://treasurer.mageia.org/y_2023.html">', ''));?></li>
+ <li>2022: <?php _g('%sFinancial report</a>%s.', array('<a href="https://treasurer.mageia.org/y_2022.html">', ''));?></li>
+ <li>2021: <?php _g('%sFinancial report</a>%s.', array('<a href="https://treasurer.mageia.org/y_2021.html">', ''));?></li>
<li>2020: <?php _g('%sFinancial report</a>%s.', array('<a href="https://treasurer.mageia.org/y_2020.html">', ''));?></li>
<li>2019: <?php _g('%sFinancial report</a>%s.', array('<a href="https://treasurer.mageia.org/y_2019.html">', ''));?></li>
<li>2018: <?php _g('%sFinancial report</a>%s.', array('<a href="https://treasurer.mageia.org/y_2018.html">', ''));?></li>
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/en/downloads/get/definitions.ini b/en/downloads/get/definitions.ini
index 5e8ae60dc..5c183b14c 100644
--- a/en/downloads/get/definitions.ini
+++ b/en/downloads/get/definitions.ini
@@ -2008,20 +2008,20 @@ size = "4.2 GB"
;;;;;;;;;;;;;;;;;;;;;
;
-[Mageia-Cauldron-netinstall-i586.iso]
-file = "Mageia-Cauldron-netinstall-i586.iso"
+[Mageia-Cauldron-netinstall-i686.iso]
+file = "Mageia-Cauldron-netinstall-i686.iso"
md5 = "read the file"
-path = "distrib/cauldron/i586/install/images"
+path = "distrib/cauldron/i686/install/images"
name = "Mageia Cauldron netinstall 32bit"
size = "48 MB"
sha3 = "read the file"
sha512 = "read the file"
;
-[Mageia-Cauldron-netinstall-nonfree-i586.iso]
-file = "Mageia-Cauldron-netinstall-nonfree-i586.iso"
+[Mageia-Cauldron-netinstall-nonfree-i686.iso]
+file = "Mageia-Cauldron-netinstall-nonfree-i686.iso"
md5 = "read the file"
-path = "distrib/cauldron/i586/install/images"
+path = "distrib/cauldron/i686/install/images"
name = "Mageia Cauldron netinstall nonfree 32bit"
size = "100 MB"
sha3 = "read the file"
diff --git a/en/downloads/get/index.php b/en/downloads/get/index.php
index 16967a737..f20c3dea6 100644
--- a/en/downloads/get/index.php
+++ b/en/downloads/get/index.php
@@ -84,23 +84,23 @@ try {
$product['file'] = $release . '-' . $type . '-' . $lang . '.' . $extension;
$product['name'] = $product['file'];
}
+ $all_mirrors = get_mirrors_for($product['file'], 'en', get('country'), true, $documentation, true);
+ $one_mirror = $all_mirrors[0];
+ $download_tmpl = get_download_link($product, $torrent);
//check if release is in archives, if yes redirect to the only mirror
- $archives = range(1,7);
+ $archives = range(1,8);
$release = explode(' ', $product['name']);
if (in_array($release[1][0], $archives)){
- $download_tmpl = get_download_link($product, $torrent);
- $download = str_replace('$MIRROR', 'https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia-archive', $download_tmpl);
+ $alt_mirrors = array();
+ $mirror_link = 'https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia-archive';
$show_alternate_mirrors = false;
} else {
- $all_mirrors = get_mirrors_for($product['file'], 'en', get('country'), true, $documentation, true);
- $one_mirror = $all_mirrors[0];
- $alt_mirrors = $all_mirrors[1];
- $download_tmpl = get_download_link($product, $torrent);
- $show_alternate_mirrors = true;
-
- // Step 2. Make the actual download link against the preferred mirror returned.
- $download = str_replace('$MIRROR', $one_mirror['mirror_url'], $download_tmpl);
+ $alt_mirrors = $all_mirrors[1];
+ $mirror_link = $one_mirror['mirror_url'];
+ $show_alternate_mirrors = true;
}
+ // Step 2. Make the actual download link against the preferred mirror returned.
+ $download = str_replace('$MIRROR', $mirror_link, $download_tmpl);
// TODO do not redirect if it's a bot!
$js_redirect = sprintf(
diff --git a/en/downloads/get/lib.php b/en/downloads/get/lib.php
index 9d6449502..44098c165 100644
--- a/en/downloads/get/lib.php
+++ b/en/downloads/get/lib.php
@@ -32,6 +32,7 @@ $countries = array (
'HU' => _r("Hungary"),
'ID' => _r("Indonesia"),
'IL' => _r("Israel"),
+ 'IN' => _r("India"),
'IT' => _r("Italia"),
'JP' => _r("日本国 - Japan"),
'KR' => _r("Korea"),
@@ -71,12 +72,16 @@ $cities_i18n = array (
'Düsseldorf' => _r("Düsseldorf"),
'Enschede' => _r("Enschede"),
'Erlangen' => _r("Erlangen"),
+ 'Falkenstein' => _r("Falkenstein"),
'Falkenstein/Vogtl.' => _r("Falkenstein/Vogtl."),
'Göttingen' => _r("Göttingen"),
'Hefei' => _r("Hefei"),
'Heraklion' => _r("Heraklion"), // 'Ηράκλειο', // .gr
'HsinChu' => _r("HsinChu"), // '新竹市', // .tw
+ 'Jaipur' => _r("Jaipur"),
'Krakow' => _r("Krakow"),
+ 'Kyiv' => _r("Kyiv"),
+ 'Las Vegas' => _r("Las Vegas"),
'Lenoir, NC' => _r("Lenoir, NC"),
'Lyon' => _r("Lyon"),
'Milan' => _r("Milan"),
@@ -91,6 +96,7 @@ $cities_i18n = array (
'Prague' => _r("Prague"), // 'Praha', // .cz
'Princeton' => _r("Princeton"),
'Richmond, VA' => _r("Richmond, VA"),
+ 'Roma' => _r("Roma"),
'Schneverdingen' => _r("Schneverdingen"),
'Shanghai' => _r("Shanghai"),
'Sofia' => _r("Sofia"),
diff --git a/en/support/index.php b/en/support/index.php
index 265014be9..84b5720a7 100644
--- a/en/support/index.php
+++ b/en/support/index.php
@@ -41,8 +41,8 @@ $rtl = is_locale_rtl($locale);
'<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/8.html">Mageia 8</a>', '<a href="//advisories.mageia.org/9.html">Mageia 9</a>'), 'p');
- // _g('Updates are available for %s (security and bug fixes) and published on an ongoing basis.', array('<a href="//advisories.mageia.org/8.html">Mageia 8</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/8.html">Mageia 8</a>', '<a href="//advisories.mageia.org/9.html">Mageia 9</a>'), 'p');
+ _g('Updates are available for %s (security and bug fixes) and published on an ongoing basis.', array('<a href="//advisories.mageia.org/9.html">' . _r('Mageia 9') . '</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>';
@@ -54,10 +54,8 @@ $rtl = is_locale_rtl($locale);
// _g('And at least three months after the new release is out.');
echo '</p>';
echo '<ul class="hl">';
- _g('Mageia 9 will be supported until March 31st, 2025', null, 'li');
- //_g('Mageia 8 was supported until November 30th, 2023', null, 'li');
- _g('Mageia 8 will be supported until November 30th, 2023', null, 'li');
- //_g('Mageia 8 will be supported until August 31st, 2022, or for at least 3 months after Mageia 9 release.', null, 'li'); // _g('Mageia 8 was supported for at least 3 months after Mageia 9 release.', null, 'li');
+ _g('%s will be supported for a minimum of 3 months after the next release', array(_r('Mageia 9')), 'li');
+ _g('Mageia 8 was supported until November 30th, 2023', null, 'li');
_g('Mageia 7 was supported until June 30th, 2021.', null, 'li');
_g('Mageia 6 was supported until September 30th, 2019.', null, 'li');
echo '<li>';
generated by cgit v1.2.1 (git 2.21.0) at 2025-08-07 07:07:20 +0000