localized (en,fr) download page for 2

author: Romain d'Alverny <rda@mageia.org> 2012-05-23 15:59:35 +0000
committer: Romain d'Alverny <rda@mageia.org> 2012-05-23 15:59:35 +0000
commit: f02fa2fa6c1670a87025da5066b6e6dfb910c4d0 (patch)
tree: db87ed2d7b2794af11365ce98a988def9c58b60b
parent: dee9caee8049c9705af6ca6587a4345eee0ab82f (diff)
download: www-f02fa2fa6c1670a87025da5066b6e6dfb910c4d0.tar
www-f02fa2fa6c1670a87025da5066b6e6dfb910c4d0.tar.gz
www-f02fa2fa6c1670a87025da5066b6e6dfb910c4d0.tar.bz2
www-f02fa2fa6c1670a87025da5066b6e6dfb910c4d0.tar.xz
www-f02fa2fa6c1670a87025da5066b6e6dfb910c4d0.zip
4 files changed, 288 insertions, 19 deletions
diff --git a/en/2/download_index.php b/en/2/download_index.php
index e710a78f6..09ab5183a 100644
--- a/en/2/download_index.php
+++ b/en/2/download_index.php
@@ -2,12 +2,8 @@
 
 define('HLANG', true);
 require '../../langs.php';
-include 'locales.php';
 
-$_t = i18n::get_strings($_t, $locale, $i18n_fallback_rules);
-
-$_t['page_title'] = sprintf($_t['page_title'], 'Mageia 2', '');
-$_t['page_h1']    = '<a href="../2/">Mageia 2</a> &raquo; Download';
+_lang_load($locale, '2');
 
 require '../downloads/get/lib.php';
 ?>
@@ -15,17 +11,17 @@ require '../downloads/get/lib.php';
 <html dir="ltr" lang="<?php echo $locale; ?>">
 <head>
     <meta charset="utf-8">
-    <title><?php echo $_t['page_title']; ?></title>
-    <meta name="description" content="<?php echo $_t['page_desc']; ?>">
-    <meta name="keywords" content="<?php echo $_t['page_kw']; ?>">
-    <meta name="robots" content="noindex,nofollow,nosnippet">
+    <title><?php _e('Download Mageia 2')?></title>
+    <meta name="description" content="<?php _e('Download Mageia 2 DVD, CD, LiveCD, network install ISO images.') ?>">
+    <meta name="keywords" content="<?php _e('mageia, mageia 2, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent')?>">
+    <meta name="robots" content="index,nofollow,nosnippet">
     <link rel="canonical" href="/<?php echo $locale; ?>/2/">
     <link rel="stylesheet" href="/g/style/all.css">
     <?php include '../../analytics.php'; ?>
 </head>
 <body class="release downloads">
     <?php echo $hsnav; ?>
-    <h1 id="mgnavt"><?php _e('page_h1')?></h1>
+    <h1 id="mgnavt"><?php _e('Download <strong>Mageia 2</strong>')?></h1>
     <?php include '../2/nav.php'; ?>
     <div id="doc4" class="yui-t7">
         <div id="bd" role="main">
@@ -78,7 +74,7 @@ require '../downloads/get/lib.php';
                                 _e('You may, if you will, add nonfree software repository <em>after</em> the installation.');
                             ?></li>
                             <li><?php
-                                _e('Please note that there is a <span class="warn">problem with notebooks using Intel, AMD/ATI and nVidia graphic cards.</span>.');
+                                _e('Please note that there is a <span class="warn">problem with notebooks using Intel, AMD/ATI and nVidia graphic cards.</span>');
                                 echo sprintf('<a href="https://wiki.mageia.org/en/Mageia_2_Errata#Hardware_Issues">%s</a>',
                                     _t('See the errata about this'));
                                 ?></li>
@@ -185,7 +181,7 @@ require '../downloads/get/lib.php';
                               <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-Boot-x86_64-CD.iso">64bit</a></td>
                           </tr>
                           <tr>
-                              <th><?php _e('Same + nonfree firmwaree')?><br>
+                              <th><?php _e('Same + nonfree firmware')?><br>
                                   <span class="dlinfo"><?php _e('needed for some disc controllers, some network cards, etc.')?></span></th>
                               <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-Boot-nonfree-i586-CD.iso">32bit</a></td>
                               <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-Boot-nonfree-x86_64-CD.iso">64bit</a></td>
