update for donate and F.R pages

3 files changed, 9 insertions, 15 deletions

diff --git a/en/about/reports/2010/index.php b/en/about/reports/2010/index.php
index ce144bcba..32dc1f46e 100644
--- a/en/about/reports/2010/index.php
+++ b/en/about/reports/2010/index.php
@@ -51,7 +51,7 @@
 			<ul>
 				<li>Donations are mixed as at the beginning they were managed by AUFML. We had a bank transfert with all donations.</li>
 				<li>You can <a href="#" hreflang="en">download this report</a> as a PDF file.</li>
-				<li>You can help Mageia by <a href="/en/donate/" hreflang="en">doing a donation</a>.</li>
+				<li>You can help Mageia.Org by <a href="/en/donate/" hreflang="en">doing a donation</a>.</li>
 				<li>You can see the <a href="/en/thank-you" hreflang="en">"thank you" page</a>.</li>
 			</ul>
 			<h2>Contact</h2>
diff --git a/en/about/reports/2011/index.php b/en/about/reports/2011/index.php
index e1ecfe232..1bd5b50ee 100644
--- a/en/about/reports/2011/index.php
+++ b/en/about/reports/2011/index.php
@@ -68,11 +68,11 @@
 			<h2>Miscellaneous</h2>
 			<ul>
 				<li>You can <a href="#" hreflang="en">download this report</a> as a PDF file.</li>
-				<li>You can help Mageia by <a href="/en/donate/" hreflang="en">doing a donation</a>.</li>
+				<li>You can help Mageia.Org by <a href="/en/donate/" hreflang="en">doing a donation</a>.</li>
 				<li>You can see the <a href="/en/thank-you" hreflang="en">"thank you" page</a>.</li>
 			</ul>
 			<h2>Contact</h2>
-			Financial report published by Damien Lallement (Mageia Treasurer on the 2011 Fiscal Year).<br/>You can contact him by sending an email to <em>treasurer[at]mageia[dot]org</em>.<br/>Last updated: Wed Mar 30 16:45:55 CEST 2011.
+			Financial report published by Damien Lallement (Mageia Treasurer on the 2011 Fiscal Year).<br/>You can contact him by sending an email to <em>treasurer[at]mageia[dot]org</em>.<br/>Last updated: Mon May 30 21:53:12 CEST 2011.
                 </div>
             </div>
         </div>
diff --git a/en/donate/index.php b/en/donate/index.php
index 04348af8a..912e83a65 100644
--- a/en/donate/index.php
+++ b/en/donate/index.php
@@ -41,19 +41,13 @@
                     </ul>
                     <hr />
                     <h2 id="status">How to track donation?</h2>
-                    <p>Currently, we have got <strong><?php echo $g_donate_amount; ?></strong>
-                        thanks to all of our <a href="/en/thank-you/">donators</a>! (updated weekly)</p>
+		    <p>Currently, we have got <strong><?php echo $g_donate_amount; ?></strong> (<a href="/en/about/reports/<?php echo date('Y'); ?>">remains</a> <strong><?php echo $g_amount_remain; ?></strong>)
+                        thanks to all of our <a href="/en/thank-you/">donators</a>!</p>
 
-                    <p>There will be a monthly report on the funds received and how they were used.
-                        We believe public accountability is crucial. As stated in the minutes of
-                        The First General Constitutive Assembly, the treasurer of Mageia.Org is Damien Lallement.</p>
+		    <p>We believe public accountability is crucial. You can know more about how are used the funds received by reading our 
+			<a href="/en/about/reports/">financial reports</a>.
+                        As stated in the minutes of The First General Constitutive Assembly, the treasurer of Mageia.Org is Damien Lallement.</p>
                         
-                    <p><strong>2011 May 4<sup>th</sup></strong>: yes, this page needs to be better;
-                        see <a href="https://bugs.mageia.org/show_bug.cgi?id=1135">bug 1135</a>
-                        and tell/show us how we could improve this (report visualization, feedback, donation).
-
-                        In the meantime, check out our reports and forecast for <a href="/en/about/reports/2010/">2010</a>
-                        and <a href="/en/about/reports/2011/">2011</a>.</p>
                     <hr />
                 </div>
             </div>
@@ -88,7 +82,7 @@
                 </div><div class="para">
                     <p><strong>Please note that:</strong></p>
                     <ul>
-                        <li>Paypal withdraws a small commission for each donation (about ...%) so we get a little bit less
+                        <li>Paypal withdraws a small commission for each donation (around 2%) so we get a little bit less
                             than you send;</li>
                         <li>conversion rates are charged to Mageia, so please use &euro; as currency;</li>
                         <li>if you want to do an anonymous donation, please add a comment.</li>