From e2bfdf0388a447336d669c68cec6f3a3674e9a6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?=
Date: Sun, 19 May 2013 14:59:45 +0000
Subject: Updating 3.en.lang. Fixing some php strings so that the
extract2lang.php script can work them out (namely changing escaped single
quotes to html '). Some translations may need to be adapted.
---
en/3/download_index.php | 6 +-
en/3/index.php | 14 +-
en/3/nav.php | 4 +-
en/for-pc/index.php | 14 +-
en/for-server/index.php | 9 +-
langs/en/3.en.lang | 388 +++++++++++++++++++++++++++++++++++++-----------
langs/fr/3.fr.lang | 381 ++++++++++++-----------------------------------
tools/extract2lang.php | 2 +-
8 files changed, 417 insertions(+), 401 deletions(-)
diff --git a/en/3/download_index.php b/en/3/download_index.php
index 9c23293c8..64d4ee8f1 100755
--- a/en/3/download_index.php
+++ b/en/3/download_index.php
@@ -80,8 +80,7 @@ require '../downloads/get/lib.php';
- upgrade guide.',
- array('https://wiki.mageia.org/en/Mageia_3_Release_Notes#Upgrading_from_Mageia_2'));?>
+ upgrade guide.', array('https://wiki.mageia.org/en/Mageia_3_Release_Notes#Upgrading_from_Mageia_2'));?>
@@ -174,8 +173,7 @@ require '../downloads/get/lib.php';
from Mageia 2?', null, 'h3')?>
do not use LiveCDs;', null, 'li');
- _h('see the upgrade guide',
- array('https://wiki.mageia.org/en/Mageia_3_Release_Notes#Upgrading_from_Mageia_2'), 'li');
+ _h('see the upgrade guide', array('https://wiki.mageia.org/en/Mageia_3_Release_Notes#Upgrading_from_Mageia_2'), 'li');
?>
diff --git a/en/3/index.php b/en/3/index.php
index 7596d4e78..057aff183 100644
--- a/en/3/index.php
+++ b/en/3/index.php
@@ -26,17 +26,17 @@ _lang_load($locale, '3');
Mageia community.',
- array('../community'));
+ _h('Mageia 3 is a GNU/Linux distribution for your computer, released by the Mageia community.', array('../community'));
- _h("What's new?", null, 'h2');
+ _h('What's new?', null, 'h2');
_h('Too much to include here! See the release notes for an extensive exposé.');
- _h('Download it right away!');
-
+ #_h('Download it right away!');
+ ?>
+
+ Mageia 1, our offering has been consistently in the top 10 of Distrowatch\'s most popular distributions.',
- array('http://distrowatch.com/popularity'));
+ _h('Since the release of Mageia 1, our offering has been consistently in the top 10 of Distrowatch's most popular distributions.', array('http://distrowatch.com/popularity'));
_h('Mageia 3 is supported by the Mageia.org nonprofit organisation, which is governed by a body of recognized and elected contributors.');
_h('Mageia 3 has been made by more than 100 people from all around the world.');
diff --git a/en/3/nav.php b/en/3/nav.php
index 2b7e4628e..940667a8a 100644
--- a/en/3/nav.php
+++ b/en/3/nav.php
@@ -23,8 +23,8 @@ if (array_key_exists($locale, $_nt))
else
$_nt = $_nt['en'];
-$nav = array(
- "/{$locale}/3/" => _t('Mageia 3'),
+$nav = array(
+ "/{$locale}/3/" => _t('Mageia 3'),
"/{$locale}/downloads/" => _t('Download'),
"/{$locale}/for-pc/" => _t('For PC'),
"/{$locale}/for-server/" => _t('For server'),
diff --git a/en/for-pc/index.php b/en/for-pc/index.php
index b05ceaa29..24a3963d4 100644
--- a/en/for-pc/index.php
+++ b/en/for-pc/index.php
@@ -25,9 +25,9 @@ _lang_load($locale, '3');
@@ -61,7 +61,7 @@ _lang_load($locale, '3');
@@ -73,19 +73,19 @@ _lang_load($locale, '3');
diff --git a/en/for-server/index.php b/en/for-server/index.php
index 44a145db7..30dec3d97 100644
--- a/en/for-server/index.php
+++ b/en/for-server/index.php
@@ -25,12 +25,10 @@ _lang_load($locale, '3');
Mageia App DB.',
- array('http://mageia.madb.org'));
+ _h('Aside from the cross-section included here, you will find many others in the repositories: you can use rpmdrake to search for packages, or check the Mageia App DB.', array('http://mageia.madb.org'));
_h('Administration', null, 'h3');
- _h('For centralised administration, we include puppet 2.7.21; we use it widely in our own infrastructure.',
- array('http://svnweb.mageia.org/adm/puppet/'));
+ _h('For centralised administration, we include puppet 2.7.21; we use it widely in our own infrastructure.', array('http://svnweb.mageia.org/adm/puppet/'));
_h('The entire High Availability stack has been updated, and now includes drbd 8.4.2, Corosync 2.3.0 and Pacemaker 1.1.8.');
@@ -48,8 +46,7 @@ _lang_load($locale, '3');
Mageia 3 Release notes.');
- _h('You can take a look at the
Mageia Application Database to get a more complete list of Mageia packages.',
- array('http://mageia.madb.org/'));
+ _h('You can take a look at the
Mageia Application Database to get a more complete list of Mageia packages.', array('http://mageia.madb.org/'));
?>