From 20055da807f10a982d324f5f98b09137d522ab5c Mon Sep 17 00:00:00 2001
From: Joshua Ferraro <jmf@liblime.com>
Date: Sun, 11 Nov 2007 12:55:52 -0600
Subject: [PATCH] Fixing nomenclature and tmpl_process3.pl bugs

tmpl_process3.pl still throws some multi-byte warnings
but no markup errors

There are still quite a few places we could normalize
to reduce the size of the translation file

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../includes/acquisitions-history-search.inc  |  4 +-
 .../prog/en/includes/acquisitions-search.inc  |  4 +-
 .../prog/en/includes/error-bottom.inc         |  2 +-
 .../prog/en/includes/error-top.inc            |  2 +-
 .../prog/en/includes/mainmenu.inc             |  4 +-
 .../prog/en/includes/popup-top.inc            |  2 +-
 .../prog/en/modules/acqui/bookfund.tmpl       |  4 +-
 .../prog/en/modules/acqui/neworderempty.tmpl  |  4 +-
 .../prog/en/modules/acqui/spent.tmpl          |  6 +--
 .../prog/en/modules/admin/aqbookfund.tmpl     |  4 +-
 .../en/modules/admin/authorised_values.tmpl   |  2 +-
 .../en/modules/admin/biblio_framework.tmpl    |  9 +++--
 .../prog/en/modules/admin/classsources.tmpl   |  8 ++--
 .../prog/en/modules/admin/currency.tmpl       |  2 +-
 .../admin/marc_subfields_structure.tmpl       |  2 +-
 .../prog/en/modules/admin/printers.tmpl       |  2 +-
 .../prog/en/modules/admin/stopwords.tmpl      |  2 +-
 .../prog/en/modules/admin/z3950servers.tmpl   |  2 +-
 .../en/modules/authorities/authorities.tmpl   |  2 +-
 .../prog/en/modules/authorities/detail.tmpl   |  2 +-
 .../prog/en/modules/catalogue/advsearch.tmpl  |  2 +-
 .../prog/en/modules/catalogue/detail.tmpl     |  2 +-
 .../prog/en/modules/catalogue/dictionary.tmpl |  6 +--
 .../value_builder/labs_theses.tmpl            |  4 +-
 .../value_builder/unimarc_field_105.tmpl      |  2 +-
 .../value_builder/unimarc_field_4XX.tmpl      |  4 +-
 .../prog/en/modules/circ/returns.tmpl         |  2 +-
 .../prog/en/modules/errors/400.tmpl           |  2 +-
 .../prog/en/modules/errors/401.tmpl           |  2 +-
 .../prog/en/modules/errors/402.tmpl           |  2 +-
 .../prog/en/modules/errors/403.tmpl           |  2 +-
 .../prog/en/modules/errors/404.tmpl           |  2 +-
 .../prog/en/modules/errors/405.tmpl           |  2 +-
 .../prog/en/modules/errors/500.tmpl           |  2 +-
 .../en/modules/help/admin/aqbookfund.tmpl     | 12 +++---
 .../prog/en/modules/help/admin/categorie.tmpl |  6 +--
 .../prog/en/modules/help/admin/itemtypes.tmpl |  2 +-
 .../modules/help/admin/systempreferences.tmpl |  2 +-
 .../en/modules/help/bull/statecollection.tmpl |  2 +-
 .../prog/en/modules/installer/step3.tmpl      | 37 +++++++++++--------
 .../prog/en/modules/intranet-main.tmpl        |  2 +-
 .../prog/en/modules/reports/dictionary.tmpl   |  2 +-
 .../modules/reports/guided_reports_start.tmpl |  4 +-
 .../modules/serials/routing-preview-slip.tmpl |  3 +-
 .../en/modules/suggestion/acceptorreject.tmpl |  4 +-
 .../suggestion/mail_suggestion_ACCEPTED.tmpl  |  4 +-
 .../suggestion/mail_suggestion_AVAILABLE.tmpl |  4 +-
 .../suggestion/mail_suggestion_ORDERED.tmpl   |  4 +-
 .../suggestion/mail_suggestion_REJECTED.tmpl  |  2 +-
 .../prog/en/modules/tools/export.tmpl         |  2 +-
 .../prog/en/modules/tools/holidays.tmpl       |  2 +-
 .../en/modules/tools/manage-marc-import.tmpl  |  2 +-
 .../prog/en/modules/tools/viewlog.tmpl        |  2 +-
 53 files changed, 105 insertions(+), 98 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-history-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-history-search.inc
index 74125ce848..29b40bb484 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-history-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-history-search.inc
@@ -11,7 +11,7 @@
 	
 		<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
 		<label for="title">Title: </label><input type="text" id="title" name="title" size="15" value="<!-- TMPL_VAR name="title"-->" /> <label for="searchsupplier">Supplier:</label> <input type="text" id="searchsupplier" name="name" size="15" value="<!-- TMPL_VAR name="name" -->" />
-	<input value="Submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced</a>
+	<input value="Submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced Search</a>
 	</form>
 	</div>	
 			<ul>
@@ -19,4 +19,4 @@
 			<li class="tabs-selected"><a href="/cgi-bin/koha/acqui/histsearch.pl#orders_search">Orders Search</a></li>
 			</ul>	
 </div>
