From 21efb9016289522da1df26aeedf1efe09ebcb243 Mon Sep 17 00:00:00 2001
From: Paul Poulain <paul.poulain@biblibre.com>
Date: Fri, 27 Jan 2012 10:51:08 +0100
Subject: [PATCH] Bug 7143 about.tt indentation fixes

This patch is just about s/tab/4spaces/ & indentation fixes
---
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt |  144 +++++++++++++---------
 1 files changed, 84 insertions(+), 60 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 40e0ff3..3d415f6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -92,7 +92,7 @@
                 <li><strong><a href="http://www.ensmp.fr">ENSMP (Ecole Nationale Supérieure des Mines de Paris)</a></strong>, France (biblio frameworks, MARC authorities, OPAC basket, Serials sponsorship)</li>
                 <li><strong><a href="http://www.mediathequeouestprovence.fr/">SAN-Ouest Provence</a></strong>, France (Koha 3.0 enhancements to patrons and holds modules)</li>
                 <li>The <strong><a href="http://ccfls.org">Crawford County Federated Library System</a></strong>, PA, USA (Koha 3.0 Zebra Integration sponsorship)</li>
-				<li>The <strong><a href="http://www.geauga.lib.oh.us/">Geauga County Public Library</a></strong>, OH, USA (Koha 3.0 beta testing)</li>
+                <li>The <strong><a href="http://www.geauga.lib.oh.us/">Geauga County Public Library</a></strong>, OH, USA (Koha 3.0 beta testing)</li>
                 <li>The <strong><a href="http://library.neu.edu.tr">Near East University</a></strong>, Cyprus</li>
                 <li><strong>OPUS International Consultants</strong>, Wellington, New Zealand (Corporate Serials sponsorship)</li>
                 <li><strong><a href="http://www.famfamfam.com/">famfamfam.com</a></strong> Birmingham (UK) based developer Mark James for the famfamfam Silk iconset.</li>
@@ -102,35 +102,35 @@
             <ul>
                <li><strong>Colin Campbell</strong> (Koha 3.4 QA Manager)</li>
                <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544614260">Galen Charlton</a></strong> (Koha 3.2 Release Manager)</li>
-	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544609030">Chris Cormack</a></strong> (Koha 1.x, 3.4, 3.6 Release Manager, Koha 3.2 Translation Manager)</li>
-	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6620692210484">Frédéric Demians</a></strong>(Koha 3.4, 3.6 Translation Manager)</li>
-	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544646984">Nicole C. Engard</a></strong> (Koha 3.x Documentation Manager)</li>
-	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544609053">Joshua Ferraro</a></strong> (Koha 3.0 Release Manager &amp; Translation Manager)</li>
-	           <li><strong>Rachel Hamilton-Williams</strong> (Kaitiaki from 2004 to present)</li>
-	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544614275">Henri-Damien Laurent</a></strong> (Koha 3.0 Release Maintainer)</li>
-	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544609147">Owen Leonard</a></strong> (Koha 3.x Interface Design)</li>
+               <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544609030">Chris Cormack</a></strong> (Koha 1.x, 3.4, 3.6 Release Manager, Koha 3.2 Translation Manager)</li>
+               <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6620692210484">Frédéric Demians</a></strong>(Koha 3.4, 3.6 Translation Manager)</li>
+               <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544646984">Nicole C. Engard</a></strong> (Koha 3.x Documentation Manager)</li>
+               <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544609053">Joshua Ferraro</a></strong> (Koha 3.0 Release Manager &amp; Translation Manager)</li>
+               <li><strong>Rachel Hamilton-Williams</strong> (Kaitiaki from 2004 to present)</li>
+               <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544614275">Henri-Damien Laurent</a></strong> (Koha 3.0 Release Maintainer)</li>
+               <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544609147">Owen Leonard</a></strong> (Koha 3.x Interface Design)</li>
                <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544615991">Chris Nighswonger</a></strong> (Koha 3.2, 3.4 Release Maintainer, Koha 3.6 Release Maintainer)</li>
