From 1d3e9476132be6c488d5d099c6f0bf9ea5da9d5f Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Fri, 6 Feb 2004 14:10:06 +0000
Subject: [PATCH] template fixes for translation

---
 koha-tmpl/intranet-tmpl/default/en/auth.tmpl  |   2 +-
 .../intranet-tmpl/default/en/default.tmpl     |   2 +-
 .../default/en/marcimport/AcceptItemCopy.tmpl |   2 +-
 .../en/marcimport/marcimportdetail.tmpl       |   2 +-
 .../default/en/member-flags.tmpl              |   2 +-
 .../default/en/members/imemberentry.tmpl      |   2 +-
 .../default/en/members/jmemberentry.tmpl      |   2 +-
 .../default/en/members/member-password.tmpl   |   2 +-
 .../default/en/members/member.tmpl            |   2 +-
 .../default/en/members/memberentry.tmpl       |  11 +-
 .../default/en/members/moremember.tmpl        |   2 +-
 .../default/en/members/readingrec.tmpl        |   2 +-
 .../intranet-tmpl/default/en/modbibitem.tmpl  |   4 +-
 .../intranet-tmpl/default/en/newimember.tmpl  |   2 +-
 .../intranet-tmpl/default/en/newjmember.tmpl  |   2 +-
 .../intranet-tmpl/default/en/newmember.tmpl   |   8 +-
 .../intranet-tmpl/default/en/opac-main.tmpl   | 268 +++++++++---------
 .../default/en/parameters/aqbudget.tmpl       |   4 +-
 .../en/parameters/authorised_values.tmpl      |   3 +-
 .../default/en/parameters/branches.tmpl       |   5 +-
 .../default/en/parameters/categorie.tmpl      |  35 ++-
 .../default/en/parameters/categoryitem.tmpl   |   4 +-
 .../default/en/parameters/charges.tmpl        |   5 +-
 .../default/en/parameters/currency.tmpl       |   6 +-
 .../default/en/parameters/itemtypes.tmpl      |  17 +-
 .../default/en/parameters/koha2marclinks.tmpl |   2 +-
 .../parameters/marc_subfields_structure.tmpl  |   9 +-
 .../default/en/parameters/printers.tmpl       |   2 +-
 .../default/en/parameters/thesaurus.tmpl      |   4 +-
 .../default/en/parameters/z3950servers.tmpl   |   4 +-
 .../intranet-tmpl/default/en/request.tmpl     |  11 +-
 .../default/en/search.marc/search.tmpl        |  11 +-
 .../intranet-tmpl/default/en/shelves.tmpl     | 169 ++++++-----
 33 files changed, 328 insertions(+), 280 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/default/en/auth.tmpl b/koha-tmpl/intranet-tmpl/default/en/auth.tmpl
index 79aa7a2333..091cb0fbf0 100644
--- a/koha-tmpl/intranet-tmpl/default/en/auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/auth.tmpl
@@ -34,7 +34,7 @@
 
     <table border="0" bgcolor="#dddddd" cellpadding="10" cellspacing="0">
     <tr><th colspan="2"><font size="+2">Koha Login</font></th></tr>
-    <tr><td>Cardnumber:</td><td><input name="userid"></td></tr>
+    <tr><td>Card number:</td><td><input name="userid"></td></tr>
     <tr><td>Password:</td><td><input type="password" name="password"></td></tr>
     <tr><td colspan="2" align="center"><input type="submit" value="login"></td></tr>
     </table>
diff --git a/koha-tmpl/intranet-tmpl/default/en/default.tmpl b/koha-tmpl/intranet-tmpl/default/en/default.tmpl
index b70b19271a..468a58c597 100644
--- a/koha-tmpl/intranet-tmpl/default/en/default.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/default.tmpl
@@ -23,6 +23,6 @@
 </td></tr>
 </table>
 <br>
-Results <!-- TMPL_VAR NAME="startfrom" --> through <!-- TMPL_VAR NAME="endat" --> of <!-- TMPL_VAR NAME="numrecords" --> records.
+Results <i><!-- TMPL_VAR NAME="startfrom" --></i> through </i><!-- TMPL_VAR NAME="endat" --></i> of <i><!-- TMPL_VAR NAME="numrecords" --></i> records.
 <hr>
 <!-- TMPL_INCLUDE NAME="/usr/share/koha/intranet/htdocs/includes/cat-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptItemCopy.tmpl b/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptItemCopy.tmpl
index ffbf175c74..2e51f09a3d 100644
--- a/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptItemCopy.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptItemCopy.tmpl
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <center>
 <!-- TMPL_IF name="BARCODE_EXISTS" -->
-	<font color=red>Barcode '<!-- TMPL_VAR name="barcode" -->' has already been assigned.</font><p>
+	<font color=red>Barcode <b><!-- TMPL_VAR name="barcode" --></b> has already been assigned.</font><p>
 <!-- /TMPL_IF -->
 <!-- TMPL_IF name="ITEM_ERROR" -->
 	<font color=red>Error : <!-- TMPL_VAR name="error" --></font><p>
diff --git a/koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl b/koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl
index d83713b9ad..82cd9d2f8b 100644
--- a/koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl
@@ -24,7 +24,7 @@ Full MARC Record available at bottom
 	<tr bgcolor="#dddddd"><td>Volume Description</td><td><input type="text" name="volumedesc" value="<!-- TMPL_VAR NAME="volumeddesc" -->" size=40 maxlenght=255></td></tr>
 	<tr bgcolor="#ddaaaa"><td>Subject</td><td><input type="text" name="subject" value="<!-- TMPL_VAR NAME="subject" -->" size=40 maxlenght=255></td></tr>
 	<tr bgcolor="#dddddd"><td>Notes</td><td><input type="text" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" size=40 maxlenght=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Item Type</td><td><select name=itemtype>$itemtypeselect</select></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Item type</td><td><select name=itemtype>$itemtypeselect</select></td></tr>
 	<tr bgcolor="#dddddd"><td>ISBN</td><td><input type="text" name="isbn" value="<!-- TMPL_VAR NAME="isbn" -->" size=40 maxlenght=40></td></tr>
 	<tr bgcolor="#ddaaaa"><td>ISSN</td><td><input type="text" name="issn" value="<!-- TMPL_VAR NAME="issn" -->" size=40 maxlenght=40></td></tr>
 	<tr bgcolor="#dddddd"><td>LCCN</td><td><input type="text" name="lccn" value="<!-- TMPL_VAR NAME="lccn" -->" size=40 maxlenght=40></td></tr>
