all mga2 pages converted to gettext

3 files changed, 459 insertions, 536 deletions

diff --git a/langs/en/2.en.lang b/langs/en/2.en.lang
deleted file mode 100644
index a7e53e43d..000000000
--- a/langs/en/2.en.lang
+++ /dev/null
@@ -1,492 +0,0 @@
-# Generated by extract2lang.php on 2013-11-22T19:38:08+00:00
-# Domain 2
-# include translation strings from:
-# en/2/download_index.php
-# en/2/for-pc/index.php
-# en/2/for-server/index.php
-# en/2/index.php
-# en/2/nav.php
-
-# en/2/download_index.php +14
-;Download Mageia 2
-Download Mageia 2
-
-
-# en/2/download_index.php +15
-;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 +16
-;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 +24
-;Download <strong>Mageia 2</strong>
-Download <strong>Mageia 2</strong>
-
-
-# en/2/download_index.php +30
-;But please remember that it already <a href="https://blog.mageia.org/en/2013/11/21/farewell-mageia-2/">reached EOL</a>.
-But please remember that it already <a href="https://blog.mageia.org/en/2013/11/21/farewell-mageia-2/">reached EOL</a>.
-
-
-# en/2/download_index.php +31
-;Free Software Installation Flavours
-Free Software Installation Flavours
-
-
-# en/2/download_index.php +36
-;size
-size
-
-
-# en/2/download_index.php +37
-;link
-link
-
-
-# en/2/download_index.php +65
-;Up to 167 locales are supported:
-Up to 167 locales are supported:
-
-
-# en/2/download_index.php +68
-;and so much more!
-and so much more!
-
-
-# en/2/download_index.php +69
-;See the comprehensive list
-See the comprehensive list
-
-
-# en/2/download_index.php +71
-;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 +72
-;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 +73
-;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 +74
-;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 +77
-;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 +79
-;See the errata about this
-See the errata about this
-
-
-# en/2/download_index.php +86
-;Use LiveCDs for fresh new installs ONLY.
-Use LiveCDs for fresh new installs ONLY.
-
-
-# en/2/download_index.php +87
-;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 +88
-;Use above DVD or CD and see the <a href="%s" hreflang="en">upgrade guide</a>.
-Use above DVD or CD and see the <a href="%s" hreflang="en">upgrade guide</a>.
-
-
-# en/2/download_index.php +105
-;Included locales:
-Included locales:
-
-
-# en/2/download_index.php +163
-;Each download is approximately 700MB.
-Each download is approximately 700MB.
-
-
-# en/2/download_index.php +167
-;Wired Network-based Installation CD
-Wired Network-based Installation CD
-
-
-# en/2/download_index.php +168
-;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 +179
-;Pure Free Software CD
-Pure Free Software CD
-
-
-# en/2/download_index.php +184
-;Same + nonfree firmware
-Same + nonfree firmware
-
-
-# en/2/download_index.php +185
-;needed for some disc controllers, some network cards, etc.
-needed for some disc controllers, some network cards, etc.
-
-
-# en/2/download_index.php +198
-;May 22<sup>nd</sup> 2012
-May 22<sup>nd</sup> 2012
-
-
-# en/2/download_index.php +200
-;Release notes
-Release notes
-
-
-# en/2/download_index.php +201
-;Errata
-Errata
-
-
-# en/2/download_index.php +202
-;<a href="%s">Which to choose</a>
-<a href="%s">Which to choose</a>
-
-
-# en/2/download_index.php +203
-;<a href="%s">Get ISO on USB flash stick</a>
-<a href="%s">Get ISO on USB flash stick</a>
-
-
-# en/2/download_index.php +204
-;Newcomer? <a href="%s">Here's a wiki page for you.</a>
-Newcomer? <a href="%s">Here's a wiki page for you.</a>
-
-
-# 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 +212
-;see the <a href="%s" hreflang="en">upgrade guide</a>
-see the <a href="%s" hreflang="en">upgrade guide</a>
-
-
-# en/2/download_index.php +218
-;Looking for Mageia 1?
-Looking for Mageia 1?
-
-
-# en/2/download_index.php +220
-;It is <a href="%s">here now</a>.
-It is <a href="%s">here now</a>.
-
-
-# en/2/download_index.php +221
-;But please remember that it already <a href="https://blog.mageia.org/en/2012/12/02/mageia-1-eol/">reached EOL</a>.
-But please remember that it already <a href="https://blog.mageia.org/en/2012/12/02/mageia-1-eol/">reached EOL</a>.
-
-
-# en/2/for-pc/index.php +12
-;Mageia 2, for your PC
-Mageia 2, for your PC
-
-
-# en/2/for-pc/index.php +22
-;for your PC
-for your PC
-
-
-# en/2/for-pc/index.php +27
-;Plenty
-Plenty
-
-
-# en/2/for-pc/index.php +28
-;There are 19&nbsp;881&nbsp;packages in our repositories. And that's just for the 64-bit branch.
-There are 19&nbsp;881&nbsp;packages in our repositories. And that's just for the 64-bit branch.
-
-
-# en/2/for-pc/index.php +29
-;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.
-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.
-
-
-# en/2/for-pc/index.php +30
-;Here's a cross-section, first of the working graphical environments, and then of the core applications you could be using on your desktop:
-Here's a cross-section, first of the working graphical environments, and then of the core applications you could be using on your desktop:
-
-
-# en/2/for-pc/index.php +31
-;Environments
-Environments
-
-
-# en/2/for-pc/index.php +32
-;Mageia 2 has all the major desktop environments:
-Mageia 2 has all the major desktop environments:
-
-
-# en/2/for-pc/index.php +43
-;And then there are the window managers, including Openbox, WindowMaker, IceWM, Fluxbox, Fvwm2 and Awesome.
-And then there are the window managers, including Openbox, WindowMaker, IceWM, Fluxbox, Fvwm2 and Awesome.
-
-
-# en/2/for-pc/index.php +44
-;Applications &rarr;
-Applications &rarr;
-
-
-# en/2/for-pc/index.php +45
-;There are many, many to choose from &ndash; including all the most popular.
-There are many, many to choose from &ndash; including all the most popular.
-
-
-# en/2/for-pc/index.php +51
-;Web
-Web
-
-
-# en/2/for-pc/index.php +52
-;Choose your web browser from Firefox ESR 10.0.4, Chromium-browser 180.1025.160, Epiphany 3.4.1 or Opera 11.64 &ndash; or one of the many others such as Lynx or Konqueror; then pick an email client from KMail 4.8.2, Thunderbird ESR 10.0.4, Evolution 3.4.1 or maybe Claws-Mail or Mutt.
-Choose your web browser from Firefox ESR 10.0.4, Chromium-browser 180.1025.160, Epiphany 3.4.1 or Opera 11.64 &ndash; or one of the many others such as Lynx or Konqueror; then pick an email client from KMail 4.8.2, Thunderbird ESR 10.0.4, Evolution 3.4.1 or maybe Claws-Mail or Mutt.
-
-
-# en/2/for-pc/index.php +57
-;Messaging
-Messaging
-
-
-# en/2/for-pc/index.php +58
-;Choose from Kopete, Pidgin, Empathy or Kadu for instant messaging; use Quassel, Konversation, XChat-Gnome or KVIrc for IRC chat; try QuteCom or Ekiga (or even Skype) for VOIP.
-Choose from Kopete, Pidgin, Empathy or Kadu for instant messaging; use Quassel, Konversation, XChat-Gnome or KVIrc for IRC chat; try QuteCom or Ekiga (or even Skype) for VOIP.
-
-
-# en/2/for-pc/index.php +63
-;Office
-Office
-
-
-# en/2/for-pc/index.php +64
-;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.
-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.
-
-
-# en/2/for-pc/index.php +69
-;Image
-Image
-
-
-# en/2/for-pc/index.php +70
-;Use GIMP for powerful image manipulation, or Inkscape for vector drawing; Blender is there for serious animation. DigiKam or Showfoto will take care of your photos, talk to your camera and give you more basic image editing.
-Use GIMP for powerful image manipulation, or Inkscape for vector drawing; Blender is there for serious animation. DigiKam or Showfoto will take care of your photos, talk to your camera and give you more basic image editing.
-
-
-# en/2/for-pc/index.php +75
-;Sound
-Sound
-
-
-# en/2/for-pc/index.php +76
-;For playing audio files, choose from Amarok 2.5.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.
-For playing audio files, choose from Amarok 2.5.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.
-
-
-# en/2/for-pc/index.php +81
-;Video
-Video
-
-
-# en/2/for-pc/index.php +82
-;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.
-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.
-
-
-# en/2/for-pc/index.php +87
-;Plus
-Plus
-
-
-# en/2/for-pc/index.php +88
-;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.
-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.
-
-
-# en/2/for-pc/index.php +93
-;For more information about these and other packages, check the <a href="%s">Mageia 2 Release notes</a>.
-For more information about these and other packages, check the <a href="%s">Mageia 2 Release notes</a>.
-
-
-# en/2/for-pc/index.php +94
-;You can take a look at the <a href="%s">Mageia Application Database</a> to get a more complete list of Mageia packages.
-You can take a look at the <a href="%s">Mageia Application Database</a> to get a more complete list of Mageia packages.
-
-
-# en/2/for-server/index.php +12
-;Mageia 2, for your server
-Mageia 2, for your server
-
-
-# en/2/for-server/index.php +22
-;for your server
-for your server
-
-
-# en/2/for-server/index.php +27
-;Mageia 2 has all the main services and server packages you will need to run your server.
-Mageia 2 has all the main services and server packages you will need to run your server.
-
-
-# en/2/for-server/index.php +28
-;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 <a href="%s">Mageia App DB</a>.
-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 <a href="%s">Mageia App DB</a>.
-
-
-# en/2/for-server/index.php +31
-;Administration
-Administration
-
-
-# en/2/for-server/index.php +32
-;For centralised administration, we include puppet 2.7.11; we use it widely in <a href="%s">our own infrastructure</a>.
-For centralised administration, we include puppet 2.7.11; we use it widely in <a href="%s">our own infrastructure</a>.
-
-
-# en/2/for-server/index.php +35
-;The entire High Availability stack has been updated, and now includes drbd 8.3.11, Corosync 2.0.0 and Pacemaker 1.1.7.
-The entire High Availability stack has been updated, and now includes drbd 8.3.11, Corosync 2.0.0 and Pacemaker 1.1.7.
-
-
-# en/2/for-server/index.php +37
-;Databases
-Databases
-
-
-# en/2/for-server/index.php +38
-;Databases included are PostgreSQL 8.4.11; MariaDB, which replaces MySQL 5.5.23; BDB.
-Databases included are PostgreSQL 8.4.11; MariaDB, which replaces MySQL 5.5.23; BDB.
-
-
-# en/2/for-server/index.php +39
-;And there are NoSQL servers too: CouchDB 1.1.1, Redis 2.4.8, Cassandra 1.4.0, MongoDB 2.0.3.
-And there are NoSQL servers too: CouchDB 1.1.1, Redis 2.4.8, Cassandra 1.4.0, MongoDB 2.0.3.
-
-
-# en/2/for-server/index.php +41
-;Servers
-Servers
-
-
-# en/2/for-server/index.php +42
-;Web servers include Apache 2.2.22, Cherokee 1.2.101 and lighttpd 1.4.30.
-Web servers include Apache 2.2.22, Cherokee 1.2.101 and lighttpd 1.4.30.
-
-
-# en/2/for-server/index.php +43
-;For file and directory sharing and network printing on heterogeneous networks, we have Samba 3.6.5, OpenLDAP 2.4.29 and Cups 1.5.2.
-For file and directory sharing and network printing on heterogeneous networks, we have Samba 3.6.5, OpenLDAP 2.4.29 and Cups 1.5.2.
-
-
-# en/2/for-server/index.php +44
-;Mail servers included with Mageia 2 are Postfix 2.8.8, Cyrus-imapd 2.4.13 and Dovecot 1.2.17.
-Mail servers included with Mageia 2 are Postfix 2.8.8, Cyrus-imapd 2.4.13 and Dovecot 1.2.17.
-
-
-# en/2/for-server/index.php +50
-;For more information about these and other packages, check the <a href="https://wiki.mageia.org/en/Mageia_2_Release_Notes">Mageia 2 Release notes</a>.
-For more information about these and other packages, check the <a href="https://wiki.mageia.org/en/Mageia_2_Release_Notes">Mageia 2 Release notes</a>.
-
-
-# en/2/index.php +12
-;Mageia 2
-Mageia 2
-
-
-# en/2/index.php +14
-;Mageia 2 is the new, solid, stable Linux distribution from the Mageia project.
-Mageia 2 is the new, solid, stable Linux distribution from the Mageia project.
-
-
-# en/2/index.php +29
-;Mageia 2 is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>.
-Mageia 2 is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>.
-
-
-# en/2/index.php +32
-;What's new?
-What's new?
-
-
-# en/2/index.php +33
-;Too much to include here! See the <a href="https://wiki.mageia.org/en/Mageia_2_Release_Notes">release notes</a> for an extensive exposé.
-Too much to include here! See the <a href="https://wiki.mageia.org/en/Mageia_2_Release_Notes">release notes</a> for an extensive exposé.
-
-
-# en/2/index.php +34
-;<a href="../2/download_index.php" style="background: #1272B1; color: white; padding: 0.9em; margin: 1em; display: inline-block; text-shadow: 0 1px 6px #000; border-radius: 3px;">Download it right away!</a>
-<a href="../2/download_index.php" style="background: #1272B1; color: white; padding: 0.9em; margin: 1em; display: inline-block; text-shadow: 0 1px 6px #000; border-radius: 3px;">Download it right away!</a>
-
-
-# en/2/index.php +36
-;Mageia in context
-Mageia in context
-
-
-# en/2/index.php +37
-;Mageia is both a Community and a Linux Distribution, with Mageia 2 being our second release.
-Mageia is both a Community and a Linux Distribution, with Mageia 2 being our second release.
-
-
-# en/2/index.php +38
-;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>.
-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>.
-
-
-# en/2/index.php +41
-;Mageia 2 is supported by the <a href="../about/">Mageia.org nonprofit organisation</a>, which is governed by a body of recognized and elected contributors.
-Mageia 2 is supported by the <a href="../about/">Mageia.org nonprofit organisation</a>, which is governed by a body of recognized and elected contributors.
-
-
-# en/2/index.php +42
-;Mageia 2 has been made by more than 100 people from all around the world.
-Mageia 2 has been made by more than 100 people from all around the world.
-
-
-# en/2/index.php +44
-;Our work adds to the excellent work of the wider Linux and Free Software community. We aim to bring one of the best, most stable, reliable and enjoyable experience and platform we can make; for regular users, developers and businesses.
-Our work adds to the excellent work of the wider Linux and Free Software community. We aim to bring one of the best, most stable, reliable and enjoyable experience and platform we can make; for regular users, developers and businesses.
-
-
-# en/2/index.php +45
-;We welcome new contributors to any of the many different teams that go to make up Mageia the Community, and we encourage you to join us.
-We welcome new contributors to any of the many different teams that go to make up Mageia the Community, and we encourage you to join us.
-
-
-# en/2/nav.php +5
-;Download
-Download
-
-
-# en/2/nav.php +6
-;For PC
-For PC
-
-
-# en/2/nav.php +7
-;For server
-For server
diff --git a/langs/en/2.pot b/langs/en/2.pot
new file mode 100644
index 000000000..a45038530
--- /dev/null
+++ b/langs/en/2.pot
@@ -0,0 +1,415 @@
+# gettext catalog for 2 web page(s)
+# Copyright (C) 2014 - 2014 Mageia
+# This file is distributed under the same license as
+# the content of the corresponding web page(s).
+#
+# Generated by extract2gettext.php
+# Domain: 2
+#
+# include translation strings from:
+# en/2/download_index.php
+# en/2/for-pc/index.php
+# en/2/for-server/index.php
+# en/2/index.php
+# en/2/nav.php
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 2\n"
+"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
+"POT-Creation-Date: 2014-03-20 19:38:15+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: "/web/en/2/download_index.php +14"
+msgid "Download Mageia 2"
+msgstr ""
+
+#: "/web/en/2/download_index.php +15"
+msgid "Download Mageia 2 DVD, CD, LiveCD, network install ISO images."
+msgstr ""
+
+#: "/web/en/2/download_index.php +16"
+msgid "mageia, mageia 2, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent"
+msgstr ""
+
+#: "/web/en/2/download_index.php +24"
+msgid "Download <strong>Mageia 2</strong>"
+msgstr ""
+
+#: "/web/en/2/download_index.php +30"
+msgid "But please remember that it already <a href=\"https://blog.mageia.org/en/2013/11/21/farewell-mageia-2/\">reached EOL</a>."
+msgstr ""
+
+#: "/web/en/2/download_index.php +31"
+msgid "Free Software Installation Flavours"
+msgstr ""
+
+#: "/web/en/2/download_index.php +36"
+msgid "size"
+msgstr ""
+
+#: "/web/en/2/download_index.php +37"
+msgid "link"
+msgstr ""
+
+#: "/web/en/2/download_index.php +65"
+msgid "Up to 167 locales are supported:"
+msgstr ""
+
+#: "/web/en/2/download_index.php +68"
+msgid "and so much more!"
+msgstr ""
+
+#: "/web/en/2/download_index.php +69"
+msgid "See the comprehensive list"
+msgstr ""
+
+#: "/web/en/2/download_index.php +71"
+msgid "These DVD and CD ISOs are made of Free Software exclusively."
+msgstr ""
+
+#: "/web/en/2/download_index.php +72"
+msgid "As a consequence, <span class=\"warn\">proprietary Wi-Fi and video drivers are not included."
+msgstr ""
+
+#: "/web/en/2/download_index.php +73"
+msgid "If you need WiFi or specific video drivers <em>at install time</em>, you should go with below LiveCDs instead.</span>"
+msgstr ""
+
+#: "/web/en/2/download_index.php +74"
+msgid "You may, if you will, add nonfree software repository <em>after</em> the installation."
+msgstr ""
+
+#: "/web/en/2/download_index.php +77"
+msgid "Please note that there is a <span class=\"warn\">problem with notebooks using Intel, AMD/ATI and nVidia graphic cards.</span>"
+msgstr ""
+
+#: "/web/en/2/download_index.php +79"
+msgid "See the errata about this"
+msgstr ""
+
+#: "/web/en/2/download_index.php +86"
+msgid "Use LiveCDs for fresh new installs ONLY."
+msgstr ""
+
+#: "/web/en/2/download_index.php +87"
+msgid "DO NOT use those LiveCDs to upgrade from Mageia 1!"
+msgstr ""
+
+#: "/web/en/2/download_index.php +88"
+msgid "Use above DVD or CD and see the <a href=\"%s\" hreflang=\"en\">upgrade guide</a>."
+msgstr ""
+
+#: "/web/en/2/download_index.php +105"
+msgid "Included locales:"
+msgstr ""
+
+#: "/web/en/2/download_index.php +163"
+msgid "Each download is approximately 700MB."
+msgstr ""
+
+#: "/web/en/2/download_index.php +167"
+msgid "Wired Network-based Installation CD"
+msgstr ""
+
+#: "/web/en/2/download_index.php +168"
+msgid "Download quickly (about 40 MB) and immediately boot into install mode from <em>wired</em> network or a local disk."
+msgstr ""
+
+#: "/web/en/2/download_index.php +179"
+msgid "Pure Free Software CD"
+msgstr ""
+
+#: "/web/en/2/download_index.php +184"
+msgid "Same + nonfree firmware"
+msgstr ""
+
+#: "/web/en/2/download_index.php +185"
+msgid "needed for some disc controllers, some network cards, etc."
+msgstr ""
+
+#: "/web/en/2/download_index.php +198"
+msgid "May 22<sup>nd</sup> 2012"
+msgstr ""
+
+#: "/web/en/2/download_index.php +200"
+msgid "Release notes"
+msgstr ""
+
+#: "/web/en/2/download_index.php +201"
+msgid "Errata"
+msgstr ""
+
+#: "/web/en/2/download_index.php +202"
+msgid "<a href=\"%s\">Which to choose</a>"
+msgstr ""
+
+#: "/web/en/2/download_index.php +203"
+msgid "<a href=\"%s\">Get ISO on USB flash stick</a>"
+msgstr ""
+
+#: "/web/en/2/download_index.php +204"
+msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
+msgstr ""
+
+#: "/web/en/2/download_index.php +209"
+msgid "Upgrading<br>from Mageia 1?"
+msgstr ""
+
+#: "/web/en/2/download_index.php +211"
+msgid "<strong>do not</strong> use LiveCDs;"
+msgstr ""
+
+#: "/web/en/2/download_index.php +212"
+msgid "see the <a href=\"%s\" hreflang=\"en\">upgrade guide</a>"
+msgstr ""
+
+#: "/web/en/2/download_index.php +218"
+msgid "Looking for Mageia 1?"
+msgstr ""
+
+#: "/web/en/2/download_index.php +220"
+msgid "It is <a href=\"%s\">here now</a>."
+msgstr ""
+
+#: "/web/en/2/download_index.php +221"
+msgid "But please remember that it already <a href=\"https://blog.mageia.org/en/2012/12/02/mageia-1-eol/\">reached EOL</a>."
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +12"
+msgid "Mageia 2, for your PC"
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +22"
+msgid "for your PC"
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +27"
+msgid "Plenty"
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +28"
+msgid "There are 19&nbsp;881&nbsp;packages in our repositories. And that's just for the 64-bit branch."
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +29"
+msgid "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."
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +30"
+msgid "Here's a cross-section, first of the working graphical environments, and then of the core applications you could be using on your desktop:"
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +31"
+msgid "Environments"
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +32"
+msgid "Mageia 2 has all the major desktop environments:"
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +43"
+msgid "And then there are the window managers, including Openbox, WindowMaker, IceWM, Fluxbox, Fvwm2 and Awesome."
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +44"
+msgid "Applications &rarr;"
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +45"
+msgid "There are many, many to choose from &ndash; including all the most popular."
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +51"
+msgid "Web"
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +52"
+msgid "Choose your web browser from Firefox ESR 10.0.4, Chromium-browser 180.1025.160, Epiphany 3.4.1 or Opera 11.64 &ndash; or one of the many others such as Lynx or Konqueror; then pick an email client from KMail 4.8.2, Thunderbird ESR 10.0.4, Evolution 3.4.1 or maybe Claws-Mail or Mutt."
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +57"
+msgid "Messaging"
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +58"
+msgid "Choose from Kopete, Pidgin, Empathy or Kadu for instant messaging; use Quassel, Konversation, XChat-Gnome or KVIrc for IRC chat; try QuteCom or Ekiga (or even Skype) for VOIP."
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +63"
+msgid "Office"
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +64"
+msgid "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."
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +69"
+msgid "Image"
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +70"
+msgid "Use GIMP for powerful image manipulation, or Inkscape for vector drawing; Blender is there for serious animation. DigiKam or Showfoto will take care of your photos, talk to your camera and give you more basic image editing."
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +75"
+msgid "Sound"
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +76"
+msgid "For playing audio files, choose from Amarok 2.5.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."
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +81"
+msgid "Video"
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +82"
+msgid "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."
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +87"
+msgid "Plus"
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +88"
+msgid "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."
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +93"
+msgid "For more information about these and other packages, check the <a href=\"%s\">Mageia 2 Release notes</a>."
+msgstr ""
+
+#: "/web/en/2/for-pc/index.php +94"
+msgid "You can take a look at the <a href=\"%s\">Mageia Application Database</a> to get a more complete list of Mageia packages."
+msgstr ""
+
+#: "/web/en/2/for-server/index.php +12"
+msgid "Mageia 2, for your server"
+msgstr ""
+
+#: "/web/en/2/for-server/index.php +22"
+msgid "for your server"
+msgstr ""
+
+#: "/web/en/2/for-server/index.php +27"
+msgid "Mageia 2 has all the main services and server packages you will need to run your server."
+msgstr ""
+
+#: "/web/en/2/for-server/index.php +28"
+msgid "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 <a href=\"%s\">Mageia App DB</a>."
+msgstr ""
+
+#: "/web/en/2/for-server/index.php +31"
+msgid "Administration"
+msgstr ""
+
+#: "/web/en/2/for-server/index.php +32"
+msgid "For centralised administration, we include puppet 2.7.11; we use it widely in <a href=\"%s\">our own infrastructure</a>."
+msgstr ""
+
+#: "/web/en/2/for-server/index.php +35"
+msgid "The entire High Availability stack has been updated, and now includes drbd 8.3.11, Corosync 2.0.0 and Pacemaker 1.1.7."
+msgstr ""
+
+#: "/web/en/2/for-server/index.php +37"
+msgid "Databases"
+msgstr ""
+
+#: "/web/en/2/for-server/index.php +38"
+msgid "Databases included are PostgreSQL 8.4.11; MariaDB, which replaces MySQL 5.5.23; BDB."
+msgstr ""
+
+#: "/web/en/2/for-server/index.php +39"
+msgid "And there are NoSQL servers too: CouchDB 1.1.1, Redis 2.4.8, Cassandra 1.4.0, MongoDB 2.0.3."
+msgstr ""
+
+#: "/web/en/2/for-server/index.php +41"
+msgid "Servers"
+msgstr ""
+
+#: "/web/en/2/for-server/index.php +42"
+msgid "Web servers include Apache 2.2.22, Cherokee 1.2.101 and lighttpd 1.4.30."
+msgstr ""
+
+#: "/web/en/2/for-server/index.php +43"
+msgid "For file and directory sharing and network printing on heterogeneous networks, we have Samba 3.6.5, OpenLDAP 2.4.29 and Cups 1.5.2."
+msgstr ""
+
+#: "/web/en/2/for-server/index.php +44"
+msgid "Mail servers included with Mageia 2 are Postfix 2.8.8, Cyrus-imapd 2.4.13 and Dovecot 1.2.17."
+msgstr ""
+
+#: "/web/en/2/for-server/index.php +50"
+msgid "For more information about these and other packages, check the <a href=\"https://wiki.mageia.org/en/Mageia_2_Release_Notes\">Mageia 2 Release notes</a>."
+msgstr ""
+
+#: "/web/en/2/index.php +12"
+msgid "Mageia 2"
+msgstr ""
+
+#: "/web/en/2/index.php +14"
+msgid "Mageia 2 is the new, solid, stable Linux distribution from the Mageia project."
+msgstr ""
+
+#: "/web/en/2/index.php +29"
+msgid "Mageia 2 is a GNU/Linux distribution for your computer, released by the <a href=\"%s\">Mageia community</a>."
+msgstr ""
+
+#: "/web/en/2/index.php +32"
+msgid "What's new?"
+msgstr ""
+
+#: "/web/en/2/index.php +33"
+msgid "Too much to include here! See the <a href=\"https://wiki.mageia.org/en/Mageia_2_Release_Notes\">release notes</a> for an extensive exposé."
+msgstr ""
+
+#: "/web/en/2/index.php +34"
+msgid "<a href=\"../2/download_index.php\" style=\"background: #1272B1; color: white; padding: 0.9em; margin: 1em; display: inline-block; text-shadow: 0 1px 6px #000; border-radius: 3px;\">Download it right away!</a>"
+msgstr ""
+
+#: "/web/en/2/index.php +36"
+msgid "Mageia in context"
+msgstr ""
+
+#: "/web/en/2/index.php +37"
+msgid "Mageia is both a Community and a Linux Distribution, with Mageia 2 being our second release."
+msgstr ""
+
+#: "/web/en/2/index.php +38"
+msgid "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>."
+msgstr ""
+
+#: "/web/en/2/index.php +41"
+msgid "Mageia 2 is supported by the <a href=\"../about/\">Mageia.org nonprofit organisation</a>, which is governed by a body of recognized and elected contributors."
+msgstr ""
+
+#: "/web/en/2/index.php +42"
+msgid "Mageia 2 has been made by more than 100 people from all around the world."
+msgstr ""
+
+#: "/web/en/2/index.php +44"
+msgid "Our work adds to the excellent work of the wider Linux and Free Software community. We aim to bring one of the best, most stable, reliable and enjoyable experience and platform we can make; for regular users, developers and businesses."
+msgstr ""
+
+#: "/web/en/2/index.php +45"
+msgid "We welcome new contributors to any of the many different teams that go to make up Mageia the Community, and we encourage you to join us."
+msgstr ""
+
+#: "/web/en/2/nav.php +5"
+msgid "Download"
+msgstr ""
+
+#: "/web/en/2/nav.php +6"
+msgid "For PC"
+msgstr ""
+
+#: "/web/en/2/nav.php +7"
+msgid "For server"
+msgstr ""
diff --git a/langs/en/contribute.pot b/langs/en/contribute.pot
index 0d081df38..e539e0e96 100644
--- a/langs/en/contribute.pot
+++ b/langs/en/contribute.pot
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: contribute\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2014-03-19 19:13:24+0000\n"
+"POT-Creation-Date: 2014-03-20 18:32:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,174 +34,174 @@ msgstr ""
 msgid "mageia, contribute, howto, operating system"
 msgstr ""
 