-	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544612249">Paul Poulain</a></strong> (Koha 2.0 Release Manager, Koha 2.2 Release Manager/Maintainer, Koha 3.8 Release Manager)</li>
-	           <li><strong><a href="http://www.ohloh.net/p/koha/contributors/6620692116417">MJ Ray</a></strong> (Koha 2.0 Release Maintainer)</li>
+               <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544612249">Paul Poulain</a></strong> (Koha 2.0 Release Manager, Koha 2.2 Release Manager/Maintainer, Koha 3.8 Release Manager)</li>
+               <li><strong><a href="http://www.ohloh.net/p/koha/contributors/6620692116417">MJ Ray</a></strong> (Koha 2.0 Release Maintainer)</li>
                 <li><strong>Ian Walls</strong> Koha 3.6 QA Manager, Koha 3.8 QA Manager</li>
                 </ul>
             <h2>Koha Development Team</h2>
-			<ul>
+            <ul>
                 <li>Md. Aftabuddin</li>
-		<li>Edward Allen</li>
+                <li>Edward Allen</li>
                 <li>Francisco M. Marzoa Alonso</li>
                 <li>Cindy Murdock Ames</li>
                 <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>Nuño López Ansótegui</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>
@@ -139,31 +139,31 @@
                 <li>Danny Bouman</li>
                 <li>Stan Brinkerhoff</li>
                 <li>Roger Buck</li>
-		<li>Steven Callender</li>
+                <li>Steven Callender</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692376789">Jared Camins-Esakov</a></li>
                 <li>Colin Campbell</li>
-		<li>Fernando Canizo</li>
-		<li>Frédérick Capovilla</li>
+                <li>Fernando Canizo</li>
+                <li>Frédérick Capovilla</li>
                 <li>DeAndre Carroll</li>
                 <li>Chris Catalfo (new plugin MARC editor)</li>
                 <li>Marc Chantreux</li>
-		<li>Jerome Charaoui</li>
+                <li>Jerome Charaoui</li>
                 <li>Andrew Chilton</li>
                 <li>Garry Collum</li>
-		<li>John Copeland</li>
-		<li>Jeremy Crabtree</li>
-		<li>Christophe Croullebois</li>
+                <li>John Copeland</li>
+                <li>Jeremy Crabtree</li>
+                <li>Christophe Croullebois</li>
                 <li>Nate Curulla</li>
                 <li>Vincent Danjean</li>
                 <li>Elliott Davis</li>
-		<li>Doug Dearden</li>
+                <li>Doug Dearden</li>
                 <li>Kip DeGraaf</li>
                 <li>Connor Dewar</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692210484">Frédéric Demians</a></li>
-		<li>Jonathan Druart</li>
-		<li>Serhij Dubyk</li>
+                <li>Jonathan Druart</li>
+                <li>Serhij Dubyk</li>
                 <li>Thomas Dukleth (MARC Frameworks Maintenance)</li>
-		<li>Frederic Durand</li>
+                <li>Frederic Durand</li>
                 <li>Sebastiaan Durand</li>
                 <li>Ecole des Mines de Saint Etienne, Philippe Jaillon (OAI-PMH support)</li>
                 <li>Stephen Edwards</li>
@@ -171,24 +171,24 @@
                 <li>Brian Engard</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544677502">Magnus Enger</a></li>
                 <li>Esiee School (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)</li>
-		<li>Shaun Evans</li>
+                <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><a href="https://www.ohloh.net/p/koha/contributors/6618544670742">Katrin Fischer</a></li>
                 <li>Clay Fouts</li>
-		<li>Claudia Forsman</li>
+                <li>Claudia Forsman</li>
                 <li>Marco Gaiarin</li>
                 <li>Pierrick Le Gall</li>
                 <li>Brendan A. Gallagher</li>
                 <li>Tumer Garip</li>
                 <li>Russel Garlick</li>
-		<li>Mark Gavillet</li>
+                <li>Mark Gavillet</li>
                 <li>Daniel Kahn Gillmor</li>
                 <li>David Goldfein</li>
                 <li>Daniel Grobani</li>
                 <li>Amit Gupta</li>
                 <li>Michael Hafen</li>
-		<li>Christopher Hall</li>
+                <li>Christopher Hall</li>
                 <li>Mike Hansen</li>
                 <li>Brian Harrington</li>
                 <li>Friedrich zur Hellen</li>