diff --git a/koha-tmpl/intranet-tmpl/default/en/member-flags.tmpl b/koha-tmpl/intranet-tmpl/default/en/member-flags.tmpl
index a7329b85b4..bcb1751818 100644
--- a/koha-tmpl/intranet-tmpl/default/en/member-flags.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/member-flags.tmpl
@@ -22,7 +22,7 @@
 	</table>
 
 	<p>
-	<input type=submit value="Set Flags">
+	<input type=submit value="Set Flags" class="button">
 </form>
 
 <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl
index bcb580ca7d..66b1250cec 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl
@@ -21,7 +21,7 @@
 
     <tr align=right>
       <td COLSPAN=2 ALIGN=RIGHT><font size=3 face='arial,helvetica'>
-        <STRONG>Member# <!-- TMPL_VAR NAME="member" -->, Card Number*</STRONG>
+        <STRONG>Member# <!-- TMPL_VAR NAME="member" -->, Card number*</STRONG>
       </TD>
       <TD align=right><input type=text name=cardnumber_institution size=20 value=<!-- TMPL_VAR NAME=cardnumber_institution -->><br></td>
     </TR>
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl
index cb520d7c33..a228eaafa8 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl
@@ -52,7 +52,7 @@
 	</TR>
 	<TR>
 		<td  COLSPAN=4   ALIGN=RIGHT ><font size=3 face='arial,helvetica'>
-			<STRONG>Member# <!-- TMPL_VAR NAME=cmember --></STRONG>, <b>Card Number*</b></STRONG>
+			<STRONG>Member# <!-- TMPL_VAR NAME=cmember --></STRONG>, <b>Card number*</b></STRONG>
 		</TD>
 		<TD>
 			<input type=text name=cardnumber_child_<!-- TMPL_VAR NAME=i --> size=20 value="<!-- TMPL_VAR NAME=jcardnumber -->"><br>
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl
index f07c95fb22..885ee3401a 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl
@@ -15,7 +15,7 @@ Click <a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR NAME=member -->"
 	New UserID: <input name=newuserid size=20 value=<!-- TMPL_VAR NAME=userid -->> <br>
 	New Password: <input name=newpassword size=20 value=<!-- TMPL_VAR NAME=defaultnewpassword -->>
 	<p>
-	<input type=submit value="Confirm Password">
+	<input type=submit value="Confirm Password" class="button">
 	</form>
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl
index 682c4492ed..61474ae1f9 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl
@@ -41,7 +41,7 @@ You Searched for <!-- TMPL_VAR NAME=member --><p>
 </table>
 
 <form action=/cgi-bin/koha/simpleredirect.pl method=post>
-<input type=submit class="button" value="Add Member" title="Add Member" alt="Add Member">
+<input type=submit class="button" value="Add member" title="Add member" alt="Add member">
 <INPUT TYPE="radio" name="chooseform" value="adult" checked>Adult
 <INPUT TYPE="radio" name="chooseform" value="organisation" >Organisation
 </form>
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
index 3a780af3ad..52fa57760f 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
@@ -1,12 +1,15 @@
 <!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
-<h1>
 <!-- TMPL_IF NAME=addAction -->
-	Add Member
+<h1>
+	Add member
+</h1>
 <!-- TMPL_ELSE -->
+<h1>
 	Update Member Details
+</h1>
 <!-- /TMPL_IF -->
-</h1><br>
+<br>
 
 <form action=/cgi-bin/koha/newmember.pl method=post>
 	<input type=hidden name=joining value="<!-- TMPL_VAR NAME=dateenrolled -->">
@@ -19,7 +22,7 @@
 
 	<tr valign=top>
 		<td COLSPAN=2><input type=reset value="Clear all Fields"></td>
-		<td COLSPAN=3 ALIGN=RIGHT><font size=4 face='arial,helvetica'>Member# <!-- TMPL_VAR NAME=member -->, Card Number* <input type=text name=cardnumber size=10 value="<!-- TMPL_VAR NAME=cardnumber -->"><br></td>
+		<td COLSPAN=3 ALIGN=RIGHT><font size=4 face='arial,helvetica'>Member# <!-- TMPL_VAR NAME=member -->, Card number* <input type=text name=cardnumber size=10 value="<!-- TMPL_VAR NAME=cardnumber -->"><br></td>
 	</tr>
 
 	<tr valign=top>
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
index 59e8a842fb..96ac97a22a 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
@@ -14,7 +14,7 @@
 	<tr VALIGN=TOP  >
 	<TD>
 		<FONT SIZE=2  face="arial, helvetica"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF name="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF --><p>
-		Card Number: <!-- TMPL_VAR NAME="cardnumber" --><BR>
+		Card number: <!-- TMPL_VAR NAME="cardnumber" --><BR>
 		Postal Address: <!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR name="zipcode" --> <!-- TMPL_VAR NAME="city" --><BR>
 		<!-- TMPL_UNLESS name="I" -->Home Address: <!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR name="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><BR>
 		Phone home: <!-- TMPL_VAR NAME="phone" --><BR><!-- /TMPL_UNLESS -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl
index a1510b8a1f..4191a87d96 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl
@@ -2,7 +2,7 @@
 
 <h1><!-- TMPL_VAR NAME=firstname --> <!-- TMPL_VAR NAME=surname --></h1>
 <br>Member Number: <!-- TMPL_VAR NAME=bornum -->
-<br>Card Number: <!-- TMPL_VAR NAME=cardnumber -->
+<br>Card number: <!-- TMPL_VAR NAME=cardnumber -->
 <P>
 <!-- TMPL_IF NAME=showfulllink -->
 <a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&limit=full">Full output</a>
diff --git a/koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl b/koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl
index 4b0259bba5..6bbee7baa5 100755
--- a/koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl
@@ -23,7 +23,7 @@ Modify Group - <!-- TMPL_VAR Name="description" --></h1><br>
 			<TD  bgcolor="99cc33" background="/images/background-mem.gif" colspan=2 ><b><input type=radio name=existing value=NO checked >OR MODIFY DETAILS</b></td>
 		</tr>
 
-		<tr valign=top bgcolor=white><td>Item Type</td><td><input type=text name=Item Type value="<!-- TMPL_VAR Name="itemtype" -->" size=20></td></tr>
+		<tr valign=top bgcolor=white><td>Item type</td><td><input type=text name=Item Type value="<!-- TMPL_VAR Name="itemtype" -->" size=20></td></tr>
 
 		<tr valign="top" bgcolor="white">
 			<td>URL</td>
@@ -76,7 +76,7 @@ Modify Group - <!-- TMPL_VAR Name="description" --></h1><br>
 			<td background="/images/background-mem.gif">Barcode</td>
 			<td background="/images/background-mem.gif">Location</td>
 			<td background="/images/background-mem.gif">Date Due</td>