-#: "/web/en/contribute/index.php +25"
+#: "/web/en/contribute/index.php +27"
 msgid "Many people from all over the world gather to build Mageia &ndash; a Linux-based operating system <em>and</em> a <a href=\"../about/code-of-conduct/\">lively, fun community</a> for <a href=\"../about/values/\">building Free Software projects</a>."
 msgstr ""
 
-#: "/web/en/contribute/index.php +26"
+#: "/web/en/contribute/index.php +28"
 msgid "Contributing is open to anyone, this is Free Software! If you are curious and willing to join, there are things you can do, depending on your time and skills; you will always find someone to welcome and help/mentor you if needed so that your contribution to the project can be as good as it can be!"
 msgstr ""
 
-#: "/web/en/contribute/index.php +27"
+#: "/web/en/contribute/index.php +29"
 msgid "Check what you could do below!"
 msgstr ""
 
-#: "/web/en/contribute/index.php +32"
+#: "/web/en/contribute/index.php +33"
 msgid "Time"
 msgstr ""
 
-#: "/web/en/contribute/index.php +33"
+#: "/web/en/contribute/index.php +34"
 msgid "How much free time do you have? and how much of it do you want to commit to Mageia? See what you can do:"
 msgstr ""
 
-#: "/web/en/contribute/index.php +36"
+#: "/web/en/contribute/index.php +37"
 msgid "A few minutes"
 msgstr ""
 
