- update donors list

- improvements on text thanks to bug #1135
- update bank accounts situation

4 files changed, 29 insertions, 16 deletions

diff --git a/donators.inc.php b/donators.inc.php
index e8a9a0514..be2c1c849 100644
--- a/donators.inc.php
+++ b/donators.inc.php
@@ -73,7 +73,7 @@ $donators = array(
     'Werner Brinkmann',
     'Serge Moreau',
     'Jean Goujoun',
-    'Anonymous (x 11)',
+    'Anonymous (x 13)',
     'Freddy Janssens',
     'Nico Bergmann',
     'Adrien Guichard',
@@ -192,7 +192,20 @@ $donators = array(
     'Kimmo Suutala',
     'Martin Turner',
     'Jean-Luc Versini',
-    'Jean-François Ramez'
+    'Jean-François Ramez',
+    'Manuel Fernandes Alonso',
+    'Richard Chonak',
+    'Rogelio Jose Trujillo Moreno',
+    'Kris Thomsen',
+    'Mona Zehle',
+    'Francesco De Crescenzo',
+    'George Goslin',
+    'Stephen Adrian',
+    'Juan Barea Sanchez',
+    'Franz Holzinger',
+    'Placais',
+    'Thomas Fackler (tomm.fa)',
+    'Schouwen R M Van',
 );
 
 //$html .= '<img src="/g/images/mageia_0.svg" style="position: absolute; top: 180px; width: 300px; opacity: 0.2;" />';
@@ -228,7 +241,7 @@ $orgs = array(
 */
 function html_donators_list($donators)
 {
-    $count_donators = count($donators)+11; //count + anonymous
+    $count_donators = count($donators)+13; //count + anonymous
     //$donators = array_unique($donators);
     sort($donators);
 
diff --git a/en/about/reports/2010/index.php b/en/about/reports/2010/index.php
index 05a76c885..f67fe0dbc 100644
--- a/en/about/reports/2010/index.php
+++ b/en/about/reports/2010/index.php
@@ -25,8 +25,8 @@
 				<li>Amount remaining: EUR&nbsp;7 523.96</li>
 			</ul>
 			<h2>Financial Report</h2>
-			<table id="fr-table"><thead><tr><th>Wording of the financial transaction</th><th>Income</th><th>Outgoing</th></tr></thead><tbody><tr>
-				<tr><td colspan=3>Donations and sells</td></tr>
+			<table id="fr-table"><thead><tr><th>Transaction description</th><th>Income</th><th>Outgoing</th></tr></thead><tbody><tr>
+				<tr><td colspan=3>Donations and Sales</td></tr>
 				<tr><td>Donations by Paypal/transfer/check/cash</td><td class="money">EUR&nbsp;8 801.42</td><td>&nbsp;</td></tr>
 				<tr><td>Paypal test to validate bank account</td><td class="money">EUR&nbsp;0.24</td><td>&nbsp;</td></tr>
 				<tr><td colspan=3>Hardware for servers</td></tr>
diff --git a/en/about/reports/2011/index.php b/en/about/reports/2011/index.php
index 475f4059e..4ef3a0517 100644
--- a/en/about/reports/2011/index.php
+++ b/en/about/reports/2011/index.php
@@ -21,21 +21,21 @@
 			<h2>Summary</h2>
 			<ul>
 				<li>Outstanding amount of <a href="/en/about/reports/2010">2010</a>: EUR&nbsp;7 523.96</li>
-				<li>Amount collected: EUR&nbsp;2 974.03</li>
+				<li>Amount collected: EUR&nbsp;3 379.86</li>
 				<li>Amount spent: EUR&nbsp;3 469.75</li>
 				<li>Amount remaining: <?php echo $g_amount_remain; ?></li>
 			</ul>
 			<h2>Financial Report</h2>
-			<table id="fr-table"><thead><tr><th>Wording of the financial transaction</th><th>Income</th><th>Outgoing</th></tr></thead><tbody><tr>
-				<tr><td colspan=3>Donations and sells</td></tr>
+			<table id="fr-table"><thead><tr><th>Transaction description</th><th>Income</th><th>Outgoing</th></tr></thead><tbody><tr>
+				<tr><td colspan=3>Donations and Sales</td></tr>
                                 <tr><td>Donations by Paypal/transfer/check</td><td class="money">EUR&nbsp;1 920.97</td><td class="money">&nbsp;</td></tr>
                                 <tr><td>Sale of Tee-Shirts</td><td class="money">EUR&nbsp;1 050.00</td><td class="money">&nbsp;</td></tr>
-				<tr><td colspan=3>Cotisations + administrative tasks</td></tr>
+				<tr><td colspan=3>Fees and Administration Costs</td></tr>
 				<tr><td>Administrative cost for the birth of Mageia.Org (JO)</td><td class="money">&nbsp;</td><td class="money">EUR&nbsp;44.00</td></tr>
-				<tr><td>April (annual cotisation)</td><td class="money">&nbsp;</td><td class="money">EUR&nbsp;100.00</td></tr>
+				<tr><td>April (annual fee)</td><td class="money">&nbsp;</td><td class="money">EUR&nbsp;100.00</td></tr>
 				<tr><td>INPI brand registration for 10 years (rda)</td><td class="money">&nbsp;</td><td class="money">EUR&nbsp;250.00</td></tr>
 				<tr><td>Annual interest of our savings account</td><td class="money">EUR&nbsp;3.06</td><td class="money">&nbsp;</td></tr>
-				<tr><td colspan=3>Goodies and accesorizes</td></tr>
+				<tr><td colspan=3>Goodies and accessories</td></tr>
 				<tr><td>Posters + flyers for Solutions Linux (rda)</td><td>&nbsp;</td><td class="money">EUR&nbsp;159.25</td></tr>
 				<tr><td>Stickers + Tee-Shirts (fosdem)</td><td>&nbsp;</td><td class="money">EUR&nbsp;1 932.14</td></tr>
 				<tr><td>Money box (dams)</td><td>&nbsp;</td><td class="money">EUR&nbsp;17.93</td></tr>
@@ -55,12 +55,12 @@
 			</table>
 			<h2>Bank accounts situation</h2>
 			<ul>
-                                <li>Paypal (non-for-profit organisation account): EUR&nbsp;158.51</li>
-				<li>Main account (with checkbook and no credit card): EUR&nbsp;1 280.29</li>
+                                <li>Paypal (non-for-profit organisation account): EUR&nbsp;443.34</li>
+				<li>Main account (with checkbook and no credit card): EUR&nbsp;1 401.29</li>
 				<li>Savings account (between 2% and 4% of interest): EUR&nbsp;5 503.06</li>
 			</ul>
 			<h2>Forecast for 2011</h2>
-			<table id="fr-table"><thead><tr><th>Wording of the financial need</th><th>Unit Price</th><th>Quantity</th><th>Recurrence</th><th>Total Price</th><th>Status</th></tr></thead><tbody><tr>
+			<table id="fr-table"><thead><tr><th>Description of planned expenditure</th><th>Unit Price</th><th>Quantity</th><th>Recurrence</th><th>Total Price</th><th>Status</th></tr></thead><tbody><tr>
                                 <tr><td>Goodies</td><td class="money">EUR&nbsp;4 500.00</td><td class="money">1</td><td class="money">1</td><td class="money">EUR&nbsp;4 500.00</td><td>pending</td></tr>
                                 <tr><td>April</td><td class="money">EUR&nbsp;100.00</td><td class="money">1</td><td class="money">1</td><td class="money">EUR&nbsp;100.00</td><td>pending</td></tr>
                                 <tr><td>Gandi (hosting: +1536 MB of RAM)</td><td class="money">EUR&nbsp;2.39</td><td class="money">6</td><td class="money">12</td><td class="money">EUR&nbsp;172.08</td><td>done (Wed Mar 30)</td></tr>
@@ -83,7 +83,7 @@
 				<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: Mon May 30 21:53:12 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 Jun 24 11:35:19 CEST 2011.
                 </div>
             </div>
         </div>
diff --git a/langs.php b/langs.php
index 7a0e8d31f..2899b4cdf 100644
--- a/langs.php
+++ b/langs.php
@@ -5,7 +5,7 @@
 $g_app_root = realpath(dirname(__FILE__));
 define('G_APP_ROOT', $g_app_root);
 
-$g_donate_amount = 'EUR&nbsp;11 775.69';
+$g_donate_amount = 'EUR&nbsp;12 181.52';
 $g_amount_remain = 'EUR&nbsp;6 941.86';
 
 $G_coord_assos = <<<T