From 79b867586bf1e0613f62e0f7c3c789220b58f44c Mon Sep 17 00:00:00 2001 From: Damien Lallement Date: Fri, 24 Jun 2011 09:47:12 +0000 Subject: - update donors list - improvements on text thanks to bug #1135 - update bank accounts situation --- donators.inc.php | 19 ++++++++++++++++--- en/about/reports/2010/index.php | 4 ++-- en/about/reports/2011/index.php | 20 ++++++++++---------- langs.php | 2 +- 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 .= ''; @@ -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 @@
  • Amount remaining: EUR 7 523.96

    • Financial Report

    - - +
    Wording of the financial transactionIncomeOutgoing
    Donations and sells
    + 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 @@

    Summary

    Financial Report

    -
    Transaction descriptionIncomeOutgoing
    Donations and Sales
    Donations by Paypal/transfer/check/cashEUR 8 801.42 
    Paypal test to validate bank accountEUR 0.24 
    Hardware for servers
    - +
    Wording of the financial transactionIncomeOutgoing
    Donations and sells
    + - + - + - + @@ -55,12 +55,12 @@
    Transaction descriptionIncomeOutgoing
    Donations and Sales
    Donations by Paypal/transfer/checkEUR 1 920.97 
    Sale of Tee-ShirtsEUR 1 050.00 
    Cotisations + administrative tasks
    Fees and Administration Costs
    Administrative cost for the birth of Mageia.Org (JO) EUR 44.00
    April (annual cotisation) EUR 100.00
    April (annual fee) EUR 100.00
    INPI brand registration for 10 years (rda) EUR 250.00
    Annual interest of our savings accountEUR 3.06 
    Goodies and accesorizes
    Goodies and accessories
    Posters + flyers for Solutions Linux (rda) EUR 159.25
    Stickers + Tee-Shirts (fosdem) EUR 1 932.14
    Money box (dams) EUR 17.93

    Bank accounts situation

    Forecast for 2011

    - +
    Wording of the financial needUnit PriceQuantityRecurrenceTotal PriceStatus
    @@ -83,7 +83,7 @@
  • You can see the "thank you" page.

    • Contact

    - Financial report published by Damien Lallement (Mageia Treasurer on the 2011 Fiscal Year).
    You can contact him by sending an email to treasurer[at]mageia[dot]org.
    Last updated: Mon May 30 21:53:12 CEST 2011. + Financial report published by Damien Lallement (Mageia Treasurer on the 2011 Fiscal Year).
    You can contact him by sending an email to treasurer[at]mageia[dot]org.
    Last updated: Mon Jun 24 11:35:19 CEST 2011. 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 11 775.69'; +$g_donate_amount = 'EUR 12 181.52'; $g_amount_remain = 'EUR 6 941.86'; $G_coord_assos = <<
    Description of planned expenditureUnit PriceQuantityRecurrenceTotal PriceStatus
    GoodiesEUR 4 500.0011EUR 4 500.00pending
    AprilEUR 100.0011EUR 100.00pending
    Gandi (hosting: +1536 MB of RAM)EUR 2.39612EUR 172.08done (Wed Mar 30)