wiki links translatable for mga4 pages

2 files changed, 9 insertions, 9 deletions

diff --git a/en/4/download_index.php b/en/4/download_index.php
index 951db2036..20433f693 100755
--- a/en/4/download_index.php
+++ b/en/4/download_index.php
@@ -62,8 +62,8 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un
             <div class="yui-ge bb1">
             <div class="yui-u first rb1">
                     <div class="para" id="classical">
-<?php _g('If you want to put the ISO on USB key, <span class="warn">please DO NOT use Unetbootin</span>. Have a look <a href="%s">here</a> for the alternative.',array('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F'),'p'); 
-	_g('Mageia 4.1 is a <a href="%s">maintenance</a> release for Mageia 4 with the current packages from update medias. It also has a fix for a syslinux bug which prevented some people installing from a burned cd/dvd.',array('http://blog.mageia.org/en/2014/06/20/pulling-mageia-4-1-out-of-the-hat/'),'p');
+<?php _g('If you want to put the ISO on USB key, <span class="warn">please DO NOT use Unetbootin</span>. Have a look <a href="%s">here</a> for the alternative.',array(_r('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F')),'p'); 
+	_g('Mageia 4.1 is a <a href="%s">maintenance</a> release for Mageia 4 with the current packages from update medias. It also has a fix for a syslinux bug which prevented some people installing from a burned cd/dvd.',array(_r('http://blog.mageia.org/en/2014/06/20/pulling-mageia-4-1-out-of-the-hat/')),'p');
 
 ?>
 
@@ -113,7 +113,7 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un
                                 Deutsch, English, español, français, italiano, português, svenska, nederlands,
                                 polski, dansk, Русский
                                 <?php _g('and so much more!', null, ' '); ?>
-                                <a href="https://wiki.mageia.org/en/Available_locales" hreflang="en"><?php _g('See the comprehensive list')?></a>.</li>
+                                <a href="<?php _g('https://wiki.mageia.org/en/Available_locales')?>" hreflang="en"><?php _g('See the comprehensive list')?></a>.</li>
                             <li><?php
                                 _g('These DVD and CD ISOs contains Free Software and some proprietary drivers.', null, ' ');
                                 _g('You will be asked of which kind of Software you want to install.');
@@ -230,9 +230,9 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un
                         <ul class="hl">
                             <li><?php _g('<a href="%s">Release notes</a>', array($releasenotes))?></li>
                             <li><?php _g('<a href="%s">Errata</a>', array($errata))?></li>
-                            <li><?php _g('<a href="%s">Which to choose</a>', array('https://wiki.mageia.org/en/Installation_Media'))?></li>
-                            <li><?php _g('<a href="%s">Get ISO on USB flash stick</a>', array('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F'))?></li>
-                            <li><?php _g('Newcomer? <a href="%s">Here\'s a wiki page for you.</a>', array('https://wiki.mageia.org/en/Newcomers_start_here'))?></li>
+                            <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 stick</a>', array(_r('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F')))?></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>
                         </ul>
                         <br>
                         <br>
@@ -247,7 +247,7 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un
                             _g('Looking for Mageia 3?', null, 'h3');
                             echo '<p>';
                             _g('It is <a href="%s">here now</a>.', array('../3/'), ' ');
-                            _g('But please remember that it already <a href="%s">reached EOL</a>.', array('https://blog.mageia.org/en/2014/11/26/lets-say-goodbye-to-mageia-3/'), 'span class="warn"'); ?>
+                            _g('But please remember that it already <a href="%s">reached EOL</a>.', array(_r('https://blog.mageia.org/en/2014/11/26/lets-say-goodbye-to-mageia-3/')), 'span class="warn"'); ?>
                         </p>
                         <br>
                         <br>
diff --git a/en/4/index.php b/en/4/index.php
index 15acddace..e1b574048 100644
--- a/en/4/index.php
+++ b/en/4/index.php
@@ -35,7 +35,7 @@ $dictionary = read_translation_file($locale, '4');
 
 	    <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 4 directly from there, and try Mageia using one of the graphical user interfaces such as GNOME or KDE.', array('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_stick.3F'), '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 4 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.3F')), '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');
@@ -48,7 +48,7 @@ $dictionary = read_translation_file($locale, '4');
 
             _g('There\'s plenty of new goodness in Mageia 4, too much to include here - see the <a hreflang="en" href="%s">release notes</a> for an extensive exposé.',array($releasenotes), 'p');
 
-            _g('To help users configure and use Mageia, and to provide some information about the community and the project, we\'ve added the new <a href="%s">MageiaWelcome</a>.It starts automatically when a session opens for the first time in any of the graphical environments.',array('https://wiki.mageia.org/en/Feature:MageiaWelcome'), 'p');
+            _g('To help users configure and use Mageia, and to provide some information about the community and the project, we\'ve added the new <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');
 
             require '../doc/doc.php';
             _g('We\'ve added two new desktop environments: Mate and Cinnamon, both available from the classic installer DVD/ISO. To make it more friendly we re-factored the <a href="%s">custom desktop choice</a>.',array('//doc.mageia.org/installer/4/' . doc_present_in_locale('installer', 4) . '/content/choosePackageGroups.html'), 'p');