From 61b3f6421e9f16c4fff364bbca754f154d5501b2 Mon Sep 17 00:00:00 2001
From: Filip Komar <filip@mageia.org>
Date: Thu, 18 Jul 2013 19:14:37 +0000
Subject: minor improvements for i18n

---
 en/4/download_index.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'en/4/download_index.php')
diff --git a/en/4/download_index.php b/en/4/download_index.php
index dcd4f08fd..c5f906f7b 100755
--- a/en/4/download_index.php
+++ b/en/4/download_index.php
@@ -35,7 +35,7 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
     break;
   }
   
-  echo 'forthcoming';
+  echo _t('forthcoming');
   /*
   echo $torrent && $unavailabletorrent ? sprintf(_t('forthcoming')) :  sprintf('<a rel="nofollow" href="?q=%s%s" title="%s">%s</a>',
     get_mageia_image_file_name($name, $version, $release, $variant, $arch, $medium, '.iso'),
@@ -52,7 +52,7 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
 <html dir="ltr" lang="<?php echo $locale; ?>">
 <head>
     <meta charset="utf-8">
-    <title><?php echo sprintf(_t('Download %s %s %s'),$name, $version, $release)?></title>
+    <title><?php echo sprintf(_t('Download') . ' %s %s %s',$name, $version, $release)?></title>
     <meta name="description" content="<?php _e('Download Mageia 4 DVD, CD, LiveCD, network install ISO images.') ?>">
     <meta name="keywords" content="<?php _e('mageia, mageia 4, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent')?>">
     <meta name="robots" content="index,nofollow,nosnippet">
@@ -74,7 +74,8 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
     <?php echo $hsnav; ?>
     <h1 id="mgnavt"><?php echo sprintf(_t('Download <strong>%s %s %s</strong>'),$name, $version, $release)?></h1>
     <?php include '../'.$version.'/nav.php'; ?>
-            <p class="unstable-release-warning"><?php _e('Be careful! This is an alpha, unstable release. It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.</strong>');?> </p> 
+            <p class="unstable-release-warning"><?php _e('Be careful! This is an alpha, unstable release.');
+            _e('It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.</strong>');?></p>
 
     <div id="doc4" class="yui-t7">
         <div id="bd" role="main">
@@ -96,27 +97,27 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
                                 <th class="name">DVD 32bit</th>
                                 <td class="size">3.9GB</td>
 				<td>
-				<?php dl_link($name,$version,$release,$variant,'i586','DVD',false);
+				<?php dl_link($name,$version,$release,null,'i586','DVD',false);
 				echo '</td><td>';
-				dl_link($name,$version,$release,$variant,'i586','DVD',true);?>
+				dl_link($name,$version,$release,null,'i586','DVD',true);?>
 				</td>
                             </tr>
                             <tr>
                                 <th class="name">DVD 64bit</th>
                                 <td class="size">3.9GB</td>
 				<td>
-				<?php dl_link($name,$version,$release,$variant,'x86_64','DVD',false);
+				<?php dl_link($name,$version,$release,null,'x86_64','DVD',false);
 				echo '</td><td>';
-				dl_link($name,$version,$release,$variant,'x86_64','DVD',true);?>
+				dl_link($name,$version,$release,null,'x86_64','DVD',true);?>
 				</td>
                             </tr>
                             <tr>
                                 <th class="name">CD</th>
                                 <td class="size">700MB</td>
 				<td>
-				<?php dl_link($name,$version,$release,$variant,'dual','CD',false);;
+				<?php dl_link($name,$version,$release,null,'dual','CD',false);;
 				echo '</td><td>';
-				dl_link($name,$version,$release,$variant,'dual','CD',true);?>
+				dl_link($name,$version,$release,null,'dual','CD',true);?>
 				</td>
                             </tr>
                         </tbody>
@@ -252,7 +253,7 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
                         <br>
                         <br>
                         <?php
-                            _h('Looking for a stable release ?', null, 'h3');
+                            _h('Looking for a stable release?', null, 'h3');
                             echo '<p>';
                             _e('It is <a href="%s">here</a>.', array('/../downloads/'));
                             echo '</p>';
-- 
cgit v1.2.1

