diff options
| author | filip <filip.komar@gmail.com> | 2015-06-19 23:01:08 +0200 |
|---|---|---|
| committer | filip <filip.komar@gmail.com> | 2015-06-19 23:01:08 +0200 |
| commit | 6c6a5776ba86f572f19a10c5bd5a2f0a928c5623 (patch) | |
| tree | a2136619aa627913ad60e375eda86455ac059e13 /en/5 | |
| parent | 7f745d04e78f7dc90f5a563f1983483729d49a76 (diff) | |
| download | www-6c6a5776ba86f572f19a10c5bd5a2f0a928c5623.tar www-6c6a5776ba86f572f19a10c5bd5a2f0a928c5623.tar.gz www-6c6a5776ba86f572f19a10c5bd5a2f0a928c5623.tar.bz2 www-6c6a5776ba86f572f19a10c5bd5a2f0a928c5623.tar.xz www-6c6a5776ba86f572f19a10c5bd5a2f0a928c5623.zip | |
mga5 release including l10n updates
also removing preview
Diffstat (limited to 'en/5')
| -rwxr-xr-x | en/5/download_index.php | 420 | ||||
| -rw-r--r-- | en/5/index.php | 104 | ||||
| -rw-r--r-- | en/5/nav.php | 13 |
3 files changed, 315 insertions, 222 deletions
diff --git a/en/5/download_index.php b/en/5/download_index.php index 3f086c940..9601bd43b 100755 --- a/en/5/download_index.php +++ b/en/5/download_index.php @@ -2,7 +2,7 @@ $name = 'Mageia'; $version = '5'; -$release = 'RC'; +$release = ''; $torrentavailable=true; $classical=true; $live=true; @@ -14,8 +14,6 @@ define('ALIGNMENT', 'Center'); require '../../langs.php'; $dictionary = read_translation_file($locale, "5"); -$dictionary_cauldron = read_translation_file($locale, 'cauldron'); -$dictionary = array_merge($dictionary, $dictionary_cauldron); function get_mageia($name, $version, $release) { @@ -53,12 +51,12 @@ echo $torrent && !$torrentavailable ? sprintf(_t('forthcoming')) : sprintf('<a $torrent ? '&torrent=1' : '', implode(' ', array($name, $version, $release, $variant, $arch, $medium)), $bit - ); + ); } function get_image($ttl, $src, $sty){ - echo sprintf('<noscript><img class="lazy" src="%s" alt="%s" title="%s" style="%s" /></noscript>', $src, $ttl, $ttl, $sty); - echo sprintf('<img class="lazy" src="" data-src="%s" alt="%s" title="%s" style="%s" />', $src, $ttl, $ttl, $sty); + echo sprintf('<noscript><img class="lazy" src="%s" alt="%s" title="%s" style="%s" /></noscript>', $src, $ttl, $ttl, $sty); + echo sprintf('<img class="lazy" src="" data-src="%s" alt="%s" title="%s" style="%s" />', $src, $ttl, $ttl, $sty); } ?> @@ -72,8 +70,8 @@ function get_image($ttl, $src, $sty){ <meta name="robots" content="index,nofollow,nosnippet"> <link rel="canonical" href="/<?php echo $locale.'/'.$verion;?>/"> <link rel="stylesheet" href="/g/style/all.css"> - <script src="/g/js/jquery-1.10.1.min.js"></script> - <script src="/g/js/tooltipsy.min.js"></script> + <script src="/g/js/jquery-1.10.1.min.js"></script> + <script src="/g/js/tooltipsy.min.js"></script> <?php include '../../analytics.php'; ?> <style> .radiobutton{ @@ -84,7 +82,7 @@ function get_image($ttl, $src, $sty){ .radiobutton .ui-button{ display: table-cell; height: 100%; - } +} .ui-button,.ui-button:link { border: 1px solid #AED0EA; -moz-box-sizing: content-box; @@ -99,7 +97,7 @@ function get_image($ttl, $src, $sty){ min-width: 200px; text-decoration: none; color: black; - text-shadow: 1px 2px 3px rgba(0,0,0, 0.5); + text-shadow: 1px 2px 3px rgba(0,0,0, 0.5); -moz-box-shadow: 0 0 5px rgba(0, 0, 0, .5); -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .5); box-shadow: 2px 2px 5px rgba(0, 0, 0, .5); @@ -137,16 +135,11 @@ input[type="radio"], input[type="submit"] { </style> </head> <body class="release downloads"> - <?php echo $hsnav; ?> - <header id="mgnavt"> - <h1><?php echo sprintf(_g('Download') . ' <strong>%s %s %s</strong>',$name, $version, $release)?></h1> - <?php include '../'.$version.'/nav.php'; ?> - </header> - <p class="unstable-release-warning"><?php -// _g('Be careful! This is an alpha, unstable release.'); -// _g('Be careful! This is a beta, unstable release.'); -// _g('It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.</strong>'); - _g('This is a Release Candidate. Release Candidate software is software that has graduated Beta testing, and should be a release-ready product suitable for advanced users and reviewers. However, beginning users and critical-applications users may wish to wait for the final release planned for %s.', array(_r('May 2015'))); _g('Release Candidate is intended to identify any remaining bugs or missing packages.'); ?></p> + <?php echo $hsnav; ?> + + <h1 id="mgnavt"><?php echo sprintf(_g('Download') . ' <strong>%s %s %s</strong>',$name, $version, $release)?></h1> + <?php include '../5/nav.php'; ?> + <div id="doc4" class="yui-t7"> <div id="bd" role="main"> <div class="yui-ge bb1"> @@ -158,77 +151,77 @@ input[type="radio"], input[type="submit"] { </noscript> <div class="para"> - <p> - <?php _g('Mageia is provided as ISO image files that have to be written to blank <a href="%s">CD or DVD discs</a>.', array(_r('https://wiki.mageia.org/en/Writing_CD_and_DVD_images')));?> - <br> - <?php _g('All ISOs can also be launched from a <a %s>USB drive</a>.', array('class="iso2usb"'));?> - <span class="warn"><?php _g('Unetbootin is not supported.'); ?></span> - <br><br> - <?php _g('If you have <a href="%s">UEFI</a>, a procedure is available in the <a href="%s">wiki</a>.', array(_r('http://en.wikipedia.org/wiki/Unified_Extensible_Firmware_Interface'),_r('https://wiki.mageia.org/en/Installing_on_systems_with_UEFI_firmware' /*this will be changed to tooltip, so no more url*/))) ;?> - </p> - <div id="iso2usbEx"> - <?php _g('Dump Mageia ISO on a USB flash drive',null,'h2'); - - _g('"Dumping" an image onto a flash device destroys any prior file-system in the partition; access to any data not destroyed will be lost, and partition capacity will be reduced to the image size. In other words, all prior data on the device is at risk.',null,'p'); - _g('Unetbootin should not be used to copy the iso image to a USB drive (see below).',null,'p class="warn"'); - _g('To dump a Mageia installation ISO on a USB stick, you may try one of several tools:',null,'p'); - echo '<ul>'; - _g('For Linux, IsoDumper, available inside repo. Or any tools based on dd.',null,'li'); - echo '<li>'; - _g('For windows use <a href="%s">usbdumper.</a>',array('http://mirrors.kernel.org/mageia/people/marcom/usbdumper.exe')); - _g('If it show "writing error or access denied" try the fallowing method: run the console (cmd), then type "diskpart", then "list disk", then select your disk with "select disk", and type "clean" (it will erase the key).',null,'span class="dlinfo"');?> - </li> - </ul> - </div> + <p> + <?php _g('Mageia is provided as ISO image files that have to be written to blank <a href="%s">CD or DVD discs</a>.', array(_r('https://wiki.mageia.org/en/Writing_CD_and_DVD_images')));?> + <br> + <?php _g('All ISOs can also be launched from a <a %s>USB drive</a>.', array('class="iso2usb"'));?> + <span class="warn"><?php _g('Unetbootin is not supported.'); ?></span> + <br><br> + <?php _g('If you have <a href="%s">UEFI</a>, a procedure is available in the <a href="%s">wiki</a>.', array(_r('http://en.wikipedia.org/wiki/Unified_Extensible_Firmware_Interface'),_r('https://wiki.mageia.org/en/Installing_on_systems_with_UEFI_firmware' /*this will be changed to tooltip, so no more url*/))) ;?> + </p> + <div id="iso2usbEx"> + <?php _g('Dump Mageia ISO on a USB flash drive',null,'h2'); + + _g('"Dumping" an image onto a flash device destroys any prior file-system in the partition; access to any data not destroyed will be lost, and partition capacity will be reduced to the image size. In other words, all prior data on the device is at risk.',null,'p'); + _g('Unetbootin should not be used to copy the iso image to a USB drive (see below).',null,'p class="warn"'); + _g('To dump a Mageia installation ISO on a USB stick, you may try one of several tools:',null,'p'); + echo '<ul>'; + _g('For Linux, IsoDumper, available inside repo. Or any tools based on dd.',null,'li'); + echo '<li>'; + _g('For windows use <a href="%s">usbdumper.</a>',array('http://mirrors.kernel.org/mageia/people/marcom/usbdumper.exe')); + _g('If it show "writing error or access denied" try the fallowing method: run the console (cmd), then type "diskpart", then "list disk", then select your disk with "select disk", and type "clean" (it will erase the key).',null,'span class="dlinfo"');?> + </li> + </ul> + </div> </div> <div class="para" id="format"> <?php if($classical == true){?> <div id="classicalEx"> - <?php _g('Classical Installation Flavours',null,'h2')?> - - <?php _g('The Classical ISO is the traditional way to install Mageia directly. Take a look at the complete <a href="%s">documentation</a> for this installer.', array('../doc/'), 'p'); ?> - <p> - <?php _g('Up to 167 locales are supported:'); ?> - Deutsch, English, Español, Français, Italiano, Português, Svenska, Nederlands, Polski, Dansk, Pусский - <?php _g('and so much more!'); ?> - <a href="https://wiki.mageia.org/en/Available_locales" hreflang="en"><?php _g('See the comprehensive list')?></a>. - </p> - <p> <?php - _g('These ISOs contains Free Software and some proprietary drivers.'); - _g('You will be asked of which kind of Software you want to install.'); - _g('The installer includes the capability of adding the online Mageia repositories during the installation, which means you can install even more packages than those available on the ISO.');?> - </p> - - <?php _g('For 32 and 64bit, size of the ISOs is about %sGB. For the dualarch it\'s about %sGB.',array('4','1.6'),'p class="dlinfo"');?> - + <?php _g('Classical Installation Flavours',null,'h2')?> + + <?php _g('The Classical ISO is the traditional way to install Mageia directly. Take a look at the complete <a href="%s">documentation</a> for this installer.', array('../doc/'), 'p'); ?> + <p> + <?php _g('Up to 167 locales are supported:'); ?> + Deutsch, English, Español, Français, Italiano, Português, Svenska, Nederlands, Polski, Dansk, Pусский + <?php _g('and so much more!'); ?> + <a href="https://wiki.mageia.org/en/Available_locales" hreflang="en"><?php _g('See the comprehensive list')?></a>. + </p> + <p> <?php + _g('These ISOs contains Free Software and some proprietary drivers.'); + _g('You will be asked of which kind of Software you want to install.'); + _g('The installer includes the capability of adding the online Mageia repositories during the installation, which means you can install even more packages than those available on the ISO.');?> + </p> + + <?php _g('For 32 and 64bit, size of the ISOs is about %sGB. For the dualarch it\'s about %sGB.',array('3.5','1.2'),'p class="dlinfo"');?> + </div> <?php } ?> <?php if($live == true){?> <div id="liveEx"> - <?php _g('LiveCDs and LiveDVDs',null,'h3');?> - - <?php _g('Live ISO\'s let you try %s without installation. You can run Mageia directly from a CD, DVD or USB device, and try it using one of the graphical user interfaces such as GNOME or KDE.', array("$name $version"), 'p'); - _g('If you are happy with the Mageia experience, you can then install it onto your hard drive from the Live media.', null, 'p');?> - - <p><?php _g('Use LiveCDs and LiveDVDs for fresh new installs ONLY.');?> - <span class="warn"><?php _g('DO NOT use these LiveCDs or LiveDVDs to upgrade from the prior Mageia release!'); ?></span> - <?php _g('Use a classical installation and see <a href="%s" hreflang="en">upgrade guide</a>.', array($upgradeguide));?> - </p> - + <?php _g('LiveCDs and LiveDVDs',null,'h3');?> + + <?php _g('Live ISO\'s let you try %s without installation. You can run Mageia directly from a CD, DVD or USB device, and try it using one of the graphical user interfaces such as GNOME or KDE.', array("$name $version"), 'p'); + _g('If you are happy with the Mageia experience, you can then install it onto your hard drive from the Live media.', null, 'p');?> + + <p><?php _g('Use LiveCDs and LiveDVDs for fresh new installs ONLY.');?> + <span class="warn"><?php _g('DO NOT use these LiveCDs or LiveDVDs to upgrade from the prior Mageia release!'); ?></span> + <?php _g('Use a classical installation and see <a href="%s" hreflang="en">upgrade guide</a>.', array($upgradeguide));?> + </p> + <?php _g('For LiveDVDs, size of the ISOs is about %sGB. For the LiveCDs it\'s about %sMB.',array('1.6','700'),'p class="dlinfo"');?> </div> <?php } ?> <div id="lanEx"> - <?php _g('Wired Network-based Installation CD',null,'h3'); - _g('Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk.',null,'p'); - _g('Have a look in the <a href="%s">wiki</a> to get a list of possibilities.',array(_r('https://wiki.mageia.org/en/Boot.iso_install')),'p'); - _g('These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one.',null,'p'); - _g('Size of the ISOs is about 50MB.',null,'p class="dlinfo"');?> + <?php _g('Wired Network-based Installation CD',null,'h3'); + _g('Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk.',null,'p'); + _g('Have a look in the <a href="%s">wiki</a> to get a list of possibilities.',array(_r('https://wiki.mageia.org/en/Boot.iso_install')),'p'); + + _g('Size of the ISOs is about 50MB.',null,'p class="dlinfo"');?> </div> <div class="radiobutton"> @@ -241,129 +234,129 @@ input[type="radio"], input[type="submit"] { </div> <?php if( !$dual || !$live || !$classical ){?> <p style="margin-top:1.5em;" class="warn"> - <?php if(!$dual){ _g('The dualarch is not yet available.');}?> - <?php if(!$live) {_g('LiveCDs and LiveDVDs are not yet available.');}?> - <?php if(!$classical){ _g('Classical Installation flavours is not yet available.');}?> + <?php if(!$dual){ _g('The dualarch is not yet available.');}?> + <?php if(!$live) {_g('LiveCDs and LiveDVDs are not yet available.');}?> + <?php if(!$classical){ _g('Classical Installation flavours is not yet available.');}?> </p> <?php }?> </div> <?php if($live){ ?> <div class="para" id="livespin"> - <?php _g('LiveCDs and LiveDVDs',null,'h2');?> - - <div id="livecdEx"> - <?php _g('LiveCDs',null,'h3'); - _g('LiveCDs contain only English and is available only in 32bit.',null,'p');?> - </div> + <?php _g('LiveCDs and LiveDVDs',null,'h2');?> - <div id="livedvdEx"> - <?php _g('LiveDVDs',null,'h3'); - _g('LiveDVDs contain all languages and is available in both 32 and 64bit.',null,'p');?> - </div> + <div id="livedvdEx"> + <?php _g('LiveDVDs',null,'h3'); + _g('LiveDVDs contain all languages and is available in both 32 and 64bit.',null,'p');?> + </div> - <div class="radiobutton"> - <input type="radio" id="livecd" value="CD" name="livespin" /> - <label for="livecd" class="ui-button livecd"><?php _g('English only (CD)')?></label> - <input type="radio" id="livedvd" value="DVD" name="livespin" /> - <label for="livedvd" class="ui-button livedvd"><?php _g('LiveDVDs')?></label> - </div> + <div id="livecdEx"> + <?php _g('LiveCDs',null,'h3'); + _g('LiveCDs contain only English and is available only in 32bit.',null,'p'); + _g('Do not use unless you really DON\'T NEED any other language than English.',null,'p class="warn"'); ?> + </div> + <div class="radiobutton"> + <input type="radio" id="livedvd" value="DVD" name="livespin" /> + <label for="livedvd" class="ui-button livedvd"><?php _g('LiveDVDs')?></label> + <input type="radio" id="livecd" value="CD" name="livespin" /> + <label for="livecd" class="ui-button livecd"><?php _g('English only (CD)')?></label> + </div> </div> <div class="para" id="desktop"> - <?php _g('Desktop',null,'h2');?> - - <div id="gnomeEx"> - <?php _g('GNOME Desktop',null,'h3');?> - <?php get_image('GNOME', '/g/5/gnome.png', 'width: 100%');?> - </div> - <div id="kdeEx"> - <?php _g('KDE Desktop',null,'h3');?> - <?php get_image('KDE', '/g/5/kde.png', 'width: 100%');?> - </div> - - <div class="radiobutton"> - <input type="radio" id="kde" value="KDE4" name="desktop" /> - <label for="kde" class="ui-button kde"><?php _g('KDE Desktop')?></label> - <input type="radio" id="gnome" value="GNOME" name="desktop" /> - <label for="gnome" class="ui-button gnome"><?php _g('GNOME Desktop')?></label> - </div> + <?php _g('Desktop',null,'h2');?> + + <div id="gnomeEx"> + <?php _g('GNOME Desktop',null,'h3');?> + <?php get_image('GNOME', '/g/5/gnome.png', 'width: 100%');?> + </div> + <div id="kdeEx"> + <?php _g('KDE Desktop',null,'h3');?> + <?php get_image('KDE', '/g/5/kde.png', 'width: 100%');?> + </div> + + <div class="radiobutton"> + <input type="radio" id="kde" value="KDE4" name="desktop" /> + <label for="kde" class="ui-button kde"><?php _g('KDE Desktop')?></label> + <input type="radio" id="gnome" value="GNOME" name="desktop" /> + <label for="gnome" class="ui-button gnome"><?php _g('GNOME Desktop')?></label> + </div> </div><?php }/*live*/?> <div class="para" id="nat"> - <?php _g('Network installer',null,'h2');?> - - <div id="freeEx"> - <?php _g('Network installer, Free Software CD', null,'h3'); - _g('Contain only free software',null,'p')?> - </div> - <div id="nonfreeEx"> - <?php _g('Network installer + nonfree firmware CD', null,'h3'); - _g('Contain nonfree drivers needed for some disc controllers, some network cards, etc.',null,'p')?> - </div> - <div class="radiobutton"> - <input type="radio" id="free" value="-" name="nat" /> - <label for="free" class="ui-button free"><?php _g('Free Software CD')?></label> - <input type="radio" id="nonfree" value="nonfree" name="nat" /> - <label for="nonfree" class="ui-button nonfree"><?php _g('Nonfree Firmware CD')?></label> - </div> + <?php _g('Network installer',null,'h2');?> + + <div id="freeEx"> + <?php _g('Network installer, Free Software CD', null,'h3'); + _g('Contain only free software',null,'p')?> + </div> + <div id="nonfreeEx"> + <?php _g('Network installer + nonfree firmware CD', null,'h3'); + _g('Contain nonfree drivers needed for some disc controllers, some network cards, etc.',null,'p')?> + </div> + <div class="radiobutton"> + <input type="radio" id="free" value="-" name="nat" /> + <label for="free" class="ui-button free"><?php _g('Free Software CD')?></label> + <input type="radio" id="nonfree" value="nonfree" name="nat" /> + <label for="nonfree" class="ui-button nonfree"><?php _g('Nonfree Firmware CD')?></label> + </div> </div> <div class="para" id="arch"> - <?php _g('Supported Architecture',null,'h2');?> - <div id='64bEx'> - <?php _g('64 bit',null,'h3'); - _g('Most new computers support x86-64 (also known as AMD64 and Intel64), but some laptop processors and netbook processors do not support it.',null,'p')?> - </div> - <div id='32bEx'> - <?php _g('32 bit',null,'h3'); - _g('This version runs on all PCs including those that support 64 Bit. If you have more than 3 GB of RAM you should prefer the 64 Bit version though.',null,'p')?> - </div> + <?php _g('Supported Architecture',null,'h2');?> + <div id='64bEx'> + <?php _g('64 bit',null,'h3'); + _g('Most new computers support x86-64 (also known as AMD64 and Intel64), but some laptop processors and netbook processors do not support it.',null,'p')?> + </div> + <div id='32bEx'> + <?php _g('32 bit',null,'h3'); + _g('This version runs on all PCs including those that support 64 Bit. If you have more than 3 GB of RAM you should prefer the 64 Bit version though.',null,'p')?> + </div> <?php if($dual){?> - <div id='dualEx'> - <?php _g('Dualarch',null,'h3');?> - <?php _g('The dualarch DVD contains only a minimal list of packages and a lite desktop, %s, to fit on %sGB.',array('XFCE','1'),'p'); + <div id='dualEx'> + <?php _g('Dualarch',null,'h3');?> + <?php _g('The dualarch DVD contains only a minimal list of packages and a lite desktop, %s, to fit on %sGB.',array('XFCE','1'),'p'); echo '<p>'; _g('Dual iso size is intended to be small for advanced users, only network proprietary drivers are included.', null, ' '); _g('You will have to add remote nonfree media if you need some more.', null,' '); _g('Furthermore UEFI is not supported.'); echo '</p>'; - _g('It can be used to install either a 32bit system or a 64bit system, the installer defaults to x86_64 when it detects a 64bit capable CPU.',null, 'p'); - _g('This ISO is generally for advanced users and system administrator for fast deployment of Mageia.',null, 'p');?> - </div> + _g('It can be used to install either a 32bit system or a 64bit system, the installer defaults to x86_64 when it detects a 64bit capable CPU.',null, 'p'); + _g('This ISO is generally for advanced users and system administrator for fast deployment of Mageia.',null, 'p');?> + </div> <?php } ?> - <div class="radiobutton"> - <input type="radio" id="32b" value="i586" name="arch" /> - <label for="32b" class="ui-button 32b"><?php _g('32 bit')?></label> - <input type="radio" id="64b" value="x86_64" name="arch" /> - <label for="64b" class="ui-button 64b"><?php _g('64 bit')?></label> + <div class="radiobutton"> + <input type="radio" id="32b" value="i586" name="arch" /> + <label for="32b" class="ui-button 32b"><?php _g('32 bit')?></label> + <input type="radio" id="64b" value="x86_64" name="arch" /> + <label for="64b" class="ui-button 64b"><?php _g('64 bit')?></label> <?php if($dual == true){ ?><input type="radio" id="dual" value="dual" name="arch" /> - <label for="dual" class="ui-button dual"><?php _g('Dualarch')?></label><?php } ?> - </div> + <label for="dual" class="ui-button dual"><?php _g('Dualarch')?></label><?php } ?> + </div> </div> <div class="dllink para" id="dllink" > - <?php _g('Download Method',null,'h2');?> - <div id="directEx"> - <?php _g('Direct Link',null,'h3'); - _g('You will be redirected to a HTTP or FTP mirror.',null,'p') ?> - </div> + <?php _g('Download Method',null,'h2');?> + <div id="directEx"> + <?php _g('Direct Link',null,'h3'); + _g('You will be redirected to a HTTP or FTP mirror.',null,'p') ?> + </div> - <div id="torrentEx"> + <div id="torrentEx"> <?php if($torrentavailable){ ?> - <?php _g('BitTorrent',null,'h3'); - _g('We recommend you to use <a href=%s>BitTorrent</a> for downloading as it usually give a higher speeds and more reliable download of large files.',array(_r('http://en.wikipedia.org/wiki/BitTorrent')),'p');?> + <?php _g('BitTorrent',null,'h3'); + _g('We recommend you to use <a href=%s>BitTorrent</a> for downloading as it usually give a higher speeds and more reliable download of large files.',array(_r('http://en.wikipedia.org/wiki/BitTorrent')),'p');?> <?php } else { echo _g('BitTorrent link are not yet available.',null, 'p style="margin-top:1.5em;" class="warn"'); } ?> - </div> + </div> - <div class="radiobutton"> - <?php if($torrentavailable){ ?> - <a href="#" id="torrentlink" class="ui-button torrentlink"><?php _g('BitTorrent')?></a><?php }?> - <a href="#" id="directlink" class="ui-button directlink"><?php _g('Direct Link')?></a> - </div> + <div class="radiobutton"> + <?php if($torrentavailable){ ?> + <a href="#" id="torrentlink" class="ui-button torrentlink"><?php _g('BitTorrent')?></a><?php }?> + <a href="#" id="directlink" class="ui-button directlink"><?php _g('Direct Link')?></a> + </div> </div> <noscript> @@ -393,7 +386,7 @@ input[type="radio"], input[type="submit"] { </tr> <?php if($dual){ ?> <tr> <th class="name">DVD dualarch</th> - <td> + <td> <?php dl_link($name,$version,$release,null,'dual','DVD',false);?> </td><td> <?php dl_link($name,$version,$release,null,'dual','DVD',true,$torrentavailable);?> @@ -402,8 +395,8 @@ input[type="radio"], input[type="submit"] { </tbody> </table> </div> -<?php } ?> - +<?php } ?> + <?php if($live){ ?> <div class="para" id="Flive"> <h2><?php _g('LiveCDs and LiveDVDs');?></h2> @@ -466,13 +459,13 @@ input[type="radio"], input[type="submit"] { <table class="fr-table dlt2"> <thead> - <tr> - <th><?php _g('Format');?></th> - <th><?php _g('link');?></th> - </tr> + <tr> + <th><?php _g('Format');?></th> + <th><?php _g('link');?></th> + </tr> </thead> <tbody> - <tr> + <tr> <th><?php _g('Network installer, Free Software CD')?></th> <td><?php dl_link($name,$version,$release,'Boot','i586','CD',false); echo '<br>'; @@ -497,20 +490,16 @@ input[type="radio"], input[type="submit"] { <ul class="hl"> <li><a href=<?php echo sprintf('"%s">',$releasenotes); _g('Release notes')?></a></li> <li><a href=<?php echo sprintf('"%s">',$errata); _g('More about known issues or limitation in installation and usage')?></a></li> - <?php /* _g('<a href="%s">Which to choose</a>', array(_r('https://wiki.mageia.org/en/Installation_Media')),'li')?></li> - <?php _g('<a href="%s">Get ISO on USB flash drive</a>', array(_r('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F')),'li') */?> + <?php _g('<a href="%s">Which to choose</a>', array(_r('https://wiki.mageia.org/en/Installation_Media')),'li')?></li> + <?php _g('<a href="%s">Get ISO on USB flash drive</a>', array(_r('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive')),'li') ?> <li><?php _g('Newcomer? <a href="%s">Here\'s a wiki page for you.</a>', array(_r('https://wiki.mageia.org/en/Newcomers_start_here')))?></li> <li><?php _g('Help us on %s', array("<a href=\"../contribute\">$name $version</a>"))?></li> </ul> <?php echo '<br>'; - _g('Looking for a stable release?', null, 'h3'); - echo '<p>'; - _g('It is <a href="%s">here</a>.', array('../downloads/')); - echo '</p>'; - /* _g('Upgrading<br>from %s ?', array('Mageia 4'), 'h3')?> - <ul class="hl"><?php + _g('Upgrading<br>from %s ?', array('Mageia 4 (4.1)'), 'h3')?> + <ul class="hl"><?php _g('<strong>do not</strong> use LiveCDs;', null, 'li'); _g('see the <a href="%s" hreflang="en">upgrade guide</a>', array($upgradeguide), 'li'); echo '</ul><br>'; @@ -518,12 +507,15 @@ input[type="radio"], input[type="submit"] { _g('Looking for %s ?', array('Mageia 4'), 'h3'); echo '<p>'; _g('It is <a href="%s">here</a>.', array('../4/'),' '); - echo '<span class="warn">', _g('But please remember that it already <a href="%s">reached EOL</a>.',array(_r_rename_when_blog_post_about_mga4_EOL_('https://blog.mageia.org/en/201?????/'))) . '</span>'; + echo '<span class="warn">', + _g('But please remember that it will soon <a href="%s">reach EOL</a>.', array('../support/')); +// _g('But please remember that it already <a href="%s">reached EOL</a>.', array(_r_rename_when_blog_post_about_mga4_EOL_('https://blog.mageia.org/en/201?????/'))); + echo '</span>'; echo '</p>'; _g('Need more challenge?', null, 'h3'); _g('You can <a href="%s">help</a> us <a href="%s">on %s</a>.', array('../contribute/','../contribute/','Mageia 6')); -*/ ?> + ?> </div> <hr> </div> @@ -542,26 +534,26 @@ $($cl).tooltipsy({ offset: [($x), ($y)], delay:500, content: function ($el, $tip) { - $tip.html($($id).remove().html()) - }, - hide: function (e, $el) { - setTimeout(function(){ + $tip.html($($id).remove().html()) + }, + hide: function (e, $el) { + setTimeout(function(){ $el.hide(); - }, 400); + }, 400); } - }); +}); } function lazyload(){ - $('img.lazy').each(function(){ - $(this) - .attr( 'src', $(this).data('src') ) - .removeClass('hidden') - .removeAttr('data-src'); - }); +$('img.lazy').each(function(){ + $(this) + .attr( 'src', $(this).data('src') ) + .removeClass('hidden') + .removeAttr('data-src'); +}); } - $('#iso2usb,#arch,#nat,#desktop,#livespin,#dllink').hide(); + $('#iso2usb,#arch,#nat,#desktop,#livespin,#dllink').hide(); $('input[name=format]').click(function () { $('#arch,label[for="dual"]')[this.id == 'classical' ? 'slideDown' : 'slideUp'](); $('label[for="64b"],#64bex').show(); @@ -598,18 +590,18 @@ function lazyload(){ $('input[name=desktop]').click(function () { $('#arch')[ $('#gnome,#kde').is(':checked') ? 'slideDown' : 'slideUp'](); - scrolltoid('#arch') + scrolltoid('#arch') }); $('input[name=arch]').click(function () { $('#dllink')[$('#32b,#64b,#dual').is(':checked') ? 'slideDown' : 'slideUp'](); $('input[name="dllink"]').prop('checked', false); $('#torrentEx,#torrentlink')[$('#lan').is(':checked') ? 'hide' : 'show'](); - scrolltoid('#dllink') + scrolltoid('#dllink') }); - $('#directlink,#torrentlink').hover(function () { - format = $('input[name=format]:checked').val(); + $('#directlink,#torrentlink').hover(function () { + format = $('input[name=format]:checked').val(); livespin = $('input[name=livespin]:checked').val(); desktop = $('input[name=desktop]:checked').val(); desktop = (livespin == 'CD') ? desktop + '-en' : desktop; @@ -617,26 +609,26 @@ function lazyload(){ arch = $('input[name=arch]:checked').val(); getname ='<?php echo get_mageia($name, $version, $release)?>' + '-'; file = $('#live').is(':checked') ? format + livespin + '-' + desktop + '-' + arch + '-' + livespin + '.iso' : $('#classical').is(':checked') ? arch + '-' + format + '.iso' : format + nat + arch + '-CD.iso'; - file = (this.id == 'torrentlink') ? getname + file + '&torrent=1' : getname + file ; + file = (this.id == 'torrentlink') ? getname + file + '&torrent=1' : getname + file ; $("a.ui-button").attr('href','../downloads/get/?q=' + file); }); - gettooltip('.iso2usb', '#iso2usbEx',0,1) - gettooltip('.classical', '#classicalEx',40,-70) - gettooltip('.live', '#liveEx',40,-70) - gettooltip('.lan','#lanEx',40,-70) - gettooltip('.livecd', '#livecdEx',40,-70) - gettooltip('.livedvd', '#livedvdEx',40,-70) - gettooltip('.gnome', '#gnomeEx',40,-300) - gettooltip('.kde', '#kdeEx',40,-300) - gettooltip('.free', '#freeEx',40,-70) - gettooltip('.nonfree','#nonfreeEx',40,-70) - gettooltip('.32b', '#32bEx',40,-70) - gettooltip('.64b', '#64bEx',40,-70) - gettooltip('.dual', '#dualEx',40,-70) - gettooltip('.directlink', '#directEx',40,-40) - gettooltip('.torrentlink','#torrentEx',40,-40) - + gettooltip('.iso2usb', '#iso2usbEx',0,1) + gettooltip('.classical', '#classicalEx',40,-70) + gettooltip('.live', '#liveEx',40,-70) + gettooltip('.lan','#lanEx',40,-70) + gettooltip('.livecd', '#livecdEx',40,-70) + gettooltip('.livedvd', '#livedvdEx',40,-70) + gettooltip('.gnome', '#gnomeEx',40,-300) + gettooltip('.kde', '#kdeEx',40,-300) + gettooltip('.free', '#freeEx',40,-70) + gettooltip('.nonfree','#nonfreeEx',40,-70) + gettooltip('.32b', '#32bEx',40,-70) + gettooltip('.64b', '#64bEx',40,-70) + gettooltip('.dual', '#dualEx',40,-70) + gettooltip('.directlink', '#directEx',40,-40) + gettooltip('.torrentlink','#torrentEx',40,-40) + }); </script> </body> diff --git a/en/5/index.php b/en/5/index.php index d597cf184..d7adbba57 100644 --- a/en/5/index.php +++ b/en/5/index.php @@ -1 +1,103 @@ -<?php include '../5/download_index.php'; +<?php +define('HLANG', true); +define('ALIGNMENT', 'Center'); +require '../../langs.php'; + +$dictionary = read_translation_file($locale, '5'); +?> +<!DOCTYPE html> +<html lang="<?php echo $locale; ?>"> +<head> + <meta charset="utf-8"> + <title><?php _g('Mageia 5')?></title> + <link rel="stylesheet" href="/g/style/all.css"> + <meta name="description" content="<?php _g('Mageia 5 is the new, solid, stable Linux distribution from the Mageia project.')?>"> + <?php include '../../analytics.php'; ?> + <style>.para{text-align: justify;text-align: -webkit-auto;}</style> + <link rel="stylesheet" href="/g/style/bjqs.css"> + <script src="/g/js/jquery-1.10.1.min.js"></script> + <script src="/g/js/bjqs-1.3.min.js"></script> + </head> + +<body class="downloads"> + <?php echo $hsnav; ?> + + <h1 id="mgnavt"><a href="../5/">Mageia 5</a></h1> + <?php include '../5/nav.php'; ?> + + <div id="doc5" class="yui-t3"> + <div id="bd" role="main"> + <div class="yui-ge bb1"> + <div class="yui-u first" style="width:55.5%"> + <div class="para"> + +<?php _g('About Mageia 5', null, 'h2'); + + _g('Mageia 5 is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>. It can be installed in several ways, with the Live or Classical ISOs being the most popular methods.', array('../community'), 'p');?> + + <p><a href="../downloads/" style="background: #1272B1; color: white; padding: 0.9em; margin: 1em; display: inline-block; text-shadow: 0 1px 6px #000; border-radius: 3px;"><?php _g('Download it right away!');?></a></p> + +<?php _g('Live ISO\'s let you try Mageia without installation. Use <a href="%s">these instructions</a> to put the Live ISO on a CD, DVD or USB device. Then you can run Mageia 5 directly from there, and try Mageia using one of the graphical user interfaces such as GNOME or KDE.', array(_r('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive')), 'p'); + _g('If you are happy with the Mageia experience, you can then install it onto your hard drive from the Live media.', null, 'p'); + + _g('The Classical ISO is the more traditional way to install Mageia directly. Take a look at the complete <a href="%s">documentation</a> for this installer.', array('../doc/'), 'p'); + + _g('Mageia 5 includes several desktop managers including KDE, Gnome, XFCE, Mate, and Cinnamon.', null, 'p'); + + _g('There are lots of applications in the official repositories. You can have a look at the <a href="%s">Mageia Application Database</a> to get a complete list of packages inside Mageia.', array('http://mageia.madb.org'), 'p'); + + _g('What\'s new?', null, 'h2'); + + _g('There\'s plenty of new goodness in Mageia 5, too much to include here - see the <a hreflang="en" href="%s">release notes</a> for an extensive exposé.',array($releasenotes), 'p'); + + _g('There is one feature worth mentioning here. It took a lot of effort and time but it was worth it. Mageia 5 <a href="%s">supports UEFI</a>, which means it’s now even easier to install it on recent hardware.', + array(_r('https://blog.mageia.org/en/2015/05/30/waiting-for-mageia-5-spotlight-on-uefi-support/')), 'p'); + + _g('To help users configure and use Mageia, and to provide some information about the community and the project, there\'s a program called <a href="%s">MageiaWelcome</a>. It starts automatically when a session opens for the first time in any of the graphical environments.',array(_r('https://wiki.mageia.org/en/Feature:MageiaWelcome')), 'p'); + ?> + </div> + </div> + + <div class="yui-u" style="width:44.5%"> + <div id="banner" style="text-align:center; display: block; padding: 2em 0em 4em;"> + <!-- start Basic Jquery Slider --> + <ul class="bjqs"> + <li><img src="/g/5/Cinnamon.png" title="Cinnamon"></li> + <li><img src="/g/5/Enlightenment.png" title="Enlightenment"></li> + <li><img src="/g/5/gnome.png" title="Gnome"></li> + <li><img src="/g/5/kde.png" title="KDE"></li> + <li><img src="/g/5/Lxde.png" title="Lxde"></li> + <li><img src="/g/5/Lxqt.png" title="Lxqt"></li> + <li><img src="/g/5/Mate.png" title="Mate"></li> + <li><img src="/g/5/Xfce.png" title="Xfce"></li> + <li><img src="/g/5/MageiaControlCenter.png" title="<?php _g('Mageia Control Center');?>"></li> + <li><img src="/g/5/MageiaWelcome1.png" title="Mageia Welcome 1"></li> + <li><img src="/g/5/MageiaWelcome2.png" title="Mageia Welcome 2"></li> + <li><img src="/g/5/MageiaWelcome3.png" title="Mageia Welcome 3"></li> + <li><img src="/g/5/MageiaWelcome4.png" title="Mageia Welcome 4"></li> + <li><img src="/g/5/MageiaWelcome5.png" title="Mageia Welcome 5"></li> + </ul> + + </div> + <div class="para" style="padding: 1em 2em 1em 0em"> + + <?php + _g('Mageia in context', null, 'h2'); + + _g('Mageia is both a Community and a Linux Distribution, with Mageia 5 being our fifth release.', null, 'p'); + + _g('Mageia 5 is supported by the <a href="%s">Mageia.org nonprofit organisation</a>, which is governed by a body of recognized and elected contributors.',array('../about/'), 'p'); + + _g('Mageia 5 has been made by more than <a href="%s">100 people from all around the world</a>.',array('//people.mageia.org/g/'), 'p'); + + _g('Our work adds to the excellent work of the wider Linux and Free Software community. We aim to blend all the excellent work done by the community, adding the special Mageia ingredients, to bring you the best, most stable, reliable and enjoyable experience we can make for regular users, developers and businesses.', null, 'p'); + + _g('We welcome new contributors to any of the many different teams that go to make up Mageia the Community, and we encourage you to <a href="%s">join us</a>.', array('../contribute'), 'p'); + ?> + </div> + +</div> +</div> + + </body> +</html> diff --git a/en/5/nav.php b/en/5/nav.php index e715d0e78..cb2864a5e 100644 --- a/en/5/nav.php +++ b/en/5/nav.php @@ -1,17 +1,16 @@ <?php -$releasenotes = "https://wiki.mageia.org/en/Mageia_5_$release"; //_r('https://wiki.mageia.org/en/Mageia_5_Release_Notes'); +$releasenotes = _r('https://wiki.mageia.org/en/Mageia_5_Release_Notes'); $errata = _r('https://wiki.mageia.org/en/Mageia_5_Errata'); $upgradeguide = _r('https://wiki.mageia.org/en/Mageia_5_Release_Notes#Upgrading_from_Mageia_4'); $nav = array( - _r("https://wiki.mageia.org/en/Mageia_5_Development#Development_Planning") => _r('Development roadmap'), - _r("https://wiki.mageia.org/en/FeatureMageia5_Review") => _r('Features review'), - /*"/{$locale}/5/" => 'Mageia 5', - "/{$locale}/downloads/" => _r('Download'),*/ + "/{$locale}/5/" => 'Mageia 5', + "/{$locale}/downloads/" => _r('Download'), + $releasenotes => _r('Release notes'), $errata => _r('Errata'), - "//bugs.mageia.org/" => _r('Bugs Reports'), +// "//bugs.mageia.org/" => _r('Bugs Reports'), ); $sru = trim($_SERVER['REQUEST_URI']); @@ -26,5 +25,5 @@ foreach ($nav as $k => $v) { $pnav = implode($pnav); echo <<<S -<ul>{$pnav}</ul> +<div id="mgnavsub"><ul id="mgnavsubl">{$pnav}</ul></div> S; |