-#: "/web/en/contribute/index.php +38"
+#: "/web/en/contribute/index.php +39"
 msgid "Stop by the <a href=\"https://forums.mageia.org/\">forums</a> support section and check if you can answer a question."
 msgstr ""
 
-#: "/web/en/contribute/index.php +39"
+#: "/web/en/contribute/index.php +40"
 msgid "Talk about the project to people around you, on your blog, your Twitter account, at your work place."
 msgstr ""
 
-#: "/web/en/contribute/index.php +40"
+#: "/web/en/contribute/index.php +41"
 msgid "If you encounter a bug you can reproduce consistently, <a href=\"https://bugs.mageia.org/\">submit a bug report</a>."
 msgstr ""
 
-#: "/web/en/contribute/index.php +41"
+#: "/web/en/contribute/index.php +42"
 msgid "Make a <a href=\"../donate/\">donation</a>!"
 msgstr ""
 
-#: "/web/en/contribute/index.php +45"
+#: "/web/en/contribute/index.php +46"
 msgid "A few hours"
 msgstr ""
 
-#: "/web/en/contribute/index.php +47"
+#: "/web/en/contribute/index.php +48"
 msgid "Stop by a Mageia event, like a test day to find, reproduce and help resolve bugs."
 msgstr ""
 
-#: "/web/en/contribute/index.php +48"
+#: "/web/en/contribute/index.php +49"
 msgid "Subscribe to a team discussion list and follow what happens there, try to see how you can bring something useful to it."
 msgstr ""
 