@@ -196,7 +196,7 @@
                 <li>Wolfgang Heymans</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544614261">Ryan Higgins</a></li>
                 <li>Sèbastien Hinderer</li>
-		<li>Stephanie Hogan</li>
+                <li>Stephanie Hogan</li>
                 <li>Daniel Holth</li>
                 <li>Andrew Hooper</li>
                 <li>Matthew Hunt</li>
@@ -207,9 +207,9 @@
                 <li><a href="https://www.ohloh.net/accounts/kohaaloha">Mason James</a></li>
                 <li>Mike Johnson</li>
                 <li>Donovan Jones</li>
-		<li>Janusz Kaczmarek</li>
+                <li>Janusz Kaczmarek</li>
                 <li>Koustubha Kale</li>
-		<li>Ulrich Kleiber</li>
+                <li>Ulrich Kleiber</li>
                 <li>Arnaud Laurin</li>
                 <li>Ambrose Li (translation tool)</li>
                 <li>Gynn Lomax</li>
@@ -218,24 +218,24 @@
                 <li>Jesse Maseto</li>
                 <li>Frère Sébastien Marie</li>
                 <li>Ricardo Dias Marques</li>
-		<li>Julian Maurice</li>
+                <li>Julian Maurice</li>
                 <li>Brig C. McCoy</li>
                 <li>Dorian Meid (German translation)</li>
-		<li>Meenakshi. R</li>
+                <li>Meenakshi. R</li>
                 <li>Matthias Meusburger</li>
-		<li>Sophie Meynieux</li>
+                <li>Sophie Meynieux</li>
                 <li>Alan Millar</li>
                 <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>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>Albert Oller</li>
+                <li>Eric Olsen</li>
+                <li>H. Passini</li>
+                <li>Dobrica Pavlinusic</li>
+                <li>Maxime Pelletier</li>
                 <li>Polytechnic University</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692116417">MJ Ray</a></li>
                 <li>Liz Rea</li>
@@ -244,54 +244,60 @@
                 <li>Serge Renaux</li>
                 <li>Waylon Robertson</li>
                 <li>Marcel de Rooy</li>
-		<li>Salvador Zaragoza Rubio</li>
-		<li>Brice Sanchez</li>
-		<li>Sam Sanders</li>
+                <li>Salvador Zaragoza Rubio</li>
+                <li>Brice Sanchez</li>
+                <li>Sam Sanders</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544619438">Robin Sheat</a></li>
-		<li>John Seymour</li>
-		<li>Juan Romay Sieira</li>
-		<li>Zach Sim</li>
+                <li>John Seymour</li>
+                <li>Juan Romay Sieira</li>
+                <li>Zach Sim</li>
                 <li>Savitra Sirohi</li>
                 <li>Pawel Skuza (Polish for 1.2)</li>
                 <li>Fridolyn Somers</li>
                 <li>Southeastern University</li>
                 <li>Glen Stewart</li>
-		<li>Will Stokes</li>
+                <li>Will Stokes</li>
                 <li>David Strainchamps</li>
                 <li>Ed Summers (Some code and Perl packages like MARC::Record)</li>
                 <li>Daniel Sweeney</li>
                 <li>Zeno Tajoli</li>
                 <li>Adam Thick</li>
-	        <li><a href="https://www.ohloh.net/p/koha/contributors/6618544609107">Finlay Thompson</a></li>
+                <li><a href="https://www.ohloh.net/p/koha/contributors/6618544609107">Finlay Thompson</a></li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692101577">Steve Tonnesen (early MARC work, Virtual Bookshelves concept, KohaCD)</a></li>
                 <li>Bruno Toumi</li>
                 <li>Andrei V. Toutoukine</li>
                 <li>Darrell Ulm</li>
                 <li>Universidad ORT Uruguay (Ernesto Silva, Andres Tarallo)</li>
+<<<<<<< HEAD
                 <li>Aleksa Vujicic</li>
 		<li>Reed Wade</li>
 		<li>Ian Walls</li>
+=======
+                <li>Reed Wade</li>
+                <li>Ian Walls</li>
+>>>>>>> Bug 7143 about.tt indentation fixes
                 <li><a href="http://www.ohloh.net/accounts/janewagner">Jane Wagner</a></li>