-			<td background="/images/background-mem.gif">Last Seen</td>
+			<td background="/images/background-mem.gif">Last seen</td>
 		</tr>
 
 		<!-- TMPL_LOOP Name="itemloop" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/newimember.tmpl b/koha-tmpl/intranet-tmpl/default/en/newimember.tmpl
index c5fb447547..165ce20669 100644
--- a/koha-tmpl/intranet-tmpl/default/en/newimember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/newimember.tmpl
@@ -36,7 +36,7 @@
 		</tr>
 		<tr valign=top bgcolor="white" >
 			<td>
-				<B>Card Number</B>
+				<B>Card number</B>
 			</td>
 			<td>
 				<!-- TMPL_VAR Name="cardnumber_institution" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/newjmember.tmpl b/koha-tmpl/intranet-tmpl/default/en/newjmember.tmpl
index 99d303238b..5fc80f0b42 100644
--- a/koha-tmpl/intranet-tmpl/default/en/newjmember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/newjmember.tmpl
@@ -41,7 +41,7 @@
 				</tr>
 				<tr valign=top bgcolor="white" >
 					<td>
-					<B>Date Of Birth</B>
+					<B>Date of birth</B>
 					</td>
 					<td>
 					<!-- TMPL_VAR Name="dob" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl b/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl
index 479958b156..74cec79e68 100644
--- a/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl
@@ -31,7 +31,7 @@
 		</tr>
 		<tr valign=top bgcolor="white" >
 			<td>
-				<B>Card Number</B>
+				<B>Card number</B>
 			</td>
 			<td>
 				<!-- TMPL_VAR Name="cardnum" -->
@@ -84,7 +84,7 @@
 		</tr>
 		<tr valign=top bgcolor="white" >
 			<td>
-				<B>Date Of Birth</B>
+				<B>Date of birth</B>
 			</td>
 			<td>
 				<!-- TMPL_VAR Name="dob" -->
@@ -229,10 +229,10 @@
 	<h1>ERROR</H1>
 	<p>The following fields have a forbidden value. Please push the back button and try again : </p>
 	<!-- TMPL_IF name="cardnumber" -->
-		Cardnumber<br/>
+		Card number<br/>
 	<!-- /TMPL_IF -->
 	<!-- TMPL_IF name="invalid_cardnumber" -->
-		Invalid_cardnumber<br/>
+		Invalid cardnumber<br/>
 	<!-- /TMPL_IF -->
 	<!-- TMPL_IF name="gender" -->
 		Gender<br/>
