@@ -, +, @@
---
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 144 +++++++++++++---------
1 files changed, 84 insertions(+), 60 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -92,7 +92,7 @@
ENSMP (Ecole Nationale Supérieure des Mines de Paris), France (biblio frameworks, MARC authorities, OPAC basket, Serials sponsorship)
SAN-Ouest Provence, France (Koha 3.0 enhancements to patrons and holds modules)
The Crawford County Federated Library System, PA, USA (Koha 3.0 Zebra Integration sponsorship)
- The Geauga County Public Library, OH, USA (Koha 3.0 beta testing)
+ The Geauga County Public Library, OH, USA (Koha 3.0 beta testing)
The Near East University, Cyprus
OPUS International Consultants, Wellington, New Zealand (Corporate Serials sponsorship)
famfamfam.com Birmingham (UK) based developer Mark James for the famfamfam Silk iconset.
@@ -102,35 +102,35 @@
- Colin Campbell (Koha 3.4 QA Manager)
- Galen Charlton (Koha 3.2 Release Manager)
- - Chris Cormack (Koha 1.x, 3.4, 3.6 Release Manager, Koha 3.2 Translation Manager)
- - Frédéric Demians(Koha 3.4, 3.6 Translation Manager)
- - Nicole C. Engard (Koha 3.x Documentation Manager)
- - Joshua Ferraro (Koha 3.0 Release Manager & Translation Manager)
- - Rachel Hamilton-Williams (Kaitiaki from 2004 to present)
- - Henri-Damien Laurent (Koha 3.0 Release Maintainer)
- - Owen Leonard (Koha 3.x Interface Design)
+ - Chris Cormack (Koha 1.x, 3.4, 3.6 Release Manager, Koha 3.2 Translation Manager)
+ - Frédéric Demians(Koha 3.4, 3.6 Translation Manager)
+ - Nicole C. Engard (Koha 3.x Documentation Manager)
+ - Joshua Ferraro (Koha 3.0 Release Manager & Translation Manager)
+ - Rachel Hamilton-Williams (Kaitiaki from 2004 to present)
+ - Henri-Damien Laurent (Koha 3.0 Release Maintainer)
+ - Owen Leonard (Koha 3.x Interface Design)
- Chris Nighswonger (Koha 3.2, 3.4 Release Maintainer, Koha 3.6 Release Maintainer)
- - Paul Poulain (Koha 2.0 Release Manager, Koha 2.2 Release Manager/Maintainer, Koha 3.8 Release Manager)
- - MJ Ray (Koha 2.0 Release Maintainer)
+ - Paul Poulain (Koha 2.0 Release Manager, Koha 2.2 Release Manager/Maintainer, Koha 3.8 Release Manager)
+ - MJ Ray (Koha 2.0 Release Maintainer)
- Ian Walls Koha 3.6 QA Manager, Koha 3.8 QA Manager
Koha Development Team
-
+
- Md. Aftabuddin
- - Edward Allen
+ - Edward Allen
- Francisco M. Marzoa Alonso
- Cindy Murdock Ames
- Richard Anderson
- Nahuel Angelinetti
- - Nuño López Ansótegui
- - Tomás Cohen Arazi
+ - Nuño López Ansótegui
+ - Tomás Cohen Arazi
- Andrew Arensburger (the small and great C4::Context module)
- Alex Arnaud
- Joe Atzberger
- Larry Baerveldt
- Al Banks
- Daniel Banzli
- - Greg Barniskis
+ - Greg Barniskis
- Benedykt P. Barszcz (Polish for 2.0)
- D Ruth Bavousett
- John Beppu
@@ -139,31 +139,31 @@
- Danny Bouman
- Stan Brinkerhoff
- Roger Buck
- - Steven Callender
+ - Steven Callender
- Jared Camins-Esakov
- Colin Campbell
- - Fernando Canizo
- - Frédérick Capovilla
+ - Fernando Canizo
+ - Frédérick Capovilla
- DeAndre Carroll
- Chris Catalfo (new plugin MARC editor)
- Marc Chantreux
- - Jerome Charaoui
+ - Jerome Charaoui
- Andrew Chilton
- Garry Collum
- - John Copeland
- - Jeremy Crabtree
- - Christophe Croullebois
+ - John Copeland
+ - Jeremy Crabtree
+ - Christophe Croullebois
- Nate Curulla
- Vincent Danjean
- Elliott Davis
- - Doug Dearden
+ - Doug Dearden
- Kip DeGraaf
- Connor Dewar
- Frédéric Demians
- - Jonathan Druart
- - Serhij Dubyk
+ - Jonathan Druart
+ - Serhij Dubyk
- Thomas Dukleth (MARC Frameworks Maintenance)
- - Frederic Durand
+ - Frederic Durand
- Sebastiaan Durand
- Ecole des Mines de Saint Etienne, Philippe Jaillon (OAI-PMH support)
- Stephen Edwards
@@ -171,24 +171,24 @@
- Brian Engard
- Magnus Enger
- Esiee School (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)
- - Shaun Evans
+ - Shaun Evans
- Pat Eyler (Kaitiaki from 2002 to 2004)
- Antoine Farnault
- Katrin Fischer
- Clay Fouts
- - Claudia Forsman
+ - Claudia Forsman
- Marco Gaiarin
- Pierrick Le Gall
- Brendan A. Gallagher
- Tumer Garip
- Russel Garlick
- - Mark Gavillet
+ - Mark Gavillet
- Daniel Kahn Gillmor
- David Goldfein
- Daniel Grobani
- Amit Gupta
- Michael Hafen
- - Christopher Hall
+ - Christopher Hall
- Mike Hansen
- Brian Harrington
- Friedrich zur Hellen
@@ -196,7 +196,7 @@
- Wolfgang Heymans
- Ryan Higgins
- Sèbastien Hinderer
- - Stephanie Hogan
+ - Stephanie Hogan
- Daniel Holth
- Andrew Hooper
- Matthew Hunt
@@ -207,9 +207,9 @@
- Mason James
- Mike Johnson
- Donovan Jones
- - Janusz Kaczmarek
+ - Janusz Kaczmarek
- Koustubha Kale
- - Ulrich Kleiber
+ - Ulrich Kleiber
- Arnaud Laurin
- Ambrose Li (translation tool)
- Gynn Lomax
@@ -218,24 +218,24 @@
- Jesse Maseto
- Frère Sébastien Marie
- Ricardo Dias Marques
- - Julian Maurice
+ - Julian Maurice
- Brig C. McCoy
- Dorian Meid (German translation)
- - Meenakshi. R
+ - Meenakshi. R
- Matthias Meusburger
- - Sophie Meynieux
+ - Sophie Meynieux
- Alan Millar
- Andrew Moore
- Sharon Moreland
- Nicolas Morin
- - Mike Mylonas
- - Joy Nelson
+ - Mike Mylonas
+ - Joy Nelson
- Chris Nighswonger
- - Albert Oller
- - Eric Olsen
- - H. Passini
- - Dobrica Pavlinusic
- - Maxime Pelletier
+ - Albert Oller
+ - Eric Olsen
+ - H. Passini
+ - Dobrica Pavlinusic
+ - Maxime Pelletier
- Polytechnic University
- MJ Ray
- Liz Rea
@@ -244,54 +244,60 @@
- Serge Renaux
- Waylon Robertson
- Marcel de Rooy
- - Salvador Zaragoza Rubio
- - Brice Sanchez
- - Sam Sanders
+ - Salvador Zaragoza Rubio
+ - Brice Sanchez
+ - Sam Sanders
- Robin Sheat
- - John Seymour
- - Juan Romay Sieira
- - Zach Sim
+ - John Seymour
+ - Juan Romay Sieira
+ - Zach Sim
- Savitra Sirohi
- Pawel Skuza (Polish for 1.2)
- Fridolyn Somers
- Southeastern University
- Glen Stewart
- - Will Stokes
+ - Will Stokes
- David Strainchamps
- Ed Summers (Some code and Perl packages like MARC::Record)
- Daniel Sweeney
- Zeno Tajoli
- Adam Thick
- - Finlay Thompson
+ - Finlay Thompson
- Steve Tonnesen (early MARC work, Virtual Bookshelves concept, KohaCD)
- Bruno Toumi
- Andrei V. Toutoukine
- Darrell Ulm
- Universidad ORT Uruguay (Ernesto Silva, Andres Tarallo)
+<<<<<<< HEAD
- Aleksa Vujicic
- Reed Wade
- Ian Walls
+=======
+ - Reed Wade
+ - Ian Walls
+>>>>>>> Bug 7143 about.tt indentation fixes
- Jane Wagner
- - Ward van Wanrooij
+ - Ward van Wanrooij
- Jesse Weaver
- Rick Welykochy
- - Piotr Wejman
+ - Piotr Wejman
- Ron Wickersham
- - Brett Wilkins
+ - Brett Wilkins
- Olwen Williams (Database design and data extraction for Koha 1.0)
- James Winter
- Lars Wirzenius
-
+
Contributing Companies and Institutions
- BibLibre, France
- Bibliotheksservice-Zentrum Baden-Württemberg (BSZ), Germany
- - ByWater Solutions, USA
- - Calyx, Australia
- - Catalyst IT, New Zealand
+ - ByWater Solutions, USA
+ - Calyx, Australia
+ - Catalyst IT, New Zealand
- Katipo Communications, New Zealand
- KohaAloha, New Zealand
- LibLime, USA
+<<<<<<< HEAD
- Libriotech, Norway
- Nelsonville Public Library, Ohio, USA
- PTFS, Maryland, USA
@@ -301,14 +307,25 @@
- Software Coop, United Kingdom
- Tamil, France
- Xercode, Spain
+=======
+ - Libriotech, Norway
+ - Nelsonville Public Library, Ohio, USA
+ - PTFS, Maryland, USA
+ - PTFS Europe Ltd, United Kingdom
+ - Rijksmuseum, Amsterdam, The Netherlands
+ - SAN-Ouest Provence, France
+ - Software Coop, United Kingdom
+ - Tamil, France
+ - Xercode, Spain
+>>>>>>> Bug 7143 about.tt indentation fixes
Additional Thanks To...
- - Jo Ransom
+ - Jo Ransom
- Nicholas Rosasco, (Documentation Compiler)
- Regula Sebastiao
- - Brooke Johnson
+ - Brooke Johnson
- Stephen Hedges (early Documentation Manager)
- Nicolas Morin (French Translation in 2.0)
@@ -387,6 +404,7 @@
Türkçe (Turkish) Selma Aslan
اردو(Urdu) Ata ur Rehman
Українська (Ukrainian) Victor Titarchuk and Serhij Dubyk
+<<<<<<< HEAD
@@ -413,5 +431,11 @@
+=======
+
+
+
+
+>>>>>>> Bug 7143 about.tt indentation fixes
[% INCLUDE 'intranet-bottom.inc' %]
--