Attachment 76335 Details for Bug 20988 – Bug 20988: koha-tmpl/intranet-tmpl/prog/en/includes

[patch] Bug 20988: koha-tmpl/intranet-tmpl/prog/en/includes

Bug-20988-koha-tmplintranet-tmplprogenincludes.patch (text/plain), 478.66 KB, created by Julian Maurice on 2018-06-25 07:21:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2018-06-25 07:21:11 UTC

Size: 478.66 KB

patch

obsolete

>From ce1736123f8a2a092a0cab13fbd76b7a1233c4aa Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Mon, 25 Jun 2018 08:42:16 +0200
>Subject: [PATCH] Bug 20988: koha-tmpl/intranet-tmpl/prog/en/includes
>
>---
> .../prog/en/includes/account_offset_type.inc  |  11 +-
> .../prog/en/includes/accounttype.inc          |  43 +--
> .../includes/acquisitions-add-to-basket.inc   |  21 +-
> .../prog/en/includes/acquisitions-menu.inc    |  27 +-
> .../prog/en/includes/acquisitions-search.inc  |  19 +-
> .../prog/en/includes/acquisitions-toolbar.inc |  17 +-
> .../admin-items-search-field-form.inc         |  21 +-
> .../prog/en/includes/admin-menu.inc           |  83 ++---
> .../prog/en/includes/adv-search.inc           |  15 +-
> .../prog/en/includes/auth-finder-search.inc   | 107 +++---
> .../includes/authorities-search-results.inc   |  45 +--
> .../prog/en/includes/authorities-search.inc   | 121 +++----
> .../prog/en/includes/authorities-toolbar.inc  |  21 +-
> .../prog/en/includes/authorities.inc          |   5 +-
> .../prog/en/includes/av-build-dropbox.inc     |   5 +-
> .../prog/en/includes/biblio-view-menu.inc     |  23 +-
> .../prog/en/includes/blocked-fines.inc        |  11 +-
> .../prog/en/includes/blocking_errors.inc      |   5 +-
> .../prog/en/includes/borrower_debarments.inc  |  41 +--
> .../prog/en/includes/branch-selector.inc      |   3 +-
> .../en/includes/budgets-active-currency.inc   |   9 +-
> .../prog/en/includes/budgets-admin-search.inc |  25 +-
> .../en/includes/budgets-admin-toolbar.inc     |  25 +-
> .../prog/en/includes/cat-menu.inc             |   3 +-
> .../prog/en/includes/cat-search.inc           |  19 +-
> .../prog/en/includes/cat-toolbar.inc          | 101 +++---
> .../prog/en/includes/cataloging-search.inc    |  23 +-
> .../catalogue/itemsearch_item.csv.inc         |   3 +-
> .../catalogue/itemsearch_item.json.inc        |   7 +-
> .../en/includes/cateditor-widgets-marc21.inc  | 121 +++----
> .../prog/en/includes/checkin-search.inc       |  15 +-
> .../en/includes/checkouts-table-footer.inc    |   7 +-
> .../prog/en/includes/checkouts-table.inc      |  59 ++--
> .../prog/en/includes/circ-menu.inc            |  45 +--
> .../prog/en/includes/circ-nav.inc             |  35 +-
> .../includes/circ-patron-search-results.inc   |  19 +-
> .../prog/en/includes/circ-search.inc          |  19 +-
> .../prog/en/includes/cities-admin-search.inc  |  17 +-
> .../en/includes/contracts-admin-search.inc    |  17 +-
> .../en/includes/csv_headers/acqui/basket.tt   |   3 +-
> .../includes/csv_headers/acqui/basketgroup.tt |   3 +-
> .../includes/csv_headers/acqui/lateorders.tt  |   3 +-
> .../csv_headers/catalogue/itemsearch.tt       |   3 +-
> .../reports/cash_register_stats.tt            |   3 +-
> .../csv_headers/reports/orders_by_budget.tt   |   3 +-
> .../en/includes/currencies-admin-search.inc   |  17 +-
> .../prog/en/includes/date-format.inc          |   3 +-
> .../prog/en/includes/delimiter_text.inc       |  13 +-
> .../intranet-tmpl/prog/en/includes/facets.inc |  37 +-
> .../prog/en/includes/form-blocks.inc          |   4 +-
> .../prog/en/includes/guided-reports-view.inc  |  15 +-
> .../intranet-tmpl/prog/en/includes/header.inc |  67 ++--
> .../prog/en/includes/help-top.inc             |   3 +-
> .../prog/en/includes/home-search.inc          |  25 +-
> .../prog/en/includes/ill-toolbar.inc          |  13 +-
> .../prog/en/includes/labels-toolbar.inc       |  21 +-
> .../prog/en/includes/langmenu-staff-top.inc   |  11 +-
> .../prog/en/includes/letters-search.inc       |  17 +-
> .../includes/member-alt-address-style-de.inc  |  51 +--
> .../includes/member-alt-address-style-fr.inc  |  51 +--
> .../includes/member-alt-address-style-us.inc  |  51 +--
> .../includes/member-alt-contact-style-de.inc  |  39 +--
> .../includes/member-alt-contact-style-fr.inc  |  39 +--
> .../includes/member-alt-contact-style-us.inc  |  39 +--
> .../includes/member-main-address-style-de.inc |  37 +-
> .../includes/member-main-address-style-fr.inc |  37 +-
> .../includes/member-main-address-style-us.inc |  37 +-
> .../prog/en/includes/members-menu.inc         |  21 +-
> .../prog/en/includes/members-toolbar.inc      |  79 ++---
> .../prog/en/includes/merge-record.inc         |   7 +-
> .../en/includes/messaging-preference-form.inc | 107 ++----
> .../modals/serials_multi_receiving.inc        |  11 +-
> .../prog/en/includes/nl-search-form.tt        |   3 +-
> .../prog/en/includes/noadd-warnings.inc       |   7 +-
> .../prog/en/includes/onboarding_messages.inc  |  33 +-
> .../prog/en/includes/page-numbers.inc         |  11 +-
> .../en/includes/patron-article-requests.inc   |  37 +-
> .../prog/en/includes/patron-search-box.inc    |   3 +-
> .../prog/en/includes/patron-search.inc        |  85 ++---
> .../prog/en/includes/patron-title.inc         |   3 +-
> .../prog/en/includes/patron-toolbar.inc       |  11 +-
> .../prog/en/includes/patroncards-errors.inc   |  55 +--
> .../prog/en/includes/patroncards-toolbar.inc  |  25 +-
> .../prog/en/includes/patrons-admin-search.inc |  17 +-
> .../prog/en/includes/permissions.inc          | 217 ++++++------
> .../prog/en/includes/prefs-admin-search.inc   |  15 +-
> .../prog/en/includes/prefs-menu.inc           |  33 +-
> .../prog/en/includes/quotes-toolbar.inc       |   7 +-
> .../en/includes/quotes-upload-toolbar.inc     |   7 +-
> .../prog/en/includes/reports-menu.inc         |  53 +--
> .../prog/en/includes/reports-toolbar.inc      |  39 +--
> .../prog/en/includes/resort_form.inc          |  61 ++--
> .../includes/rotating-collections-toolbar.inc |   9 +-
> .../prog/en/includes/search_indexes.inc       |  67 ++--
> .../prog/en/includes/serials-menu.inc         |  17 +-
> .../prog/en/includes/serials-search.inc       |  25 +-
> .../prog/en/includes/serials-toolbar.inc      |  29 +-
> .../prog/en/includes/subscriptions-search.inc |  17 +-
> .../prog/en/includes/subtypes_unimarc.inc     | 321 +++++++++---------
> .../en/includes/suggestions-add-search.inc    |  23 +-
> .../prog/en/includes/tools-item-action.inc    |  11 +-
> .../prog/en/includes/tools-menu.inc           |  77 ++---
> .../prog/en/includes/tools-nomatch-action.inc |   5 +-
> .../prog/en/includes/tools-overlay-action.inc |   9 +-
> .../prog/en/includes/vendor-menu.inc          |  13 +-
> .../en/includes/virtualshelves-toolbar.inc    |  23 +-
> .../virtualshelves/merge/selection.tt         |   3 +-
> .../prog/en/includes/z3950-admin-search.inc   |  17 +-
> 108 files changed, 1765 insertions(+), 1706 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/account_offset_type.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/account_offset_type.inc
>index a36a883a86..3c2c520a33 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/account_offset_type.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/account_offset_type.inc
>@@ -1,8 +1,9 @@
>+[% PROCESS 'i18n.inc' %]
> [% SWITCH account_offset.type %]
>-    [% CASE 'Payment' %]Payment
>-    [% CASE 'Manual Debit' %]Manual invoice
>-    [% CASE 'Lost Item Return' %]Lost item returned
>-    [% CASE 'Writeoff' %]Writeoff
>-    [% CASE 'Void Payment' %]Void payment
>+    [% CASE 'Payment' %][% t('Payment') %]
>+    [% CASE 'Manual Debit' %][% t('Manual invoice') %]
>+    [% CASE 'Lost Item Return' %][% t('Lost item returned') %]
>+    [% CASE 'Writeoff' %][% t('Writeoff') %]
>+    [% CASE 'Void Payment' %][% t('Void payment') %]
>     [% CASE %][% account_offset.type %]
> [%- END -%]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounttype.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounttype.inc
>index 7d7cdc6109..80595842f1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounttype.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounttype.inc
>@@ -1,24 +1,25 @@
>+[% PROCESS 'i18n.inc' %]
> [% SWITCH account.accounttype %]
>-    [% CASE 'Pay' %]Payment, thanks
>-    [% CASE 'Pay00' %]Payment, thanks (cash via SIP2)
>-    [% CASE 'Pay01' %]Payment, thanks (VISA via SIP2)
>-    [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2)
>-    [% CASE 'VOID' %]Payment, Voided
>-    [% CASE 'N' %]New card
>-    [% CASE 'F' %]Fine
>-    [% CASE 'A' %]Account management fee
>-    [% CASE 'M' %]Sundry
>-    [% CASE 'L' %]Lost item
>-    [% CASE 'W' %]Writeoff
>-    [% CASE 'FU' %]Accruing fine
>-    [% CASE 'HE' %]Hold waiting too long
>-    [% CASE 'Rent' %]Rental fee
>-    [% CASE 'FOR' %]Forgiven
>-    [% CASE 'LR' %]Lost item fee refund
>-    [% CASE 'PF' %]Processing fee
>-    [% CASE 'PAY' %]Payment
>-    [% CASE 'WO' %]Writeoff
>-    [% CASE 'C' %]Credit
>-    [% CASE 'CR' %]Credit
>+    [% CASE 'Pay' %][% t('Payment, thanks') %]
>+    [% CASE 'Pay00' %][% t('Payment, thanks (cash via SIP2)') %]
>+    [% CASE 'Pay01' %][% t('Payment, thanks (VISA via SIP2)') %]
>+    [% CASE 'Pay02' %][% t('Payment, thanks (credit card via SIP2)') %]
>+    [% CASE 'VOID' %][% t('Payment, Voided') %]
>+    [% CASE 'N' %][% t('New card') %]
>+    [% CASE 'F' %][% t('Fine') %]
>+    [% CASE 'A' %][% t('Account management fee') %]
>+    [% CASE 'M' %][% t('Sundry') %]
>+    [% CASE 'L' %][% t('Lost item') %]
>+    [% CASE 'W' %][% t('Writeoff') %]
>+    [% CASE 'FU' %][% t('Accruing fine') %]
>+    [% CASE 'HE' %][% t('Hold waiting too long') %]
>+    [% CASE 'Rent' %][% t('Rental fee') %]
>+    [% CASE 'FOR' %][% t('Forgiven') %]
>+    [% CASE 'LR' %][% t('Lost item fee refund') %]
>+    [% CASE 'PF' %][% t('Processing fee') %]
>+    [% CASE 'PAY' %][% t('Payment') %]
>+    [% CASE 'WO' %][% t('Writeoff') %]
>+    [% CASE 'C' %][% t('Credit') %]
>+    [% CASE 'CR' %][% t('Credit') %]
>     [% CASE %][% account.accounttype %]
> [%- END -%]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc
>index 8e2961b6df..7c7bbfbc46 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc
>@@ -1,27 +1,28 @@
>+[% PROCESS 'i18n.inc' %]
> <fieldset class="acqui_basket_add">
>-    <legend>Add order to basket</legend>
>+    <legend>[% t('Add order to basket') %]</legend>
>     [% IF has_budgets %]
>       <ul>
>         <li>
>           <form action="/cgi-bin/koha/acqui/neworderbiblio.pl" method="post">
>-            <label>From an existing record:
>-                <input type="text"  size="25" name="q" />
>+            <label>[% t('From an existing record:') %]
>+                <input type="text" size="25" name="q" />
>             </label>
>             <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
>             <input type="hidden" name="basketno" value="[% basketno %]" />
>             <input type="submit" class="submit" value="Search" />
>           </form>
>         </li>
>-        <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">From a suggestion</a></li>
>-        <li><a href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">From a subscription</a></li>
>-        <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">From a new (empty) record</a></li>
>-        <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">From an external source</a></li>
>-        <li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]"> From a staged file</a></li>
>-        [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/reserveratios.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">From titles with highest hold ratios</a></li>[% END %]
>+        <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]">[% t('From a suggestion') %]</a></li>
>+        <li><a href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]">[% t('From a subscription') %]</a></li>
>+        <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]">[% t('From a new (empty) record') %]</a></li>
>+        <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]">[% t('From an external source') %]</a></li>
>+        <li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]"> [% t('From a staged file') %]</a></li>
>+        [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/reserveratios.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]">[% t('From titles with highest hold ratios') %]</a></li>[% END %]
>       </ul>
>     [% ELSE %]
>         <div class="dialog alert">
>-          <p>You can't create any orders unless you first <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">define a budget and a fund</a>.</p>
>+          <p>[% t('You can\'t create any orders unless you first') %] <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">[% t('define a budget and a fund') %]</a>.</p>
>         </div>
>     [% END %]
> </fieldset>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
>index 8d46d87939..4303738b19 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
>@@ -1,29 +1,30 @@
>+[% PROCESS 'i18n.inc' %]
> <div id="navmenu">
>     <div id="navmenulist">
>-        <h5>Acquisitions</h5>
>+        <h5>[% t('Acquisitions') %]</h5>
>         <ul>
>-            <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions home</a></li>
>-            <li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>
>-            [% IF ( suggestion ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% END %]
>-                <li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li>
>+            <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">[% t('Acquisitions home') %]</a></li>
>+            <li><a href="/cgi-bin/koha/acqui/lateorders.pl">[% t('Late orders') %]</a></li>
>+            [% IF ( suggestion ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">[% t('Suggestions') %]</a></li>[% END %]
>+                <li><a href="/cgi-bin/koha/acqui/invoices.pl">[% t('Invoices') %]</a></li>
>             [% IF CAN_user_acquisition_edi_manage %]
>-                <li><a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a></li>
>+                <li><a href="/cgi-bin/koha/acqui/edifactmsgs.pl">[% t('EDIFACT messages') %]</a></li>
>             [% END %]
>         </ul>
>         [% IF ( CAN_user_acquisition_budget_manage || CAN_user_parameters || CAN_user_acquisition_edi_manage ) %]
>-            <h5>Administration</h5>
>+            <h5>[% t('Administration') %]</h5>
>             <ul>
>-                <li><a href="/cgi-bin/koha/admin/admin-home.pl">Administration home</a></li>
>+                <li><a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration home') %]</a></li>
>                 [% IF ( CAN_user_acquisition_budget_manage ) %]
>-                    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li>
>-                    <li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>
>+                    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">[% t('Budgets') %]</a></li>
>+                    <li><a href="/cgi-bin/koha/admin/aqbudgets.pl">[% t('Funds') %]</a></li>
>                 [% END %]
>                 [% IF ( CAN_user_parameters ) %]
>-                    <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></li>
>+                    <li><a href="/cgi-bin/koha/admin/currency.pl">[% t('Currencies') %]</a></li>
>                 [% END %]
>                 [% IF CAN_user_acquisition_edi_manage %]
>-                    <li><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></li>
>-                    <li><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></li>
>+                    <li><a href="/cgi-bin/koha/admin/edi_accounts.pl">[% t('EDI accounts') %]</a></li>
>+                    <li><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">[% t('Library EANs') %]</a></li>
>                 [% END %]
>             </ul>
>         [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
>index 26ab7f1c70..c6ada45a29 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
>@@ -1,31 +1,32 @@
>+[% PROCESS 'i18n.inc' %]
> <div class="gradient">
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1>
> <div id="header_search">
> <div id="supplier_search" class="residentsearch">
>-	<p class="tip">Search vendors:</p>
>+	<p class="tip">[% t('Search vendors:') %]</p>
>         <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
>            <input type="text" size="25" name="supplier" id="supplier" class="focus" />
>             <input type="submit" class="submit" value="Submit" /></form>
> </div>
>     <div id="orders_search" class="residentsearch">
>-	<p class="tip">Search orders:</p>
>+	<p class="tip">[% t('Search orders:') %]</p>
> 	
> 		<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
>-        <label for="title">Title: </label> <input type="text" id="title" name="title" size="15" value="[% title %]" />
>-        <label for="searchsupplier">Vendor:</label> <input type="text" id="searchsupplier" name="name" size="15" value="[% name|html %]" />
>+        <label for="title">[% t('Title:') %] </label> <input type="text" id="title" name="title" size="15" value="[% title %]" />
>+        <label for="searchsupplier">[% t('Vendor:') %]</label> <input type="text" id="searchsupplier" name="name" size="15" value="[% name|html %]" />
>         <input type="hidden" id="do_search" name="do_search" value="do" />
>         <span class="filteraction" id="filteraction_off" style="display:none"> <a href="#" class="toggle_element" data-element="#filters,.filteraction">[-]</a></span>
>         <span class="filteraction" id="filteraction_on"> <a href="#" class="toggle_element" data-element="#filters,.filteraction">[+]</a></span>
>-    <input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced search</a>
>+    <input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">[% t('Advanced search') %]</a>
>     <p id="filters" style="display:none">
>-      <label for="basket">Basket: </label><input type="text" name="basket" id="basket" />
>-      <label for="booksellerinvoicenumber">Invoice no.: </label><input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" />
>+      <label for="basket">[% t('Basket:') %] </label><input type="text" name="basket" id="basket" />
>+      <label for="booksellerinvoicenumber">[% t('Invoice no.:') %] </label><input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" />
>     </p>
> 	</form>
> 	</div>	
> 			<ul id="tabtriggers">
>-            <li><a href="#supplier_search">Vendor search</a></li>
>-            <li><a href="#orders_search">Orders search</a></li>
>+            <li><a href="#supplier_search">[% t('Vendor search') %]</a></li>
>+            <li><a href="#orders_search">[% t('Orders search') %]</a></li>
> 			</ul>	
> </div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
>index 198c6cbbe3..4571634316 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% INCLUDE 'blocking_errors.inc' %]
> <script type="text/javascript">
> //<![CDATA[
>@@ -11,31 +12,31 @@ function confirm_deletion() {
> <div id="toolbar" class="btn-toolbar">
>     [% IF ( booksellerid ) %]
>         <div class="btn-group">
>-        <a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-plus"></i> New
>+        <a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-plus"></i> [% t('New') %]
>         <span class="caret"></span>
>         </a>
>         <ul class="dropdown-menu">
>             [% IF CAN_user_acquisition_order_manage && active %]
>-                <li><a href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&amp;op=add_form">Basket</a></li>
>+                <li><a href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&op=add_form">[% t('Basket') %]</a></li>
>             [% END %]
>             [% IF CAN_user_acquisition_contracts_manage && active %]
>-                <li><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid %]">Contract</a></li>
>+                <li><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid %]">[% t('Contract') %]</a></li>
>             [% END %]
>             [% IF ( CAN_user_acquisition_vendors_manage ) %]
>-                <li><a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">Vendor</a></li>
>+                <li><a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">[% t('Vendor') %]</a></li>
>             [% END %]
>         </ul>
>         </div>
>             [% IF ( CAN_user_acquisition_vendors_manage ) %]
>-                <div class="btn-group"><a class="btn btn-default btn-sm" id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&amp;op=enter"><i class="fa fa-pencil"></i> Edit vendor</a></div>
>+                <div class="btn-group"><a class="btn btn-default btn-sm" id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&op=enter"><i class="fa fa-pencil"></i> [% t('Edit vendor') %]</a></div>
>                 [% UNLESS ( basketcount OR subscriptioncount ) %]
>-                    <div class="btn-group"><a class="btn btn-default btn-sm" id="deletesupplier" href="javascript:confirm_deletion()"><i class="fa fa-trash"></i> Delete vendor</a></div>
>+                    <div class="btn-group"><a class="btn btn-default btn-sm" id="deletesupplier" href="javascript:confirm_deletion()"><i class="fa fa-trash"></i> [% t('Delete vendor') %]</a></div>
>                 [% END %]
>             [% END %]
>             [% IF CAN_user_acquisition_order_receive && basketcount %]
>-                <div class="btn-group"><a class="btn btn-default btn-sm" id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]"><i class="fa fa-inbox"></i> Receive shipments</a></div>
>+                <div class="btn-group"><a class="btn btn-default btn-sm" id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]"><i class="fa fa-inbox"></i> [% t('Receive shipments') %]</a></div>
>             [% END %]
>         [% ELSE %]
>-            <div class="btn-group"><a class="btn btn-default btn-sm" href="/cgi-bin/koha/acqui/supplier.pl?op=enter"><i class="fa fa-plus"></i> New vendor</a></div>
>+            <div class="btn-group"><a class="btn btn-default btn-sm" href="/cgi-bin/koha/acqui/supplier.pl?op=enter"><i class="fa fa-plus"></i> [% t('New vendor') %]</a></div>
>         [% END %]
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc
>index 4ab91b1836..fac8d9ad4f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc
>@@ -1,27 +1,28 @@
>+[% PROCESS 'i18n.inc' %]
> [% PROCESS 'html_helpers.inc' %]
> <ol>
>   <li>
>       [% IF field %]
>-          <span class="label">Name: </span>
>+          <span class="label">[% t('Name:') %] </span>
>           [% field.name |html %]
>           <input type="hidden" name="name" value="[% field.name %]">
>       [% ELSE %]
>-          <label class="required" for="name">Name: </label>
>+          <label class="required" for="name">[% t('Name:') %] </label>
>           <input type="text" name="name" id="name" class="required" required="required" />
>-          <span class="required">Required</span>
>+          <span class="required">[% t('Required') %]</span>
>       [% END %]
>   </li>
>   <li>
>-    <label class="required" for="label">Label: </label>
>+    <label class="required" for="label">[% t('Label:') %] </label>
>     [% IF field %]
>         <input type="text" name="label" id="label" value="[% field.label |html %]" class="required" required="required" />
>     [% ELSE %]
>         <input type="text" name="label" id="label" class="required" required="required" />
>     [% END %]
>-          <span class="required">Required</span>
>+          <span class="required">[% t('Required') %]</span>
>   </li>
>   <li>
>-    <label for="tagfield" required="required">MARC field: </label>
>+    <label for="tagfield" required="required">[% t('MARC field:') %] </label>
>     <select id="tagfield" name="tagfield" class="required" required="required">
>       [% FOREACH tagfield IN ['001'..'999'] %]
>         [% IF field && field.tagfield == tagfield %]
>@@ -31,10 +32,10 @@
>         [% END %]
>       [% END %]
>     </select>
>-    <span class="required">Required</span>
>+    <span class="required">[% t('Required') %]</span>
>   </li>
>   <li>
>-    <label for="tagsubfield">MARC subfield: </label>
>+    <label for="tagsubfield">[% t('MARC subfield:') %] </label>
>     <select id="tagsubfield" name="tagsubfield">
>       [% codes = [''] %]
>       [% codes = codes.merge([0..9], ['a'..'z']) %]
>@@ -48,9 +49,9 @@
>     </select>
>   </li>
>   <li>
>-    <label for="authorised_values_category">Authorised values category: </label>
>+    <label for="authorised_values_category">[% t('Authorised values category:') %] </label>
>     <select id="authorised_values_category" name="authorised_values_category">
>-      <option value="">- None -</option>
>+      <option value="">[% t('- None -') %]</option>
>       [% PROCESS options_for_authorised_value_categories authorised_value_categories => AuthorisedValues.GetCategories( selected => field.authorised_values_category ) %]
>     </select>
>   </li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
>index d41968e204..851cc5a87a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
>@@ -1,77 +1,78 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> 
> <div id="navmenu">
> <div id="navmenulist">
>-<h5>System preferences</h5>
>+<h5>[% t('System preferences') %]</h5>
> <ul>
>-    <li><a href="/cgi-bin/koha/admin/preferences.pl">System preferences</a></li>
>+    <li><a href="/cgi-bin/koha/admin/preferences.pl">[% t('System preferences') %]</a></li>
> </ul>
> 
>-<h5>Basic parameters</h5>
>+<h5>[% t('Basic parameters') %]</h5>
> <ul>
>-    <li><a href="/cgi-bin/koha/admin/branches.pl">Libraries</a></li>
>-    <li><a href="/cgi-bin/koha/admin/library_groups.pl">Library groups</a></li>
>-    <li><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></li>
>-    <li><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a></li>
>+    <li><a href="/cgi-bin/koha/admin/branches.pl">[% t('Libraries') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/library_groups.pl">[% t('Library groups') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/itemtypes.pl">[% t('Item types') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/authorised_values.pl">[% t('Authorized values') %]</a></li>
> </ul>
> 
>-<h5>Patrons and circulation</h5>
>+<h5>[% t('Patrons and circulation') %]</h5>
> <ul>
>-    <li><a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a></li>
>-    <li><a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fines rules</a></li>
>-    <li><a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron attribute types</a></li>
>-    <li><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Library transfer limits</a></li>
>-    <li><a href="/cgi-bin/koha/admin/transport-cost-matrix.pl">Transport cost matrix</a></li>
>-    <li><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item circulation alerts</a></li>
>-    <li><a href="/cgi-bin/koha/admin/cities.pl">Cities and towns</a></li>
>+    <li><a href="/cgi-bin/koha/admin/categories.pl">[% t('Patron categories') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/smart-rules.pl">[% t('Circulation and fines rules') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/patron-attr-types.pl">[% t('Patron attribute types') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">[% t('Library transfer limits') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/transport-cost-matrix.pl">[% t('Transport cost matrix') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">[% t('Item circulation alerts') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/cities.pl">[% t('Cities and towns') %]</a></li>
> </ul>
> 
>-<h5>Catalog</h5>
>+<h5>[% t('Catalog') %]</h5>
> <ul>
>-    <li><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC bibliographic framework</a></li>
>-    <li><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha to MARC mapping</a></li>
>-    <li><a href="/cgi-bin/koha/admin/fieldmapping.pl">Keywords to MARC mapping</a></li>
>-    <li><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC bibliographic framework test</a></li>
>-    <li><a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a></li>
>-    <li><a href="/cgi-bin/koha/admin/classsources.pl">Classification sources</a></li>
>-    <li><a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a></li>
>-    <li><a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a></li>
>-    <li><a href="/cgi-bin/koha/admin/items_search_fields.pl">Item search fields</a></li>
>+    <li><a href="/cgi-bin/koha/admin/biblio_framework.pl">[% t('MARC bibliographic framework') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/koha2marclinks.pl">[% t('Koha to MARC mapping') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/fieldmapping.pl">[% t('Keywords to MARC mapping') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/checkmarc.pl">[% t('MARC bibliographic framework test') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/authtypes.pl">[% t('Authority types') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/classsources.pl">[% t('Classification sources') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/matching-rules.pl">[% t('Record matching rules') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/oai_sets.pl">[% t('OAI sets configuration') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/items_search_fields.pl">[% t('Item search fields') %]</a></li>
>     [% IF Koha.Preference('SearchEngine') == 'Elasticsearch' %]
>-        <li><a href="/cgi-bin/koha/admin/searchengine/elasticsearch/mappings.pl">Search engine configuration</a></li>
>+        <li><a href="/cgi-bin/koha/admin/searchengine/elasticsearch/mappings.pl">[% t('Search engine configuration') %]</a></li>
>     [% END %]
> </ul>
> 
>-<h5>Acquisition parameters</h5>
>+<h5>[% t('Acquisition parameters') %]</h5>
> 
> <ul>
>-    <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies and exchange rates</a></li>
>-    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li>
>-    <li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>
>-    <li><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></li>
>-    <li><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></li>
>+    <li><a href="/cgi-bin/koha/admin/currency.pl">[% t('Currencies and exchange rates') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">[% t('Budgets') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/aqbudgets.pl">[% t('Funds') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/edi_accounts.pl">[% t('EDI accounts') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">[% t('Library EANs') %]</a></li>
> </ul>
> 
> [% IF CAN_user_plugins %]
>-<h5>Plugins</h5>
>+<h5>[% t('Plugins') %]</h5>
> 
> <ul>
>-    <li><a href="/cgi-bin/koha/plugins/plugins-home.pl">Manage plugins</a></li>
>+    <li><a href="/cgi-bin/koha/plugins/plugins-home.pl">[% t('Manage plugins') %]</a></li>
> </ul>
> [% END %]
> 
>-<h5>Additional parameters</h5>
>+<h5>[% t('Additional parameters') %]</h5>
> 
> <ul>
>     
>-    <li><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50/SRU servers</a></li>
>-    <li><a href="/cgi-bin/koha/admin/didyoumean.pl">Did you mean?</a></li>
>-    <li><a href="/cgi-bin/koha/admin/columns_settings.pl">Columns settings</a></li>
>-    <li><a href="/cgi-bin/koha/admin/audio_alerts.pl">Audio alerts</a></li>
>+    <li><a href="/cgi-bin/koha/admin/z3950servers.pl">[% t('Z39.50/SRU servers') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/didyoumean.pl">[% t('Did you mean?') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/columns_settings.pl">[% t('Columns settings') %]</a></li>
>+    <li><a href="/cgi-bin/koha/admin/audio_alerts.pl">[% t('Audio alerts') %]</a></li>
>     [% IF Koha.Preference('SMSSendDriver') == 'Email' %]
>-        <li><a href="/cgi-bin/koha/admin/sms_providers.pl">SMS cellular providers</a></li>
>+        <li><a href="/cgi-bin/koha/admin/sms_providers.pl">[% t('SMS cellular providers') %]</a></li>
>     [% END %]
>-    <li><a href="/cgi-bin/koha/admin/usage_statistics.pl">Share usage statistics</a></li>
>+    <li><a href="/cgi-bin/koha/admin/usage_statistics.pl">[% t('Share usage statistics') %]</a></li>
> </ul>
> </div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
>index cc1abab4c1..67ab449b7d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> <div class="gradient">
>     <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1>
> 
>@@ -6,14 +7,14 @@
>         [% INCLUDE 'patron-search-box.inc' %]
>         [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
>             <div id="checkin_search" class="residentsearch">
>-                <p class="tip">Scan a barcode to check in:</p>
>+                <p class="tip">[% t('Scan a barcode to check in:') %]</p>
>                 <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
>                     <input name="barcode" class="head-searchbox" id="ret_barcode" size="40" accesskey="r" />
>                     <input value="Submit" class="submit" type="submit" />
>                 </form>
>             </div>
>             <div id="renew_search" class="residentsearch">
>-                <p class="tip">Scan a barcode to renew:</p>
>+                <p class="tip">[% t('Scan a barcode to renew:') %]</p>
>                 <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
>                     <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
>                     <input value="Submit" class="submit" type="submit" />
>@@ -23,7 +24,7 @@
> 
>         [% IF CAN_user_borrowers_edit_borrowers %]
>             <div id="patron_search" class="residentsearch">
>-                <p class="tip">Enter patron card number or partial name:</p>
>+                <p class="tip">[% t('Enter patron card number or partial name:') %]</p>
>                 <form action="/cgi-bin/koha/members/member.pl" method="post">
>                     <input name="searchmember" class="head-searchbox" id="searchmember" size="40" type="text" />
>                     <input type="hidden" name="quicksearch" value="1" />
>@@ -34,16 +35,16 @@
> 
>         <ul>
>             [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
>-                <li><a class="keep_text" href="#circ_search">Check out</a></li>
>+                <li><a class="keep_text" href="#circ_search">[% t('Check out') %]</a></li>
>             [% END %]
>             [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
>-                <li><a class="keep_text" href="#checkin_search">Check in</a></li>
>+                <li><a class="keep_text" href="#checkin_search">[% t('Check in') %]</a></li>
>             [% END %]
>             [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
>-                <li><a class="keep_text" href="#renew_search">Renew</a></li>
>+                <li><a class="keep_text" href="#renew_search">[% t('Renew') %]</a></li>
>             [% END %]
>             [% IF CAN_user_borrowers_edit_borrowers %]
>-                <li><a class="keep_text" href="#patron_search">Search patrons</a></li>
>+                <li><a class="keep_text" href="#patron_search">[% t('Search patrons') %]</a></li>
>             [% END %]
>         </ul>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
>index 78746cb002..752e04adc9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
>@@ -1,40 +1,41 @@
>+[% PROCESS 'i18n.inc' %]
> [% PROCESS 'form-blocks.inc' %]
> 
> <div id="toolbar" class="btn-toolbar">
>-    <div class="btn-group"><a href="#" id="clear" class="btn btn-default btn-sm"><i class="fa fa-trash"></i> Clear field</a></div>
>-    <div class="btn-group"><a href="#" id="createnew" class="btn btn-default btn-sm"><i class="fa fa-plus"></i> Create new authority</a></div>
>+    <div class="btn-group"><a href="#" id="clear" class="btn btn-default btn-sm"><i class="fa fa-trash"></i> [% t('Clear field') %]</a></div>
>+    <div class="btn-group"><a href="#" id="createnew" class="btn btn-default btn-sm"><i class="fa fa-plus"></i> [% t('Create new authority') %]</a></div>
> </div>
> <form name="f" method="get" action="auth_finder.pl">
>             <input type="hidden" name="source" value="[% source %]" />
>             <input type="hidden" name="op" value="do_search" />
>             <input type="hidden" name="type" value="intranet" />
>             <input type="hidden" name="index" value="[% index %]" />
>-                <fieldset class="rows"><legend>Search options</legend>
>+                <fieldset class="rows"><legend>[% t('Search options') %]</legend>
>                 <ol><li>
>-                    <span class="label">Authority type: </span>
>+                    <span class="label">[% t('Authority type:') %] </span>
>                     [% authtypecode %]
>                     <input type="hidden" name="authtypecode" value="[% authtypecode %]" />
>                 </li>
>                 <li>
>-                    <label for="mainmainentry">Search main heading ($a only): </label>
>+                    <label for="mainmainentry">[% t('Search main heading ($a only):') %] </label>
>                     <input type="hidden" name="marclist" value="mainmainentry" />
>                     <input type="hidden" name="and_or" value="and" />
>                     <input type="hidden" name="excluding" value="" />
>                     <select name="operator" id="mainmainentry">
>                         [% IF ( operator_mainstr == 'contains' ) %]
>-                        <option value="contains" selected="selected">contains</option>
>+                        <option value="contains" selected="selected">[% t('contains') %]</option>
>                         [% ELSE %]
>-                        <option value="contains">contains</option>
>+                        <option value="contains">[% t('contains') %]</option>
>                         [% END %]
>                         [% IF ( operator_mainstr == 'start' ) %]
>-                        <option value="start" selected="selected">starts with</option>
>+                        <option value="start" selected="selected">[% t('starts with') %]</option>
>                         [% ELSE %]
>-                        <option value="start">starts with</option>
>+                        <option value="start">[% t('starts with') %]</option>
>                         [% END %]
>                         [% IF ( operator_mainstr == 'is' ) %]
>-                        <option value="is" selected="selected">is exactly</option>
>+                        <option value="is" selected="selected">[% t('is exactly') %]</option>
>                         [% ELSE %]
>-                        <option value="is">is exactly</option>
>+                        <option value="is">[% t('is exactly') %]</option>
>                         [% END %]
>                     </select>
>                     <input id="value_mainstr" style="width:400px;" type="text" name="value_mainstr" value="[% value_mainstr |html %]" />
>@@ -42,122 +43,122 @@
>                 </li>
> 
>                 <li>
>-                    <label for="mainentry">Search main heading: </label>
>+                    <label for="mainentry">[% t('Search main heading:') %] </label>
>                     <input type="hidden" name="marclist" value="mainentry" />
>                     <input type="hidden" name="and_or" value="and" />
>                     <input type="hidden" name="excluding" value="" />
>                     <select name="operator" id="mainentry">
>                         [% IF ( operator_main == 'contains' ) %]
>-                        <option value="contains" selected="selected">contains</option>
>+                        <option value="contains" selected="selected">[% t('contains') %]</option>
>                         [% ELSE %]
>-                        <option value="contains">contains</option>
>+                        <option value="contains">[% t('contains') %]</option>
>                         [% END %]
>                         [% IF ( operator_main == 'start' ) %]
>-                        <option value="start" selected="selected">starts with</option>
>+                        <option value="start" selected="selected">[% t('starts with') %]</option>
>                         [% ELSE %]
>-                        <option value="start">starts with</option>
>+                        <option value="start">[% t('starts with') %]</option>
>                         [% END %]
>                         [% IF ( operator_main == 'is' ) %]
>-                        <option value="is" selected="selected">is exactly</option>
>+                        <option value="is" selected="selected">[% t('is exactly') %]</option>
>                         [% ELSE %]
>-                        <option value="is">is exactly</option>
>+                        <option value="is">[% t('is exactly') %]</option>
>                         [% END %]
>                     </select>
>                     <input id="value_main" style="width:400px;" type="text" name="value_main" value="[% value_main |html %]" />
>                     <div id="yvaluecontainermainentry"></div>
>                 </li>
>                 <li>
>-                    <label for="marclistheading">Search all headings: </label>
>+                    <label for="marclistheading">[% t('Search all headings:') %] </label>
>                     <input type="hidden" name="marclist" value="match" />
>                     <input type="hidden" name="and_or" value="and" />
>                     <input type="hidden" name="excluding" value="" />
>                     <select name="operator" id="marclistheading">
>                         [% IF ( operator_match == 'contains' ) %]
>-                        <option value="contains" selected="selected">contains</option>
>+                        <option value="contains" selected="selected">[% t('contains') %]</option>
>                         [% ELSE %]
>-                        <option value="contains">contains</option>
>+                        <option value="contains">[% t('contains') %]</option>
>                         [% END %]
>                         [% IF ( operator_match == 'start' ) %]
>-                        <option value="start" selected="selected">starts with</option>
>+                        <option value="start" selected="selected">[% t('starts with') %]</option>
>                         [% ELSE %]
>-                        <option value="start">starts with</option>
>+                        <option value="start">[% t('starts with') %]</option>
>                         [% END %]
>                         [% IF ( operator_match == 'is' ) %]
>-                        <option value="is" selected="selected">is exactly</option>
>+                        <option value="is" selected="selected">[% t('is exactly') %]</option>
>                         [% ELSE %]
>-                        <option value="is">is exactly</option>
>+                        <option value="is">[% t('is exactly') %]</option>
>                         [% END %]
>                     </select>
>                     <input type="text" name="value_match" value="[% value_match |html %]" />
>                 </li>
>                 <li>
>-                    <label for="marclistanywhere">Search entire record: </label>
>+                    <label for="marclistanywhere">[% t('Search entire record:') %] </label>
>                     <input type="hidden" name="marclist" value="all" />
>                     <input type="hidden" name="and_or" value="and" />
>                     <input type="hidden" name="excluding" value="" />
>                     <select name="operator" id="marclistanywhere">
>                         [% IF ( operator_any == 'contains' ) %]
>-                        <option value="contains" selected="selected">contains</option>
>+                        <option value="contains" selected="selected">[% t('contains') %]</option>
>                         [% ELSE %]
>-                        <option value="contains">contains</option>
>+                        <option value="contains">[% t('contains') %]</option>
>                         [% END %]
>                         [% IF ( operator_any == 'start' ) %]
>-                        <option value="start" selected="selected">starts with</option>
>+                        <option value="start" selected="selected">[% t('starts with') %]</option>
>                         [% ELSE %]
>-                        <option value="start">starts with</option>
>+                        <option value="start">[% t('starts with') %]</option>
>                         [% END %]
>                         [% IF ( operator_any == 'is' ) %]
>-                        <option value="is" selected="selected">is exactly</option>
>+                        <option value="is" selected="selected">[% t('is exactly') %]</option>
>                         [% ELSE %]
>-                        <option value="is">is exactly</option>
>+                        <option value="is">[% t('is exactly') %]</option>
>                         [% END %]
>                     </select>
>                     <input id="value_any" style="width:400px;" type="text" name="value_any" value="[% value_any |html %]" />
>                     <div id="yvaluecontainermarclist"></div>
>                 </li>
>         <li>
>-        <label for="orderby">Sort by: </label>
>+        <label for="orderby">[% t('Sort by:') %] </label>
>         <select name="orderby" id="orderby">
>             [% IF ( orderby == 'HeadingAsc' ) %]
>-            <option value="HeadingAsc" selected="selected">Heading A-Z</option>
>+            <option value="HeadingAsc" selected="selected">[% t('Heading A-Z') %]</option>
>             [% ELSE %]
>-            <option value="HeadingAsc">Heading A-Z</option>
>+            <option value="HeadingAsc">[% t('Heading A-Z') %]</option>
>             [% END %]
>             [% IF ( orderby == 'HeadingDsc' ) %]
>-            <option value="HeadingDsc" selected="selected">Heading Z-A</option>
>+            <option value="HeadingDsc" selected="selected">[% t('Heading Z-A') %]</option>
>             [% ELSE %]
>-            <option value="HeadingDsc">Heading Z-A</option>
>+            <option value="HeadingDsc">[% t('Heading Z-A') %]</option>
>             [% END %]
>             [% IF ( orderby == '' && op ) %]
>-            <option value="" selected="selected">None</option>
>+            <option value="" selected="selected">[% t('None') %]</option>
>             [% ELSE %]
>-            <option value="">None</option>
>+            <option value="">[% t('None') %]</option>
>             [% END %]
>         </select>
>         </li></ol></fieldset>
>         [% IF source == 'auth' %]
>-        <fieldset class="rows"><legend>Relationship information</legend>
>+        <fieldset class="rows"><legend>[% t('Relationship information') %]</legend>
>             <ol>
>             <li>
>-                <label for="relationship">Special relationship: </label>
>+                <label for="relationship">[% t('Special relationship:') %] </label>
>                 <select name="relationship" id="relationship">
>                     [% selected=relationship %]
>-                    [% PROCESS selectoptionopen value='' %]None specified</option>
>-                    [% PROCESS selectoptionopen value='a' %]a - Earlier heading</option>
>-                    [% PROCESS selectoptionopen value='b' %]b - Later heading</option>
>-                    [% PROCESS selectoptionopen value='d' %]d - Acronym</option>
>-                    [% PROCESS selectoptionopen value='f' %]f - Musical composition</option>
>-                    [% PROCESS selectoptionopen value='g' %]g - Broader term</option>
>-                    [% PROCESS selectoptionopen value='h' %]h - Narrower term</option>
>-                    [% PROCESS selectoptionopen value='i' %]i - Reference instruction phrase in subfield $i</option>
>-                    [% PROCESS selectoptionopen value='n' %]n - Not applicable</option>
>-                    [% PROCESS selectoptionopen value='r' %]r - Relationship designation in $i or $4</option>
>-                    [% PROCESS selectoptionopen value='t' %]t - Immediate parent body</option>
>+                    [% PROCESS selectoptionopen value='' %][% t('None specified') %]</option>
>+                    [% PROCESS selectoptionopen value='a' %][% t('a - Earlier heading') %]</option>
>+                    [% PROCESS selectoptionopen value='b' %][% t('b - Later heading') %]</option>
>+                    [% PROCESS selectoptionopen value='d' %][% t('d - Acronym') %]</option>
>+                    [% PROCESS selectoptionopen value='f' %][% t('f - Musical composition') %]</option>
>+                    [% PROCESS selectoptionopen value='g' %][% t('g - Broader term') %]</option>
>+                    [% PROCESS selectoptionopen value='h' %][% t('h - Narrower term') %]</option>
>+                    [% PROCESS selectoptionopen value='i' %][% t('i - Reference instruction phrase in subfield $i') %]</option>
>+                    [% PROCESS selectoptionopen value='n' %][% t('n - Not applicable') %]</option>
>+                    [% PROCESS selectoptionopen value='r' %][% t('r - Relationship designation in $i or $4') %]</option>
>+                    [% PROCESS selectoptionopen value='t' %][% t('t - Immediate parent body') %]</option>
>                 </select>
>             </li>
>             </ol>
>         </fieldset>
>         [% END %]
>-        <fieldset class="action"> <input type="submit" value="Search" class="submit" id="search" /> <a id="cancel" class="cancel close" href="#">Cancel</a>
>+        <fieldset class="action"> <input type="submit" value="Search" class="submit" id="search" /> <a id="cancel" class="cancel close" href="#">[% t('Cancel') %]</a>
>         </fieldset>
> </form>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc
>index 1b4efda72c..242b0459a2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% BLOCK showreference %]
> [%# Parameters: %]
> [%# heading: the heading itself %]
>@@ -10,13 +11,13 @@
>     [% IF marcflavour == 'UNIMARC' %]
>         [% SWITCH type %]
>         [% CASE 'broader' %]
>-            <span class="BT"><abbr title="Broader Term">BT</abbr>: [% heading | html %]</span>
>+            <span class="BT"><abbr title="[% t('Broader Term') %]">[% t('BT') %]</abbr>: [% heading | html %]</span>
>         [% CASE 'narrower' %]
>-            <span class="NT"><abbr title="Narrower Term">NT</abbr>: [% heading | html %]</span>
>+            <span class="NT"><abbr title="[% t('Narrower Term') %]">[% t('NT') %]</abbr>: [% heading | html %]</span>
>         [% CASE 'seefrom' %]
>-            <span class="UF"><abbr title="Used For">UF</abbr>: [% heading | html %]</span>
>+            <span class="UF"><abbr title="[% t('Used For') %]">[% t('UF') %]</abbr>: [% heading | html %]</span>
>         [% CASE 'seealso' %]
>-            <span class="RT"><abbr title="Related Term">RT</abbr>: [% heading | html %]</span>
>+            <span class="RT"><abbr title="[% t('Related Term') %]">[% t('RT') %]</abbr>: [% heading | html %]</span>
>         [% END %]
>     [% ELSE %]
>         <span class="heading">
>@@ -33,13 +34,13 @@
>         [% UNLESS ( type=='seefrom' || type=='seealso' ) %]
>         <span class="type">
>             [% SWITCH type %]
>-            [% CASE 'earlier' %](Earlier heading)
>-            [% CASE 'later' %](Later heading)
>-            [% CASE 'acronym' %](Acronym)
>-            [% CASE 'musical' %](Musical composition)
>-            [% CASE 'broader' %](Broader heading)
>-            [% CASE 'narrower' %](Narrower heading)
>-            [% CASE 'parent' %](Immediate parent body)
>+            [% CASE 'earlier' %][% t('(Earlier heading)') %]
>+            [% CASE 'later' %][% t('(Later heading)') %]
>+            [% CASE 'acronym' %][% t('(Acronym)') %]
>+            [% CASE 'musical' %][% t('(Musical composition)') %]
>+            [% CASE 'broader' %][% t('(Broader heading)') %]
>+            [% CASE 'narrower' %][% t('(Narrower heading)') %]
>+            [% CASE 'parent' %][% t('(Immediate parent body)') %]
>             [% CASE %][% IF type %]([% type | html %])
>             [% END %]
>         [% END %]
>@@ -97,7 +98,7 @@
>         [% ELSE %]
>             [% IF ( summary.seefrom.size >= 1 ) %]
>             <div class="seefrom">
>-                <span class="seefrom">used for/see from:</span>
>+                <span class="seefrom">[% t('used for/see from:') %]</span>
>                 [% FOREACH seefro IN summary.seefrom %]
>                     <div class="authref">
>                     [%# Following on one line for translatability %]
>@@ -108,7 +109,7 @@
>             [% END %]
>             [% IF ( summary.seealso.size >= 1 ) %]
>             <div class="seealso">
>-                <span class="seealso">see also:</span>
>+                <span class="seealso">[% t('see also:') %]</span>
>                 [% FOREACH seeals IN summary.seealso %]
>                     <div class="authref">
>                     [%# Following on one line for translatability %]
>@@ -122,15 +123,15 @@
> [% END %]
> [% BLOCK language %]
>   [% SWITCH lang %]
>-   [% CASE ['en', 'eng'] %]English
>-   [% CASE ['fr', 'fre'] %]French
>-   [% CASE ['it', 'ita'] %]Italian
>-   [% CASE ['de', 'ger', 'deu'] %]German
>-   [% CASE ['es', 'spa'] %]Spanish
>-   [% CASE ['heb'] %]Hebrew
>-   [% CASE ['ara'] %]Arabic
>-   [% CASE ['gre'] %]Greek (modern)
>-   [% CASE ['grc'] %]Greek (to 1453)
>+   [% CASE ['en', 'eng'] %][% t('English') %]
>+   [% CASE ['fr', 'fre'] %][% t('French') %]
>+   [% CASE ['it', 'ita'] %][% t('Italian') %]
>+   [% CASE ['de', 'ger', 'deu'] %][% t('German') %]
>+   [% CASE ['es', 'spa'] %][% t('Spanish') %]
>+   [% CASE ['heb'] %][% t('Hebrew') %]
>+   [% CASE ['ara'] %][% t('Arabic') %]
>+   [% CASE ['gre'] %][% t('Greek (modern)') %]
>+   [% CASE ['grc'] %][% t('Greek (to 1453)') %]
>    [% CASE %][% lang %]
>   [% END %]
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
>index 1f4bab7e2c..b65be243ab 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
>@@ -1,14 +1,15 @@
>+[% PROCESS 'i18n.inc' %]
> <div class="gradient">
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1>
> 
> <div id="header_search" class="residentsearch">
>     <div id="mainmain_heading" class="residentsearch">
>-    <p class="tip">Enter main heading ($a only):</p>
>+    <p class="tip">[% t('Enter main heading ($a only):') %]</p>
>     <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
>         <input type="hidden" name="op" value="do_search" />
>         <input type="hidden" name="type" value="intranet" />
>         <select name="authtypecode">
>-        [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %]
>+        [% IF (marcflavour == 'UNIMARC' ) %]<option value="">[% t('All authority types') %]</option>[% END %]
>         [% FOREACH authority_type IN authority_types %]
>             [% IF authority_type.authtypecode == authtypecode %]
>             <option value="[% authority_type.authtypecode%]" selected="selected">[% authority_type.authtypetext %]</option>
>@@ -22,49 +23,49 @@
>         <input type="hidden" name="excluding" value="" />
>         <select name="operator">
>             [% IF ( operator == 'contains' ) %]
>-            <option value="contains" selected="selected">contains</option>
>+            <option value="contains" selected="selected">[% t('contains') %]</option>
>             [% ELSE %]
>-            <option value="contains">contains</option>
>+            <option value="contains">[% t('contains') %]</option>
>             [% END %]
>             [% IF ( operator == 'start' ) %]
>-            <option value="start" selected="selected">starts with</option>
>+            <option value="start" selected="selected">[% t('starts with') %]</option>
>             [% ELSE %]
>-            <option value="start">starts with</option>
>+            <option value="start">[% t('starts with') %]</option>
>             [% END %]
>             [% IF ( operator == 'is' ) %]
>-            <option value="is" selected="selected">is exactly</option>
>+            <option value="is" selected="selected">[% t('is exactly') %]</option>
>             [% ELSE %]
>-            <option value="is">is exactly</option>
>+            <option value="is">[% t('is exactly') %]</option>
>             [% END %]
>         </select>
>         <input id="value_mainentry" type="text" name="value" value="[% value | html%]" class="head-searchbox" />
>         <select name="orderby">
>             [% IF ( orderby == 'HeadingAsc' ) %]
>-            <option value="HeadingAsc" selected="selected">Heading A-Z</option>
>+            <option value="HeadingAsc" selected="selected">[% t('Heading A-Z') %]</option>
>             [% ELSE %]
>-            <option value="HeadingAsc">Heading A-Z</option>
>+            <option value="HeadingAsc">[% t('Heading A-Z') %]</option>
>             [% END %]
>             [% IF ( orderby == 'HeadingDsc' ) %]
>-            <option value="HeadingDsc" selected="selected">Heading Z-A</option>
>+            <option value="HeadingDsc" selected="selected">[% t('Heading Z-A') %]</option>
>             [% ELSE %]
>-            <option value="HeadingDsc">Heading Z-A</option>
>+            <option value="HeadingDsc">[% t('Heading Z-A') %]</option>
>             [% END %]
>             [% IF ( orderby == '' && op ) %]
>-            <option value="" selected="selected">None</option>
>+            <option value="" selected="selected">[% t('None') %]</option>
>             [% ELSE %]
>-            <option value="">None</option>
>+            <option value="">[% t('None') %]</option>
>             [% END %]
>         </select>
>         <input type="submit" class="submit" value="Submit" />
>     </form>
>     </div>
>     <div id="main_heading" class="residentsearch">
>-    <p class="tip">Enter main heading:</p>
>+    <p class="tip">[% t('Enter main heading:') %]</p>
>     <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
>         <input type="hidden" name="op" value="do_search" />
>         <input type="hidden" name="type" value="intranet" />
>         <select name="authtypecode">
>-        [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %]
>+        [% IF (marcflavour == 'UNIMARC' ) %]<option value="">[% t('All authority types') %]</option>[% END %]
>         [% FOREACH authority_type IN authority_types %]
>             [% IF authority_type.authtypecode == authtypecode %]
>             <option value="[% authority_type.authtypecode %]" selected="selected">[% authority_type.authtypetext %]</option>
>@@ -78,49 +79,49 @@
>         <input type="hidden" name="excluding" value="" />
>         <select name="operator">
>             [% IF ( operator == 'contains' ) %]
>-            <option value="contains" selected="selected">contains</option>
>+            <option value="contains" selected="selected">[% t('contains') %]</option>
>             [% ELSE %]
>-            <option value="contains">contains</option>
>+            <option value="contains">[% t('contains') %]</option>
>             [% END %]
>             [% IF ( operator == 'start' ) %]
>-            <option value="start" selected="selected">starts with</option>
>+            <option value="start" selected="selected">[% t('starts with') %]</option>
>             [% ELSE %]
>-            <option value="start">starts with</option>
>+            <option value="start">[% t('starts with') %]</option>
>             [% END %]
>             [% IF ( operator == 'is' ) %]
>-            <option value="is" selected="selected">is exactly</option>
>+            <option value="is" selected="selected">[% t('is exactly') %]</option>
>             [% ELSE %]
>-            <option value="is">is exactly</option>
>+            <option value="is">[% t('is exactly') %]</option>
>             [% END %]
>         </select>
>         <input id="value_mainentry" type="text" name="value" value="[% value | html%]" class="head-searchbox" />
>         <select name="orderby">
>             [% IF ( orderby == 'HeadingAsc' ) %]
>-            <option value="HeadingAsc" selected="selected">Heading A-Z</option>
>+            <option value="HeadingAsc" selected="selected">[% t('Heading A-Z') %]</option>
>             [% ELSE %]
>-            <option value="HeadingAsc">Heading A-Z</option>
>+            <option value="HeadingAsc">[% t('Heading A-Z') %]</option>
>             [% END %]
>             [% IF ( orderby == 'HeadingDsc' ) %]
>-            <option value="HeadingDsc" selected="selected">Heading Z-A</option>
>+            <option value="HeadingDsc" selected="selected">[% t('Heading Z-A') %]</option>
>             [% ELSE %]
>-            <option value="HeadingDsc">Heading Z-A</option>
>+            <option value="HeadingDsc">[% t('Heading Z-A') %]</option>
>             [% END %]
>             [% IF ( orderby == '' && op ) %]
>-            <option value="" selected="selected">None</option>
>+            <option value="" selected="selected">[% t('None') %]</option>
>             [% ELSE %]
>-            <option value="">None</option>
>+            <option value="">[% t('None') %]</option>
>             [% END %]
>         </select>
>         <input type="submit" class="submit" value="Submit" />
>     </form>
>     </div>
>     <div id="matchheading_search" class="residentsearch">
>-    <p class="tip">Enter any heading:</p>
>+    <p class="tip">[% t('Enter any heading:') %]</p>
>     <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
>         <input type="hidden" name="op" value="do_search" />
>         <input type="hidden" name="type" value="intranet" />
>         <select name="authtypecode">
>-        [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %]
>+        [% IF (marcflavour == 'UNIMARC' ) %]<option value="">[% t('All authority types') %]</option>[% END %]
>         [% FOREACH authority_type IN authority_types %]
>             [% IF authority_type.authtypecode == authtypecode %]
>             <option value="[% authority_type.authtypecode %]" selected="selected">[% authority_type.authtypetext %]</option>
>@@ -132,49 +133,49 @@
>         <input type="hidden" name="marclist" value="match" />
>         <select name="operator">
>             [% IF ( operator == 'contains' ) %]
>-            <option value="contains" selected="selected">contains</option>
>+            <option value="contains" selected="selected">[% t('contains') %]</option>
>             [% ELSE %]
>-            <option value="contains">contains</option>
>+            <option value="contains">[% t('contains') %]</option>
>             [% END %]
>             [% IF ( operator == 'start' ) %]
>-            <option value="start" selected="selected">starts with</option>
>+            <option value="start" selected="selected">[% t('starts with') %]</option>
>             [% ELSE %]
>-            <option value="start">starts with</option>
>+            <option value="start">[% t('starts with') %]</option>
>             [% END %]
>             [% IF ( operator == 'is' ) %]
>-            <option value="is" selected="selected">is exactly</option>
>+            <option value="is" selected="selected">[% t('is exactly') %]</option>
>             [% ELSE %]
>-            <option value="is">is exactly</option>
>+            <option value="is">[% t('is exactly') %]</option>
>             [% END %]
>         </select>
>         <input id="value_matchheading" type="text" name="value" value="[% value | html %]" class="head-searchbox" />
>         <select name="orderby">
>             [% IF ( orderby == 'HeadingAsc' ) %]
>-            <option value="HeadingAsc" selected="selected">Heading A-Z</option>
>+            <option value="HeadingAsc" selected="selected">[% t('Heading A-Z') %]</option>
>             [% ELSE %]
>-            <option value="HeadingAsc">Heading A-Z</option>
>+            <option value="HeadingAsc">[% t('Heading A-Z') %]</option>
>             [% END %]
>             [% IF ( orderby == 'HeadingDsc' ) %]
>-            <option value="HeadingDsc" selected="selected">Heading Z-A</option>
>+            <option value="HeadingDsc" selected="selected">[% t('Heading Z-A') %]</option>
>             [% ELSE %]
>-            <option value="HeadingDsc">Heading Z-A</option>
>+            <option value="HeadingDsc">[% t('Heading Z-A') %]</option>
>             [% END %]
>             [% IF ( orderby == '' && op ) %]
>-            <option value="" selected="selected">None</option>
>+            <option value="" selected="selected">[% t('None') %]</option>
>             [% ELSE %]
>-            <option value="">None</option>
>+            <option value="">[% t('None') %]</option>
>             [% END %]
>          </select>
>          <input type="submit" class="submit" value="Submit" />
>     </form>
>     </div>
>     <div id="entire_record" class="residentsearch">
>-    <p class="tip">Enter any authority field:</p>
>+    <p class="tip">[% t('Enter any authority field:') %]</p>
>     <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
>         <input type="hidden" name="op" value="do_search" />
>         <input type="hidden" name="type" value="intranet" />
>         <select name="authtypecode">
>-        [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %]
>+        [% IF (marcflavour == 'UNIMARC' ) %]<option value="">[% t('All authority types') %]</option>[% END %]
>         [% FOREACH authority_type IN authority_types %]
>             [% IF authority_type.authtypecode == authtypecode %]
>             <option value="[% authority_type.authtypecode %]" selected="selected">[% authority_type.authtypetext %]</option>
>@@ -188,47 +189,47 @@
>         <input type="hidden" name="excluding" value="" />
>         <select name="operator">
>             [% IF ( operator == 'contains' ) %]
>-            <option value="contains" selected="selected">contains</option>
>+            <option value="contains" selected="selected">[% t('contains') %]</option>
>             [% ELSE %]
>-            <option value="contains">contains</option>
>+            <option value="contains">[% t('contains') %]</option>
>             [% END %]
>             [% IF ( operator == 'start' ) %]
>-            <option value="start" selected="selected">starts with</option>
>+            <option value="start" selected="selected">[% t('starts with') %]</option>
>             [% ELSE %]
>-            <option value="start">starts with</option>
>+            <option value="start">[% t('starts with') %]</option>
>             [% END %]
>             [% IF ( operator == 'is' ) %]
>-            <option value="is" selected="selected">is exactly</option>
>+            <option value="is" selected="selected">[% t('is exactly') %]</option>
>             [% ELSE %]
>-            <option value="is">is exactly</option>
>+            <option value="is">[% t('is exactly') %]</option>
>             [% END %]
>         </select>
>         <input id="value_anywhere" type="text" name="value" value="[% value | html %]" class="head-searchbox" />
>         <select name="orderby">
>             [% IF ( orderby == 'HeadingAsc' ) %]
>-            <option value="HeadingAsc" selected="selected">Heading A-Z</option>
>+            <option value="HeadingAsc" selected="selected">[% t('Heading A-Z') %]</option>
>             [% ELSE %]
>-            <option value="HeadingAsc">Heading A-Z</option>
>+            <option value="HeadingAsc">[% t('Heading A-Z') %]</option>
>             [% END %]
>             [% IF ( orderby == 'HeadingDsc' ) %]
>-            <option value="HeadingDsc" selected="selected">Heading Z-A</option>
>+            <option value="HeadingDsc" selected="selected">[% t('Heading Z-A') %]</option>
>             [% ELSE %]
>-            <option value="HeadingDsc">Heading Z-A</option>
>+            <option value="HeadingDsc">[% t('Heading Z-A') %]</option>
>             [% END %]
>             [% IF ( orderby == '' && op ) %]
>-            <option value="" selected="selected">None</option>
>+            <option value="" selected="selected">[% t('None') %]</option>
>             [% ELSE %]
>-            <option value="">None</option>
>+            <option value="">[% t('None') %]</option>
>             [% END %]
>         </select>
>         <input type="submit" class="submit" value="Submit" />
>     </form>
>     </div>
>     <ul>
>-        <li><a class="keep_text" href="#mainmain_heading">Search main heading ($a only)</a></li>
>-        <li><a class="keep_text" href="#main_heading">Search main heading</a></li>
>-        <li><a class="keep_text" href="#matchheading_search">Search all headings</a></li>
>-        <li><a class="keep_text" href="#entire_record">Search entire record</a></li>
>+        <li><a class="keep_text" href="#mainmain_heading">[% t('Search main heading ($a only)') %]</a></li>
>+        <li><a class="keep_text" href="#main_heading">[% t('Search main heading') %]</a></li>
>+        <li><a class="keep_text" href="#matchheading_search">[% t('Search all headings') %]</a></li>
>+        <li><a class="keep_text" href="#entire_record">[% t('Search entire record') %]</a></li>
>     </ul>
> </div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc
>index b42074a380..efb64f0fdb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% INCLUDE 'blocking_errors.inc' %]
> [% IF ( authid || CAN_user_editauthorities) %]
> 
>@@ -5,29 +6,29 @@
> 
> [% IF ( authid ) %]
>     [% IF ( CAN_user_editauthorities ) %]
>-        <div class="btn-group"><a class="btn btn-default btn-sm" id="editAuth" href="authorities.pl?authid=[% authid %]"><i class="fa fa-pencil"></i> Edit</a></div>
>-        <div class="btn-group"><a class="btn btn-default btn-sm" id="dupAuth" href="authorities.pl?authid=[% authid %]&amp;op=duplicate"><i class="fa fa-copy"></i> Duplicate</a></div>
>+        <div class="btn-group"><a class="btn btn-default btn-sm" id="editAuth" href="authorities.pl?authid=[% authid %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a></div>
>+        <div class="btn-group"><a class="btn btn-default btn-sm" id="dupAuth" href="authorities.pl?authid=[% authid %]&op=duplicate"><i class="fa fa-copy"></i> [% t('Duplicate') %]</a></div>
>         [% UNLESS ( count ) %]
>-            <div class="btn-group"><a href="#" class="btn btn-default btn-sm" id="delAuth"><i class="fa fa-trash"></i> Delete</a></div>
>+            <div class="btn-group"><a href="#" class="btn btn-default btn-sm" id="delAuth"><i class="fa fa-trash"></i> [% t('Delete') %]</a></div>
>         [% END %]
>     [% END %]
> 
>     <div class="btn-group">
>-        <a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-download"></i> Save
>+        <a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-download"></i> [% t('Save') %]
>         <span class="caret"></span>
>         </a>
>         <ul class="dropdown-menu">
>-            <li><a href="/cgi-bin/koha/authorities/export.pl?format=mads&amp;op=export&amp;authid=[% authid %]">MADS (XML)</a></li>
>-            <li><a href="/cgi-bin/koha/authorities/export.pl?format=marcxml&amp;op=export&amp;authid=[% authid %]">MARCXML</a></li>
>-            <li><a href="/cgi-bin/koha/authorities/export.pl?format=marc8&amp;op=export&amp;authid=[% authid %]">MARC (non-Unicode/MARC-8)</a></li>
>-            <li><a href="/cgi-bin/koha/authorities/export.pl?format=utf8&amp;op=export&amp;authid=[% authid %]">MARC (Unicode/UTF-8)</a></li>
>+            <li><a href="/cgi-bin/koha/authorities/export.pl?format=mads&op=export&authid=[% authid %]">[% t('MADS (XML)') %]</a></li>
>+            <li><a href="/cgi-bin/koha/authorities/export.pl?format=marcxml&op=export&authid=[% authid %]">[% t('MARCXML') %]</a></li>
>+            <li><a href="/cgi-bin/koha/authorities/export.pl?format=marc8&op=export&authid=[% authid %]">[% t('MARC (non-Unicode/MARC-8)') %]</a></li>
>+            <li><a href="/cgi-bin/koha/authorities/export.pl?format=utf8&op=export&authid=[% authid %]">[% t('MARC (Unicode/UTF-8)') %]</a></li>
>         </ul>
>     </div>
> [% END %]
> 
> [% IF ( CAN_user_editauthorities ) %]
>     <div class="btn-group">
>-        <a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-plus"></i> New authority
>+        <a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-plus"></i> [% t('New authority') %]
>         <span class="caret"></span>
>         </a>
>         <ul class="dropdown-menu">
>@@ -38,7 +39,7 @@
>     </div>
>     [% IF servers.count > 0 %]
>         <div class="btn-group">
>-            <a class="btn btn-default btn-sm" id="z3950submit" href="#"><i class="fa fa-search"></i> New from Z39.50</a>
>+            <a class="btn btn-default btn-sm" id="z3950submit" href="#"><i class="fa fa-search"></i> [% t('New from Z39.50') %]</a>
>         </div>
>     [% END %]
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc
>index 9e173c9ab1..b3246ab188 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% BLOCK showhierarchy %]
>     [% FOREACH tree IN trees %]
>         [% PROCESS showtree tree = tree %]
>@@ -8,9 +9,9 @@
>         [% FOREACH node IN tree %]
>             <li id="hier[% node.authid %]" class="[% node.class %] authnode">
>             [% IF ( node.current_value ) %]
>-                <span class='currentauth'>[% node.value | html %]</span>
>+                <span class="currentauth">[% node.value | html %]</span>
>             [% ELSE %]
>-                <a href="detail.pl?authid=[% node.authid %]" title="Term">[% node.value | html %]</a>
>+                <a href="detail.pl?authid=[% node.authid %]" title="[% t('Term') %]">[% node.value | html %]</a>
>             [% END %]
>             [% IF ( node.children && node.children.size > 0 ) %]
>                 [% PROCESS showtree tree = node.children %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/av-build-dropbox.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/av-build-dropbox.inc
>index e2270b858f..6b30e84f68 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/av-build-dropbox.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/av-build-dropbox.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE AuthorisedValues %]
> [%# Parameters: %]
> [%# name: the name of the select element %]
>@@ -11,8 +12,8 @@
> [% DEFAULT class = '' size = 20 %]
> 
> [% IF avs %]
>-  <select id="[% name %]" name="[% name %]" class="[% class %]" >
>-  [% IF all %]<option value="">All</option>[% END %]
>+  <select id="[% name %]" name="[% name %]" class="[% class %]">
>+  [% IF all %]<option value="">[% t('All') %]</option>[% END %]
>   [% FOR av IN avs %]
>     [% IF av.authorised_value == default %]
>       <option value="[% av.authorised_value %]" selected="selected">[% av.lib | html_entity %]</option>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
>index f0b2a8fa93..fc5289e2e4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> [% USE Biblio %]
> [% SET biblio_object_id = object || biblionumber || biblio.biblionumber %]
>@@ -5,41 +6,41 @@
> <div id="menu">
> <ul>
>     [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]
>-    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio_object_id | url  %]">Normal</a></li>
>+    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio_object_id | url  %]">[% t('Normal') %]</a></li>
> 
> [% IF ( can_view_MARC ) %]
> [% IF ( marcview ) %]<li class="active">[% ELSE %]<li>[% END %]
>-<a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% biblio_object_id | url  %]">MARC</a></li>
>+<a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% biblio_object_id | url  %]">[% t('MARC') %]</a></li>
> [% END %]
> 
> [% IF ( can_view_labeledMARC ) %]
>     [% IF ( labeledmarcview ) %]<li class="active">[% ELSE %]<li>[% END %]
>-    <a href="/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=[% biblio_object_id | url  %]">Labeled MARC</a></li>
>+    <a href="/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=[% biblio_object_id | url  %]">[% t('Labeled MARC') %]</a></li>
> [% END %]
> 
> [% IF ( can_view_ISBD ) %]
>     [% IF ( isbdview ) %]<li class="active">[% ELSE %]<li>[% END %]
>-    <a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=[% biblio_object_id | url  %]">ISBD</a></li>
>+    <a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=[% biblio_object_id | url  %]">[% t('ISBD') %]</a></li>
> [% END %]
> 
>     [% IF ( moredetailview ) %]<li class="active">[% ELSE %]<li>[% END %]
>-    <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio_object_id | url  %]">Items</a></li>
>+    <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio_object_id | url  %]">[% t('Items') %]</a></li>
>     [% IF ( CAN_user_reserveforothers ) %]
>-    [% IF ( holdsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblio_object_id | url  %]">Holds ([% Biblio.HoldsCount( biblio_object_id ) %])</a></li>
>+    [% IF ( holdsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblio_object_id | url  %]">[% t('Holds (') %][% Biblio.HoldsCount( biblio_object_id ) %])</a></li>
>     [% END %]
>-    [% IF ( EasyAnalyticalRecords ) %][% IF ( analyze ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio_object_id | url  %]&amp;analyze=1">Analytics</a></li>[% END %]
>+    [% IF ( EasyAnalyticalRecords ) %][% IF ( analyze ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio_object_id | url  %]&analyze=1">[% t('Analytics') %]</a></li>[% END %]
> 
>     [% IF Koha.Preference('ArticleRequests') %]
>         [% IF ( article_requests_view ) %]<li class="active">[% ELSE %]<li>[% END %]
>-        <a href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% IF ( object ) %][% object %][% ELSE %][% biblionumber %][% END %]">Article requests ([% Biblio.ArticleRequestsActiveCount( biblio_object_id ) %])</a></li>
>+        <a href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% IF ( object ) %][% object %][% ELSE %][% biblionumber %][% END %]">[% t('Article requests (') %][% Biblio.ArticleRequestsActiveCount( biblio_object_id ) %])</a></li>
>     [% END %]
> 
>-    [% IF ( subscriptionsnumber ) %]<li><a href="/cgi-bin/koha/serials/serials-search.pl?searched=1&amp;biblionumber=[% biblio_object_id | url  %]">Subscription(s)</a></li>[% END %]
>+    [% IF ( subscriptionsnumber ) %]<li><a href="/cgi-bin/koha/serials/serials-search.pl?searched=1&biblionumber=[% biblio_object_id | url  %]">[% t('Subscription(s)') %]</a></li>[% END %]
> </ul>
> <ul>
> [% IF ( issuehistoryview ) %]<li class="active">[% ELSE %]<li>[% END %]
>-<a href="/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=[% biblio_object_id | url  %]" >Checkout history</a></li>
>-[% IF ( CAN_user_tools_view_system_logs ) %][% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=CATALOGUING&amp;action=MODIFY&amp;object=[% biblio_object_id | url  %]">Modification log</a> </li>[% END %]
>+<a href="/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=[% biblio_object_id | url  %]">[% t('Checkout history') %]</a></li>
>+[% IF ( CAN_user_tools_view_system_logs ) %][% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&modules=CATALOGUING&action=MODIFY&object=[% biblio_object_id | url  %]">[% t('Modification log') %]</a> </li>[% END %]
> </ul>
> </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc
>index 1cbe84ffa8..5c7d0a957f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc
>@@ -1,13 +1,14 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Price %]
> [% SET NoIssuesCharge = Koha.Preference('noissuescharge') %]
> [% IF fines and fines > 0 %]
>     <li>
>-        <span class="circ-hlt">Fees &amp; Charges:</span>
>-        Patron has outstanding fees &amp; charges of [% fines | $Price %].
>+        <span class="circ-hlt">[% t('Fees &amp; Charges:') %]</span>
>+        [% t('Patron has outstanding fees &amp; charges of') %] [% fines | $Price %].
>         [% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge && fines > NoIssuesCharge %]
>-           <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
>+           <span class="circ-hlt">[% t('Checkouts are BLOCKED because fine balance is OVER THE LIMIT.') %]</span>
>         [% END %]
>-        <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]" class="btn btn-default btn-xs" >Make payment</a>
>-        <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% borrowernumber %]" class="btn btn-default btn-xs" >Pay all fines</a></li>
>+        <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]" class="btn btn-default btn-xs">[% t('Make payment') %]</a>
>+        <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% borrowernumber %]" class="btn btn-default btn-xs">[% t('Pay all fines') %]</a></li>
>     </li>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/blocking_errors.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/blocking_errors.inc
>index 4be8110e46..ad8df72ed2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/blocking_errors.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/blocking_errors.inc
>@@ -1,8 +1,9 @@
>+[% PROCESS 'i18n.inc' %]
> [% IF blocking_error %]
>     [% SWITCH blocking_error %]
>     [% CASE 'unknown_patron' %]
>-        <div class="dialog message">This patron does not exist. <a href="/cgi-bin/koha/members/members-home.pl">Find another patron?</a></div>
>-    [% CASE 'cannot_see_patron_infos' %]You are not allowed to see the information of this patron.
>+        <div class="dialog message">[% t('This patron does not exist.') %] <a href="/cgi-bin/koha/members/members-home.pl">[% t('Find another patron?') %]</a></div>
>+    [% CASE 'cannot_see_patron_infos' %][% t('You are not allowed to see the information of this patron.') %]
>     [% CASE %][% blocking_error %]
>     [% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
>index 92dda54b34..39aa9c87c6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
>@@ -1,16 +1,17 @@
>+[% PROCESS 'i18n.inc' %]
> <div id="reldebarments">
>     [% IF ( not debarments.defined || debarments.size < 1 ) %]
>-        <p>Patron is currently unrestricted.</p>
>+        <p>[% t('Patron is currently unrestricted.') %]</p>
>     [% ELSE %]
>         <table>
>             <thead>
>                 <tr>
>-                     <th>Type</th>
>-                     <th>Comment</th>
>-                     <th>Expiration</th>
>-                     <th>Created</th>
>+                     <th>[% t('Type') %]</th>
>+                     <th>[% t('Comment') %]</th>
>+                     <th>[% t('Expiration') %]</th>
>+                     <th>[% t('Created') %]</th>
>                      [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
>-                         <th>&nbsp;</th>
>+                         <th>Â </th>
>                      [% END %]
>                 </tr>
>             </thead>
>@@ -20,28 +21,28 @@
>                         <td>
>                             [% SWITCH d.type %]
>                                 [% CASE 'MANUAL' %]
>-                                    Manual
>+                                    [% t('Manual') %]
>                                 [% CASE 'OVERDUES' %]
>-                                    Overdues
>+                                    [% t('Overdues') %]
>                                 [% CASE 'SUSPENSION' %]
>-                                    Suspension
>+                                    [% t('Suspension') %]
>                                 [% CASE 'DISCHARGE' %]
>-                                    Discharge
>+                                    [% t('Discharge') %]
>                             [% END %]
>                         </td>
>                         <td>
> 			    [% IF d.comment.search('OVERDUES_PROCESS') %]
>-				Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') %]
>+				[% t('Restriction added by overdues process') %] [% d.comment.remove('OVERDUES_PROCESS ') %]
> 			    [% ELSE %]
> 				[% d.comment %]
> 			    [% END %]
> 			</td>
>-                        <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
>+                        <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>[% t('Indefinite') %]</i> [% END %]</td>
>                         <td>[% d.created | $KohaDates %]</td>
>                         [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
>                             <td>
>-                                <a class="remove_restriction btn btn-default btn-xs" href="/cgi-bin/koha/members/mod_debarment.pl?borrowernumber=[% patron.borrowernumber %]&amp;borrower_debarment_id=[% d.borrower_debarment_id %]&amp;action=del">
>-                                    <i class="fa fa-trash"></i> Remove
>+                                <a class="remove_restriction btn btn-default btn-xs" href="/cgi-bin/koha/members/mod_debarment.pl?borrowernumber=[% patron.borrowernumber %]&borrower_debarment_id=[% d.borrower_debarment_id %]&action=del">
>+                                    <i class="fa fa-trash"></i> [% t('Remove') %]
>                                 </a>
>                             </td>
>                         [% END %]
>@@ -51,18 +52,18 @@
>         </table>
>     [% END %]
>     [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
>-        <p><a href="#" id="add_manual_restriction"><i class="fa fa-plus"></i> Add manual restriction</a></p>
>+        <p><a href="#" id="add_manual_restriction"><i class="fa fa-plus"></i> [% t('Add manual restriction') %]</a></p>
>         <form method="post" action="/cgi-bin/koha/members/mod_debarment.pl" class="clearfix">
>             <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
>             <input type="hidden" name="action" value="add" />
>             <fieldset class="rows" id="manual_restriction_form">
>-                <legend>Add manual restriction</legend>
>+                <legend>[% t('Add manual restriction') %]</legend>
>                 <ol>
>-                    <li><label for="rcomment">Comment:</label> <input type="text" id="rcomment" name="comment" /></li>
>-                    <li><label for="rexpiration">Expiration:</label> <input name="expiration" id="rexpiration" size="10" value="" class="datepicker" />
>-                        <a href="#" class="clear-date" id="clear-date-rexpiration">Clear date</a></li>
>+                    <li><label for="rcomment">[% t('Comment:') %]</label> <input type="text" id="rcomment" name="comment" /></li>
>+                    <li><label for="rexpiration">[% t('Expiration:') %]</label> <input name="expiration" id="rexpiration" size="10" value="" class="datepicker" />
>+                        <a href="#" class="clear-date" id="clear-date-rexpiration">[% t('Clear date') %]</a></li>
>                 </ol>
>-            <fieldset class="action"><input type="submit" value="Add restriction" /> <a href="#" class="cancel" id="cancel_manual_restriction">Cancel</a></fieldset>
>+            <fieldset class="action"><input type="submit" value="Add restriction" /> <a href="#" class="cancel" id="cancel_manual_restriction">[% t('Cancel') %]</a></fieldset>
>             </fieldset>
>         </form>
>     [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc
>index b91ecc2b6f..d26fe8e1bc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [%# First check to see if we have anything selected, otherwise we select all %]
> [% selectall = 1 %]
> [% FOREACH branch IN branches %]
>@@ -6,7 +7,7 @@
>     [% END %]
> [% END %]
> <div class="branchselector">
>-    <p><a href="#" id="checkall"> <i class="fa fa-check"></i> Select all</a> | <a href="#" id="checknone"> <i class="fa fa-remove"></i> Clear all</a></p>
>+    <p><a href="#" id="checkall"> <i class="fa fa-check"></i> [% t('Select all') %]</a> | <a href="#" id="checknone"> <i class="fa fa-remove"></i> [% t('Clear all') %]</a></p>
>     <div class="branchgridrow">
>     [% FOREACH branch IN branches %]
>         <div class="branchgriditem">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc
>index 18620599e2..463833f3da 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc
>@@ -1,14 +1,15 @@
>+[% PROCESS 'i18n.inc' %]
> [% IF ( currency ) %]
>     [% IF ( not hide ) %]
>-        <p><b>Currency = [% currency %]</b></p>
>+        <p><b>[% t('Currency =') %] [% currency %]</b></p>
>     [% END %]
> [% ELSE %]
>     <div class="dialog alert">
>-        <h3>No active currency is defined</h3>
>+        <h3>[% t('No active currency is defined') %]</h3>
>         [% IF CAN_user_parameters_parameters_remaining_permissions %]
>-            <p><a href="/cgi-bin/koha/admin/currency.pl">Please specify an active currency.</a></p>
>+            <p><a href="/cgi-bin/koha/admin/currency.pl">[% t('Please specify an active currency.') %]</a></p>
>         [% ELSE %]
>-            <p>Your administrator must specify an active currency.</p>
>+            <p>[% t('Your administrator must specify an active currency.') %]</p>
>         [% END %]
>     </div>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
>index 3399ce9405..442b583071 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> [% USE Branches %]
> <div class="gradient">
>@@ -5,21 +6,21 @@
> 
> <div id="header_search">
>     <div id="budgets_search" class="residentsearch">
>-        <p class="tip">Search funds:</p>
>+        <p class="tip">[% t('Search funds:') %]</p>
>         <form action="/cgi-bin/koha/admin/aqbudgets.pl" method="post">
>-            <label for="filter_budgetname">Fund code: </label><input class="query" type="text" name="filter_budgetname" id="filter_budgetname" size="20" value="[% filter_budgetname %]" />
>-            <label for="filter_budgetbranch">Library: </label>
>+            <label for="filter_budgetname">[% t('Fund code:') %] </label><input class="query" type="text" name="filter_budgetname" id="filter_budgetname" size="20" value="[% filter_budgetname %]" />
>+            <label for="filter_budgetbranch">[% t('Library:') %] </label>
>             <select name="filter_budgetbranch" id="filter_budgetbranch" style="width:10em;">
>                 <option value=""></option>
>                     [% FOREACH branchloo IN Branches.all( selected => selected_branchcode ) %]
>                         [% IF branchloo.selected %]
>                         <option value="[% branchloo.branchcode %]" selected="selected">[% branchloo.branchname %]</option>
>                         [% ELSE %]
>-                        <option value="[% branchloo.branchcode %]" >[% branchloo.branchname %]</option>
>+                        <option value="[% branchloo.branchcode %]">[% branchloo.branchname %]</option>
>                         [% END %]
>                     [% END %]
>             </select>
>-          <input type="hidden"  name="budget_period_id" value="[% budget_period_id %]" />
>+          <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
>           <input type="submit" class="submit" name="filter" value="Submit" />
>         </form>
>     </div>
>@@ -28,17 +29,17 @@
> 
>     [% IF ( CAN_user_catalogue ) %]
>     <div id="catalog_search" class="residentsearch">
>-    <p class="tip">Enter search keywords:</p>
>-        <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>+    <p class="tip">[% t('Enter search keywords:') %]</p>
>+        <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block">
>              [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>-             <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="query form-text" />
>-                <input type="submit" value="Submit"  class="submit" />
>+             <input type="text" name="q" id="search-form" size="40" value="" title="[% t('Enter the terms you wish to search for.') %]" class="query form-text" />
>+                <input type="submit" value="Submit" class="submit" />
>         </form>
>     </div>[% END %]
>             <ul>
>-            <li><a class="keep_text" href="#budgets_search">Search funds</a></li>
>-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
>-            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
>+            <li><a class="keep_text" href="#budgets_search">[% t('Search funds') %]</a></li>
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">[% t('Check out') %]</a></li>[% END %]
>+            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">[% t('Search the catalog') %]</a></li>[% END %]
>             </ul>
> </div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
>index 813ee8c66e..6470a6b10d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
>@@ -1,62 +1,63 @@
>+[% PROCESS 'i18n.inc' %]
> [% INCLUDE 'blocking_errors.inc' %]
> <div id="toolbar" class="btn-toolbar">
>     [% IF ( budget_period_id ) %]
>         <div class="btn-group">
>-            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>
>+            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> [% t('New') %] <span class="caret"></span></button>
>                 <ul class="dropdown-menu">
>-                    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form">New budget</a></li>
>+                    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form">[% t('New budget') %]</a></li>
>                     [% IF ( budget_period_locked || !CAN_user_acquisition_budget_add_del ) %]
>                         <li class="disabled">
>                     [% ELSE %]
>                         <li>
>                     [% END %]
>-                    <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_period_id=[% budget_period_id %]">New fund for [% budget_period_description %]</a></li>
>+                    <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_period_id=[% budget_period_id %]">[% t('New fund for') %] [% budget_period_description %]</a></li>
>                 </ul>
>         </div>
> 
>         <div class="btn-group">
>-            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
>+            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> [% t('Edit') %] <span class="caret"></span></button>
>                 <ul class="dropdown-menu">
>-                    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form&amp;budget_period_id=[% budget_period_id %]">Edit budget [% budget_period_description %]</a></li>
>-                    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=duplicate_form&amp;budget_period_id=[% budget_period_id %]">Duplicate budget [% budget_period_description %]</a></li>
>+                    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form&budget_period_id=[% budget_period_id %]">[% t('Edit budget') %] [% budget_period_description %]</a></li>
>+                    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=duplicate_form&budget_period_id=[% budget_period_id %]">[% t('Duplicate budget') %] [% budget_period_description %]</a></li>
>                 </ul>
>         </div>
> 
>         <div class="btn-group">
>-            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Planning <span class="caret"></span></button>
>+            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> [% t('Planning') %] <span class="caret"></span></button>
>                 <ul class="dropdown-menu">
>                     [% IF ( CAN_user_acquisition_planning_manage ) %]
>                     <li>
>                     [% ELSE %]
>                     <li class="disabled">
>                     [% END %]
>-                    <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id %]&amp;authcat=MONTHS">Plan by months</a></li>
>+                    <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id %]&authcat=MONTHS">[% t('Plan by months') %]</a></li>
>                     [% IF ( CAN_user_acquisition_planning_manage ) %]
>                     <li>
>                     [% ELSE %]
>                     <li class="disabled">
>                     [% END %]
>-                    <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id %]&amp;authcat=BRANCHES">Plan by libraries</a></li>
>+                    <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id %]&authcat=BRANCHES">[% t('Plan by libraries') %]</a></li>
>                     [% IF ( CAN_user_acquisition_planning_manage ) %]
>                     <li>
>                     [% ELSE %]
>                     <li class="disabled">
>                     [% END %]
>-                    <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id %]&amp;authcat=ITEMTYPES">Plan by item types</a></li>
>+                    <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id %]&authcat=ITEMTYPES">[% t('Plan by item types') %]</a></li>
>                     [% FOREACH auth_cats_loo IN auth_cats_loop %]
>                         [% IF ( CAN_user_acquisition_planning_manage ) %]
>                         <li>
>                         [% ELSE %]
>                         <li class="disabled">
>                         [% END %]
>-                        <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id %]&amp;authcat=[% auth_cats_loo %]">Plan by [% auth_cats_loo %]</a>
>+                        <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id %]&authcat=[% auth_cats_loo %]">[% t('Plan by') %] [% auth_cats_loo %]</a>
>                         </li>
>                     [% END %]
>                 </ul>
>         </div>
> 
>     [% ELSE %]
>-        <div class="btn-group"><a class="btn btn-default btn-sm" id="newrootbudget" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form"><i class="fa fa-plus"></i> New budget</a></div>
>+        <div class="btn-group"><a class="btn btn-default btn-sm" id="newrootbudget" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form"><i class="fa fa-plus"></i> [% t('New budget') %]</a></div>
>     [% END %]
> 
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
>index 817552ecd8..9e69a00fef 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> <ul>
>-	<li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a></li>
>+	<li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">[% t('Lists') %]</a></li>
> </ul>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
>index ada7f193b4..c81dd77246 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> <div class="gradient">
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1>
>@@ -7,14 +8,14 @@
> 
> [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
> <div id="checkin_search" class="residentsearch">
>-    <p class="tip">Scan a barcode to check in:</p>
>+    <p class="tip">[% t('Scan a barcode to check in:') %]</p>
>     <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
>         <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" />
>         <input value="Submit" class="submit" type="submit" />
>     </form>
> </div>
> <div id="renew_search" class="residentsearch">
>-    <p class="tip">Scan a barcode to renew:</p>
>+    <p class="tip">[% t('Scan a barcode to renew:') %]</p>
>     <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
>         <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
>         <input value="Submit" class="submit" type="submit" />
>@@ -24,20 +25,20 @@
> 
> [% IF ( CAN_user_catalogue ) %]
> <div id="catalog_search" class="residentsearch">
>-    <p class="tip">Enter search keywords:</p>
>-    <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>+    <p class="tip">[% t('Enter search keywords:') %]</p>
>+    <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block">
>         [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>-        <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
>+        <input type="text" name="q" id="search-form" size="40" value="" title="[% t('Enter the terms you wish to search for.') %]" class="head-searchbox form-text" />
>         <input type="submit" class="submit" value="Submit" />
>     </form>
> </div>
> [% END %]
> 
> <ul>
>-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
>-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
>-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
>-    [% IF ( CAN_user_catalogue ) %]<li class="keep_text ui-tabs-active"><a href="#catalog_search">Search the catalog</a></li>[% END %]
>+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">[% t('Check out') %]</a></li>[% END %]
>+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">[% t('Check in') %]</a></li>[% END %]
>+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">[% t('Renew') %]</a></li>[% END %]
>+    [% IF ( CAN_user_catalogue ) %]<li class="keep_text ui-tabs-active"><a href="#catalog_search">[% t('Search the catalog') %]</a></li>[% END %]
> </ul>
> 
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
>index 781b79714d..0346c6861e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
>@@ -1,27 +1,28 @@
>+[% PROCESS 'i18n.inc' %]
> [% INCLUDE 'blocking_errors.inc' %]
> <div id="toolbar" class="btn-toolbar">
> 
> [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items ||
> CAN_user_serials_create_subscription ) %]
>     <div class="btn-group">
>-    <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>
>+    <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> [% t('New') %] <span class="caret"></span></button>
>         <ul class="dropdown-menu">
>             [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
>-             <li><a id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New record</a></li>
>+             <li><a id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">[% t('New record') %]</a></li>
>             [% END %]
> 
>             [% IF ( CAN_user_editcatalogue_edit_items ) %]
>-             <li><a id="newitem" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber %]#additema">New item</a></li>
>+             <li><a id="newitem" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber %]#additema">[% t('New item') %]</a></li>
>             [% END %]
>             [% IF ( CAN_user_serials_create_subscription ) %]
>-             <li><a id="newsub" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber %]">New subscription</a></li>
>+             <li><a id="newsub" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber %]">[% t('New subscription') %]</a></li>
>             [% END %]
> 
>             [% IF ( EasyAnalyticalRecords && CAN_user_editcatalogue_edit_catalogue ) %]
>-                <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]&amp;analyze=1">Analyze items</a></li>
>+                <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]&analyze=1">[% t('Analyze items') %]</a></li>
>             [% END %]
>             [% IF CAN_user_editcatalogue_edit_catalogue && ! EasyAnalyticalRecords %]
>-                <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?parentbiblionumber=[% biblionumber %]">New child record</a></li>
>+                <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?parentbiblionumber=[% biblionumber %]">[% t('New child record') %]</a></li>
>             [% END %]
>     </ul>
>     </div>
>@@ -29,55 +30,55 @@ CAN_user_serials_create_subscription ) %]
> 
> [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items || CAN_user_tools_items_batchmod || CAN_user_tools_items_batchdel ) or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
>     <div class="btn-group">
>-    <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
>+    <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> [% t('Edit') %] <span class="caret"></span></button>
>         <ul class="dropdown-menu">
>             [% IF CAN_user_editcatalogue_edit_catalogue or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
>-            <li><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]">Edit record</a></li>
>+            <li><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]">[% t('Edit record') %]</a></li>
>             [% END %]
> 
>             [% IF CAN_user_editcatalogue_edit_items or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
>-            <li><a id="edititems" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber %]">Edit items</a></li>
>+            <li><a id="edititems" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber %]">[% t('Edit items') %]</a></li>
>             [% END %]
> 
>             [% IF ( CAN_user_tools_items_batchmod ) %]
>                 [% IF ( count ) %]
>-                    <li><a id="batchedit" href="/cgi-bin/koha/tools/batchMod.pl?op=show&amp;biblionumber=[% biblionumber %]&amp;src=CATALOGUING">Edit items in batch</a></li>
>+                    <li><a id="batchedit" href="/cgi-bin/koha/tools/batchMod.pl?op=show&biblionumber=[% biblionumber %]&src=CATALOGUING">[% t('Edit items in batch') %]</a></li>
>                 [% ELSE %]
>-                    <li class="disabled"><a id="batchedit-disabled" href="#" data-toggle="tooltip" data-placement="left" title="This record has no items">Edit items in batch</a></li>
>+                    <li class="disabled"><a id="batchedit-disabled" href="#" data-toggle="tooltip" data-placement="left" title="[% t('This record has no items') %]">[% t('Edit items in batch') %]</a></li>
>                 [% END %]
>             [% END %]
> 
>             [% IF ( CAN_user_tools_items_batchdel ) %]
>                 [% IF ( count ) %]
>-                    <li><a id="batchdelete" href="/cgi-bin/koha/tools/batchMod.pl?del=1&amp;op=show&amp;biblionumber=[% biblionumber %]&amp;src=CATALOGUING">Delete items in a batch</a></li>
>+                    <li><a id="batchdelete" href="/cgi-bin/koha/tools/batchMod.pl?del=1&op=show&biblionumber=[% biblionumber %]&src=CATALOGUING">[% t('Delete items in a batch') %]</a></li>
>                 [% ELSE %]
>-                    <li class="disabled"><a id="batchdelete-disabled" href="#" data-toggle="tooltip" data-placement="left" title="This record has no items">Delete items in a batch</a></li>
>+                    <li class="disabled"><a id="batchdelete-disabled" href="#" data-toggle="tooltip" data-placement="left" title="[% t('This record has no items') %]">[% t('Delete items in a batch') %]</a></li>
>                 [% END %]
>             [% END %]
> 
>-            [% IF ( CAN_user_editcatalogue_edit_items ) %]<li><a href="/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=[% biblionumber %]">Attach item</a></li>[% END %]
>+            [% IF ( CAN_user_editcatalogue_edit_items ) %]<li><a href="/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=[% biblionumber %]">[% t('Attach item') %]</a></li>[% END %]
> 
>-            [% IF ( EasyAnalyticalRecords ) %][% IF ( CAN_user_editcatalogue_edit_items ) %]<li><a href="/cgi-bin/koha/cataloguing/linkitem.pl?biblionumber=[% biblionumber %]">Link to host item</a>[% END %][% END %]
>-            [% IF ( LocalCoverImages || OPACLocalCoverImages) %][% IF ( CAN_user_tools_upload_local_cover_images ) %]<li><a href="/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber %]&amp;filetype=image">Upload image</a>[% END %][% END %]
>+            [% IF ( EasyAnalyticalRecords ) %][% IF ( CAN_user_editcatalogue_edit_items ) %]<li><a href="/cgi-bin/koha/cataloguing/linkitem.pl?biblionumber=[% biblionumber %]">[% t('Link to host item') %]</a>[% END %][% END %]
>+            [% IF ( LocalCoverImages || OPACLocalCoverImages) %][% IF ( CAN_user_tools_upload_local_cover_images ) %]<li><a href="/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber %]&filetype=image">[% t('Upload image') %]</a>[% END %][% END %]
> 
>             [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
>-                <li><a id="duplicatebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]&amp;op=duplicate">Edit as new (duplicate)</a></li>
>-                <li><a href="#" id="z3950copy">Replace record via Z39.50/SRU</a></li>
>+                <li><a id="duplicatebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]&op=duplicate">[% t('Edit as new (duplicate)') %]</a></li>
>+                <li><a href="#" id="z3950copy">[% t('Replace record via Z39.50/SRU') %]</a></li>
>             [% END %]
> 
>             [% IF CAN_user_editcatalogue_edit_catalogue or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
>                 [% IF ( count ) %]
>-                    <li class="disabled"><a id="deletebiblio" data-toggle="tooltip" data-placement="left" title="[% count %] item(s) are attached to this record. You must delete all items before deleting this record." href="#">Delete record</a></li>
>+                    <li class="disabled"><a id="deletebiblio" data-toggle="tooltip" data-placement="left" title="[% count %] [% t('item(s) are attached to this record. You must delete all items before deleting this record.') %]" href="#">[% t('Delete record') %]</a></li>
>                 [% ELSE %]
>-                    <li><a id="deletebiblio" data-order-manage="[% CAN_user_acquisition_order_manage %]" href="#">Delete record</a></li>
>+                    <li><a id="deletebiblio" data-order-manage="[% CAN_user_acquisition_order_manage %]" href="#">[% t('Delete record') %]</a></li>
>                 [% END %]
>             [% END %]
> 
>             [% IF CAN_user_editcatalogue_delete_all_items or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
>                 [% IF ( count ) %]
>-                    <li><a href="#" id="deleteallitems">Delete all items</a></li>
>+                    <li><a href="#" id="deleteallitems">[% t('Delete all items') %]</a></li>
>                 [% ELSE %]
>-                    <li class="disabled"><a href="#" id="deleteallitems-disabled" data-toggle="tooltip" data-placement="left" title="This record has no items">Delete all items</a></li>
>+                    <li class="disabled"><a href="#" id="deleteallitems-disabled" data-toggle="tooltip" data-placement="left" title="[% t('This record has no items') %]">[% t('Delete all items') %]</a></li>
>                 [% END %]
>             [% END %]
> 
>@@ -86,34 +87,34 @@ CAN_user_serials_create_subscription ) %]
> [% END %]
> 
>     <div class="btn-group">
>-    <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> Save <span class="caret"></span></button>
>+    <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> [% t('Save') %] <span class="caret"></span></button>
>     <ul class="dropdown-menu">
>-        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=bibtex&amp;op=export&amp;bib=[% biblionumber %]">BIBTEX</a></li>
>-        <li><a href="#" data-toggle="modal" data-target="#exportModal_">Dublin Core</a></li>
>-        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=marcxml&amp;op=export&amp;bib=[% biblionumber %]">MARCXML</a></li>
>-        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=marc8&amp;op=export&amp;bib=[% biblionumber %]">MARC (non-Unicode/MARC-8)</a></li>
>-        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=utf8&amp;op=export&amp;bib=[% biblionumber %]">MARC (Unicode/UTF-8)</a></li>
>-        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=marcstd&amp;op=export&amp;bib=[% biblionumber %]">MARC (Unicode/UTF-8, Standard)</a></li>
>-        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=mods&amp;op=export&amp;bib=[% biblionumber %]">MODS (XML)</a></li>
>-        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=ris&amp;op=export&amp;bib=[% biblionumber %]">RIS</a></li>
>+        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=bibtex&op=export&bib=[% biblionumber %]">[% t('BIBTEX') %]</a></li>
>+        <li><a href="#" data-toggle="modal" data-target="#exportModal_">[% t('Dublin Core') %]</a></li>
>+        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=marcxml&op=export&bib=[% biblionumber %]">[% t('MARCXML') %]</a></li>
>+        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=marc8&op=export&bib=[% biblionumber %]">[% t('MARC (non-Unicode/MARC-8)') %]</a></li>
>+        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=utf8&op=export&bib=[% biblionumber %]">[% t('MARC (Unicode/UTF-8)') %]</a></li>
>+        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=marcstd&op=export&bib=[% biblionumber %]">[% t('MARC (Unicode/UTF-8, Standard)') %]</a></li>
>+        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=mods&op=export&bib=[% biblionumber %]">[% t('MODS (XML)') %]</a></li>
>+        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=ris&op=export&bib=[% biblionumber %]">[% t('RIS') %]</a></li>
>     </ul>
>     </div>
> 
> [% IF ( virtualshelves && intranetbookbag ) %]
>     <div class="btn-group">
>-    <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">Add to <span class="caret"></span></button>
>+    <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">[% t('Add to') %] <span class="caret"></span></button>
>     <ul class="dropdown-menu">
>-        <li><a href="#" id="addtocart">Cart</a></li>
>-        <li><a href="#" id="addtoshelf">List</a></li>
>+        <li><a href="#" id="addtocart">[% t('Cart') %]</a></li>
>+        <li><a href="#" id="addtoshelf">[% t('List') %]</a></li>
>     </ul>
>     </div>
> [% ELSIF ( virtualshelves ) %]
>-    <div class="btn-group"><a id="addtoshelf" class="btn btn-default btn-sm"><i class="fa fa-list"></i> Add to list</a> </div>
>+    <div class="btn-group"><a id="addtoshelf" class="btn btn-default btn-sm"><i class="fa fa-list"></i> [% t('Add to list') %]</a> </div>
> [% ELSIF ( intranetbookbag ) %]
>-    <div class="btn-group"><a id="addtocart" class="btn btn-default btn-sm"><i class="fa fa-shopping-cart"></i> Add to cart</a> </div>
>+    <div class="btn-group"><a id="addtocart" class="btn btn-default btn-sm"><i class="fa fa-shopping-cart"></i> [% t('Add to cart') %]</a> </div>
> [% END %]
> 
>-    <div class="btn-group"><a id="printbiblio" class="btn btn-default btn-sm"><i class="fa fa-print"></i> Print</a></div>
>+    <div class="btn-group"><a id="printbiblio" class="btn btn-default btn-sm"><i class="fa fa-print"></i> [% t('Print') %]</a></div>
> 
> [% IF ( CAN_user_reserveforothers ) %]
>     [% UNLESS ( norequests ) %]
>@@ -121,22 +122,22 @@ CAN_user_serials_create_subscription ) %]
>             <div class="btn-group">
>                 <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
>                     <i class="fa fa-sticky-note-o"></i>
>-                    Place hold
>+                    [% t('Place hold') %]
>                     <span class="caret"></span>
>                 </button>
>                 <ul class="dropdown-menu">
>-                    <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]">Place hold</a></li>
>-                    <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]&amp;findborrower=[% holdfor_cardnumber %]">Place hold for [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])</a></li>
>+                    <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]">[% t('Place hold') %]</a></li>
>+                    <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]&findborrower=[% holdfor_cardnumber %]">[% t('Place hold for') %] [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])</a></li>
>                 </ul>
>             </div>
>         [% ELSE %]
>-            <div class="btn-group"><a id="placehold" class="btn btn-default btn-sm" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]"><i class="fa fa-sticky-note-o"></i> Place hold</a></div>
>+            <div class="btn-group"><a id="placehold" class="btn btn-default btn-sm" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]"><i class="fa fa-sticky-note-o"></i> [% t('Place hold') %]</a></div>
>         [% END %]
>     [% END %]
> [% END %]
> 
> [% IF Koha.Preference('ArticleRequests') %]
>-    <div class="btn-group"><a id="placehold" class="btn btn-default btn-sm" href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% biblionumber %]"><i class="fa fa-file-text-o"></i> Request article</a></div>
>+    <div class="btn-group"><a id="placehold" class="btn btn-default btn-sm" href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% biblionumber %]"><i class="fa fa-file-text-o"></i> [% t('Request article') %]</a></div>
> [% END %]
> 
> </div>
>@@ -146,26 +147,26 @@ CAN_user_serials_create_subscription ) %]
>         <div class="modal-dialog">
>         <div class="modal-content">
>         <div class="modal-header">
>-            <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">&times;</button>
>-            <h3 id="exportLabelexportModal_">Exporting to Dublin Core...</h3>
>+            <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button>
>+            <h3 id="exportLabelexportModal_">[% t('Exporting to Dublin Core...') %]</h3>
>         </div>
>         <form method="get" action="/cgi-bin/koha/catalogue/export.pl">
>         <div class="modal-body">
>             <fieldset>
>                 <input id="input-simple" type="radio" name="format" value="rdfdc">
>-                <label for="input-simple">Simple DC-RDF</label>
>+                <label for="input-simple">[% t('Simple DC-RDF') %]</label>
>                 <br>
>-                <input id="input-oai" type="radio" name="format" value="oaidc" checked>
>-                <label for="input-oai">OAI-DC</label>
>+                <input id="input-oai" type="radio" name="format" value="oaidc" checked="">
>+                <label for="input-oai">[% t('OAI-DC') %]</label>
>                 <br>
>                 <input id="input-srw" type="radio" name="format" value="srwdc">
>-                <label for="input-srw">SRW-DC</label>
>+                <label for="input-srw">[% t('SRW-DC') %]</label>
>                 <br>
>             </fieldset>
>         </div>
>         <div class="modal-footer">
>-            <button type="submit" class="btn btn-default">Export</button>
>-            <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button>
>+            <button type="submit" class="btn btn-default">[% t('Export') %]</button>
>+            <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">[% t('Cancel') %]</button>
>         </div>
>         <input type="hidden" name="op" value="export" />
>         <input type="hidden" name="bib" value="[% biblionumber %]" />
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
>index a289b70527..8e11d1ec56 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
>@@ -1,9 +1,10 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> <div class="gradient">
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1>
>     <div id="header_search">
>         <div id="addbooks_search" class="residentsearch">
>-        <p class="tip">Search the catalog and the reservoir:</p>
>+        <p class="tip">[% t('Search the catalog and the reservoir:') %]</p>
>             <form name="search" action="addbooks.pl">
>                 <input class="head-searchbox" type="text" name="q" size="40" />
>                 <input type="submit" class="submit" value="Submit" />
>@@ -14,14 +15,14 @@
> 
>         [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
>         <div id="checkin_search" class="residentsearch">
>-            <p class="tip">Scan a barcode to check in:</p>
>+            <p class="tip">[% t('Scan a barcode to check in:') %]</p>
>             <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
>                 <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" />
>                 <input value="Submit" class="submit" type="submit" />
>             </form>
>         </div>
>         <div id="renew_search" class="residentsearch">
>-        <p class="tip">Scan a barcode to renew:</p>
>+        <p class="tip">[% t('Scan a barcode to renew:') %]</p>
>             <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
>                 <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
>                 <input value="Submit" class="submit" type="submit" />
>@@ -31,20 +32,20 @@
> 
> 
>         <div id="catalog_search" class="residentsearch">
>-            <p class="tip">Enter search keywords:</p>
>-            <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>+            <p class="tip">[% t('Enter search keywords:') %]</p>
>+            <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block">
>                 [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>-                <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
>+                <input type="text" name="q" id="search-form" size="40" value="" title="[% t('Enter the terms you wish to search for.') %]" class="head-searchbox form-text" />
>                 <input type="submit" class="submit" value="Submit" />
>             </form>
>         </div>
> 
>         <ul>
>-            <li><a class="keep_text" href="#addbooks_search">Cataloging search</a></li>
>-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
>-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
>-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
>-            <li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>
>+            <li><a class="keep_text" href="#addbooks_search">[% t('Cataloging search') %]</a></li>
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">[% t('Check out') %]</a></li>[% END %]
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">[% t('Check in') %]</a></li>[% END %]
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">[% t('Renew') %]</a></li>[% END %]
>+            <li><a class="keep_text" href="#catalog_search">[% t('Search the catalog') %]</a></li>
>         </ul>
>     </div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc
>index 5e38a58db5..7d3c9cc5b9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc
>@@ -1,5 +1,6 @@
>+[% PROCESS 'i18n.inc' %]
> [%- USE Branches -%]
> [%- USE Koha -%]
> [%- biblio = item.biblio -%]
> [%- biblioitem = item.biblioitem -%]
>-"[% biblio.title |html %] [% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %]by [% END %][% biblio.author |html %]", "[% (biblioitem.publicationyear || biblio.copyrightdate) |html %]", "[% biblioitem.publishercode |html %]", "[% biblioitem.collectiontitle |html %]", "[% item.barcode |html %]", "[% item.itemcallnumber |html %]", "[% Branches.GetName(item.homebranch) |html %]", "[% Branches.GetName(item.holdingbranch) |html %]", "[% item.location |html %]", "[% item.stocknumber |html %]", "[% item.status |html %]", "[% (item.issues || 0) |html %]"
>+"[% biblio.title |html %] [% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %][% t('by') %] [% END %][% biblio.author |html %]", "[% (biblioitem.publicationyear || biblio.copyrightdate) |html %]", "[% biblioitem.publishercode |html %]", "[% biblioitem.collectiontitle |html %]", "[% item.barcode |html %]", "[% item.itemcallnumber |html %]", "[% Branches.GetName(item.homebranch) |html %]", "[% Branches.GetName(item.holdingbranch) |html %]", "[% item.location |html %]", "[% item.stocknumber |html %]", "[% item.status |html %]", "[% (item.issues || 0) |html %]"
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc
>index 30b7178997..ded9f9ad60 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [%- USE Branches -%]
> [%- USE Koha -%]
> [% USE AuthorisedValues %]
>@@ -5,13 +6,13 @@
> [%- biblioitem = item.biblioitem -%]
> [
>   "[% FILTER escape_quotes = replace('"', '\"') ~%]
>-    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber %]" title="Go to record detail page">[% biblio.title |html %]</a>[% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %] by[% END %] [% biblio.author |html %]
>+    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber %]" title="[% t('Go to record detail page') %]">[% biblio.title |html %]</a>[% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %] [% t('by') %][% END %] [% biblio.author |html %]
>   [%~ END %]",
>   "[% (biblioitem.publicationyear || biblio.copyrightdate) |html %]",
>   "[% biblioitem.publishercode |html %]",
>   "[% AuthorisedValues.GetByCode( 'CCODE', item.ccode ) %]",
>   "[% FILTER escape_quotes ~%]
>-    <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber %]#item[% item.itemnumber %]" title="Go to item details">[% item.barcode |html %]</a>
>+    <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber %]#item[% item.itemnumber %]" title="[% t('Go to item details') %]">[% item.barcode |html %]</a>
>   [%~ END %]",
>   "[% item.itemcallnumber |html %]",
>   "[% Branches.GetName(item.homebranch) |html %]",
>@@ -21,6 +22,6 @@
>   "[% item.status |html %]",
>   "[% (item.issues || 0) |html %]",
>   "[% FILTER escape_quotes ~%]
>-    <div class="btn-group dropup"><button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="fa fa-pencil"></i> Edit <span class="caret"></span> </button> <ul class="dropdown-menu"> <li><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber %]&itemnumber=[% item.itemnumber %]">Edit item</a></li> <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% item.biblionumber %]">Edit record</a></li> </ul> </div>
>+    <div class="btn-group dropup"><button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="fa fa-pencil"></i> [% t('Edit') %] <span class="caret"></span> </button> <ul class="dropdown-menu"> <li><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber %]&itemnumber=[% item.itemnumber %]">[% t('Edit item') %]</a></li> <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% item.biblionumber %]">[% t('Edit record') %]</a></li> </ul> </div>
>   [%~ END %]"
> ]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-widgets-marc21.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-widgets-marc21.inc
>index ba049d5239..77fed9aadd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-widgets-marc21.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-widgets-marc21.inc
>@@ -1,72 +1,73 @@
>+[% PROCESS 'i18n.inc' %]
> <div id="editor-widget-templates" style="display:none">
>     <div id="widget-leader">
>-        Leader:&nbsp;<span title="Record length (autogenerated)">#####</span>
>-        <select name="f5" title="Record status">
>-            <option value="a">a - Increase in encoding level</option>
>-            <option value="c">c - Corrected or revised</option>
>-            <option value="d">d - Deleted</option>
>-            <option value="n">n - New</option>
>-            <option value="p">p - Increase in encoding level from prepublication</option>
>+        [% t('Leader:Â ') %]<span title="[% t('Record length (autogenerated)') %]">#####</span>
>+        <select name="f5" title="[% t('Record status') %]">
>+            <option value="a">[% t('a - Increase in encoding level') %]</option>
>+            <option value="c">[% t('c - Corrected or revised') %]</option>
>+            <option value="d">[% t('d - Deleted') %]</option>
>+            <option value="n">[% t('n - New') %]</option>
>+            <option value="p">[% t('p - Increase in encoding level from prepublication') %]</option>
>         </select>
>-        <select name="f6" title="Type of record">
>-            <option value="a">a - Language material</option>
>-            <option value="c">c - Notated music</option>
>-            <option value="d">d - Manuscript notated music</option>
>-            <option value="e">e - Cartographic material</option>
>-            <option value="f">f - Manuscript cartographic material</option>
>-            <option value="g">g - Projected medium</option>
>-            <option value="i">i - Nonmusical sound recording</option>
>-            <option value="j">j - Musical sound recording</option>
>-            <option value="k">k - Two-dimensional nonprojectable graphic</option>
>-            <option value="m">m - Computer file</option>
>-            <option value="o">o - Kit</option>
>-            <option value="p">p - Mixed materials</option>
>-            <option value="r">r - Three-dimensional artifact or naturally occurring object</option>
>-            <option value="t">t - Manuscript language material</option>
>+        <select name="f6" title="[% t('Type of record') %]">
>+            <option value="a">[% t('a - Language material') %]</option>
>+            <option value="c">[% t('c - Notated music') %]</option>
>+            <option value="d">[% t('d - Manuscript notated music') %]</option>
>+            <option value="e">[% t('e - Cartographic material') %]</option>
>+            <option value="f">[% t('f - Manuscript cartographic material') %]</option>
>+            <option value="g">[% t('g - Projected medium') %]</option>
>+            <option value="i">[% t('i - Nonmusical sound recording') %]</option>
>+            <option value="j">[% t('j - Musical sound recording') %]</option>
>+            <option value="k">[% t('k - Two-dimensional nonprojectable graphic') %]</option>
>+            <option value="m">[% t('m - Computer file') %]</option>
>+            <option value="o">[% t('o - Kit') %]</option>
>+            <option value="p">[% t('p - Mixed materials') %]</option>
>+            <option value="r">[% t('r - Three-dimensional artifact or naturally occurring object') %]</option>
>+            <option value="t">[% t('t - Manuscript language material') %]</option>
>         </select>
>-        <select name="f7" title="Bibliographic level">
>-            <option value="a">a - Monographic component part</option>
>-            <option value="b">b - Serial component part</option>
>-            <option value="c">c - Collection</option>
>-            <option value="d">d - Subunit</option>
>-            <option value="i">i - Integrating resource</option>
>-            <option value="m">m - Monograph/item</option>
>-            <option value="s">s - Serial</option>
>+        <select name="f7" title="[% t('Bibliographic level') %]">
>+            <option value="a">[% t('a - Monographic component part') %]</option>
>+            <option value="b">[% t('b - Serial component part') %]</option>
>+            <option value="c">[% t('c - Collection') %]</option>
>+            <option value="d">[% t('d - Subunit') %]</option>
>+            <option value="i">[% t('i - Integrating resource') %]</option>
>+            <option value="m">[% t('m - Monograph/item') %]</option>
>+            <option value="s">[% t('s - Serial') %]</option>
>         </select>
>-        <select name="f8" title="Type of control">
>-                <option value=" ">_ - No specific type</option>
>-                <option value="a">a - Archival</option>
>+        <select name="f8" title="[% t('Type of control') %]">
>+                <option value=" ">[% t('_ - No specific type') %]</option>
>+                <option value="a">[% t('a - Archival') %]</option>
>         </select>
>-        <span title="Encoding (forced Unicode)">a</span>
>-        <span title="Indicator/subfield lengths">22</span>
>-        <span title="Data base address (autogenerated)">#####</span>
>-        <select name="f17" title="Encoding level">
>-            <option value=" ">_ - Full level</option>
>-            <option value="1">1 - Full level, material not examined</option>
>-            <option value="2">2 - Less-than-full level, material not examined</option>
>-            <option value="3">3 - Abbreviated level</option>
>-            <option value="4">4 - Core level</option>
>-            <option value="5">5 - Partial (preliminary) level</option>
>-            <option value="7">7 - Minimal level</option>
>-            <option value="8">8 - Prepublication level</option>
>-            <option value="u">u - Unknown</option>
>-            <option value="z">z - Not applicable</option>
>+        <span title="[% t('Encoding (forced Unicode)') %]">[% t('a') %]</span>
>+        <span title="[% t('Indicator/subfield lengths') %]">[% t('22') %]</span>
>+        <span title="[% t('Data base address (autogenerated)') %]">#####</span>
>+        <select name="f17" title="[% t('Encoding level') %]">
>+            <option value=" ">[% t('_ - Full level') %]</option>
>+            <option value="1">[% t('1 - Full level, material not examined') %]</option>
>+            <option value="2">[% t('2 - Less-than-full level, material not examined') %]</option>
>+            <option value="3">[% t('3 - Abbreviated level') %]</option>
>+            <option value="4">[% t('4 - Core level') %]</option>
>+            <option value="5">[% t('5 - Partial (preliminary) level') %]</option>
>+            <option value="7">[% t('7 - Minimal level') %]</option>
>+            <option value="8">[% t('8 - Prepublication level') %]</option>
>+            <option value="u">[% t('u - Unknown') %]</option>
>+            <option value="z">[% t('z - Not applicable') %]</option>
>         </select>
>-        <select name="f18" title="Descriptive cataloging form">
>-            <option value=" ">_ - Non-ISBD</option>
>-            <option value="a">a - AACR 2</option>
>-            <option value="c">c - ISBD punctuation omitted</option>
>-            <option value="i">i - ISBD punctuation included</option>
>-            <option value="n">n - Non-ISBD punctuation omitted</option>
>-            <option value="u">u - Unknown</option>
>+        <select name="f18" title="[% t('Descriptive cataloging form') %]">
>+            <option value=" ">[% t('_ - Non-ISBD') %]</option>
>+            <option value="a">[% t('a - AACR 2') %]</option>
>+            <option value="c">[% t('c - ISBD punctuation omitted') %]</option>
>+            <option value="i">[% t('i - ISBD punctuation included') %]</option>
>+            <option value="n">[% t('n - Non-ISBD punctuation omitted') %]</option>
>+            <option value="u">[% t('u - Unknown') %]</option>
>         </select>
>-        <select name="f19" title="Multipart record resource level">
>-            <option value=" ">_ - Not specified or not applicable</option>
>-            <option value="a">a - Set</option>
>-            <option value="b">b - Part with independent title</option>
>-            <option value="c">c - Part with dependent title</option>
>+        <select name="f19" title="[% t('Multipart record resource level') %]">
>+            <option value=" ">[% t('_ - Not specified or not applicable') %]</option>
>+            <option value="a">[% t('a - Set') %]</option>
>+            <option value="b">[% t('b - Part with independent title') %]</option>
>+            <option value="c">[% t('c - Part with dependent title') %]</option>
>         </select>
>-        <span title="Length of directory elements">4500</span>
>+        <span title="[% t('Length of directory elements') %]">[% t('4500') %]</span>
>     </div>
> </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
>index edaaceedb6..25f0150d24 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> <div class="gradient">
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1>
>@@ -5,17 +6,17 @@
> [% INCLUDE 'patron-search-box.inc' %]
> [% IF ( CAN_user_catalogue ) %]
> <div id="catalog_search" class="residentsearch">
>-    <p class="tip">Enter search keywords:</p>
>-    <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>+    <p class="tip">[% t('Enter search keywords:') %]</p>
>+    <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block">
>         [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>         <input class="head-searchbox" type="text" name="q" id="search-form" size="40" />
>-        <input type="submit" class="submit" value="Submit"/>
>+        <input type="submit" class="submit" value="Submit" />
>     </form>
> </div>
> [% END %]
> [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
> <div id="renew_search" class="residentsearch">
>-    <p class="tip">Scan a barcode to renew:</p>
>+    <p class="tip">[% t('Scan a barcode to renew:') %]</p>
>     <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
>         <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
>         <input value="Submit" class="submit" type="submit" />
>@@ -24,9 +25,9 @@
> [% END %]
> 
> <ul>
>-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
>-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
>-    [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
>+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">[% t('Check out') %]</a></li>[% END %]
>+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">[% t('Renew') %]</a></li>[% END %]
>+    [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">[% t('Search the catalog') %]</a></li>[% END %]
> </ul>   
> 
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc
>index 3adbfa326a..9076b61341 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc
>@@ -1,13 +1,14 @@
>+[% PROCESS 'i18n.inc' %]
> <tfoot>
> 	<tr>
>-        <td colspan="11" style="text-align: right; font-weight:bold;">Totals:</td>
>+        <td colspan="11" style="text-align: right; font-weight:bold;">[% t('Totals:') %]</td>
>         <td id="totaldue" style="text-align: right;">[% totaldue %]</td>
>         <td id="totalfine" style="text-align: right;">[% finetotal %]</td>
>         <td id="totalprice" style="text-align: right;">[% totalprice %]</td>
>                 <td colspan="3"><div class="date-select">
>-            <p><label for="newduedate">Renewal due date:</label> <input type="text" size="12" id="newduedate" name="newduedate" value="[% newduedate %]" />
>+            <p><label for="newduedate">[% t('Renewal due date:') %]</label> <input type="text" size="12" id="newduedate" name="newduedate" value="[% newduedate %]" />
> </p>
>-            <p><label for="exemptfine">Forgive fines on return: <input type="checkbox" id="exemptfine" name="exemptfine" value="1" /></label></p></div>
>+            <p><label for="exemptfine">[% t('Forgive fines on return:') %] <input type="checkbox" id="exemptfine" name="exemptfine" value="1" /></label></p></div>
> 		</td>
> 	</tr>
> </tfoot>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
>index b34089d3c7..94b17f841f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
>@@ -1,62 +1,63 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> <div id="checkouts">
>     [% IF ( issuecount ) %]
>         <div id="issues-table-loading-message">
>             <p>
>-                <a id="issues-table-load-now-button" href="#" class="btn btn-default"><i class="fa fa-book"></i> Show checkouts</a>
>+                <a id="issues-table-load-now-button" href="#" class="btn btn-default"><i class="fa fa-book"></i> [% t('Show checkouts') %]</a>
>             </p>
>         </div>
>         <form name="issues" action="/cgi-bin/koha/tools/export.pl" method="post" class="checkboxed">
>             <table id="issues-table" style="width: 100% !Important;">
>                 <thead>
>                     <tr>
>-                        <th scope="col">&nbsp;</th>
>-                        <th scope="col">&nbsp;</th>
>-                        <th scope="col">Due date</th>
>-                        <th scope="col">Due date</th>
>-                        <th scope="col">Title</th>
>-                        <th scope="col">Item type</th>
>-                        <th scope="col">Location</th>
>-                        <th scope="col">Home library</th>
>-                        <th scope="col">Checked out on</th>
>-                        <th scope="col">Checked out from</th>
>-                        <th scope="col">Call no</th>
>-                        <th scope="col">Charge</th>
>-                        <th scope="col">Fine</th>
>-                        <th scope="col">Price</th>
>-                        <th scope="col">Renew <p class="column-tool"><a href="#" id="CheckAllRenewals">select all</a> | <a href="#" id="UncheckAllRenewals">none</a></p></th>
>-                        <th scope="col">Check in <p class="column-tool"><a href="#" id="CheckAllCheckins">select all</a> | <a href="#" id="UncheckAllCheckins">none</a></p></th>
>-                        <th scope="col">Export <p class="column-tool"><a href="#" id="CheckAllExports">select all</a> | <a href="#" id="UncheckAllExports">none</a></p></th>
>+                        <th scope="col">Â </th>
>+                        <th scope="col">Â </th>
>+                        <th scope="col">[% t('Due date') %]</th>
>+                        <th scope="col">[% t('Due date') %]</th>
>+                        <th scope="col">[% t('Title') %]</th>
>+                        <th scope="col">[% t('Item type') %]</th>
>+                        <th scope="col">[% t('Location') %]</th>
>+                        <th scope="col">[% t('Home library') %]</th>
>+                        <th scope="col">[% t('Checked out on') %]</th>
>+                        <th scope="col">[% t('Checked out from') %]</th>
>+                        <th scope="col">[% t('Call no') %]</th>
>+                        <th scope="col">[% t('Charge') %]</th>
>+                        <th scope="col">[% t('Fine') %]</th>
>+                        <th scope="col">[% t('Price') %]</th>
>+                        <th scope="col">[% t('Renew') %] <p class="column-tool"><a href="#" id="CheckAllRenewals">[% t('select all') %]</a> | <a href="#" id="UncheckAllRenewals">[% t('none') %]</a></p></th>
>+                        <th scope="col">[% t('Check in') %] <p class="column-tool"><a href="#" id="CheckAllCheckins">[% t('select all') %]</a> | <a href="#" id="UncheckAllCheckins">[% t('none') %]</a></p></th>
>+                        <th scope="col">[% t('Export') %] <p class="column-tool"><a href="#" id="CheckAllExports">[% t('select all') %]</a> | <a href="#" id="UncheckAllExports">[% t('none') %]</a></p></th>
>                     </tr>
>                 </thead>
>                 [% INCLUDE 'checkouts-table-footer.inc' %]
>             </table>
> 
>-            <label for="issues-table-load-immediately">Always show checkouts immediately</label>
>+            <label for="issues-table-load-immediately">[% t('Always show checkouts immediately') %]</label>
>             <input id="issues-table-load-immediately" type="checkbox" />
> 
>             <div id="issues-table-actions">
>                 <fieldset class="action">
>                     [% IF ( CAN_user_circulate_override_renewals ) %]
>                         [% IF CAN_user_circulate_override_renewals && Koha.Preference( 'AllowRenewalLimitOverride' ) %]
>-                            <label for="override_limit">Override renewal limit:</label>
>+                            <label for="override_limit">[% t('Override renewal limit:') %]</label>
>                             <input type="checkbox" name="override_limit" id="override_limit" value="1" />
>                         [% END %]
>                     [% END %]
>                     [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
>-                        <button class="btn btn-default" id="RenewCheckinChecked"><i class="fa fa-check"></i> Renew or check in selected items</button>
>-                        <button class="btn btn-default" id="RenewAll"><i class="fa fa-book"></i> Renew all</button>
>+                        <button class="btn btn-default" id="RenewCheckinChecked"><i class="fa fa-check"></i> [% t('Renew or check in selected items') %]</button>
>+                        <button class="btn btn-default" id="RenewAll"><i class="fa fa-book"></i> [% t('Renew all') %]</button>
>                     [% END %]
>                 </fieldset>
> 
>                 [% IF Koha.Preference('ExportCircHistory') %]
>                     <fieldset>
>-                        <label for="issues-table-output-format"><b>Export checkouts using format:</b></label>
>+                        <label for="issues-table-output-format"><b>[% t('Export checkouts using format:') %]</b></label>
>                         <select name="issues-table-output-format" id="issues-table-output-format">
>-                            <option value="iso2709_995">ISO2709 with items</option>
>-                            <option value="iso2709">ISO2709 without items</option>
>+                            <option value="iso2709_995">[% t('ISO2709 with items') %]</option>
>+                            <option value="iso2709">[% t('ISO2709 without items') %]</option>
>                             [% IF csv_profiles.size %]
>-                                <option value="csv">CSV</option>
>+                                <option value="csv">[% t('CSV') %]</option>
>                             [% END %]
>                         </select>
> 
>@@ -67,17 +68,17 @@
>                                 [% END %]
>                             </select>
>                         [% END %]
>-                       <label for="export_remove_fields">Don't export fields:</label> <input type="text" id="export_remove_fields" name="export_remove_fields" value="[% Koha.Preference('ExportRemoveFields') %]" title="Use for iso2709 exports" />
>+                       <label for="export_remove_fields">[% t('Don\'t export fields:') %]</label> <input type="text" id="export_remove_fields" name="export_remove_fields" value="[% Koha.Preference('ExportRemoveFields') %]" title="[% t('Use for iso2709 exports') %]" />
>                         <input type="hidden" name="op" value="export" />
>                         <input type="hidden" id="output_format" name="output_format" value="iso2709" />
>                         <input type="hidden" id="dont_export_item" name="dont_export_item" value="0" />
>                         <input type="hidden" id="record_type" name="record_type" value="bibs" />
>-                        <button class="btn btn-default btn-sm" id="export_submit"><i class="fa fa-download"></i> Export</button>
>+                        <button class="btn btn-default btn-sm" id="export_submit"><i class="fa fa-download"></i> [% t('Export') %]</button>
>                     </fieldset>
>                 [% END %]
>             </div>
>         </form>
>     [% ELSE %]
>-        <p>Patron has nothing checked out.</p>
>+        <p>[% t('Patron has nothing checked out.') %]</p>
>     [% END %]
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
>index dcdf1ccc87..8119d84710 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> [% IF ( patron.borrowernumber ) %]
> <div class="patroninfo"><h5>[% INCLUDE 'patron-title.inc' %]</h5>
>@@ -44,16 +45,16 @@
>     [% END %]
> 
>     [% UNLESS ( patron.address or patron.address2 ) %]
>-        <li><span class="empty" id="noaddressstored">No address stored.</span></li>
>+        <li><span class="empty" id="noaddressstored">[% t('No address stored.') %]</span></li>
>     [% END %]
>     [% UNLESS ( patron.city ) %]
>-        <li><span class="empty" id="nocitystored">No city stored.</span></li>
>+        <li><span class="empty" id="nocitystored">[% t('No city stored.') %]</span></li>
>     [% END %]
>     [% UNLESS ( patron.phone or patron.mobile or patron.phonepro) %]
>-        <li> <span class="empty">No phone stored.</span></li>
>+        <li> <span class="empty">[% t('No phone stored.') %]</span></li>
>     [% END %]
>     [% UNLESS ( patron.email or patron.emailpro) %]
>-        <li> <span class="empty">No email stored.</span></li>
>+        <li> <span class="empty">[% t('No email stored.') %]</span></li>
>     [% END %]
> 
>     [% IF ( ExtendedPatronAttributes ) %][% FOREACH extendedattribute IN extendedattributes %]
>@@ -63,63 +64,63 @@
>             [% END %]
>         [% END %]
>     [% END %][% END %]
>-    <li class="patroncategory">Category: [% patron.category.description %] ([% patron.categorycode %])</li>
>-    <li class="patronlibrary">Home library: [% Branches.GetName( patron.branchcode ) %]</li>
>-    <li class="patronborrowernumber">Borrowernumber: [% patron.borrowernumber %]</li>
>+    <li class="patroncategory">[% t('Category:') %] [% patron.category.description %] ([% patron.categorycode %])</li>
>+    <li class="patronlibrary">[% t('Home library:') %] [% Branches.GetName( patron.branchcode ) %]</li>
>+    <li class="patronborrowernumber">[% t('Borrowernumber:') %] [% patron.borrowernumber %]</li>
>   </ul></div>
> <div id="menu">
> <ul>
>     [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
>-        [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber %]">Check out</a></li>
>+        [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber %]">[% t('Check out') %]</a></li>
>         [% IF Koha.Preference('BatchCheckouts') && Koha.Preference('BatchCheckoutsValidCategories').split('\|').grep('^' _ patron.categorycode _ '$').size > 0 %]
>-          [% IF ( batch_checkout_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber %]&amp;batch=1">Batch check out</a></li>
>+          [% IF ( batch_checkout_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber %]&batch=1">[% t('Batch check out') %]</a></li>
>         [% END %]
>     [% END %]
>     [% IF CAN_user_borrowers_edit_borrowers %]
>-        [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">Details</a></li>
>+        [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% t('Details') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_updatecharges ) %]
>-        [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]">Fines</a></li>
>+        [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]">[% t('Fines') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_circulate_circulate_remaining_permissions  )  %]
>-        [% IF Koha.Preference("RoutingSerials") %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% patron.borrowernumber %]">Routing lists</a></li>[% END %]
>+        [% IF Koha.Preference("RoutingSerials") %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% patron.borrowernumber %]">[% t('Routing lists') %]</a></li>[% END %]
>     [% END %]
>     [% IF CAN_user_borrowers_edit_borrowers %]
>         [% IF ( intranetreadinghistory ) %]
>-            [% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% patron.borrowernumber %]">Circulation history</a></li>
>+            [% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% patron.borrowernumber %]">[% t('Circulation history') %]</a></li>
>         [% END %]
>     [% END %]
>     [% IF CAN_user_borrowers_edit_borrowers %]
>         [% IF ( intranetreadinghistory ) %]
>-            [% IF ( holdshistoryview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/holdshistory.pl?borrowernumber=[% patron.borrowernumber %]">Holds history</a></li>
>+            [% IF ( holdshistoryview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/holdshistory.pl?borrowernumber=[% patron.borrowernumber %]">[% t('Holds history') %]</a></li>
>         [% END %]
>     [% END %]
>     [% IF ( CAN_user_parameters ) %]
>-        [% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;modules=circulation&amp;object=[% patron.borrowernumber %]&amp;src=circ">Modification log</a></li>
>+        [% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&modules=MEMBERS&modules=circulation&object=[% patron.borrowernumber %]&src=circ">[% t('Modification log') %]</a></li>
>     [% END %]
>     [% IF CAN_user_borrowers_edit_borrowers %]
>-    [% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% patron.borrowernumber %]">Notices</a></li>
>+    [% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% patron.borrowernumber %]">[% t('Notices') %]</a></li>
>     [% END %]
>     [% IF CAN_user_borrowers_edit_borrowers %]
>-        [% IF (  statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% patron.borrowernumber %]">Statistics</a></li>
>+        [% IF (  statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% patron.borrowernumber %]">[% t('Statistics') %]</a></li>
>     [% END %]
>     [% IF CAN_user_borrowers_edit_borrowers %]
>         [% IF ( EnableBorrowerFiles ) %]
>-            [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% patron.borrowernumber %]">Files</a></li>
>+            [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% patron.borrowernumber %]">[% t('Files') %]</a></li>
>         [% END %]
>     [% END %]
> 
>     [% IF CAN_user_borrowers_edit_borrowers %]
>-        [% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% patron.borrowernumber %]">Purchase suggestions</a></li>
>+        [% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% patron.borrowernumber %]">[% t('Purchase suggestions') %]</a></li>
>     [% END %]
>     [% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
>-        [% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% patron.borrowernumber %]">Discharges</a></li>
>+        [% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% patron.borrowernumber %]">[% t('Discharges') %]</a></li>
>     [% END %]
>     [% IF Koha.Preference('HouseboundModule') %]
>-        [% IF houseboundview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber %]">Housebound</a></li>
>+        [% IF houseboundview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber %]">[% t('Housebound') %]</a></li>
>     [% END %]
>     [% IF Koha.Preference('ILLModule') && CAN_user_ill %]
>-        <li><a href="/cgi-bin/koha/ill/ill-requests.pl?borrowernumber=[% patron.borrowernumber %]">Interlibrary loans</a></li>
>+        <li><a href="/cgi-bin/koha/ill/ill-requests.pl?borrowernumber=[% patron.borrowernumber %]">[% t('Interlibrary loans') %]</a></li>
>     [% END %]
> </ul></div>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc
>index 844926c83a..9fe1eff13d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Branches %]
> <script type="text/javascript">//<![CDATA[
>     $(document).ready(function() {
>@@ -16,38 +17,38 @@
>     <div id="navmenulist">
> 
>         <ul>
>-            <li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation home</a></li>
>+            <li><a href="/cgi-bin/koha/circ/circulation-home.pl">[% t('Circulation home') %]</a></li>
>         </ul>
> 
>-        <h5>Circulation</h5>
>+        <h5>[% t('Circulation') %]</h5>
>         <ul>
>-            <li><a href="/cgi-bin/koha/circ/circulation.pl">Check out</a></li>
>-            <li><a href="/cgi-bin/koha/circ/returns.pl">Check in</a></li>
>-            <li><a href="/cgi-bin/koha/circ/renew.pl">Renew</a></li>
>+            <li><a href="/cgi-bin/koha/circ/circulation.pl">[% t('Check out') %]</a></li>
>+            <li><a href="/cgi-bin/koha/circ/returns.pl">[% t('Check in') %]</a></li>
>+            <li><a href="/cgi-bin/koha/circ/renew.pl">[% t('Renew') %]</a></li>
>             [% IF Branches.InIndependentBranchesMode %]
>-                <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>
>+                <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">[% t('Transfer') %]</a></li>
>             [% END %]
>             [% IF ( AutoLocation ) %][% ELSE %][% IF ( IndependentBranches ) %][% ELSE %]
>-                <li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a></li>
>+                <li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">[% t('Set library') %]</a></li>
>             [% END %][% END %]
>             [% IF ( fast_cataloging ) %][% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
>-                <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA">Fast cataloging</a></li>
>+                <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA">[% t('Fast cataloging') %]</a></li>
>             [% END %][% END %]
>         </ul>
> 
>-        <h5>Circulation reports</h5>
>+        <h5>[% t('Circulation reports') %]</h5>
>         <ul>
>-            <li><a href="/cgi-bin/koha/circ/view_holdsqueue.pl">Holds queue</a></li>
>-            <li><a href="/cgi-bin/koha/circ/pendingreserves.pl">Holds to pull</a></li>
>-            <li><a href="/cgi-bin/koha/circ/waitingreserves.pl">Holds awaiting pickup</a></li>
>-            <li><a href="/cgi-bin/koha/circ/reserveratios.pl">Hold ratios</a></li>
>-            <li><a href="/cgi-bin/koha/circ/transferstoreceive.pl">Transfers to receive</a></li>
>+            <li><a href="/cgi-bin/koha/circ/view_holdsqueue.pl">[% t('Holds queue') %]</a></li>
>+            <li><a href="/cgi-bin/koha/circ/pendingreserves.pl">[% t('Holds to pull') %]</a></li>
>+            <li><a href="/cgi-bin/koha/circ/waitingreserves.pl">[% t('Holds awaiting pickup') %]</a></li>
>+            <li><a href="/cgi-bin/koha/circ/reserveratios.pl">[% t('Hold ratios') %]</a></li>
>+            <li><a href="/cgi-bin/koha/circ/transferstoreceive.pl">[% t('Transfers to receive') %]</a></li>
>             [% IF ( CAN_user_circulate_overdues_report ) %]
>-                <li><a href="/cgi-bin/koha/circ/overdue.pl">Overdues</a></li>
>+                <li><a href="/cgi-bin/koha/circ/overdue.pl">[% t('Overdues') %]</a></li>
>             [% END %]
>-            <li><a href="/cgi-bin/koha/circ/branchoverdues.pl">Overdues with fines</a></li>
>+            <li><a href="/cgi-bin/koha/circ/branchoverdues.pl">[% t('Overdues with fines') %]</a></li>
>             [% IF Koha.Preference('OnSiteCheckouts') %]
>-                <li><a href="/cgi-bin/koha/circ/on-site_checkouts.pl">Pending on-site checkouts</a></li>
>+                <li><a href="/cgi-bin/koha/circ/on-site_checkouts.pl">[% t('Pending on-site checkouts') %]</a></li>
>             [% END %]
>         </ul>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc
>index d255186f30..25f2df2bf5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc
>@@ -1,14 +1,15 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE KohaDates %]
>-<legend>Patron selection</legend>
>+<legend>[% t('Patron selection') %]</legend>
> <table id="table_borrowers" class="table_borrowers">
>     <thead>
>         <tr>
>-            <th>Name</th>
>-            <th>Card number</th>
>-            <th>Date of birth</th>
>-            <th>Category</th>
>-            <th>Library</th>
>-            <th>Address</th>
>+            <th>[% t('Name') %]</th>
>+            <th>[% t('Card number') %]</th>
>+            <th>[% t('Date of birth') %]</th>
>+            <th>[% t('Category') %]</th>
>+            <th>[% t('Library') %]</th>
>+            <th>[% t('Address') %]</th>
>         </tr>
>     </thead>
>     <tbody>
>@@ -18,9 +19,9 @@
>                     <td><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrower.borrowernumber %]">[% borrower.surname %], [% borrower.firstname %]</a></td>
>             [% ELSIF destination == "holds" %]
>                 [% IF multi_hold %]
>-                    [% SET data_url = "/cgi-bin/koha/reserve/request.pl?borrowernumber=" _ borrower.borrowernumber _ "&amp;multi_hold=1&amp;biblionumbers=" _ biblionumbers %]
>+                    [% SET data_url = "/cgi-bin/koha/reserve/request.pl?borrowernumber=" _ borrower.borrowernumber _ "&multi_hold=1&biblionumbers=" _ biblionumbers %]
>                 [% ELSE %]
>-                    [% SET data_url = "/cgi-bin/koha/reserve/request.pl?borrowernumber=" _ borrower.borrowernumber _ "&amp;biblionumber=" _ biblionumber %]
>+                    [% SET data_url = "/cgi-bin/koha/reserve/request.pl?borrowernumber=" _ borrower.borrowernumber _ "&biblionumber=" _ biblionumber %]
>                 [% END %]
>                 <tr class="clickable" data-url="[% data_url %]">
>                     <td><a href="[% data_url %]">[% borrower.surname %], [% borrower.firstname %]</a></td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
>index 7fec2dd754..3c0fa932e7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> <div class="gradient">
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1>
>@@ -6,14 +7,14 @@
>     [% INCLUDE 'patron-search-box.inc' %]
> [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
> <div id="checkin_search" class="residentsearch">
>-    <p class="tip">Scan a barcode to check in:</p>
>+    <p class="tip">[% t('Scan a barcode to check in:') %]</p>
>     <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
>         <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" accesskey="r" />
>         <input value="Submit" class="submit" type="submit" />
>     </form>
> </div>
> <div id="renew_search" class="residentsearch">
>-    <p class="tip">Scan a barcode to renew:</p>
>+    <p class="tip">[% t('Scan a barcode to renew:') %]</p>
>     <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
>         <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
>         <input value="Submit" class="submit" type="submit" />
>@@ -22,20 +23,20 @@
> [% END %]
> [% IF ( CAN_user_catalogue ) %]
> <div id="catalog_search" class="residentsearch">
>-    <p class="tip">Enter search keywords:</p>
>-    <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>+    <p class="tip">[% t('Enter search keywords:') %]</p>
>+    <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block">
>         [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>         <input class="head-searchbox" type="text" name="q" id="search-form" size="40" accesskey="q" />
>-        <input type="submit" class="submit" value="Submit"/>
>+        <input type="submit" class="submit" value="Submit" />
>     </form>
> </div>
> [% END %]
> 
> <ul>
>-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
>-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
>-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
>-    [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
>+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">[% t('Check out') %]</a></li>[% END %]
>+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">[% t('Check in') %]</a></li>[% END %]
>+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">[% t('Renew') %]</a></li>[% END %]
>+    [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">[% t('Search the catalog') %]</a></li>[% END %]
> </ul>   
> 
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
>index 2247a4929c..df5521ba6c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
>@@ -1,9 +1,10 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> <div class="gradient">
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1>
> <div id="header_search">
> 	<div id="city_search" class="residentsearch">
>-    <p class="tip">City search:</p>
>+    <p class="tip">[% t('City search:') %]</p>
> 	<form action="[% script_name %]" method="post">
>         <input class="head-searchbox" type="text" name="city_name" value="[% searchfield %]" size="40" />
> 		<input type="submit" name="submit" value="OK" class="submit" />
>@@ -14,17 +15,17 @@
> 
> 	[% IF ( CAN_user_catalogue ) %]
>     <div id="catalog_search" class="residentsearch">
>-	<p class="tip">Enter search keywords:</p>
>-		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>+	<p class="tip">[% t('Enter search keywords:') %]</p>
>+		<form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block">
>              [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>-             <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
>-				<input type="submit" value="Submit"  class="submit" />
>+             <input type="text" name="q" id="search-form" size="40" value="" title="[% t('Enter the terms you wish to search for.') %]" class="head-searchbox form-text" />
>+				<input type="submit" value="Submit" class="submit" />
> 		</form>
> 	</div>[% END %]
> 			<ul>
>-            <li><a class="keep_text" href="#city_search">Search cities</a></li>
>-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
>-            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
>+            <li><a class="keep_text" href="#city_search">[% t('Search cities') %]</a></li>
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">[% t('Check out') %]</a></li>[% END %]
>+            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">[% t('Search the catalog') %]</a></li>[% END %]
> 			</ul>	
> </div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
>index 7837466162..46fdbb668f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
>@@ -1,10 +1,11 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> <div class="gradient">
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1>
> 
> <div id="header_search">
> 	<div id="contract_description_search" class="residentsearch">
>-	<p class="tip">Search by contract name or/and description:</p>
>+	<p class="tip">[% t('Search by contract name or/and description:') %]</p>
> 	<form action="[% script_name %]" method="post">
>         <input class="head-searchbox" type="text" name="searchfield" size="40" value="[% searchfield %]" />
> 		<input type="submit" class="submit" name="search" value="Search" />
>@@ -15,18 +16,18 @@
> 
> 	[% IF ( CAN_user_catalogue ) %]
>     <div id="catalog_search" class="residentsearch">
>-	<p class="tip">Enter search keywords:</p>
>-		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>+	<p class="tip">[% t('Enter search keywords:') %]</p>
>+		<form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block">
>              [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>-             <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
>-				<input type="submit" value="Submit"  class="submit" />
>+             <input type="text" name="q" id="search-form" size="40" value="" title="[% t('Enter the terms you wish to search for.') %]" class="head-searchbox form-text" />
>+				<input type="submit" value="Submit" class="submit" />
> 		</form>
> 	</div>[% END %]
> 
> 	<ul>
>-            <li><a class="keep_text" href="#contract_description_search">Search contracts</a></li>
>-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
>-            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
>+            <li><a class="keep_text" href="#contract_description_search">[% t('Search contracts') %]</a></li>
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">[% t('Check out') %]</a></li>[% END %]
>+            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">[% t('Search the catalog') %]</a></li>[% END %]
> 	</ul>
> </div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt
>index b6e434f10f..4f6b14a435 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt
>@@ -1,4 +1,5 @@
>+[% PROCESS 'i18n.inc' %]
> [%- USE Koha -%]
> [%- SET delimiter = Koha.Preference( 'delimiter' ) || ',' -%]
> 
>-[%- BLOCK -%]Contract name[% delimiter %]Order number[% delimiter %]Entry date[% delimiter %]ISBN[% delimiter %]Author[% delimiter %]Title[% delimiter %]Publication year[% delimiter %]Publisher[% delimiter %]Collection title[% delimiter %]Note for vendor[% delimiter %]Quantity[% delimiter %]RRP[% delimiter %]Delivery place[% delimiter %]Billing place[%- END -%]
>\ No newline at end of file
>+[%- BLOCK -%][% t('Contract name') %][% delimiter %][% t('Order number') %][% delimiter %][% t('Entry date') %][% delimiter %][% t('ISBN') %][% delimiter %][% t('Author') %][% delimiter %][% t('Title') %][% delimiter %][% t('Publication year') %][% delimiter %][% t('Publisher') %][% delimiter %][% t('Collection title') %][% delimiter %][% t('Note for vendor') %][% delimiter %][% t('Quantity') %][% delimiter %][% t('RRP') %][% delimiter %][% t('Delivery place') %][% delimiter %][% t('Billing place') %][%- END -%]
>\ No newline at end of file
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt
>index 81a33c78b8..a6a362f391 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt
>@@ -1,4 +1,5 @@
>+[% PROCESS 'i18n.inc' %]
> [%- USE Koha -%]
> [%- SET delimiter = Koha.Preference( 'delimiter' ) || ',' -%]
> 
>-[%- BLOCK -%]Account number[% delimiter %]Basket name[% delimiter %]Order number[% delimiter %]Author[% delimiter %]Title[% delimiter %]Publisher[% delimiter %]Publication year[% delimiter %]Collection title[% delimiter %]ISBN[% delimiter %]Quantity[% delimiter %]RRP tax included[% delimiter %]RRP tax excluded[% delimiter %]Discount[% delimiter %]Estimated cost tax included[% delimiter %]Estimated cost tax excluded[% delimiter %]Note for vendor[% delimiter %]Entry date[% delimiter %]Bookseller name[% delimiter %]Bookseller physical address[% delimiter %]Bookseller postal address[% delimiter %]Contract number[% delimiter %]Contract name[% delimiter %]Basket group delivery place[% delimiter %]Basket group billing place[% delimiter %]Basket delivery place[% delimiter %]Basket billing place[%- END -%]
>\ No newline at end of file
>+[%- BLOCK -%][% t('Account number') %][% delimiter %][% t('Basket name') %][% delimiter %][% t('Order number') %][% delimiter %][% t('Author') %][% delimiter %][% t('Title') %][% delimiter %][% t('Publisher') %][% delimiter %][% t('Publication year') %][% delimiter %][% t('Collection title') %][% delimiter %][% t('ISBN') %][% delimiter %][% t('Quantity') %][% delimiter %][% t('RRP tax included') %][% delimiter %][% t('RRP tax excluded') %][% delimiter %][% t('Discount') %][% delimiter %][% t('Estimated cost tax included') %][% delimiter %][% t('Estimated cost tax excluded') %][% delimiter %][% t('Note for vendor') %][% delimiter %][% t('Entry date') %][% delimiter %][% t('Bookseller name') %][% delimiter %][% t('Bookseller physical address') %][% delimiter %][% t('Bookseller postal address') %][% delimiter %][% t('Contract number') %][% delimiter %][% t('Contract name') %][% delimiter %][% t('Basket group delivery place') %][% delimiter %][% t('Basket group billing place') %][% delimiter %][% t('Basket delivery place') %][% delimiter %][% t('Basket billing place') %][%- END -%]
>\ No newline at end of file
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/lateorders.tt
>index 29b77d503b..621cfbd3d5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/lateorders.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/lateorders.tt
>@@ -1,4 +1,5 @@
>+[% PROCESS 'i18n.inc' %]
> [%- USE Koha -%]
> [%- SET delimiter = Koha.Preference( 'delimiter' ) || ',' -%]
> 
>-[%- BLOCK -%]ORDER DATE[%- delimiter -%]ESTIMATED DELIVERY DATE[%- delimiter -%]VENDOR[%- delimiter -%]INFORMATION[%- delimiter -%]TOTAL COST[%- delimiter -%]BASKET[%- delimiter -%]CLAIMS COUNT[%- delimiter -%]CLAIMED DATE[%- END -%]
>\ No newline at end of file
>+[%- BLOCK -%][% t('ORDER DATE') %][%- delimiter -%][% t('ESTIMATED DELIVERY DATE') %][%- delimiter -%][% t('VENDOR') %][%- delimiter -%][% t('INFORMATION') %][%- delimiter -%][% t('TOTAL COST') %][%- delimiter -%][% t('BASKET') %][%- delimiter -%][% t('CLAIMS COUNT') %][%- delimiter -%][% t('CLAIMED DATE') %][%- END -%]
>\ No newline at end of file
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/catalogue/itemsearch.tt
>index 8add507eec..f853f37140 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/catalogue/itemsearch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/catalogue/itemsearch.tt
>@@ -1 +1,2 @@
>-[%- BLOCK -%]Title, Publication date, Publisher, Collection, Barcode, Call number, Home library, Current location, Shelving location, Inventory number, Status, Checkouts[%- END -%]
>+[% PROCESS 'i18n.inc' %]
>+[%- BLOCK -%][% t('Title, Publication date, Publisher, Collection, Barcode, Call number, Home library, Current location, Shelving location, Inventory number, Status, Checkouts') %][%- END -%]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt
>index 11ec56b9cd..1b7f94a10e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt
>@@ -1 +1,2 @@
>-[%- BLOCK -%]mfirstname[% sep %]card number[% sep %]firstname[% sep %]branchname[% sep %]date[% sep %]accounttype[% sep %]amount[% sep %]title[% sep %]barcode[% sep %]itype[%- END -%]
>+[% PROCESS 'i18n.inc' %]
>+[%- BLOCK -%][% t('mfirstname') %][% sep %][% t('card number') %][% sep %][% t('firstname') %][% sep %][% t('branchname') %][% sep %][% t('date') %][% sep %][% t('accounttype') %][% sep %][% t('amount') %][% sep %][% t('title') %][% sep %][% t('barcode') %][% sep %][% t('itype') %][%- END -%]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/orders_by_budget.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/orders_by_budget.tt
>index 2494d4e9d6..62d4480e9d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/orders_by_budget.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/orders_by_budget.tt
>@@ -1 +1,2 @@
>-[%- BLOCK -%]Fund[% sep %]"Basket num"[% sep %]"Basket name"[% sep %]"Authorised by"[% sep %]"Biblio number"[% sep %]Title[% sep %]Currency[% sep %]"Vendor price"[% sep %]RRP[% sep %]"Budgeted cost"[% sep %]Quantity[% sep %]"Total RRP"[% sep %]"Total cost"[% sep %]"Entry date"[% sep %]"Date received"[% sep %]"Internal note"[% sep %]"Vendor note"[%- END -%]
>+[% PROCESS 'i18n.inc' %]
>+[%- BLOCK -%][% t('Fund') %][% sep %][% t('&#34;Basket num&#34;') %][% sep %][% t('&#34;Basket name&#34;') %][% sep %][% t('&#34;Authorised by&#34;') %][% sep %][% t('&#34;Biblio number&#34;') %][% sep %][% t('Title') %][% sep %][% t('Currency') %][% sep %][% t('&#34;Vendor price&#34;') %][% sep %][% t('RRP') %][% sep %][% t('&#34;Budgeted cost&#34;') %][% sep %][% t('Quantity') %][% sep %][% t('&#34;Total RRP&#34;') %][% sep %][% t('&#34;Total cost&#34;') %][% sep %][% t('&#34;Entry date&#34;') %][% sep %][% t('&#34;Date received&#34;') %][% sep %][% t('&#34;Internal note&#34;') %][% sep %][% t('&#34;Vendor note&#34;') %][%- END -%]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
>index 299c323f39..0cd9f2e3ae 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
>@@ -1,9 +1,10 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> <div class="gradient">
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1>
> <div id="header_search">
> 	<div id="currency_search" class="residentsearch">
>-    <p class="tip">Currencies search:</p>
>+    <p class="tip">[% t('Currencies search:') %]</p>
>         <form action="[% script_name %]" method="post">
>                 <input class="head-searchbox" type="text" name="description" size="40" value="[% searchfield %]" />
>                 <input type="submit" class="submit" name="search" value="Search" />
>@@ -12,17 +13,17 @@
>     [% INCLUDE 'patron-search-box.inc' %]
> 	[% IF ( CAN_user_catalogue ) %]
>     <div id="catalog_search" class="residentsearch">
>-	<p class="tip">Enter search keywords:</p>
>-		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>+	<p class="tip">[% t('Enter search keywords:') %]</p>
>+		<form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block">
>              [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>-             <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
>-				<input type="submit" value="Submit"  class="submit" />
>+             <input type="text" name="q" id="search-form" size="40" value="" title="[% t('Enter the terms you wish to search for.') %]" class="head-searchbox form-text" />
>+				<input type="submit" value="Submit" class="submit" />
> 		</form>
> 	</div>[% END %]
> 			<ul>
>-            <li><a class="keep_text" href="#currency_search">Search currencies</a></li>
>-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
>-            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
>+            <li><a class="keep_text" href="#currency_search">[% t('Search currencies') %]</a></li>
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">[% t('Check out') %]</a></li>[% END %]
>+            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">[% t('Search the catalog') %]</a></li>[% END %]
> 			</ul>	
> </div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc
>index 36d0d01461..80342295d6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc
>@@ -1 +1,2 @@
>-[% IF ( dateformat == "us" ) %](MM/DD/YYYY)[% ELSIF ( dateformat == "metric" ) %](DD/MM/YYYY)[% ELSIF ( dateformat == "dmydot" ) %](DD.MM.YYYY)[% ELSE %](YYYY-MM-DD)[% END %]
>+[% PROCESS 'i18n.inc' %]
>+[% IF ( dateformat == "us" ) %][% t('(MM/DD/YYYY)') %][% ELSIF ( dateformat == "metric" ) %][% t('(DD/MM/YYYY)') %][% ELSIF ( dateformat == "dmydot" ) %][% t('(DD.MM.YYYY)') %][% ELSE %][% t('(YYYY-MM-DD)') %][% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/delimiter_text.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/delimiter_text.inc
>index c6b1ce0297..1eb6753508 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/delimiter_text.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/delimiter_text.inc
>@@ -1,8 +1,9 @@
>+[% PROCESS 'i18n.inc' %]
> [% SWITCH Koha.Preference('delimiter') %]
>-    [% CASE '#' %]<span>Pound (#) separated text (.csv)</span>
>-    [% CASE ',' %]<span>Comma separated text (.csv)</span>
>-    [% CASE '/' %]<span>Slash separated text (.csv)</span>
>-    [% CASE ';' %]<span>Semicolon separated text (.csv)</span>
>-    [% CASE '\\' %]<span>Backslash separated text (.csv)</span>
>-    [% CASE 'tabulation' %]<span>Tab separated text (.csv)</span>
>+    [% CASE '#' %]<span>[% t('Pound (#) separated text (.csv)') %]</span>
>+    [% CASE ',' %]<span>[% t('Comma separated text (.csv)') %]</span>
>+    [% CASE '/' %]<span>[% t('Slash separated text (.csv)') %]</span>
>+    [% CASE ';' %]<span>[% t('Semicolon separated text (.csv)') %]</span>
>+    [% CASE '\\' %]<span>[% t('Backslash separated text (.csv)') %]</span>
>+    [% CASE 'tabulation' %]<span>[% t('Tab separated text (.csv)') %]</span>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
>index 572be95594..7392913513 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
>@@ -1,41 +1,42 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE AuthorisedValues %]
> [% IF ( opacfacets ) %]
> [% IF ( facets_loop ) %]
> <div id="search-facets">
>-<h4>Refine your search</h4>
>+<h4>[% t('Refine your search') %]</h4>
> <ul>
>-    <li id="availability_facet">Availability<ul><li>[% IF ( available ) %]<strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi_not_availablity %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]">Show all items</a>[% ELSE %]<a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]&amp;limit=available">Limit to currently available items</a>[% END %]</li></ul>
>-	[% IF ( related ) %] <li>(related searches: [% FOREACH relate IN related %][% relate.related_search %][% END %])</li>[% END %]
>+    <li id="availability_facet">[% t('Availability') %]<ul><li>[% IF ( available ) %]<strong>[% t('Showing only available items') %]</strong></li><li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi_not_availablity %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]">[% t('Show all items') %]</a>[% ELSE %]<a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]&limit=available">[% t('Limit to currently available items') %]</a>[% END %]</li></ul>
>+	[% IF ( related ) %] <li>[% t('(related searches:') %] [% FOREACH relate IN related %][% relate.related_search %][% END %])</li>[% END %]
> 	</li>
> 
> 	[% FOREACH facets_loo IN facets_loop %]
> [% IF facets_loo.facets.size > 0 %]
> 	<li id="[% facets_loo.type_id %]">
> [% facets_loo.type_label %]
>-[% IF facets_loo.type_label_Authors %]<span id="facet-authors">Authors</span>[% END %]
>-[% IF facets_loo.type_label_Titles %]<span id="facet-titles">Titles</span>[% END %]
>-[% IF facets_loo.type_label_Topics %]<span id="facet-topics">Topics</span>[% END %]
>-[% IF facets_loo.type_label_Places %]<span id="facet-places">Places</span>[% END %]
>-[% IF facets_loo.type_label_Series %]<span id="facet-series">Series</span>[% END %]
>-[% IF facets_loo.type_label_ItemTypes %]<span id="facet-itemtypes">Item types</span>[% END %]
>-[% IF ( facets_loo.type_label_HomeLibrary ) %]<span id="facet-home-libraries">Home libraries</span>[% END %]
>-[% IF ( facets_loo.type_label_HoldingLibrary ) %]<span id="facet-holding-libraries">Holding libraries</span>[% END %]
>-[% IF facets_loo.type_label_Location %]<span id="facet-locations">Locations</span>[% END %]
>-[% IF facets_loo.type_label_CollectionCodes %]<span id="facet-locations">Collections</span>[% END %]
>+[% IF facets_loo.type_label_Authors %]<span id="facet-authors">[% t('Authors') %]</span>[% END %]
>+[% IF facets_loo.type_label_Titles %]<span id="facet-titles">[% t('Titles') %]</span>[% END %]
>+[% IF facets_loo.type_label_Topics %]<span id="facet-topics">[% t('Topics') %]</span>[% END %]
>+[% IF facets_loo.type_label_Places %]<span id="facet-places">[% t('Places') %]</span>[% END %]
>+[% IF facets_loo.type_label_Series %]<span id="facet-series">[% t('Series') %]</span>[% END %]
>+[% IF facets_loo.type_label_ItemTypes %]<span id="facet-itemtypes">[% t('Item types') %]</span>[% END %]
>+[% IF ( facets_loo.type_label_HomeLibrary ) %]<span id="facet-home-libraries">[% t('Home libraries') %]</span>[% END %]
>+[% IF ( facets_loo.type_label_HoldingLibrary ) %]<span id="facet-holding-libraries">[% t('Holding libraries') %]</span>[% END %]
>+[% IF facets_loo.type_label_Location %]<span id="facet-locations">[% t('Locations') %]</span>[% END %]
>+[% IF facets_loo.type_label_CollectionCodes %]<span id="facet-locations">[% t('Collections') %]</span>[% END %]
> <ul>
>   [% SET url = "/cgi-bin/koha/catalogue/search.pl?" _ query_cgi _ limit_cgi %]
>   [% IF ( sort_by ) %]
>-    [% url = BLOCK %][% url %][% "&amp;sort_by=" _ sort_by |url %][% END %]
>+    [% url = BLOCK %][% url %][% "&sort_by=" _ sort_by |url %][% END %]
>   [% END %]
>   [% FOREACH facet IN facets_loo.facets %]
>   [% IF facets_loo.type_label_CollectionCodes %][% SET facet.facet_label_value = AuthorisedValues.GetByCode('CCODE',facet.facet_label_value,0) || facet.facet_label_value %][% END %]
>     <li>
>       [% IF facet.active %]
>-        [% SET local_url = url _ "&amp;nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
>+        [% SET local_url = url _ "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
>         <span class="facet-label">[% facet.facet_label_value %]</span>
>-        [<a href="[% local_url %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
>+        [<a href="[% local_url %]" title="[% t('Remove facet') %] [% facet.facet_link_value | html %]">[% t('x') %]</a>]
>       [% ELSE %]
>-        [% SET local_url = url _ "&amp;limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
>+        [% SET local_url = url _ "&limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
>         <span class="facet-label"><a href="[% local_url %]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a></span>
>         [% IF ( displayFacetCount ) %]
>           <span class="facet-count"> ([% facet.facet_count %])</span>
>@@ -45,7 +46,7 @@
>   [% END %]
>   [% IF ( facets_loo.expandable ) %]
>       <li class="showmore">
>-          <a href="[% url %][% IF offset %]&amp;offset=[% offset |url %][% END %]&amp;expand=[% facets_loo.expand |url %]#[% facets_loo.type_id |url %]">Show more</a>
>+          <a href="[% url %][% IF offset %]&offset=[% offset |url %][% END %]&expand=[% facets_loo.expand |url %]#[% facets_loo.type_id |url %]">[% t('Show more') %]</a>
>       </li>
>   [% END %]
> </ul></li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/form-blocks.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/form-blocks.inc
>index 8c307d59af..44f3ed0f13 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/form-blocks.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/form-blocks.inc
>@@ -1,5 +1,5 @@
> [% BLOCK selectoptionopen %]
>-    [% IF value == selected %]<option value='[% value %]' selected='selected'>
>-    [% ELSE %]<option value='[% value %]'>
>+    [% IF value == selected %]<option value="[% value %]" selected="selected">
>+    [% ELSE %]<option value="[% value %]">
>     [% END %]
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc
>index 752ecf22c3..1866c20b86 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc
>@@ -1,18 +1,19 @@
>+[% PROCESS 'i18n.inc' %]
> <div id="navmenu">
> <div id="navmenulist">
> 
>-<h5>Run reports</h5>
>+<h5>[% t('Run reports') %]</h5>
> <ul>
>-	[% IF ( CAN_user_reports_execute_reports ) %]<li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports</a></li>[% END %]
>+	[% IF ( CAN_user_reports_execute_reports ) %]<li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">[% t('Saved reports') %]</a></li>[% END %]
> </ul>
>-<h5>Reports dictionary</h5>
>+<h5>[% t('Reports dictionary') %]</h5>
> <ul>
>-<li><a href="/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary">View dictionary</a></li>
>+<li><a href="/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary">[% t('View dictionary') %]</a></li>
> </ul>
>-<h5>Useful resources</h5>
>+<h5>[% t('Useful resources') %]</h5>
> <ul>
>-<li><a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="blank">Koha report library</a></li>
>-<li><a href="http://schema.koha-community.org/" target="blank">Koha database schema</a></li>
>+<li><a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="blank">[% t('Koha report library') %]</a></li>
>+<li><a href="http://schema.koha-community.org/" target="blank">[% t('Koha database schema') %]</a></li>
> </ul>
> </div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
>index 3c112ee70c..1da4bec007 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
>@@ -1,52 +1,53 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Branches %]
> <div id="header" class="navbar navbar-default">
>     <div class="container-fluid">
>         <ul id="toplevelmenu" class="nav navbar-nav">
>-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a></li>[% END %]
>-            [% IF CAN_user_borrowers_edit_borrowers %]<li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li>[% END %]
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a href="/cgi-bin/koha/circ/circulation-home.pl">[% t('Circulation') %]</a></li>[% END %]
>+            [% IF CAN_user_borrowers_edit_borrowers %]<li><a href="/cgi-bin/koha/members/members-home.pl">[% t('Patrons') %]</a></li>[% END %]
>             <li class="dropdown">
>-                <a href="/cgi-bin/koha/catalogue/search.pl" class="dropdown-toggle" data-toggle="dropdown">Search <b class="caret"></b></a>
>+                <a href="/cgi-bin/koha/catalogue/search.pl" class="dropdown-toggle" data-toggle="dropdown">[% t('Search') %] <b class="caret"></b></a>
>                 <ul class="dropdown-menu dropdown-menu-right">
>-                    [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl">Advanced search</a></li>
>-                    <li><a href="/cgi-bin/koha/catalogue/itemsearch.pl">Item search</a></li>[% END %]
>+                    [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl">[% t('Advanced search') %]</a></li>
>+                    <li><a href="/cgi-bin/koha/catalogue/itemsearch.pl">[% t('Item search') %]</a></li>[% END %]
>                 </ul>
>             </li>
>             [% IF ( intranetbookbag ) %]
>                 <li>
>-                    <a href="#" id="cartmenulink">Cart<span id="basketcount"></span></a>
>+                    <a href="#" id="cartmenulink">[% t('Cart') %]<span id="basketcount"></span></a>
>                 </li>
>             [% END %]
>             [% IntranetNav %]
>             <li class="dropdown">
>-                <a href="/cgi-bin/koha/mainpage.pl" class="dropdown-toggle" data-toggle="dropdown">More <b class="caret"></b></a>
>+                <a href="/cgi-bin/koha/mainpage.pl" class="dropdown-toggle" data-toggle="dropdown">[% t('More') %] <b class="caret"></b></a>
>                 <ul class="dropdown-menu dropdown-menu-right">
>-                    <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a></li>
>+                    <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">[% t('Lists') %]</a></li>
>                     [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items ) %]
>-                        <li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a></li>
>+                        <li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">[% t('Cataloging') %]</a></li>
>                     [% END %]
>                     [% IF ( CAN_user_acquisition ) %]
>-                        <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></li>
>+                        <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">[% t('Acquisitions') %]</a></li>
>                     [% END %]
>-                    <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
>+                    <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">[% t('Authorities') %]</a></li>
>                     [% IF Koha.Preference('ILLModule') && CAN_user_ill %]
>-                        <li><a href="/cgi-bin/koha/ill/ill-requests.pl">ILL requests</a></li>
>+                        <li><a href="/cgi-bin/koha/ill/ill-requests.pl">[% t('ILL requests') %]</a></li>
>                     [% END %]
>                     [% IF ( CAN_user_serials ) %]
>-                        <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
>+                        <li><a href="/cgi-bin/koha/serials/serials-home.pl">[% t('Serials') %]</a></li>
>                     [% END %]
>                     [% IF ( UseCourseReserves ) %]
>-                        <li><a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a></li>
>+                        <li><a href="/cgi-bin/koha/course_reserves/course-reserves.pl">[% t('Course reserves') %]</a></li>
>                     [% END %]
>                     [% IF ( CAN_user_reports ) %]
>-                        <li><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li>
>+                        <li><a href="/cgi-bin/koha/reports/reports-home.pl">[% t('Reports') %]</a></li>
>                     [% END %]
>                     [% IF ( CAN_user_tools ) %]
>-                        <li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></li>
>+                        <li><a href="/cgi-bin/koha/tools/tools-home.pl">[% t('Tools') %]</a></li>
>                     [% END %]
>                     [% IF ( CAN_user_parameters ) %]
>-                        <li><a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a></li>
>+                        <li><a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a></li>
>                     [% END %]
>-                    <li><a href="/cgi-bin/koha/about.pl">About Koha</a></li>
>+                    <li><a href="/cgi-bin/koha/about.pl">[% t('About Koha') %]</a></li>
>                 </ul>
>             </li>
>         </ul>
>@@ -67,7 +68,7 @@
>                         [% ELSE %]
>                             <strong>
>                                 [% IF ( LoginBranchname == 'NO_LIBRARY_SET' ) %]
>-                                    NO LIBRARY SET
>+                                    [% t('NO LIBRARY SET') %]
>                                 [% ELSE %]
>                                     <span class="logged-in-branch-name">[% LoginBranchname %]</span>
>                                     <span class="logged-in-branch-code content_hidden">[% Branches.GetLoggedInBranchcode %]</span>
>@@ -80,7 +81,7 @@
>                 <ul class="dropdown-menu dropdown-menu-left" role="menu" aria-labelledby="logged-in-menu">
> 
>                     <li class="loggedin-menu-label">
>-                        Logged in as:<br />
>+                        [% t('Logged in as:') %]<br />
>                         <span class="loggedinusername">[% loggedinusername %]</span>
>                     </li>
>                     <li class="loggedin-menu-label">
>@@ -90,9 +91,9 @@
>                             </brand>
>                         [% ELSE %]
>                             [% IF ( LoginBranchname == 'NO_LIBRARY_SET' ) %]
>-                                NO LIBRARY SET
>+                                [% t('NO LIBRARY SET') %]
>                             [% ELSE %]
>-                                Location: <br />
>+                                [% t('Location:') %] <br />
>                                 <span class="logged-in-branch-name">[% LoginBranchname %]</span>
>                                 <span class="logged-in-branch-code content_hidden">[% Branches.GetLoggedInBranchcode %]</span>
>                             [% END %]
>@@ -103,46 +104,46 @@
>                     [% IF ( IndependentBranches ) %]
>                         [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
>                     <li>
>-                        <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
>+                        <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl">[% t('Set library') %]</a>
>                     </li>
>                         [% END %]
>                     [% ELSE %]
>                     <li>
>-                        <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
>+                        <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl">[% t('Set library') %]</a>
>                     </li>
>                     [% END %]
>                     [% IF EnableSearchHistory %]
>                     <li>
>-                        <a class="toplinks" href="/cgi-bin/koha/catalogue/search-history.pl">Search history</a>
>+                        <a class="toplinks" href="/cgi-bin/koha/catalogue/search-history.pl">[% t('Search history') %]</a>
>                     </li>
>                     [% END %]
>                     [% IF loggedinusernumber %]
>-                        <li class ="toplinks-myaccount">
>-                            <a class="toplinks" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loggedinusernumber %]">My account</a>
>+                        <li class="toplinks-myaccount">
>+                            <a class="toplinks" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loggedinusernumber %]">[% t('My account') %]</a>
>                         </li>
>                         <li class="toplinks-mycheckouts">
>-                            <a class="toplinks" href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% loggedinusernumber %]">My checkouts</a>
>+                            <a class="toplinks" href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% loggedinusernumber %]">[% t('My checkouts') %]</a>
>                         </li>
>                     [% END %]
>                     <li>
>-                        <a id="logout" class="toplinks" href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log out</a>
>+                        <a id="logout" class="toplinks" href="/cgi-bin/koha/mainpage.pl?logout.x=1">[% t('Log out') %]</a>
>                     </li>
>                 </ul>
>             </li>
>             [% INCLUDE 'langmenu-staff-top.inc' %]
>             <li>
>-                <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
>+                <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>[% t('Help') %]</span></a>
>             </li>
>             [% ELSE %]
>             <li class="loggedout">
>                 <span>
>-                    <a href="/cgi-bin/koha/mainpage.pl" id="login">Log in</a>
>+                    <a href="/cgi-bin/koha/mainpage.pl" id="login">[% t('Log in') %]</a>
>                     <span class="separator">|</span>
>-                    <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
>+                    <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>[% t('Help') %]</span></a>
>                 </span>
>             </li>
>             [% END %]
>         </ul>
>     </div>
>-    [% IF ( intranetbookbag ) %]<div id="cartDetails">Your cart is empty.</div>[% END %]
>+    [% IF ( intranetbookbag ) %]<div id="cartDetails">[% t('Your cart is empty.') %]</div>[% END %]
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
>index 99946e26de..8d66fbec8f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
>@@ -1,6 +1,7 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Online help</title>
>+<title>[% t('Online help') %]</title>
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
> <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" />
> [% Asset.css("lib/jquery/jquery-ui-1.11.4.min.css") %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
>index 59ddcecc6c..14d840f880 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> <div class="gradient">
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1>
>@@ -6,14 +7,14 @@
>     [% INCLUDE 'patron-search-box.inc' %]
> [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
> <div id="checkin_search" class="residentsearch">
>-    <p class="tip">Scan a barcode to check in:</p>
>+    <p class="tip">[% t('Scan a barcode to check in:') %]</p>
>     <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
>         <input name="barcode" class="head-searchbox" id="ret_barcode" size="40" accesskey="r" />
>         <input value="Submit" class="submit" type="submit" />
>     </form>
> </div>
> <div id="renew_search" class="residentsearch">
>-    <p class="tip">Scan a barcode to renew:</p>
>+    <p class="tip">[% t('Scan a barcode to renew:') %]</p>
>         <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
>             <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
>             <input value="Submit" class="submit" type="submit" />
>@@ -23,29 +24,29 @@
> 
> [% IF CAN_user_borrowers_edit_borrowers %]
> <div id="patron_search" class="residentsearch">
>-    <p class="tip">Enter patron card number or partial name:</p>
>+    <p class="tip">[% t('Enter patron card number or partial name:') %]</p>
>     <form action="/cgi-bin/koha/members/member.pl" method="post">
>-        <input name="searchmember" class="head-searchbox" id="searchmember" size="40" type="text"/>
>+        <input name="searchmember" class="head-searchbox" id="searchmember" size="40" type="text" />
>         <input type="hidden" name="quicksearch" value="1" />
>         <input value="Submit" class="submit" type="submit" />
>     </form>
> </div>[% END %]
> [% IF ( CAN_user_catalogue ) %]
> <div id="catalog_search" class="residentsearch">
>-    <p class="tip">Enter search keywords:</p>
>-    <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>+    <p class="tip">[% t('Enter search keywords:') %]</p>
>+    <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block">
>         [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>         <input type="text" name="q" id="search-form" class="head-searchbox" size="40" accesskey="q" />
>-        <input type="submit" class="submit" value="Submit"/>
>+        <input type="submit" class="submit" value="Submit" />
>     </form>
> </div>[% END %]
> 
> <ul>
>-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
>-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
>-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
>-    [% IF CAN_user_borrowers_edit_borrowers %]<li><a class="keep_text" href="#patron_search">Search patrons</a></li>[% END %]
>-    [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
>+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">[% t('Check out') %]</a></li>[% END %]
>+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">[% t('Check in') %]</a></li>[% END %]
>+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">[% t('Renew') %]</a></li>[% END %]
>+    [% IF CAN_user_borrowers_edit_borrowers %]<li><a class="keep_text" href="#patron_search">[% t('Search patrons') %]</a></li>[% END %]
>+    [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">[% t('Search the catalog') %]</a></li>[% END %]
> </ul>
> 
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc
>index d725e26a56..7659069715 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> [% IF Koha.Preference('ILLModule ') && CAN_user_ill %]
>     <div id="toolbar" class="btn-toolbar">
>@@ -5,26 +6,26 @@
>           [% IF backends.size > 1 %]
>             <div class="dropdown btn-group">
>                 <button class="btn btn-sm btn-default dropdown-toggle" type="button" id="ill-backend-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
>-                    <i class="fa fa-plus"></i> New ILL request <span class="caret"></span>
>+                    <i class="fa fa-plus"></i> [% t('New ILL request') %] <span class="caret"></span>
>                 </button>
>                 <ul class="dropdown-menu" aria-labelledby="ill-backend-dropdown">
>                     [% FOREACH backend IN backends %]
>-                        <li><a href="/cgi-bin/koha/ill/ill-requests.pl?method=create&amp;backend=[% backend %]">[% backend %]</a></li>
>+                        <li><a href="/cgi-bin/koha/ill/ill-requests.pl?method=create&backend=[% backend %]">[% backend %]</a></li>
>                     [% END %]
>                 </ul>
>             </div>
>           [% ELSE %]
>-            <a id="ill-new" class="btn btn-sm btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=create&amp;backend=[% backends.0 %]">
>-                <i class="fa fa-plus"></i> New ILL request
>+            <a id="ill-new" class="btn btn-sm btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=create&backend=[% backends.0 %]">
>+                <i class="fa fa-plus"></i> [% t('New ILL request') %]
>             </a>
>           [% END %]
>         [% ELSE %]
>             <a id="ill-new" class="btn btn-sm btn-default disabled" href="">
>-                <i class="fa fa-plus"></i> New ILL request
>+                <i class="fa fa-plus"></i> [% t('New ILL request') %]
>             </a>
>         [% END %]
>         <a id="ill-list" class="btn btn-sm btn-default btn-group" href="/cgi-bin/koha/ill/ill-requests.pl">
>-            <i class="fa fa-list"></i> List requests
>+            <i class="fa fa-list"></i> [% t('List requests') %]
>         </a>
>     </div>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc
>index aa25fb1b87..a607962ba5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc
>@@ -1,21 +1,22 @@
>+[% PROCESS 'i18n.inc' %]
> [% INCLUDE 'blocking_errors.inc' %]
> <div id="toolbar" class="btn-toolbar">
>     <div class="btn-group">
>-        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>
>+        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> [% t('New') %] <span class="caret"></span></button>
>         <ul class="dropdown-menu">
>-            <li><a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=new">Label batch</a></li>
>-            <li><a href="/cgi-bin/koha/labels/label-edit-layout.pl?op=new">Layout</a></li>
>-            <li><a href="/cgi-bin/koha/labels/label-edit-template.pl?op=new">Label template</a></li>
>-            <li><a href="/cgi-bin/koha/labels/label-edit-profile.pl?op=new">Printer profile</a></li>
>+            <li><a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=new">[% t('Label batch') %]</a></li>
>+            <li><a href="/cgi-bin/koha/labels/label-edit-layout.pl?op=new">[% t('Layout') %]</a></li>
>+            <li><a href="/cgi-bin/koha/labels/label-edit-template.pl?op=new">[% t('Label template') %]</a></li>
>+            <li><a href="/cgi-bin/koha/labels/label-edit-profile.pl?op=new">[% t('Printer profile') %]</a></li>
>         </ul>
>     </div>
>     <div class="btn-group">
>-        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-edit"></i> Manage <span class="caret"></span></button>
>+        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-edit"></i> [% t('Manage') %] <span class="caret"></span></button>
>         <ul class="dropdown-menu">
>-            <li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Label batches</a></li>
>-            <li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Layouts</a></li>
>-            <li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=template">Label templates</a></li>
>-            <li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=profile">Printer profiles</a></li>
>+            <li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">[% t('Label batches') %]</a></li>
>+            <li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">[% t('Layouts') %]</a></li>
>+            <li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=template">[% t('Label templates') %]</a></li>
>+            <li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=profile">[% t('Printer profiles') %]</a></li>
>         </ul>
>     </div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc
>index cf7a5d9622..79ce9d9818 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc
>@@ -1,7 +1,8 @@
>+[% PROCESS 'i18n.inc' %]
> 
> [% IF ( ( ! one_language_enabled ) && ( languages_loop ) && ( Koha.Preference('StaffLangSelectorMode') == 'both' || Koha.Preference('StaffLangSelectorMode') == 'top') ) %]
> <li class="dropdown">
>-    <a href="#" title="Switch languages" class="dropdown-toggle" id="langmenu" data-toggle="dropdown" role="button"><i class="icon-flag icon-white"></i> <span class="langlabel">Languages</span> <b class="caret"></b></a>
>+    <a href="#" title="[% t('Switch languages') %]" class="dropdown-toggle" id="langmenu" data-toggle="dropdown" role="button"><i class="icon-flag icon-white"></i> <span class="langlabel">[% t('Languages') %]</span> <b class="caret"></b></a>
>     <ul aria-labelledby="langmenu" role="menu" class="dropdown-menu dropdown-menu-left">
>     [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %]
>         [% IF ( languages_loo.group_enabled ) %]
>@@ -9,18 +10,18 @@
>                 [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
>                     [% IF ( sublanguages_loo.enabled ) %]
>                         [% IF ( sublanguages_loo.sublanguage_current ) %]
>-                            <li role="presentation"> <a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]&nbsp;<i class="fa fa-check"></i></a></li>
>+                            <li role="presentation"> <a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]Â <i class="fa fa-check"></i></a></li>
>                         [% ELSE %]
>-                            <li role="presentation"><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"  tabindex="-1" role="menuitem"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]</a></li>
>+                            <li role="presentation"><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]" tabindex="-1" role="menuitem"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]</a></li>
>                         [% END %]
>                     [% END # / IF sublanguages_loo.enabled %]
>                 [% END # / FOREACH sublanguages_loo %]
>             [% ELSE %]
>                 [% IF ( languages_loo.group_enabled ) %]
>                     [% IF ( languages_loo.current ) %]
>-                        <li role="presentation"><a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]&nbsp;<i class="fa fa-check"></i></a></li>
>+                        <li role="presentation"><a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]Â <i class="fa fa-check"></i></a></li>
>                     [% ELSE %]
>-                        <li role="presentation"><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]"  tabindex="-1" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a></li>
>+                        <li role="presentation"><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]" tabindex="-1" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a></li>
>                     [% END %]
>                 [% END # / IF languages_loo.current %]
>             [% END # / IF ( languages_loo.plural ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
>index 1eea7bb551..816e696e6d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
>@@ -1,9 +1,10 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> <div class="gradient">
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1>
> <div id="header_search">
> 	<div id="notices_search" class="residentsearch">
>-    <p class="tip">Search existing notices:</p>
>+    <p class="tip">[% t('Search existing notices:') %]</p>
> <form action="/cgi-bin/koha/tools/letter.pl" method="post">
>         <input class="head-searchbox" type="text" name="searchfield" size="40" value="" />
>                 <input type="submit" class="submit" name="search" value="Search" />
>@@ -12,17 +13,17 @@
>     [% INCLUDE 'patron-search-box.inc' %]
> 	[% IF ( CAN_user_catalogue ) %]
>     <div id="catalog_search" class="residentsearch">
>-	<p class="tip">Enter search keywords:</p>
>-		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>+	<p class="tip">[% t('Enter search keywords:') %]</p>
>+		<form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block">
>             [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>-            <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
>-				<input type="submit" name="op" value="Submit"  class="submit" />
>+            <input type="text" name="q" id="search-form" size="40" value="" title="[% t('Enter the terms you wish to search for.') %]" class="head-searchbox form-text" />
>+				<input type="submit" name="op" value="Submit" class="submit" />
> 		</form>
> 	</div>[% END %]
> 			<ul>
>-            <li><a class="keep_text" href="#notices_search">Search notices</a></li>
>-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
>-            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
>+            <li><a class="keep_text" href="#notices_search">[% t('Search notices') %]</a></li>
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">[% t('Check out') %]</a></li>[% END %]
>+            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">[% t('Search the catalog') %]</a></li>[% END %]
> 			</ul>	
> </div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc
>index 7856fc11df..af46f6e06d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc
>@@ -1,5 +1,6 @@
>+[% PROCESS 'i18n.inc' %]
>         <fieldset class="rows" id="memberentry_address">
>-        <legend id="alt_address_lgd">Alternate address</legend><ol>
>+        <legend id="alt_address_lgd">[% t('Alternate address') %]</legend><ol>
>         [% UNLESS noB_address %]
>             <li>
>                 [% IF ( mandatoryB_address ) %]
>@@ -7,9 +8,9 @@
>                 [% ELSE %]
>                     <label for="B_address">
>                 [% END %]
>-                Address: </label>
>+                [% t('Address:') %] </label>
>                     <input type="text" id="B_address" name="B_address" size="40" value="[% patron.B_address %]" />
>-      [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatoryB_address ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
> 
>@@ -20,7 +21,7 @@
>             [% ELSE %]
>                 <label for="B_streettype">
>         [% END %]
>-            Street type: </label>
>+            [% t('Street type:') %] </label>
>             <select name="B_streettype">
>             <option value=""></option>
>             [% FOR roadtype IN roadtypes %]
>@@ -31,7 +32,7 @@
>                 [% END %]
>             [% END %]
>             </select>
>-            [% IF ( mandatoryB_streettype ) %]<span class="required">Required</span>[% END %]
>+            [% IF ( mandatoryB_streettype ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
> 
>@@ -42,9 +43,9 @@
>                 [% ELSE %]
>                     <label for="B_streetnumber">
>                 [% END %]
>-                Street Number: </label>
>+                [% t('Street Number:') %] </label>
>                     <input type="text" id="B_streetnumber" name="B_streetnumber" size="5" value="[% patron.B_streetnumber %]" />
>-                [% IF ( mandatoryB_streetnumber ) %]<span class="required">Required</span>[% END %]
>+                [% IF ( mandatoryB_streetnumber ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
> 
>@@ -55,9 +56,9 @@
>                 [% ELSE %]
>                     <label for="B_address2">
>                 [% END %]
>-                Address 2: </label>
>+                [% t('Address 2:') %] </label>
>                     <input type="text" id="B_address2" name="B_address2" size="40" value="[% patron.B_address2 %]" />
>-      [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatoryB_address2 ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noB_zipcode %]
>@@ -67,33 +68,33 @@
>                                 [% ELSE %]
>                                         <label for="B_zipcode">
>                                 [% END %]
>-                                ZIP/Postal code: </label>
>+                                [% t('ZIP/Postal code:') %] </label>
>                     <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% patron.B_zipcode %]" />
>-          [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
>+          [% IF ( mandatoryB_zipcode ) %]<span class="required">[% t('Required') %]</span>[% END %]
>                         </li>
>         [% END %]
>         [% UNLESS noB_city %]
>             <li>
>                 [% IF ( mandatoryB_city ) %]
>-                    <label for="B_city" class="required" >
>+                    <label for="B_city" class="required">
>                 [% ELSE %]
>                     <label for="B_city">
>                 [% END %]
>-                City: </label>
>+                [% t('City:') %] </label>
>                 <input type="text" id="B_city" name="B_city" size="20" value="[% patron.B_city %]" />
>-      [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatoryB_city ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noB_state %]
>             <li>
>                 [% IF ( mandatoryB_state ) %]
>-                    <label for="B_state" class="required" >
>+                    <label for="B_state" class="required">
>                 [% ELSE %]
>                     <label for="B_state">
>                 [% END %]
>-                State: </label>
>+                [% t('State:') %] </label>
>                 <input type="text" id="B_state" name="B_state" size="20" value="[% patron.B_state %]" />
>-      [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatoryB_state ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noB_country %]
>@@ -103,9 +104,9 @@
>                 [% ELSE %]
>                     <label for="B_country">
>                 [% END %]
>-                Country: </label>
>+                [% t('Country:') %] </label>
>                     <input type="text" id="B_country" name="B_country" size="20" value="[% patron.B_country %]" />
>-      [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatoryB_country ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noB_phone %]
>@@ -115,9 +116,9 @@
>                 [% ELSE %]
>                 <label for="B_phone">
>                 [% END %]
>-                Phone: </label>
>+                [% t('Phone:') %] </label>
>                     <input type="text" id="B_phone" name="B_phone" value="[% patron.B_phone %]" />
>-                [% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %]
>+                [% IF ( mandatoryB_phone ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noB_email %]
>@@ -127,9 +128,9 @@
>         [% ELSE %]
>           <label for="B_email">
>         [% END %]
>-        Email: </label>
>+        [% t('Email:') %] </label>
>             <input type="text" id="B_email" name="B_email" size="45" value="[% patron.B_email %]" />
>-        [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
>+        [% IF ( mandatoryB_email ) %]<span class="required">[% t('Required') %]</span>[% END %] </li>
>         [% END %]
>         [% UNLESS nocontactnote %]
>             <li>
>@@ -138,9 +139,9 @@
>                 [% ELSE %]
>                 <label for="contactnote">
>                 [% END %]
>-                Contact note: </label>
>+                [% t('Contact note:') %] </label>
>                 <textarea id="contactnote" name="contactnote" cols="40" rows="2">[% patron.contactnote %]</textarea>
>-        [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
>+        [% IF ( mandatorycontactnote ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>             </ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-fr.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-fr.inc
>index 94f1dd7bb7..2654e1deb3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-fr.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-fr.inc
>@@ -1,5 +1,6 @@
>+[% PROCESS 'i18n.inc' %]
> <fieldset class="rows" id="memberentry_address">
>-<legend id="alt_address_lgd">Alternate address</legend><ol>
>+<legend id="alt_address_lgd">[% t('Alternate address') %]</legend><ol>
> 
> [% UNLESS noB_streetnumber %]
>     <li>
>@@ -8,9 +9,9 @@
>     [% ELSE %]
>          <label for="B_streetnumber">
>     [% END %]
>-    Street Number: </label>
>+    [% t('Street Number:') %] </label>
>     <input type="text" id="B_streetnumber" name="B_streetnumber" size="5" value="[% patron.B_streetnumber %]" />
>-    [% IF ( mandatoryB_streetnumber ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatoryB_streetnumber ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
> [% END %]
> 
>@@ -21,7 +22,7 @@
>     [% ELSE %]
>          <label for="B_streettype">
>     [% END %]
>-    Street type: </label>
>+    [% t('Street type:') %] </label>
>     <select name="B_streettype">
>     <option value=""></option>
>     [% FOR roadtype IN roadtypes %]
>@@ -32,7 +33,7 @@
>         [% END %]
>     [% END %]
>     </select>
>-    [% IF ( mandatoryB_streettype ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatoryB_streettype ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
> [% END %]
> 
>@@ -43,9 +44,9 @@
>     [% ELSE %]
>         <label for="B_address">
>     [% END %]
>-        Address: </label>
>+        [% t('Address:') %] </label>
>         <input type="text" id="B_address" name="B_address" size="40" value="[% patron.B_address %]" />
>-    [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatoryB_address ) %]<span class="required">[% t('Required') %]</span>[% END %]
>         </li>
> [% END %]
> 
>@@ -56,9 +57,9 @@
>     [% ELSE %]
>         <label for="B_address2">
>     [% END %]
>-    Address 2: </label>
>+    [% t('Address 2:') %] </label>
>     <input type="text" id="B_address2" name="B_address2" size="40" value="[% patron.B_address2 %]" />
>-    [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatoryB_address2 ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
> [% END %]
> [% UNLESS noB_zipcode %]
>@@ -68,33 +69,33 @@
>     [% ELSE %]
>         <label for="B_zipcode">
>     [% END %]
>-    ZIP/Postal code: </label>
>+    [% t('ZIP/Postal code:') %] </label>
>     <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% patron.B_zipcode %]" />
>-    [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatoryB_zipcode ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
> [% END %]
> [% UNLESS noB_city %]
>     <li>
>     [% IF ( mandatoryB_city ) %]
>-        <label for="B_city" class="required" >
>+        <label for="B_city" class="required">
>     [% ELSE %]
>         <label for="B_city">
>     [% END %]
>-    City: </label>
>+    [% t('City:') %] </label>
>     <input type="text" id="B_city" name="B_city" size="20" value="[% patron.B_city %]" />
>-    [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatoryB_city ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
> [% END %]
> [% UNLESS noB_state %]
>     <li>
>     [% IF ( mandatoryB_state ) %]
>-        <label for="B_state" class="required" >
>+        <label for="B_state" class="required">
>     [% ELSE %]
>         <label for="B_state">
>     [% END %]
>-        State: </label>
>+        [% t('State:') %] </label>
>         <input type="text" id="B_state" name="B_state" size="20" value="[% patron.B_state %]" />
>-    [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatoryB_state ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
> [% END %]
> [% UNLESS noB_country %]
>@@ -104,9 +105,9 @@
>     [% ELSE %]
>         <label for="B_country">
>     [% END %]
>-        Country: </label>
>+        [% t('Country:') %] </label>
>         <input type="text" id="B_country" name="B_country" size="20" value="[% patron.B_country %]" />
>-    [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatoryB_country ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
> [% END %]
> [% UNLESS noB_phone %]
>@@ -116,9 +117,9 @@
>    [% ELSE %]
>        <label for="B_phone">
>    [% END %]
>-   Phone: </label>
>+   [% t('Phone:') %] </label>
>    <input type="text" id="B_phone" name="B_phone" value="[% patron.B_phone %]" />
>-   [% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %]
>+   [% IF ( mandatoryB_phone ) %]<span class="required">[% t('Required') %]</span>[% END %]
>    </li>
> [% END %]
> [% UNLESS noB_email %]
>@@ -128,9 +129,9 @@
>    [% ELSE %]
>        <label for="B_email">
>    [% END %]
>-       Email: </label>
>+       [% t('Email:') %] </label>
>        <input type="text" id="B_email" name="B_email" size="45" value="[% patron.B_email %]" />
>-   [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
>+   [% IF ( mandatoryB_email ) %]<span class="required">[% t('Required') %]</span>[% END %] </li>
> [% END %]
> [% UNLESS nocontactnote %]
>     <li>
>@@ -139,9 +140,9 @@
>     [% ELSE %]
>         <label for="contactnote">
>     [% END %]
>-        Contact note: </label>
>+        [% t('Contact note:') %] </label>
>         <textarea id="contactnote" name="contactnote" cols="40" rows="2">[% patron.contactnote %]</textarea>
>-    [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatorycontactnote ) %]<span class="required">[% t('Required') %]</span>[% END %]
>         </li>
>     [% END %]
> </ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc
>index a4d77c3b37..bd38aaaa37 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc
>@@ -1,5 +1,6 @@
>+[% PROCESS 'i18n.inc' %]
>         <fieldset class="rows" id="memberentry_address">
>-        <legend id="alt_address_lgd">Alternate address</legend><ol>
>+        <legend id="alt_address_lgd">[% t('Alternate address') %]</legend><ol>
>         [% UNLESS noB_streetnumber %]
>             <li>
>                 [% IF ( mandatoryB_streetnumber ) %]
>@@ -7,9 +8,9 @@
>                 [% ELSE %]
>                     <label for="B_streetnumber">
>                 [% END %]
>-                Street Number: </label>
>+                [% t('Street Number:') %] </label>
>                 <input type="text" id="B_streetnumber" name="B_streetnumber" size="5" value="[% patron.B_streetnumber %]" />
>-               [% IF ( mandatoryB_streetnumber ) %]<span class="required">Required</span>[% END %]
>+               [% IF ( mandatoryB_streetnumber ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
> 
>@@ -20,7 +21,7 @@
>             [% ELSE %]
>                 <label for="B_streettype">
>         [% END %]
>-        Street type: </label>
>+        [% t('Street type:') %] </label>
>         <select name="B_streettype">
>         <option value=""></option>
>         [% FOR roadtype IN roadtypes %]
>@@ -31,7 +32,7 @@
>             [% END %]
>         [% END %]
>         </select>
>-        [% IF ( mandatoryB_streettype ) %]<span class="required">Required</span>[% END %]
>+        [% IF ( mandatoryB_streettype ) %]<span class="required">[% t('Required') %]</span>[% END %]
>         </li>
>       [% END %]
> 
>@@ -42,9 +43,9 @@
>                 [% ELSE %]
>                     <label for="B_address">
>                 [% END %]
>-                Address: </label>
>+                [% t('Address:') %] </label>
>                     <input type="text" id="B_address" name="B_address" size="40" value="[% patron.B_address %]" />
>-      [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatoryB_address ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noB_address2 %]
>@@ -54,33 +55,33 @@
>                 [% ELSE %]
>                     <label for="B_address2">
>                 [% END %]
>-                Address 2: </label>
>+                [% t('Address 2:') %] </label>
>                     <input type="text" id="B_address2" name="B_address2" size="40" value="[% patron.B_address2 %]" />
>-      [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatoryB_address2 ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noB_city %]
>             <li>
>                 [% IF ( mandatoryB_city ) %]
>-                    <label for="B_city" class="required" >
>+                    <label for="B_city" class="required">
>                 [% ELSE %]
>                     <label for="B_city">
>                 [% END %]
>-                City: </label>
>+                [% t('City:') %] </label>
>                 <input type="text" id="B_city" name="B_city" size="20" value="[% patron.B_city %]" />
>-      [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatoryB_city ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noB_state %]
>             <li>
>                 [% IF ( mandatoryB_state ) %]
>-                    <label for="B_state" class="required" >
>+                    <label for="B_state" class="required">
>                 [% ELSE %]
>                     <label for="B_state">
>                 [% END %]
>-                State: </label>
>+                [% t('State:') %] </label>
>                 <input type="text" id="B_state" name="B_state" size="20" value="[% patron.B_state %]" />
>-      [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatoryB_state ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noB_zipcode %]
>@@ -90,9 +91,9 @@
>                 [% ELSE %]
>                     <label for="B_zipcode">
>                 [% END %]
>-                ZIP/Postal code: </label>
>+                [% t('ZIP/Postal code:') %] </label>
>                     <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% patron.B_zipcode %]" />
>-      [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatoryB_zipcode ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noB_country %]
>@@ -102,9 +103,9 @@
>                 [% ELSE %]
>                     <label for="B_country">
>                 [% END %]
>-                Country: </label>
>+                [% t('Country:') %] </label>
>                     <input type="text" id="B_country" name="B_country" size="20" value="[% patron.B_country %]" />
>-      [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatoryB_country ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noB_phone %]
>@@ -114,9 +115,9 @@
>                 [% ELSE %]
>                 <label for="B_phone">
>                 [% END %]
>-                Phone: </label>
>+                [% t('Phone:') %] </label>
>                     <input type="text" id="B_phone" name="B_phone" value="[% patron.B_phone %]" />
>-                [% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %]
>+                [% IF ( mandatoryB_phone ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noB_email %]
>@@ -126,9 +127,9 @@
>         [% ELSE %]
>           <label for="B_email">
>         [% END %]
>-        Email: </label>
>+        [% t('Email:') %] </label>
>             <input type="text" id="B_email" name="B_email" size="45" value="[% patron.B_email %]" />
>-        [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
>+        [% IF ( mandatoryB_email ) %]<span class="required">[% t('Required') %]</span>[% END %] </li>
>         [% END %]
>         [% UNLESS nocontactnote %]
>             <li>
>@@ -137,9 +138,9 @@
>                 [% ELSE %]
>                 <label for="contactnote">
>                 [% END %]
>-                Contact note: </label>
>+                [% t('Contact note:') %] </label>
>                 <textarea id="contactnote" name="contactnote" cols="40" rows="2">[% contactnote %]</textarea>
>-        [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
>+        [% IF ( mandatorycontactnote ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>             </ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc
>index 2f3e4c309d..12a5f0ac69 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc
>@@ -1,5 +1,6 @@
>+[% PROCESS 'i18n.inc' %]
>         <fieldset class="rows" id="memberentry_altaddress">
>-            <legend id="alt_contact_lgd">Alternate contact</legend><ol>
>+            <legend id="alt_contact_lgd">[% t('Alternate contact') %]</legend><ol>
>         [% UNLESS noaltcontactsurname %]
>             <li>
>                 [% IF ( mandatoryaltcontactsurname ) %]
>@@ -7,9 +8,9 @@
>                 [% ELSE %]
>                 <label for="altcontactsurname">
>                 [% END %]
>-                Surname:</label>
>+                [% t('Surname:') %]</label>
>                     <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% patron.altcontactsurname %]" />
>-                [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
>+                [% IF ( mandatoryaltcontactsurname ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noaltcontactfirstname %]
>@@ -19,9 +20,9 @@
>                 [% ELSE %]
>                 <label for="altcontactfirstname">
>                 [% END %]
>-                First name:</label>
>+                [% t('First name:') %]</label>
>                     <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% patron.altcontactfirstname %]" />
>-                [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
>+                [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noaltcontactaddress1 %]
>@@ -31,9 +32,9 @@
>                 [% ELSE %]
>                 <label for="altcontactaddress1">
>                 [% END %]
>-                Address:</label>
>+                [% t('Address:') %]</label>
>                     <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% patron.altcontactaddress1 %]" size="40" />
>-                [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
>+                [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noaltcontactaddress2 %]
>@@ -43,9 +44,9 @@
>                 [% ELSE %]
>                 <label for="altcontactaddress2">
>                 [% END %]
>-                Address 2:</label>
>+                [% t('Address 2:') %]</label>
>                 <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% patron.altcontactaddress2 %]" size="40" />
>-                [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
>+                [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noaltcontactzipcode %]
>@@ -55,9 +56,9 @@
>                                 [% ELSE %]
>                                 <label for="altcontactzipcode">
>                                 [% END %]
>-                                ZIP/Postal code:</label>
>+                                [% t('ZIP/Postal code:') %]</label>
>                     <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% patron.altcontactzipcode %]" size="5" />
>-                                [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
>+                                [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">[% t('Required') %]</span>[% END %]
>                         </li>
>         [% END %]
>         [% UNLESS noaltcontactaddress3 %]
>@@ -67,9 +68,9 @@
>                 [% ELSE %]
>                 <label for="altcontactaddress3">
>                 [% END %]
>-                City:</label>
>+                [% t('City:') %]</label>
>                 <input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% patron.altcontactaddress3 %]" size="20" />
>-                [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
>+                [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noaltcontactstate %]
>@@ -79,9 +80,9 @@
>                 [% ELSE %]
>                 <label for="altcontactstate">
>                 [% END %]
>-                State:</label>
>+                [% t('State:') %]</label>
>                 <input type="text" name="altcontactstate" id="altcontactstate" value="[% patron.altcontactstate %]" size="20" />
>-                [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
>+                [% IF ( mandatoryaltcontactstate ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noaltcontactcountry %]
>@@ -91,9 +92,9 @@
>                 [% ELSE %]
>                 <label for="altcontactcountry">
>                 [% END %]
>-                Country:</label>
>+                [% t('Country:') %]</label>
>                     <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% patron.altcontactcountry %]" size="20" />
>-                [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
>+                [% IF ( mandatoryaltcontactcountry ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noaltcontactphone %]
>@@ -103,9 +104,9 @@
>                 [% ELSE %]
>                 <label for="altcontactphone">
>                 [% END %]
>-                Phone:</label>
>+                [% t('Phone:') %]</label>
>                     <input type="text" name="altcontactphone" id="altcontactphone" value="[% patron.altcontactphone %]" />
>-                [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
>+                [% IF ( mandatoryaltcontactphone ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>             </ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-fr.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-fr.inc
>index 50c1921af2..d5ee6abbf0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-fr.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-fr.inc
>@@ -1,5 +1,6 @@
>+[% PROCESS 'i18n.inc' %]
> <fieldset class="rows" id="memberentry_altaddress">
>-    <legend id="alt_contact_lgd">Alternate contact</legend><ol>
>+    <legend id="alt_contact_lgd">[% t('Alternate contact') %]</legend><ol>
> [% UNLESS noaltcontactsurname %]
>     <li>
>     [% IF ( mandatoryaltcontactsurname ) %]
>@@ -7,9 +8,9 @@
>     [% ELSE %]
>         <label for="altcontactsurname">
>     [% END %]
>-    Surname:</label>
>+    [% t('Surname:') %]</label>
>     <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% patron.altcontactsurname %]" />
>-    [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatoryaltcontactsurname ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
> [% END %]
> [% UNLESS noaltcontactfirstname %]
>@@ -19,9 +20,9 @@
>     [% ELSE %]
>         <label for="altcontactfirstname">
>     [% END %]
>-        First name:</label>
>+        [% t('First name:') %]</label>
>         <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% patron.altcontactfirstname %]" />
>-    [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
> [% END %]
> [% UNLESS noaltcontactaddress1 %]
>@@ -31,9 +32,9 @@
>     [% ELSE %]
>         <label for="altcontactaddress1">
>     [% END %]
>-    Address:</label>
>+    [% t('Address:') %]</label>
>     <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% patron.altcontactaddress1 %]" size="40" />
>-    [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
> [% END %]
> [% UNLESS noaltcontactaddress2 %]
>@@ -43,9 +44,9 @@
>     [% ELSE %]
>         <label for="altcontactaddress2">
>     [% END %]
>-    Address 2:</label>
>+    [% t('Address 2:') %]</label>
>     <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% patron.altcontactaddress2 %]" size="40" />
>-    [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
> [% END %]
> [% UNLESS noaltcontactzipcode %]
>@@ -55,9 +56,9 @@
>     [% ELSE %]
>         <label for="altcontactzipcode">
>     [% END %]
>-    ZIP/Postal code:</label>
>+    [% t('ZIP/Postal code:') %]</label>
>     <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% patron.altcontactzipcode %]" size="5" />
>-    [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
> [% END %]
> [% UNLESS noaltcontactaddress3 %]
>@@ -67,9 +68,9 @@
>     [% ELSE %]
>         <label for="altcontactaddress3">
>     [% END %]
>-    City:</label>
>+    [% t('City:') %]</label>
>     <input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% patron.altcontactaddress3 %]" size="20" />
>-    [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
> [% END %]
> [% UNLESS noaltcontactstate %]
>@@ -79,9 +80,9 @@
>     [% ELSE %]
>         <label for="altcontactstate">
>     [% END %]
>-    State:</label>
>+    [% t('State:') %]</label>
>     <input type="text" name="altcontactstate" id="altcontactstate" value="[% patron.altcontactstate %]" size="20" />
>-    [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatoryaltcontactstate ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
> [% END %]
> [% UNLESS noaltcontactcountry %]
>@@ -91,9 +92,9 @@
>     [% ELSE %]
>         <label for="altcontactcountry">
>     [% END %]
>-    Country:</label>
>+    [% t('Country:') %]</label>
>     <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% patron.altcontactcountry %]" size="20" />
>-    [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatoryaltcontactcountry ) %]<span class="required">[% t('Required') %]</span>[% END %]
> </li>
> [% END %]
> [% UNLESS noaltcontactphone %]
>@@ -103,9 +104,9 @@
>     [% ELSE %]
>         <label for="altcontactphone">
>     [% END %]
>-    Phone:</label>
>+    [% t('Phone:') %]</label>
>     <input type="text" name="altcontactphone" id="altcontactphone" value="[% patron.altcontactphone %]" />
>-    [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatoryaltcontactphone ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
> [% END %]
> </ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc
>index 7e7e790ea1..1bf4c64c38 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc
>@@ -1,5 +1,6 @@
>+[% PROCESS 'i18n.inc' %]
>         <fieldset class="rows" id="memberentry_altaddress">
>-            <legend id="alt_contact_lgd">Alternate contact</legend><ol>
>+            <legend id="alt_contact_lgd">[% t('Alternate contact') %]</legend><ol>
>         [% UNLESS noaltcontactsurname %]
>             <li>
>                 [% IF ( mandatoryaltcontactsurname ) %]
>@@ -7,9 +8,9 @@
>                 [% ELSE %]
>                 <label for="altcontactsurname">
>                 [% END %]
>-                Surname:</label>
>+                [% t('Surname:') %]</label>
>                     <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% patron.altcontactsurname %]" />
>-                [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
>+                [% IF ( mandatoryaltcontactsurname ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noaltcontactfirstname %]
>@@ -19,9 +20,9 @@
>                 [% ELSE %]
>                 <label for="altcontactfirstname">
>                 [% END %]
>-                First name:</label>
>+                [% t('First name:') %]</label>
>                     <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% patron.altcontactfirstname %]" />
>-                [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
>+                [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noaltcontactaddress1 %]
>@@ -31,9 +32,9 @@
>                 [% ELSE %]
>                 <label for="altcontactaddress1">
>                 [% END %]
>-                Address:</label>
>+                [% t('Address:') %]</label>
>                     <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% patron.altcontactaddress1 %]" size="40" />
>-                [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
>+                [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noaltcontactaddress2 %]
>@@ -43,9 +44,9 @@
>                 [% ELSE %]
>                 <label for="altcontactaddress2">
>                 [% END %]
>-                Address 2:</label>
>+                [% t('Address 2:') %]</label>
>                 <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% patron.altcontactaddress2 %]" size="40" />
>-                [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
>+                [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noaltcontactaddress3 %]
>@@ -55,9 +56,9 @@
>                 [% ELSE %]
>                 <label for="altcontactaddress3">
>                 [% END %]
>-                City:</label>
>+                [% t('City:') %]</label>
>                 <input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% patron.altcontactaddress3 %]" size="20" />
>-                [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
>+                [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noaltcontactstate %]
>@@ -67,9 +68,9 @@
>                 [% ELSE %]
>                 <label for="altcontactstate">
>                 [% END %]
>-                State:</label>
>+                [% t('State:') %]</label>
>                 <input type="text" name="altcontactstate" id="altcontactstate" value="[% patron.altcontactstate %]" size="20" />
>-                [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
>+                [% IF ( mandatoryaltcontactstate ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noaltcontactzipcode %]
>@@ -79,9 +80,9 @@
>                 [% ELSE %]
>                 <label for="altcontactzipcode">
>                 [% END %]
>-                ZIP/Postal code:</label>
>+                [% t('ZIP/Postal code:') %]</label>
>                     <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% patron.altcontactzipcode %]" size="5" />
>-                [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
>+                [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noaltcontactcountry %]
>@@ -91,9 +92,9 @@
>                 [% ELSE %]
>                 <label for="altcontactcountry">
>                 [% END %]
>-                Country:</label>
>+                [% t('Country:') %]</label>
>                     <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% patron.altcontactcountry %]" size="20" />
>-                [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
>+                [% IF ( mandatoryaltcontactcountry ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>         [% UNLESS noaltcontactphone %]
>@@ -103,9 +104,9 @@
>                 [% ELSE %]
>                 <label for="altcontactphone">
>                 [% END %]
>-                Phone:</label>
>+                [% t('Phone:') %]</label>
>                     <input type="text" name="altcontactphone" id="altcontactphone" value="[% patron.altcontactphone %]" />
>-                [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
>+                [% IF ( mandatoryaltcontactphone ) %]<span class="required">[% t('Required') %]</span>[% END %]
>             </li>
>         [% END %]
>             </ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
>index 6bebd13ba5..9a30ec1c42 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
>@@ -1,5 +1,6 @@
>+[% PROCESS 'i18n.inc' %]
> <fieldset class="rows" id="memberentry_mainaddress">
>-    <legend id="main_address_lgd">Main address</legend><ol>
>+    <legend id="main_address_lgd">[% t('Main address') %]</legend><ol>
> [% UNLESS nostreettype %]
>     [% IF roadtypes %]
>       <li>
>@@ -8,7 +9,7 @@
>       [% ELSE %]
>       <label for="streettype">
>       [% END %]
>-      Street type: </label>
>+      [% t('Street type:') %] </label>
>       <select name="streettype">
>         <option value=""></option>
>         [% FOR roadtype IN roadtypes %]
>@@ -19,7 +20,7 @@
>           [% END %]
>         [% END %]
>       </select>
>-      [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatorystreettype ) %]<span class="required">[% t('Required') %]</span>[% END %]
>       </li>
>     [% END %]
>         [% END %]
>@@ -30,9 +31,9 @@
>       [% ELSE %]
>       <label for="address">
>       [% END %]
>-      Address: </label>
>+      [% t('Address:') %] </label>
>             <input type="text" id="address" name="address" size="35" value="[% patron.address %]" />
>-      [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatoryaddress ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
>         [% END %]
>         [% UNLESS nostreetnumber %]
>@@ -42,9 +43,9 @@
>       [% ELSE %]
>       <label for="streetnumber">
>       [% END %]
>-      Street number: </label>
>+      [% t('Street number:') %] </label>
>         <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% patron.streetnumber %]" />
>-[% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
>+[% IF ( mandatorystreetnumber ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
>         [% END %]
>         [% UNLESS noaddress2 %]
>@@ -54,9 +55,9 @@
>       [% ELSE %]
>       <label for="address2">
>       [% END %]
>-      Address 2: </label>
>+      [% t('Address 2:') %] </label>
>             <input type="text" id="address2" name="address2" size="35" value="[% patron.address2 %]" />
>-      [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatoryaddress2 ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
>         [% END %]
>         [% UNLESS nozipcode %]
>@@ -66,9 +67,9 @@
>       [% ELSE %]
>         <label for="zipcode">
>       [% END %]
>-      ZIP/Postal code: </label>
>+      [% t('ZIP/Postal code:') %] </label>
>             <input type="text" name="zipcode" id="zipcode" size="10" value="[% patron.zipcode %]" />
>-          [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
>+          [% IF ( mandatoryzipcode ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
>         [% END %]
>         [% UNLESS nocity %]
>@@ -78,9 +79,9 @@
>       [% ELSE %]
>         <label for="city">
>       [% END %]
>-      City: </label>
>+      [% t('City:') %] </label>
>         <input type="text" id="city" name="city" size="20" value="[% patron.city %]" />
>-        [% IF cities.count %]or choose
>+        [% IF cities.count %][% t('or choose') %]
>         <select id="select_city" name="select_city">
>             <option value="|||"></option>
>             [% FOREACH c IN cities %]
>@@ -94,7 +95,7 @@
>             [% END %]
>         </select>
>         [% END %]
>-      [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatorycity ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
>         [% END %]
>         [% UNLESS nostate %]
>@@ -104,9 +105,9 @@
>       [% ELSE %]
>         <label for="state">
>       [% END %]
>-      State: </label>
>+      [% t('State:') %] </label>
>       <input type="text" name="state" id="state" size="20" value="[% patron.state %]" />
>-      [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatorystate ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
>         [% END %]
>         [% UNLESS nocountry %]
>@@ -116,9 +117,9 @@
>       [% ELSE %]
>         <label for="country">
>       [% END %]
>-      Country: </label>
>+      [% t('Country:') %] </label>
>         <input type="text" name="country" id="country" size="20" value="[% patron.country %]" />
>-      [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatorycountry ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
>         [% END %]
>     </ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc
>index 696b327974..c066740d43 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc
>@@ -1,5 +1,6 @@
>+[% PROCESS 'i18n.inc' %]
> <fieldset class="rows" id="memberentry_mainaddress">
>-    <legend id="main_address_lgd">Main address</legend><ol>
>+    <legend id="main_address_lgd">[% t('Main address') %]</legend><ol>
> [% UNLESS nostreettype %]
>     [% UNLESS nostreetnumber %]
>         [% IF ( mandatorystreetnumber ) %]
>@@ -7,9 +8,9 @@
>         [% ELSE %]
>             <label for="streetnumber">
>         [% END %]
>-            Street number: </label>
>+            [% t('Street number:') %] </label>
>             <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% patron.streetnumber %]" />
>-        [% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
>+        [% IF ( mandatorystreetnumber ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     [% END %]
> 
>     [% IF roadtypes %]
>@@ -19,7 +20,7 @@
>         [% ELSE %]
>             <label for="streettype">
>         [% END %]
>-        Street type: </label>
>+        [% t('Street type:') %] </label>
>         <select name="streettype">
>            <option value=""></option>
>         [% FOR roadtype IN roadtypes %]
>@@ -30,7 +31,7 @@
>             [% END %]
>         [% END %]
>         </select>
>-        [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
>+        [% IF ( mandatorystreettype ) %]<span class="required">[% t('Required') %]</span>[% END %]
>         </li>
>     [% END %]
> [% END %]
>@@ -41,9 +42,9 @@
>     [% ELSE %]
>         <label for="address">
>     [% END %]
>-    Address: </label>
>+    [% t('Address:') %] </label>
>         <input type="text" id="address" name="address" size="35" value="[% patron.address %]" />
>-    [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatoryaddress ) %]<span class="required">[% t('Required') %]</span>[% END %]
>       </li>
> [% END %]
> [% UNLESS noaddress2 %]
>@@ -53,9 +54,9 @@
>     [% ELSE %]
>         <label for="address2">
>     [% END %]
>-        Address 2: </label>
>+        [% t('Address 2:') %] </label>
>         <input type="text" id="address2" name="address2" size="35" value="[% patron.address2 %]" />
>-    [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatoryaddress2 ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
> [% END %]
> [% UNLESS nozipcode %]
>@@ -65,9 +66,9 @@
>     [% ELSE %]
>         <label for="zipcode">
>     [% END %]
>-    ZIP/Postal code: </label>
>+    [% t('ZIP/Postal code:') %] </label>
>     <input type="text" name="zipcode" id="zipcode" size="10" value="[% patron.zipcode %]" />
>-    [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatoryzipcode ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
> [% END %]
> [% UNLESS nocity %]
>@@ -77,9 +78,9 @@
>     [% ELSE %]
>         <label for="city">
>     [% END %]
>-    City: </label>
>+    [% t('City:') %] </label>
>     <input type="text" id="city" name="city" size="20" value="[% patron.city %]" />
>-    [% IF cities.count %]or choose
>+    [% IF cities.count %][% t('or choose') %]
>         <select id="select_city" name="select_city">
>             <option value="|||"></option>
>         [% FOREACH c IN cities %]
>@@ -93,7 +94,7 @@
>         [% END %]
>         </select>
>     [% END %]
>-    [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatorycity ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
> [% END %]
> [% UNLESS nostate %]
>@@ -103,9 +104,9 @@
>     [% ELSE %]
>         <label for="state">
>     [% END %]
>-        State: </label>
>+        [% t('State:') %] </label>
>         <input type="text" name="state" id="state" size="20" value="[% patron.state %]" />
>-    [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatorystate ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
> [% END %]
> [% UNLESS nocountry %]
>@@ -115,9 +116,9 @@
>     [% ELSE %]
>       <label for="country">
>     [% END %]
>-    Country: </label>
>+    [% t('Country:') %] </label>
>       <input type="text" name="country" id="country" size="20" value="[% patron.country %]" />
>-    [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
>+    [% IF ( mandatorycountry ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
> [% END %]
> </ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc
>index f76d3fdbf1..ea50c45673 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc
>@@ -1,5 +1,6 @@
>+[% PROCESS 'i18n.inc' %]
> <fieldset class="rows" id="memberentry_mainaddress">
>-    <legend id="main_address_lgd">Main address</legend><ol>
>+    <legend id="main_address_lgd">[% t('Main address') %]</legend><ol>
>         [% UNLESS nostreetnumber %]
>     <li>
>       [% IF ( mandatorystreetnumber ) %]
>@@ -7,9 +8,9 @@
>       [% ELSE %]
>       <label for="streetnumber">
>       [% END %]
>-      Street number: </label>
>+      [% t('Street number:') %] </label>
>         <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% patron.streetnumber %]" />
>-[% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
>+[% IF ( mandatorystreetnumber ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
>         [% END %]
>         [% UNLESS nostreettype %]
>@@ -20,7 +21,7 @@
>       [% ELSE %]
>       <label for="streettype">
>       [% END %]
>-      Street type: </label>
>+      [% t('Street type:') %] </label>
>       <select name="streettype">
>         <option value=""></option>
>         [% FOR roadtype IN roadtypes %]
>@@ -31,7 +32,7 @@
>           [% END %]
>         [% END %]
>       </select>
>-      [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatorystreettype ) %]<span class="required">[% t('Required') %]</span>[% END %]
>       </li>
>     [% END %]
>         [% END %]
>@@ -42,9 +43,9 @@
>       [% ELSE %]
>       <label for="address">
>       [% END %]
>-      Address: </label>
>+      [% t('Address:') %] </label>
>             <input type="text" id="address" name="address" size="35" value="[% patron.address %]" />
>-      [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatoryaddress ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
>         [% END %]
>         [% UNLESS noaddress2 %]
>@@ -54,9 +55,9 @@
>       [% ELSE %]
>       <label for="address2">
>       [% END %]
>-      Address 2: </label>
>+      [% t('Address 2:') %] </label>
>             <input type="text" id="address2" name="address2" size="35" value="[% patron.address2 %]" />
>-      [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatoryaddress2 ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
>         [% END %]
>         [% UNLESS nocity %]
>@@ -66,9 +67,9 @@
>       [% ELSE %]
>         <label for="city">
>       [% END %]
>-      City: </label>
>+      [% t('City:') %] </label>
>         <input type="text" id="city" name="city" size="20" value="[% patron.city %]" />
>-        [% IF cities.count %]or choose
>+        [% IF cities.count %][% t('or choose') %]
>         <select id="select_city" name="select_city">
>             <option value="|||"></option>
>             [% FOREACH c IN cities %]
>@@ -82,7 +83,7 @@
>             [% END %]
>         </select>
>         [% END %]
>-      [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatorycity ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
>         [% END %]
>         [% UNLESS nostate %]
>@@ -92,9 +93,9 @@
>       [% ELSE %]
>         <label for="state">
>       [% END %]
>-      State: </label>
>+      [% t('State:') %] </label>
>       <input type="text" name="state" id="state" size="20" value="[% patron.state %]" />
>-      [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatorystate ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
>         [% END %]
>         [% UNLESS nozipcode %]
>@@ -104,9 +105,9 @@
>       [% ELSE %]
>         <label for="zipcode">
>       [% END %]
>-      ZIP/Postal code: </label>
>+      [% t('ZIP/Postal code:') %] </label>
>             <input type="text" name="zipcode" id="zipcode" size="10" value="[% patron.zipcode %]" />
>-      [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatoryzipcode ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
>         [% END %]
>         [% UNLESS nocountry %]
>@@ -116,9 +117,9 @@
>       [% ELSE %]
>         <label for="country">
>       [% END %]
>-      Country: </label>
>+      [% t('Country:') %] </label>
>         <input type="text" name="country" id="country" size="20" value="[% patron.country %]" />
>-      [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
>+      [% IF ( mandatorycountry ) %]<span class="required">[% t('Required') %]</span>[% END %]
>     </li>
>         [% END %]
>     </ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
>index 43d0e5ad0b..c54d9af701 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
>@@ -1,27 +1,28 @@
>+[% PROCESS 'i18n.inc' %]
> [% IF ( borrowernumber ) %]
> <div id="menu">
>   <ul>
>-    [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">Check out</a></li>
>-    [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Details</a></li>
>+    [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">[% t('Check out') %]</a></li>
>+    [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% t('Details') %]</a></li>
>     [% IF ( CAN_user_updatecharges ) %]
>-        [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Fines</a></li>
>+        [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">[% t('Fines') %]</a></li>
>     [% END %]
>     [% IF ( intranetreadinghistory ) %]
>-        [% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]">Circulation history</a></li>
>+        [% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]">[% t('Circulation history') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_parameters ) %]
>-        [% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;action=MODIFY&amp;object=[% borrowernumber %]">Modification log</a></li>
>+        [% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&modules=MEMBERS&action=MODIFY&object=[% borrowernumber %]">[% t('Modification log') %]</a></li>
>     [% END %]
>-	[% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber %]">Notices</a></li>
>-    [% IF (  statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% borrowernumber %]">Statistics</a></li>
>+	[% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber %]">[% t('Notices') %]</a></li>
>+    [% IF (  statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% borrowernumber %]">[% t('Statistics') %]</a></li>
>     [% IF EnableBorrowerFiles %]
>-        [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% borrowernumber %]">Files</a></li>
>+        [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% borrowernumber %]">[% t('Files') %]</a></li>
>     [% END %]
>     [% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
>-        [% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% borrowernumber %]">Discharge</a></li>
>+        [% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% borrowernumber %]">[% t('Discharge') %]</a></li>
>     [% END %]
>     [% IF Koha.Preference('HouseboundModule') %]
>-        [% IF houseboundview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% borrowernumber %]">Housebound</a></li>
>+        [% IF houseboundview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% borrowernumber %]">[% t('Housebound') %]</a></li>
>     [% END %]
>   </ul>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>index 1897af77ae..e1974fdee1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% INCLUDE 'blocking_errors.inc' %]
> [% USE Koha %]
> [% USE Borrowers %]
>@@ -7,90 +8,90 @@
> <div id="toolbar" class="btn-toolbar">
>     [% IF CAN_user_borrowers_edit_borrowers %]
>         [% IF ( guarantor ) %]
>-            <a id="editpatron" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber %]&amp;guarantorid=[% guarantor.borrowernumber %]&amp;categorycode=[% patron.categorycode %]">
>+            <a id="editpatron" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber %]&guarantorid=[% guarantor.borrowernumber %]&categorycode=[% patron.categorycode %]">
>         [% ELSE %]
>-            <a id="editpatron" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber %]&amp;categorycode=[% patron.categorycode %]">
>+            <a id="editpatron" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber %]&categorycode=[% patron.categorycode %]">
>         [% END %]
>-        <i class="fa fa-pencil"></i> Edit</a>
>+        <i class="fa fa-pencil"></i> [% t('Edit') %]</a>
>     [% END %]
> 
>     [% IF CAN_user_borrowers_edit_borrowers %]
>         [% IF patron.is_adult AND Koha.Preference("borrowerRelationship") %]
>-            <a id="addchild" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% patron.borrowernumber %]"><i class="fa fa-plus"></i> Add child</a>
>+            <a id="addchild" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=add&guarantorid=[% patron.borrowernumber %]"><i class="fa fa-plus"></i> [% t('Add child') %]</a>
>         [% END %]
>         [% IF CAN_user_borrowers_edit_borrowers %]
>-            <a id="changepassword" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber %]"><i class="fa fa-lock"></i> Change password</a>
>+            <a id="changepassword" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber %]"><i class="fa fa-lock"></i> [% t('Change password') %]</a>
>         [% END %]
>-        <a id="duplicate" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% patron.borrowernumber %]&amp;categorycode=[% patron.categorycode %]"><i class="fa fa-copy"></i> Duplicate</a>
>+        <a id="duplicate" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&borrowernumber=[% patron.borrowernumber %]&categorycode=[% patron.categorycode %]"><i class="fa fa-copy"></i> [% t('Duplicate') %]</a>
>     [% END %]
> 
>     [% IF CAN_user_circulate_circulate_remaining_permissions %]
>     <div class="btn-group">
>-        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-print"></i> Print <span class="caret"></span></button>
>+        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-print"></i> [% t('Print') %] <span class="caret"></span></button>
>             <ul class="dropdown-menu">
>-                <li><a id="printsummary" href="#">Print summary</a></li>
>-                <li><a id="printslip" href="#">Print slip</a></li>
>-                <li><a id="printquickslip" href="#">Print quick slip</a></li>
>+                <li><a id="printsummary" href="#">[% t('Print summary') %]</a></li>
>+                <li><a id="printslip" href="#">[% t('Print slip') %]</a></li>
>+                <li><a id="printquickslip" href="#">[% t('Print quick slip') %]</a></li>
>                 [% IF Borrowers.HasOverdues( patron.borrowernumber ) %]
>-                    <li><a id="print_overdues" href="#">Print overdues</a></li>
>+                    <li><a id="print_overdues" href="#">[% t('Print overdues') %]</a></li>
>                 [% END %]
>             </ul>
>     </div>
>     [% END %]
> 
>     [% IF ( CAN_user_reserveforothers ) %]
>-        <a id="searchtohold" class="btn btn-default btn-sm" href="#"><i class="fa fa-search"></i> Search to hold</a>
>+        <a id="searchtohold" class="btn btn-default btn-sm" href="#"><i class="fa fa-search"></i> [% t('Search to hold') %]</a>
>     [% END %]
> 
>-    <a id="addnewmessageLabel" href="#add_message_form" data-toggle="modal" class="btn btn-default btn-sm"><i class="fa fa-comment-o"></i> Add message</a>
>+    <a id="addnewmessageLabel" href="#add_message_form" data-toggle="modal" class="btn btn-default btn-sm"><i class="fa fa-comment-o"></i> [% t('Add message') %]</a>
> 
>          <div class="btn-group">
>-        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">More <span class="caret"></span></button>
>+        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">[% t('More') %] <span class="caret"></span></button>
>             <ul class="dropdown-menu">
>                 [% IF CAN_user_borrowers_edit_borrowers %]
>-                    <li><a id="renewpatron" href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber %]&amp;destination=[% destination %]&amp;reregistration=y">Renew patron</a></li>
>+                    <li><a id="renewpatron" href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber %]&destination=[% destination %]&reregistration=y">[% t('Renew patron') %]</a></li>
>                 [% ELSE %]
>-                    <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="You are not authorized to renew patrons" id="renewpatron" href="#">Renew patron</a></li>
>+                    <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="[% t('You are not authorized to renew patrons') %]" id="renewpatron" href="#">[% t('Renew patron') %]</a></li>
>                 [% END %]
>                 [% IF ( CAN_user_permissions ) %]
>-                    <li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% patron.borrowernumber %]">Set permissions</a></li>
>+                    <li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% patron.borrowernumber %]">[% t('Set permissions') %]</a></li>
>                 [% ELSE %]
>-                    <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="You are not authorized to set permissions" id="patronflags" href="#">Set permissions</a></li>
>+                    <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="[% t('You are not authorized to set permissions') %]" id="patronflags" href="#">[% t('Set permissions') %]</a></li>
>                 [% END %]
> 
>                 [% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
>-                    <li><a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% patron.borrowernumber %]">Discharge</a></li>
>+                    <li><a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% patron.borrowernumber %]">[% t('Discharge') %]</a></li>
>                 [% END %]
> 
>                 [% IF Koha.Preference('RESTOAuth2ClientCredentials') %]
>                     [% IF CAN_user_borrowers_edit_borrowers %]
>-                        <li><a id="apikeys" href="/cgi-bin/koha/members/apikeys.pl?patron_id=[% patron.borrowernumber %]">Manage API keys</a></li>
>+                        <li><a id="apikeys" href="/cgi-bin/koha/members/apikeys.pl?patron_id=[% patron.borrowernumber %]">[% t('Manage API keys') %]</a></li>
>                     [% ELSE %]
>-                        <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="You are not authorized to manage API keys" id="apikeys" href="#">Manage API keys</a></li>
>+                        <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="[% t('You are not authorized to manage API keys') %]" id="apikeys" href="#">[% t('Manage API keys') %]</a></li>
>                     [% END %]
>                 [% END %]
> 
>                 [% IF CAN_user_borrowers_edit_borrowers %]
>                     [% IF ( NorwegianPatronDBEnable == 1 ) %]
>-                        <li><a id="deletepatronlocal" href="#">Delete local</a></li>
>-                        <li><a id="deletepatronremote" href="#">Delete remote</a></li>
>-                        <li><a id="deletepatronboth" href="#">Delete local and remote</a></li>
>+                        <li><a id="deletepatronlocal" href="#">[% t('Delete local') %]</a></li>
>+                        <li><a id="deletepatronremote" href="#">[% t('Delete remote') %]</a></li>
>+                        <li><a id="deletepatronboth" href="#">[% t('Delete local and remote') %]</a></li>
>                     [% ELSE %]
>-                        <li><a id="deletepatron" href="#">Delete</a></li>
>+                        <li><a id="deletepatron" href="#">[% t('Delete') %]</a></li>
>                     [% END %]
>                 [% ELSE %]
>-                    <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="You are not authorized to delete patrons" id="deletepatron" href="#">Delete</a></li>
>+                    <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="[% t('You are not authorized to delete patrons') %]" id="deletepatron" href="#">[% t('Delete') %]</a></li>
>                 [% END %]
>                 [% IF ( patron.is_child ) %]
>-                    <li><a id="updatechild" href="#">Update child to adult patron</a></li>
>+                    <li><a id="updatechild" href="#">[% t('Update child to adult patron') %]</a></li>
>                 [% ELSE %]
>-                    <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="Patron is an adult" id="updatechild" href="#">Update child to adult patron</a></li>
>+                    <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="[% t('Patron is an adult') %]" id="updatechild" href="#">[% t('Update child to adult patron') %]</a></li>
>                 [% END %]
>                 [% IF Koha.Preference('intranetreadinghistory') %]
>                     [%IF ( privacy == 2 ) %]
>-                        <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="Not allowed by patron's privacy settings" id="exportbarcodes" href="#">Export today's checked in barcodes</a></li>
>+                        <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="[% t('Not allowed by patron\'s privacy settings') %]" id="exportbarcodes" href="#">[% t('Export today\'s checked in barcodes') %]</a></li>
>                     [% ELSE %]
>-                        <li><a id="exportcheckins" href="#">Export today's checked in barcodes</a></li>
>+                        <li><a id="exportcheckins" href="#">[% t('Export today\'s checked in barcodes') %]</a></li>
>                     [% END %]
>                 [% END %]
>             </ul>
>@@ -103,22 +104,22 @@
>         <div class="modal-content">
>             <form method="post" action="/cgi-bin/koha/circ/add_message.pl" id="message_form" name="message_f">
>                 <div class="modal-header">
>-                    <h3>Leave a message</h3>
>+                    <h3>[% t('Leave a message') %]</h3>
>                 </div>
>                 <div class="modal-body">
>                     <div class="form-group">
>-                        <label for="message_type">Add a message for:</label>
>+                        <label for="message_type">[% t('Add a message for:') %]</label>
>                         <select name="message_type" id="message_type">
>-                            <option value="L">Staff - Internal note</option>
>-                            <option value="B">OPAC - [% patron.firstname | html %] [% patron.surname | html %]</option>
>+                            <option value="L">[% t('Staff - Internal note') %]</option>
>+                            <option value="B">[% t('OPAC -') %] [% patron.firstname | html %] [% patron.surname | html %]</option>
>                         </select>
>                     </div>
>                     [% bor_notes = AuthorisedValues.Get( 'BOR_NOTES' ) %]
>                     [% IF bor_notes %]
>                         <div class="form-group">
>-                            <label for="select_patron_messages">Predefined notes: </label>
>+                            <label for="select_patron_messages">[% t('Predefined notes:') %] </label>
>                             <select name="type" id="select_patron_messages">
>-                                <option value="">Select note</option>
>+                                <option value="">[% t('Select note') %]</option>
>                                 [% FOREACH bor_note IN bor_notes %]
>                                     <option value="[% bor_note.lib %]">[% bor_note.lib %]</option>
>                                 [% END %]
>@@ -126,15 +127,15 @@
>                         </div>
>                     [% END %]
>                     <div class="form-group">
>-                        <textarea rows="3" class="modal-textarea" name="borrower_message" id="borrower_message" ></textarea>
>+                        <textarea rows="3" class="modal-textarea" name="borrower_message" id="borrower_message"></textarea>
>                     </div>
>                     <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
>                     <input type="hidden" name="batch" value="[% batch %]" />
>                     <input type="hidden" name="branchcode" value="[% LoginBranchcode %]" />
>                 </div>
>                 <div class="modal-footer">
>-                    <button class="btn btn-default approve" type="submit"><i class="fa fa-check"></i> Save</button>
>-                    <button class="btn btn-default deny cancel" href="#" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i> Cancel</button>
>+                    <button class="btn btn-default approve" type="submit"><i class="fa fa-check"></i> [% t('Save') %]</button>
>+                    <button class="btn btn-default deny cancel" href="#" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i> [% t('Cancel') %]</button>
>                 </div>
>             </form>
>         </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc
>index df79d8e691..bf16c85928 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% BLOCK sourcetab %]
>     <div id="tabrecord[% record.recordid %]">
>         <div class="record">
>@@ -46,13 +47,13 @@
> 
> [% BLOCK mergesource %]
> <div id="tabs" class="toptabs">
>-<h2>Source records</h2>
>+<h2>[% t('Source records') %]</h2>
>     <ul>
>         [% FOREACH record IN sourcerecords %]
>             <li>
>                 <a href="#tabrecord[% record.recordid %]">
>                     [% record.recordid %]
>-                    [% IF record.reference %](ref)[% END %]
>+                    [% IF record.reference %][% t('(ref)') %][% END %]
>                 </a>
>             </li>
>         [% END %]
>@@ -67,7 +68,7 @@
> 
> [% BLOCK mergetarget %]
> <div id="result">
>-    <h2>Destination record</h2>
>+    <h2>[% t('Destination record') %]</h2>
>     <div style="border:1px solid #E8E8E8;padding:1em;margin-top:2em;">
>         <ul id="resultul"></ul>
>     </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
>index 1f2ac94309..712a48027e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> 
> 
>@@ -5,23 +6,23 @@
> <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
>   <table>
>     <tr><th></th>
>-        <th>Days in advance</th>
>-        [% IF Koha.Preference('SMSSendDriver') %]<th>SMS</th>[% END %]
>-        [% IF Koha.Preference('TalkingTechItivaPhoneNotification') %]<th>Phone</th>[% END %]
>-        <th>Email</th>
>-        <th>Digests only <i id="info_digests" data-toggle="tooltip" title="You can ask for a digest to reduce the number of messages. Messages will be saved and sent as a single message." data-placement="right" class="fa fa-info-circle"></i></th>
>+        <th>[% t('Days in advance') %]</th>
>+        [% IF Koha.Preference('SMSSendDriver') %]<th>[% t('SMS') %]</th>[% END %]
>+        [% IF Koha.Preference('TalkingTechItivaPhoneNotification') %]<th>[% t('Phone') %]</th>[% END %]
>+        <th>[% t('Email') %]</th>
>+        <th>[% t('Digests only') %] <i id="info_digests" data-toggle="tooltip" title="[% t('You can ask for a digest to reduce the number of messages. Messages will be saved and sent as a single message.') %]" data-placement="right" class="fa fa-info-circle"></i></th>
>         
>-        [% UNLESS ( messaging_form_inactive ) %]<th>Do not notify</th>[% END %]
>+        [% UNLESS ( messaging_form_inactive ) %]<th>[% t('Do not notify') %]</th>[% END %]
>     </tr>
>     [% FOREACH messaging_preference IN messaging_preferences %]
>     <tr>
>-      <td>[% IF ( messaging_preference.Item_Due ) %]Item due
>-          [% ELSIF ( messaging_preference.Advance_Notice ) %]Advance notice
>-          [% ELSIF ( messaging_preference.Upcoming_Events ) %]Upcoming events
>-          [% ELSIF ( messaging_preference.Hold_Filled ) %]Hold filled
>-          [% ELSIF ( messaging_preference.Item_Check_in ) %]Item check-in
>-          [% ELSIF ( messaging_preference.Item_Checkout ) %]Item checkout
>-          [% ELSE %]Unknown [% END %]</td>
>+      <td>[% IF ( messaging_preference.Item_Due ) %][% t('Item due') %]
>+          [% ELSIF ( messaging_preference.Advance_Notice ) %][% t('Advance notice') %]
>+          [% ELSIF ( messaging_preference.Upcoming_Events ) %][% t('Upcoming events') %]
>+          [% ELSIF ( messaging_preference.Hold_Filled ) %][% t('Hold filled') %]
>+          [% ELSIF ( messaging_preference.Item_Check_in ) %][% t('Item check-in') %]
>+          [% ELSIF ( messaging_preference.Item_Checkout ) %][% t('Item checkout') %]
>+          [% ELSE %][% t('Unknown') %] [% END %]</td>
>       [% IF ( messaging_preference.takes_days ) %]
>       <td>
>           [% IF ( messaging_form_inactive ) %]
>@@ -45,27 +46,15 @@
>           <td>
>           [% IF ( messaging_form_inactive ) %]
>               [% IF ( messaging_preference.transports_sms ) %]
>-                 <input type="checkbox"
>-                 id="sms[% messaging_preference.message_attribute_id %]"
>-                 name="[% messaging_preference.message_attribute_id %]"
>-                 value="sms" checked="checked" disabled="disabled" />
>+                 <input type="checkbox" id="sms[% messaging_preference.message_attribute_id %]" name="[% messaging_preference.message_attribute_id %]" value="sms" checked="checked" disabled="disabled" />
>               [% ELSE %]
>-                 <input type="checkbox"
>-                 id="sms[% messaging_preference.message_attribute_id %]"
>-                 name="[% messaging_preference.message_attribute_id %]"
>-                 value="sms" disabled="disabled" />
>+                 <input type="checkbox" id="sms[% messaging_preference.message_attribute_id %]" name="[% messaging_preference.message_attribute_id %]" value="sms" disabled="disabled" />
>               [% END %]
>           [% ELSE %]
>               [% IF ( messaging_preference.transports_sms ) %]
>-                 <input type="checkbox"
>-                 id="sms[% messaging_preference.message_attribute_id %]"
>-                 name="[% messaging_preference.message_attribute_id %]"
>-                 value="sms" checked="checked" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id %]" />
>+                 <input type="checkbox" id="sms[% messaging_preference.message_attribute_id %]" name="[% messaging_preference.message_attribute_id %]" value="sms" checked="checked" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id %]" />
>               [% ELSE %]
>-                 <input type="checkbox"
>-                 id="sms[% messaging_preference.message_attribute_id %]"
>-                 name="[% messaging_preference.message_attribute_id %]"
>-                 value="sms" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id %]" />
>+                 <input type="checkbox" id="sms[% messaging_preference.message_attribute_id %]" name="[% messaging_preference.message_attribute_id %]" value="sms" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id %]" />
>               [% END %]
>           [% END %]
>           </td>
>@@ -79,27 +68,15 @@
>           <td>
>           [% IF ( messaging_form_inactive ) %]
>               [% IF ( messaging_preference.transports_phone ) %]
>-                 <input type="checkbox"
>-                 id="phone[% messaging_preference.message_attribute_id %]"
>-                 name="[% messaging_preference.message_attribute_id %]"
>-                 value="phone" checked="checked" disabled="disabled" />
>+                 <input type="checkbox" id="phone[% messaging_preference.message_attribute_id %]" name="[% messaging_preference.message_attribute_id %]" value="phone" checked="checked" disabled="disabled" />
>               [% ELSE %]
>-                 <input type="checkbox"
>-                 id="phone[% messaging_preference.message_attribute_id %]"
>-                 name="[% messaging_preference.message_attribute_id %]"
>-                 value="phone" disabled="disabled" />
>+                 <input type="checkbox" id="phone[% messaging_preference.message_attribute_id %]" name="[% messaging_preference.message_attribute_id %]" value="phone" disabled="disabled" />
>               [% END %]
>           [% ELSE %]
>               [% IF ( messaging_preference.transports_phone ) %]
>-                 <input type="checkbox"
>-                 id="phone[% messaging_preference.message_attribute_id %]"
>-                 name="[% messaging_preference.message_attribute_id %]"
>-                 value="phone" checked="checked" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id %]" />
>+                 <input type="checkbox" id="phone[% messaging_preference.message_attribute_id %]" name="[% messaging_preference.message_attribute_id %]" value="phone" checked="checked" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id %]" />
>               [% ELSE %]
>-                 <input type="checkbox"
>-                 id="phone[% messaging_preference.message_attribute_id %]"
>-                 name="[% messaging_preference.message_attribute_id %]"
>-                 value="phone" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id %]" />
>+                 <input type="checkbox" id="phone[% messaging_preference.message_attribute_id %]" name="[% messaging_preference.message_attribute_id %]" value="phone" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id %]" />
>               [% END %]
>           [% END %]
>           </td>
>@@ -112,27 +89,15 @@
>       <td>
>           [% IF ( messaging_form_inactive ) %]
>               [% IF ( messaging_preference.transports_email ) %]
>-                <input type="checkbox"
>-                   id="email[% messaging_preference.message_attribute_id %]"
>-                   name="[% messaging_preference.message_attribute_id %]"
>-                   value="email" checked="checked" disabled="disabled" />
>+                <input type="checkbox" id="email[% messaging_preference.message_attribute_id %]" name="[% messaging_preference.message_attribute_id %]" value="email" checked="checked" disabled="disabled" />
>               [% ELSE %]
>-                <input type="checkbox"
>-                   id="email[% messaging_preference.message_attribute_id %]"
>-                   name="[% messaging_preference.message_attribute_id %]"
>-                   value="email" disabled="disabled" />
>+                <input type="checkbox" id="email[% messaging_preference.message_attribute_id %]" name="[% messaging_preference.message_attribute_id %]" value="email" disabled="disabled" />
>               [% END %]
>           [% ELSE %]
>               [% IF ( messaging_preference.transports_email ) %]
>-            <input type="checkbox"
>-                 id="email[% messaging_preference.message_attribute_id %]"
>-                 name="[% messaging_preference.message_attribute_id %]"
>-                 value="email" checked="checked" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id %]" />
>+            <input type="checkbox" id="email[% messaging_preference.message_attribute_id %]" name="[% messaging_preference.message_attribute_id %]" value="email" checked="checked" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id %]" />
>               [% ELSE %]
>-            <input type="checkbox"
>-                 id="email[% messaging_preference.message_attribute_id %]"
>-                 name="[% messaging_preference.message_attribute_id %]"
>-                 value="email" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id %]" />
>+            <input type="checkbox" id="email[% messaging_preference.message_attribute_id %]" name="[% messaging_preference.message_attribute_id %]" value="email" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id %]" />
>               [% END %]
>           [% END %]
>       </td>
>@@ -144,27 +109,15 @@
>       <td>
>           [% IF ( messaging_form_inactive ) %]
>               [% IF ( messaging_preference.digest ) %]
>-                <input type="checkbox"
>-                     id="digest[% messaging_preference.message_attribute_id %]"
>-                     value="[% messaging_preference.message_attribute_id %]"
>-                     name="digest" checked="checked" disabled="disabled" />
>+                <input type="checkbox" id="digest[% messaging_preference.message_attribute_id %]" value="[% messaging_preference.message_attribute_id %]" name="digest" checked="checked" disabled="disabled" />
>               [% ELSE %]
>-                <input type="checkbox"
>-                     id="digest[% messaging_preference.message_attribute_id %]"
>-                     value="[% messaging_preference.message_attribute_id %]"
>-                     name="digest" disabled="disabled" />
>+                <input type="checkbox" id="digest[% messaging_preference.message_attribute_id %]" value="[% messaging_preference.message_attribute_id %]" name="digest" disabled="disabled" />
>               [% END %]
>           [% ELSE %]
>               [% IF ( messaging_preference.digest ) %]
>-                <input type="checkbox"
>-                     id="digest[% messaging_preference.message_attribute_id %]"
>-                     value="[% messaging_preference.message_attribute_id %]"
>-                     name="digest" checked="checked" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id %]" />
>+                <input type="checkbox" id="digest[% messaging_preference.message_attribute_id %]" value="[% messaging_preference.message_attribute_id %]" name="digest" checked="checked" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id %]" />
>               [% ELSE %]
>-                <input type="checkbox"
>-                     id="digest[% messaging_preference.message_attribute_id %]"
>-                     value="[% messaging_preference.message_attribute_id %]"
>-                     name="digest" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id %]" />
>+                <input type="checkbox" id="digest[% messaging_preference.message_attribute_id %]" value="[% messaging_preference.message_attribute_id %]" name="digest" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id %]" />
>               [% END %]
>           [% END %]
>       </td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/serials_multi_receiving.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/serials_multi_receiving.inc
>index e88d2e6b6e..8fb3830268 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/serials_multi_receiving.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/serials_multi_receiving.inc
>@@ -1,17 +1,18 @@
>+[% PROCESS 'i18n.inc' %]
> <div id="multi_receiving" class="modal" tabindex="-1" role="dialog" aria-labelledby="multi_receiving_label" aria-hidden="true">
>     <div class="modal-dialog">
>         <div class="modal-content">
>             <form action="/cgi-bin/koha/serials/serials-collection.pl" method="post">
>                 <div class="modal-body">
>                     <fieldset class="rows">
>-                        <legend>Multi receiving</legend>
>+                        <legend>[% t('Multi receiving') %]</legend>
>                         <ol>
>                             <li>
>-                            <label for="nbissues" class="required">How many issues do you want to receive?</label>
>-                            <input type="text"  size="25" id="nbissues" name="nbissues" required="required" />
>+                            <label for="nbissues" class="required">[% t('How many issues do you want to receive?') %]</label>
>+                            <input type="text" size="25" id="nbissues" name="nbissues" required="required" />
>                             <li>
>                             <li>
>-                                <label for="date_received_today">Set the date received to today?</label>
>+                                <label for="date_received_today">[% t('Set the date received to today?') %]</label>
>                                 <input type="checkbox" id="date_received_today" name="date_received_today" />
>                             </li>
>                         </ol>
>@@ -23,7 +24,7 @@
>                 </div>
> 
>                 <div class="modal-footer">
>-                    <a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a>
>+                    <a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">[% t('Cancel') %]</a>
>                     <input type="submit" class="btn btn-default approve" value="OK" />
>                 </div>
>             </form>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/nl-search-form.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/nl-search-form.tt
>index a8eeef5fdd..a0c68b98d9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/nl-search-form.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/nl-search-form.tt
>@@ -1,8 +1,9 @@
>+[% PROCESS 'i18n.inc' %]
> <form method="POST" action="nl-search.pl" autocomplete="off"> 
> <input type="hidden" name="op" value="search" />
>     <fieldset>
>         <legend>[% nl_search_form_title %]</legend>
>-        <label for="q">Social security or card number: </label>
>+        <label for="q">[% t('Social security or card number:') %] </label>
>         <input type="text" name="q" value="[% q %]">
>         <input type="submit" value="Search">
>     </fieldset>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/noadd-warnings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/noadd-warnings.inc
>index e0fdc2a6ae..4ab549fa4b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/noadd-warnings.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/noadd-warnings.inc
>@@ -1,11 +1,12 @@
>+[% PROCESS 'i18n.inc' %]
> [% IF ( no_add ) %]
>     <div class="dialog alert">
>-        <h3>Cannot add patron</h3>
>+        <h3>[% t('Cannot add patron') %]</h3>
>         [% IF ( no_branches ) %]
>-            <p><strong>There are no libraries defined. </strong>[% IF ( CAN_user_parameters ) %]<a href="/cgi-bin/koha/admin/branches.pl">Please add a library</a>.[% ELSE %]An administrator must define at least one library.[% END %]</p>
>+            <p><strong>[% t('There are no libraries defined.') %] </strong>[% IF ( CAN_user_parameters ) %]<a href="/cgi-bin/koha/admin/branches.pl">[% t('Please add a library') %]</a>.[% ELSE %][% t('An administrator must define at least one library.') %][% END %]</p>
>         [% END %]
>         [% IF ( no_categories ) %]
>-            <p><strong>There are no patron categories defined. </strong>[% IF ( CAN_user_parameters ) %]<a href="/cgi-bin/koha/admin/categories.pl">Please add a patron category</a>.[% ELSE %]An administrator must define at least one patron category.[% END %]</p>
>+            <p><strong>[% t('There are no patron categories defined.') %] </strong>[% IF ( CAN_user_parameters ) %]<a href="/cgi-bin/koha/admin/categories.pl">[% t('Please add a patron category') %]</a>.[% ELSE %][% t('An administrator must define at least one patron category.') %][% END %]</p>
>         [% END %]
>     </div>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc
>index fbe0d3a635..b3fbe7d604 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc
>@@ -1,37 +1,38 @@
>+[% PROCESS 'i18n.inc' %]
> [% FOR m IN messages %]
>     [% SWITCH m.code %]
>         [% CASE 'success_on_insert_library' %]
>-            <div class="alert alert-success">Library created!</div>
>+            <div class="alert alert-success">[% t('Library created!') %]</div>
>         [% CASE 'error_on_insert_library' %]
>-            <div class="alert alert-danger">Library already exists and cannot be modified!</div>
>+            <div class="alert alert-danger">[% t('Library already exists and cannot be modified!') %]</div>
>         [% CASE 'success_on_insert_category' %]
>-            <div class="alert alert-success">Patron category created!</div>
>+            <div class="alert alert-success">[% t('Patron category created!') %]</div>
>         [% CASE 'error_on_insert_category' %]
>-            <div class="alert alert-danger">Patron category already exists and cannot be modified!</div>
>+            <div class="alert alert-danger">[% t('Patron category already exists and cannot be modified!') %]</div>
>         [% CASE 'success_on_insert_patron' %]
>-            <div class="alert alert-success">Administrator account created!</div>
>+            <div class="alert alert-success">[% t('Administrator account created!') %]</div>
>         [% CASE 'error_on_insert_patron' %]
>-            <div class="alert alert-danger">The patron has not been created! Cardnumber or Userid may already exist.</div>
>+            <div class="alert alert-danger">[% t('The patron has not been created! Cardnumber or Userid may already exist.') %]</div>
>         [% CASE 'ERROR_cardnumber_already_exists' %]
>-            <div class="alert alert-danger">Card number already in use.</div>
>+            <div class="alert alert-danger">[% t('Card number already in use.') %]</div>
>         [% CASE 'ERROR_cardnumber_length' %]
>-            <div class="alert alert-danger">Card number length is incorrect.</div>
>+            <div class="alert alert-danger">[% t('Card number length is incorrect.') %]</div>
>         [% CASE 'ERROR_password_mismatch' %]
>-            <div class="alert alert-danger">Passwords do not match.</div>
>+            <div class="alert alert-danger">[% t('Passwords do not match.') %]</div>
>         [% CASE 'success_on_insert_itemtype' %]
>-            <div class="alert alert-success">New item type created!</div>
>+            <div class="alert alert-success">[% t('New item type created!') %]</div>
>         [% CASE 'error_on_insert_itemtype' %]
>-            <div class="alert alert-danger">Item type already exists!</div>
>+            <div class="alert alert-danger">[% t('Item type already exists!') %]</div>
>         [% CASE 'success_on_insert_circ_rule' %]
>-            <div class="alert alert-success">Circulation rule created!</div>
>+            <div class="alert alert-success">[% t('Circulation rule created!') %]</div>
>         [% CASE 'error_on_insert_circ_rule' %]
>-            <div class="alert alert-danger">Circulation rule not created!</div>
>+            <div class="alert alert-danger">[% t('Circulation rule not created!') %]</div>
>         [% CASE 'ERROR_password_too_short' %]
>-            <div class="alert alert-danger">The patron has not been created the entered password was too short</div>
>+            <div class="alert alert-danger">[% t('The patron has not been created the entered password was too short') %]</div>
>         [% CASE 'ERROR_password_too_weak' %]
>-            <div class="alert alert-danger">The patron has not been created the entered password was too weak, must contain at least one uppercase, and lower case letter and one number</div>
>+            <div class="alert alert-danger">[% t('The patron has not been created the entered password was too weak, must contain at least one uppercase, and lower case letter and one number') %]</div>
>         [% CASE 'ERROR_password_has_whitespaces' %]
>-            <div class="alert alert-danger">The patron has not been created the entered password contained whitespaces</div>
>+            <div class="alert alert-danger">[% t('The patron has not been created the entered password contained whitespaces') %]</div>
>         [% CASE %][% message %]
>     [% END %]
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc
>index af4bc09c75..282ded5c8b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc
>@@ -1,18 +1,19 @@
>+[% PROCESS 'i18n.inc' %]
> [% IF ( PAGE_NUMBERS ) %]<nav><ul class="pagination">
>     [% IF ( previous_page_offset.defined ) %]
>-        <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]">First</a></li>
>+        <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]">[% t('First') %]</a></li>
>         
>-        <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;offset=[% previous_page_offset %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]">&lt;&lt; Previous</a></li>
>+        <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %]&offset=[% previous_page_offset %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]">[% t('&lt;&lt; Previous') %]</a></li>
>     [% END %]
>     [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %]
>         [% IF ( PAGE_NUMBER.highlight ) %]
>             <li class="active"><span>[% PAGE_NUMBER.pg %]</span></li>
>         [% ELSE %]
>-            <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;offset=[% PAGE_NUMBER.offset %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]">[% PAGE_NUMBER.pg %]</a></li>
>+            <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %]&offset=[% PAGE_NUMBER.offset %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]">[% PAGE_NUMBER.pg %]</a></li>
>         [% END %]
>     [% END %]
>     [% IF ( next_page_offset ) %]
>-        <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;offset=[% next_page_offset %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]">Next &gt;&gt;</a></li>
>-        <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;offset=[% last_page_offset %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]">Last</a></li>
>+        <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %]&offset=[% next_page_offset %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]">[% t('Next &gt;&gt;') %]</a></li>
>+        <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %]&offset=[% last_page_offset %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]">[% t('Last') %]</a></li>
>     [% END %]
> </ul></nav>[% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc
>index 0f7dda5180..437c582917 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc
>@@ -1,20 +1,21 @@
>+[% PROCESS 'i18n.inc' %]
> <div id="article-requests">
> [% IF patron.article_requests_current.count %]
>     <table id="article-requests-table" class="table table-bordered table-striped">
>         <thead>
>             <tr>
>-                <th class="article-request-record-title anti-the">Record title</th>
>-                <th class="article-request-created_on psort">Placed on</th>
>-                <th class="article-request-title anti-the">Title</th>
>-                <th class="article-request-author">Author</th>
>-                <th class="article-request-volume">Volume</th>
>-                <th class="article-request-issue">Issue</th>
>-                <th class="article-request-date">Date</th>
>-                <th class="article-request-pages">Pages</th>
>-                <th class="article-request-chapters">Chapters</th>
>-                <th class="article-request-notes">Notes</th>
>-                <th class="article-request-status">Status</th>
>-                <th class="article-request-branchcode">Pickup library</th>
>+                <th class="article-request-record-title anti-the">[% t('Record title') %]</th>
>+                <th class="article-request-created_on psort">[% t('Placed on') %]</th>
>+                <th class="article-request-title anti-the">[% t('Title') %]</th>
>+                <th class="article-request-author">[% t('Author') %]</th>
>+                <th class="article-request-volume">[% t('Volume') %]</th>
>+                <th class="article-request-issue">[% t('Issue') %]</th>
>+                <th class="article-request-date">[% t('Date') %]</th>
>+                <th class="article-request-pages">[% t('Pages') %]</th>
>+                <th class="article-request-chapters">[% t('Chapters') %]</th>
>+                <th class="article-request-notes">[% t('Notes') %]</th>
>+                <th class="article-request-status">[% t('Status') %]</th>
>+                <th class="article-request-branchcode">[% t('Pickup library') %]</th>
>             </tr>
>         </thead>
> 
>@@ -27,7 +28,7 @@
>                             [% ar.item.enumchron %]
>                         </a>
>                         [% ar.biblio.author %]
>-                        [% IF ar.itemnumber %] <i>(only [% ar.item.barcode %])</i>[% END %]
>+                        [% IF ar.itemnumber %] <i>[% t('(only') %] [% ar.item.barcode %])</i>[% END %]
>                     </td>
> 
>                     <td class="article-request-created_on">
>@@ -68,13 +69,13 @@
> 
>                     <td class="article-request-status">
>                         [% IF ar.status == 'PENDING' %]
>-                            Pending
>+                            [% t('Pending') %]
>                         [% ELSIF ar.status == 'PROCESSING' %]
>-                            Processing
>+                            [% t('Processing') %]
>                         [% ELSIF ar.status == 'COMPLETED' %]
>-                            Completed
>+                            [% t('Completed') %]
>                         [% ELSIF ar.status == 'CANCELED' %]
>-                            Canceled
>+                            [% t('Canceled') %]
>                         [% END %]
>                     </td>
> 
>@@ -86,6 +87,6 @@
>         </tbody>
>     </table>
>     [% ELSE %]
>-        Patron has no current article requests.
>+        [% t('Patron has no current article requests.') %]
>     [% END %]
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc
>index cb13280ba8..8a7f7cf4cd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc
>@@ -1,6 +1,7 @@
>+[% PROCESS 'i18n.inc' %]
> [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
>     <div id="circ_search" class="residentsearch">
>-    <p class="tip">Enter patron card number or partial name:</p>
>+    <p class="tip">[% t('Enter patron card number or partial name:') %]</p>
>     <form action="/cgi-bin/koha/circ/circulation.pl" id="patronsearch" method="post">
>     [% IF ( CircAutocompl ) %]
>     <div class="autocomplete">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
>index 84e67a30ae..28ce1a4937 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> [% USE Branches %]
> [% USE Categories %]
>@@ -5,9 +6,9 @@
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1>
> <div id="header_search">
>     <div id="patron_search" class="residentsearch">
>-    <p class="tip">Enter patron card number or partial name:</p>
>+    <p class="tip">[% t('Enter patron card number or partial name:') %]</p>
>     <form action="/cgi-bin/koha/members/member.pl" method="post">
>-    <input id="searchmember" data-toggle="tooltip" size="25" class="head-searchbox focus" name="searchmember" type="text" value="[% searchmember %]"/>
>+    <input id="searchmember" data-toggle="tooltip" size="25" class="head-searchbox focus" name="searchmember" type="text" value="[% searchmember %]" />
>     <input type="hidden" name="quicksearch" value="1" />
>     <span class="filteraction" id="filteraction_off"> <a href="#">[-]</a></span>
>     <span class="filteraction" id="filteraction_on"> <a href="#">[+]</a></span>
>@@ -15,80 +16,80 @@
>     <input value="Search" class="submit" type="submit" />
> 
>     <div id="filters">
>-        <p><label for="searchfieldstype">Search fields:</label>
>+        <p><label for="searchfieldstype">[% t('Search fields:') %]</label>
>             <select name="searchfieldstype" id="searchfieldstype">
>               [% IF searchfieldstype == "standard" %]
>-                <option selected="selected" value='standard'>Standard</option>
>+                <option selected="selected" value="standard">[% t('Standard') %]</option>
>               [% ELSE %]
>-                <option value='standard'>Standard</option>
>+                <option value="standard">[% t('Standard') %]</option>
>               [% END %]
>               [% IF searchfieldstype == "surname" %]
>-                <option selected="selected" value='surname'>Surname</option>
>+                <option selected="selected" value="surname">[% t('Surname') %]</option>
>               [% ELSE %]
>-                <option value='surname'>Surname</option>
>+                <option value="surname">[% t('Surname') %]</option>
>               [% END %]
>               [% IF searchfieldstype == "email" %]
>-                <option selected="selected" value='email'>Email</option>
>+                <option selected="selected" value="email">[% t('Email') %]</option>
>               [% ELSE %]
>-                <option value='email'>Email</option>
>+                <option value="email">[% t('Email') %]</option>
>               [% END %]
>               [% IF searchfieldstype == "borrowernumber" %]
>-                <option selected="selected" value='borrowernumber'>Borrower number</option>
>+                <option selected="selected" value="borrowernumber">[% t('Borrower number') %]</option>
>               [% ELSE %]
>-                <option value='borrowernumber'>Borrower number</option>
>+                <option value="borrowernumber">[% t('Borrower number') %]</option>
>               [% END %]
>               [% IF searchfieldstype == "userid" %]
>-                <option selected="selected" value='userid'>Username</option>
>+                <option selected="selected" value="userid">[% t('Username') %]</option>
>               [% ELSE %]
>-                <option value='userid'>Username</option>
>+                <option value="userid">[% t('Username') %]</option>
>               [% END %]
>               [% IF searchfieldstype == "phone" %]
>-                <option selected="selected" value='phone'>Phone number</option>
>+                <option selected="selected" value="phone">[% t('Phone number') %]</option>
>               [% ELSE %]
>-                <option value='phone'>Phone number</option>
>+                <option value="phone">[% t('Phone number') %]</option>
>               [% END %]
>               [% IF searchfieldstype == "address" %]
>-                <option selected="selected" value='address'>Street Address</option>
>+                <option selected="selected" value="address">[% t('Street Address') %]</option>
>               [% ELSE %]
>-                <option value='address'>Street Address</option>
>+                <option value="address">[% t('Street Address') %]</option>
>               [% END %]
>               [% IF searchfieldstype == "dateofbirth" %]
>-                <option selected="selected" value='dateofbirth'>Date of birth</option>
>+                <option selected="selected" value="dateofbirth">[% t('Date of birth') %]</option>
>               [% ELSE %]
>-                <option value='dateofbirth'>Date of birth</option>
>+                <option value="dateofbirth">[% t('Date of birth') %]</option>
>               [% END %]
>               [% IF searchfieldstype == "sort1" %]
>-                <option selected="selected" value='sort1'>Sort field 1</option>
>+                <option selected="selected" value="sort1">[% t('Sort field 1') %]</option>
>               [% ELSE %]
>-                <option value='sort1'>Sort field 1</option>
>+                <option value="sort1">[% t('Sort field 1') %]</option>
>               [% END %]
>               [% IF searchfieldstype == "sort2" %]
>-                <option selected="selected" value='sort2'>Sort field 2</option>
>+                <option selected="selected" value="sort2">[% t('Sort field 2') %]</option>
>               [% ELSE %]
>-                <option value='sort2'>Sort field 2</option>
>+                <option value="sort2">[% t('Sort field 2') %]</option>
>               [% END %]
>             </select>
>         </p>
> 
>         <p>
>-            <label for="searchtype">Search type:</label>
>+            <label for="searchtype">[% t('Search type:') %]</label>
>             <select name="searchtype" id="searchtype">
>               [% IF searchtype == 'start_with' %]
>-                  <option selected="selected" value='start_with'>Starts with</option>
>-                  <option value='contain'>Contains</option>
>+                  <option selected="selected" value="start_with">[% t('Starts with') %]</option>
>+                  <option value="contain">[% t('Contains') %]</option>
>               [% ELSE %]
>-                  <option value='start_with'>Starts with</option>
>-                  <option selected="selected" value='contain'>Contains</option>
>+                  <option value="start_with">[% t('Starts with') %]</option>
>+                  <option selected="selected" value="contain">[% t('Contains') %]</option>
>               [% END %]
>             </select>
>         </p>
> 
>         <p>
>-            <label for="branchcode">Library: </label>
>+            <label for="branchcode">[% t('Library:') %] </label>
>             [% SET branches = Branches.all( selected => branchcode_filter, only_my_group => 1 ) %]
>             <select name="branchcode_filter" id="branchcode">
>                 [% IF branches.size != 1 %]
>-                  <option value="">Any</option>
>+                  <option value="">[% t('Any') %]</option>
>                 [% END %]
>                 [% FOREACH b IN branches %]
>                     [% IF b.selected %]
>@@ -101,10 +102,10 @@
>         </p>
> 
>         <p>
>-            <label for="categorycode">Category: </label>
>+            <label for="categorycode">[% t('Category:') %] </label>
>             [% SET categories = Categories.all() %]
>             <select name="categorycode_filter" id="categorycode">
>-                <option value="">Any</option>
>+                <option value="">[% t('Any') %]</option>
>                 [% FOREACH category IN categories %]
>                     [% IF category.categorycode == categorycode_filter %]
>                         <option value="[% category.categorycode %]" selected="selected">[% category.description |html %]</option>
>@@ -121,14 +122,14 @@
> 
>     [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
>     <div id="checkin_search" class="residentsearch">
>-    <p class="tip">Scan a barcode to check in:</p>
>+    <p class="tip">[% t('Scan a barcode to check in:') %]</p>
>     <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
>     <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" accesskey="r" />
>     <input value="Submit" class="submit" type="submit" />
>     </form>
>     </div>
>         <div id="renew_search" class="residentsearch">
>-        <p class="tip">Scan a barcode to renew:</p>
>+        <p class="tip">[% t('Scan a barcode to renew:') %]</p>
>             <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
>                 <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
>                 <input value="Submit" class="submit" type="submit" />
>@@ -138,20 +139,20 @@
> 
>     [% IF ( CAN_user_catalogue ) %]
>     <div id="catalog_search" class="residentsearch">
>-    <p class="tip">Enter search keywords:</p>
>-        <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>+    <p class="tip">[% t('Enter search keywords:') %]</p>
>+        <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block">
>              [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>-             <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
>+             <input type="text" name="q" id="search-form" size="40" value="" title="[% t('Enter the terms you wish to search for.') %]" class="head-searchbox form-text" />
>              <input type="submit" name="op" id="opac-submit" value="Submit" class="submit" />
>         </form>
>     </div>[% END %]
> 
>     <ul>
>-        <li><a class="keep_text" href="#patron_search">Search patrons</a></li>
>-        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
>-        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
>-        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
>-        [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
>+        <li><a class="keep_text" href="#patron_search">[% t('Search patrons') %]</a></li>
>+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">[% t('Check out') %]</a></li>[% END %]
>+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">[% t('Check in') %]</a></li>[% END %]
>+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">[% t('Renew') %]</a></li>[% END %]
>+        [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">[% t('Search the catalog') %]</a></li>[% END %]
>     </ul>
> </div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc
>index 8d0aa7424e..2e917e8716 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [%- USE Koha -%]
> [%- USE Branches -%]
> [%- SET data = {} -%]
>@@ -67,7 +68,7 @@
>         [%- data.cardnumber | html -%]
>     [%- END -%]
> [%- ELSE -%]
>-    A patron from library [% Branches.GetName( patron.branchcode ) -%]
>+    [% t('A patron from library') %] [% Branches.GetName( patron.branchcode ) -%]
> [%- END -%]
> 
> [%- IF hide_patron_infos_if_needed AND ( display_patron_name OR display_cardnumber ) -%]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
>index 147ff110f7..45c6c3598a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% INCLUDE 'blocking_errors.inc' %]
> [% USE Categories %]
> [% USE Koha %]
>@@ -6,21 +7,21 @@
> [% UNLESS ( no_add ) %]
> <div id="toolbar" class="btn-toolbar">
>     <div class="btn-group" id="new-patron-button">
>-        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New patron <span class="caret"></span></button>
>+        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> [% t('New patron') %] <span class="caret"></span></button>
>             <ul class="dropdown-menu">
>-                [% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;categorycode=[% category.categorycode %]">[% category.description |html %]</a></li>[% END %]
>+                [% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% category.categorycode %]">[% category.description |html %]</a></li>[% END %]
>             </ul>
>     </div>
>     [% IF Koha.Preference('PatronQuickAddFields') || Koha.Preference('BorrowerMandatoryField') %]
>     <div class="btn-group" id="quick-add-new-patron-button">
>-        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> Quick add new patron <span class="caret"></span></button>
>+        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> [% t('Quick add new patron') %] <span class="caret"></span></button>
>             <ul class="dropdown-menu">
>-                [% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;categorycode=[% category.categorycode %]&amp;quickadd=true">[% category.description |html %]</a></li>[% END %]
>+                [% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% category.categorycode %]&quickadd=true">[% category.description |html %]</a></li>[% END %]
>             </ul>
>     </div>
>     [% END %]
>     [% IF CAN_user_tools_manage_patron_lists %]
>-        <a class="btn btn-default btn-sm" href="/cgi-bin/koha/patron_lists/lists.pl" id="patron-lists-button"><i class="fa fa-edit"></i> Patron lists</a>
>+        <a class="btn btn-default btn-sm" href="/cgi-bin/koha/patron_lists/lists.pl" id="patron-lists-button"><i class="fa fa-edit"></i> [% t('Patron lists') %]</a>
>     [% END %]
> 
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc
>index f220fe8432..c553dce4bd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc
>@@ -1,16 +1,17 @@
>-[% BLOCK asksysadmin %]<span>Please have your system administrator check the error log for details.</span>[% END %]
>-[% BLOCK b_batch %]<span>Batch: </span>[% END %]
>-[% BLOCK b_patronlist %]<span>Patron list: </span>[% END %]
>-[% BLOCK b_patronnumber %]<span>Patron number: </span>[% END %]
>-[% BLOCK b_layout %]<span>Layout: </span>[% END %]
>-[% BLOCK b_template %]<span>Template: </span>[% END %]
>+[% PROCESS 'i18n.inc' %]
>+[% BLOCK asksysadmin %]<span>[% t('Please have your system administrator check the error log for details.') %]</span>[% END %]
>+[% BLOCK b_batch %]<span>[% t('Batch:') %] </span>[% END %]
>+[% BLOCK b_patronlist %]<span>[% t('Patron list:') %] </span>[% END %]
>+[% BLOCK b_patronnumber %]<span>[% t('Patron number:') %] </span>[% END %]
>+[% BLOCK b_layout %]<span>[% t('Layout:') %] </span>[% END %]
>+[% BLOCK b_template %]<span>[% t('Template:') %] </span>[% END %]
> 
> [% IF ( error || CGI.param('pdferr') )  %]
> <div class="dialog alert">
>   <p>
>-    <strong>WARNING:</strong>
>-        [% IF CGI.param('pdferr') %]<span>Error while creating PDF file. </span>
>-            [% IF CGI.param('errnocards') %]<span>No cards created (empty batch or list?) </span>[% END %]
>+    <strong>[% t('WARNING:') %]</strong>
>+        [% IF CGI.param('pdferr') %]<span>[% t('Error while creating PDF file.') %] </span>
>+            [% IF CGI.param('errnocards') %]<span>[% t('No cards created (empty batch or list?)') %] </span>[% END %]
>             [% IF CGI.param('errba') %][% INCLUDE b_batch %]<span class="ex">[%- CGI.param('errba') -%]</span>[% END %]
>             [% IF CGI.param('errpl') %][% INCLUDE b_patronlist %]<span class="ex">[%- CGI.param('errpl') -%]</span>][% END %]
>             [% IF CGI.param('errpt') %][% INCLUDE b_patronnumber %]<span class="ex">[%- CGI.param('errpt') -%]</span>[% END %]
>@@ -20,37 +21,37 @@
>         [% END %]
> 
>         [% IF ( error == 101 ) %]
>-           [% IF ( card_element ) %]<span>The database returned an error while saving [% card_element %] [% element_id %]. </span>
>-          [% ELSE %]<span>The database returned an error while attempting a save operation. </span>[% END %][% INCLUDE asksysadmin %]
>+           [% IF ( card_element ) %]<span>[% t('The database returned an error while saving') %] [% card_element %] [% element_id %]. </span>
>+          [% ELSE %]<span>[% t('The database returned an error while attempting a save operation.') %] </span>[% END %][% INCLUDE asksysadmin %]
>         [% ELSIF ( error == 102 ) %]
>-            [% IF ( card_element ) %]<span>The database returned an error while deleting [% card_element %] [% element_id %]. </span>
>-            [% ELSIF ( image_ids ) %]<span>The database returned an error while deleting [% image_ids %]. </span>
>-            [% ELSE %]<span>The database returned an error while attempting a delete operation. </span>[% END %][% INCLUDE asksysadmin %]
>+            [% IF ( card_element ) %]<span>[% t('The database returned an error while deleting') %] [% card_element %] [% element_id %]. </span>
>+            [% ELSIF ( image_ids ) %]<span>[% t('The database returned an error while deleting') %] [% image_ids %]. </span>
>+            [% ELSE %]<span>[% t('The database returned an error while attempting a delete operation.') %] </span>[% END %][% INCLUDE asksysadmin %]
>         [% ELSIF ( error == 201 ) %]
>-            [%IF ( element_id ) %]<span>An unsupported operation was attempted on [% card_element %] [% element_id %]. </span>
>-            [% ELSE %]<span>An unsupported operation was attempted. </span>[% END %][% INCLUDE asksysadmin %]
>+            [%IF ( element_id ) %]<span>[% t('An unsupported operation was attempted on') %] [% card_element %] [% element_id %]. </span>
>+            [% ELSE %]<span>[% t('An unsupported operation was attempted.') %] </span>[% END %][% INCLUDE asksysadmin %]
>         [% ELSIF ( error == 202 ) %]
>-            <span>An error has occurred. </span>[% INCLUDE asksysadmin %]
>+            <span>[% t('An error has occurred.') %] </span>[% INCLUDE asksysadmin %]
>         [% ELSIF ( error == 203 ) %]
>-            <span>A non-existent or invalid library code was supplied. Please verify that you have a library set. </span><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
>+            <span>[% t('A non-existent or invalid library code was supplied. Please verify that you have a library set.') %] </span><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">[% t('Set library') %]</a>
>         [% ELSIF ( error == 301 ) %]
>-            <span>An error has occurred while attempting to upload the image file. </span>[% INCLUDE asksysadmin %]
>+            <span>[% t('An error has occurred while attempting to upload the image file.') %] </span>[% INCLUDE asksysadmin %]
>         [% ELSIF ( error == 302 ) %]
>-            <span>Image exceeds 500KB. Please resize and import again. </span>
>+            <span>[% t('Image exceeds 500KB. Please resize and import again.') %] </span>
>         [% ELSIF ( error == 303 ) %]
>-            <span>The database image quota currently only allows a maximum of [% image_limit %] images to be stored at any one time. Please delete one or more images to free up quota space. </span>
>+            <span>[% t('The database image quota currently only allows a maximum of') %] [% image_limit %] [% t('images to be stored at any one time. Please delete one or more images to free up quota space.') %] </span>
>         [% ELSIF ( error == 304 ) %]
>-            <span>An image with the name '[% IMAGE_NAME %]' already exists.</span>
>+            <span>[% t('An image with the name \'') %][% IMAGE_NAME %][% t('\' already exists.') %]</span>
>         [% ELSIF ( error == 401 ) %]
>-            <span>An error has occurred and no items have been added to batch [% batch_id %]. </span>[% INCLUDE asksysadmin %]
>+            <span>[% t('An error has occurred and no items have been added to batch') %] [% batch_id %]. </span>[% INCLUDE asksysadmin %]
>         [% ELSIF ( error == 402 ) %]
>-            <span>No items added because the library is not set. Please set your library before adding items to a batch. </span><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
>+            <span>[% t('No items added because the library is not set. Please set your library before adding items to a batch.') %] </span><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">[% t('Set library') %]</a>
>         [% ELSIF ( error == 403 ) %]
>-            <span>An error has occurred and the item(s) was not removed from batch [% batch_id %]. </span>[% INCLUDE asksysadmin %]
>+            <span>[% t('An error has occurred and the item(s) was not removed from batch') %] [% batch_id %]. </span>[% INCLUDE asksysadmin %]
>         [% ELSIF ( error == 404 ) %]
>-            <span>An error has occurred and batch [% batch_id %] was not deleted. </span>[% INCLUDE asksysadmin %]
>+            <span>[% t('An error has occurred and batch') %] [% batch_id %] [% t('was not deleted.') %] </span>[% INCLUDE asksysadmin %]
>         [% ELSIF ( error == 405 ) %]
>-            <span>An error has occurred and batch [% batch_id %] was not fully de-duplicated. </span>
>+            <span>[% t('An error has occurred and batch') %] [% batch_id %] [% t('was not fully de-duplicated.') %] </span>
>         [% END %]
>   </p>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc
>index 4f39e70423..24b4501593 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc
>@@ -1,23 +1,24 @@
>+[% PROCESS 'i18n.inc' %]
> [% INCLUDE 'blocking_errors.inc' %]
> <div id="toolbar" class="btn-toolbar">
>     <div class="btn-group">
>-        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>
>+        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> [% t('New') %] <span class="caret"></span></button>
>         <ul class="dropdown-menu">
>-            <li><a href="/cgi-bin/koha/patroncards/edit-batch.pl?op=new">Card batch</a></li>
>-            <li><a href="/cgi-bin/koha/patroncards/image-manage.pl">Image</a></li>
>-            <li><a href="/cgi-bin/koha/patroncards/edit-layout.pl?op=new">Layout</a></li>
>-            <li><a href="/cgi-bin/koha/patroncards/edit-template.pl?op=new">Card template</a></li>
>-            <li><a href="/cgi-bin/koha/patroncards/edit-profile.pl?op=new">Printer profile</a></li>
>+            <li><a href="/cgi-bin/koha/patroncards/edit-batch.pl?op=new">[% t('Card batch') %]</a></li>
>+            <li><a href="/cgi-bin/koha/patroncards/image-manage.pl">[% t('Image') %]</a></li>
>+            <li><a href="/cgi-bin/koha/patroncards/edit-layout.pl?op=new">[% t('Layout') %]</a></li>
>+            <li><a href="/cgi-bin/koha/patroncards/edit-template.pl?op=new">[% t('Card template') %]</a></li>
>+            <li><a href="/cgi-bin/koha/patroncards/edit-profile.pl?op=new">[% t('Printer profile') %]</a></li>
>         </ul>
>     </div>
>     <div class="btn-group">
>-        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-edit"></i> Manage <span class="caret"></span></button>
>+        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-edit"></i> [% t('Manage') %] <span class="caret"></span></button>
>         <ul class="dropdown-menu">
>-            <li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=batch">Card batches</a></li>
>-            <li><a href="/cgi-bin/koha/patroncards/image-manage.pl">Images</a></li>
>-            <li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=layout">Layouts</a></li>
>-            <li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=template">Card templates</a></li>
>-            <li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=profile">Printer profiles</a></li>
>+            <li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=batch">[% t('Card batches') %]</a></li>
>+            <li><a href="/cgi-bin/koha/patroncards/image-manage.pl">[% t('Images') %]</a></li>
>+            <li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=layout">[% t('Layouts') %]</a></li>
>+            <li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=template">[% t('Card templates') %]</a></li>
>+            <li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=profile">[% t('Printer profiles') %]</a></li>
>         </ul>
>     </div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
>index d1e77a64f3..3b63c71612 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
>@@ -1,9 +1,10 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> <div class="gradient">
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1>
> <div id="header_search">
> 	<div id="patron_category_search" class="residentsearch">
>-    <p class="tip">Search by patron category name:</p>
>+    <p class="tip">[% t('Search by patron category name:') %]</p>
> 	<form action="[% script_name %]" method="post">
>         <input class="head-searchbox" type="text" name="description" size="40" value="[% searchfield %]" />
> 		<input type="submit" class="submit" name="search" value="Search" />
>@@ -12,18 +13,18 @@
>     [% INCLUDE 'patron-search-box.inc' %]
> 	[% IF ( CAN_user_catalogue ) %]
>     <div id="catalog_search" class="residentsearch">
>-	<p class="tip">Enter search keywords:</p>
>-		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>+	<p class="tip">[% t('Enter search keywords:') %]</p>
>+		<form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block">
>             [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>-            <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
>-				<input type="submit" value="Submit"  class="submit" />
>+            <input type="text" name="q" id="search-form" size="40" value="" title="[% t('Enter the terms you wish to search for.') %]" class="head-searchbox form-text" />
>+				<input type="submit" value="Submit" class="submit" />
> 		</form>
> 	</div>[% END %]
> 
> 	<ul>
>-            <li><a class="keep_text" href="#patron_category_search">Search patron categories</a></li>
>-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
>-            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
>+            <li><a class="keep_text" href="#patron_category_search">[% t('Search patron categories') %]</a></li>
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">[% t('Check out') %]</a></li>[% END %]
>+            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">[% t('Search the catalog') %]</a></li>[% END %]
> 			</ul>	
> </div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
>index 129d7f5593..d07438954c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
>@@ -1,118 +1,119 @@
>+[% PROCESS 'i18n.inc' %]
> [%- BLOCK main_permissions -%]
>     [% SWITCH name %]
>-    [%- CASE 'superlibrarian' -%]<span>Access to all librarian functions</span>
>-    [%- CASE 'circulate' -%]<span>Check out and check in items</span>
>-    [%- CASE 'catalogue' -%]<span><b>Required for staff login.</b> Staff access, allows viewing of catalogue in staff client.</span>
>-    [%- CASE 'parameters' -%]<span>Manage Koha system settings (Administration panel)</span>
>-    [%- CASE 'borrowers' -%]<span>Add, modify and view patron information</span>
>-    [%- CASE 'permissions' -%]<span>Set user permissions</span>
>-    [%- CASE 'reserveforothers' -%]<span>Place and modify holds for patrons</span>
>-    [%- CASE 'editcatalogue' -%]<span>Edit catalog (Modify bibliographic/holdings data)</span>
>-    [%- CASE 'updatecharges' -%]<span>Manage patrons fines and fees</span>
>-    [%- CASE 'acquisition' -%]<span>Acquisition and/or suggestion management</span>
>-    [%- CASE 'tools' -%]<span>Use all tools (expand for granular tools permissions)</span>
>-    [%- CASE 'editauthorities' -%]<span>Edit authorities</span>
>-    [%- CASE 'serials' -%]<span>Manage serial subscriptions</span>
>-    [%- CASE 'reports' -%]<span>Allow access to the reports module</span>
>-    [%- CASE 'staffaccess' -%]<span>Allow staff members to modify permissions for other staff members</span>
>-    [%- CASE 'coursereserves' -%]<span>Course reserves</span>
>-    [%- CASE 'plugins' -%]<span>Koha plugins</span>
>-    [%- CASE 'lists' -%]<span>Lists</span>
>-    [%- CASE 'clubs' -%]<span>Patron clubs</span>
>-    [%- CASE 'ill' -%]<span>Create and modify Interlibrary loan requests</span>
>-    [%- CASE 'self_check' -%]<span>Self check modules</span>
>+    [%- CASE 'superlibrarian' -%]<span>[% t('Access to all librarian functions') %]</span>
>+    [%- CASE 'circulate' -%]<span>[% t('Check out and check in items') %]</span>
>+    [%- CASE 'catalogue' -%]<span><b>[% t('Required for staff login.') %]</b> [% t('Staff access, allows viewing of catalogue in staff client.') %]</span>
>+    [%- CASE 'parameters' -%]<span>[% t('Manage Koha system settings (Administration panel)') %]</span>
>+    [%- CASE 'borrowers' -%]<span>[% t('Add, modify and view patron information') %]</span>
>+    [%- CASE 'permissions' -%]<span>[% t('Set user permissions') %]</span>
>+    [%- CASE 'reserveforothers' -%]<span>[% t('Place and modify holds for patrons') %]</span>
>+    [%- CASE 'editcatalogue' -%]<span>[% t('Edit catalog (Modify bibliographic/holdings data)') %]</span>
>+    [%- CASE 'updatecharges' -%]<span>[% t('Manage patrons fines and fees') %]</span>
>+    [%- CASE 'acquisition' -%]<span>[% t('Acquisition and/or suggestion management') %]</span>
>+    [%- CASE 'tools' -%]<span>[% t('Use all tools (expand for granular tools permissions)') %]</span>
>+    [%- CASE 'editauthorities' -%]<span>[% t('Edit authorities') %]</span>
>+    [%- CASE 'serials' -%]<span>[% t('Manage serial subscriptions') %]</span>
>+    [%- CASE 'reports' -%]<span>[% t('Allow access to the reports module') %]</span>
>+    [%- CASE 'staffaccess' -%]<span>[% t('Allow staff members to modify permissions for other staff members') %]</span>
>+    [%- CASE 'coursereserves' -%]<span>[% t('Course reserves') %]</span>
>+    [%- CASE 'plugins' -%]<span>[% t('Koha plugins') %]</span>
>+    [%- CASE 'lists' -%]<span>[% t('Lists') %]</span>
>+    [%- CASE 'clubs' -%]<span>[% t('Patron clubs') %]</span>
>+    [%- CASE 'ill' -%]<span>[% t('Create and modify Interlibrary loan requests') %]</span>
>+    [%- CASE 'self_check' -%]<span>[% t('Self check modules') %]</span>
>     [%- END -%]
> [%- END -%]
> 
> [%- BLOCK sub_permissions -%]
>   [% SWITCH name %]
>-    [%- CASE 'circulate_remaining_permissions' -%]<span>Remaining circulation permissions</span>
>-    [%- CASE 'force_checkout' -%]<span>Force checkout if a limitation exists</span>
>-    [%- CASE 'manage_restrictions' -%]<span>Manage restrictions for accounts</span>
>-    [%- CASE 'overdues_report' -%]<span>Execute overdue items report</span>
>-    [%- CASE 'override_renewals' -%]<span>Override blocked renewals</span>
>-    [%- CASE 'manage_circ_rules' -%]<span>manage circulation rules</span>
>-    [%- CASE 'parameters_remaining_permissions' -%]<span>Remaining system parameters permissions</span>
>-    [%- CASE 'edit_borrowers' -%]<span>Add, modify and view patron information</span>
>-    [%- CASE 'view_borrower_infos_from_any_libraries' -%]<span>View patron infos from any libraries. If not set the logged in user could only access patron infos from its own library or group of libraries.</span>
>-    [%- CASE 'modify_holds_priority' -%]<span>Modify holds priority</span>
>-    [%- CASE 'place_holds' -%]<span>Place holds for patrons</span>
>-    [%- CASE 'delete_all_items' -%]<span>Delete all items at once</span>
>-    [%- CASE 'edit_catalogue' -%]<span>Edit catalog (Modify bibliographic/holdings data)</span>
>-    [%- CASE 'edit_items' -%]<span>Edit items</span>
>-    [%- CASE 'edit_items_restricted' -%]<span>Limit item modification to subfields defined in the SubfieldsToAllowForRestrictedEditing preference (please note that edit_item is still required)</span>
>-    [%- CASE 'fast_cataloging' -%]<span>Fast cataloging</span>
>-    [%- CASE 'remaining_permissions' -%]<span>Remaining permissions for managing fines and fees</span>
>-    [%- CASE 'writeoff' -%]<span>Write off fines and fees</span>
>-    [%- CASE 'budget_add_del' -%]<span>Add and delete funds (but can't modify funds)</span>
>-    [%- CASE 'budget_manage' -%]<span>Manage funds</span>
>-    [%- CASE 'budget_manage_all' -%]<span>Manage all funds</span>
>-    [%- CASE 'budget_modify' -%]<span>Modify funds (can't create lines, but can modify existing ones)</span>
>-    [%- CASE 'contracts_manage' -%]<span>Manage contracts</span>
>-    [%- CASE 'group_manage' -%]<span>Manage basket groups</span>
>-    [%- CASE 'order_manage' -%]<span>Manage basket and order lines</span>
>-    [%- CASE 'order_manage_all' -%]<span>Manage all baskets and order lines, regardless of restrictions on them</span>
>-    [%- CASE 'order_receive' -%]<span>Receive orders and manage shipments</span>
>-    [%- CASE 'period_manage' -%]<span>Manage budgets</span>
>-    [%- CASE 'planning_manage' -%]<span>Manage budget plannings</span>
>-    [%- CASE 'vendors_manage' -%]<span>Manage vendors</span>
>-    [%- CASE 'batch_upload_patron_images' -%]<span>Upload patron images in a batch or one at a time</span>
>-    [%- CASE 'delete_anonymize_patrons' -%]<span>Delete old borrowers and anonymize circulation history (deletes borrower reading history)</span>
>-    [%- CASE 'edit_calendar' -%]<span>Define days when the library is closed</span>
>-    [%- CASE 'edit_news' -%]<span>Write news for the OPAC and staff interfaces</span>
>-    [%- CASE 'edit_notice_status_triggers' -%]<span>Set notice/status triggers for overdue items</span>
>-    [%- CASE 'edit_notices' -%]<span>Define notices</span>
>-    [%- CASE 'edit_patrons' -%]<span>Perform batch modification of patrons</span>
>-    [%- CASE 'edit_quotes' -%]<span>Edit quotes for quote-of-the-day feature</span>
>-    [%- CASE 'export_catalog' -%]<span>Export bibliographic and holdings data</span>
>-    [%- CASE 'import_patrons' -%]<span>Import patron data</span>
>-    [%- CASE 'inventory' -%]<span>Perform inventory of your catalog</span>
>-    [%- CASE 'items_batchdel' -%]<span>Perform batch deletion of items</span>
>-    [%- CASE 'items_batchmod' -%]<span>Perform batch modification of items</span>
>-    [%- CASE 'items_batchmod_restricted' -%]<span>Limit batch item modification to subfields defined in the SubfieldsToAllowForRestrictedBatchmod preference (please note that items_batchmod is still required)</span>
>-    [%- CASE 'label_creator' -%]<span>Create printable labels and barcodes from catalog and patron data</span>
>-    [%- CASE 'manage_csv_profiles' -%]<span>Manage CSV export profiles</span>
>-    [%- CASE 'manage_patron_lists' -%]<span>Add, edit and delete patron lists and their contents</span>
>-    [%- CASE 'manage_staged_marc' -%]<span>Managed staged MARC records, including completing and reversing imports</span>
>-    [%- CASE 'marc_modification_templates' -%]<span>Manage marc modification templates</span>
>-    [%- CASE 'moderate_comments' -%]<span>Moderate patron comments</span>
>-    [%- CASE 'moderate_tags' -%]<span>Moderate patron tags</span>
>-    [%- CASE 'records_batchdel' -%]<span>Perform batch deletion of records (bibliographic or authority)</span>
>-    [%- CASE 'records_batchmod' -%]<span>Perform batch modification of records (biblios or authorities)</span>
>-    [%- CASE 'rotating_collections' -%]<span>Manage rotating collections</span>
>-    [%- CASE 'schedule_tasks' -%]<span>Schedule tasks to run</span>
>-    [%- CASE 'stage_marc_import' -%]<span>Stage MARC records into the reservoir</span>
>-    [%- CASE 'upload_local_cover_images' -%]<span>Upload local cover images</span>
>-    [%- CASE 'view_system_logs' -%]<span>Browse the system logs</span>
>-    [%- CASE 'check_expiration' -%]<span>Check the expiration of a serial</span>
>-    [%- CASE 'claim_serials' -%]<span>Claim missing serials</span>
>-    [%- CASE 'create_subscription' -%]<span>Create a new subscription</span>
>-    [%- CASE 'delete_subscription' -%]<span>Delete an existing subscription</span>
>-    [%- CASE 'edit_subscription' -%]<span>Edit an existing subscription</span>
>-    [%- CASE 'receive_serials' -%]<span>Serials receiving</span>
>-    [%- CASE 'renew_subscription' -%]<span>Renew a subscription</span>
>-    [%- CASE 'routing' -%]<span>Routing</span>
>-    [%- CASE 'superserials' -%]<span>Manage subscriptions from any branch (only applies when IndependentBranches is used)</span>
>-    [%- CASE 'delete_reports' -%]<span>Delete SQL reports</span>
>-    [%- CASE 'create_reports' -%]<span>Create SQL reports</span>
>-    [%- CASE 'execute_reports' -%]<span>Execute SQL reports</span>
>-    [%- CASE 'add_reserves' -%]<span>Add course reserves</span>
>-    [%- CASE 'delete_reserves' -%]<span>Remove course reserves</span>
>-    [%- CASE 'manage_courses' -%]<span>Add, edit and delete courses</span>
>-    [%- CASE 'configure' -%]<span>Configure plugins</span>
>-    [%- CASE 'manage' -%]<span>Manage plugins ( install / uninstall )</span>
>-    [%- CASE 'report' -%]<span>Use report plugins</span>
>-    [%- CASE 'tool' -%]<span>Use tool plugins</span>
>-    [%- CASE 'delete_public_lists' -%]<span>Delete public lists</span>
>-    [%- CASE 'upload_general_files' -%]<span>Upload any file</span>
>-    [%- CASE 'upload_manage' -%]<span>Manage uploaded files (<i>Useless without upload_general_files</i>)</span>
>-    [%- CASE 'access_files' -%]<span>Access to the files stored on the server</span>
>-    [%- CASE 'edit_clubs' -%]<span>Create and edit clubs</span>
>-    [%- CASE 'edit_templates' -%]<span>Create and edit club templates</span>
>-    [%- CASE 'enroll' -%]<span>Enroll patrons in clubs</span>
>-    [%- CASE 'edi_manage' -%]<span>Manage EDIFACT transmissions</span>
>+    [%- CASE 'circulate_remaining_permissions' -%]<span>[% t('Remaining circulation permissions') %]</span>
>+    [%- CASE 'force_checkout' -%]<span>[% t('Force checkout if a limitation exists') %]</span>
>+    [%- CASE 'manage_restrictions' -%]<span>[% t('Manage restrictions for accounts') %]</span>
>+    [%- CASE 'overdues_report' -%]<span>[% t('Execute overdue items report') %]</span>
>+    [%- CASE 'override_renewals' -%]<span>[% t('Override blocked renewals') %]</span>
>+    [%- CASE 'manage_circ_rules' -%]<span>[% t('manage circulation rules') %]</span>
>+    [%- CASE 'parameters_remaining_permissions' -%]<span>[% t('Remaining system parameters permissions') %]</span>
>+    [%- CASE 'edit_borrowers' -%]<span>[% t('Add, modify and view patron information') %]</span>
>+    [%- CASE 'view_borrower_infos_from_any_libraries' -%]<span>[% t('View patron infos from any libraries. If not set the logged in user could only access patron infos from its own library or group of libraries.') %]</span>
>+    [%- CASE 'modify_holds_priority' -%]<span>[% t('Modify holds priority') %]</span>
>+    [%- CASE 'place_holds' -%]<span>[% t('Place holds for patrons') %]</span>
>+    [%- CASE 'delete_all_items' -%]<span>[% t('Delete all items at once') %]</span>
>+    [%- CASE 'edit_catalogue' -%]<span>[% t('Edit catalog (Modify bibliographic/holdings data)') %]</span>
>+    [%- CASE 'edit_items' -%]<span>[% t('Edit items') %]</span>
>+    [%- CASE 'edit_items_restricted' -%]<span>[% t('Limit item modification to subfields defined in the SubfieldsToAllowForRestrictedEditing preference (please note that edit_item is still required)') %]</span>
>+    [%- CASE 'fast_cataloging' -%]<span>[% t('Fast cataloging') %]</span>
>+    [%- CASE 'remaining_permissions' -%]<span>[% t('Remaining permissions for managing fines and fees') %]</span>
>+    [%- CASE 'writeoff' -%]<span>[% t('Write off fines and fees') %]</span>
>+    [%- CASE 'budget_add_del' -%]<span>[% t('Add and delete funds (but can\'t modify funds)') %]</span>
>+    [%- CASE 'budget_manage' -%]<span>[% t('Manage funds') %]</span>
>+    [%- CASE 'budget_manage_all' -%]<span>[% t('Manage all funds') %]</span>
>+    [%- CASE 'budget_modify' -%]<span>[% t('Modify funds (can\'t create lines, but can modify existing ones)') %]</span>
>+    [%- CASE 'contracts_manage' -%]<span>[% t('Manage contracts') %]</span>
>+    [%- CASE 'group_manage' -%]<span>[% t('Manage basket groups') %]</span>
>+    [%- CASE 'order_manage' -%]<span>[% t('Manage basket and order lines') %]</span>
>+    [%- CASE 'order_manage_all' -%]<span>[% t('Manage all baskets and order lines, regardless of restrictions on them') %]</span>
>+    [%- CASE 'order_receive' -%]<span>[% t('Receive orders and manage shipments') %]</span>
>+    [%- CASE 'period_manage' -%]<span>[% t('Manage budgets') %]</span>
>+    [%- CASE 'planning_manage' -%]<span>[% t('Manage budget plannings') %]</span>
>+    [%- CASE 'vendors_manage' -%]<span>[% t('Manage vendors') %]</span>
>+    [%- CASE 'batch_upload_patron_images' -%]<span>[% t('Upload patron images in a batch or one at a time') %]</span>
>+    [%- CASE 'delete_anonymize_patrons' -%]<span>[% t('Delete old borrowers and anonymize circulation history (deletes borrower reading history)') %]</span>
>+    [%- CASE 'edit_calendar' -%]<span>[% t('Define days when the library is closed') %]</span>
>+    [%- CASE 'edit_news' -%]<span>[% t('Write news for the OPAC and staff interfaces') %]</span>
>+    [%- CASE 'edit_notice_status_triggers' -%]<span>[% t('Set notice/status triggers for overdue items') %]</span>
>+    [%- CASE 'edit_notices' -%]<span>[% t('Define notices') %]</span>
>+    [%- CASE 'edit_patrons' -%]<span>[% t('Perform batch modification of patrons') %]</span>
>+    [%- CASE 'edit_quotes' -%]<span>[% t('Edit quotes for quote-of-the-day feature') %]</span>
>+    [%- CASE 'export_catalog' -%]<span>[% t('Export bibliographic and holdings data') %]</span>
>+    [%- CASE 'import_patrons' -%]<span>[% t('Import patron data') %]</span>
>+    [%- CASE 'inventory' -%]<span>[% t('Perform inventory of your catalog') %]</span>
>+    [%- CASE 'items_batchdel' -%]<span>[% t('Perform batch deletion of items') %]</span>
>+    [%- CASE 'items_batchmod' -%]<span>[% t('Perform batch modification of items') %]</span>
>+    [%- CASE 'items_batchmod_restricted' -%]<span>[% t('Limit batch item modification to subfields defined in the SubfieldsToAllowForRestrictedBatchmod preference (please note that items_batchmod is still required)') %]</span>
>+    [%- CASE 'label_creator' -%]<span>[% t('Create printable labels and barcodes from catalog and patron data') %]</span>
>+    [%- CASE 'manage_csv_profiles' -%]<span>[% t('Manage CSV export profiles') %]</span>
>+    [%- CASE 'manage_patron_lists' -%]<span>[% t('Add, edit and delete patron lists and their contents') %]</span>
>+    [%- CASE 'manage_staged_marc' -%]<span>[% t('Managed staged MARC records, including completing and reversing imports') %]</span>
>+    [%- CASE 'marc_modification_templates' -%]<span>[% t('Manage marc modification templates') %]</span>
>+    [%- CASE 'moderate_comments' -%]<span>[% t('Moderate patron comments') %]</span>
>+    [%- CASE 'moderate_tags' -%]<span>[% t('Moderate patron tags') %]</span>
>+    [%- CASE 'records_batchdel' -%]<span>[% t('Perform batch deletion of records (bibliographic or authority)') %]</span>
>+    [%- CASE 'records_batchmod' -%]<span>[% t('Perform batch modification of records (biblios or authorities)') %]</span>
>+    [%- CASE 'rotating_collections' -%]<span>[% t('Manage rotating collections') %]</span>
>+    [%- CASE 'schedule_tasks' -%]<span>[% t('Schedule tasks to run') %]</span>
>+    [%- CASE 'stage_marc_import' -%]<span>[% t('Stage MARC records into the reservoir') %]</span>
>+    [%- CASE 'upload_local_cover_images' -%]<span>[% t('Upload local cover images') %]</span>
>+    [%- CASE 'view_system_logs' -%]<span>[% t('Browse the system logs') %]</span>
>+    [%- CASE 'check_expiration' -%]<span>[% t('Check the expiration of a serial') %]</span>
>+    [%- CASE 'claim_serials' -%]<span>[% t('Claim missing serials') %]</span>
>+    [%- CASE 'create_subscription' -%]<span>[% t('Create a new subscription') %]</span>
>+    [%- CASE 'delete_subscription' -%]<span>[% t('Delete an existing subscription') %]</span>
>+    [%- CASE 'edit_subscription' -%]<span>[% t('Edit an existing subscription') %]</span>
>+    [%- CASE 'receive_serials' -%]<span>[% t('Serials receiving') %]</span>
>+    [%- CASE 'renew_subscription' -%]<span>[% t('Renew a subscription') %]</span>
>+    [%- CASE 'routing' -%]<span>[% t('Routing') %]</span>
>+    [%- CASE 'superserials' -%]<span>[% t('Manage subscriptions from any branch (only applies when IndependentBranches is used)') %]</span>
>+    [%- CASE 'delete_reports' -%]<span>[% t('Delete SQL reports') %]</span>
>+    [%- CASE 'create_reports' -%]<span>[% t('Create SQL reports') %]</span>
>+    [%- CASE 'execute_reports' -%]<span>[% t('Execute SQL reports') %]</span>
>+    [%- CASE 'add_reserves' -%]<span>[% t('Add course reserves') %]</span>
>+    [%- CASE 'delete_reserves' -%]<span>[% t('Remove course reserves') %]</span>
>+    [%- CASE 'manage_courses' -%]<span>[% t('Add, edit and delete courses') %]</span>
>+    [%- CASE 'configure' -%]<span>[% t('Configure plugins') %]</span>
>+    [%- CASE 'manage' -%]<span>[% t('Manage plugins ( install / uninstall )') %]</span>
>+    [%- CASE 'report' -%]<span>[% t('Use report plugins') %]</span>
>+    [%- CASE 'tool' -%]<span>[% t('Use tool plugins') %]</span>
>+    [%- CASE 'delete_public_lists' -%]<span>[% t('Delete public lists') %]</span>
>+    [%- CASE 'upload_general_files' -%]<span>[% t('Upload any file') %]</span>
>+    [%- CASE 'upload_manage' -%]<span>[% t('Manage uploaded files (') %]<i>[% t('Useless without upload_general_files') %]</i>)</span>
>+    [%- CASE 'access_files' -%]<span>[% t('Access to the files stored on the server') %]</span>
>+    [%- CASE 'edit_clubs' -%]<span>[% t('Create and edit clubs') %]</span>
>+    [%- CASE 'edit_templates' -%]<span>[% t('Create and edit club templates') %]</span>
>+    [%- CASE 'enroll' -%]<span>[% t('Enroll patrons in clubs') %]</span>
>+    [%- CASE 'edi_manage' -%]<span>[% t('Manage EDIFACT transmissions') %]</span>
>   [%# self_check %]
>-    [%- CASE 'self_checkin_module' -%]<span>Log into the self check-in module. Note: this permission prevents the patron from using any other OPAC functionality</span>
>-    [%- CASE 'self_checkout_module' -%]<span>Perform self checkout at the OPAC. It should be used for the patron matching the AutoSelfCheckID</span>
>+    [%- CASE 'self_checkin_module' -%]<span>[% t('Log into the self check-in module. Note: this permission prevents the patron from using any other OPAC functionality') %]</span>
>+    [%- CASE 'self_checkout_module' -%]<span>[% t('Perform self checkout at the OPAC. It should be used for the patron matching the AutoSelfCheckID') %]</span>
>   [%- END -%]
> [%- END -%]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
>index 41705765ef..4d7bae725f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
>@@ -1,9 +1,10 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> <div class="gradient">
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1>
> <div id="header_search">
> 	<div id="syspref_search" class="residentsearch">
>-	<p class="tip">System preference search:</p>
>+	<p class="tip">[% t('System preference search:') %]</p>
> 	    <form action="/cgi-bin/koha/admin/preferences.pl">
>         <input type="hidden" name="tab" value="[% last_tab %]" />
>         <input type="hidden" name="op" value="search" />
>@@ -14,18 +15,18 @@
>     [% INCLUDE 'patron-search-box.inc' %]
> 	[% IF ( CAN_user_catalogue ) %]
>     <div id="catalog_search" class="residentsearch">
>-<p class="tip">Enter search keywords:</p>
>-		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>+<p class="tip">[% t('Enter search keywords:') %]</p>
>+		<form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block">
>              [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>-             <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
>+             <input type="text" name="q" id="search-form" size="40" value="" title="[% t('Enter the terms you wish to search for.') %]" class="head-searchbox form-text" />
> 				<input type="submit" value="Submit" class="submit" />
> 		</form>
> 	</div>
> 	[% END %]
> 			<ul>
>-            <li><a class="keep_text" href="#syspref_search">Search system preferences</a></li>
>-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
>-            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
>+            <li><a class="keep_text" href="#syspref_search">[% t('Search system preferences') %]</a></li>
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">[% t('Check out') %]</a></li>[% END %]
>+            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">[% t('Search the catalog') %]</a></li>[% END %]
> 			</ul>
> </div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
>index 3b2e2f75ed..633c9dd9b3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
>@@ -1,20 +1,21 @@
>+[% PROCESS 'i18n.inc' %]
> <div id="menu">
> <ul>
>-[% IF ( acquisitions ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Acquisitions" href="/cgi-bin/koha/admin/preferences.pl?tab=acquisitions">Acquisitions</a></li>
>-[% IF ( admin ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Administration" href="/cgi-bin/koha/admin/preferences.pl?tab=admin">Administration</a></li>
>-[% IF ( authorities ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Authority Control" href="/cgi-bin/koha/admin/preferences.pl?tab=authorities">Authorities</a></li>
>-[% IF ( cataloguing ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Cataloging" href="/cgi-bin/koha/admin/preferences.pl?tab=cataloguing">Cataloging</a></li>
>-[% IF ( circulation ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Circulation" href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">Circulation</a></li>
>-[% IF ( enhanced_content ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Enhanced content settings" href="/cgi-bin/koha/admin/preferences.pl?tab=enhanced_content">Enhanced content</a></li>
>-[% IF ( i18n_l10n ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Internationalization and localization" href="/cgi-bin/koha/admin/preferences.pl?tab=i18n_l10n">I18N/L10N</a></li>
>-[% IF ( local_use ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/admin/systempreferences.pl">Local use</a></li>
>-[% IF ( logs ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Transaction logs" href="/cgi-bin/koha/admin/preferences.pl?tab=logs">Logs</a></li>
>-[% IF ( opac ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Online Public Access Catalog" href="/cgi-bin/koha/admin/preferences.pl?tab=opac">OPAC</a></li>
>-[% IF ( patrons ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Patrons" href="/cgi-bin/koha/admin/preferences.pl?tab=patrons">Patrons</a></li>
>-[% IF ( searching ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Searching" href="/cgi-bin/koha/admin/preferences.pl?tab=searching">Searching</a></li>
>-[% IF ( serials ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Serials" href="/cgi-bin/koha/admin/preferences.pl?tab=serials">Serials</a></li>
>-[% IF ( staff_client ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Staff client" href="/cgi-bin/koha/admin/preferences.pl?tab=staff_client">Staff client</a></li>
>-[% IF ( tools ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Tools" href="/cgi-bin/koha/admin/preferences.pl?tab=tools">Tools</a></li>
>-[% IF ( web_services ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Web services" href="/cgi-bin/koha/admin/preferences.pl?tab=web_services">Web services</a></li>
>+[% IF ( acquisitions ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="[% t('Acquisitions') %]" href="/cgi-bin/koha/admin/preferences.pl?tab=acquisitions">[% t('Acquisitions') %]</a></li>
>+[% IF ( admin ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="[% t('Administration') %]" href="/cgi-bin/koha/admin/preferences.pl?tab=admin">[% t('Administration') %]</a></li>
>+[% IF ( authorities ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="[% t('Authority Control') %]" href="/cgi-bin/koha/admin/preferences.pl?tab=authorities">[% t('Authorities') %]</a></li>
>+[% IF ( cataloguing ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="[% t('Cataloging') %]" href="/cgi-bin/koha/admin/preferences.pl?tab=cataloguing">[% t('Cataloging') %]</a></li>
>+[% IF ( circulation ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="[% t('Circulation') %]" href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">[% t('Circulation') %]</a></li>
>+[% IF ( enhanced_content ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="[% t('Enhanced content settings') %]" href="/cgi-bin/koha/admin/preferences.pl?tab=enhanced_content">[% t('Enhanced content') %]</a></li>
>+[% IF ( i18n_l10n ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="[% t('Internationalization and localization') %]" href="/cgi-bin/koha/admin/preferences.pl?tab=i18n_l10n">[% t('I18N/L10N') %]</a></li>
>+[% IF ( local_use ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/admin/systempreferences.pl">[% t('Local use') %]</a></li>
>+[% IF ( logs ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="[% t('Transaction logs') %]" href="/cgi-bin/koha/admin/preferences.pl?tab=logs">[% t('Logs') %]</a></li>
>+[% IF ( opac ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="[% t('Online Public Access Catalog') %]" href="/cgi-bin/koha/admin/preferences.pl?tab=opac">[% t('OPAC') %]</a></li>
>+[% IF ( patrons ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="[% t('Patrons') %]" href="/cgi-bin/koha/admin/preferences.pl?tab=patrons">[% t('Patrons') %]</a></li>
>+[% IF ( searching ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="[% t('Searching') %]" href="/cgi-bin/koha/admin/preferences.pl?tab=searching">[% t('Searching') %]</a></li>
>+[% IF ( serials ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="[% t('Serials') %]" href="/cgi-bin/koha/admin/preferences.pl?tab=serials">[% t('Serials') %]</a></li>
>+[% IF ( staff_client ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="[% t('Staff client') %]" href="/cgi-bin/koha/admin/preferences.pl?tab=staff_client">[% t('Staff client') %]</a></li>
>+[% IF ( tools ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="[% t('Tools') %]" href="/cgi-bin/koha/admin/preferences.pl?tab=tools">[% t('Tools') %]</a></li>
>+[% IF ( web_services ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="[% t('Web services') %]" href="/cgi-bin/koha/admin/preferences.pl?tab=web_services">[% t('Web services') %]</a></li>
> </ul>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc
>index 621480b3d6..f94c0e0334 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc
>@@ -1,5 +1,6 @@
>+[% PROCESS 'i18n.inc' %]
> <div id="toolbar" class="btn-toolbar">
>-        <div class="btn-group"><a class="btn btn-default btn-sm" id="add_quote" href="#"><i class="fa fa-plus"></i> Add quote</a></div>
>-        <div class="btn-group"><a class="btn btn-default btn-sm" id="delete_quote" href="#"><i class="fa fa-trash"></i> Delete quote(s)</a></div>
>-        <div class="btn-group"><a class="btn btn-default btn-sm" id="import_quotes" href="/cgi-bin/koha/tools/quotes-upload.pl"><i class="fa fa-folder-open"></i> Import quotes</a></div>
>+        <div class="btn-group"><a class="btn btn-default btn-sm" id="add_quote" href="#"><i class="fa fa-plus"></i> [% t('Add quote') %]</a></div>
>+        <div class="btn-group"><a class="btn btn-default btn-sm" id="delete_quote" href="#"><i class="fa fa-trash"></i> [% t('Delete quote(s)') %]</a></div>
>+        <div class="btn-group"><a class="btn btn-default btn-sm" id="import_quotes" href="/cgi-bin/koha/tools/quotes-upload.pl"><i class="fa fa-folder-open"></i> [% t('Import quotes') %]</a></div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc
>index b7554c8a78..d6594a6989 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc
>@@ -1,5 +1,6 @@
>+[% PROCESS 'i18n.inc' %]
> <div id="toolbar" class="btn-toolbar" style="visibility: hidden; position: absolute">
>-        <div class="btn-group"><a class="btn btn-default btn-sm" id="save_quotes" href="#"><i class="fa fa-save"></i> Save quotes</a></div>
>-        <div class="btn-group"><a class="btn btn-default btn-sm" id="delete_quote" href="#"><i class="fa fa-trash"></i> Delete quote(s)</a></div>
>-        <div class="btn-group"><a href="/cgi-bin/koha/tools/quotes-upload.pl" id="cancel_quotes" class="btn btn-default btn-sm"><i class="fa fa-remove"></i> Cancel import</a></div>
>+        <div class="btn-group"><a class="btn btn-default btn-sm" id="save_quotes" href="#"><i class="fa fa-save"></i> [% t('Save quotes') %]</a></div>
>+        <div class="btn-group"><a class="btn btn-default btn-sm" id="delete_quote" href="#"><i class="fa fa-trash"></i> [% t('Delete quote(s)') %]</a></div>
>+        <div class="btn-group"><a href="/cgi-bin/koha/tools/quotes-upload.pl" id="cancel_quotes" class="btn btn-default btn-sm"><i class="fa fa-remove"></i> [% t('Cancel import') %]</a></div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc
>index e79f2db105..9faa22193d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc
>@@ -1,57 +1,58 @@
>+[% PROCESS 'i18n.inc' %]
> <div id="navmenu">
>     <div id="navmenulist">
> 
>-        <h5>Guided reports</h5>
>+        <h5>[% t('Guided reports') %]</h5>
>             <ul>
>-                <li><a href="/cgi-bin/koha/reports/guided_reports.pl">Guided reports</a></li>
>+                <li><a href="/cgi-bin/koha/reports/guided_reports.pl">[% t('Guided reports') %]</a></li>
>                 [% IF ( CAN_user_reports_create_reports ) %]
>-                    <li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build new</a></li>
>+                    <li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">[% t('Build new') %]</a></li>
>                 [% END %]
>                 [% IF ( CAN_user_reports_execute_reports ) %]
>-                    <li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Use saved</a></li>
>+                    <li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">[% t('Use saved') %]</a></li>
>                 [% END %]
>                 [% IF ( CAN_user_reports_create_reports ) %]
>-                    <li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL">Create from SQL</a></li>
>+                    <li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL">[% t('Create from SQL') %]</a></li>
>                 [% END %]
>             </ul>
> 
>-        <h5>Statistics wizards</h5>
>+        <h5>[% t('Statistics wizards') %]</h5>
>             <ul>
>-                <li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></li>
>-                <li><a href="/cgi-bin/koha/reports/borrowers_stats.pl">Patrons</a></li>
>-                <li><a href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalog</a></li>
>-                <li><a href="/cgi-bin/koha/reports/issues_stats.pl">Circulation</a></li>
>-                <li><a href="/cgi-bin/koha/reports/serials_stats.pl">Serials</a></li>
>-                <li><a href="/cgi-bin/koha/reports/cash_register_stats.pl">Cash register</a></li>
>-                <li><a href="/cgi-bin/koha/reports/reserves_stats.pl">Holds</a></li>
>+                <li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">[% t('Acquisitions') %]</a></li>
>+                <li><a href="/cgi-bin/koha/reports/borrowers_stats.pl">[% t('Patrons') %]</a></li>
>+                <li><a href="/cgi-bin/koha/reports/catalogue_stats.pl">[% t('Catalog') %]</a></li>
>+                <li><a href="/cgi-bin/koha/reports/issues_stats.pl">[% t('Circulation') %]</a></li>
>+                <li><a href="/cgi-bin/koha/reports/serials_stats.pl">[% t('Serials') %]</a></li>
>+                <li><a href="/cgi-bin/koha/reports/cash_register_stats.pl">[% t('Cash register') %]</a></li>
>+                <li><a href="/cgi-bin/koha/reports/reserves_stats.pl">[% t('Holds') %]</a></li>
>             </ul>
> 
>         [% IF UseKohaPlugins %]
>-            <h5>Report plugins</h5>
>+            <h5>[% t('Report plugins') %]</h5>
>             <ul>
>-                <li><a href="/cgi-bin/koha/plugins/plugins-home.pl?method=report">Report plugins</a></li>
>+                <li><a href="/cgi-bin/koha/plugins/plugins-home.pl?method=report">[% t('Report plugins') %]</a></li>
>             </ul>
>         [% END %]
> 
>-        <h5>Top lists</h5>
>+        <h5>[% t('Top lists') %]</h5>
>         <ul>
>-            <li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Patrons with the most checkouts</a></li>
>-            <li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Most-circulated items</a></li>
>+            <li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">[% t('Patrons with the most checkouts') %]</a></li>
>+            <li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">[% t('Most-circulated items') %]</a></li>
>         </ul>
> 
>-        <h5>Inactive</h5>
>+        <h5>[% t('Inactive') %]</h5>
>         <ul>
>-            <li><a href="/cgi-bin/koha/reports/borrowers_out.pl">Patrons who haven't checked out</a></li>
>-            <li><a href="/cgi-bin/koha/reports/catalogue_out.pl">Items with no checkouts</a></li>
>+            <li><a href="/cgi-bin/koha/reports/borrowers_out.pl">[% t('Patrons who haven\'t checked out') %]</a></li>
>+            <li><a href="/cgi-bin/koha/reports/catalogue_out.pl">[% t('Items with no checkouts') %]</a></li>
>         </ul>
> 
> 
>-        <h5>Other</h5>
>+        <h5>[% t('Other') %]</h5>
>         <ul>
>-            <li><a href="/cgi-bin/koha/reports/itemslost.pl">Lost items</a></li>
>-            <li><a href="/cgi-bin/koha/reports/orders_by_fund.pl">Orders by fund</a></li>
>-            <li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalog by item type</a></li>
>-            <li><a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average loan time</a></li>
>+            <li><a href="/cgi-bin/koha/reports/itemslost.pl">[% t('Lost items') %]</a></li>
>+            <li><a href="/cgi-bin/koha/reports/orders_by_fund.pl">[% t('Orders by fund') %]</a></li>
>+            <li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">[% t('Catalog by item type') %]</a></li>
>+            <li><a href="/cgi-bin/koha/reports/issues_avg_stats.pl">[% t('Average loan time') %]</a></li>
>         </ul>
>     </div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc
>index 99ce946084..3702a39b3b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc
>@@ -1,11 +1,12 @@
>+[% PROCESS 'i18n.inc' %]
> [% INCLUDE 'blocking_errors.inc' %]
> <div id="toolbar" class="btn-toolbar">
>     [% IF ( CAN_user_reports_create_reports ) %]
>         <div class="btn-group">
>-            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New report <span class="caret"></span></button>
>+            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> [% t('New report') %] <span class="caret"></span></button>
>             <ul class="dropdown-menu">
>-                <li id="newmenuc"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">New guided report</a> </li>
>-                <li id="newsql"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL">New SQL report</a> </li>
>+                <li id="newmenuc"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">[% t('New guided report') %]</a> </li>
>+                <li id="newsql"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL">[% t('New SQL report') %]</a> </li>
>             </ul>
>         </div>
>     [% END %]
>@@ -14,14 +15,14 @@
>         [% IF ( CAN_user_reports_create_reports ) %]
>             [% UNLESS ( editsql ) # Do not show edit button on edit page %]
>                 <div class="btn-group">
>-                    <a id="editreport" class="btn btn-default btn-sm" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&amp;phase=Edit%20SQL">
>-                        <i class="fa fa-pencil"></i> Edit
>+                    <a id="editreport" class="btn btn-default btn-sm" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Edit%20SQL">
>+                        <i class="fa fa-pencil"></i> [% t('Edit') %]
>                     </a>
>                 </div>
>             [% END %]
>             <div class="btn-group">
>-                <a class="btn btn-default btn-sm" title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&amp;sql=[% original_sql || sql |uri %]&amp;reportname=[% reportname |uri %]&amp;notes=[% notes |uri %]">
>-                    <i class="fa fa-copy"></i> Duplicate
>+                <a class="btn btn-default btn-sm" title="[% t('Duplicate this saved report') %]" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&sql=[% original_sql || sql |uri %]&reportname=[% reportname |uri %]&notes=[% notes |uri %]">
>+                    <i class="fa fa-copy"></i> [% t('Duplicate') %]
>                 </a>
>             </div>
>         [% END %]
>@@ -29,42 +30,42 @@
>         [% IF ( CAN_user_reports_delete_reports ) %]
>             <div class="btn-group">
>                 <a class="delete btn btn-default btn-sm" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Delete%20Saved">
>-                    <i class="fa fa-trash"></i> Delete
>+                    <i class="fa fa-trash"></i> [% t('Delete') %]
>                 </a>
>             </div>
>         [% END %]
> 
>         [% UNLESS ( errors ) # Unless there are errors saving a report %]
>             <div class="btn-group">
>-                <a id="runreport" class="btn btn-default btn-sm" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&amp;phase=Run%20this%20report">
>-                    <i class="fa fa-play"></i> Run report
>+                <a id="runreport" class="btn btn-default btn-sm" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Run%20this%20report">
>+                    <i class="fa fa-play"></i> [% t('Run report') %]
>                 </a>
>             </div>
>             <div class="btn-group">
>                 <a class="btn btn-default btn-sm" href="/cgi-bin/koha/tools/scheduler.pl?id=[% id %]">
>-                    <i class="fa fa-clock-o"></i> Schedule
>+                    <i class="fa fa-clock-o"></i> [% t('Schedule') %]
>                 </a>
>             </div>
>         [% END %]
> 
>         [% IF ( execute ) %]
>             [% BLOCK params %]
>-                [%- FOREACH param IN sql_params %]&amp;sql_params=[% param %][% END %]
>-                    [%- FOREACH param_name IN param_names %]&amp;param_name=[% param_name %][% END %]
>+                [%- FOREACH param IN sql_params %][% t('&amp;sql_params=') %][% param %][% END %]
>+                    [%- FOREACH param_name IN param_names %][% t('&amp;param_name=') %][% param_name %][% END %]
>             [%- END %]
> 
> 
>             <div class="btn-group">
>-                <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="format"><i class="fa fa-upload"></i> Download <span class="caret"></span></button>
>+                <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="format"><i class="fa fa-upload"></i> [% t('Download') %] <span class="caret"></span></button>
>                 <ul class="dropdown-menu">
>-                    <li><a id="csv" href="/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Export&amp;format=csv&amp;report_id=[% id %]&amp;reportname=[% name |uri %][% PROCESS params %]">[% PROCESS 'delimiter_text.inc' %]</a></li>
>-                    <li><a id="tab" href="/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Export&amp;format=tab&amp;report_id=[% id %]&amp;reportname=[% name |uri %][% PROCESS params %]">Tab separated text</a></li>
>-                    <li><a id="ods" href="/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Export&amp;format=ods&amp;report_id=[% id %]&amp;reportname=[% name |uri %][% PROCESS params %]">Open Document Spreadsheet</a></li>
>+                    <li><a id="csv" href="/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Export&format=csv&report_id=[% id %]&reportname=[% name |uri %][% PROCESS params %]">[% PROCESS 'delimiter_text.inc' %]</a></li>
>+                    <li><a id="tab" href="/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Export&format=tab&report_id=[% id %]&reportname=[% name |uri %][% PROCESS params %]">[% t('Tab separated text') %]</a></li>
>+                    <li><a id="ods" href="/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Export&format=ods&report_id=[% id %]&reportname=[% name |uri %][% PROCESS params %]">[% t('Open Document Spreadsheet') %]</a></li>
>                 </ul>
>             </div>
>             <div class="btn-group">
>-                <a class="btn btn-default btn-sm toggle_sql" id="toggle_sql_hid" href="#"><i class="fa fa-eye"></i> Show SQL code</a>
>-                <a class="btn btn-default btn-sm toggle_sql" id="toggle_sql_vis" href="#" style="display:none;"><i class="fa fa-eye-slash"></i> Hide SQL code</a>
>+                <a class="btn btn-default btn-sm toggle_sql" id="toggle_sql_hid" href="#"><i class="fa fa-eye"></i> [% t('Show SQL code') %]</a>
>+                <a class="btn btn-default btn-sm toggle_sql" id="toggle_sql_vis" href="#" style="display:none;"><i class="fa fa-eye-slash"></i> [% t('Hide SQL code') %]</a>
>             </div>
>         [% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc
>index 4326bea4fa..de02a0e929 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc
>@@ -1,86 +1,87 @@
>-<option value="relevance">Relevance</option>
>+[% PROCESS 'i18n.inc' %]
>+<option value="relevance">[% t('Relevance') %]</option>
> 
>-<optgroup label="Popularity">
>+<optgroup label="[% t('Popularity') %]">
> 	
> 	[% IF ( sort_by == "popularity_dsc" ) %]
>-<option value="popularity_dsc" selected="selected">Popularity (most to least)</option>
>+<option value="popularity_dsc" selected="selected">[% t('Popularity (most to least)') %]</option>
> [% ELSE %]
>-    <option value="popularity_dsc">Popularity (most to least)</option>
>+    <option value="popularity_dsc">[% t('Popularity (most to least)') %]</option>
>  [% END %]
> [% IF ( sort_by == "popularity_asc" ) %]
>-<option value="popularity_asc" selected="selected">Popularity (least to most)</option>
>+<option value="popularity_asc" selected="selected">[% t('Popularity (least to most)') %]</option>
> [% ELSE %]
>-    <option value="popularity_asc">Popularity (least to most)</option>
>+    <option value="popularity_asc">[% t('Popularity (least to most)') %]</option>
>  [% END %]
> 
> </optgroup>
> 
>-<optgroup label="Author">
>+<optgroup label="[% t('Author') %]">
> 	
> 	[% IF ( sort_by == "author_az" || sort_by == "author_asc" ) %]
>-<option value="author_az" selected="selected">Author (A-Z)</option>	
>+<option value="author_az" selected="selected">[% t('Author (A-Z)') %]</option>	
> [% ELSE %]
>-<option value="author_az">Author (A-Z)</option>
>+<option value="author_az">[% t('Author (A-Z)') %]</option>
>  [% END %]
> [% IF ( sort_by == "author_za" || sort_by == "author_dsc" ) %]
>-<option value="author_za" selected="selected">Author (Z-A)</option>
>+<option value="author_za" selected="selected">[% t('Author (Z-A)') %]</option>
> [% ELSE %]
>-<option value="author_za">Author (Z-A)</option>
>+<option value="author_za">[% t('Author (Z-A)') %]</option>
>  [% END %]
> 
> </optgroup>
> 
>-<optgroup label="Call Number">
>+<optgroup label="[% t('Call Number') %]">
> 	
> 	[% IF ( sort_by == "call_number_asc" ) %]
>-<option value="call_number_asc" selected="selected">Call Number (0-9 to A-Z)</option>
>+<option value="call_number_asc" selected="selected">[% t('Call Number (0-9 to A-Z)') %]</option>
> [% ELSE %]
>-    <option value="call_number_asc">Call number (0-9 to A-Z)</option>
>+    <option value="call_number_asc">[% t('Call number (0-9 to A-Z)') %]</option>
> [% END %]
> 
> [% IF ( sort_by == "call_number_dsc" ) %]
>-<option value="call_number_dsc" selected="selected">Call number (Z-A to 9-0)</option>
>+<option value="call_number_dsc" selected="selected">[% t('Call number (Z-A to 9-0)') %]</option>
> [% ELSE %]
>-    <option value="call_number_dsc">Call number (Z-A to 9-0)</option>
>+    <option value="call_number_dsc">[% t('Call number (Z-A to 9-0)') %]</option>
> [% END %]
> 
> </optgroup>
> 
>-<optgroup label="Dates">
>+<optgroup label="[% t('Dates') %]">
> 	[% IF ( sort_by == "pubdate_dsc" ) %]
>-<option value="pubdate_dsc" selected="selected" >Publication/Copyright date: newest to oldest</option>
>+<option value="pubdate_dsc" selected="selected">[% t('Publication/Copyright date: newest to oldest') %]</option>
> 	[% ELSE %]
>-<option value="pubdate_dsc">Publication/Copyright date: newest to oldest</option>
>+<option value="pubdate_dsc">[% t('Publication/Copyright date: newest to oldest') %]</option>
> [% END %]
> 
> [% IF ( sort_by == "pubdate_asc" ) %]
>-<option value="pubdate_asc" selected="selected" >Publication/Copyright date: oldest to newest</option>
>+<option value="pubdate_asc" selected="selected">[% t('Publication/Copyright date: oldest to newest') %]</option>
> [% ELSE %]
>-<option value="pubdate_asc">Publication/Copyright date: oldest to newest</option>
>+<option value="pubdate_asc">[% t('Publication/Copyright date: oldest to newest') %]</option>
> [% END %]
> 
> [% IF ( sort_by == "acqdate_dsc" ) %]
>-<option value="acqdate_dsc" selected="selected">Acquisition date: newest to oldest</option>
>+<option value="acqdate_dsc" selected="selected">[% t('Acquisition date: newest to oldest') %]</option>
> [% ELSE %]
>-<option value="acqdate_dsc">Acquisition date: newest to oldest</option>
>+<option value="acqdate_dsc">[% t('Acquisition date: newest to oldest') %]</option>
>  [% END %]
> 
>  [% IF ( sort_by == "acqdate_asc" ) %]
>-<option value="acqdate_asc" selected="selected">Acquisition date: oldest to newest</option>
>+<option value="acqdate_asc" selected="selected">[% t('Acquisition date: oldest to newest') %]</option>
> [% ELSE %]
>-<option value="acqdate_asc">Acquisition date: oldest to newest</option>
>+<option value="acqdate_asc">[% t('Acquisition date: oldest to newest') %]</option>
>  [% END %]
> </optgroup>
> 
>-<optgroup label="Title">
>+<optgroup label="[% t('Title') %]">
> 	[% IF ( sort_by == "title_az" || sort_by == "title_asc" ) %]
>-<option value="title_az" selected="selected">Title (A-Z)</option>
>+<option value="title_az" selected="selected">[% t('Title (A-Z)') %]</option>
> 	[% ELSE %]
>-<option value="title_az">Title (A-Z)</option>
>+<option value="title_az">[% t('Title (A-Z)') %]</option>
> 	 [% END %]
> 	[% IF ( sort_by == "title_za" || sort_by == "title_dsc" ) %]
>-<option value="title_za" selected="selected">Title (Z-A)</option>	
>+<option value="title_za" selected="selected">[% t('Title (Z-A)') %]</option>	
> 	[% ELSE %]
>-<option value="title_za">Title (Z-A)</option>
>+<option value="title_za">[% t('Title (Z-A)') %]</option>
> [% END %]
> </optgroup>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc
>index cfcc609c9d..5c88179125 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc
>@@ -1,18 +1,19 @@
>+[% PROCESS 'i18n.inc' %]
> [% INCLUDE 'blocking_errors.inc' %]
> <div id="toolbar" class="btn-toolbar">
>     <div class="btn-group">
>-        <a class="btn btn-default btn-sm" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=new"><i class="fa fa-plus"></i> New collection</a>
>+        <a class="btn btn-default btn-sm" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=new"><i class="fa fa-plus"></i> [% t('New collection') %]</a>
>     </div>
> 
>     [% IF ( colId ) %]
>         <div class="btn-group">
>-            <a class="btn btn-default btn-sm" href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% colId %]"><i class="fa fa-exchange"></i> Transfer</a>
>+            <a class="btn btn-default btn-sm" href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% colId %]"><i class="fa fa-exchange"></i> [% t('Transfer') %]</a>
>         </div>
>         <div class="btn-group">
>-            <a class="btn btn-default btn-sm" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&amp;colId=[% colId %]"><i class="fa fa-pencil"></i> Edit</a>
>+            <a class="btn btn-default btn-sm" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&colId=[% colId %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a>
>         </div>
>         <div class="btn-group">
>-            <a class="btn btn-default btn-sm confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&amp;colId=[% colId %]"><i class="fa fa-trash"></i> Delete</a>
>+            <a class="btn btn-default btn-sm confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&colId=[% colId %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a>
>         </div>
>     [% END %]
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
>index 95d368411a..bd36dd3819 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
>@@ -1,46 +1,47 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> <select class="advsearch" name="idx">
>-    <option value="kw">Keyword</option>
>-    <option value="kw,phr">&nbsp;&nbsp;&nbsp;&nbsp; Keyword as phrase</option>
>-    <option value="au">Author</option>
>-    <option value="au,phr">&nbsp;&nbsp;&nbsp;&nbsp; Author as phrase</option>
>-    <option value="cpn">&nbsp;&nbsp;&nbsp;&nbsp; Corporate name</option>
>-    <option value="cfn">&nbsp;&nbsp;&nbsp;&nbsp; Conference name</option>
>-    <option value="cpn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Corporate name as phrase</option>
>-    <option value="cfn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Conference name as phrase</option>
>-    <option value="pn">&nbsp;&nbsp;&nbsp;&nbsp; Personal name</option>
>-    <option value="pn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Personal name as phrase</option>
>-    <option value="ti">Title</option>
>-    <option value="ti,phr">&nbsp;&nbsp;&nbsp;&nbsp; Title as phrase</option>
>-    <option value="se">&nbsp;&nbsp;&nbsp;&nbsp; Series title</option>
>-    <option value="su">Subject</option>
>-    <option value="su,phr">&nbsp;&nbsp;&nbsp;&nbsp; Subject as phrase</option>
>+    <option value="kw">[% t('Keyword') %]</option>
>+    <option value="kw,phr">[% t('Â Â Â Â  Keyword as phrase') %]</option>
>+    <option value="au">[% t('Author') %]</option>
>+    <option value="au,phr">[% t('Â Â Â Â  Author as phrase') %]</option>
>+    <option value="cpn">[% t('Â Â Â Â  Corporate name') %]</option>
>+    <option value="cfn">[% t('Â Â Â Â  Conference name') %]</option>
>+    <option value="cpn,phr">[% t('Â Â Â Â  Corporate name as phrase') %]</option>
>+    <option value="cfn,phr">[% t('Â Â Â Â  Conference name as phrase') %]</option>
>+    <option value="pn">[% t('Â Â Â Â  Personal name') %]</option>
>+    <option value="pn,phr">[% t('Â Â Â Â  Personal name as phrase') %]</option>
>+    <option value="ti">[% t('Title') %]</option>
>+    <option value="ti,phr">[% t('Â Â Â Â  Title as phrase') %]</option>
>+    <option value="se">[% t('Â Â Â Â  Series title') %]</option>
>+    <option value="su">[% t('Subject') %]</option>
>+    <option value="su,phr">[% t('Â Â Â Â  Subject as phrase') %]</option>
>     [% IF ( expanded_options ) %]
>-        <option value="su-br">&nbsp;&nbsp;&nbsp;&nbsp; Subject and broader terms</option>
>-        <option value="su-na">&nbsp;&nbsp;&nbsp;&nbsp; Subject and narrower terms</option>
>-        <option value="su-rl">&nbsp;&nbsp;&nbsp;&nbsp; Subject and related terms</option>
>+        <option value="su-br">[% t('Â Â Â Â  Subject and broader terms') %]</option>
>+        <option value="su-na">[% t('Â Â Â Â  Subject and narrower terms') %]</option>
>+        <option value="su-rl">[% t('Â Â Â Â  Subject and related terms') %]</option>
>     [% END %]
>-    <option value="bc">Barcode</option>
>-    <option value="location">Shelving location</option>
>+    <option value="bc">[% t('Barcode') %]</option>
>+    <option value="location">[% t('Shelving location') %]</option>
>     [% IF ( Koha.Preference('IntranetNumbersPreferPhrase') ) %]
>-    <option value="sn,phr">Standard number</option>
>+    <option value="sn,phr">[% t('Standard number') %]</option>
>     [% ELSE %]
>-    <option value="sn">Standard number</option>
>+    <option value="sn">[% t('Standard number') %]</option>
>     [% END %]
>-    <option value="nb">&nbsp;&nbsp;&nbsp;&nbsp; ISBN</option>
>-    <option value="ns">&nbsp;&nbsp;&nbsp;&nbsp; ISSN</option>
>+    <option value="nb">[% t('Â Â Â Â  ISBN') %]</option>
>+    <option value="ns">[% t('Â Â Â Â  ISSN') %]</option>
>     [% IF ( Koha.Preference('IntranetNumbersPreferPhrase') ) %]
>-    <option value="callnum,phr">&nbsp;&nbsp;&nbsp;&nbsp; Call number</option>
>+    <option value="callnum,phr">[% t('Â Â Â Â  Call number') %]</option>
>     [% ELSE %]
>-    <option value="callnum">&nbsp;&nbsp;&nbsp;&nbsp; Call number</option>
>+    <option value="callnum">[% t('Â Â Â Â  Call number') %]</option>
>     [% END %]
>-    <option value="ln,rtrn">Language</option>
>-    <option value="nt">Notes/Comments</option>
>+    <option value="ln,rtrn">[% t('Language') %]</option>
>+    <option value="nt">[% t('Notes/Comments') %]</option>
>     [% IF (marcflavour != 'UNIMARC' ) %]
>-        <option value="curriculum">Curriculum</option>
>+        <option value="curriculum">[% t('Curriculum') %]</option>
>     [% END %]
>-    <option value="pb">Publisher</option>
>-    <option value="pl">Publisher location</option>
>+    <option value="pb">[% t('Publisher') %]</option>
>+    <option value="pl">[% t('Publisher location') %]</option>
> 
>     [%# Use non-normalized st-year instead of st-numeric, %]
>     [%# since pubdate can include 'u' to signify unknown %]
>@@ -48,6 +49,6 @@
>     [%# http://www.loc.gov/marc/bibliographic/bd008a.html %]
>     [%# This search is also for date ranges due to the %]
>     [%# special Zebra r=r CCL mapping for 'yr' %]
>-    <option value="yr,st-year">Publication date (yyyy-yyyy)</option>
>-    <option value="acqdate,st-date-normalized">Acquisition date (yyyy-mm-dd)</option>
>+    <option value="yr,st-year">[% t('Publication date (yyyy-yyyy)') %]</option>
>+    <option value="acqdate,st-date-normalized">[% t('Acquisition date (yyyy-mm-dd)') %]</option>
> </select>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
>index 21dff3aa99..48960b02e5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
>@@ -1,12 +1,13 @@
>+[% PROCESS 'i18n.inc' %]
> [% IF ( subscriptionid ) %]
> <ul>
>-<li><a href="serials-collection.pl?subscriptionid=[% subscriptionid %]">Serial collection</a></li>
>+<li><a href="serials-collection.pl?subscriptionid=[% subscriptionid %]">[% t('Serial collection') %]</a></li>
>   [% UNLESS closed %]
>     [% IF ( routing && CAN_user_serials_routing ) %]
>         [% IF ( hasRouting ) %]
>-             <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]">Edit routing list</a></li>
>+             <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]">[% t('Edit routing list') %]</a></li>
>         [% ELSE %]
>-            <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]&amp;op=new">Create routing list</a></li>
>+            <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]&op=new">[% t('Create routing list') %]</a></li>
>         [% END %]
>     [% END %]
>   [% END %]
>@@ -15,20 +16,20 @@
> 
> <ul>
>     [% IF ( CAN_user_serials_claim_serials ) %]
>-	<li><a href="/cgi-bin/koha/serials/claims.pl">Claims</a></li>
>+	<li><a href="/cgi-bin/koha/serials/claims.pl">[% t('Claims') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_serials_check_expiration ) %]
>-	<li><a href="/cgi-bin/koha/serials/checkexpiration.pl">Check expiration</a></li>
>+	<li><a href="/cgi-bin/koha/serials/checkexpiration.pl">[% t('Check expiration') %]</a></li>
>     [% END %]
>     <li>
>         <a href="/cgi-bin/koha/serials/subscription-frequencies.pl">
>-            Manage frequencies
>+            [% t('Manage frequencies') %]
>         </a>
>     </li>
>     <li>
>         <a href="/cgi-bin/koha/serials/subscription-numberpatterns.pl">
>-            Manage numbering patterns
>+            [% t('Manage numbering patterns') %]
>         </a>
>     </li>
>-    <li><a href="/cgi-bin/koha/serials/add_fields.pl">Add subscription fields</a></li>
>+    <li><a href="/cgi-bin/koha/serials/add_fields.pl">[% t('Add subscription fields') %]</a></li>
> </ul>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
>index cb78faf008..370ca0bf8b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
>@@ -1,38 +1,39 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> <div class="gradient">
>   <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1>
>   <div id="header_search">
>     <div id="subscription_search" class="residentsearch">
>-    <p class="tip">Search subscriptions:</p>
>+    <p class="tip">[% t('Search subscriptions:') %]</p>
>     <form action="/cgi-bin/koha/serials/serials-search.pl" method="get">
>       [% IF ( routing ) %]
>         <input type="hidden" name="routing" value="[% routing %]" />
>       [% END %]
>       <input type="hidden" name="searched" value="1" />
>-      <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter | html %]" />
>+      <label for="ISSN_filter">[% t('ISSN:') %]</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter | html %]" />
> 
>       [% IF (UNIMARC) %]
>-        <label for="EAN_filter">EAN:</label> <input type="text" size="20" maxlength="40" name="EAN_filter" id="EAN_filter" value="[% EAN_filter | html %]" />
>+        <label for="EAN_filter">[% t('EAN:') %]</label> <input type="text" size="20" maxlength="40" name="EAN_filter" id="EAN_filter" value="[% EAN_filter | html %]" />
>       [% END %]
>-      <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter | html %]" />
>-      <input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/serials/serials-search.pl">Advanced search</a>
>+      <label for="title_filter">[% t('Title:') %]</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter | html %]" />
>+      <input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/serials/serials-search.pl">[% t('Advanced search') %]</a>
>     </form>
>     </div>
>     [% INCLUDE 'patron-search-box.inc' %]
>     [% IF ( CAN_user_catalogue ) %]
>       <div id="catalog_search" class="residentsearch">
>-        <p class="tip">Enter search keywords:</p>
>-        <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>+        <p class="tip">[% t('Enter search keywords:') %]</p>
>+        <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block">
>           [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>-          <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
>-          <input type="submit" value="Submit"  class="submit" />
>+          <input type="text" name="q" id="search-form" size="40" value="" title="[% t('Enter the terms you wish to search for.') %]" class="head-searchbox form-text" />
>+          <input type="submit" value="Submit" class="submit" />
>         </form>
>       </div>
>     [% END %]
>     <ul>
>-      <li><a href="#subscription_search">Search subscriptions</a></li>
>-      [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
>-      [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
>+      <li><a href="#subscription_search">[% t('Search subscriptions') %]</a></li>
>+      [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">[% t('Check out') %]</a></li>[% END %]
>+      [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">[% t('Search the catalog') %]</a></li>[% END %]
>     </ul>
>   </div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
>index 0c9109994d..3000efac2b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
>@@ -1,38 +1,39 @@
>+[% PROCESS 'i18n.inc' %]
> [% INCLUDE 'blocking_errors.inc' %]
> [% IF subscriptionid and ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription || CAN_user_serials_receive_serials ) %]
>     <div id="toolbar" class="btn-toolbar">
>         [% IF CAN_user_serials_create_subscription %]
>             [% IF biblionumber_for_new_subscription %]
>-                <div class="btn-group"><a id="newsubscription" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="fa fa-plus"></i> New subscription</a></div>
>+                <div class="btn-group"><a id="newsubscription" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="fa fa-plus"></i> [% t('New subscription') %]</a></div>
>             [% ELSE %]
>-                <div class="btn-group"><a id="newsubscription" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div>
>+                <div class="btn-group"><a id="newsubscription" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> [% t('New subscription') %]</a></div>
>             [% END %]
>         [% END %]
> 
>         [% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %]
>             [% UNLESS ( cannotedit ) %]
>                 <div class="btn-group">
>-                    <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
>+                    <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> [% t('Edit') %] <span class="caret"></span></button>
>                         <ul class="dropdown-menu">
>                             [% IF ( cannotedit ) %] <li class="disabled"> [% ELSE %]
>                             <li> [% END %]
>-                            <a href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&amp;subscriptionid=[% subscriptionid %]">Edit subscription</a></li>
>+                            <a href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&subscriptionid=[% subscriptionid %]">[% t('Edit subscription') %]</a></li>
>                             [% IF ( cannotedit ) %] <li class="disabled"> [% ELSE %]
>                             <li> [% END %]
>-                            <a href="/cgi-bin/koha/serials/subscription-add.pl?op=dup&amp;subscriptionid=[% subscriptionid %]">Edit as new (duplicate)</a></li>
>+                            <a href="/cgi-bin/koha/serials/subscription-add.pl?op=dup&subscriptionid=[% subscriptionid %]">[% t('Edit as new (duplicate)') %]</a></li>
> 
>                             [% IF CAN_user_editcatalogue_edit_catalogue %]
>-                                <li><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]">Edit record</a></li>
>+                                <li><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]">[% t('Edit record') %]</a></li>
>                             [% END %]
> 
>                             [% IF serialsadditems && CAN_user_editcatalogue_edit_items %]
>-                                <li><a id="edititems" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber %]">Edit items</a></li>
>+                                <li><a id="edititems" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber %]">[% t('Edit items') %]</a></li>
>                             [% END %]
> 
>                             [% IF ( CAN_user_serials_delete_subscription ) %]
>                             [% IF ( cannotedit ) %] <li class="disabled"> [% ELSE %]
>                             <li> [% END %]
>-                            <a href="#" id="deletesub">Delete subscription</a></li>[% END %]
>+                            <a href="#" id="deletesub">[% t('Delete subscription') %]</a></li>[% END %]
>                         </ul>
>                 </div>
>             [% END %]
>@@ -40,16 +41,16 @@
> 
>         [% IF not cannotedit or CAN_user_serials_receive_serials %]
>             [% IF CAN_user_serials_renew_subscription and not closed %]
>-                <div class="btn-group"><a id="renew" class="btn btn-default btn-sm" href="#"><i class="fa fa-refresh"></i> Renew</a></div>
>+                <div class="btn-group"><a id="renew" class="btn btn-default btn-sm" href="#"><i class="fa fa-refresh"></i> [% t('Renew') %]</a></div>
>             [% END %]
>             [% IF CAN_user_serials_receive_serials and not closed %]
>-                <div class="btn-group"><a id="receive" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscriptionid %]&amp;serstatus=1,3"><i class="fa fa-inbox"></i> Receive</a></div>
>+                <div class="btn-group"><a id="receive" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscriptionid %]&serstatus=1,3"><i class="fa fa-inbox"></i> [% t('Receive') %]</a></div>
>             [% END %]
>             [% UNLESS cannotedit %]
>                 [% IF closed %]
>-                    <div class="btn-group"><a id="reopen" class="btn btn-default btn-sm" href="#"><i class="fa fa-repeat"></i> Reopen</a></div>
>+                    <div class="btn-group"><a id="reopen" class="btn btn-default btn-sm" href="#"><i class="fa fa-repeat"></i> [% t('Reopen') %]</a></div>
>                 [% ELSE %]
>-                    <div class="btn-group"><a id="close" class="btn btn-default btn-sm" href="#"><i class="fa fa-times-circle"></i> Close</a></div>
>+                    <div class="btn-group"><a id="close" class="btn btn-default btn-sm" href="#"><i class="fa fa-times-circle"></i> [% t('Close') %]</a></div>
>                 [% END %]
>             [% END %]
>         [% END %]
>@@ -57,9 +58,9 @@
> [% ELSIF CAN_user_serials_create_subscription %]
>     <div id="toolbar" class="btn-toolbar">
>         [% IF ( biblionumber_for_new_subscription ) %]
>-            <div class="btn-group"><a id="newsubscription" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="fa fa-plus"></i> New subscription</a></div>
>+            <div class="btn-group"><a id="newsubscription" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="fa fa-plus"></i> [% t('New subscription') %]</a></div>
>         [% ELSE %]
>-            <div class="btn-group"><a id="newsubscription" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div>
>+            <div class="btn-group"><a id="newsubscription" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> [% t('New subscription') %]</a></div>
>         [% END %]
>     </div>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc
>index 7fdea9c933..c1ffb9f15c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc
>@@ -1,36 +1,37 @@
>+[% PROCESS 'i18n.inc' %]
> [% PROCESS 'html_helpers.inc' %]
> <div id="advsearch">
>     <form action="" method="get">
>         <fieldset class="brief">
>-        <a href="#" class="toggle_element" data-element="#advsearch_form">Advanced search</a>
>+        <a href="#" class="toggle_element" data-element="#advsearch_form">[% t('Advanced search') %]</a>
>             <div id="advsearch_form" style="display:none">
>             <ol>
>               <li>
>-                <label for="issn">ISSN:</label>
>+                <label for="issn">[% t('ISSN:') %]</label>
>                 <input type="text" id="issn" name="ISSN_filter" value="[% ISSN_filter | html %]" />
>               </li>
>               <li>
>-                <label for="title">Title:</label>
>+                <label for="title">[% t('Title:') %]</label>
>                 <input type="text" id="title" name="title_filter" value="[% title_filter | html %]" />
>               </li>
>               [% IF Koha.Preference( 'marcflavour' ) == "UNIMARC" %]
>               <li>
>-                <label for="ean">EAN:</label>
>+                <label for="ean">[% t('EAN:') %]</label>
>                 <input type="text" id="ean" name="EAN_filter" value="[% EAN_filter | html %]" />
>               </li>
>               [% END %]
>               <li>
>-                <label for="publisher">Publisher:</label>
>+                <label for="publisher">[% t('Publisher:') %]</label>
>                 <input type="text" id="publisher" name="publisher_filter" value="[% publisher_filter | html %]" />
>               </li>
>               <li>
>-                <label for="supplier">Vendor:</label>
>+                <label for="supplier">[% t('Vendor:') %]</label>
>                 <input type="text" id="supplier" name="supplier_filter" value="[% supplier_filter | html %]" />
>               </li>
>               <li>
>-                <label for="branch">Library:</label>
>+                <label for="branch">[% t('Library:') %]</label>
>                 <select id="branch" name="branch_filter">
>-                  <option value="">All</option>
>+                  <option value="">[% t('All') %]</option>
>                   [%# FIXME Should not we filter the libraries? %]
>                   [% PROCESS options_for_libraries libraries => Branches.all( selected => branch_filter, unfiltered => 1 ) %]
>                 </select>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc
>index d564f7803f..5bf265c290 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc
>@@ -1,218 +1,219 @@
>+[% PROCESS 'i18n.inc' %]
> <p>
>-    <a id="show_coded_fields" class="toggle_element" data-element="#Coded_Fields,#show_coded_fields,#hide_coded_fields" href="#"><i class="fa fa-plus-square-o"></i> Show coded information filters</a>
>-    <a id="hide_coded_fields" class="toggle_element" data-element="#Coded_Fields,#show_coded_fields,#hide_coded_fields" href="#" style="display:none;"><i class="fa fa-minus-square-o"></i> Hide coded information filters</a>
>+    <a id="show_coded_fields" class="toggle_element" data-element="#Coded_Fields,#show_coded_fields,#hide_coded_fields" href="#"><i class="fa fa-plus-square-o"></i> [% t('Show coded information filters') %]</a>
>+    <a id="hide_coded_fields" class="toggle_element" data-element="#Coded_Fields,#show_coded_fields,#hide_coded_fields" href="#" style="display:none;"><i class="fa fa-minus-square-o"></i> [% t('Hide coded information filters') %]</a>
> </p>
> <div style="display:none;" id="Coded_Fields">
> 
>         <fieldset>
>-        <legend>Coded fields</legend>
>+        <legend>[% t('Coded fields') %]</legend>
>         <p>
>-        <label for="audience">Audience: </label>
>+        <label for="audience">[% t('Audience:') %] </label>
>         <select id="audience" name="limit" class="subtype">
>-            <option value="" selected="selected" >Any</option>
>-            <option value="ta:a">juvenile, general</option>
>-            <option value="ta:b">pre-primary (0-5)</option>
>-            <option value="ta:c">primary (5-8)</option>
>-            <option value="ta:d">children (9-14)</option>
>-            <option value="ta:e">young adult</option>
>-            <option value="ta:k">adult, serious</option>
>-            <option value="ta:m">adult, General</option>
>-            <option value="ta:u">unknown</option>
>+            <option value="" selected="selected">[% t('Any') %]</option>
>+            <option value="ta:a">[% t('juvenile, general') %]</option>
>+            <option value="ta:b">[% t('pre-primary (0-5)') %]</option>
>+            <option value="ta:c">[% t('primary (5-8)') %]</option>
>+            <option value="ta:d">[% t('children (9-14)') %]</option>
>+            <option value="ta:e">[% t('young adult') %]</option>
>+            <option value="ta:k">[% t('adult, serious') %]</option>
>+            <option value="ta:m">[% t('adult, General') %]</option>
>+            <option value="ta:u">[% t('unknown') %]</option>
> 		</select>
>         </p>
> 		<p>
>-        <label for="physical_presentation">Physical presentation: </label>
>+        <label for="physical_presentation">[% t('Physical presentation:') %] </label>
>         <select id="physical_presentation" name="limit" class="subtype">
>-            <option value="" selected="selected" >Any</option>
>-            <option value="ff8-23:r">regular print</option>
>-            <option value="ff8-23:d">large print</option>
>-            <option value="ff8-23:e">newspaper format</option>
>-            <option value="ff8-23:f">Braille or Moon script</option>
>-            <option value="ff8-23:g">microprint</option>
>-            <option value="ff8-23:h">hand-written</option>
>-            <option value="ff8-23:i">multimedia</option>
>-            <option value="ff8-23:j">mini-print</option>
>-            <option value="ff8-23:s">electronic resource</option>
>-            <option value="ff8-23:t">microform</option>
>-            <option value="ff8-23:z">other form of textual material</option>
>+            <option value="" selected="selected">[% t('Any') %]</option>
>+            <option value="ff8-23:r">[% t('regular print') %]</option>
>+            <option value="ff8-23:d">[% t('large print') %]</option>
>+            <option value="ff8-23:e">[% t('newspaper format') %]</option>
>+            <option value="ff8-23:f">[% t('Braille or Moon script') %]</option>
>+            <option value="ff8-23:g">[% t('microprint') %]</option>
>+            <option value="ff8-23:h">[% t('hand-written') %]</option>
>+            <option value="ff8-23:i">[% t('multimedia') %]</option>
>+            <option value="ff8-23:j">[% t('mini-print') %]</option>
>+            <option value="ff8-23:s">[% t('electronic resource') %]</option>
>+            <option value="ff8-23:t">[% t('microform') %]</option>
>+            <option value="ff8-23:z">[% t('other form of textual material') %]</option>
> 		</select>
>         </p>
> 		<p>
>-            <label for="literary_genre">Literary genre: </label>
>+            <label for="literary_genre">[% t('Literary genre:') %] </label>
>             <select id="literary_genre" name="limit" class="subtype">
>-			<option value="" selected="selected" >Any</option>
>-            <option value="lf:a">fiction</option>
>-            <option value="lf:b">drama</option>
>-            <option value="lf:c">essays</option>
>-            <option value="lf:d">humour, satire</option>
>-            <option value="lf:e">letters</option>
>-            <option value="lf:f">short stories</option>
>-            <option value="lf:g">poetry</option>
>-            <option value="lf:h">speeches, oratory</option>
>-            <option value="lf:i">libretto</option>
>-            <option value="lf:y">not a literary text</option>
>-            <option value="lf:z">multiple/other literary forms</option>
>+			<option value="" selected="selected">[% t('Any') %]</option>
>+            <option value="lf:a">[% t('fiction') %]</option>
>+            <option value="lf:b">[% t('drama') %]</option>
>+            <option value="lf:c">[% t('essays') %]</option>
>+            <option value="lf:d">[% t('humour, satire') %]</option>
>+            <option value="lf:e">[% t('letters') %]</option>
>+            <option value="lf:f">[% t('short stories') %]</option>
>+            <option value="lf:g">[% t('poetry') %]</option>
>+            <option value="lf:h">[% t('speeches, oratory') %]</option>
>+            <option value="lf:i">[% t('libretto') %]</option>
>+            <option value="lf:y">[% t('not a literary text') %]</option>
>+            <option value="lf:z">[% t('multiple/other literary forms') %]</option>
>     </select>
>     </p>
>         <p>
>-            <label for="biography">Biography: </label>
>+            <label for="biography">[% t('Biography:') %] </label>
>             <select id="biography" name="limit" class="subtype">
>-            <option value="">Any</option>
>-                <option value="bio:y">not a biography</option>
>-                <option value="bio:a">autobiography</option>
>-                <option value="bio:b">individual biography</option>
>-                <option value="bio:c">collective biography</option>
>-                <option value="bio:d">contains biographical data</option>
>+            <option value="">[% t('Any') %]</option>
>+                <option value="bio:y">[% t('not a biography') %]</option>
>+                <option value="bio:a">[% t('autobiography') %]</option>
>+                <option value="bio:b">[% t('individual biography') %]</option>
>+                <option value="bio:c">[% t('collective biography') %]</option>
>+                <option value="bio:d">[% t('contains biographical data') %]</option>
> 		</select>
>         </p>
>         <p>
>-            <label for="illustration">Illustration: </label>
>+            <label for="illustration">[% t('Illustration:') %] </label>
>             <select id="illustration" name="limit" class="subtype">
>-            <option value="">Any</option>
>-                <option value="ff8-18-21:a">illustrations</option>
>-                <option value="ff8-18-21:b">maps</option>
>-                <option value="ff8-18-21:c">portraits</option>
>-                <option value="ff8-18-21:d">charts</option>
>-                <option value="ff8-18-21:e">plans</option>
>-                <option value="ff8-18-21:f">plates</option>
>-                <option value="ff8-18-21:g">music</option>
>-                <option value="ff8-18-21:h">facsimiles</option>
>-                <option value="ff8-18-21:i">coats of arms</option>
>-                <option value="ff8-18-21:j">genealogical tables</option>
>-                <option value="ff8-18-21:k">forms</option>
>-                <option value="ff8-18-21:l">samples</option>
>-                <option value="ff8-18-21:m">sound recordings</option>
>-                <option value="ff8-18-21:n">transparencies</option>
>-                <option value="ff8-18-21:o">illuminations</option>
>-                <option value="ff8-18-21:y">no illustrations</option>
>+            <option value="">[% t('Any') %]</option>
>+                <option value="ff8-18-21:a">[% t('illustrations') %]</option>
>+                <option value="ff8-18-21:b">[% t('maps') %]</option>
>+                <option value="ff8-18-21:c">[% t('portraits') %]</option>
>+                <option value="ff8-18-21:d">[% t('charts') %]</option>
>+                <option value="ff8-18-21:e">[% t('plans') %]</option>
>+                <option value="ff8-18-21:f">[% t('plates') %]</option>
>+                <option value="ff8-18-21:g">[% t('music') %]</option>
>+                <option value="ff8-18-21:h">[% t('facsimiles') %]</option>
>+                <option value="ff8-18-21:i">[% t('coats of arms') %]</option>
>+                <option value="ff8-18-21:j">[% t('genealogical tables') %]</option>
>+                <option value="ff8-18-21:k">[% t('forms') %]</option>
>+                <option value="ff8-18-21:l">[% t('samples') %]</option>
>+                <option value="ff8-18-21:m">[% t('sound recordings') %]</option>
>+                <option value="ff8-18-21:n">[% t('transparencies') %]</option>
>+                <option value="ff8-18-21:o">[% t('illuminations') %]</option>
>+                <option value="ff8-18-21:y">[% t('no illustrations') %]</option>
>         </select>
>         </p>
> 		<p>
>-            <label for="content">Content: </label>
>+            <label for="content">[% t('Content:') %] </label>
>             <select id="content" name="limit" class="subtype">
>-			<option value="" >Any</option>
>-            <option value="ctype:a" >bibliography</option>
>-            <option value="ctype:b" >catalogue</option>
>-            <option value="ctype:c" >index</option>
>-            <option value="ctype:d" >abstract</option>
>-            <option value="ctype:e" >dictionary</option>
>-            <option value="ctype:f" >encyclopaedia</option>
>-            <option value="ctype:g" >directory</option>
>-            <option value="ctype:h" >project description</option>
>-            <option value="ctype:i" >statistics</option>
>-            <option value="ctype:j" >programmed text books</option>
>-            <option value="ctype:k" >patent</option>
>-            <option value="ctype:l" >standard</option>
>-            <option value="ctype:m" >dissertation or thesis</option>
>-            <option value="ctype:n" >laws and legislation</option>
>-            <option value="ctype:o" >numeric table</option>
>-            <option value="ctype:p" >technical report</option>
>-            <option value="ctype:q" >examination paper</option>
>-            <option value="ctype:r" >literature surveys/reviews</option>
>-            <option value="ctype:s" >treaties</option>
>-            <option value="ctype:t" >cartoons or comic strips</option>
>-            <option value="ctype:v" >dissertation or thesis (revised)</option>
>-            <option value="ctype:w" >religious text</option>
>-            <option value="ctype:z" >other</option>
>+			<option value="">[% t('Any') %]</option>
>+            <option value="ctype:a">[% t('bibliography') %]</option>
>+            <option value="ctype:b">[% t('catalogue') %]</option>
>+            <option value="ctype:c">[% t('index') %]</option>
>+            <option value="ctype:d">[% t('abstract') %]</option>
>+            <option value="ctype:e">[% t('dictionary') %]</option>
>+            <option value="ctype:f">[% t('encyclopaedia') %]</option>
>+            <option value="ctype:g">[% t('directory') %]</option>
>+            <option value="ctype:h">[% t('project description') %]</option>
>+            <option value="ctype:i">[% t('statistics') %]</option>
>+            <option value="ctype:j">[% t('programmed text books') %]</option>
>+            <option value="ctype:k">[% t('patent') %]</option>
>+            <option value="ctype:l">[% t('standard') %]</option>
>+            <option value="ctype:m">[% t('dissertation or thesis') %]</option>
>+            <option value="ctype:n">[% t('laws and legislation') %]</option>
>+            <option value="ctype:o">[% t('numeric table') %]</option>
>+            <option value="ctype:p">[% t('technical report') %]</option>
>+            <option value="ctype:q">[% t('examination paper') %]</option>
>+            <option value="ctype:r">[% t('literature surveys/reviews') %]</option>
>+            <option value="ctype:s">[% t('treaties') %]</option>
>+            <option value="ctype:t">[% t('cartoons or comic strips') %]</option>
>+            <option value="ctype:v">[% t('dissertation or thesis (revised)') %]</option>
>+            <option value="ctype:w">[% t('religious text') %]</option>
>+            <option value="ctype:z">[% t('other') %]</option>
> 		</select>
>         </p>
>         <p>
>-            <label for="video_types">Video types: </label>
>+            <label for="video_types">[% t('Video types:') %] </label>
>             <select id="video_types" name="limit" class="subtype">
>-            <option value="">Any</option>
>-			<option value="Video-mt:a">motion picture</option>
>-			<option value="Video-mt:b">visual projection</option>
>-			<option value="Video-mt:c">video recording</option>
>+            <option value="">[% t('Any') %]</option>
>+			<option value="Video-mt:a">[% t('motion picture') %]</option>
>+			<option value="Video-mt:b">[% t('visual projection') %]</option>
>+			<option value="Video-mt:c">[% t('video recording') %]</option>
> 		</select>
>         </p>
> 		</fieldset>
> 
> 		<fieldset>
>-        <legend>Serials</legend>
>+        <legend>[% t('Serials') %]</legend>
> 		<p>
>-            <label for="serial_type">Serial type: </label>
>+            <label for="serial_type">[% t('Serial type:') %] </label>
>             <select id="serial_type" name="limit" class="subtype">
>-           <option value="">Any type</option>
>-            <option value="ff8-21:a">Periodical</option>
>-            <option value="ff8-21:b">Monographic series</option>
>-            <option value="ff8-21:c">Newspaper</option>
>-            <option value="ff8-21:e">Updating loose-leaf</option>
>-            <option value="ff8-21:f">Database</option>
>-            <option value="ff8-21:g">Updating website</option>
>-            <option value="ff8-21:z">Other</option>
>+           <option value="">[% t('Any type') %]</option>
>+            <option value="ff8-21:a">[% t('Periodical') %]</option>
>+            <option value="ff8-21:b">[% t('Monographic series') %]</option>
>+            <option value="ff8-21:c">[% t('Newspaper') %]</option>
>+            <option value="ff8-21:e">[% t('Updating loose-leaf') %]</option>
>+            <option value="ff8-21:f">[% t('Database') %]</option>
>+            <option value="ff8-21:g">[% t('Updating website') %]</option>
>+            <option value="ff8-21:z">[% t('Other') %]</option>
> 		</select>
>         </p>
>         <p>
>-            <label for="periodicity">Periodicity: </label>
>+            <label for="periodicity">[% t('Periodicity:') %] </label>
>             <select id="periodicity" name="limit" class="subtype">
>-			<option value="">Any</option>
>-            <option value="ff8-18:a">Daily</option>
>-            <option value="ff8-18:b">Semiweekly</option>
>-            <option value="ff8-18:c">Weekly</option>
>-            <option value="ff8-18:d">Biweekly</option>
>-            <option value="ff8-18:e">Semimonthly</option>
>-            <option value="ff8-18:f">Monthly</option>
>-            <option value="ff8-18:g">Bimonthly</option>
>-            <option value="ff8-18:h">Quarterly</option>
>-            <option value="ff8-18:i">Three times a year</option>
>-            <option value="ff8-18:j">Semiannual</option>
>-            <option value="ff8-18:k">Annual</option>
>-            <option value="ff8-18:l">Biennial</option>
>-            <option value="ff8-18:m">Triennial</option>
>-            <option value="ff8-18:n">Three times a week</option>
>-            <option value="ff8-18:o">Three times a month</option>
>-            <option value="ff8-18:y">Without periodicity</option>
>-            <option value="ff8-18:u">Unknown</option>
>-            <option value="ff8-18:z">Other</option>
>+			<option value="">[% t('Any') %]</option>
>+            <option value="ff8-18:a">[% t('Daily') %]</option>
>+            <option value="ff8-18:b">[% t('Semiweekly') %]</option>
>+            <option value="ff8-18:c">[% t('Weekly') %]</option>
>+            <option value="ff8-18:d">[% t('Biweekly') %]</option>
>+            <option value="ff8-18:e">[% t('Semimonthly') %]</option>
>+            <option value="ff8-18:f">[% t('Monthly') %]</option>
>+            <option value="ff8-18:g">[% t('Bimonthly') %]</option>
>+            <option value="ff8-18:h">[% t('Quarterly') %]</option>
>+            <option value="ff8-18:i">[% t('Three times a year') %]</option>
>+            <option value="ff8-18:j">[% t('Semiannual') %]</option>
>+            <option value="ff8-18:k">[% t('Annual') %]</option>
>+            <option value="ff8-18:l">[% t('Biennial') %]</option>
>+            <option value="ff8-18:m">[% t('Triennial') %]</option>
>+            <option value="ff8-18:n">[% t('Three times a week') %]</option>
>+            <option value="ff8-18:o">[% t('Three times a month') %]</option>
>+            <option value="ff8-18:y">[% t('Without periodicity') %]</option>
>+            <option value="ff8-18:u">[% t('Unknown') %]</option>
>+            <option value="ff8-18:z">[% t('Other') %]</option>
> 		</select>
>         </p>
>         <p>
>-            <label for="regularity">Regularity: </label>
>+            <label for="regularity">[% t('Regularity:') %] </label>
>             <select id="regularity" name="limit" class="subtype">
>-            <option value="">Any regularity</option>
>-            <option value="ff8-19:a">regular</option>
>-            <option value="ff8-19:b">normalised irregular</option>
>-            <option value="ff8-19:y">irregular</option>
>-            <option value="ff8-19:u">unknown</option>
>+            <option value="">[% t('Any regularity') %]</option>
>+            <option value="ff8-19:a">[% t('regular') %]</option>
>+            <option value="ff8-19:b">[% t('normalised irregular') %]</option>
>+            <option value="ff8-19:y">[% t('irregular') %]</option>
>+            <option value="ff8-19:u">[% t('unknown') %]</option>
> 		</select>
>         </p>
>         </fieldset>
> 
> 		<fieldset>
>-        <legend>Picture</legend>
>+        <legend>[% t('Picture') %]</legend>
>         <p>
> 		<select name="limit" class="subtype">
>-				<option value="">Any</option>
>-				<option value="Graphics-type:a">collage</option>
>-				<option value="Graphics-type:b">drawing</option>
>-				<option value="Graphics-type:c">painting</option>
>-				<option value="Graphics-type:d">photomechanical reproduction</option>
>-				<option value="Graphics-type:e">photonegative</option>
>-				<option value="Graphics-type:f">photoprint</option>
>-				<option value="Graphics-type:h">picture</option>
>-				<option value="Graphics-type:i">print</option>
>-				<option value="Graphics-type:k">technical drawing</option>
>-				<option value="Graphics-type:z">other non-projected graphic type</option>
>+				<option value="">[% t('Any') %]</option>
>+				<option value="Graphics-type:a">[% t('collage') %]</option>
>+				<option value="Graphics-type:b">[% t('drawing') %]</option>
>+				<option value="Graphics-type:c">[% t('painting') %]</option>
>+				<option value="Graphics-type:d">[% t('photomechanical reproduction') %]</option>
>+				<option value="Graphics-type:e">[% t('photonegative') %]</option>
>+				<option value="Graphics-type:f">[% t('photoprint') %]</option>
>+				<option value="Graphics-type:h">[% t('picture') %]</option>
>+				<option value="Graphics-type:i">[% t('print') %]</option>
>+				<option value="Graphics-type:k">[% t('technical drawing') %]</option>
>+				<option value="Graphics-type:z">[% t('other non-projected graphic type') %]</option>
> 		</select>
> 		<select name="limit" class="subtype">
>-            <option value="">Any</option>
>-            <option value="Graphics-support:a">canvas</option>
>-            <option value="Graphics-support:b">bristol board</option>
>-            <option value="Graphics-support:c">cardboard/illustration board</option>
>-            <option value="Graphics-support:d">glass</option>
>-            <option value="Graphics-support:j">plaster</option>
>-            <option value="Graphics-support:k">hardboard</option>
>-            <option value="Graphics-support:l">porcelaine</option>
>-            <option value="Graphics-support:m">stone</option>
>-            <option value="Graphics-support:n">wood</option>
>-            <option value="Graphics-support:v">mixed collection</option>
>-            <option value="Graphics-support:e">synthetics</option>
>-            <option value="Graphics-support:f">skin</option>
>-            <option value="Graphics-support:g">textile</option>
>-            <option value="Graphics-support:h">metal</option>
>-            <option value="Graphics-support:i">paper</option>
>-            <option value="Graphics-support:z">others</option>
>-            <option value="Graphics-support:u">unknown</option>
>+            <option value="">[% t('Any') %]</option>
>+            <option value="Graphics-support:a">[% t('canvas') %]</option>
>+            <option value="Graphics-support:b">[% t('bristol board') %]</option>
>+            <option value="Graphics-support:c">[% t('cardboard/illustration board') %]</option>
>+            <option value="Graphics-support:d">[% t('glass') %]</option>
>+            <option value="Graphics-support:j">[% t('plaster') %]</option>
>+            <option value="Graphics-support:k">[% t('hardboard') %]</option>
>+            <option value="Graphics-support:l">[% t('porcelaine') %]</option>
>+            <option value="Graphics-support:m">[% t('stone') %]</option>
>+            <option value="Graphics-support:n">[% t('wood') %]</option>
>+            <option value="Graphics-support:v">[% t('mixed collection') %]</option>
>+            <option value="Graphics-support:e">[% t('synthetics') %]</option>
>+            <option value="Graphics-support:f">[% t('skin') %]</option>
>+            <option value="Graphics-support:g">[% t('textile') %]</option>
>+            <option value="Graphics-support:h">[% t('metal') %]</option>
>+            <option value="Graphics-support:i">[% t('paper') %]</option>
>+            <option value="Graphics-support:z">[% t('others') %]</option>
>+            <option value="Graphics-support:u">[% t('unknown') %]</option>
>     </select>
>         </p>
> </fieldset>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
>index 42a231eefd..6d3ab0c899 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
>@@ -1,14 +1,15 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> <div class="gradient">
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1>
> <div id="header_search">
> 	<div id="suggestions_search" class="residentsearch">
>-    <p class="tip">Suggestions search:</p>
>+    <p class="tip">[% t('Suggestions search:') %]</p>
> 	<form action="/cgi-bin/koha/acqui/newordersuggestion.pl" method="get">
>     <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
>-	<label for="searchtitle">Title:</label> <input type="text" id="searchtitle" name="title" size="10" value="[% title %]" />
>-    <label for="searchauthor">Author:</label> <input type="text" id="searchauthor" name="author" size="10" value="[% author %]" />
>-    <label for="searchpublishercode">Publisher:</label> <input type="text" id="searchpublishercode" name="publishercode" size="10" value="[% publishercode %]" />
>+	<label for="searchtitle">[% t('Title:') %]</label> <input type="text" id="searchtitle" name="title" size="10" value="[% title %]" />
>+    <label for="searchauthor">[% t('Author:') %]</label> <input type="text" id="searchauthor" name="author" size="10" value="[% author %]" />
>+    <label for="searchpublishercode">[% t('Publisher:') %]</label> <input type="text" id="searchpublishercode" name="publishercode" size="10" value="[% publishercode %]" />
>     <input type="submit" class="submit" value="Search" />
>         </form>
> 	</div>
>@@ -17,18 +18,18 @@
> 
> 	[% IF ( CAN_user_catalogue ) %]
>     <div id="catalog_search" class="residentsearch">
>-	<p class="tip">Enter search keywords:</p>
>-		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>+	<p class="tip">[% t('Enter search keywords:') %]</p>
>+		<form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block">
>             [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>-            <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
>-				<input type="submit" value="Submit"  class="submit" />
>+            <input type="text" name="q" id="search-form" size="40" value="" title="[% t('Enter the terms you wish to search for.') %]" class="head-searchbox form-text" />
>+				<input type="submit" value="Submit" class="submit" />
> 		</form>
> 	</div>
> 	[% END %]
> 			<ul>
>-            <li><a href="#suggestions_search">Search suggestions</a></li>
>-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
>-            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
>+            <li><a href="#suggestions_search">[% t('Search suggestions') %]</a></li>
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">[% t('Check out') %]</a></li>[% END %]
>+            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">[% t('Search the catalog') %]</a></li>[% END %]
>             </ul>
> </div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-item-action.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-item-action.inc
>index 9b5486980d..cbd7cd31ea 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-item-action.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-item-action.inc
>@@ -1,32 +1,33 @@
>+[% PROCESS 'i18n.inc' %]
>           <select name="item_action" id="item_action">
>             [% IF ( item_action_always_add ) %]
>                 <option value="always_add" selected="selected">
>             [% ELSE %]
>                 <option value="always_add">
>             [% END %]
>-                Always add items</option>
>+                [% t('Always add items') %]</option>
>             [% IF ( item_action_add_only_for_matches ) %]
>                 <option value="add_only_for_matches" selected="selected">
>             [% ELSE %]
>                 <option value="add_only_for_matches">
>             [% END %]
>-                Add items only if matching bib was found</option>
>+                [% t('Add items only if matching bib was found') %]</option>
>             [% IF ( item_action_add_only_for_new ) %]
>                 <option value="add_only_for_new" selected="selected">
>             [% ELSE %]
>                 <option value="add_only_for_new">
>             [% END %]
>-                Add items only if no matching bib was found</option>
>+                [% t('Add items only if no matching bib was found') %]</option>
>             [% IF ( item_action_replace ) %]
>                 <option value="replace" selected="selected">
>             [% ELSE %]
>                 <option value="replace">
>             [% END %]
>-                Replace items if matching bib was found (only for existing items)</option>
>+                [% t('Replace items if matching bib was found (only for existing items)') %]</option>
>             [% IF ( item_action_ignore ) %]
>                 <option value="ignore" selected="selected">
>             [% ELSE %]
>                 <option value="ignore">
>             [% END %]
>-                Ignore items</option>
>+                [% t('Ignore items') %]</option>
>         </select>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
>index d3e03a95ad..9a9b16f16e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
>@@ -1,114 +1,115 @@
>+[% PROCESS 'i18n.inc' %]
> <div id="navmenu">
> <div id="navmenulist">
> <ul>
>-    <li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools home</a></li>
>+    <li><a href="/cgi-bin/koha/tools/tools-home.pl">[% t('Tools home') %]</a></li>
> </ul>
>-<h5>Patrons and circulation</h5>
>+<h5>[% t('Patrons and circulation') %]</h5>
> <ul>
>     [% IF ( CAN_user_tools_manage_patron_lists ) %]
>-	<li><a href="/cgi-bin/koha/patron_lists/lists.pl">Patron lists</a></li>
>+	<li><a href="/cgi-bin/koha/patron_lists/lists.pl">[% t('Patron lists') %]</a></li>
>     [% END %]
>     [% IF (CAN_user_clubs) %]
>-        <li><a href="/cgi-bin/koha/clubs/clubs.pl">Patron clubs</a></li>
>+        <li><a href="/cgi-bin/koha/clubs/clubs.pl">[% t('Patron clubs') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_moderate_comments ) %]
>-	<li><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments</a></li>
>+	<li><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">[% t('Comments') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_import_patrons ) %]
>-	<li><a href="/cgi-bin/koha/tools/import_borrowers.pl">Import patrons</a></li>
>+	<li><a href="/cgi-bin/koha/tools/import_borrowers.pl">[% t('Import patrons') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_edit_notices ) %]
>-    <li><a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; slips</a></li>
>+    <li><a href="/cgi-bin/koha/tools/letter.pl">[% t('Notices &amp; slips') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_edit_notice_status_triggers ) %]
>-	<li><a href="/cgi-bin/koha/tools/overduerules.pl">Overdue notice/status triggers</a></li>
>+	<li><a href="/cgi-bin/koha/tools/overduerules.pl">[% t('Overdue notice/status triggers') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_label_creator ) %]
>-    <li><a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator</a></li>
>+    <li><a href="/cgi-bin/koha/patroncards/home.pl">[% t('Patron card creator') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_delete_anonymize_patrons ) %]
>-    <li><a href="/cgi-bin/koha/tools/cleanborrowers.pl">Batch patron deletion/anonymization</a></li>
>+    <li><a href="/cgi-bin/koha/tools/cleanborrowers.pl">[% t('Batch patron deletion/anonymization') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_edit_patrons ) %]
>-    <li><a href="/cgi-bin/koha/tools/modborrowers.pl">Batch patron modification</a></li>
>+    <li><a href="/cgi-bin/koha/tools/modborrowers.pl">[% t('Batch patron modification') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_moderate_tags ) %]
>-    <li><a href="/cgi-bin/koha/tags/review.pl">Tag moderation</a></li>
>+    <li><a href="/cgi-bin/koha/tags/review.pl">[% t('Tag moderation') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_batch_upload_patron_images ) %]
>-	<li><a href="/cgi-bin/koha/tools/picture-upload.pl">Upload patron images</a></li>
>+	<li><a href="/cgi-bin/koha/tools/picture-upload.pl">[% t('Upload patron images') %]</a></li>
>     [% END %]
> </ul>
>-<h5>Catalog</h5>
>+<h5>[% t('Catalog') %]</h5>
> <ul>
>     [% IF ( CAN_user_tools_items_batchdel ) %]
>-	<li><a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Batch item deletion</a></li>
>+	<li><a href="/cgi-bin/koha/tools/batchMod.pl?del=1">[% t('Batch item deletion') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_items_batchmod ) %]
>-	<li><a href="/cgi-bin/koha/tools/batchMod.pl">Batch item modification</a></li>
>+	<li><a href="/cgi-bin/koha/tools/batchMod.pl">[% t('Batch item modification') %]</a></li>
>     [% END %]
>     [% IF CAN_user_tools_records_batchdel %]
>-      <li><a href="/cgi-bin/koha/tools/batch_delete_records.pl">Batch record deletion</a></li>
>+      <li><a href="/cgi-bin/koha/tools/batch_delete_records.pl">[% t('Batch record deletion') %]</a></li>
>     [% END %]
>     [% IF CAN_user_tools_records_batchmod %]
>-      <li><a href="/cgi-bin/koha/tools/batch_record_modification.pl">Batch record modification</a></li>
>+      <li><a href="/cgi-bin/koha/tools/batch_record_modification.pl">[% t('Batch record modification') %]</a></li>
>     [% END %]
>     [% IF CAN_user_tools_items_batchmod %]
>-      <li><a href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl">Automatic item modifications by age</a></li>
>+      <li><a href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl">[% t('Automatic item modifications by age') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_export_catalog ) %]
>-    <li><a href="/cgi-bin/koha/tools/export.pl">Export data</a></li>
>+    <li><a href="/cgi-bin/koha/tools/export.pl">[% t('Export data') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_inventory ) %]
>-        <li><a href="/cgi-bin/koha/tools/inventory.pl">Inventory</a></li>
>+        <li><a href="/cgi-bin/koha/tools/inventory.pl">[% t('Inventory') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_label_creator ) %]
>-	<li><a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a></li>
>-	<li><a href="/cgi-bin/koha/labels/spinelabel-home.pl">Quick spine label creator</a></li>
>+	<li><a href="/cgi-bin/koha/labels/label-home.pl">[% t('Label creator') %]</a></li>
>+	<li><a href="/cgi-bin/koha/labels/spinelabel-home.pl">[% t('Quick spine label creator') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_rotating_collections ) %]
>-    <li><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a></li>
>+    <li><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">[% t('Rotating collections') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_marc_modification_templates ) %]
>-        <li><a href="/cgi-bin/koha/tools/marc_modification_templates.pl">Manage MARC modification templates</a></li>
>+        <li><a href="/cgi-bin/koha/tools/marc_modification_templates.pl">[% t('Manage MARC modification templates') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_stage_marc_import ) %]
>-	<li><a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC for import</a></li>
>+	<li><a href="/cgi-bin/koha/tools/stage-marc-import.pl">[% t('Stage MARC for import') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_manage_staged_marc ) %]
>-	<li><a href="/cgi-bin/koha/tools/manage-marc-import.pl">Staged MARC management</a></li>
>+	<li><a href="/cgi-bin/koha/tools/manage-marc-import.pl">[% t('Staged MARC management') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_upload_local_cover_images ) %]
>-    <li><a href="/cgi-bin/koha/tools/upload-cover-image.pl">Upload local cover image</a></li>
>+    <li><a href="/cgi-bin/koha/tools/upload-cover-image.pl">[% t('Upload local cover image') %]</a></li>
>     [% END %]
> </ul>
>-<h5>Additional tools</h5>
>+<h5>[% t('Additional tools') %]</h5>
> <ul>
>     [% IF ( CAN_user_tools_edit_calendar ) %]
>-	<li><a href="/cgi-bin/koha/tools/holidays.pl">Calendar</a></li>
>+	<li><a href="/cgi-bin/koha/tools/holidays.pl">[% t('Calendar') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_manage_csv_profiles ) %]
>-	<li><a href="/cgi-bin/koha/tools/csv-profiles.pl">CSV profiles</a></li>
>+	<li><a href="/cgi-bin/koha/tools/csv-profiles.pl">[% t('CSV profiles') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_view_system_logs ) %]
>-	<li><a href="/cgi-bin/koha/tools/viewlog.pl">Log viewer</a></li>
>+	<li><a href="/cgi-bin/koha/tools/viewlog.pl">[% t('Log viewer') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_edit_news ) %]
>-	<li><a href="/cgi-bin/koha/tools/koha-news.pl">News</a></li>
>+	<li><a href="/cgi-bin/koha/tools/koha-news.pl">[% t('News') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_schedule_tasks ) %]
>-	<li><a href="/cgi-bin/koha/tools/scheduler.pl">Task scheduler</a></li>
>+	<li><a href="/cgi-bin/koha/tools/scheduler.pl">[% t('Task scheduler') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_edit_quotes ) %]
>-       <li><a href="/cgi-bin/koha/tools/quotes.pl">Quote editor</a></li>
>+       <li><a href="/cgi-bin/koha/tools/quotes.pl">[% t('Quote editor') %]</a></li>
>     [% END %]
>     [% IF ( UseKohaPlugins && CAN_user_plugins_tool ) %]
>-        <li><a href="/cgi-bin/koha/plugins/plugins-home.pl?method=tool">Tool plugins</a></li>
>+        <li><a href="/cgi-bin/koha/plugins/plugins-home.pl?method=tool">[% t('Tool plugins') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_upload_general_files ) %]
>-       <li><a href="/cgi-bin/koha/tools/upload.pl">Upload any file</a></li>
>+       <li><a href="/cgi-bin/koha/tools/upload.pl">[% t('Upload any file') %]</a></li>
>     [% END %]
>     [% IF ( CAN_user_tools_access_files ) %]
>-    <li><a href="/cgi-bin/koha/tools/access_files.pl">Access files</a></li>
>+    <li><a href="/cgi-bin/koha/tools/access_files.pl">[% t('Access files') %]</a></li>
>     [% END %]
> </ul></div></div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-nomatch-action.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-nomatch-action.inc
>index 0d01b425d5..6cf6ff1ac6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-nomatch-action.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-nomatch-action.inc
>@@ -1,14 +1,15 @@
>+[% PROCESS 'i18n.inc' %]
>           <select name="nomatch_action" id="nomatch_action">
>             [% IF ( nomatch_action_create_new ) %]
>                 <option value="create_new" selected="selected">
>             [% ELSE %]
>                 <option value="create_new">
>             [% END %]
>-                Add incoming record</option>
>+                [% t('Add incoming record') %]</option>
>             [% IF ( nomatch_action_ignore ) %]
>                 <option value="ignore" selected="selected">
>             [% ELSE %]
>                 <option value="ignore">
>             [% END %]
>-                Ignore incoming record (its items may still be processed)</option>
>+                [% t('Ignore incoming record (its items may still be processed)') %]</option>
>         </select>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-overlay-action.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-overlay-action.inc
>index 93188147d6..a6ab8bdb86 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-overlay-action.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-overlay-action.inc
>@@ -1,20 +1,21 @@
>+[% PROCESS 'i18n.inc' %]
>           <select name="overlay_action" id="overlay_action">
>             [% IF ( overlay_action_replace ) %]
>-                <option value="replace"  selected="selected">
>+                <option value="replace" selected="selected">
>             [% ELSE %]
>                 <option value="replace">
>             [% END %]
>-                Replace existing record with incoming record</option>
>+                [% t('Replace existing record with incoming record') %]</option>
>             [% IF ( overlay_action_create_new ) %]
>                 <option value="create_new" selected="selected">
>             [% ELSE %]
>                 <option value="create_new">
>             [% END %]
>-                Add incoming record</option>
>+                [% t('Add incoming record') %]</option>
>             [% IF ( overlay_action_ignore ) %]
>                 <option value="ignore" selected="selected">
>             [% ELSE %]
>                 <option value="ignore">
>             [% END %]
>-                Ignore incoming record (its items may still be processed)</option>
>+                [% t('Ignore incoming record (its items may still be processed)') %]</option>
>         </select>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc
>index 106221e203..93255ac23c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc
>@@ -1,14 +1,15 @@
>+[% PROCESS 'i18n.inc' %]
> [% IF ( booksellerid ) %]
> <div id="menu">
>     <ul>
>-        [% IF ( CAN_user_acquisition_order_manage ) %]<li><a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]">Baskets</a></li>[% END %]
>-        [% IF ( CAN_user_acquisition_group_manage ) %]<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]">Basket groups</a></li>[% END %]
>-        [% IF ( CAN_user_acquisition_contracts_manage ) %]<li><a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a></li>[% END %]
>-        <li><a href="/cgi-bin/koha/acqui/invoices.pl?supplierid=[% booksellerid %]&amp;op=do_search">Invoices</a></li>
>+        [% IF ( CAN_user_acquisition_order_manage ) %]<li><a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]">[% t('Baskets') %]</a></li>[% END %]
>+        [% IF ( CAN_user_acquisition_group_manage ) %]<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]">[% t('Basket groups') %]</a></li>[% END %]
>+        [% IF ( CAN_user_acquisition_contracts_manage ) %]<li><a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">[% t('Contracts') %]</a></li>[% END %]
>+        <li><a href="/cgi-bin/koha/acqui/invoices.pl?supplierid=[% booksellerid %]&op=do_search">[% t('Invoices') %]</a></li>
>         [% IF ( CAN_user_acquisition_order_manage ) %][% IF ( basketno ) %]
>-        <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;owner=1">Uncertain prices</a></li>
>+        <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&owner=1">[% t('Uncertain prices') %]</a></li>
>         [% ELSE %]
>-        <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&amp;owner=1">Uncertain prices</a></li>
>+        <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&owner=1">[% t('Uncertain prices') %]</a></li>
>         [% END %] [% END %]
>     </ul>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
>index dacd451f1a..fb814624f2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
>@@ -1,31 +1,32 @@
>+[% PROCESS 'i18n.inc' %]
> [% INCLUDE 'blocking_errors.inc' %]
> 
> <div id="toolbar" class="btn-toolbar">
>-    <div class="btn-group"><a id="newshelf" class="btn btn-default btn-sm" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=add_form&amp;referer=[% op %]"><i class="fa fa-plus"></i> New list</a></div>
>+    <div class="btn-group"><a id="newshelf" class="btn btn-default btn-sm" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=add_form&referer=[% op %]"><i class="fa fa-plus"></i> [% t('New list') %]</a></div>
> 
>     [% IF shelf AND op == 'view' %]
>         [% IF can_manage_shelf %]
>         <div class="btn-group">
>-            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
>+            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> [% t('Edit') %] <span class="caret"></span></button>
>             <ul class="dropdown-menu">
>-                <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=edit_form&amp;shelfnumber=[% shelf.shelfnumber %]&amp;referer=[% op %]">Edit list</a></li>
>-                <li><a id="deleteshelf" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=delete&amp;shelfnumber=[% shelf.shelfnumber %]">Delete list</a></li>
>+                <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=edit_form&shelfnumber=[% shelf.shelfnumber %]&referer=[% op %]">[% t('Edit list') %]</a></li>
>+                <li><a id="deleteshelf" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=delete&shelfnumber=[% shelf.shelfnumber %]">[% t('Delete list') %]</a></li>
>             </ul>
>         </div>
>         [% END %]
> 
>         <div class="btn-group">
>-            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> Download list <span class="caret"></span></button>
>+            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> [% t('Download list') %] <span class="caret"></span></button>
>                 <ul class="dropdown-menu">
>-                    <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=iso2709&amp;shelfid=[% shelf.shelfnumber %]">iso2709</a></li>
>-                    <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=ris&amp;shelfid=[% shelf.shelfnumber %]">RIS</a></li>
>-                    <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=bibtex&amp;shelfid=[% shelf.shelfnumber %]">BibTex</a></li>
>+                    <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=iso2709&shelfid=[% shelf.shelfnumber %]">[% t('iso2709') %]</a></li>
>+                    <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=ris&shelfid=[% shelf.shelfnumber %]">[% t('RIS') %]</a></li>
>+                    <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=bibtex&shelfid=[% shelf.shelfnumber %]">[% t('BibTex') %]</a></li>
>                     [% FOREACH csv_profile IN csv_profiles %]
>-                        <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=[% csv_profile.export_format_id %]&amp;shelfid=[% shelf.shelfnumber %]">CSV - [% csv_profile.profile %]</a></li>
>+                        <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=[% csv_profile.export_format_id %]&shelfid=[% shelf.shelfnumber %]">[% t('CSV -') %] [% csv_profile.profile %]</a></li>
>                     [% END %]
>                 </ul>
>         </div>
>-        <div class="btn-group"><a class="btn btn-default btn-sm" href="#" id="sendlist"><i class="fa fa-envelope"></i> Send list</a></div>
>-        <div class="btn-group"><a class="btn btn-default btn-sm" id="printlist" target="_blank" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber %]&amp;print=1"><i class="fa fa-print"></i> Print list</a></div>
>+        <div class="btn-group"><a class="btn btn-default btn-sm" href="#" id="sendlist"><i class="fa fa-envelope"></i> [% t('Send list') %]</a></div>
>+        <div class="btn-group"><a class="btn btn-default btn-sm" id="printlist" target="_blank" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber %]&print=1"><i class="fa fa-print"></i> [% t('Print list') %]</a></div>
>     [% END %]
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves/merge/selection.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves/merge/selection.tt
>index 886db7e695..02d4cd7479 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves/merge/selection.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves/merge/selection.tt
>@@ -1,4 +1,5 @@
>-<form><table><caption>Merge</caption>
>+[% PROCESS 'i18n.inc' %]
>+<form><table><caption>[% t('Merge') %]</caption>
> [% FOREACH field IN fields %]
> <tr>
> <td>[% field.from %]</td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
>index 6723a23f60..a3712593d0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
>@@ -1,9 +1,10 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> <div class="gradient">
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1>
> <div id="header_search">
>     <div id="z3950_search" class="residentsearch">
>-    <p class="tip">Z39.50/SRU server search:</p>
>+    <p class="tip">[% t('Z39.50/SRU server search:') %]</p>
> 	<form action="/cgi-bin/koha/admin/z3950servers.pl" method="post">
>                 <input class="head-searchbox" type="text" name="searchfield" size="40" value="[% searchfield %]" />
>                 <input type="submit" class="submit" name="search" value="Search" />
>@@ -14,18 +15,18 @@
> 
> 	[% IF ( CAN_user_catalogue ) %]
>     <div id="catalog_search" class="residentsearch">
>-	<p class="tip">Enter search keywords:</p>
>-		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>+	<p class="tip">[% t('Enter search keywords:') %]</p>
>+		<form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block">
>             [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>-            <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
>-				<input type="submit" value="Submit"  class="submit" />
>+            <input type="text" name="q" id="search-form" size="40" value="" title="[% t('Enter the terms you wish to search for.') %]" class="head-searchbox form-text" />
>+				<input type="submit" value="Submit" class="submit" />
> 		</form>
> 	</div>
> 	[% END %]
> 			<ul>
>-            <li><a class="keep_text" href="#z3950_search">Search Z39.50/SRU servers</a></li>
>-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
>-            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
>+            <li><a class="keep_text" href="#z3950_search">[% t('Search Z39.50/SRU servers') %]</a></li>
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">[% t('Check out') %]</a></li>[% END %]
>+            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">[% t('Search the catalog') %]</a></li>[% END %]
> 			</ul>	
> </div>
> </div>
>-- 
>2.17.1

Actions: View | Diff | Splinter Review

Attachments on bug 20988: 76333 | 76334 | 76335 | 76336 | 76337 | 76338 | 76339 | 76340 | 76341 | 76342 | 76343 | 76344 | 76345 | 76346 | 76347 | 76348 | 76349 | 76350 | 76351 | 76352 | 76353 | 76354 | 76355 | 76356 | 76357 | 76358 | 76359 | 76360 | 76361 | 76362 | 76363 | 76364 | 76365 | 76934 | 76935