diff --git a/koha-tmpl/intranet-tmpl/default/en/opac-main.tmpl b/koha-tmpl/intranet-tmpl/default/en/opac-main.tmpl
index 0b9283e370..1ac6eff20f 100644
--- a/koha-tmpl/intranet-tmpl/default/en/opac-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/opac-main.tmpl
@@ -1,134 +1,134 @@
-<HTML>
-<TITLE>WELCOME TO THE  KOHA OPAC </TITLE>
-
-
-<style type="text/css">
-<!--
-input{font-size:16px}
--->
-
-</style>
-
-
-</HEAD>
-
-<BODY   onload="document.catsearch.keyword.focus()"
-	BGCOLOR="#339999" 
-	text="black" 
-	link="white" 
-	vlink="white" 
-	alink="#663366" 
-	leftmargin=0 
-	topmargin=0
-	marginheight=0
-	marginwidth=0 >
-
-<center>
-<table cellspacing=0 cellpadding=0 border=0 >
-	
-  <tr valign=top >
-	<td background="/images/front-background-med.gif"><img src="/images/holder.gif" 
-	width=1 height=440 align=left alt=" " hspace=0 vspace=0><table
-cellspacing=0 cellpadding=0 border=0 >
-	
-  <tr valign=top >
-	<td background=" "><img src="/images/holder.gif" width=228 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=57 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=47 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=1 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=1 height=88 
-	alt=" " hspace=0 vspace=0></td>
-  </tr>
-
-  <tr valign=top >
-	<td background=" " rowspan=2 align="right" colspan=2><img src="/images/holder.gif"
- 	width=1 height=30
-	alt=" " hspace=0 vspace=0><br>
-	<img src="/images/koha.gif" width=200 height=128
-	alt="Koha: Horowhenua Library Trust Catalogue and Member Services" hspace=0 vspace=0></td>
-
-	<td background=" "  colspan=3><font size=+2><a href="/cgi-bin/koha/catalogue-home.pl"><img src="/images/heading-search.gif" width=272 	height=38
-	alt="Search the Catalogue" hspace=0 vspace=0 border=0></a></font></td>
-
-  </tr>
-
-
-<tr valign=top >
-	<td>&nbsp; &nbsp; </td>
-	<FORM ACTION="/cgi-bin/koha/search.pl" name=catsearch>
-	<input type=hidden name=type value=opac>
-	<td background=" " >
-
-	<input type=text size="27" name="keyword"><br>
-	</font>
-	<b>Type in the box and press the enter 			key.</b><br>
-	<a href="/cgi-bin/koha/catalogue-home.pl">
-      
-	<img src="/images/front-arrow.gif" width=27 height=22
-	alt="-" hspace=0 vspace=0 border=0 align=middle >Advanced Search (More Options)</a><br>
-
-	<img src="/images/holder.gif" width=1 height=8
-	alt=" " hspace=0 vspace=0>
-	<p>
-	<!-- TMPL_IF NAME="loggedinuser" -->
-	    <p align=left>Logged in as: <!-- TMPL_VAR NAME="loggedinuser" --> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
-	<!-- TMPL_ELSE -->
-	    <p align=left><a href=/cgi-bin/koha/userpage.pl>Log In</a> to Koha</p>
-	<!-- /TMPL_IF -->
-	</td>
-	</form>
-  </tr>
-
-
- 
-
-<!--
-  <tr valign=top ><form action="/cgi-bin/member.pl" method=get >
-	<td background=" "  colspan=3><img src="/images/heading-login.gif" width=279 		height=38
-	alt="Member Login" hspace=0 vspace=0 border=0></td>
-
-  </tr>
-<tr valign=top >
-        <td></td>
-	<form action="/cgi-bin/member.pl" method=get >
-	<td background=" " >
-	<font size=3 face="arial narrow,arial,helvetica">Card Number &nbsp;</font></td>
-	<td background=" " ><input type=text size="12" name="card"></td>
-
-  </tr>
-
-  <tr valign=top><td></td>
-	<td></td>
-	<td></td>
-	<td background=" " >
-	<font size=3 face="arial narrow,arial,helvetica">Password</font></td>
-	<td background=" " ><input type=password size="12" name="password"><br>
-	<input type=submit value="OK"><br>
-
-	<img src="/images/holder.gif" width=1 height=8
-	alt=" " hspace=0 vspace=0></td>
-	</font>
- </tr>
-
-  <tr valign=top >
-	<td></td>
-	<td background=" " colspan=4><A href="join.html"><img src="/images/heading-member.gif" width=331 		height=38
-	alt="Become a Website Member" hspace=0 vspace=0 border=0></a>
-	</td>
-	<td>
-	</td>
-
-  </tr>
-
--->
-</table>
-
-</td>
-  </tr>
-</table>
-<p>
-</center>
+<HTML>
+<TITLE>WELCOME TO THE  KOHA OPAC </TITLE>
+
+
+<style type="text/css">
+<!--
+input{font-size:16px}
+-->
+
+</style>
+
+
+</HEAD>
+
+<BODY   onload="document.catsearch.keyword.focus()"
+	BGCOLOR="#339999" 
+	text="black" 
+	link="white" 
+	vlink="white" 
+	alink="#663366" 
+	leftmargin=0 
+	topmargin=0
+	marginheight=0
+	marginwidth=0 >
+
+<center>
+<table cellspacing=0 cellpadding=0 border=0 >
+	
+  <tr valign=top >
+	<td background="/images/front-background-med.gif"><img src="/images/holder.gif" 
+	width=1 height=440 align=left alt=" " hspace=0 vspace=0><table
+cellspacing=0 cellpadding=0 border=0 >
+	
+  <tr valign=top >
+	<td background=" "><img src="/images/holder.gif" width=228 height=88 
+	alt=" " hspace=0 vspace=0></td>
+	<td background=" "><img src="/images/holder.gif" width=57 height=88 
+	alt=" " hspace=0 vspace=0></td>
+	<td background=" "><img src="/images/holder.gif" width=47 height=88 
+	alt=" " hspace=0 vspace=0></td>
+	<td background=" "><img src="/images/holder.gif" width=1 height=88 
+	alt=" " hspace=0 vspace=0></td>
+	<td background=" "><img src="/images/holder.gif" width=1 height=88 
+	alt=" " hspace=0 vspace=0></td>
+  </tr>
+
+  <tr valign=top >
+	<td background=" " rowspan=2 align="right" colspan=2><img src="/images/holder.gif"
+ 	width=1 height=30
+	alt=" " hspace=0 vspace=0><br>
+	<img src="/images/koha.gif" width=200 height=128
+	alt="Koha: Horowhenua Library Trust Catalogue and Member Services" hspace=0 vspace=0></td>
+
+	<td background=" "  colspan=3><font size=+2><a href="/cgi-bin/koha/catalogue-home.pl"><img src="/images/heading-search.gif" width=272 	height=38
+	alt="Search the Catalogue" hspace=0 vspace=0 border=0></a></font></td>
+
+  </tr>
+
+
+<tr valign=top >
+	<td>&nbsp; &nbsp; </td>
+	<FORM ACTION="/cgi-bin/koha/search.pl" name=catsearch>
+	<input type=hidden name=type value=opac>
+	<td background=" " >
+
+	<input type=text size="27" name="keyword"><br>
+	</font>
+	<b>Type in the box and press the enter 			key.</b><br>
+	<a href="/cgi-bin/koha/catalogue-home.pl">
+      
+	<img src="/images/front-arrow.gif" width=27 height=22
+	alt="-" hspace=0 vspace=0 border=0 align=middle >Advanced Search (More Options)</a><br>
+
+	<img src="/images/holder.gif" width=1 height=8
+	alt=" " hspace=0 vspace=0>
+	<p>
+	<!-- TMPL_IF NAME="loggedinuser" -->
+	    <p align=left>Logged in as: <!-- TMPL_VAR NAME="loggedinuser" --> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
+	<!-- TMPL_ELSE -->
+	    <p align=left><a href=/cgi-bin/koha/userpage.pl>Log In</a> to Koha</p>
+	<!-- /TMPL_IF -->
+	</td>
+	</form>
+  </tr>
+
+
+ 
+
+<!--
+  <tr valign=top ><form action="/cgi-bin/member.pl" method=get >
+	<td background=" "  colspan=3><img src="/images/heading-login.gif" width=279 		height=38
+	alt="Member Login" hspace=0 vspace=0 border=0></td>
+
+  </tr>
+<tr valign=top >
+        <td></td>
+	<form action="/cgi-bin/member.pl" method=get >
+	<td background=" " >
+	<font size=3 face="arial narrow,arial,helvetica">Card number &nbsp;</font></td>
+	<td background=" " ><input type=text size="12" name="card"></td>
+
+  </tr>
+
+  <tr valign=top><td></td>
+	<td></td>
+	<td></td>
+	<td background=" " >
+	<font size=3 face="arial narrow,arial,helvetica">Password</font></td>
+	<td background=" " ><input type=password size="12" name="password"><br>
+	<input type=submit value="OK"><br>
+
+	<img src="/images/holder.gif" width=1 height=8
+	alt=" " hspace=0 vspace=0></td>
+	</font>
+ </tr>
+
+  <tr valign=top >
+	<td></td>
+	<td background=" " colspan=4><A href="join.html"><img src="/images/heading-member.gif" width=331 		height=38
+	alt="Become a Website Member" hspace=0 vspace=0 border=0></a>
+	</td>
+	<td>
+	</td>
+
+  </tr>
+
+-->
+</table>
+
+</td>
+  </tr>
+</table>
+<p>
+</center>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl
index c99bb602a1..9562452da4 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl
@@ -91,8 +91,8 @@
 	<tr><td>Bookfund</td><td><input type=hidden name=bookfundid size=5 maxlength=5 value="<!-- TMPL_VAR name="bookfundid" -->"><!-- TMPL_VAR name="bookfundid" --></td></tr>
 <!-- /TMPL_IF -->
 
-<tr><td>Start date (<!-- TMPL_VAR NAME=dateformat -->)</td><td><input type=text name=startdate size=11 value='<!-- TMPL_VAR name="startdate" -->'>&nbsp;</td></tr>
-<tr><td>End date (<!-- TMPL_VAR NAME=dateformat -->)</td><td><input type=text name=enddate size=11 value='<!-- TMPL_VAR name="enddate" -->'></td></tr>
+<tr><td>Start date <i>(<!-- TMPL_VAR NAME=dateformat -->)</i></td><td><input type=text name=startdate size=11 value='<!-- TMPL_VAR name="startdate" -->'>&nbsp;</td></tr>
+<tr><td>End date <i>(<!-- TMPL_VAR NAME=dateformat -->)</i></td><td><input type=text name=enddate size=11 value='<!-- TMPL_VAR name="enddate" -->'></td></tr>
 <tr><td>Budget amount</td><td><input type=text name=budgetamount value='<!-- TMPL_VAR name="budgetamount" -->'></td></tr>
 <tr><td>&nbsp;</td><td><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR name="aqbudgetid" -->"><INPUT type=button value='OK' onClick='Check(this.form)'></td></tr>
 </table>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl
index 4bb0c3190b..c42c7338a6 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl
@@ -50,8 +50,7 @@
 <!-- TMPL_IF name="else" -->
 <h1>Authorised values admin</h1>
 <p>This table is used in MARC definition. You can define as many categories as you want, and as many authorised values as you want in each category.</p>
-<p>When you define the MARC subfield structure, you can link a subfield to an authorised-value category. When the user adds or modifies a biblio,
-the subfield is not entered through a free field, but though a list of authorised values.</p>
+<p>When you define the MARC subfield structure, you can link a subfield to an authorised-value category. When the user adds or modifies a biblio, the subfield is not entered through a free field, but though a list of authorised values.</p>
 <form action=/cgi-bin/koha/admin/authorised_values.pl method=post>
 	<!-- TMPL_VAR name="tab_list" --><input type="submit" value="OK">   <a href="authorised_values.pl?op=add_form">New category...</a>
 </form>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl
index 78b55dcaaf..609227fa0f 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
 <!-- TMPL_IF name="add" -->
+
 <h1><!-- TMPL_VAR name=head --></h1><br>
 <form action='<!-- TMPL_VAR name=action -->' name=Aform method=post>
 <input type=hidden name=op value='add_validate'>
@@ -56,7 +57,7 @@
 	</tr>
 	<tr>
 		<td>&nbsp;</td>
-		<td><input type=submit value='Submit'></td>
+		<td><input type=submit value='Save' class="button"></td>
 	</tr>
 </table>
 </form>
@@ -126,7 +127,7 @@
 					<form action='<!-- TMPL_VAR name=action -->' method=post>
 					<input type='hidden' name='op' value='edit'>
 					<input type='hidden' name='branchcode' value='<!-- TMPL_VAR name=value escape="HTML" -->'>
-					<input type=submit value=Edit class="button">
+					<input type=submit value="Edit" class="button">
 					</form>
 				</td>
 				<td align='left' valign='top'>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl
index 63c0f456f4..61f00a8347 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl
@@ -192,10 +192,6 @@
 			<td>Fine type</td>
 			<td><!-- TMPL_VAR NAME=finetype --></td>
 		</tr>
-		<tr>
-			<td>Bulk</td>
-			<td><!-- TMPL_VAR NAME=bulk --></td>
-		</tr>
 		<tr>
 			<td>Enrollment fee</td>
 			<td><!-- TMPL_VAR NAME=enrolmentfee --></td>
@@ -237,7 +233,7 @@
 
 <!-- TMPL_IF NAME=delete_confirmed -->
 	Data deleted
-        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
+        <form action='<!-- TMPL_VAR NAME="script_name" -->' method=post>
         <input type=submit value=OK>
         </form>
 
@@ -246,26 +242,25 @@
 <!-- TMPL_IF NAME=else -->
 	<h2>Category admin</h2>
 	<!-- TMPL_IF NAME=searchfield -->
-		You Searched for <!-- TMPL_VAR NAME=searchfield -->
+		You Searched for <!-- TMPL_VAR name=searchfield -->
 	<!-- /TMPL_IF -->
 
-	<form action='<TMP_VAR NAME=script_name>' method=post>
-		<input type=text name=description value=<!-- TMPL_VAR NAME=searchfield -->>
-		<input type=reset name=reset value="clr">
+	<form action='<TMPL_VAR NAME="script_name">' method=post>
+		<input type=text name=description value=<!-- TMPL_VAR name="searchfield" -->>
+		<input type="submit" name="submit" value="OK" class="button">
 	</form>
-	
+
         <table border=0 cellspacing=0 cellpadding=5>
 		<tr bgcolor='#99cc33'>
 			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Category</b></td>
 			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Description</b></td>
-			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Enrollment</b></td>
+			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Enrollment period</b></td>
+			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Enrollment fee</b></td>
 			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Upper Age Limit</b></td>
 			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Age Required</b></td>
 			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Fine</b></td>
-			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Bulk</b></td>
-			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Fee</b></td>
 			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Overdue</b></td>
-			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Issue Limit</b></td>
+			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Issue limit</b></td>
 			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Reserve</b></td>
 			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'> </td>
 			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'> </td>
@@ -275,12 +270,16 @@
                         <td><!-- TMPL_VAR NAME=categorycode --></td>
                         <td><!-- TMPL_VAR NAME=description --></td>
                         <td><!-- TMPL_VAR NAME=enrolmentperiod --></td>
+                        <td><!-- TMPL_VAR NAME=enrolmentfee --></td>
                         <td><!-- TMPL_VAR NAME=upperagelimit --></td>
                         <td><!-- TMPL_VAR NAME=dateofbirthrequired --></td>
                         <td><!-- TMPL_VAR NAME=finetype --></td>
-                        <td><!-- TMPL_VAR NAME=bulk --></td>
-                        <td><!-- TMPL_VAR NAME=enrolmentfee --></td>
-                        <td><!-- TMPL_IF NAME=overduenoticerequired -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+                        <td><!-- TMPL_IF NAME=overduenoticerequired -->
+					<i>Yes</i>
+				<!-- TMPL_ELSE -->
+					<i>No</i>
+				<!-- /TMPL_IF -->
+			</td>
                         <td><!-- TMPL_VAR NAME=issuelimit --></td>
                         <td><!-- TMPL_VAR NAME=reservefee --></td>
                         <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&categorycode=<!-- TMPL_VAR NAME=categorycode -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
@@ -291,7 +290,7 @@
 	</table>
 	<p><form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
 		<input type=hidden name=op value=add_form>
-		<input type=submit class="button" value="Add Category"  ALT="Add Category"><br>
+		<input type=submit class="button" value="Add category"  ALT="Add category"><br>
 	</form></p>
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl
index f15f73b0fb..bbbf8f789c 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl
@@ -268,7 +268,7 @@
                         <td background='/images/background-mem.gif'><b>Bulk</b></td>
                         <td background='/images/background-mem.gif'><b>Fee</b></td>
                         <td background='/images/background-mem.gif'><b>Overdue</b></td>
-                        <td background='/images/background-mem.gif'><b>Issue Limit</b></td>
+                        <td background='/images/background-mem.gif'><b>Issue limit</b></td>
                         <td background='/images/background-mem.gif'><b>Reserve</b></td>
                         <td background='/images/background-mem.gif'> </td>
                         <td background='/images/background-mem.gif'> </td>