-#: "/web/en/contribute/index.php +52"
+#: "/web/en/contribute/index.php +53"
 msgid "A few weeks or more"
 msgstr ""
 
-#: "/web/en/contribute/index.php +54"
+#: "/web/en/contribute/index.php +55"
 msgid "Learn about free software, open source collaboration in general, and Mageia in particular."
 msgstr ""
 
-#: "/web/en/contribute/index.php +55"
+#: "/web/en/contribute/index.php +56"
 msgid "If you are a student, consider talking to your tutor about participating into the project as part of your studies; you don't specifically need to be studying Computer Science to do so."
 msgstr ""
 
-#: "/web/en/contribute/index.php +63"
+#: "/web/en/contribute/index.php +64"
 msgid "Roles"
 msgstr ""
 
-#: "/web/en/contribute/index.php +66"
+#: "/web/en/contribute/index.php +67"
 msgid "Helping users &amp; advocating the project"
 msgstr ""
 
-#: "/web/en/contribute/index.php +67"
+#: "/web/en/contribute/index.php +68"
 msgid "Want to welcome and help new users or share tips with experienced ones? In <a href=\"https://wiki.mageia.org/en/IRC\">IRC channels</a>, <a href=\"https://forums.mageia.org/\">forums</a>, <a href=\"https://wiki.mageia.org/en/Mailing_lists\">mailing-lists</a>, local events? Just get in touch with us via one of these channels and share the fun!"
 msgstr ""
 
