From dd506c3a2153b18ef7f29b15fa48f2c9d9809cb9 Mon Sep 17 00:00:00 2001
From: filip <filip.komar@gmail.com>
Date: Tue, 28 Jul 2015 16:46:35 +0200
Subject: bugfix for mga#16378 + Slovenian translation updated

---
 en/5/download_index.php | 75 +++++++++++++++++++++++--------------------------
 1 file changed, 35 insertions(+), 40 deletions(-)

(limited to 'en/5')

diff --git a/en/5/download_index.php b/en/5/download_index.php
index 9601bd43b..a28750ab0 100755
--- a/en/5/download_index.php
+++ b/en/5/download_index.php
@@ -55,8 +55,8 @@ echo $torrent && !$torrentavailable  ? sprintf(_t('forthcoming')) :  sprintf('<a
 }
 
 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="%s" alt="%s" title="%s" style="%s" />', $src, $ttl, $ttl, $sty);
 }
 
 ?>
@@ -68,7 +68,7 @@ function get_image($ttl, $src, $sty){
     <meta name="description" content="<?php _g('Download %s DVD, CD, LiveCD, network install ISO images.', array("$name $version"))?>">
     <meta name="keywords" content="<?php _g('mageia, %s, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent', array("$name $version"))?>">
     <meta name="robots" content="index,nofollow,nosnippet">
-    <link rel="canonical" href="/<?php echo $locale.'/'.$verion;?>/">
+    <link rel="canonical" href="/<?php echo $locale.'/'.$version;?>/">
     <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>
@@ -152,27 +152,23 @@ input[type="radio"], input[type="submit"]  {
 
 <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')));?>
+    <?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('All ISOs can also be launched from a <a %s>USB drive</a>.', array('href="' . _r('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive') . '"'));
+    echo '</p>';
+    _g('To <a %s>dump</a> a Mageia installation ISO on a USB stick, you may try one of several tools:', array('class="iso2usb"'),'p');
+    echo '<ul><li>';
+    _g('For Linux, IsoDumper, available inside repo. Or any tools based on dd.', null, ' ');
+    _g('Unetbootin is not supported.', null, 'span class="warn"'); ?>
+    </li>
+    <?php _g('For Windows please have a look on our <a href="%s">wiki</a> for your options.', array(_r('https://wiki.mageia.org/en/Dump_Mageia_ISO_on_a_USB_flash_drive_-_Alternative_tools')), 'li'); ?>
+    </ul>
+    <div id="iso2usbEx"><p>
+    <?php _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.'); ?>
+    </p></div>
+    <p>
     <?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">
@@ -181,18 +177,18 @@ input[type="radio"], input[type="submit"]  {
 <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');  ?>
+    <?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
+    <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>	
+    </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"');?>
 
@@ -246,7 +242,7 @@ input[type="radio"], input[type="submit"]  {
     <?php _g('LiveCDs and LiveDVDs',null,'h2');?>
 
     <div id="livedvdEx">
-        <?php 	_g('LiveDVDs',null,'h3');
+        <?php _g('LiveDVDs',null,'h3');
         _g('LiveDVDs contain all languages and is available in both 32 and 64bit.',null,'p');?>
     </div>
 
@@ -268,11 +264,11 @@ input[type="radio"], input[type="submit"]  {
     <?php _g('Desktop',null,'h2');?>
 
     <div id="gnomeEx">
-        <?php 	_g('GNOME Desktop',null,'h3');?>
+        <?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 _g('KDE Desktop',null,'h3');?>
         <?php get_image('KDE', '/g/5/kde.png', 'width: 100%');?>
     </div>
 
@@ -288,11 +284,11 @@ input[type="radio"], input[type="submit"]  {
     <?php _g('Network installer',null,'h2');?>
 
     <div id="freeEx">
-        <?php 	_g('Network installer, Free Software CD', null,'h3');
+        <?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');
+        <?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">
@@ -333,7 +329,7 @@ input[type="radio"], input[type="submit"]  {
         <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 } ?>
+        <label for="dual" class="ui-button dual"><?php _g('Dualarch')?></label><?php } ?>
     </div>
 </div>
 
@@ -489,17 +485,16 @@ input[type="radio"], input[type="submit"]  {
                     <div class="para" style="padding-left: 1em;">
                         <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>
+                            <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')?>
                             <?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>
+                            <?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')?>
+                            <?php _g('Help us on %s', array("<a href=\"../contribute\">$name $version</a>"), 'li')?>
                         </ul>
-                        <?php  
-                            echo '<br>';
-
-                            _g('Upgrading<br>from %s ?', array('Mageia 4 (4.1)'), 'h3')?>
-                            <ul class="hl"><?php 
+                        <br>
+                        <?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>';
@@ -526,7 +521,7 @@ input[type="radio"], input[type="submit"]  {
 
 $(function () {
 
-function scrolltoid(id){ $('html, body').animate({ scrollTop: $(id).offset().top }, 800);  }
+function scrolltoid(id){ $('html, body').animate({ scrollTop: $(id).offset().top }, 800); }
 
 function gettooltip($cl, $id, $x, $y){
 $($cl).tooltipsy({
-- 
cgit v1.2.1