Merge branch 'bug_8942' into 3.12-master

[koha_ffzg] / koha-tmpl / intranet-tmpl / prog / en / modules / about.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 17fd1e8..d862fd2 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -177,14 +177,14 @@
                 <li>Richard Anderson</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692181851">Nahuel Angelinetti</a></li>
                 <li>Nuño López Ansótegui</li>
-             <li>Tomás Cohen Arazi</li>
+                <li>Tomás Cohen Arazi</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692124662">Andrew Arensburger (the small and great C4::Context module)</a></li>
                 <li>Alex Arnaud</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544614259">Joe Atzberger</a></li>
                 <li>Larry Baerveldt</li>
                 <li>Al Banks</li>
                 <li>Daniel Banzli</li>
-                 <li>Greg Barniskis</li>
+                <li>Greg Barniskis</li>
                 <li>Benedykt P. Barszcz (Polish for 2.0)</li>
                 <li>D Ruth Bavousett</li>
                 <li>John Beppu</li>
@@ -212,6 +212,7 @@
                 <li>Christophe Croullebois</li>
                 <li>Nate Curulla</li>
                 <li>Vincent Danjean</li>
+                <li>Hugh Davenport</li>
                 <li>Elliott Davis</li>
                 <li>Doug Dearden</li>
                 <li>Kip DeGraaf</li>
@@ -232,9 +233,11 @@
                 <li>Shaun Evans</li>
                 <li>Pat Eyler (Kaitiaki from 2002 to 2004)</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544609865">Antoine Farnault</a></li>
+                <li>Vitor Fernandes</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544670742">Katrin Fischer</a></li>
                 <li>Clay Fouts</li>
                 <li>Claudia Forsman</li>
+                <li>Corey Fuimaono</li>
                 <li>Marco Gaiarin</li>
                 <li>Pierrick Le Gall</li>
                 <li>Brendan A. Gallagher</li>
@@ -243,6 +246,7 @@
                 <li>Mark Gavillet</li>
                 <li>Daniel Kahn Gillmor</li>
                 <li>David Goldfein</li>
+                <li>Bernardo Gonzalez Kriegel</li>
                 <li>Daniel Grobani</li>
                 <li>Amit Gupta</li>
                 <li>Michael Hafen</li>
@@ -289,17 +293,19 @@
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544607803">Andrew Moore</a></li>
                 <li>Sharon Moreland</li>
                 <li>Nicolas Morin</li>
-                 <li>Mike Mylonas</li>
-                 <li>Joy Nelson</li>
+                <li>Mike Mylonas</li>
+                <li>Nadia Nicolaides</li>
+                <li>Joy Nelson</li>
                 <li><a href="https://www.ohloh.net/accounts/cnighswonger">Chris Nighswonger</a></li>
                 <li>Albert Oller</li>
                 <li>Eric Olsen</li>
                 <li>H. Passini</li>
                 <li>Dobrica Pavlinusic</li>
                 <li>Maxime Pelletier</li>
-                <li>Polytechnic University</li>
                 <li>Shari Perkins</li>
-                <li>Meenakshi.R</li>
+                <li>Fred Pierre</li>
+                <li>Polytechnic University</li>
+                <li>Romina Racca</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692116417">MJ Ray</a></li>
                 <li>Liz Rea</li>
                 <li>Thatcher Rea</li>
@@ -362,7 +368,9 @@
                 <li>ByWater Solutions, USA</li>
                 <li>Calyx, Australia</li>
                 <li>Catalyst IT, New Zealand</li>
+                <li>C &amp; P Bibliography Services, USA</li>
                 <li>Katipo Communications, New Zealand</li>
+                <li>KEEP SOLUTIONS, Portugal</li>
                 <li>KohaAloha, New Zealand</li>
                 <li>LibLime, USA</li>
                 <li>Libriotech, Norway</li>
@@ -371,7 +379,7 @@
                 <li>PTFS Europe Ltd, United Kingdom</li>
                 <li>Rijksmuseum, Amsterdam, The Netherlands</li>
                 <li>SAN-Ouest Provence, France</li>
-                <li>Software Coop, United Kingdom</li>
+                <li>software.coop, United Kingdom</li>
                 <li>Tamil, France</li>
                 <li>Xercode, Spain</li>
             </ul>
@@ -460,7 +468,7 @@
 <li>Fran&ccedil;ais (French) <a href="http://www.koha-fr.org/category/tags/association">Kohala</a>, Pascale Nalon (ENSMP), and many more </li>
 <li>Galego (Galician) Ignacio Javier</li>
 <li>Deutsch (German) Friedrich zur Hellen, Robert Hillig, Katrin Fischer, Beda Szukics, Mirko Tietgen and Marc Véron</li>
-<li>&#949;&#955;&#955;&#951;&#957;&#953;&#954;&#940; (Greek, Modern [1453- ])Georgia Katsarou, Panoraia Gaitanou</li>
+<li>&#949;&#955;&#955;&#951;&#957;&#953;&#954;&#940; (Greek, Modern [1453- ]) Georgia Katsarou, Panoraia Gaitanou and Kiriaki Roditi</li>
 <li>&#1506;&#1489;&#1512;&#1497;&#1514; (Hebrew)</li>
 <li>&#2361;&#2367;&#2344;&#2381;&#2342;&#2368; (Hindi)</li>
 <li>Magyar (Hungarian)Agnes Imecs</li>