-#: "/web/en/contribute/index.php +70"
+#: "/web/en/contribute/index.php +71"
 msgid "Writing, copywriting and documenting"
 msgstr ""
 
-#: "/web/en/contribute/index.php +71"
+#: "/web/en/contribute/index.php +72"
 msgid "You have a taste for practical, clear, concise, proofread, nice writing? You like to take the challenge of explaining clearly complex ideas or systems and teaching others? You know how to mix form &amp; content to push the right message? Get in touch with our <a href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation team</a>!"
 msgstr ""
 
-#: "/web/en/contribute/index.php +74"
+#: "/web/en/contribute/index.php +75"
 msgid "Translating"
 msgstr ""
 
-#: "/web/en/contribute/index.php +75"
+#: "/web/en/contribute/index.php +76"
 msgid "Mageia is localized in more than 180 languages! Clarifying, completing, improving translations of software, guides, tutorials, Web sites, marketing material, etc. happens thanks to the effort of so many contributors. Join <a href=\"https://wiki.mageia.org/en/Internationalisation_Team_(i18n)\">them</a>!"
 msgstr ""
 
-#: "/web/en/contribute/index.php +78"
+#: "/web/en/contribute/index.php +79"
 msgid "Triaging"
 msgstr ""
 
-#: "/web/en/contribute/index.php +79"
+#: "/web/en/contribute/index.php +80"
 msgid "Bugs happen! And some get reported. So, logically they need to be triaged to make the task of the packagers/developers fixing them easier: validation (is the bug reproducible?), collecting the needed debugging info from the reporter, assigning the report properly. <a href=\"https://wiki.mageia.org/en/Bug_Squad\">Grow the Triage team</a> and be the link between users who report bugs in the forums or mailing-lists, and the <a href=\"https://bugs.mageia.org/\">Mageia Bugzilla</a> used by developers."
 msgstr ""
 