@@ -293,7 +293,7 @@
         </table>
         <p><form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
                 <input type=hidden name=op value=add_form>
-                <input type=submit class="button"  value="Add Category"  ALT="Add Category"><br>
+                <input type=submit class="button"  value="Add category"  ALT="Add category"><br>
         </form></p>
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/charges.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/charges.tmpl
index c83ac8726b..f8ad898cae 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/charges.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/charges.tmpl
@@ -1,9 +1,8 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 <p>
 Each box needs to be filled in with fine,time to start charging,charging cycle<br/>
-eg 1,7,7 = $1 fine, after 7 days, every 7 days</p>
-<p>Note : fines are calculated by the fines2.pl script, located in misc directory.
-Ask your administrator to put this script in crontab (after midnight) to have fines calculated every night
+eg 1,7,7 = 1USD,EUR,etc fine, after 7 days, every 7 days</p>
+<p>Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night
 </p>
 <form action=/cgi-bin/koha/admin/updatecharges.pl method=post>
 <table border=0>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl
index a19cb1fb7d..2e270d2437 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl
@@ -181,8 +181,8 @@
 		<tr bgcolor="<!-- TMPL_VAR NAME=toggle -->">
 			<td><!-- TMPL_VAR NAME=currency --></td>
 			<td><!-- TMPL_VAR NAME=rate --></td>
-			<td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&searchfield=<!-- TMPL_VAR NAME=currency -->">Edit</a></td>
-                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&searchfield=<!-- TMPL_VAR NAME=currency -->">Delete</a></td>
+			<td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&searchfield=<!-- TMPL_VAR NAME=currency -->" class="button">Edit</a></td>
+                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&searchfield=<!-- TMPL_VAR NAME=currency -->" class="button">Delete</a></td>
 		</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
@@ -201,7 +201,7 @@
 	<!-- /TMPL_iF -->
 
         <br>
