[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en about.tmpl,1.12,1.13

[Paul POULAIN]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20915/koha-tmpl/intranet-tmpl/default/en

Modified Files:
        about.tmpl 
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits 
done here

Index: about.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/about.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** about.tmpl  5 Jan 2005 14:32:56 -0000       1.12
--- about.tmpl  1 Mar 2005 13:40:51 -0000       1.13
***************
*** 13,31 ****
        </div>
        <div id="bloc25">
!               <h2>Special thanks to the following funders</h2>
!               <p><b>Horowhenua Library Trust</b> and Rosalie Blake, Head of 
Libraries, (Koha 1.0)</p>
!               <p>The <b>Nelsonville Public Library</b> (MARC support)</p>
!               <p><b>EMN (Ecole des Mines de Nantes)</b> (Suggestion, stats 
modules and improved ldap support)</p>
!               <p><b>ENSMP (Ecole Nationale Supérieure des Mines de Paris)</b> 
(biblio frameworks, MARC authorities, OPAC basket, Serials support)</p>
        </div>
        <div id="bloc25">
                <h2>Core team for 2.2</h2>
                <p><b>Rachel Hamilton-Williams</b>, Kaitiaki</p>
!               <p><b>Paul Poulain</b>, 2.2 release manager (MARC 
developper)</p>
!               <p>Stephen Hedges &amp; the <b>Nelsonville Public Library</b> 
(MARC features funders)</p>
!               <p>Nicholas Rosasco, (Documentation Compiler)</p>
!               <p>Mike Hansen</p>
!               <p>MJ Ray and <b>Turo Technology LLP</b>, (quality control, 
installer &amp; updater, 2.0 release maintainer)</p>
!               <p><b>Katipo Communications</b></p>
                <ul>
                        <p>Rachel Hamilton-Williams, General Manager 
(Webmistress)</p>
--- 13,28 ----
        </div>
        <div id="bloc25">
!               <h2>Special thanks to the following libraries</h2>
!               <p><b>Horowhenua Library Trust</b>, New Zealand, and Rosalie 
Blake, Head of Libraries, (Koha 1.0)</p>
!               <p>The <b>Nelsonville Public Library</b>, USA, Ohio (MARC 
support funding)</p>
!               <p><b>EMN (Ecole des Mines de Nantes)</b>, France (Suggestion, 
stats modules and improved ldap support funding)</p>
!               <p><b>ENSMP (Ecole Nationale Supérieure des Mines de 
Paris)</b>, France (biblio frameworks, MARC authorities, OPAC basket, Serials 
support funding)</p>
        </div>
        <div id="bloc25">
                <h2>Core team for 2.2</h2>
                <p><b>Rachel Hamilton-Williams</b>, Kaitiaki</p>
!               <p><b>Paul Poulain</b>, 2.2 release manager (MARC developer)</p>
!               <p>Stephen Hedges, Owen Leonard, Joshua Ferraro (<b>Nelsonville 
Public Library</b>)</p>
!               <p><b>Katipo Communications</b> (Koha 1.0 developers)</p>
                <ul>
                        <p>Rachel Hamilton-Williams, General Manager 
(Webmistress)</p>
***************
*** 34,37 ****
--- 31,39 ----
                        <p>Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca 
Holden, Olive T. Canine</p>
                </ul>
+               <p>Emiliano Marmonti, Matías Veleda & Sebastian Catañeda <b>La 
Plata University, Argentina</b> (barcode printing)</p>
+               <p>MJ Ray and <b>Turo Technology LLP</b>, (quality control, 
installer &amp; updater, 2.0 release maintainer)</p>
+               <p>Nicholas Rosasco, (Documentation Compiler)</p>
+               <p>Mike Hansen</p>
+               <p><b>Pate Eyler</b> (Kaitiaki from 2002 to 2004)</p>
        </div>
        <div id="bloc25">
***************
*** 40,45 ****
                                        <p>Andrew Hooper</p>
                                        <p>Al Banks</p>
!                                       <p>Ambrose Li (chinese & translation 
tool)</p>
!                                       <p>Andrew Arensburger (the small & 
great C4::Context module)</p>
                                        <p>Benedykt P. Barszcz (Polish for 
2.0)</p>
                                        <p>Brig C. McCoy</p>
--- 42,47 ----
                                        <p>Andrew Hooper</p>
                                        <p>Al Banks</p>
!                                       <p>Ambrose Li (translation tool)</p>
!                                       <p>Andrew Arensburger (the small &amp; 
great C4::Context module)</p>
                                        <p>Benedykt P. Barszcz (Polish for 
2.0)</p>
                                        <p>Brig C. McCoy</p>
***************
*** 47,53 ****
                                        <p>David Strainchamps</p>
                                        <p>Dorian Meid (German translation)</p>
!                                       <p><b>doXulting</b> (Matthieu Branlat) 
OPAC basket</p>
                                        <p>Ed Summers (Some code and Perl 
packages like MARC::Record)</p>
!                                       <p><b>Esiee School</b> (Jérome 
Vizcaino, Michel Lerenard, Pierre Cauchois)</p>
                                        <p>Florian Bischof</p>
                                        <p>Francisco M. Marzoa Alonso</p>
--- 49,55 ----
                                        <p>David Strainchamps</p>
                                        <p>Dorian Meid (German translation)</p>
!                                       <p>doXulting (Matthieu Branlat) OPAC 
basket</p>
                                        <p>Ed Summers (Some code and Perl 
packages like MARC::Record)</p>
!                                       <p>Esiee School (Jérome Vizcaino, 
Michel Lerenard, Pierre Cauchois)</p>
                                        <p>Florian Bischof</p>
                                        <p>Francisco M. Marzoa Alonso</p>
***************
*** 67,71 ****
                                        <p>Ron Wickersham</p>
                                        <p>Sebastiaan Durand</p>
!                                       <p><b>Steve Tonnesen</b> (early MARC 
work, Virtual Bookshelves concept, KohaCD)</p>
        </div>
  </div>
--- 69,81 ----
                                        <p>Ron Wickersham</p>
                                        <p>Sebastiaan Durand</p>
!                                       <p>Steve Tonnesen (early MARC work, 
Virtual Bookshelves concept, KohaCD)</p>
!                                       <p>Universidad ORT Uruguay (Ernesto 
Silva, Andres Tarallo)</p>
!       </div>
!       <div id="bloc25">
!       <h2>Translation</h2>
!               <p><label>French</label>Pascale Nalon (ENSMP) and Jean Yves 
Lemaire (Saint Germain sur Morin)</p>
!               <p><label>Chinese</label>Ambrose Li</p>
!               <p><label>Spanish</label>Andres Tarallo</p>
!               <p><label>Italian</label>Giuseppe Angilella</p>
        </div>
  </div>