From c9a818f3da9594c13be18a5a9754d09561aebc98 Mon Sep 17 00:00:00 2001
From: Victor Grousset/tuxayo <victor@tuxayo.net>
Date: Wed, 11 May 2022 17:08:32 +0200
Subject: [PATCH] Bug 30733: [22.05] Simplify translatable strings

And a few minor fixes when they where causing issues for
translatability.
And rephrased a string about password reset to have it identical to
other strings with the same meaning.

Simplified via wrapping strings with <span> to split to huge
concatenated strings with a lot of %s everywhere.

== Test plan ==
This patch needs mainly proof reading. Still it's possible to do some
basic testing to demonstrate that adding a <span> in an IF doesn't
break anything.
Pick in one of the 110 modified templates a string that you know how to
display. Otherwise:
1. acquisitions => vendor => basket => add to basket =>
   search "from existing record" => add order
2. Cancel the order
3. You see without issue "Bibliographic record will not be deleted"
4. administration => Patron categories
5. Try to delete a used and unused category
6. You see as expected
   Category XXXX is in use. Deletion not possible!
   and
   Confirm deletion of category XXXX

Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../background_jobs/update_elastic_index.inc  |  2 +-
 .../prog/en/includes/recalls.inc              | 20 ++++----
 .../prog/en/includes/transaction_types.inc    |  4 +-
 .../prog/en/modules/acqui/addorderiso2709.tt  | 20 ++++----
 .../prog/en/modules/acqui/basket.tt           |  8 +--
 .../prog/en/modules/acqui/basketgroup.tt      |  2 +-
 .../prog/en/modules/acqui/cancelorder.tt      |  4 +-
 .../prog/en/modules/acqui/invoices.tt         | 20 ++++----
 .../prog/en/modules/acqui/neworderempty.tt    |  8 +--
 .../prog/en/modules/acqui/transferorder.tt    |  2 +-
 .../en/modules/admin/additional-fields.tt     |  4 +-
 .../prog/en/modules/admin/aqbudgets.tt        |  4 +-
 .../modules/admin/auth_subfields_structure.tt |  8 +--
 .../en/modules/admin/authorised_values.tt     | 12 ++---
 .../prog/en/modules/admin/authtypes.tt        |  6 +--
 .../prog/en/modules/admin/categories.tt       | 12 ++---
 .../prog/en/modules/admin/cities.tt           |  6 +--
 .../prog/en/modules/admin/columns_settings.tt |  8 +--
 .../prog/en/modules/admin/credit_types.tt     |  2 +-
 .../prog/en/modules/admin/debit_types.tt      | 12 ++---
 .../prog/en/modules/admin/itemtypes.tt        |  6 +--
 .../modules/admin/marc_subfields_structure.tt | 26 +++++-----
 .../prog/en/modules/admin/marctagstructure.tt | 12 ++---
 .../en/modules/admin/patron-attr-types.tt     |  8 +--
 .../searchengine/elasticsearch/mappings.tt    | 20 ++++----
 .../prog/en/modules/admin/smart-rules.tt      | 14 +++---
 .../prog/en/modules/admin/smtp_servers.tt     |  2 +-
 .../intranet-tmpl/prog/en/modules/auth.tt     |  2 +-
 .../prog/en/modules/authorities/merge.tt      | 10 ++--
 .../prog/en/modules/basket/sendbasket.tt      |  2 +-
 .../prog/en/modules/catalogue/advsearch.tt    |  8 +--
 .../prog/en/modules/catalogue/detail.tt       | 47 ++++++++---------
 .../prog/en/modules/catalogue/moredetail.tt   | 18 +++----
 .../prog/en/modules/catalogue/results.tt      |  6 +--
 .../en/modules/catalogue/stockrotation.tt     |  8 +--
 .../prog/en/modules/cataloguing/addbooks.tt   | 10 ++--
 .../value_builder/marc21_linking_section.tt   |  4 +-
 .../value_builder/unimarc_field_210c.tt       |  2 +-
 .../value_builder/unimarc_field_4XX.tt        |  4 +-
 .../prog/en/modules/circ/article-requests.tt  |  6 +--
 .../prog/en/modules/circ/branchtransfers.tt   |  6 +--
 .../prog/en/modules/circ/circulation.tt       |  6 +--
 .../prog/en/modules/circ/request-article.tt   | 10 ++--
 .../prog/en/modules/circ/returns.tt           | 16 +++---
 .../prog/en/modules/circ/view_holdsqueue.tt   | 12 ++---
 .../prog/en/modules/clubs/clubs.tt            |  8 +--
 .../course_reserves/add_items-step2.tt        |  4 +-
 .../modules/course_reserves/course-details.tt |  4 +-
 .../prog/en/modules/course_reserves/course.tt |  4 +-
 .../en/modules/labels/label-bib-search.tt     |  2 +-
 .../prog/en/modules/labels/label-print.tt     |  6 +--
 .../en/modules/members/accountline-details.tt |  4 +-
 .../prog/en/modules/members/holdshistory.tt   | 12 ++---
 .../prog/en/modules/members/memberentrygen.tt | 16 +++---
 .../prog/en/modules/members/moremember.tt     | 14 +++---
 .../prog/en/modules/members/notices.tt        | 16 +++---
 .../prog/en/modules/members/paycollect.tt     | 20 ++++----
 .../prog/en/modules/members/routing-lists.tt  |  6 +--
 .../prog/en/modules/patroncards/edit-batch.tt | 11 ++--
 .../en/modules/patroncards/edit-layout.tt     |  8 ++-
 .../prog/en/modules/patroncards/print.tt      |  8 +--
 .../modules/reports/guided_reports_start.tt   | 14 +++---
 .../prog/en/modules/reports/itemslost.tt      |  4 +-
 .../prog/en/modules/reports/serials_stats.tt  |  4 +-
 .../prog/en/modules/reserve/request.tt        | 18 +++----
 .../prog/en/modules/reviews/reviewswaiting.tt |  4 +-
 .../modules/rotating_collections/addItems.tt  | 10 ++--
 .../rotating_collections/editCollections.tt   |  6 +--
 .../prog/en/modules/serials/routing.tt        |  4 +-
 .../en/modules/serials/serials-collection.tt  | 24 ++++-----
 .../en/modules/serials/subscription-detail.tt | 24 ++++-----
 .../prog/en/modules/suggestion/suggestion.tt  | 14 +++---
 .../prog/en/modules/tags/review.tt            | 44 ++++++++--------
 .../en/modules/tools/additional-contents.tt   | 10 ++--
 .../automatic_item_modification_by_age.tt     |  4 +-
 .../en/modules/tools/batch_delete_records.tt  | 12 ++---
 .../tools/batch_record_modification.tt        | 10 ++--
 .../prog/en/modules/tools/csv-profiles.tt     | 18 +++----
 .../prog/en/modules/tools/import_borrowers.tt | 34 ++++++-------
 .../prog/en/modules/tools/inventory.tt        |  8 +--
 .../en/modules/tools/manage-marc-import.tt    | 16 +++---
 .../tools/marc_modification_templates.tt      | 36 ++++++-------
 .../prog/en/modules/tools/upload.tt           |  4 +-
 .../prog/en/modules/tools/viewlog.tt          |  2 +-
 .../en/modules/virtualshelves/sendshelf.tt    |  2 +-
 .../bootstrap/en/includes/holds-table.inc     | 11 ++--
 .../bootstrap/en/includes/masthead.inc        |  4 +-
 .../bootstrap/en/includes/shelfbrowser.inc    |  6 +--
 .../bootstrap/en/modules/maintenance.tt       |  2 +-
 .../en/modules/opac-account-pay-error.tt      |  2 +-
 .../en/modules/opac-addbybiblionumber.tt      |  8 +--
 .../bootstrap/en/modules/opac-advsearch.tt    |  8 +--
 .../en/modules/opac-alert-subscribe.tt        |  4 +-
 .../bootstrap/en/modules/opac-detail.tt       |  4 +-
 .../en/modules/opac-full-serial-issues.tt     | 24 ++++-----
 .../bootstrap/en/modules/opac-holdshistory.tt | 10 ++--
 .../bootstrap/en/modules/opac-library.tt      |  2 +-
 .../bootstrap/en/modules/opac-main.tt         |  8 +--
 .../bootstrap/en/modules/opac-messaging.tt    | 22 ++++----
 .../bootstrap/en/modules/opac-passwd.tt       | 10 ++--
 .../en/modules/opac-password-recovery.tt      | 14 +++---
 .../bootstrap/en/modules/opac-recall.tt       | 16 +++---
 .../bootstrap/en/modules/opac-recalls.tt      | 22 ++++----
 .../bootstrap/en/modules/opac-reserve.tt      | 26 +++++-----
 .../en/modules/opac-reset-password.tt         | 18 +++----
 .../bootstrap/en/modules/opac-sendbasket.tt   |  4 +-
 .../en/modules/opac-serial-issues.tt          | 50 +++++++++----------
 .../bootstrap/en/modules/opac-shelves.tt      | 10 ++--
 .../bootstrap/en/modules/opac-showreviews.tt  |  4 +-
 .../bootstrap/en/modules/opac-suggestions.tt  | 18 +++----
 .../bootstrap/en/modules/opac-tags.tt         | 26 +++++-----
 .../bootstrap/en/modules/opac-user.tt         | 32 ++++++------
 .../bootstrap/en/modules/sco/sco-main.tt      |  4 +-
 .../en/modules/text/explodedterms.tt          |  6 +--
 114 files changed, 641 insertions(+), 632 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_elastic_index.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_elastic_index.inc
index 9386cedcb9..d6f24e89a9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_elastic_index.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_elastic_index.inc
@@ -10,7 +10,7 @@
         [% ELSE %]
             <div class="dialog message">
                 [% report.total_success | html %] / [% report.total_records | html %] records have successfully been reindexed. Some errors occurred.