-	<input type=submit class="button" value="Add Currency" alt="Add Currency">
+	<input type=submit class="button" value="Add currency" alt="Add currency">
 	<br>
         </form>
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl
index 85911395fc..a610245463 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl
@@ -80,12 +80,21 @@ function Check(f) {
 			</tr>
 			<tr>
 				<td>Not for loan</td>
-				<td><input type=checkbox name=notforloan <!-- TMPL_IF name="notforloan" -->checked<!-- /TMPL_IF --> value=1> (if checked, no item of this type can be issued.
-							If not checked, every item of this type can be issued unless notforloan is set for a specific item)</td>
+				<td>
+					<!-- TMPL_IF name="notforloan" -->
+						<input type=checkbox name=notforloan checked value=1>
+					<!-- TMPL_ELSE -->
+						<input type=checkbox name=notforloan value=1>
+					<!-- /TMPL_IF -->
+					if checked, no item of this type can be issued. If not checked, every item of this type can be issued unless notforloan is set for a specific item
+				</td>
 			</tr>
 			<tr>
 				<td>Loan length</td>
-				<td><input type=text name=loanlength size=10 value='<!-- TMPL_VAR name="loanlength" -->'> (meaningful only if not for loan is not set)</td>
+				<td>
+					<input type=text name=loanlength size=10 value='<!-- TMPL_VAR name="loanlength" -->'>
+					meaningful only if not for loan is not set
+				</td>
 			</tr>
 			<tr>
 				<td>Renewals allowed</td>
@@ -156,7 +165,7 @@ function Check(f) {
 <table width=40%>
 	<tr>
 		<td width="33%">
-			<input type=submit class="button" value="Add Item Type" title="Add item type" alt="Add item type" >
+			<input type=submit class="button" value="Add item type" title="Add item type" alt="Add item type" >
 		</td>
 		<td width=33%><!-- TMPL_IF name="previous" --><a href="<!-- TMPL_VAR name=previous -->"><input type=image src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1leftarrow.png" title="previous" ALT="previous" BORDER=0></a><!-- /TMPL_IF --></td>
 		<td width=33%><!-- TMPL_IF name="next" --><a href="<!-- TMPL_VAR name=next -->"><input type=image src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1rightarrow.png" title="next" ALT="next" BORDER=0></a><!-- /TMPL_IF --></td>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl
index 2c1547aa3e..da01fbbf17 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl
@@ -163,7 +163,7 @@
 
 <table border=0 cellspacing=0 cellpadding=2>
 <tr valign=top bgcolor=#99cc33>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=10%><b>koha field</b> <span style="font-size:8;color:red" title="the koha-DB field linked to this subfield">?</span></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=10%><b>Koha field</b> <span style="font-size:8;color:red" title="the koha-DB field linked to this subfield">?</span></td>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=5%><b>Tag</b></td>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=5%><b>Subfield</b></td>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=42%><b>Lib</b></td>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl
index f7484b4b78..8fa45707c1 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl
@@ -67,16 +67,15 @@
 
 <!-------------------------------------------------------------------------------------------------->
 <!-- TMPL_IF name="else" -->
-<font SIZE=6><em>MARC subfield structure admin for <!-- TMPL_VAR name="tagfield" --></em></font>
-<p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on "edit". </p>
-<p>The column <b>Koha field</b> shows that the subfield is linked with a "Koha field". Koha can manage a MARC interface, or a Koha interface. This link ensures that 
-both DB are synchronized, thus you can change from a MARC to a Koha interface easily.</p>
+<h1>MARC subfield structure admin for <!-- TMPL_VAR name="tagfield" --></h1>
+<p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit. </p>
+<p>The column <b>Koha field</b> shows that the subfield is linked with a Koha field. Koha can manage a MARC interface, or a Koha interface. This link ensures that both DB are synchronized, thus you can change from a MARC to a Koha interface easily.</p>
 
 <table border=0 cellspacing=0 cellpadding=2 width="80%">
 <tr valign=top bgcolor=#99cc33>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=5%><b>Subfield</b></td>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=30%><b>Lib</b></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=10%><b>koha field</b> <span style="font-size:8;color:red" title="the koha-DB field linked to this subfield">?</span></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=10%><b>Koha field</b> <span style="font-size:8;color:red" title="the koha-DB field linked to this subfield">?</span></td>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=8%><b>Rep</b> <span style="font-size:8;color:red" title="subfield may be repeated (1=yes, 0=no)">?</span></td>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=8%><b>Mand</b> <span style="font-size:8;color:red" title="subfield is mandatory (1=yes, 0=no)">?</span></td>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=8%><b>Tab</b> <span style="font-size:8;color:red" title="subfield is shown in which tab (0-9 or item)">?</span></td>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl
index c09a85fcc1..c8737ef42f 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl
@@ -194,7 +194,7 @@
 	<!-- /TMPL_iF -->
 
         <br>
-	<input type=submit class="button" value="Add Printer" alt="Add Printer">
+	<input type=submit class="button" value="Add printer" alt="Add printer">
 	<br>
         </form>
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl
index b74869560d..29de9dc7c2 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl
@@ -98,7 +98,7 @@
 	<h1>Thesaurus management</h1>
 	<p>Manages thesaurus and authorities files.<br />
 	<ul>
-		<b>Dig</b>: see data dependent one this one<br />
+		<b>Dig</b>: see data depending of this one<br />
 		<b>Related</b>: see other forms of this authority entry</p>
 	</ul>
 	<form action="/cgi-bin/koha/admin/thesaurus.pl" method="post">
@@ -124,7 +124,7 @@
 		<td>&nbsp;</td>
 		<td><!-- TMPL_VAR name="freelib" --></td>
 		<td><!-- TMPL_VAR name="father" --> <!-- TMPL_VAR name="stdlib" --></td>
-		<td><!-- TMPL_VAR name="dig" -->Dig</a></td>
+		<td><!-- TMPL_VAR name="dig" -->Dig</a>&nbsp;&nbsp;</td>
 		<td><!-- TMPL_VAR name="related" -->Related</a></td>
 		<td><a href="<!-- TMPL_VAR name="edit" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
 		<td><a href="<!-- TMPL_VAR name="delete" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl
index 28b8ec7083..2fd8cc12b0 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl
@@ -73,7 +73,7 @@
         <!-- TMPL_IF NAME=searchfield -->
                 <h1>Modify Z39.50 Server</h1>
         <!-- TMPL_ELSE -->
-                <h1>Add Z39.50 Server</h1>
+                <h1>Add Z39.50 server</h1>
         <!-- /TMPL_IF -->
         <form action="<!-- TMPL_VAR NAME=script_name -->" name=Aform method=post>
         <input type=hidden name=op value='add_validate'>
@@ -279,7 +279,7 @@
         <!-- /TMPL_iF -->
                 
         <br>
-        <input type=submit class="button" alt="Add Z39.50 server" value="Add Z39.50 Server">
+        <input type=submit class="button" alt="Add Z39.50 server" value="Add Z39.50 server">
         <br>
         </form>
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/request.tmpl b/koha-tmpl/intranet-tmpl/default/en/request.tmpl
index 1ca2d4f56c..16edd351e4 100644
--- a/koha-tmpl/intranet-tmpl/default/en/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/request.tmpl
@@ -44,7 +44,7 @@
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
 <TR VALIGN=TOP>
 	<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Request</b></TD>
-	<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Item Type</b></TD>
+	<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Item type</b></TD>
 	<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Classification</b></TD>
 	<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Volume</b></TD>
 	<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Pubdate</b></TD>
@@ -141,10 +141,10 @@
 					</a>
 				<!-- TMPL_ELSE -->
 					<!-- TMPL_IF Name="constrainttypea" -->
-						Next Available
+						<i>Next Available</i>
 					<!-- TMPL_ELSE -->
 						<!-- TMPL_IF Name="constrainttypeo" -->
-							This type only : <!-- TMPL_VAR Name="volumeddesc" --> <!-- TMPL_VAR Name="itemtype" -->
+							This type only : <b><!-- TMPL_VAR Name="volumeddesc" --> <!-- TMPL_VAR Name="itemtype" --></b>
 						<!-- /TMPL_IF -->
 					<!-- /TMPL_IF -->
 				<!-- /TMPL_IF -->
@@ -154,8 +154,9 @@
 	<!-- /TMPL_LOOP -->
 	<tr VALIGN=TOP>
 	<TD colspan=6 align=right>
-	Delete a request by selecting "del" from the rank list.
-	<INPUT TYPE="image" name="submit"  VALUE="request" BORDER=0 src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/2rightarrow.png"></td>
+		Delete a request by selecting "del" from the rank list.
+		<INPUT TYPE="image" name="submit"  VALUE="request" BORDER=0 src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/2rightarrow.png">
+	</td>
 	</tr>
 </table>
 <P>
diff --git a/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl b/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl
index 7c089c6d27..10d6c09f94 100644
--- a/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl
@@ -4,7 +4,7 @@
     <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <!-- /TMPL_IF -->
 
-<span style="font-size:2em; text-align:left;">MARC Search</span>
+<span style="font-size:2em; text-align:left;">MARC search</span>
 
 <center>
 <form name="f" method="post">
@@ -13,21 +13,22 @@
 <input type="hidden" name="type" value="intranet">
 <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
 
-	<table border=0 cellspacing=0 cellpadding=2 width="80%>
+	<table border=0 cellspacing=0 cellpadding=2 width="100%">
 		<tr align="center">
-			<td colspan=3>
+			<td>
 				<div name="sql">
 				<textarea name="sql" rows=5 cols=60 disabled readonly></textarea>
 				</div>
 			</td>
-			<td colspan=2 bgcolor="#ad11ad" valign="top" align="left">
+			<td bgcolor="#ad11ad" valign="top" align="left">
 				<span style="color:#FFFFFF;">
 					<b>HELP :</b><br/>
 					Build your request using MARC fields and subfields. Add criteria lets you add another criteria to your search. Search commits the request and displays the results.
 				</span>
 			</td>
 		</tr>
-
+	</table>
+	<table border=0 cellspacing=0 cellpadding=2 width="100%">
 		<!-- TMPL_LOOP NAME="statements" -->
 		<tr>
 			<td>
diff --git a/koha-tmpl/intranet-tmpl/default/en/shelves.tmpl b/koha-tmpl/intranet-tmpl/default/en/shelves.tmpl
index 76948ba51b..109bdc3978 100644
--- a/koha-tmpl/intranet-tmpl/default/en/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/shelves.tmpl
@@ -1,42 +1,48 @@
 <!-- TMPL_INCLUDE Name="cat-top.inc" -->
 
-<p align=left>Logged in as: <!-- TMPL_VAR Name="loggedinuser" --> [<a href="/cgi-bin/koha/logout.pl">Log Out</a>]</p>
-
-
 <!-- TMPL_IF Name="viewshelf" -->
-    <center>
-    <form>
-    <a href=shelves.pl>Shelf List</a><p>
-    <table border=0 cellpadding=0 cellspacing=0>
-		<tr><td colspan=7>
-			<table>
-			<tr><td>Add a book by barcode:</td><td><input name=addbarcode></td></tr>
-			</table>
-			<br>
-			<table border=0 cellpadding=5 cellspacing=0 width=100%>
-			<tr><th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-			<font color=white>Contents of <!-- TMPL_VAR Name="shelfname" --> shelf</font>
-			</th></tr>
-			</table>
-		</td></tr>
+<center>
+<form>
+    <table border=0 cellpadding=2 cellspacing=0>
+    		<tr>
+			<th colspan=4 bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
+				<font color=white>Contents of <!-- TMPL_VAR Name="shelfname" --></font>
+			</th>
+		</tr>
 		<!-- TMPL_LOOP Name="itemsloop" -->
 			<tr>
 				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><input type=checkbox name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->" width=10 align=center><img src=/images/blankdot.gif></td>
 				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="barcode" --></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->" width=10 align=center><img src=/images/blankdot.gif></td>
 				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="title" --></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->" width=10 align=center><img src=/images/blankdot.gif></td>
 				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="author" --></td>
 			</tr>
 		<!-- /TMPL_LOOP -->
-    </table>
-    <br>
-    <input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
-    <input type=hidden name=modifyshelfcontents value=1>
-    <input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
-    <input type=submit value="Remove Selected Items">
-    </form>
+	</table>
+	<br>
+	<a href="shelves.pl" class="button">Shelf list</a>
+	<input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
+	<input type=hidden name=modifyshelfcontents value=1>
+	<input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
+	<input type=submit value="Remove Selected Items" class="button">
+</form>
+<form>
+	<input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
+	<input type=hidden name=modifyshelfcontents value=1>
+	<input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
+	<table>
+		<tr>
+			<td>
+				Add a book by barcode in <!-- TMPL_VAR name="shelfname" -->:
+			</td>
+			<td>
+				<input name="addbarcode">
+				<input type=hidden name=modifyshelfcontents value=1>
+				<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->">
+				<input type="submit" value="Save" class="button">
+			</td>
+		</tr>
+	</table>
+</form>
 <!-- TMPL_ELSE -->
 	<!-- TMPL_IF Name="shelves" -->
 		<!-- TMPL_IF Name="status1" -->
@@ -48,55 +54,86 @@
 			<!-- /TMPL_IF -->
 		<!-- /TMPL_LOOP -->
 		<center>
-		<a href=shelves.pl>Modify Shelf Contents</a><p>
 		<h1>Bookshelves</h1>
 		<table border=0 cellpadding=7>
-			<tr><td align=center>
-				<form method=post>
-				<input type=hidden name=shelves value=1>
-				<table border=0 cellpadding=0 cellspacing=0>
-				<tr><th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-				<font color=white>Select Shelves to Delete</font>
-			</th></tr>
-			<!-- TMPL_LOOP Name="shelvesloop" -->
-				<tr>
-					<td bgcolor="<!-- TMPL_VAR Name="color" -->">
-						<input type=checkbox name="DEL-<!-- TMPL_VAR Name="shelf" -->">
-						<!-- TMPL_VAR Name="shelfname" --> (<!-- TMPL_VAR Name="shelfbookcount" --> books)
-					</td>
-				</tr>
-			<!-- /TMPL_LOOP -->
-    </table>
-    <p><input type=submit value="Delete Shelves"><p>
-    </td><td align=center valign=top>
-    <form method=post>
-    <input type=hidden name=shelves value=1>
-    <p>Add Shelf: <input name=addshelf size=25><p>
-    <p><input type=submit value="Add New Shelf"><p>
-    </form>
-    </td></tr></table>
+			<tr>
+				<td align=center valign="bottom">
+					<form>
+						<p>
+							<a href="shelves.pl" class="button">Shelf list</a>
+						</p>
+					</form>
+				</td>
+				<td align=center valign="bottom">
+					<form method=post>
+					<input type="hidden" name="shelves" value=1>
+					<table border=0 cellpadding=0 cellspacing=0>
+						<tr>
+							<th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
+								<font color=white>Select Shelves to Delete</font>
+							</th>
+						</tr>
+						<!-- TMPL_LOOP Name="shelvesloop" -->
+						<tr>
+							<td bgcolor="<!-- TMPL_VAR Name="color" -->">
+								<input type=checkbox name="DEL-<!-- TMPL_VAR Name="shelf" -->">
+								<!-- TMPL_VAR Name="shelfname" --> (<!-- TMPL_VAR Name="shelfbookcount" --> books)
+							</td>
+						</tr>
+						<!-- /TMPL_LOOP -->
+					</table>
+					<p>
+						<input type=submit value="Delete Shelves" class="button"></form>
+					</p>
+				</td>
+				<td align=center valign=bottom>
+					<form method=post>
+					<input type=hidden name=shelves value=1>
+					<table border=0 cellpadding=0 cellspacing=0>
+						<tr>
+							<th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
+								<font color=white>Add Shelf</font>
+							</th>
+						</tr>
+						<tr>
+							<td>
+								<p><input name=addshelf size=25></p>
+							</td>
+						</tr>
+					</table>
+								<p><input type=submit value="Add New Shelf" class="button"></p>
+					</form>
+				</td>
+			</tr>
+		</table>
 
 	<!-- TMPL_ELSE -->
 		<center>
 		<table border=0 cellpadding=4 cellspacing=0>
-			<tr><td bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-				<table border=0 cellpadding=5 cellspacing=0 width=100%>
-					<tr><th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-					<font color=white>Shelf List</font>
-					</th></tr>
-				</table>
-			</td></tr>
+			<tr>
+				<td bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
+					<table border=0 cellpadding=5 cellspacing=0 width=100%>
+						<tr>
+							<th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
+								<font color=white>Shelf List</font>
+							</th>
+						</tr>
+					</table>
+				</td>
+			</tr>
 			<!-- TMPL_LOOP Name="shelvesloop" -->
-				<tr><td bgcolor="<!-- TMPL_VAR Name="color" -->">
+			<tr>
+				<td bgcolor="<!-- TMPL_VAR Name="color" -->">
 					<a href="shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->">
 						<!-- TMPL_VAR Name="shelfname" -->(<!-- TMPL_VAR Name="shelfbookcount" --> books)
 					</a>
-				</td></tr>
+				</td>
+			</tr>
 			<!-- /TMPL_LOOP -->
 		</table>
-		<P><a href=shelves.pl?shelves=1>Add or Remove Book Shelves</a>
+		<P>
+			<a href="shelves.pl?shelves=1" class="button">Add or Remove Book Shelves</a>
+		</p>
 	<!-- /TMPL_IF -->
-
 <!-- /TMPL_IF -->
-
-<!-- TMPL_INCLUDE Name="cat-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE Name="cat-bottom.inc" -->
-- 
2.39.5