From f3a3d7a42db72c5244ccbdf6ce86b59dc49198c4 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 3 Apr 2012 15:28:23 -0400
Subject: [PATCH] Bug 2780 - Capitalize strings consistently (Admin pages)

Correcting capitalization in Administration templates.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
---
 .../prog/en/modules/admin/admin-home.tt       | 12 +++---
 .../en/modules/admin/aqbudget_owner_search.tt |  4 +-
 .../prog/en/modules/admin/aqbudgetperiods.tt  | 16 +++----
 .../prog/en/modules/admin/aqbudgets.tt        | 18 ++++----
 .../prog/en/modules/admin/aqcontract.tt       | 12 +++---
 .../modules/admin/auth_subfields_structure.tt |  8 ++--
 .../en/modules/admin/auth_tag_structure.tt    | 32 +++++++-------
 .../en/modules/admin/authorised_values.tt     | 22 +++++-----
 .../prog/en/modules/admin/authtypes.tt        | 16 +++----
 .../prog/en/modules/admin/biblio_framework.tt | 32 +++++++-------
 .../modules/admin/branch_transfer_limits.tt   | 10 ++---
 .../prog/en/modules/admin/branches.tt         | 38 ++++++++---------
 .../prog/en/modules/admin/categorie.tt        | 42 +++++++++----------
 .../prog/en/modules/admin/checkmarc.tt        |  6 +--
 .../prog/en/modules/admin/cities.tt           |  6 +--
 .../prog/en/modules/admin/classsources.tt     | 18 ++++----
 .../prog/en/modules/admin/clone-rules.tt      |  2 +-
 .../prog/en/modules/admin/currency.tt         | 28 ++++++-------
 .../prog/en/modules/admin/fieldmapping.tt     | 10 ++---
 .../modules/admin/item_circulation_alerts.tt  |  8 ++--
 .../prog/en/modules/admin/itemtypes.tt        | 40 +++++++++---------
 .../prog/en/modules/admin/koha2marclinks.tt   | 10 ++---
 .../modules/admin/marc_subfields_structure.tt | 24 +++++------
 .../prog/en/modules/admin/marctagstructure.tt | 22 +++++-----
 .../prog/en/modules/admin/matching-rules.tt   | 12 +++---
 .../prog/en/modules/admin/oai_set_mappings.tt |  4 +-
 .../prog/en/modules/admin/oai_sets.tt         | 10 ++---
 .../en/modules/admin/patron-attr-types.tt     |  8 ++--
 .../prog/en/modules/admin/preferences.tt      |  4 +-
 .../prog/en/modules/admin/printers.tt         | 24 +++++------
 .../prog/en/modules/admin/roadtype.tt         | 14 +++----
 .../prog/en/modules/admin/smart-rules.tt      |  4 +-
 .../prog/en/modules/admin/stopwords.tt        | 14 +++----
 .../en/modules/admin/systempreferences.tt     | 22 +++++-----
 .../prog/en/modules/admin/z3950servers.tt     | 38 ++++++++---------
 35 files changed, 295 insertions(+), 295 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
index 6b339f8a44..ef46ede474 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
@@ -12,7 +12,7 @@
    
    <div id="bd">
 	<div id="yui-main" class="sysprefs">
-	<div class="yui-g"><h1>Koha Administration</h1></div>
+    <div class="yui-g"><h1>Koha administration</h1></div>
 	<div class="yui-g">
 
 <div class="yui-u first">
@@ -51,16 +51,16 @@
 	<dd>Define extended attributes (identifiers and statistical categories) for patron records</dd>
 	<dt><a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fines rules</a></dt>
 	<dd>Define circulation and fines rules for combinations of libraries, patron categories, and item types</dd>
-	<dt><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Library Transfer Limits</a></dt>
+    <dt><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Library transfer limits</a></dt>
 	<dd>Limit the ability to transfer items between libraries based on the library sending, the library receiving, and the item type involved. These rules only go into effect if the preference UseBranchTransferLimits is set to ON.</dd>
-	<dt><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item Circulation Alerts</a></dt>
+    <dt><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item circulation alerts</a></dt>
 	<dd>Define rules for check-in and checkout notifications for combinations of libraries, patron categories, and item types</dd>
 </dl>
 </div>
 <div class="yui-u">
 <h3>Catalog</h3>
 <dl>
-	<dt><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC Bibliographic framework</a></dt>
+    <dt><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC bibliographic framework</a></dt>
 	<dd>Create and manage Bibliographic frameworks that define the characteristics of your MARC Records (field and subfield definitions) as well as templates for the MARC editor.</dd>
 	<dt><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha to MARC mapping</a></dt>
 	<dd>Define the mapping between the Koha transactional database (SQL) and the MARC Bibliographic records. Note that the mapping can be defined through MARC Bibliographic Framework. This tool is just a shortcut to speed up linkage.</dd>
@@ -74,7 +74,7 @@
     <dd>Define classification sources (i.e., call number schemes) used by your collection.  Also define filing rules used for sorting call numbers.</dd>
     <dt><a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a></dt>
     <dd>Manage rules for automatically matching MARC records during record imports.</dd>
-    <dt><a href="/cgi-bin/koha/admin/oai_sets.pl">OAI Sets Configuration</a></dt>
+    <dt><a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a></dt>
     <dd>Manage OAI Sets</dd>
 </dl>
 
@@ -97,7 +97,7 @@
 	<dd>Words ignored during search.</dd>[% END %]
 	<!-- <dt><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></dt>
 	<dd>Printers (UNIX paths).</dd> -->
-	<dt><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Client Targets</a></dt>
+    <dt><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 client targets</a></dt>
 	<dd>Define which servers to query for MARC data in the integrated Z39.50 client.</dd>
 </dl>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget_owner_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget_owner_search.tt
index 84da262593..79ebcd87b2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget_owner_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget_owner_search.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Budget Owner Search</title>
+<title>Koha &rsaquo; Budget owner search</title>
 [% INCLUDE 'doc-head-close.inc' %]
     <style type="text/css">
     #custom-doc { width:44.46em;*width:43.39em;min-width:578px; margin:auto; text-align:left; }