-                [% IF job.status == 'cancelled' %]The job has been cancelled before it finished.[% END %]
+                [% IF job.status == 'cancelled' %]<span>The job has been cancelled before it finished.</span>[% END %]
             </div>
         [% END %]
     [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc
index 0c007f0285..fa3a7cedea 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc
@@ -55,7 +55,7 @@
                         [% IF ( recall.expiration_date ) %]
                             [% recall.expiration_date | $KohaDates %]
                         [% ELSIF ( !recall.completed ) %]
-                            Never expires
+                            <span>Never expires</span>
                         [% ELSE %]
                             -
                         [% END %]
@@ -67,28 +67,28 @@
 
                     <td class="recall-status">
                         [% IF ( recall.in_transit ) %]
-                            In transit to [% recall.library.branchname | html %]
+                            <span>In transit to [% recall.library.branchname | html %]</span>
                         [% ELSIF ( recall.waiting ) %]
-                            Ready for pickup
+                            <span>Ready for pickup</span>
                         [% ELSIF ( recall.expired ) %]
-                            Expired on [% recall.expiration_date | $KohaDates %]
+                            <span>Expired on [% recall.expiration_date | $KohaDates %]</span>
                         [% ELSIF ( recall.cancelled ) %]
-                            Cancelled on [% recall.completed_date | $KohaDates %]
+                            <span>Cancelled on [% recall.completed_date | $KohaDates %]</span>
                         [% ELSIF ( recall.overdue ) %]
-                            Overdue to be returned
+                            <span>Overdue to be returned</span>
                         [% ELSIF ( recall.fulfilled ) %]
-                            Fulfilled
+                            <span>Fulfilled</span>
                         [% ELSE %]
-                            Requested
+                            <span>Requested</span>
                         [% END %]
                     </td>
 
                     [% UNLESS viewing_old %]
                     <td class="recall-duedate">
                         [% IF recall.requested and recall.checkout %]
-                            Due to be returned by [% recall.checkout.date_due | $KohaDates %]
+                            <span>Due to be returned by [% recall.checkout.date_due | $KohaDates %]</span>
                         [% ELSIF recall.waiting and RECALL.expiration_date %]
-                            Pick up by [% RECALL.expiration_date | $KohaDates %]
+                            <span>Pick up by [% RECALL.expiration_date | $KohaDates %]</span>
                         [% ELSE %]
                             -
                         [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/transaction_types.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/transaction_types.inc
index e71b3fc8ee..9200c8ea6e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/transaction_types.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/transaction_types.inc
@@ -7,7 +7,7 @@
 [% IF payment_types.size > 0 %]
     <li>
         [% IF Koha.Preference('UseCashRegisters') || Koha.Preference('RequirePaymentType') %]
-            <label for="[% type | html %]_type" class="required">[% IF type == 'payment' %]Payment[% ELSE %]Transaction[% END %] type: </label>
+            <label for="[% type | html %]_type" class="required">[% IF type == 'payment' %]<span>Payment type:</span>[% ELSE %]<span>Transaction type:</span>[% END %] </label>
             <select name="[% type | html %]_type" id="[% type | html %]_type" class="required" required="required">
                 <option value="">None selected</option>
                 [% IF type == 'refund' %]
@@ -19,7 +19,7 @@
             </select>
             <span class="required">Required</span>
         [%- ELSE -%]
-            <label for="[% type | html %]_type">[% IF type == 'payment' %]Payment[% ELSE %]Transaction[% END %] type: </label>
+            <label for="[% type | html %]_type">[% IF type == 'payment' %]<span>Payment type:</span>[% ELSE %]<span>Transaction type:</span>[% END %] </label>
             <select name="[% type | html %]_type" id="[% type | html %]_type">
                 <option value="">None selected</option>
                 [% IF type == 'refund' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
index d22111bb6a..c5da4d2c52 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -120,16 +120,16 @@ Batch list
                             <li class="status">
                               <span class="match">
                                 [% IF ( biblio_lis.overlay_status == 'no_match' ) %]
-                                    No match
+                                    <span>No match</span>
                                 [% ELSIF ( biblio_lis.overlay_status == 'match_applied' ) %]
-                                    Match applied
+                                    <span>Match applied</span>
                                 [% ELSIF ( biblio_lis.overlay_status == 'auto_match' ) %]
-                                    Match found
+                                    <span>Match found</span>
                                 [% ELSE %]
                                     [% biblio_lis.overlay_status | html %]
                                 [% END %]
                                 [% IF ( biblio.match_biblionumber ) %]
-                                  Matches biblio [% biblio.match_biblionumber | uri %] (score = [% biblio.match_score | html %]): <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.match_biblionumber | uri %]">[% biblio.match_citation | html %]</a>
+                                  <span>Matches biblio [% biblio.match_biblionumber | uri %]</span> (score = [% biblio.match_score | html %]): <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.match_biblionumber | uri %]">[% biblio.match_citation | html %]</a>
                                 [% END %]
                               </span>
                             </li>
@@ -430,17 +430,17 @@ Batch list
                         <td>[% batch_lis.comments | html %]</td>
                         <td>
                           [% IF ( batch_lis.import_status == 'cleaned' ) %]
-                            Cleaned
+                            <span>Cleaned</span>
                           [% ELSIF ( batch_lis.import_status == 'imported' ) %]
-                            Imported
+                            <span>Imported</span>
                           [% ELSIF ( batch_lis.import_status == 'importing' ) %]
-                            Importing
+                            <span>Importing</span>
                           [% ELSIF ( batch_lis.import_status == 'reverted' ) %]
-                            Reverted
+                            <span>Reverted</span>
                           [% ELSIF ( batch_lis.import_status == 'reverting' ) %]
-                            Reverting
+                            <span>Reverting</span>
                           [% ELSIF ( batch_lis.import_status == 'staged' ) %]
-                            Staged
+                            <span>Staged</span>
                           [% ELSE %]
                             [% batch_lis.import_status | html %]
                           [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index e1ae56b631..9d2687881d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -49,16 +49,16 @@
             <a href="#" aria-current="page">
                 [% UNLESS ( basketno ) %]
                     [% IF ( delete_confirmed ) %]
-                        Deleted
+                        <span>Deleted</span>
                     [% ELSE %]
-                        New
+                        <span>New</span>
                     [% END %]
                 [% END %]
-                Basket [% basketname | html %]
+                <span>Basket [% basketname | html %]
                 [% IF ( basketno ) %]
                     ([% basketno | html %])
                 [% END %]
-                for [% booksellername | html %]
+                for [% booksellername | html %]</span>
             </a>
         </li>
     </ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
index 4cd224ac2e..db725d2b91 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
@@ -293,7 +293,7 @@ fieldset.various li {
                                                             [% IF ( selectedbasket.basketname ) %]
                                                                 [% selectedbasket.basketname | html %]
                                                             [% ELSE %]
-                                                                No name, basketnumber: [% selectedbasket.basketno | html %]
+                                                                <span>No name, basketnumber: [% selectedbasket.basketno | html %]</span>
                                                             [% END %]
                                                         </a>, <br />
                                                         Total: [% selectedbasket.total | $Price %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt
index 7c70c1200e..d40571d3bd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt
@@ -35,9 +35,9 @@
           <h1>Are you sure you want to cancel this order ([% ordernumber | html %])</h1>
           <p>
             [% IF (del_biblio) %]
-              Bibliographic record will be deleted too.
+              <span>Bibliographic record will be deleted too.</span>
             [% ELSE %]
-              Bibliographic record will not be deleted.
+              <span>Bibliographic record will not be deleted.</span>
             [% END %]
           </p>
           <p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
index e54e8e0756..b98c4d02b9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
@@ -85,9 +85,9 @@
                                             <td>[% invoice.receiveditems | html %]</td>
                                             <td>
                                                 [% IF invoice.closedate %]
-                                                    Closed on [% invoice.closedate | $KohaDates %]
+                                                    <span>Closed on [% invoice.closedate | $KohaDates %]</span>
                                                 [% ELSE %]
-                                                    Open
+                                                    <span>Open</span>
                                                 [% END %]
                                             </td>
                                             <td>
@@ -235,12 +235,12 @@
                                 [% END %]
                                 [% IF shipmentdatefrom %]
                                     <li>
-                                        Shipment date:
+                                        <span>Shipment date:</span>
                                         [% IF shipmentdateto %]
-                                            From [% shipmentdatefrom | $KohaDates %]
-                                            To [% shipmentdateto | $KohaDates %]
+                                            <span>From [% shipmentdatefrom | $KohaDates %]</span>
+                                            <span>To [% shipmentdateto | $KohaDates %]</span>
                                         [% ELSE %]
-                                            All since [% shipmentdatefrom | $KohaDates %]
+                                            <span>All since [% shipmentdatefrom | $KohaDates %]</span>
                                         [% END %]
                                     </li>
                                 [% ELSE %]
@@ -253,12 +253,12 @@
                                 [% END %]
                                 [% IF billingdatefrom %]
                                     <li>
-                                        Billing date:
+                                        <span>Billing date:</span>
                                         [% IF billingdateto %]
-                                            From [% billingdatefrom | $KohaDates %]
-                                            To [% billingdateto | $KohaDates %]
+                                            <span>From [% billingdatefrom | $KohaDates %]</span>
+                                            <span>To [% billingdateto | $KohaDates %]</span>
                                         [% ELSE %]
-                                            All since [% billingdatefrom | $KohaDates %]
+                                            <span>All since [% billingdatefrom | $KohaDates %]</span>
                                         [% END %]
                                     </li>
                                 [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index 8f95f312bc..468e93c0a7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -351,10 +351,10 @@
                 [% IF subscription %]
                     <br/>
                     <div class="hint">
-                        Frequency: [% subscription.frequency.description | html %] |
-                        [% IF subscription.numberlength %]Number of issues: [% subscription.numberlength | html %][% END %]
-                        [% IF subscription.weeklength   %]Number of weeks: [% subscription.weeklength | html %][% END %]
-                        [% IF subscription.monthlength  %]Number of months: [% subscription.monthlength | html %][% END %]
+                        <span>Frequency:</span> [% subscription.frequency.description | html %] |
+                        [% IF subscription.numberlength %]<span>Number of issues: [% subscription.numberlength | html %]</span>[% END %]
+                        [% IF subscription.weeklength   %]<span>Number of weeks: [% subscription.weeklength | html %]</span>[% END %]
+                        [% IF subscription.monthlength  %]<span>Number of months: [% subscription.monthlength | html %]</span>[% END %]
                     </div>
                 [% END %]
             </li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
index 92bcb32778..b6442bee42 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
@@ -81,7 +81,7 @@
                             [% IF ( ordersloo.author ) %] by [% ordersloo.author | html %][% END %]
                             [% IF ( ordersloo.isbn ) %] &ndash; [% ordersloo.isbn | html %][% END %]
                             [% IF ( ordersloo.publishercode ) %]
-                                <br />Publisher: [% ordersloo.publishercode | html %]
+                                <br /><span>Publisher: [% ordersloo.publishercode | html %]</span>
                                 [%- IF    ( ordersloo.publicationyear > 0) -%], [% ordersloo.publicationyear | html %]
                                 [%- ELSIF ( ordersloo.copyrightdate   > 0) -%] [% ordersloo.copyrightdate | html %]
                                 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
index 38965080b7..21d968fcd7 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
@@ -109,10 +109,10 @@
         [% END %]
         <ul>
             [% IF CAN_user_acquisition_order_manage %]
-                [% WRAPPER table_option value="aqbasket" %]Order baskets[% END %]
+                [% WRAPPER table_option value="aqbasket" %]<span>Order baskets</span>[% END %]
             [% END %]
             [% IF CAN_user_serials_edit_subscription %]
-                [% WRAPPER table_option value="subscription" %]Subscriptions[% END %]
+                [% WRAPPER table_option value="subscription" %]<span>Subscriptions</span>[% END %]
             [% END %]
         </ul>
         [% ELSE %]
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 bb1b9ff600..71724c4746 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -243,9 +243,9 @@
 [% IF op == 'add_form' && !error_not_authorised_to_modify %]
 <form action="/cgi-bin/koha/admin/aqbudgets.pl" id="edit_fund" name="Aform" method="post">
     <fieldset class="rows">
-        <legend><h1>[% IF ( budget_id ) %]Modify[% ELSE %]Add[% END %] Fund
+        <legend><h1>[% IF ( budget_id ) %]<span>Modify fund</span>[% ELSE %]<span>Add fund</span>[% END %]
     [% IF ( budget_period_description ) %]
-        [% budget_name | html %] for Budget '[% budget_period_description | html %]'
+        [% budget_name | html %] <span>for budget</span> '[% budget_period_description | html %]'
     [% END %]
             </h1>
     </legend>
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 67222253cc..83ab4f28be 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
@@ -338,13 +338,13 @@
             [% ELSE %]
                 <strong>Tab:</strong>[% loo.tab | html %],
                 [% IF ( loo.kohafield ) %] | <strong>Koha field:</strong> [% loo.kohafield | html %], [% END %]
-                [% IF ( loo.repeatable ) %]Repeatable, [% ELSE %]Not repeatable,
+                [% IF ( loo.repeatable ) %]<span>Repeatable</span>, [% ELSE %]<span>Not repeatable</span>,
                 [% END %]
-                        [% IF ( loo.mandatory ) %]Mandatory, [% ELSE %]Not mandatory,
+                        [% IF ( loo.mandatory ) %]<span>Mandatory</span>, [% ELSE %]<span>Not mandatory</span>,
                 [% END %]
-                        [% IF ( loo.hidden ) %]hidden,
+                        [% IF ( loo.hidden ) %]<span>hidden</span>,
                 [% END %]
-                        [% IF ( loo.isurl ) %]is a url,
+                        [% IF ( loo.isurl ) %]<span>is a URL</span>,
                 [% END %]
                         [% IF ( loo.authorised_value ) %] | <strong>Auth value:</strong>[% loo.authorised_value | html %],
                 [% END %]
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 04c7c87731..46653abec4 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
@@ -103,9 +103,9 @@
 
                 [% IF op == 'add_form' %]
                     <h1>
-                        [% IF ( action_modify ) %]Modify authorized value[% END %]
-                        [% IF ( action_add_value ) %]New authorized value[% END %]
-                        [% IF ( action_add_category ) %]New category[% END %]
+                        [% IF ( action_modify ) %]<span>Modify authorized value</span>[% END %]
+                        [% IF ( action_add_value ) %]<span>New authorized value</span>[% END %]
+                        [% IF ( action_add_category ) %]<span>New category</span>[% END %]
                     </h1>
 
                     [% IF ( action_modify ) %]
@@ -352,12 +352,12 @@
                                                     [% END %]
                                                     <span class="library_limitation" title="[% branches_str | html %]">
                                                         [% IF loo.branches.size > 1 %]
-                                                            [% loo.branches.size | html %] library limitations
+                                                            <span>[% loo.branches.size | html %] library limitations</span>
                                                         [% ELSE %]
-                                                            [% loo.branches.size | html %] library limitation
+                                                            <span>[% loo.branches.size | html %] library limitation</span>
                                                         [% END %]
                                                 [% ELSE %]
-                                                    No limitation
+                                                    <span>No limitation</span>
                                                 [% END # /IF loo.branches.size > 0 %]
                                             </td>
                                             <td class="actions"><a href="/cgi-bin/koha/admin/authorised_values.pl?op=add_form&amp;id=[% loo.id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
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 bb4e979402..5df96eda7d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
@@ -35,10 +35,10 @@ Authority types &rsaquo; Administration &rsaquo; Koha
             <li>
                 <a href="#" aria-current="page">
                     [% IF authority_type.authtypecode.defined %]
-                        Modify
+                        <span>Modify authority type</span>
                     [% ELSE %]
-                        New
-                    [% END %] Authority type
+                        <span>New authority type</span>
+                    [% END %]
                 </a>
             </li>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
index ca6ba5c44c..5ed1aba71a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
@@ -431,9 +431,9 @@
             <legend>
                 <h1>
                     [% IF patrons_in_category > 0 %]
-                        Category [% categorycode | html %] is in use.  Deletion not possible!
+                        <span>Category [% categorycode | html %] is in use. Deletion not possible!</span>
                     [% ELSE %]
-                        Confirm deletion of category [% categorycode | html %]
+                        <span>Confirm deletion of category [% categorycode | html %]</span>
                     [% END %]
             </h1>
             </legend>
@@ -618,7 +618,7 @@
                                         [% END %]
                                     [% END %]
                                 [% ELSE %]
-                                    None
+                                    <span>None</span>
                                 [% END %]
                             </td>
                         [% END %]
@@ -635,12 +635,12 @@
                                 [% END %]
                                 <span class="library_limitation" title="[% library_str | html %]">
                                     [% IF library_limits.count > 1 %]
-                                        [% library_limits.count | html %] library limitations
+                                        <span>[% library_limits.count | html %] library limitations</span>
                                     [% ELSE %]
-                                        [% library_limits.count | html %] library limitation
+                                        <span>[% library_limits.count | html %] library limitation</span>
                                     [% END %]
                             [% ELSE %]
-                                No limitation
+                                <span>No limitation</span>
                             [% END %]
                         </td>
                         [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
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 feea946e9e..032f6fe9cb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
@@ -38,10 +38,10 @@
             <li>
                 <a href="#" aria-current="page">
                     [% IF city.cityid %]
-                        Modify
+                        <span>Modify city</span>
                     [% ELSE %]
-                        New
-                    [% END %] City
+                        <span>New city</span>
+                    [% END %]
                 </a>
             </li>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
index 0b4d54ecaa..1a02339635 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
@@ -5,7 +5,7 @@
 [% SET panel_id = 0 %]
 [% BLOCK pagelist %]
     [% IF module.keys and module.keys.size > 0 %]
-        Jump to:
+        <span>Jump to:</span>
         [% FOR pagename IN module.keys.sort %]
             <a href="#[% pagename | url %]">[% pagename | html %]</a>
             [% UNLESS loop.last %]<span class="separator"> | </span>[% END %]
@@ -32,11 +32,11 @@
                                 <table>
                                     <caption>
                                         [% IF tablename == 'currencies-table' %]
-                                            Currency
+                                            <span>Currency</span>
                                         [% ELSIF pagename == 'additem' AND tablename == 'itemst' %]
-                                            Items editor
+                                            <span>Items editor</span>
                                         [% ELSE %]
-                                            Table id: [% tablename | html %]
+                                            <span>Table id: [% tablename | html %]</span>
                                         [% END %]
                                     </caption>
                                     <thead>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt
index 6bdcb18ea4..ff878f994f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt
@@ -108,7 +108,7 @@
                                 <li>
                                     <label for="can_be_added_manually">Can be manually added ? </label>
                                     [% IF credit_type && credit_type.is_system %]
-                                        [% IF credit_type.can_be_added_manually %]Yes[% ELSE %]No[% END %]
+                                        [% IF credit_type.can_be_added_manually %]<span>Yes</span>[% ELSE %]<span>No</span>[% END %]
                                     [% ELSIF credit_type.can_be_added_manually %]
                                         <input type="checkbox" name="can_be_added_manually" id="can_be_added_manually" checked="checked" value="1" />
                                     [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
index 2b3e3fc7ba..ddd960ed26 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
@@ -36,10 +36,10 @@
             <li>
                 <a href="#" aria-current="page">
                     [% IF debit_type.code %]
-                        Modify
+                        <span>Modify debit type</span>
                     [% ELSE %]
-                        New
-                    [% END %] debit type
+                        <span>New debit type</span>
+                    [% END %]
                 </a>
             </li>
 
@@ -189,12 +189,12 @@
                                             [% END %]
                                             <span class="library_limitation" title="[% library_limits_str | html %]">
                                                 [% IF debit_type.library_limits.count > 1 %]
-                                                    [% debit_type.library_limits.count | html %] library limitations
+                                                    <span>[% debit_type.library_limits.count | html %] library limitations</span>
                                                 [% ELSE %]
-                                                    [% debit_type.library_limits.count | html %] library limitation
+                                                    <span>[% debit_type.library_limits.count | html %] library limitation</span>
                                                 [% END %]
                                         [% ELSE %]
-                                            No limitation
+                                            <span>No limitation</span>
                                         [% END %]
                                     </td>
                                     <td class="actions">
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 79763e85e3..1066a8cd2d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
@@ -575,12 +575,12 @@ Item types &rsaquo; Administration &rsaquo; Koha
                     [% END %]
                     <span class="library_limitation" title="[% library_str | html %]">
                         [% IF library_limits.count > 1 %]
-                            [% library_limits.count | html %] library limitations
+                            <span>[% library_limits.count | html %] library limitations</span>
                         [% ELSE %]
-                            [% library_limits.count | html %] library limitation
+                            <span>[% library_limits.count | html %] library limitation</span>
                         [% END %]
                 [% ELSE %]
-                    No limitation
+                    <span>No limitation</span>
                 [% END %]
             </td>
             <td>[% IF ( itemtype.automatic_checkin ) %]Yes[% ELSE %]&nbsp;[% END %]</td>
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 7970d63051..0ee1b7d199 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
@@ -113,7 +113,7 @@
                     [% IF ( add_form ) %]
                         <h1>
                             [% IF ( use_heading_flags_p ) %]
-                                [% IF ( heading_edit_subfields_p ) %]Tag [% tagfield | html %] Subfield constraints[% END %]
+                                [% IF ( heading_edit_subfields_p ) %]<span>Tag</span> [% tagfield | html %] <span>Subfield constraints</span>[% END %]
                             [% ELSE %]
                                 [% action | html %]
                             [% END %]
@@ -398,18 +398,18 @@
                                             [% IF loo.tab == -1 %]
                                                 <em>subfield ignored</em>
                                             [% ELSE %]
-                                                Tab:[% loo.tab | html %],
-                                                [% IF ( loo.kohafield ) %] | Koha field: [% loo.kohafield | html %], [% END %]
-                                                [% IF ( loo.repeatable ) %]Repeatable, [% ELSE %]Not repeatable,[% END %]
-                                                [% IF ( loo.mandatory ) %]Mandatory, [% ELSE %]Not mandatory,[% END %]
-                                                [% IF ( loo.important ) %]Important, [% ELSE %]Not important,[% END %]
-                                                [% IF ( loo.seealso ) %] | See also: [% loo.seealso | html %],[% END %]
-                                                [% IF ( loo.hidden ) %]hidden,[% END %]
-                                                [% IF ( loo.isurl ) %]is a URL,[% END %]
-                                                [% IF ( loo.authorised_value ) %] | Auth value:[% loo.authorised_value | html %],[% END %]
-                                                [% IF ( loo.authtypecode ) %] | Authority:[% loo.authtypecode | html %],[% END %]
-                                                [% IF ( loo.value_builder ) %] | Plugin:[% loo.value_builder | html %],[% END %]
-                                                [% IF ( loo.link ) %] | Link:[% loo.link | html %],[% END %]
+                                                <span>Tab:</span>[% loo.tab | html %],
+                                                [% IF ( loo.kohafield ) %] | <span>Koha field:</span> [% loo.kohafield | html %], [% END %]
+                                                [% IF ( loo.repeatable ) %]<span>Repeatable</span>, [% ELSE %]<span>Not repeatable</span>,[% END %]
+                                                [% IF ( loo.mandatory ) %]<span>Mandatory</span>, [% ELSE %]<span>Not mandatory</span>,[% END %]
+                                                [% IF ( loo.important ) %]<span>Important</span>, [% ELSE %]<span>Not important</span>,[% END %]
+                                                [% IF ( loo.seealso ) %] | <span>See also:</span> [% loo.seealso | html %],[% END %]
+                                                [% IF ( loo.hidden ) %]<span>hidden</span>,[% END %]
+                                                [% IF ( loo.isurl ) %]<span>is a URL</span>,[% END %]
+                                                [% IF ( loo.authorised_value ) %] | <span>Auth value:</span>[% loo.authorised_value | html %],[% END %]
+                                                [% IF ( loo.authtypecode ) %] | <span>Authority:</span>[% loo.authtypecode | html %],[% END %]
+                                                [% IF ( loo.value_builder ) %] | <span>Plugin:</span>[% loo.value_builder | html %],[% END %]
+                                                [% IF ( loo.link ) %] | <span>Link:</span>[% loo.link | html %],[% END %]
                                             [% END %]
                                         </td>
                                         <td class="actions">
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 e73c986d33..94dd186424 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
@@ -50,9 +50,9 @@ MARC frameworks &rsaquo; Administration &rsaquo; Koha
             <li>
                 <a href="#" aria-current="page">
                     [% IF heading_add_tag_p %]
-                        Add tag
+                        <span>Add tag</span>
                     [% ELSE %]
-                        Modify tag
+                        <span>Modify tag</span>
                     [% END %] [% searchfield | html %]
                 </a>
             </li>
@@ -122,9 +122,9 @@ MARC frameworks &rsaquo; Administration &rsaquo; Koha
       <fieldset class="rows">
             <legend>
                 [% IF heading_add_tag_p %]
-                    Add tag
+                    <span>Add tag</span>
                 [% ELSE %]
-                    Modify tag <input type="hidden" name="modif" value="1" />[% searchfield | html %]
+                    <span>Modify tag</span> <input type="hidden" name="modif" value="1" />[% searchfield | html %]
                 [% END %]
             </legend>
             <input type="hidden" name="op" value="add_validate" />
@@ -276,8 +276,8 @@ MARC frameworks &rsaquo; Administration &rsaquo; Koha
             [% IF ( select_display ) %]
                 [% FOREACH subfield IN loo.subfields %]
                     <p>
-                        Tab:[% subfield.tab | html %] | $[% subfield.tagsubfield | html %]
-                        [% subfield.liblibrarian | html %] [% IF ( subfield.kohafield ) %][% subfield.kohafield | html %][% END %][% IF ( subfield.repeatable ) %], repeatable[% END %][% IF ( subfield.mandatory ) %], Mandatory[% END %][% IF ( subfield.seealso ) %], See [% subfield.seealso | html %][% END %][% IF ( subfield.authorised_value ) %], [% subfield.authorised_value | html %][% END %][% IF ( subfield.authtypecode ) %], [% subfield.authtypecode | html %][% END %][% IF ( subfield.value_builder ) %], [% subfield.value_builder | html %][% END %]
+                        <span>Tab:[% subfield.tab | html %]</span> | $[% subfield.tagsubfield | html %]
+                        [% subfield.liblibrarian | html %] [% IF ( subfield.kohafield ) %][% subfield.kohafield | html %][% END %][% IF ( subfield.repeatable ) %], <span>repeatable</span>[% END %][% IF ( subfield.mandatory ) %], <span>Mandatory</span>[% END %][% IF ( subfield.seealso ) %], <span>See [% subfield.seealso | html %]</span>[% END %][% IF ( subfield.authorised_value ) %], [% subfield.authorised_value | html %][% END %][% IF ( subfield.authtypecode ) %], [% subfield.authtypecode | html %][% END %][% IF ( subfield.value_builder ) %], [% subfield.value_builder | html %][% END %]
                     </p>
                 [% END %]
             [% END %]
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 4535f1a351..6733c3a663 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
@@ -317,9 +317,9 @@ Patron attribute types &rsaquo; Administration &rsaquo; Koha
                     [% END %]
                     <span title="[% branches_str | html %]">
                         [% IF libraries.count > 1 %]
-                            [% libraries.count | html %] library limitations
+                            <span>[% libraries.count | html %] library limitations</span>
                         [% ELSE %]
-                            [% libraries.count | html %] library limitation
+                            <span>[% libraries.count | html %] library limitation</span>
                         [% END %]
                     </span>
                 [% ELSE %]
@@ -334,9 +334,9 @@ Patron attribute types &rsaquo; Administration &rsaquo; Koha
                 [% END %]
             <td>
                 [% IF ( item.mandatory ) -%]
-                   Yes
+                   <span>Yes</span>
                 [% ELSE -%]
-                   No
+                   <span>No</span>
                 [% END %]
             </td>
             <td class="actions">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
index edfe3ec66f..05f3da43d2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
@@ -442,16 +442,16 @@ a.add, a.delete {
                                                 </td>
                                                 <td>
                                                     [% SWITCH f.name %]
-                                                    [% CASE 'author' %]Authors
-                                                    [% CASE 'itype' %]Item types
-                                                    [% CASE 'location' %]Locations
-                                                    [% CASE 'su-geo' %]Places
-                                                    [% CASE 'title-series' %]Series
-                                                    [% CASE 'subject' %]Topics
-                                                    [% CASE 'ccode' %]Collections
-                                                    [% CASE 'holdingbranch' %]Holding libraries
-                                                    [% CASE 'homebranch' %]Home libraries
-                                                    [% CASE 'ln' %]Language
+                                                    [% CASE 'author' %]<span>Authors</span>
+                                                    [% CASE 'itype' %]<span>Item types</span>
+                                                    [% CASE 'location' %]<span>Locations</span>
+                                                    [% CASE 'su-geo' %]<span>Places</span>
+                                                    [% CASE 'title-series' %]<span>Series</span>
+                                                    [% CASE 'subject' %]<span>Topics</span>
+                                                    [% CASE 'ccode' %]<span>Collections</span>
+                                                    [% CASE 'holdingbranch' %]<span>Holding libraries</span>
+                                                    [% CASE 'homebranch' %]<span>Home libraries</span>
+                                                    [% CASE 'ln' %]<span>Language</span>
                                                     [% CASE %][% f | html %]
                                                     [% END %]
                                                 </td>
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 62e2f5639a..5c6c0e6a88 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
@@ -253,11 +253,11 @@
                                     </td>
                                     <td>
                                         [% IF ( lengthunit == 'days' ) %]
-                                            Days
+                                            <span>Days</span>
                                         [% ELSIF ( lengthunit == 'hours') %]
-                                            Hours
+                                            <span>Hours</span>
                                         [% ELSE %]
-                                            Undefined
+                                            <span>Undefined</span>
                                         [% END %]
                                     </td>
                                     <td>
@@ -1006,13 +1006,13 @@
                                 <option value="*">
                             [% END %]
                               [% IF defaultRefundRule == 'refund' %]
-                                Use default (Refund lost item charge)
+                                <span>Use default (Refund lost item charge)</span>
                               [% ELSIF defaultRefundRule == 'charge' %]
-                                Use default (Refund lost item charge and restore overdue fine)
+                                <span>Use default (Refund lost item charge and restore overdue fine)</span>
                               [% ELSIF defaultRefundRule == 'restore' %]
-                                Use default (Refund lost item charge and charge new overdue fine)
+                                <span>Use default (Refund lost item charge and charge new overdue fine)</span>
                               [% ELSE %]
-                                Use default (Leave lost item charge)
+                                <span>Use default (Leave lost item charge)</span>
                               [% END %]
                                 </option>
                             [% IF ( not refundLostItemFeeRule ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
index 7a39d63ed1..ae78a07dad 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
@@ -240,7 +240,7 @@
             <li><strong>Host</strong>: [%- default_config.host | html -%]</li>
             <li><strong>Port</strong>: [%- default_config.port | html -%]</li>
             <li><strong>Timeout (secs)</strong>: [%- default_config.timeout | html -%]</li>
-            <li><strong>SSL</strong>: [%- IF default_config.ssl_mode == 'disabled' -%]Disabled[%- ELSIF default_config.ssl_mode == 'ssl' -%]SSL[%- ELSE -%]STARTTLS[%- END -%]</li>
+            <li><strong>SSL</strong>: [%- IF default_config.ssl_mode == 'disabled' -%]<span>Disabled</span>[%- ELSIF default_config.ssl_mode == 'ssl' -%]<span>SSL</span>[%- ELSE -%]<span>STARTTLS</span>[%- END -%]</li>
             <li><strong>Debug mode</strong>: [%- IF default_config.debug -%]Yes[%- ELSE -%]No[%- END -%]</li>
         </ul>
     </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
index 1306f6a1e5..47e135312c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
@@ -57,7 +57,7 @@
     [% ELSIF Categories.can_any_reset_password && Koha.Preference('OpacBaseURL') %]
         <a href="[% Koha.Preference('OpacBaseURL') | url %]/cgi-bin/koha/opac-password-recovery.pl">You must reset your password</a>.
     [% ELSE %]
-        <p>You must contact the library to have your password reset</p>
+        <p>You must contact the library to reset your password</p>
     [% END %]
 [% ELSIF invalid_username_or_password %]
 <div id="login_error"><strong>Error: </strong>Invalid username or password</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
index 60d60e5026..80e0e71562 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
@@ -44,15 +44,15 @@ div#result { margin-top: 1em; }
     [% FOREACH error IN errors %]
         <div class="dialog alert">
             [% IF error.code == 'WRONG_COUNT' %]
-                Number of records provided for merging: [% error.value | html %]. Currently only 2 records can be merged at a time.
+                <span>Number of records provided for merging: [% error.value | html %]. Currently only 2 records can be merged at a time.</span>
             [% ELSIF error.code == 'DESTRUCTIVE_MERGE' %]
-                You cannot merge a record with itself. Please select two different authorities.
+                <span>You cannot merge a record with itself. Please select two different authorities.</span>
             [% ELSIF error.code == 'WRONG_FRAMEWORK' %]
-                The default framework cannot be used, or the framework does not exist. Please select another framework for merging.
+                <span>The default framework cannot be used, or the framework does not exist. Please select another framework for merging.</span>
             [% ELSIF error.code == 'EMPTY_MARC' %]
-                Sorry, but we did not find any MARC tags in the reference record.
+                <span>Sorry, but we did not find any MARC tags in the reference record.</span>
             [% ELSIF error.code == 'MISSING_RECORD' %]
-                Sorry, but we did not find a record for number: [% error.value | html %].
+                <span>Sorry, but we did not find a record for number: [% error.value | html %].</span>
             [% ELSE %]
                 [% error | html %]
             [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt
index 6af47706d0..a39f377914 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt
@@ -38,7 +38,7 @@ Your cart
 
             <p>
             [% IF ( BIBLIO_RESULT.HASAUTHORS ) %]
-            <span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author | $raw %][% END %]
+            <span><span>Author(s):</span> [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author | $raw %][% END %]
 
             [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %]
                 [% IF ( BIBLIO_RESULT.author ) %]; [% END %]
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 65215c6dd3..29808258d1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
@@ -182,10 +182,10 @@
                         [% FOREACH advsearchloo IN advancedsearchesloop %]
                             <li role="presentation" id="advsearch-tab-[% advsearchloo.advanced_search_type | html %]">
                                 <a href="#advsearch-[% advsearchloo.advanced_search_type | uri %]" aria-controls="advsearch-[% advsearchloo.advanced_search_type | uri %]" role="tab" data-toggle="tab">
-                                    [% IF ( advsearchloo.advanced_search_type == 'itemtypes' ) %]Item type
-                                    [% ELSIF ( advsearchloo.advanced_search_type == 'ccode' ) %]Collection
-                                    [% ELSIF ( advsearchloo.advanced_search_type == 'loc' ) %]Shelving location
-                                    [% ELSE %]Something else
+                                    [% IF ( advsearchloo.advanced_search_type == 'itemtypes' ) %]<span>Item type</span>
+                                    [% ELSIF ( advsearchloo.advanced_search_type == 'ccode' ) %]<span>Collection</span>
+                                    [% ELSIF ( advsearchloo.advanced_search_type == 'loc' ) %]<span>Shelving location</span>
+                                    [% ELSE %]<span>Something else</span>
                                     [% END %]
                                 </a>
                             </li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 905fd07bd3..917a7ef246 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -516,14 +516,15 @@ Note that permanent location is a code, and location may be an authval.
 
                         [% IF item.recalled %]
                             [% IF item.recall.waiting_date %]
-                                Waiting at [% Branches.GetName( item.recall.pickup_library_id ) | html %] since [% item.recall.waiting_date | $KohaDates %]
+                                <span>Waiting at [% Branches.GetName( item.recall.pickup_library_id ) | html %] since [% item.recall.waiting_date | $KohaDates %]</span>
                             [% ELSE %]
-                                Item recalled by <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.recall.patron_id | uri %]">[% item.recall.patron.firstname | html %] [% item.recall.patron.surname | html %] ([% item.recall.patron.cardnumber | html %])</a> on [% item.recall.created_date | $KohaDates %]
+                                [% patron_link = BLOCK %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.recall.patron_id | uri %]">[% item.recall.patron.firstname | html %] [% item.recall.patron.surname | html %] ([% item.recall.patron.cardnumber | html %])</a>[% END %]
+                                <span>Item recalled by [% patron_link| $raw %] on [% item.recall.created_date | $KohaDates %]</span>
                             [% END %]
                         [% END %]
 
                         [% UNLESS ( item.itemnotforloan || item.notforloan_per_itemtype || item.onloan || item.itemlost || item.withdrawn || item.damaged || item.transfertwhen || hold || item.recalled ) %]
-                            Available
+                            <span>Available</span>
                         [% END %]
 
                         [% IF ( item.restricted ) %]
@@ -744,18 +745,18 @@ Note that permanent location is a code, and location may be an authval.
                     <td data-order="[% latestserial.planneddate | html %]">[% latestserial.planneddate | $KohaDates %]</td>
                     <td data-order="[% latestserial.publisheddate | html %]">[% latestserial.publisheddate | $KohaDates %]</td>
                     <td>
-                      [% IF ( latestserial.status1 ) %]Expected[% END %]
-                      [% IF ( latestserial.status2 ) %]Arrived[% END %]
-                      [% IF ( latestserial.status3 ) %]Late[% END %]
-                      [% IF ( latestserial.status4 ) %]Missing[% END %]
-                      [% IF ( latestserial.status41 ) %]Missing (never received)[% END %]
-                      [% IF ( latestserial.status42 ) %]Missing (sold out)[% END %]
-                      [% IF ( latestserial.status43 ) %]Missing (damaged)[% END %]
-                      [% IF ( latestserial.status44 ) %]Missing (lost)[% END %]
-                      [% IF ( latestserial.status5 ) %]Not issued[% END %]
-                      [% IF ( latestserial.status6 ) %]Delete[% END %]
-                      [% IF ( latestserial.status7 ) %]Claimed[% END %]
-                      [% IF ( latestserial.status8 ) %]Stopped[% END %]
+                      [% IF ( latestserial.status1 ) %]<span>Expected</span>[% END %]
+                      [% IF ( latestserial.status2 ) %]<span>Arrived</span>[% END %]
+                      [% IF ( latestserial.status3 ) %]<span>Late</span>[% END %]
+                      [% IF ( latestserial.status4 ) %]<span>Missing</span>[% END %]
+                      [% IF ( latestserial.status41 ) %]<span>Missing (never received)</span>[% END %]
+                      [% IF ( latestserial.status42 ) %]<span>Missing (sold out)</span>[% END %]
+                      [% IF ( latestserial.status43 ) %]<span>Missing (damaged)</span>[% END %]
+                      [% IF ( latestserial.status44 ) %]<span>Missing (lost)</span>[% END %]
+                      [% IF ( latestserial.status5 ) %]<span>Not issued</span>[% END %]
+                      [% IF ( latestserial.status6 ) %]<span>Delete</span>[% END %]
+                      [% IF ( latestserial.status7 ) %]<span>Claimed</span>[% END %]
+                      [% IF ( latestserial.status8 ) %]<span>Stopped</span>[% END %]
                     </td>
                     <td>[% latestserial.notes | html %]</td>
                 </tr>
@@ -907,15 +908,15 @@ Note that permanent location is a code, and location may be an authval.
                         [% suggestion.fund.budget_name | html %]
                     </td>
                     <td>
-                        [% IF    suggestion.STATUS == 'ASKED'     %]Pending
-                        [% ELSIF suggestion.STATUS == 'ACCEPTED'  %]Accepted
-                        [% ELSIF suggestion.STATUS == 'ORDERED'   %]Ordered
-                        [% ELSIF suggestion.STATUS == 'REJECTED'  %]Rejected
-                        [% ELSIF suggestion.STATUS == 'CHECKED'   %]Checked
-                        [% ELSIF suggestion.STATUS == 'AVAILABLE' %]Available
+                        [% IF    suggestion.STATUS == 'ASKED'     %]<span>Pending</span>
+                        [% ELSIF suggestion.STATUS == 'ACCEPTED'  %]<span>Accepted</span>
+                        [% ELSIF suggestion.STATUS == 'ORDERED'   %]<span>Ordered</span>
+                        [% ELSIF suggestion.STATUS == 'REJECTED'  %]<span>Rejected</span>
+                        [% ELSIF suggestion.STATUS == 'CHECKED'   %]<span>Checked</span>
+                        [% ELSIF suggestion.STATUS == 'AVAILABLE' %]<span>Available</span>
                         [% ELSIF AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestion.STATUS ) %]
                             [% AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestion.STATUS ) | html %]
-                        [% ELSE %]Status unknown
+                        [% ELSE %]<span>Status unknown</span>
                         [% END %]
                         [% IF suggestion.reason %]
                             <br />([% suggestion.reason | html %])
@@ -933,7 +934,7 @@ Note that permanent location is a code, and location may be an authval.
 <table>
 [% FOREACH XISBN IN XISBNS %]<tr>[% IF ( AmazonCoverImages ) %]<td><a href="http://www.amazon.com/gp/reader/[% XISBN.normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link"><img src="https://images-na.ssl-images-amazon.com/images/P/[% XISBN.normalized_isbn | html %].01._AA75_PU_PU-5_.jpg" /></a></td>[% END %]
 [% IF ( !item_level_itypes || Koha.Preference('BiblioItemtypeInfo') ) %]<td>[% IF ( noItemTypeImages ) %][% XISBN.description | html %][% ELSE %]<img src="[% XISBN.imageurl | html %]" alt="[% XISBN.description | html %]" title="[% XISBN.description | html %]">[% END %]</td>[% END %]
-<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% XISBN.biblionumber | uri %]">[% XISBN.title | html %]</a> by [% XISBN.author | html %] &copy;[% XISBN.copyrightdate | html %]
+<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% XISBN.biblionumber | uri %]">[% XISBN.title | html %]</a> <span>by</span> [% XISBN.author | html %] &copy;[% XISBN.copyrightdate | html %]
   [% IF ( XISBN.publishercode ) %]
 [% XISBN.publishercode | html %] [% IF ( XISBN.place ) %]([% XISBN.place | html %])[% END %] [% IF ( XISBN.publicationyear ) %], [% XISBN.publicationyear | html %][% END %] [% IF ( XISBN.editionstatement ) %][% XISBN.editionstatement | html %][% END %] [% IF ( XISBN.editionresponsibility ) %][% XISBN.editionresponsibility | html %][% END %]
     [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
index 6db25bb690..3e0794311a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
@@ -108,26 +108,26 @@
             [% IF ( ITEM_DAT.replacementprice ) %]<li><span class="label">Replacement price:</span> [% ITEM_DAT.replacementprice | $Price %]&nbsp;</li> [% END %]
 	    [% IF ITEM_DAT.materials %]<li><span class="label">Materials specified:</span> [% ITEM_DAT.materials | html %] </li> [% END %]
             </ol></div></div>
-           <div class="listgroup"><h4>Statuses [% IF ( ITEM_DAT.status_advisory ) %](
+           <div class="listgroup"><h4><span>Statuses</span> [% IF ( ITEM_DAT.status_advisory ) %](
                 [% IF ( ITEM_DAT.notforloantext ) %][% ITEM_DAT.notforloantext | html %] [% END %]
-                [% IF ( ITEM_DAT.itemlost ) %]Lost[% END %]
-                [% IF ( ITEM_DAT.damaged ) %]Damaged[% END %]
-                [% IF ( ITEM_DAT.withdrawn ) %]Withdrawn[% END %]
+                [% IF ( ITEM_DAT.itemlost ) %]<span>Lost</span>[% END %]
+                [% IF ( ITEM_DAT.damaged ) %]<span>Damaged</span>[% END %]
+                [% IF ( ITEM_DAT.withdrawn ) %]<span>Withdrawn</span>[% END %]
             )[% END %]</h4>
 
             <div class="rows">
             <ol class="bibliodetails">
             <li><span class="label">Current library:</span> [% Branches.GetName( ITEM_DAT.holdingbranch ) | html %]&nbsp;</li>
             <li><span class="label">Checkout status:</span>
-            [% IF ( ITEM_DAT.issue ) %]Checked out to
-                [% INCLUDE 'patron-title.inc' patron => ITEM_DAT.patron hide_patron_infos_if_needed=1 %]
+            [% IF ( ITEM_DAT.issue ) %]<span>Checked out to
+                [% INCLUDE 'patron-title.inc' patron => ITEM_DAT.patron hide_patron_infos_if_needed=1 %]</span>
                 [% IF ( ITEM_DAT.lastreneweddate ) %]
-                    Last renewed [% ITEM_DAT.lastreneweddate | $KohaDates %],
+                    <span>Last renewed [% ITEM_DAT.lastreneweddate | $KohaDates %]</span>,
                 [% END %]
                 [% IF ( ITEM_DAT.datedue ) %]
-                    Due back on [% ITEM_DAT.datedue | $KohaDates %]
+                    <span>Due back on [% ITEM_DAT.datedue | $KohaDates %]</span>
                 [% ELSE %]
-                    Not checked out
+                    <span>Not checked out</span>
                 [% END %]
             [% END %]
             &nbsp;</li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index 0e550fd353..50f24e05f9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -570,7 +570,7 @@
                                                                 <span class="blocker inaccurate-item-statuses" title="Item statuses may be inaccurate. Please view the record details for accurate item statuses">
                                                             [% END %]
 
-                                                            [% tnx('{count} item', '{count} items', SEARCH_RESULT.items_count, {count = SEARCH_RESULT.items_count}) | html %][% IF ( SEARCH_RESULT.availablecount ) %], [% SEARCH_RESULT.availablecount | html %] available:[% ELSE %], None available[% END %]
+                                                            [% tnx('{count} item', '{count} items', SEARCH_RESULT.items_count, {count = SEARCH_RESULT.items_count}) | html %][% IF ( SEARCH_RESULT.availablecount ) %], [% SEARCH_RESULT.availablecount | html %] <span>available:</span>[% ELSE %], <span>None available</span>[% END %]
 
                                                             [% IF MaxSearchResultsItemsPerRecordStatusCheck && SEARCH_RESULT.items_count > MaxSearchResultsItemsPerRecordStatusCheck %]
                                                                 </span>
@@ -618,10 +618,10 @@
                                                                                     ([% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.damaged', authorised_value => items_loo.damaged ) | html %])
                                                                                 [% END %]
                                                                                 [% IF ( items_loo.intransit ) %]
-                                                                                    (In transit)
+                                                                                    (<span>In transit</span>)
                                                                                 [% END %]
                                                                                 [% IF ( items_loo.onhold ) %]
-                                                                                    (On hold)
+                                                                                    (<span>On hold</span>)
                                                                                 [% END %]
                                                                                 [% IF ( items_loo.notforloan ) %]
                                                                                     [% items_loo.notforloan | html %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
index a081592272..25c74f9fcf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
@@ -68,9 +68,9 @@
                                         <span class="highlighted-row">
                                     [% END %]
                                         [% IF item.rota.active %]
-                                            Active
+                                            <span>Active</span>
                                         [% ELSE %]
-                                            Inactive
+                                            <span>Inactive</span>
                                         [% END %]
                                     [% IF !item.rota.active %]
                                         </span>
@@ -79,9 +79,9 @@
                             </td>
                             <td>
                                 [% IF item.bib_item.get_transfer %]
-                                    Yes
+                                    <span>Yes</span>
                                 [% ELSE %]
-                                    No
+                                    <span>No</span>
                                 [% END %]
                             </td>
                             <td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
index adf125d512..126e49e524 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
@@ -151,11 +151,11 @@
                                             </span>
                                         [% END %]
                                         <span class="unavailable">
-                                            [% IF ( resultsloo.onloancount ) %] Checked out ([% resultsloo.onloancount | html %]),<br /> [% END %]
-                                            [% IF ( resultsloo.withdrawncount ) %] Withdrawn ([% resultsloo.withdrawncount | html %]),<br /> [% END %]
-                                            [% IF ( resultsloo.itemlostcount ) %] Lost ([% resultsloo.itemlostcount | html %])<br />[% END %]
-                                            [% IF ( resultsloo.recalledcount ) %] Waiting to fill recall ([% resultsloo.recalled | html %])[% END %]
-                                            [% IF ( resultsloo.onholdcount ) %] Waiting on hold ([% resultsloo.onholdcount | html %])[% END %]
+                                            [% IF ( resultsloo.onloancount ) %] <span>Checked out ([% resultsloo.onloancount | html %])</span>,<br /> [% END %]
+                                            [% IF ( resultsloo.withdrawncount ) %] <span>Withdrawn ([% resultsloo.withdrawncount | html %])</span>,<br /> [% END %]
+                                            [% IF ( resultsloo.itemlostcount ) %] <span>Lost ([% resultsloo.itemlostcount | html %])</span><br />[% END %]
+                                            [% IF ( resultsloo.recalledcount ) %] <span>Waiting to fill recall ([% resultsloo.recalled | html %])</span>[% END %]
+                                            [% IF ( resultsloo.onholdcount ) %] <span>Waiting on hold ([% resultsloo.onholdcount | html %])</span>[% END %]
                                         </span>
                                         <span class="notforloan">
                                             [% IF ( resultsloo.other_items_loop ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt
index 9555d29856..62fa53f9c0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt
@@ -54,8 +54,8 @@
                                   <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=marc21_linking_section.pl&amp;index=[% index | html %]&amp;startfrom=[% startfromnext | html %]&amp;search=[% search | html %]&amp;resultsperpage=[% resultsperpage | html %]&amp;type=intranet&amp;op=do_search">Next&gt;&gt;</a>
                                 [% END %]</p>
                   <p class="resultcount">
-                          [% IF ( total ) %]Results [% from | html %] to [% to | html %] of [% total | html %]
-                          [% ELSE %]No results found
+                          [% IF ( total ) %]<span>Results [% from | html %] to [% to | html %] of [% total | html %]</span>
+                          [% ELSE %]<span>No results found</span>
                           [% END %]</p></div>
             <div id="resultlist">
                   <table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt
index 8af5f2ce91..480177d966 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt
@@ -50,7 +50,7 @@
                 [% IF ( total ) %]
                     &nbsp;<strong>Results [% from | html %] to [% to | html %] of [% total | html %]</strong><br /><br />
                 [% ELSE %]
-                    &nbsp; No results found<br />
+                    &nbsp; <span>No results found</span><br />
                 [% END %]
             </p>
 [% IF ( total ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt
index 43e862ede4..dcf404d0e3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt
@@ -52,8 +52,8 @@
                                   <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=[% index | html %]&amp;startfrom=[% startfromnext | html %]&amp;search=[% search |uri %]&amp;resultsperpage=[% resultsperpage | html %]&amp;type=intranet&amp;op=do_search">Next&gt;&gt;</a>
                                 [% END %]</p>
 			<p class="resultcount">
-                          [% IF ( total ) %]Results [% from | html %] to [% to | html %] of [% total | html %]
-                          [% ELSE %]No results found
+                          [% IF ( total ) %]<span>Results [% from | html %] to [% to | html %] of [% total | html %]</span>
+                          [% ELSE %]<span>No results found</span>
                           [% END %]</p></div>
 		<div id="resultlist">
 			<table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
index 562854249e..d453a7de33 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
@@ -247,7 +247,7 @@
                                                         [% r.biblio.biblioitem.size | html %]
 
                                                         [% IF ar.biblio.biblioitem.isbn %]
-                                                            ISBN: [% ar.biblio.biblioitem.isbn | html %]
+                                                            <span>ISBN: [% ar.biblio.biblioitem.isbn | html %]</span>
                                                         [% END %]
                                                     </div>
                                                 </p>
@@ -354,7 +354,7 @@
                                                         [% r.biblio.biblioitem.size | html %]
 
                                                         [% IF ar.biblio.biblioitem.isbn %]
-                                                            ISBN: [% ar.biblio.biblioitem.isbn | html %]
+                                                            <span>ISBN: [% ar.biblio.biblioitem.isbn | html %]</span>
                                                         [% END %]
                                                     </div>
                                                 </p>
@@ -458,7 +458,7 @@
                                                         [% r.biblio.biblioitem.size | html %]
 
                                                         [% IF ar.biblio.biblioitem.isbn %]
-                                                            ISBN: [% ar.biblio.biblioitem.isbn | html %]
+                                                            <span>ISBN: [% ar.biblio.biblioitem.isbn | html %]</span>
                                                         [% END %]
                                                     </div>
                                                 </p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
index 267cb064e2..563aee1a32 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
@@ -42,13 +42,13 @@
     <table>
         <caption>
             [% IF ( reserved ) %]
-                Hold found for [% INCLUDE 'patron-title.inc' patron => hold.patron | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
+                <span>Hold found for [% INCLUDE 'patron-title.inc' patron => hold.patron | html %]</span> (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
             [% END %]
             [% IF ( waiting ) %]
-                Item is marked waiting at [% branchname | html %] for [% name | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
+                <span>Item is marked waiting at [% branchname | html %] for [% name | html %]</span> (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
             [% END %]
             [% IF ( transferred ) %]
-                Item has been trapped to fill a hold and is in transit for [% name | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
+                <span>Item has been trapped to fill a hold and is in transit for [% name | html %]</span> (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
             [% END %]
         </caption>
         <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index a000d35d52..4947def9f3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -186,13 +186,13 @@
                                 [% IF ( NOT_FOR_LOAN_FORCING ) %]
                                     <li>
                                     [% IF ( itemtype_notforloan ) %]
-                                        Item type is normally not for loan.
+                                        <span>Item type is normally not for loan.</span>
                                     [% ELSIF ( item_notforloan ) %]
                                         [% item_notforloan_lib = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => item.notforloan ) %]
-                                        Item is normally not for loan[% IF (item_notforloan_lib) %] ([% item_notforloan_lib | html %])[% END %].
+                                        <span>Item is normally not for loan</span>[% IF (item_notforloan_lib) %] ([% item_notforloan_lib | html %])[% END %].
                                     [% END %]
                                         [% IF CAN_user_circulate_force_checkout %]
-                                            Check out anyway?
+                                            <span>Check out anyway?</span>
                                         [% END %]
                                     </li>
                                 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
index 243f6e068b..c94c19178d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
@@ -306,15 +306,15 @@
                                         </td>
                                         <td>
                                             [% IF ar.status == 'PENDING' %]
-                                                Pending
+                                                <span>Pending</span>
                                             [% ELSIF ar.status == 'PROCESSING' %]
-                                                Processing
+                                                <span>Processing</span>
                                             [% ELSIF ar.status == 'REQUESTED' %]
-                                                New
+                                                <span>New</span>
                                             [% ELSIF ar.status == 'COMPLETED' %]
-                                                Completed
+                                                <span>Completed</span>
                                             [% ELSIF ar.status == 'CANCELED' %]
-                                                Canceled
+                                                <span>Canceled</span>
                                             [% END %]
                                         </td>
                                         <td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index ab184328ea..ba867c8cc4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -10,11 +10,11 @@
 [% SET footerjs = 1 %]
 [% BLOCK display_bormessagepref %]
     [% IF ( bormessagepref ) %]
-        <li class="notification_method">Patron notification:
+        <li class="notification_method"><span>Patron notification:</span>
             [% FOREACH mtt IN bormessagepref.keys %]
-                [%~ IF ( mtt == 'email' ) %] Email[% END ~%]
-                [%~ IF ( mtt == 'phone' ) %] Phone[% END ~%]
-                [%~ IF ( mtt == 'sms' ) %] SMS[% END ~%]
+                [%~ IF ( mtt == 'email' ) %] <span>Email</span>[% END ~%]
+                [%~ IF ( mtt == 'phone' ) %] <span>Phone</span>[% END ~%]
+                [%~ IF ( mtt == 'sms' ) %] <span>SMS</span>[% END ~%]
                 [%~ UNLESS loop.last %], [% ELSE %].[% END ~%]
             [% END %]
         </li>
@@ -249,18 +249,18 @@
                                         [% IF ( errmsgloo.ItemLocationUpdated ) %]
                                              <p class="problem ret_location_update">
                                                  Item shelving location updated.
-                                                <br />Old value:
+                                                <br /><span>Old value:</span>
                                                 [% IF errmsgloo.ItemLocationUpdated.from %]
                                                     [% SET av_description = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => errmsgloo.ItemLocationUpdated.from ) %]
                                                     [% IF errmsgloo.ItemLocationUpdated.from == '' %]
-                                                        empty
+                                                        <span>empty</span>
                                                     [% ELSIF av_description == '' %]
-                                                        [% errmsgloo.ItemLocationUpdated.from | html %] (No description available)
+                                                        [% errmsgloo.ItemLocationUpdated.from | html %] (<span>No description available</span>)
                                                     [% ELSE %]
                                                         [% av_description | html %]
                                                     [% END %]
                                                 [% ELSE %]
-                                                    "Blank"
+                                                    <span>"Blank"</span>
                                                 [% END %]
                                                 <br />New value:
                                                 [% IF errmsgloo.ItemLocationUpdated.to %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
index b0c0933df3..7d1032386c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
@@ -63,11 +63,11 @@
 
 [% IF ( run_report ) %]
     [% IF ( total ) %]
-        <div class="results">[% total | html %] items found for
-            [% IF ( branchlimit ) %][% Branches.GetName( branchlimit ) | html %][% ELSE %]All libraries[% END %]
-            [% IF ( itemtypeslimit ) %] and item type: [% ItemTypes.GetDescription( itemtypeslimit ) | html %][% END %]
-            [% IF ( ccodeslimit ) %] and collection: [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode' authorised_value = ccodeslimit ) | html %][% END %]
-            [% IF ( locationslimit ) %] and shelving location: [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location' authorised_value = locationslimit ) | html %][% END %]
+        <div class="results">[% total | html %] <span>items found for</span>
+            [% IF ( branchlimit ) %][% Branches.GetName( branchlimit ) | html %][% ELSE %]<span>All libraries</span>[% END %]
+            [% IF ( itemtypeslimit ) %] <span>and item type: [% ItemTypes.GetDescription( itemtypeslimit ) | html %]</span>[% END %]
+            [% IF ( ccodeslimit ) %] <span>and collection: [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode' authorised_value = ccodeslimit ) | html %]</span>[% END %]
+            [% IF ( locationslimit ) %] <span>and shelving location: [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location' authorised_value = locationslimit ) | html %]</span>[% END %]
         </div>
     [% ELSE %]
         <div class="dialog message">No items found.</div>
@@ -175,7 +175,7 @@
 
                         [% IF ( itemsloo.item('size') ) %][% itemsloo.item('size') | html %][% END %]
 
-                        [% IF ( itemsloo.isbn ) %]ISBN: [% itemsloo.isbn | html %][% END %]
+                        [% IF ( itemsloo.isbn ) %]<span>ISBN: [% itemsloo.isbn | html %]</span>[% END %]
                     </div>
                 </p>
             </td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt
index b55a054fc4..027b9a1bdc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt
@@ -84,16 +84,16 @@
                                     <td>[% t.description | html %]</td>
                                     <td>
                                         [% IF t.is_enrollable_from_opac %]
-                                            Yes
+                                            <span>Yes</span>
                                         [% ELSE %]
-                                            No
+                                            <span>No</span>
                                         [% END %]
                                     </td>
                                     <td>
                                         [% IF t.is_email_required %]
-                                            Yes
+                                            <span>Yes</span>
                                         [% ELSE %]
-                                            No
+                                            <span>No</span>
                                         [% END %]
                                     </td>
                                     <td>[% Branches.GetName( t.branchcode ) | html %]</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt
index d9fb79eb53..5693489ecb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt
@@ -20,7 +20,7 @@
         </li>
         <li>
             <a href="#" aria-current="page">
-                [% IF is_edit || course_reserve %] Edit [% ELSE %] Reserve [% END %]
+                [% IF is_edit || course_reserve %] <span>Edit</span> [% ELSE %] <span>Reserve</span> [% END %]
                 <em>[% biblio.title | html %]</em> for <em>[% course.course_name | html %]</em>
             </a>
         </li>
@@ -31,7 +31,7 @@
     <div class="row">
         <div class="col-md-8 col-md-offset-2">
             <h1>
-                [% IF is_edit || course_reserve %]Edit [% ELSE %]Reserve [% END %]<em>[% biblio.title | html %]</em> for <em>[% course.course_name | html %]</em>
+                [% IF is_edit || course_reserve %]<span>Edit</span> [% ELSE %]<span>Reserve</span> [% END %]<em>[% biblio.title | html %]</em> for <em>[% course.course_name | html %]</em>
             </h1>
 
         [% IF course_reserve && !is_edit%]<div class="dialog message" id="already_on_reserve_this">This course already has this item on reserve.</div>[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
index fbd03d48fa..0b706dc761 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
@@ -268,9 +268,9 @@
                             <td class="status">
                                 <span>
                                 [% IF cr.item.onloan %]
-                                    Checked out
+                                    <span>Checked out</span>
                                 [% ELSE %]
-                                    Available
+                                    <span>Available</span>
                                 [% END %]
                                 </span>
                             </td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt
index ca5e55fee5..1c7c3d7aac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt
@@ -161,9 +161,9 @@
     <h1>No DEPARTMENT authorized values found!</h1>
     <p>
         [% IF ( CAN_user_parameters ) %]
-            Please <a href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=DEPARTMENT">create one or more authorized values</a> with the category DEPARTMENT.
+            <span>Please <a href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=DEPARTMENT">create one or more authorized values</a> with the category DEPARTMENT.</span>
         [% ELSE %]
-            An administrator must create one or more authorized values with the category DEPARTMENT.
+            <span>An administrator must create one or more authorized values with the category DEPARTMENT.</span>
         [% END %]
     </p>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt
index 7082b27c02..9440e482c1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %]Koha &rsaquo; Tools &rsaquo; Labels &rsaquo;: Search[% INCLUDE 'doc-head-close.inc' %]
+[% INCLUDE 'doc-head-open.inc' %]<span>Koha</span> &rsaquo; <span>Tools</span> &rsaquo; <span>Labels</span> &rsaquo;: <span>Search</span>[% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="labels_label-bib-search" class="tools labels">
 <div id="main-compact">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
index d8bda80551..7349d8fb06 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
@@ -58,11 +58,11 @@
         [% ELSE %]
             <h3>
                 [% IF ( label_ids ) %]
-                    [% IF ( label_count == 1 ) %]Exporting [% label_count | html %] label[% ELSE %]Exporting [% label_count | html %] labels[% END %]
+                    [% IF ( label_count == 1 ) %]<span>Exporting 1 label</span>[% ELSE %]<span>Exporting [% label_count | html %] labels</span>[% END %]
                 [% ELSIF ( item_numbers ) %]
-                    [% IF ( item_count == 1 ) %]Exporting [% item_count | html %] label[% ELSE %]Exporting [% item_count | html %] labels[% END %]
+                    [% IF ( item_count == 1 ) %]<span>Exporting 1 label</span>[% ELSE %]<span>Exporting [% item_count | html %] labels</span>[% END %]
                 [% ELSE %]
-                    [% IF ( multi_batch_count == 1 ) %][% multi_batch_count | html %] batch to export[% ELSE %][% multi_batch_count | html %] batches to export[% END %]
+                    [% IF ( multi_batch_count == 1 ) %]<span>1 batch to export</span>[% ELSE %]<span>[% multi_batch_count | html %] batches to export</span>[% END %]
                 [% END %]
             </h3>
             <form name="exporting" method="post" action="/cgi-bin/koha/labels/label-print.pl">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
index b6677ce9c2..1a328dac49 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
@@ -62,9 +62,9 @@
 
             <h1>
                 [% IF type == 'credit' %]
-                    Details of payment
+                    <span>Details of payment</span>
                 [% ELSIF type == 'debit' %]
-                    Details of fee
+                    <span>Details of fee</span>
                 [% END %]
             </h1>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt
index 848d37bed5..cb53a59913 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt
@@ -96,20 +96,20 @@
           [% END %]
           <td>
           [% IF hold.found == 'F' %]
-              Fulfilled
+              <span>Fulfilled</span>
           [% ELSIF hold.cancellationdate %]
-              Cancelled
+              <span>Cancelled</span>
                 [% IF hold.cancellation_reason %]
                     ([% AuthorisedValues.GetByCode('HOLD_CANCELLATION', hold.cancellation_reason) | html %])
                 [% END %]
           [% ELSIF hold.found == 'W' %]
-              Waiting
+              <span>Waiting</span>
           [% ELSIF hold.found == 'P' %]
-              Processing
+              <span>Processing</span>
           [% ELSIF hold.found == 'T' %]
-              In transit
+              <span>In transit</span>
           [% ELSE %]
-              Pending
+              <span>Pending</span>
           [% END %]
           </td>
         </tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 5ea169e046..b9d46fc4b2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -59,11 +59,11 @@ legend:hover {
                 <li>
                     <a href="#" aria-current="page">
                         [% IF ( opadd ) %]
-                            Add patron
+                            <span>Add patron</span>
                         [% ELSIF ( opduplicate ) %]
-                            Duplicate patron
+                            <span>Duplicate patron</span>
                         [% ELSE %]
-                            Modify patron
+                            <span>Modify patron</span>
                         [% END %]
                         [% IF categoryname %]
                             ([% categoryname | html %])
@@ -111,11 +111,11 @@ legend:hover {
                     [% UNLESS ( no_add ) %]
                         <h1>
                             [% IF ( opadd ) %]
-                                Add patron
+                                <span>Add patron</span>
                             [% ELSIF ( opduplicate ) %]
-                                Duplicate patron
+                                <span>Duplicate patron</span>
                             [% ELSE %]
-                                Modify patron
+                                <span>Modify patron</span>
                             [% END %]
                             [% INCLUDE 'patron-title.inc' %]
                             [% IF categoryname %]([% categoryname | html %])[% END %]
@@ -269,7 +269,7 @@ legend:hover {
                             [% IF ( step_1 ) %]
                                 [% UNLESS notitle && nosurname && nofirstname && nodateofbirth && noinitials && noothernames &&nosex %]
                                     <fieldset class="rows" id="memberentry_identity">
-                                        <legend id="identity_lgd">[% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity</legend>
+                                        <legend id="identity_lgd">[% IF ( I ) %]<span>Organization</span> [% ELSE %]<span>Patron</span> [% END %]<span>identity</span></legend>
                                         <ol>
                                             [% UNLESS ( I ) %]
                                                 [% UNLESS notitle %]
@@ -1316,7 +1316,7 @@ legend:hover {
                                                                 No
                                                         </label>
                                                     [% ELSE %]
-                                                        [% IF flagloo.yes %]Yes[% ELSE %]No[% END %]
+                                                        [% IF flagloo.yes %]<span>Yes</span>[% ELSE %]<span>No</span>[% END %]
                                                     [% END # /IF CAN_user_circulate_manage_restrictions %]
                                                 </li>
                                             [% END # /FOREACH flagloo %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index 0488d014c5..8a9eaceee0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -412,9 +412,9 @@
                                         [% IF Koha.Preference( 'OPACPrivacy') %]
                                             <li id="patron-privacypref">
                                                 <span class="label">Privacy pref:</span>
-                                                    [% IF ( patron.privacy == 0 ) %]Forever[% END %]
-                                                    [% IF ( patron.privacy == 1 ) %]Default[% END %]
-                                                    [% IF ( patron.privacy == 2 ) %]Never[% END %]
+                                                    [% IF ( patron.privacy == 0 ) %]<span>Forever</span>[% END %]
+                                                    [% IF ( patron.privacy == 1 ) %]<span>Default</span>[% END %]
+                                                    [% IF ( patron.privacy == 2 ) %]<span>Never</span>[% END %]
                                             </li>
                                         [% END %]
 
@@ -454,7 +454,7 @@
                                                 [% IF ( patron.password_expiration_date ) %]
                                                     [% patron.password_expiration_date | $KohaDates %]
                                                 [% ELSE %]
-                                                    Never
+                                                    <span>Never</span>
                                                 [% END %]
                                             </li>
                                         [% END %]
@@ -477,11 +477,11 @@
                                             <li id="patron-checkprev">
                                                 <span class="label">Check previous checkouts: </span>
                                                 [% IF ( patron.checkprevcheckout == 'yes' ) %]
-                                                    Yes
+                                                    <span>Yes</span>
                                                 [% ELSIF ( patron.checkprevcheckout == 'no' ) %]
-                                                    No
+                                                    <span>No</span>
                                                 [% ELSE %]
-                                                    Inherited
+                                                    <span>Inherited</span>
                                                 [% END %]
                                             </li>
                                         [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
index 14f7d18188..8922a7557c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
@@ -61,17 +61,17 @@
                                             <iframe class="notice" id="notice[% QUEUED_MESSAGE.message_id | html %]" srcdoc="[% QUEUED_MESSAGE.content | html | html_line_break %]"></iframe>
                                         </td>
                                         <td>
-                                            [% IF ( QUEUED_MESSAGE.message_transport_type == 'email' ) %]email
-                                            [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'print' ) %]print
-                                            [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'feed' ) %]feed
-                                            [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'sms' ) %]sms
+                                            [% IF ( QUEUED_MESSAGE.message_transport_type == 'email' ) %]<span>email</span>
+                                            [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'print' ) %]<span>print</span>
+                                            [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'feed' ) %]<span>feed</span>
+                                            [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'sms' ) %]<span>sms</span>
                                             [% ELSE %][% QUEUED_MESSAGE.message_transport_type | html %][% END %]
                                         </td>
                                         <td>
-                                            [% IF ( QUEUED_MESSAGE.status == 'sent' ) %]sent
-                                            [% ELSIF ( QUEUED_MESSAGE.status == 'pending' ) %]pending
-                                            [% ELSIF ( QUEUED_MESSAGE.status == 'failed' ) %]failed
-                                            [% ELSIF ( QUEUED_MESSAGE.status == 'deleted' ) %]deleted
+                                            [% IF ( QUEUED_MESSAGE.status == 'sent' ) %]<span>sent</span>
+                                            [% ELSIF ( QUEUED_MESSAGE.status == 'pending' ) %]<span>pending</span>
+                                            [% ELSIF ( QUEUED_MESSAGE.status == 'failed' ) %]<span>failed</span>
+                                            [% ELSIF ( QUEUED_MESSAGE.status == 'deleted' ) %]<span>deleted</span>
                                             [% ELSE %][% QUEUED_MESSAGE.status | html %][% END %]
                                             [% IF ( QUEUED_MESSAGE.status != 'pending' ) %]
                                                 <div class="notice">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
index e97f92d212..6911d5868f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
@@ -49,18 +49,18 @@
         <li>
             <a href="#" aria-current="page">
                 [% IF ( pay_individual ) %]
-                    Pay an individual fine
+                    <span>Pay an individual fine</span>
                 [% ELSIF ( writeoff_individual ) %]
-                    Write off an individual fine
+                    <span>Write off an individual fine</span>
                 [% ELSE %]
                     [% IF ( selected_accts ) %]
                         [% IF type == 'WRITEOFF' %]
-                            Write off an amount toward selected fines
+                            <span>Write off an amount toward selected fines</span>
                         [% ELSE %]
-                            Pay an amount toward selected fines
+                            <span>Pay an amount toward selected fines</span>
                         [% END %]
                     [% ELSE %]
-                        Pay an amount toward all fines
+                        <span>Pay an amount toward all fines</span>
                     [% END %]
                 [% END %]
             </a>
@@ -75,18 +75,18 @@
 
             <h1>
                 [% IF ( pay_individual ) %]
-                    Pay an individual fine
+                    <span>Pay an individual fine</span>
                 [% ELSIF ( writeoff_individual ) %]
-                    Write off an individual fine
+                    <span>Write off an individual fine</span>
                 [% ELSE %]
                     [% IF ( selected_accts ) %]
                         [% IF type == 'WRITEOFF' %]
-                            Write off an amount toward selected fines
+                            <span>Write off an amount toward selected fines</span>
                         [% ELSE %]
-                            Pay an amount toward selected fines
+                            <span>Pay an amount toward selected fines</span>
                         [% END %]
                     [% ELSE %]
-                        Pay an amount toward all fines
+                        <span>Pay an amount toward all fines</span>
                     [% END %]
                 [% END %]
             </h1>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
index 81c7c03a3f..ce35ab360a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
@@ -46,11 +46,11 @@
 [% SET routinglists = patron.get_routing_lists %]
 <h2>
 [% UNLESS ( routinglists ) %]
-0 subscription routing lists
+<span>0 subscription routing lists</span>
 [% ELSIF ( routinglists.count == 1 ) %]
-[% routinglists.count | html %] subscription routing list
+<span>[% routinglists.count | html %] subscription routing list</span>
 [% ELSE %]
-[% routinglists.count | html %] subscription routing lists
+<span>[% routinglists.count | html %] subscription routing lists</span>
 [% END %]
 </h2>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
index e9a57f91ea..554342bed3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
@@ -27,11 +27,11 @@
             <li>
                 <a href="#" aria-current="page">
                     [% IF description %]
-                        Edit [% description | html %]
+                        <span>Edit [% description | html %]</span>
                     [% ELSIF batch_id %]
-                        Edit ([% batch_id | html %])
+                        <span>Edit ([% batch_id | html %])</span>
                     [% ELSE %]
-                        New
+                        <span>New</span>
                     [% END %]
                 </a>
             </li>
@@ -45,7 +45,10 @@
 
                     [% INCLUDE 'patroncards-toolbar.inc' %]
 
-                    <h1>[% IF description %]Edit [% ELSIF batch_id %]Edit [% ELSE %]New [% END %]patron card batches</h1>
+                    <h1>[% IF description %]<span>Edit</span> [% description | html %]
+                        [% ELSIF batch_id %]<span>Edit patron card batch</span> [% batch_id | html %]
+                        [% ELSE %]<span>New patron card batch</span>[% END %]
+                    </h1>
 
                 [% IF ( duplicate_message ) %]
                     <div class="dialog message">
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 16d698fb0f..f8e1c2f536 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
@@ -41,7 +41,9 @@
 
                     [% INCLUDE 'patroncards-toolbar.inc' %]
 
-                    <h1>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card layout</h1>
+                    <h1>[% IF ( layout_id ) %]<span>Edit patron card layout</span> [% layout_id | html %]
+                        [% ELSE %]<span>Create patron card layout</span>[% END %]
+                    </h1>
 
                 <!-- NOTE: The order of the elements on this form is crictical to correct processing. You've been warned...  -->
                 <form name="input" action="/cgi-bin/koha/patroncards/edit-layout.pl" method="get">
@@ -279,7 +281,9 @@
                 </div>
                 <div class="col-sm-6">
                     <fieldset class="rows">
-                    <legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card graphic layout</legend>
+                    <legend>[% IF ( layout_id ) %]<span>Edit patron card graphic layout</span>
+                            [% ELSE %]<span>Create patron card graphic layout</span>[% END %]
+                    </legend>
                     <ol>
 <!--
                             <li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
index f612641ac8..195cd7aa4d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
@@ -46,12 +46,12 @@
             [% ELSE %]
             <h3>
                     [% IF ( label_ids ) %]
-                        [% IF ( card_count == 1 ) %]Exporting [% card_count | html %] patron card[% ELSE %]Exporting [% card_count | html %] patron cards[% END %]
+                        [% IF ( card_count == 1 ) %]<span>Exporting 1 patron card</span>[% ELSE %]<span>Exporting [% card_count | html %] patron cards</span>[% END %]
                     [% ELSIF ( borrower_numbers ) %]
-                        [% IF ( borrower_count == 1 ) %]Exporting [% borrower_count | html %] patron card[% ELSE %]Exporting [% borrower_count | html %] patron cards[% END %]
-                    [% ELSIF ( patronlist_id ) %] Exporting from patron list
+                        [% IF ( borrower_count == 1 ) %]<span>Exporting 1 patron card</span>[% ELSE %]<span>Exporting [% borrower_count | html %] patron cards</span>[% END %]
+                    [% ELSIF ( patronlist_id ) %] <span>Exporting from patron list</span>
                     [% ELSE %]
-                        [% IF ( multi_batch_count == 1 ) %][% multi_batch_count | html %] batch to export[% ELSE %][% multi_batch_count | html %] batches to export[% END %]
+                        [% IF ( multi_batch_count == 1 ) %]<span>1 batch to export</span>[% ELSE %]<span>[% multi_batch_count | html %] batches to export</span>[% END %]
                     [% END %]
             </h3>
             <form id="exportingf" name="exporting" method="post" action="/cgi-bin/koha/patroncards/print.pl">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index 7253410094..bcd73e272c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -129,17 +129,17 @@
             <li>
                 <a href="#" aria-current="page">
                     [% IF ( build1 ) %]
-                        Step 1 of 6: Choose a module
+                        <span>Step 1 of 6: Choose a module</span>
                     [% ELSIF ( build2 ) %]
-                        Step 2 of 6: Pick a report type
+                        <span>Step 2 of 6: Pick a report type</span>
                     [% ELSIF ( build3 ) %]
-                        Step 3 of 6: Select columns for display
+                        <span>Step 3 of 6: Select columns for display</span>
                     [% ELSIF ( build4 ) %]
-                        Step 4 of 6: Select criteria to limit on
+                        <span>Step 4 of 6: Select criteria to limit on</span>
                     [% ELSIF ( build5 ) %]
-                        Step 5 of 6: Pick which columns to total
+                        <span>Step 5 of 6: Pick which columns to total</span>
                     [% ELSIF ( build6 ) %]
-                        Step 6 of 6: Select how you want the report ordered
+                        <span>Step 6 of 6: Select how you want the report ordered</span>
                     [% END %]
                 </a>
         [% END %]
@@ -1386,7 +1386,7 @@
                                     Use of this keyword is not allowed in Koha reports due to security and data integrity risks. Only SELECT queries are allowed.<br />
                                     Please return to the &quot;Saved Reports&quot; screen and delete this report or retry creating a new one.
                                 [% ELSIF ( error.queryerr ) %]
-                                    The database returned the following error: <br />
+                                    <span>The database returned the following error:</span> <br />
                                     [% error.queryerr | html %]<br />Please check the log for further details.
                                 [% ELSIF ( error.cache_expiry ) %]
                                     Please select a cache expiry less than 30 days.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
index 86df61a3c0..9ccc075100 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
@@ -75,9 +75,9 @@
         [% ELSE %]
             <div class="dialog message">
                 [% IF ( CAN_user_tools_manage_csv_profiles ) %]
-                    To enable the export of selected items, <a href="/cgi-bin/koha/tools/csv-profiles.pl">create a CSV profile</a> of the type "SQL" with usage option "Export lost items in report."
+                    <span>To enable the export of selected items, <a href="/cgi-bin/koha/tools/csv-profiles.pl">create a CSV profile</a> of the type "SQL" with usage option "Export lost items in report."</span>
                 [% ELSE %]
-                    To enable the export of selected items, your administrator must create a CSV profile of the type "SQL" with usage option "Export lost items in report."
+                    <span>To enable the export of selected items, your administrator must create a CSV profile of the type "SQL" with usage option "Export lost items in report."</span>
                 [% END %]
             </div>
             <div class="lostitems-table_table_controls">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt
index f8d2304cfc..0a0f60370c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt
@@ -63,9 +63,9 @@
                     <td data-order="[% data.enddate | html %]">[% data.enddate | $KohaDates %]</td>
                     <td>
                         [% IF data.closed %]
-                            Closed
+                            <span>Closed</span>
                         [% ELSIF data.expired %]
-                            Expired
+                            <span>Expired</span>
                         [% END %]
                     </td>
                 </tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index 396afc7964..1a062bb750 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -127,12 +127,12 @@
             [% ELSE %]
                 <h2>
                     [% IF ( patron ) %]
-                        Place holds
+                        <span>Place holds</span>
                     [% ELSE %]
                         [% IF clubcount %]
-                            Search patrons or clubs
+                            <span>Search patrons or clubs</span>
                         [% ELSE %]
-                            Search patrons
+                            <span>Search patrons</span>
                         [% END %]
                     [% END %]
                 </h2>
@@ -729,21 +729,21 @@
                                                 [% ELSE %]
                                                     <td>
                                                         [% IF ( itemloo.transfertwhen ) %]
-                                                            In transit from [% Branches.GetName( itemloo.transfertfrom ) | html %],
-                                                            to [% Branches.GetName( itemloo.transfertto ) | html %], since [% itemloo.transfertwhen | html %]
+                                                            <span>In transit from [% Branches.GetName( itemloo.transfertfrom ) | html %],
+                                                            to [% Branches.GetName( itemloo.transfertto ) | html %], since [% itemloo.transfertwhen | html %]</span>
                                                         [% END %]
                                                 [% END %]
 
                                                     [% IF ( itemloo.reservedate ) %]
                                                         [% IF ( itemloo.nocancel ) %]
-                                                                Can't be cancelled when item is in transit
+                                                                <span>Can't be cancelled when item is in transit</span>
                                                         [% ELSE %]
-                                                            [% IF ( itemloo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %]
+                                                            [% IF ( itemloo.waitingdate ) %]<span>Waiting</span>[% ELSE %]<span>On hold</span>[% END %]
                                                             [% IF ( itemloo.canreservefromotherbranches ) %]
-                                                                for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedFor.borrowernumber | uri %]">[% itemloo.ReservedFor.firstname | html %] [% itemloo.ReservedFor.surname | html %]</a>
+                                                                <span>for</span> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedFor.borrowernumber | uri %]">[% itemloo.ReservedFor.firstname | html %] [% itemloo.ReservedFor.surname | html %]</a>
                                                             [% END %]
                                                             [% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %]
-                                                            [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %] since
+                                                            [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %] <span>since</span>
                                                             [% IF ( itemloo.waitingdate ) %]
                                                                 [% itemloo.waitingdate | $KohaDates %]
                                                             [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt
index ef01a2b3c1..5a203ca4e7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt
@@ -23,9 +23,9 @@
         <li>
             <a href="#" aria-current="page">
                 [% IF ( status ) %]
-                    Approved comments
+                    <span>Approved comments</span>
                 [% ELSE %]
-                    Comments awaiting moderation
+                    <span>Comments awaiting moderation</span>
                 [% END %]
             </a>
         </li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
index d09366f527..c607e61f38 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
@@ -55,11 +55,11 @@
                     <p>Failed to add item with barcode <em>[% barcode | html %]</em>:
                     <p>
                         [% IF failureMessage == "NO_ITEM" %]
-                            No item with matching barcode found
+                            <span>No item with matching barcode found</span>
                         [% ELSIF failureMessage == "IN_COLLECTION_OTHER" %]
-                            Item is already in a different rotating collection
+                            <span>Item is already in a different rotating collection</span>
                         [% ELSIF failureMessage == "IN_COLLECTION" %]
-                            Item is already in this collection
+                            <span>Item is already in this collection</span>
                         [% ELSE %]
                             [% failureMessage | html %]
                         [% END %]
@@ -76,9 +76,9 @@
                     Failed to remove item with barcode <em>[% barcode | html %]</em>:
                     <p>
                         [% IF failureMessage == "NO_ITEM" %]
-                            No item with matching barcode found
+                            <span>No item with matching barcode found</span>
                         [% ELSIF failureMessage == "NOT_IN_COLLECTION" %]
-                            Item is not in this collection
+                            <span>Item is not in this collection</span>
                         [% ELSE %]
                             [% failureMessage | html %]
                         [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
index e244801def..eecf14ca8f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
@@ -62,11 +62,11 @@
                     <p>Collection <em>[% createdTitle | html %]</em> failed to be added</p>
                     <p>
                         [% IF failureMessage == "NO_TITLE" %]
-                            No title entered.
+                            <span>No title entered.</span>
                         [% ELSIF failureMessage == "DUPLICATE_TITLE" %]
-                            Title already in use.
+                            <span>Title already in use.</span>
                         [% ELSIF failureMessage == "NO_DESCRIPTION" %]
-                            No description entered.
+                            <span>No description entered.</span>
                         [% ELSE %]
                             [% failureMessage | html %]
                         [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
index 6d4974a8d3..74e36cc475 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
@@ -31,9 +31,9 @@
             <li>
                 <a href="#" aria-current="page">
                     [% IF ( op ) %]
-                        Create routing list
+                        <span>Create routing list</span>
                     [% ELSE %]
-                        Edit routing list
+                        <span>Edit routing list</span>
                     [% END %]
                 </a>
             </li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
index 22dac4b769..2e7196f69a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
@@ -267,18 +267,18 @@
                     [% END %]
                 </td>
                 <td>
-                    [% IF ( serial.status1 ) %]Expected[% END %]
-                    [% IF ( serial.status2 ) %]Arrived[% END %]
-                    [% IF ( serial.status3 ) %]Late[% END %]
-                    [% IF ( serial.status4 ) %]Missing[% END %]
-                    [% IF ( serial.status41 ) %]Missing (never received)[% END %]
-                    [% IF ( serial.status42 ) %]Missing (sold out)[% END %]
-                    [% IF ( serial.status43 ) %]Missing (damaged)[% END %]
-                    [% IF ( serial.status44 ) %]Missing (lost)[% END %]
-                    [% IF ( serial.status5 ) %]Not issued[% END %]
-                    [% IF ( serial.status6 ) %]Delete[% END %]
-                    [% IF ( serial.status7 ) %]Claimed[% END %]
-                    [% IF ( serial.status8 ) %]Stopped[% END %]
+                    [% IF ( serial.status1 ) %]<span>Expected</span>[% END %]
+                    [% IF ( serial.status2 ) %]<span>Arrived</span>[% END %]
+                    [% IF ( serial.status3 ) %]<span>Late</span>[% END %]
+                    [% IF ( serial.status4 ) %]<span>Missing</span>[% END %]
+                    [% IF ( serial.status41 ) %]<span>Missing (never received)</span>[% END %]
+                    [% IF ( serial.status42 ) %]<span>Missing (sold out)</span>[% END %]
+                    [% IF ( serial.status43 ) %]<span>Missing (damaged)</span>[% END %]
+                    [% IF ( serial.status44 ) %]<span>Missing (lost)</span>[% END %]
+                    [% IF ( serial.status5 ) %]<span>Not issued</span>[% END %]
+                    [% IF ( serial.status6 ) %]<span>Delete</span>[% END %]
+                    [% IF ( serial.status7 ) %]<span>Claimed</span>[% END %]
+                    [% IF ( serial.status8 ) %]<span>Stopped</span>[% END %]
                 </td>
                 <td>
                     [% serial.notes | html %]
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 f6f4b3fe5a..ee7d25a256 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
@@ -356,23 +356,23 @@
                                         [% serialslis.publisheddatetext | html %]
                                     </td>
                                     <td>
-                                        [% IF ( serialslis.status1 ) %]Expected[% END %]
-                                        [% IF ( serialslis.status2 ) %]Arrived[% END %]
-                                        [% IF ( serialslis.status3 ) %]Late[% END %]
-                                        [% IF ( serialslis.status4 ) %]Missing[% END %]
-                                        [% IF ( serialslis.status41 ) %]Missing (never received)[% END %]
-                                        [% IF ( serialslis.status42 ) %]Missing (sold out)[% END %]
-                                        [% IF ( serialslis.status43 ) %]Missing (damaged)[% END %]
-                                        [% IF ( serialslis.status44 ) %]Missing (lost)[% END %]
-                                        [% IF ( serialslis.status5 ) %]Not issued[% END %]
-                                        [% IF ( serialslis.status6 ) %]Delete[% END %]
+                                        [% IF ( serialslis.status1 ) %]<span>Expected</span>[% END %]
+                                        [% IF ( serialslis.status2 ) %]<span>Arrived</span>[% END %]
+                                        [% IF ( serialslis.status3 ) %]<span>Late</span>[% END %]
+                                        [% IF ( serialslis.status4 ) %]<span>Missing</span>[% END %]
+                                        [% IF ( serialslis.status41 ) %]<span>Missing (never received)</span>[% END %]
+                                        [% IF ( serialslis.status42 ) %]<span>Missing (sold out)</span>[% END %]
+                                        [% IF ( serialslis.status43 ) %]<span>Missing (damaged)</span>[% END %]
+                                        [% IF ( serialslis.status44 ) %]<span>Missing (lost)</span>[% END %]
+                                        [% IF ( serialslis.status5 ) %]<span>Not issued</span>[% END %]
+                                        [% IF ( serialslis.status6 ) %]<span>Delete</span>[% END %]
                                         [% IF ( serialslis.status7 ) %]
-                                            Claimed
+                                            <span>Claimed</span>
                                             [% IF ( serialslis.claimdate ) %]
                                                 [% serialslis.claimdate | html %]
                                             [% END %]
                                         [% END %]
-                                        [% IF ( serialslis.status8 ) %]Stopped[% END %]
+                                        [% IF ( serialslis.status8 ) %]<span>Stopped</span>[% END %]
                                     </td>
                                 </tr>
                             [% END # /FOREACH serialslist %]
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 8a06dceea3..8a3fec4128 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -816,21 +816,21 @@
                                                 </td>
                                                 <td>
                                                     [% IF ( suggestions_loo.ASKED ) %]
-                                                        Pending
+                                                        <span>Pending</span>
                                                     [% ELSIF ( suggestions_loo.ACCEPTED ) %]
-                                                        Accepted
+                                                        <span>Accepted</span>
                                                     [% ELSIF ( suggestions_loo.ORDERED ) %]
-                                                        Ordered
+                                                        <span>Ordered</span>
                                                     [% ELSIF ( suggestions_loo.REJECTED ) %]
-                                                        Rejected
+                                                        <span>Rejected</span>
                                                     [% ELSIF ( suggestions_loo.CHECKED ) %]
-                                                        Checked
+                                                        <span>Checked</span>
                                                     [% ELSIF ( suggestions_loo.AVAILABLE ) %]
-                                                        Available
+                                                        <span>Available</span>
                                                     [% ELSIF AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS ) %]
                                                         [% AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS ) | html %]
                                                     [% ELSE %]
-                                                        Status unknown
+                                                        <span>Status unknown</span>
                                                     [% END %]
 
                                                     [% IF ( suggestions_loo.reason ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
index e7962321fe..abd19df0a8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
@@ -43,22 +43,22 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
 <div class="col-sm-8 col-sm-push-2">
 <h1>Tags</h1>
 <form method="post" action="/cgi-bin/koha/tags/review.pl">
-  <h4>Displaying 
-	[% IF ( filter_approved_all ) %]all[% END %]
-	[% IF ( filter_approved_ok ) %]approved[% END %]
-	[% IF ( filter_approved_pending ) %]pending[% END %]
-	[% IF ( filter_approved_rej ) %]rejected[% END %]
-	terms
-  </h4>
+    <h4><span>Displaying</span>
+    [% IF ( filter_approved_all ) %]<span>all</span>[% END %]
+    [% IF ( filter_approved_ok ) %]<span>approved</span>[% END %]
+    [% IF ( filter_approved_pending ) %]<span>pending</span>[% END %]
+    [% IF ( filter_approved_rej ) %]<span>rejected</span>[% END %]
+    terms
+    </h4>
 
   [% IF ( op_count ) %]
   <div class="dialog message" id="main_status">
-  		[% IF ( op == 'approve' ) %]		Approved
-  		[% ELSIF ( op == 'reject' ) %]	Rejected
-  		[% ELSIF ( op == 'test' ) %]		Tested
-        [% ELSE %]Unknown operation ([% op | html %]) on
-  		[% END %]
-	[% op_count | html %] Term(s).
+      [% IF ( op == 'approve' ) %]   <span>Approved</span>
+      [% ELSIF ( op == 'reject' ) %] <span>Rejected</span>
+      [% ELSIF ( op == 'test' ) %]   <span>Tested</span>
+      [% ELSE %]<span>Unknown operation ([% op | html %]) on</span>
+      [% END %]
+      <span>[% op_count | html %] Term(s).</span>
   </div>
   [% END %]
   [% IF ( message_loop ) %]
@@ -193,15 +193,15 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
    <input type="text" size="14" name="test" id="test" />
    <fieldset class="action"><button type="submit" value="Test" class="approval_btn btn btn-default btn-sm" id="test_button" name="op-test"><i class="fa fa-check-square-o" aria-hidden="true"></i> Test</button></fieldset>
    <div id="verdict">
-	[% IF ( test_term ) %]
-	[% IF ( verdict_ok ) %]
-		&quot;[% test_term | html %]&quot; is permitted.
-	[% ELSIF ( verdict_rej ) %]
-		&quot;[% test_term | html %]&quot; is prohibited.
-	[% ELSIF ( verdict_indeterminate ) %]
-		&quot;[% test_term | html %]&quot; is neither permitted nor prohibited.
-	[% END %]
-	[% END %]
+    [% IF ( test_term ) %]
+    [% IF ( verdict_ok ) %]
+        <span>&quot;[% test_term | html %]&quot; is permitted.</span>
+    [% ELSIF ( verdict_rej ) %]
+        <span>&quot;[% test_term | html %]&quot; is prohibited.</span>
+    [% ELSIF ( verdict_indeterminate ) %]
+        <span>&quot;[% test_term | html %]&quot; is neither permitted nor prohibited.</span>
+    [% END %]
+    [% END %]
    </div>
    </form>
   </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
index 5b1ea8a746..7065c90b88 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
@@ -335,11 +335,11 @@
                         </td>
                         <td>
                             [% IF c.category == 'news' %]
-                                [% IF c.location == 'staff_and_opac' %]All
-                                [% ELSIF c.location == 'staff_only' %]Librarian interface
-                                [% ELSIF c.location == 'opac_only' %]OPAC
-                                [% ELSIF c.location == 'slip' %]Slip
-                                [% ELSE %]Unknown ('[% location | html %]')
+                                [% IF c.location == 'staff_and_opac' %]<span>All</span>
+                                [% ELSIF c.location == 'staff_only' %]<span>Librarian interface</span>
+                                [% ELSIF c.location == 'opac_only' %]<span>OPAC</span>
+                                [% ELSIF c.location == 'slip' %]<span>Slip</span>
+                                [% ELSE %]<span>Unknown ('[% location | html %]')</span>
                                 [% END %]
                             [% ELSE %]
                                 [% c.location | html %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
index 67f391f555..5e8864597a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
@@ -226,9 +226,9 @@
                                 <tr>
                                     <td>
                                         [% IF rule.age.defined and rule.age.length > 0 %]
-                                            [% rule.age | html %] days
+                                            <span>[% rule.age | html %] days</span>
                                         [% ELSE %]
-                                            There is no age for this rule.
+                                            <span>There is no age for this rule.</span>
                                         [% END %]
                                     </td>
                                     <td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
index c78702ee5b..85c618b716 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
@@ -40,19 +40,19 @@
       <div class="dialog alert" style="margin:auto;">
     [% END %]
     [% IF message.code == 'biblio_not_exists' %]
-      The biblionumber [% message.biblionumber | html %] does not exist in the database.
+      <span>The biblionumber [% message.biblionumber | html %] does not exist in the database.</span>
     [% ELSIF message.code == 'authority_not_exists' %]
-      The authority id [% message.authid | html %] does not exist in the database.
+      <span>The authority id [% message.authid | html %] does not exist in the database.</span>
     [% ELSIF message.code == 'cannot_enqueue_job' %]
-        Cannot enqueue this job.
+        <span>Cannot enqueue this job.</span>
     [% ELSIF message.code == 'biblio_not_exists' %]
-        Bibliographic record [% message.biblionumber | html %] does not exist in the database.
+        <span>Bibliographic record [% message.biblionumber | html %] does not exist in the database.</span>
     [% ELSIF message.code == 'authority_not_exists' %]
-        Authority record [% message.authid | html %] does not exist in the database.
+        <span>Authority record [% message.authid | html %] does not exist in the database.</span>
     [% END %]
 
     [% IF message.error %]
-      (The error was: [% message.error | html %], see the Koha log file for more information).
+      <span>(The error was: [% message.error | html %], see the Koha log file for more information).</span>
     [% END %]
     </div>
   [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
index ff3a61cd53..7710466e8f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
@@ -45,16 +45,16 @@
                                     <div><i class="fa fa-exclamation error"></i>
                                 [% END %]
                                 [% IF message.code == 'no_action_defined_for_the_template' %]
-                                    The selected template (id=[% message.mmtid | html %]) does not exist or no action is defined.
+                                    <span>The selected template (id=[% message.mmtid | html %]) does not exist or no action is defined.</span>
                                 [% ELSIF message.code == 'biblio_not_exists' %]
-                                    Bibliographic record [% message.biblionumber | html %] does not exist in the database.
+                                    <span>Bibliographic record [% message.biblionumber | html %] does not exist in the database.</span>
                                 [% ELSIF message.code == 'authority_not_exists' %]
-                                    Authority record [% message.authid | html %] does not exist in the database.
+                                    <span>Authority record [% message.authid | html %] does not exist in the database.</span>
                                 [% ELSIF message.code == 'cannot_enqueue_job' %]
-                                    Cannot enqueue this job.
+                                    <span>Cannot enqueue this job.</span>
                                 [% END %]
                                 [% IF message.error %]
-                                    (The error was: [% message.error | html %]. See the Koha logfile for more information).
+                                    <span>(The error was: [% message.error | html %]. See the Koha logfile for more information).</span>
                                 [% END %]
                                 </div>
                             [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
index e97eaf0802..caaec4e2c3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
@@ -119,19 +119,19 @@
 [% END %]
 
 [% BLOCK type_description %]
-    [% IF type_code == 'marc' %] MARC
-    [% ELSIF type_code == 'sql' %] SQL
-    [% ELSE %] Unknown type
+    [% IF type_code == 'marc' %] <span>MARC</span>
+    [% ELSIF type_code == 'sql' %] <span>SQL</span>
+    [% ELSE %] <span>Unknown type</span>
     [% END %]
 [% END %]
 
 [% BLOCK used_for_description %]
-    [% IF used_for_code == 'export_records' %]<span> Export records</span>
-    [% ELSIF used_for_code == 'late_issues' %]<span> Late serial issues claims</span>
-    [% ELSIF used_for_code == 'late_orders' %]<span> Export late orders</span>
-    [% ELSIF used_for_code == 'export_basket' %]<span> Basket export in acquisition</span>
-    [% ELSIF used_for_code == 'export_lost_items' %]<span> Export lost items in report</span>
-    [% ELSE %]<span> Unknown usage</span>
+    [% IF used_for_code == 'export_records' %] <span>Export records</span>
+    [% ELSIF used_for_code == 'late_issues' %] <span>Late serial issues claims</span>
+    [% ELSIF used_for_code == 'late_orders' %] <span>Export late orders</span>
+    [% ELSIF used_for_code == 'export_basket' %] <span>Basket export in acquisition</span>
+    [% ELSIF used_for_code == 'export_lost_items' %] <span>Export lost items in report</span>
+    [% ELSE %] <span>Unknown usage</span>
     [% END %]
 [% END %]
 
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 1446b72b27..c322a3f80e 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
@@ -81,13 +81,13 @@
                     [% FOREACH f IN feedback %]
                         <li>
                             [% IF ( f.filename ) %]
-                                Parsing upload file <span class="filename">[% f.filename | html %]</span>
+                                <span>Parsing upload file</span> <span class="filename">[% f.filename | html %]</span>
                             [% ELSIF ( f.backend ) %]
-                                Upload parsed using [% f.backend | html %]
+                                <span>Upload parsed using [% f.backend | html %]</span>
                             [% ELSIF ( f.headerrow ) %]
-                                These fields found: [% f.value | html %]
+                                <span>These fields found: [% f.value | html %]</span>
                             [% ELSIF ( f.already_in_db ) %]
-                                Patron already in database: [% f.value | html %]
+                                <span>Patron already in database: [% f.value | html %]</span>
                             [% ELSE %]
                                 [% f.name | html %] : [% f.value | html %]
                             [% END %]
@@ -111,21 +111,21 @@
                             Line <span class="linenumber">[% missing_critical.line | html %]</span>
 
                             [% IF ( missing_critical.badparse ) %]
-                                could not be parsed!
+                                <span>could not be parsed!</span>
                             [% ELSIF ( missing_critical.bad_date ) %]
-                                has &quot;[% missing_critical.key | html %]&quot; in unrecognized format: &quot;[% missing_critical.value | html %]&quot;
+                                <span>has &quot;[% missing_critical.key | html %]&quot; in unrecognized format:</span> &quot;[% missing_critical.value | html %]&quot;
                             [% ELSE %]
-                                Critical field &quot;[% missing_critical.key | html %]&quot;
+                                <span>Critical field &quot;[% missing_critical.key | html %]&quot;</span>
 
                                 [% IF ( missing_critical.branch_map ) %]
-                                    has unrecognized value &quot;[% missing_critical.value | html %]&quot;
+                                    <span>has unrecognized value &quot;[% missing_critical.value | html %]&quot;</span>
                                 [% ELSIF ( missing_critical.category_map ) %]
-                                    has unrecognized value &quot;[% missing_critical.value | html %]&quot;
+                                    <span>has unrecognized value &quot;[% missing_critical.value | html %]&quot;</span>
                                 [% ELSE %]
-                                    missing
+                                    <span>missing</span>
                                 [% END %]
 
-                                (borrowernumber: [% missing_critical.borrowernumber | html %]; surname: [% missing_critical.surname | html %]).
+                                (<span>borrowernumber: [% missing_critical.borrowernumber | html %]</span>; <span>surname: [% missing_critical.surname | html %]</span>).
                             [% END %]
 
                             <br/>
@@ -172,27 +172,27 @@
                     [% IF e.patron_attribute_unique_id_constraint %]
                         <li class="line_error">
                             [% IF e.borrowernumber %]
-                                Patron attribute [% e.attribute.code | html %] must be unique for patron with borrowernumber [% e.borrowernumber | html %].
+                                <span>Patron attribute [% e.attribute.code | html %] must be unique for patron with borrowernumber [% e.borrowernumber | html %].</span>
                             [% ELSE %]
-                                Patron attribute [% e.attribute.code | html %] must be unique for patron [% e.patron_id | html %].
+                                <span>Patron attribute [% e.attribute.code | html %] must be unique for patron [% e.patron_id | html %].</span>
                             [% END %]
                         </li>
                     [% END %]
                     [% IF e.patron_attribute_invalid_type %]
                         <li class="line_error">
                             [% IF e.borrowernumber %]
-                                Patron attribute [% e.attribute_type_code | html %] is invalid for patron with borrowernumber [% e.borrowernumber | html %].
+                                <span>Patron attribute [% e.attribute_type_code | html %] is invalid for patron with borrowernumber [% e.borrowernumber | html %].</span>
                             [% ELSE %]
-                                Patron attribute [% e.attribute_type_code | html %] is invalid for patron [% e.patron_id | html %].
+                                <span>Patron attribute [% e.attribute_type_code | html %] is invalid for patron [% e.patron_id | html %].</span>
                             [% END %]
                         </li>
                     [% END %]
                     [% IF e.patron_attribute_non_repeatable %]
                         <li class="line_error">
                             [% IF e.borrowernumber %]
-                                Patron attribute [% e.attribute.code | html %] is non-repeatable for patron with borrowernumber [% e.borrowernumber | html %].
+                                <span>Patron attribute [% e.attribute.code | html %] is non-repeatable for patron with borrowernumber [% e.borrowernumber | html %].</span>
                             [% ELSE %]
-                                Patron attribute [% e.attribute.code | html %] is non-repeatable for patron [% e.patron_id | html %].
+                                <span>Patron attribute [% e.attribute.code | html %] is non-repeatable for patron [% e.patron_id | html %].</span>
                             [% END %]
                         </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 9aacf152de..2096880d23 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
@@ -57,10 +57,10 @@
     [% FOREACH error IN errorloop %]
         <div class="dialog alert">
             [% error.barcode | html %]
-            [% IF (error.ERR_BARCODE) %]: barcode not found[% END %]
-            [% IF (error.ERR_WTHDRAWN) %]: item withdrawn[% END %]
-            [% IF (error.ERR_ONLOAN_RET) %]: item was on loan. It was returned before marked as seen[% END %]
-            [% IF (error.ERR_ONLOAN_NOT_RET) %]: item was on loan. couldn't be returned.[% END %]
+            [% IF (error.ERR_BARCODE) %]: <span>barcode not found</span>[% END %]
+            [% IF (error.ERR_WTHDRAWN) %]: <span>item withdrawn</span>[% END %]
+            [% IF (error.ERR_ONLOAN_RET) %]: <span>item was on loan. It was returned before marked as seen</span>[% END %]
+            [% IF (error.ERR_ONLOAN_NOT_RET) %]: <span>item was on loan. couldn't be returned.</span>[% END %]
         </div>
     [% END %]
        [% UNLESS op %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
index 67dd9249e1..921a3d8e0b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
@@ -66,9 +66,9 @@
                         [% END %]
                             <p><strong>
                                 [% IF ( label_batch_msg == "error" ) %]
-                                    Error attempting to create label batch. Please ask your system administrator to check the log for more details.
+                                    <span>Error attempting to create label batch. Please ask your system administrator to check the log for more details.</span>
                                 [% ELSE %]
-                                    Label <a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=edit&element_id=[% label_batch_msg | uri %]" >batch #[% label_batch_msg | html %]</a> created.
+                                    <span>Label</span> <a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=edit&element_id=[% label_batch_msg | uri %]" >batch #[% label_batch_msg | html %]</a> created.
                                 [% END %]
                             </strong></p>
                         </div>
@@ -130,17 +130,17 @@
                                 <li><span class="label">Staged:</span> [% upload_timestamp | $KohaDates with_hours=1 %]</li>
                                 <li><span class="label">Status:</span>
                                     [% IF ( import_status == 'cleaned' ) %]
-                                        Cleaned
+                                        <span>Cleaned</span>
                                     [% ELSIF ( import_status == 'imported' ) %]
-                                        Imported
+                                        <span>Imported</span>
                                     [% ELSIF ( import_status == 'importing' ) %]
-                                        Importing
+                                        <span>Importing</span>
                                     [% ELSIF ( import_status == 'reverted' ) %]
-                                        Reverted
+                                        <span>Reverted</span>
                                     [% ELSIF ( import_status == 'reverting' ) %]
-                                        Reverting
+                                        <span>Reverting</span>
                                     [% ELSIF ( import_status == 'staged' ) %]
-                                        Staged
+                                        <span>Staged</span>
                                     [% ELSE %]
                                         [% import_status | html %]
                                     [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
index f84290a370..03c87cedc4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
@@ -147,47 +147,47 @@
 
                                         <td>[% ActionsLoo.ordering | html %]</td>
                                         <td>
-                                            [% IF ( ActionsLoo.action_delete_field ) %] Delete [% END %]
-                                            [% IF ( ActionsLoo.action_add_field ) %] Add new [% END %]
-                                            [% IF ( ActionsLoo.action_update_field ) %] Update existing or add new [% END %]
-                                            [% IF ( ActionsLoo.action_move_field ) %] Move [% END %]
-                                            [% IF ( ActionsLoo.action_copy_field ) %] Copy [% END %]
-                                            [% IF ( ActionsLoo.action_copy_and_replace_field ) %] Copy and replace [% END %]
+                                            [% IF ( ActionsLoo.action_delete_field ) %] <span>Delete</span> [% END %]
+                                            [% IF ( ActionsLoo.action_add_field ) %] <span>Add new</span> [% END %]
+                                            [% IF ( ActionsLoo.action_update_field ) %] <span>Update existing or add new</span> [% END %]
+                                            [% IF ( ActionsLoo.action_move_field ) %] <span>Move</span> [% END %]
+                                            [% IF ( ActionsLoo.action_copy_field ) %] <span>Copy</span> [% END %]
+                                            [% IF ( ActionsLoo.action_copy_and_replace_field ) %] <span>Copy and replace</span> [% END %]
 
                                             [% UNLESS ( ActionsLoo.action_update_field ) %]
                                                 [% IF ( ActionsLoo.field_number ) %]
-                                                    1st
+                                                    <span>1st</span>
                                                 [% END %]
                                             [% END %]
 
-                                            field
+                                            <span>field</span>
 
                                             [% ActionsLoo.from_field | html %][% IF ( ActionsLoo.from_subfield.length ) %]$[% ActionsLoo.from_subfield | html %][% END %]
 
                                             [% IF ( ActionsLoo.field_value ) %]
-                                                with value <em>[% ActionsLoo.field_value | html %]</em>
+                                                <span>with value</span> <em>[% ActionsLoo.field_value | html %]</em>
                                             [% END %]
 
                                             [% IF ( ActionsLoo.to_field ) %]
-                                                to [% ActionsLoo.to_field | html %][% IF ( ActionsLoo.to_subfield.length ) %]$[% ActionsLoo.to_subfield | html %][% END %]
+                                                <span>to</span> [% ActionsLoo.to_field | html %][% IF ( ActionsLoo.to_subfield.length ) %]$[% ActionsLoo.to_subfield | html %][% END %]
 
                                                 [% IF ( ActionsLoo.to_regex_search ) %]
-                                                     using RegEx s<strong>/[% ActionsLoo.to_regex_search | html %]/[% ActionsLoo.to_regex_replace | html %]/[% ActionsLoo.to_regex_modifiers | html %]</strong>
+                                                     <span>using RegEx</span> s<strong>/[% ActionsLoo.to_regex_search | html %]/[% ActionsLoo.to_regex_replace | html %]/[% ActionsLoo.to_regex_modifiers | html %]</strong>
                                                 [% END %]
                                             [% END %]
 
                                             [% IF ( ActionsLoo.conditional ) %]
-                                                [% IF ( ActionsLoo.conditional_if ) %] if [% END %]
-                                                [% IF ( ActionsLoo.conditional_unless ) %] unless [% END %]
+                                                [% IF ( ActionsLoo.conditional_if ) %] <span>if</span> [% END %]
+                                                [% IF ( ActionsLoo.conditional_unless ) %] <span>unless</span> [% END %]
 
                                                 [% ActionsLoo.conditional_field | html %][% IF ( ActionsLoo.conditional_subfield.length ) %]$[% ActionsLoo.conditional_subfield | html %][% END %]
 
-                                                [% IF ( ActionsLoo.conditional_comparison_exists ) %] exists [% END %]
-                                                [% IF ( ActionsLoo.conditional_comparison_not_exists ) %] does not exist [% END %]
-                                                [% IF ( ActionsLoo.conditional_comparison_equals ) %] matches [% END %]
-                                                [% IF ( ActionsLoo.conditional_comparison_not_equals ) %] does not match [% END %]
+                                                [% IF ( ActionsLoo.conditional_comparison_exists ) %] <span>exists</span> [% END %]
+                                                [% IF ( ActionsLoo.conditional_comparison_not_exists ) %] <span>does not exist</span> [% END %]
+                                                [% IF ( ActionsLoo.conditional_comparison_equals ) %] <span>matches</span> [% END %]
+                                                [% IF ( ActionsLoo.conditional_comparison_not_equals ) %] <span>does not match</span> [% END %]
 
-                                                [% IF ( ActionsLoo.conditional_regex ) %] RegEx m/[% END %]<strong>[% ActionsLoo.conditional_value | html %]</strong>[% IF ( ActionsLoo.conditional_regex ) %]/[% END %]
+                                                [% IF ( ActionsLoo.conditional_regex ) %] <span>RegEx</span> m/[% END %]<strong>[% ActionsLoo.conditional_value | html %]</strong>[% IF ( ActionsLoo.conditional_regex ) %]/[% END %]
                                             [% END %]
                                         </td>
                                         <td>[% ActionsLoo.description | html %]</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
index c88238fab1..716f9a6a2b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
@@ -78,9 +78,9 @@
                 <div class="hint">
                     Note: No upload categories are defined.
                     [% IF ( CAN_user_parameters_manage_auth_values ) -%]
-                        Add values to the <a href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=UPLOAD">UPLOAD authorized value category</a> otherwise all uploads will be marked as temporary.
+                        <span>Add values to the <a href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=UPLOAD">UPLOAD authorized value category</a> otherwise all uploads will be marked as temporary.</span>
                     [% ELSE -%]
-                        An administrator must add values to the UPLOAD authorized value category otherwise all uploads will be marked as temporary.
+                        <span>An administrator must add values to the UPLOAD authorized value category otherwise all uploads will be marked as temporary.</span>
                     [% END %]
                 </div>
             [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
index a5881d04a5..323b3fa5c2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
@@ -348,7 +348,7 @@
                                     <td>
                                         [% IF ( loopro.module == 'MEMBERS' ) || ( loopro.module == 'CIRCULATION' ) || ( loopro.module == 'FINES' ) %]
                                             [% IF loopro.patron %]
-                                                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object | uri %]" title="Display member details."> [% IF ( loopro.object ) %][% IF ( loopro.patron.firstname ) || ( loopro.patron.surname ) %][% loopro.patron.firstname | html %] [% loopro.patron.surname | html %] ([% loopro.object | html %]) [% ELSE %]Member [% loopro.object | html %][% END %][% END %] </a>
+                                                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object | uri %]" title="Display member details."> [% IF ( loopro.object ) %][% IF ( loopro.patron.firstname ) || ( loopro.patron.surname ) %][% loopro.patron.firstname | html %] [% loopro.patron.surname | html %] ([% loopro.object | html %]) [% ELSE %]<span>Member</span> [% loopro.object | html %][% END %][% END %] </a>
                                             [% ELSE %]
                                                 [% loopro.object | html %]
                                             [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt
index 0310e41c5b..81567cb980 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt
@@ -41,7 +41,7 @@ Your list: [% shelfname | $raw %]
 
             <p>
             [% IF ( BIBLIO_RESULT.HASAUTHORS ) %]
-            <span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author | $raw %][% END %]
+            <span><span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author | $raw %][% END %]</span>
 
             [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %]
                 [% IF ( BIBLIO_RESULT.author ) %]; [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
index 2263737ec8..1e956323c1 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
@@ -113,17 +113,18 @@
                             [% ELSE %]
                                 [% IF ( HOLD.is_in_transit ) %]
                                     [% SET transfer = HOLD.item.get_transfer %]
-                                    Item in transit from <strong> [% Branches.GetName( transfer.frombranch ) | html %]</strong> since
+                                    [% branch_name = BLOCK %]<strong>[% Branches.GetName( transfer.frombranch ) | html %]</strong>[% END %]
+                                    <span>Item in transit from [% branch_name| $raw %] since</span>
                                     [% transfer.datesent | $KohaDates %]
                                 [% ELSIF ( HOLD.is_in_processing ) %]
-                                    Item in processing
+                                    <span>Item in processing</span>
                                 [% ELSIF ( HOLD.suspend ) %]
-                                    Suspended [% IF ( HOLD.suspend_until ) %] until [% HOLD.suspend_until | $KohaDates %] [% END %]
+                                    <span>Suspended</span>[% IF ( HOLD.suspend_until ) %] <span>until</span> [% HOLD.suspend_until | $KohaDates %][% END %]
                                 [% ELSE %]
                                     [% IF HOLD.itemtype %]
-                                        Pending for next available item of item type '[% ItemTypes.GetDescription( HOLD.itemtype ) | html %]'
+                                        <span>Pending for next available item of item type '[% ItemTypes.GetDescription( HOLD.itemtype ) | html %]'</span>
                                     [% ELSE %]
-                                        Pending
+                                        <span>Pending</span>
                                     [% END %]
                                 [% END %]
                             [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index 407e87d4b7..b60c696d56 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -339,9 +339,9 @@
                     <li class="nav-item">
                         <a id="library_page" href="/cgi-bin/koha/opac-library.pl">
                             [% IF ( singleBranchMode ) %]
-                                Library
+                                <span>Library</span>
                             [% ELSE %]
-                                Libraries
+                                <span>Libraries</span>
                             [% END %]
                         </a>
                     </li>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc
index 84f2b3082c..51c89e767f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc
@@ -2,11 +2,11 @@
     [% IF OpenOPACShelfBrowser %]
         <div id="shelfbrowser">
             <h5 style="text-align: center;" tabindex="-1">
-                [%- IF ( starting_homebranch ) %]Browsing [% starting_homebranch | html %] shelves[% END -%]
+                [%- IF ( starting_homebranch ) %]<span>Browsing [% starting_homebranch | html %] shelves</span>[% END -%]
                 [%- IF ( starting_homebranch && starting_location ) %], [% END %]
-                [%- IF ( starting_location ) %]Shelving location: [%- starting_location | html -%][% END -%]
+                [%- IF ( starting_location ) %]<span>Shelving location:</span> [%- starting_location | html -%][% END -%]
                 [%- IF ( starting_homebranch && starting_ccode ) %], [% END %]
-                [%- IF ( starting_ccode ) %]Collection: [%- starting_ccode | html -%][% END -%]
+                    [%- IF ( starting_ccode ) %]<span>Collection: [%- starting_ccode | html -%]</span>[% END -%]
                 <a style="font-size: 75%;" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | html %]" class="close_shelf" >Close shelf browser <span class="sr-only">(Hides shelf browser)</span></a>
             </h5>
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
index d650a87ca6..cec3b0951e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
@@ -41,7 +41,7 @@
                     [% ELSE %]
                         <h1>System maintenance</h1>
                             <p>
-                                The [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog is offline for system maintenance. We'll be back soon!
+                                <span>The [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog is offline for system maintenance. We'll be back soon!</span>
                                 [% IF ( Koha.Preference( 'ReplytoDefault' ) ) %]
                                     If you have any questions, please contact the <a href="mailto:[% Koha.Preference( 'ReplytoDefault' ) | $raw %]">site administrator</a>
                                 [% ELSIF ( Koha.Preference( 'KohaAdminEmailAddress' ) ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt
index 2e0d2d92a7..d4b06e1176 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt
@@ -2,7 +2,7 @@
 [% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
 [% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
 [% INCLUDE 'doc-head-open.inc' %]
-[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your payment
+[% IF ( LibraryNameTitle ) %]<span>[% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</span> &rsaquo; <span>Your payment</span>
 [% INCLUDE 'doc-head-close.inc' %]
 [% BLOCK cssinclude %][% END %]
 </head>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt
index 87f783ef65..c79ee3d2a4 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt
@@ -12,9 +12,9 @@
                         [% IF ( authorized ) %]
                             [% UNLESS ( newshelf ) %]
                                 [% IF ( multiple ) %]
-                                    <h1>Add [% total | html %] items to [% IF ( singleshelf ) %]<em>[% shelfname | html %]</em>: [% ELSE %]a list:[% END %]</h1>
+                                    <h1>Add [% total | html %] items to [% IF ( singleshelf ) %]<em>[% shelfname | html %]</em>: [% ELSE %]<span>a list:</span>[% END %]</h1>
                                 [% ELSE %]
-                                    <h1>Add to [% IF ( singleshelf ) %]<em>[% shelfname | html %]</em>[% ELSE %]a list:[% END %]</h1>
+                                    <h1>Add to [% IF ( singleshelf ) %]<em>[% shelfname | html %]</em>[% ELSE %]<span>a list:</span>[% END %]</h1>
                                 [% END %]
                                 <ul>
                                     [% FOREACH biblio IN biblios %]
@@ -99,9 +99,9 @@
                         [% ELSE %]
                             <p>
                                 [% IF (errcode==1) %]
-                                    Could not create new list. Please check if the name is unique.
+                                    <span>Could not create new list. Please check if the name is unique.</span>
                                 [% ELSE %]
-                                    Sorry, you cannot add items to this list.
+                                    <span>Sorry, you cannot add items to this list.</span>
                                 [% END %]
                             </p>
                         [% END # IF authorized %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
index 98562bdd36..6c7b01d34d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
@@ -161,10 +161,10 @@
                                 [% FOREACH advsearchloo IN advancedsearchesloop %]
                                     <li id="advsearch-tab-[% advsearchloo.advanced_search_type | html %]">
                                     <a href="#advsearch-[% advsearchloo.advanced_search_type | uri %]">
-                                   [% IF ( advsearchloo.advanced_search_type == 'itemtypes' ) %]Item type
-                                   [% ELSIF ( advsearchloo.advanced_search_type == 'ccode' ) %]Collection
-                                   [% ELSIF ( advsearchloo.advanced_search_type == 'loc' ) %]Shelving location
-                                   [% ELSE %]Something else
+                                   [% IF ( advsearchloo.advanced_search_type == 'itemtypes' ) %]<span>Item type</span>
+                                   [% ELSIF ( advsearchloo.advanced_search_type == 'ccode' ) %]<span>Collection</span>
+                                   [% ELSIF ( advsearchloo.advanced_search_type == 'loc' ) %]<span>Shelving location</span>
+                                   [% ELSE %]<span>Something else</span>
                                    [% END %]
                                    </a></li>
                                 [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt
index de580efaff..802c5f6f13 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt
@@ -19,9 +19,9 @@
                 <li class="breadcrumb-item active">
                     <a href="#" aria-current="page">
                         [% IF ( typeissue ) %]
-                            Subscribe to a subscription alert
+                            <span>Subscribe to a subscription alert</span>
                         [% ELSIF ( typeissuecancel ) %]
-                            Unsubscribe from a subscription alert
+                            <span>Unsubscribe from a subscription alert</span>
                         [% END %]
                     </a>
                 </li>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
index a39cd0a0c0..a62af151c9 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -1009,12 +1009,12 @@
                                                 [% IF ( listitem.biblionumber == biblionumber ) %]
                                                     <li id="li_pag_[% loop.count | html %]" class="highlight" title="Go to detail">
                                                         <span class="li_pag_index"><i class="fa fa-arrow-left" aria-hidden="true"></i> [% loop.count  + offset | html %]</span>
-                                                        <a href="opac-detail.pl?biblionumber=[% biblionumber | uri %]&amp;query_desc=[% query_desc |uri %]">[% title | html %]</a><br> [% IF ( author ) %]by [% author | html %][% END %]
+                                                        <a href="opac-detail.pl?biblionumber=[% biblionumber | uri %]&amp;query_desc=[% query_desc |uri %]">[% title | html %]</a><br> [% IF ( author ) %]<span>by</span> [% author | html %][% END %]
                                                     </li>
                                                 [% ELSE %]
                                                     <li id="li_pag_[% loop.count | html %]" title="Go to detail">
                                                         <span class="li_pag_index">[% loop.count + offset | html %]</span>
-                                                        <a href="opac-detail.pl?biblionumber=[% listitem.biblionumber | uri %]&amp;query_desc=[% query_desc |uri %]">[% listitem.title | html %]</a><br> [% IF ( listitem.author ) %]by [% listitem.author | html %][% END %]
+                                                        <a href="opac-detail.pl?biblionumber=[% listitem.biblionumber | uri %]&amp;query_desc=[% query_desc |uri %]">[% listitem.title | html %]</a><br> [% IF ( listitem.author ) %]<span>by</span> [% listitem.author | html %][% END %]
                                                     </li>
                                                 [% END # /IF listitem.biblionumber %]
                                             [% END # /FOREACH listitem %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt
index 57bcf25364..3b24ba9087 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt
@@ -165,18 +165,18 @@
                                                 </td>
                                                 <td>[% serial.serialseq | html %]</td>
                                                 <td>
-                                                    [% IF ( serial.status1 ) %]Expected[% END %]
-                                                    [% IF ( serial.status2 ) %]Arrived[% END %]
-                                                    [% IF ( serial.status3 ) %]Late[% END %]
-                                                    [% IF ( serial.status4 ) %]Missing[% END %]
-                                                        [% IF ( serial.status41 ) %]Missing (never received)[% END %]
-                                                        [% IF ( serial.status42 ) %]Missing (sold out)[% END %]
-                                                        [% IF ( serial.status43 ) %]Missing (damaged)[% END %]
-                                                        [% IF ( serial.status44 ) %]Missing (lost)[% END %]
-                                                    [% IF ( serial.status5 ) %]Not available[% END %]
-                                                    [% IF ( serial.status6 ) %]Delete[% END %]
-                                                    [% IF ( serial.status7 ) %]Claimed[% END %]
-                                                    [% IF ( serial.status8 ) %]Stopped[% END %]
+                                                    [% IF ( serial.status1 ) %]<span>Expected</span>[% END %]
+                                                    [% IF ( serial.status2 ) %]<span>Arrived</span>[% END %]
+                                                    [% IF ( serial.status3 ) %]<span>Late</span>[% END %]
+                                                    [% IF ( serial.status4 ) %]<span>Missing</span>[% END %]
+                                                        [% IF ( serial.status41 ) %]<span>Missing (never received)</span>[% END %]
+                                                        [% IF ( serial.status42 ) %]<span>Missing (sold out)</span>[% END %]
+                                                        [% IF ( serial.status43 ) %]<span>Missing (damaged)</span>[% END %]
+                                                        [% IF ( serial.status44 ) %]<span>Missing (lost)</span>[% END %]
+                                                    [% IF ( serial.status5 ) %]<span>Not available</span>[% END %]
+                                                    [% IF ( serial.status6 ) %]<span>Delete</span>[% END %]
+                                                    [% IF ( serial.status7 ) %]<span>Claimed</span>[% END %]
+                                                    [% IF ( serial.status8 ) %]<span>Stopped</span>[% END %]
                                                 </td>
                                                 <td class="subscriptionidfilterclass">[% serial.subscriptionid | html %]</td>
                                             </tr>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt
index 837775ef02..24d521d383 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt
@@ -149,15 +149,15 @@
                                         [% END %]
                                         <td>
                                         [% IF hold.found == 'F' %]
-                                            Fulfilled
+                                            <span>Fulfilled</span>
                                         [% ELSIF hold.cancellationdate %]
-                                            Cancelled
+                                            <span>Cancelled</span>
                                         [% ELSIF hold.found == 'W' %]
-                                            Waiting
+                                            <span>Waiting</span>
                                         [% ELSIF hold.found == 'T' %]
-                                            In transit
+                                            <span>In transit</span>
                                         [% ELSE %]
-                                            Pending
+                                            <span>Pending</span>
                                         [% END %]
                                         </td>
                                         </tr>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt
index 9566efa093..29b44767cd 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt
@@ -132,7 +132,7 @@
 
                 [% ELSE %]
                     <div id="library_info" class="maincontent">
-                        <h1>[% IF ( singleBranchMode ) %]Library[% ELSE %]Libraries[% END %]</h1>
+                        <h1>[% IF ( singleBranchMode ) %]<span>Library</span>[% ELSE %]<span>Libraries</span>[% END %]</h1>
 
                         [% FOREACH library IN libraries %]
                             <div class="section_library" id="section_[% library.branchcode | html %]">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
index 2b5abed26e..76fa790f8f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
@@ -128,15 +128,15 @@
                                 <i class="fa fa-rss" aria-hidden="true"></i>
                                 [% IF Branches.all.size == 1 %]
                                     [% IF branchcode %]
-                                        RSS feed for [% Branches.GetName( branchcode ) | html %] library news
+                                        <span>RSS feed for [% Branches.GetName( branchcode ) | html %] library news</span>
                                     [% ELSE %]
-                                        RSS feed for library news
+                                        <span>RSS feed for library news</span>
                                     [% END %]
                                 [% ELSE %]
                                     [% IF branchcode %]
-                                        RSS feed for [% Branches.GetName( branchcode ) | html %] and system-wide library news
+                                        <span>RSS feed for [% Branches.GetName( branchcode ) | html %] and system-wide library news</span>
                                     [% ELSE %]
-                                        RSS feed for system-wide library news
+                                        <span>RSS feed for system-wide library news</span>
                                     [% END %]
                                 [% END %]
                             </a>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
index c99ff825e0..e8eaaac6b8 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
@@ -62,21 +62,21 @@
                                         [% NEXT IF !Koha.Preference( 'ILLModule' ) && messaging_preference.message_name.match('^Ill_') %]
                                         [% NEXT IF messaging_preference.Auto_Renewals && Koha.Preference('AutoRenewalNotices') != 'preferences' %]
                                         <tr>
-                                            <td>[% IF ( messaging_preference.Item_Due ) %]Item due
-                                                [% ELSIF ( messaging_preference.Advance_Notice ) %]Advance notice
-                                                [% ELSIF ( messaging_preference.Hold_Filled ) %]Hold filled
-                                                [% ELSIF ( messaging_preference.Hold_Reminder ) %]Hold reminder
-                                                [% ELSIF ( messaging_preference.Item_Check_in ) %]Item check-in
+                                            <td>[% IF ( messaging_preference.Item_Due ) %]<span>Item due</span>
+                                                [% ELSIF ( messaging_preference.Advance_Notice ) %]<span>Advance notice</span>
+                                                [% ELSIF ( messaging_preference.Hold_Filled ) %]<span>Hold filled</span>
+                                                [% ELSIF ( messaging_preference.Hold_Reminder ) %]<span>Hold reminder</span>
+                                                [% ELSIF ( messaging_preference.Item_Check_in ) %]<span>Item check-in</span>
                                                 [% ELSIF ( messaging_preference.Item_Checkout ) %]
                                                     [% IF Koha.Preference( 'RenewalSendNotice' ) %]
-                                                        Item checkout and renewal
+                                                        <span>Item checkout and renewal</span>
                                                     [% ELSE %]
-                                                        Item checkout
+                                                        <span>Item checkout</span>
                                                     [% END %]
-                                                [% ELSIF ( messaging_preference.Ill_ready ) %]Interlibrary loan ready
-                                                [% ELSIF ( messaging_preference.Ill_unavailable ) %]Interlibrary loan unavailable
-                                                [% ELSIF ( messaging_preference.Auto_Renewals ) %]Auto renewal
-                                                [% ELSE %]Unknown [% END %]</td>
+                                                [% ELSIF ( messaging_preference.Ill_ready ) %]<span>Interlibrary loan ready</span>
+                                                [% ELSIF ( messaging_preference.Ill_unavailable ) %]<span>Interlibrary loan unavailable</span>
+                                                [% ELSIF ( messaging_preference.Auto_Renewals ) %]<span>Auto renewal</span>
+                                                [% ELSE %]<span>Unknown</span> [% END %]</td>
                                             [% IF ( messaging_preference.takes_days ) %]
                                                 <td><select class="input-mini" name="[% messaging_preference.message_attribute_id | html %]-DAYS">
                                                 [% FOREACH select_day IN messaging_preference.select_days %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
index 2c4402d06a..54f5b35025 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
@@ -43,20 +43,20 @@
                             <h2>There was a problem with your submission</h2>
                             <p>
                                 [% IF ( passwords_mismatch ) %]
-                                Passwords do not match.  Please re-type your new password.
+                                   <span>Passwords do not match.  Please re-type your new password.</span>
                                 [% END %]
                                 [% IF password_too_short %]
-                                    Password must be at least [% minPasswordLength | html %] characters long.
+                                    <span>Password must be at least [% minPasswordLength | html %] characters long.</span>
                                 [% END %]
                                 [% IF password_too_weak %]
-                                    Password must contain at least one digit, one lowercase and one uppercase.
+                                    <span>Password must contain at least one digit, one lowercase and one uppercase.</span>
                                 [% END %]
                                 [% IF password_has_whitespaces %]
-                                    Password must not contain leading or trailing whitespaces.
+                                    <span>Password must not contain leading or trailing whitespaces.</span>
                                 [% END %]
 
                                 [% IF ( WrongPass ) %]
-                                Your current password was entered incorrectly.  If this problem persists, please ask a librarian to reset your password for you.
+                                   <span>Your current password was entered incorrectly. If this problem persists, please ask a librarian to reset your password for you.</span>
                                 [% END %]
                             </p>
                         </div>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt
index 96c5cb5300..78a7d9f5ef 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt
@@ -78,19 +78,19 @@
                         <h2>Error</h2>
                         <p>
                         [% IF (sendmailError) %]
-                            An error has occurred while sending you the password recovery link.
-                            <br/>Please try again later.
+                            <span>An error has occurred while sending you the password recovery link.</span>
+                            <br/><span>Please try again later.</span>
                         [% ELSIF (errNoBorrowerFound) %]
-                            No account was found with the provided information.
+                            <span>No account was found with the provided information.</span>
                         [% ELSIF errResetForbidden %]
                             <span id="password-reset-forbidden">Sorry, your password cannot be changed online.</span>
                         [% ELSIF (errMultipleAccountsForEmail) %]
-                            Account identification with this email address only is ambiguous.
-                            <br />Please use the field 'Login' as well.
+                            <span>Account identification with this email address only is ambiguous.</span>
+                            <br /><span>Please use the field 'Login' as well.</span>
                         [% ELSIF (errNoBorrowerEmail) %]
-                            This account has no email address we can send the email to.
+                            <span>This account has no email address we can send the email to.</span>
                         [% ELSIF (errAlreadyStartRecovery) %]
-                            The process of password recovery has already been started for this account
+                            <span>The process of password recovery has already been started for this account</span>
                             [% IF username %]
                                 ("<strong>[% username | html %]</strong>")
                             [% ELSIF email %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt
index 57509713af..10c7f95510 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt
@@ -38,21 +38,21 @@
                 <div id="recall" class="maincontent">
                     <h1>Confirm recalls for: [% INCLUDE 'patron-title.inc' patron = logged_in_user %] ([% logged_in_user.cardnumber | html %])</h1>
                     [% IF nosyspref %]
-                        Recalls have not been enabled. Please contact your library.
+                        <span>Recalls have not been enabled. Please contact your library.</span>
                     [% ELSIF error == 'unavailable' %]
-                        There are no items available for recall.
+                        <span>There are no items available for recall.</span>
                         <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | uri %]">Return to [% biblio.title | html %]</a>
                     [% ELSE %]
                         [% IF error %]
                             <div class="dialog alert">
                                 [% IF error == 'duplicate' %]
-                                    You have reached the maximum number of recalls on this record.
+                                    <span>You have reached the maximum number of recalls on this record.</span>
                                 [% ELSIF error == 'unavailable' %]
-                                    There are no items available for recall.
+                                    <span>There are no items available for recall.</span>
                                 [% ELSIF error == 'cannot' %]
-                                    You cannot place a recall on this item.
+                                    <span>You cannot place a recall on this item.</span>
                                 [% ELSE %]
-                                    An error has occurred while attempting to place a recall. Please contact your library.
+                                    <span>An error has occurred while attempting to place a recall. Please contact your library.</span>
                                 [% END %]
                             </div>
                         [% END %]
@@ -142,9 +142,9 @@
                                                         [% IF ( item.recall ) %]
                                                             <span class="waiting">
                                                             [% IF ( item.recall.waitingdate ) %]
-                                                                Waiting for patron at [% Branches.GetName( item.recall.branchcode ) | html %] since [% item.recall.waitingdate | $KohaDates %].
+                                                                <span>Waiting for patron at [% Branches.GetName( item.recall.branchcode ) | html %]</span> <span>since</span> [% item.recall.waitingdate | $KohaDates %].
                                                             [% ELSE %]
-                                                                Recalled by patron expected at [% Branches.GetName( item.recall.branchcode ) | html %] since [% item.recall.recalldate | $KohaDates %].
+                                                                <span>Recalled by patron expected at [% Branches.GetName( item.recall.branchcode ) | html %]</span> <span>since</span> [% item.recall.recalldate | $KohaDates %].
                                                             [% END %]
                                                             </span>
                                                         [% ELSIF ( hold.waitingdate ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt
index 60f806be2f..6e2c6be819 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt
@@ -83,27 +83,27 @@
                                                     <td class="status">
                                                         <span class="tdlabel">Status:</span>
                                                         [% IF ( RECALL.in_transit ) %]
-                                                            In transit to [% RECALL.library.branchname | html %]
+                                                            <span>In transit to [% RECALL.library.branchname | html %]</span>
                                                         [% ELSIF ( RECALL.waiting ) %]
-                                                            Ready for pickup
+                                                            <span>Ready for pickup</span>
                                                         [% ELSIF ( RECALL.overdue ) %]
-                                                            Overdue to be returned
+                                                            <span>Overdue to be returned</span>
                                                         [% ELSIF ( RECALL.expired ) %]
-                                                            Expired on [% RECALL.expiration_date | $KohaDates %]
+                                                            <span>Expired on [% RECALL.expiration_date | $KohaDates %]</span>
                                                         [% ELSIF ( RECALL.cancelled ) %]
-                                                            Cancelled on [% RECALL.completed_date | $KohaDates %]
+                                                            <span>Cancelled on [% RECALL.completed_date | $KohaDates %]</span>
                                                         [% ELSIF ( RECALL.fulfilled ) %]
-                                                            Fulfilled
+                                                            <span>Fulfilled</span>
                                                         [% ELSE %]
-                                                            Requested
+                                                            <span>Requested</span>
                                                         [% END %]
                                                     </td>
                                                     <td class="due_date">
                                                         <span class="tdlabel">Due date</span>
                                                         [% IF ( RECALL.requested ) %]
-                                                            Due to be returned by [% RECALL.checkout.date_due | $KohaDates %]
+                                                            <span>Due to be returned by [% RECALL.checkout.date_due | $KohaDates %]</span>
                                                         [% ELSIF ( RECALL.waiting and RECALL.expiration_date ) %]
-                                                            Pick up by [% RECALL.expiration_date | $KohaDates %]
+                                                            <span>Pick up by [% RECALL.expiration_date | $KohaDates %]</span>
                                                         [% ELSE %]
                                                             -
                                                         [% END %]
@@ -125,10 +125,10 @@
                                     <table>
                                 </div>
                             [% ELSE %]
-                                No recalls have been made.
+                                <span>No recalls have been made.</span>
                             [% END # / # RECALLS.count %]
                         [% ELSE %]
-                            Recalls have not been enabled. Please contact your library.
+                            <span>Recalls have not been enabled. Please contact your library.</span>
                         [% END %]
                         </div> <!-- /#recalls -->
                     </div> <!-- /.col-md-12 -->
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
index 4e8b2d1ba2..28e8b64eec 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
@@ -35,7 +35,7 @@
                         [% IF ( GNA ) %]
                             <li id="gna">
                                 According to our records, we don't have up-to-date contact information. Please contact the library.
-                                <a href="/cgi-bin/koha/opac-memberentry.pl">[% IF ( Koha.Preference('OPACPatronDetails') ) %]Update your contact information[% ELSE %]Go to your contact information[% END %]</a>
+                                <a href="/cgi-bin/koha/opac-memberentry.pl">[% IF ( Koha.Preference('OPACPatronDetails') ) %]<span>Update your contact information</span>[% ELSE %]<span>Go to your contact information</span>[% END %]</a>
                                 [% IF ( Koha.Preference('OPACPatronDetails') ) %]<em>(Please note: there may be a delay in restoring your account if you submit online.)</em>[% END %]
                             </li>
                         [% END %]
@@ -144,9 +144,9 @@
                 [% IF (RESERVE_CHARGE) %]
                     <div class="alert" id="reserve_fee">
                         [% IF Koha.Preference('HoldFeeMode') == 'any_time_is_collected' %]
-                            You will be charged a hold fee of [% RESERVE_CHARGE | $Price %] when you collect this item
+                            <span>You will be charged a hold fee of [% RESERVE_CHARGE | $Price %] when you collect this item</span>
                         [% ELSE %]
-                            You will be charged a hold fee of [% RESERVE_CHARGE | $Price %] for placing this hold
+                            <span>You will be charged a hold fee of [% RESERVE_CHARGE | $Price %] for placing this hold</span>
                         [% END %]
                     </div>
                 [% END %]
@@ -170,11 +170,11 @@
                                 [% IF bibitemloo.forced_hold_level %]
                                     <div class="alert alert-info forced_hold_level">
                                         [% IF bibitemloo.forced_hold_level == 'item' %]
-                                            You already have at least one item level hold on this title.
-                                            All further holds must be item level.
+                                            <span>You already have at least one item level hold on this title.
+                                            All further holds must be item level.</span>
                                         [% ELSE %]
-                                            You already have at least one record level hold on this title.
-                                            All further holds must be record level.
+                                            <span>You already have at least one record level hold on this title.
+                                            All further holds must be record level.</span>
                                         [% END %]
                                     </div>
                                 [% END %]
@@ -439,17 +439,17 @@
                                                                 [% IF ( itemLoo.reservedate ) %]
                                                                     <span class="waiting">
                                                                         [% IF ( itemLoo.waitingdate ) %]
-                                                                            Waiting
+                                                                            <span>Waiting</span>
                                                                         [% ELSE %]
-                                                                            On hold
+                                                                            <span>On hold</span>
                                                                         [% END %]
-                                                                        for patron
+                                                                            <span>for patron</span>
                                                                         [% IF ( itemLoo.waitingdate ) %]
-                                                                            at
+                                                                            <span>at</span>
                                                                         [% ELSE %]
-                                                                            expected at
+                                                                            <span>expected at</span>
                                                                         [% END %]
-                                                                        [% itemLoo.ExpectedAtLibrary | html %] since
+                                                                        [% itemLoo.ExpectedAtLibrary | html %] <span>since</span>
                                                                         [% IF ( itemLoo.waitingdate ) %]
                                                                             [% itemLoo.waitingdate | $KohaDates %]
                                                                         [% ELSE %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt
index dc2f998029..cfbac7a6a5 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt
@@ -38,29 +38,29 @@
                                 <p>
                                     [% SWITCH error %]
                                         [% CASE  'no_change' %]
-                                            New password must not be the same as old password.
+                                            <span>New password must not be the same as old password.</span>
                                         [% CASE  'passwords_mismatch' %]
-                                            Passwords do not match.  Please re-type your new password.
+                                            <span>Passwords do not match.  Please re-type your new password.</span>
                                         [% CASE 'password_too_short' %]
-                                            Password must be at least [% minPasswordLength | html %] characters long.
+                                            <span>Password must be at least [% minPasswordLength | html %] characters long.</span>
                                         [% CASE 'password_too_weak' %]
-                                            Password must contain at least one digit, one lowercase and one uppercase.
+                                            <span>Password must contain at least one digit, one lowercase and one uppercase.</span>
                                         [% CASE 'password_has_whitespaces' %]
-                                            Password must not contain leading or trailing whitespaces.
+                                            <span>Password must not contain leading or trailing whitespaces.</span>
                                         [% CASE 'invalid_credentials' %]
-                                            You entered an incorrect username or password. Please try again! But note that passwords are case sensitive[% IF Koha.Preference('FailedLoginAttempts') %] and that your account will be locked out after a fixed number of failed login attempts[% END %]. Please contact a library staff member if you continue to have problems.
+                                            <span>You entered an incorrect username or password. Please try again! But note that passwords are case sensitive[% IF Koha.Preference('FailedLoginAttempts') %] and that your account will be locked out after a fixed number of failed login attempts[% END %]. Please contact a library staff member if you continue to have problems.</span>
                                         [% CASE 'no_expire' %]
-                                            Please log-in to account to update your password.</br>
+                                            <span>Please log-in to account to update your password.</span></br>
                                             <a href="/cgi-bin/koha/opac-user.pl" class="nav-link login-link loginModal-trigger"><i class="fa fa-user fa-icon-black fa-fw" aria-hidden="true"></i> <span class="userlabel">Log in to your account</span></a>.
                                         [% CASE 'account_locked' %]
                                             This account has been locked!
                                             [% IF Categories.can_any_reset_password && Koha.Preference('OpacBaseURL') %]
                                                 <a href="[% Koha.Preference('OpacBaseURL') | url %]/cgi-bin/koha/opac-password-recovery.pl">You must reset your password via e-mail</a>.
                                             [% ELSE %]
-                                                You must contact the library for assistance.
+                                                <span>You must contact the library for assistance.</span>
                                             [% END %]
                                         [% CASE %]
-                                            An unknown error occurred. Please try again or contact the library for assistance.
+                                            <span>An unknown error occurred. Please try again or contact the library for assistance.</span>
                                     [% END %]
                                 </p>
                             </div>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt
index 823e0bf0a5..00f93e7e0a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt
@@ -64,10 +64,10 @@ Your cart
 
             [% IF BIBLIO_RESULT.publishercode %]
             <span>
-                Published by: [% BIBLIO_RESULT.publishercode | $raw %]
+                <span>Published by: [% BIBLIO_RESULT.publishercode | $raw %]
                 [% IF ( BIBLIO_RESULT.publicationyear ) %]
                     in [% BIBLIO_RESULT.publicationyear | $raw %]
-                [% END %]
+                [% END %]</span>
                 [% IF ( BIBLIO_RESULT.pages ) %]
                     , [% BIBLIO_RESULT.pages | $raw %]
                 [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
index 755f1951fc..2197e4fe96 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
@@ -59,72 +59,72 @@
                                 <div id="subscriptionline[% subscription_LOO.subscriptionid | html %]" class="subscriptionline">
                                     <caption><h2>Subscription information for [% subscription_LOO.bibliotitle | html %]</h2><caption>
                                     <p>
-                                        The current subscription began on [% subscription_LOO.startdate | html %] and is issued
+                                        <span>The current subscription began on [% subscription_LOO.startdate | html %] and is issued</span>
                                         [% IF ( subscription_LOO.periodicity1 ) %]
-                                                twice per day
+                                                <span>twice per day</span>
                                         [% END %]
                                         [% IF ( subscription_LOO.periodicity2 ) %]
-                                                every day
+                                                <span>every day</span>
                                         [% END %]
                                         [% IF ( subscription_LOO.periodicity3 ) %]
-                                                three times per week
+                                                <span>three times per week</span>
                                         [% END %]
                                         [% IF ( subscription_LOO.periodicity4 ) %]
-                                                every week
+                                                <span>every week</span>
                                         [% END %]
                                         [% IF ( subscription_LOO.periodicity5 ) %]
-                                                every 2 weeks
+                                                <span>every 2 weeks</span>
                                         [% END %]
                                         [% IF ( subscription_LOO.periodicity6 ) %]
-                                                every 3 weeks
+                                                <span>every 3 weeks</span>
                                         [% END %]
                                         [% IF ( subscription_LOO.periodicity7 ) %]
-                                                every month
+                                                <span>every month</span>
                                         [% END %]
                                         [% IF ( subscription_LOO.periodicity8 ) %]
-                                                every 2 months
+                                                <span>every 2 months</span>
                                         [% END %]
                                         [% IF ( subscription_LOO.periodicity9 ) %]
-                                                every quarter
+                                                <span>every quarter</span>
                                         [% END %]
                                         [% IF ( subscription_LOO.periodicity10 ) %]
-                                                twice per year
+                                                <span>twice per year</span>
                                         [% END %]
                                         [% IF ( subscription_LOO.periodicity11 ) %]
-                                                every year
+                                                <span>every year</span>
                                         [% END %]
                                         [% IF ( subscription_LOO.periodicity12 ) %]
-                                                every 2 years
+                                                <span>every 2 years</span>
                                         [% END %]
                                         [% IF ( subscription_LOO.periodicity13 ) %]
-                                                irregularly
+                                                <span>irregularly</span>
                                         [% END %]
                                         [% IF ( subscription_LOO.arrival1 ) %]
-                                            on Monday
+                                                <span>on Monday</span>
                                         [% END %]
                                         [% IF ( subscription_LOO.arrival2 ) %]
-                                                on Tuesday
+                                                <span>on Tuesday</span>
                                         [% END %]
                                         [% IF ( subscription_LOO.arrival3 ) %]
-                                                on Wednesday
+                                                <span>on Wednesday</span>
                                         [% END %]
                                         [% IF ( subscription_LOO.arrival4 ) %]
-                                                on Thursday
+                                                <span>on Thursday</span>
                                         [% END %]
                                         [% IF ( subscription_LOO.arrival5 ) %]
-                                                on Friday
+                                                <span>on Friday</span>
                                         [% END %]
                                         [% IF ( subscription_LOO.arrival6 ) %]
-                                                on Saturday
+                                                <span>on Saturday</span>
                                         [% END %]
                                         [% IF ( subscription_LOO.arrival7 ) %]
-                                                on Sunday
+                                                <span>on Sunday</span>
                                         [% END %]
 
-                                        for
-                                            [% IF ( subscription_LOO.numberlength ) %][% subscription_LOO.numberlength | html %] issues[% END %]
-                                            [% IF ( subscription_LOO.weeklength ) %][% subscription_LOO.weeklength | html %] weeks[% END %]
-                                            [% IF ( subscription_LOO.monthlength ) %][% subscription_LOO.monthlength | html %] months[% END %]
+                                        <span>for</span>
+                                            [% IF ( subscription_LOO.numberlength ) %][% subscription_LOO.numberlength | html %] <span>issues</span>[% END %]
+                                            [% IF ( subscription_LOO.weeklength ) %][% subscription_LOO.weeklength | html %] <span>weeks</span>[% END %]
+                                            [% IF ( subscription_LOO.monthlength ) %][% subscription_LOO.monthlength | html %] <span>months</span>[% END %]
                                     </p>
                                     <p>The first subscription was started on  [% subscription_LOO.histstartdate | html %]</p>
                                     [% IF ( subscription_LOO.histenddate ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
index 05388eb3e8..e53cab6163 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
@@ -532,9 +532,9 @@
                             </div> <!-- / #toolbar -->
 
                             <div class="alert alert-info">
-                                This list is empty.
+                                <span>This list is empty.</span>
                                 [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
-                                    You can add to your lists from the results of any <a href="opac-main.pl">search</a>.
+                                    <span>You can add to your lists from the results of any <a href="opac-main.pl">search</a>.</span>
                                 [% END %]
                             </div>
 
@@ -689,12 +689,12 @@
                                             [% SET contents = s.get_contents %]
                                             <tr>
                                                 <td><a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | uri %]">[% s.shelfname | html %]</a></td>
-                                                <td>[% IF contents.count %][% contents.count | html %] [% IF contents.count == 1 %]item[% ELSE %]items[% END %][% ELSE %]Empty[% END %]</td>
+                                                <td>[% IF contents.count %][% contents.count | html %] [% IF contents.count == 1 %]<span>item</span>[% ELSE %]<span>items</span>[% END %][% ELSE %]<span>Empty</span>[% END %]</td>
                                                 <td>
                                                     [% IF s.is_private %]
-                                                        [% IF s.is_shared %]Shared[% ELSE %]Private[% END %]
+                                                        [% IF s.is_shared %]<span>Shared</span>[% ELSE %]<span>Private</span>[% END %]
                                                     [% ELSE %]
-                                                        Public
+                                                        <span>Public</span>
                                                     [% END %]
                                                 </td>
                                                 <td>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt
index 5404864f45..7821e5099f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt
@@ -88,10 +88,10 @@
                                             [% END %]
                                             <span class="commenter">
                                                 [% IF review.your_comment %]
-                                                    Added [% review.datereviewed | $KohaDates %] by you
+                                                    <span>Added [% review.datereviewed | $KohaDates %] by you</span>
                                                 [% ELSE %]
                                                     [% IF ( review.borrowernumber && ShowReviewer != "none" ) %]
-                                                        Added [% review.datereviewed | $KohaDates %] by
+                                                        <span>Added [% review.datereviewed | $KohaDates %] by</span>
                                                         [% SWITCH ShowReviewer %]
                                                             [% CASE 'full' %]
                                                                 [% review.borrtitle | html %] [% review.firstname | html %] [% review.surname | html %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
index d3a23f688e..0a2a26460f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
@@ -281,12 +281,12 @@
                         [% IF ( op_else ) %]
                             <h1>
                                 [% IF Koha.Preference( 'OPACViewOthersSuggestions' ) == 1 %]
-                                    Purchase suggestions
+                                    <span>Purchase suggestions</span>
                                 [% ELSE %]
                                     [% IF ( loggedinusername ) %]
-                                        Your purchase suggestions
+                                        <span>Your purchase suggestions</span>
                                     [% ELSE %]
-                                        Purchase suggestions
+                                        <span>Purchase suggestions</span>
                                     [% END %]
                                 [% END %]
                             </h1>
@@ -437,12 +437,12 @@
                                                     [% END %]
                                                     <td>
                                                         <span class="tdlabel">Status:</span>
-                                                        [% IF ( suggestions_loo.ASKED ) %]Requested
-                                                        [% ELSIF ( suggestions_loo.CHECKED ) %]Checked by the library
-                                                        [% ELSIF ( suggestions_loo.ACCEPTED ) %]Accepted by the library
-                                                        [% ELSIF ( suggestions_loo.ORDERED ) %]Ordered by the library
-                                                        [% ELSIF ( suggestions_loo.REJECTED ) %]Suggestion declined
-                                                        [% ELSIF ( suggestions_loo.AVAILABLE ) %]Available in the library
+                                                        [% IF ( suggestions_loo.ASKED ) %]<span>Requested</span>
+                                                        [% ELSIF ( suggestions_loo.CHECKED ) %]<span>Checked by the library</span>
+                                                        [% ELSIF ( suggestions_loo.ACCEPTED ) %]<span>Accepted by the library</span>
+                                                        [% ELSIF ( suggestions_loo.ORDERED ) %]<span>Ordered by the library</span>
+                                                        [% ELSIF ( suggestions_loo.REJECTED ) %]<span>Suggestion declined</span>
+                                                        [% ELSIF ( suggestions_loo.AVAILABLE ) %]<span>Available in the library</span>
                                                         [% ELSE %] [% AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS, 1 ) | html %] [% END %]
                                                         [% IF ( suggestions_loo.reason ) %]([% suggestions_loo.reason | html %])[% END %]
                                                     </td>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
index 8953297ab7..445ec01a03 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
@@ -64,21 +64,21 @@
                         [% IF ( ERRORS ) %]
                             [% FOREACH ERROR IN ERRORS %]
                                 <div class="alert alert-warning">
-                                    There was a problem with this operation:
+                                    <span>There was a problem with this operation:</span>
                                     [% IF ( ERROR.badparam ) %]
-                                        ERROR: illegal parameter [% ERROR.badparam | html %]
+                                        <span>ERROR: illegal parameter [% ERROR.badparam | html %]</span>
                                     [% ELSIF ( ERROR.login ) %]
-                                        ERROR: You must log in to complete that action.
+                                        <span>ERROR: You must log in to complete that action.</span>
                                     [% ELSIF ( ERROR.failed_delete ) %]
-                                        ERROR: You cannot delete the tag [% ERROR.failed_delete | html %].
-                                        <br />Note: you can only delete your own tags.
+                                        <span>ERROR: You cannot delete the tag [% ERROR.failed_delete | html %].</span>
+                                        <br /><span>Note: you can only delete your own tags.</span>
                                     [% ELSIF ( ERROR.scrubbed ) %]
-                                        Note: your tag contained markup code that was removed.
-                                        <br />The tag was added as &quot;[% ERROR.scrubbed | html %]&quot;.
+                                        <span>Note: your tag contained markup code that was removed.</span>
+                                        <br /><span>The tag was added as &quot;[% ERROR.scrubbed | html %]&quot;.</span>
                                     [% ELSIF ( ERROR.scrubbed_all_bad ) %]
-                                        Note: your tag was entirely markup code.  It was NOT added.
-                                        <br />Please try again with plain text.
-                                    [% ELSE %]Unrecognized error.
+                                        <span>Note: your tag was entirely markup code.  It was NOT added.</span>
+                                        <br /><span>Please try again with plain text.</span>
+                                    [% ELSE %]<span>Unrecognized error.</span>
                                     [% END %]
                                 </div>
                             [% END %]
@@ -89,9 +89,9 @@
                                 <div class="form-inline">
                                     <label>
                                         [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
-                                            Tags to show from other users:
+                                            <span>Tags to show from other users:</span>
                                         [% ELSE %]
-                                            Tags to show:
+                                            <span>Tags to show:</span>
                                         [% END %]
                                     </label>
                                     <input type="text" name="limit" class="form-control form-control-sm mr-2" maxlength="4" size="4" value="[% limit or '100' | html %]" />
@@ -127,7 +127,7 @@
                                 <div class="dialog message">[% added_count | html %] [% IF ( added_count == 1 ) %]tag[% ELSE %]tags[% END %] successfully added.</div>
                             [% END %]
                             [% IF ( deleted_count ) %]
-                            <div class="dialog message">[% deleted_count | html %] [% IF ( deleted_count == 1 ) %]tag[% ELSE %]tags[% END %] successfully deleted.</div>
+                                <div class="dialog message">[% deleted_count | html %] [% IF ( deleted_count == 1 ) %]tag[% ELSE %]tags[% END %] successfully deleted.</div>
                             [% END %]
                         [% END # /add_op %]
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index a8dcd2a5f8..b78a0cc857 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -148,7 +148,7 @@
                                 [% END %]
                                 [% IF ( borrower.gonenoaddress ) %]
                                     <li id="gonenoaddress"><strong>Please note:</strong> According to our records, we don't have up-to-date contact information. Please contact the library.
-                                <a href="/cgi-bin/koha/opac-memberentry.pl">[% IF ( Koha.Preference('OPACPatronDetails') ) %]Update your contact information[% ELSE %]Go to your contact information[% END %]</a>
+                                <a href="/cgi-bin/koha/opac-memberentry.pl">[% IF ( Koha.Preference('OPACPatronDetails') ) %]<span>Update your contact information</span>[% ELSE %]<span>Go to your contact information</span>[% END %]</a>
                                 [% IF ( Koha.Preference('OPACPatronDetails') ) %]<em>(Please note: there may be a delay in restoring your account if you submit online.)</em>[% END %]
                                     </li>
                                 [% END %]
@@ -431,11 +431,11 @@
                                                     <td class="fines">
                                                         <span class="tdlabel">Fines:</span>
                                                         [% IF ( ISSUE.charges ) %]
-                                                            Yes (Item overdue or lost)
+                                                            <span>Yes (Item overdue or lost)</span>
                                                         [% ELSIF ( ISSUE.rentalfines ) %]
-                                                            Yes (Rental fees)
+                                                            <span>Yes (Rental fees)</span>
                                                         [% ELSE %]
-                                                            No
+                                                            <span>No</span>
                                                         [% END %]
                                                     </td>
                                                 [% END %]
@@ -724,9 +724,9 @@
                                                         [% ELSIF ( OVERDUE.norenew_overdue ) %]
                                                             Not allowed<span class="renewals">(overdue)</span>
                                                         [% ELSIF ( OVERDUE.onreserve ) %]
-                                                            On hold
+                                                            <span>On hold</span>
                                                         [% ELSE %]
-                                                            No renewals left
+                                                            <span>No renewals left</span>
                                                         [% END %]
                                                     </td>
                                                 [% END %]
@@ -795,13 +795,13 @@
                                             <td class="status">
                                                 <span class="tdlabel">Status:</span>
                                                 [% IF ( RECALL.requested ) %]
-                                                    Requested
+                                                    <span>Requested</span>
                                                 [% ELSIF ( RECALL.overdue ) %]
-                                                    Overdue to be returned
+                                                    <span>Overdue to be returned</span>
                                                 [% ELSIF ( RECALL.in_transit ) %]
-                                                    In transit to [% RECALL.library.branchname | html %]
+                                                    <span>In transit to [% RECALL.library.branchname | html %]</span>
                                                 [% ELSIF ( RECALL.waiting ) %]
-                                                    Ready for pickup
+                                                    <span>Ready for pickup</span>
                                                 [% END %]
                                             </td>
                                             <td class="cancelrecall">
@@ -897,19 +897,19 @@
                                                     [% ar.patron_notes | html %]
                                                 </td>
 
-                                                <td class="article-request-format">[% IF ar.format == 'PHOTOCOPY' %]Copy[% ELSIF ar.format == 'SCAN' %]Scan[% END %]</td>
+                                                <td class="article-request-format">[% IF ar.format == 'PHOTOCOPY' %]<span>Copy</span>[% ELSIF ar.format == 'SCAN' %]<span>Scan</span>[% END %]</td>
 
                                                 <td class="article-request-status">
                                                     [% IF ar.status == 'PENDING' %]
-                                                        Pending
+                                                        <span>Pending</span>
                                                     [% ELSIF ar.status == 'PROCESSING' %]
-                                                        Processing
+                                                        <span>Processing</span>
                                                     [% ELSIF ar.status == 'REQUESTED' %]
-                                                        New
+                                                        <span>New</span>
                                                     [% ELSIF ar.status == 'COMPLETED' %]
-                                                        Completed
+                                                        <span>Completed</span>
                                                     [% ELSIF ar.status == 'CANCELED' %]
-                                                        Canceled
+                                                        <span>Canceled</span>
                                                     [% END %]
                                                 </td>
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
index b435b29501..7feec7e2fc 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
@@ -246,9 +246,9 @@
                                 <form id="scan_form" name="scan_form" method="post" action="/cgi-bin/koha/sco/sco-main.pl" onsubmit="return checkout_confirm('[% patronid | html %]');">
                                     <legend><h2>
                                         [% IF ( Koha.Preference('SCOAllowCheckin') ) %]
-                                            Check out, return, or renew an item:
+                                            <span>Check out, return, or renew an item:</span>
                                         [% ELSE %]
-                                            Check out or renew an item:
+                                            <span>Check out or renew an item:</span>
                                         [% END %]
                                         </h2></legend>
                                     <div class="row">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/text/explodedterms.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/text/explodedterms.tt
index 6f394ad1cd..2a21289e7e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/text/explodedterms.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/text/explodedterms.tt
@@ -1,8 +1,8 @@
 [%- SWITCH index -%]
 [%- CASE 'su-na' -%]
-Search also for narrower subjects
+<span>Search also for narrower subjects</span>
 [%- CASE 'su-br' -%]
-Search also for broader subjects
+<span>Search also for broader subjects</span>
 [%- CASE 'su-rl' -%]
-Search also for related subjects
+<span>Search also for related subjects</span>
 [%- END -%]
-- 
2.36.1