-<!-- End Acquisitions Resident Search Box -->
\ No newline at end of file
+<!-- End Acquisitions Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
index e88b2a81b5..6ab905cea3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
@@ -11,7 +11,7 @@
 	
 		<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
 		<label for="title">Title: </label><input type="text" id="title" name="title" size="15" value="<!-- TMPL_VAR name="title"-->" /> <label for="searchsupplier">Supplier:</label> <input type="text" id="searchsupplier" name="name" size="15" value="<!-- TMPL_VAR name="name" -->" />
-	<input value="Submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced</a>
+	<input value="Submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced Search</a>
 	</form>
 	</div>	
 			<ul>
@@ -19,4 +19,4 @@
 			<li><a href="/cgi-bin/koha/acqui/histsearch.pl#orders_search">Orders Search</a></li>
 			</ul>	
 </div>
-<!-- End Acquisitions Resident Search Box -->
\ No newline at end of file
+<!-- End Acquisitions Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc
index fee0fd7c1b..ee9e511012 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc
@@ -8,7 +8,7 @@
 <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> ||
 <a href="/cgi-bin/koha/reports-home.pl">Reports</a> ||
 <a href="/cgi-bin/koha/admin-home.pl">Parameters</a> ||
-<a href="/cgi-bin/koha/about.pl">About</a> || 
+<a href="/cgi-bin/koha/about.pl">About Koha</a> || 
 Help
 </div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc
index 4fe5e520b3..448caf7c5c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>KOHA: INTRANET: Catalogue</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf8" />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
 <script language="JavaScript">
 <!-- Hide from old browsers
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc
index 75498a4b4d..94004eb02a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc
@@ -45,7 +45,7 @@
                 <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
     <li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a><ul>
-        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC</a></li>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC Record</a></li>
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
         <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
     </ul></li>
@@ -71,4 +71,4 @@
     <!-- /TMPL_IF -->
 	
 </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/popup-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/popup-top.inc
index 593db34044..6a5c8643c9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/popup-top.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/popup-top.inc
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>Popup</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf8" />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/css/staff.css" />
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl
index c8596525ed..17503e6f70 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->         
-<title>Koha &rsaquo; Acquisitions &rsaquo; Book Funds</title>                                     
+<title>Koha &rsaquo; Acquisitions &rsaquo; Funds</title>                                     
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->           
 </head>   
 <body>  
@@ -61,4 +61,4 @@
 <!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
 </div>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