-#: "/web/en/contribute/index.php +82"
+#: "/web/en/contribute/index.php +83"
 msgid "Testing &amp; <abbr title=\"Quality Assurance\">QA</abbr>"
 msgstr ""
 
-#: "/web/en/contribute/index.php +83"
+#: "/web/en/contribute/index.php +84"
 msgid "We can't ship software if we are not confident it works well! <a href=\"https://wiki.mageia.org/en/QA_Team\">Testers and QA</a> people make sure what we do (software, packages, ISO's, Web sites) match our expectations for quality before they reach users."
 msgstr ""
 
-#: "/web/en/contribute/index.php +86"
+#: "/web/en/contribute/index.php +87"
 msgid "Marketing, Communication &amp; Evangelism"
 msgstr ""
 
-#: "/web/en/contribute/index.php +87"
+#: "/web/en/contribute/index.php +88"
 msgid "Better understanding of who uses and contributes to the project to help them even more, making sure the Mageia voice is consistent and heard, that's a job for the <a href=\"https://wiki.mageia.org/en/Marcom_Team\">marcomm team</a> (Marketing and Communication), on both global and local scales."
 msgstr ""
 
-#: "/web/en/contribute/index.php +90"
+#: "/web/en/contribute/index.php +91"
 msgid "Graphic &amp; UI design"
 msgstr ""
 
