From 574d34dbb44f90f92acd9f605f524a5fa5691049 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 25 Mar 2013 16:08:04 -0400
Subject: [PATCH] Bug 2835 - Inconsistent use of colon at the end of sentences
Content-Type: text/plain; charset="utf-8"

Labels which precede a text input or select typically have a colon
before them:

Name: [____]

This patch cleans up templates where labels in this context lack a
colon. Exceptions to this rule include radio buttons, checkboxes, and
labels inside tables.

To test, view the affected pages and confirm that labels look
consistent.
---
 .../prog/en/includes/auth-finder-search.inc        |   12 ++--
 .../prog/en/modules/acqui/basketheader.tt          |   10 +--
 .../prog/en/modules/acqui/supplier.tt              |   40 +++++------
 .../prog/en/modules/acqui/z3950_search.tt          |    4 +-
 .../prog/en/modules/admin/aqbudgetperiods.tt       |   16 ++---
 .../prog/en/modules/admin/aqcontract.tt            |    8 +--
 .../prog/en/modules/admin/auth_tag_structure.tt    |   12 ++--
 .../prog/en/modules/admin/authorised_values.tt     |   14 ++--
 .../prog/en/modules/admin/biblio_framework.tt      |    6 +-
 .../prog/en/modules/admin/branches.tt              |   38 +++++-----
 .../prog/en/modules/admin/categorie.tt             |    6 +-
 .../prog/en/modules/admin/itemtypes.tt             |   10 +--
 .../prog/en/modules/catalogue/advsearch.tt         |    4 +-
 .../prog/en/modules/cataloguing/z3950_search.tt    |    4 +-
 .../prog/en/modules/labels/label-edit-layout.tt    |   16 ++---
 .../intranet-tmpl/prog/en/modules/labels/search.tt |    4 +-
 .../prog/en/modules/patroncards/edit-layout.tt     |   74 ++++++++++----------
 .../prog/en/modules/patroncards/members-search.tt  |    6 +-
 .../prog/en/modules/reports/bor_issues_top.tt      |    2 +-
 .../prog/en/modules/reports/borrowers_out.tt       |    2 +-
 .../prog/en/modules/reports/borrowers_stats.tt     |    2 +-
 .../prog/en/modules/reports/cat_issues_top.tt      |    2 +-
 .../prog/en/modules/reports/catalogue_out.tt       |    2 +-
 .../prog/en/modules/reports/catalogue_stats.tt     |    2 +-
 .../prog/en/modules/reports/issues_avg_stats.tt    |    2 +-
 .../prog/en/modules/reports/issues_stats.tt        |    2 +-
 .../prog/en/modules/reports/reserves_stats.tt      |    2 +-
 .../prog/en/modules/serials/subscription-add.tt    |   12 ++--
 .../prog/en/modules/serials/subscription-detail.tt |    4 +-
 .../prog/en/modules/suggestion/suggestion.tt       |    2 +-
 .../prog/en/modules/tools/batchMod.tt              |    4 +-
 .../prog/en/modules/tools/import_borrowers.tt      |    2 +-
 .../prog/en/modules/tools/inventory.tt             |   12 ++--
 .../prog/en/modules/tools/koha-news.tt             |   10 +--
 34 files changed, 176 insertions(+), 172 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
index 17d1138..d54cf64 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
@@ -113,12 +113,12 @@ function finderjumpfull(page)
             <input type="hidden" name="index" value="[% index %]" />
                 <fieldset class="rows"><legend>Search options</legend>
                 <ol><li>
-                    <span class="label">Authority type</span>
+                    <span class="label">Authority type: </span>
                     [% authtypecode %]
                     <input type="hidden" name="authtypecode" value="[% authtypecode %]" />
                 </li>
                 <li>
-                    <label for="mainmainentry">Main entry ($a only)</label>
+                    <label for="mainmainentry">Main entry ($a only): </label>
                     <input type="hidden" name="marclist" value="mainmainentry" />
                     <input type="hidden" name="and_or" value="and" />
                     <input type="hidden" name="excluding" value="" />
@@ -132,7 +132,7 @@ function finderjumpfull(page)
                 </li>
 
                 <li>
-                    <label for="mainentry">Main entry</label>
+                    <label for="mainentry">Main entry: </label>
                     <input type="hidden" name="marclist" value="mainentry" />
                     <input type="hidden" name="and_or" value="and" />
                     <input type="hidden" name="excluding" value="" />
@@ -146,7 +146,7 @@ function finderjumpfull(page)
                 </li>
 
                 <li>
-                    <label for="marclistanywhere">Anywhere</label>
+                    <label for="marclistanywhere">Anywhere: </label>
                     <input type="hidden" name="marclist" value="any" />
                     <input type="hidden" name="and_or" value="and" />
                     <input type="hidden" name="excluding" value="" />
@@ -159,7 +159,7 @@ function finderjumpfull(page)
                     <div id="yvaluecontainermarclist"></div>
                 </li>
                 <li>
-                    <label for="marclistheading">Heading match</label>
+                    <label for="marclistheading">Heading match: </label>
                     <input type="hidden" name="marclist" value="match" />
                     <input type="hidden" name="and_or" value="and" />
                     <input type="hidden" name="excluding" value="" />
@@ -171,7 +171,7 @@ function finderjumpfull(page)
                     <input type="text" name="value_match" value="[% value_match |html %]" />
                 </li>
         <li>
-        <label for="orderby">Sort by </label>
+        <label for="orderby">Sort by: </label>
         <select name="orderby" id="orderby">
             <option value="">No order</option>
             <option value="HeadingAsc" selected="selected">Heading ascendant</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
