aboutsummaryrefslogtreecommitdiffstats
path: root/en
diff options
context:
space:
mode:
Diffstat (limited to 'en')
-rw-r--r--en/3/index.php4
-rw-r--r--en/for-pc/index.php14
2 files changed, 9 insertions, 9 deletions
diff --git a/en/3/index.php b/en/3/index.php
index 465d5d2ab..5630fb6cc 100644
--- a/en/3/index.php
+++ b/en/3/index.php
@@ -28,14 +28,14 @@ _lang_load($locale, '3');
<?php
_h('Mageia 3 is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>.', array('../community'));
- _h('What&#39;s new?', null, 'h2');
+ _h('What\'s new?', null, 'h2');
_h('Too much to include here! See the <a href="https://wiki.mageia.org/en/Mageia_3_Release_Notes">release notes</a> for an extensive exposé.');
?>
<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 _h('Download it right away!');?></a>
<?php
_h('Mageia in context', null, 'h2');
_h('Mageia is both a Community and a Linux Distribution, with Mageia 3 being our third release.');
- _h('Since the release of <a href="../1/">Mageia 1</a>, our offering has been consistently in the <a href="%s">top 10 of Distrowatch&#39;s most popular distributions</a>.', array('http://distrowatch.com/popularity'));
+ _h('Since the release of <a href="../1/">Mageia 1</a>, our offering has been consistently in the <a href="%s">top 10 of Distrowatch\'s most popular distributions</a>.', array('http://distrowatch.com/popularity'));
_h('Mageia 3 is supported by the <a href="../about/">Mageia.org nonprofit organisation</a>, 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/for-pc/index.php b/en/for-pc/index.php
index 24a3963d4..b05ceaa29 100644
--- a/en/for-pc/index.php
+++ b/en/for-pc/index.php
@@ -25,9 +25,9 @@ _lang_load($locale, '3');
<section>
<?php
_h('Plenty', null, 'h2');
- _h('There are more than 21&nbsp;700&nbsp;packages in our repositories. And that&#39;s just for the 64-bit branch.');
- _h('The total number is double that &ndash; and then if you consider the backports, and the packages in the Cauldron still testing... you&#39;ll see that Mageia users are spoiled for choice.');
- _h('Here&#39;s a cross-section, first of the working graphical environments, and then of the core applications you could be using on your desktop:');
+ _h('There are more than 21&nbsp;700&nbsp;packages in our repositories. And that\'s just for the 64-bit branch.');
+ _h('The total number is double that &ndash; and then if you consider the backports, and the packages in the Cauldron still testing... you\'ll see that Mageia users are spoiled for choice.');
+ _h('Here\'s a cross-section, first of the working graphical environments, and then of the core applications you could be using on your desktop:');
_h('Environments', null, 'h2');
_h('Mageia 3 has all the major desktop environments:');
?>
@@ -61,7 +61,7 @@ _lang_load($locale, '3');
<div class="para" style="width: 300px">
<?php
_h('Office', null, 'h3');
- _h('The two full-featured office suites LibreOffice and Calligra are there, as well as AbiWord, and a host of text editors including Kate; for finance there&#39;s KMyMoney, Skrooge or the professional-level GnuCash.');
+ _h('The two full-featured office suites LibreOffice and Calligra are there, as well as AbiWord, and a host of text editors including Kate; for finance there\'s KMyMoney, Skrooge or the professional-level GnuCash.');
?>
</div>
<div class="para" style="width: 300px">
@@ -73,19 +73,19 @@ _lang_load($locale, '3');
<div class="para" style="width: 300px">
<?php
_h('Sound', null, 'h3');
- _h('For playing audio files, choose from Amarok 2.7.0 and Rhythmbox, among others; use VLC, Totem or MPlayer for video and for audio, or use the XBMC Media Center as your home entertainment system. Some packages can be found in both the Core and Tainted repositories: the packages in the Core repository support only non-patent-encumbered codecs and the packages in the Tainted repository support all codecs, for users who live in countries where those codecs don&#39;t infringe local laws.');
+ _h('For playing audio files, choose from Amarok 2.7.0 and Rhythmbox, among others; use VLC, Totem or MPlayer for video and for audio, or use the XBMC Media Center as your home entertainment system. Some packages can be found in both the Core and Tainted repositories: the packages in the Core repository support only non-patent-encumbered codecs and the packages in the Tainted repository support all codecs, for users who live in countries where those codecs don\'t infringe local laws.');
?>
</div>
<div class="para" style="width: 300px">
<?php
_h('Video', null, 'h3');
- _h('For editing video files, try Avidemux, Kino or OpenShot; for subtitles, there&#39;s Gaupol or Subtitles Composer; use MythTV, Miro, tvtime, FreetuxTV or Me TV for watching or recording TV programmes.');
+ _h('For editing video files, try Avidemux, Kino or OpenShot; for subtitles, there\'s Gaupol or Subtitles Composer; use MythTV, Miro, tvtime, FreetuxTV or Me TV for watching or recording TV programmes.');
?>
</div>
<div class="para" style="width: 300px">
<?php
_h('Plus', null, 'h3');
- _h('Then there&#39;s ZoneMinder, for CCTV Security; VirtualBox or WINE for virtualisation; and a range of development environments such as Anjuta, Eclipse, Netbeans or KDevelop.');
+ _h('Then there\'s ZoneMinder, for CCTV Security; VirtualBox or WINE for virtualisation; and a range of development environments such as Anjuta, Eclipse, Netbeans or KDevelop.');
?>
</div>
<div class="para">