-#: "/web/en/contribute/index.php +91"
+#: "/web/en/contribute/index.php +92"
 msgid "Software isn't only about code neither is Mageia only about technology. So make it human, practical and beautiful! If you have a talent and experience in graphic design, ergonomics <a href=\"https://wiki.mageia.org/en/Artwork_team\">join the artwork team</a>!"
 msgstr ""
 
-#: "/web/en/contribute/index.php +94"
+#: "/web/en/contribute/index.php +95"
 msgid "Coding &amp; packaging"
 msgstr ""
 
-#: "/web/en/contribute/index.php +95"
+#: "/web/en/contribute/index.php +96"
 msgid "Contribute to the core of the distribution with your technical skills! Adding, fixing, patching and maintaining software to be included in the distribution, from upstream projects or from Mageia-specific sources. Join the <a href=\"https://wiki.mageia.org/en/Packagers_Team\">Packagers team</a>!"
 msgstr ""
 
-#: "/web/en/contribute/index.php +98"
+#: "/web/en/contribute/index.php +99"
 msgid "Web, tools, systems design &amp; administration"
 msgstr ""
 
-#: "/web/en/contribute/index.php +99"
+#: "/web/en/contribute/index.php +100"
 msgid "Mageia depends on infrastructure and tools that enable everyone to collaborate. These need experts to build, maintain, develop, provide and manage servers, connections, security, applications, data flow, etc. It takes from <a href=\"https://wiki.mageia.org/en/Sysadmin_Team\">system administrators</a> to <a href=\"https://wiki.mageia.org/en/Web_team\">Web designers/developers/integrators</a> to manage this huge task."
 msgstr ""
 