index 07db148..49e704a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
@@ -65,7 +65,7 @@ function Check(ff) {
                     </li>
                 [% END %]
                 <li>
-                    <label for="basketname" class="required">Basket name</label> &nbsp;
+                    <label for="basketname" class="required">Basket name: </label> &nbsp;
                         <input type="text" name="basketname" id="basketname" size="40" maxlength="80" value="[% basketname %]" />
                 </li>
                  <li>
@@ -99,7 +99,7 @@ function Check(ff) {
                     </select>
                 </li>
                 <li>
-                    <label for="basketbooksellerid">Vendor</label> &nbsp;
+                    <label for="basketbooksellerid">Vendor: </label> &nbsp;
                     <select name="basketbooksellerid" id="basketbooksellerid">
                     [% FOREACH b IN booksellers %]
                         [% IF booksellerid == b.id %]
@@ -111,15 +111,15 @@ function Check(ff) {
             </select>
                 </li>
                 <li>
-                    <label for="basketnote">Internal note</label> &nbsp;
+                    <label for="basketnote">Internal note: </label> &nbsp;
                     <textarea name="basketnote" id="basketnote" rows="5" cols="40">[% basketnote %]</textarea>
                 </li>
                 <li>
-                    <label for="basketbooksellernote">Vendor note</label> &nbsp;
+                    <label for="basketbooksellernote">Vendor note: </label> &nbsp;
                     <textarea name="basketbooksellernote" id="basketbooksellernote" rows="5" cols="40">[% basketbooksellernote %]</textarea>
                 </li>
                 [% IF ( contractloop ) %]
-                    <li><label for="basketcontractnumber">Contract</label>
+                    <li><label for="basketcontractnumber">Contract: </label>
                         <select id="basketcontractnumber" name="basketcontractnumber">
                             <option value=""></option>
                             [% FOREACH contractloo IN contractloop %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
index 51ec129..2645a83 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
@@ -66,36 +66,36 @@ if (f.company.value == "") {
         <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
         <fieldset class="rows">
             <legend>Company details</legend>
-            <ol><li><label for="company" class="required">Name * </label>
+            <ol><li><label for="company" class="required">Name: * </label>
                 <input type="text" size="40" id="company" name="company" value="[% name %]" /></li>
-            <li><label for="company_postal">Postal address</label>
+            <li><label for="company_postal">Postal address: </label>
                     <textarea id="company_postal" name="company_postal" cols="40" rows="3">[% postal %]</textarea></li>
-            <li><label for="physical">Physical address</label>
+            <li><label for="physical">Physical address: </label>
                 <textarea id="physical" name="physical" cols="40" rows="3">[% address1 %][% address2 %][% address3 %][% address4 %]</textarea></li>
-            <li><label for="company_phone">Phone</label>
+            <li><label for="company_phone">Phone: </label>
                 <input type="text" size="20" id="company_phone" name="company_phone" value="[% phone %]" /></li>
-            <li><label for="company_fax">Fax</label>
+            <li><label for="company_fax">Fax: </label>
                 <input type="text" size="20" id="company_fax" name="company_fax" value="[% fax %]" /></li>
-            <li><label for="website">Website</label>
+            <li><label for="website">Website: </label>
                 <input type="text" size="40" id="website" name="website" value="[% url %]" /></li>
-            <li><label for="accountnumber">Account number</label>
+            <li><label for="accountnumber">Account number: </label>
                 <input type="text" size="40" id="accountnumber" name="accountnumber" value="[% accountnumber %]" /></li></ol>
         </fieldset>
         <fieldset class="rows">
             <legend>Contact details</legend>
-        <ol> <li><label for="company_contact_name">Contact name</label>
+        <ol> <li><label for="company_contact_name">Contact name: </label>
                 <input type="text" size="40" id="company_contact_name" name="company_contact_name" value="[% contact %]" /></li>
-            <li><label for="company_contact_position">Position</label>
+            <li><label for="company_contact_position">Position: </label>
                 <input type="text" size="40" id="company_contact_position" name="company_contact_position" value="[% contpos %]" /></li>
-            <li><label for="contact_phone">Phone</label>
+            <li><label for="contact_phone">Phone: </label>
                 <input type="text" size="20" id="contact_phone" name="contact_phone" value="[% contphone %]" /> </li>
-            <li><label for="contact_phone_2">Alternative phone</label>
+            <li><label for="contact_phone_2">Alternative phone: </label>
                 <input type="text" size="20" id="contact_phone_2" name="contact_phone_2" value="[% contaltphone %]" /></li>
-            <li><label for="contact_fax">Fax</label>
+            <li><label for="contact_fax">Fax: </label>
                 <input type="text" size="20" id="contact_fax" name="contact_fax" value="[% contfax %]" /></li>
-            <li><label for="company_email">Email</label>
+            <li><label for="company_email">Email: </label>
                 <input type="text" size="40" id="company_email" name="company_email" value="[% contemail %]" /></li>
-            <li><label for="contact_notes">Notes</label>
+            <li><label for="contact_notes">Notes: </label>
                 <textarea id="contact_notes" name="contact_notes" cols="40" rows="4">[% contnotes %]</textarea></li></ol>
         </fieldset>
     </div>
@@ -112,7 +112,7 @@ if (f.company.value == "") {
                     [% END %]</li>
             </ol>
             <ol>
-            <li><label for="list_currency">List prices are</label>
+            <li><label for="list_currency">List prices are: </label>
                     <select name="list_currency" id="list_currency">
                     [% FOREACH loop_currenc IN loop_currency %]
                         [% IF ( loop_currenc.listprice ) %]<option value="[% loop_currenc.currency %]" selected="1">[% loop_currenc.currency %]</option>
@@ -120,7 +120,7 @@ if (f.company.value == "") {
                     [% END %]
                     </select>
             </li>
-            <li><label for="invoice_currency">Invoice prices are</label>
+            <li><label for="invoice_currency">Invoice prices are: </label>
                     <select name="invoice_currency" id="invoice_currency">
                     [% FOREACH loop_currenc IN loop_currency %]
                         [% IF ( loop_currenc.invoiceprice ) %]<option value="[% loop_currenc.currency %]" selected="1">[% loop_currenc.currency %]</option>
@@ -160,7 +160,7 @@ if (f.company.value == "") {
             [% IF gst_values %]
                 <ol>
                   <li>
-                    <label for="gst">Tax rate</label>
+                    <label for="gst">Tax rate: </label>
                     <select name="gstrate" id="gstrate">
                     [% FOREACH gst IN gst_values %]
                       [% IF ( gstrate == gst.option ) %]
@@ -176,13 +176,13 @@ if (f.company.value == "") {
                 <input type="hidden" name="gstrate" value="0" />
             [% END %]
             <ol>
-            <li><label for="discount">Discount</label>
+            <li><label for="discount">Discount: </label>
                 <input type="text" size="6" id="discount" name="discount" value="[% discount | format ("%.1f") %]" />%</li>
             <li>
-                <label for="deliverytime">Delivery time</label>
+                <label for="deliverytime">Delivery time: </label>
                 <input type="text" size="2" id="deliverytime" name="deliverytime" value="[% deliverytime %]" /> days
             </li>
-            <li><label for="notes">Notes</label>
+            <li><label for="notes">Notes: </label>
                 <textarea cols="40" rows="4" id="notes" name="notes" >[% notes %]</textarea></li></ol>
         </fieldset>
         <fieldset class="action"><input type="button" value="Save" onclick="check(this.form);" /> [% IF ( booksellerid ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
index 483bf65..7ce0222 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
@@ -100,7 +100,9 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
 		</fieldset>
 	    </div>
     <div class="yui-u">
-	<fieldset class="rows">		 <ol><li><label for="author">Author: </label> <input type="text" id="author" name="author" value="[% author %]" /><!--  <label for="Keyword">Keyword</label> <input type="text" name="keyword" value="" /> --></li>
+    <fieldset class="rows">
+        <ol>
+        <li><label for="author">Author: </label> <input type="text" id="author" name="author" value="[% author %]" /></li>
          <li><label for="issn">ISSN: </label> <input type="text" id="issn" name="issn" value="[% issn %]" /></li>
          <li> <label for="subject">Subject heading: </label> <input type="text" id="subject" name="subject" value="" /></li>
 		 <li><label for="dewey">Dewey: </label> <input type="text" id="dewey" name="dewey" value="" /></li></ol></fieldset>
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 244f92f..d86a5ab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
@@ -187,13 +187,13 @@
     <ol>
 
     <li>
-    <label class="required" for="from">Start date</label>
+    <label class="required" for="from">Start date: </label>
     <input type="text" size="10" id="from" name="budget_period_startdate" value="[% budget_period_startdate | $KohaDates %]" class="datepickerfrom" />
 				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
     </li>
     <li>
 
-    <label class="required" for="to">End date</label>
+    <label class="required" for="to">End date: </label>
     <input type="text" size="10" id="to" name="budget_period_enddate" value="[% budget_period_enddate | $KohaDates %]" class="datepickerto" />
 				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
     </li>
@@ -226,13 +226,13 @@
     <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
     <ol>
     <li>
-    <label class="required" for="from">Start date</label>
+    <label class="required" for="from">Start date: </label>
     <input type="text" size="10" id="from" name="budget_period_startdate" value="[% budget_period_startdate | $KohaDates %]" class="datepickerfrom" />
 				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
     </li>
     <li>
 
-    <label class="required" for="to">End date</label>
+    <label class="required" for="to">End date: </label>
     <input type="text" size="10" id="to" name="budget_period_enddate" value="[% budget_period_enddate | $KohaDates %]" class="datepickerto" />
 				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
     </li>
@@ -240,7 +240,7 @@
     <li>
         <!-- DESCRIPTION -->
         <!-- ############################## -->
-        <label class="required" for="budget_period_description">Description</label>
+        <label class="required" for="budget_period_description">Description: </label>
         <input type="text" id="budget_period_description" name="budget_period_description"
         size="48" maxlength="80" value="[% budget_period_description %]" />
     </li>
@@ -248,7 +248,7 @@
     <li>
         <!-- TOTAL -->
         <!-- ############################## -->
-        <label for="budget_period_total">Total amount</label>
+        <label for="budget_period_total">Total amount: </label>
         <input type="text" id="budget_period_total" name="budget_period_total"
         size="10" maxlength="80" value="[% budget_period_total %]" />
     </li>
@@ -256,14 +256,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>
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 969869c..6d01a3e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
@@ -108,17 +108,17 @@ function Check(ff) {
                                             <input type="hidden" name="is_a_modif" value="1" />
                                         </li>
                                 [% END %]
-                                <li><label for="contractname" class="required">Name *</label> &nbsp;
+                                <li><label for="contractname" class="required">Name:  *</label> &nbsp;
                                         <input type="text" name="contractname" id="contractname" size="40" maxlength="80" value="[% contractname %]" />
                                 </li>
-                                <li><label for="contractdescription">Description</label> &nbsp;
+                                <li><label for="contractdescription">Description: </label> &nbsp;
                                         <input type="text" name="contractdescription" id="contractdescription" size="40" maxlength="80" value="[% contractdescription %]" />
                                 </li>
-                                <li><label for="from" class="required">Start date *</label> &nbsp;
+                                <li><label for="from" class="required">Start date: *</label> &nbsp;
                                         <input type="text" name="contractstartdate" id="from" value="[% contractstartdate %]" maxlength="10" size="10" class="datepickerfrom" />
 				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
                                 </li>
-                                <li><label for="to" class="required">End date *</label> &nbsp;
+                                <li><label for="to" class="required">End date: *</label> &nbsp;
                                         <input type="text" name="contractenddate" id="to" value="[% contractenddate %]" maxlength="10"  size="10" class="datepickerto" />
 				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
                                 </li>
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 d35d37e..fc61789 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
@@ -137,24 +137,24 @@ return false;
         [% IF ( heading_modify_tag_p ) %]<input type="hidden" name="modif" value="1" />[% END %]
         <input type="hidden" name="authtypecode" value="[% authtypecode %]" />
         <fieldset class="rows"><ol>
-        <li><span class="label">Tag</span>[% searchfield %]</li>
-        <li><label for="liblibrarian">Text for librarians</label><input type="text" name="liblibrarian" id="liblibrarian" value="[% liblibrarian |html %]" size="40" maxlength="100" /></li>
-        <li><label for="libopac">Text for opac</label><input type="text" name="libopac" id="libopac" value="[% libopac |html %]" size="40" maxlength="100" /></li>
-        <li><label for="repeatable">Repeatable</label>
+        <li><span class="label">Tag: </span>[% searchfield %]</li>
+        <li><label for="liblibrarian">Text for librarians: </label><input type="text" name="liblibrarian" id="liblibrarian" value="[% liblibrarian |html %]" size="40" maxlength="100" /></li>
+        <li><label for="libopac">Text for opac: </label><input type="text" name="libopac" id="libopac" value="[% libopac |html %]" size="40" maxlength="100" /></li>
+        <li><label for="repeatable">Repeatable: </label>
             [% IF ( repeatable ) %]
                 <input type="checkbox" name="repeatable" id="repeatable" value="1" checked="checked" />
             [% ELSE %]
                 <input type="checkbox" name="repeatable" id="repeatable" value="1" />
             [% END %]
         </li>
-        <li><label for="mandatory">Mandatory</label>
+        <li><label for="mandatory">Mandatory: </label>
             [% IF ( mandatory ) %]
                 <input type="checkbox" name="mandatory" id="mandatory" value="1" checked="checked" />
             [% ELSE %]
                 <input type="checkbox" name="mandatory" id="mandatory" value="1" />
             [% END %]
             </li>
-        <li><label for="authorised_value">Authorized value</label>[% authorised_value %] (if you select a value here, the indicators will be limited to the authorized value list)</li>
+        <li><label for="authorised_value">Authorized value: </label>[% authorised_value %] (if you select a value here, the indicators will be limited to the authorized value list)</li>
 </ol></fieldset>
         <p><input type="button" value="Submit" class="button" onclick="Check(this.form)" /></p>
     </form>
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 790f0b5..bfba804 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
@@ -80,14 +80,14 @@ $(document).ready(function() {
     <input type="hidden" name="offset" value="[% offset %]" />
         <fieldset class="rows"><ol>
         <li>
-			 [% IF ( action_add_category ) %]<label for="category">Category</label>
+        [% IF ( action_add_category ) %]<label for="category">Category: </label>
             <input type="text" name="category"  id="category" size="10" maxlength="10" class="focus" />
 			 [% ELSE %]<span class="label">Category</span>
 		<input type="hidden" name="category" value="[% category %]" />	 [% category %]
 			 [% END %]
         </li>
         <li>
-            <label for="authorised_value">Authorized value</label>
+            <label for="authorised_value">Authorized value: </label>
      [% IF ( action_modify ) %]<input type="hidden" id="id" name="id" value="[% id %]" />[% END %]
             [% IF ( action_add_category ) %]
             <input type="text" id="authorised_value" name="authorised_value" value="[% authorised_value %]" maxlength="80" />
@@ -96,16 +96,16 @@ $(document).ready(function() {
             [% END %]
         </li>
         <li>
-            <label for="lib">Description</label>
+            <label for="lib">Description: </label>
             <input type="text" name="lib" id="lib" value="[% lib %]" maxlength="200" />
         </li>
 	<li>
-            <label for="lib_opac">Description (OPAC)</label>
+            <label for="lib_opac">Description (OPAC): </label>
             <input type="text" name="lib_opac" id="lib_opac" value="[% lib_opac %]" maxlength="200" />
         </li>
-        <li><label for="branches">Branches limitation: </label>
+        <li><label for="branches">Libraries limitation: </label>
             <select id="branches" name="branches" multiple size="10">
-                <option value="">All branches</option>
+                <option value="">All libraries</option>
                 [% FOREACH branch IN branches_loop %]
                   [% IF ( branch.selected ) %]
                     <option selected="selected" value="[% branch.branchcode %]">[% branch.branchname %]</option>
@@ -114,7 +114,7 @@ $(document).ready(function() {
                   [% END %]
                 [% END %]
             </select>
-            <span>Select All if this authorised value must to be displayed all the time. Otherwise select librairies you want to associate with this value.
+            <span>Select All if this authorised value must to be displayed all the time. Otherwise select libraries you want to associate with this value.
             </span>
         </li>
 
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 1458d10..c4fee12 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
@@ -149,13 +149,13 @@ function Check(f) {
     <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>
+        <li><label for="description">Description: </label>
         <input type="text" name="frameworktext" id="description" size="40" maxlength="80" value="[% frameworktext |html %]" /></li></ol></fieldset>
         <fieldset class="action">	<input type="submit" value="Submit" class="submit" /></fieldset>
     </form>
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 e210397..aa1dcd3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
@@ -91,16 +91,16 @@ tinyMCE.init({
         [% END %]
         <ol><li>
             [% IF ( heading_branches_add_branch_p ) %]
-            <label for="branchcode" class="required">Library code</label>
+            <label for="branchcode" class="required">Library code: </label>
                 <input type="text" name="branchcode" id="branchcode" size="10" maxlength="10" value="[% branchcode |html %]" class="required" required="required" /> <span class="required">Required</span>
             [% ELSE %]
-			<label for="branchcode" class="required">Library code</label>
+            <label for="branchcode" class="required">Library code: </label>
                 <input type="hidden" name="branchcode" value="[% branchcode |html %]" />
                 [% branchcode %]
             [% END %]
         </li>
         <li>
-            <label for="branchname" class="required">Name</label>
+            <label for="branchname" class="required">Name: </label>
             <input type="text" name="branchname" id="branchname" size="80" value="[% branch_name |html %]" class="required" required="required" /> <span class="required">Required</span>
         </li>
 	</ol>
@@ -108,7 +108,7 @@ tinyMCE.init({
 	[% IF ( categoryloop ) %]<fieldset class="rows"><legend>Group(s):</legend>
         <ol>
 		[% FOREACH categoryloo IN categoryloop %]
-            <li><label for="[% categoryloo.categorycode %]">[% categoryloo.categoryname %]</label>
+            <li><label for="[% categoryloo.categorycode %]">[% categoryloo.categoryname %]: </label>
                 [% IF ( categoryloo.checked ) %]
                     <input type="checkbox" id="[% categoryloo.categorycode %]" name="[% categoryloo.categorycode %]" checked="checked" />
                 [% ELSE %]
@@ -121,21 +121,21 @@ 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="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="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" class="email" value="[% branchemail |html %]" /></li>
-        <li><label for="branchurl">URL</label><input type="text" name="branchurl" id="branchurl" value="[% branchurl |html %]" class="url" /></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="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="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" class="email" value="[% branchemail |html %]" /></li>
+        <li><label for="branchurl">URL: </label><input type="text" name="branchurl" id="branchurl" value="[% branchurl |html %]" class="url" /></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>
+        <li><label for="branchprinter">Library Printer: </label>
             <select id="branchprinter" name="branchprinter">
                 <option value="">None</option>
             [% FOREACH printerloo IN printerloop %]
@@ -147,7 +147,7 @@ tinyMCE.init({
                 [% END %]
             </select></li>
 			-->
-        <li><label for="branchnotes">Notes</label><input type="text" name="branchnotes" id="branchnotes" value="[% branchnotes |html %]" /></li>
+        <li><label for="branchnotes">Notes: </label><input type="text" name="branchnotes" id="branchnotes" value="[% branchnotes |html %]" /></li>
         </ol>
         </fieldset>
         <fieldset class="action"><input type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/branches.pl">Cancel</a></fieldset>
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 ad57315..98e09ff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
@@ -140,10 +140,10 @@
 	[% END %]
 	<fieldset class="rows">
 	<ol>[% IF ( categorycode ) %]
-	<li><span class="label">Category code</span>[% categorycode |html %]
+    <li><span class="label">Category code: </span>[% categorycode |html %]
 				<input type="hidden" name="categorycode" value="[% categorycode |html %]" /><input type="hidden" name="is_a_modif" value="1" /></li>
 	[% ELSE %]
-	<li><label for="categorycode">Category code: </label> <input type="text" name="categorycode" id="categorycode" size="10" maxlength="10" onblur="toUC(this)" /></li>
+    <li><label for="categorycode">Category code: </label> <input type="text" name="categorycode" id="categorycode" size="10" maxlength="10" onblur="toUC(this)" /></li>
 	[% END %]
 	<li><label for="description">Description: </label> <input type="text" name="description" id="description" size="40" maxlength="80" value="[% description |html %]" /></li>
 	<li><label for="enrolmentperiod">Enrollment period: </label>
@@ -171,7 +171,7 @@
 						<option value="1">Yes</option>
 			[% END %]
 					</select></li>
-	<li><label for="hidelostitems">Lost items in staff client</label> <select name="hidelostitems" id="hidelostitems">
+    <li><label for="hidelostitems">Lost items in staff client: </label> <select name="hidelostitems" id="hidelostitems">
 			[% IF ( hidelostitems ) %]
 						<option value="0">Shown</option>
 						<option value="1" selected="selected">Hidden by default</option>
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 f21a998..8bd5524 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
@@ -147,19 +147,19 @@ Item types administration
 	<ol>
   [% IF ( itemtype ) %]
       <li>
-          <span class="label">Item type</span> <input type="hidden" name="itemtype" value="[% itemtype %]" />
+          <span class="label">Item type: </span> <input type="hidden" name="itemtype" value="[% itemtype %]" />
           [% itemtype %]
      </li>
   [% ELSE %]
       <li>
-          <label for="itemtype">Item type</label> <input type="text" id="itemtype" name="itemtype" size="10" maxlength="10" onblur="toUC(this)" class="focus" />
+          <label for="itemtype">Item type: </label> <input type="text" id="itemtype" name="itemtype" size="10" maxlength="10" onblur="toUC(this)" class="focus" />
       </li>
   [% END %]
       <li>
       [% IF ( itemtype ) %]
-          <label for="description">Description</label><input type="text" id="description" name="description" size="48" value="[% description |html %]" class="focus" /></li>
+          <label for="description">Description: </label><input type="text" id="description" name="description" size="48" value="[% description |html %]" class="focus" /></li>
       [% ELSE %]
-          <label for="description">Description</label><input type="text" id="description" name="description" size="48" value="[% description |html %]" /></li>
+          <label for="description">Description: </label><input type="text" id="description" name="description" size="48" value="[% description |html %]" /></li>
       [% END %]
      [% IF ( noItemTypeImages ) %]
 	 <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>
@@ -216,7 +216,7 @@ Item types administration
 </div>
 <ol>
       <li>
-          <label for="notforloan">Not for loan</label>   [% IF ( notforloan ) %]
+          <label for="notforloan">Not for loan: </label>   [% IF ( notforloan ) %]
                 <input type="checkbox" id="notforloan" name="notforloan" checked="checked" value="1" />
             [% ELSE %]
                 <input type="checkbox" id="notforloan" name="notforloan" value="1" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
index 43560d0..c982eb4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
@@ -248,7 +248,7 @@
     <!-- <input type="hidden" name="limit" value="branch: MAIN" /> -->
         [% IF ( searchdomainloop ) %]
     <p>OR</p> <!-- should addjs to grey out group pulldown if a library is selected. -->
-        <p><label for="categoryloop">Groups of libraries</label><select name="multibranchlimit" id="categoryloop">
+        <p><label for="categoryloop">Groups of libraries: </label><select name="multibranchlimit" id="categoryloop">
         <option value=""> -- none -- </option>
         [% FOREACH searchdomainloo IN searchdomainloop %]
         <option value="[% searchdomainloo.categorycode %]">[% searchdomainloo.categoryname %]</option>
@@ -262,7 +262,7 @@
 <!-- RANK LIMITS -->
 <fieldset id="sortby"><legend>Sorting</legend>
     <p>
-    <label for="sort_by">Sort by </label><select id="sort_by" name="sort_by">
+    <label for="sort_by">Sort by: </label><select id="sort_by" name="sort_by">
   [% INCLUDE 'resort_form.inc' %]
     </select>
         </p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
index c30d23b..7e5b0af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
@@ -116,7 +116,9 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
   		</fieldset>
 	    </div>
     <div class="yui-u">
-	<fieldset class="rows">		 <ol><li><label for="author">Author: </label> <input type="text" id="author" name="author" value="[% author %]" /><!--  <label for="Keyword">Keyword</label> <input type="text" name="keyword" value="" /> --></li>
+    <fieldset class="rows">
+        <ol>
+        <li><label for="author">Author: </label> <input type="text" id="author" name="author" value="[% author %]" /></li>
         <li><label for="issn">ISSN: </label> <input type="text" id="issn" name="issn" value="[% issn %]" /></li>
         <li> <label for="subject">Subject heading: </label> <input type="text" id="subject" name="subject" value="" /></li>
   		 <li><label for="dewey">Dewey: </label> <input type="text" id="dewey" name="dewey" value="" /></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
index 45a084d..583f6f0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
@@ -38,11 +38,11 @@
                             <legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] Label layout</legend>
                             <ol>
                                 <li>
-                                    <label for="layout_name">Layout name</label>
+                                    <label for="layout_name">Layout name: </label>
                                     <input type="text" name="layout_name" id="layout_name" size="20" value="[% layout_name %]" />
                                 </li>
                                 <li>
-                                    <label for="barcode_type">Choose barcode type (encoding)</label>
+                                    <label for="barcode_type">Choose barcode type (encoding): </label>
                                     <select name="barcode_type" id="barcode_type">
                                     [% FOREACH barcode_type IN barcode_types %]
                                     [% IF ( barcode_type.selected ) %]
@@ -54,7 +54,7 @@
                                     </select>
                                 </li>
                                 <li>
-                                    <label for="printing_type">Choose layout type</label>
+                                    <label for="printing_type">Choose layout type: </label>
                                     <select name="printing_type" id="printing_type">
                                     [% FOREACH label_type IN label_types %]
                                     [% IF ( label_type.selected ) %]
@@ -112,7 +112,7 @@
                                     </fieldset>
                                 </li>
                                 <li>
-                                    <label for="guidebox">Draw guide boxes</label>
+                                    <label for="guidebox">Draw guide boxes: </label>
                                     [% IF ( guidebox ) %]
                                     <input type="checkbox" name="guidebox" id="guidebox" value="1"  checked="checked" />
                                     [% ELSE %]
@@ -120,7 +120,7 @@
                                     [% END %]
                                 </li>
                                 <li>
-                                    <label for="callnum_split">Split call numbers</label>
+                                    <label for="callnum_split">Split call numbers: </label>
                                     [% IF ( callnum_split ) %]
                                     <input type="checkbox" name="callnum_split" id="callnum_split" value="1"  checked="checked" />
                                     [% ELSE %]
@@ -128,7 +128,7 @@
                                     [% END %]
                                 </li>
                                 <li>
-                                    <label for="text_justify">Text justification</label>
+                                    <label for="text_justify">Text justification: </label>
                                     <select name="text_justify" id="text_justify">
                                         [% FOREACH text_justification_type IN text_justification_types %]
                                         [% IF ( text_justification_type.selected ) %]
@@ -140,7 +140,7 @@
                                     </select>
                                 </li>
                                 <li>
-                                    <label for="font">Font</label>
+                                    <label for="font">Font: </label>
                                     <select name="font" id="font">
                                         [% FOREACH font_type IN font_types %]
                                         [% IF ( font_type.selected ) %]
@@ -152,7 +152,7 @@
                                     </select>
                                 </li>
                                 <li>
-                                    <label for="font_size">Font size</label>
+                                    <label for="font_size">Font size: </label>
                                     <input type="text" name="font_size" id="font_size" size="2" value="[% font_size |html %]" />
                                 </li>
                             </ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt
index 04170ac..748d5ac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt
@@ -90,12 +90,12 @@ to add to Batch [% batch_id %]
 <fieldset class="rows">
 <ol>
 	<li>
-    <label for="from">Added on or after date</label>
+    <label for="from">Added on or after date: </label>
         <input type="text" size="10" id="from" name="datefrom" class="datepickerfrom" value="" />
 <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
 </li>
 <li>
-    <label for="to">Added on or before date</label>
+    <label for="to">Added on or before date: </label>
         <input type="text" size="10" id="to" name="dateto" class="datepickerto" value="" />
 <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
 </li></ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
index 0a96568..798ad48 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
@@ -131,11 +131,11 @@
                                 <fieldset>
                                 <legend>General settings</legend>
                                 <li>
-                                    <label for="layout_name">Layout name</label>
+                                    <label for="layout_name">Layout name: </label>
                                     <input type="text" name="layout_name" id="layout_name" size="20" value="[% layout_name %]" />
                                 </li>
                                 <li>
-                                    <label for="units">Units:</label>
+                                    <label for="units">Units: </label>
                                     <select id="units" name="units">
                                     [% FOREACH unit IN units %]
                                         [% IF ( unit.selected ) %]
@@ -149,7 +149,7 @@
                                     </select>
                                 </li>
                                 <li>
-                                    <label for="page_side">Page side:</label>
+                                    <label for="page_side">Page side: </label>
                                     [% IF ( page_side ) %]
                                     <input type="radio" name="page_side" id="page_side" value="F" />Front
                                     <input type="radio" name="page_side" id="page_side" value="B" checked="checked" />Back
@@ -182,11 +182,11 @@
                                             [% END %]
                                             <div id="field_1_select" style="display: none;">
                                             <li>
-                                                <label for="field_1_text">Text</label>
+                                                <label for="field_1_text">Text: </label>
                                                 <input type="text" name="field_1_text" id="field_1_text" size="60" value="[% field_1_text |html %]" />
                                             </li>
                                             <li>
-                                                <label for="field_1_font">Font</label>
+                                                <label for="field_1_font">Font: </label>
                                                 <select name="field_1_font" id="field_1_font">
                                                     [% FOREACH field_1_fon IN field_1_font %]
                                                     [% IF ( field_1_fon.selected ) %]
@@ -198,12 +198,12 @@
                                                 </select>
                                             </li>
                                             <li>
-                                                <label for="field_1_font_size">Font size</label>
+                                                <label for="field_1_font_size">Font size: </label>
                                                 <input type="text" name="field_1_font_size" id="field_1_font_size" size="2" value="[% field_1_font_size |html %]" />
                                                 <span class="font_unit"> pt</span>
                                             </li>
                                             <li>
-                                                <label for="field_1_text_alignment">Text alignment</label>
+                                                <label for="field_1_text_alignment">Text alignment: </label>
                                                 <select name="field_1_text_alignment" id="field_1_text_alignment">
                                                     [% FOREACH field_1_text_alignmen IN field_1_text_alignment %]
                                                     [% IF ( field_1_text_alignmen.selected ) %]
@@ -215,11 +215,11 @@
                                                 </select>
                                             </li>
                                             <li>
-                                                <label for="field_1_llx">Lower left X coordinate</label>
+                                                <label for="field_1_llx">Lower left X coordinate: </label>
                                                 <input type="text" name="field_1_llx" id="field_1_llx" size="2" value="[% field_1_llx |html %]" />
                                             </li>
                                             <li>
-                                                <label for="field_1_lly">Lower left Y coordinate</label>
+                                                <label for="field_1_lly">Lower left Y coordinate: </label>
                                                 <input type="text" name="field_1_lly" id="field_1_lly" size="2" value="[% field_1_lly |html %]" />
                                             </li>
                                             </div>
@@ -234,11 +234,11 @@
                                             [% END %]
                                             <div id="field_2_select" style="display: none;">
                                             <li>
-                                                <label for="field_2_text">Text</label>
+                                                <label for="field_2_text">Text: </label>
                                                 <input type="text" name="field_2_text" id="field_2_text" size="60" value="[% field_2_text |html %]" />
                                             </li>
                                             <li>
-                                                <label for="field_2_font">Font</label>
+                                                <label for="field_2_font">Font: </label>
                                                 <select name="field_2_font" id="field_2_font">
                                                     [% FOREACH field_2_fon IN field_2_font %]
                                                     [% IF ( field_2_fon.selected ) %]
@@ -250,12 +250,12 @@
                                                 </select>
                                             </li>
                                             <li>
-                                                <label for="field_2_font_size">Font size</label>
+                                                <label for="field_2_font_size">Font size: </label>
                                                 <input type="text" name="field_2_font_size" id="field_2_font_size" size="2" value="[% field_2_font_size |html %]" />
                                                 <span class="font_unit"> pt</span>
                                             </li>
                                             <li>
-                                                <label for="field_2_text_alignment">Text alignment</label>
+                                                <label for="field_2_text_alignment">Text alignment: </label>
                                                 <select name="field_2_text_alignment" id="field_2_text_alignment">
                                                     [% FOREACH field_2_text_alignmen IN field_2_text_alignment %]
                                                     [% IF ( field_2_text_alignmen.selected ) %]
@@ -267,11 +267,11 @@
                                                 </select>
                                             </li>
                                             <li>
-                                                <label for="field_2_llx">Lower left X coordinate</label>
+                                                <label for="field_2_llx">Lower left X coordinate: </label>
                                                 <input type="text" name="field_2_llx" id="field_2_llx" size="2" value="[% field_2_llx |html %]" />
                                             </li>
                                             <li>
-                                                <label for="field_2_lly">Lower left Y coordinate</label>
+                                                <label for="field_2_lly">Lower left Y coordinate: </label>
                                                 <input type="text" name="field_2_lly" id="field_2_lly" size="2" value="[% field_2_lly |html %]" />
                                             </li>
                                             </div>
@@ -286,11 +286,11 @@
                                             [% END %]
                                             <div id="field_3_select" style="display: none;">
                                             <li>
-                                                <label for="field_3_text">Text</label>
+                                                <label for="field_3_text">Text: </label>
                                                 <input type="text" name="field_3_text" id="field_3_text" size="60" value="[% field_3_text |html %]" />
                                             </li>
                                             <li>
-                                                <label for="field_3_font">Font</label>
+                                                <label for="field_3_font">Font: </label>
                                                 <select name="field_3_font" id="field_3_font">
                                                     [% FOREACH field_3_fon IN field_3_font %]
                                                     [% IF ( field_3_fon.selected ) %]
@@ -302,12 +302,12 @@
                                                 </select>
                                             </li>
                                             <li>
-                                                <label for="field_3_font_size">Font size</label>
+                                                <label for="field_3_font_size">Font size: </label>
                                                 <input type="text" name="field_3_font_size" id="field_3_font_size" size="2" value="[% field_3_font_size |html %]" />
                                                 <span class="font_unit"> pt</span>
                                             </li>
                                             <li>
-                                                <label for="field_3_text_alignment">Text alignment</label>
+                                                <label for="field_3_text_alignment">Text alignment: </label>
                                                 <select name="field_3_text_alignment" id="field_3_text_alignment">
                                                     [% FOREACH field_3_text_alignmen IN field_3_text_alignment %]
                                                     [% IF ( field_3_text_alignmen.selected ) %]
@@ -319,11 +319,11 @@
                                                 </select>
                                             </li>
                                             <li>
-                                                <label for="field_3_llx">Lower left X coordinate</label>
+                                                <label for="field_3_llx">Lower left X coordinate: </label>
                                                 <input type="text" name="field_3_llx" id="field_3_llx" size="2" value="[% field_3_llx |html %]" />
                                             </li>
                                             <li>
-                                                <label for="field_3_lly">Lower left Y coordinate</label>
+                                                <label for="field_3_lly">Lower left Y coordinate: </label>
                                                 <input type="text" name="field_3_lly" id="field_3_lly" size="2" value="[% field_3_lly |html %]" />
                                             </li>
                                             </div>
@@ -345,7 +345,7 @@
 <!--
                             <li>
                                 <fieldset>
-                                <label for="guidebox">Draw guide boxes</label>
+                                <label for="guidebox">Draw guide boxes: </label>
                                 [% IF ( guidebox ) %]
                                 <input type="checkbox" name="guidebox" id="guidebox" value="1"  checked="checked" />
                                 [% ELSE %]
@@ -358,7 +358,7 @@
                             <fieldset>
                                 <legend>Barcode</legend>
                                 <li>
-                                    <label for="barcode_print">Print card number as barcode</label>
+                                    <label for="barcode_print">Print card number as barcode: </label>
                                     [% IF ( barcode_print ) %]
                                     <input type="checkbox" name="barcode_print" id="barcode_print" value="1" checked="checked" />
                                     [% ELSE %]
@@ -367,15 +367,15 @@
                                 </li>
                                 <div id="barcode_param" style="display: none;">
                                 <li>
-                                    <label for="barcode_llx">Lower left X coordinate</label>
+                                    <label for="barcode_llx">Lower left X coordinate: </label>
                                     <input type="text" name="barcode_llx" id="barcode_llx" size="2" value="[% barcode_llx |html %]" />
                                 </li>
                                 <li>
-                                    <label for="barcode_lly">Lower left Y coordinate</label>
+                                    <label for="barcode_lly">Lower left Y coordinate: </label>
                                     <input type="text" name="barcode_lly" id="barcode_lly" size="2" value="[% barcode_lly |html %]" />
                                 </li>
                                 <li>
-                                    <label for="barcode_type">Barcode type</label>
+                                    <label for="barcode_type">Barcode type: </label>
                                     <select name="barcode_type" id="barcode_type">
                                         [% FOREACH barcode_typ IN barcode_type %]
                                         [% IF ( barcode_typ.selected ) %]
@@ -387,7 +387,7 @@
                                     </select>
                                 </li>
                                 <li>
-                                    <label for="barcode_text_print">Print card number as text under barcode</label>
+                                    <label for="barcode_text_print">Print card number as text under barcode: </label>
                                     [% IF ( barcode_text_print ) %]
                                     <input type="checkbox" name="barcode_text_print" id="barcode_text_print" value="1" checked="checked" />
                                     [% ELSE %]
@@ -404,7 +404,7 @@
                                     <fieldset>
                                     <legend>Image 1</legend>
                                     <li>
-                                        <label for="image_1_image_source">Image source</label>
+                                        <label for="image_1_image_source">Image source: </label>
                                         <select name="image_1_image_source" id="image_1_image_source">
                                             [% FOREACH image_1_image_sourc IN image_1_image_source %]
                                             [% IF ( image_1_image_sourc.selected ) %]
@@ -417,7 +417,7 @@
                                     </li>
                                     <div id="image_1_image_name" style="display: none;">
                                     <li>
-                                        <label for="image_1_image_name">Image</label>
+                                        <label for="image_1_image_name">Image: </label>
                                         <select name="image_1_image_name" id="image_1_image_name">
                                             [% FOREACH image_1_image_nam IN image_1_image_name %]
                                             [% IF ( image_1_image_nam.selected ) %]
@@ -431,15 +431,15 @@
                                     </div>
                                     <div id="image_1_image_metrics" style="display: none;">
                                     <li>
-                                        <label for="image_1_Dx">Display height</label>
+                                        <label for="image_1_Dx">Display height: </label>
                                         <input type="text" name="image_1_Dx" id="image_1_Dx" size="2" value="[% image_1_Dx |html %]" />
                                     </li>
                                     <li>
-                                        <label for="image_1_Tx">Lower left X coordinate</label>
+                                        <label for="image_1_Tx">Lower left X coordinate: </label>
                                         <input type="text" name="image_1_Tx" id="image_1_Tx" size="2" value="[% image_1_Tx |html %]" />
                                     </li>
                                     <li>
-                                        <label for="image_1_Ty">Lower left Y coordinate</label>
+                                        <label for="image_1_Ty">Lower left Y coordinate: </label>
                                         <input type="text" name="image_1_Ty" id="image_1_Ty" size="2" value="[% image_1_Ty |html %]" />
                                     </li>
                                     </div>
@@ -454,7 +454,7 @@
                                     <fieldset>
                                     <legend>Image 2</legend>
                                     <li>
-                                        <label for="image_2_image_source">Image source</label>
+                                        <label for="image_2_image_source">Image source: </label>
                                         <select name="image_2_image_source" id="image_2_image_source">
                                             [% FOREACH image_2_image_sourc IN image_2_image_source %]
                                             [% IF ( image_2_image_sourc.selected ) %]
@@ -467,7 +467,7 @@
                                     </li>
                                     <div id="image_2_image_name" style="display: none;">
                                     <li>
-                                        <label for="image_2_image_name">Image</label>
+                                        <label for="image_2_image_name">Image: </label>
                                         <select name="image_2_image_name" id="image_2_image_name">
                                             [% FOREACH image_2_image_nam IN image_2_image_name %]
                                             [% IF ( image_2_image_nam.selected ) %]
@@ -481,15 +481,15 @@
                                     </div>
                                     <div id="image_2_image_metrics" style="display: none;">
                                     <li>
-                                        <label for="image_2_Dx">Display height</label>
+                                        <label for="image_2_Dx">Display height: </label>
                                         <input type="text" name="image_2_Dx" id="image_2_Dx" size="2" value="[% image_2_Dx |html %]" />
                                     </li>
                                     <li>
-                                        <label for="image_2_Tx">Lower left X coordinate</label>
+                                        <label for="image_2_Tx">Lower left X coordinate: </label>
                                         <input type="text" name="image_2_Tx" id="image_2_Tx" size="2" value="[% image_2_Tx |html %]" />
                                     </li>
                                     <li>
-                                        <label for="image_2_Ty">Lower left Y coordinate</label>
+                                        <label for="image_2_Ty">Lower left Y coordinate: </label>
                                         <input type="text" name="image_2_Ty" id="image_2_Ty" size="2" value="[% image_2_Ty |html %]" />
                                     </li>
                                     </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt
index c3a1df7..9bef74c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt
@@ -57,9 +57,9 @@ function add_item(borrowernum,batch_id,type_id){
 <form method="get" action="/cgi-bin/koha/patroncards/members-search.pl"><p>
 <input type="hidden" name="batch_id" value="[% batch_id %]" />
 <input type="hidden" name="type" value="[% type %]" />
-<label for="member">Name</label>
+<label for="member">Name: </label>
 <input id="member" name="member" />
-<label for="category">Category code</label>
+<label for="category">Category code: </label>
 <input id="category" name="category" />
 <input type="submit" value="Search" /></p>
 </form>
@@ -73,7 +73,7 @@ function add_item(borrowernum,batch_id,type_id){
 
     <table style="float: left; margin: .5em 0;">
     <tr>
-    <th><label style="font-weight:bold;">Select</label></th>
+    <th>Select</th>
     <th><a href="members-search.pl?member=[% member %]&amp;category=[% category_type %]&amp;batch_id=[% batch_id %]&amp;orderby=cardnumber">Card</a></th>
     <th><a href="members-search.pl?member=[% member %]&amp;category=[% category_type %]&amp;batch_id=[% batch_id %]&amp;orderby=surname">Name</a></th>
     <th><a href="members-search.pl?member=[% member %]&amp;category=[% category_type %]&amp;batch_id=[% batch_id %]&amp;orderby=borrowers.categorycode">Category</a></th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt
index a42b834..1526283 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt
@@ -59,7 +59,7 @@ function Dopop(link) {
 	[% FOREACH mainloo IN mainloop %]
         <h1>Top [% mainloo.limit %] List patrons for checkouts</h1>
 		[% IF ( mainloo.loopfilter ) %]
-			<p>Filtered on</p>
+            <p>Filtered on:</p>
 			[% FOREACH loopfilte IN mainloo.loopfilter %]
 					<p>[% IF ( loopfilte.err ) %]  [% END %] [% loopfilte.crit %] =[% loopfilte.filter %][% IF ( loopfilte.err ) %]  [% END %]</p>
 			[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt
index ec92c8c..58b5622 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt
@@ -26,7 +26,7 @@ $(document).ready(function(){
     [% FOREACH mainloo IN mainloop %]
         <h1>Patrons with no checkouts</h1>
         [% IF ( mainloo.loopfilter ) %]
-            <p>Filtered on</p>
+            <p>Filtered on:</p>
             [% FOREACH loopfilte IN mainloo.loopfilter %]
                     <p>[% IF ( loopfilte.err ) %]  [% END %] [% loopfilte.crit %] =[% loopfilte.filter %][% IF ( loopfilte.err ) %]  [% END %]</p>
             [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
index b6ebcfa..37da198 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
@@ -23,7 +23,7 @@
 	[% FOREACH mainloo IN mainloop %]
 		<h1>Patrons statistics</h1>
 		[% IF ( mainloo.loopfilter ) %]
-			<p>Filtered on</p>
+            <p>Filtered on:</p>
 			[% FOREACH loopfilte IN mainloo.loopfilter %]
 				<p>
 					[% loopfilte.crit %] = [% loopfilte.filter %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt
index c2d8906..dba83f2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt
@@ -56,7 +56,7 @@
 	[% FOREACH mainloo IN mainloop %]
         <h1>Top [% mainloo.limit %] Most-circulated items</h1>
 		[% IF ( mainloo.loopfilter ) %]
-			<p>Filtered on</p>
+            <p>Filtered on:</p>
 			[% FOREACH loopfilte IN mainloo.loopfilter %]
 					<p>[% IF ( loopfilte.err ) %]  [% END %] [% loopfilte.crit %] =[% loopfilte.filter %][% IF ( loopfilte.err ) %]  [% END %]</p>
 			[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
index 23eb6ba..b098cc7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
@@ -20,7 +20,7 @@
 	<h1>Items with no checkouts</h1>
 	[% FOREACH mainloo IN mainloop %]
 		[% IF ( mainloo.loopfilter ) %]
-			<p>Filtered on</p>
+            <p>Filtered on:</p>
 			[% FOREACH loopfilte IN mainloo.loopfilter %]
 				[% IF ( loopfilte.err ) %]<p class="error">Error: 
 				[% ELSE %]<p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
index 41e5f74..e1fc987 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
@@ -52,7 +52,7 @@
 	[% FOREACH mainloo IN mainloop %]
 		<h1>Catalog statistics</h1>
 		[% IF ( mainloo.loopfilter ) %]
-			<p>Filtered on</p>
+            <p>Filtered on:</p>
 			[% FOREACH loopfilte IN mainloo.loopfilter %]
 					<p>[% loopfilte.crit %] =[% loopfilte.filter %]</p>
 			[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt
index 9010092..8460bf0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt
@@ -52,7 +52,7 @@
 	[% FOREACH mainloo IN mainloop %]
         <h1>Average checkout period</h1>
 		[% IF ( mainloo.loopfilter ) %]
-			<p>Filtered on</p>
+            <p>Filtered on:</p>
 			[% FOREACH loopfilte IN mainloo.loopfilter %]
 					<p>[% IF ( loopfilte.err ) %]  [% END %] [% loopfilte.crit %] =[% loopfilte.filter %][% IF ( loopfilte.err ) %]  [% END %]</p>
 			[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
index e09b9cc..54708b4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
@@ -22,7 +22,7 @@
     [% FOREACH mainloo IN mainloop %]
         <h1>Circulation statistics</h1>
         [% IF ( mainloo.loopfilter ) %]
-            <p>Filtered on</p>
+            <p>Filtered on:</p>
             <ul>
             [% FOREACH loopfilte IN mainloo.loopfilter %]
                 [% IF ( loopfilte.err ) %]<li class="error">Error:
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
index c5a198b..e8b2548 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
@@ -94,7 +94,7 @@
     [% IF ( mainloop ) %]
         <h1>Holds statistics</h1>
         [% IF ( loopfilter ) %]
-            <p>Filtered on</p>
+            <p>Filtered on:</p>
             <ul>
             [% FOREACH loopfilte IN loopfilter %]
                 [% IF ( loopfilte.err ) %]<li class="error">Error:
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
index 35d4187..2f1dc7f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
@@ -1102,27 +1102,27 @@ $(document).ready(function() {
         <fieldset class="rows">
             <ol>
                 <li>
-                <label for="histstartdate">Subscription start date</label>
+                <label for="histstartdate">Subscription start date: </label>
                 <input type="text" name="histstartdate" id="histstartdate" value="[% histstartdate %]" /><div class="hint"> (start date of the 1st subscription)</div>
                 </li>
                 <li>
-                <label for="histenddate">Subscription end date</label>
+                <label for="histenddate">Subscription end date: </label>
                 <input type="text" name="histenddate" id="histenddate" value="[% histenddate %]" /> <div class="hint">(if empty, subscription is still active)</div>
                 </li>
                 <li>
-                <label for="recievedlist">Received issues</label>
+                <label for="recievedlist">Received issues: </label>
                 <textarea name="recievedlist" id="recievedlist" cols="60" rows="5">[% recievedlist %]</textarea>
                 </li>
                 <li>
-                <label for="missinglist">Missing issues</label>
+                <label for="missinglist">Missing issues: </label>
                 <textarea name="missinglist" id="missinglist" cols="60" rows="5">[% missinglist %]</textarea>
                 </li>
                 <li>
-                <label for="opacnote">Note for OPAC</label>
+                <label for="opacnote">Note for OPAC: </label>
                 <textarea name="opacnote" id="opacnote" cols="60" rows="5">[% opacnote %]</textarea>
                 </li>
                 <li>
-                <label for="librariannote">Note for staff</label>
+                <label for="librariannote">Note for staff: </label>
                 <textarea name="librariannote" id="librariannote" cols="60" rows="5">[% librariannote %]</textarea>
                 </li>
             </ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
index a7b9e83..0d9e832 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -409,8 +409,8 @@ $(document).ready(function() {
             <li><span class="label">Missing issues:</span>[% missinglist %]</li>
             <li><span class="label">Nonpublic note:</span>[% internalnotes FILTER html_line_break %]</li>
             <li><span class="label">Public note:</span>[% notes FILTER html_line_break %]</li>
-            <li><span class="label">History staff note</span>[% librariannote FILTER html_line_break %]</li>
-            <li><span class="label">History OPAC note</span>[% opacnote FILTER html_line_break %]</li>
+            <li><span class="label">History staff note:</span>[% librariannote FILTER html_line_break %]</li>
+            <li><span class="label">History OPAC note:</span>[% opacnote FILTER html_line_break %]</li>
         </ol>
     </div>
     </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index fcb8eca..6076557 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -346,7 +346,7 @@ $(document).ready(function() { calcNewsuggTotal(); });
             </select>
                 </li><li><label for="price">Price:</label>
 			<input type="text" size="20" name="price" id="price" value="[% price %]" onchange="calcNewsuggTotal();" />
-                </li><li><label for="total">Total</label>
+                </li><li><label for="total">Total: </label>
 			<input type="text" readonly="readonly" id="total" name="total" size="10" value="[% total %]"/>
                 </li></ol>
     </fieldset><input type="hidden" id="returnsuggested" name="returnsuggested" value="[% IF ( returnsuggestedby ) %][% returnsuggestedby %][% ELSE %]noone[% END %]"/>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt
index df6fa57..92bc771 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt
@@ -35,9 +35,9 @@
                                 <legend>Use a file</legend>
                 	              <ol>
 				      <li>
-					<label for="barcode_file">Barcode file</label><input type="radio" name="filecontent" value="barcode_file" id="barcode_file" checked="checked" /></li>
+                    <label for="barcode_file">Barcode file: </label><input type="radio" name="filecontent" value="barcode_file" id="barcode_file" checked="checked" /></li>
                     <li>
-					<label for="itemid_file">Item number file</label><input type="radio" name="filecontent" value="itemid_file" id="itemid_file" />
+                    <label for="itemid_file">Item number file: </label><input type="radio" name="filecontent" value="itemid_file" id="itemid_file" />
 				      </li>
                                     <li><label for="uploadfile">File: </label> <input type="file" id="uploadfile" name="uploadfile" /></li>
                                 </ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
index b894369..6744faf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
@@ -108,7 +108,7 @@
 <ol>
     [% FOREACH columnkey IN columnkeys %]
 	<li>
-		<label class="widelabel" for="[% columnkey.key %]">[% columnkey.key %]</label>
+        <label class="widelabel" for="[% columnkey.key %]">[% columnkey.key %]: </label>
 		<input id="[% columnkey.key %]" name="[% columnkey.key %]" />
 	</li>
     [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
index a88ed84..424928f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
@@ -66,11 +66,11 @@ $(document).ready(function(){
         <fieldset class="rows">
         <legend>Select items you want to check</legend>
         <ol><li>
-        <label for="branch">Library</label>
+        <label for="branch">Library: </label>
             <input type="radio" name="branch" value="homebranch"> Home library</input>
             <input type="radio" name="branch" value="holdingbranch"> Current location</input>
         </li><li>
-        <label for="branchloop">Library</label><select id="branchloop" name="branchcode" style="width:12em;">
+        <label for="branchloop">Library: </label><select id="branchloop" name="branchcode" style="width:12em;">
             <option value="">All locations</option>
         [% FOREACH branchloo IN branchloop %]
             [% IF ( branchloo.selected ) %]
@@ -83,7 +83,7 @@ $(document).ready(function(){
         </li>
         [% IF ( authorised_values ) %]
         <li>
-            <label for="locationloop">Shelving location (items.location) is</label>
+            <label for="locationloop">Shelving location (items.location) is: </label>
         <select id="locationloop" name="location">
                 <option value="">Filter location</option>
         [% FOREACH authorised_value IN authorised_values %]
@@ -105,7 +105,7 @@ $(document).ready(function(){
 	</ol>
 	</fieldset>
             <fieldset class="rows">
-            <legend>Item statuses:</legend>
+            <legend>Item statuses</legend>
             <div name="statuses" style="display: block;">
                   [% FOREACH statuse IN statuses %]
                       [% IF ( statuse.values ) %]
@@ -146,11 +146,11 @@ $(document).ready(function(){
             <input type="text" id="offset" name="offset" value="[% offset %]" size="5" maxlength="5" />
         </li>
         <li>
-           <label for="CSVexport">Export to CSV file</label>
+           <label for="CSVexport">Export to CSV file: </label>
            <input type="checkbox" name="CSVexport" id="CSVexport" />
         </li>
         <li>
-            <label for="compareinv2barcd">Compare barcodes list to results</label>
+            <label for="compareinv2barcd">Compare barcodes list to results: </label>
             <input type="checkbox" name="compareinv2barcd" id="compareinv2barcd" />
         </li>
         </ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
index d84f8c5..927c4ac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
@@ -79,28 +79,28 @@ Edit News Item[% ELSE %]Add News Item[% END %][% ELSE %]News[% END %]</div>
             </select>
             </li>
             <li>
-                <label for="title">Title</label>
+                <label for="title">Title: </label>
                 <input id="title" size="30" type="text" name="title" value="[% new_detail.title %]" />
             </li>
             <li>
-                <label for="from">Publication date</label>
+                <label for="from">Publication date: </label>
                 <input id="from" type="text" name="timestamp" size="15" value="[% new_detail.timestamp %]" class="datepickerfrom" />
 				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
             </li>
             <li>
-                <label for="to">Expiration date</label>
+                <label for="to">Expiration date: </label>
                 <input id="to" type="text" name="expirationdate" size="15" value="[% new_detail.expirationdate %]" class="datepickerto" />
 				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
             </li>
             <li>
-                <label for="number">Appear in position </label>
+                <label for="number">Appear in position: </label>
                 [% IF ( new_detail.number ) %]
                     <input id="number" size="3" name="number" type="text" checked="checked" value="[% new_detail.number %]" />
                 [% ELSE %]
                     <input id="number" size="3" name="number" type="text" />
                 [% END %]
             </li>
-            <li><label for="new">News</label>
+            <li><label for="new">News: </label>
             <textarea name="new" id="new"  cols="75" rows="10">[% new_detail.new %]</textarea></li>
             </ol>
 			</fieldset>
-- 
1.7.9.5