@@ -, +, @@
---
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 127 +++++++++++++++++-----
1 files changed, 98 insertions(+), 29 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -86,35 +86,35 @@
Special thanks to the following organizations
- - Horowhenua Library Trust, New Zealand, and Rosalie Blake, Head of Libraries, (Koha 1.0)
- - The Nelsonville Public Library System, Ohio, USA (MARC sponsorship, documentation, template maintenance)
- - EMN (Ecole des Mines de Nantes), France (Suggestions, Stats wizards and improved LDAP sponsorship)
- - 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 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.
-
-
-
Koha Release Team
+
Horowhenua Library Trust, New Zealand, and Rosalie Blake, Head of Libraries, (Koha 1.0)
+
The Nelsonville Public Library System, Ohio, USA (MARC sponsorship, documentation, template maintenance)
+
EMN (Ecole des Mines de Nantes), France (Suggestions, Stats wizards and improved LDAP sponsorship)
+
Mines Paristech (previously 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 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.
+
+
+
Koha release team
- - 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 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)
- - Ian Walls Koha 3.6 QA Manager, Koha 3.8 QA Manager
+ - 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 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)
+ - Ian Walls Koha 3.6 QA Manager, Koha 3.8 QA Manager
-
Koha Development Team
+
Koha development team
- Md. Aftabuddin
- Jon Aker
@@ -296,8 +296,9 @@
- James Winter
- Lars Wirzenius
-
Contributing Companies and Institutions
+
Contributing companies and institutions
+<<<<<<< HEAD
- BibLibre, France
- Bibliotheksservice-Zentrum Baden-Württemberg (BSZ), Germany
- ByWater Solutions, USA
@@ -327,6 +328,25 @@
- Tamil, France
- Xercode, Spain
>>>>>>> Bug 7143 about.tt indentation fixes
+=======
+ - BibLibre, France
+ - Bibliotheksservice-Zentrum Baden-Württemberg (BSZ), Germany
+ - ByWater Solutions, USA
+ - Calyx, Australia
+ - Catalyst IT, New Zealand
+ - Katipo Communications, New Zealand
+ - KohaAloha, New Zealand
+ - LibLime, USA
+ - 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 some cleaning
Additional Thanks To...
@@ -336,7 +356,6 @@
Regula Sebastiao
Brooke Johnson
Stephen Hedges (early Documentation Manager)
-
Nicolas Morin (French Translation in 2.0)
@@ -366,6 +385,7 @@
Translation
+<<<<<<< HEAD
- العربية (Arabic)
- አማርኛ (Amharic) Getway II Ethiopia Co. (Yohannes Mulugeta (Team Leader), Tegene Assefa, Abiyot Bayou)
- Armenian Tigran Zargaryan
@@ -441,6 +461,55 @@
=======
+=======
+العربية (Arabic)
+አማርኛ (Amharic) Getway II Ethiopia Co. (Yohannes Mulugeta (Team Leader), Tegene Assefa, Abiyot Bayou)
+Armenian Tigran Zargaryan
+Български (Bulgarian) Radoslav Kolev
+euskara (Basque) Nere Erkiaga
+বাংলা (Bengali) Parthasarathi Mukhopadhyay
+中文 (Chinese)
+Hrvatski (Croatian)
+čeština (Czech)
+Dænsk (Danish)
+Nederlands-Nederland (Dutch-The Netherlands) Sponsored by Rijksmuseum
+Nederlands-België (Dutch-Belgium)
+English
+suomi, suomen kieli (Finnish) Pasi Korkalo
+Français (French) Pascale Nalon (ENSMP) and Jean Yves Lemaire (Chatel Saint Germain)
+Galego (Galician) Ignacio Javier
+Deutsch (German) Friedrich zur Hellen, Robert Hillig, Katrin Fischer and Beda Szukics
+ελληνικά (Greek, Modern [1453- ])Georgia Katsarou, Panoraia Gaitanou
+עברית (Hebrew)
+हिन्दी (Hindi)
+Magyar (Hungarian)Agnes Imecs
+Norsk Bokmål (Norwegian) Axel Bojer and Thomas Gramstad
+Norsk Nynorsk (Norwegian) Unni Knutsen and Marit Kristine Ådland
+ArmenianTigran Zargaryan
+(Indonesian)
+Italiano (Italian) Zeno Tajoli, Pietro Gozzetti and Paolo Pozzan
+日本語 (Japanese)
+한국어 (Korean)
+ಕನ್ನಡ (kannaḍa)
+Latina (Latin)
+Lao Anousak Anthony Souphavanh
+Māori
+മലയാളം (Malayalam)
+فارسى (Persian)
+ଓଡ଼ିଆ (ōṛiyā)
+Polski (Polish)
+Português (Portuguese)
+Română (Romanian)
+Русский (Russian) Victor Titarchuk and Serhij Dubyk
+Español (Spanish) Alejandro Tiraboschi (UNC), Bernardo González Kriegel (UNC) and Martín Longo, with the help of the koha-es community.
+Español (Spanish, Venezuela) Ailé Filippi
+Svenska (Swedish)
+Tetun (Tetum) Karen Myers
+ภาษาไทย (Thai)
+Türkçe (Turkish) Selma Aslan
+اردو(Urdu) Ata ur Rehman
+Українська (Ukrainian) Victor Titarchuk and Serhij Dubyk
+>>>>>>> Bug 7143 some cleaning
--