-#: "/web/en/contribute/index.php +102"
+#: "/web/en/contribute/index.php +103"
 msgid "Mirroring"
 msgstr ""
 
-#: "/web/en/contribute/index.php +103"
+#: "/web/en/contribute/index.php +104"
 msgid "Making all the software provided by Mageia available requires <a href=\"https://mirrors.mageia.org/\">several mirrors around the world</a>, to distribute ISO's and software packages. If you have some disk space and bandwidth to share, please <a href=\"https://wiki.mageia.org/en/Mirrors_policy#How_to_.28become_a.29_mirror.3F\">see how you can provide an official Mageia mirror</a>."
 msgstr ""
 
-#: "/web/en/contribute/index.php +106"
+#: "/web/en/contribute/index.php +107"
 msgid "Donating"
 msgstr ""
 
-#: "/web/en/contribute/index.php +107"
+#: "/web/en/contribute/index.php +108"
 msgid "Financial donations help us allocate specific tasks, secure our infrastructure, fund events, goodies &amp; transportation. <a href=\"../thank-you/\">200+ persons already expressed their trust in us</a> with their money, hardware or other resources. We keep a <a href=\"../about/reports/\">public record of what we get and how we use it</a>."
 msgstr ""
 
-#: "/web/en/contribute/index.php +110"
+#: "/web/en/contribute/index.php +111"
 msgid "Data mining"
 msgstr ""
 
-#: "/web/en/contribute/index.php +111"
+#: "/web/en/contribute/index.php +112"
 msgid "There are tons of data out there, most of which we don't use, or even know about. If you like to grab and analyze data to reveal &amp; visualize it to spot what we can do even better, get in touch!"
 msgstr ""
 
-#: "/web/en/contribute/index.php +114"
+#: "/web/en/contribute/index.php +115"
 msgid "Designing, experimenting, revealing the unknown"
 msgstr ""
 
-#: "/web/en/contribute/index.php +115"
+#: "/web/en/contribute/index.php +116"
 msgid "Ideas are great, actionable prototypes are even better. The Mageia project is not only about making a different Linux distribution but also about building new products and experiences with it and with the data around it."
 msgstr ""