reworked contact page

2 files changed, 138 insertions, 69 deletions

diff --git a/langs/en/contact.en.lang b/langs/en/contact.en.lang
index e30fe84a5..bd6bfe4fe 100644
--- a/langs/en/contact.en.lang
+++ b/langs/en/contact.en.lang
@@ -1,4 +1,4 @@
-# Generated by extract2lang.php on 2013-06-02T13:32:45+02:00
+# Generated by extract2lang.php on 2013-11-30T23:32:48+00:00
 # Domain contact
 # include translation strings from:
 # en/contact/index.php
@@ -24,85 +24,120 @@ You are looking for support
 
 
 # en/contact/index.php +25
-;Please check our <a href="https://forums.mageia.org/">forum</a> or our <a href="https://wiki.mageia.org/" hreflang="en">wiki</a>.
-Please check our <a href="https://forums.mageia.org/">forum</a> or our <a href="https://wiki.mageia.org/" hreflang="en">wiki</a>.
+;Search on:
+Search on:
+
+
+# en/contact/index.php +26
+;Our <a href="%s">wiki</a>
+Our <a href="%s">wiki</a>
 
 
 # en/contact/index.php +27
-;You would like to report an issue
-You would like to report an issue
+;In the End user <a href="%s">doc</a>
+In the End user <a href="%s">doc</a>
 
 
-# en/contact/index.php +28
-;Please see <a href="%s" hreflang="en">how to report an issue in our bugs database</a>.
-Please see <a href="%s" hreflang="en">how to report an issue in our bugs database</a>.
+# en/contact/index.php +29
+;Discuss with other users via:
+Discuss with other users via:
+
+
+# en/contact/index.php +30
+;The <a href="%s">forum</a>
+The <a href="%s">forum</a>
+
+
+# en/contact/index.php +31
+;User <a href="%s">mailing list</a>
+User <a href="%s">mailing list</a>
 
 
 # en/contact/index.php +32
-;You are not sure who to contact
-You are not sure who to contact
+;<a href="%s">IRC</a> channel
+<a href="%s>IRC</a> channel
 
 
-# en/contact/index.php +36
-;For generic contact information.
-For generic contact information.
+# en/contact/index.php +33
+;The <a href="%s">Google Plus</a> community
+The <a href="%s">Google Plus</a> community
 
 
-# en/contact/index.php +40
-;For press inquiries.
-For press inquiries.
+# en/contact/index.php +36
+;You would like to report an issue
+You would like to report an issue
 
 
-# en/contact/index.php +44
-;You may as well try to reach us on <a href="%s">#mageia on Freenode IRC</a>.
-You may as well try to reach us on <a href="%s">#mageia on Freenode IRC</a>.
+# en/contact/index.php +37
+;Please see <a href="%s" hreflang="en">how to report an issue in our bugs database</a>.
+Please see <a href="%s" hreflang="en">how to report an issue in our bugs database</a>.
 
 
-# en/contact/index.php +54
+# en/contact/index.php +44
 ;You have an idea of whom to contact
 You have an idea of whom to contact
 
 
-# en/contact/index.php +56
+# en/contact/index.php +46
 ;Use <a href="%s">the discuss mailing list</a> or <a href="%s">the forums</a> for general Mageia discussions
 Use <a href="%s">the discuss mailing list</a> or <a href="%s">the forums</a> for general Mageia discussions
 
 
-# en/contact/index.php +57
+# en/contact/index.php +47
 ;Use <a href="%s">the dev mailing list</a> for Mageia development discussions
 Use <a href="%s">the dev mailing list</a> for Mageia development discussions
 
 
-# en/contact/index.php +58
+# en/contact/index.php +48
 ;Use one of <a href="https://wiki.mageia.org/en/Mailing_lists">the other mailing lists</a> for discussions on other topics
 Use one of <a href="https://wiki.mageia.org/en/Mailing_lists">the other mailing lists</a> for discussions on other topics
 
 
-# en/contact/index.php +59
+# en/contact/index.php +49
 ;Contact <a href="%s">the treasurer</a> for donation questions
 Contact <a href="%s">the treasurer</a> for donation questions
 
 
-# en/contact/index.php +60
+# en/contact/index.php +50
 ;Contact <a href="%s">the sysadmin team</a> for questions about mirrors, problems with your <a href="%s">Mageia identity account</a>, or other problems with Mageia infrastructure (there is also a public <a href="%s">sysadmin-discuss mailing list</a> if your question does not need to be private)
 Contact <a href="%s">the sysadmin team</a> for questions about mirrors, problems with your <a href="%s">Mageia identity account</a>, or other problems with Mageia infrastructure (there is also a public <a href="%s">sysadmin-discuss mailing list</a> if your question does not need to be private)
 
 
