added new strings

2 files changed, 195 insertions, 38 deletions

diff --git a/langs/en/2.en.lang b/langs/en/2.en.lang
index e62e657e4..2598e6ef4 100644
--- a/langs/en/2.en.lang
+++ b/langs/en/2.en.lang
@@ -1,165 +1,274 @@
-# Generated by extract2lang.php on 2012-05-23T17:39:28+02:00
+# Generated by extract2lang.php on 2012-05-24T17:40:35+02:00
 # Domain 2
 
-# /en/2/download_index.php +18
+# en/2/download_index.php +14
 ;Download Mageia 2
 Download Mageia 2
 
 
-# /en/2/download_index.php +19
+# 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 +20
+# 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 +28
+# en/2/download_index.php +24
 ;Download <strong>Mageia 2</strong>
 Download <strong>Mageia 2</strong>
 
 
-# /en/2/download_index.php +35
+# en/2/download_index.php +31
 ;Free Software Installation Flavours
 Free Software Installation Flavours
 
 
-# /en/2/download_index.php +40
+# en/2/download_index.php +36
 ;size
 size
 
 
-# /en/2/download_index.php +41
+# en/2/download_index.php +37
 ;link
 link
 
 
-# /en/2/download_index.php +69
+# en/2/download_index.php +65
 ;Up to 167 locales are supported:
 Up to 167 locales are supported:
 
 
-# /en/2/download_index.php +72
+# en/2/download_index.php +68
 ;and so much more!
 and so much more!
 
 
-# /en/2/download_index.php +73
+# en/2/download_index.php +69
 ;See the comprehensive list
 See the comprehensive list
 
 
-# /en/2/download_index.php +75
+# 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 +76
+# 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 +77
+# 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 +78
+# 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 +81
+# 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 +83
+# en/2/download_index.php +79
 ;See the errata about this
 See the errata about this
 
 
-# /en/2/download_index.php +90
+# 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 +91
+# 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 +109
+# en/2/download_index.php +105
 ;Included locales:
 Included locales:
 
 
-# /en/2/download_index.php +167
+# en/2/download_index.php +163
 ;Each download is approximately 700MB.
 Each download is approximately 700MB.
 
 
-# /en/2/download_index.php +171
+# en/2/download_index.php +167
 ;Wired Network-based Installation CD
 Wired Network-based Installation CD
 
 
-# /en/2/download_index.php +172
+# 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 +183
+# en/2/download_index.php +179
 ;Pure Free Software CD
 Pure Free Software CD
 
 
-# /en/2/download_index.php +188
+# en/2/download_index.php +184
 ;Same + nonfree firmware
 Same + nonfree firmware
 
 
-# /en/2/download_index.php +189
+# 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 +202
+# en/2/download_index.php +198
 ;May 22<sup>nd</sup> 2012
 May 22<sup>nd</sup> 2012
 
 
-# /en/2/download_index.php +204
+# en/2/download_index.php +200
 ;Release notes
 Release notes
 
 
-# /en/2/download_index.php +209
+# en/2/download_index.php +205
 ;Upgrading<br>from Mageia 1?
 Upgrading<br>from Mageia 1?
 
 
-# /en/2/download_index.php +211
+# en/2/download_index.php +207
 ;<strong>do not</strong> use LiveCDs;
 <strong>do not</strong> use LiveCDs;
 
 
-# /en/2/download_index.php +218
+# en/2/download_index.php +214
 ;Looking for Mageia 1?
 Looking for Mageia 1?
 
 
-# /en/2/download_index.php +219
+# en/2/download_index.php +215
 ;It is <a href="%s">here now</a>.
 It is <a href="%s">here now</a>.
 
-;Download
-Download
 
-;For PC
-For PC
+# en/for-pc/index.php +12
+;page_title
+page_title
 
-;For server
-For server
\ No newline at end of file
+
+# en/for-server/index.php +21
+;for your server
+for your server
+
+
+# en/for-server/index.php +26
+;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/for-server/index.php +30
+;Administration
+Administration
+
+
+# en/for-server/index.php +34
+;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/for-server/index.php +36
+;Databases
+Databases
+
+
+# en/for-server/index.php +37
+;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/for-server/index.php +38
+;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/for-server/index.php +40
+;Servers
+Servers
+
+
+# en/for-server/index.php +41
+;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/for-server/index.php +42
+;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/for-server/index.php +43
+;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/for-server/index.php +49
+;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 +14
+;Mageia 2
+Mageia 2
+
+
+# en/2/index.php +16
+;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 +35
+;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 +37
+;<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;">Download it right away!</a>
+<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;">Download it right away!</a>
+
+
+# en/2/index.php +39
+;Mageia in context
+Mageia in context
+
+
+# en/2/index.php +41
+;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 +46
+;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 +47
+;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 +49
+;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 +51
+;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.
+
+;What's new?
+What's new?
\ No newline at end of file
diff --git a/langs/fr/2.fr.lang b/langs/fr/2.fr.lang
index 6b1cd894d..72b2f22d8 100644
--- a/langs/fr/2.fr.lang
+++ b/langs/fr/2.fr.lang
@@ -106,3 +106,51 @@ Pour PC
 
 ;For server
 Pour serveur
+
+;for your server
+Pour vos serveurs
+
+;Mageia 2 has all the main services and server packages you will need to run your server.
+
+;Administration
+Administration
+
+;The entire High Availability stack has been updated, and now includes drbd 8.3.11, Corosync 2.0.0 and Pacemaker 1.1.7.
+
+
+;Databases
+Bases de données
+
+;Databases included are PostgreSQL 8.4.11; MariaDB, which replaces MySQL 5.5.23; BDB .
+
+;And there are NoSQL servers too: CouchDB 1.1.1, Redis 2.4.8, Cassandra 1.4.0, MongoDB 2.0.3.
+
+;Servers
+Serveurs
+
+;Web servers include Apache 2.2.22, Cherokee 1.2.101 and lighttpd 1.4.30.
+Parmi les serveurs Web se comptent Apache 2.2.22, Cherokee 1.2.101, lighttpd 1.4.30.
+
+;Mageia in context
+Mageia en contexte
+
+;Mageia is both a Community and a Linux Distribution, with Mageia 2 being our second release.
+Mageia est à la fois une communauté et une distribution Linux. Mageia 2 est notre seconde version majeure.
+
+;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 est soutenue par <a href="../about/">l&rsquo;association Mageia.org</a>, gouvernée par des contributeurs élus.
+
+;Mageia 2 has been made by more than 100 people from all around the world.
+Mageia 2 a été réalisée par plus de 100&nbsp;personnes du monde entier.
+
+;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.
+
+;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.
+
+;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é.
+
+;What's new?
+Quoi de neuf&nbsp;?
\ No newline at end of file