@@ -201,15 +197,15 @@ require '../downloads/get/lib.php';
                         <h2>Mageia 2</h2>
                         <?php _h('May 22<sup>nd</sup> 2012')?>
                         <ul class="hl">
-                            <li><a href="https://wiki.mageia.org/en/Mageia_2_Release_Notes">Release notes</a></li>
+                            <li><a href="https://wiki.mageia.org/en/Mageia_2_Release_Notes"><?php _e('Release notes')?></a></li>
                             <li><a href="https://wiki.mageia.org/en/Mageia_2_Errata">Errata</a>.</li>
                         </ul>
                         <br>
                         <br>
                         <?php _h('Upgrading<br>from Mageia 1?', null, 'h3')?>
                         <ul class="hl"><?php
-                            _e('<strong>do not</strong> use LiveCDs;', null, 'li');
-                            _e('see the <a href="%s" hreflang="en">upgrade guide</a>',
+                            _h('<strong>do not</strong> use LiveCDs;', null, 'li');
+                            _h('see the <a href="%s" hreflang="en">upgrade guide</a>',
                                 array('https://wiki.mageia.org/en/Mageia_2_Release_Notes#Upgrading_from_Mageia_1'), 'li');
                         ?></ul>
                         <br>
diff --git a/en/2/nav.php b/en/2/nav.php
index e64e9b6b8..c17e591b2 100644
--- a/en/2/nav.php
+++ b/en/2/nav.php
@@ -24,10 +24,10 @@ else
     $_nt = $_nt['en'];
 
 $nav = array(
-    "/{$locale}/2/"          => 'Mageia 2',
-    "/{$locale}/downloads/"  => 'Download',
-    "/{$locale}/for-pc/"     => 'For PC',
-    "/{$locale}/for-server/" => 'For server',
+    "/{$locale}/2/"          => _t('Mageia 2'),
+    "/{$locale}/downloads/"  => _t('Download'),
+    "/{$locale}/for-pc/"     => _t('For PC'),
+    "/{$locale}/for-server/" => _t('For server'),
 );
 
 $sru = trim($_SERVER['REQUEST_URI']);
diff --git a/langs/en/2.en.lang b/langs/en/2.en.lang
new file mode 100644
index 000000000..e62e657e4
--- /dev/null
+++ b/langs/en/2.en.lang
@@ -0,0 +1,165 @@
+# Generated by extract2lang.php on 2012-05-23T17:39:28+02:00
+# Domain 2
+
+# /en/2/download_index.php +18
+;Download Mageia 2
+Download Mageia 2
+
+
+# /en/2/download_index.php +19
+;Download Mageia 2 DVD, CD, LiveCD, network install ISO images.
+Download Mageia 2 DVD, CD, LiveCD, network install ISO images.
+
+
+# /en/2/download_index.php +20
+;mageia, mageia 2, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent
+mageia, mageia 2, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent
+
+
+# /en/2/download_index.php +28
+;Download <strong>Mageia 2</strong>
+Download <strong>Mageia 2</strong>
+
+
+# /en/2/download_index.php +35
+;Free Software Installation Flavours
+Free Software Installation Flavours
+
+
+# /en/2/download_index.php +40
+;size
+size
+
+
+# /en/2/download_index.php +41
+;link
+link
+
+
+# /en/2/download_index.php +69
+;Up to 167 locales are supported:
+Up to 167 locales are supported:
+
+
+# /en/2/download_index.php +72
+;and so much more!
+and so much more!
+
+
+# /en/2/download_index.php +73
+;See the comprehensive list
+See the comprehensive list
+
+
+# /en/2/download_index.php +75
+;These DVD and CD ISOs are made of Free Software exclusively.
+These DVD and CD ISOs are made of Free Software exclusively.
+
+
+# /en/2/download_index.php +76
+;As a consequence, <span class="warn">proprietary Wi-Fi and video drivers are not included.
+As a consequence, <span class="warn">proprietary Wi-Fi and video drivers are not included.
+
+
+# /en/2/download_index.php +77
+;If you need WiFi or specific video drivers <em>at install time</em>, you should go with below LiveCDs instead.</span>
+If you need WiFi or specific video drivers <em>at install time</em>, you should go with below LiveCDs instead.</span>
+
+
+# /en/2/download_index.php +78
+;You may, if you will, add nonfree software repository <em>after</em> the installation.
+You may, if you will, add nonfree software repository <em>after</em> the installation.
+
+
+# /en/2/download_index.php +81
+;Please note that there is a <span class="warn">problem with notebooks using Intel, AMD/ATI and nVidia graphic cards.</span>
+Please note that there is a <span class="warn">problem with notebooks using Intel, AMD/ATI and nVidia graphic cards.</span>
+
+
+# /en/2/download_index.php +83
+;See the errata about this
+See the errata about this
+
+
+# /en/2/download_index.php +90
+;Use LiveCDs for fresh new installs ONLY.
+Use LiveCDs for fresh new installs ONLY.
+
+
+# /en/2/download_index.php +91
+;DO NOT use those LiveCDs to upgrade from Mageia 1!
+DO NOT use those LiveCDs to upgrade from Mageia 1!
+
+
+# /en/2/download_index.php +109
+;Included locales:
+Included locales:
+
+
+# /en/2/download_index.php +167
+;Each download is approximately 700MB.
+Each download is approximately 700MB.
+
+
+# /en/2/download_index.php +171
+;Wired Network-based Installation CD
+Wired Network-based Installation CD
+
+
+# /en/2/download_index.php +172
+;Download quickly (about 40 MB) and immediately boot into install mode from <em>wired</em> network or a local disk.
+Download quickly (about 40 MB) and immediately boot into install mode from <em>wired</em> network or a local disk.
+
+
+# /en/2/download_index.php +183
+;Pure Free Software CD
+Pure Free Software CD
+
+
+# /en/2/download_index.php +188
+;Same + nonfree firmware
+Same + nonfree firmware
+
+
+# /en/2/download_index.php +189
+;needed for some disc controllers, some network cards, etc.
+needed for some disc controllers, some network cards, etc.
+
+
+# /en/2/download_index.php +202
+;May 22<sup>nd</sup> 2012
+May 22<sup>nd</sup> 2012
+
+
+# /en/2/download_index.php +204
+;Release notes
+Release notes
+
+
+# /en/2/download_index.php +209
+;Upgrading<br>from Mageia 1?
+Upgrading<br>from Mageia 1?
+
+
+# /en/2/download_index.php +211
+;<strong>do not</strong> use LiveCDs;
+<strong>do not</strong> use LiveCDs;
+
+
+# /en/2/download_index.php +218
+;Looking for Mageia 1?
+Looking for Mageia 1?
+
+
+# /en/2/download_index.php +219
+;It is <a href="%s">here now</a>.
+It is <a href="%s">here now</a>.
+
+;Download
+Download
+
+;For PC
+For PC
+
+;For server
+For server
+\ No newline at end of file
diff --git a/langs/fr/2.fr.lang b/langs/fr/2.fr.lang
new file mode 100644
index 000000000..6b1cd894d
--- /dev/null
+++ b/langs/fr/2.fr.lang
@@ -0,0 +1,108 @@
+# Generated by extract2lang.php on 2012-05-23T17:39:28+02:00
+# Domain 2
+
+;Download Mageia 2
+Télécharger Mageia 2
+
+;Download Mageia 2 DVD, CD, LiveCD, network install ISO images.
+Télécharger Mageia 2, en DVD, CD, LiveCD, image réseau.
+
+;mageia, mageia 2, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent
+télécharger, libre, gratuit, mageia, mageia 2, linux, free, iso, torrent, vm, http, ftp, rsync, bittorrent
+
+;Download <strong>Mageia 2</strong>
+Télécharger <strong>Mageia 2</strong>
+
+;Free Software Installation Flavours
+DVD et CD 100% Logiciel Libre
+
+;size
+Taille
+
+;link
+Lien
+
+;Up to 167 locales are supported:
+Jusqu&rsquo;à 167 langues incluses&nbsp;:
+
+;and so much more!
+et bien plus&nbsp;!
+
+;See the comprehensive list
+Voir toute la liste
+
+;These DVD and CD ISOs are made of Free Software exclusively.
+Ces DVD et CD ne contiennent <em>que</em> des logiciels libres.
+
+;As a consequence, <span class="warn">proprietary Wi-Fi and video drivers are not included.
+Par conséquence, <span class="warn">certains pilotes propriétaires (Wi-Fi, vidéo) ne sont pas inclus.
+
+;If you need WiFi or specific video drivers <em>at install time</em>, you should go with below LiveCDs instead.</span>
+Si vous avez besoin d&rsquo;utiliser le Wi-Fi ou des pilotes graphiques <em>lors de l&rsquo;installation</em>, vous devriez plutôt utiliser un LiveCD (plus bas).</span>
+
+;You may, if you will, add nonfree software repository <em>after</em> the installation.
+Vous pourrez, si vous le souhaitez, ajouter des dépôts nonfree/non-libre <em>après</em> l&rsquo;installation.
+
+;Please note that there is a <span class="warn">problem with notebooks using Intel, AMD/ATI and nVidia graphic cards.</span>
+Notez qu&rsquo;il y a un <span class="warn">problème avec les notebooks utilisant des cartes graphiques Intel, AMD/ATI ou nVidia.</span>
+
+;See the errata about this
+Consultez l&rsquo;errata à ce propos
+
+;Use LiveCDs for fresh new installs ONLY.
+N&rsquo;utilisez un LiveCD QUE pour une PREMIÈRE installation.
+
+;DO NOT use those LiveCDs to upgrade from Mageia 1!
+N&rsquo;en utilisez PAS pour faire une mise à jour depuis Mageia 1 vers Mageia 2.
+
+;Included locales:
+Langues inclues&nbsp;:
+
+;Each download is approximately 700MB.
+Chaque LiveCD fait environ 700&nbsp;Mo.
+
+;Wired Network-based Installation CD
+CD d&rsquo;installation réseau
+
+;Download quickly (about 40 MB) and immediately boot into install mode from <em>wired</em> network or a local disk.
+À télécharger rapidement (environ 40&nbsp;Mo) et démarrer directement en mode d&rsquo;installation depuis un réseau <em>filaire</em> ou un disque local.
+
+;Pure Free Software CD
+CD Pur Logiciel Libre
+
+# /en/2/download_index.php +188
+;Same + nonfree firmware
+Idem + firmware non-libre
+
+;needed for some disc controllers, some network cards, etc.
+nécessaire pour certaines cartes réseaux ou contrôleurs de disques, etc.
+
+;May 22<sup>nd</sup> 2012
+22 mai 2012
+
+;Release notes
+Notes de publication
+
+;Upgrading<br>from Mageia 1?
+Mise&nbsp;à&nbsp;jour<br>depuis Mageia&nbsp;1&nbsp;?
+
+;<strong>do not</strong> use LiveCDs;
+<strong>n&rsquo;utilisez pas</strong> de LiveCD;
+
+;see the <a href="%s" hreflang="en">upgrade guide</a>
+<a href="%s" hreflang="en">consultez le guide de migration</a>
+
+;Looking for Mageia 1?
+Vous chercher<br>Mageia&nbsp;1&nbsp;?
+
+;It is <a href="%s">here now</a>.
+<a href="%s">C&rsquo;est ici</a>.
+
+;Download
+Télécharger
+
+;For PC
+Pour PC
+
+;For server
+Pour serveur
author	Romain d'Alverny <rda@mageia.org>	2012-05-23 15:59:35 +0000
committer	Romain d'Alverny <rda@mageia.org>	2012-05-23 15:59:35 +0000
commit	f02fa2fa6c1670a87025da5066b6e6dfb910c4d0 (patch)
tree	db87ed2d7b2794af11365ce98a988def9c58b60b
parent	dee9caee8049c9705af6ca6587a4345eee0ab82f (diff)
download	www-f02fa2fa6c1670a87025da5066b6e6dfb910c4d0.tar www-f02fa2fa6c1670a87025da5066b6e6dfb910c4d0.tar.gz www-f02fa2fa6c1670a87025da5066b6e6dfb910c4d0.tar.bz2 www-f02fa2fa6c1670a87025da5066b6e6dfb910c4d0.tar.xz www-f02fa2fa6c1670a87025da5066b6e6dfb910c4d0.zip