index 7ab32b37ff..0bf3291517 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
@@ -191,7 +191,7 @@ if (quantity ==0) {
 		</ol>
     </fieldset>
 	<fieldset class="rows">
-        <legend>Accounting details</legend>
+        <legend>Accounting Details</legend>
 		<ol>
             <li>
                 <!-- TMPL_IF name="close" -->
@@ -302,4 +302,4 @@ if (quantity ==0) {
 <!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
 </div>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl
index fe5ccf7e42..f9413cdedc 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl
@@ -1,12 +1,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->         
-<title>Koha &rsaquo; Acquisitions &rsaquo; Budgets and Bookfunds: Spent</title>                                     
+<title>Koha &rsaquo; Acquisitions &rsaquo; Budgets and Funds: Spent</title>                                     
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->           
 </head>   
 <body>  
 <!-- TMPL_INCLUDE NAME="header.inc" -->                                   
 <!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Budgets and Bookfunds: Spent</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Budgets and funds: Spent</div>
 
 <div id="doc3" class="yui-t2">
 <div id="bd">            
@@ -41,7 +41,7 @@
 	
 		<td><!--TMPL_VAR NAME="title"-->	</td>
 		<td>
-                  <a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<!--TMPL_VAR NAME="ordnum"-->&amp;biblio=<!--TMPL_VAR NAME="biblionumber"-->&amp;invoice=<!--TMPL_VAR NAME="booksellerinvoicenumber"-->&amp;supplierid=<!--TMPL_VAR NAME="booksellerid"-->&amp;catview=yes"><TMPL_VAR NAME="ordnum"--></a></td>
+                  <a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<!-- TMPL_VAR NAME="ordnum"-->&amp;biblio=<!--TMPL_VAR NAME="biblionumber"-->&amp;invoice=<!--TMPL_VAR NAME="booksellerinvoicenumber"-->&amp;supplierid=<!--TMPL_VAR NAME="booksellerid"-->&amp;catview=yes"><!-- TMPL_VAR NAME="ordnum"--></a></td>
 		<td><!--TMPL_VAR NAME="booksellerid"-->	</td>
 		<td>	<a href=/cgi-bin/koha/acqui/receive.pl?invoice=<!--TMPL_VAR NAME="booksellerinvoicenumber"-->&amp;supplierid=<!--TMPL_VAR NAME="booksellerid"-->><!--TMPL_VAR NAME="booksellerinvoicenumber"--></a></td>
 		<td><!--TMPL_VAR NAME="itemtype"-->	</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
index 1c04c6f2cd..f4def45819 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
@@ -63,7 +63,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="bookfund-admin-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="else" -->Funds and Budgets  <!-- /TMPL_IF --> <!-- TMPL_IF name="add_form" --><a href="/cgi-bin/koha/admin/aqbookfund.pl">Funds and Budgets</a> &rsaquo; Add book fund<!-- /TMPL_IF --></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="else" -->Funds and Budgets  <!-- /TMPL_IF --> <!-- TMPL_IF name="add_form" --><a href="/cgi-bin/koha/admin/aqbookfund.pl">Funds and Budgets</a> &rsaquo; Add fund<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -154,7 +154,7 @@
 
 <!-- TMPL_IF name="header-is-modify-p" -->
   <input type="hidden" name="op" value="mod_validate" />
-  <input type="hidden" name="current_branch" value="<!-- TMPL_VAR name="current_branch" -->"
+  <input type="hidden" name="current_branch" value="<!-- TMPL_VAR name="current_branch" -->"/>
   <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="header-is-add-p" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
index 1350590ed2..affe5b84ec 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
@@ -133,7 +133,7 @@ the subfield is not entered through a free field, but though a list of authorize
 <!-- TMPL_IF NAME="isprevpage" -->
 <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 <input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevpage" -->" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-	<input type="submit" value="&lt;&lt; Previous Page" /></form>
+	<input type="submit" value="&lt;&lt; Previous" /></form>
 <!-- /TMPL_IF --> 
 
 <!-- TMPL_IF NAME="nextpage" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl
index 5bbd5bb3eb..d1cf3d69bb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl
@@ -95,12 +95,13 @@ function Check(f) {
     <h1><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --></h1>
     <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
         <input type="hidden" name="op" value="add_validate" />
-<fieldset class="rows">	<ol><!-- TMPL_IF NAME="frameworkcode" -->
+<fieldset class="rows">	<ol>
+	<!-- TMPL_IF NAME="frameworkcode" -->
             <li><span class="label">Framework Code</span><input type="hidden" id="frameworkcode" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><!-- TMPL_VAR NAME="frameworkcode" --></li>
-            <input type="hidden" name="modif" value=1" />
-        <!-- TMPL_ELSE -->
+            <input type="hidden" name="modif" value="1" />
+	<!-- TMPL_ELSE -->
             <li><label for="frameworkcode">Framework Code</label><input type="text" id="frameworkcode" name="frameworkcode" size="4" maxlength="4" onblur="toUC(this)" /></li>
-        <!-- /TMPL_IF -->
+	<!-- /TMPL_IF -->
         <li><label for="description">Description</label>
         <input type="text" name="frameworktext" id="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="frameworktext" ESCAPE="HTML" -->" /></li></ol></fieldset>
         <fieldset class="action">	<input type="submit" value="Submit" class="submit" onclick="Check(this.form)" /></fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
index 457175d47e..2622dd38fb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
@@ -121,9 +121,9 @@ function CheckRuleForm(f) {
 
 <!-- TMPL_IF name="class_source_form" -->
   <!-- TMPL_IF name="edit_class_source" -->
-<h2>Modify classification source</h2>
+<h2>&rsaquo; Modify classification source</h2>
   <!-- TMPL_ELSE -->
-<h2>Add classification source</h2>
+<h2>&rsaquo; Add classification source</h2>
   <!-- /TMPL_IF -->
 <form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
   <input type="hidden" name="op" value="<!-- TMPL_VAR name="confirm_op"-->" />
@@ -175,9 +175,9 @@ function CheckRuleForm(f) {
 
 <!-- TMPL_IF name="sort_rule_form" -->
   <!-- TMPL_IF name="edit_sort_rule" -->
-<h2>Modify filing rule</h2>
+<h2>&rsaquo; Modify filing rule</h2>
   <!-- TMPL_ELSE -->
-<h2>Add filing rule</h2>
+<h2>&rsaquo; Add filing rule</h2>
   <!-- /TMPL_IF -->
 <form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
   <input type="hidden" name="op" value="<!-- TMPL_VAR name="confirm_op"-->" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
index a61390f688..f341fdddbf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
@@ -203,7 +203,7 @@
 	</table>
 	
 	<!-- TMPL_IF NAME="offsetgtzero" -->
-		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
+		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Previous</a>
 	<!-- /TMPL_IF -->
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
index a71b26dc1f..a6a2c46475 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
@@ -91,7 +91,7 @@ function displayMoreConstraint(numlayer){
                     <input type="text" name="defaultvalue" id="defaultvalue" value="<!-- TMPL_VAR NAME="defaultvalue" -->" /></li>
                 <li><label for="hidden<!-- TMPL_VAR NAME="row" -->">hidden</label><input type="text" id="hidden<!-- TMPL_VAR NAME="row" -->" name="hidden" value="<!-- TMPL_VAR name="hidden" -->" size="2" /> (see online help)</li>
                 <li><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL</label><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is an URL and can be clicked</li>
-                <li><label for="link">Link</label><input type="text" id="link" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5" /> (exemple:200b)</li>
+                <li><label for="link">Link</label><input type="text" id="link" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5" /> (example:200b)</li>
                 <li><span class="label">Others Options:</span> (choose one)
                     	<ol>
                     		<li><label for="authorised_value">Authorized Value</label><!-- TMPL_VAR NAME="authorised_value" --></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl
index dc75a84a20..cba152a89a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl
@@ -202,7 +202,7 @@
 	</table><!-- TMPL_ELSE --><div class="notice">No printers defined.</div><!-- /TMPL_IF -->
 
 	<!-- TMPL_IF NAME="offsetgtzero" -->
-		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
+		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Previous</a>
 	<!-- /TMPL_IF -->
 
 	<!-- TMPL_IF NAME="ltcount" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl
index 642aa7b8d5..7e882e6a1a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl
@@ -157,7 +157,7 @@
             <!-- /TMPL_LOOP -->
     </table>
             <!-- TMPL_IF NAME="offsetgtzero" -->
-                <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
+                <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Previous</a>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="ltcount" -->
                 <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Next &gt;&gt;</a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
index d5f982a11d..1435013290 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
@@ -184,7 +184,7 @@
 
 <!-- TMPL_IF NAME="offsetgtzero" --><form action="<!-- TMPL_VAR NAME="script_name" -->" method="get">
 	<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevpage" -->" />
-	<input type="submit" value="&lt;&lt; Prev">
+	<input type="submit" value="&lt;&lt; Previous">
 </form><!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="ltcount" --><form action="<!-- TMPL_VAR NAME="script_name" -->" method="get">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
index fb487cd1e8..890af4200b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
@@ -424,7 +424,7 @@ function searchauthority() {
 
 <!-- TMPL_IF name="duplicateauthid" -->
         <div class="problem">
-                <p>Duplicate suspected with <a href="javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&amp;popup=1", "Duplicate Authority");" class="button"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
+                <p>Duplicate suspected with <a href="javascript:openWindow('detail.pl?authid=<!-- TMPL_VAR name=duplicateauthid -->&amp;popup=1', 'Duplicate Authority')" class="button"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
                 <p>You must either :</p>
                 <ul>
                         <p><input type="checkbox" value="1" name="confirm_not_duplicate" />confirm it's not a duplicate (and click on <input type="button" value="Add authority" onclick="Check(this.form)" accesskey="w" class="button" /> again)</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl
index 27d8be04eb..97d8c21023 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl
@@ -110,7 +110,7 @@ function searchauthority() {
     <a href="javascript:confirm_deletion()">Delete</a>
     <!-- /TMPL_UNLESS -->
     
-    <a href="../catalogue/search.pl?type=intranet&amp;op=do_search&amp;q=an=<!--TMPL_VAR Name="authid" -->" class="button"><!-- TMPL_VAR name="count" --> biblios</a>
+    <a href="../catalogue/search.pl?type=intranet&amp;op=do_search&amp;q=an=<!--TMPL_VAR Name="authid" -->" class="button"><!-- TMPL_VAR name="count" --> biblio(s)</a>
 </div>
 
 <div id="authoritiestabs" class="toptabs numbered">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
index eefe974032..9e36748a9d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
@@ -309,7 +309,7 @@
             <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear">[New search]</a> 
             </p>
 <!-- /SEARCH BUTTONS -->
-</form
+</form>
 </div>
 </div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index c7275f84d6..2aa9950c95 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -92,7 +92,7 @@
             <ul>
                 <!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
  <li><!-- TMPL_LOOP NAME="MARCSUBJECT_SUBFIELDS_LOOP" -->
-          <!-- TMPL_VAR NAME="separator" --><a title="$<!-- TMPL_VAR NAME="code" --> <!-- TMPL_VAR NAME="value" -->"href="/cgi-bin/koha/catalogue/search.pl?q=<!-- TMPL_LOOP NAME="link_loop" --><!-- TMPL_VAR NAME="operator" -->su:'<!-- TMPL_VAR NAME="link" -->'<!-- /TMPL_LOOP -->"><!-- TMPL_VAR NAME="value" --></a>    <!-- /TMPL_LOOP --></li>
+          <!-- TMPL_VAR NAME="separator" --><a title="$<!-- TMPL_VAR NAME="code" --> <!-- TMPL_VAR NAME="value" -->" href="/cgi-bin/koha/catalogue/search.pl?q=<!-- TMPL_LOOP NAME="link_loop" --><!-- TMPL_VAR NAME="operator" -->su:'<!-- TMPL_VAR NAME="link" -->'<!-- /TMPL_LOOP -->"><!-- TMPL_VAR NAME="value" --></a>    <!-- /TMPL_LOOP --></li>
 
                 <!-- /TMPL_LOOP -->
 				</ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl
index bf8451a0d5..061381e31b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl
@@ -25,7 +25,7 @@
 	<!-- TMPL_IF NAME="authresult" -->
 		
 			<!-- TMPL_IF NAME="displayprev" --> 
-					<a href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE="URL"-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE="URL"-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
+					<a href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE="URL"-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE="URL"-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt; Previous</a>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_LOOP NAME="numbers" -->
 					<!-- TMPL_IF NAME="highlight" -->
@@ -107,7 +107,7 @@
 			</table>
 		
 			<!-- TMPL_IF NAME="displayprev" --> 
-					<a href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE="URL"-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE="URL"-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
+					<a href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE="URL"-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE="URL"-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt; Previous</a>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_LOOP NAME="numbers" -->
 					<!-- TMPL_IF NAME="highlight" -->
@@ -148,4 +148,4 @@
 </div>
 
 <!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl
index 4f6239789f..f341426d49 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl
@@ -91,7 +91,7 @@ a.catalogue:hover {
 		</div>
 		<div id="resultnumber">
 			<p><!-- TMPL_IF NAME="displayprev" --> 
-					<a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=labs_theses.pl&amp;startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;cat_auth=<!-- TMPL_VAR NAME="cat_auth" ESCAPE="URL"-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE="URL"-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
+					<a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=labs_theses.pl&amp;startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;cat_auth=<!-- TMPL_VAR NAME="cat_auth" ESCAPE="URL"-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE="URL"-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt; Previous</a>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_LOOP NAME="numbers" -->
 					<!-- TMPL_IF NAME="highlight" -->
@@ -127,4 +127,4 @@ a.catalogue:hover {
 <!-- /TMPL_IF -->
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tmpl
index 883e5fbb3e..3f89c9cf88 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tmpl
@@ -990,7 +990,7 @@
                         <!-- /TMPL_IF -->
                         
                         <!-- TMPL_IF name="f110" -->
-                                <option value="0"SELECTED>Document qui ne contient pas d'index</option>
+                                <option value="0" selected="selected">Document qui ne contient pas d'index</option>
                         <!-- TMPL_ELSE -->
                                 <option	value="0">Document qui ne contient pas d'index</option>
                         <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tmpl
index eac7ff7463..4c31e58657 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tmpl
@@ -127,7 +127,7 @@
 
 		<h2>Search results</h2>
 		<div id="unimarc_field_4XX_resultnumber">
-			<p><!-- TMPL_IF NAME="displayprev" --> <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&lt;&lt;Previous</a><!-- /TMPL_IF -->
+			<p><!-- TMPL_IF NAME="displayprev" --> <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&lt;&lt; Previous</a><!-- /TMPL_IF -->
 				<!-- TMPL_LOOP NAME="numbers" --><!-- TMPL_IF NAME="highlight" --> <span class="highlight"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE --> <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a><!-- /TMPL_IF --><!-- /TMPL_LOOP --> <!-- TMPL_IF NAME="displaynext" --><a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">Next&gt;&gt;</a><!-- /TMPL_IF --></p>
 			<p class="resultcount"><!-- TMPL_IF NAME="total" -->Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --><!-- TMPL_ELSE -->No results found.<!-- /TMPL_IF --></p></div>
 		<div id="resultlist">
@@ -174,7 +174,7 @@
 			<p>
 				<!-- TMPL_IF NAME="displayprev" -->
 				<a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
-					&lt;&lt;Previous
+					&lt;&lt; Previous
 				</a>
 				<!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
index bb075c6fea..3bbb297541 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
@@ -43,7 +43,7 @@
     <!-- /TMPL_IF -->
         </td>
         </tr>
-        <tr><th>Action : </th>
+        <tr><th>Action</th>
             <td class="problem">
                 This item must be transfered to : <!-- TMPL_VAR Name="TransferWaitingAt" -->
             </td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tmpl
index eb096c600b..346026fb94 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tmpl
@@ -73,7 +73,7 @@
     <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
     <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a></h3>
 	<ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
-        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC</a></li>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC Record</a></li>
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
         <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
     </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tmpl
index c9be487ed4..2cbe176288 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tmpl
@@ -73,7 +73,7 @@
     <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
     <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a></h3>
 	<ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
-        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC</a></li>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC Record</a></li>
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
         <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
     </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl
index 4feab83eef..eb995bff4b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl
@@ -73,7 +73,7 @@
     <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
     <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a></h3>
 	<ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
-        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC</a></li>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC Record</a></li>
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
         <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
     </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tmpl
index bf85038131..4b7188b5a0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tmpl
@@ -73,7 +73,7 @@
     <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
     <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a></h3>
 	<ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
-        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC</a></li>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC Record</a></li>
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
         <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
     </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl
index 0bdf653de6..f43c61b2c0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl
@@ -73,7 +73,7 @@
     <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
     <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a></h3>
 	<ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
-        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC</a></li>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC Record</a></li>
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
         <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
     </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl
index 95e4da7d83..fbdb9a3d71 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl
@@ -73,7 +73,7 @@
     <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
     <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a></h3>
 	<ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
-        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC</a></li>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC Record</a></li>
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
         <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
     </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tmpl
index 57763254b6..7b8c454571 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tmpl
@@ -73,7 +73,7 @@
     <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
     <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a></h3>
 	<ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
-        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC</a></li>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC Record</a></li>
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
         <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
     </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbookfund.tmpl
index c88c875a23..adce6d1731 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbookfund.tmpl
@@ -1,19 +1,19 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Online Help &rsaquo; System Preferences &rsaquo; Book Fund Administration</title>
+<title>Koha &rsaquo; Online Help &rsaquo; System Preferences &rsaquo; Fund Administration</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 
 
-<h1>Book Fund Administration</h1>
+<h1>Fund Administration</h1>
 
-<p>The first time you access this page, you will be asked to add your first book fund -- thereafter you will also have the option of editing and deleting book funds.</p>
+<p>The first time you access this page, you will be asked to add your first fund -- thereafter you will also have the option of editing and deleting funds.</p>
 
-<p>Book Funds may be ignored if you are setting your System Preferences to "simple" acquisitions: the funds are only useful when using "normal" acquisitions.</p>
+<p>Funds may be ignored if you are setting your System Preferences to "simple" acquisitions: the funds are only useful when using "normal" acquisitions.</p>
 
-<p>"Book Funds" are accounts that you establish to keep track of your expenditures for library materials. They may be used for any kind of material, not just books, and should match the lines in your materials budget. For instance, if your library establishes a budget line for books, another for audiovisual materials, a third line for magazines, and a fourth budget line for electronic databases, then you would have four Book Funds.</p>
+<p>"Funds" are accounts that you establish to keep track of your expenditures for library materials. They may be used for any kind of material, not just books, and should match the lines in your materials budget. For instance, if your library establishes a budget line for books, another for audiovisual materials, a third line for magazines, and a fourth budget line for electronic databases, then you would have four funds.</p>
 
-<p>Each Book Fund has a unique fund code, limited to no more than five characters, that identifies it. You should decide on your fund codes (e.g. something like BOOKS, AV, MAGS, DATA for the four book funds described above) and enter the code in the "Book fund" box, then a full name in the "Name" box.</p>
+<p>Each fund has a unique fund code, limited to no more than five characters, that identifies it. You should decide on your fund codes (e.g. something like BOOKS, AV, MAGS, DATA for the four funds described above) and enter the code in the "fund" box, then a full name in the "Name" box.</p>
 
 <p>Once you have set up a fund, you will see a link to a page for setting up the fund budget. Here you will enter the beginning and ending dates of your budget year and the amount of money in that particular budget line. Do not use any kind of currency notation (like "$") or commas when entering the number. (Commas will be converted to decimal points.) NOTE: Your dates will not saved correctly unless you have set your date format in the System Preferences section of the Parameters page -- DO THIS BEFORE setting budgets.)</p>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tmpl
index 2b0dae2d3d..af9c62ee07 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tmpl
@@ -9,11 +9,11 @@
 <p>Here is where you define the types of users of your library and how they will be handled.</p>
 
 <h2>Category Code and Description</h2>
-<p>Start by assigning a Category Code and a Description to each borrower type. The code is limited on no more than two characters and may be anything you choose. Four codes, however, have special meaning for Koha :</p>
+<p>Start by assigning a Category Code and a Description to each patron type. The code is limited on no more than two characters and may be anything you choose. Four codes, however, have special meaning for Koha :</p>
 <ul>
 	<li>"I" can be used for institutional members, like other libraries that borrow from you, in which case Koha expects slightly different information about the institution;</li>
-	<li>"A" (Adult) and "W" can be linked as "guarantors" to other borrowers who are their dependents.</li>
-	<li>"C" (Children) is a borrower category that has a "guarantor"</li>
+	<li>"A" (Adult) and "W" can be linked as "guarantors" to other patrons who are their dependents.</li>
+	<li>"C" (Children) is a patron category that has a "guarantor"</li>
 </ul>
 
 <h2>Enrollment Period</h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tmpl
index b213fce9ae..4d4663efdd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tmpl
@@ -13,7 +13,7 @@
 
 <p>"Rental charge" is any amount you might charge to users for borrowing items of a certain type (like videos).</p>
 
-<p>"Renewals allowed" says how many times an items of this type may be renewed.</p>
+<p>"Renewals allowed" indicates how many times an items of this type may be renewed.</p>
 
 <p>Item types are useful for many things, and <b>very</b> important in controlling how Koha works :</p>
 <ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/systempreferences.tmpl
index f3c1a14b19..130fe6f809 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/systempreferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/systempreferences.tmpl
@@ -55,7 +55,7 @@
 
 <li><b>maxoutstanding --</b> The maximum amount of outstanding charges a borrower may have before he/she is barred from making reserve requests. The number represents units of your local currency (e.g. "5" means $5.00, if the dollar is your local currency.)</li>
 
-<li><b>maxreserves --</b> The maximum number of reserves a member can make.</li>
+<li><b>maxreserves --</b> The maximum number of holds a patron can place.</li>
 
 <li><b>noissuescharge --</b> The maximum amount of outstanding charges a borrower may have before he/she is barred from checking out items. The number represents units of your local currency (e.g. "5" means $5.00, if the dollar is your local currency.)</li>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/statecollection.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/statecollection.tmpl
index 9c29dd69fe..9b7e73e469 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/statecollection.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/statecollection.tmpl
@@ -14,7 +14,7 @@
 		<li>Missing : means the book will never arrive. The issue disappear from the list, and the number of the issue is added to the "missing list" (on the left box)</li>
 	</ul>
 	<h2>The left part</h2>
-	<p>the left part contains 6 differents informations, that are automatically calculated for some of them, but that you can change<p>
+	<p>the left part contains six elements, some are automatically calculated but but can be changed</p>
 	<ul>
 		<li>Subscription beginning date : the date of the beginning of the 1st subscription. Should not be modified and is not modified automatically by subscriptions renewals</li>
 		<li>Subscription enddate : must be entered manually when the subscription is definetly closed</li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl
index 203e9871e6..2844ba43cd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl
@@ -173,28 +173,35 @@
     </ul>
     <!--/TMPL_LOOP-->
     <h2>Zebra or Nozebra ?</h2>
-    <p>Koha comes in 2 flavours : Zebra and NoZebra. You will now decide the version you need</p>
-    <p>some directions to help you choose:</p>
-    <h3>Zebra version</h3>
+    <p>Searching Koha's bibliographic and authorities databases can be acomplished in two ways:
+	Koha can utilize a textual index engine (Zebra) or use its own internal indexing scheme (NoZebra).
+	</p>
+    <p>You can change your selection after installation and re-index accordingly.</p>
+    <h3>Zebra</h3>
       <ul>
-        <li>is highly scalable (can support easily more than 300 000 items on a public library with an OPAC widely accessed on the web : see http://catalog.ccfls.org/cgi-bin/koha/opac-main.pl or http://www.mediathequeouestprovence.fr/)<li>
-        <li>provide a public (external) z3950 server</li>
-        <li>is complex to configure and administrate</li>
+        <li>Is highly scalable (can scale to tens of millions of bibliographic records. Examples of
+		Zebra Koha installations include:
+		http://catalog.ccfls.org/cgi-bin/koha/opac-main.pl or 
+		http://www.mediathequeouestprovence.fr/)
+		</li>
+        <li>Native support for Z39.50 and SRU servers for bibliographic and authoritiy data</li>
+		<li>Support for field-weighting, relevance ranking, truncation, stemming</li>
+		<li>Arbitrarily complex queries</li>
+        <li>Can be complex to configure and maintain</li>
     </ul>
-    <h3>NoZebra version</h3>
+    <h3>NoZebra (internal Koha indexes)</h3>
         <ul>
-            <li>is available immediatly once Koha is installed</li>
-            <li>is probably not that speedy for catalogue with more than 100 000 items</li>
-            <li>does not provide a public (external) z3950 server</li>
+			<li>Simple to configure and maintain</li>
+            <li>Hasn't been tested with data sets larger than 100,000 records</li>
+            <li>Does not provide a public (external) z3950 server</li>
         </ul>
-    <p>Whatever you choose now, you can always change your mind and setup the other version.</p>
-    <p>Note that, if you choose "Zebra", you won't have a working koha, you must set up zebra first (catalogue search won't work, the rest will)</p>
-    <h3>What do you choose ?</h3>
+    <p>Note that, if you choose "Zebra", you must configure Zebra before your catalogue searching will work)</p>
+    <h3>Please Choose:</h3>
         <form action="install.pl">
             <input type="hidden" name="step" value="3" />
             <input type="hidden" name="op" value="Nozebra" />
-            <p><input type="radio" name="NoZebra" value="1" />Nozebra: my catalogue is not that large and I want something simple to setup</p>
-            <p><input type="radio" name="NoZebra" value="0" />Zebra: I have a large catalogue, I'm not afraid having to setup more software on my server</p>
+            <p><input type="radio" name="NoZebra" value="1" />Nozebra: my catalogue is not that large and I want something simple to setup/maintain</p>
+            <p><input type="radio" name="NoZebra" value="0" />Zebra: I have a large catalogue, I understand I must configure Zebra after the installation has completed</p>
             <input type="submit" value="Choose" /></form>
         </form>
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
index 68572192a5..61440bc0da 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
@@ -31,7 +31,7 @@
     <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
     <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a></h3>
 	<ul>
-        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC</a></li>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC Record</a></li>
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
         <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
     </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl
index 20c5dde7a5..40e496b864 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl
@@ -150,7 +150,7 @@ Filter By Area <select name="areas">
 <!-- /TMPL_LOOP -->                
 </select></td>
 
-<td><input type="button" name="Add" value="Add &gt;&gt;" class="button"  style="width : 6em; margin-bottom : .5em;" onclick="addColumn()" /><br /><input type="button" name="delete" value="&lt;&lt; Delete" class="button" style="width : 6em;"  onclick="delColumn()" />  </td>
+<td><input type="button" name="Add" value="Add" class="button"  style="width : 6em; margin-bottom : .5em;" onclick="addColumn()" /><br /><input type="button" name="delete" value="&lt;&lt; Delete" class="button" style="width : 6em;"  onclick="delColumn()" />  </td>
 
 <td><select id="selectedColumns" name="columns" size="25" style="width:200px;height:300px;"></select>     </td>   </tr></table>     
          
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
index 4b1caa0b2b..f6f819b2d3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
@@ -177,8 +177,8 @@ reports</p>
 </option>
 <!-- /TMPL_LOOP -->
 </select></div>
-<div style="width: 6.3em; float: right; margin-top: 100px"><input type="button" name="Add" value="Add &gt;&gt;" class="button" style="width:6em;" onclick="addColumn()" /><br />
-<input type="button" name="delete" value="&lt;&lt; Remove" class="button" style="width: 6em; margin: 1em 0;" onclick="delColumn()" /></div>
+<div style="width: 6.3em; float: right; margin-top: 100px"><input type="button" name="Add" value="Add" class="button" style="width:6em;" onclick="addColumn()" /><br />
+<input type="button" name="delete" value="&lt;&lt; Delete" class="button" style="width: 6em; margin: 1em 0;" onclick="delColumn()" /></div>
 </div>
 
 <div class="yui-u">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl
index 2df1f5cbae..70945bd1ec 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl
@@ -23,8 +23,7 @@
             <td>&nbsp;</td></tr>
 <!-- /TMPL_LOOP -->
 </table>
-<p><b>Notes:</b> Please return this journal
-promptly as others are waiting.
+<p><b>Notes:</b> Please return this item promptly as others are waiting for it.
 <br /><!-- TMPL_VAR NAME="routingnotes" --></p>
    <div id="slip-block-links">
    <a class="button" href="javascript:window.print();self.close()">Print</a> &nbsp; <a class="button" href="javascript:self.close()">Close</a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl
index 9b5bfb4ba8..40209a1d9c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl
@@ -90,7 +90,7 @@
 		    </span>
 			
 		    <span id="span-other-reason<!-- TMPL_VAR NAME="suggestionid" -->" class="content_hidden">
-			<input type="text" name="other-reason<!-- TMPL_VAR name="suggestionid" -->" value="write your reason here..." onclick="if(this.value === 'write your reason here...'){this.value=''}" />
+			<input type="text" name="other-reason<!-- TMPL_VAR name="suggestionid" -->" value="please note your reason here..." onclick="if(this.value === 'please note your reason here...'){this.value=''}" />
 			<small><a href="#" onclick="displayOther('<!-- TMPL_VAR NAME="suggestionid" -->'); return false;">back to list</a></small>
 		    </span>
 			
@@ -185,4 +185,4 @@
 </div>
 </div>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_ACCEPTED.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_ACCEPTED.tmpl
index db86df7dff..0b17ed0ae5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_ACCEPTED.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_ACCEPTED.tmpl
@@ -2,10 +2,10 @@ Dear <!-- TMPL_VAR NAME="LibraryName" --> user,
 
 You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.
 
-<!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> reviewed your suggestion today, and found it interesting. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the book arrives at the library.
+<!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> reviewed your suggestion today. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the item arrives at the library.
 
 If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.
 
 Thank you,
 
-<!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file
+<!-- TMPL_VAR NAME="LibraryName" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_AVAILABLE.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_AVAILABLE.tmpl
index 7193a5c221..4adadb647e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_AVAILABLE.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_AVAILABLE.tmpl
@@ -2,10 +2,10 @@ Dear <!-- TMPL_VAR NAME="LibraryName" --> user,
 
 You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.
 
-We are pleased to inform you that the item is now part of the collection of the <!-- TMPL_VAR NAME="LibraryName" -->.
+We are pleased to inform you that the item you requested is now part of the collection of the <!-- TMPL_VAR NAME="LibraryName" -->.
 
 If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.
 
 Thank you,
 
-<!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file
+<!-- TMPL_VAR NAME="LibraryName" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_ORDERED.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_ORDERED.tmpl
index 428d14183e..b9645ae290 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_ORDERED.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_ORDERED.tmpl
@@ -2,7 +2,7 @@ Dear <!-- TMPL_VAR NAME="LibraryName" --> user,
 
 You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.
 
-We are pleased to inform you that the book has now been ordered. It should arrive soon, at which time it will be processed for addition to the collection.
+We are pleased to inform you that the item you requested has now been ordered. It should arrive soon, at which time it will be processed for addition into the collection.
 
 You will be notified again when the book is available.
 
@@ -10,4 +10,4 @@ If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->
 
 Thank you,
 
-<!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file
+<!-- TMPL_VAR NAME="LibraryName" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_REJECTED.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_REJECTED.tmpl
index cb88c6eb5b..2a1c08b33d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_REJECTED.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_REJECTED.tmpl
@@ -4,7 +4,7 @@ You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- T
 
 <!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR name="lib.firstname" --> reviewed your request today, and has decided not to accept the suggestion at this time.
 
-The reason given for this reject is: <!-- TMPL_VAR NAME="reason" -->
+The reason given is: <!-- TMPL_VAR NAME="reason" -->
 
 If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl
index b6584f0166..85c33d8478 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl
@@ -74,7 +74,7 @@
         <li>
         <label for="dont_export_fields">Don't export fields</label>
         <input id="dont_export_fields" type="text" name="dont_export_fields" />
-        <i>seperate by a blank. (e.g.: 100a 200 606)</i>
+        <i>separate by a blank. (e.g.: 100a 200 606)</i>
         </li></ol>
     </fieldset>
     <fieldset class="rows">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl
index 397abfe660..163f4c5b9d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl
@@ -196,7 +196,7 @@
 			<label for="showMonth">Month</label> <input type="text" size="2" id="showMonth" name="showMonth" readonly="readonly" style="background-color:#FFFFFF;color:Black;font-size:10px;" />
 			<label for="showYear">Year</label> <input type="text" size="4" id="showYear" name="showYear" readonly="readonly" style="background-color:#FFFFFF;color:Black;font-size:10px;" />		
 		</div>
-	    <p><label for="showDescription">Add a description to holiday day:</label></p>
+	    <p><label for="showDescription">Add a description to holiday day</label></p>
 		<p>
 			<textarea rows="2" cols="40" id="showDescription" name="showDescription"></textarea>	
 		</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tmpl
index fa9d8e4584..4d05c0621c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tmpl
@@ -95,7 +95,7 @@ Page
     <th>Comments</th>
     <th>Status</th>
     <th>Staged</th>
-    <th># Bibs</th.
+    <th># Bibs</th>
     <th># Items</th>
   </tr>
   <!-- TMPL_LOOP name="batch_list" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
index 83ea67cd4d..f2da891dd6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
@@ -20,7 +20,7 @@
 <form method="post" action="/cgi-bin/koha/tools/viewlog.pl">
 
 <fieldset>
-    <legend>Additional infos</legend>
+    <legend>Additional parameters</legend>
         <p>
         <label for="from"> Display from</label> <input type="text" size="10" id="from" name="from" value="<!-- TMPL_VAR NAME="datefrom"-->" />
 							<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" alt="Show Calendar" id="openCalendarFrom" style="cursor: pointer;" />
-- 
2.39.2