-# en/contact/index.php +61
+# en/contact/index.php +51
 ;If you want to contact Council or Board for a public discussion, you can start a thread on a mailing-list and add the <a href="%s">Board</a> or <a href="%s">Council</a> alias in CC.
 If you want to contact Council or Board for a public discussion, you can start a thread on a mailing-list and add the <a href="%s">Board</a> or <a href="%s">Council</a> alias in CC.
 
 
-# en/contact/index.php +64
+# en/contact/index.php +54
 ;In most cases you should avoid sending private emails and use appropriate <a href="%s">public mailing list</a> when possible.
 In most cases you should avoid sending private emails and use appropriate <a href="%s">public mailing list</a> when possible.
 
 
-# en/contact/index.php +68
+# en/contact/index.php +58
 ;You want to join and contribute to Mageia
 You want to join and contribute to Mageia
 
 
-# en/contact/index.php +69
+# en/contact/index.php +59
 ;Please see <a href="%s">our Contributions page</a>.
 Please see <a href="%s">our Contributions page</a>.
+
+
+# en/contact/index.php +63
+;Something particular to ask
+Something particular to ask
+
+
+# en/contact/index.php +64
+;In English and this is not for support
+In English and this is not for support
+
+
+# en/contact/index.php +69
+;For generic contact information.
+For generic contact information.
+
+
+# en/contact/index.php +73
+;For press inquiries.
+For press inquiries.
diff --git a/langs/fr/contact.fr.lang b/langs/fr/contact.fr.lang
index 107350130..9260c0eb6 100644
--- a/langs/fr/contact.fr.lang
+++ b/langs/fr/contact.fr.lang
@@ -1,106 +1,140 @@
-# Generated by extract2lang.php on 2013-01-16T21:29:47+01:00
+# Generated by extract2lang.php on 2013-11-30T23:23:44+00:00
 # Domain contact
+# include translation strings from:
+# en/contact/index.php
 
-# ../../svn/web/en/contact/index.php +10
+# en/contact/index.php +10
 ;Contact Us
 Nous contacter
 
 
-# ../../svn/web/en/contact/index.php +11
+# en/contact/index.php +11
 ;Here you can find out, how to contribute to the Mageia project
 Vous trouverez ici comment contribuer au projet Mageia
 
 
-# ../../svn/web/en/contact/index.php +12
+# en/contact/index.php +12
 ;mageia, contact, mail, press, people, board, council, mailing lists
 mageia, contact, mail, email, courriel, presse, communaute, bureau, conseil, mailing lists, listes de discussion
 
-
-# ../../svn/web/en/contact/index.php +24
+# en/contact/index.php +24
 ;You are looking for support
 Vous cherchez de l'aide
 
 
-# ../../svn/web/en/contact/index.php +25
-;Please check our <a href="https://forums.mageia.org/">forum</a> or our <a href="https://wiki.mageia.org/" hreflang="en">wiki</a>.
-Veuillez consulter notre <a href="https://forums.mageia.org/fr">forum francophone</a> (ou la version <a href="https://forums.mageia.org/en">anglophone</a>) ou notre <a href="https://wiki.mageia.org/" hreflang="en">wiki</a>.
+# en/contact/index.php +25
+;Search on:
+Rechercher dans:
 
 
-# ../../svn/web/en/contact/index.php +27
-;You would like to report an issue
-Vous voulez signaler un problème
+# en/contact/index.php +26
+;Our <a href="%s">wiki</a>
+Notre <a href="%s" hreflang="en">wiki</a>
 
 
-# ../../svn/web/en/contact/index.php +28
-;Please see <a href="%s" hreflang="en">how to report an issue in our bugs database</a>.
-Voyez ici <a href="%s" hreflang="en">comment signaler un problème dans notre répertoire de bugs</a>.
+# en/contact/index.php +27
+;In the End user <a href="%s">doc</a>
+Dans les documents <a href="%s">finals</a>
 
 
-# ../../svn/web/en/contact/index.php +32
-;You are not sure who to contact
-Vous ne savez pas bien qui contacter
+# en/contact/index.php +29
+;Discuss with other users via:
+Discuter avec les autres utilisateurs via:
 
 
-# ../../svn/web/en/contact/index.php +36
-;For generic contact information.
-Pour les demandes générales d'information.
+# en/contact/index.php +30
+;The <a href="%s">forum</a>
+Le <a href="%sfr">forum</a> ou sa version <a href="https://forums.mageia.org/">international</a>
 
 
-# ../../svn/web/en/contact/index.php +40
-;For press inquiries.
-Pour les enquêtes de presse.
+# en/contact/index.php +31
+;User <a href="%s">mailing list</a>
+La <a href="%s-fr">Liste de diffustion</a>
+
+
+# en/contact/index.php +32
+;<a href="%s">IRC</a> channel
+Canal <a href="%s-fr">IRC</a>
 
 
-# ../../svn/web/en/contact/index.php +44
-;You may as well try to reach us on <a href="%s">#mageia on Freenode IRC</a>.
-Vous pouvez également chercher à nous contacter sur <a href="irc://irc.freenode.net/#mageia-fr">#mageia-fr sur le serveur IRC Freenode</a>.
+# en/contact/index.php +33
+;The <a href="%s">Google Plus</a> community
+La communauté <a href="%s">Google Plus</a>
 
 
-# ../../svn/web/en/contact/index.php +54
+# en/contact/index.php +36
+;You would like to report an issue
+Vous voulez signaler un problème
+
+
+# en/contact/index.php +37
+;Please see <a href="%s" hreflang="en">how to report an issue in our bugs database</a>.
+Voyez ici <a href="%s" hreflang="en">comment signaler un problème dans notre répertoire de bugs</a>.
+
+
+# en/contact/index.php +44
 ;You have an idea of whom to contact
 Vous savez qui vous voulez contacter
 
 