-		<li>Ward van Wanrooij</li>
+                <li>Ward van Wanrooij</li>
                 <li><a href="https://www.ohloh.net/accounts/pianohacker">Jesse Weaver</a></li>
                 <li>Rick Welykochy</li>
-		<li>Piotr Wejman</li>
+                <li>Piotr Wejman</li>
                 <li>Ron Wickersham</li>
-		<li>Brett Wilkins</li>
+                <li>Brett Wilkins</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692127299">Olwen Williams (Database design and data extraction for Koha 1.0)</a></li>
                 <li>James Winter</li>
                 <li>Lars Wirzenius</li>
-			</ul>
+            </ul>
             <h3>Contributing Companies and Institutions</h3>
             <ul>
                 <li><strong>BibLibre</strong>, France</li>
                 <li><strong>Bibliotheksservice-Zentrum Baden-Württemberg (BSZ)</strong>, Germany</li>
-		<li><strong>ByWater Solutions</strong>, USA</li>
-		<li><strong>Calyx</strong>, Australia</li>
-		<li><strong>Catalyst IT</strong>, New Zealand</li>
+                <li><strong>ByWater Solutions</strong>, USA</li>
+                <li><strong>Calyx</strong>, Australia</li>
+                <li><strong>Catalyst IT</strong>, New Zealand</li>
                 <li><strong>Katipo Communications</strong>, New Zealand</li>
                 <li><strong>KohaAloha</strong>, New Zealand</li>
                 <li><strong>LibLime</strong>, USA</li>
+<<<<<<< HEAD
                 <li><strong>Libriotech</strong>, Norway</li>
 		<li><strong>Nelsonville Public Library</strong>, Ohio, USA</li>
 		<li><strong>PTFS</strong>, Maryland, USA</li>
@@ -301,14 +307,25 @@
 		<li><strong>Software Coop</strong>, United Kingdom</li>
 		<li><strong>Tamil</strong>, France</li>
 		<li><strong>Xercode</strong>, Spain</li>
+=======
+                <li><strong>Libriotech</strong>, Norway</li> 
+                <li><strong>Nelsonville Public Library</strong>, Ohio, USA</li>
+                <li><strong>PTFS</strong>, Maryland, USA</li>
+                <li><strong>PTFS Europe Ltd</strong>, United Kingdom</li>
+                <li><strong>Rijksmuseum</strong>, Amsterdam, The Netherlands</li>
+                <li><strong>SAN-Ouest Provence</strong>, France</li>
+                <li><strong>Software Coop</strong>, United Kingdom</li>
+                <li><strong>Tamil</strong>, France</li>
+                <li><strong>Xercode</strong>, Spain</li>
+>>>>>>> Bug 7143 about.tt indentation fixes
             </ul>
 
             <h2>Additional Thanks To...</h2>
             <ul>
-	    <li>Jo Ransom</li>
+                <li>Jo Ransom</li>
                 <li>Nicholas Rosasco, (Documentation Compiler)</li>
                 <li>Regula Sebastiao</li>
-		<li>Brooke Johnson</li>
+                <li>Brooke Johnson</li>
                 <li>Stephen Hedges (early Documentation Manager)</li>
                 <li>Nicolas Morin (French Translation in 2.0)</li>
             </ul>
@@ -387,6 +404,7 @@
 <li><strong>T&uuml;rk&ccedil;e (Turkish)</strong> Selma Aslan</li>
 <li><strong>&#1575;&#1585;&#1583;&#1608;(Urdu)</strong> Ata ur Rehman</li>
 <li><strong>&#1059;&#1082;&#1088;&#1072;&#1111;&#1085;&#1089;&#1100;&#1082;&#1072; (Ukrainian)</strong> Victor Titarchuk and Serhij Dubyk</li>
+<<<<<<< HEAD
             </ul>
 
         </div>
@@ -413,5 +431,11 @@
 
     </div>
 
+=======
+</ul>
+
+</div>
+</div>
+>>>>>>> Bug 7143 about.tt indentation fixes
 </div></div></div>
 [% INCLUDE 'intranet-bottom.inc' %]
-- 
1.7.5.4