@@ -26,7 +26,7 @@ function returnOwner(ownerId, ownerName){
 	<div class="yui-g">
 
 
-<h3>Search for Budget Owner</h3>
+<h3>Search for budget owner</h3>
 	<form action="/cgi-bin/koha/admin/aqbudget_owner_search.pl" method="post">
 		<fieldset>
 		<input type="text" name="member" id="member" value="[% member %]" class="focus" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
index f3c52d505a..aae5925ccd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
@@ -94,7 +94,7 @@
             Delete budget '[% budget_period_description %]'?
     [% END %]
     [% IF ( delete_confirmed ) %]&rsaquo;
-        Data Deleted
+        Data deleted
     [% END %]
 </title>
 
@@ -269,14 +269,14 @@
     <li>
         <!-- ACTIVE -->
         <!-- ############################## -->
-        <label for="budget_period_active">Make Budget Active</label>
+        <label for="budget_period_active">Make budget active</label>
         [% IF ( budget_period_active ) %]<input type="checkbox" checked="checked" id="budget_period_active" name="budget_period_active" value="1" />[% ELSE %]  <input type="checkbox" id="budget_period_active" name="budget_period_active" value="1"/> [% END %]
     </li>
 
     <li>
         <!-- LOCK  -->
         <!-- ############################## -->
-        <label for="budget_period_locked">Lock Budget</label>
+        <label for="budget_period_locked">Lock budget</label>
         [% IF ( budget_period_locked ) %]<input type="checkbox" checked="checked" id="budget_period_locked" name="budget_period_locked" value="1" />[% ELSE %]  <input type="checkbox" id="budget_period_locked" name="budget_period_locked" value="1"/> [% END %]
     </li>
     </ol>
@@ -285,7 +285,7 @@
     <fieldset class="action">
         <!-- "save changes" button -->
         <!-- ###################################### -->
-        <input type="button" value="Save Changes"  onclick="Check(this.form)"    />
+        <input type="button" value="Save changes"  onclick="Check(this.form)"    />
         <!--             <input type="submit" value="Save Changes"  />  -->
         <!--            <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl" class="cancel">Cancel</a> -->
     </fieldset>
@@ -334,9 +334,9 @@
     <table id="periodsh">
     <thead>
 	    <tr>
-	        <th>Budget Name</th>
-	        <th>Start Date</th>
-	        <th>End Date</th>
+            <th>Budget name</th>
+            <th>Start date</th>
+            <th>End date</th>
 	        <th>Active</th>
 	        <th>Locked</th>
 	        <th>Total</th>
@@ -359,7 +359,7 @@
 	        <td>
 	            <a href="[% period_loo.script_name %]?op=add_form&amp;budget_period_id=[% period_loo.budget_period_id |html %]">Edit</a>
 	            <a href="[% period_loo.script_name %]?op=delete_confirm&amp;budget_period_id=[% period_loo.budget_period_id %]">Delete</a>
-	           	<a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_period_id=[% period_loo.budget_period_id %]">Add Fund</a>
+            <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_period_id=[% period_loo.budget_period_id %]">Add fund</a>
 	        </td>
 	        </tr>
 	    [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index cae23062c8..bf778c7907 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Funds[% IF ( add_form ) %] &rsaquo; [% IF ( budget_id ) %]Modify Fund[% IF ( budget_name ) %] '[% budget_name %]'[% END %][% ELSE %]Add Fund [% END %][% END %]</title>
+<title>Koha &rsaquo; Administration &rsaquo; Funds[% IF ( add_form ) %] &rsaquo; [% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name %]'[% END %][% ELSE %]Add fund [% END %][% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
 
@@ -225,12 +225,12 @@
             </ul>
         [% END %]</td>
     [% IF ( budge.budget_lock ) %]
-        <td> <span style="color: gray;" > Edit Delete </span> </td>
+        <td> <span style="color: gray;"> Edit Delete </span> </td>
     [% ELSE %]
         <td>
             <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_id=[% budge.budget_id %]&amp;budget_period_id=[% budge.budget_period_id %]" >Edit</a>
             <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=delete_confirm&amp;budget_id=[% budge.budget_id %]&amp;budget_period_id=[% budge.budget_period_id %]">Delete</a>
-            <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_parent_id=[% budge.budget_id %]&amp;budget_period_id=[% budge.budget_period_id %]">Add Child Fund</a>
+            <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_parent_id=[% budge.budget_id %]&amp;budget_period_id=[% budge.budget_period_id %]">Add child fund</a>
         </td>
     [% END %]
     </tr>
@@ -260,19 +260,19 @@
     <ol>
     [% IF ( budget_parent_id ) %]
     <li>
-        <span class="label">Fund Parent: </span>
+        <span class="label">Fund parent: </span>
         [% budget_parent_name %]
         [% budget_parent_id %] - [% budget_parent_name %]
         <input type="hidden" name="budget_parent_id" value="[% budget_parent_id %]" />
     </li>
     [% END %]
     <li>
-    <label class="required"  for="budget_code">Fund Code: </label>
+    <label class="required"  for="budget_code">Fund code: </label>
     <input type="text" name="budget_code" id="budget_code" value="[% budget_code %]" size="30" />
     </li>
 
     <li>
-    <label class="required" for="budget_name">Fund Name: </label>
+    <label class="required" for="budget_name">Fund name: </label>
     <input type="text" name="budget_name" id="budget_name" value="[% budget_name %]" size="60" />
     </li>
 
@@ -377,10 +377,10 @@
 [% END %] <!-- add_form -->
 
 [% IF ( delete_confirm ) %]
-<div class="dialog alert"> <h3>Delete Fund [% budget_name %]?</h3>
+<div class="dialog alert"> <h3>Delete fund [% budget_name %]?</h3>
 <table>
     <tr>
-    <th scope="row">Fund Amount:</th>
+    <th scope="row">Fund amount:</th>
     <td>[% budget_amount %]</td>
     </tr>
 </table>
@@ -393,7 +393,7 @@
 </form>
 
 <form action="[% action %]" method="get">
-    <input type="submit" class="deny" value="No, Do Not Delete" />
+    <input type="submit" class="deny" value="No, do not delete" />
 </form>
 </div>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
index 9eb908808f..20f06cb2fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
@@ -6,8 +6,8 @@
 [% END %]
 [% IF ( else ) %]Contracts of [% booksellername %][% END %]
 [% IF ( add_validate ) %]Data recorded[% END %]
-[% IF ( delete_confirm ) %]Confirm Deletion of Contract '[% contractnumber %]'[% END %]
-[% IF ( delete_confirmed ) %]Contract Deleted[% END %]</title>
+[% IF ( delete_confirm ) %]Confirm deletion of contract '[% contractnumber %]'[% END %]
+[% IF ( delete_confirmed ) %]Contract deleted[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
@@ -75,7 +75,7 @@ function Check(ff) {
     [% END %]
     [% IF ( delete_confirm ) %]
         <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a>
-        &rsaquo; Confirm Deletion of Contract [% contractnumber %]
+        &rsaquo; Confirm deletion of contract [% contractnumber %]
     [% END %]
     [% IF ( delete_confirmed ) %]
         <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a> &rsaquo; Contract Deleted
@@ -154,7 +154,7 @@ function Check(ff) {
             [% IF ( delete_confirm ) %]
                 <form action="[% script_name %]" method="post">
                     <fieldset>
-                        <legend>Confirm Deletion of Contract [% contractnumber %]</legend>
+                        <legend>Confirm deletion of contract [% contractnumber %]</legend>
                         <table>
                             <tr><th scope="row">Contract number:</th><td>[% contractnumber %]</td></tr>
                             <tr><th scope="row">Contract name:</th><td>[% contractname %]</td></tr>
@@ -174,7 +174,7 @@ function Check(ff) {
                 </form>
             [% END %]
             [% IF ( delete_confirmed ) %]
-                <h3>Contract Deleted</h3>
+                <h3>Contract deleted</h3>
                 <form action="[% script_name %]" method="post">
                     <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
                     <input type="submit" value="OK" />
@@ -195,7 +195,7 @@ function Check(ff) {
                         //]]>
                     </script>
                     <ul class="toolbar">
-                        <li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid %]">New Contract</a></li>
+                        <li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid %]">New contract</a></li>
                     </ul>
                 </div>
                 <h2>Contract(s) of [% booksellername %]</h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
index e7ea422d68..2880572ecf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
@@ -29,7 +29,7 @@ function displayMoreConstraint(numlayer){
   [% IF ( else ) %]Authority MARC subfield structure
   [% ELSE %]<a href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield %]&amp;tagsubfield=[% tagsubfield %]&amp;authtypecode=[% authtypecode %]">Authority MARC subfield structure</a> &rsaquo;
   [% END %]
-  [% IF ( delete_confirm ) %]Confirm Deletion of Subfield [% tagsubfield %]?[% END %]
+  [% IF ( delete_confirm ) %]Confirm deletion of subfield [% tagsubfield %]?[% END %]
   [% IF ( delete_confirmed ) %]Data deleted[% END %]
   [% IF ( add_form ) %]
   [% IF ( use_heading_flags_p ) %]
@@ -53,7 +53,7 @@ function displayMoreConstraint(numlayer){
         <input type="hidden" name="op" value="add_validate" />
         <input type="hidden" name="tagfield" value="[% tagfield %]" />
         <input type="hidden" name="authtypecode" value="[% authtypecode %]" />
-        <fieldset class="action"><input type="submit" class="submit" value="Save Changes" /> <a class="cancel" href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield %]&amp;authtypecode=[% authtypecode %]">Cancel</a></fieldset>
+        <fieldset class="action"><input type="submit" class="submit" value="Save changes" /> <a class="cancel" href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield %]&amp;authtypecode=[% authtypecode %]">Cancel</a></fieldset>
         <div id="subfieldtabs" class="toptabs numbered">
             <ul>
                 [% FOREACH loo IN loop %]
@@ -95,7 +95,7 @@ function displayMoreConstraint(numlayer){
                         </ol>
                     </fieldset>
                 </li>
-                <li><label for="isurl[% loo.row %]">Is a url:</label>[% loo.isurl %] (if checked, it means that the subfield is a url and can be clicked)</li>
+                <li><label for="isurl[% loo.row %]">Is a URL:</label>[% loo.isurl %] (if checked, it means that the subfield is a URL and can be clicked)</li>
                 <li>
                     <fieldset><legend>Help input</legend>	
                         <ol>
@@ -114,7 +114,7 @@ function displayMoreConstraint(numlayer){
 
 [% IF ( delete_confirm ) %]
 
-	<div class="dialog alert"><h3>Delete Subfield <span class="ex">'[% tagsubfield %]'?</span></h3>
+    <div class="dialog alert"><h3>Delete subfield <span class="ex">'[% tagsubfield %]'?</span></h3>
     <form action="[% delete_link %]" method="post"><input type="hidden" name="op" value="delete_confirmed" />
     <table><tr><th scope="row">Subfield:</th> <td>[% tagsubfield %]</td></tr>
     <tr><th scope="row">Description:</th> <td>[% liblibrarian %]</td></tr></table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
index 9347adcc0f..c26f5b0e8d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
@@ -1,8 +1,8 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Administration &rsaquo; Authority MARC framework [% IF ( add_form ) %][% IF ( use_heading_flags_p ) %]
-    [% IF ( heading_modify_tag_p ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default Framework[% END %] &rsaquo; Modify tag[% END %]
-    [% IF ( heading_add_tag_p ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default Framework[% END %] &rsaquo; New tag[% END %]
-    [% ELSE %]&rsaquo; [% action %][% END %][% END %][% IF ( delete_confirm ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default Framework[% END %] &rsaquo; Confirm Deletion[% END %][% IF ( delete_confirmed ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default Framework[% END %] &rsaquo; Data Deleted[% END %]</title>
+    [% IF ( heading_modify_tag_p ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default framework[% END %] &rsaquo; Modify tag[% END %]
+    [% IF ( heading_add_tag_p ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default framework[% END %] &rsaquo; New tag[% END %]
+    [% ELSE %]&rsaquo; [% action %][% END %][% END %][% IF ( delete_confirm ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default framework[% END %] &rsaquo; Confirm deletion[% END %][% IF ( delete_confirmed ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default framework[% END %] &rsaquo; Data deleted[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script>
@@ -70,18 +70,18 @@ return false;
 [% INCLUDE 'cat-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; [% IF ( add_form ) %][% IF ( use_heading_flags_p ) %]
-    [% IF ( heading_modify_tag_p ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] Framework</a>[% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default Framework</a>[% END %] &rsaquo; Modify tag[% END %]
-    [% IF ( heading_add_tag_p ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] Framework</a>[% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default Framework</a>[% END %] &rsaquo; New tag[% END %]
-    [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; [% action %]
+    [% IF ( heading_modify_tag_p ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC framework</a> &rsaquo; [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] Framework</a>[% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>[% END %] &rsaquo; Modify tag[% END %]
+    [% IF ( heading_add_tag_p ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC framework</a> &rsaquo; [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] framework</a>[% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>[% END %] &rsaquo; New tag[% END %]
+    [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC framework</a> &rsaquo; [% action %]
     [% END %]
     [% ELSE %]
-    [% IF ( delete_confirm ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo;
-    [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] Framework</a>
-    [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default Framework</a>[% END %] &rsaquo; Confirm Deletion
+    [% IF ( delete_confirm ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC framework</a> &rsaquo;
+    [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] framework</a>
+    [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>[% END %] &rsaquo; Confirm deletion
     [% ELSE %]
-    [% IF ( delete_confirmed ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; Data Deleted
-    [% ELSE %]Authority MARC Framework: [% IF ( authtypecode ) %][% authtypecode %] Framework
-    [% ELSE %]Default Framework[% END %]
+    [% IF ( delete_confirmed ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC framework</a> &rsaquo; Data deleted
+    [% ELSE %]Authority MARC framework: [% IF ( authtypecode ) %][% authtypecode %] framework
+    [% ELSE %]Default framework[% END %]
     [% END %]
     [% END %]
     [% END %]
@@ -135,7 +135,7 @@ return false;
 
 [% IF ( delete_confirm ) %]
 		<div class="dialog alert">
-		<h3>Confirm Deletion</h3>
+        <h3>Confirm deletion</h3>
 		<form action="[% script_name %]" method="post">
 		<table>
 			<tr><th scope="row">Tag: </th><td>[% searchfield %] [% liblibrarian %]</td></tr>
@@ -143,8 +143,8 @@ return false;
         <input type="hidden" name="op" value="delete_confirmed" />
         <input type="hidden" name="authtypecode" value="[% authtypecode %]" />
         <input type="hidden" name="searchfield" value="[% searchfield %]" />
-		<input type="submit" value="Yes, Delete" class="approve"></form>
-		<form action="[% script_name %]" method="get"><input type="submit" class="deny" value="No, Do Not Delete" /></form>
+        <input type="submit" value="Yes, delete" class="approve"></form>
+        <form action="[% script_name %]" method="get"><input type="submit" class="deny" value="No, do not delete" /></form>
 		</div>
 [% END %]
 
@@ -189,7 +189,7 @@ return false;
 	}	//]]>
 	</script>
 	<ul class="toolbar">
-	<li><a id="newtag" href="/cgi-bin/koha/admin/auth_tag_structure.pl?op=add_form&amp;authtypecode=[% authtypecode %]">New Tag</a></li>
+    <li><a id="newtag" href="/cgi-bin/koha/admin/auth_tag_structure.pl?op=add_form&amp;authtypecode=[% authtypecode %]">New tag</a></li>
 </ul></div>
 
 <h2>Select an authority framework</h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
index 0c806cebb6..0deebe1f70 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
@@ -1,8 +1,8 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Authorized Values [% IF ( add_form ) %] &rsaquo; [% IF ( action_modify ) %]Modify authorized value[% END %]
+<title>Koha &rsaquo; Administration &rsaquo; Authorized values [% IF ( add_form ) %] &rsaquo; [% IF ( action_modify ) %]Modify authorized value[% END %]
 	   [% IF ( action_add_value ) %] &rsaquo;  New authorized value[% END %]
 	   [% IF ( action_add_category ) %] &rsaquo; New category[% END %][% END %]
-[% IF ( delete_confirm ) %] &rsaquo; Confirm Deletion[% END %]
+[% IF ( delete_confirm ) %] &rsaquo; Confirm deletion[% END %]
 [% IF ( else ) %]Authorized values[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
@@ -32,10 +32,10 @@
 <body id="admin_authorised_values" class="admin">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-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; [% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized Values</a> &rsaquo; [% IF ( action_modify ) %]Modify authorized value[% END %]
+<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; [% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a> &rsaquo; [% IF ( action_modify ) %]Modify authorized value[% END %]
 	   [% IF ( action_add_value ) %]New authorized value[% END %]
 	   [% IF ( action_add_category ) %]New category[% END %][% END %]
-[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized Values</a> &rsaquo; Confirm Deletion[% END %]
+[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a> &rsaquo; Confirm deletion[% END %]
 [% IF ( else ) %]Authorized values[% END %]</div>
 
 <div id="doc3" class="yui-t2">
@@ -79,7 +79,7 @@
         </li>
 		</ol>
 		<div id="icons" class="toptabs">
-		<h5 style="margin-left:10px;">Choose an Icon:</h5>
+        <h5 style="margin-left:10px;">Choose an icon:</h5>
 			<ul>
 					<li><a href="/cgi-bin/koha/admin/authorised_values.pl?op=add_form&amp;category=[% category %]#none">None</a></li>
 				  [% FOREACH imageset IN imagesets %]
@@ -122,7 +122,7 @@
 
 [% IF ( delete_confirm ) %]
 	<div class="dialog alert">
-<h3>Confirm Deletion</h3>
+<h3>Confirm deletion</h3>
 <table>
 	<tr>
 		<th>Category</th>
@@ -140,8 +140,8 @@
 	<form action="[% script_name %]" method="post">
 		<input type="hidden" name="op" value="delete_confirmed" />
 		<input type="hidden" name="id" value="[% id %]" />
-		<input type="hidden" name="searchfield" value="[% searchfield %]" /><fieldset class="action"><input type="submit" value="Yes, Delete" class="approve" /></form>
-<form action="[% script_name %]" method="get"><input type="hidden" name="searchfield" value="[% searchfield %]" /><input type="submit" value="No, Do Not Delete" class="deny" /></form>
+        <input type="hidden" name="searchfield" value="[% searchfield %]" /><fieldset class="action"><input type="submit" value="Yes, delete" class="approve" /></form>
+<form action="[% script_name %]" method="get"><input type="hidden" name="searchfield" value="[% searchfield %]" /><input type="submit" value="No, do not delete" class="deny" /></form>
 </div>
 [% END %]
 
@@ -171,8 +171,8 @@
 	//]]>
 	</script>
 	<ul class="toolbar">
-	 <li><a id="addauth" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form&amp;category=[% category %]">New Authorized value for [% category %]</a></li>
-    <li><a id="addcat" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form">New Category</a></li>
+     <li><a id="addauth" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form&amp;category=[% category %]">New authorized value for [% category %]</a></li>
+    <li><a id="addcat" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form">New category</a></li>
 </ul></div>
 
 <h1>Authorized values</h1>
@@ -182,7 +182,7 @@
 <div class="dialog alert">Could not add value &quot;[% duplicate_value %]&quot; for category &quot;[% duplicate_category %]&quot; &mdash; value already present.
 </div>
 [% END %]
-<form action="/cgi-bin/koha/admin/authorised_values.pl" method="post" id="category"><label for="searchfield">Show Category: </label>[% tab_list %] <input type="submit" value="Submit" /></form>
+<form action="/cgi-bin/koha/admin/authorised_values.pl" method="post" id="category"><label for="searchfield">Show category: </label>[% tab_list %] <input type="submit" value="Submit" /></form>
 [% IF ( category == 'Bsort1' ) %]
     <p>An authorized value attached to patrons, that can be used for stats purposes</p>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
index ef11e9a30e..c87434e536 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Authority Types
+<title>Koha &rsaquo; Administration &rsaquo; Authority types
 [% IF ( add_form ) %]
 &rsaquo; [% IF ( authtypecode ) %]Modify authority type[% ELSE %]New authority type[% END %]
 [% ELSIF ( delete_confirm ) %]
-&rsaquo; Confirm Deletion of Authority Type
+&rsaquo; Confirm deletion of authority type
 [% END %]
 </title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -55,11 +55,11 @@ $(document).ready(function() {
 <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; <a href="[% script_name %]">Authority Types</a>
+&rsaquo; <a href="[% script_name %]">Authority types</a>
 [% IF ( add_form ) %]
-&rsaquo; [% IF ( authtypecode ) %]Modify[% ELSE %]New[% END %] Authority Type
+&rsaquo; [% IF ( authtypecode ) %]Modify[% ELSE %]New[% END %] Authority type
 [% ELSIF ( delete_confirm ) %]
-&rsaquo; Confirm Deletion of Authority Type
+&rsaquo; Confirm deletion of authority type
 [% END %]
 </div>
 
@@ -110,7 +110,7 @@ $(document).ready(function() {
 [% END %]
 
 [% IF ( delete_confirm ) %]
-		<div class="dialog alert"><h3>Confirm Deletion of authority structure definition for <span class="ex">'[% authtypetext %]' ([% authtypecode %])</span></h3>
+        <div class="dialog alert"><h3>Confirm deletion of authority structure definition for <span class="ex">'[% authtypetext %]' ([% authtypecode %])</span></h3>
 	[% IF ( total ) %]
 		<p>This record is used <strong>[% total %]</strong> times</p>
 	[% END %]		
@@ -126,10 +126,10 @@ $(document).ready(function() {
 
 <div id="toolbar">
 	<ul class="toolbar">
-	<li><a id="authtype" href="[% script_name %]?op=add_form">New Authority Type</a></li>
+    <li><a id="authtype" href="[% script_name %]?op=add_form">New authority type</a></li>
 </ul></div>
 
-<h1>Authority Types</h1>
+<h1>Authority types</h1>
 <p>Define authority types, then authority MARC structure in the same way you define itemtypes and biblio MARC tag structure. Authority values are managed through plugins</p>
 <table>
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
index 234d2d5ca3..eb826a4136 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; MARC Frameworks
+<title>Koha &rsaquo; Administration &rsaquo; MARC frameworks
 [% IF ( add_form ) %]
 &rsaquo; [% IF ( frameworkcode ) %]Modify framework text[% ELSE %]Add framework[% END %]
 [% ELSIF ( delete_confirm ) %]
-&rsaquo; Delete Framework for [% frameworktext %] ([% frameworkcode %])?
+&rsaquo; Delete framework for [% frameworktext %] ([% frameworkcode %])?
 [% END %]
 </title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -129,11 +129,11 @@ $(document).ready(function() {
 <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; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC Frameworks</a>
+&rsaquo; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a>
 [% IF ( add_form ) %]
 &rsaquo; [% IF ( frameworkcode ) %]Modify framework text[% ELSE %]Add framework[% END %]
 [% ELSIF ( delete_confirm ) %]
-&rsaquo; Delete Framework for [% frameworktext %] ([% frameworkcode %])?
+&rsaquo; Delete framework for [% frameworktext %] ([% frameworkcode %])?
 [% END %]
 </div>
 
@@ -144,7 +144,7 @@ $(document).ready(function() {
 	
 [% IF ( else ) %]<div id="toolbar">
 	<ul class="toolbar">
-	<li><a id="newframework" href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form">New Framework</a></li>
+    <li><a id="newframework" href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form">New framework</a></li>
 </ul></div>[% END %]
 
 [% IF ( add_form ) %]
@@ -154,11 +154,11 @@ $(document).ready(function() {
     <fieldset class="rows">
     <ol>
 	[% IF ( frameworkcode ) %]
-        <li><span class="label">Framework Code</span><input type="hidden" id="frameworkcode" name="frameworkcode" value="[% frameworkcode %]" />[% frameworkcode %]
+        <li><span class="label">Framework code</span><input type="hidden" id="frameworkcode" name="frameworkcode" value="[% frameworkcode %]" />[% frameworkcode %]
             <input type="hidden" name="modif" value="1" />
         </li>
 	[% ELSE %]
-        <li><label for="frameworkcode">Framework Code</label><input type="text" id="frameworkcode" name="frameworkcode" size="4" maxlength="4" onblur="toUC(this)" /></li>
+        <li><label for="frameworkcode">Framework code</label><input type="text" id="frameworkcode" name="frameworkcode" size="4" maxlength="4" onblur="toUC(this)" /></li>
 	[% END %]
         <li><label for="description">Description</label>
         <input type="text" name="frameworktext" id="description" size="40" maxlength="80" value="[% frameworktext |html %]" /></li></ol></fieldset>
@@ -172,14 +172,14 @@ $(document).ready(function() {
     [% IF ( total ) %]
        <p><strong>This framework is used [% total %] times</strong>.</p>
     [% END %]
-    <form class="inline" action="[% script_name %]" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="frameworkcode" value="[% frameworkcode %]" /><input type="submit" class="approve" value="Yes, Delete this Framework!" />
+    <form class="inline" action="[% script_name %]" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="frameworkcode" value="[% frameworkcode %]" /><input type="submit" class="approve" value="Yes, delete this framework!" />
     </form>
-    <form class="inline" action="[% script_name %]" method="get"><input type="submit" class="deny" value="No, Do not Delete!" /></form>
+    <form class="inline" action="[% script_name %]" method="get"><input type="submit" class="deny" value="No, do not delete!" /></form>
 </div>
 [% END %]
 
 [% IF ( else ) %]
-<h1>MARC Frameworks</h1>
+<h1>MARC frameworks</h1>
 <p>Framework name, then go to MARC biblio to set MARC editor parameters</p>
 <table>
     <tr>
@@ -203,9 +203,9 @@ $(document).ready(function() {
                     <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
                     <ul>
                         <li class="li_close_import_export"><span class="import_export_close" title="Close popup">Close</span></li>
-                        <li><input type="radio" name="type_export_[% frameworkcode %]" value="csv" id="type_export_[% frameworkcode %]" checked="checked" /><label for="type_export_[% frameworkcode %]" title="Export to CSV Spreadsheet">Export to CSV Spreadsheet</label></li>
-                        <li><input type="radio" name="type_export_[% frameworkcode %]" value="excel" id="type_export_[% frameworkcode %]" /><label for="type_export_[% frameworkcode %]" title="Export to Excel as xml format, compatible with OpenOffice/LibreOffice as well">Export to Excel with xml format</label></li>
-                        <li><input type="radio" name="type_export_[% frameworkcode %]" value="ods" id="type_export_[% frameworkcode %]" /><label for="type_export_[% frameworkcode %]">Export to OpenDocument Spreadsheet format</label></li>
+                        <li><input type="radio" name="type_export_[% frameworkcode %]" value="csv" id="type_export_[% frameworkcode %]" checked="checked" /><label for="type_export_[% frameworkcode %]" title="Export to CSV spreadsheet">Export to CSV spreadsheet</label></li>
+                        <li><input type="radio" name="type_export_[% frameworkcode %]" value="excel" id="type_export_[% frameworkcode %]" /><label for="type_export_[% frameworkcode %]" title="Export to Excel as XML format, compatible with OpenOffice/LibreOffice as well">Export to Excel with XML format</label></li>
+                        <li><input type="radio" name="type_export_[% frameworkcode %]" value="ods" id="type_export_[% frameworkcode %]" /><label for="type_export_[% frameworkcode %]">Export to OpenDocument spreadsheet format</label></li>
                         <li><input type="radio" name="type_export_[% frameworkcode %]" value="sql" id="type_export_[% frameworkcode %]" /><label for="type_export_[% frameworkcode %]" title="Export to SQL">Export to SQL</label></li>
                         <li><input type="submit" class="export_ok" href="#" value="Export" title="Export to a spreadsheet" /></li>
                     </ul>
@@ -245,9 +245,9 @@ $(document).ready(function() {
                         <input type="hidden" name="frameworkcode" value="[% loo.frameworkcode %]" />
                         <ul>
                             <li class="li_close_import_export"><span class="import_export_close" title="Close popup">Close</span></li>
-                            <li><input type="radio" name="type_export_[% loo.frameworkcode %]" value="csv" id="type_export_[% loo.frameworkcode %]" checked="checked" /><label for="type_export_[% loo.frameworkcode %]" title="Export to CSV Spreadsheet">Export to CSV Spreadsheet</label></li>
-                            <li><input type="radio" name="type_export_[% loo.frameworkcode %]" value="excel" id="type_export_[% loo.frameworkcode %]" /><label for="type_export_[% loo.frameworkcode %]" title="Export to Excel as xml format, compatible with OpenOffice/LibreOffice as well">Export to Excel as xml format</label></li>
-                            <li><input type="radio" name="type_export_[% loo.frameworkcode %]" value="ods" id="type_export_[% loo.frameworkcode %]" /><label for="type_export_[% loo.frameworkcode %]">Export to OpenDocument Spreadsheet format</label></li>
+                            <li><input type="radio" name="type_export_[% loo.frameworkcode %]" value="csv" id="type_export_[% loo.frameworkcode %]" checked="checked" /><label for="type_export_[% loo.frameworkcode %]" title="Export to CSV spreadsheet">Export to CSV spreadsheet</label></li>
+                            <li><input type="radio" name="type_export_[% loo.frameworkcode %]" value="excel" id="type_export_[% loo.frameworkcode %]" /><label for="type_export_[% loo.frameworkcode %]" title="Export to Excel as XML format, compatible with OpenOffice/LibreOffice as well">Export to Excel as XML format</label></li>
+                            <li><input type="radio" name="type_export_[% loo.frameworkcode %]" value="ods" id="type_export_[% loo.frameworkcode %]" /><label for="type_export_[% loo.frameworkcode %]">Export to OpenDocument spreadsheet format</label></li>
                             <li><input type="radio" name="type_export_[% loo.frameworkcode %]" value="sql" id="type_export_[% loo.frameworkcode %]" /><label for="type_export_[% loo.frameworkcode %]" title="Export to SQL">Export to SQL</label></li>
                             <li><input type="submit" class="export_ok" href="#" value="Export" title="Export to a spreadsheet" /></li>
                         </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
index 1fd78162aa..d1274cdeff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Library Checkin and Transfer Policy</title>
+<title>Koha &rsaquo; Administration &rsaquo; Library checkin and transfer policy</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script>
@@ -63,7 +63,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-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; Set Library Checkin and Transfer Policy</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; Set library checkin and transfer policy</div>
 
 <div id="doc3" class="yui-t1">
 
@@ -71,7 +71,7 @@
      <div id="yui-main">
     <div class="yui-b">
 
-<h1>Library [% branchcode %] - [% branchname %] Checkin and Transfer Policy</h1>
+<h1>Library [% branchcode %] - [% branchname %] Checkin and transfer policy</h1>
     <form method="get" action="/cgi-bin/koha/admin/branch_transfer_limits.pl" id="selectlibrary">
         <label for="branchselect">Select a library :</label>
             <select name="branchcode" id="branchselect">
@@ -87,7 +87,7 @@
     </form>
 
 <p class="help">Check the boxes for the libraries you accept to checkin items from.</p>
-<fieldset>For <strong>all</strong> [% limit_phrase %]s: <a id="CheckAll" href="#">Check All</a> | <a id="UncheckAll" href="#">Uncheck All</a></fieldset>
+<fieldset>For <strong>all</strong> [% limit_phrase %]s: <a id="CheckAll" href="#">Check all</a> | <a id="UncheckAll" href="#">Uncheck all</a></fieldset>
 
 
   <div id="transferlimit_tabs" class="toptabs">
@@ -100,7 +100,7 @@
 	[% FOREACH codes_loo IN codes_loop %]
 	<div id="[% codes_loo.code %]set">
 		<h4>Policy for [% codes_loo.limit_phrase %]: [% codes_loo.code %]</h4>
-	<p><a id="CheckAll[% codes_loo.code %]table" class="checkall" href="#">Check All</a> | <a id="UncheckAll[% codes_loo.code %]table" class="uncheckall" href="#">Uncheck All</a></p>
+    <p><a id="CheckAll[% codes_loo.code %]table" class="checkall" href="#">Check all</a> | <a id="UncheckAll[% codes_loo.code %]table" class="uncheckall" href="#">Uncheck all</a></p>
 	
 	<div id="pager[% codes_loo.code %]table">
 	[% INCLUDE 'table-pager.inc' perpage='20' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
index 583a7a09d0..7c8f6a0302 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Libraries and Groups
+<title>Koha &rsaquo; Administration &rsaquo; Libraries and groups
 [% IF ( editcategory ) %]
-    &rsaquo;[% IF ( categorycode ) %]Edit Group [% categorycode %][% ELSE %]New Group[% END %]
+    &rsaquo;[% IF ( categorycode ) %]Edit group [% categorycode %][% ELSE %]New Group[% END %]
 [% ELSIF ( delete_category ) %]
-    &rsaquo; Confirm Deletion of Group [% categorycode %]
+    &rsaquo; Confirm deletion of group [% categorycode %]
 [% ELSIF ( add ) %]
     &rsaquo;[% IF ( heading_branches_add_branch_p ) %]New library[% ELSE %]Modify library [% branchcode %][% END %]
 [% ELSIF ( delete_confirm ) %]
@@ -40,11 +40,11 @@ tinyMCE.init({
 <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; <a href="/cgi-bin/koha/admin/branches.pl">Libraries and Groups</a>
+&rsaquo; <a href="/cgi-bin/koha/admin/branches.pl">Libraries and groups</a>
 [% IF ( editcategory ) %]
-&rsaquo; [% IF ( categorycode ) %]Edit Group [% categorycode %][% ELSE %]New Group[% END %]
+&rsaquo; [% IF ( categorycode ) %]Edit group [% categorycode %][% ELSE %]New group[% END %]
 [% ELSIF ( delete_category ) %]
-&rsaquo; Confirm Deletion of Group [% categorycode %]
+&rsaquo; Confirm deletion of group [% categorycode %]
 [% ELSIF ( add ) %]
 &rsaquo; [% IF ( heading_branches_add_branch_p ) %]New library[% ELSE %]Modify library [% branchcode %][% END %]
 [% ELSIF ( delete_confirm ) %]
@@ -82,8 +82,8 @@ tinyMCE.init({
 	//]]>
 	</script>
 	<ul class="toolbar">
-	<li><a id="newbranch" href="/cgi-bin/koha/admin/branches.pl?op=add">New Library</a></li>
-	<li><a id="newcategory" href="/cgi-bin/koha/admin/branches.pl?op=editcategory">New Group</a></li>
+    <li><a id="newbranch" href="/cgi-bin/koha/admin/branches.pl?op=add">New library</a></li>
+    <li><a id="newcategory" href="/cgi-bin/koha/admin/branches.pl?op=editcategory">New group</a></li>
 </ul></div>
 [% END %]
 
@@ -130,18 +130,18 @@ tinyMCE.init({
 </fieldset>[% END %]
 	<fieldset class="rows">
 	<ol>
-        <li><label for="branchaddress1">Address Line 1</label><input type="text" name="branchaddress1" id="branchaddress1" value="[% branchaddress1 |html %]" /></li>
-        <li><label for="branchaddress2">Address Line 2</label><input type="text" name="branchaddress2" id="branchaddress2" value="[% branchaddress2 |html %]" /></li>
-        <li><label for="branchaddress3">Address Line 3</label><input type="text" name="branchaddress3" id="branchaddress3" value="[% branchaddress3 |html %]" /></li>
+        <li><label for="branchaddress1">Address line 1</label><input type="text" name="branchaddress1" id="branchaddress1" value="[% branchaddress1 |html %]" /></li>
+        <li><label for="branchaddress2">Address line 2</label><input type="text" name="branchaddress2" id="branchaddress2" value="[% branchaddress2 |html %]" /></li>
+        <li><label for="branchaddress3">Address line 3</label><input type="text" name="branchaddress3" id="branchaddress3" value="[% branchaddress3 |html %]" /></li>
         <li><label for="branchcity">City</label><input type="text" name="branchcity" id="branchcity" value="[% branchcity |html %]" /></li>
         <li><label for="branchstate">State</label><input type="text" name="branchstate" id="branchstate" value="[% branchstate |html %]" /></li>
-        <li><label for="branchzip">Zip/Postal Code</label><input type="text" name="branchzip" id="branchzip" value="[% branchzip |html %]" /></li>
+        <li><label for="branchzip">Zip/Postal code</label><input type="text" name="branchzip" id="branchzip" value="[% branchzip |html %]" /></li>
         <li><label for="branchcountry">Country</label><input type="text" name="branchcountry" id="branchcountry" value="[% branchcountry |html %]" /></li>
         <li><label for="branchphone">Phone</label><input type="text" name="branchphone" id="branchphone" value="[% branchphone |html %]" /></li>
         <li><label for="branchfax">Fax</label><input type="text" name="branchfax" id="branchfax" value="[% branchfax |html %]" /></li>
         <li><label for="branchemail">Email</label><input type="text" name="branchemail" id="branchemail" value="[% branchemail |html %]" /></li>
-        <li><label for="branchurl">url</label><input type="text" name="branchurl" id="branchurl" value="[% branchurl |html %]" /></li>
-        <li><label for="opac_info">OPAC Info</label><textarea name="opac_info" id="opac_info">[% opac_info |html %]</textarea></li>
+        <li><label for="branchurl">URL</label><input type="text" name="branchurl" id="branchurl" value="[% branchurl |html %]" /></li>
+        <li><label for="opac_info">OPAC info</label><textarea name="opac_info" id="opac_info">[% opac_info |html %]</textarea></li>
         <li><label for="branchip">IP</label><input type="text" name="branchip" id="branchip" value="[% branchip |html %]" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li>
 		<!--
         <li><label for="branchprinter">Library Printer</label>
@@ -268,7 +268,7 @@ tinyMCE.init({
     
    [% IF ( branchcategories ) %]
    [% FOREACH branchcategorie IN branchcategories %]
-    <h3>Group(s):  [% IF ( branchcategorie.properties ) %]Properties[% ELSE %][% IF ( branchcategorie.searchdomain ) %]Search Domain[% END %][% END %]</h3>
+    <h3>Group(s):  [% IF ( branchcategorie.properties ) %]Properties[% ELSE %][% IF ( branchcategorie.searchdomain ) %]Search domain[% END %][% END %]</h3>
 	<table>
     <tr>
         <th>Name</th>
@@ -287,16 +287,16 @@ tinyMCE.init({
         <td><a href="[% catloo.action %]?op=delete_category&amp;categorycode=[% catloo.categorycode |url %]">Delete</a>
         </td>
         </tr>
-    [% END %][% ELSE %]<tr><td colspan="5">No [% IF ( branchcategorie.properties ) %]Properties[% ELSIF ( branchcategorie.searchdomain ) %]Search Domain[% END %] Defined</td></tr>[% END %]
+    [% END %][% ELSE %]<tr><td colspan="5">No [% IF ( branchcategorie.properties ) %]Properties[% ELSIF ( branchcategorie.searchdomain ) %]Search domain[% END %] Defined</td></tr>[% END %]
     </table>
     [% END %]
     [% ELSE %]
-        <p>No Groups defined.</p>
+        <p>No groups defined.</p>
     [% END %] <!-- NAME="branchcategories" -->
 [% END %]
 
 [% IF ( editcategory ) %]
-    <h3>[% IF ( categorycode ) %]Edit Group [% categorycode %][% ELSE %]Add Group[% END %]</h3>
+    <h3>[% IF ( categorycode ) %]Edit group [% categorycode %][% ELSE %]Add group[% END %]</h3>
     <form action="[% action %]" name="Aform" method="post">
     <input type="hidden" name="op" value="addcategory_validate" />
 	[% IF ( categorycode ) %]
@@ -325,7 +325,7 @@ tinyMCE.init({
             <input type="text" name="codedescription" id="codedescription" size="70" value="[% codedescription |html %]" />
         </li>
 		<li>
-		<label for="categorytype">Category Type: </label>
+        <label for="categorytype">Category type: </label>
             <select id="categorytype" name="categorytype">
             [% FOREACH categorytyp IN categorytype %]
                 [% IF ( categorytyp.selected ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
index d2c353e1f9..e2425af9ab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
@@ -1,8 +1,8 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Patron Categories &rsaquo; [% IF ( add_form ) %][% IF ( categorycode ) %]Modify category '[% categorycode |html %]'[% ELSE %]New category[% END %][% END %]
+<title>Koha &rsaquo; Administration &rsaquo; Patron categories &rsaquo; [% IF ( add_form ) %][% IF ( categorycode ) %]Modify category '[% categorycode |html %]'[% ELSE %]New category[% END %][% END %]
 [% IF ( add_validate ) %]Data recorded[% END %]
-[% IF ( delete_confirm ) %][% IF ( totalgtzero ) %]Cannot Delete: Category [% categorycode |html %] in Use[% ELSE %]Confirm Deletion of Category '[% categorycode |html %]'[% END %][% END %]
-[% IF ( delete_confirmed ) %]Category Deleted[% END %]</title>
+[% IF ( delete_confirm ) %][% IF ( totalgtzero ) %]Cannot delete: category [% categorycode |html %] in use[% ELSE %]Confirm deletion of category '[% categorycode |html %]'[% END %][% END %]
+[% IF ( delete_confirmed ) %]Category deleted[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script>
@@ -93,11 +93,11 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'patrons-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; [% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/categorie.pl">Patron Categories</a> &rsaquo; [% IF ( categorycode ) %]Modify category '[% categorycode |html %]'[% ELSE %]New category[% END %][% END %]
-[% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/categorie.pl">Patron Categories</a> &rsaquo; Data recorded[% END %]
-[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/categorie.pl">Patron Categories</a> &rsaquo; [% IF ( totalgtzero ) %]Cannot Delete: Category [% categorycode |html %] in Use[% ELSE %]Confirm Deletion of Category '[% categorycode |html %]'[% END %][% END %]
-[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/categorie.pl">Patron Categories</a> &rsaquo; Category Deleted[% END %]
-[% IF ( else ) %]Patron Categories[% END %]</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; [% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/categorie.pl">Patron categories</a> &rsaquo; [% IF ( categorycode ) %]Modify category '[% categorycode |html %]'[% ELSE %]New category[% END %][% END %]
+[% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/categorie.pl">Patron categories</a> &rsaquo; Data recorded[% END %]
+[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/categorie.pl">Patron categories</a> &rsaquo; [% IF ( totalgtzero ) %]Cannot delete: Category [% categorycode |html %] in use[% ELSE %]Confirm deletion of category '[% categorycode |html %]'[% END %][% END %]
+[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/categorie.pl">Patron categories</a> &rsaquo; Category deleted[% END %]
+[% IF ( else ) %]Patron categories[% END %]</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -171,7 +171,7 @@
 					</select></li>
 	<li><label for="reservefee">Hold fee: </label><input type="text" name="reservefee" id="reservefee" size="6" value="[% reservefee %]" /></li>
 	<li><label for="category_type">Category type: </label> <select name="category_type" id="category_type">
-						[% IF ( type_n ) %]<option value="" selected="selected">Select a Category type</option>[% ELSE %]<option value="">Select a Category type</option>[% END %]
+                        [% IF ( type_n ) %]<option value="" selected="selected">Select a category type</option>[% ELSE %]<option value="">Select a category type</option>[% END %]
 					[% IF ( type_A ) %]<option value="A" selected="selected">Adult</option>[% ELSE %]<option value="A">Adult</option>[% END %]
 					[% IF ( type_C ) %]<option value="C" selected="selected">Child</option>[% ELSE %]<option value="C">Child</option>[% END %]
 					[% IF ( type_S ) %]<option value="S" selected="selected">Staff</option>[% ELSE %]<option value="S">Staff</option>[% END %]
@@ -207,7 +207,7 @@
 	<fieldset><legend>    	
 	[% IF ( totalgtzero ) %]
 	Category [% categorycode |html %] is in use.  Deletion not possible![% ELSE %]
-Confirm Deletion of Category [% categorycode |html %][% END %]</legend>
+Confirm deletion of category [% categorycode |html %][% END %]</legend>
 
 [% IF ( totalgtzero ) %]<div class="dialog alert"><strong>This category is used [% total %] times</strong>. Deletion not possible</div>[% END %]
 	<table>
@@ -233,12 +233,12 @@ Confirm Deletion of Category [% categorycode |html %][% END %]</legend>
 <input type="submit" value="OK" /></form>
 		[% ELSE %]
 			<input type="hidden" name="op" value="delete_confirmed" />
-			<input type="hidden" name="categorycode" value="[% categorycode |html %]" /> <input type="submit" value="Delete this Category" /> <a class="cancel" href="/cgi-bin/koha/admin/categorie.pl">Cancel</a> 
+            <input type="hidden" name="categorycode" value="[% categorycode |html %]" /> <input type="submit" value="Delete this category" /> <a class="cancel" href="/cgi-bin/koha/admin/categorie.pl">Cancel</a>
 		[% END %]</fieldset></fieldset></form>
 [% END %]
 
 [% IF ( delete_confirmed ) %]
-<h3>Category Deleted</h3>
+<h3>Category deleted</h3>
 
         <form action="[% script_name %]" method="post">
         <input type="submit" value="OK" />
@@ -266,10 +266,10 @@ Confirm Deletion of Category [% categorycode |html %][% END %]</legend>
 	//]]>
 	</script>
 	<ul class="toolbar">
-	<li><a id="newcategory" href="/cgi-bin/koha/admin/categorie.pl?op=add_form">New Category</a></li>
+    <li><a id="newcategory" href="/cgi-bin/koha/admin/categorie.pl?op=add_form">New category</a></li>
 </ul></div>
 
-<h2>Patron Category Administration</h2>
+<h2>Patron category administration</h2>
 [% IF ( searchfield ) %]
 		You Searched for [% searchfield %]</span>
 	[% END %]
@@ -287,7 +287,7 @@ Confirm Deletion of Category [% categorycode |html %][% END %]</legend>
 			<th scope="col">Upper age limit</th>
 			<th scope="col">Enrollment fee</th>
 			<th scope="col">Overdue</th>
-			<th scope="col">Lost Items</th>
+            <th scope="col">Lost items</th>
  			<th scope="col">Hold fee</th>
             [% IF ( EnhancedMessagingPreferences ) %]
             <th scope="col">Messaging</th>
@@ -328,12 +328,12 @@ Confirm Deletion of Category [% categorycode |html %][% END %]</legend>
                               [% FOREACH prefs IN loo.messaging_prefs %]
 	                                [% FOREACH transport IN prefs.transports %]
                                          [% IF ( transport.transport ) %]
-			                                [% IF ( prefs.Item_Due ) %]Item Due
-			                                [% ELSIF ( prefs.Advance_Notice ) %]Advance Notice
-			                                [% ELSIF ( prefs.Upcoming_Events ) %]Upcoming Events
-			                                [% ELSIF ( prefs.Hold_Filled ) %]Hold Filled
-			                                [% ELSIF ( prefs.Item_Check_in ) %]Item Check-in
-			                                [% ELSIF ( prefs.Item_Checkout ) %]Item Checkout
+                                            [% IF ( prefs.Item_Due ) %]Item due
+                                            [% ELSIF ( prefs.Advance_Notice ) %]Advance notice
+                                            [% ELSIF ( prefs.Upcoming_Events ) %]Upcoming events
+                                            [% ELSIF ( prefs.Hold_Filled ) %]Hold filled
+                                            [% ELSIF ( prefs.Item_Check_in ) %]Item check-in
+                                            [% ELSIF ( prefs.Item_Checkout ) %]Item checkout
 			                                [% ELSE %]Unknown
 			                                [% END %]:
 				                            <strong>[% transport.transport %]</strong><br />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
index 63851bf8fd..5777eb64e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; MARC Check
+<title>Koha &rsaquo; Administration &rsaquo; MARC check
 [% IF ( total ) %] :[% total %] errors found[% ELSE %] : Configuration OK![% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
@@ -7,7 +7,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-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; MARC Check
+<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; MARC check
 [% IF ( total ) %]: [% total %] errors found[% ELSE %] : Configuration OK![% END %]</div>
 
 <div id="doc3" class="yui-t2">
@@ -16,7 +16,7 @@
 	<div id="yui-main">
 	<div class="yui-b">
 
-<h1>MARC Bibliographic Framework Test</h1>
+<h1>MARC bibliographic framework test</h1>
 <table>
     <tr>
         <th>Test</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
index bd45d57090..4b5dc0bc9f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; [% IF ( add_form ) %]Cities &rsaquo; [% IF ( cityid ) %] Modify City[% ELSE %] New City[% END %][% ELSE %][% IF ( delete_confirm ) %]Cities &rsaquo; Confirm Deletion of City[% ELSE %] Cities[% END %][% END %]</title>
+<title>Koha &rsaquo; Administration &rsaquo; [% IF ( add_form ) %]Cities &rsaquo; [% IF ( cityid ) %] Modify city[% ELSE %] New city[% END %][% ELSE %][% IF ( delete_confirm ) %]Cities &rsaquo; Confirm deletion of city[% ELSE %] Cities[% END %][% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script>
@@ -36,7 +36,7 @@
     [% IF ( add_form ) %]
     &rsaquo; [% IF ( cityid ) %]Modify[% ELSE %]New[% END %] City
     [% ELSIF ( delete_confirm ) %]
-    &rsaquo; Confirm Deletion of City
+    &rsaquo; Confirm deletion of city
     [% END %]
 </div>
 
@@ -120,7 +120,7 @@
 
 <div id="toolbar">
 	<ul class="toolbar">
-	<li><a id="newcity" href="[% script_name %]?op=add_form">New City</a></li>
+    <li><a id="newcity" href="[% script_name %]?op=add_form">New city</a></li>
 </ul></div>
 
 	<h2>Cities</h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
index 4dafc16342..21eb0ead81 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Classification Sources
+<title>Koha &rsaquo; Administration &rsaquo; Classification sources
 [% IF ( class_source_form ) %]
 &rsaquo; 
     [% IF ( edit_class_source ) %]Modify classification source[% ELSE %]Add classification source[% END %]
@@ -80,7 +80,7 @@ $(document).ready(function() {
 <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; <a href="/cgi-bin/koha/admin/classsources.pl">Classification Sources</a>
+&rsaquo; <a href="/cgi-bin/koha/admin/classsources.pl">Classification sources</a>
 [% IF ( class_source_form ) %]
 &rsaquo; [% IF ( edit_class_source ) %]Modify classification source[% ELSE %]Add classification source[% END %]
 [% END %]
@@ -129,7 +129,7 @@ $(document).ready(function() {
            [% IF ( used ) %]<input type="checkbox" id="used" name="used" value="used" checked="checked" />[% ELSE %]
 		  <input type="checkbox" id="used" name="used" value="used" />[% END %]
        </li>
-       <li><label for="sort_rule">Filing Rule: </label>
+       <li><label for="sort_rule">Filing rule: </label>
            <select id="sort_rule" name="sort_rule">
            [% FOREACH rules_dropdow IN rules_dropdown %]
              [% IF ( rules_dropdow.selected ) %]
@@ -173,7 +173,7 @@ $(document).ready(function() {
            <input type="text" id="description" name="description" size="50" maxlength="250" 
                   value="[% description |html %]" />
        </li>
-       <li><label for="sort_routine">Filing Routine: </label>
+       <li><label for="sort_routine">Filing routine: </label>
            <select id="sort_routine" name="sort_routine">
            [% FOREACH routines_dropdow IN routines_dropdown %]
              [% IF ( routines_dropdow.selected ) %]
@@ -234,11 +234,11 @@ $(document).ready(function() {
 
 <div id="toolbar">
 	<ul class="toolbar">
-	<li><a id="newsource" href="[% script_name %]?op=add_source">New Classification Source</a></li>
-	<li><a id="newrule" href="[% script_name %]?op=add_sort_rule">New Filing Rules</a></li>
+    <li><a id="newsource" href="[% script_name %]?op=add_source">New classification source</a></li>
+    <li><a id="newrule" href="[% script_name %]?op=add_sort_rule">New filing rules</a></li>
 </ul></div>
 
-<h2>Classification Sources</h2>
+<h2>Classification sources</h2>
 [% IF ( added_source ) %]
 <div class="dialog message">Added classification source [% added_source %]</div>
 [% END %]
@@ -276,7 +276,7 @@ $(document).ready(function() {
 
 <div class="pages">[% pagination_bar %]</div>
 
-<h2>Classification Filing Rules</h2>
+<h2>Classification filing rules</h2>
 [% IF ( added_rule ) %]
 <div class="dialog message">Added filing rule [% added_rule %]</div>
 [% END %]
@@ -290,7 +290,7 @@ $(document).ready(function() {
   <tr>
     <th>Code</th>
     <th>Description</th>
-    <th>Sorting Routine</th>
+    <th>Sorting routine</th>
     <th>Actions</th>
   </tr>
   [% FOREACH class_sort_rule IN class_sort_rules %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
index dfe65fb12f..74d6ef451d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
@@ -26,7 +26,7 @@
 	[% ELSE %]
 	    <div class="dialog message"><p>The rules have been cloned.</p></div>
 	[% END %]
-	<a href="/cgi-bin/koha/admin/smart-rules.pl">Return to Issuing rules</a>
+    <a href="/cgi-bin/koha/admin/smart-rules.pl">Return to issuing rules</a>
     [% ELSE %]
 
 	<p class="help">Use carefully ! If the destination library already has issuing rules, they will be deleted without warning !</p> 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
index bc187abb80..d2d05972ec 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
@@ -1,8 +1,8 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Currencies &amp; Exchange Rates &rsaquo;
-[% IF ( add_form ) %][% IF ( searchfield ) %]Modify Currency '[% searchfield %]'[% ELSE %]New Currency[% END %][% END %]
-[% IF ( delete_confirm ) %]Confirm Deletion of Currency '[% searchfield %]'[% END %]
-[% IF ( delete_confirmed ) %]Currency Deleted[% END %]
+<title>Koha &rsaquo; Administration &rsaquo; Currencies &amp; Exchange rates &rsaquo;
+[% IF ( add_form ) %][% IF ( searchfield ) %]Modify currency '[% searchfield %]'[% ELSE %]New currency[% END %][% END %]
+[% IF ( delete_confirm ) %]Confirm deletion of currency '[% searchfield %]'[% END %]
+[% IF ( delete_confirmed ) %]Currency deleted[% END %]
 [% IF ( else ) %]Currencies[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
@@ -56,9 +56,9 @@
 
 
 
-<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;  <a href="/cgi-bin/koha/admin/currency.pl">Currencies &amp; Exchange Rates</a> &rsaquo; [% IF ( add_form ) %][% IF ( searchfield ) %]Modify Currency '[% searchfield %]'[% ELSE %]New Currency[% END %][% END %]
-[% IF ( delete_confirm ) %]Confirm Deletion of Currency '<span class="ex">[% searchfield %]</span>'[% END %]
-[% IF ( delete_confirmed ) %]Currency Deleted[% END %]
+<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;  <a href="/cgi-bin/koha/admin/currency.pl">Currencies &amp; Exchange rates</a> &rsaquo; [% IF ( add_form ) %][% IF ( searchfield ) %]Modify currency '[% searchfield %]'[% ELSE %]New currency[% END %][% END %]
+[% IF ( delete_confirm ) %]Confirm deletion of currency '<span class="ex">[% searchfield %]</span>'[% END %]
+[% IF ( delete_confirmed ) %]Currency deleted[% END %]
 [% IF ( else ) %]Currencies[% END %]
 </div>
 
@@ -71,7 +71,7 @@
 [% IF ( else ) %]
 <div id="toolbar">
     <ul class="toolbar">
-    <li><a id="newcurrency" href="[% script_name %]?op=add_form">New Currency</a></li>
+    <li><a id="newcurrency" href="[% script_name %]?op=add_form">New currency</a></li>
 </ul></div>
 [% END %]
 
@@ -105,7 +105,7 @@
         </li>
 
         <li>
-            <span class="label">Last Updated: </span>[% timestamp %]
+            <span class="label">Last updated: </span>[% timestamp %]
         </li>
         <li>
             <label for="active">Active: </label>
@@ -130,7 +130,7 @@
 [% IF ( delete_confirm ) %]
     [% IF ( totalgtzero ) %]
     <div class="dialog message">
-        <h3>Cannot Delete Currency <span class="ex">'[% searchfield %]'</span></h3>
+        <h3>Cannot delete currency <span class="ex">'[% searchfield %]'</span></h3>
         <p>This currency is used [% total %] times. Deletion not possible</p>
         <form action="[% script_name %]" method="post">
             <input type="submit" value="OK" class="approve" />
@@ -138,7 +138,7 @@
     </div>
     [% ELSE %]
     <div class="dialog alert">
-        <h3>Confirm Deletion of Currency <span class="ex">'[% searchfield %]'</span></h3>
+        <h3>Confirm deletion of currency <span class="ex">'[% searchfield %]'</span></h3>
         <table>
             <tr><th>Currency</th>
                 <td>[% searchfield %]</td>
@@ -160,7 +160,7 @@
 [% END %]
 
 [% IF ( delete_confirmed ) %]
-<div class="dialog message"><h3>Currency Deleted</h3>
+<div class="dialog message"><h3>Currency deleted</h3>
 <form action="[% script_name %]" method="post">
     <input type="submit" class="approve" value="OK" />
 </form></div>
@@ -168,7 +168,7 @@
 
 [% IF ( else ) %]
 
-<h2>Currencies and Exchange Rates</h2>
+<h2>Currencies and exchange rates</h2>
 
 [% IF ( loop ) %][% UNLESS ( activecurrency ) %]<div class="dialog alert"><h3>No active currency is defined</h3><p>Please edit one currency and mark it as active.</p></div>[% END %][% END %]
 
@@ -182,7 +182,7 @@
             <th>Currency</th>
             <th>Rate</th>
             <th>Symbol</th>
-            <th>Last Updated</th>
+            <th>Last updated</th>
             <th>Active</th>
             <th colspan="2">Actions&nbsp;</th>
         </tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt
index 7355bf096e..e4fc007931 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Keyword to MARC Mapping</title>
+<title>Koha &rsaquo; Administration &rsaquo; Keyword to MARC mapping</title>
 [% INCLUDE 'doc-head-close.inc' %]
 
 <script type="text/javascript">
@@ -19,11 +19,11 @@ $(document).ready(function() {
 <body id="admin_fieldmapping" class="admin">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-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; Keyword to MARC Mapping</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; Keyword to MARC mapping</div>
 <div id="doc3" class="yui-t2">
 	<div id="yui-main">
 		<div class="yui-b">
-			<h2>Keyword to MARC Mapping</h2>
+            <h2>Keyword to MARC mapping</h2>
 			[% UNLESS ( fields ) %]
 			<div class="dialog message"><p>There are no mappings for the [% IF ( frameworktext ) %]<em>[% frameworktext %]</em>[% ELSE %]default[% END %] framework. </p></div>
 			[% END %]
@@ -62,8 +62,8 @@ $(document).ready(function() {
 								<caption>Mappings for the [% IF ( frameworktext ) %]<em>[% frameworktext %]</em>[% ELSE %]default[% END %] framework</caption>
 									<tr>
 										<th>Field</th>
-										<th>MARC Field</th>
-										<th>MARC Subfield</th>
+                                        <th>MARC field</th>
+                                        <th>MARC subfield</th>
 										<th>&nbsp;</th>
 									</tr>
 									[% FOREACH field IN fields %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
index a652bc4d32..83650c37cc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Item Circulation Alerts</title>
+<title>Koha &rsaquo; Administration &rsaquo; Item circulation alerts</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <style type="text/css">
 table.grid thead th {
@@ -88,7 +88,7 @@ $(function(){
 <body id="admin_item_circulation_alerts" class="admin">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-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; Item Circulation Alerts </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; Item circulation alerts </div>
 
 <div id="doc3" class="yui-t1">
 
@@ -99,7 +99,7 @@ $(function(){
 
 <div class="yui-g">
 <div class="yui-u first">
-<h1>Item Circulation Alerts</h1>
+<h1>Item circulation alerts</h1>
 <h2>Select a library:</h2>
 <form id="branch_selector" method="get" action="/cgi-bin/koha/admin/item_circulation_alerts.pl">
 <select id="branch" name="branch">
@@ -141,7 +141,7 @@ $(function(){
 </div>
 </div>
 
-<h2>Circulation Alerts for [% branch_name %]</h2>
+<h2>Circulation alerts for [% branch_name %]</h2>
 <p>Click on the grid to toggle the settings.</p>
 
 <div id="alerttabs" class="toptabs">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
index 8407d0991c..16cd705220 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
@@ -1,20 +1,20 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Item Types [% IF ( add_form ) %]&rsaquo; 
+<title>Koha &rsaquo; Administration &rsaquo; Item types [% IF ( add_form ) %]&rsaquo;
   [% IF ( itemtype ) %]
-Modify Item Type '[% itemtype %]'
+Modify item type '[% itemtype %]'
   [% ELSE %]
-Add Item Type
+Add item type
   [% END %]
 [% END %]
 [% IF ( delete_confirm ) %]&rsaquo; 
   [% IF ( total ) %]
-Cannot Delete Item Type '[% itemtype %]'
+Cannot delete item type '[% itemtype %]'
   [% ELSE %]
-Delete Item Type '[% itemtype %]'?
+Delete item type '[% itemtype %]'?
   [% END %]
 [% END %]
 [% IF ( delete_confirmed ) %]&rsaquo; 
-Data Deleted
+Data deleted
 [% END %]
 </title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -101,23 +101,23 @@ function Check(f) {
 
 <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; [% IF ( add_form ) %]
   [% IF ( itemtype ) %]
-<a href="/cgi-bin/koha/admin/itemtypes.pl">Item Types</a> &rsaquo; Modify Item Type '[% itemtype %]'
+<a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a> &rsaquo; Modify item type '[% itemtype %]'
   [% ELSE %]
-<a href="/cgi-bin/koha/admin/itemtypes.pl">Item Types</a> &rsaquo; Add Item Type
+<a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a> &rsaquo; Add item type
   [% END %]
 [% END %]
 [% IF ( delete_confirm ) %]
   [% IF ( total ) %]
-<a href="/cgi-bin/koha/admin/itemtypes.pl">Item Types</a> &rsaquo; Cannot Delete Item Type '[% itemtype %]'
+<a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a> &rsaquo; Cannot delete item type '[% itemtype %]'
   [% ELSE %]
-<a href="/cgi-bin/koha/admin/itemtypes.pl">Item Types</a> &rsaquo; Delete Item Type '[% itemtype %]'?
+<a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a> &rsaquo; Delete item type '[% itemtype %]'?
   [% END %]
 [% END %]
 [% IF ( delete_confirmed ) %]
-<a href="/cgi-bin/koha/admin/itemtypes.pl">Item Types</a> &rsaquo;Data Deleted
+<a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a> &rsaquo;Data deleted
 [% END %]
 [% IF ( else ) %]
-Item Types Administration
+Item types administration
 [% END %]</div>
 
 <div id="doc3" class="yui-t2">
@@ -145,14 +145,14 @@ Item Types Administration
 	//]]>
 	</script>
 	<ul class="toolbar">
-	<li><a id="newitemtype" href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form">New Item Type</a></li>
+    <li><a id="newitemtype" href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form">New item type</a></li>
 </ul></div>[% ELSE %]&nbsp;[% END %]
 
 [% IF ( add_form ) %]
   [% IF ( itemtype ) %]
-      <h3>Modify Item Type</h3>
+      <h3>Modify item type</h3>
   [% ELSE %]
-      <h3>Add Item Type</h3>
+      <h3>Add item type</h3>
   [% END %]
 <form action="[% script_name %]" name="Aform" method="post">
   <input type="hidden" name="op" value="add_validate" />
@@ -176,13 +176,13 @@ Item Types Administration
 	 <li><span class="label">Image: </span>Item type images are disabled. To enable them, turn off the <a href="/cgi-bin/koha/admin/preferences.pl?op=search&amp;searchfield=noItemTypeImages">noItemTypeImages system preference</a></li></ol>
 	 [% ELSE %]</ol>
 		<div id="icons" class="toptabs">
-		<h5 style="margin-left:10px;">Choose an Icon:</h5>
+        <h5 style="margin-left:10px;">Choose an icon:</h5>
 			<ul>
 					<li><a href="/cgi-bin/koha/admin/itemtypes.pl#none">None</a></li>
 				  [% FOREACH imageset IN imagesets %]
             [% IF ( imageset.imagesetactive ) %]<li class="ui-tabs-selected">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/admin/itemtypes.pl#[% imageset.imagesetname %]">[% imageset.imagesetname %]</a></li>
 				  [% END %]
-				  [% IF ( remote_image ) %]<li class="ui-tabs-selected">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/admin/itemtypes.pl#remote">Remote Image</a></li>
+                  [% IF ( remote_image ) %]<li class="ui-tabs-selected">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/admin/itemtypes.pl#remote">Remote image</a></li>
 			</ul>
 		</div>
   <div id="none"><ul>
@@ -257,10 +257,10 @@ Item Types Administration
 
 [% IF ( delete_confirm ) %]
 [% IF ( total ) %]<div class="dialog message">
-<h3>Cannot Delete Item Type</h3>
+<h3>Cannot delete item type</h3>
 <p><strong>This record is used [% total %] times</strong>. Deletion is not possible.</p>
 [% ELSE %]<div class="dialog alert">
-<h3>Delete Item Type '[% itemtype %]'?</h3>
+<h3>Delete item type '[% itemtype %]'?</h3>
 [% END %]
 <table>
 		<tr>
@@ -284,7 +284,7 @@ Item Types Administration
 [% END %]
 
 [% IF ( else ) %]
-<h2>Item Types Administration</h2>
+<h2>Item types administration</h2>
 [% IF ( loop ) %]<div id="pagertable_item_type">
 [% INCLUDE 'table-pager.inc' perpage='10' %]
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
index 287a5813c3..aa40731025 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
@@ -1,7 +1,7 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Administration &rsaquo;
-[% IF ( add_form ) %] Koha to MARC Mapping &rsaquo; Connect [% tablename %].[% kohafield %] to a MARC subfield[% END %]
-[% IF ( else ) %]Koha to MARC Mapping [% tagfield %][% END %]</title>
+[% IF ( add_form ) %] Koha to MARC mapping &rsaquo; Connect [% tablename %].[% kohafield %] to a MARC subfield[% END %]
+[% IF ( else ) %]Koha to MARC mapping [% tagfield %][% END %]</title>
 
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
@@ -10,7 +10,7 @@
 [% INCLUDE 'cat-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; [% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha to MARC Mapping</a> &rsaquo; Connect [% tablename %].[% kohafield %] to a MARC subfield[% END %]
-[% IF ( else ) %]Koha to MARC Mapping[% tagfield %][% END %]</div>
+[% IF ( else ) %]Koha to MARC mapping[% tagfield %][% END %]</div>
 [% IF ( add_form ) %]
 <div id="doc" class="yui-t7">
 
@@ -142,13 +142,13 @@
 
 [% IF ( else ) %]
 
-<h1>Koha to MARC Mapping [% tagfield %]</h1>
+<h1>Koha to MARC mapping [% tagfield %]</h1>
 <form action="[% script_name %]" method="post">
 <p>[% tablename %] <input type="submit" value="OK" /></p>
 </form>
 <table>
 <tr>
-    <th>Koha Field</th>
+    <th>Koha field</th>
     <th>Tag</th>
     <th>Subfield</th>
     <th>Lib</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
index 71c83b9981..fe58d30f51 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo;[% IF ( add_form ) %][% IF ( use_heading_flags_p ) %][% IF ( heading_edit_subfields_p ) %] MARC Subfield Structure &rsaquo; Edit MARC subfields constraints[% END %][% ELSE %] MARC Subfield Structure &rsaquo; [% action %][% END %][% END %]
-[% IF ( delete_confirm ) %] MARC Subfield Structure &rsaquo; Confirm Deletion of Subfield [% tagsubfield %][% END %][% IF ( delete_confirmed ) %] MARC Subfield Structure &rsaquo; Subfield Deleted[% END %][% IF ( else ) %]MARC Subfield Structure[% END %]</title>
+<title>Koha &rsaquo; Administration &rsaquo;[% IF ( add_form ) %][% IF ( use_heading_flags_p ) %][% IF ( heading_edit_subfields_p ) %] MARC subfield structure &rsaquo; Edit MARC subfields constraints[% END %][% ELSE %] MARC subfield structure &rsaquo; [% action %][% END %][% END %]
+[% IF ( delete_confirm ) %] MARC subfield structure &rsaquo; Confirm deletion of subfield [% tagsubfield %][% END %][% IF ( delete_confirmed ) %] MARC subfield structure &rsaquo; Subfield deleted[% END %][% IF ( else ) %]MARC subfield structure[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
 //<![CDATA[
@@ -38,19 +38,19 @@ $(document).ready(function() {
 [% INCLUDE 'cat-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; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC Frameworks</a> &rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode %]&amp;searchfield=[% tagfield %]">[% frameworkcode %] Framework Structure</a> &rsaquo;
+  <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a> &rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode %]&amp;searchfield=[% tagfield %]">[% frameworkcode %] framework structure</a> &rsaquo;
   [% IF ( add_form ) %]
   [% IF ( use_heading_flags_p ) %]
-  [% IF ( heading_edit_subfields_p ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield %]&amp;frameworkcode=[% frameworkcode %]">Tag [% tagfield %] Subfield Structure</a> &rsaquo; Edit subfields constraints
+  [% IF ( heading_edit_subfields_p ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield %]&amp;frameworkcode=[% frameworkcode %]">Tag [% tagfield %] Subfield structure</a> &rsaquo; Edit subfields constraints
   [% END %]
-  [% ELSE %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield %]&amp;frameworkcode=[% frameworkcode %]">Tag [% tagfield %] Subfield Structure</a> &rsaquo; [% action %]
+  [% ELSE %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield %]&amp;frameworkcode=[% frameworkcode %]">Tag [% tagfield %] Subfield structure</a> &rsaquo; [% action %]
   [% END %]
   [% END %]
-[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield %]&amp;frameworkcode=[% frameworkcode %]">Tag [% tagfield %] Subfield Structure</a> &rsaquo; Confirm Deletion of Subfield [% tagsubfield %]
+[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield %]&amp;frameworkcode=[% frameworkcode %]">Tag [% tagfield %] Subfield structure</a> &rsaquo; Confirm deletion of subfield [% tagsubfield %]
 [% END %]
-[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield %]&amp;frameworkcode=[% frameworkcode %]">Tag [% tagfield %] Subfield Structure</a> &rsaquo; Subfield Deleted
+[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield %]&amp;frameworkcode=[% frameworkcode %]">Tag [% tagfield %] subfield structure</a> &rsaquo; Subfield deleted
 [% END %]
-[% IF ( else ) %]Tag [% tagfield %] Subfield Structure[% END %]
+[% IF ( else ) %]Tag [% tagfield %] Subfield structure[% END %]
 </div>
 
 <div id="doc" class="yui-t7">
@@ -62,7 +62,7 @@ $(document).ready(function() {
 [% IF ( add_form ) %]
     <h1>
         [% IF ( use_heading_flags_p ) %]
-            [% IF ( heading_edit_subfields_p ) %]Tag [% tagfield %] Subfield Constraints[% END %]
+            [% IF ( heading_edit_subfields_p ) %]Tag [% tagfield %] Subfield constraints[% END %]
         [% ELSE %]
             [% action %]
         [% END %]
@@ -71,7 +71,7 @@ $(document).ready(function() {
     <input type="hidden" name="op" value="add_validate" />
 	<input type="hidden" name="tagfield" value="[% tagfield %]" />
     <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
-    <input type="submit" value="Save Changes" />
+    <input type="submit" value="Save changes" />
     
     <div id="subfieldtabs" class="toptabs numbered">
    <ul>
@@ -113,7 +113,7 @@ $(document).ready(function() {
 				<li><label for="maxlength[% loo.row %]">Max length:</label><input type="text" id="maxlength[% loo.row %]" name="maxlength" value="[% loo.maxlength %]" size="4" /> (see online help)</li>
                 <li><label for="hidden[% loo.row %]">hidden</label><input type="text" id="hidden[% loo.row %]" name="hidden" value="[% loo.hidden %]" size="2" /> (see online help)</li>
                 <li><label for="isurl[% loo.row %]">Is a url:</label>[% loo.isurl %] (if checked, it means that the subfield is a url and can be clicked)</li>
-                <li><label for="link[% loo.row %]">Link:</label><input type="text" id="link[% loo.row %]" name="link" value="[% loo.link %]" size="10" maxlength="80" /> (e.g., Title or Local-Number) <span class="error"><em>NOTE: If you change this value you must ask your administrator to run misc/batchRebuildBiblioTables.pl.</em></span></li>
+                <li><label for="link[% loo.row %]">Link:</label><input type="text" id="link[% loo.row %]" name="link" value="[% loo.link %]" size="10" maxlength="80" /> (e.g., title or local-number) <span class="error"><em>NOTE: If you change this value you must ask your administrator to run misc/batchRebuildBiblioTables.pl.</em></span></li>
                 <li><label for="kohafield[% loo.row %]">Koha link:</label>[% loo.kohafield %]</li>
 			</ol>
 	</fieldset>
@@ -134,7 +134,7 @@ $(document).ready(function() {
 
 [% IF ( delete_confirm ) %]
 
-<h3>Confirm Deletion of Subfield [% tagsubfield %]?</h3>
+<h3>Confirm deletion of subfield [% tagsubfield %]?</h3>
     <p>Subfield: [% tagsubfield %]</p>
     <p>Description: [% liblibrarian %]</p>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
index ec0a583499..d0f01326df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Administration &rsaquo;
-[% IF ( add_form ) %]MARC Frameworks &rsaquo; [% action %] [% searchfield %][% END %]
-[% IF ( delete_confirm ) %]MARC Frameworks &rsaquo; Confirm Deletion of Tag '[% searchfield %]'[% END %]
-[% IF ( delete_confirmed ) %]MARC Frameworks &rsaquo;  Data Deleted[% END %]
-[% IF ( else ) %]MARC Frameworks[% END %]</title>
+[% IF ( add_form ) %]MARC frameworks &rsaquo; [% action %] [% searchfield %][% END %]
+[% IF ( delete_confirm ) %]MARC frameworks &rsaquo; Confirm deletion of tag '[% searchfield %]'[% END %]
+[% IF ( delete_confirmed ) %]MARC frameworks &rsaquo;  Data deleted[% END %]
+[% IF ( else ) %]MARC frameworks[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script>
@@ -44,7 +44,7 @@ $(document).ready(function() {
 <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; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC Frameworks</a>
+&rsaquo; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a>
 [% IF ( add_form ) %]
 &rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode %]">[% frameworktext %] ([% frameworkcode %])</a>
 &rsaquo; [% action %] [% searchfield %]
@@ -52,10 +52,10 @@ $(document).ready(function() {
 &rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode %]">[% IF ( frameworkcode ) %][% frameworktext %] ([% frameworkcode %])[% ELSE %]Default MARC framework[% END %]</a>
 [% ELSIF ( delete_confirm ) %]
 &rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode %]">[% frameworktext %] ([% frameworkcode %])</a>
-&rsaquo; Confirm Deletion of Tag '[% searchfield %]'
+&rsaquo; Confirm deletion of tag '[% searchfield %]'
 [% ELSIF ( delete_confirmed ) %]
 &rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode %]">[% frameworktext %] ([% frameworkcode %])</a>
-&rsaquo; Data Deleted
+&rsaquo; Data deleted
 [% END %]
 </div>
 
@@ -67,7 +67,7 @@ $(document).ready(function() {
 [% IF ( else ) %]
 <div id="toolbar">
 	<ul class="toolbar">
-	<li><a id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&amp;frameworkcode=[% frameworkcode %]">New Tag</a></li>
+    <li><a id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&amp;frameworkcode=[% frameworkcode %]">New tag</a></li>
 </ul></div>[% END %]
 
 <h1>MARC Framework for [% IF ( frameworkcode ) %][% frameworktext %] ([% frameworkcode %])[% ELSE %]default MARC framework[% END %]</h1>
@@ -96,7 +96,7 @@ $(document).ready(function() {
 
 [% IF ( delete_confirm ) %]
 
-<div class="dialog alert"><h3>Confirm Deletion of Tag <span class="ex">'[% searchfield %]'</span>?</h3>
+<div class="dialog alert"><h3>Confirm deletion of tag <span class="ex">'[% searchfield %]'</span>?</h3>
     <p>Tag: [% searchfield %]</p>
     <p>Description: [% liblibrarian %]</p>
     <form action="[% script_name %]" method="post">
@@ -109,7 +109,7 @@ $(document).ready(function() {
 
 [% IF ( delete_confirmed ) %]
 
-    <div class="dialog message"><h3>Tag Deleted</h3>
+    <div class="dialog message"><h3>Tag deleted</h3>
     <form action="[% script_name %]" method="post"><input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
     <input type="submit" value="OK" class="approve" />
     </form></div>
@@ -149,7 +149,7 @@ $(document).ready(function() {
             [% END %]
         </select>
     <input type="submit" value="Search" />
-<p>        <label for="select_display">Display only used Tags/Subfields</label>
+<p>        <label for="select_display">Display only used tags/subfields</label>
         [% IF ( select_display ) %]
             <input type="checkbox" name="select_display" id="select_display" value="True" checked="checked"  onchange="this.form.submit();" />
         [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
index 4e31d4fec6..58352447ef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Record Matching Rules
+<title>Koha &rsaquo; Administration &rsaquo; Record matching rules
 [% IF ( matching_rule_form ) %]
   [% IF ( edit_matching_rule ) %]
     &rsaquo; Modify record matching rule
@@ -172,7 +172,7 @@ function CheckRuleForm(f) {
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-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; [% IF ( display_list ) %]Record Matching Rules[% ELSE %]<a href="/cgi-bin/koha/admin/matching-rules.pl">Record Matching Rules</a>[% END %]
+<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; [% IF ( display_list ) %]Record matching rules[% ELSE %]<a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a>[% END %]
 [% IF ( matching_rule_form ) %]
   [% IF ( edit_matching_rule ) %]
     &rsaquo; Modify record matching rule
@@ -232,7 +232,7 @@ function CheckRuleForm(f) {
   [% FOREACH matchpoint IN matchpoints %]
   <div id="mp_[% matchpoint.mp_num %]" class="matchgroup">
   <fieldset class="rows">
-    <legend>Match Point [% matchpoint.mp_num %] | <a href="#" class="button" onclick="InsertMatchpoint('mp_[% matchpoint.mp_num %]', 'mp_template'); return false;">Add match point</a> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></legend>
+    <legend>Match point [% matchpoint.mp_num %] | <a href="#" class="button" onclick="InsertMatchpoint('mp_[% matchpoint.mp_num %]', 'mp_template'); return false;">Add match point</a> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></legend>
     <ol>
       <li>
         <label for="mp_[% matchpoint.mp_num %]_search_index">Search index: </label>
@@ -302,7 +302,7 @@ function CheckRuleForm(f) {
   [% ELSE %]
   <div id="mp_1" class="matchgroup">
   <fieldset class="rows">
-    <legend>Match Point 1 | <a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;">Add match point</a> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></legend>
+    <legend>Match point 1 | <a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;">Add match point</a> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></legend>
     <ol>
       <li>
         <label for="mp_1_search_index">Search index: </label>
@@ -546,10 +546,10 @@ function CheckRuleForm(f) {
 	}	//]]>
 	</script>
 	<ul class="toolbar">
-	<li><a id="newrule" href="[% script_name %]?op=add_matching_rule">New Record Matching Rule</a></li>
+    <li><a id="newrule" href="[% script_name %]?op=add_matching_rule">New record matching rule</a></li>
 </ul></div>
 
-<h2>Record Matching Rules</h2>
+<h2>Record matching rules</h2>
 [% IF ( added_matching_rule ) %]
 <div class="dialog message">Added record matching rule &quot;[% added_matching_rule %]&quot;</div>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
index 2d438e0c80..1724c0661f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Admin &rsaquo; OAI Set Mappings</title>
+<title>Koha &rsaquo; Admin &rsaquo; OAI set mappings</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
 //<![CDATA[
@@ -29,7 +29,7 @@ function returnToSetsPage() {
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Admin</a> &rsaquo; <a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% id %]">OAI Set Mappings</a></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Admin</a> &rsaquo; <a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% id %]">OAI set mappings</a></div>
 
 <div id="doc3" class="yui-t2">
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
index bb53fb8cc4..21a0c4f5b5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Admin &rsaquo; OAI Sets</title>
+<title>Koha &rsaquo; Admin &rsaquo; OAI sets</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
 //<![CDATA[
@@ -28,14 +28,14 @@ $(document).ready(function() {
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Admin</a> &rsaquo; OAI Sets</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Admin</a> &rsaquo; OAI sets</div>
 
 <div id="doc3" class="yui-t2">
 
 <div id="bd">
   <div id="yui-main">
     <div class="yui-b">
-      <h1>OAI Sets Configuration</h1>
+      <h1>OAI sets configuration</h1>
 
         [% IF op_new %]
             <h2>Add a new set</h2>
@@ -116,9 +116,9 @@ $(document).ready(function() {
                                 [% END %]
                             </td>
                             <td>
-                                <a href="/cgi-bin/koha/admin/oai_sets.pl?op=mod&id=[% set.id %]">Modify</a>
+                                <a href="/cgi-bin/koha/admin/oai_sets.pl?op=mod&amp;id=[% set.id %]">Modify</a>
                                 |
-                                <a href="/cgi-bin/koha/admin/oai_sets.pl?op=del&id=[% set.id %]">Delete</a>
+                                <a href="/cgi-bin/koha/admin/oai_sets.pl?op=del&amp;id=[% set.id %]">Delete</a>
                                 |
                                 <a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% set.id %]">Define mappings</a>
                             </td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
index 54bd8f29a8..4ce47858e2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Patron Attribute Types
+<title>Koha &rsaquo; Administration &rsaquo; Patron attribute types
 [% IF ( attribute_type_form ) %]
   [% IF ( edit_attribute_type ) %]
     &rsaquo; Modify patron attribute type
@@ -48,7 +48,7 @@ function CheckAttributeTypeForm(f) {
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-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; [% IF ( display_list ) %]Patron Attribute Types[% ELSE %]<a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron Attribute Types</a>[% END %]
+<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; [% IF ( display_list ) %]Patron attribute types[% ELSE %]<a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron attribute types</a>[% END %]
 [% IF ( attribute_type_form ) %]
   [% IF ( edit_attribute_type ) %]
     &rsaquo; Modify patron attribute type
@@ -255,10 +255,10 @@ function CheckAttributeTypeForm(f) {
 	}	//]]>
 	</script>
 	<ul class="toolbar">
-	<li><a id="newrule" href="[% script_name %]?op=add_attribute_type">New Patron Attribute Type</a></li>
+    <li><a id="newrule" href="[% script_name %]?op=add_attribute_type">New patron attribute type</a></li>
 </ul></div>
 
-<h2>Patron Attribute Types</h2>
+<h2>Patron attribute types</h2>
 [% IF ( added_attribute_type ) %]
 <div class="dialog message">Added patron attribute type &quot;[% added_attribute_type %]&quot;</div>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
index 7fd77bed14..875b863796 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; System Preferences</title>
+<title>Koha &rsaquo; Administration &rsaquo; System preferences</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/preferences.css" />
@@ -26,7 +26,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'prefs-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; System Preferences</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; System preferences</div>
 
 <div id="doc3" class="yui-t2">
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
index 486fc48610..7dfb80b1d2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Administration &rsaquo;
 [% IF ( add_form ) %][% IF ( searchfield ) %] Printers &rsaquo; Modify printer '[% searchfield %]'[% ELSE %] Printers &rsaquo; New printer[% END %][% END %]
-[% IF ( add_validate ) %] Printers &rsaquo; Printer Added[% END %]
-[% IF ( delete_confirm ) %] Printers &rsaquo; Confirm Deletion of Printer '[% searchfield %]'[% END %]
-[% IF ( delete_confirmed ) %] Printers &rsaquo; Printer Deleted[% END %]
+[% IF ( add_validate ) %] Printers &rsaquo; Printer added[% END %]
+[% IF ( delete_confirm ) %] Printers &rsaquo; Confirm deletion of printer '[% searchfield %]'[% END %]
+[% IF ( delete_confirmed ) %] Printers &rsaquo; Printer deleted[% END %]
 [% IF ( else ) %]Printers[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% IF ( add_form ) %]<script type="text/javascript">
@@ -68,9 +68,9 @@
 [% INCLUDE 'printers-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; [% IF ( add_form ) %][% IF ( searchfield ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Modify printer '[% searchfield %]'[% ELSE %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; New printer[% END %][% END %]
-[% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Printer Added[% END %]
-[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Confirm Deletion of Printer '[% searchfield %]'[% END %]
-[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Printer Deleted[% END %]
+[% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Printer added[% END %]
+[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Confirm deletion of printer '[% searchfield %]'[% END %]
+[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Printer deleted[% END %]
 [% IF ( else ) %]Printers[% END %]</div>
 
 <div id="doc3" class="yui-t2">
@@ -96,12 +96,12 @@
 	<fieldset class="rows">
 <ol>	[% IF ( searchfield ) %]
 		<li>
-			<span class="label">Printer Name: </span>
+            <span class="label">Printer name: </span>
 				<input type="hidden" name="printername" id="" value="[% searchfield %]" />[% searchfield %]
 		</li>
 	[% ELSE %]
 		<li>
-			<label for="printername">Printer Name: </label>
+            <label for="printername">Printer name: </label>
 				<input type="text" name="printername" id="printername" size="50" maxlength="50" />
 		</li>
 	[% END %]
@@ -120,14 +120,14 @@
 [% END %]
 
 [% IF ( add_validate ) %]
-<h3>Printer Added</h3>
+<h3>Printer added</h3>
 <form action="[% script_name %]" method="post">
        <fieldset class="action"> <input type="submit" value="OK" /></fieldset>
 </form>
 [% END %]
 
 [% IF ( delete_confirm ) %]
-<h3>Confirm Deletion of Printer <em>[% searchfield %]</em></h3>
+<h3>Confirm deletion of printer <em>[% searchfield %]</em></h3>
 <ul>
 		<li>
 			<strong>Printer: </strong>
@@ -152,7 +152,7 @@
 [% END %]
 
 [% IF ( delete_confirmed ) %]
-<h3>Printer Deleted</h3>
+<h3>Printer deleted</h3>
 <form action="[% script_name %]" method="post">
 		<fieldset class="action"><input type="submit" value="OK" /></fieldset>
 </form>
@@ -170,7 +170,7 @@
 	//]]>
 	</script>
 	<ul class="toolbar">
-	<li><a id="newprinter" href="/cgi-bin/koha/admin/printers.pl?op=add_form">New Printer</a></li>
+    <li><a id="newprinter" href="/cgi-bin/koha/admin/printers.pl?op=add_form">New printer</a></li>
 </ul></div>
 
 <h2>Printers</h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tt
index bdd3bc1cf0..1c3ff5eef0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; [% IF ( add_form ) %]Road Types &rsaquo; [% IF ( roadtypeid ) %] Modify Road Type[% ELSE %] New Road Type[% END %][% ELSE %][% IF ( delete_confirm ) %]Road Types &rsaquo; Confirm Deletion of Road Type[% ELSE %] Road Type[% END %][% END %]</title>
+<title>Koha &rsaquo; Administration &rsaquo; [% IF ( add_form ) %]Road types &rsaquo; [% IF ( roadtypeid ) %] Modify road type[% ELSE %] New road type[% END %][% ELSE %][% IF ( delete_confirm ) %]Road types &rsaquo; Confirm deletion of road type[% ELSE %] Road type[% END %][% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
 //<![CDATA[
@@ -53,7 +53,7 @@
 <body id="admin_roadtype" class="admin">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'roadtype-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; [% IF ( add_form ) %]<a href="/cgi-bin/koha/admin/roadtype.pl">Road Types</a> &rsaquo; [% IF ( roadtypeid ) %] Modify Road Type[% ELSE %] New Road Type[% END %][% ELSE %][% IF ( delete_confirm ) %]<a href="/cgi-bin/koha/admin/roadtype.pl">Road Types</a> &rsaquo; Confirm Deletion of Road Type[% ELSE %] Road Type[% END %][% END %]</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; [% IF ( add_form ) %]<a href="/cgi-bin/koha/admin/roadtype.pl">Road types</a> &rsaquo; [% IF ( roadtypeid ) %] Modify road type[% ELSE %] New road type[% END %][% ELSE %][% IF ( delete_confirm ) %]<a href="/cgi-bin/koha/admin/roadtype.pl">Road types</a> &rsaquo; Confirm deletion of road type[% ELSE %] Road type[% END %][% END %]</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -91,9 +91,9 @@
 [% END %]
 
 [% IF ( delete_confirm ) %]
-	<div class="dialog alert"><h3>Delete Road Type "[% road_type %]?"</h3>
+    <div class="dialog alert"><h3>Delete road type "[% road_type %]?"</h3>
 <table>	<tr>
-		<th>Road type id : </th>
+        <th>Road type id: </th>
 			<td>[% roadtypeid %]</td>
 		</tr>
 	<tr>	<th>Road type: </th>
@@ -102,8 +102,8 @@
 
 	</tr></table><form action="[% script_name %]" method="post">
 			<input type="hidden" name="op" value="delete_confirmed" />
-			<input type="hidden" name="roadtypeid" value="[% roadtypeid %]" /><input type="submit" class="approve" value="Yes, Delete" /></form> <form action="[% script_name %]" method="post">
-			<input type="submit" class="deny" value="No, Do Not Delete" /></form></div>
+            <input type="hidden" name="roadtypeid" value="[% roadtypeid %]" /><input type="submit" class="approve" value="Yes, delete" /></form> <form action="[% script_name %]" method="post">
+            <input type="submit" class="deny" value="No, do not delete" /></form></div>
 [% END %]
 
 [% IF ( else ) %]
@@ -127,7 +127,7 @@
 	//]]>
 	</script>
 	<ul class="toolbar">
-	<li><a id="addroad" href="/cgi-bin/koha/admin/roadtype.pl?op=add_form">New Road Type</a></li>
+    <li><a id="addroad" href="/cgi-bin/koha/admin/roadtype.pl?op=add_form">New road type</a></li>
 </ul></div>
 
 	<h2>Road type</h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index 7b01ac72f4..635051ff3c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Circulation and Fine Rules</title>
+<title>Koha &rsaquo; Administration &rsaquo; Circulation and fine rules</title>
 [% INCLUDE 'doc-head-close.inc' %]
 
 <script type="text/javascript">
@@ -23,7 +23,7 @@ $(document).ready(function() {
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-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; Circulation and Fine Rules</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; Circulation and fine rules</div>
 
 <div id="doc3" class="yui-t1">
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tt
index 272d1a0968..ccda84514a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; System Administration &rsaquo; Stop words
+<title>Koha &rsaquo; System administration &rsaquo; Stop words
 [% IF ( add_form ) %]&rsaquo; [% IF ( searchfield ) %]Modify[% ELSE %]New[% END %] stop word
 [% ELSIF ( add_validate ) %]&rsaquo; Data recorded
 [% ELSIF ( delete_confirm ) %]&rsaquo; Delete stop word '[% searchfield %]' ?
@@ -34,13 +34,13 @@
 <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; <a href="/cgi-bin/koha/admin/stopwords.pl">Stop Words</a>
+&rsaquo; <a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a>
 [% IF ( add_form ) %]
-    &rsaquo; [% IF ( searchfield ) %]Modify[% ELSE %]New[% END %] Stop Word
+    &rsaquo; [% IF ( searchfield ) %]Modify[% ELSE %]New[% END %] Stop word
 [% ELSIF ( add_validate ) %]
     &rsaquo; Data recorded
 [% ELSIF ( delete_confirm ) %]
-    &rsaquo; Delete Stop Word '[% searchfield %]' ?
+    &rsaquo; Delete stop word '[% searchfield %]' ?
 [% ELSIF ( delete_confirmed ) %]
     &rsaquo; Data deleted
 [% END %]
@@ -88,7 +88,7 @@
 
 [% IF ( delete_confirm ) %]
     <div class="dialog alert">
-	<h3>Delete Stop Word <span class="ex">'[% searchfield %]'</span></h3>
+    <h3>Delete stop word <span class="ex">'[% searchfield %]'</span></h3>
 	<form action="[% script_name %]" method="post">
         <input type="hidden" name="op" value="delete_confirmed" />
         <input type="hidden" name="searchfield" value="[% searchfield %]" />
@@ -110,10 +110,10 @@
 
 <div id="toolbar">
 	<ul class="toolbar">
-	<li><a id="newstopword" href="/cgi-bin/koha/admin/stopwords.pl?op=add_form">New Stop Word</a></li>
+    <li><a id="newstopword" href="/cgi-bin/koha/admin/stopwords.pl?op=add_form">New stop word</a></li>
 </ul></div>
 
-    <h1>Stop Words</h1>
+    <h1>Stop words</h1>
     <p class="message">NOTE : if you change something in this table, ask your administrator to run misc/batchRebuildBiblioTables.pl script.</p>
 
     [% IF ( searchfield ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
index 9e0a976506..d9d0a5c7a1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; [% IF ( add_form ) %] System Preferences &rsaquo; [% IF ( modify ) %]Modify system preference '[% searchfield %]'[% ELSE %]Add a system preference[% END %][% END %][% IF ( add_validate ) %] System Preferences &rsaquo; Data Added[% END %]
-[% IF ( delete_confirm ) %] System Preferences &rsaquo; [% searchfield %] &rsaquo; Confirm Deletion of Parameter '[% searchfield %]'[% END %][% IF ( delete_confirmed ) %] System Preferences &rsaquo; Parameter Deleted[% END %][% IF ( else ) %]System Preferences[% END %]</title>
+<title>Koha &rsaquo; Administration &rsaquo; [% IF ( add_form ) %] System preferences &rsaquo; [% IF ( modify ) %]Modify system preference '[% searchfield %]'[% ELSE %]Add a system preference[% END %][% END %][% IF ( add_validate ) %] System preferences &rsaquo; Data added[% END %]
+[% IF ( delete_confirm ) %] System preferences &rsaquo; [% searchfield %] &rsaquo; Confirm deletion of parameter '[% searchfield %]'[% END %][% IF ( delete_confirmed ) %] System preferences &rsaquo; Parameter deleted[% END %][% IF ( else ) %]System preferences[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
 //<![CDATA[
@@ -77,8 +77,8 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'sysprefs-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; [% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a> &rsaquo; [% IF ( modify ) %]Modify system preference '[% searchfield %]'[% ELSE %]Add a system preference[% END %][% END %][% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a> &rsaquo; Data Added[% END %]
-[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a> &rsaquo; <a href="/cgi-bin/koha/admin/systempreferences.pl?op=add_form&amp;searchfield=[% searchfield %]">[% searchfield %]</a> &rsaquo; Confirm Deletion of Parameter '[% searchfield %]'[% END %][% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a> &rsaquo; Parameter Deleted[% END %][% IF ( else ) %]System Preferences[% END %]</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; [% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a> &rsaquo; [% IF ( modify ) %]Modify system preference '[% searchfield %]'[% ELSE %]Add a system preference[% END %][% END %][% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a> &rsaquo; Data added[% END %]
+[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a> &rsaquo; <a href="/cgi-bin/koha/admin/systempreferences.pl?op=add_form&amp;searchfield=[% searchfield %]">[% searchfield %]</a> &rsaquo; Confirm deletion of parameter '[% searchfield %]'[% END %][% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a> &rsaquo; Parameter deleted[% END %][% IF ( else ) %]System preferences[% END %]</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -199,7 +199,7 @@
         <div class="hint"> (<span class="variabletype" id="Choice">Choice</span>, <span class="variabletype" id="YesNo">YesNo</span>, <span class="variabletype" id="Integer">Integer</span>, <span class="variabletype" id="Textarea">Textarea</span>, <span class="variabletype" id="Float">Float</span>, <span class="variabletype" id="Themes">Themes</span>, <span class="variabletype" id="Languages">Languages</span>, <span class="variabletype" id="Upload">Upload</span> or <span class="variabletype" id="ClassSources">ClassSources</span>)</div>
         <input type="text" name="preftype" id="preftype" value="[% preftype %]" size="40" maxlength="40" /></li>
         <li><label for="prefoptions">Variable options:</label>
-        <div class="hint">(a choice list for Choice (separated by |) or cols|rows for Texarea)</div>
+        <div class="hint">(a choice list for choice (separated by |) or cols|rows for texarea)</div>
         <input type="text" name="prefoptions" id="prefoptions" value="[% prefoptions %]" size="60" maxlength="80" /></li>
         </ol>
         </fieldset>
@@ -216,9 +216,9 @@
     
     [% IF ( delete_confirm ) %]
     <table>
-        <caption>Confirm Deletion of [% searchfield %]?</caption>
+        <caption>Confirm deletion of [% searchfield %]?</caption>
         <tr>
-            <th>Variable Name:</th>
+            <th>Variable name:</th>
             <td>[% searchfield %]</td>
         </tr>
         <tr><th>Value: </th><td>
@@ -228,8 +228,8 @@
         <input type="hidden" name="op" value="delete_confirmed" />
         <input type="hidden" name="searchfield" value="[% searchfield %]" />
         <input type="hidden" name="Tvalue" value="[% Tvalue %]" />
-        <input type="submit"  value="Yes, Delete" /></form> 
-        <form class="inline" action="[% script_name %]" method="post"><input type="submit" value="No, Do not Delete" /></form>
+        <input type="submit"  value="Yes, delete" /></form>
+        <form class="inline" action="[% script_name %]" method="post"><input type="submit" value="No, do not delete" /></form>
     [% END %]
     
     [% IF ( delete_confirmed ) %]
@@ -259,7 +259,7 @@
     }   //]]>
     </script>
     <ul class="toolbar">
-        <li><a id="newstopword" href="[% script_name %]?op=add_form">New Preference</a></li>
+        <li><a id="newstopword" href="[% script_name %]?op=add_form">New preference</a></li>
     </ul></div>
     
     <h1>System preferences admin</h1>
@@ -294,7 +294,7 @@
                 <input type="file" name="value" value="[% loo.value |html %]" />
                 [% END %]
                 [% IF ( loo.type_textarea ) %]
-                <a class="expand-textarea" style="display: none" href="#">Click to Edit</a>
+                <a class="expand-textarea" style="display: none" href="#">Click to edit</a>
                 <textarea name="value" rows="[% loo.rows %]" cols="[% loo.cols %]">[% loo.value |html %]</textarea>
                 [% END %]
                 [% IF ( loo.type_choice ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
index 9a4950bb30..3205e6f6ba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; [% IF ( else ) %]Z39.50 Servers[% END %]
-[% IF ( add_form ) %] Z39.50 Servers &rsaquo; [% IF ( searchfield ) %]Modify Z39.50 Server [% searchfield %][% ELSE %]New Z39.50 Server[% END %][% END %]
-[% IF ( delete_confirm ) %]Z39.50 Servers &rsaquo; Confirm Deletion[% END %]
-[% IF ( add_validate ) %]Z39.50 Servers &rsaquo; Z39.50 Server Added[% END %]
-[% IF ( delete_confirmed ) %]Z39.50 Servers &rsaquo; Z39.50 Server Deleted[% END %]</title>
+<title>Koha &rsaquo; Administration &rsaquo; [% IF ( else ) %]Z39.50 servers[% END %]
+[% IF ( add_form ) %] Z39.50 servers &rsaquo; [% IF ( searchfield ) %]Modify Z39.50 server [% searchfield %][% ELSE %]New Z39.50 server[% END %][% END %]
+[% IF ( delete_confirm ) %]Z39.50 servers &rsaquo; Confirm deletion[% END %]
+[% IF ( add_validate ) %]Z39.50 servers &rsaquo; Z39.50 server added[% END %]
+[% IF ( delete_confirmed ) %]Z39.50 servers &rsaquo; Z39.50 server deleted[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 
 [% IF ( add_form ) %]
@@ -69,11 +69,11 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'z3950-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; [% IF ( else ) %]Z39.50 Servers[% END %]
-[% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a> &rsaquo; [% IF ( searchfield ) %]Modify Z39.50 Server [% searchfield %][% ELSE %]New Z39.50 Server[% END %][% END %]
-[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a> &rsaquo; Confirm Deletion[% END %]
-[% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a> &rsaquo; Z39.50 Server Added[% END %]
-[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a> &rsaquo; Z39.50 Server Deleted[% END %]</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; [% IF ( else ) %]Z39.50 servers[% END %]
+[% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a> &rsaquo; [% IF ( searchfield ) %]Modify Z39.50 server [% searchfield %][% ELSE %]New Z39.50 server[% END %][% END %]
+[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a> &rsaquo; Confirm deletion[% END %]
+[% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a> &rsaquo; Z39.50 server added[% END %]
+[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a> &rsaquo; Z39.50 server deleted[% END %]</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -86,15 +86,15 @@
         <form action="[% script_name %]" name="Aform" method="post">
         <input type="hidden" name="op" value="add_validate" />
 [% IF ( searchfield ) %]
-                <h1>Modify Z39.50 Server</h1>
+                <h1>Modify Z39.50 server</h1>
         [% ELSE %]
-                <h1>New Z39.50 Server</h1>
+                <h1>New Z39.50 server</h1>
         [% END %]                
         <fieldset class="rows">
         <ol>[% IF ( searchfield ) %]
-                <li><span class="label">Z39.50 Server: </span>        <input type="hidden" name="searchfield" value="[% searchfield %]" />[% searchfield %]</li>
+                <li><span class="label">Z39.50 server: </span>        <input type="hidden" name="searchfield" value="[% searchfield %]" />[% searchfield %]</li>
         [% ELSE %]
-                <li><label for="searchfield">Z39.50 Server: </label>        <input type="text" name="searchfield" id="searchfield" size="65" maxlength="100" onblur="toUC(this)" /></li>
+                <li><label for="searchfield">Z39.50 server: </label>        <input type="text" name="searchfield" id="searchfield" size="65" maxlength="100" onblur="toUC(this)" /></li>
         [% END %]
 
 		<li><label for="host">Hostname: </label>	<input type="text" name="host" id="host" size="30" value="[% host %]" />
@@ -241,7 +241,7 @@
 [% END %]
 
 [% IF ( add_validate ) %]
-<h3>Z39.50 Server Added</h3>
+<h3>Z39.50 server added</h3>
 <form action="[% script_name %]" method="post">
         <input type="submit" value="OK" />
         </form>
@@ -249,7 +249,7 @@
 
 [% IF ( delete_confirm ) %]
 	[% reqsel %]
-<h3>Confirm Deletion of Server [% searchfield %]</h3>	
+<h3>Confirm deletion of server [% searchfield %]</h3>
         <ul>
                 <li><strong>Target: </strong>        [% searchfield %]</li>
                 <li><strong>Hostname: </strong>[% host %]</li>
@@ -269,7 +269,7 @@
 [% END %]
 
 [% IF ( delete_confirmed ) %]
-<h3>Z39.50 Server Deleted</h3>
+<h3>Z39.50 server deleted</h3>
 <form action="[% script_name %]" method="post">
                 <input type="submit" value="OK" />
 </form>
@@ -296,10 +296,10 @@
 	}	//]]>
 	</script>
 	<ul class="toolbar">
-	<li><a id="newserver" href="/cgi-bin/koha/admin/z3950servers.pl?op=add_form">New Z39.50 Server</a></li>
+    <li><a id="newserver" href="/cgi-bin/koha/admin/z3950servers.pl?op=add_form">New Z39.50 server</a></li>
 </ul></div>
 
-<h3>Z39.50 Servers Administration</h3>
+<h3>Z39.50 servers administration</h3>
 
         [% IF ( searchfield ) %]
                 You searched for [% searchfield %]
-- 
2.39.5