-# en/contact/index.php +56
+# en/contact/index.php +46
 ;Use <a href="%s">the discuss mailing list</a> or <a href="%s">the forums</a> for general Mageia discussions
 Utilisez les listes de diffusion <a href="%s" hreflang="en">discuss</a> et <a href="https://ml.mageia.org/l/info/discuss-fr">discuss-fr</a> ou <a href="%s">le forum</a> pour des discussions générales à propos de Mageia
 
 
-# en/contact/index.php +57
+# en/contact/index.php +47
 ;Use <a href="%s">the dev mailing list</a> for Mageia development discussions
 Utilisez la liste de diffusion <a href="%s">dev</a> pour des discussions liées au développement de Mageia
 
 
-# en/contact/index.php +58
+# en/contact/index.php +48
 ;Use one of <a href="https://wiki.mageia.org/en/Mailing_lists">the other mailing lists</a> for discussions on other topics
 Utilisez l'une des <a href="https://wiki.mageia.org/en/Mailing_lists" hreflang="en">autres listes de diffusion</a> pour des discussions sur d'autres sujets
 
-
-# en/contact/index.php +59
+# en/contact/index.php +49
 ;Contact <a href="%s">the treasurer</a> for donation questions
 Contactez le <a href="%s">trésorier</a> pour vos questions à propos des dons
 
-
-# en/contact/index.php +60
+# en/contact/index.php +50
 ;Contact <a href="%s">the sysadmin team</a> for questions about mirrors, problems with your <a href="%s">Mageia identity account</a>, or other problems with Mageia infrastructure (there is also a public <a href="%s">sysadmin-discuss mailing list</a> if your question does not need to be private)
 Contactez l'<a href="%s">équipe des administrateurs système</a> pour des questions à propos des miroirs, des problèmes avec votre <a href="%s">compte Mageia identity</a>, ou d'autres problèmes avec l'infrastructure de Mageia (il existe aussi une liste de diffusion publique <a href="%s">sysadmin-discuss</a> si votre question n'a pas lieu de rester privée)
 
 
-# en/contact/index.php +61
+# en/contact/index.php +51
 ;If you want to contact Council or Board for a public discussion, you can start a thread on a mailing-list and add the <a href="%s">Board</a> or <a href="%s">Council</a> alias in CC.
 Si vous souhaitez contacter le Conseil ou le Bureau pour une discussion publique, vous pouvez commencer une discussion sur l'une des listes de diffusion et ajouter l'alias du <a href="%s">Bureau</a> ou du <a href="%s">Conseil</a> en copie.
 
 
-# en/contact/index.php +64
+# en/contact/index.php +54
 ;In most cases you should avoid sending private emails and use appropriate <a href="%s">public mailing list</a> when possible.
-Dans la plupart des cas, il est préférable d'éviter d'envoyer des courriels privés si vous pouvez utiliser les <a href="%s">listes de diffusion publiques</a> appropriées à la place.
+Dans la plupart des cas, il est préférable d'éviter d'envoyer des courriels privés si vous pouvez utiliser les <a href="%s">listes de diffusion publiques</a> appropriées à la place
 
 
-# ../../svn/web/en/contact/index.php +80
+# en/contact/index.php +58
 ;You want to join and contribute to Mageia
 Vous voulez rejoindre le projet et contribuer à Mageia
 
 
-# ../../svn/web/en/contact/index.php +81
+# en/contact/index.php +59
 ;Please see <a href="%s">our Contributions page</a>.
 Veuillez consulter <a href="%s">notre page sur la contribution</a>.
+
+
+# en/contact/index.php +63
+;Something particular to ask
+Une demande particulière
+
+
+# en/contact/index.php +64
+;In English and this is not for support
+En Anglais, et ceci n'est pas pour du support
+
+
+# en/contact/index.php +69
+;For generic contact information.
+Pour les demandes générales d'information.
+
+
+# en/contact/index.php +73
+;For press inquiries.
+Pour les enquêtes de presse