fix mga#16877 + remove time as requested in older email

1 files changed, 6 insertions, 24 deletions

diff --git a/en/contribute/index.php b/en/contribute/index.php
index 353168cc1..e9bf8ea13 100644
--- a/en/contribute/index.php
+++ b/en/contribute/index.php
@@ -30,28 +30,17 @@ $dictionary = read_translation_file($locale, array('contribute', 'common_footer'
         </div>
        <div class="col-sm-5">
         <div class="para" id="by-time">
-            <h2><?php _g('Time')?></h2>
-            <p><?php _g('How much free time do you have? and how much of it do you want to commit to Mageia? See what you can do:')?></p>
+            <h2><?php _g('Contribution entry points')?></h2>
             <ul id="contrib-time" class="contrib-list">
                 <li>
-                    <h3><?php _g('A few minutes')?></h3>
+                    <h3><?php _g('Do you want to join Mageia community?')?></h3>
                     <ul class="contrib-act">
                         <li><?php _g('Stop by the <a href="https://forums.mageia.org/">forums</a> support section and check if you can answer a question.')?></li>
                         <li><?php _g('Talk about the project to people around you, on your blog, your Twitter account, at your work place.')?></li>
                         <li><?php _g('If you encounter a bug you can reproduce consistently, <a href="https://bugs.mageia.org/">submit a bug report</a>.')?></li>
                         <li><?php _g('Make a <a href="../donate/">donation</a>!')?></li>
-                    </ul>
-                </li>
-                <li>
-                    <h3><?php _g('A few hours')?></h3>
-                    <ul class="contrib-act">
                         <li><?php _g('Stop by a Mageia event, like a test day to find, reproduce and help resolve bugs.')?></li>
                         <li><?php _g('Subscribe to a team discussion list and follow what happens there, try to see how you can bring something useful to it.')?></li>
-                    </ul>
-                </li>
-                <li>
-                    <h3><?php _g('A few weeks or more')?></h3>
-                    <ul class="contrib-act">
                         <li><?php _g('Learn about free software, open source collaboration in general, and Mageia in particular.')?></li>
                         <li><?php _g('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.')?></li>
                     </ul>
@@ -84,19 +73,16 @@ $dictionary = read_translation_file($locale, array('contribute', 'common_footer'
                 <p><?php _g('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.')?></p>
             </li>
             <li id="marketing">
-                <h3><a href="https://wiki.mageia.org/en/Atelier_Team"><?php _g('Marketing, Communication &amp; Evangelism')?></a></h3>
-                <p><?php _g('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/Atelier_Team">marcomm team</a> (Marketing and Communication), on both global and local scales.')?></p>
-            </li>
-            <li id="graphic">
-                <h3><a href="https://wiki.mageia.org/en/Atelier_team"><?php _g('Graphic &amp; UI design')?></a></h3>
-                <p><?php _g('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/Atelier_Team">join the artwork team</a>!')?></p>
+                <h3><a href="https://wiki.mageia.org/en/Atelier_Team"><?php _g('Marketing, Communication &amp; Evangelism'); echo ' + '; _g('Graphic &amp; UI design')?></a></h3>
+                <p><?php _g('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/Atelier_Team">Atelier team</a> (Marketing and Communication), on both global and local scales.', null, ' ');
+                _g('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/Atelier_Team">join the Atelier team</a>!')?></p>
             </li>
             <li id="dev">
                 <h3><a href="https://wiki.mageia.org/en/Packagers_Team"><?php _g('Coding &amp; packaging')?></a></h3>
                 <p><?php _g('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>!')?></p>
             </li>
             <li id="web">
-                <h3><a href="https://wiki.mageia.org/en/Web_team"><?php _g('Web, tools, systems design &amp; administration')?></a></h3>
+                <h3><a href="https://wiki.mageia.org/en/Sysadmin_Team"><?php _g('Web, tools, systems design &amp; administration')?></a></h3>
                 <p><?php _g('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/Atelier_Team">Web designers/developers/integrators</a> to manage this huge task.')?></p>
             </li>
             <li id="mirror">
@@ -107,10 +93,6 @@ $dictionary = read_translation_file($locale, array('contribute', 'common_footer'
                 <h3><a href="../donate/"><?php _g('Donating')?></a></h3>
                 <p><?php _g('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>.')?></p>
             </li>
-            <li id="data">
-                <h3><?php _g('Data mining')?></h3>
-                <p><?php _g('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!')?></p>
-            </li>
             <li id="design">
                 <h3><?php _g('Designing, experimenting, revealing the unknown')?></h3>
                 <p><?php _g('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.')?></p>