Attachment 76340 Details for Bug 20988 – Bug 20988: koha-tmpl/intranet-tmpl/prog/en/modules/admin

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

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

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

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

Size: 710.14 KB

patch

obsolete

>From aa35ccf9e4ad87e9d3222bb4c4cbdc28acd0b08d Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Mon, 25 Jun 2018 08:46:00 +0200
>Subject: [PATCH] Bug 20988: koha-tmpl/intranet-tmpl/prog/en/modules/admin
>
>---
> .../prog/en/modules/admin/admin-home.tt       | 157 +++---
> .../prog/en/modules/admin/aqbudgetperiods.tt  | 235 +++++----
> .../prog/en/modules/admin/aqbudgets.tt        | 156 +++---
> .../prog/en/modules/admin/aqcontract.tt       | 109 ++---
> .../prog/en/modules/admin/aqplan.tt           |  89 ++--
> .../prog/en/modules/admin/audio_alerts.tt     |  95 ++--
> .../modules/admin/auth_subfields_structure.tt | 147 +++---
> .../en/modules/admin/auth_tag_structure.tt    | 113 ++---
> .../en/modules/admin/authorised_values.tt     | 141 +++---
> .../prog/en/modules/admin/authtypes.tt        |  87 ++--
> .../prog/en/modules/admin/biblio_framework.tt | 135 +++---
> .../modules/admin/branch_transfer_limits.tt   |  23 +-
> .../prog/en/modules/admin/branches.tt         | 137 +++---
> .../prog/en/modules/admin/categories.tt       | 325 ++++++-------
> .../prog/en/modules/admin/checkmarc.tt        | 179 +++----
> .../prog/en/modules/admin/cities.tt           |  87 ++--
> .../prog/en/modules/admin/classsources.tt     | 151 +++---
> .../prog/en/modules/admin/clone-rules.tt      |  31 +-
> .../prog/en/modules/admin/columns_settings.tt |  57 +--
> .../prog/en/modules/admin/currency.tt         | 113 ++---
> .../prog/en/modules/admin/didyoumean.tt       |  43 +-
> .../prog/en/modules/admin/edi_accounts.tt     | 144 +++---
> .../prog/en/modules/admin/edi_ean_accounts.tt |  63 +--
> .../prog/en/modules/admin/fieldmapping.tt     |  33 +-
> .../modules/admin/item_circulation_alerts.tt  |  45 +-
> .../en/modules/admin/items_search_field.tt    |  15 +-
> .../en/modules/admin/items_search_fields.tt   |  53 +-
> .../prog/en/modules/admin/itemtypes.tt        | 177 +++----
> .../prog/en/modules/admin/koha2marclinks.tt   |  29 +-
> .../prog/en/modules/admin/library_groups.tt   | 105 ++--
> .../prog/en/modules/admin/localization.tt     |  19 +-
> .../modules/admin/marc_subfields_structure.tt | 155 +++---
> .../prog/en/modules/admin/marctagstructure.tt | 131 ++---
> .../prog/en/modules/admin/matching-rules.tt   | 319 ++++++------
> .../prog/en/modules/admin/oai_set_mappings.tt |  51 +-
> .../prog/en/modules/admin/oai_sets.tt         |  49 +-
> .../en/modules/admin/patron-attr-types.tt     | 137 +++---
> .../prog/en/modules/admin/preferences.tt      |  39 +-
> .../prog/en/modules/admin/printers.tt         |  79 +--
> .../searchengine/elasticsearch/mappings.tt    | 121 ++---
> .../prog/en/modules/admin/smart-rules.tt      | 457 +++++++++---------
> .../prog/en/modules/admin/sms_providers.tt    |  37 +-
> .../prog/en/modules/admin/sru_modmapping.tt   |  27 +-
> .../en/modules/admin/systempreferences.tt     | 121 ++---
> .../en/modules/admin/transport-cost-matrix.tt |  27 +-
> .../prog/en/modules/admin/usage_statistics.tt | 123 ++---
> .../prog/en/modules/admin/z3950servers.tt     | 141 +++---
> 47 files changed, 2651 insertions(+), 2656 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>index c0c1917691..0161d97515 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>@@ -1,135 +1,136 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration</title>
>+<title>[% t('Koha âº Administration') %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="admin_admin-home" class="admin">
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Administration</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> [% t('âº Administration') %]</div>
> 
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
> 
>-        <h1>Koha administration</h1>
>+        <h1>[% t('Koha administration') %]</h1>
>         <div class="row">
>             <div class="col-md-6 sysprefs">
> 
>                 <form action="/cgi-bin/koha/admin/preferences.pl" method="post">
>                 <fieldset>
>-                    <h4><a href="/cgi-bin/koha/admin/preferences.pl">Global system preferences</a></h4>
>-                    <p>Manage global system preferences like MARC flavor, date format, administrator email, and templates.</p>
>+                    <h4><a href="/cgi-bin/koha/admin/preferences.pl">[% t('Global system preferences') %]</a></h4>
>+                    <p>[% t('Manage global system preferences like MARC flavor, date format, administrator email, and templates.') %]</p>
>                     <input type="hidden" name="op" value="search" />
>                     <input type="text" name="searchfield" value="[% searchfield %]" />
>                     <input type="submit" name="ok" class="submit" value="Search" />
>                 </fieldset>
>                 </form>
> 
>-                <div class="hint"><h4>Hint:</h4><p>Configure these parameters in the order they appear.</p></div>
>-                <h3>Basic parameters</h3>
>+                <div class="hint"><h4>[% t('Hint:') %]</h4><p>[% t('Configure these parameters in the order they appear.') %]</p></div>
>+                <h3>[% t('Basic parameters') %]</h3>
>                 <dl>
>-                    <dt><a href="/cgi-bin/koha/admin/branches.pl">Libraries</a></dt>
>-                    <dd>Define libraries.</dd>
>-                    <dt><a href="/cgi-bin/koha/admin/library_groups.pl">Library groups</a></dt>
>-                    <dd>Define hierarchical library groups.</dd>
>-                    <dt><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></dt>
>-                    <dd>Define item types used for circulation rules.</dd>
>-                    <dt><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a></dt>
>-                    <dd>Define categories and authorized values for them.</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/branches.pl">[% t('Libraries') %]</a></dt>
>+                    <dd>[% t('Define libraries.') %]</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/library_groups.pl">[% t('Library groups') %]</a></dt>
>+                    <dd>[% t('Define hierarchical library groups.') %]</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/itemtypes.pl">[% t('Item types') %]</a></dt>
>+                    <dd>[% t('Define item types used for circulation rules.') %]</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/authorised_values.pl">[% t('Authorized values') %]</a></dt>
>+                    <dd>[% t('Define categories and authorized values for them.') %]</dd>
>                 </dl>
> 
>-                <h3>Patrons and circulation</h3>
>+                <h3>[% t('Patrons and circulation') %]</h3>
>                 <dl>
>-                    <dt><a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a></dt>
>-                    <dd>Define patron categories.</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/categories.pl">[% t('Patron categories') %]</a></dt>
>+                    <dd>[% t('Define patron categories.') %]</dd>
>                 [% IF CAN_user_parameters_manage_circ_rules %]
>-                    <dt><a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fines rules</a></dt>
>-                    <dd>Define circulation and fines rules for combinations of libraries, patron categories, and item types</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/smart-rules.pl">[% t('Circulation and fines rules') %]</a></dt>
>+                    <dd>[% t('Define circulation and fines rules for combinations of libraries, patron categories, and item types') %]</dd>
>                 [% END %]
>-                    <dt><a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron attribute types</a></dt>
>-                    <dd>Define extended attributes (identifiers and statistical categories) for patron records</dd>
>-                    <dt><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Library transfer limits</a></dt>
>-                    <dd>Limit the ability to transfer items between libraries based on the library sending, the library receiving, and the item type involved. These rules only go into effect if the preference UseBranchTransferLimits is set to ON.</dd>
>-                    <dt><a href="/cgi-bin/koha/admin/transport-cost-matrix.pl">Transport cost matrix</a></dt>
>-                    <dd>Define transport costs between branches</dd>
>-                    <dt><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item circulation alerts</a></dt>
>-                    <dd>Define rules for check-in and checkout notifications for combinations of libraries, patron categories, and item types</dd>
>-                    <dt><a href="/cgi-bin/koha/admin/cities.pl">Cities and towns</a></dt>
>-                    <dd>Define cities and towns that your patrons live in.</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/patron-attr-types.pl">[% t('Patron attribute types') %]</a></dt>
>+                    <dd>[% t('Define extended attributes (identifiers and statistical categories) for patron records') %]</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">[% t('Library transfer limits') %]</a></dt>
>+                    <dd>[% t('Limit the ability to transfer items between libraries based on the library sending, the library receiving, and the item type involved. These rules only go into effect if the preference UseBranchTransferLimits is set to ON.') %]</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/transport-cost-matrix.pl">[% t('Transport cost matrix') %]</a></dt>
>+                    <dd>[% t('Define transport costs between branches') %]</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">[% t('Item circulation alerts') %]</a></dt>
>+                    <dd>[% t('Define rules for check-in and checkout notifications for combinations of libraries, patron categories, and item types') %]</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/cities.pl">[% t('Cities and towns') %]</a></dt>
>+                    <dd>[% t('Define cities and towns that your patrons live in.') %]</dd>
>                 </dl>
>                 [% IF CAN_user_plugins && plugins_enabled %]
>-                    <h3>Plugins</h3>
>+                    <h3>[% t('Plugins') %]</h3>
>                     <dl>
>-                        <dt><a href="/cgi-bin/koha/plugins/plugins-home.pl">Manage plugins</a></dt>
>-                        <dd>View, manage, configure and run plugins.</dd>
>+                        <dt><a href="/cgi-bin/koha/plugins/plugins-home.pl">[% t('Manage plugins') %]</a></dt>
>+                        <dd>[% t('View, manage, configure and run plugins.') %]</dd>
>                     </dl>
>                 [% END %]
>                 </div>
>                 <div class="col-md-6 sysprefs">
>-                <h3>Catalog</h3>
>+                <h3>[% t('Catalog') %]</h3>
>                 <dl>
>-                    <dt><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC bibliographic framework</a></dt>
>-                    <dd>Create and manage Bibliographic frameworks that define the characteristics of your MARC Records (field and subfield definitions) as well as templates for the MARC editor.</dd>
>-                    <dt><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha to MARC mapping</a></dt>
>-                    <dd>Define the mapping between the Koha transactional database (SQL) and the MARC Bibliographic records.</dd>
>-                    <dt><a href="/cgi-bin/koha/admin/fieldmapping.pl">Keywords to MARC mapping</a></dt>
>-                    <dd>Define the mapping between keywords and MARC fields. The keywords are used to find some data independently of the framework.</dd>
>-                    <dt><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Bibliographic framework test</a></dt>
>-                    <dd>Checks the MARC structure. If you change your MARC Bibliographic framework it's recommended that you run this tool to test for errors in your definition.</dd>
>-                    <dt><a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a></dt>
>-                    <dd>Create and manage Authorities frameworks that define the characteristics of your MARC Records (field and subfield definitions).</dd>
>-                    <dt><a href="/cgi-bin/koha/admin/classsources.pl">Classification sources</a></dt>
>-                    <dd>Define classification sources (i.e., call number schemes) used by your collection.  Also define filing rules used for sorting call numbers.</dd>
>-                    <dt><a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a></dt>
>-                    <dd>Manage rules for automatically matching MARC records during record imports.</dd>
>-                    <dt><a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a></dt>
>-                    <dd>Manage OAI Sets</dd>
>-                    <dt><a href="/cgi-bin/koha/admin/items_search_fields.pl">Item search fields</a></dt>
>-                    <dd>Manage custom fields for item search.</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/biblio_framework.pl">[% t('MARC bibliographic framework') %]</a></dt>
>+                    <dd>[% t('Create and manage Bibliographic frameworks that define the characteristics of your MARC Records (field and subfield definitions) as well as templates for the MARC editor.') %]</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/koha2marclinks.pl">[% t('Koha to MARC mapping') %]</a></dt>
>+                    <dd>[% t('Define the mapping between the Koha transactional database (SQL) and the MARC Bibliographic records.') %]</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/fieldmapping.pl">[% t('Keywords to MARC mapping') %]</a></dt>
>+                    <dd>[% t('Define the mapping between keywords and MARC fields. The keywords are used to find some data independently of the framework.') %]</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/checkmarc.pl">[% t('MARC Bibliographic framework test') %]</a></dt>
>+                    <dd>[% t('Checks the MARC structure. If you change your MARC Bibliographic framework it\'s recommended that you run this tool to test for errors in your definition.') %]</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/authtypes.pl">[% t('Authority types') %]</a></dt>
>+                    <dd>[% t('Create and manage Authorities frameworks that define the characteristics of your MARC Records (field and subfield definitions).') %]</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/classsources.pl">[% t('Classification sources') %]</a></dt>
>+                    <dd>[% t('Define classification sources (i.e., call number schemes) used by your collection.') %]  [% t('Also define filing rules used for sorting call numbers.') %]</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/matching-rules.pl">[% t('Record matching rules') %]</a></dt>
>+                    <dd>[% t('Manage rules for automatically matching MARC records during record imports.') %]</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/oai_sets.pl">[% t('OAI sets configuration') %]</a></dt>
>+                    <dd>[% t('Manage OAI Sets') %]</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/items_search_fields.pl">[% t('Item search fields') %]</a></dt>
>+                    <dd>[% t('Manage custom fields for item search.') %]</dd>
>                     [% IF Koha.Preference('SearchEngine') == 'Elasticsearch' %]
>-                        <dt><a href="/cgi-bin/koha/admin/searchengine/elasticsearch/mappings.pl">Search engine configuration</a></dt>
>-                        <dd>Manage indexes, facets, and their mappings to MARC fields and subfields.</dd>
>+                        <dt><a href="/cgi-bin/koha/admin/searchengine/elasticsearch/mappings.pl">[% t('Search engine configuration') %]</a></dt>
>+                        <dd>[% t('Manage indexes, facets, and their mappings to MARC fields and subfields.') %]</dd>
>                     [% END %]
>                 </dl>
> 
>-                <h3>Acquisition parameters</h3>
>+                <h3>[% t('Acquisition parameters') %]</h3>
>                 <dl>
>-                        <dt><a href="/cgi-bin/koha/admin/currency.pl">Currencies and exchange rates</a></dt>
>-                        <dd>Define currencies and exchange rates used for acquisitions.</dd>
>+                        <dt><a href="/cgi-bin/koha/admin/currency.pl">[% t('Currencies and exchange rates') %]</a></dt>
>+                        <dd>[% t('Define currencies and exchange rates used for acquisitions.') %]</dd>
> 
>-                        <dt><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></dt>
>-                        <dd>Define your budgets</dd>
>+                        <dt><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">[% t('Budgets') %]</a></dt>
>+                        <dd>[% t('Define your budgets') %]</dd>
> 
>-                        <dt><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></dt>
>-                        <dd>Define funds within your budgets</dd>
>+                        <dt><a href="/cgi-bin/koha/admin/aqbudgets.pl">[% t('Funds') %]</a></dt>
>+                        <dd>[% t('Define funds within your budgets') %]</dd>
> 
>-                        <dt><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></dt>
>-                        <dd>Manage vendor EDI accounts for import/export</dd>
>-                        <dt><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></dt>
>-                        <dd>Manage library EDI EANs</dd>
>+                        <dt><a href="/cgi-bin/koha/admin/edi_accounts.pl">[% t('EDI accounts') %]</a></dt>
>+                        <dd>[% t('Manage vendor EDI accounts for import/export') %]</dd>
>+                        <dt><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">[% t('Library EANs') %]</a></dt>
>+                        <dd>[% t('Manage library EDI EANs') %]</dd>
>                 </dl>
> 
>-                <h3>Additional parameters</h3>
>+                <h3>[% t('Additional parameters') %]</h3>
>                 <dl>
>                     
>-                    <dt><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50/SRU servers</a></dt>
>-                    <dd>Define which external servers to query for MARC data.</dd>
>-                    <dt><a href="/cgi-bin/koha/admin/didyoumean.pl">Did you mean?</a></dt>
>-                    <dd>Choose which plugins to use to suggest searches to patrons and staff.</dd>
>-                    <dt><a href="/cgi-bin/koha/admin/columns_settings.pl">Configure columns</a></dt>
>-                    <dd>Hide or show columns for tables.</dd>
>-                    <dt><a href="/cgi-bin/koha/admin/audio_alerts.pl">Audio alerts</a></dt>
>-                    <dd>Define which events trigger which sounds</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/z3950servers.pl">[% t('Z39.50/SRU servers') %]</a></dt>
>+                    <dd>[% t('Define which external servers to query for MARC data.') %]</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/didyoumean.pl">[% t('Did you mean?') %]</a></dt>
>+                    <dd>[% t('Choose which plugins to use to suggest searches to patrons and staff.') %]</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/columns_settings.pl">[% t('Configure columns') %]</a></dt>
>+                    <dd>[% t('Hide or show columns for tables.') %]</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/audio_alerts.pl">[% t('Audio alerts') %]</a></dt>
>+                    <dd>[% t('Define which events trigger which sounds') %]</dd>
>                     [% IF Koha.Preference('SMSSendDriver') == 'Email' %]
>-                        <dt><a href="/cgi-bin/koha/admin/sms_providers.pl">SMS cellular providers</a></dt>
>-                        <dd>Define a list of cellular providers for sending SMS messages via email.</dd>
>+                        <dt><a href="/cgi-bin/koha/admin/sms_providers.pl">[% t('SMS cellular providers') %]</a></dt>
>+                        <dd>[% t('Define a list of cellular providers for sending SMS messages via email.') %]</dd>
>                     [% END %]
>-                    <dt><a href="/cgi-bin/koha/admin/usage_statistics.pl">Share your usage statistics</a></dt>
>-                    <dd>Share with the Koha community the usage statistics of your Koha installation.</dd>
>+                    <dt><a href="/cgi-bin/koha/admin/usage_statistics.pl">[% t('Share your usage statistics') %]</a></dt>
>+                    <dd>[% t('Share with the Koha community the usage statistics of your Koha installation.') %]</dd>
>                 </dl>
>             </div>
>         </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>index ea68e0db1d..bc0db204c3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% USE KohaDates %]
> [% USE Price %]
>@@ -5,29 +6,29 @@
> [%- BLOCK action_menu %]
>     <div class="dropdown">
>         <a class="btn btn-default btn-xs dropdown-toggle" id="budgetmenu_[% block_budget.budget_period_id %]" role="button" data-toggle="dropdown" href="#">
>-           Actions <b class="caret"></b>
>+           [% t('Actions') %] <b class="caret"></b>
>         </a>
>         <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="budgetmenu_[% block_budget.budget_period_id %]">
>               <li>
>-                  <a href="[% script_name %]?op=add_form&amp;budget_period_id=[% block_budget.budget_period_id |html %]"><i class="fa fa-pencil"></i> Edit</a>
>+                  <a href="[% script_name %]?op=add_form&budget_period_id=[% block_budget.budget_period_id |html %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a>
>               </li>
>               [% IF block_budget.count %]
>                   <li class="disabled">
>-                      <a data-toggle="tooltip" data-placement="left" title="[% block_budget.count %] fund(s) are attached to this budget. You must delete all attached funds before deleting this budget." href="#"><i class="fa fa-trash"></i> Delete</a>
>+                      <a data-toggle="tooltip" data-placement="left" title="[% block_budget.count %] [% t('fund(s) are attached to this budget. You must delete all attached funds before deleting this budget.') %]" href="#"><i class="fa fa-trash"></i> [% t('Delete') %]</a>
>                   </li>
>               [% ELSE %]
>                   <li>
>-                      <a href="[% script_name %]?op=delete_confirm&amp;budget_period_id=[% block_budget.budget_period_id %]"><i class="fa fa-trash"></i> Delete</a>
>+                      <a href="[% script_name %]?op=delete_confirm&budget_period_id=[% block_budget.budget_period_id %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a>
>                   </li>
>               [% END %]
>               <li>
>-                  <a href="[% script_name %]?op=duplicate_form&amp;budget_period_id=[% block_budget.budget_period_id %]"><i class="fa fa-copy"></i> Duplicate</a>
>+                  <a href="[% script_name %]?op=duplicate_form&budget_period_id=[% block_budget.budget_period_id %]"><i class="fa fa-copy"></i> [% t('Duplicate') %]</a>
>               </li>
>               <li>
>-                  <a href="[% script_name %]?op=close_form&amp;budget_period_id=[% block_budget.budget_period_id %]"><i class="fa fa-times-circle"></i> Close</a>
>+                  <a href="[% script_name %]?op=close_form&budget_period_id=[% block_budget.budget_period_id %]"><i class="fa fa-times-circle"></i> [% t('Close') %]</a>
>               </li>
>               <li>
>-                  <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_period_id=[% block_budget.budget_period_id %]"><i class="fa fa-plus"></i> Add fund</a>
>+                  <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_period_id=[% block_budget.budget_period_id %]"><i class="fa fa-plus"></i> [% t('Add fund') %]</a>
>               </li>
>         </ul>
>     </div>
>@@ -41,27 +42,27 @@
> [% END %]
> 
> <title>
>-    Koha &rsaquo; Administration &rsaquo; Budgets
>+    [% t('Koha âº Administration âº Budgets') %]
> 
>-    [% IF ( add_form ) %]&rsaquo;
>+    [% IF ( add_form ) %]âº
>         [% IF ( budget_period_id ) %]
>-            Modify budget [% budget_period_description %]
>+            [% t('Modify budget') %] [% budget_period_description %]
>         [% ELSE %]
>-            Add budget
>+            [% t('Add budget') %]
>         [% END %]
>     [% END %]
>-    [% IF ( duplicate_form ) %]&rsaquo; Duplicate budget[% END %]
>-    [% IF ( delete_confirm ) %]&rsaquo;
>-            Delete budget '[% budget_period_description %]'?
>+    [% IF ( duplicate_form ) %][% t('âº Duplicate budget') %][% END %]
>+    [% IF ( delete_confirm ) %]âº
>+            [% t('Delete budget \'') %][% budget_period_description %]'?
>     [% END %]
>-    [% IF ( delete_confirmed ) %]&rsaquo;
>-        Data deleted
>+    [% IF ( delete_confirmed ) %]âº
>+        [% t('Data deleted') %]
>     [% END %]
>-    [% IF close_form %]&rsaquo;
>-      Close budget [% budget_period_description %]
>+    [% IF close_form %]âº
>+      [% t('Close budget') %] [% budget_period_description %]
>     [% END %]
>-    [% IF closed %]&rsaquo;
>-      Budget [% budget_period_description %] closed
>+    [% IF closed %]âº
>+      [% t('Budget') %] [% budget_period_description %] [% t('closed') %]
>     [% END %]
> </title>
> 
>@@ -78,38 +79,38 @@
> 
> 
> <div id="breadcrumbs">
>-    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
>-    <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;
>+    <a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº
>+    <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> âº
> 
>     [% IF ( add_form ) %]
>-        <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> &rsaquo;
>+        <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">[% t('Budgets') %]</a> âº
>         [% IF ( budget_period_id ) %]
>-            <span>Modify budget '[% budget_period_description %]'</span>
>+            <span>[% t('Modify budget \'') %][% budget_period_description %]'</span>
>         [% ELSE %]
>-            <span>Add budget</span>
>+            <span>[% t('Add budget') %]</span>
>         [% END %]
>     [% END %]
>     [% IF ( delete_confirm ) %]
>-        <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> &rsaquo;
>+        <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">[% t('Budgets') %]</a> âº
>         [% IF ( total || funds_exist ) %]
>-            <span>Cannot delete budget '[% budget_period_description %]'</span>
>+            <span>[% t('Cannot delete budget \'') %][% budget_period_description %]'</span>
>         [% ELSE %]
>-            <span>Delete budget '[% budget_period_description %]'?</span>
>+            <span>[% t('Delete budget \'') %][% budget_period_description %]'?</span>
>         [% END %]
>     [% END %]
>     [% IF ( duplicate_form ) %]
>-        <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> &rsaquo; Duplicate budget
>+        <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">[% t('Budgets') %]</a> [% t('âº Duplicate budget') %]
>     [% END %]
>     [% IF close_form %]
>-        <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> &rsaquo;
>-        <span>Close budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]">[% budget_period_description %]</a></span>
>+        <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">[% t('Budgets') %]</a> âº
>+        <span>[% t('Close budget') %] <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]">[% budget_period_description %]</a></span>
>     [% END %]
>     [% IF closed %]
>-        <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> &rsaquo;
>-        <span>Budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]">[% budget_period_description %]</a> closed</span>
>+        <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">[% t('Budgets') %]</a> âº
>+        <span>[% t('Budget') %] <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]">[% budget_period_description %]</a> [% t('closed') %]</span>
>     [% END %]
>     [% IF ( else ) %]
>-        <span>Budgets administration</span>
>+        <span>[% t('Budgets administration') %]</span>
>     [% END %]
> </div>
> 
>@@ -123,7 +124,7 @@
> [% END %]
> 
> [% IF ( duplicate_form ) %]
>-<h3>Duplicate budget</h3>
>+<h3>[% t('Duplicate budget') %]</h3>
> <form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post">
>     <fieldset class="rows">
>     <input type="hidden" name="op" value="duplicate_budget" />
>@@ -132,41 +133,41 @@
>     <ol>
> 
>     <li>
>-    <label class="required" for="from">Start date: </label>
>+    <label class="required" for="from">[% t('Start date:') %] </label>
>     <input type="text" size="10" id="from" name="budget_period_startdate" value="[% budget_period_startdate | $KohaDates %]" class="datepickerfrom" />
> 				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>     </li>
>     <li>
> 
>-    <label class="required" for="to">End date: </label>
>+    <label class="required" for="to">[% t('End date:') %] </label>
>     <input type="text" size="10" id="to" name="budget_period_enddate" value="[% budget_period_enddate | $KohaDates %]" class="datepickerto" />
> 				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>     </li>
> 
>     <li>
>-    <label class="required" for="budget_period_description">Description</label>
>+    <label class="required" for="budget_period_description">[% t('Description') %]</label>
>     <input type="text" id="budget_period_description" name="budget_period_description" value="[% budgetperiod.budget_period_description %]" />
>     </li>
> 
>     <li>
>-      <label for="amount_change_percentage">Change amounts by</label>
>+      <label for="amount_change_percentage">[% t('Change amounts by') %]</label>
>       <input type="text" id="amount_change_percentage" name="amount_change_percentage" /> %
>-      <div class="hint">(can be positive or negative)</div>
>+      <div class="hint">[% t('(can be positive or negative)') %]</div>
>     </li>
> 
>     <li>
>-      <label for="amount_change_round_increment">If amounts changed, round to a multiple of</label>
>+      <label for="amount_change_round_increment">[% t('If amounts changed, round to a multiple of') %]</label>
>       <input type="text" id="amount_change_round_increment" name="amount_change_round_increment" />
>-      <div class="hint">(amounts will be rounded down)</div>
>+      <div class="hint">[% t('(amounts will be rounded down)') %]</div>
>     </li>
> 
>     <li>
>-      <label for="mark_as_inactive">Mark the original budget as inactive</label>
>+      <label for="mark_as_inactive">[% t('Mark the original budget as inactive') %]</label>
>       <input type="checkbox" id="mark_as_inactive" name="mark_original_budget_as_inactive" />
>     </li>
> 
>     <li>
>-      <label for="reset_all_budgets">Set all funds to zero</label>
>+      <label for="reset_all_budgets">[% t('Set all funds to zero') %]</label>
>       <input type="checkbox" id="reset_all_budgets" name="reset_all_budgets" />
>     </li>
> 
>@@ -174,7 +175,7 @@
>     </fieldset>
> 
>     <fieldset class="action">
>-        <input type="button" value="Save Changes"  onclick="CheckDuplicateForm(this.form)" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]">Cancel</a>
>+        <input type="button" value="Save Changes" onclick="CheckDuplicateForm(this.form)" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]">[% t('Cancel') %]</a>
>     </fieldset>
> 
> </form>
>@@ -185,9 +186,9 @@
>     
> 
>     [% IF ( budget_period_id ) %]
>-        <h3>Modify budget <i>[% budget_period_description %]</i></h3>
>+        <h3>[% t('Modify budget') %] <i>[% budget_period_description %]</i></h3>
>     [% ELSE %]
>-        <h3>Add budget</h3>
>+        <h3>[% t('Add budget') %]</h3>
> 	[% END %]
> <form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post">
>     <fieldset class="rows">
>@@ -198,13 +199,13 @@
>     <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
>     <ol>
>     <li>
>-    <label class="required" for="from">Start date: </label>
>+    <label class="required" for="from">[% t('Start date:') %] </label>
>     <input type="text" size="10" id="from" name="budget_period_startdate" value="[% budget_period_startdate | $KohaDates %]" class="datepickerfrom" />
> 				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>     </li>
>     <li>
> 
>-    <label class="required" for="to">End date: </label>
>+    <label class="required" for="to">[% t('End date:') %] </label>
>     <input type="text" size="10" id="to" name="budget_period_enddate" value="[% budget_period_enddate | $KohaDates %]" class="datepickerto" />
> 				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>     </li>
>@@ -212,31 +213,29 @@
>     <li>
>         
>         
>-        <label class="required" for="budget_period_description">Description: </label>
>-        <input type="text" id="budget_period_description" name="budget_period_description"
>-        size="48" maxlength="80" value="[% budget_period_description %]" />
>+        <label class="required" for="budget_period_description">[% t('Description:') %] </label>
>+        <input type="text" id="budget_period_description" name="budget_period_description" size="48" maxlength="80" value="[% budget_period_description %]" />
>     </li>
> 
>     <li>
>         
>         
>-        <label for="budget_period_total">Total amount: </label>
>-        <input type="text" id="budget_period_total" name="budget_period_total"
>-        size="10" maxlength="80" value="[% budget_period_total | $Price on_editing => 1 %]" />
>+        <label for="budget_period_total">[% t('Total amount:') %] </label>
>+        <input type="text" id="budget_period_total" name="budget_period_total" size="10" maxlength="80" value="[% budget_period_total | $Price on_editing => 1 %]" />
>     </li>
> 
>     <li>
>         
>         
>-        <label for="budget_period_active">Make budget active: </label>
>-        [% IF ( budget_period_active ) %]<input type="checkbox" checked="checked" id="budget_period_active" name="budget_period_active" value="1" />[% ELSE %]  <input type="checkbox" id="budget_period_active" name="budget_period_active" value="1"/> [% END %]
>+        <label for="budget_period_active">[% t('Make budget active:') %] </label>
>+        [% IF ( budget_period_active ) %]<input type="checkbox" checked="checked" id="budget_period_active" name="budget_period_active" value="1" />[% ELSE %]  <input type="checkbox" id="budget_period_active" name="budget_period_active" value="1" /> [% END %]
>     </li>
> 
>     <li>
>         
>         
>-        <label for="budget_period_locked">Lock budget: </label>
>-        [% IF ( budget_period_locked ) %]<input type="checkbox" checked="checked" id="budget_period_locked" name="budget_period_locked" value="1" />[% ELSE %]  <input type="checkbox" id="budget_period_locked" name="budget_period_locked" value="1"/> [% END %]
>+        <label for="budget_period_locked">[% t('Lock budget:') %] </label>
>+        [% IF ( budget_period_locked ) %]<input type="checkbox" checked="checked" id="budget_period_locked" name="budget_period_locked" value="1" />[% ELSE %]  <input type="checkbox" id="budget_period_locked" name="budget_period_locked" value="1" /> [% END %]
>     </li>
>     </ol>
>     </fieldset>
>@@ -244,12 +243,12 @@
>     <fieldset class="action">
>         
>         
>-        <input type="button" value="Save"  onclick="Check(this.form)" />
>+        <input type="button" value="Save" onclick="Check(this.form)" />
>         
>         [% IF ( budget_period_id ) %]
>-            <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]" class="cancel">Cancel</a>
>+            <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]" class="cancel">[% t('Cancel') %]</a>
>         [% ELSE %]
>-            <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl" class="cancel">Cancel</a>
>+            <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl" class="cancel">[% t('Cancel') %]</a>
>         [% END %]
>     </fieldset>
> 
>@@ -264,16 +263,16 @@
> [% IF ( delete_confirm ) %]
>     [% IF ( total ) %]
>         <div class="dialog message">
>-        <h3>Cannot delete budget</h3>
>-        <p><strong>This record is used [% total %] times</strong>
>-        . Deletion is not possible.</p>
>+        <h3>[% t('Cannot delete budget') %]</h3>
>+        <p><strong>[% t('This record is used') %] [% total %] [% t('times') %]</strong>
>+        [% t('. Deletion is not possible.') %]</p>
>     [% ELSIF ( funds_exist ) %]
>         <div class="dialog message">
>-        <h3>Cannot delete budget</h3>
>-        <p>This budget has funds attached. You must delete all attached funds before you can delete this budget.</p>
>+        <h3>[% t('Cannot delete budget') %]</h3>
>+        <p>[% t('This budget has funds attached. You must delete all attached funds before you can delete this budget.') %]</p>
>     [% ELSE %]
>         <div class="dialog alert">
>-        <h3>Delete budget '[% budget_period_description %]'?</h3>
>+        <h3>[% t('Delete budget \'') %][% budget_period_description %]'?</h3>
> 
>     
>     
>@@ -282,10 +281,10 @@
>     <form action="[% script_name %]" method="post">
>         <input type="hidden" name="op" value="delete_confirmed" />
>         <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
>-        <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
>+        <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('Yes, delete') %]</button>
>     </form>
>     <form action="[% script_name %]" method="post">
>-        <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
>+        <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> [% t('No, do not delete') %]</button>
>     </form>
>     [% END %]
> 
>@@ -294,22 +293,22 @@
> 
> [% IF close_form %]
>   [% IF budget_periods.size == 0 %]
>-    You cannot move funds of this budget, there is no active budget.
>-    Please create a new active budget and retry.
>-    <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a>
>+    [% t('You cannot move funds of this budget, there is no active budget.') %]
>+    [% t('Please create a new active budget and retry.') %]
>+    <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">[% t('Back') %]</a>
>   [% ELSIF number_of_unreceived_orders == 0 %]
>-    There are no unreceived orders for this budget.
>-    <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a>
>+    [% t('There are no unreceived orders for this budget.') %]
>+    <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">[% t('Back') %]</a>
>   [% ELSE %]
>-    <h3>The unreceived orders from the following funds will be moved</h3>
>-      Fund list of budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]">[% budget_period_description %]</a>:
>+    <h3>[% t('The unreceived orders from the following funds will be moved') %]</h3>
>+      [% t('Fund list of budget') %] <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]">[% budget_period_description %]</a>:
>     <table id="budgeth">
>       <thead>
>         <tr>
>-            <th>Fund id</th>
>-            <th>Fund code</th>
>-            <th>Fund name</th>
>-            <th>Unreceived orders</th>
>+            <th>[% t('Fund id') %]</th>
>+            <th>[% t('Fund code') %]</th>
>+            <th>[% t('Fund name') %]</th>
>+            <th>[% t('Unreceived orders') %]</th>
>         </tr>
>       </thead>
>       <tbody>
>@@ -327,7 +326,7 @@
>       <fieldset class="rows">
>         <ol>
>           <li>
>-            <label class="required" for="to_budget_period_id">Select a budget</label>
>+            <label class="required" for="to_budget_period_id">[% t('Select a budget') %]</label>
>             <select name="to_budget_period_id" id="to_budget_period_id" required="required">
>               <option value=""></option>
>               [% FOR budget_period IN budget_periods %]
>@@ -336,7 +335,7 @@
>             </select>
>           </li>
>           <li>
>-          <label for="move_remaining_unspent">Move remaining unspent funds</label>
>+          <label for="move_remaining_unspent">[% t('Move remaining unspent funds') %]</label>
>             <input type="checkbox" name="move_remaining_unspent" id="move_remaining_unspent" />
>           </li>
>         </ol>
>@@ -345,20 +344,20 @@
>           <input type="hidden" name="op" value="close_confirmed" />
>           <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
>           <input type="submit" value="Move unreceived orders" />
>-          <a class="cancel" href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Cancel</a>
>+          <a class="cancel" href="/cgi-bin/koha/admin/aqbudgetperiods.pl">[% t('Cancel') %]</a>
>       </fieldset>
>     </form>
>   [% END %]
> [% ELSIF closed %]
>-  <h3>Report after moving unreceived orders from budget [% from_budget_period.budget_period_description %] ([% from_budget_period.budget_period_startdate | $KohaDates %] - [% from_budget_period.budget_period_enddate | $KohaDates %]) to [% to_budget_period.budget_period_description %] ([% to_budget_period.budget_period_startdate | $KohaDates %] - [% to_budget_period.budget_period_enddate | $KohaDates%])</h3>
>+  <h3>[% t('Report after moving unreceived orders from budget') %] [% from_budget_period.budget_period_description %] ([% from_budget_period.budget_period_startdate | $KohaDates %] - [% from_budget_period.budget_period_enddate | $KohaDates %][% t(') to') %] [% to_budget_period.budget_period_description %] ([% to_budget_period.budget_period_startdate | $KohaDates %] - [% to_budget_period.budget_period_enddate | $KohaDates%])</h3>
> 
>   <table id="closed_report">
>     <thead>
>       <tr>
>-        <td>Budget id</td>
>-        <td>Basket</td>
>-        <td>Ordernumber</td>
>-        <td>Details</td>
>+        <td>[% t('Budget id') %]</td>
>+        <td>[% t('Basket') %]</td>
>+        <td>[% t('Ordernumber') %]</td>
>+        <td>[% t('Details') %]</td>
>       </tr>
>     </thead>
>     <tbody>
>@@ -367,27 +366,27 @@
>             [% IF r.orders_moved.size > 0 %]
>               [% FOR order IN r.orders_moved %]
>                 <tr>
>-                  <td>[% r.budget.budget_name %] (id=[% r.budget.budget_id %]) Amount=[% r.budget.budget_amount | $Price %][% IF r.unspent_moved %] ([% r.unspent_moved | $Price %] remaining has been moved)[% END %]</td>
>+                  <td>[% r.budget.budget_name %] [% t('(id=') %][% r.budget.budget_id %][% t(') Amount=') %][% r.budget.budget_amount | $Price %][% IF r.unspent_moved %] ([% r.unspent_moved | $Price %] [% t('remaining has been moved)') %][% END %]</td>
>                   <td>[% order.basketname %]</td>
>                   <td>[% order.ordernumber %]</td>
>-                  <td>Moved!</td>
>+                  <td>[% t('Moved!') %]</td>
>                 </tr>
>               [% END %]
>             [% ELSE %]
>               <tr>
>-                <td>[% r.budget.budget_name %] (id=[% r.budget.budget_id %])</td>
>+                <td>[% r.budget.budget_name %] [% t('(id=') %][% r.budget.budget_id %])</td>
>                 <td></td>
>                 <td></td>
>-                <td>There were no unreceived orders for this fund.</td>
>+                <td>[% t('There were no unreceived orders for this fund.') %]</td>
>               </tr>
>             [% END %]
>           [% ELSE %]
>             [% IF r.error == 'budget_code_not_exists' %]
>               <tr>
>-                <td>[% r.budget.budget_id %] [% r.budget.budget_amount | $Price %][% IF r.unspent_moved %] ([% r.unspent_moved | $Price %] remaining has been moved)[% END %]</td>
>+                <td>[% r.budget.budget_id %] [% r.budget.budget_amount | $Price %][% IF r.unspent_moved %] ([% r.unspent_moved | $Price %] [% t('remaining has been moved)') %][% END %]</td>
>                 <td></td>
>                 <td></td>
>-                <td>This fund code does not exist in the destination budget.</td>
>+                <td>[% t('This fund code does not exist in the destination budget.') %]</td>
>               </tr>
>             [% END %]
>           [% END %]
>@@ -395,23 +394,23 @@
>       [% END %]
>     </tbody>
>   </table>
>-  <a class="cancel" href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a>
>+  <a class="cancel" href="/cgi-bin/koha/admin/aqbudgetperiods.pl">[% t('Back') %]</a>
> [% END %]
> 
> 
> [% IF ( else ) %]
>-  <h2>Budgets administration</h2>
>+  <h2>[% t('Budgets administration') %]</h2>
> 
>     [% IF ( failed_delete_funds_exist ) %]
>-        <div class="dialog message">Failed to delete budget because funds exist.</div>
>+        <div class="dialog message">[% t('Failed to delete budget because funds exist.') %]</div>
>     [% END %]
> 
>   [% INCLUDE 'budgets-active-currency.inc' %]
> 
>   <div id="budgetsTabs" class="toptabs">
>     <ul>
>-        <li><a href="#active">Active budgets</a></li>
>-        <li><a href="#inactive">Inactive budgets</a></li>
>+        <li><a href="#active">[% t('Active budgets') %]</a></li>
>+        <li><a href="#inactive">[% t('Inactive budgets') %]</a></li>
>     </ul>
> 
>     <div id="active">
>@@ -419,23 +418,23 @@
>         <table id="activeperiodst">
>           <thead>
>             <tr>
>-              <th>Budget name</th>
>-              <th class="title-string">Start date</th>
>-              <th class="title-string">End date</th>
>-              <th>Locked</th>
>-              <th>Total</th>
>-              <th>Actions</th>
>+              <th>[% t('Budget name') %]</th>
>+              <th class="title-string">[% t('Start date') %]</th>
>+              <th class="title-string">[% t('End date') %]</th>
>+              <th>[% t('Locked') %]</th>
>+              <th>[% t('Total') %]</th>
>+              <th>[% t('Actions') %]</th>
>             </tr>
>           </thead>
>           <tbody>
>               [% FOREACH period_active IN period_active_loop %]
>                 <tr>
>-                <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_active.budget_period_id %]" title="View funds for [% period_active.budget_period_description %]">[% period_active.budget_period_description %]</a></td>
>+                <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_active.budget_period_id %]" title="[% t('View funds for') %] [% period_active.budget_period_description %]">[% period_active.budget_period_description %]</a></td>
>                 <td><span title="[% period_active.budget_period_startdate %]">[% period_active.budget_period_startdate | $KohaDates %]</span></td>
>                 <td><span title="[% period_active.budget_period_enddate %]">[% period_active.budget_period_enddate | $KohaDates %]</span></td>
>                 <td>
>                   [% IF ( period_active.budget_period_locked ) %]
>-                    <span style="color:green;">Locked</span>&nbsp;
>+                    <span style="color:green;">[% t('Locked') %]</span>Â 
>                   [% END %]
>                 </td>
>                 <td class="data">[% period_active.budget_period_total | $Price %]</td>
>@@ -447,7 +446,7 @@
>           </tbody>
>         </table>
>       [% ELSE %]
>-        No active budgets
>+        [% t('No active budgets') %]
>       [% END %]
>     </div>
>     <div id="inactive">
>@@ -455,21 +454,21 @@
>         <table id="inactiveperiodst">
>           <thead>
>               <tr>
>-                  <th>Budget name</th>
>-                  <th class="title-string">Start date</th>
>-                  <th class="title-string">End date</th>
>-                  <th>Locked</th>
>-                  <th>Total</th>
>-                  <th>Actions</th>
>+                  <th>[% t('Budget name') %]</th>
>+                  <th class="title-string">[% t('Start date') %]</th>
>+                  <th class="title-string">[% t('End date') %]</th>
>+                  <th>[% t('Locked') %]</th>
>+                  <th>[% t('Total') %]</th>
>+                  <th>[% t('Actions') %]</th>
>               </tr>
>           </thead>
>           <tbody>
>               [% FOREACH period_loo IN period_inactive_loop %]
>                   <tr>
>-                  <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_loo.budget_period_id %]" title="View funds for [% period_loo.budget_period_description %]">[% period_loo.budget_period_description %]</a></td>
>+                  <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_loo.budget_period_id %]" title="[% t('View funds for') %] [% period_loo.budget_period_description %]">[% period_loo.budget_period_description %]</a></td>
>                   <td><span title="[% period_loo.budget_period_startdate %]">[% period_loo.budget_period_startdate | $KohaDates %]</span></td>
>                   <td><span title="[% period_loo.budget_period_enddate %]">[% period_loo.budget_period_enddate | $KohaDates %]</span></td>
>-                  <td> [% IF ( period_loo.budget_period_locked ) %]<span style="color:green;">Locked</span>&nbsp;[% ELSE %][% END %] </td>
>+                  <td> [% IF ( period_loo.budget_period_locked ) %]<span style="color:green;">[% t('Locked') %]</span>Â [% ELSE %][% END %] </td>
>                   <td class="data">[% period_loo.budget_period_total | $Price %]</td>
>                   <td>
>                         [% PROCESS action_menu block_budget=period_loo %]
>@@ -479,7 +478,7 @@
>           </tbody>
>         </table>
>       [% ELSE %]
>-        No inactive budgets
>+        [% t('No inactive budgets') %]
>       [% END %]
>     </div>
>   </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
>index dd72013375..82a43ee577 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
>@@ -1,10 +1,11 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% USE AuthorisedValues %]
> [% USE Branches %]
> [% USE Price %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Funds[% IF op == 'add_form' %] &rsaquo; [% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name %]'[% END %][% ELSE %]Add fund [% END %][% END %]</title>
>+<title>[% t('Koha âº Administration âº Funds') %][% IF op == 'add_form' %] âº [% IF ( budget_id ) %][% t('Modify fund') %][% IF ( budget_name ) %] '[% budget_name %]'[% END %][% ELSE %][% t('Add fund') %] [% END %][% END %]</title>
> [% Asset.css("css/datatables.css") %]
> [% Asset.css("lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css") %]
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -14,13 +15,13 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'budgets-admin-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
>-    <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> &rsaquo; [% IF op == 'list' %][% IF budget_period_id %]Funds for '[% budget_period_description %]'[% ELSE %]All funds[% END %][% END %]
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº
>+    <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> âº <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">[% t('Budgets') %]</a> âº [% IF op == 'list' %][% IF budget_period_id %][% t('Funds for \'') %][% budget_period_description %]'[% ELSE %][% t('All funds') %][% END %][% END %]
>     [% IF op == 'add_form' %]
>-      <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]">Funds</a> &rsaquo; [% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name %]'[% END %][% ELSE %]Add fund[% END %]
>+      <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]">[% t('Funds') %]</a> âº [% IF ( budget_id ) %][% t('Modify fund') %][% IF ( budget_name ) %] '[% budget_name %]'[% END %][% ELSE %][% t('Add fund') %][% END %]
>     [% END %]
>     [% IF op == 'delete_confirm' %]
>-      <a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a> &rsaquo; Delete fund?
>+      <a href="/cgi-bin/koha/admin/aqbudgets.pl">[% t('Funds') %]</a> [% t('âº Delete fund?') %]
>     [% END %]
> </div>
> 
>@@ -34,7 +35,7 @@
> 
> [% IF (error_not_authorised_to_modify) %]
>     <div class="error">
>-        <p>You are not authorized to modify this fund</p>
>+        <p>[% t('You are not authorized to modify this fund') %]</p>
>     </div>
> [% END %]
> 
>@@ -42,9 +43,9 @@
> 
> <h1>
>   [% IF budget_period_id %]
>-    Funds for '[% budget_period_description %]'
>+    [% t('Funds for \'') %][% budget_period_description %]'
>   [% ELSE %]
>-    All funds
>+    [% t('All funds') %]
>   [% END %]
> </h1>
> 
>@@ -55,33 +56,33 @@
> <table id="budgeth" class="group">
>     [% UNLESS budget_period_id %]
>       <caption>
>-        <span class="actions"><a href="#" id="expand_all">Expand all</a>
>-        | <a href="#" id="collapse_all">Collapse all</a>
>-        | <a href="#" id="hide_inactive">Hide inactive budgets</a>
>-        | <a href="#" id="show_inactive">Show inactive budgets</a></span>
>+        <span class="actions"><a href="#" id="expand_all">[% t('Expand all') %]</a>
>+        | <a href="#" id="collapse_all">[% t('Collapse all') %]</a>
>+        | <a href="#" id="hide_inactive">[% t('Hide inactive budgets') %]</a>
>+        | <a href="#" id="show_inactive">[% t('Show inactive budgets') %]</a></span>
>       </caption>
>     [% END %]
>     <thead>
>         <tr>
>-            <th>Active</th>
>-            <th>Budget period description</th>
>-            <th>Fund code</th>
>-            <th>Fund name</th>
>-            <th>Base-level allocated</th>
>-            <th>Base-level ordered</th>
>-            <th>Total ordered</th>
>-            <th>Base-level spent</th>
>-            <th>Total spent</th>
>-            <th>Base-level available</th>
>-            <th>Total available</th>
>-            <th>Actions</th>
>+            <th>[% t('Active') %]</th>
>+            <th>[% t('Budget period description') %]</th>
>+            <th>[% t('Fund code') %]</th>
>+            <th>[% t('Fund name') %]</th>
>+            <th>[% t('Base-level allocated') %]</th>
>+            <th>[% t('Base-level ordered') %]</th>
>+            <th>[% t('Total ordered') %]</th>
>+            <th>[% t('Base-level spent') %]</th>
>+            <th>[% t('Total spent') %]</th>
>+            <th>[% t('Base-level available') %]</th>
>+            <th>[% t('Total available') %]</th>
>+            <th>[% t('Actions') %]</th>
>         </tr>
>     </thead>
>     <tfoot>
>     <tr>
>     <th></th>
>     <th></th>
>-    <th colspan="2" style="text-align: left;" nowrap="nowrap">Period allocated [% IF budget_period_total %][% budget_period_total | $Price %][% END %]  </th>
>+    <th colspan="2" style="text-align: left;" nowrap="nowrap">[% t('Period allocated') %] [% IF budget_period_total %][% budget_period_total | $Price %][% END %]  </th>
>     <th nowrap="nowrap" class="data"> [% period_alloc_total | $Price %]</th>
>     <th></th>
>     <th class="data">[% ordered_total | $Price %]</th>
>@@ -100,7 +101,7 @@
>       <tr data-tt-id="[% budget.budget_id %]">
>     [% END %]
>     <td>[% budget.budget_period_active %]</td>
>-    <td>Budget [% budget.budget_period_description %] [id=[% budget.budget_period_id %]][% UNLESS budget.budget_period_active %] (inactive)[% END %]</td>
>+    <td>[% t('Budget') %] [% budget.budget_period_description %] [% t('[id=') %][% budget.budget_period_id %]][% UNLESS budget.budget_period_active %] [% t('(inactive)') %][% END %]</td>
>     <td>[% budget.budget_code %]</td>
>     <td>[% budget.budget_name %]</td>
>     <td class="data">
>@@ -173,16 +174,16 @@
>         <td>
>             <div class="dropdown dropup">
>                 <a class="btn btn-default btn-xs dropdown-toggle" id="budgetactions[% budget.budget_id %]_[% budget.budget_period_id %]" role="button" data-toggle="dropdown" href="#">
>-                   Actions <b class="caret"></b>
>+                   [% t('Actions') %] <b class="caret"></b>
>                 </a>
>                 <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="budgetactions[% budget.budget_id %]_[% budget.budget_period_id %]">
>-                    <li><a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_id=[% budget.budget_id %]&amp;budget_period_id=[% budget.budget_period_id %]"><i class="fa fa-pencil"></i> Edit</a></li>
>+                    <li><a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=[% budget.budget_id %]&budget_period_id=[% budget.budget_period_id %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a></li>
>                     [% IF budget.budget_has_children %]
>-                        <li class="disabled"><a href="#" class="deletefund-disabled" data-toggle="tooltip" data-placement="left" title="This fund has children"><i class="fa fa-trash"></i> Delete</a></li>
>+                        <li class="disabled"><a href="#" class="deletefund-disabled" data-toggle="tooltip" data-placement="left" title="[% t('This fund has children') %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a></li>
>                     [% ELSE %]
>-                        <li><a href="/cgi-bin/koha/admin/aqbudgets.pl?op=delete_confirm&amp;budget_id=[% budget.budget_id %]&amp;budget_period_id=[% budget.budget_period_id %]"><i class="fa fa-trash"></i> Delete</a></li>
>+                        <li><a href="/cgi-bin/koha/admin/aqbudgets.pl?op=delete_confirm&budget_id=[% budget.budget_id %]&budget_period_id=[% budget.budget_period_id %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a></li>
>                     [% END %]
>-                    <li><a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_parent_id=[% budget.budget_id %]&amp;budget_period_id=[% budget.budget_period_id %]"><i class="fa fa-plus"></i> Add child fund</a></li>
>+                    <li><a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_parent_id=[% budget.budget_id %]&budget_period_id=[% budget.budget_period_id %]"><i class="fa fa-plus"></i> [% t('Add child fund') %]</a></li>
>                 </ul>
>             </div>
>         </td>
>@@ -193,7 +194,7 @@
> </table>
> 
> [% ELSE %]
>-    <p>No fund found</p>
>+    <p>[% t('No fund found') %]</p>
> [% END %]
> 
> [% END %] 
>@@ -203,9 +204,9 @@
> [% IF op == 'add_form' && !error_not_authorised_to_modify %]
> <form action="/cgi-bin/koha/admin/aqbudgets.pl" id="edit_fund" name="Aform" method="post">
>     <fieldset class="rows">
>-    <legend>[% IF ( budget_id ) %]Modify[% ELSE %]Add[% END %] Fund
>+    <legend>[% IF ( budget_id ) %][% t('Modify') %][% ELSE %][% t('Add') %][% END %] [% t('Fund') %]
>     [% IF ( budget_period_description ) %]
>-        [% budget_name %] for Budget '[% budget_period_description %]'
>+        [% budget_name %] [% t('for Budget \'') %][% budget_period_description %]'
>     [% END %]
>     </legend>
> 
>@@ -214,54 +215,53 @@
>     <ol>
>     [% IF ( budget_parent_id ) %]
>     <li>
>-        <span class="label">Fund parent: </span>
>+        <span class="label">[% t('Fund parent:') %] </span>
>         [% budget_parent_name %]
>         [% budget_parent_id %] - [% budget_parent_name %]
>         <input type="hidden" name="budget_parent_id" value="[% budget_parent_id %]" />
>     </li>
>     [% END %]
>     <li>
>-    <label class="required"  for="budget_code">Fund code: </label>
>+    <label class="required" for="budget_code">[% t('Fund code:') %] </label>
>     <input type="text" name="budget_code" id="budget_code" value="[% budget_code %]" size="30" />
>     </li>
> 
>     <li>
>-    <label class="required" for="budget_name">Fund name: </label>
>+    <label class="required" for="budget_name">[% t('Fund name:') %] </label>
>     <input type="text" name="budget_name" id="budget_name" value="[% budget_name %]" size="60" />
>     </li>
> 
>     <li>
>-    <label style="white-space: nowrap;" for="budget_amount" class="required">Amount: </label>
>+    <label style="white-space: nowrap;" for="budget_amount" class="required">[% t('Amount:') %] </label>
>     <input type="text" name="budget_amount" id="budget_amount" value="[% budget_amount | $Price on_editing => 1 %]" size="8" />
>     </li>
> 
>     <li>
>-      <label for="budget_encumb">Warning at (%): </label>
>+      <label for="budget_encumb">[% t('Warning at (%):') %] </label>
>       <input type="text" name="budget_encumb" id="budget_encumb" value="[% budget_encumb %]" size="10" />
>-      <span class="hint">0 to disable</span>
>+      <span class="hint">[% t('0 to disable') %]</span>
>     </li>
> 
>     <li>
>-      <label for="budget_expend">Warning at (amount): </label>
>+      <label for="budget_expend">[% t('Warning at (amount):') %] </label>
>       <input type="text" name="budget_expend" id="budget_expend" value="[% budget_expend | $Price on_editing => 1 %]" size="10" />
>-      <span class="hint">0 to disable</span>
>+      <span class="hint">[% t('0 to disable') %]</span>
>     </li>
> 
>     <li>
>-        <span class="label">Owner: </span>
>+        <span class="label">[% t('Owner:') %] </span>
>         [% IF  budget_owner %]
>-            <span  id="budget_owner_name">
>+            <span id="budget_owner_name">
>                 <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% budget_owner.borrowernumber %]">
>                     [% budget_owner.firstname %] [% budget_owner.surname %]
>                 </a> |
>             </span>
>         [% ELSE %]
>-            <span  id="budget_owner_name"></span>
>+            <span id="budget_owner_name"></span>
>         [% END %]
>-        <a id="edit_owner" class="new_window" href="#"><i class="fa fa-search"></i> Select owner</a>
>-        <a id="remove_owner" href="#"><i class="fa fa-trash"></i> Remove owner</a>
>-        <input type="hidden" name="budget_owner_id" id="budget_owner_id"
>-            value="[% budget_owner.borrowernumber %]" />
>+        <a id="edit_owner" class="new_window" href="#"><i class="fa fa-search"></i> [% t('Select owner') %]</a>
>+        <a id="remove_owner" href="#"><i class="fa fa-trash"></i> [% t('Remove owner') %]</a>
>+        <input type="hidden" name="budget_owner_id" id="budget_owner_id" value="[% budget_owner.borrowernumber %]" />
>     </li>
> 
> 
>@@ -269,29 +269,29 @@
>         <li class="radio">
>             <label>
>                 <input type="checkbox" id="set_owner_to_children" name="set_owner_to_children" value="1" />
>-                Update all child funds with this owner
>+                [% t('Update all child funds with this owner') %]
>             </label>
>-            <span class="hint">Selecting this option will overwrite existing fund owners, if any</span>
>+            <span class="hint">[% t('Selecting this option will overwrite existing fund owners, if any') %]</span>
>         </li>
>     [% END %]
> 
>     <li>
>-        <span class="label">Users:</span>
>+        <span class="label">[% t('Users:') %]</span>
>         <ul style="float:left;" id="budget_users">
>             [% FOREACH user IN budget_users %]
>                 <li id="user_[% user.borrowernumber %]">
>                     <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% user.borrowernumber %]">
>                         [% user.firstname %] [% user.surname %]
>                     </a>
>-                    &bull; <a href="#" class="del_user" data-borrowernumber="[% user.borrowernumber %]"><i class="fa fa-trash"></i> Remove</a>
>+                    â¢ <a href="#" class="del_user" data-borrowernumber="[% user.borrowernumber %]"><i class="fa fa-trash"></i> [% t('Remove') %]</a>
>                 </li>
>             [% END %]
>-            <li><a href="#" id="add_user_button"><i class="fa fa-plus"></i> Add users</a></li>
>+            <li><a href="#" id="add_user_button"><i class="fa fa-plus"></i> [% t('Add users') %]</a></li>
>         </ul>
>         <input type="hidden" name="budget_users_ids" id="budget_users_id" value="[% budget_users_ids %]" />
>     </li>
>     <li>
>-    <label for="budget_branchcode">Library: </label>
>+    <label for="budget_branchcode">[% t('Library:') %] </label>
>     <select name="budget_branchcode" id="budget_branchcode">
>         <option value=""></option>
>         [% PROCESS options_for_libraries libraries => Branches.all( selected => budget_branchcode, unfiltered => 1 ) %]
>@@ -299,14 +299,14 @@
>     </li>
> 
>     <li>
>-    <label for="budget_permission">Restrict access to: </label>
>+    <label for="budget_permission">[% t('Restrict access to:') %] </label>
>     <select name="budget_permission" id="budget_permission">
>         [% IF ( budget_perm_0 ) %]
>             <option value="0" selected="selected">
>         [% ELSE %]
>             <option value="0">
>         [% END %]
>-            None
>+            [% t('None') %]
>         </option>
> 
>         [% IF ( budget_perm_1 ) %]
>@@ -314,7 +314,7 @@
>         [% ELSE %]
>             <option value="1">
>         [% END %]
>-            Owner
>+            [% t('Owner') %]
>         </option>
> 
>         [% IF ( budget_perm_3) %]
>@@ -322,7 +322,7 @@
>         [% ELSE %]
>             <option value="3">
>         [% END %]
>-            Owner and users
>+            [% t('Owner and users') %]
>         </option>
> 
>         [% IF ( budget_perm_2 ) %]
>@@ -330,25 +330,25 @@
>         [% ELSE %]
>             <option value="2">
>         [% END %]
>-            Owner, users and library
>+            [% t('Owner, users and library') %]
>         </option>
>     </select>
>     </li>
> 
>     <li>
>-    <label for="budget_notes">Notes: </label>
>-    <textarea name="budget_notes" id="budget_notes"  cols="80" rows="6">[% budget_notes %]</textarea>
>+    <label for="budget_notes">[% t('Notes:') %] </label>
>+    <textarea name="budget_notes" id="budget_notes" cols="80" rows="6">[% budget_notes %]</textarea>
>     </li>
> 
>     <li>
>-    <label  style="white-space: nowrap;" for="authorised_value_category1">Statistic 1 done on: </label>
>+    <label style="white-space: nowrap;" for="authorised_value_category1">[% t('Statistic 1 done on:') %] </label>
>         <select name="sort1_authcat" id="authorised_value_category1">
>             <option value=""></option>
>             [% PROCESS options_for_authorised_value_categories authorised_value_categories => AuthorisedValues.GetCategories( selected => sort1_authcat ) %]
>         </select>
>     </li>
>     <li>
>-    <label  style="white-space: nowrap;" for="authorised_value_category2">Statistic 2 done on: </label>
>+    <label style="white-space: nowrap;" for="authorised_value_category2">[% t('Statistic 2 done on:') %] </label>
>         <select name="sort2_authcat" id="authorised_value_category2">
>             <option value=""></option>
>             [% PROCESS options_for_authorised_value_categories authorised_value_categories => AuthorisedValues.GetCategories( selected => sort2_authcat ) %]
>@@ -362,7 +362,7 @@
>     </fieldset>
> 
>     <fieldset class="action">
>-        <input type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl">Cancel</a>
>+        <input type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl">[% t('Cancel') %]</a>
>         <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
>     </fieldset>
> </form>
>@@ -371,11 +371,11 @@
> 
> [% IF op == 'delete_confirm' %]
>     <div class="dialog alert">
>-        <h3>Delete fund [% budget_name %]?</h3>
>-        If you delete this fund, all orders linked to this fund will be deleted!
>+        <h3>[% t('Delete fund') %] [% budget_name %]?</h3>
>+        [% t('If you delete this fund, all orders linked to this fund will be deleted!') %]
>         <table>
>             <tr>
>-            <th scope="row">Fund amount:</th>
>+            <th scope="row">[% t('Fund amount:') %]</th>
>             <td>[% budget_amount | $Price %]</td>
>             </tr>
>         </table>
>@@ -384,10 +384,10 @@
>             <input type="hidden" name="op" value="delete_confirmed" />
>             <input type="hidden" name="budget_id" value="[% budget_id %]" />
>             <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
>-            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this fund</button>
>+            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('Yes, delete this fund') %]</button>
>         </form>
>         <form action="/cgi-bin/koha/admin/aqbudgets.pl" method="get">
>-            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
>+            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> [% t('No, do not delete') %]</button>
>         </form>
>     </div>
> [% END %]
>@@ -397,12 +397,12 @@
> <div class="yui-b">
> [% IF op == 'list' %]
>   <form action="/cgi-bin/koha/admin/aqbudgets.pl" method="get">
>-    <a href="#" id="filterbutton">Filters</a>
>+    <a href="#" id="filterbutton">[% t('Filters') %]</a>
>     <fieldset class="brief" id="fundfilters">
>-    <h4>Fund filters</h4>
>+    <h4>[% t('Fund filters') %]</h4>
>         <ol>
>         <li>
>-            <label for="filter_budgetbranch2">Library: </label>
>+            <label for="filter_budgetbranch2">[% t('Library:') %] </label>
>             <select name="filter_budgetbranch" id="filter_budgetbranch2">
>                 <option value=""></option>
>                 [% PROCESS options_for_libraries libraries => Branches.all( selected => budget_branchcode, unfiltered => 1 ) %]
>@@ -410,19 +410,19 @@
>         </li>
>         <li class="radio">
> 
>-        <label for="show_mine">Show my funds only:</label>
>+        <label for="show_mine">[% t('Show my funds only:') %]</label>
>             [% IF ( show_mine ) %]
>-                <input type="checkbox" id="show_mine"  name="show_mine" value="1" checked="checked" />
>+                <input type="checkbox" id="show_mine" name="show_mine" value="1" checked="checked" />
>             [% ELSE %]
>-                <input type="checkbox" id="show_mine"  name="show_mine" value="1" />
>+                <input type="checkbox" id="show_mine" name="show_mine" value="1" />
>         [% END %]
>         </li>
> 
>         [% IF periods %]
>           <li>
>-            <label for="periods">Budget:</label>
>+            <label for="periods">[% t('Budget:') %]</label>
>             <select id="periods" name="budget_period_id">
>-              <option value="">All budgets</option>
>+              <option value="">[% t('All budgets') %]</option>
>               [% FOR period IN periods %]
>                 [% IF budget_period_id && period.budget_period_id == budget_period_id %]
>                   <option value="[% period.budget_period_id %]" selected="selected">[% period.budget_period_description %]</option>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
>index 4b0ab5f55c..82c581c354 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
>@@ -1,16 +1,17 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% USE KohaDates %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Acquisitions &rsaquo; Contracts &rsaquo;
>+<title>[% t('Koha âº Acquisitions âº Contracts âº') %]
> [% IF ( add_form ) %]
>-    [% IF ( contractnumber ) %]Modify contract '[% contractname %]'
>-[% ELSE %]New contract[% END %]
>+    [% IF ( contractnumber ) %][% t('Modify contract \'') %][% contractname %]'
>+[% ELSE %][% t('New contract') %][% END %]
> [% END %]
>-[% IF ( else ) %]Contracts of [% booksellername %][% END %]
>-[% IF ( add_validate ) %]Data recorded[% END %]
>-[% IF ( delete_confirm ) %]Confirm deletion of contract '[% contractnumber %]'[% END %]
>-[% IF ( delete_confirmed ) %]Contract deleted[% END %]</title>
>+[% IF ( else ) %][% t('Contracts of') %] [% booksellername %][% END %]
>+[% IF ( add_validate ) %][% t('Data recorded') %][% END %]
>+[% IF ( delete_confirm ) %][% t('Confirm deletion of contract \'') %][% contractnumber %]'[% END %]
>+[% IF ( delete_confirmed ) %][% t('Contract deleted') %][% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>@@ -19,31 +20,31 @@
> [% INCLUDE 'contracts-admin-search.inc' %]
> 
> <div id="breadcrumbs">
>-    <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>-    &rsaquo;
>-    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
>-    &rsaquo;
>+    <a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a>
>+    âº
>+    <a href="/cgi-bin/koha/acqui/acqui-home.pl">[% t('Acquisitions') %]</a>
>+    âº
>     <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a>
>-    &rsaquo;
>+    âº
>     [% IF ( add_form ) %]
>-        <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a>
>-        &rsaquo;
>-        [% IF ( contractnumber ) %]Modify contract '[% contractname %]'
>-        [% ELSE %]New contract
>+        <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">[% t('Contracts') %]</a>
>+        âº
>+        [% IF ( contractnumber ) %][% t('Modify contract \'') %][% contractname %]'
>+        [% ELSE %][% t('New contract') %]
>         [% END %]
>     [% END %]
>     [% IF ( add_validate ) %]
>-        <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a>
>-        &rsaquo; Data recorded
>+        <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">[% t('Contracts') %]</a>
>+        [% t('âº Data recorded') %]
>     [% END %]
>     [% IF ( delete_confirm ) %]
>-        <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a>
>-        &rsaquo; Confirm deletion of contract [% contractnumber %]
>+        <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">[% t('Contracts') %]</a>
>+        [% t('âº Confirm deletion of contract') %] [% contractnumber %]
>     [% END %]
>     [% IF ( delete_confirmed ) %]
>-        <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a> &rsaquo; Contract deleted
>+        <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">[% t('Contracts') %]</a> [% t('âº Contract deleted') %]
>     [% END %]
>-    [% IF ( else ) %]Contracts[% END %]
>+    [% IF ( else ) %][% t('Contracts') %][% END %]
> </div>
> 
> <div id="doc3" class="yui-t2">
>@@ -55,7 +56,7 @@
> [% INCLUDE 'acquisitions-toolbar.inc' %]
> 
> [% IF error == 'not_deleted' %]
>-    <div class="dialog alert">Contract has not been deleted. Maybe a basket linked to this contract exists.</div>
>+    <div class="dialog alert">[% t('Contract has not been deleted. Maybe a basket linked to this contract exists.') %]</div>
> [% END %]
> 
>                 [% IF ( add_form ) %]
>@@ -64,107 +65,107 @@
>                         <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
>                         <input type="hidden" name="checked" value="0" />
>                         [% IF ( contractnumber ) %]
>-                            <h1>Modify contract [% contractname %] for [% booksellername %]</h1>
>+                            <h1>[% t('Modify contract') %] [% contractname %] [% t('for') %] [% booksellername %]</h1>
>                         [% ELSE %]
>-                            <h1>New contract for [% booksellername %]</h1>
>+                            <h1>[% t('New contract for') %] [% booksellername %]</h1>
>                         [% END %]
>                         <fieldset class="rows">
>                             <ol>
>                                 [% IF ( contractnumber ) %]
>-                                        <li><span class="label">Contract id </span>[% contractnumber %]
>+                                        <li><span class="label">[% t('Contract id') %] </span>[% contractnumber %]
>                                             <input type="hidden" name="contractnumber" value="[% contractnumber %]" />
>                                             <input type="hidden" name="is_a_modif" value="1" />
>                                         </li>
>                                 [% END %]
>-                                <li><label for="contractname" class="required">Name: *</label> &nbsp;
>+                                <li><label for="contractname" class="required">[% t('Name: *') %]</label> Â 
>                                         <input type="text" name="contractname" id="contractname" size="40" maxlength="80" value="[% contractname %]" />
>                                 </li>
>-                                <li><label for="contractdescription">Description: </label> &nbsp;
>+                                <li><label for="contractdescription">[% t('Description:') %] </label> Â 
>                                         <input type="text" name="contractdescription" id="contractdescription" size="40" maxlength="80" value="[% contractdescription %]" />
>                                 </li>
>-                                <li><label for="from" class="required">Start date: *</label> &nbsp;
>+                                <li><label for="from" class="required">[% t('Start date: *') %]</label> Â 
>                                         <input type="text" name="contractstartdate" id="from" value="[% contractstartdate | $KohaDates %]" maxlength="10" size="10" class="datepickerfrom" />
> 				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>                                 </li>
>-                                <li><label for="to" class="required">End date: *</label> &nbsp;
>-                                        <input type="text" name="contractenddate" id="to" value="[% contractenddate | $KohaDates %]" maxlength="10"  size="10" class="datepickerto" />
>+                                <li><label for="to" class="required">[% t('End date: *') %]</label> Â 
>+                                        <input type="text" name="contractenddate" id="to" value="[% contractenddate | $KohaDates %]" maxlength="10" size="10" class="datepickerto" />
> 				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>                                 </li>
>                             </ol>
>                         </fieldset>
>                         <fieldset class="action">
>-                            <input type="button" value="Save" onclick="Check(this.form);" /> <a class="cancel" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]&amp;contractnumber=[% contractnumber %]">Cancel</a>
>+                            <input type="button" value="Save" onclick="Check(this.form);" /> <a class="cancel" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]&contractnumber=[% contractnumber %]">[% t('Cancel') %]</a>
>                         </fieldset>
>                     </form>
>             [% END %]
>             [% IF ( add_validate ) %]
>-                <h3>Data recorded</h3>
>+                <h3>[% t('Data recorded') %]</h3>
>                 <form action="[% script_name %]" method="post">
>                     <input type="submit" value="OK" />
>                 </form>
>             [% END %]
>             [% IF ( delete_confirm ) %]
>                     <div class="dialog alert">
>-                        <h3>Confirm deletion of contract <i>[% contractname %]</i></h3>
>+                        <h3>[% t('Confirm deletion of contract') %] <i>[% contractname %]</i></h3>
>                         <table>
>-                            <tr><th scope="row">Contract number:</th><td>[% contractnumber %]</td></tr>
>-                            <tr><th scope="row">Contract name:</th><td>[% contractname %]</td></tr>
>-                            <tr><th scope="row">Contract description:</th><td>[% contractdescription %]</td></tr>
>-                            <tr><th scope="row">Contract start date:</th><td>[% contractstartdate | $KohaDates %]</td></tr>
>-                            <tr><th scope="row">Contract end date:</th><td>[% contractenddate | $KohaDates %]</td></tr>
>-                            <tr><th scope="row">Vendor:</th><td>[% booksellername %]</td></tr>
>+                            <tr><th scope="row">[% t('Contract number:') %]</th><td>[% contractnumber %]</td></tr>
>+                            <tr><th scope="row">[% t('Contract name:') %]</th><td>[% contractname %]</td></tr>
>+                            <tr><th scope="row">[% t('Contract description:') %]</th><td>[% contractdescription %]</td></tr>
>+                            <tr><th scope="row">[% t('Contract start date:') %]</th><td>[% contractstartdate | $KohaDates %]</td></tr>
>+                            <tr><th scope="row">[% t('Contract end date:') %]</th><td>[% contractenddate | $KohaDates %]</td></tr>
>+                            <tr><th scope="row">[% t('Vendor:') %]</th><td>[% booksellername %]</td></tr>
>                         </table>
>                         <form action="[% script_name %]" method="post">
>                             <input type="hidden" name="op" value="delete_confirmed" />
>                             <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
>                             <input type="hidden" name="contractnumber" value="[% contractnumber %]" />
>-                            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete contract</button>
>+                            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('Yes, delete contract') %]</button>
>                         </form>
>                         <form action="/cgi-bin/koha/admin/aqcontract.pl" method="get">
>                             <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
>                             <input type="hidden" name="contractnumber" value="[% contractnumber %]" />
>-                            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
>+                            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> [% t('No, do not delete') %]</button>
>                         </form>
>                     </div>
>             [% END %]
>             [% IF ( delete_confirmed ) %]
>-                <h3>Contract deleted</h3>
>+                <h3>[% t('Contract deleted') %]</h3>
>                 <form action="[% script_name %]" method="post">
>                     <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
>                     <input type="submit" value="OK" />
>                 </form>
>             [% END %]
>             [% IF ( else ) %]
>-                <h2>Contract(s) of [% booksellername %]</h2>
>+                <h2>[% t('Contract(s) of') %] [% booksellername %]</h2>
>                 [% IF ( loop ) %]
>                     <table>
>                         <tr>
>-                            <th scope="col">Name</th>
>-                            <th scope="col">Description</th>
>-                            <th scope="col">Start date</th>
>-                            <th scope="col">End date</th>
>-                            <th scope="col">Actions</th>
>+                            <th scope="col">[% t('Name') %]</th>
>+                            <th scope="col">[% t('Description') %]</th>
>+                            <th scope="col">[% t('Start date') %]</th>
>+                            <th scope="col">[% t('End date') %]</th>
>+                            <th scope="col">[% t('Actions') %]</th>
>                         </tr>
>                     [% FOREACH loo IN loop %]
>                         <tr>
>                         <td>
>-                            <a href="[% loo.script_name %]?op=add_form&amp;booksellerid=[% loo.booksellerid %]&amp;contractnumber=[% loo.contractnumber %]">[% loo.contractname %]</a>
>+                            <a href="[% loo.script_name %]?op=add_form&booksellerid=[% loo.booksellerid %]&contractnumber=[% loo.contractnumber %]">[% loo.contractname %]</a>
>                         </td>
>                         <td>[% loo.contractdescription %]</td>
>                         <td>[% loo.contractstartdate %]</td>
>                         <td>[% loo.contractenddate %]</td>
>                         <td class="actions">
>-                            <a href="[% loo.script_name %]?op=add_form&amp;contractnumber=[% loo.contractnumber %]&amp;booksellerid=[% loo.booksellerid %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
>-                            <a href="[% loo.script_name %]?op=delete_confirm&amp;contractnumber=[% loo.contractnumber %]&amp;booksellerid=[% loo.booksellerid %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
>+                            <a href="[% loo.script_name %]?op=add_form&contractnumber=[% loo.contractnumber %]&booksellerid=[% loo.booksellerid %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> [% t('Edit') %]</a>
>+                            <a href="[% loo.script_name %]?op=delete_confirm&contractnumber=[% loo.contractnumber %]&booksellerid=[% loo.booksellerid %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> [% t('Delete') %]</a>
>                         </td>
>                         </tr>
>                     [% END %]
>                 </table>
>                 [% ELSE %]
>                     <div class="dialog message">
>-                        There are no contracts with this vendor.
>+                        [% t('There are no contracts with this vendor.') %]
>                         [% IF active %]
>-                            <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid %]">Add a contract</a>.
>+                            <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid %]">[% t('Add a contract') %]</a>.
>                         [% END %]
>                     </div>
>                 [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
>index 324e08946c..5321b7d35c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
>@@ -1,8 +1,9 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% USE Price %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Budgets &rsaquo; Funds &rsaquo; Planning for [% budget_period_description %] by [% authcat %]</title>
>+<title>[% t('Koha âº Administration âº Budgets âº Funds âº Planning for') %] [% budget_period_description %] [% t('by') %] [% authcat %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <style type="text/css">td.locked { background-image: url('[% interface %]/[% theme %]/img/locked.png'); padding-left : 20px; background-repeat: no-repeat; background-position: 5px 5px; } a.control { font-size:85%;text-decoration:none; }</style>
> </head>
>@@ -12,11 +13,11 @@
> [% INCLUDE 'budgets-admin-search.inc' %]
> 
> <div id="breadcrumbs">
>-    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
>-    <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;
>-    <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> &rsaquo; 
>-    <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]">Funds</a> &rsaquo;
>-    <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id %]">Planning</a> &rsaquo;
>+    <a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº
>+    <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> âº
>+    <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">[% t('Budgets') %]</a> âº 
>+    <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]">[% t('Funds') %]</a> âº
>+    <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id %]">[% t('Planning') %]</a> âº
> </div>
> 
> <div id="doc3" class="yui-t2">
>@@ -26,8 +27,8 @@
> 
> [% INCLUDE 'budgets-admin-toolbar.inc' %]
> 
>-<form method="post" id="Aform" name="Aform"  action="/cgi-bin/koha/admin/aqplan.pl">
>-<h3>Planning for [% budget_period_description %] by [% authcat %]</h3>
>+<form method="post" id="Aform" name="Aform" action="/cgi-bin/koha/admin/aqplan.pl">
>+<h3>[% t('Planning for') %] [% budget_period_description %] [% t('by') %] [% authcat %]</h3>
> <input type="hidden" name="authcat" value="[% authcat %]" />
> 
> 
>@@ -35,13 +36,13 @@
> 
>         [% INCLUDE 'budgets-active-currency.inc' %]
>         [% IF ( show_actual ) %]
>-            <p><b>Each cell contain both actual and estimated values.</b></p>
>+            <p><b>[% t('Each cell contain both actual and estimated values.') %]</b></p>
>         [% ELSE %]
>-            <p><b>Cells contain estimated values only.</b></p>
>+            <p><b>[% t('Cells contain estimated values only.') %]</b></p>
>         [% END %]
> 
>     <p id="selections">
>-        <strong>Show/hide columns:</strong> <span class="selected"><input type="checkbox" checked="checked" id="showall"/><label for="showall">Show all columns</label></span> <span><input type="checkbox" id="hideall"/><label for="hideall">Hide all columns</label></span>
>+        <strong>[% t('Show/hide columns:') %]</strong> <span class="selected"><input type="checkbox" checked="checked" id="showall" /><label for="showall">[% t('Show all columns') %]</label></span> <span><input type="checkbox" id="hideall" /><label for="hideall">[% t('Hide all columns') %]</label></span>
>         [% FOREACH authvals_ro IN authvals_row %]
>             <span class="selected"><label><input type="checkbox" checked="checked" id="col[% authvals_ro.colnum %]">[% authvals_ro.code %]</label></span>
>         [% END %]
>@@ -49,8 +50,8 @@
>     <table id="plan">
>     <thead>
>     <tr>
>-    <th>Fund name</th>
>-    <th>Fund total</th>
>+    <th>[% t('Fund name') %]</th>
>+    <th>[% t('Fund total') %]</th>
> 
>     [% FOREACH authvals_ro IN authvals_row %]
>          [% IF ( authvals_ro.display ) %]
>@@ -62,7 +63,7 @@
>     [% authvals_ro.code %]</th>
>     [% END %]
> 
>-    <th class="remaining">Fund remaining</th><th>&nbsp;</th>
>+    <th class="remaining">[% t('Fund remaining') %]</th><th>Â </th>
>     </tr>
>     </thead>
> 
>@@ -70,12 +71,12 @@
>     [% FOREACH budget_line IN budget_lines %]
>     <tr>
>         [% IF ( budget_line.budget_lock ) %]
>-            <td class="locked" title="Fund locked">
>+            <td class="locked" title="[% t('Fund locked') %]">
>         [% ELSE %]
>             <td>
>         [% END %]
>-        <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_id=[% budget_line.budget_id %]&amp;budget_period_id=[% budget_period_id %]">[% budget_line.budget_name %]</a></td>
>-        <td><span id="[% budget_line.budget_amount %]">[% budget_line.budget_amount | $Price %]&nbsp;</span>
>+        <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=[% budget_line.budget_id %]&budget_period_id=[% budget_period_id %]">[% budget_line.budget_name %]</a></td>
>+        <td><span id="[% budget_line.budget_amount %]">[% budget_line.budget_amount | $Price %]Â </span>
> 
> 
>         
>@@ -90,15 +91,15 @@
>             <table class="invis">
>                 <tr>
>                     [% IF show_actual %]
>-                        <td    >[% line.actual_amount %]</td>
>+                        <td>[% line.actual_amount %]</td>
>                     [% END %]
>                 <td>
> 
>                 [% IF ( line.budget_lock ) %]
>-                    [% line.estimated_amount %]&nbsp;
>-                    <input type="hidden" style="text-align: right;"  name="[% line.cell_name %]" value="[% line.estimated_amount %]"   />
>+                    [% line.estimated_amount %]Â 
>+                    <input type="hidden" style="text-align: right;" name="[% line.cell_name %]" value="[% line.estimated_amount %]" />
>                 [% ELSE %]
>-                    <input type="text" style="text-align: right;  width:90%; " size="6" name="[% line.cell_name %]"  value="[% line.estimated_amount %]"  id="budget_[% line.budget_id %][% line.colnum %]" class="plan_entry_[% line.budget_id %]" onchange="calcTotalRow(this);" />
>+                    <input type="text" style="text-align: right;  width:90%; " size="6" name="[% line.cell_name %]" value="[% line.estimated_amount %]" id="budget_[% line.budget_id %][% line.colnum %]" class="plan_entry_[% line.budget_id %]" onchange="calcTotalRow(this);" />
>                 [% END %]
> 
>                 </td></tr>
>@@ -128,7 +129,7 @@
>         [% ELSE %]
>             <td id="budget_est_[% budget_line.budget_id %]">
>         [% END %] 
>-                [% budget_line.budget_est_remain | $Price %]&nbsp;
>+                [% budget_line.budget_est_remain | $Price %]Â 
>             </td>
>             </tr>
>         </table>
>@@ -136,9 +137,9 @@
> 
>         <td>
>              [% UNLESS ( budget_line.budget_lock ) %]
>-                    <input type="button"  onclick="autoFillRow('[% budget_line.budget_id %]')" value="Auto-fill row"/>
>+                    <input type="button" onclick="autoFillRow('[% budget_line.budget_id %]')" value="Auto-fill row" />
>             [% ELSE %]
>-             <div style="color:red;">not owned</div>
>+             <div style="color:red;">[% t('not owned') %]</div>
>             [% END %]
>         </td>
>         </tr>
>@@ -150,7 +151,7 @@
>     [% IF ( budget_period_locked ) %]
>         
>     [% ELSE %]
>-        <fieldset class="action"><input type="button"  onclick="Check(this.form)" value="Save"/></fieldset>
>+        <fieldset class="action"><input type="button" onclick="Check(this.form)" value="Save" /></fieldset>
>     [% END %]
> 
> 
>@@ -158,7 +159,7 @@
>     [% FOREACH authvals_ro IN authvals_row %]
> 
>      [% UNLESS ( authvals_ro.display ) %]
>-        <input type="hidden" value="[% authvals_ro.code %]"  name="hide_cols"/>
>+        <input type="hidden" value="[% authvals_ro.code %]" name="hide_cols" />
>      [% END %]
>     [% END %]
> 
>@@ -168,9 +169,9 @@
> </form>
> 
>         [% ELSIF not budget_period_id %]
>-<div class="dialog alert">That budget does not exist! Please select a budget to continue.</div>
>+<div class="dialog alert">[% t('That budget does not exist! Please select a budget to continue.') %]</div>
>         [% ELSE %]
>-<div class="dialog message">No funds to display for this search criteria</div>
>+<div class="dialog message">[% t('No funds to display for this search criteria') %]</div>
>         [% END %]
> 
> 
>@@ -181,18 +182,18 @@
> <form method="post" action="/cgi-bin/koha/admin/aqplan.pl">
>     <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
> <fieldset class="brief">
>-<h4>Filter</h4>
>+<h4>[% t('Filter') %]</h4>
> [% BLOCK planning_types %]
> [%   SWITCH type %]
>-[%     CASE 'MONTHS'    %]<span>by months</span>
>-[%     CASE 'ITEMTYPES' %]<span>by item types</span>
>-[%     CASE 'BRANCHES'  %]<span>by libraries</span>
>-[%     CASE             %]<span>by [% type %]</span>
>+[%     CASE 'MONTHS'    %]<span>[% t('by months') %]</span>
>+[%     CASE 'ITEMTYPES' %]<span>[% t('by item types') %]</span>
>+[%     CASE 'BRANCHES'  %]<span>[% t('by libraries') %]</span>
>+[%     CASE             %]<span>[% t('by') %] [% type %]</span>
> [%   END %]
> [% END %]
> <ol>
>     <li>
>-        <label for="authcat"> Select planning type:</label>
>+        <label for="authcat"> [% t('Select planning type:') %]</label>
>         <select name="authcat" id="authcat" size="1">
>         [% FOREACH value IN authcat_dropbox.values %]
>             [% IF ( value == authcat_dropbox.default ) %]
>@@ -205,11 +206,11 @@
>     </li>
>     <li class="radio">
>     [% IF ( show_mine ) %]
>-        <input type="checkbox" id="show_mine"  name="show_mine" value="1" checked="checked" />
>+        <input type="checkbox" id="show_mine" name="show_mine" value="1" checked="checked" />
>     [% ELSE %]
>-        <input type="checkbox" id="show_mine"  name="show_mine" value="1"  />
>+        <input type="checkbox" id="show_mine" name="show_mine" value="1" />
>     [% END %]
>-    <label for="show_mine">Show my funds only</label>
>+    <label for="show_mine">[% t('Show my funds only') %]</label>
>     </li>
> 
>     <li class="radio">
>@@ -218,7 +219,7 @@
>     [% ELSE %]
>         <input type="checkbox" id="show_active" name="show_active" value="1" />
>         [% END %]
>-    <label for="show_active">Show active funds only</label>
>+    <label for="show_active">[% t('Show active funds only') %]</label>
>     </li>
> 
> 
>@@ -226,9 +227,9 @@
>         [% IF ( show_actual ) %]
>             <input type="checkbox" id="show_actual" name="show_actual" value="1" checked="checked" />
>         [% ELSE %]
>-            <input type="checkbox" id="show_actual" name="show_actual" value="1"  />
>+            <input type="checkbox" id="show_actual" name="show_actual" value="1" />
>         [% END %]
>-        <label for="show_actual">Show actual/estimated values</label>
>+        <label for="show_actual">[% t('Show actual/estimated values') %]</label>
>     </li>
>     </ol>
>     <fieldset class="action">
>@@ -240,10 +241,10 @@
> [% IF ( budget_lines ) %]
> <form method="post" action="/cgi-bin/koha/admin/aqplan.pl">
> <fieldset class="brief">
>-<h4>Export</h4>
>+<h4>[% t('Export') %]</h4>
>     <ol>
>-        <li><label for="basename">Output to a file named: </label><input type="text" name="basename" id="basename" value="Export" /></li>
>-        <li><label class="inline" for="MIME">Into an application</label>
>+        <li><label for="basename">[% t('Output to a file named:') %] </label><input type="text" name="basename" id="basename" value="Export" /></li>
>+        <li><label class="inline" for="MIME">[% t('Into an application') %]</label>
>             <select name="MIME" id="MIME" size="1">
>             [% FOREACH value IN CGIextChoice %]
>                 <option value="[% value %]">[% value %]</option>
>@@ -256,7 +257,7 @@
>             </select>
>         </li>
>     </ol>
>-    <fieldset class="action">    <input type="submit" value="Submit"/>
>+    <fieldset class="action">    <input type="submit" value="Submit" />
>     <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
>     <input type="hidden" name="report_name" value="[% report_name %]" />
>     <input type="hidden" name="output" value="file" /></fieldset>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
>index ecf62266ec..5f8a982224 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
>@@ -1,8 +1,9 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% USE Koha %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Audio alerts</title>
>+<title>[% t('Koha âº Administration âº Audio alerts') %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>@@ -10,7 +11,7 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Audio alerts</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> [% t('âº Audio alerts') %]</div>
> 
> <div id="doc3" class="yui-t2">
>     <div id="bd">
>@@ -18,75 +19,75 @@
>             <div class="yui-b">
> 
>                 <div id="toolbar" class="btn-toolbar">
>-                    <a class="btn btn-default btn-sm" id="newalert" href="/cgi-bin/koha/admin/audio_alerts.pl"><i class="fa fa-plus"></i> New alert</a>
>+                    <a class="btn btn-default btn-sm" id="newalert" href="/cgi-bin/koha/admin/audio_alerts.pl"><i class="fa fa-plus"></i> [% t('New alert') %]</a>
>                 </div>
> 
>                 <form id="new-alert-form" action="audio_alerts.pl" method="post" class="validated">
>                     <fieldset class="rows">
>-                        <legend><span class="create-alert">Add new alert</span><span class="edit-alert">Edit alert</span></legend>
>+                        <legend><span class="create-alert">[% t('Add new alert') %]</span><span class="edit-alert">[% t('Edit alert') %]</span></legend>
> 
>                         <input id="id" name="id" type="hidden" value="" />
>                         <ol>
>                             <li>
>-                                <label for="selector" class="required">Selector: </label>
>-                                <input id="selector" name="selector" type="text" class="required input-large" placeholder="selector" />
>-                                <span class="required">Required</span>
>+                                <label for="selector" class="required">[% t('Selector:') %] </label>
>+                                <input id="selector" name="selector" type="text" class="required input-large" placeholder="[% t('selector') %]" />
>+                                <span class="required">[% t('Required') %]</span>
>                             </li>
>                             <li>
>-                                <label for="sound" class="required">Sound: </label>
>-                                <input id="sound" name="sound" type="text" class="required input-large" placeholder="sound" />
>-                                <button id="play-sound" class="btn btn-default btn-xs disabled"><i class="fa fa-play"></i> Play sound</button>
>-                                 <span class="required">Required</span>
>+                                <label for="sound" class="required">[% t('Sound:') %] </label>
>+                                <input id="sound" name="sound" type="text" class="required input-large" placeholder="[% t('sound') %]" />
>+                                <button id="play-sound" class="btn btn-default btn-xs disabled"><i class="fa fa-play"></i> [% t('Play sound') %]</button>
>+                                 <span class="required">[% t('Required') %]</span>
>                             </li>
>                             <li>
>-                                <label for="koha-sounds">Select a built-in sound: </label>
>+                                <label for="koha-sounds">[% t('Select a built-in sound:') %] </label>
>                                 <select id="koha-sounds">
>-                                    <option value=""> -- Choose one -- </option>
>-                                    <option value="beep.ogg">beep.ogg</option>
>-                                    <option value="call.ogg">call.ogg</option>
>-                                    <option value="critical.ogg">critical.ogg</option>
>-                                    <option value="device_connect.ogg">device_connect.ogg</option>
>-                                    <option value="device_disconnect.ogg">device_disconnect.ogg</option>
>-                                    <option value="ending.ogg">ending.ogg</option>
>-                                    <option value="fail.ogg">fail.ogg</option>
>-                                    <option value="IM_notification.ogg">IM_notification.ogg</option>
>-                                    <option value="incoming_call.ogg">incoming_call.ogg</option>
>-                                    <option value="loading.ogg">loading.ogg</option>
>-                                    <option value="loading_2.ogg">loading_2.ogg</option>
>-                                    <option value="maximize.ogg">maximize.ogg</option>
>-                                    <option value="minimize.ogg">minimize.ogg</option>
>-                                    <option value="new_mail_notification.ogg">new_mail_notification.ogg</option>
>-                                    <option value="opening.ogg">opening.ogg</option>
>-                                    <option value="panic.ogg">panic.ogg</option>
>-                                    <option value="popup.ogg">popup.ogg</option>
>-                                    <option value="warning.ogg">warning.ogg</option>
>+                                    <option value=""> [% t('-- Choose one --') %] </option>
>+                                    <option value="beep.ogg">[% t('beep.ogg') %]</option>
>+                                    <option value="call.ogg">[% t('call.ogg') %]</option>
>+                                    <option value="critical.ogg">[% t('critical.ogg') %]</option>
>+                                    <option value="device_connect.ogg">[% t('device_connect.ogg') %]</option>
>+                                    <option value="device_disconnect.ogg">[% t('device_disconnect.ogg') %]</option>
>+                                    <option value="ending.ogg">[% t('ending.ogg') %]</option>
>+                                    <option value="fail.ogg">[% t('fail.ogg') %]</option>
>+                                    <option value="IM_notification.ogg">[% t('IM_notification.ogg') %]</option>
>+                                    <option value="incoming_call.ogg">[% t('incoming_call.ogg') %]</option>
>+                                    <option value="loading.ogg">[% t('loading.ogg') %]</option>
>+                                    <option value="loading_2.ogg">[% t('loading_2.ogg') %]</option>
>+                                    <option value="maximize.ogg">[% t('maximize.ogg') %]</option>
>+                                    <option value="minimize.ogg">[% t('minimize.ogg') %]</option>
>+                                    <option value="new_mail_notification.ogg">[% t('new_mail_notification.ogg') %]</option>
>+                                    <option value="opening.ogg">[% t('opening.ogg') %]</option>
>+                                    <option value="panic.ogg">[% t('panic.ogg') %]</option>
>+                                    <option value="popup.ogg">[% t('popup.ogg') %]</option>
>+                                    <option value="warning.ogg">[% t('warning.ogg') %]</option>
>                                 </select>
>                             </li>
>                         </ol>
>                     </fieldset>
>                     <fieldset class="action">
>                             <input id="save-alert" type="submit" value="Submit" />
>-                            <a href="#" id="cancel-edit" class="cancel cancel-edit">Cancel</a>
>+                            <a href="#" id="cancel-edit" class="cancel cancel-edit">[% t('Cancel') %]</a>
>                     </fieldset>
>                 </form>
> 
>                 <form id="delete-alert-form" action="audio_alerts.pl" method="post">
>-                    <h3>Audio alerts</h3>
>+                    <h3>[% t('Audio alerts') %]</h3>
>                     [%IF !( Koha.Preference('AudioAlerts') ) %]
>                         <div class="dialog alert">
>-                            <p><strong>Note: </strong></p>
>-                            <p>Please enable system preference 'AudioAlerts' to activate sounds.</p>
>+                            <p><strong>[% t('Note:') %] </strong></p>
>+                            <p>[% t('Please enable system preference \'AudioAlerts\' to activate sounds.') %]</p>
>                         </div>
>                     [% END %]
>                     <table id="audio-alerts-table">
>                         <thead id="audio-alerts-table-head">
>                             <tr>
>-                                <th>&nbsp;</th>
>-                                <th>Precedence</th>
>-                                <th>Change order</th>
>-                                <th>Selector</th>
>-                                <th>Sound</th>
>-                                <th>&nbsp;</th>
>+                                <th>Â </th>
>+                                <th>[% t('Precedence') %]</th>
>+                                <th>[% t('Change order') %]</th>
>+                                <th>[% t('Selector') %]</th>
>+                                <th>[% t('Sound') %]</th>
>+                                <th>Â </th>
>                             </tr>
>                         </thead>
> 
>@@ -96,33 +97,33 @@
>                                     <td><input type="checkbox" name="delete" value="[% a.id %]" /></td>
>                                     <td>[% a.precedence %]</td>
>                                     <td style="white-space:nowrap;">
>-                                        <a title="Move alert up" href="audio_alerts.pl?action=move&amp;where=up&amp;id=[% a.id %]">
>+                                        <a title="[% t('Move alert up') %]" href="audio_alerts.pl?action=move&where=up&id=[% a.id %]">
>                                             <i class="fa fa-arrow-up fa-lg order-control"></i>
>                                         </a>
> 
>-                                        <a title="Move alert to top" href="audio_alerts.pl?action=move&amp;where=top&amp;id=[% a.id %]">
>+                                        <a title="[% t('Move alert to top') %]" href="audio_alerts.pl?action=move&where=top&id=[% a.id %]">
>                                             <i class="fa fa-arrow-up fa-lg overline order-control"></i>
>                                         </a>
> 
>-                                        <a title="Move alert to bottom" href="audio_alerts.pl?action=move&amp;where=bottom&amp;id=[% a.id %]">
>+                                        <a title="[% t('Move alert to bottom') %]" href="audio_alerts.pl?action=move&where=bottom&id=[% a.id %]">
>                                             <i class="fa fa-arrow-down fa-lg underline order-control"></i>
>                                         </a>
> 
>-                                        <a title="Move alert down" href="audio_alerts.pl?action=move&amp;where=down&amp;id=[% a.id %]">
>+                                        <a title="[% t('Move alert down') %]" href="audio_alerts.pl?action=move&where=down&id=[% a.id %]">
>                                             <i class="fa fa-arrow-down fa-lg order-control"></i>
>                                         </a>
>                                     </td>
>                                     <td>[% a.selector %]</td>
>                                     <td>[% a.sound %]</td>
>                                     <td>
>-                                        <a class="btn btn-default btn-xs edit" data-soundid="[% a.id %]" data-precedence="[% a.precedence %]" data-selector="[% a.selector %]" data-sound="[% a.sound %]"><i class="fa fa-pencil"></i> Edit</a></td>
>+                                        <a class="btn btn-default btn-xs edit" data-soundid="[% a.id %]" data-precedence="[% a.precedence %]" data-selector="[% a.selector %]" data-sound="[% a.sound %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a></td>
>                                 </tr>
>                             [% END %]
>                         </tbody>
>                     </table>
> 
>                     <p>
>-                        <button id="delete-alerts" type="submit" class="btn btn-default btn-sm disabled"><i class="fa fa-trash"></i> Delete selected alerts</button>
>+                        <button id="delete-alerts" type="submit" class="btn btn-default btn-sm disabled"><i class="fa fa-trash"></i> [% t('Delete selected alerts') %]</button>
>                     </p>
>                 </form>
>             </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
>index 8e6e6d3acb..16895d6b6f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
>@@ -1,26 +1,27 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Authority MARC subfield structure</title>
>+<title>[% t('Koha âº Administration âº Authority MARC subfield structure') %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
> <body id="admin_auth_subfields_structure" class="admin">
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;
>-  <a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a> &rsaquo;
>-  [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri%]">[% authtypecode |html%] framework</a> &rsaquo;
>-  [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a> &rsaquo;
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> âº
>+  <a href="/cgi-bin/koha/admin/authtypes.pl">[% t('Authority types') %]</a> âº
>+  [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri%]">[% authtypecode |html%] [% t('framework') %]</a> âº
>+  [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">[% t('Default framework') %]</a> âº
>   [% END %]
>-  [% IF ( else ) %]Authority MARC subfield structure for [% tagfield | html %]
>-  [% ELSE %]<a href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;tagsubfield=[% tagsubfield %]&amp;authtypecode=[% authtypecode |uri %]">Authority MARC subfield structure for [% tagfield | html %]</a> &rsaquo;
>+  [% IF ( else ) %][% t('Authority MARC subfield structure for') %] [% tagfield | html %]
>+  [% ELSE %]<a href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield | uri %]&tagsubfield=[% tagsubfield %]&authtypecode=[% authtypecode |uri %]">[% t('Authority MARC subfield structure for') %] [% tagfield | html %]</a> âº
>   [% END %]
>-  [% IF ( delete_confirm ) %]Confirm deletion of subfield [% tagsubfield %]?[% END %]
>-  [% IF ( delete_confirmed ) %]Data deleted[% END %]
>+  [% IF ( delete_confirm ) %][% t('Confirm deletion of subfield') %] [% tagsubfield %]?[% END %]
>+  [% IF ( delete_confirmed ) %][% t('Data deleted') %][% END %]
>   [% IF ( add_form ) %]
>   [% IF ( use_heading_flags_p ) %]
>-  [% IF ( heading_edit_subfields_p ) %]Edit MARC subfields constraints[% END %]
>+  [% IF ( heading_edit_subfields_p ) %][% t('Edit MARC subfields constraints') %][% END %]
>   [% ELSE %][% action %][% END %]
>   [% END %]
> </div>
>@@ -34,18 +35,18 @@
> [% IF ( add_form ) %]
> 
>     <h1>[% IF ( use_heading_flags_p ) %]
>-    [% IF ( heading_edit_subfields_p ) %]Edit MARC subfields constraints for field [% tagfield | html %] authority [% authtypecode |html%][% END %]
>+    [% IF ( heading_edit_subfields_p ) %][% t('Edit MARC subfields constraints for field') %] [% tagfield | html %] [% t('authority') %] [% authtypecode |html%][% END %]
>     [% ELSE %][% action %][% END %]</h1>
>     <form action="[% script_name %]" name="Aform" method="post">
>         <input type="hidden" name="op" value="add_validate" />
>         <input type="hidden" name="tagfield" value="[% tagfield | html %]" />
>         <input type="hidden" name="authtypecode" value="[% authtypecode | html%]" />
>-        <fieldset class="action"><input type="submit" class="submit" value="Save changes" /> <a class="cancel" href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;authtypecode=[% authtypecode |uri %]">Cancel</a></fieldset>
>+        <fieldset class="action"><input type="submit" class="submit" value="Save changes" /> <a class="cancel" href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield | uri %]&authtypecode=[% authtypecode |uri %]">[% t('Cancel') %]</a></fieldset>
>         <div id="subfieldtabs" class="toptabs numbered">
>             <ul>
>                 [% FOREACH loo IN loop %]
>                     [% IF ( loo.new_subfield ) %]
>-                        <li><a href="#sub[% loo.tagsubfield %]field" title="[% loo.liblibrarian | html_entity %]">New</a></li>
>+                        <li><a href="#sub[% loo.tagsubfield %]field" title="[% loo.liblibrarian | html_entity %]">[% t('New') %]</a></li>
>                     [% ELSE %]
>                         <li><a href="#sub[% loo.tagsubfield %]field" title="[% loo.liblibrarian | html_entity %]">
>                             [% loo.tagsubfield %]
>@@ -60,7 +61,7 @@
> 
>                 [% IF ( loo.new_subfield ) %]
>                     <li>
>-                        <label for="tagsubfieldinput[% loo.row %]">Subfield code: </label>
>+                        <label for="tagsubfieldinput[% loo.row %]">[% t('Subfield code:') %] </label>
>                         <input type="text" name="tagsubfield" value="[% loo.tagsubfield %]" size="1" id="tagsubfield" maxlength="1" />
>                     </li>
>                 [% ELSE %]
>@@ -69,7 +70,7 @@
>                     </li>
>                 [% END %]
>                 <li>
>-                    <label for="repeatable[% loo.row %]">Repeatable: </label>
>+                    <label for="repeatable[% loo.row %]">[% t('Repeatable:') %] </label>
>                     [% IF loo.repeatable %]
>                         <input type="checkbox" id="repeatable[% loo.row %]" name="repeatable[% loo.row %]" checked="checked" value="1" />
>                     [% ELSE %]
>@@ -77,47 +78,47 @@
>                     [% END %]
>                 </li>
>                 <li>
>-                    <label for="mandatory[% loo.row %]">Mandatory: </label>
>+                    <label for="mandatory[% loo.row %]">[% t('Mandatory:') %] </label>
>                     [% IF loo.mandatory %]
>                         <input type="checkbox" id="mandatory[% loo.row %]" name="mandatory[% loo.row %]" checked="checked" value="1" />
>                     [% ELSE %]
>                         <input type="checkbox" id="mandatory[% loo.row %]" name="mandatory[% loo.row %]" value="1" />
>                     [% END %]
>                 </li>
>-                <li><label for="liblibrarian[% loo.row %]">Text for librarian: </label><input id="liblibrarian[% loo.row %]" type="text" name="liblibrarian" value="[% loo.liblibrarian | html_entity %]" size="40" maxlength="80" /></li>
>-                <li><label for="libopac[% loo.row %]">Text for OPAC: </label><input type="text" id="libopac[% loo.row %]" name="libopac" value="[% loo.libopac | html_entity %]" size="40" maxlength="80" /></li>
>-                <li><label for="tab[% loo.row %]">Managed in tab: </label>
>+                <li><label for="liblibrarian[% loo.row %]">[% t('Text for librarian:') %] </label><input id="liblibrarian[% loo.row %]" type="text" name="liblibrarian" value="[% loo.liblibrarian | html_entity %]" size="40" maxlength="80" /></li>
>+                <li><label for="libopac[% loo.row %]">[% t('Text for OPAC:') %] </label><input type="text" id="libopac[% loo.row %]" name="libopac" value="[% loo.libopac | html_entity %]" size="40" maxlength="80" /></li>
>+                <li><label for="tab[% loo.row %]">[% t('Managed in tab:') %] </label>
>                     <select name="tab" size="1" id="tab[% loo.row %]">
>                         [%- IF ( loo.tab ==  -1 ) -%]
>-                        <option value="-1" selected="selected">ignore</option>
>+                        <option value="-1" selected="selected">[% t('ignore') %]</option>
>                         [%- ELSE -%]
>-                        <option value="-1">ignore</option>
>+                        <option value="-1">[% t('ignore') %]</option>
>                         [%- END -%]
>                     [%- FOREACH t IN [ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'] -%]
>                         [%- IF ( loo.tab ==  t && t.length>0 ) -%]
>                         <option value="[%- t -%]" selected="selected">[%- t -%]</option>
>                         [%- ELSIF ( loo.tab ==  t ) -%]
>-                        <option value="[%- t -%]" selected="selected">&nbsp;</option>
>+                        <option value="[%- t -%]" selected="selected">Â </option>
>                         [%- ELSE -%]
>                         <option value="[%- t -%]">[%- t -%]</option>
>                         [%- END -%]
>                     [%- END -%]
>                     </select>
>-                    (ignore means that the subfield does not display in the record editor)
>+                    [% t('(ignore means that the subfield does not display in the record editor)') %]
>                 </li>
>                 <li>
>                     <fieldset>
>-                        <legend>Display</legend>
>+                        <legend>[% t('Display') %]</legend>
>                         <ol>
>-                            <li><label for="ohidden[% loo.row %]">Select to display or not:</label>
>+                            <li><label for="ohidden[% loo.row %]">[% t('Select to display or not:') %]</label>
>                                 <select name="ohidden" size="1" id="ohidden[% loo.row %]">
>                                     [%- IF ( loo.ohidden ==  0 ) -%]
>-                                    <option value= "0" selected="selected">Show all</option>
>-                                    <option value="1">Hide all</option>
>+                                    <option value="0" selected="selected">[% t('Show all') %]</option>
>+                                    <option value="1">[% t('Hide all') %]</option>
>                                     [%- ELSE -%]
>                                     [%# All other non-zero values mean: Hide %]
>-                                    <option value= "0">Show all</option>
>-                                    <option value="1" selected="selected">Hide all</option>
>+                                    <option value="0">[% t('Show all') %]</option>
>+                                    <option value="1" selected="selected">[% t('Hide all') %]</option>
>                                     [%- END -%]
>                                 </select>
>                             </li>
>@@ -126,37 +127,37 @@
>                 </li>
>                 <li>
>                     <fieldset class="rows">
>-                        <legend>Advanced constraints:</legend>
>+                        <legend>[% t('Advanced constraints:') %]</legend>
>                         <ol>
>                             <li>
>-                                <label for="isurl[% loo.row %]">Is a URL:</label>
>+                                <label for="isurl[% loo.row %]">[% t('Is a URL:') %]</label>
>                                 [% IF loo.isurl %]
>                                     <input type="checkbox" id="isurl[% loo.row %]" name="isurl[% loo.row %]" checked="checked" value="1" />
>                                 [% ELSE %]
>                                     <input type="checkbox" id="isurl[% loo.row %]" name="isurl[% loo.row %]" value="1" />
>                                 [% END %]
>-                                (if checked, it means that the subfield is a URL and can be clicked)
>+                                [% t('(if checked, it means that the subfield is a URL and can be clicked)') %]
>                             </li>
>                             <li>
>-                                <label for="defaultvalue[% loo.row %]">Default value:</label>
>+                                <label for="defaultvalue[% loo.row %]">[% t('Default value:') %]</label>
>                                 <input type="text" name="defaultvalue" id="defaultvalue[% loo.row %]" value="[% loo.defaultvalue %]" />
>                             </li>
>                         </ol>
>                     </fieldset>
>                 </li>
>                 <li>
>-                    <fieldset><legend>Help input</legend>    
>+                    <fieldset><legend>[% t('Help input') %]</legend>    
>                         <ol>
>                             <li>
>-                                <label for="kohafield[% loo.row %]">Koha field:</label>
>+                                <label for="kohafield[% loo.row %]">[% t('Koha field:') %]</label>
>                                 <select name="kohafield" id="kohafield[% loo.row %]" size="1">
>                                 [%- FOREACH value IN loo.kohafields %]
>                                     [% IF ( value == loo.kohafield  && value.length>0 ) -%]
>                                     <option value="[% value %]" selected="selected">[% value %]</option>
>                                     [%- ELSIF ( value == loo.kohafield ) -%]
>-                                    <option value="[% value %]" selected="selected">&nbsp;</option>
>+                                    <option value="[% value %]" selected="selected">Â </option>
>                                     [%- ELSIF ( value.length==0 ) -%]
>-                                    <option value="[% value %]">&nbsp;</option>
>+                                    <option value="[% value %]">Â </option>
>                                     [%- ELSE -%]
>                                     <option value="[% value %]">[% value %]</option>
>                                     [%- END -%]
>@@ -164,15 +165,15 @@
>                                 </select>
>                             </li>
>                             <li>
>-                                <label for="authorised_value[% loo.row %]">Authorized value:</label>
>+                                <label for="authorised_value[% loo.row %]">[% t('Authorized value:') %]</label>
>                                 <select name="authorised_value" id="authorised_value[% loo.row %]" size="1">
>                                 [%- FOREACH value IN loo.authorised_values %]
>                                     [% IF ( value == loo.authorised_value && value.length>0 ) -%]
>                                     <option value="[% value %]" selected="selected">[% value %]</option>
>                                     [%- ELSIF ( value == loo.authorised_value ) -%]
>-                                    <option value="[% value %]" selected>&nbsp;</option>
>+                                    <option value="[% value %]" selected="">Â </option>
>                                     [%- ELSIF ( value.length==0 ) -%]
>-                                    <option value="[% value %]">&nbsp;</option>
>+                                    <option value="[% value %]">Â </option>
>                                     [%- ELSE -%]
>                                     <option value="[% value %]">[% value %]</option>
>                                     [%- END -%]
>@@ -180,15 +181,15 @@
>                                 </select>
>                             </li>
>                             <li>
>-                                <label for="frameworkcode[% loo.row %]">Thesaurus:</label>
>+                                <label for="frameworkcode[% loo.row %]">[% t('Thesaurus:') %]</label>
>                                 <select name="frameworkcode" id="frameworkcode[% loo.row %]" size="1">
>                                 [%- FOREACH value IN loo.frameworkcodes %]
>                                     [% IF ( value == loo.frameworkcode && value.length>0 ) -%]
>                                     <option value="[% value %]" selected="selected">[% value %]</option>
>                                     [%- ELSIF ( value == loo.frameworkcode ) -%]
>-                                    <option value="[% value %]" selected="selected">&nbsp;</option>
>+                                    <option value="[% value %]" selected="selected">Â </option>
>                                     [%- ELSIF ( value.length==0 ) -%]
>-                                    <option value="[% value %]">&nbsp;</option>
>+                                    <option value="[% value %]">Â </option>
>                                     [%- ELSE -%]
>                                     <option value="[% value %]">[% value %]</option>
>                                     [%- END -%]
>@@ -196,15 +197,15 @@
>                                 </select>
>                             </li>
>                             <li>
>-                                <label for="value_builder[% loo.row %]">Plugin:</label>
>+                                <label for="value_builder[% loo.row %]">[% t('Plugin:') %]</label>
>                                 <select name="value_builder" id="value_builder[% loo.row %]" size="1">
>                                 [%- FOREACH value IN loo.value_builders %]
>                                     [% IF ( value == loo.value_builder && value.length>0 ) -%]
>                                     <option value="[% value %]" selected="selected">[% value %]</option>
>                                     [%- ELSIF ( value == loo.value_builder ) -%]
>-                                    <option value="[% value %]" selected="selected">&nbsp;</option>
>+                                    <option value="[% value %]" selected="selected">Â </option>
>                                     [%- ELSIF ( value.length==0 ) -%]
>-                                    <option value="[% value %]">&nbsp;</option>
>+                                    <option value="[% value %]">Â </option>
>                                     [%- ELSE -%]
>                                     <option value="[% value %]">[% value %]</option>
>                                     [%- END -%]
>@@ -224,18 +225,18 @@
> [% IF ( delete_confirm ) %]
> 
>     <div class="dialog alert">
>-        <h3>Delete subfield <span class="ex">'[% tagsubfield %]'?</span></h3>
>+        <h3>[% t('Delete subfield') %] <span class="ex">'[% tagsubfield %]'?</span></h3>
>         <form action="[% delete_link %]" method="post">
>             <input type="hidden" name="op" value="delete_confirmed" />
>             <table>
>-                <tr><th scope="row">Subfield:</th> <td>[% tagsubfield %]</td></tr>
>-                <tr><th scope="row">Description:</th> <td>[% liblibrarian | html_entity %]</td></tr>
>+                <tr><th scope="row">[% t('Subfield:') %]</th> <td>[% tagsubfield %]</td></tr>
>+                <tr><th scope="row">[% t('Description:') %]</th> <td>[% liblibrarian | html_entity %]</td></tr>
>             </table>
>             <input type="hidden" name="searchfield" value="[% searchfield %]" />
>             <input type="hidden" name="tagfield" value="[% tagfield%]" />
>             <input type="hidden" name="tagsubfield" value="[% tagsubfield | html %]" />
>             <input type="hidden" name="authtypecode" value="[% authtypecode | html %]" />
>-            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this subfield</button>
>+            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('Yes, delete this subfield') %]</button>
>         </form>
> 
>         <form action="[% delete_link %]" method="get">
>@@ -243,14 +244,14 @@
>             <input type="hidden" name="tagfield" value="[% tagfield | html %]" />
>             <input type="hidden" name="tagsubfield" value="[% tagsubfield %]" />
>             <input type="hidden" name="authtypecode" value="[% authtypecode |html %]" />
>-            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
>+            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> [% t('No, do not delete') %]</button>
>         </form>
>     </form></div>
> [% END %]
> 
> [% IF ( delete_confirmed ) %]
> 
>-   <div class="dialog message"> <h3>Data deleted</h3>
>+   <div class="dialog message"> <h3>[% t('Data deleted') %]</h3>
>     <form action="[% script_name %]" method="post">
>         <input type="hidden" name="tagfield" value="[% tagfield | html %]" />
>         <input type="submit" class="approve" value="OK" />
>@@ -259,16 +260,16 @@
> 
> 
> [% IF ( else ) %]
>-<h1>Authority MARC subfield structure admin for [% tagfield | html %] (authority: [% authtypecode | html%])</h1>
>-<p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.</p>
>-<p>The column 'Koha field' shows that the subfield is linked with a Koha field.</p>
>+<h1>[% t('Authority MARC subfield structure admin for') %] [% tagfield | html %] [% t('(authority:') %] [% authtypecode | html%])</h1>
>+<p>[% t('This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.') %]</p>
>+<p>[% t('The column \'Koha field\' shows that the subfield is linked with a Koha field.') %]</p>
> 
> <table>
>     <tr>
>-        <th>Subfield</th>
>-        <th>Text</th>
>-        <th>Constraints</th>
>-        <th>&nbsp;</th>
>+        <th>[% t('Subfield') %]</th>
>+        <th>[% t('Text') %]</th>
>+        <th>[% t('Constraints') %]</th>
>+        <th>Â </th>
>     </tr>
>     [% FOREACH loo IN loop %]
>     <tr>
>@@ -282,26 +283,26 @@
>         </td>
>         <td>
>             [% IF ( loo.subfield_ignored ) %]
>-                    <i>subfield ignored</i>
>+                    <i>[% t('subfield ignored') %]</i>
>             [% ELSE %]
>-                <strong>Tab:</strong>[% loo.tab %],
>-                [% IF ( loo.kohafield ) %] | <strong>Koha field:</strong> [% loo.kohafield %], [% END %]
>-                [% IF ( loo.repeatable ) %]Repeatable, [% ELSE %]Not repeatable,
>+                <strong>[% t('Tab:') %]</strong>[% loo.tab %],
>+                [% IF ( loo.kohafield ) %] | <strong>[% t('Koha field:') %]</strong> [% loo.kohafield %], [% END %]
>+                [% IF ( loo.repeatable ) %][% t('Repeatable,') %] [% ELSE %][% t('Not repeatable,') %]
>                 [% END %]
>-                        [% IF ( loo.mandatory ) %]Mandatory, [% ELSE %]Not mandatory,
>+                        [% IF ( loo.mandatory ) %][% t('Mandatory,') %] [% ELSE %][% t('Not mandatory,') %]
>                 [% END %]
>-                        [% IF ( loo.hidden ) %]hidden,
>+                        [% IF ( loo.hidden ) %][% t('hidden,') %]
>                 [% END %]
>-                        [% IF ( loo.isurl ) %]is a url,
>+                        [% IF ( loo.isurl ) %][% t('is a url,') %]
>                 [% END %]
>-                        [% IF ( loo.authorised_value ) %] | <strong>Auth value:</strong>[% loo.authorised_value %],
>+                        [% IF ( loo.authorised_value ) %] | <strong>[% t('Auth value:') %]</strong>[% loo.authorised_value %],
>                 [% END %]
>-                        [% IF ( loo.frameworkcode ) %] | <strong>Authority:</strong>[% loo.frameworkcode %],
>+                        [% IF ( loo.frameworkcode ) %] | <strong>[% t('Authority:') %]</strong>[% loo.frameworkcode %],
>                 [% END %]
>-                [% IF ( loo.value_builder ) %] | <strong>Plugin:</strong>[% loo.value_builder %],[% END %]
>+                [% IF ( loo.value_builder ) %] | <strong>[% t('Plugin:') %]</strong>[% loo.value_builder %],[% END %]
>             [% END %]
>         </td>
>-        <td><a href="[% loo.delete %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a></td>
>+        <td><a href="[% loo.delete %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> [% t('Delete') %]</a></td>
>     </tr>
>     [% END %]
> </table>
>@@ -311,16 +312,16 @@
>     <input type="hidden" name="tagfield" value="[% edit_tagfield %]" />
>     <input type="hidden" name="authtypecode" value="[% edit_authtypecode %]" />
>     <input type="submit" value="Edit subfields" />
>-    <a class="cancel" href="auth_tag_structure.pl?searchfield=[% tagfield | uri%]&amp;authtypecode=[% authtypecode | uri %]">Cancel</a></fieldset>
>+    <a class="cancel" href="auth_tag_structure.pl?searchfield=[% tagfield | uri%]&authtypecode=[% authtypecode | uri %]">[% t('Cancel') %]</a></fieldset>
>     </form>
> 
>     [% IF ( previous ) %]
>-    <input type="image" src="[% interface %]/[% theme %]/images/1leftarrow.png" title="previous" alt="previous" />
>+    <input type="image" src="[% interface %]/[% theme %]/images/1leftarrow.png" title="[% t('previous') %]" alt="[% t('previous') %]" />
>     </a>
>     [% END %]
>     [% IF ( next ) %]
>         [% next %]
>-    <input type="image" src="[% interface %]/[% theme %]/images/1rightarrow.png" title="next" alt="next" />
>+    <input type="image" src="[% interface %]/[% theme %]/images/1rightarrow.png" title="[% t('next') %]" alt="[% t('next') %]" />
>     </a>
>     [% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
>index 435210f511..d5bdf51c0b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
>@@ -1,11 +1,12 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% USE AuthorisedValues %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Authority MARC framework [% IF ( add_form ) %][% IF ( use_heading_flags_p ) %]
>-    [% IF ( heading_modify_tag_p ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default framework[% END %] &rsaquo; Modify tag[% END %]
>-    [% IF ( heading_add_tag_p ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default framework[% END %] &rsaquo; New tag[% END %]
>-    [% ELSE %]&rsaquo; [% action %][% END %][% END %][% IF ( delete_confirm ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default framework[% END %] &rsaquo; Confirm deletion[% END %][% IF ( delete_confirmed ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default framework[% END %] &rsaquo; Data deleted[% END %]</title>
>+<title>[% t('Koha âº Administration âº Authority MARC framework') %] [% IF ( add_form ) %][% IF ( use_heading_flags_p ) %]
>+    [% IF ( heading_modify_tag_p ) %]âº [% IF ( authtypecode ) %][% authtypecode %] [% t('Framework') %][% ELSE %][% t('Default framework') %][% END %] [% t('âº Modify tag') %][% END %]
>+    [% IF ( heading_add_tag_p ) %]âº [% IF ( authtypecode ) %][% authtypecode %] [% t('Framework') %][% ELSE %][% t('Default framework') %][% END %] [% t('âº New tag') %][% END %]
>+    [% ELSE %]âº [% action %][% END %][% END %][% IF ( delete_confirm ) %]âº [% IF ( authtypecode ) %][% authtypecode %] [% t('Framework') %][% ELSE %][% t('Default framework') %][% END %] [% t('âº Confirm deletion') %][% END %][% IF ( delete_confirmed ) %]âº [% IF ( authtypecode ) %][% authtypecode %] [% t('Framework') %][% ELSE %][% t('Default framework') %][% END %] [% t('âº Data deleted') %][% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> 
> [% Asset.css("css/datatables.css") %]
>@@ -15,38 +16,38 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;
>-    <a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a> &rsaquo;
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> âº
>+    <a href="/cgi-bin/koha/admin/authtypes.pl">[% t('Authority types') %]</a> âº
>     [% IF ( add_form ) %]
>         [% IF ( use_heading_flags_p ) %]
>             [% IF ( heading_modify_tag_p ) %]
>-                [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] Framework</a>
>-                [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>-                [% END %] &rsaquo; Modify tag
>+                [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] [% t('Framework') %]</a>
>+                [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">[% t('Default framework') %]</a>
>+                [% END %] [% t('âº Modify tag') %]
>             [% END %]
>             [% IF ( heading_add_tag_p ) %]
>-                [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] framework</a>
>-                [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>-                [% END %] &rsaquo; New tag
>+                [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] [% t('framework') %]</a>
>+                [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">[% t('Default framework') %]</a>
>+                [% END %] [% t('âº New tag') %]
>             [% END %]
>         [% ELSE %]
>-            [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] Framework</a>
>-            [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>-            [% END %] &rsaquo; [% action %]
>+            [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] [% t('Framework') %]</a>
>+            [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">[% t('Default framework') %]</a>
>+            [% END %] âº [% action %]
>         [% END %]
>     [% ELSE %]
>         [% IF ( delete_confirm ) %]
>-            [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] framework</a>
>-            [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>-            [% END %] &rsaquo; Confirm deletion
>+            [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] [% t('framework') %]</a>
>+            [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">[% t('Default framework') %]</a>
>+            [% END %] [% t('âº Confirm deletion') %]
>         [% ELSE %]
>             [% IF ( delete_confirmed ) %]
>-                [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] framework</a>
>-                [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>-                [% END %] &rsaquo; Data deleted
>+                [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] [% t('framework') %]</a>
>+                [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">[% t('Default framework') %]</a>
>+                [% END %] [% t('âº Data deleted') %]
>             [% ELSE %]
>-                [% IF ( authtypecode ) %][% authtypecode %] Framework
>-                [% ELSE %]Default framework
>+                [% IF ( authtypecode ) %][% authtypecode %] [% t('Framework') %]
>+                [% ELSE %][% t('Default framework') %]
>                 [% END %]
>             [% END %]
>         [% END %]
>@@ -59,14 +60,14 @@
>     <div id="yui-main">
>     <div class="yui-b">
> 
>-<h1>Authority MARC framework for [% IF ( authtypecode ) %][% authtypecode %][% ELSE %]default framework[% END %]</h1>
>+<h1>[% t('Authority MARC framework for') %] [% IF ( authtypecode ) %][% authtypecode %][% ELSE %][% t('default framework') %][% END %]</h1>
> 
> 
> [% IF ( add_form ) %]
> 
>     <h2>
>-    [% IF ( heading_modify_tag_p ) %]Modify tag[% END %]
>-    [% IF ( heading_add_tag_p ) %]New tag[% END %]
>+    [% IF ( heading_modify_tag_p ) %][% t('Modify tag') %][% END %]
>+    [% IF ( heading_add_tag_p ) %][% t('New tag') %][% END %]
>     </h2>
>     <form action="[% script_name %]" name="Aform" method="post" class="validated">
>         <input type="hidden" name="op" value="add_validate" />
>@@ -76,45 +77,45 @@
>             <ol>
>                 [% IF ( heading_modify_tag_p ) %]
>                     <li>
>-                        <span class="label">Tag: </span>
>+                        <span class="label">[% t('Tag:') %] </span>
>                         <input type="hidden" name="tagfield" value="[% searchfield %]" />
>                         [% searchfield %]
>                     </li>
>                 [% ELSE %]
>                     <li>
>-                        <label for="tagfield" class="required">Tag: </label><input type="text" id="tagfield" name="tagfield" size="5" maxlength="3" required="required" class="required" />
>-                        <span class="required">Required</span>
>+                        <label for="tagfield" class="required">[% t('Tag:') %] </label><input type="text" id="tagfield" name="tagfield" size="5" maxlength="3" required="required" class="required" />
>+                        <span class="required">[% t('Required') %]</span>
>                     </li>
>                 [% END %]
> 
>-        <li><label for="liblibrarian">Text for librarians: </label><input type="text" name="liblibrarian" id="liblibrarian" value="[% liblibrarian |html %]" size="40" maxlength="100" /></li>
>-        <li><label for="libopac">Text for opac: </label><input type="text" name="libopac" id="libopac" value="[% libopac |html %]" size="40" maxlength="100" /></li>
>-        <li><label for="repeatable">Repeatable: </label>
>+        <li><label for="liblibrarian">[% t('Text for librarians:') %] </label><input type="text" name="liblibrarian" id="liblibrarian" value="[% liblibrarian |html %]" size="40" maxlength="100" /></li>
>+        <li><label for="libopac">[% t('Text for opac:') %] </label><input type="text" name="libopac" id="libopac" value="[% libopac |html %]" size="40" maxlength="100" /></li>
>+        <li><label for="repeatable">[% t('Repeatable:') %] </label>
>             [% IF ( repeatable ) %]
>                 <input type="checkbox" name="repeatable" id="repeatable" value="1" checked="checked" />
>             [% ELSE %]
>                 <input type="checkbox" name="repeatable" id="repeatable" value="1" />
>             [% END %]
>         </li>
>-        <li><label for="mandatory">Mandatory: </label>
>+        <li><label for="mandatory">[% t('Mandatory:') %] </label>
>             [% IF ( mandatory ) %]
>                 <input type="checkbox" name="mandatory" id="mandatory" value="1" checked="checked" />
>             [% ELSE %]
>                 <input type="checkbox" name="mandatory" id="mandatory" value="1" />
>             [% END %]
>         </li>
>-        <li><label for="authorised_value">Authorized value: </label>
>+        <li><label for="authorised_value">[% t('Authorized value:') %] </label>
>             <select name="authorised_value" id="authorised_value" size="1">
>                 <option value=""></option>
>                 [% PROCESS options_for_authorised_value_categories authorised_value_categories => AuthorisedValues.GetCategories( selected => authorised_value ) %]
>             </select>
>-            (if you select a value here, the indicators will be limited to the authorized value list)
>+            [% t('(if you select a value here, the indicators will be limited to the authorized value list)') %]
>         </li>
>         </ol>
>         </fieldset>
>         <fieldset class="action">
>             <input type="submit" value="Submit" />
>-            <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]" class="cancel">Cancel</a>
>+            <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]" class="cancel">[% t('Cancel') %]</a>
>         </fieldset>
>     </form>
> [% END %]
>@@ -122,25 +123,25 @@
> 
> [% IF ( delete_confirm ) %]
>     <div class="dialog alert">
>-        <h3>Confirm deletion</h3>
>+        <h3>[% t('Confirm deletion') %]</h3>
>         <form action="[% script_name %]" method="post">
>             <table>
>-                <tr><th scope="row">Tag: </th><td>[% searchfield %] [% liblibrarian %]</td></tr>
>+                <tr><th scope="row">[% t('Tag:') %] </th><td>[% searchfield %] [% liblibrarian %]</td></tr>
>             </table>
>             <input type="hidden" name="op" value="delete_confirmed" />
>             <input type="hidden" name="authtypecode" value="[% authtypecode %]" />
>             <input type="hidden" name="searchfield" value="[% searchfield %]" />
>-            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
>+            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('Yes, delete') %]</button>
>         </form>
>         <form action="[% script_name %]" method="get">
>-            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
>+            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> [% t('No, do not delete') %]</button>
>         </form>
>     </div>
> [% END %]
> 
> [% IF ( delete_confirmed ) %]
> 
>-  <div class="dialog message">  <h3>Data deleted</h3>
>+  <div class="dialog message">  <h3>[% t('Data deleted') %]</h3>
>     <form action="[% script_name %]" method="post">
>     <input type="hidden" name="authtypecode" value="[% authtypecode %]" />
>     <input type="hidden" name="searchfield" value="[% searchfield %]" />
>@@ -152,7 +153,7 @@
>     <form action="[% script_name %]" method="post">
>         <input type="hidden" name="op" value="authtype_create_confirm" />
>         <input type="hidden" name="authtypecode" value="[% authtypecode %]" />
>-        Create authority framework for [% authtypecode %] using
>+        [% t('Create authority framework for') %] [% authtypecode %] [% t('using') %]
>         <select name="existingauthtypecode">
>         [% FOREACH existingauthtypeloo IN existingauthtypeloop %]
>             [% IF existingauthtypeloo.value == "" %]
>@@ -170,10 +171,10 @@
> [% IF ( else ) %]
> 
> <div id="toolbar" class="btn-toolbar">
>-    <div class="btn-group"><a class="btn btn-default btn-sm" id="newtag" href="/cgi-bin/koha/admin/auth_tag_structure.pl?op=add_form&amp;authtypecode=[% authtypecode %]"><i class="fa fa-plus"></i> New tag</a></div>
>+    <div class="btn-group"><a class="btn btn-default btn-sm" id="newtag" href="/cgi-bin/koha/admin/auth_tag_structure.pl?op=add_form&authtypecode=[% authtypecode %]"><i class="fa fa-plus"></i> [% t('New tag') %]</a></div>
> </div>
> 
>-<h2>Select an authority framework</h2>
>+<h2>[% t('Select an authority framework') %]</h2>
> <form action="[% script_name %]" method="post">
>     <select name="authtypecode">
>     [% FOREACH authority_type IN authority_types%]
>@@ -192,12 +193,12 @@
> <table id="table_authtagstructure">
>     <thead>
>         <tr>
>-            <th>Tag</th>
>-            <th>Lib</th>
>-            <th>Repeatable</th>
>-            <th>Mandatory</th>
>-            <th>Authorized<br />value</th>
>-            <th>&nbsp;</th>
>+            <th>[% t('Tag') %]</th>
>+            <th>[% t('Lib') %]</th>
>+            <th>[% t('Repeatable') %]</th>
>+            <th>[% t('Mandatory') %]</th>
>+            <th>[% t('Authorized') %]<br />[% t('value') %]</th>
>+            <th>Â </th>
>         </tr>
>     </thead>
>     <tbody>
>@@ -205,17 +206,17 @@
>         <tr>
>             <td><b>[% loo.tagfield %]</b></td>
>             <td>[% loo.liblibrarian %]</td>
>-            <td>[% IF ( loo.repeatable ) %]Yes[% ELSE %]No[% END %]</td>
>-            <td>[% IF ( loo.mandatory ) %]Yes[% ELSE %]No[% END %]</td>
>+            <td>[% IF ( loo.repeatable ) %][% t('Yes') %][% ELSE %][% t('No') %][% END %]</td>
>+            <td>[% IF ( loo.mandatory ) %][% t('Yes') %][% ELSE %][% t('No') %][% END %]</td>
>             <td>[% loo.authorised_value %]</td>
>             <td>
>                 <div class="dropdown">
>                     <a class="btn btn-default btn-xs dropdown-toggle" id="authtagactions[% loo.tagfield %]" role="button" data-toggle="dropdown" href="#">
>-                        Actions <b class="caret"></b></a>
>+                        [% t('Actions') %] <b class="caret"></b></a>
>                     <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="authtagactions[% loo.tagfield %]">
>-                        <li><a href="[% loo.subfield_link %]"><i class="fa fa-eye"></i> Subfields</a></li>
>-                        <li><a href="[% loo.edit %]"><i class="fa fa-pencil"></i> Edit</a></li>
>-                        <li><a href="[% loo.delete %]"><i class="fa fa-trash"></i> Delete</a></li>
>+                        <li><a href="[% loo.subfield_link %]"><i class="fa fa-eye"></i> [% t('Subfields') %]</a></li>
>+                        <li><a href="[% loo.edit %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a></li>
>+                        <li><a href="[% loo.delete %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a></li>
>                     </ul>
>                 </div>
>             </td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
>index a728a45e33..05d2002d41 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
>@@ -1,11 +1,12 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Authorized values
>+<title>[% t('Koha âº Administration âº Authorized values') %]
> [% IF op == 'add_form' %]
>-  [% IF ( action_modify ) %] &rsaquo; Modify authorized value[% END %]
>-  [% IF ( action_add_value ) %] &rsaquo;  New authorized value[% END %]
>-  [% IF ( action_add_category ) %] &rsaquo; New category[% END %]
>+  [% IF ( action_modify ) %] [% t('âº Modify authorized value') %][% END %]
>+  [% IF ( action_add_value ) %] âº  [% t('New authorized value') %][% END %]
>+  [% IF ( action_add_category ) %] [% t('âº New category') %][% END %]
> [% END %]
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -23,10 +24,10 @@
> <body id="admin_authorised_values" class="admin">
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF op == 'add_form' %] <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a> &rsaquo; [% IF ( action_modify ) %]Modify authorized value[% END %]
>-	   [% IF ( action_add_value ) %]New authorized value[% END %]
>-	   [% IF ( action_add_category ) %]New category[% END %][% END %]
>-[% IF op == 'list' %]Authorized values[% END %]</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> âº [% IF op == 'add_form' %] <a href="/cgi-bin/koha/admin/authorised_values.pl">[% t('Authorized values') %]</a> âº [% IF ( action_modify ) %][% t('Modify authorized value') %][% END %]
>+	   [% IF ( action_add_value ) %][% t('New authorized value') %][% END %]
>+	   [% IF ( action_add_category ) %][% t('New category') %][% END %][% END %]
>+[% IF op == 'list' %][% t('Authorized values') %][% END %]</div>
> 
> <div id="doc3" class="yui-t2">
>    
>@@ -36,44 +37,44 @@
> 
> [% IF op == 'add_form' %]
> 	<h1>
>-	   [% IF ( action_modify ) %]Modify authorized value[% END %]
>-	   [% IF ( action_add_value ) %]New authorized value[% END %]
>-	   [% IF ( action_add_category ) %]New category[% END %]
>+	   [% IF ( action_modify ) %][% t('Modify authorized value') %][% END %]
>+	   [% IF ( action_add_value ) %][% t('New authorized value') %][% END %]
>+	   [% IF ( action_add_category ) %][% t('New category') %][% END %]
> 	</h1>
> 
>-    [% IF ( action_modify ) %]<div class="note"><i class="fa fa-exclamation"></i> <strong>NOTE:</strong> If you change an authorized value code, existing records using it won't be updated. Changes to value descriptions will show immediately.</div>[% END %]
>+    [% IF ( action_modify ) %]<div class="note"><i class="fa fa-exclamation"></i> <strong>[% t('NOTE:') %]</strong> [% t('If you change an authorized value code, existing records using it won\'t be updated. Changes to value descriptions will show immediately.') %]</div>[% END %]
> 
>  <form action="/cgi-bin/koha/admin/authorised_values.pl" name="Aform" method="post" class="validated">
>         <fieldset class="rows"><ol>
>         [% IF action_add_category %]
>             <li>
>-                <label for="category" class="required">Category: </label>
>-                <input type="text" name="category"  id="category" size="32" maxlength="32" class="focus required" />
>-                <span class="required">Required</span>
>+                <label for="category" class="required">[% t('Category:') %] </label>
>+                <input type="text" name="category" id="category" size="32" maxlength="32" class="focus required" />
>+                <span class="required">[% t('Required') %]</span>
>                 <input type="hidden" name="op" value="add_category" />
>             </li>
>         [% ELSE %]
>             <li>
>-                <span class="label">Category</span>
>+                <span class="label">[% t('Category') %]</span>
>                 <input type="hidden" name="op" value="add" />
>                 <input type="hidden" name="category" value="[% category | html %]" /> [% category | html %]
>             </li>
>         <li>
>-            <label for="authorised_value">Authorized value: </label>
>+            <label for="authorised_value">[% t('Authorized value:') %] </label>
>             [% IF ( action_modify ) %]<input type="hidden" id="id" name="id" value="[% id %]" />[% END %]
>             <input type="text" id="authorised_value" name="authorised_value" value="[% authorised_value | html %]" maxlength="80" class="focus" />
>         </li>
>         <li>
>-            <label for="lib">Description: </label>
>+            <label for="lib">[% t('Description:') %] </label>
>             <input type="text" name="lib" id="lib" value="[% lib %]" maxlength="200" />
>         </li>
> 	<li>
>-            <label for="lib_opac">Description (OPAC): </label>
>+            <label for="lib_opac">[% t('Description (OPAC):') %] </label>
>             <input type="text" name="lib_opac" id="lib_opac" value="[% lib_opac %]" maxlength="200" />
>         </li>
>-        <li><label for="branches">Libraries limitation: </label>
>-            <select id="branches" name="branches" multiple size="10">
>-                <option value="">All libraries</option>
>+        <li><label for="branches">[% t('Libraries limitation:') %] </label>
>+            <select id="branches" name="branches" multiple="" size="10">
>+                <option value="">[% t('All libraries') %]</option>
>                 [% FOREACH branch IN branches_loop %]
>                   [% IF ( branch.selected ) %]
>                     <option selected="selected" value="[% branch.branchcode %]">[% branch.branchname |html %]</option>
>@@ -82,20 +83,20 @@
>                   [% END %]
>                 [% END %]
>             </select>
>-            <span>Select 'All libraries' if this authorized value must be displayed all the time. Otherwise select libraries you want to associate with this value.</span>
>+            <span>[% t('Select \'All libraries\' if this authorized value must be displayed all the time. Otherwise select libraries you want to associate with this value.') %]</span>
>         </li>
> 
> 		</ol>
>         <div id="icons" class="toptabs" style="clear:both">
>-        <h5 style="margin-left:10px;">Choose an icon:</h5>
>+        <h5 style="margin-left:10px;">[% t('Choose an icon:') %]</h5>
> 			<ul>
>-                  <li><a href="#none">None</a></li>
>+                  <li><a href="#none">[% t('None') %]</a></li>
> 				  [% FOREACH imageset IN imagesets %]
>                         [% IF ( imageset.imagesetactive ) %]<li class="ui-tabs-active">[% ELSE %]<li>[% END %]<a href="#[% imageset.imagesetname %]">[% imageset.imagesetname %]</a></li>
> 				  [% END %]
> 			</ul>
>   <div id="none"><ul>
>-  <li><label for="noimage">No image: </label><input type="radio" name="imageurl" id="noimage" value="removeImage" /></li>
>+  <li><label for="noimage">[% t('No image:') %] </label><input type="radio" name="imageurl" id="noimage" value="removeImage" /></li>
>   </ul>
>   <br class="clear" /></div>
>   [% FOREACH imageset IN imagesets %]
>@@ -123,7 +124,7 @@
>         [% END %]
>         </fieldset>
>        <fieldset class="action"> <input type="hidden" name="id" value="[% id %]" />
>-        <input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=[% category | url %]">Cancel</a></fieldset>
>+        <input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=[% category | url %]">[% t('Cancel') %]</a></fieldset>
>     </form>
> [% END %]
> 
>@@ -131,38 +132,38 @@
> [% IF op == 'list' %]
> 
> <div id="toolbar" class="btn-toolbar">
>-    <a id="addauth" class="btn btn-default btn-sm" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form&amp;category=[% category | url %]"><i class="fa fa-plus"> </i> New authorized value for [% category |html %]</a>
>-    <a id="addcat" class="btn btn-default btn-sm" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form"><i class="fa fa-plus"> </i> New category</a>
>+    <a id="addauth" class="btn btn-default btn-sm" href="/cgi-bin/koha/admin/authorised_values.pl?op=add_form&category=[% category | url %]"><i class="fa fa-plus"> </i> [% t('New authorized value for') %] [% category |html %]</a>
>+    <a id="addcat" class="btn btn-default btn-sm" href="/cgi-bin/koha/admin/authorised_values.pl?op=add_form"><i class="fa fa-plus"> </i> [% t('New category') %]</a>
> </div>
> 
>-<h1>Authorized values</h1>
>-<div class="note"><i class="fa fa-exclamation"></i> <strong>NOTE:</strong> If you change an authorized value code, existing records using it won't be updated. Changes to value descriptions will show immediately.</div>
>+<h1>[% t('Authorized values') %]</h1>
>+<div class="note"><i class="fa fa-exclamation"></i> <strong>[% t('NOTE:') %]</strong> [% t('If you change an authorized value code, existing records using it won\'t be updated. Changes to value descriptions will show immediately.') %]</div>
> 
> [% FOR m IN messages %]
>     <div class="dialog [% m.type %]">
>         [% SWITCH m.code %]
>         [% CASE 'error_on_update' %]
>-            An error occurred when updating this authorized value. Perhaps the value already exists.
>+            [% t('An error occurred when updating this authorized value. Perhaps the value already exists.') %]
>         [% CASE 'error_on_insert' %]
>-            An error occurred when inserting this authorized value. Perhaps the value or the category already exists.
>+            [% t('An error occurred when inserting this authorized value. Perhaps the value or the category already exists.') %]
>         [% CASE 'error_on_insert_cat' %]
>-            An error occurred when inserting this authorized value category. Perhaps the category name already exists.
>+            [% t('An error occurred when inserting this authorized value category. Perhaps the category name already exists.') %]
>         [% CASE 'error_on_delete' %]
>-            An error occurred when deleting this authorized value. Check the logs.
>+            [% t('An error occurred when deleting this authorized value. Check the logs.') %]
>         [% CASE 'success_on_update' %]
>-            Authorized value updated successfully.
>+            [% t('Authorized value updated successfully.') %]
>         [% CASE 'success_on_insert' %]
>-            Authorized value added successfully.
>+            [% t('Authorized value added successfully.') %]
>         [% CASE 'success_on_insert_cat' %]
>-            Authorized value category added successfully.
>+            [% t('Authorized value category added successfully.') %]
>         [% CASE 'success_on_delete' %]
>-            Authorized value deleted successfully.
>+            [% t('Authorized value deleted successfully.') %]
>         [% CASE 'already_exists' %]
>-            This authorized value already exists.
>+            [% t('This authorized value already exists.') %]
>         [% CASE 'cat_already_exists' %]
>-            This authorized value category already exists.
>+            [% t('This authorized value category already exists.') %]
>         [% CASE 'invalid_category_name' %]
>-            The authorized value category 'branches', 'itemtypes' and 'cn_source' are used internally by Koha and are not valid.
>+            [% t('The authorized value category \'branches\', \'itemtypes\' and \'cn_source\' are used internally by Koha and are not valid.') %]
>         [% CASE %]
>             [% m.code %]
>         [% END %]
>@@ -170,7 +171,7 @@
> [% END %]
> 
> <form action="/cgi-bin/koha/admin/authorised_values.pl" method="post" id="category">
>-  <label for="searchfield">Show category: </label>
>+  <label for="searchfield">[% t('Show category:') %] </label>
>   <select name="searchfield" id="searchfield" size="1">
>   [% FOR c IN categories %]
>     [% IF c == searchfield %]
>@@ -182,54 +183,54 @@
>   <input type="submit" value="Submit" />
> </form>
> [% IF ( category == 'Bsort1' ) %]
>-    <p>An authorized value attached to patrons, that can be used for stats purposes</p>
>+    <p>[% t('An authorized value attached to patrons, that can be used for stats purposes') %]</p>
> [% END %]
> [% IF ( category == 'Bsort2' ) %]
>-    <p>An authorized value attached to patrons, that can be used for stats purposes</p>
>+    <p>[% t('An authorized value attached to patrons, that can be used for stats purposes') %]</p>
> [% END %]
> [% IF ( category == 'Asort1' ) %]
>-    <p>An authorized value attached to acquisitions, that can be used for stats purposes</p>
>+    <p>[% t('An authorized value attached to acquisitions, that can be used for stats purposes') %]</p>
> [% END %]
> [% IF ( category == 'Asort2' ) %]
>-    <p>An authorized value attached to acquisitions, that can be used for stats purposes</p>
>+    <p>[% t('An authorized value attached to acquisitions, that can be used for stats purposes') %]</p>
> [% END %]
> [% IF ( category == 'SUGGEST' ) %]
>-    <p>Reasons to reject or accept patron suggestions</p>
>+    <p>[% t('Reasons to reject or accept patron suggestions') %]</p>
> [% END %]
> [% IF ( category == 'DAMAGED' ) %]
>-    <p>Statuses to describe a damaged item</p>
>+    <p>[% t('Statuses to describe a damaged item') %]</p>
> [% END %]
> [% IF ( category == 'LOST' ) %]
>-   <p>Statuses to describe a lost item</p>
>+   <p>[% t('Statuses to describe a lost item') %]</p>
> [% END %]
> [% IF ( category == 'MANUAL_INV' ) %]
>-    <p>Additional values for manual invoice types</p>
>+    <p>[% t('Additional values for manual invoice types') %]</p>
> [% END %]
> [% IF ( category == 'BOR_NOTES' ) %]
>-    <p>Values for custom patron notes</p>
>+    <p>[% t('Values for custom patron notes') %]</p>
> [% END %]
> [% IF ( category == 'LOC' ) %]
>-    <p>Values for shelving locations</p>
>+    <p>[% t('Values for shelving locations') %]</p>
> [% END %]
> [% IF ( category == 'CCODE' ) %]
>-    <p>Values for collection codes</p>
>+    <p>[% t('Values for collection codes') %]</p>
>  [% END %]
>  [% IF ( category == 'NOT_LOAN' ) %]
>-    <p>Statuses to describe why an item is not for loan</p>
>+    <p>[% t('Statuses to describe why an item is not for loan') %]</p>
>  [% END %]
>-<h3>Authorized values for category [% category |html %]:</h3>
>+<h3>[% t('Authorized values for category') %] [% category |html %]:</h3>
> 
> [% IF ( loop ) %]<div id="pagertable_authorized_values">
> </div>[% END %]
> 
> [% IF ( loop ) %]<table id="table_authorized_values">
> <thead><tr>
>-	<th>Authorized value</th>
>-	<th>Description</th>
>-	<th>Description (OPAC)</th>
>-	<th>Icon</th>
>-    <th>Branches limitations</th>
>-    <th>Actions</th>
>+	<th>[% t('Authorized value') %]</th>
>+	<th>[% t('Description') %]</th>
>+	<th>[% t('Description (OPAC)') %]</th>
>+	<th>[% t('Icon') %]</th>
>+    <th>[% t('Branches limitations') %]</th>
>+    <th>[% t('Actions') %]</th>
> 	</tr>
> </thead><tbody>
> [% FOREACH loo IN loop %]
>@@ -241,7 +242,7 @@
> 	<td>[% loo.authorised_value | html %]</td>
>     <td>[% loo.lib |html %]</td>
>     <td>[% loo.lib_opac |html %]</td>
>-	<td>[% IF ( loo.imageurl ) %]<img src="[% loo.imageurl %]" alt=""/>[% ELSE %]&nbsp;[% END %]</td>
>+	<td>[% IF ( loo.imageurl ) %]<img src="[% loo.imageurl %]" alt="" />[% ELSE %]Â [% END %]</td>
>     <td>
>         [% IF loo.branches.size > 0 %]
>             [% branches_str = "" %]
>@@ -250,26 +251,26 @@
>             [% END %]
>             <span href="#" title="[% branches_str %]">
>                 [% IF loo.branches.size > 1 %]
>-                    [% loo.branches.size %] branches limitations
>+                    [% loo.branches.size %] [% t('branches limitations') %]
>                 [% ELSE %]
>-                    [% loo.branches.size %] branch limitation
>+                    [% loo.branches.size %] [% t('branch limitation') %]
>                 [% END %]
>         [% ELSE %]
>-            No limitation
>+            [% t('No limitation') %]
>         [% END %]
>     </td>
>-    <td class="actions"><a href="/cgi-bin/koha/admin/authorised_values.pl?op=add_form&amp;id=[% loo.id %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
>-    <a class="delete btn btn-default btn-xs" href="/cgi-bin/koha/admin/authorised_values.pl?op=delete&amp;searchfield=[% searchfield | url %]&amp;id=[% loo.id %]"><i class="fa fa-trash"></i> Delete</a></td>
>+    <td class="actions"><a href="/cgi-bin/koha/admin/authorised_values.pl?op=add_form&id=[% loo.id %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> [% t('Edit') %]</a>
>+    <a class="delete btn btn-default btn-xs" href="/cgi-bin/koha/admin/authorised_values.pl?op=delete&searchfield=[% searchfield | url %]&id=[% loo.id %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a></td>
> </tr>
> [% END %]
> </tbody></table>[% ELSE %]
>-<div class="dialog message">There are no authorized values defined for [% category |html %]</div>
>+<div class="dialog message">[% t('There are no authorized values defined for') %] [% category |html %]</div>
> [% END %]
> 
> [% IF ( isprevpage ) %]
> <form class="inline" action="/cgi-bin/koha/admin/authorised_values.pl" method="post">
> <input type="hidden" name="searchfield" value="[% searchfield | html %]" />
>-	<input type="submit" value="&lt;&lt; Previous" /></form>
>+	<input type="submit" value="<< Previous" /></form>
> [% END %] 
> 
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
>index c75e410da8..2f2129e492 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
>@@ -1,11 +1,12 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Authority types
>+<title>[% t('Koha âº Administration âº Authority types') %]
> [% IF op == 'add_form' %]
>-&rsaquo; [% IF authority_type.authtypecode.defined %]Modify authority type[% ELSE %]New authority type[% END %]
>+âº [% IF authority_type.authtypecode.defined %][% t('Modify authority type') %][% ELSE %][% t('New authority type') %][% END %]
> [% ELSIF op == 'delete_confirm' %]
>-&rsaquo; Confirm deletion of authority type
>+[% t('âº Confirm deletion of authority type') %]
> [% END %]
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -17,13 +18,13 @@
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
> <div id="breadcrumbs">
>-         <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>-&rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>-&rsaquo; <a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a>
>+         <a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a>
>+âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a>
>+âº <a href="/cgi-bin/koha/admin/authtypes.pl">[% t('Authority types') %]</a>
> [% IF op == 'add_form' %]
>-&rsaquo; [% IF authority_type.authtypecode.defined %]Modify[% ELSE %]New[% END %] Authority type
>+âº [% IF authority_type.authtypecode.defined %][% t('Modify') %][% ELSE %][% t('New') %][% END %] [% t('Authority type') %]
> [% ELSIF op == 'delete_confirm' %]
>-&rsaquo; Confirm deletion of authority type
>+[% t('âº Confirm deletion of authority type') %]
> [% END %]
> </div>
> 
>@@ -36,17 +37,17 @@
>     <div class="dialog [% m.type %]">
>         [% SWITCH m.code %]
>         [% CASE 'error_on_update' %]
>-            An error occurred when updating this authority type. Perhaps it already exists.
>+            [% t('An error occurred when updating this authority type. Perhaps it already exists.') %]
>         [% CASE 'error_on_insert' %]
>-            An error occurred when adding this authority type. The authority type code might already exist.
>+            [% t('An error occurred when adding this authority type. The authority type code might already exist.') %]
>         [% CASE 'error_on_delete' %]
>-            An error occurred when deleting this authority type. Check the logs.
>+            [% t('An error occurred when deleting this authority type. Check the logs.') %]
>         [% CASE 'success_on_update' %]
>-            Authority type updated successfully.
>+            [% t('Authority type updated successfully.') %]
>         [% CASE 'success_on_insert' %]
>-            Authority type added successfully.
>+            [% t('Authority type added successfully.') %]
>         [% CASE 'success_on_delete' %]
>-            Authority type deleted successfully.
>+            [% t('Authority type deleted successfully.') %]
>         [% CASE %]
>             [% m.code %]
>         [% END %]
>@@ -60,36 +61,36 @@
>         <fieldset class="rows">
>             <legend>
>                 [% IF authority_type.authtypecode.defined %]
>-                    Modify authority type
>+                    [% t('Modify authority type') %]
>                 [% ELSE %]
>-                    New authority type
>+                    [% t('New authority type') %]
>                 [% END %]
>             </legend>
>             <ol>
>                 <li>
>                     [% IF authority_type.authtypecode.defined %]
>-                            <span class="label">Authority type</span>
>+                            <span class="label">[% t('Authority type') %]</span>
>                             <input type="hidden" name="op" value="add_validate" />
>                             <input type="hidden" name="checked" value="0" />
>                             <input type="hidden" name="authtypecode" value="[% authority_type.authtypecode %]" />[% authority_type.authtypecode %]
>                     [% ELSE %]
>-                            <label for="authtypecode" class="required">Authority type: </label>
>+                            <label for="authtypecode" class="required">[% t('Authority type:') %] </label>
>                             <input id="authtypecode" type="text" class="required" required="required" name="authtypecode" size="10" maxlength="10" />
>-                            <span class="required">Required</span>
>+                            <span class="required">[% t('Required') %]</span>
>                     [% END %]
>                 </li>
>                 <li>
>-                    <label for="authtypetext" class="required">Description: </label>
>+                    <label for="authtypetext" class="required">[% t('Description:') %] </label>
>                     <input type="text" id="authtypetext" name="authtypetext" size="40" maxlength="80" value="[% authority_type.authtypetext |html %]" class="required" required="required" />
>-                    <span class="required">Required</span>
>+                    <span class="required">[% t('Required') %]</span>
>                 </li>
>                 <li>
>-                    <label for="summary">Summary: </label>
>+                    <label for="summary">[% t('Summary:') %] </label>
>                     <textarea id="summary" name="summary" cols="55" rows="7">[% authority_type.summary %]</textarea>
>                 </li>
>                 <li>
>-                    <p class="tip">Note: for 'Authority field to copy', enter the authority field that should be copied from the authority record to the bibliographic record. E.g., in MARC21, field 100 in the authority record should be copied to field 100 in the bibliographic record</p>
>-                    <label for="auth_tag_to_report">Authority field to copy: </label>
>+                    <p class="tip">[% t('Note: for \'Authority field to copy\', enter the authority field that should be copied from the authority record to the bibliographic record. E.g., in MARC21, field 100 in the authority record should be copied to field 100 in the bibliographic record') %]</p>
>+                    <label for="auth_tag_to_report">[% t('Authority field to copy:') %] </label>
>                     <input type="text" id="auth_tag_to_report" name="auth_tag_to_report" size="5" maxlength="3" value="[% authority_type.auth_tag_to_report %]" />
>                     <input type="hidden" name="op" value="add_validate" />
>                     [% IF authority_type.authtypecode.defined %]
>@@ -100,7 +101,7 @@
>         </fieldset>
>         <fieldset class="action">
>             <input type="submit" value="Submit" />
>-            <a class="cancel" href="/cgi-bin/koha/admin/authtypes.pl">Cancel</a>
>+            <a class="cancel" href="/cgi-bin/koha/admin/authtypes.pl">[% t('Cancel') %]</a>
>         </fieldset>
>     </form>
> [% END %]
>@@ -108,18 +109,18 @@
> [% IF op == 'delete_confirm' %]
>     <div class="dialog alert">
>         [% IF authorities_using_it %]
>-            <h3>This authority type cannot be deleted</h3>
>-            <p>This record is used <strong>[% authorities_using_it %]</strong> times</p>
>-            <a class="cancel" href="/cgi-bin/koha/admin/authtypes.pl">Back to the list</a>
>+            <h3>[% t('This authority type cannot be deleted') %]</h3>
>+            <p>[% t('This record is used') %] <strong>[% authorities_using_it %]</strong> [% t('times') %]</p>
>+            <a class="cancel" href="/cgi-bin/koha/admin/authtypes.pl">[% t('Back to the list') %]</a>
>         [% ELSE %]
>-            <h3>Confirm deletion of authority structure definition for <span class="ex">'[% authority_type.authtypetext %]' ([% authority_type.authtypecode %])</span></h3>
>+            <h3>[% t('Confirm deletion of authority structure definition for') %] <span class="ex">'[% authority_type.authtypetext %]' ([% authority_type.authtypecode %])</span></h3>
>             <form action="/cgi-bin/koha/admin/authtypes.pl" method="post">
>                 <input type="hidden" name="op" value="delete_confirmed" />
>                 <input type="hidden" name="authtypecode" value="[% authority_type.authtypecode %]" />
>-                <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
>+                <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('Yes, delete') %]</button>
>             </form>
>             <form action="/cgi-bin/koha/admin/authtypes.pl" method="get">
>-                <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
>+                <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> [% t('No, do not delete') %]</button>
>             </form>
>         [% END %]
>     </div>
>@@ -127,19 +128,19 @@
> 
> [% IF op == 'list' %]
>     <div id="toolbar" class="btn-toolbar">
>-        <a id="authtype" class="btn btn-default btn-sm" href="/cgi-bin/koha/admin/authtypes.pl?op=add_form"><i class="fa fa-plus"></i> New authority type</a>
>+        <a id="authtype" class="btn btn-default btn-sm" href="/cgi-bin/koha/admin/authtypes.pl?op=add_form"><i class="fa fa-plus"></i> [% t('New authority type') %]</a>
>     </div>
> 
>-    <h1>Authority types</h1>
>-    <p>Define authority types, then authority MARC structure in the same way you define itemtypes and biblio MARC tag structure. Authority values are managed through plugins</p>
>+    <h1>[% t('Authority types') %]</h1>
>+    <p>[% t('Define authority types, then authority MARC structure in the same way you define itemtypes and biblio MARC tag structure. Authority values are managed through plugins') %]</p>
>     <table id="authtypes">
>         <thead>
>         <tr>
>-            <th>Code</th>
>-            <th>Description</th>
>-            <th>Summary</th>
>-            <th>Auth field copied</th>
>-            <th>&nbsp;</th>
>+            <th>[% t('Code') %]</th>
>+            <th>[% t('Description') %]</th>
>+            <th>[% t('Summary') %]</th>
>+            <th>[% t('Auth field copied') %]</th>
>+            <th>Â </th>
>         </tr>
>         </thead>
>         <tbody>
>@@ -152,11 +153,11 @@
>                 <td>
>                   <div class="dropdown">
>                     <a class="btn btn-default btn-xs dropdown-toggle" id="authtypeactions[% authority_type.authtypecode %]" role="button" data-toggle="dropdown" href="#">
>-                      Actions <b class="caret"></b></a>
>+                      [% t('Actions') %] <b class="caret"></b></a>
>                     <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="authtypeactions[% authority_type.authtypecode %]">
>-                      <li><a href="auth_tag_structure.pl?authtypecode=[% authority_type.authtypecode %]" class="button parameters"><i class="fa fa-eye"></i> MARC structure</a></li>
>-                      <li><a href="/cgi-bin/koha/admin/authtypes.pl?op=add_form&amp;authtypecode=[% authority_type.authtypecode |html %]"><i class="fa fa-pencil"></i> Edit</a></li>
>-                      [% IF authority_type.authtypecode %]<li><a href="/cgi-bin/koha/admin/authtypes.pl?op=delete_confirm&amp;authtypecode=[% authority_type.authtypecode |html %]"><i class="fa fa-trash"></i> Delete</a></li>[% END %]
>+                      <li><a href="auth_tag_structure.pl?authtypecode=[% authority_type.authtypecode %]" class="button parameters"><i class="fa fa-eye"></i> [% t('MARC structure') %]</a></li>
>+                      <li><a href="/cgi-bin/koha/admin/authtypes.pl?op=add_form&authtypecode=[% authority_type.authtypecode |html %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a></li>
>+                      [% IF authority_type.authtypecode %]<li><a href="/cgi-bin/koha/admin/authtypes.pl?op=delete_confirm&authtypecode=[% authority_type.authtypecode |html %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a></li>[% END %]
>                     </ul>
>                   </div>
>                 </td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
>index beeaa66f8d..434b495485 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
>@@ -1,11 +1,12 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; MARC frameworks
>+<title>[% t('Koha âº Administration âº MARC frameworks') %]
> [% IF op == 'add_form' %]
>-&rsaquo; [% IF framework %]Modify framework text[% ELSE %]Add framework[% END %]
>+âº [% IF framework %][% t('Modify framework text') %][% ELSE %][% t('Add framework') %][% END %]
> [% ELSIF op == 'delete_confirm' %]
>-&rsaquo; Delete framework for [% framework.frameworktext |html %] ([% framework.frameworkcode %])?
>+[% t('âº Delete framework for') %] [% framework.frameworktext |html %] ([% framework.frameworkcode %])?
> [% END %]
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -17,13 +18,13 @@
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
> <div id="breadcrumbs">
>-        <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>-&rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>-&rsaquo; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a>
>+        <a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a>
>+âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a>
>+âº <a href="/cgi-bin/koha/admin/biblio_framework.pl">[% t('MARC frameworks') %]</a>
> [% IF op == 'add_form' %]
>-&rsaquo; [% IF framework %]Modify framework text[% ELSE %]Add framework[% END %]
>+âº [% IF framework %][% t('Modify framework text') %][% ELSE %][% t('Add framework') %][% END %]
> [% ELSIF op == 'delete_confirm' %]
>-&rsaquo; Delete framework for [% framework.frameworktext |html %] ([% framework.frameworkcode %])?
>+[% t('âº Delete framework for') %] [% framework.frameworktext |html %] ([% framework.frameworkcode %])?
> [% END %]
> </div>
> 
>@@ -36,19 +37,19 @@
>     <div class="dialog [% m.type %]">
>         [% SWITCH m.code %]
>         [% CASE 'error_on_update' %]
>-            An error occurred when updating this framework. Perhaps it already exists.
>+            [% t('An error occurred when updating this framework. Perhaps it already exists.') %]
>         [% CASE 'error_on_insert' %]
>-            An error occurred when adding this framework. The framework might already exist.
>+            [% t('An error occurred when adding this framework. The framework might already exist.') %]
>         [% CASE 'error_on_delete' %]
>-            An error occurred when deleting this framework. Check the logs.
>+            [% t('An error occurred when deleting this framework. Check the logs.') %]
>         [% CASE 'success_on_update' %]
>-            Framework updated successfully.
>+            [% t('Framework updated successfully.') %]
>         [% CASE 'success_on_insert' %]
>-            Framework added successfully.
>+            [% t('Framework added successfully.') %]
>         [% CASE 'success_on_delete' %]
>-            Framework deleted successfully.
>+            [% t('Framework deleted successfully.') %]
>         [% CASE 'already_exists' %]
>-            This framework code already exists.
>+            [% t('This framework code already exists.') %]
>         [% CASE %]
>             [% m.code %]
>         [% END %]
>@@ -59,33 +60,33 @@
> 
> [% IF op == 'list'%]
>     <div id="toolbar" class="btn-toolbar">
>-        <a class="btn btn-default btn-sm" id="newframework" href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form"><i class="fa fa-plus"></i> New framework</a>
>+        <a class="btn btn-default btn-sm" id="newframework" href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form"><i class="fa fa-plus"></i> [% t('New framework') %]</a>
>     </div>
> [% END %]
> 
> [% IF op == 'add_form' %]
>-    <h1>[% IF framework %]Modify framework text[% ELSE %]Add framework[% END %]</h1>
>+    <h1>[% IF framework %][% t('Modify framework text') %][% ELSE %][% t('Add framework') %][% END %]</h1>
>     <form action="/cgi-bin/koha/admin/biblio_framework.pl" name="Aform" method="post" class="validated">
>         <input type="hidden" name="op" value="add_validate" />
>         <fieldset class="rows">
>             <ol>
>                 [% IF framework %]
>                     <li>
>-                        <span class="label">Framework code: </span>
>+                        <span class="label">[% t('Framework code:') %] </span>
>                         <input type="hidden" id="frameworkcode" name="frameworkcode" value="[% framework.frameworkcode %]" />[% framework.frameworkcode %]
>                         <input type="hidden" name="is_a_modif" value="1" />
>                     </li>
>                 [% ELSE %]
>                     <li>
>-                        <label for="frameworkcode" class="required">Framework code: </label>
>+                        <label for="frameworkcode" class="required">[% t('Framework code:') %] </label>
>                         <input type="text" id="frameworkcode" name="frameworkcode" size="4" maxlength="4" required="required" class="required" />
>-                        <span class="required">Required</span>
>+                        <span class="required">[% t('Required') %]</span>
>                     </li>
>                 [% END %]
>                 <li>
>-                    <label for="description" class="required">Description: </label>
>+                    <label for="description" class="required">[% t('Description:') %] </label>
>                     <input type="text" name="frameworktext" id="description" size="40" maxlength="80" value="[% framework.frameworktext |html %]" required="required" class="required" />
>-                    <span class="required">Required</span>
>+                    <span class="required">[% t('Required') %]</span>
>                 </li>
>             </ol>
>         </fieldset>
>@@ -98,52 +99,52 @@
> [% IF op == 'delete_confirm' %]
>     <div class="dialog alert">
>         [% IF biblios_use_this_framework %]
>-            <h3>This framework cannot be deleted</h3>
>+            <h3>[% t('This framework cannot be deleted') %]</h3>
>             <p><strong><span class="ex">[% framework.frameworktext |html %] ([% framework.frameworkcode %])</span></strong></p>
>-            <p>The framework is used [% biblios_use_this_framework %] times.</p>
>+            <p>[% t('The framework is used') %] [% biblios_use_this_framework %] [% t('times.') %]</p>
>             <form action="/cgi-bin/koha/admin/biblio_framework.pl" method="get">
>-                <button type="submit"><i class="fa fa-fw fa-arrow-left"></i> Return to frameworks</button>
>+                <button type="submit"><i class="fa fa-fw fa-arrow-left"></i> [% t('Return to frameworks') %]</button>
>             </form>
>         [% ELSE %]
>-            <h3>Delete framework for [% framework.frameworktext |html %] ([% framework.frameworkcode %])?</h3>
>+            <h3>[% t('Delete framework for') %] [% framework.frameworktext |html %] ([% framework.frameworkcode %])?</h3>
>             <form class="inline" action="/cgi-bin/koha/admin/biblio_framework.pl" method="post">
>                 <input type="hidden" name="op" value="delete_confirmed" />
>                 <input type="hidden" name="frameworkcode" value="[% framework.frameworkcode %]" />
>-                <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this framework</button>
>+                <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('Yes, delete this framework') %]</button>
>             </form>
>             <form class="inline" action="/cgi-bin/koha/admin/biblio_framework.pl" method="get">
>-                <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
>+                <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> [% t('No, do not delete') %]</button>
>             </form>
>         [% END %]
>     </div>
> [% END %]
> 
> [% IF op == 'list' %]
>-<h1>MARC frameworks</h1>
>-<p>Framework name, then go to MARC biblio to set MARC editor parameters</p>
>+<h1>[% t('MARC frameworks') %]</h1>
>+<p>[% t('Framework name, then go to MARC biblio to set MARC editor parameters') %]</p>
> <table id="table_biblio_frameworks">
>     <thead>
>     <tr>
>-        <th>Code</th>
>-        <th>Description</th>
>-        <th>&nbsp;</th>
>+        <th>[% t('Code') %]</th>
>+        <th>[% t('Description') %]</th>
>+        <th>Â </th>
>     </tr>
>     </thead>
>     <tbody>
>     <tr>
>-        <td>&nbsp;</td>
>-        <td>Default framework</td>
>+        <td>Â </td>
>+        <td>[% t('Default framework') %]</td>
>         <td>
>           <div class="dropdown">
>             <a class="btn btn-default btn-xs dropdown-toggle" id="frameworkactions[% loo.frameworkcode %]" role="button" data-toggle="dropdown" href="#">
>-              Actions <b class="caret"></b>
>+              [% t('Actions') %] <b class="caret"></b>
>             </a>
>             <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="frameworkactions[% loo.frameworkcode %]">
>-              <li><a href="marctagstructure.pl?frameworkcode="><i class="fa fa-eye"></i> MARC structure</a></li>
>+              <li><a href="marctagstructure.pl?frameworkcode="><i class="fa fa-eye"></i> [% t('MARC structure') %]</a></li>
>               
>-              <li><a href="#" data-toggle="modal" data-target="#exportModal_default" title="Export framework structure (fields, subfields) to a spreadsheet file (.csv, .xml, .ods)"><i class="fa fa-upload"></i> Export</a></li>
>+              <li><a href="#" data-toggle="modal" data-target="#exportModal_default" title="[% t('Export framework structure (fields, subfields) to a spreadsheet file (.csv, .xml, .ods)') %]"><i class="fa fa-upload"></i> [% t('Export') %]</a></li>
>               
>-              <li><a href="#" data-toggle="modal" data-target="#importModal_[% framework.frameworkcode %][% frameworks.count %]" title="Import framework structure (fields, subfields) from a spreadsheet file (.csv, .xml, .ods)"><i class="fa fa-download"></i> Import</a></li>
>+              <li><a href="#" data-toggle="modal" data-target="#importModal_[% framework.frameworkcode %][% frameworks.count %]" title="[% t('Import framework structure (fields, subfields) from a spreadsheet file (.csv, .xml, .ods)') %]"><i class="fa fa-download"></i> [% t('Import') %]</a></li>
>             </ul>
>             
>             <div class="modal" id="exportModal_default" tabindex="-1" role="dialog" aria-labelledby="exportLabelexportModal_default" aria-hidden="true">
>@@ -151,20 +152,20 @@
>               <div class="modal-content">
>               <div class="modal-header">
>                 <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button>
>-                <h3 id="exportLabelexportModal_default">Export default framework</h3>
>+                <h3 id="exportLabelexportModal_default">[% t('Export default framework') %]</h3>
>               </div>
>-              <form action="import_export_framework.pl" name="form_defaul" method="get" target="_blank"  class="form_export">
>+              <form action="import_export_framework.pl" name="form_defaul" method="get" target="_blank" class="form_export">
>                 <div class="modal-body">
>                   <fieldset>
>                     <input type="hidden" name="frameworkcode" value="" />
>-                    <p><label for="csv_type_export_default"><input type="radio" name="type_export_default" value="csv" id="csv_type_export_default" checked="checked" /> Export to CSV spreadsheet</label></p>
>-                    <p><label for="xml_type_export_default"><input type="radio" name="type_export_default" value="excel" id="xml_type_export_default" /> Export to Excel with XML format, compatible with OpenOffice/LibreOffice as well</label></p>
>-                    <p><label for="ods_type_export_default"><input type="radio" name="type_export_default" value="ods" id="ods_type_export_default" /> Export to OpenDocument spreadsheet format</label></p>
>+                    <p><label for="csv_type_export_default"><input type="radio" name="type_export_default" value="csv" id="csv_type_export_default" checked="checked" /> [% t('Export to CSV spreadsheet') %]</label></p>
>+                    <p><label for="xml_type_export_default"><input type="radio" name="type_export_default" value="excel" id="xml_type_export_default" /> [% t('Export to Excel with XML format, compatible with OpenOffice/LibreOffice as well') %]</label></p>
>+                    <p><label for="ods_type_export_default"><input type="radio" name="type_export_default" value="ods" id="ods_type_export_default" /> [% t('Export to OpenDocument spreadsheet format') %]</label></p>
>                   </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>
>               </form>
>               </div>
>@@ -177,18 +178,18 @@
>               <div class="modal-content">
>               <div class="modal-header">
>                 <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button>
>-                <h3 id="importLabelexportModal_[% framework.frameworkcode %][% frameworks.count %]">Import default framework structure (fields and subfields) from a spreadsheet file (.csv, .xml, .ods)</h>
>+                <h3 id="importLabelexportModal_[% framework.frameworkcode %][% frameworks.count %]">[% t('Import default framework structure (fields and subfields) from a spreadsheet file (.csv, .xml, .ods)') %]</h>
>               </div>
>               <form action="/cgi-bin/koha/admin/import_export_framework.pl" name="form_i_default" id="form_i_default" method="post" enctype="multipart/form-data" class="form_import">
>                 <div class="modal-body">
>                   <input type="hidden" name="frameworkcode" value="default" />
>                   <input type="hidden" name="action" value="import" />
>-                  <p><label for="file_import_default">Upload file:</label> <input type="file" name="file_import_default" id="file_import_default" class="input_import" /></p>
>+                  <p><label for="file_import_default">[% t('Upload file:') %]</label> <input type="file" name="file_import_default" id="file_import_default" class="input_import" /></p>
>                     <div id="importing_default" style="display:none" class="importing"><img src="[% interface %]/[% theme %]/img/spinner-small.gif" alt="" /><span class="importing_msg"></span></div>
>                 </div>
>                 <div class="modal-footer">
>-                  <button type="submit" class="btn btn-default">Import</button>
>-                  <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Close</button>
>+                  <button type="submit" class="btn btn-default">[% t('Import') %]</button>
>+                  <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">[% t('Close') %]</button>
>                 </div>
>               </form>
>               </div>
>@@ -205,16 +206,16 @@
>             <td>
>               <div class="dropdown">
>                 <a class="btn btn-default btn-xs dropdown-toggle" id="frameworkactions[% loo.frameworkcode %]" role="button" data-toggle="dropdown" href="#">
>-                  Actions <b class="caret"></b>
>+                  [% t('Actions') %] <b class="caret"></b>
>                 </a>
>                 <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="frameworkactions[% loo.frameworkcode %]">
>-                  <li><a href="marctagstructure.pl?frameworkcode=[% loo.frameworkcode %]"><i class="fa fa-eye"></i> MARC structure</a></li>
>-                  <li><a href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form&amp;frameworkcode=[% loo.frameworkcode |html %]"><i class="fa fa-pencil"></i> Edit</a></li>
>-                  <li><a href="/cgi-bin/koha/admin/biblio_framework.pl?op=delete_confirm&amp;frameworkcode=[% loo.frameworkcode |html %]"><i class="fa fa-trash"></i> Delete</a></li>
>+                  <li><a href="marctagstructure.pl?frameworkcode=[% loo.frameworkcode %]"><i class="fa fa-eye"></i> [% t('MARC structure') %]</a></li>
>+                  <li><a href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form&frameworkcode=[% loo.frameworkcode |html %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a></li>
>+                  <li><a href="/cgi-bin/koha/admin/biblio_framework.pl?op=delete_confirm&frameworkcode=[% loo.frameworkcode |html %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a></li>
>                   
>-                  <li><a href="#" data-toggle="modal" data-target="#exportModal_[% loo.frameworkcode %][% loop.count %]" title="Export framework structure (fields, subfields) to a spreadsheet file (.csv, .xml, .ods)"><i class="fa fa-upload"></i> Export</a></li>
>+                  <li><a href="#" data-toggle="modal" data-target="#exportModal_[% loo.frameworkcode %][% loop.count %]" title="[% t('Export framework structure (fields, subfields) to a spreadsheet file (.csv, .xml, .ods)') %]"><i class="fa fa-upload"></i> [% t('Export') %]</a></li>
>                   
>-                  <li><a href="#" data-toggle="modal" data-target="#importModal_[% loo.frameworkcode %][% loop.count %]" title="Import framework structure (fields, subfields) from a spreadsheet file (.csv, .xml, .ods)"><i class="fa fa-download"></i> Import</a></li>
>+                  <li><a href="#" data-toggle="modal" data-target="#importModal_[% loo.frameworkcode %][% loop.count %]" title="[% t('Import framework structure (fields, subfields) from a spreadsheet file (.csv, .xml, .ods)') %]"><i class="fa fa-download"></i> [% t('Import') %]</a></li>
>                 </ul>
>                 
>                 <div class="modal" id="exportModal_[% loo.frameworkcode %][% loop.count %]" tabindex="-1" role="dialog" aria-labelledby="exportLabelexportModal_[% loo.frameworkcode %][% loop.count %]" aria-hidden="true">
>@@ -222,20 +223,20 @@
>                   <div class="modal-content">
>                   <div class="modal-header">
>                     <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button>
>-                    <h3 id="exportLabelexportModal_[% loo.frameworkcode %][% loop.count %]">Export [% loo.frameworktext |html %] framework</h3>
>+                    <h3 id="exportLabelexportModal_[% loo.frameworkcode %][% loop.count %]">[% t('Export') %] [% loo.frameworktext |html %] [% t('framework') %]</h3>
>                   </div>
>-                  <form action="import_export_framework.pl" name="form_[% loo.frameworkcode %]" method="get" target="_blank"  class="form_export">
>+                  <form action="import_export_framework.pl" name="form_[% loo.frameworkcode %]" method="get" target="_blank" class="form_export">
>                     <div class="modal-body">
>                       <fieldset>
>                         <input type="hidden" name="frameworkcode" value="[% loo.frameworkcode %]" />
>-                        <p><label for="csv_type_export_[% loo.frameworkcode %][% loop.count %]"><input type="radio" name="type_export_[% loo.frameworkcode %]" value="csv" id="csv_type_export_[% loo.frameworkcode %][% loop.count %]" checked="checked" /> Export to CSV spreadsheet</label></p>
>-                        <p><label for="xml_type_export_[% loo.frameworkcode %][% loop.count %]"><input type="radio" name="type_export_[% loo.frameworkcode %]" value="excel" id="xml_type_export_[% loo.frameworkcode %][% loop.count %]" /> Export to Excel with XML format, compatible with OpenOffice/LibreOffice as well</label></p>
>-                        <p><label for="ods_type_export_[% loo.frameworkcode %][% loop.count %]"><input type="radio" name="type_export_[% loo.frameworkcode %]" value="ods" id="ods_type_export_[% loo.frameworkcode %][% loop.count %]" /> Export to OpenDocument spreadsheet format</label></p>
>+                        <p><label for="csv_type_export_[% loo.frameworkcode %][% loop.count %]"><input type="radio" name="type_export_[% loo.frameworkcode %]" value="csv" id="csv_type_export_[% loo.frameworkcode %][% loop.count %]" checked="checked" /> [% t('Export to CSV spreadsheet') %]</label></p>
>+                        <p><label for="xml_type_export_[% loo.frameworkcode %][% loop.count %]"><input type="radio" name="type_export_[% loo.frameworkcode %]" value="excel" id="xml_type_export_[% loo.frameworkcode %][% loop.count %]" /> [% t('Export to Excel with XML format, compatible with OpenOffice/LibreOffice as well') %]</label></p>
>+                        <p><label for="ods_type_export_[% loo.frameworkcode %][% loop.count %]"><input type="radio" name="type_export_[% loo.frameworkcode %]" value="ods" id="ods_type_export_[% loo.frameworkcode %][% loop.count %]" /> [% t('Export to OpenDocument spreadsheet format') %]</label></p>
>                       </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>
>                   </form>
>                   </div>
>@@ -248,18 +249,18 @@
>                   <div class="modal-content">
>                   <div class="modal-header">
>                     <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button>
>-                    <h3 id="importLabelexportModal_[% loo.frameworkcode %][% loop.count %]">Import [% loo.frameworkcode %] framework structure (fields and subfields) from a spreadsheet file (.csv, .xml, .ods)</h3>
>+                    <h3 id="importLabelexportModal_[% loo.frameworkcode %][% loop.count %]">[% t('Import') %] [% loo.frameworkcode %] [% t('framework structure (fields and subfields) from a spreadsheet file (.csv, .xml, .ods)') %]</h3>
>                   </div>
>                   <form action="/cgi-bin/koha/admin/import_export_framework.pl" name="form_i_[% loo.frameworkcode %]" id="form_i_[% loo.frameworkcode %]" method="post" enctype="multipart/form-data" class="form_import">
>                     <div class="modal-body">
>                       <input type="hidden" name="frameworkcode" value="[% loo.frameworkcode %]" />
>                       <input type="hidden" name="action" value="import" />
>-                      <p><label for="file_import_[% loo.frameworkcode %]">Upload file:</label> <input type="file" name="file_import_[% loo.frameworkcode %]" id="file_import_[% loo.frameworkcode %]" class="input_import" /></p>
>+                      <p><label for="file_import_[% loo.frameworkcode %]">[% t('Upload file:') %]</label> <input type="file" name="file_import_[% loo.frameworkcode %]" id="file_import_[% loo.frameworkcode %]" class="input_import" /></p>
>                       <div id="importing_[% loo.frameworkcode %]" style="display:none" class="importing"><img src="[% interface %]/[% theme %]/img/spinner-small.gif" alt="" /><span class="importing_msg"></span></div>
>                     </div>
>                     <div class="modal-footer">
>-                      <button type="submit" class="btn btn-default">Import</button>
>-                      <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Close</button>
>+                      <button type="submit" class="btn btn-default">[% t('Import') %]</button>
>+                      <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">[% t('Close') %]</button>
>                     </div>
>                   </form>
>                   </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
>index 3dd10b8001..f6f9ca8b07 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
>@@ -1,8 +1,9 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% USE Branches %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Library checkin and transfer policy</title>
>+<title>[% t('Koha âº Administration âº Library checkin and transfer policy') %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% Asset.css("css/datatables.css") %]
> <style type="text/css">td { text-align: center; } .sorted { min-width: 50%; }</style>
>@@ -12,7 +13,7 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Set library checkin and transfer policy</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> [% t('âº Set library checkin and transfer policy') %]</div>
> 
> <div id="doc3" class="yui-t1">
> 
>@@ -20,16 +21,16 @@
>      <div id="yui-main">
>     <div class="yui-b">
> 
>-<h1>Library [% branchcode %] - [% Branches.GetName( branchcode ) %] Checkin and transfer policy</h1>
>+<h1>[% t('Library') %] [% branchcode %] - [% Branches.GetName( branchcode ) %] [% t('Checkin and transfer policy') %]</h1>
>     <form method="get" action="/cgi-bin/koha/admin/branch_transfer_limits.pl" id="selectlibrary">
>-        <label for="branchselect">Select a library :</label>
>+        <label for="branchselect">[% t('Select a library :') %]</label>
>         <select name="branchcode" id="branchselect">
>             [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode, unfiltered => 1 ) %]
>         </select>
>     </form>
> 
>-<p class="help">Check the boxes for the libraries you accept to checkin items from.</p>
>-<fieldset>[% IF ( limitType == 'ccode' ) %]<strong>For all collection codes: </strong>[% ELSE %]<strong>For all item types: </strong>[% END %]<a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a> | <a id="UncheckAll" href="#"><i class="fa fa-remove"></i> Clear all</a></fieldset>
>+<p class="help">[% t('Check the boxes for the libraries you accept to checkin items from.') %]</p>
>+<fieldset>[% IF ( limitType == 'ccode' ) %]<strong>[% t('For all collection codes:') %] </strong>[% ELSE %]<strong>[% t('For all item types:') %] </strong>[% END %]<a id="CheckAll" href="#"><i class="fa fa-check"></i> [% t('Select all') %]</a> | <a id="UncheckAll" href="#"><i class="fa fa-remove"></i> [% t('Clear all') %]</a></fieldset>
> 
> 
>   <div id="transferlimit_tabs" class="toptabs">
>@@ -41,14 +42,14 @@
> 
> 	[% FOREACH codes_loo IN codes_loop %]
> 	<div id="[% codes_loo.code %]set">
>-		<h4>Policy for [% codes_loo.limit_phrase %]: [% codes_loo.code %]</h4>
>-    <p><a id="CheckAll[% codes_loo.code %]table" class="checkall" href="#"><i class="fa fa-check"></i> Select all</a> | <a id="UncheckAll[% codes_loo.code %]table" class="uncheckall" href="#"><i class="fa fa-remove"></i> Clear all</a></p>
>+		<h4>[% t('Policy for') %] [% codes_loo.limit_phrase %]: [% codes_loo.code %]</h4>
>+    <p><a id="CheckAll[% codes_loo.code %]table" class="checkall" href="#"><i class="fa fa-check"></i> [% t('Select all') %]</a> | <a id="UncheckAll[% codes_loo.code %]table" class="uncheckall" href="#"><i class="fa fa-remove"></i> [% t('Clear all') %]</a></p>
> 	
> 		<table id="[% codes_loo.code %]table" class="sorted">
> 			<thead>
> 				<tr>
>-				    <th>Library</th>
>-				    <th>Allow transfer?</th>
>+				    <th>[% t('Library') %]</th>
>+				    <th>[% t('Allow transfer?') %]</th>
> 				</tr>
> 			</thead>
> 
>@@ -74,7 +75,7 @@
> 		    <input type="hidden" name="updateLimits" value="1" />
> 		    <input type="hidden" name="branchcode" value="[% branchcode %]" />
> 		    <input type="submit" value="Save" /> 
>-		    <a class="cancel" href="/cgi-bin/koha/admin/admin-home.pl">Cancel</a>
>+		    <a class="cancel" href="/cgi-bin/koha/admin/admin-home.pl">[% t('Cancel') %]</a>
> 		</fieldset>
> 		</form>
> 		</div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>index cbb07301f4..171e5b2ad0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>@@ -1,11 +1,12 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Libraries
>+<title>[% t('Koha âº Administration âº Libraries') %]
> [% IF op == 'add_form' %]
>-    &rsaquo;[% IF library %]Modify library[% ELSE %]New library [% library.branchcode | html %][% END %]
>+    âº[% IF library %][% t('Modify library') %][% ELSE %][% t('New library') %] [% library.branchcode | html %][% END %]
> [% ELSIF op == 'delete_confirm' %]
>-    &rsaquo; Confirm deletion of library '[% library.branchcode | html %]'
>+    [% t('âº Confirm deletion of library \'') %][% library.branchcode | html %]'
> [% END %]
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -17,13 +18,13 @@
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
> <div id="breadcrumbs">
>-    <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>-&rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>-&rsaquo; <a href="/cgi-bin/koha/admin/branches.pl">Libraries</a>
>+    <a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a>
>+âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a>
>+âº <a href="/cgi-bin/koha/admin/branches.pl">[% t('Libraries') %]</a>
> [% IF op == 'add_form'  %]
>-&rsaquo; [% IF library %]Modify library[% ELSE %]New library [% library.branchcode | html %][% END %]
>+âº [% IF library %][% t('Modify library') %][% ELSE %][% t('New library') %] [% library.branchcode | html %][% END %]
> [% ELSIF op == 'delete_confirm' %]
>-&rsaquo; Confirm deletion of library '[% library.branchcode | html %]'
>+[% t('âº Confirm deletion of library \'') %][% library.branchcode | html %]'
> [% END %]
> </div>
> 
>@@ -37,40 +38,40 @@
>     <div class="dialog [% m.type %]">
>         [% SWITCH m.code %]
>         [% CASE 'error_on_update' %]
>-            An error occurred when updating this library. Perhaps it already exists.
>+            [% t('An error occurred when updating this library. Perhaps it already exists.') %]
>         [% CASE 'error_on_insert' %]
>-            An error occurred when adding this library. The branchcode might already exist.
>+            [% t('An error occurred when adding this library. The branchcode might already exist.') %]
>         [% CASE 'error_on_delete' %]
>-            An error occurred when deleting this library. Check the logs.
>+            [% t('An error occurred when deleting this library. Check the logs.') %]
>         [% CASE 'success_on_update' %]
>-            Library updated successfully.
>+            [% t('Library updated successfully.') %]
>         [% CASE 'success_on_insert' %]
>-            Library added successfully.
>+            [% t('Library added successfully.') %]
>         [% CASE 'success_on_delete' %]
>-            Library deleted successfully.
>+            [% t('Library deleted successfully.') %]
>         [% CASE 'cannot_delete_library' %]
>-            This library cannot be deleted. Patrons or items are still using it
>+            [% t('This library cannot be deleted. Patrons or items are still using it') %]
>             [% IF m.data.patrons_count and m.data.items_count %]
>-                ([% m.data.patrons_count %] patrons and [% m.data.items_count %] items).
>+                ([% m.data.patrons_count %] [% t('patrons and') %] [% m.data.items_count %] [% t('items).') %]
>             [% ELSIF m.data.patrons_count %]
>-                ([% m.data.patrons_count %] patrons).
>+                ([% m.data.patrons_count %] [% t('patrons).') %]
>             [% ELSIF m.data.items_count %]
>-                ([% m.data.items_count %] items).
>+                ([% m.data.items_count %] [% t('items).') %]
>             [% END %]
>         [% CASE 'error_on_update_category' %]
>-            An error occurred when updating this library category. Perhaps it already exists.
>+            [% t('An error occurred when updating this library category. Perhaps it already exists.') %]
>         [% CASE 'error_on_insert_category' %]
>-            An error occurred when adding this library category. The categorycode might already exist.
>+            [% t('An error occurred when adding this library category. The categorycode might already exist.') %]
>         [% CASE 'error_on_delete_category' %]
>-            An error occurred when deleting this library category. Check the logs.
>+            [% t('An error occurred when deleting this library category. Check the logs.') %]
>         [% CASE 'success_on_update_category' %]
>-            Library category updated successfully.
>+            [% t('Library category updated successfully.') %]
>         [% CASE 'success_on_insert_category' %]
>-            Library category added successfully.
>+            [% t('Library category added successfully.') %]
>         [% CASE 'success_on_delete_category' %]
>-            Library category deleted successfully.
>+            [% t('Library category deleted successfully.') %]
>         [% CASE 'cannot_delete_category' %]
>-            This library category cannot be deleted. [% m.data.libraries_count %] libraries are still using it.
>+            [% t('This library category cannot be deleted.') %] [% m.data.libraries_count %] [% t('libraries are still using it.') %]
>         [% CASE %]
>             [% m.code %]
>         [% END %]
>@@ -79,12 +80,12 @@
> 
> [% IF op == 'list' %]
>     <div id="toolbar" class="btn-toolbar">
>-        <a class="btn btn-default btn-sm" id="newbranch" href="/cgi-bin/koha/admin/branches.pl?op=add_form"><i class="fa fa-plus"></i> New library</a>
>+        <a class="btn btn-default btn-sm" id="newbranch" href="/cgi-bin/koha/admin/branches.pl?op=add_form"><i class="fa fa-plus"></i> [% t('New library') %]</a>
>     </div>
> [% END %]
> 
> [% IF op == 'add_form' %]
>-    <h3>[% IF library %]Modify library[% ELSE %]New library[% END %]</h3>
>+    <h3>[% IF library %][% t('Modify library') %][% ELSE %][% t('New library') %][% END %]</h3>
>     <form action="/cgi-bin/koha/admin/branches.pl" id="Aform" name="Aform" class="validated" method="post">
>         <fieldset class="rows">
>             <input type="hidden" name="op" value="add_validate" />
>@@ -94,24 +95,24 @@
>             <ol>
>                 <li>
>                     [% IF library %]
>-                        <span class="label">Library code: </span>
>+                        <span class="label">[% t('Library code:') %] </span>
>                         <input type="hidden" name="branchcode" value="[% library.branchcode |html %]" />
>                         [% library.branchcode | html %]
>                     [% ELSE %]
>-                        <label for="branchcode" class="required">Library code: </label>
>+                        <label for="branchcode" class="required">[% t('Library code:') %] </label>
>                         <input type="text" name="branchcode" id="branchcode" size="10" maxlength="10" value="[% library.branchcode |html %]" class="required" required="required" />
>-                        <span class="required">Required</span>
>+                        <span class="required">[% t('Required') %]</span>
>                     [% END %]
>                 </li>
>                 <li>
>-                    <label for="branchname" class="required">Name: </label>
>+                    <label for="branchname" class="required">[% t('Name:') %] </label>
>                     <input type="text" name="branchname" id="branchname" size="80" value="[% library.branchname |html %]" class="required" required="required" />
>-                    <span class="required">Required</span>
>+                    <span class="required">[% t('Required') %]</span>
>                 </li>
>             </ol>
>         </fieldset>
>         [% IF categories %]
>-            <fieldset class="rows"><legend>Group(s):</legend>
>+            <fieldset class="rows"><legend>[% t('Group(s):') %]</legend>
>                 <ol>
>                     [% FOREACH category IN categories %]
>                         <li>
>@@ -129,28 +130,28 @@
>         [% END %]
>         <fieldset class="rows">
>             <ol>
>-                <li><label for="branchaddress1">Address line 1: </label><input type="text" name="branchaddress1" id="branchaddress1" size="60" value="[% library.branchaddress1 |html %]" /></li>
>-                <li><label for="branchaddress2">Address line 2: </label><input type="text" name="branchaddress2" id="branchaddress2" size="60" value="[% library.branchaddress2 |html %]" /></li>
>-                <li><label for="branchaddress3">Address line 3: </label><input type="text" name="branchaddress3" id="branchaddress3" size="60" value="[% library.branchaddress3 |html %]" /></li>
>-                <li><label for="branchcity">City: </label><input type="text" name="branchcity" id="branchcity" size="60" value="[% library.branchcity |html %]" /></li>
>-                <li><label for="branchstate">State: </label><input type="text" name="branchstate" id="branchstate" size="60" value="[% library.branchstate |html %]" /></li>
>-                <li><label for="branchzip">ZIP/Postal code: </label><input type="text" name="branchzip" id="branchzip"  size="25" maxlength="25" value="[% library.branchzip |html %]" /></li>
>-                <li><label for="branchcountry">Country: </label><input type="text" name="branchcountry" id="branchcountry" size="60" value="[% library.branchcountry |html %]" /></li>
>-                <li><label for="branchphone">Phone: </label><input type="text" name="branchphone" id="branchphone" size="60" value="[% library.branchphone |html %]" /></li>
>-                <li><label for="branchfax">Fax: </label><input type="text" name="branchfax" id="branchfax" size="60" value="[% library.branchfax |html %]" /></li>
>-                <li><label for="branchemail">Email: </label><input type="text" name="branchemail" id="branchemail" class="email"  size="80" value="[% library.branchemail |html %]" /></li>
>-                <li><label for="branchreplyto">Reply-To: </label> <input type="text" name="branchreplyto" id="branchreplyto" class="email"  size="80" value="[% library.branchreplyto |html %]" /><br /><span class="hint">Default: ReplyToDefault system preference</span></li>
>-                <li><label for="branchreturnpath">Return-Path: </label> <input type="text" name="branchreturnpath" id="branchreturnpath" class="email"  size="80" value="[% library.branchreturnpath |html %]" /><br /><span class="hint">Default: ReturnpathDefault system preference</span></li>
>-                <li><label for="branchurl">URL: </label><input type="text" name="branchurl" id="branchurl"  size="80" value="[% library.branchurl |html %]" class="url" /></li>
>-                <li><label for="opac_info">OPAC info: </label><textarea name="opac_info" id="opac_info">[% library.opac_info |html %]</textarea></li>
>-                <li><label for="branchip">IP: </label><input type="text" name="branchip" id="branchip"  size="15" maxlength="15" value="[% library.branchip |html %]" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li>
>-                <li><label for="marcorgccode">MARC organization code</label> <input type="text" name="marcorgcode" id="marcorgcode" size="16" value="[% library.marcorgcode |html %]" /> <span class="hint">If not filled in defaults to system preference MARCOrgCode. You can obtain your code from <a href="http://www.loc.gov/marc/organizations/orgshome.html" target="_blank">Library of Congress</a>.</span>
>-                <li><label for="branchnotes">Notes: </label><input type="text" name="branchnotes" id="branchnotes" size="80" value="[% library.branchnotes |html %]" /></li>
>+                <li><label for="branchaddress1">[% t('Address line 1:') %] </label><input type="text" name="branchaddress1" id="branchaddress1" size="60" value="[% library.branchaddress1 |html %]" /></li>
>+                <li><label for="branchaddress2">[% t('Address line 2:') %] </label><input type="text" name="branchaddress2" id="branchaddress2" size="60" value="[% library.branchaddress2 |html %]" /></li>
>+                <li><label for="branchaddress3">[% t('Address line 3:') %] </label><input type="text" name="branchaddress3" id="branchaddress3" size="60" value="[% library.branchaddress3 |html %]" /></li>
>+                <li><label for="branchcity">[% t('City:') %] </label><input type="text" name="branchcity" id="branchcity" size="60" value="[% library.branchcity |html %]" /></li>
>+                <li><label for="branchstate">[% t('State:') %] </label><input type="text" name="branchstate" id="branchstate" size="60" value="[% library.branchstate |html %]" /></li>
>+                <li><label for="branchzip">[% t('ZIP/Postal code:') %] </label><input type="text" name="branchzip" id="branchzip" size="25" maxlength="25" value="[% library.branchzip |html %]" /></li>
>+                <li><label for="branchcountry">[% t('Country:') %] </label><input type="text" name="branchcountry" id="branchcountry" size="60" value="[% library.branchcountry |html %]" /></li>
>+                <li><label for="branchphone">[% t('Phone:') %] </label><input type="text" name="branchphone" id="branchphone" size="60" value="[% library.branchphone |html %]" /></li>
>+                <li><label for="branchfax">[% t('Fax:') %] </label><input type="text" name="branchfax" id="branchfax" size="60" value="[% library.branchfax |html %]" /></li>
>+                <li><label for="branchemail">[% t('Email:') %] </label><input type="text" name="branchemail" id="branchemail" class="email" size="80" value="[% library.branchemail |html %]" /></li>
>+                <li><label for="branchreplyto">[% t('Reply-To:') %] </label> <input type="text" name="branchreplyto" id="branchreplyto" class="email" size="80" value="[% library.branchreplyto |html %]" /><br /><span class="hint">[% t('Default: ReplyToDefault system preference') %]</span></li>
>+                <li><label for="branchreturnpath">[% t('Return-Path:') %] </label> <input type="text" name="branchreturnpath" id="branchreturnpath" class="email" size="80" value="[% library.branchreturnpath |html %]" /><br /><span class="hint">[% t('Default: ReturnpathDefault system preference') %]</span></li>
>+                <li><label for="branchurl">[% t('URL:') %] </label><input type="text" name="branchurl" id="branchurl" size="80" value="[% library.branchurl |html %]" class="url" /></li>
>+                <li><label for="opac_info">[% t('OPAC info:') %] </label><textarea name="opac_info" id="opac_info">[% library.opac_info |html %]</textarea></li>
>+                <li><label for="branchip">[% t('IP:') %] </label><input type="text" name="branchip" id="branchip" size="15" maxlength="15" value="[% library.branchip |html %]" /> <span class="hint">[% t('Can be entered as a single IP, or a subnet such as 192.168.1.*') %]</span></li>
>+                <li><label for="marcorgccode">[% t('MARC organization code') %]</label> <input type="text" name="marcorgcode" id="marcorgcode" size="16" value="[% library.marcorgcode |html %]" /> <span class="hint">[% t('If not filled in defaults to system preference MARCOrgCode. You can obtain your code from') %] <a href="http://www.loc.gov/marc/organizations/orgshome.html" target="_blank">[% t('Library of Congress') %]</a>.</span>
>+                <li><label for="branchnotes">[% t('Notes:') %] </label><input type="text" name="branchnotes" id="branchnotes" size="80" value="[% library.branchnotes |html %]" /></li>
>             </ol>
>         </fieldset>
>         <fieldset class="action">
>             <input type="submit" value="Submit" />
>-            <a class="cancel" href="/cgi-bin/koha/admin/branches.pl">Cancel</a>
>+            <a class="cancel" href="/cgi-bin/koha/admin/branches.pl">[% t('Cancel') %]</a>
>         </fieldset>
>     </form>
> [% END %]
>@@ -158,30 +159,30 @@
> [% IF op == 'delete_confirm' and not ( items_count or patrons_count )%]
>     <div class="dialog alert">
>         <form action="/cgi-bin/koha/admin/branches.pl" method="post">
>-            <h3>Are you sure you want to delete [% library.branchname |html %] ([% library.branchcode | html %])?</h3>
>+            <h3>[% t('Are you sure you want to delete') %] [% library.branchname |html %] ([% library.branchcode | html %])?</h3>
>             <input type="hidden" name="op" value="delete_confirmed" />
>             <input type="hidden" name="branchcode" value="[% library.branchcode |html %]" />
>             <input type="hidden" name="branchname" value="[% library.branchname |html %]">
>-            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
>+            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('Yes, delete') %]</button>
>         </form>
>         <form action="/cgi-bin/koha/admin/branches.pl" method="get">
>-            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
>+            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> [% t('No, do not delete') %]</button>
>         </form>
>     </div>
> [% END %]
> 
> [% IF op == 'list' %]
>-    <h3>Libraries</h3>
>+    <h3>[% t('Libraries') %]</h3>
>     [% IF libraries.count %]
>         <table id="branchest">
>             <thead>
>                 <tr>
>-                    <th>Name</th>
>-                    <th>Code</th>
>-                    <th>Address</th>
>-                    <th>MARC organization code</th>
>-                    <th>IP</th>
>-                    <th>Actions</th>
>+                    <th>[% t('Name') %]</th>
>+                    <th>[% t('Code') %]</th>
>+                    <th>[% t('Address') %]</th>
>+                    <th>[% t('MARC organization code') %]</th>
>+                    <th>[% t('IP') %]</th>
>+                    <th>[% t('Actions') %]</th>
>                 </tr>
>             </thead>
>             <tbody>
>@@ -204,26 +205,26 @@
>                             [% IF library.branchcountry %]
>                                 <br />[% library.branchcountry |html %][% END %]
>                             [% IF library.branchphone %]
>-                                <br />Ph: [% library.branchphone |html %][% END %]
>+                                <br />[% t('Ph:') %] [% library.branchphone |html %][% END %]
>                             [% IF library.branchfax %]
>-                                <br />Fax: [% library.branchfax |html %][% END %]
>+                                <br />[% t('Fax:') %] [% library.branchfax |html %][% END %]
>                             [% IF library.branchemail %]
>                                 <br /><a href="mailto:[% library.branchemail %]">[% library.branchemail |html %]</a>[% END %]
>                             [% IF library.branchurl %]
>                                 <br /><a href="[% library.branchurl %]">[% library.branchurl |html %]</a>[% END %]
>                             [% IF library.opac_info %]
>-                                <br />OPAC Info: <div>[% library.opac_info %]</div>[% END %]
>+                                <br />[% t('OPAC Info:') %] <div>[% library.opac_info %]</div>[% END %]
>                             [% IF library.branchnotes %]
>-                                <br />Notes: [% library.branchnotes |html %][% END %]
>+                                <br />[% t('Notes:') %] [% library.branchnotes |html %][% END %]
>                         </td>
>                         <td>[% library.marcorgcode %]</td>
>                         <td>[% library.branchip %]</td>
>                         <td class="actions">
>-                            <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/branches.pl?op=add_form&amp;branchcode=[% library.branchcode |uri %]"><i class="fa fa-pencil"></i> Edit</a>
>+                            <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/branches.pl?op=add_form&branchcode=[% library.branchcode |uri %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a>
>                             <form action="/cgi-bin/koha/admin/branches.pl" method="post">
>                                 <input type="hidden" name="branchcode" value="[% library.branchcode |html %]" />
>                                 <input type="hidden" name="op" value="delete_confirm" />
>-                                <button type="submit" id="delete_library_[% library.branchcode | html %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</button>
>+                                <button type="submit" id="delete_library_[% library.branchcode | html %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> [% t('Delete') %]</button>
>                             </form>
>                         </td>
>                     </tr>
>@@ -231,7 +232,7 @@
>             </tbody>
>         </table>
>     [% ELSE %]
>-        <div class="dialog message">There are no libraries defined. <a href="/cgi-bin/koha/admin/branches.pl?op=add_form">Start defining libraries</a>.</div>
>+        <div class="dialog message">[% t('There are no libraries defined.') %] <a href="/cgi-bin/koha/admin/branches.pl?op=add_form">[% t('Start defining libraries') %]</a>.</div>
>     [% END %]
> [% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>index c71e6fb7e4..a88be032b2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>@@ -1,11 +1,12 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% USE Koha %]
> [% USE KohaDates %]
> [% USE Price %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Patron categories &rsaquo; [% IF op == 'add_form' %][% IF ( categorycode ) %]Modify category '[% categorycode |html %]'[% ELSE %]New category[% END %][% END %]
>-[% IF op == 'delete_confirm' %][% IF ( patrons_in_category > 0 ) %]Cannot delete: category [% categorycode |html %] in use[% ELSE %]Confirm deletion of category '[% categorycode |html %]'[% END %][% END %]
>+<title>[% t('Koha âº Administration âº Patron categories âº') %] [% IF op == 'add_form' %][% IF ( categorycode ) %][% t('Modify category \'') %][% categorycode |html %]'[% ELSE %][% t('New category') %][% END %][% END %]
>+[% IF op == 'delete_confirm' %][% IF ( patrons_in_category > 0 ) %][% t('Cannot delete: category') %] [% categorycode |html %] [% t('in use') %][% ELSE %][% t('Confirm deletion of category \'') %][% categorycode |html %]'[% END %][% END %]
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% Asset.css("css/datatables.css") %]
>@@ -16,10 +17,10 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'patrons-admin-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF op == 'add_form' %] <a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a> &rsaquo; [% IF ( categorycode ) %]Modify category '[% categorycode |html %]'[% ELSE %]New category[% END %][% END %]
>-[% IF op == 'delete_confirm' %] <a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a> &rsaquo; [% IF ( patrons_in_category > 0 ) %]Cannot delete: Category [% categorycode |html %] in use[% ELSE %]Confirm deletion of category '[% categorycode |html %]'[% END %][% END %]
>-[% IF op == 'delete_confirmed' %] <a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a> &rsaquo; Category deleted[% END %]
>-[% IF op == 'list' %]Patron categories[% END %]</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> âº [% IF op == 'add_form' %] <a href="/cgi-bin/koha/admin/categories.pl">[% t('Patron categories') %]</a> âº [% IF ( categorycode ) %][% t('Modify category \'') %][% categorycode |html %]'[% ELSE %][% t('New category') %][% END %][% END %]
>+[% IF op == 'delete_confirm' %] <a href="/cgi-bin/koha/admin/categories.pl">[% t('Patron categories') %]</a> âº [% IF ( patrons_in_category > 0 ) %][% t('Cannot delete: Category') %] [% categorycode |html %] [% t('in use') %][% ELSE %][% t('Confirm deletion of category \'') %][% categorycode |html %]'[% END %][% END %]
>+[% IF op == 'delete_confirmed' %] <a href="/cgi-bin/koha/admin/categories.pl">[% t('Patron categories') %]</a> [% t('âº Category deleted') %][% END %]
>+[% IF op == 'list' %][% t('Patron categories') %][% END %]</div>
> 
> <div id="doc3" class="yui-t2">
>    <div id="bd">
>@@ -30,19 +31,19 @@
>     <div class="dialog [% m.type %]">
>         [% SWITCH m.code %]
>         [% CASE 'error_on_update' %]
>-            An error occurred when updating this patron category. Perhaps it already exists.
>+            [% t('An error occurred when updating this patron category. Perhaps it already exists.') %]
>         [% CASE 'error_on_insert' %]
>-            An error occurred when inserting this patron category. The patron category might already exist.
>+            [% t('An error occurred when inserting this patron category. The patron category might already exist.') %]
>         [% CASE 'error_on_delete' %]
>-            An error occurred when deleting this patron category. Check the logs.
>+            [% t('An error occurred when deleting this patron category. Check the logs.') %]
>         [% CASE 'success_on_update' %]
>-            Patron category updated successfully.
>+            [% t('Patron category updated successfully.') %]
>         [% CASE 'success_on_insert' %]
>-            Patron category inserted successfully.
>+            [% t('Patron category inserted successfully.') %]
>         [% CASE 'success_on_delete' %]
>-            Patron category deleted successfully.
>+            [% t('Patron category deleted successfully.') %]
>         [% CASE 'already_exists' %]
>-            This patron category already exists.
>+            [% t('This patron category already exists.') %]
>         [% CASE %]
>             [% m.code %]
>         [% END %]
>@@ -54,105 +55,105 @@
>         <input type="hidden" name="op" value="add_validate" />
>         <input type="hidden" name="checked" value="0" />
>         [% IF category %]
>-            <h1>Modify category [% categorycode |html %]</h1>
>+            <h1>[% t('Modify category') %] [% categorycode |html %]</h1>
>         [% ELSE %]
>-            <h1>New category</h1>
>+            <h1>[% t('New category') %]</h1>
>         [% END %]
>         <fieldset class="rows">
>             <ol>
>                 [% IF category %]
>                     <li>
>-                        <span class="label">Category code: </span>[% categorycode |html %]
>+                        <span class="label">[% t('Category code:') %] </span>[% categorycode |html %]
>                         <input type="hidden" name="categorycode" value="[% category.categorycode |html %]" /><input type="hidden" name="is_a_modif" value="1" />
>                     </li>
>                 [% ELSE %]
>                     <li>
>-                        <label for="categorycode" class="required">Category code: </label>
>+                        <label for="categorycode" class="required">[% t('Category code:') %] </label>
>                         <input type="text" name="categorycode" id="categorycode" size="10" maxlength="10" class="required" required="required" />
>-                        <span class="required">Required</span>
>+                        <span class="required">[% t('Required') %]</span>
>                     </li>
>                 [% END %]
>                 <li>
>-                    <label for="description" class="required">Description: </label>
>+                    <label for="description" class="required">[% t('Description:') %] </label>
>                     <input type="text" name="description" id="description" size="40" maxlength="80" class="required" required="required" value="[% category.description |html %]" />
>-                    <span class="required">Required</span>
>+                    <span class="required">[% t('Required') %]</span>
>                 </li>
>                 <li>
>-                    <span class="label">Enrollment period: </span>
>+                    <span class="label">[% t('Enrollment period:') %] </span>
>                     <fieldset>
>-                        <legend>Choose one</legend>
>+                        <legend>[% t('Choose one') %]</legend>
>                         <ol>
>                             <li>
>-                                <label for="enrolmentperiod" style="width:6em;">In months: </label>
>+                                <label for="enrolmentperiod" style="width:6em;">[% t('In months:') %] </label>
>                                 [% IF category.enrolmentperiod %]
>-                                    <input type="text" class="enrollmentperiod" name="enrolmentperiod" id="enrolmentperiod" size="3" maxlength="3" value="[% category.enrolmentperiod %]" /> months
>+                                    <input type="text" class="enrollmentperiod" name="enrolmentperiod" id="enrolmentperiod" size="3" maxlength="3" value="[% category.enrolmentperiod %]" /> [% t('months') %]
>                                [% ELSE %]
>-                                    <input type="text" class="enrollmentperiod" name="enrolmentperiod" id="enrolmentperiod" size="3" maxlength="3" value="" /> months
>+                                    <input type="text" class="enrollmentperiod" name="enrolmentperiod" id="enrolmentperiod" size="3" maxlength="3" value="" /> [% t('months') %]
>                                [% END %]
>                             </li>
>                             <li>
>-                                <label for="enrolmentperioddate" style="width:6em;">Until date: </label>
>+                                <label for="enrolmentperioddate" style="width:6em;">[% t('Until date:') %] </label>
>                                 <input type="text" class="enrollmentperiod datepicker" name="enrolmentperioddate" id="enrolmentperioddate" value="[% category.enrolmentperioddate | $KohaDates %]" />
>                             </li>
>                         </ol>
>                     </fieldset>
>                 </li>
>                 <li>
>-                    <label for="dateofbirthrequired">Age required: </label>
>-                    <input type="text" name="dateofbirthrequired" id="dateofbirthrequired" value="[% category.dateofbirthrequired %]" size="3" maxlength="3" /> years
>+                    <label for="dateofbirthrequired">[% t('Age required:') %] </label>
>+                    <input type="text" name="dateofbirthrequired" id="dateofbirthrequired" value="[% category.dateofbirthrequired %]" size="3" maxlength="3" /> [% t('years') %]
>                 </li>
>                 <li>
>-                    <label for="upperagelimit">Upperage limit: </label>
>-                    <input type="text" name="upperagelimit" id="upperagelimit" size="3" maxlength="3" value="[% category.upperagelimit %]" /> years
>+                    <label for="upperagelimit">[% t('Upperage limit:') %] </label>
>+                    <input type="text" name="upperagelimit" id="upperagelimit" size="3" maxlength="3" value="[% category.upperagelimit %]" /> [% t('years') %]
>                 </li>
>                 <li>
>-                    <label for="enrolmentfee">Enrollment fee: </label>
>+                    <label for="enrolmentfee">[% t('Enrollment fee:') %] </label>
>                     <input type="text" name="enrolmentfee" id="enrolmentfee" size="6" value="[% category.enrolmentfee | $Price on_editing => 1 %]" />
>                 </li>
>                 <li>
>-                    <label for="overduenoticerequired">Overdue notice required: </label>
>+                    <label for="overduenoticerequired">[% t('Overdue notice required:') %] </label>
>                     <select name="overduenoticerequired" id="overduenoticerequired">
>                         [% IF category.overduenoticerequired %]
>-                            <option value="0">No</option>
>-                            <option value="1" selected="selected">Yes</option>
>+                            <option value="0">[% t('No') %]</option>
>+                            <option value="1" selected="selected">[% t('Yes') %]</option>
>                         [% ELSE %]
>-                            <option value="0" selected="selected">No</option>
>-                            <option value="1">Yes</option>
>+                            <option value="0" selected="selected">[% t('No') %]</option>
>+                            <option value="1">[% t('Yes') %]</option>
>                         [% END %]
>                     </select>
>                 </li>
>                 <li>
>-                    <label for="hidelostitems">Lost items in staff client: </label>
>+                    <label for="hidelostitems">[% t('Lost items in staff client:') %] </label>
>                     <select name="hidelostitems" id="hidelostitems">
>                         [% IF category.hidelostitems %]
>-                            <option value="0">Shown</option>
>-                            <option value="1" selected="selected">Hidden by default</option>
>+                            <option value="0">[% t('Shown') %]</option>
>+                            <option value="1" selected="selected">[% t('Hidden by default') %]</option>
>                         [% ELSE %]
>-                            <option value="0" selected="selected">Shown</option>
>-                            <option value="1">Hidden by default</option>
>+                            <option value="0" selected="selected">[% t('Shown') %]</option>
>+                            <option value="1">[% t('Hidden by default') %]</option>
>                         [% END %]
>                     </select>
>                 </li>
>                 <li>
>-                    <label for="reservefee">Hold fee: </label>
>+                    <label for="reservefee">[% t('Hold fee:') %] </label>
>                     <input type="text" name="reservefee" id="reservefee" size="6" value="[% category.reservefee | $Price on_editing => 1 %]" />
>                 </li>
>                 <li>
>-                    <label for="category_type" class="required">Category type: </label>
>+                    <label for="category_type" class="required">[% t('Category type:') %] </label>
>                     <select name="category_type" id="category_type">
>-                        [% UNLESS category %]<option value="" selected="selected">Select a category type</option>[% ELSE %]<option value="">Select a category type</option>[% END %]
>-                        [% IF category and category.category_type == 'A' %]<option value="A" selected="selected">Adult</option>[% ELSE %]<option value="A">Adult</option>[% END %]
>-                        [% IF category and category.category_type == 'C' %]<option value="C" selected="selected">Child</option>[% ELSE %]<option value="C">Child</option>[% END %]
>-                        [% IF category and category.category_type == 'S' %]<option value="S" selected="selected">Staff</option>[% ELSE %]<option value="S">Staff</option>[% END %]
>-                        [% IF category and category.category_type == 'I' %]<option value="I" selected="selected">Organization</option>[% ELSE %]<option value="I">Organization</option>[% END %]
>-                        [% IF category and category.category_type == 'P' %]<option value="P" selected="selected">Professional</option>[% ELSE %]<option value="P">Professional</option>[% END %]
>-                        [% IF category and category.category_type == 'X' %]<option value="X" selected="selected">Statistical</option>[% ELSE %]<option value="X">Statistical</option>[% END %]
>+                        [% UNLESS category %]<option value="" selected="selected">[% t('Select a category type') %]</option>[% ELSE %]<option value="">[% t('Select a category type') %]</option>[% END %]
>+                        [% IF category and category.category_type == 'A' %]<option value="A" selected="selected">[% t('Adult') %]</option>[% ELSE %]<option value="A">[% t('Adult') %]</option>[% END %]
>+                        [% IF category and category.category_type == 'C' %]<option value="C" selected="selected">[% t('Child') %]</option>[% ELSE %]<option value="C">[% t('Child') %]</option>[% END %]
>+                        [% IF category and category.category_type == 'S' %]<option value="S" selected="selected">[% t('Staff') %]</option>[% ELSE %]<option value="S">[% t('Staff') %]</option>[% END %]
>+                        [% IF category and category.category_type == 'I' %]<option value="I" selected="selected">[% t('Organization') %]</option>[% ELSE %]<option value="I">[% t('Organization') %]</option>[% END %]
>+                        [% IF category and category.category_type == 'P' %]<option value="P" selected="selected">[% t('Professional') %]</option>[% ELSE %]<option value="P">[% t('Professional') %]</option>[% END %]
>+                        [% IF category and category.category_type == 'X' %]<option value="X" selected="selected">[% t('Statistical') %]</option>[% ELSE %]<option value="X">[% t('Statistical') %]</option>[% END %]
>                     </select>
>-                    <span class="required">Required</span>
>+                    <span class="required">[% t('Required') %]</span>
>                 </li>
>-                <li><label for="branches">Branches limitation: </label>
>-                    <select id="branches" name="branches" multiple size="10">
>-                        <option value="">All branches</option>
>+                <li><label for="branches">[% t('Branches limitation:') %] </label>
>+                    <select id="branches" name="branches" multiple="" size="10">
>+                        <option value="">[% t('All branches') %]</option>
>                         [% FOREACH branch IN branches_loop %]
>                           [% IF branch.selected %]
>                             <option selected="selected" value="[% branch.branchcode %]">[% branch.branchname |html %]</option>
>@@ -161,89 +162,89 @@
>                           [% END %]
>                         [% END %]
>                     </select>
>-                    <span>Select <i>All branches</i> if this category type must to be displayed all the time. Otherwise select libraries you want to associate with this value.
>+                    <span>[% t('Select') %] <i>[% t('All branches') %]</i> [% t('if this category type must to be displayed all the time. Otherwise select libraries you want to associate with this value.') %]
>                     </span>
>                 </li>
>-                <li><label for="block_expired">Block expired patrons:</label>
>+                <li><label for="block_expired">[% t('Block expired patrons:') %]</label>
>                     <select name="BlockExpiredPatronOpacActions" id="block_expired">
>                         [% IF not category or category.BlockExpiredPatronOpacActions == -1%]
>-                            <option value="-1" selected="selected"> Follow system preference BlockExpiredPatronOpacActions </option>
>+                            <option value="-1" selected="selected"> [% t('Follow system preference BlockExpiredPatronOpacActions') %] </option>
>                         [% ELSE %]
>-                            <option value="-1"> Follow system preference BlockExpiredPatronOpacActions </option>
>+                            <option value="-1"> [% t('Follow system preference BlockExpiredPatronOpacActions') %] </option>
>                         [% END %]
> 
>                         [% IF category and category.BlockExpiredPatronOpacActions == 1 %]
>-                            <option value="1" selected="selected"> Block </option>
>+                            <option value="1" selected="selected"> [% t('Block') %] </option>
>                         [% ELSE %]
>-                            <option value="1"> Block </option>
>+                            <option value="1"> [% t('Block') %] </option>
>                         [% END %]
> 
>                         [% IF category and category.BlockExpiredPatronOpacActions == 0 %]
>-                            <option value="0" selected="selected"> Don't block </option>
>+                            <option value="0" selected="selected"> [% t('Don\'t block') %] </option>
>                         [% ELSE %]
>-                            <option value="0"> Don't block </option>
>+                            <option value="0"> [% t('Don\'t block') %] </option>
>                         [% END %]
>                     </select>
>                     <span>
>-                        Choose whether patrons of this category be blocked from public catalog actions such as renewing and placing holds when their cards have expired.
>+                        [% t('Choose whether patrons of this category be blocked from public catalog actions such as renewing and placing holds when their cards have expired.') %]
>                     </span>
>                 </li>
>                 [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' )  %]
>-                  <li><label for="checkprevcheckout">Check for previous checkouts: </label>
>+                  <li><label for="checkprevcheckout">[% t('Check for previous checkouts:') %] </label>
>                       <select name="checkprevcheckout" id="checkprevcheckout">
>                           [% IF category.checkprevcheckout == 'yes' %]
>-                          <option value="yes" selected="selected">Yes and try to override system preferences</option>
>-                          <option value="no">No and try to override system preferences</option>
>-                          <option value="inherit">Inherit from system preferences</option>
>+                          <option value="yes" selected="selected">[% t('Yes and try to override system preferences') %]</option>
>+                          <option value="no">[% t('No and try to override system preferences') %]</option>
>+                          <option value="inherit">[% t('Inherit from system preferences') %]</option>
>                           [% ELSIF category.checkprevcheckout == 'no' %]
>-                          <option value="yes">Yes and try to override system preferences</option>
>-                          <option value="no" selected="selected">No and try to override system preferences</option>
>-                          <option value="inherit">Inherit from system preferences</option>
>+                          <option value="yes">[% t('Yes and try to override system preferences') %]</option>
>+                          <option value="no" selected="selected">[% t('No and try to override system preferences') %]</option>
>+                          <option value="inherit">[% t('Inherit from system preferences') %]</option>
>                           [% ELSE %]
>-                          <option value="yes">Yes and try to override system preferences</option>
>-                          <option value="no">No and try to override system preferences</option>
>-                          <option value="inherit" selected="selected">Inherit from system preferences</option>
>+                          <option value="yes">[% t('Yes and try to override system preferences') %]</option>
>+                          <option value="no">[% t('No and try to override system preferences') %]</option>
>+                          <option value="inherit" selected="selected">[% t('Inherit from system preferences') %]</option>
>                           [% END %]
>                       </select>
>                       <span>
>-                          Choose whether patrons of this category by default are reminded if they try to borrow an item they borrowed before.
>+                          [% t('Choose whether patrons of this category by default are reminded if they try to borrow an item they borrowed before.') %]
>                       </span>
>                   </li>
>                 [% END %]
>                 <li>
>-                    <label for="default_privacy">Default privacy: </label>
>+                    <label for="default_privacy">[% t('Default privacy:') %] </label>
>                     <select id="default_privacy" name="default_privacy">
>                         [% SET default_privacy = 'default' %]
>                         [% IF category %][% SET default_privacy = category.default_privacy %][% END %]
>                         [% SWITCH default_privacy %]
>                         [% CASE 'forever' %]
>-                            <option value="default">Default</option>
>-                            <option value="never">Never</option>
>-                            <option value="forever" selected="selected">Forever</option>
>+                            <option value="default">[% t('Default') %]</option>
>+                            <option value="never">[% t('Never') %]</option>
>+                            <option value="forever" selected="selected">[% t('Forever') %]</option>
>                         [% CASE 'never' %]
>-                            <option value="default">Default</option>
>-                            <option value="never" selected="selected">Never</option>
>-                            <option value="forever">Forever</option>
>+                            <option value="default">[% t('Default') %]</option>
>+                            <option value="never" selected="selected">[% t('Never') %]</option>
>+                            <option value="forever">[% t('Forever') %]</option>
>                         [% CASE %]
>-                            <option value="default" selected="selected">Default</option>
>-                            <option value="never">Never</option>
>-                            <option value="forever">Forever</option>
>+                            <option value="default" selected="selected">[% t('Default') %]</option>
>+                            <option value="never">[% t('Never') %]</option>
>+                            <option value="forever">[% t('Forever') %]</option>
>                         [% END %]
>                     </select>
>-                    <span>Controls how long a patrons checkout history is kept for new patrons of this category. "Never" anonymizes checkouts on return, and "Forever" keeps a patron's checkout history indefinitely. When set to "Default", the amount of history kept is controlled by the cronjob <i>batch_anonymise.pl</i> which should be set up by your system administrator.</span>
>+                    <span>[% t('Controls how long a patrons checkout history is kept for new patrons of this category. &#34;Never&#34; anonymizes checkouts on return, and &#34;Forever&#34; keeps a patron\'s checkout history indefinitely. When set to &#34;Default&#34;, the amount of history kept is controlled by the cronjob') %] <i>[% t('batch_anonymise.pl') %]</i> [% t('which should be set up by your system administrator.') %]</span>
>                 </li>
>             </ol>
>         </fieldset>
> 
>         [% IF ( EnhancedMessagingPreferences ) %]
>             <fieldset class="rows">
>-                <h4>Default messaging preferences for this patron category</h4>
>+                <h4>[% t('Default messaging preferences for this patron category') %]</h4>
>                 [% INCLUDE 'messaging-preference-form.inc' %]
>             </fieldset>
>         [% END %]
>         <fieldset class="action">
>             <input type="submit" value="Save" />
>-            <a href="/cgi-bin/koha/admin/categories.pl" class="cancel">Cancel</a>
>+            <a href="/cgi-bin/koha/admin/categories.pl" class="cancel">[% t('Cancel') %]</a>
>         </fieldset>
>     </form>
> [% END %]
>@@ -253,61 +254,61 @@
>         <fieldset>
>             <legend>
>                 [% IF patrons_in_category > 0 %]
>-                    Category [% categorycode |html %] is in use.  Deletion not possible!
>+                    [% t('Category') %] [% categorycode |html %] [% t('is in use.') %]  [% t('Deletion not possible!') %]
>                 [% ELSE %]
>-                    Confirm deletion of category [% categorycode |html %]
>+                    [% t('Confirm deletion of category') %] [% categorycode |html %]
>                 [% END %]
>             </legend>
> 
>             [% IF patrons_in_category > 0  %]
>                 <div class="dialog alert">
>-                    <strong>This category is used [% patrons_in_category %] times</strong>. Deletion not possible
>+                    <strong>[% t('This category is used') %] [% patrons_in_category %] [% t('times') %]</strong>[% t('. Deletion not possible') %]
>                 </div>
>             [% END %]
>             <table>
>-                <tr><th scope="row">Category code: </th><td>[% category.categorycode |html %]</td></tr>
>-                <tr><th scope="row">Description: </th><td>[% category.description |html %]</td></tr>
>-                <tr><th scope="row">Enrollment period: </th>
>+                <tr><th scope="row">[% t('Category code:') %] </th><td>[% category.categorycode |html %]</td></tr>
>+                <tr><th scope="row">[% t('Description:') %] </th><td>[% category.description |html %]</td></tr>
>+                <tr><th scope="row">[% t('Enrollment period:') %] </th>
>                     <td>
>                         [% IF category.enrolmentperiod %]
>-                            [% category.enrolmentperiod %] months
>+                            [% category.enrolmentperiod %] [% t('months') %]
>                         [% ELSE %]
>-                            until [% category.enrolmentperioddate | $KohaDates %]
>+                            [% t('until') %] [% category.enrolmentperioddate | $KohaDates %]
>                         [% END %]
>                     </td>
>                 </tr>
>-                <tr><th scope="row">Age required: </th><td>[% category.dateofbirthrequired %] years</td></tr>
>-                <tr><th scope="row">Upperage limit: </th><td>[% category.upperagelimit %] years</td></tr>
>-                <tr><th scope="row">Enrollment fee: </th><td>[% category.enrolmentfee | $Price %]</td></tr>
>-                <tr><th scope="row">Receives overdue notices: </th><td>[% IF category. overduenoticerequired %]Yes[% ELSE %]No[% END %]</td></tr>
>-                <tr><th scope="row">Lost items in staff client</th><td>[% IF category.hidelostitems %]Hidden by default[% ELSE %]Shown[% END %]</td></tr>
>-                <tr><th scope="row">Hold fee: </th><td>[% category.reservefee | $Price %]</td></tr>
>+                <tr><th scope="row">[% t('Age required:') %] </th><td>[% category.dateofbirthrequired %] [% t('years') %]</td></tr>
>+                <tr><th scope="row">[% t('Upperage limit:') %] </th><td>[% category.upperagelimit %] [% t('years') %]</td></tr>
>+                <tr><th scope="row">[% t('Enrollment fee:') %] </th><td>[% category.enrolmentfee | $Price %]</td></tr>
>+                <tr><th scope="row">[% t('Receives overdue notices:') %] </th><td>[% IF category. overduenoticerequired %][% t('Yes') %][% ELSE %][% t('No') %][% END %]</td></tr>
>+                <tr><th scope="row">[% t('Lost items in staff client') %]</th><td>[% IF category.hidelostitems %][% t('Hidden by default') %][% ELSE %][% t('Shown') %][% END %]</td></tr>
>+                <tr><th scope="row">[% t('Hold fee:') %] </th><td>[% category.reservefee | $Price %]</td></tr>
> 
>                 [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
>                   <tr>
>-                      <th scope="row">Check previous checkouts: </th>
>+                      <th scope="row">[% t('Check previous checkouts:') %] </th>
>                       <td>
>                           [% SWITCH category.checkprevcheckout %]
>                           [% CASE 'yes' %]
>-                              Yes
>+                              [% t('Yes') %]
>                           [% CASE 'no' %]
>-                              No
>+                              [% t('No') %]
>                           [% CASE 'inherit' %]
>-                              Inherit
>+                              [% t('Inherit') %]
>                           [% END %]
>                       </td>
>                   </tr>
>                 [% END %]
>                 <tr>
>-                    <th scope="row">Default privacy: </th>
>+                    <th scope="row">[% t('Default privacy:') %] </th>
>                     <td>
>                         [% SWITCH category.default_privacy %]
>                         [% CASE 'default' %]
>-                            Default
>+                            [% t('Default') %]
>                         [% CASE 'never' %]
>-                            Never
>+                            [% t('Never') %]
>                         [% CASE 'forever' %]
>-                            Forever
>+                            [% t('Forever') %]
>                         [% END %]
>                     </td>
>                 </tr>
>@@ -319,7 +320,7 @@
>                     <input type="hidden" name="op" value="delete_confirmed" />
>                     <input type="hidden" name="categorycode" value="[% categorycode |html %]" />
>                     <input type="submit" value="Delete this category" />
>-                    <a class="cancel" href="/cgi-bin/koha/admin/categories.pl">Cancel</a>
>+                    <a class="cancel" href="/cgi-bin/koha/admin/categories.pl">[% t('Cancel') %]</a>
>                 [% END %]
>             </fieldset>
>         </fieldset>
>@@ -329,36 +330,36 @@
> [% IF op == 'list' %]
> 
>     <div id="toolbar" class="btn-toolbar">
>-        <a class="btn btn-default btn-sm" id="newcategory" href="/cgi-bin/koha/admin/categories.pl?op=add_form"><i class="fa fa-plus"></i> New category</a>
>+        <a class="btn btn-default btn-sm" id="newcategory" href="/cgi-bin/koha/admin/categories.pl?op=add_form"><i class="fa fa-plus"></i> [% t('New category') %]</a>
>     </div>
> 
>-    <h2>Patron categories</h2>
>+    <h2>[% t('Patron categories') %]</h2>
>     [% IF searchfield %]
>-        You Searched for [% searchfield |html %]</span>
>+        [% t('You Searched for') %] [% searchfield |html %]</span>
>     [% END %]
>     [% IF categories%]
>         <table id="table_categorie">
>             <thead>
>                 <tr>
>-                    <th scope="col">Code</th>
>-                    <th scope="col">Category name</th>
>-                    <th scope="col">Type</th>
>-                    <th scope="col">Enrollment period</th>
>-                    <th scope="col">Age required</th>
>-                    <th scope="col">Upper age limit</th>
>-                    <th scope="col">Enrollment fee</th>
>-                    <th scope="col">Overdue</th>
>-                    <th scope="col">Lost items</th>
>-                    <th scope="col">Hold fee</th>
>+                    <th scope="col">[% t('Code') %]</th>
>+                    <th scope="col">[% t('Category name') %]</th>
>+                    <th scope="col">[% t('Type') %]</th>
>+                    <th scope="col">[% t('Enrollment period') %]</th>
>+                    <th scope="col">[% t('Age required') %]</th>
>+                    <th scope="col">[% t('Upper age limit') %]</th>
>+                    <th scope="col">[% t('Enrollment fee') %]</th>
>+                    <th scope="col">[% t('Overdue') %]</th>
>+                    <th scope="col">[% t('Lost items') %]</th>
>+                    <th scope="col">[% t('Hold fee') %]</th>
>                     [% IF ( EnhancedMessagingPreferences ) %]
>-                    <th scope="col">Messaging</th>
>+                    <th scope="col">[% t('Messaging') %]</th>
>                     [% END %]
>-                    <th scope="col">Branches limitations</th>
>+                    <th scope="col">[% t('Branches limitations') %]</th>
>                     [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
>-                    <th scope="col">Check previous checkout?</th>
>+                    <th scope="col">[% t('Check previous checkout?') %]</th>
>                     [% END %]
>-                    <th scope="col">Default privacy</th>
>-                    <th scope="col">Actions</th>
>+                    <th scope="col">[% t('Default privacy') %]</th>
>+                    <th scope="col">[% t('Actions') %]</th>
>                 </tr>
>             </thead>
>             <tbody>
>@@ -366,32 +367,32 @@
>                     <tr>
>                         <td>[% category.categorycode |html %]</td>
>                         <td>
>-                            <a href="/cgi-bin/koha/admin/categories.pl?op=add_form&amp;categorycode=[% category.categorycode |uri %]">[% category.description |html %]</a>
>+                            <a href="/cgi-bin/koha/admin/categories.pl?op=add_form&categorycode=[% category.categorycode |uri %]">[% category.description |html %]</a>
>                         </td>
>                         <td>
>                             [% SWITCH category.category_type %]
>-                                [% CASE 'A' %]Adult
>-                                [% CASE 'C' %]Child
>-                                [% CASE 'P' %]Prof.
>-                                [% CASE 'I' %]Org.
>-                                [% CASE 'S' %]Staff
>-                                [% CASE 'X' %]Statistical
>+                                [% CASE 'A' %][% t('Adult') %]
>+                                [% CASE 'C' %][% t('Child') %]
>+                                [% CASE 'P' %][% t('Prof.') %]
>+                                [% CASE 'I' %][% t('Org.') %]
>+                                [% CASE 'S' %][% t('Staff') %]
>+                                [% CASE 'X' %][% t('Statistical') %]
>                             [% END %]
>                         </td>
>                         <td>
>                             [% IF ( category.enrolmentperiod ) %]
>-                                [% category.enrolmentperiod %] months
>+                                [% category.enrolmentperiod %] [% t('months') %]
>                             [% ELSE %]
>-                                until [% category.enrolmentperioddate | $KohaDates %]
>+                                [% t('until') %] [% category.enrolmentperioddate | $KohaDates %]
>                             [% END %]
>                         </td>
>                         [% IF (category.dateofbirthrequired) %]
>-                            <td>[% category.dateofbirthrequired %] years</td>
>+                            <td>[% category.dateofbirthrequired %] [% t('years') %]</td>
>                         [% ELSE %]
>                             <td>-</td>
>                         [% END %]
>                         [% IF (category.upperagelimit) %]
>-                            <td>[% category.upperagelimit %] years</td>
>+                            <td>[% category.upperagelimit %] [% t('years') %]</td>
>                         [% ELSE %]
>                             <td>-</td>
>                         [% END %]
>@@ -400,8 +401,8 @@
>                         [% ELSE %]
>                             <td>-</td>
>                         [% END %]
>-                        <td>[% IF ( category.overduenoticerequired ) %]Yes[% ELSE %]No[% END %]</td>
>-                        <td>[% IF ( category.hidelostitems ) %]Hidden[% ELSE %]Shown[% END %]</td>
>+                        <td>[% IF ( category.overduenoticerequired ) %][% t('Yes') %][% ELSE %][% t('No') %][% END %]</td>
>+                        <td>[% IF ( category.hidelostitems ) %][% t('Hidden') %][% ELSE %][% t('Shown') %][% END %]</td>
>                         [% IF (category.reservefee > 0) %]
>                             <td>[% category.reservefee | $Price %]</td>
>                         [% ELSE %]
>@@ -414,20 +415,20 @@
>                                     [% FOREACH prefs IN default_messaging %]
>                                         [% FOREACH transport IN prefs.transports %]
>                                             [% IF ( transport.transport ) %]
>-                                                [% IF ( prefs.Item_Due ) %]Item due
>-                                                [% ELSIF ( prefs.Advance_Notice ) %]Advance notice
>-                                                [% ELSIF ( prefs.Upcoming_Events ) %]Upcoming events
>-                                                [% ELSIF ( prefs.Hold_Filled ) %]Hold filled
>-                                                [% ELSIF ( prefs.Item_Check_in ) %]Item check-in
>-                                                [% ELSIF ( prefs.Item_Checkout ) %]Item checkout
>-                                                [% ELSE %]Unknown
>+                                                [% IF ( prefs.Item_Due ) %][% t('Item due') %]
>+                                                [% ELSIF ( prefs.Advance_Notice ) %][% t('Advance notice') %]
>+                                                [% ELSIF ( prefs.Upcoming_Events ) %][% t('Upcoming events') %]
>+                                                [% ELSIF ( prefs.Hold_Filled ) %][% t('Hold filled') %]
>+                                                [% ELSIF ( prefs.Item_Check_in ) %][% t('Item check-in') %]
>+                                                [% ELSIF ( prefs.Item_Checkout ) %][% t('Item checkout') %]
>+                                                [% ELSE %][% t('Unknown') %]
>                                                 [% END %]:
>                                                 <strong>[% transport.transport %]</strong><br />
>-                                            [% ELSE %]None<br />[% END %]
>+                                            [% ELSE %][% t('None') %]<br />[% END %]
>                                         [% END %]
>                                     [% END %]
>                                 [% ELSE %]
>-                                    None
>+                                    [% t('None') %]
>                                 [% END %]
>                             </td>
>                         [% END %]
>@@ -440,47 +441,47 @@
>                                 [% END %]
>                                 <span title="[% branches_str %]">
>                                     [% IF branch_limitations.size > 1 %]
>-                                        [% branch_limitations.size %] branches limitations
>+                                        [% branch_limitations.size %] [% t('branches limitations') %]
>                                     [% ELSE %]
>-                                        [% branch_limitations.size %] branch limitation
>+                                        [% branch_limitations.size %] [% t('branch limitation') %]
>                                     [% END %]
>                                 </span>
>                             [% ELSE %]
>-                                No limitation
>+                                [% t('No limitation') %]
>                             [% END %]
>                         </td>
>                         [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
>                           <td>
>                               [% SWITCH category.checkprevcheckout %]
>                               [% CASE 'yes' %]
>-                              Yes
>+                              [% t('Yes') %]
>                               [% CASE 'no' %]
>-                              No
>+                              [% t('No') %]
>                               [% CASE 'inherit' %]
>-                              Inherit
>+                              [% t('Inherit') %]
>                               [% END %]
>                           </td>
>                         [% END %]
>                         <td>
>                             [% SWITCH category.default_privacy %]
>                             [% CASE 'default' %]
>-                                Default
>+                                [% t('Default') %]
>                             [% CASE 'never' %]
>-                                Never
>+                                [% t('Never') %]
>                             [% CASE 'forever' %]
>-                                Forever
>+                                [% t('Forever') %]
>                             [% END %]
>                         </td>
>                         <td class="actions">
>-                            <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/categories.pl?op=add_form&amp;categorycode=[% category.categorycode |uri %]"><i class="fa fa-pencil"></i> Edit</a>
>-                            <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/categories.pl?op=delete_confirm&amp;categorycode=[% category.categorycode |uri %]"><i class="fa fa-trash"></i> Delete</a>
>+                            <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/categories.pl?op=add_form&categorycode=[% category.categorycode |uri %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a>
>+                            <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/categories.pl?op=delete_confirm&categorycode=[% category.categorycode |uri %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a>
>                         </td>
>                     </tr>
>                 [% END %]
>             </tbody>
>         </table>
>     [% ELSE %]
>-        <div class="dialog alert">No categories have been defined. <a href="/cgi-bin/koha/admin/categories.pl?op=add_form">Create a new category</a>.</div>
>+        <div class="dialog alert">[% t('No categories have been defined.') %] <a href="/cgi-bin/koha/admin/categories.pl?op=add_form">[% t('Create a new category') %]</a>.</div>
>     [% END %]
> [% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
>index db49419b1f..ac6124c0d6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
>@@ -1,16 +1,17 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; MARC check
>-[% IF ( total ) %] :[% total %] errors found[% ELSE %] : Configuration OK![% END %]</title>
>+<title>[% t('Koha âº Administration âº MARC check') %]
>+[% IF ( total ) %] :[% total %] [% t('errors found') %][% ELSE %] [% t(': Configuration OK!') %][% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="admin_checkmarc" class="admin">
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; MARC check
>-[% IF ( total ) %]: [% total %] errors found[% ELSE %] : Configuration OK![% END %]</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> [% t('âº MARC check') %]
>+[% IF ( total ) %]: [% total %] [% t('errors found') %][% ELSE %] [% t(': Configuration OK!') %][% END %]</div>
> 
> <div id="doc3" class="yui-t2">
>    
>@@ -18,155 +19,155 @@
> 	<div id="yui-main">
> 	<div class="yui-b">
> 
>-<h1>MARC bibliographic framework test</h1>
>+<h1>[% t('MARC bibliographic framework test') %]</h1>
> <table>
>     <tr>
>-        <th>Test</th>
>-        <th>Result</th>
>+        <th>[% t('Test') %]</th>
>+        <th>[% t('Result') %]</th>
>     </tr>
> 
> [% IF ( itemnum ) %]
>     <tr>
>-        <td>itemnum</td>
>-        <td><ul><li>The field itemnum MUST be mapped </li>
>-            <li>The corresponding subfield MUST be in with -1 (ignore) tab</li></ul></td>
>+        <td>[% t('itemnum') %]</td>
>+        <td><ul><li>[% t('The field itemnum MUST be mapped') %] </li>
>+            <li>[% t('The corresponding subfield MUST be in with -1 (ignore) tab') %]</li></ul></td>
>     </tr>
> [% ELSE %]
>     <tr>
>-        <td>OK</td>
>-        <td>itemnum : the field itemnumber is mapped to a field in tab -1</td>
>+        <td>[% t('OK') %]</td>
>+        <td>[% t('itemnum : the field itemnumber is mapped to a field in tab -1') %]</td>
>     </tr>
> [% END %]
> 
> [% IF ( itemfields ) %]
>     <tr>
>-        <td>item fields</td>
>-        <td>ALL items fields MUST :<br />
>-            <ul><li>be mapped to the same tag,</li>
>-            <li>and they must all be in the 10 (items) tab</li></ul></td>
>+        <td>[% t('item fields') %]</td>
>+        <td>[% t('ALL items fields MUST :') %]<br />
>+            <ul><li>[% t('be mapped to the same tag,') %]</li>
>+            <li>[% t('and they must all be in the 10 (items) tab') %]</li></ul></td>
>     </tr>
> [% ELSE %]
>     <tr>
>-        <td>OK</td>
>-        <td>All item fields are in the same tag and in item tab</td>
>+        <td>[% t('OK') %]</td>
>+        <td>[% t('All item fields are in the same tag and in item tab') %]</td>
>     </tr>
> [% END %]
> 
>     [% IF ( itemtags ) %]
>         <tr>
>-            <td>Item tag</td>
>-            <td>There is more than 1 MARC tag related to items tab (10) : [% itemtags %]</td>
>+            <td>[% t('Item tag') %]</td>
>+            <td>[% t('There is more than 1 MARC tag related to items tab (10) :') %] [% itemtags %]</td>
>         </tr>
>     [% ELSE %]
>         <tr>
>-            <td>OK</td>
>-            <td>Only 1 MARC tag mapped to items</td>
>+            <td>[% t('OK') %]</td>
>+            <td>[% t('Only 1 MARC tag mapped to items') %]</td>
>         </tr>
>     [% END %]
>     
> [% IF ( itemtype ) %]
>     <tr>
>-        <td>itemtype NOT mapped</td>
>-        <td>the biblioitems.itemtype field MUST :<br />
>-            <ul><li>be mapped to a MARC subfield, </li>
>-            <li>the corresponding subfield MUST have "Authorized value" set to "itemtype"</li></ul></td>
>+        <td>[% t('itemtype NOT mapped') %]</td>
>+        <td>[% t('the biblioitems.itemtype field MUST :') %]<br />
>+            <ul><li>[% t('be mapped to a MARC subfield,') %] </li>
>+            <li>[% t('the corresponding subfield MUST have &#34;Authorized value&#34; set to &#34;itemtype&#34;') %]</li></ul></td>
>     </tr>
> [% ELSE %]
>     <tr>
>-        <td>OK</td>
>-        <td>biblioitems.itemtype defined</td>
>+        <td>[% t('OK') %]</td>
>+        <td>[% t('biblioitems.itemtype defined') %]</td>
>     </tr>
> [% END %]
> 
> [% IF ( branch ) %]
>     <tr>
>-        <td>homebranch NOT mapped</td>
>-        <td>the items.homebranch field MUST :<br />
>-            <ul><li>be mapped to a MARC subfield,</li>
>-            <li>the corresponding subfield MUST have "Authorized value" set to "branches"</li></ul></td>
>+        <td>[% t('homebranch NOT mapped') %]</td>
>+        <td>[% t('the items.homebranch field MUST :') %]<br />
>+            <ul><li>[% t('be mapped to a MARC subfield,') %]</li>
>+            <li>[% t('the corresponding subfield MUST have &#34;Authorized value&#34; set to &#34;branches&#34;') %]</li></ul></td>
>     </tr>
> [% ELSE %]
>     <tr>
>-        <td>OK</td>
>-        <td>homebranch defined</td>
>+        <td>[% t('OK') %]</td>
>+        <td>[% t('homebranch defined') %]</td>
>     </tr>
> [% END %]
> 
> [% IF ( holdingbranch ) %]
>     <tr>
>-        <td>holdingbranch NOT mapped</td>
>-        <td>the items.holdingbranch field MUST :<br />
>-            <ul><li>be mapped to a MARC subfield, </li>
>-            <li>the corresponding subfield MUST have "Authorized value" set to "branches"</li></ul></td>
>+        <td>[% t('holdingbranch NOT mapped') %]</td>
>+        <td>[% t('the items.holdingbranch field MUST :') %]<br />
>+            <ul><li>[% t('be mapped to a MARC subfield,') %] </li>
>+            <li>[% t('the corresponding subfield MUST have &#34;Authorized value&#34; set to &#34;branches&#34;') %]</li></ul></td>
>     </tr>
> [% ELSE %]
>     <tr>
>-        <td>OK</td>
>-        <td>holdingbranch defined</td>
>+        <td>[% t('OK') %]</td>
>+        <td>[% t('holdingbranch defined') %]</td>
>     </tr>
> [% END %]
> 
> [% IF ( itemtypes_empty ) %]
>     <tr>
>-        <td>item type not defined</td>
>-        <td>at least 1 item type must be defined</td>
>+        <td>[% t('item type not defined') %]</td>
>+        <td>[% t('at least 1 item type must be defined') %]</td>
>     </tr>
> [% ELSE %]
>     <tr>
>-        <td>OK</td>
>-        <td>at least 1 item type defined</td>
>+        <td>[% t('OK') %]</td>
>+        <td>[% t('at least 1 item type defined') %]</td>
>     </tr>
> [% END %]
> 
> [% IF ( branches_empty ) %]
>     <tr>
>-        <td>library not defined</td>
>-        <td>at least 1 library must be defined</td>
>+        <td>[% t('library not defined') %]</td>
>+        <td>[% t('at least 1 library must be defined') %]</td>
>     </tr>
> [% ELSE %] 
>     <tr>
>-        <td>OK</td>             
>-        <td>at least 1 library defined</td>
>+        <td>[% t('OK') %]</td>             
>+        <td>[% t('at least 1 library defined') %]</td>
>     </tr>                                       
> [% END %]
> 
> [% IF ( biblionumber ) %]
>     <tr>
>-        <td>biblio and biblionumber</td>
>-        <td>The biblio.biblionumber and biblioitems.biblioitemnumber fields be mapped to a MARC subfield,</td>
>+        <td>[% t('biblio and biblionumber') %]</td>
>+        <td>[% t('The biblio.biblionumber and biblioitems.biblioitemnumber fields be mapped to a MARC subfield,') %]</td>
>     </tr>
> [% ELSE %]
>     <tr>
>-        <td>OK</td>
>-        <td>biblionumber and biblioitemnumber mapped correctly</td>
>+        <td>[% t('OK') %]</td>
>+        <td>[% t('biblionumber and biblioitemnumber mapped correctly') %]</td>
>     </tr>
> [% END %]
> 
>     [% IF ( frameworknull ) %]
>         <tr>
>-            <td>framework values</td>
>-            <td>there is a null value in a frameworkcode. Check the following tables<br />
>-                <li>select * from marc_subfield_structure where frameworkcode is NULL</li>
>-                <li>select * from marc_tag_structure where frameworkcode is NULL</li>
>+            <td>[% t('framework values') %]</td>
>+            <td>[% t('there is a null value in a frameworkcode. Check the following tables') %]<br />
>+                <li>[% t('select * from marc_subfield_structure where frameworkcode is NULL') %]</li>
>+                <li>[% t('select * from marc_tag_structure where frameworkcode is NULL') %]</li>
>             </td>
>         </tr>
>     [% ELSE %]
>         <tr>
>-            <td>OK</td>
>-            <td>no NULL value in frameworkcode</td>
>+            <td>[% t('OK') %]</td>
>+            <td>[% t('no NULL value in frameworkcode') %]</td>
>         </tr>
>     [% END %]
> 
>     [% IF ( inconsistent_tabs ) %]
>         <tr>
>-            <td style="vertical-align:top;">subfields not in same tabs</td>
>-            <td>Not all subfields for the following tags are in the same tab (or marked 'ignored').
>+            <td style="vertical-align:top;">[% t('subfields not in same tabs') %]</td>
>+            <td>[% t('Not all subfields for the following tags are in the same tab (or marked \'ignored\').') %]
>                 <table>
>                     <tr>
>-                        <th>Code</th>
>-                        <th>Description</th>
>-                        <th>Tag</th>
>-                        <th>Tabs in use</th>
>+                        <th>[% t('Code') %]</th>
>+                        <th>[% t('Description') %]</th>
>+                        <th>[% t('Tag') %]</th>
>+                        <th>[% t('Tabs in use') %]</th>
>                     </tr>
>                     [% FOREACH tab_inf IN tab_info %]
>                         <tr>
>@@ -174,7 +175,7 @@
>                             [% IF ( tab_inf.frameworkcode ) %]
>                                 <td>[% tab_inf.frameworktext %]</td>
>                             [% ELSE %]
>-                                <td>Default framework</td>
>+                                <td>[% t('Default framework') %]</td>
>                             [% END %]
>                             <td>[% tab_inf.tagfield %]</td>
>                             <td>[% tab_inf.tabs %]</td>
>@@ -185,22 +186,22 @@
>         </tr>
>     [% ELSE %]
>         <tr>
>-            <td>OK</td>
>-            <td>all subfields for each tag are in the same tab (or ignored)</td>
>+            <td>[% t('OK') %]</td>
>+            <td>[% t('all subfields for each tag are in the same tab (or ignored)') %]</td>
>         </tr>
>     [% END %]
> 
>     [% IF ( invalid_authtypecodes ) %]
>         <tr>
>-            <td style="vertical-align:top;">invalid authority types</td>
>-            <td>Not all authority types referred to by the frameworks are defined.
>+            <td style="vertical-align:top;">[% t('invalid authority types') %]</td>
>+            <td>[% t('Not all authority types referred to by the frameworks are defined.') %]
>                 <table>
>                     <tr>
>-                        <th>Framework code</th>
>-                        <th>Framework description</th>
>-                        <th>Tag</th>
>-                        <th>Subfield</th>
>-                        <th>Invalid authority type</th>
>+                        <th>[% t('Framework code') %]</th>
>+                        <th>[% t('Framework description') %]</th>
>+                        <th>[% t('Tag') %]</th>
>+                        <th>[% t('Subfield') %]</th>
>+                        <th>[% t('Invalid authority type') %]</th>
>                     </tr>
>                     [% FOREACH authtypecode_inf IN authtypecode_info %]
>                         <tr>
>@@ -208,7 +209,7 @@
>                             [% IF ( authtypecode_inf.frameworkcode ) %]
>                                 <td>[% authtypecode_inf.frameworktext %]</td>
>                             [% ELSE %]
>-                                <td>Default framework</td>
>+                                <td>[% t('Default framework') %]</td>
>                             [% END %]
>                             <td>[% authtypecode_inf.tagfield %]</td>
>                             <td>[% authtypecode_inf.tagsubfield %]</td>
>@@ -220,21 +221,21 @@
>         </tr>
>     [% ELSE %]
>         <tr>
>-            <td>OK</td>
>-            <td>all authority types used in the frameworks are defined</td>
>+            <td>[% t('OK') %]</td>
>+            <td>[% t('all authority types used in the frameworks are defined') %]</td>
>         </tr>
>     [% END %]
> 
>     [% IF ( permanent_location_mapped ) %]
>         <tr>
>-            <td style="vertical-align:top;">items.permanent_location mapped</td>
>-            <td>The following mappings exist for items.permanent_location, and they shouldn't.
>+            <td style="vertical-align:top;">[% t('items.permanent_location mapped') %]</td>
>+            <td>[% t('The following mappings exist for items.permanent_location, and they shouldn\'t.') %]
>                 <table>
>                     <tr>
>-                        <th>Framework code</th>
>-                        <th>Framework description</th>
>-                        <th>Tag</th>
>-                        <th>Subfield</th>
>+                        <th>[% t('Framework code') %]</th>
>+                        <th>[% t('Framework description') %]</th>
>+                        <th>[% t('Tag') %]</th>
>+                        <th>[% t('Subfield') %]</th>
>                     </tr>
>                     [% FOREACH mapped_perm_loc IN mapped_permanent_location %]
>                         <tr>
>@@ -242,7 +243,7 @@
>                             [% IF ( mapped_perm_loc.frameworkcode ) %]
>                                 <td>[% mapped_perm_loc.frameworktext %]</td>
>                             [% ELSE %]
>-                                <td>Default framework</td>
>+                                <td>[% t('Default framework') %]</td>
>                             [% END %]
>                             <td>[% mapped_perm_loc.tagfield %]</td>
>                             <td>[% mapped_perm_loc.tagsubfield %]</td>
>@@ -253,21 +254,21 @@
>         </tr>
>     [% ELSE %]
>         <tr>
>-            <td>OK</td>
>-            <td>items.permanent_location is not mapped on the frameworks</td>
>+            <td>[% t('OK') %]</td>
>+            <td>[% t('items.permanent_location is not mapped on the frameworks') %]</td>
>         </tr>
>     [% END %]
> 
> 
> [% IF ( total ) %]
>     <tr>
>-        <td>TOTAL</td>
>-        <td>You have [% total %] error(s) in your MARC configuration. Please fix them before using Koha</td>
>+        <td>[% t('TOTAL') %]</td>
>+        <td>[% t('You have') %] [% total %] [% t('error(s) in your MARC configuration. Please fix them before using Koha') %]</td>
>     </tr>
> </table>
> [% ELSE %]
>     </table>
>-        <p><b>Configuration OK, you don't have errors in your MARC parameters table</b></p>
>+        <p><b>[% t('Configuration OK, you don\'t have errors in your MARC parameters table') %]</b></p>
> [% END %]
> 
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
>index f7daa3ca2e..2c187ab986 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
>@@ -1,7 +1,8 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; [% IF op =='add_form' %]Cities &rsaquo; [% IF city.cityid %] Modify city[% ELSE %] New city[% END %][% ELSE %][% IF op == 'delete_confirm' %]Cities &rsaquo; Confirm deletion of city[% ELSE %] Cities[% END %][% END %]</title>
>+<title>[% t('Koha âº Administration âº') %] [% IF op =='add_form' %][% t('Cities âº') %] [% IF city.cityid %] [% t('Modify city') %][% ELSE %] [% t('New city') %][% END %][% ELSE %][% IF op == 'delete_confirm' %][% t('Cities âº Confirm deletion of city') %][% ELSE %] [% t('Cities') %][% END %][% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% Asset.css("css/datatables.css") %]
> </head>
>@@ -11,13 +12,13 @@
> [% INCLUDE 'cities-admin-search.inc' %]
> 
> <div id="breadcrumbs">
>-    <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>-    &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>-    &rsaquo; <a href="/cgi-bin/koha/admin/cities.pl">Cities</a>
>+    <a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a>
>+    âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a>
>+    âº <a href="/cgi-bin/koha/admin/cities.pl">[% t('Cities') %]</a>
>     [% IF op == 'add_form' %]
>-    &rsaquo; [% IF city.cityid %]Modify[% ELSE %]New[% END %] City
>+    âº [% IF city.cityid %][% t('Modify') %][% ELSE %][% t('New') %][% END %] [% t('City') %]
>     [% ELSIF op == 'delete_confirm' %]
>-    &rsaquo; Confirm deletion of city
>+    [% t('âº Confirm deletion of city') %]
>     [% END %]
> </div>
> 
>@@ -31,19 +32,19 @@
>     <div class="dialog [% m.type %]">
>         [% SWITCH m.code %]
>         [% CASE 'error_on_update' %]
>-            An error occurred when updating this city. Perhaps it already exists.
>+            [% t('An error occurred when updating this city. Perhaps it already exists.') %]
>         [% CASE 'error_on_insert' %]
>-            An error occurred when adding this city. The city id might already exist.
>+            [% t('An error occurred when adding this city. The city id might already exist.') %]
>         [% CASE 'error_on_delete' %]
>-            An error occurred when deleting this city. Check the logs.
>+            [% t('An error occurred when deleting this city. Check the logs.') %]
>         [% CASE 'success_on_update' %]
>-            City updated successfully.
>+            [% t('City updated successfully.') %]
>         [% CASE 'success_on_insert' %]
>-            City added successfully.
>+            [% t('City added successfully.') %]
>         [% CASE 'success_on_delete' %]
>-            City deleted successfully.
>+            [% t('City deleted successfully.') %]
>         [% CASE 'already_exists' %]
>-            This city already exists.
>+            [% t('This city already exists.') %]
>         [% CASE %]
>             [% m.code %]
>         [% END %]
>@@ -52,9 +53,9 @@
> 
> [% IF op == 'add_form' %]
>     [% IF city %]
>-        <h1>Modify a city</h1>
>+        <h1>[% t('Modify a city') %]</h1>
>     [% ELSE %]
>-        <h1>New city</h1>
>+        <h1>[% t('New city') %]</h1>
>     [% END %]
> 
>     <form action="/cgi-bin/koha/admin/cities.pl" name="Aform" method="post" class="validated">
>@@ -64,22 +65,22 @@
>         <fieldset class="rows">
>             <ol>
>                 [% IF city %]
>-                    <li><span class="label">City ID: </span>[% city.cityid %]</li>
>+                    <li><span class="label">[% t('City ID:') %] </span>[% city.cityid %]</li>
>                 [% END %]
>                 <li>
>-                    <label for="city_name" class="required">City: </label>
>-                    <input type="text" name="city_name" id="city_name" size="80" maxlength="100" value="[% city.city_name |html %]" required="required" class="required" /> <span class="required">Required</span>
>+                    <label for="city_name" class="required">[% t('City:') %] </label>
>+                    <input type="text" name="city_name" id="city_name" size="80" maxlength="100" value="[% city.city_name |html %]" required="required" class="required" /> <span class="required">[% t('Required') %]</span>
>                 </li>
>                 <li>
>-                    <label for="city_state">State: </label>
>+                    <label for="city_state">[% t('State:') %] </label>
>                     <input type="text" name="city_state" id="city_state" size="80" maxlength="100" value="[% city.city_state |html %]" />
>                 </li>
>                 <li>
>-                    <label for="city_zipcode" class="required">ZIP/Postal code: </label>
>-                    <input type="text" name="city_zipcode" id="city_zipcode" size="20" maxlength="20" value="[% city.city_zipcode %]" required="required" class="required" /> <span class="required">Required</span>
>+                    <label for="city_zipcode" class="required">[% t('ZIP/Postal code:') %] </label>
>+                    <input type="text" name="city_zipcode" id="city_zipcode" size="20" maxlength="20" value="[% city.city_zipcode %]" required="required" class="required" /> <span class="required">[% t('Required') %]</span>
>                 </li>
>                 <li>
>-                    <label for="city_country">Country: </label>
>+                    <label for="city_country">[% t('Country:') %] </label>
>                     <input type="text" name="city_country" id="city_country" size="80" maxlength="100" value="[% city.city_country |html %]" />
>                 </li>
>             </ol>
>@@ -87,38 +88,38 @@
> 
>         <fieldset class="action">
>             <input type="submit" value="Submit" />
>-            <a class="cancel" href="/cgi-bin/koha/admin/cities.pl">Cancel</a>
>+            <a class="cancel" href="/cgi-bin/koha/admin/cities.pl">[% t('Cancel') %]</a>
>         </fieldset>
>     </form>
> [% END %]
> 
> [% IF op == 'delete_confirm' %]
>     <div class="dialog alert">
>-        <h3>Delete city "[% city.city_name %]?"</h3>
>+        <h3>[% t('Delete city &#34;') %][% city.city_name %]?"</h3>
>         <table>
>-            <tr><th>City id</th>
>+            <tr><th>[% t('City id') %]</th>
>                 <td>[% city.cityid %]</td>
>             </tr>
>-            <tr><th>City</th>
>+            <tr><th>[% t('City') %]</th>
>                 <td>[% city.city_name %]</td>
>             </tr>
>-            <tr><th>State</th>
>+            <tr><th>[% t('State') %]</th>
>                 <td>[% city.city_state %]</td>
>             </tr>
>-            <tr><th>ZIP/Postal code</th>
>+            <tr><th>[% t('ZIP/Postal code') %]</th>
>                 <td>[% city.city_zipcode %]</td>
>             </tr>
>-            <tr><th>Country</th>
>+            <tr><th>[% t('Country') %]</th>
>                 <td>[% city.city_country %]</td>
>             </tr>
>         </table>
>         <form action="/cgi-bin/koha/admin/cities.pl" method="post">
>             <input type="hidden" name="op" value="delete_confirmed" />
>             <input type="hidden" name="cityid" value="[% city.cityid %]" />
>-            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
>+            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('Yes, delete') %]</button>
>         </form>
>         <form action="/cgi-bin/koha/admin/cities.pl" method="get">
>-            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
>+            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> [% t('No, do not delete') %]</button>
>         </form>
>     </div>
> [% END %]
>@@ -126,23 +127,23 @@
> [% IF op == 'list' %]
> 
>     <div id="toolbar" class="btn-toolbar">
>-        <a class="btn btn-default btn-sm" id="newcity" href="/cgi-bin/koha/admin/cities.pl?op=add_form"><i class="fa fa-plus"></i> New city</a>
>+        <a class="btn btn-default btn-sm" id="newcity" href="/cgi-bin/koha/admin/cities.pl?op=add_form"><i class="fa fa-plus"></i> [% t('New city') %]</a>
>     </div>
> 
>-    <h2>Cities</h2>
>+    <h2>[% t('Cities') %]</h2>
>     [% IF searchfield %]
>-        Searching: [% searchfield |html %]
>+        [% t('Searching:') %] [% searchfield |html %]
>     [% END %]
> 
>     [% IF cities.count %]
>         <table id="table_cities">
>             <thead>
>-                <th>City ID</th>
>-                <th>City</th>
>-                <th>State</th>
>-                <th>ZIP/Postal code</th>
>-                <th>Country</th>
>-                <th>Actions</th>
>+                <th>[% t('City ID') %]</th>
>+                <th>[% t('City') %]</th>
>+                <th>[% t('State') %]</th>
>+                <th>[% t('ZIP/Postal code') %]</th>
>+                <th>[% t('Country') %]</th>
>+                <th>[% t('Actions') %]</th>
>             </thead>
>             <tbody>
>                 [% FOREACH city IN cities %]
>@@ -153,8 +154,8 @@
>                     <td>[% city.city_zipcode %]</td>
>                     <td>[% city.city_country %]</td>
>                     <td class="actions">
>-                        <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/cities.pl?op=add_form&amp;cityid=[% city.cityid %]"><i class="fa fa-pencil"></i> Edit</a>
>-                        <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/cities.pl?op=delete_confirm&amp;cityid=[% city.cityid %]"><i class="fa fa-trash"></i> Delete</a>
>+                        <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/cities.pl?op=add_form&cityid=[% city.cityid %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a>
>+                        <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/cities.pl?op=delete_confirm&cityid=[% city.cityid %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a>
>                     </td>
>                 </tr>
>                 [% END %]
>@@ -162,7 +163,7 @@
>         </table>
>     [% ELSE %]
>         <div class="dialog message">
>-            There are no cities defined. <a href="/cgi-bin/koha/admin/cities.pl?op=add_form">Create a new city</a>.
>+            [% t('There are no cities defined.') %] <a href="/cgi-bin/koha/admin/cities.pl?op=add_form">[% t('Create a new city') %]</a>.
>         </div>
>     [% END %]
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
>index c89bfdb486..96166a5fd6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
>@@ -1,21 +1,22 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Classification sources
>+<title>[% t('Koha âº Administration âº Classification sources') %]
> [% IF ( class_source_form ) %]
>-&rsaquo; 
>-    [% IF ( edit_class_source ) %]Modify classification source[% ELSE %]Add classification source[% END %]
>+âº 
>+    [% IF ( edit_class_source ) %][% t('Modify classification source') %][% ELSE %][% t('Add classification source') %][% END %]
> [% END %]
> [% IF ( sort_rule_form ) %]
>-&rsaquo;
>-    [% IF ( edit_sort_rule ) %]Modify filing rule[% ELSE %]Add filing rule[% END %]
>+âº
>+    [% IF ( edit_sort_rule ) %][% t('Modify filing rule') %][% ELSE %][% t('Add filing rule') %][% END %]
> [% END %]
> [% IF ( delete_class_source_form ) %]
>-  &rsaquo; Confirm deletion of classification source [% class_source %]
>+  [% t('âº Confirm deletion of classification source') %] [% class_source %]
> [% ELSIF ( delete_sort_rule_form ) %]
>-  &rsaquo; Confirm deletion of filing rule [% sort_rule %]
>+  [% t('âº Confirm deletion of filing rule') %] [% sort_rule %]
> [% ELSIF ( delete_sort_rule_impossible ) %]
>-  &rsaquo; Cannot delete filing rule [% sort_rule %]
>+  [% t('âº Cannot delete filing rule') %] [% sort_rule %]
> [% END %]
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -26,21 +27,21 @@
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
> <div id="breadcrumbs">
>-         <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>-&rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>-&rsaquo; <a href="/cgi-bin/koha/admin/classsources.pl">Classification sources</a>
>+         <a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a>
>+âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a>
>+âº <a href="/cgi-bin/koha/admin/classsources.pl">[% t('Classification sources') %]</a>
> [% IF ( class_source_form ) %]
>-&rsaquo; [% IF ( edit_class_source ) %]Modify classification source[% ELSE %]Add classification source[% END %]
>+âº [% IF ( edit_class_source ) %][% t('Modify classification source') %][% ELSE %][% t('Add classification source') %][% END %]
> [% END %]
> [% IF ( sort_rule_form ) %]
>-&rsaquo; [% IF ( edit_sort_rule ) %]Modify filing rule[% ELSE %]Add filing rule[% END %]
>+âº [% IF ( edit_sort_rule ) %][% t('Modify filing rule') %][% ELSE %][% t('Add filing rule') %][% END %]
> [% END %]
> [% IF ( delete_class_source_form ) %]
>-&rsaquo; Confirm deletion of classification source <span class="ex">'[% class_source %]'</span>
>+[% t('âº Confirm deletion of classification source') %] <span class="ex">'[% class_source %]'</span>
> [% ELSIF ( delete_sort_rule_form ) %]
>-&rsaquo; Confirm deletion of filing rule <span class="ex">'[% sort_rule %]'</span>
>+[% t('âº Confirm deletion of filing rule') %] <span class="ex">'[% sort_rule %]'</span>
> [% ELSIF ( delete_sort_rule_impossible ) %]
>-&rsaquo; Cannot delete filing rule <span class="ex">'[% sort_rule %]'</span>
>+[% t('âº Cannot delete filing rule') %] <span class="ex">'[% sort_rule %]'</span>
> [% END %]
> </div>
> 
>@@ -51,9 +52,9 @@
> 
> [% IF ( class_source_form ) %]
>   [% IF ( edit_class_source ) %]
>-<h2>Modify classification source</h2>
>+<h2>[% t('Modify classification source') %]</h2>
>   [% ELSE %]
>-<h2>Add classification source</h2>
>+<h2>[% t('Add classification source') %]</h2>
>   [% END %]
> <form action="[% script_name %]" name="Aform" class="validated" method="post">
>   <input type="hidden" name="op" value="[% confirm_op %]" />
>@@ -61,24 +62,24 @@
>     <ol>
>       <li>
>           [% IF ( edit_class_source ) %]
>-		  <span class="label">Classification source code: </span>
>+		  <span class="label">[% t('Classification source code:') %] </span>
>             <input type="hidden" name="class_source" value="[% class_source %]" />
>             [% class_source %]
>           [% ELSE %]
>-              <label class="required" for="class_source">Classification source code: </label>
>-              <input class="required" required="required" type="text" id="class_source" name="class_source"  size="10" maxlength="10" />
>-              <span class="required">Required</span>
>+              <label class="required" for="class_source">[% t('Classification source code:') %] </label>
>+              <input class="required" required="required" type="text" id="class_source" name="class_source" size="10" maxlength="10" />
>+              <span class="required">[% t('Required') %]</span>
>           [% END %]
>        </li>
>-       <li><label class="required" for="description">Description: </label>
>+       <li><label class="required" for="description">[% t('Description:') %] </label>
>            <input class="required" required="required" type="text" id="description" name="description" size="50" maxlength="250" value="[% description |html %]" />
>-           <span class="required">Required</span>
>+           <span class="required">[% t('Required') %]</span>
>        </li>
>-       <li><label for="used">Source in use?</label>
>+       <li><label for="used">[% t('Source in use?') %]</label>
>            [% IF ( used ) %]<input type="checkbox" id="used" name="used" value="used" checked="checked" />[% ELSE %]
> 		  <input type="checkbox" id="used" name="used" value="used" />[% END %]
>        </li>
>-       <li><label class="required" for="sort_rule">Filing rule: </label>
>+       <li><label class="required" for="sort_rule">[% t('Filing rule:') %] </label>
>            <select class="required" required="required" id="sort_rule" name="sort_rule">
>            [% FOREACH rules_dropdow IN rules_dropdown %]
>              [% IF ( rules_dropdow.selected ) %]
>@@ -88,22 +89,22 @@
>              [% END %]
>            [% END %]
>            </select>
>-           <span class="required">Required</span>
>+           <span class="required">[% t('Required') %]</span>
>        </li>    
>     </ol>
>   </fieldset>
>   <fieldset class="action">
>     <input type="submit" value="Save" />
>-    <a class="cancel" href="/cgi-bin/koha/admin/classsources.pl">Cancel</a>
>+    <a class="cancel" href="/cgi-bin/koha/admin/classsources.pl">[% t('Cancel') %]</a>
>   </fieldset>
> </form>
> [% END %]
> 
> [% IF ( sort_rule_form ) %]
>   [% IF ( edit_sort_rule ) %]
>-<h2>Modify filing rule</h2>
>+<h2>[% t('Modify filing rule') %]</h2>
>   [% ELSE %]
>-<h2>Add filing rule</h2>
>+<h2>[% t('Add filing rule') %]</h2>
>   [% END %]
> <form action="[% script_name %]" name="Aform" class="validated" method="post">
>   <input type="hidden" name="op" value="[% confirm_op %]" />
>@@ -111,20 +112,20 @@
>     <ol>
>       <li>
>           [% IF ( edit_sort_rule ) %]
>-		  <span class="label">Filing rule code: </span>
>+		  <span class="label">[% t('Filing rule code:') %] </span>
>             <input type="hidden" name="sort_rule" value="[% sort_rule %]" />
>             [% sort_rule %]
>           [% ELSE %]
>-              <label for="sort_rule" class="required">Filing rule code: </label>
>-              <input class="required" required="required" type="text" id="sort_rule" name="sort_rule"  size="10" maxlength="10" />
>-              <span class="required">Required</span>
>+              <label for="sort_rule" class="required">[% t('Filing rule code:') %] </label>
>+              <input class="required" required="required" type="text" id="sort_rule" name="sort_rule" size="10" maxlength="10" />
>+              <span class="required">[% t('Required') %]</span>
>           [% END %]
>        </li>
>-       <li><label for="description" class="required">Description: </label>
>+       <li><label for="description" class="required">[% t('Description:') %] </label>
>            <input class="required" required="required" type="text" id="description" name="description" size="50" maxlength="250" value="[% description |html %]" />
>-           <span class="required">Required</span>
>+           <span class="required">[% t('Required') %]</span>
>        </li>
>-       <li><label for="sort_routine" class="required">Filing routine: </label>
>+       <li><label for="sort_routine" class="required">[% t('Filing routine:') %] </label>
>            <select class="required" required="required" id="sort_routine" name="sort_routine">
>            [% FOREACH routines_dropdow IN routines_dropdown %]
>              [% IF ( routines_dropdow.selected ) %]
>@@ -134,52 +135,52 @@
>              [% END %]
>            [% END %]
>            </select>
>-           <span class="required">Required</span>
>+           <span class="required">[% t('Required') %]</span>
>        </li>
>     </ol>
>   </fieldset>
>     <fieldset class="action">
>         <input type="submit" value="Save" />
>-        <a class="cancel" href="/cgi-bin/koha/admin/classsources.pl">Cancel</a>
>+        <a class="cancel" href="/cgi-bin/koha/admin/classsources.pl">[% t('Cancel') %]</a>
>     </fieldset>
> </form>
> [% END %]
> 
> [% IF ( delete_class_source_form ) %]
>     <div class="dialog alert">
>-        <h3>Confirm deletion of classification source <span class="ex">'[% class_source %]'</span>?</h3>
>+        <h3>[% t('Confirm deletion of classification source') %] <span class="ex">'[% class_source %]'</span>?</h3>
>         <form action="[% script_name %]" name="Aform" method="post">
>             <input type="hidden" name="op" value="[% confirm_op %]" />
>             <input type="hidden" name="class_source" value="[% class_source %]" />
>-            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete classification source</button>
>+            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('Yes, delete classification source') %]</button>
>         </form>
>         <form action="[% script_name %]" method="get">
>-            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
>+            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> [% t('No, do not delete') %]</button>
>         </form>
>     </div>
> [% END %]
> 
> [% IF ( delete_sort_rule_form ) %]
>     <div class="dialog alert">
>-        <h3>Confirm deletion of filing rule <span class="ex">'[% sort_rule %]'</span>?</h3>
>+        <h3>[% t('Confirm deletion of filing rule') %] <span class="ex">'[% sort_rule %]'</span>?</h3>
>         <form action="[% script_name %]" name="Aform" method="post">
>             <input type="hidden" name="op" value="[% confirm_op %]" />
>             <input type="hidden" name="sort_rule" value="[% sort_rule %]" />
>-            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete filing rule</button>
>+            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('Yes, delete filing rule') %]</button>
>         </form>
>         <form action="[% script_name %]" method="get">
>-            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
>+            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> [% t('No, do not delete') %]</button>
>         </form>
>     </div>
> [% END %]
> 
> [% IF ( delete_sort_rule_impossible ) %]
>-<div class="dialog alert"><h3>Cannot delete filing rule <span class="ex">'[% sort_rule %]'</span></h3>
>-    <p>The filing rule [% sort_rule %] is used by at least one classification source.  Please
>-    remove it from all classification source definitions before trying again.
>+<div class="dialog alert"><h3>[% t('Cannot delete filing rule') %] <span class="ex">'[% sort_rule %]'</span></h3>
>+    <p>[% t('The filing rule') %] [% sort_rule %] [% t('is used by at least one classification source.') %]  [% t('Please') %]
>+    [% t('remove it from all classification source definitions before trying again.') %]
>     </p>
>     <form action="[% script_name %]" method="get">
>-          <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> OK</button>
>+          <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('OK') %]</button>
>     </form>
> </div>
> [% END %]
>@@ -187,64 +188,64 @@
> [% IF ( display_lists ) %]
> 
> <div id="toolbar" class="btn-toolbar">
>-    <a class="btn btn-default btn-sm" id="newsource" href="[% script_name %]?op=add_source"><i class="fa fa-plus"></i> New classification source</a>
>-    <a class="btn btn-default btn-sm" id="newrule" href="[% script_name %]?op=add_sort_rule"><i class="fa fa-plus"></i> New filing rule</a>
>+    <a class="btn btn-default btn-sm" id="newsource" href="[% script_name %]?op=add_source"><i class="fa fa-plus"></i> [% t('New classification source') %]</a>
>+    <a class="btn btn-default btn-sm" id="newrule" href="[% script_name %]?op=add_sort_rule"><i class="fa fa-plus"></i> [% t('New filing rule') %]</a>
> </div>
> 
>-<h2>Classification sources</h2>
>+<h2>[% t('Classification sources') %]</h2>
> [% IF ( added_source ) %]
>-<div class="dialog message">Added classification source [% added_source %]</div>
>+<div class="dialog message">[% t('Added classification source') %] [% added_source %]</div>
> [% END %]
> [% IF ( edited_source ) %]
>-<div class="dialog message">Modified classification source [% edited_source %]</div>
>+<div class="dialog message">[% t('Modified classification source') %] [% edited_source %]</div>
> [% END %]
> [% IF ( deleted_source ) %]
>-<div class="dialog message">Deleted classification source [% deleted_source %]</div>
>+<div class="dialog message">[% t('Deleted classification source') %] [% deleted_source %]</div>
> [% END %]
> [% IF ( failed_add_source ) %]
>-<div class="dialog message">Failed to add classification source [% failed_add_source %]. Perhaps the code already exists?</div>
>+<div class="dialog message">[% t('Failed to add classification source') %] [% failed_add_source %][% t('. Perhaps the code already exists?') %]</div>
> [% END %]
> <table>
>   <tr>
>-    <th>Code</th>
>-    <th>Description</th>
>-    <th>In use</th>
>-    <th>Filing rule</th>
>-    <th>Actions</th>
>+    <th>[% t('Code') %]</th>
>+    <th>[% t('Description') %]</th>
>+    <th>[% t('In use') %]</th>
>+    <th>[% t('Filing rule') %]</th>
>+    <th>[% t('Actions') %]</th>
>   </tr>
>   [% FOREACH class_source IN class_sources %]
>   <tr>
>     <td>[% class_source.code %]</td>
>     <td>[% class_source.description |html %]</td>
>-    <td>[% IF ( class_source.used ) %]Yes[% ELSE %]No[% END %]</td>
>+    <td>[% IF ( class_source.used ) %][% t('Yes') %][% ELSE %][% t('No') %][% END %]</td>
>     <td>[% class_source.sortrule %]</td>
>     <td class="actions">
>-      <a class="btn btn-default btn-xs" href="[% class_source.script_name %]?op=edit_source&amp;class_source=[% class_source.code |html %]"><i class="fa fa-pencil"></i> Edit</a>
>-      <a class="btn btn-default btn-xs" href="[% class_source.script_name %]?op=delete_source&amp;class_source=[% class_source.code |html %]"><i class="fa fa-trash"></i> Delete</a>
>+      <a class="btn btn-default btn-xs" href="[% class_source.script_name %]?op=edit_source&class_source=[% class_source.code |html %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a>
>+      <a class="btn btn-default btn-xs" href="[% class_source.script_name %]?op=delete_source&class_source=[% class_source.code |html %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a>
>     </td>
>   </tr>
>   [% END %]
> </table>
> 
>-<h2>Classification filing rules</h2>
>+<h2>[% t('Classification filing rules') %]</h2>
> [% IF ( added_rule ) %]
>-<div class="dialog message">Added filing rule [% added_rule %]</div>
>+<div class="dialog message">[% t('Added filing rule') %] [% added_rule %]</div>
> [% END %]
> [% IF ( edited_rule ) %]
>-<div class="dialog message">Modified filing rule [% edited_rule %]</div>
>+<div class="dialog message">[% t('Modified filing rule') %] [% edited_rule %]</div>
> [% END %]
> [% IF ( deleted_rule ) %]
>-<div class="dialog message">Deleted filing rule [% deleted_rule %]</div>
>+<div class="dialog message">[% t('Deleted filing rule') %] [% deleted_rule %]</div>
> [% END %]
> [% IF ( failed_add_rule ) %]
>-<div class="dialog message">Failed to add filing rule [% failed_add_rule %]. Perhaps the code already exists?</div>
>+<div class="dialog message">[% t('Failed to add filing rule') %] [% failed_add_rule %][% t('. Perhaps the code already exists?') %]</div>
> [% END %]
> <table>
>   <tr>
>-    <th>Code</th>
>-    <th>Description</th>
>-    <th>Sorting routine</th>
>-    <th>Actions</th>
>+    <th>[% t('Code') %]</th>
>+    <th>[% t('Description') %]</th>
>+    <th>[% t('Sorting routine') %]</th>
>+    <th>[% t('Actions') %]</th>
>   </tr>
>   [% FOREACH class_sort_rule IN class_sort_rules %]
>   <tr>
>@@ -252,8 +253,8 @@
>     <td>[% class_sort_rule.description |html %]</td>
>     <td>[% class_sort_rule.sort_routine %]</td>
>     <td class="actions">
>-      <a class="btn btn-default btn-xs" href="[% class_sort_rule.script_name %]?op=edit_sort_rule&amp;sort_rule=[% class_sort_rule.rule |html %]"><i class="fa fa-pencil"></i> Edit</a>
>-      <a class="btn btn-default btn-xs" href="[% class_sort_rule.script_name %]?op=delete_sort_rule&amp;sort_rule=[% class_sort_rule.rule |html %]"><i class="fa fa-trash"></i> Delete</a>
>+      <a class="btn btn-default btn-xs" href="[% class_sort_rule.script_name %]?op=edit_sort_rule&sort_rule=[% class_sort_rule.rule |html %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a>
>+      <a class="btn btn-default btn-xs" href="[% class_sort_rule.script_name %]?op=delete_sort_rule&sort_rule=[% class_sort_rule.rule |html %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a>
>     </td>
>   </tr>
>   [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
>index 9adae50971..83e6872936 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
>@@ -1,43 +1,44 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% USE Branches %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Circulation and fine rules &rsaquo; Clone circulation and fine rules</title>
>+<title>[% t('Koha âº Administration âº Circulation and fine rules âº Clone circulation and fine rules') %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="admin_clone-rules" class="admin">
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fine rules</a> &rsaquo; Clone circulation and fine rules</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> âº <a href="/cgi-bin/koha/admin/smart-rules.pl">[% t('Circulation and fine rules') %]</a> [% t('âº Clone circulation and fine rules') %]</div>
> 
> <div id="doc3" class="yui-t1">
> 
> <div id="bd">
>     <div id="yui-main">
>     <div class="yui-b">
>-    <h2>Cloning circulation and fine rules
>-        [% IF frombranch %] from "[% Branches.GetName( frombranch ) %]"[% END %]
>-        [% IF tobranch %] to "[% Branches.GetName( tobranch ) %]"[% END %]
>+    <h2>[% t('Cloning circulation and fine rules') %]
>+        [% IF frombranch %] [% t('from &#34;') %][% Branches.GetName( frombranch ) %]"[% END %]
>+        [% IF tobranch %] [% t('to &#34;') %][% Branches.GetName( tobranch ) %]"[% END %]
>     </h2>
> 
>     [% IF ( result ) %]
> 	[% IF ( error ) %]
>-        <div class="dialog alert">Cloning of circulation and fine rules failed!</div>
>+        <div class="dialog alert">[% t('Cloning of circulation and fine rules failed!') %]</div>
> 	[% ELSE %]
>-	    <div class="dialog message"><p>The rules have been cloned.</p></div>
>+	    <div class="dialog message"><p>[% t('The rules have been cloned.') %]</p></div>
> 	[% END %]
>-    <a href="/cgi-bin/koha/admin/smart-rules.pl">Return to circulation and fine rules</a>
>+    <a href="/cgi-bin/koha/admin/smart-rules.pl">[% t('Return to circulation and fine rules') %]</a>
>     [% ELSE %]
> 
>-    <p class="help">Use carefully! If the destination library already has circulation and fine rules, they will be deleted without warning!</p>
>+    <p class="help">[% t('Use carefully! If the destination library already has circulation and fine rules, they will be deleted without warning!') %]</p>
>     <form action="/cgi-bin/koha/admin/clone-rules.pl" method="post">
>         [% UNLESS ( frombranch ) %]
>             <fieldset>
>-                <legend>Please choose a library to clone rules from:</legend>
>-                <label for="frombranch">Source library:</label>
>+                <legend>[% t('Please choose a library to clone rules from:') %]</legend>
>+                <label for="frombranch">[% t('Source library:') %]</label>
>                 <select name="frombranch" id="frombranch">
>-                    <option value="">Default</option>
>+                    <option value="">[% t('Default') %]</option>
>                     [% PROCESS options_for_libraries libraries => Branches.all() %]
>                 </select>
>                 [% IF ( tobranch ) %]<input type="hidden" name="tobranch" value="[% tobranch %]" />[% END %]
>@@ -46,10 +47,10 @@
> 
>         [% UNLESS ( tobranch ) %]
>             <fieldset>
>-            <legend>Please choose the library to clone the rules to:</legend>
>-            <label for="tobranch">Destination library:</label>
>+            <legend>[% t('Please choose the library to clone the rules to:') %]</legend>
>+            <label for="tobranch">[% t('Destination library:') %]</label>
>             <select name="tobranch" id="tobranch">
>-                <option value="">Default</option>
>+                <option value="">[% t('Default') %]</option>
>                 [% PROCESS options_for_libraries libraries => Branches.all() %]
>             </select>
>             [% IF ( frombranch ) %]<input type="hidden" name="frombranch" value="[% frombranch %]" />[% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
>index cfc12772ec..103610263e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% SET panel_id = 0 %]
>@@ -15,18 +16,18 @@
>         [% IF tables.$pagename.keys and tables.$pagename.keys.size > 0 %]
>           [% FOR tablename IN tables.$pagename.keys.sort %]
>             [% IF pagename == 'additem' AND tablename == 'itemst' %]
>-              <div class="alert">Changes made below will only apply to item subfields that are mapped to the 'items' table. <a href="/cgi-bin/koha/admin/koha2marclinks.pl?tablename=items">Go to Koha to MARC mapping</a></div>
>+              <div class="alert">[% t('Changes made below will only apply to item subfields that are mapped to the \'items\' table.') %] <a href="/cgi-bin/koha/admin/koha2marclinks.pl?tablename=items">[% t('Go to Koha to MARC mapping') %]</a></div>
>             [% END %]
>             <table>
>               <caption>
>                 [% IF tablename == 'currencies-table' %]
>-                  Currency
>+                  [% t('Currency') %]
>                 [% ELSIF pagename == 'additem' AND tablename == 'itemst' %]
>-                  Items Editor
>+                  [% t('Items Editor') %]
>                 [% END %]
>-                (id=[% tablename %])
>+                [% t('(id=') %][% tablename %])
>               </caption>
>-              <thead><tr><th>Column name</th><th>Is hidden by default</th><th>Cannot be toggled</th></tr></thead>
>+              <thead><tr><th>[% t('Column name') %]</th><th>[% t('Is hidden by default') %]</th><th>[% t('Cannot be toggled') %]</th></tr></thead>
>               <tbody>
>               [% FOR column IN tables.$pagename.$tablename %]
>                 [% SET value = pagename _ '#' _ tablename _ '#' _ column.columnname %]
>@@ -76,83 +77,83 @@
>           [% END %]
>           <input type="submit" value="Save" />
>         [% ELSE %]
>-          There is no table to configure for this module.
>+          [% t('There is no table to configure for this module.') %]
>         [% END %]
>       [% END %]
>     [% ELSE %]
>-        There is no page using the table configuration in this module.
>+        [% t('There is no page using the table configuration in this module.') %]
>     [% END %]
>   </form>
> </div>
> [% END %]
> 
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Columns settings</title>
>+<title>[% t('Koha âº Administration âº Columns settings') %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
> <body id="admin_tables" class="admin">
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Columns settings</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> [% t('âº Columns settings') %]</div>
> 
> <div id="doc3" class="yui-t2">
>   <div id="bd">
>     <div id="yui-main">
>       <div class="yui-b">
>-        <h2>Columns settings</h2>
>+        <h2>[% t('Columns settings') %]</h2>
>         <div id="modules">
>-          <h3><a href="#acqui">Acquisition</a></h3>
>+          <h3><a href="#acqui">[% t('Acquisition') %]</a></h3>
>           <div id="acqui">
>-            <h4>Acquisition tables</h4>
>+            <h4>[% t('Acquisition tables') %]</h4>
>             [% PROCESS pagelist module=modules.acqui modulename="acqui" %]
>           </div>
> 
>-          <h3><a href="#admin">Administration</a></h3>
>+          <h3><a href="#admin">[% t('Administration') %]</a></h3>
>           <div id="admin">
>-            <h4>Administration tables</h4>
>+            <h4>[% t('Administration tables') %]</h4>
>             [% PROCESS pagelist module=modules.admin modulename="admin" %]
>           </div>
> 
>-          <h3><a href="#authorities">Authorities</a></h3>
>+          <h3><a href="#authorities">[% t('Authorities') %]</a></h3>
>           <div id="authorities">
>-            <h4>Authorities tables</h4>
>+            <h4>[% t('Authorities tables') %]</h4>
>             [% PROCESS pagelist module=modules.authorities modulename="authorities" %]
>           </div>
> 
>-          <h3><a href="#catalog">Catalog</a></h3>
>+          <h3><a href="#catalog">[% t('Catalog') %]</a></h3>
>           <div id="catalogue">
>-            <h4>Catalogue tables</h4>
>+            <h4>[% t('Catalogue tables') %]</h4>
>             [% PROCESS pagelist module=modules.catalogue modulename="catalogue" %]
>           </div>
> 
>-          <h3><a href="#cataloguing">Cataloging</a></h3>
>+          <h3><a href="#cataloguing">[% t('Cataloging') %]</a></h3>
>           <div id="cataloguing">
>-            <h4>Cataloguing tables</h4>
>+            <h4>[% t('Cataloguing tables') %]</h4>
>             [% PROCESS pagelist module=modules.cataloguing modulename="cataloguing" %]
>           </div>
> 
>-          <h3><a href="#circulation">Circulation</a></h3>
>+          <h3><a href="#circulation">[% t('Circulation') %]</a></h3>
>           <div id="circulation">
>-            <h4>Circulation tables</h4>
>+            <h4>[% t('Circulation tables') %]</h4>
>             [% PROCESS pagelist module=modules.circ modulename="circ" %]
>           </div>
> 
>-          <h3><a href="#members">Patrons</a></h3>
>+          <h3><a href="#members">[% t('Patrons') %]</a></h3>
>           <div id="members">
>-            <h4>Patrons tables</h4>
>+            <h4>[% t('Patrons tables') %]</h4>
>             [% PROCESS pagelist module=modules.members modulename="members" %]
>           </div>
> 
>-          <h3><a href="#opac">OPAC</a></h3>
>+          <h3><a href="#opac">[% t('OPAC') %]</a></h3>
>           <div id="opac">
>-            <h4>OPAC tables</h4>
>+            <h4>[% t('OPAC tables') %]</h4>
>             [% PROCESS pagelist module=modules.opac modulename="opac" %]
>           </div>
> 
>-          <h3><a href="#reports">Reports</a></h3>
>+          <h3><a href="#reports">[% t('Reports') %]</a></h3>
>           <div id="reports">
>-            <h4>Reports tables</h4>
>+            <h4>[% t('Reports tables') %]</h4>
>             [% PROCESS pagelist module=modules.reports modulename="reports" %]
>           </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
>index f9178a9939..addfc8c0e4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
>@@ -1,13 +1,14 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% USE KohaDates %]
> [% USE ColumnsSettings %]
> [% USE HtmlTags %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Currencies &amp; Exchange rates &rsaquo;
>-[% IF op == 'add_form' %][% IF currency %]Modify currency '[% currency.currency %]'[% ELSE %]New currency[% END %][% END %]
>-[% IF op == 'delete_confirm' %]Confirm deletion of currency '[% currency.currency %]'[% END %]
>-[% IF op == 'list' %]Currencies[% END %]</title>
>+<title>[% t('Koha âº Administration âº Currencies &amp; Exchange rates âº') %]
>+[% IF op == 'add_form' %][% IF currency %][% t('Modify currency \'') %][% currency.currency %]'[% ELSE %][% t('New currency') %][% END %][% END %]
>+[% IF op == 'delete_confirm' %][% t('Confirm deletion of currency \'') %][% currency.currency %]'[% END %]
>+[% IF op == 'list' %][% t('Currencies') %][% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% Asset.css("css/datatables.css") %]
> </head>
>@@ -16,9 +17,9 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'currencies-admin-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;  <a href="/cgi-bin/koha/admin/currency.pl">Currencies &amp; Exchange rates</a> &rsaquo; [% IF op == 'add_form' %][% IF currency %]Modify currency '[% currency.currency %]'[% ELSE %]New currency[% END %][% END %]
>-[% IF op == 'delete_confirm' %]Confirm deletion of currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]
>-[% ELSIF op == 'list' %]Currencies
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> âº  <a href="/cgi-bin/koha/admin/currency.pl">[% t('Currencies &amp; Exchange rates') %]</a> âº [% IF op == 'add_form' %][% IF currency %][% t('Modify currency \'') %][% currency.currency %]'[% ELSE %][% t('New currency') %][% END %][% END %]
>+[% IF op == 'delete_confirm' %][% t('Confirm deletion of currency') %] [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]
>+[% ELSIF op == 'list' %][% t('Currencies') %]
> [% END %]
> </div>
> 
>@@ -29,7 +30,7 @@
>     <div class="yui-b">
> [% IF op == 'list' %]
> <div id="toolbar" class="btn-toolbar">
>-    <a class="btn btn-default btn-sm" id="newcurrency" href="/cgi-bin/koha/admin/currency.pl?op=add_form"><i class="fa fa-plus"></i> New currency</a>
>+    <a class="btn btn-default btn-sm" id="newcurrency" href="/cgi-bin/koha/admin/currency.pl?op=add_form"><i class="fa fa-plus"></i> [% t('New currency') %]</a>
> </div>
> [% END %]
> 
>@@ -37,17 +38,17 @@
>     <div class="dialog [% m.type %]">
>         [% SWITCH m.code %]
>         [% CASE 'error_on_update' %]
>-            An error occurred when updating this currency. Perhaps it already exists.
>+            [% t('An error occurred when updating this currency. Perhaps it already exists.') %]
>         [% CASE 'error_on_insert' %]
>-            An error occurred when adding this currency. The currency code might already exist.
>+            [% t('An error occurred when adding this currency. The currency code might already exist.') %]
>         [% CASE 'error_on_delete' %]
>-            An error occurred when deleting this currency. Check the logs.
>+            [% t('An error occurred when deleting this currency. Check the logs.') %]
>         [% CASE 'success_on_update' %]
>-            Currency updated successfully.
>+            [% t('Currency updated successfully.') %]
>         [% CASE 'success_on_insert' %]
>-            Currency added successfully.
>+            [% t('Currency added successfully.') %]
>         [% CASE 'success_on_delete' %]
>-            Currency deleted successfully.
>+            [% t('Currency deleted successfully.') %]
>         [% CASE %]
>             [% m.code %]
>         [% END %]
>@@ -63,39 +64,39 @@
>     <fieldset class="rows">
>         <legend>
>             [% IF currency %]
>-                Modify currency
>+                [% t('Modify currency') %]
>             [% ELSE %]
>-                New currency
>+                [% t('New currency') %]
>             [% END %]
>         </legend>
>         <ol>
>             <li>
>                 [% IF currency %]
>-                    <span class="label">Currency: </span>
>+                    <span class="label">[% t('Currency:') %] </span>
>                     <input type="hidden" name="is_a_modif" value="1" />
>                     <input type="hidden" name="currency_code" id="currency" value="[% currency.currency %]" />[% currency.currency %]
>                 [% ELSE %]
>-                    <label for="currency_code" class="required">Currency: </label>
>-                    <input type="text" name="currency_code" id="currency_code" size="50" maxlength="50" required="required" class="required" /> <span class="required">Required</span>
>+                    <label for="currency_code" class="required">[% t('Currency:') %] </label>
>+                    <input type="text" name="currency_code" id="currency_code" size="50" maxlength="50" required="required" class="required" /> <span class="required">[% t('Required') %]</span>
>                 [% END %]
>             </li>
>             <li>
>-                <label for="rate" class="required">Rate: </label>
>-                <input type="text" name="rate" id="rate" size="10" maxlength="10" value="[% currency.rate %]" required="required" class="required" /> <span class="required">Required</span>
>+                <label for="rate" class="required">[% t('Rate:') %] </label>
>+                <input type="text" name="rate" id="rate" size="10" maxlength="10" value="[% currency.rate %]" required="required" class="required" /> <span class="required">[% t('Required') %]</span>
>             </li>
>             <li>
>-                <label for="symbol" class="required">Symbol: </label>
>-                <input type="text" name="symbol" id="symbol" size="5" maxlength="5" value="[% currency.symbol %]" required="required" class="required" /> <span class="required">Required</span>
>+                <label for="symbol" class="required">[% t('Symbol:') %] </label>
>+                <input type="text" name="symbol" id="symbol" size="5" maxlength="5" value="[% currency.symbol %]" required="required" class="required" /> <span class="required">[% t('Required') %]</span>
>             </li>
>             <li>
>-                <label for="isocode">ISO code: </label>
>+                <label for="isocode">[% t('ISO code:') %] </label>
>                 <input type="text" name="isocode" id="isocode" size="5" maxlength="5" value="[% currency.isocode %]" />
>             </li>
>             <li>
>-                <span class="label">Last updated: </span>[% currency.timestamp | $KohaDates %]
>+                <span class="label">[% t('Last updated:') %] </span>[% currency.timestamp | $KohaDates %]
>             </li>
>             <li>
>-                <label for="p_sep_by_space">Space separation between symbol and value: </label>
>+                <label for="p_sep_by_space">[% t('Space separation between symbol and value:') %] </label>
>                 [% IF currency.p_sep_by_space %]
>                     <input type="checkbox" id="p_sep_by_space" name="p_sep_by_space" value="1" checked="checked" />
>                 [% ELSE %]
>@@ -103,7 +104,7 @@
>                 [% END %]
>             </li>
>             <li>
>-                <label for="active">Active: </label>
>+                <label for="active">[% t('Active:') %] </label>
>                 [% IF currency.active %]
>                 <input type="checkbox" id="active" name="active" value="1" checked="checked" />
>                 [% ELSE %]
>@@ -116,7 +117,7 @@
> 
>     <fieldset class="action">
>         <input type="submit" value="Submit" />
>-        <a href="/cgi-bin/koha/admin/currency.pl" class="cancel">Cancel</a>
>+        <a href="/cgi-bin/koha/admin/currency.pl" class="cancel">[% t('Cancel') %]</a>
>     </fieldset>
>     </form>
> 
>@@ -125,37 +126,37 @@
> [% IF op =='delete_confirm' %]
>     [% IF nb_of_orders or nb_of_vendors %]
>     <div class="dialog alert">
>-        <h3>Cannot delete currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]</h3>
>+        <h3>[% t('Cannot delete currency') %] [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]</h3>
>         <p>
>             [% IF nb_of_orders %]
>-                This currency is used by [% nb_of_orders %] orders.
>+                [% t('This currency is used by') %] [% nb_of_orders %] [% t('orders.') %]
>             [% ELSIF nb_of_vendors %]
>-                This currency is used by [% nb_of_vendors %] vendors.
>+                [% t('This currency is used by') %] [% nb_of_vendors %] [% t('vendors.') %]
>             [% END %]
>-            Deletion not possible
>+            [% t('Deletion not possible') %]
>         </p>
>         <form action="/cgi-bin/koha/admin/currency.pl" method="post">
>-            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> OK</button>
>+            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('OK') %]</button>
>         </form>
>     </div>
>     [% ELSE %]
>     <div class="dialog alert">
>-        <h3>Confirm deletion of currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]</h3>
>+        <h3>[% t('Confirm deletion of currency') %] [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]</h3>
>         <table>
>-            <tr><th>Currency</th>
>+            <tr><th>[% t('Currency') %]</th>
>                 <td>[% currency.currency %]</td>
>             </tr>
>-            <tr><th>Rate</th>
>+            <tr><th>[% t('Rate') %]</th>
>                 <td>[% currency.rate %]</td>
>             </tr>
>         </table>
>         <form action="/cgi-bin/koha/admin/currency.pl" method="post">
>             <input type="hidden" name="op" value="delete_confirmed" />
>             <input type="hidden" name="currency_code" value="[% currency.currency %]" />
>-            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this currency</button>
>+            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('Yes, delete this currency') %]</button>
>         </form>
>         <form action="/cgi-bin/koha/admin/currency.pl" method="post">
>-            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
>+            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> [% t('No, do not delete') %]</button>
>         </form>
>     </div>
>     [% END %]
>@@ -163,27 +164,27 @@
> 
> [% IF op == 'list' %]
> 
>-<h2>Currencies and exchange rates</h2>
>+<h2>[% t('Currencies and exchange rates') %]</h2>
> 
>     [% IF currencies and no_active_currency %]
>-        <div class="dialog alert"><h3>No active currency is defined</h3><p>Please edit one currency and mark it as active.</p></div>
>+        <div class="dialog alert"><h3>[% t('No active currency is defined') %]</h3><p>[% t('Please edit one currency and mark it as active.') %]</p></div>
>     [% END %]
> 
>     [% IF searchfield %]
>-        You searched for [% searchfield |html %]</span>
>+        [% t('You searched for') %] [% searchfield |html %]</span>
>     [% END %]
> 
>-    <table id='currencies-table'>
>+    <table id="currencies-table">
>       <thead>
>         <tr>
>-            <th>Currency</th>
>-            <th>Rate</th>
>-            <th>Symbol</th>
>-            <th>ISO code</th>
>-            <th class="title-string">Last updated</th>
>-            <th>Active</th>
>-            <th>Archived</th>
>-            <th>Actions</th>
>+            <th>[% t('Currency') %]</th>
>+            <th>[% t('Rate') %]</th>
>+            <th>[% t('Symbol') %]</th>
>+            <th>[% t('ISO code') %]</th>
>+            <th class="title-string">[% t('Last updated') %]</th>
>+            <th>[% t('Active') %]</th>
>+            <th>[% t('Archived') %]</th>
>+            <th>[% t('Actions') %]</th>
>         </tr>
>       </thead>
>       <tbody>
>@@ -195,10 +196,10 @@
>             <td>[% currency.isocode |html %]</td>
>             <td><span title="[% currency.timestamp %]">[% currency.timestamp | $KohaDates %]</span></td>
>             <td style="color:green;">[% IF currency.active %]â[% END %]</td>
>-            <td>[% IF currency.archived %]Yes[% END %]</td>
>+            <td>[% IF currency.archived %][% t('Yes') %][% END %]</td>
>             <td class="actions">
>-              <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/currency.pl?op=add_form&amp;currency_code=[% currency.currency %]"><i class="fa fa-pencil"></i> Edit</a>
>-              <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/currency.pl?op=delete_confirm&amp;currency_code=[% currency.currency %]"><i class="fa fa-trash"></i> Delete</a>
>+              <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/currency.pl?op=add_form&currency_code=[% currency.currency %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a>
>+              <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/currency.pl?op=delete_confirm&currency_code=[% currency.currency %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a>
>             </td>
>           </tr>
>         [% END %]
>@@ -208,11 +209,11 @@
>     <br />
>     <div class="hint">
>         <p>
>-            When importing MARC files via the staging tools, the tool will attempt to find and use the price of the currently active currency.
>+            [% t('When importing MARC files via the staging tools, the tool will attempt to find and use the price of the currently active currency.') %]
>         </p>
>         <p>
>-            Some examples of compatible price fields include "$9.99", "9.99 USD", "$9.99 USD", "9.99 USD (10.00 CAN)", "$9.99 USD (paperback)".
>-            These examples assume USD is the active currency.
>+            [% t('Some examples of compatible price fields include &#34;$9.99&#34;, &#34;9.99 USD&#34;, &#34;$9.99 USD&#34;, &#34;9.99 USD (10.00 CAN)&#34;, &#34;$9.99 USD (paperback)&#34;.') %]
>+            [% t('These examples assume USD is the active currency.') %]
>         </p>
>     </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt
>index ecaad4f789..193593bae3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% BLOCK pluginlist %]
>@@ -6,14 +7,14 @@
>     <div class="plugin">
>         <div class="pluginname">
>             [% IF plugin.enabled %]<input type="checkbox" checked="checked" id="checkbox_[% type %][% plugin.name %]">[% ELSE %]<input type="checkbox" id="checkbox_[% type %][% plugin.name %]">[% END %]
>-            <label class='pluginlabel' for="checkbox_[% type %][% plugin.name %]">[% plugin.name %]</label></div>
>+            <label class="pluginlabel" for="checkbox_[% type %][% plugin.name %]">[% plugin.name %]</label></div>
>         <div class="plugindesc">
>         [% SWITCH plugin.name %]
>         [% CASE 'AuthorityFile' %]
>-            Suggest authorities which are relevant to the term the user searched for.
>+            [% t('Suggest authorities which are relevant to the term the user searched for.') %]
>         [% CASE 'ExplodedTerms' %]
>-            Suggest that patrons expand their searches to include
>-            broader/narrower/related terms.
>+            [% t('Suggest that patrons expand their searches to include') %]
>+            [% t('broader/narrower/related terms.') %]
>         [% END %]
>         </div>
>     </div>
>@@ -21,44 +22,44 @@
> </div>
> [% END %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Did you mean?</title>
>+<title>[% t('Koha âº Administration âº Did you mean?') %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
> <body id="admin_didyoumean" class="admin">
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Did you mean?</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> [% t('âº Did you mean?') %]</div>
> 
> <div id="doc3" class="yui-t2">
> 
>     <div id="bd">
>     <div id="yui-main">
>     <div class="yui-b">
>-        <h3>Did you mean?</h3>
>-        <noscript><div class="dialog alert"><strong>Please enable Javascript:</strong>
>-            Configuring 'Did you mean?' plugins requires Javascript. If
>-            you are unable to use Javascript, you may be able to enter the
>-            configuration (which is stored in JSON in the OPACdidyoumean and
>-            INTRAdidyoumean system preferences) in the Local Preferences tab in
>-            the system preference editor, but this is unsupported, not
>-            recommended, and likely will not work.</div></noscript>
>+        <h3>[% t('Did you mean?') %]</h3>
>+        <noscript>[% t('&lt;div class=&#34;dialog alert&#34;&gt;&lt;strong&gt;Please enable Javascript:&lt;/strong&gt;') %]
>+            [% t('Configuring \'Did you mean?\' plugins requires Javascript. If') %]
>+            [% t('you are unable to use Javascript, you may be able to enter the') %]
>+            [% t('configuration (which is stored in JSON in the OPACdidyoumean and') %]
>+            [% t('INTRAdidyoumean system preferences) in the Local Preferences tab in') %]
>+            [% t('the system preference editor, but this is unsupported, not') %]
>+            [% t('recommended, and likely will not work.&lt;/div&gt;') %]</noscript>
>         <div id="didyoumeanlegend">
>-            Please put the 'Did you mean?' plugins in order by significance, from
>-            most significant to least significant, and check the box to enable those
>-            plugins that you want to use. (NOTE: 'Did you mean?' functionality
>-            is not yet enabled on the staff client)
>+            [% t('Please put the \'Did you mean?\' plugins in order by significance, from') %]
>+            [% t('most significant to least significant, and check the box to enable those') %]
>+            [% t('plugins that you want to use. (NOTE: \'Did you mean?\' functionality') %]
>+            [% t('is not yet enabled on the staff client)') %]
>         </div>
>         <form action="/cgi-bin/koha/admin/didyoumean.pl" method="post">
>             <fieldset id="didyoumeanopac">
>-                <legend>OPAC</legend>
>+                <legend>[% t('OPAC') %]</legend>
>                 [% PROCESS pluginlist plugins=OPACpluginlist type='opac' %]
>             </fieldset>
>             <fieldset id="didyoumeanintranet">
>-                <legend>Intranet</legend>
>+                <legend>[% t('Intranet') %]</legend>
>                 [% PROCESS pluginlist plugins=INTRApluginlist type='intranet' %]
>             </fieldset>
>-            <fieldset class="action"><button class="save-all submit" type="submit">Save configuration</button> <a href="/cgi-bin/koha/admin/didyoumean.pl" class="force_reload cancel">Cancel</a></fieldset>
>+            <fieldset class="action"><button class="save-all submit" type="submit">[% t('Save configuration') %]</button> <a href="/cgi-bin/koha/admin/didyoumean.pl" class="force_reload cancel">[% t('Cancel') %]</a></fieldset>
>         </form>
> 
>         </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
>index 2dc1c0958c..bad951e2d2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
>@@ -1,16 +1,17 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; EDI accounts
>+<title>[% t('Koha âº Administration âº EDI accounts') %]
> [% IF acct_form %]
>   [% IF account %]
>-     &rsaquo; Modify account
>+     [% t('âº Modify account') %]
>   [% ELSE %]
>-     &rsaquo; Add new account
>+     [% t('âº Add new account') %]
>   [% END %]
> [% END %]
> [% IF delete_confirm %]
>-     &rsaquo; Confirm deletion of account
>+     [% t('âº Confirm deletion of account') %]
> [% END %]
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -20,18 +21,18 @@
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
> <div id="breadcrumbs">
>-<a href="/cgi-bin/koha/mainpage.pl">Home</a>
>-&rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>+<a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a>
>+âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a>
>  [% IF acct_form %]
>   [% IF account %]
>-     &rsaquo; <a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a> &rsaquo; Modify account
>+     âº <a href="/cgi-bin/koha/admin/edi_accounts.pl">[% t('EDI accounts') %]</a> [% t('âº Modify account') %]
>   [% ELSE %]
>-     &rsaquo; <a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a> &rsaquo; Add new account
>+     âº <a href="/cgi-bin/koha/admin/edi_accounts.pl">[% t('EDI accounts') %]</a> [% t('âº Add new account') %]
>   [% END %]
> [% ELSIF delete_confirm %]
>-     &rsaquo; <a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a> &rsaquo; Confirm deletion of account
>+     âº <a href="/cgi-bin/koha/admin/edi_accounts.pl">[% t('EDI accounts') %]</a> [% t('âº Confirm deletion of account') %]
> [% ELSE %]
>-     &rsaquo; EDI accounts
>+     [% t('âº EDI accounts') %]
> [% END %]
> </div>
> 
>@@ -44,7 +45,7 @@
>     <div id="toolbar" class="btn-toolbar">
>     <a class="btn btn-default btn-sm" id="newediacct" href="/cgi-bin/koha/admin/edi_accounts.pl?op=acct_form">
>          <i class="fa fa-plus"></i>
>-         New account
>+         [% t('New account') %]
>     </a>
>     </div>
> [% END %]
>@@ -58,15 +59,15 @@
>   <fieldset class="rows">
>   <legend>
>   [% IF account %]
>-     Modify account
>+     [% t('Modify account') %]
>   [% ELSE %]
>-    New account
>+    [% t('New account') %]
>   [% END %]
>   </legend>
> 
>   <ol>
>   <li>
>-     <label for="vendor_id">Vendor: </label>
>+     <label for="vendor_id">[% t('Vendor:') %] </label>
>      <select name="vendor_id" id="vendor_id">
>      [% FOREACH vendor IN vendors %]
>        [% IF account.vendor_id == vendor.id %]
>@@ -79,9 +80,9 @@
>   </li>
>   [% IF plugins_enabled %]
>   <li>
>-     <label for="plugin">Plugin: </label>
>+     <label for="plugin">[% t('Plugin:') %] </label>
>      <select name="plugin" id="plugin">
>-        <option value="">Do not use plugin</option>
>+        <option value="">[% t('Do not use plugin') %]</option>
>         [% FOREACH plugin IN plugins %]
>             [% IF account.plugin == plugin.class %]
>                 <option value="[% plugin.class %]" selected="selected">[% plugin.metadata.name %]</option>
>@@ -95,14 +96,13 @@
>   <input type="hidden" name="plugin" value="" />
>   [% END %]
>   <li>
>-     <label for="description">Description: </label>
>+     <label for="description">[% t('Description:') %] </label>
>      <input type="text" name="description" id="description" size="20" value="[% account.description %]" />
>   </li>
>   <li>
>      [% transport_types = [ 'FTP', 'SFTP', 'FILE' ] %]
>-     <label for="transport">Transport: </label>
>-     <select name="transport" title="valid types of transport are FTP and SFTP"
>-      id="transport">
>+     <label for="transport">[% t('Transport:') %] </label>
>+     <select name="transport" title="[% t('valid types of transport are FTP and SFTP') %]" id="transport">
>       [% FOREACH transport_type IN transport_types %]
>            [% IF transport_type == account.transport %]
>               <option value="[% transport_type %]" selected="selected">[% transport_type %]</option>
>@@ -113,29 +113,29 @@
>      </select>
>   </li>
>   <li>
>-     <label for="host">Remote host: </label>
>+     <label for="host">[% t('Remote host:') %] </label>
>      <input type="text" name="host" id="host" size="20" maxlength="40" value="[% account.host %]" />
>   </li>
>   <li>
>-     <label for="username">Username: </label>
>+     <label for="username">[% t('Username:') %] </label>
>      <input type="text" name="username" id="username" size="20" maxlength="40" value="[% account.username %]" />
>   </li>
>   <li>
>-     <label for="password">Password: </label>
>+     <label for="password">[% t('Password:') %] </label>
>      <input type="text" name="password" id="password" size="20" maxlength="40" value="[% account.password %]" />
>   </li>
>   <li>
>-     <label for="download_directory">Download directory: </label>
>+     <label for="download_directory">[% t('Download directory:') %] </label>
>      <input type="text" name="download_directory" id="download_directory" size="20" value="[% account.download_directory %]" />
>-        <div class="hint">The download directory specifies the directory on the ftp site from which quotes and invoices are downloaded.</div>
>+        <div class="hint">[% t('The download directory specifies the directory on the ftp site from which quotes and invoices are downloaded.') %]</div>
>   </li>
>   <li>
>-     <label for="upload_directory">Upload directory: </label>
>+     <label for="upload_directory">[% t('Upload directory:') %] </label>
>      <input type="text" name="upload_directory" id="upload_directory" size="20" value="[% account.upload_directory %]" />
>-        <div class="hint">The upload directory specifies the directory on the ftp site to which orders are uploaded.</div>
>+        <div class="hint">[% t('The upload directory specifies the directory on the ftp site to which orders are uploaded.') %]</div>
>   </li>
>   <li>
>-     <label for="id_code_qualifier">Qualifier:</label>
>+     <label for="id_code_qualifier">[% t('Qualifier:') %]</label>
>      <select name="id_code_qualifier" id="id_code_qualifier">
>      [% FOREACH qualifier IN code_qualifiers %]
>         [% IF qualifier.code == account.id_code_qualifier %]
>@@ -151,11 +151,11 @@
>    </select>
>   </li>
>   <li>
>-     <label for="san">SAN: </label>
>+     <label for="san">[% t('SAN:') %] </label>
>      <input type="text" name="san" id="san" size="20" maxlength="20" value="[% account.san %]" />
>   </li>
>   <li>
>-     <label for="quotes_enabled">Quotes enabled: </label>
>+     <label for="quotes_enabled">[% t('Quotes enabled:') %] </label>
>       [% IF account.quotes_enabled %]
>      <input type="checkbox" name="quotes_enabled" id="quotes_enabled" value="[% account.quotes_enabled %]" checked="checked" />
>       [% ELSE %]
>@@ -163,7 +163,7 @@
>       [% END %]
>   </li>
>   <li>
>-     <label for="orders_enabled">Orders enabled: </label>
>+     <label for="orders_enabled">[% t('Orders enabled:') %] </label>
> [% IF account.orders_enabled %]
>      <input type="checkbox" name="orders_enabled" id="orders_enabled" value="[% account.orders_enabled %]" checked="checked" />
> [% ELSE %]
>@@ -171,7 +171,7 @@
> [% END %]
>   </li>
>   <li>
>-     <label for="invoices_enabled">Invoices enabled: </label>
>+     <label for="invoices_enabled">[% t('Invoices enabled:') %] </label>
> [% IF account.invoices_enabled %]
>      <input type="checkbox" name="invoices_enabled" id="invoices_enabled" value="[% account.invoices_enabled %]" checked="checked" />
> [% ELSE %]
>@@ -179,7 +179,7 @@
> [% END %]
>   </li>
>   <li>
>-     <label for="responses_enabled">Responses enabled: </label>
>+     <label for="responses_enabled">[% t('Responses enabled:') %] </label>
> [% IF account.responses_enabled %]
>      <input type="checkbox" name="responses_enabled" id="responses_enabled" value="[% account.responses_enabled %]" checked="checked" />
> [% ELSE %]
>@@ -187,14 +187,14 @@
> [% END %]
>   </li>
>   <li>
>-     <label for="auto_orders">Automatic ordering: </label>
>+     <label for="auto_orders">[% t('Automatic ordering:') %] </label>
> [% IF account.auto_orders %]
>      <input type="checkbox" name="auto_orders" id="auto_orders" value="[% account.auto_orders %]" checked="checked" />
> [% ELSE %]
>      <input type="checkbox" name="auto_orders" id="auto_orders" value="[% account.auto_orders %]" />
> [% END %]
>     <div class="hint">
>-        With automatic ordering quotes generate orders without staff intervention.
>+        [% t('With automatic ordering quotes generate orders without staff intervention.') %]
>     </div>
>   </li>
>   </ol>
>@@ -202,25 +202,25 @@
> 
>   <fieldset class="action">
>     <input type="submit" value="Submit" />
>-    <a href="/cgi-bin/koha/admin/edi_accounts.pl" class="cancel">Cancel</a>
>+    <a href="/cgi-bin/koha/admin/edi_accounts.pl" class="cancel">[% t('Cancel') %]</a>
>   </fieldset>
> </form>
> 
> [% END %]
> [% IF delete_confirm %]
> <div class="dialog alert">
>-<h3>Delete this account?</h3>
>+<h3>[% t('Delete this account?') %]</h3>
> <table>
>     <tr>
>-    <th>Vendor</th>
>+    <th>[% t('Vendor') %]</th>
>     <td>[% account.vendor.name %]</td>
>     </tr>
>     <tr>
>-    <th>Description</th>
>+    <th>[% t('Description') %]</th>
>     <td>[% account.description %]</td>
>     </tr>
>     <tr>
>-    <th>SAN</th>
>+    <th>[% t('SAN') %]</th>
>     <td>[% account.san %]</td>
>     </tr>
> </table>
>@@ -229,36 +229,36 @@
>     </table>
>     <input type="hidden" name="op" value="delete_confirmed" />
>     <input type="hidden" name="id" value="[% account.id %]" />
>-    <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
>+    <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('Yes, delete') %]</button>
> </form>
> <form action="/cgi-bin/koha/admin/edi_accounts.pl" method="get">
>-    <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
>+    <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> [% t('No, do not delete') %]</button>
> </form>
> </div>
> [% END %]
> [% IF display %]
> [% IF ( ediaccounts ) %]
>-<h2>Vendor EDI accounts</h2>
>+<h2>[% t('Vendor EDI accounts') %]</h2>
> 
>     <table>
>     <tr>
>-       <th>ID</th>
>-       <th>Vendor</th>
>-       <th>Description</th>
>-       <th>Transport</th>
>-       <th>Remote host</th>
>-       <th>Username</th>
>-       <th>Password</th>
>-       <th>Download directory</th>
>-       <th>Upload directory</th>
>-       <th>Qualifier</th>
>-       <th>SAN</th>
>-       <th>Quotes</th>
>-       <th>Orders</th>
>-       <th>Invoices</th>
>-       <th>Responses</th>
>-       <th>Auto ordering</th>
>-       <th>Actions</th>
>+       <th>[% t('ID') %]</th>
>+       <th>[% t('Vendor') %]</th>
>+       <th>[% t('Description') %]</th>
>+       <th>[% t('Transport') %]</th>
>+       <th>[% t('Remote host') %]</th>
>+       <th>[% t('Username') %]</th>
>+       <th>[% t('Password') %]</th>
>+       <th>[% t('Download directory') %]</th>
>+       <th>[% t('Upload directory') %]</th>
>+       <th>[% t('Qualifier') %]</th>
>+       <th>[% t('SAN') %]</th>
>+       <th>[% t('Quotes') %]</th>
>+       <th>[% t('Orders') %]</th>
>+       <th>[% t('Invoices') %]</th>
>+       <th>[% t('Responses') %]</th>
>+       <th>[% t('Auto ordering') %]</th>
>+       <th>[% t('Actions') %]</th>
>     </tr>
>     [% FOREACH account IN ediaccounts %]
>     <tr>
>@@ -281,39 +281,39 @@
>      </td>
>       <td>[% account.san %]</td>
>       [% IF account.quotes_enabled %]
>-         <td>Y</td>
>+         <td>[% t('Y') %]</td>
>       [% ELSE %]
>-         <td>N</td>
>+         <td>[% t('N') %]</td>
>       [% END %]
>       [% IF account.orders_enabled %]
>-         <td>Y</td>
>+         <td>[% t('Y') %]</td>
>       [% ELSE %]
>-         <td>N</td>
>+         <td>[% t('N') %]</td>
>       [% END %]
>       [% IF account.invoices_enabled %]
>-         <td>Y</td>
>+         <td>[% t('Y') %]</td>
>       [% ELSE %]
>-         <td>N</td>
>+         <td>[% t('N') %]</td>
>       [% END %]
>       [% IF account.responses_enabled %]
>-         <td>Y</td>
>+         <td>[% t('Y') %]</td>
>       [% ELSE %]
>-         <td>N</td>
>+         <td>[% t('N') %]</td>
>       [% END %]
>       [% IF account.auto_orders %]
>-         <td>Y</td>
>+         <td>[% t('Y') %]</td>
>       [% ELSE %]
>-         <td>N</td>
>+         <td>[% t('N') %]</td>
>       [% END %]
>       <td class="actions">
>-          <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_accounts.pl?op=acct_form&id=[% account.id %]"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_accounts.pl?op=delete_confirm&id=[% account.id %]"><i class="fa fa-trash"></i> Delete</a>
>+          <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_accounts.pl?op=acct_form&id=[% account.id %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a> <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_accounts.pl?op=delete_confirm&id=[% account.id %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a>
>       </td>
>     </tr>
>     [% END %]
>     </table>
>     [% ELSE %]
>         <div class="dialog message">
>-            There are no EDI accounts.
>+            [% t('There are no EDI accounts.') %]
>         </div>
>     [% END %]
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
>index 70887362b9..cc2d33f3b5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
>@@ -1,16 +1,17 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Library EANs
>+<title>[% t('Koha âº Administration âº Library EANs') %]
> [% IF ean_form %]
>   [% IF ean %]
>-     &rsaquo; Modify library EAN
>+     [% t('âº Modify library EAN') %]
>   [% ELSE %]
>-     &rsaquo; Add new library EAN
>+     [% t('âº Add new library EAN') %]
>   [% END %]
> [% END %]
> [% IF delete_confirm %]
>-     &rsaquo; Confirm deletion of EAN
>+     [% t('âº Confirm deletion of EAN') %]
> [% END %]
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -20,18 +21,18 @@
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
> <div id="breadcrumbs">
>-<a href="/cgi-bin/koha/mainpage.pl">Home</a>
>- &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>+<a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a>
>+ âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a>
> [% IF ean_form %]
>   [% IF ean %]
>-     &rsaquo; <a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a> &rsaquo; Modify library EAN
>+     âº <a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">[% t('Library EANs') %]</a> [% t('âº Modify library EAN') %]
>   [% ELSE %]
>-     &rsaquo; <a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a> &rsaquo; Add new library EAN
>+     âº <a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">[% t('Library EANs') %]</a> [% t('âº Add new library EAN') %]
>   [% END %]
> [% ELSIF delete_confirm %]
>-     &rsaquo; <a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a> &rsaquo; Confirm deletion of EAN
>+     âº <a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">[% t('Library EANs') %]</a> [% t('âº Confirm deletion of EAN') %]
> [% ELSE %]
>-     &rsaquo; Library EANs
>+     [% t('âº Library EANs') %]
> [% END %]
> </div>
> 
>@@ -44,7 +45,7 @@
>     <div id="toolbar" class="btn-toolbar">
>     <a class="btn btn-default btn-sm" id="newediean" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form">
>          <i class="fa fa-plus"></i>
>-         New EAN
>+         [% t('New EAN') %]
>     </a>
>     </div>
> [% END %]
>@@ -60,15 +61,15 @@
>   <fieldset class="rows">
>       <legend>
>           [% IF ean %]
>-             Modify EAN
>+             [% t('Modify EAN') %]
>           [% ELSE %]
>-            New EAN
>+            [% t('New EAN') %]
>           [% END %]
>       </legend>
> 
>       <ol>
>           <li>
>-             <label for="branchcode">Library: </label>
>+             <label for="branchcode">[% t('Library:') %] </label>
>              <select name="branchcode" id="branchcode">
>                 [% FOREACH branch IN branches %]
>                     [% IF branch.branchcode == ean.branch.branchcode %]
>@@ -80,15 +81,15 @@
>               </select>
>           </li>
>           <li>
>-             <label for="description">Description: </label>
>+             <label for="description">[% t('Description:') %] </label>
>              <input type="text" name="description" id="description" size="30" maxlength="128" value="[% ean.description %]" />
>           </li>
>           <li>
>-             <label for="ean">EAN: </label>
>+             <label for="ean">[% t('EAN:') %] </label>
>              <input type="text" name="ean" id="ean" size="20" maxlength="15" value="[% ean.ean %]" />
>           </li>
>           <li>
>-             <label for="id_code_qualifier">Qualifier: </label>
>+             <label for="id_code_qualifier">[% t('Qualifier:') %] </label>
>              <select name="id_code_qualifier" id="id_code_qualifier">
>                  [% FOREACH qualifier IN code_qualifiers %]
>                     [% IF qualifier.code == ean.id_code_qualifier %]
>@@ -107,36 +108,36 @@
>   </fieldset>
> 
>   <fieldset class="action">
>-    <input type="submit" value="Submit"/>
>-    <a href="/cgi-bin/koha/admin/edi_ean_accounts.pl" class="cancel">Cancel</a>
>+    <input type="submit" value="Submit" />
>+    <a href="/cgi-bin/koha/admin/edi_ean_accounts.pl" class="cancel">[% t('Cancel') %]</a>
>   </fieldset>
> </form>
> [% END %]
> 
> [% IF delete_confirm %]
> <div class="dialog alert">
>-<h3>Delete EAN [% ean.ean %] for [% ean.branch.branchname %]?</h3>
>+<h3>[% t('Delete EAN') %] [% ean.ean %] [% t('for') %] [% ean.branch.branchname %]?</h3>
> <form action="/cgi-bin/koha/admin/edi_ean_accounts.pl" method="post">
>     <input type="hidden" name="op" value="delete_confirmed" />
>     <input type="hidden" name="id" value="[% ean.id %]" />
>-    <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
>+    <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('Yes, delete') %]</button>
> </form>
> <form action="/cgi-bin/koha/admin/edi_ean_accounts.pl" method="get">
>-    <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
>+    <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> [% t('No, do not delete') %]</button>
> </form>
> </div>
> [% END %]
> 
> [% IF display %]
> [% IF ( eans ) %]
>-    <h2>Library EANs</h2>
>+    <h2>[% t('Library EANs') %]</h2>
>     <table>
>         <tr>
>-            <th>Library</th>
>-            <th>Description</th>
>-            <th>EAN</th>
>-            <th>Qualifier</th>
>-            <th>Actions</th>
>+            <th>[% t('Library') %]</th>
>+            <th>[% t('Description') %]</th>
>+            <th>[% t('EAN') %]</th>
>+            <th>[% t('Qualifier') %]</th>
>+            <th>[% t('Actions') %]</th>
>         </tr>
>         [% FOREACH ean IN eans %]
>             <tr>
>@@ -151,15 +152,15 @@
>                  [% END %]
>                 </td>
>                 <td class="actions">
>-                    <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form&id=[% ean.id %]"><i class="fa fa-pencil"></i> Edit</a>
>-                    <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=delete_confirm&id=[% ean.id %]"><i class="fa fa-trash"></i> Delete</a>
>+                    <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form&id=[% ean.id %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a>
>+                    <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=delete_confirm&id=[% ean.id %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a>
>                 </td>
>             </tr>
>         [% END %]
>     </table>
> [% ELSE %]
>     <div class="dialog message">
>-        There are no library EANs.
>+        [% t('There are no library EANs.') %]
>     </div>
> [% END %]
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt
>index 1f6b36df74..7f689ec523 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt
>@@ -1,25 +1,26 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Keyword to MARC mapping</title>
>+<title>[% t('Koha âº Administration âº Keyword to MARC mapping') %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
> <body id="admin_fieldmapping" class="admin">
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Keyword to MARC mapping</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> [% t('âº Keyword to MARC mapping') %]</div>
> <div id="doc3" class="yui-t2">
> 	<div id="yui-main">
> 		<div class="yui-b">
>-            <h2>Keyword to MARC mapping</h2>
>+            <h2>[% t('Keyword to MARC mapping') %]</h2>
>             [% UNLESS ( fields.count ) %]
>-                <div class="dialog message"><p>There are no mappings for the [% IF framework.frameworktext %]<em>[% framework.frameworktext |html %]</em>[% ELSE %]default[% END %] framework. </p></div>
>+                <div class="dialog message"><p>[% t('There are no mappings for the') %] [% IF framework.frameworktext %]<em>[% framework.frameworktext |html %]</em>[% ELSE %][% t('default') %][% END %] [% t('framework.') %] </p></div>
>             [% END %]
> 			<form method="get" action="/cgi-bin/koha/admin/fieldmapping.pl" id="selectframework">
>-				<label for="framework">Framework:</label>
>+				<label for="framework">[% t('Framework:') %]</label>
>                 <select name="framework" id="framework" style="width:20em;">
>-                    <option value="">Default</option>
>+                    <option value="">[% t('Default') %]</option>
>                 [% FOREACH f IN frameworks %]
>                     [% IF f.frameworkcode == framework.frameworkcode %]
>                     <option selected="selected" value="[% f.frameworkcode %]">[% f.frameworktext |html %]</option>
>@@ -35,11 +36,11 @@
> 			<form method="post" action="" id="addfield">
>                 <input type="hidden" name="framework" value="[% framework.frameworkcode %]" />
> 				<fieldset class="rows">
>-				<legend>Add a mapping</legend>
>+				<legend>[% t('Add a mapping') %]</legend>
> 				<ol>
>-					<li><label for="fieldname">Field name: </label><input type="text" id="fieldname" name="fieldname" /></li>
>-					<li><label for="marcfield">MARC field: </label><input type="text" id="marcfield" name="marcfield" size="3" /></li>
>-					<li><label for="marcsubfield">MARC subfield: </label><input type="text" id="marcsubfield" name="marcsubfield" size="1" /></li>
>+					<li><label for="fieldname">[% t('Field name:') %] </label><input type="text" id="fieldname" name="fieldname" /></li>
>+					<li><label for="marcfield">[% t('MARC field:') %] </label><input type="text" id="marcfield" name="marcfield" size="3" /></li>
>+					<li><label for="marcsubfield">[% t('MARC subfield:') %] </label><input type="text" id="marcsubfield" name="marcsubfield" size="1" /></li>
> 				</ol>
> 				<fieldset class="action">
> 					<input type="submit" value="Submit" />
>@@ -49,19 +50,19 @@
> 
>                 [% IF ( fields.count ) %]
>                     <table>
>-                    <caption>Mappings for the [% IF framework.frameworktext %]<em>[% framework.frameworktext %]</em>[% ELSE %]default[% END %] framework</caption>
>+                    <caption>[% t('Mappings for the') %] [% IF framework.frameworktext %]<em>[% framework.frameworktext %]</em>[% ELSE %][% t('default') %][% END %] [% t('framework') %]</caption>
> 									<tr>
>-										<th>Field</th>
>-                                        <th>MARC field</th>
>-                                        <th>MARC subfield</th>
>-										<th>&nbsp;</th>
>+										<th>[% t('Field') %]</th>
>+                                        <th>[% t('MARC field') %]</th>
>+                                        <th>[% t('MARC subfield') %]</th>
>+										<th>Â </th>
> 									</tr>
> 									[% FOREACH field IN fields %]
> 									<tr>
>                                         <td>[% field.field |html %]</td>
> 										<td>[% field.fieldcode %]</td>
> 										<td>[% field.subfieldcode %]</td>
>-                                        <td><a class="btn btn-default btn-xs" href="?op=delete&amp;id=[% field.id %]&amp;framework=[% field.frameworkcode %]"><i class="fa fa-trash"></i> Delete</a></td>
>+                                        <td><a class="btn btn-default btn-xs" href="?op=delete&id=[% field.id %]&framework=[% field.frameworkcode %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a></td>
> 									</tr>
> 									[% END %]
> 								</table>[% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
>index f47d5f9412..0f64be60d2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
>@@ -1,8 +1,9 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% USE Branches %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Item circulation alerts</title>
>+<title>[% t('Koha âº Administration âº Item circulation alerts') %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <style type="text/css">
> table.grid thead th {
>@@ -44,7 +45,7 @@ table.grid td.default {
> <body id="admin_item_circulation_alerts" class="admin">
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Item circulation alerts </div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> [% t('âº Item circulation alerts') %] </div>
> 
> <div id="doc3" class="yui-t1">
> 
>@@ -55,11 +56,11 @@ table.grid td.default {
> 
> <div class="yui-g">
> <div class="yui-u first">
>-<h1>Item circulation alerts</h1>
>-<h2>Select a library:</h2>
>+<h1>[% t('Item circulation alerts') %]</h1>
>+<h2>[% t('Select a library:') %]</h2>
> <form id="branch_selector" method="get" action="/cgi-bin/koha/admin/item_circulation_alerts.pl">
> <select id="branch" name="branch">
>-    <option value="*">Default</option>
>+    <option value="*">[% t('Default') %]</option>
>     [% PROCESS options_for_libraries libraries => Branches.all( selected => branch, unfiltered => 1 ) %]
> </select>
> <input type="submit" name="pick" value="Pick" />
>@@ -67,46 +68,46 @@ table.grid td.default {
> </div>
> <div class="yui-u">
> <table class="grid">
>-<caption>Legend</caption>
>+<caption>[% t('Legend') %]</caption>
> <thead>
> <tr>
>-  <th>Color</th>
>-  <th>Meaning</th>
>+  <th>[% t('Color') %]</th>
>+  <th>[% t('Meaning') %]</th>
> </tr>
> </thead>
> <tbody>
>   <tr>
>-    <td width="100" class="default">&nbsp;</td>
>-    <td class="info">These are disabled for ALL libraries.  To change these settings, choose the "Default" library.</td>
>+    <td width="100" class="default">Â </td>
>+    <td class="info">[% t('These are disabled for ALL libraries.') %]  [% t('To change these settings, choose the &#34;Default&#34; library.') %]</td>
>   </tr>
>   <tr>
>-    <td class="disabled">&nbsp;</td>
>-    <td class="info">These are disabled for the current library.</td>
>+    <td class="disabled">Â </td>
>+    <td class="info">[% t('These are disabled for the current library.') %]</td>
>   </tr>
>   <tr>
>-    <td>&nbsp;</td>
>-    <td class="info">These are enabled.</td>
>+    <td>Â </td>
>+    <td class="info">[% t('These are enabled.') %]</td>
>   </tr>
> </tbody>
> </table>
> </div>
> </div>
> 
>-<h2>Circulation alerts for [% Branches.GetName( branch ) || 'Default' %]</h2>
>-<p>Click on the grid to toggle the settings.</p>
>+<h2>[% t('Circulation alerts for') %] [% Branches.GetName( branch ) || 'Default' %]</h2>
>+<p>[% t('Click on the grid to toggle the settings.') %]</p>
> 
> <div id="alerttabs" class="toptabs">
> <ul>
>-<li><a href="#checkout">Checkout</a></li>
>-<li><a href="#checkin">Check-in</a></li>
>+<li><a href="#checkout">[% t('Checkout') %]</a></li>
>+<li><a href="#checkin">[% t('Check-in') %]</a></li>
> </ul>
> 
> <div id="checkout">
>-<h3>Checkout</h3>
>+<h3>[% t('Checkout') %]</h3>
> <table class="grid active" width="100%">
> <thead>
> <tr>
>-  <th>&nbsp;</th>
>+  <th>Â </th>
>   [% FOREACH item_type IN item_types %]
>   <th>[% item_type.description %]</th>
>   [% END %]
>@@ -126,11 +127,11 @@ table.grid td.default {
> </div>
> 
> <div id="checkin">
>-<h3>Check-in</h3>
>+<h3>[% t('Check-in') %]</h3>
> <table class="grid active" width="100%">
> <thead>
> <tr>
>-  <th>&nbsp;</th>
>+  <th>Â </th>
>   [% FOREACH item_type IN item_types %]
>   <th>[% item_type.description %]</th>
>   [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
>index c0ad079227..4ba4ca1e21 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
>@@ -1,17 +1,18 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% USE AuthorisedValues %]
> [% INCLUDE 'doc-head-open.inc' %]
>-  <title>Koha &rsaquo; Administration &rsaquo; Item search fields</title>
>+  <title>[% t('Koha âº Administration âº Item search fields') %]</title>
>   [% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="admin_itemssearchfields" class="admin">
>   [% INCLUDE 'header.inc' %]
>   [% INCLUDE 'prefs-admin-search.inc' %]
>   <div id="breadcrumbs">
>-    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
>-    <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;
>-    <a href="/cgi-bin/koha/admin/items_search_fields.pl">Item search fields</a> &rsaquo;
>+    <a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº
>+    <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> âº
>+    <a href="/cgi-bin/koha/admin/items_search_fields.pl">[% t('Item search fields') %]</a> âº
>     [% field.name |html %]
>   </div>
> 
>@@ -19,11 +20,11 @@
>     <div id="bd">
>       <div id="yui-main">
>         <div class="yui-b">
>-          <h1>Item search field: [% field.label |html %]</h1>
>+          <h1>[% t('Item search field:') %] [% field.label |html %]</h1>
> 
>           <form action="/cgi-bin/koha/admin/items_search_field.pl" method="POST" class="validated">
>             <fieldset class="rows">
>-              <legend>Edit field</legend>
>+              <legend>[% t('Edit field') %]</legend>
>               [% INCLUDE 'admin-items-search-field-form.inc' field=field %]
>               <div>
>                 <input type="hidden" name="op" value="mod" />
>@@ -31,7 +32,7 @@
>             </fieldset>
>             <fieldset class="action">
>                 <input type="submit" value="Submit" />
>-                <a class="cancel" href="/cgi-bin/koha/admin/items_search_fields.pl">Cancel</a>
>+                <a class="cancel" href="/cgi-bin/koha/admin/items_search_fields.pl">[% t('Cancel') %]</a>
>             </fieldset>
>           </form>
>         </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
>index 8db4c85beb..2193b61a1b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
>@@ -1,8 +1,9 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% USE AuthorisedValues %]
> [% INCLUDE 'doc-head-open.inc' %]
>-  <title>Koha &rsaquo; Administration &rsaquo; Item search fields</title>
>+  <title>[% t('Koha âº Administration âº Item search fields') %]</title>
>   [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>@@ -10,9 +11,9 @@
>   [% INCLUDE 'header.inc' %]
>   [% INCLUDE 'prefs-admin-search.inc' %]
>   <div id="breadcrumbs">
>-    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
>-    <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;
>-    Item search fields
>+    <a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº
>+    <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> âº
>+    [% t('Item search fields') %]
>   </div>
> 
>   <div id="doc3" class="yui-t2">
>@@ -21,50 +22,50 @@
>         <div class="yui-b">
> 
>     <div id="toolbar" class="btn-toolbar">
>-        <a class="btn btn-default btn-sm" id="new_search_field" href="/cgi-bin/koha/admin/items_search_fields.pl"><i class="fa fa-plus"></i> New search field</a>
>+        <a class="btn btn-default btn-sm" id="new_search_field" href="/cgi-bin/koha/admin/items_search_fields.pl"><i class="fa fa-plus"></i> [% t('New search field') %]</a>
>     </div>
> 
>           [% IF field_added %]
>             <div class="dialog message">
>-              Field successfully added: [% field_added.label |html %]
>+              [% t('Field successfully added:') %] [% field_added.label |html %]
>             </div>
>           [% ELSIF field_not_added %]
>             <div class="dialog alert">
>-              <p>Failed to add field. Please make sure the field name doesn't already exist.</p>
>-              <p>Check logs for more details.</p>
>+              <p>[% t('Failed to add field. Please make sure the field name doesn\'t already exist.') %]</p>
>+              <p>[% t('Check logs for more details.') %]</p>
>             </div>
>           [% ELSIF field_deleted %]
>             <div class="dialog message">
>-              Field successfully deleted.
>+              [% t('Field successfully deleted.') %]
>             </div>
>           [% ELSIF field_not_deleted %]
>             <div class="dialog alert">
>-              <p>Failed to delete field.</p>
>-              <p>Check logs for more details.</p>
>+              <p>[% t('Failed to delete field.') %]</p>
>+              <p>[% t('Check logs for more details.') %]</p>
>             </div>
>           [% ELSIF field_updated %]
>             <div class="dialog message">
>-              Field successfully updated: [% field_updated.label %]
>+              [% t('Field successfully updated:') %] [% field_updated.label %]
>             </div>
>           [% ELSIF field_not_updated %]
>             <div class="dialog alert">
>-              <p>Failed to update field.</p>
>-              <p>Check logs for more details.</p>
>+              <p>[% t('Failed to update field.') %]</p>
>+              <p>[% t('Check logs for more details.') %]</p>
>             </div>
>           [% END %]
>           [% IF fields.size %]
>               <div id="search_fields_list">
>-                  <h2>Item search fields</h2>
>+                  <h2>[% t('Item search fields') %]</h2>
> 
>                   <table id="search_fields_table">
>                     <thead>
>                       <tr>
>-                        <th>Name</th>
>-                        <th>Label</th>
>-                        <th>MARC field</th>
>-                        <th>MARC subfield</th>
>-                        <th>Authorised values category</th>
>-                        <th>Actions</th>
>+                        <th>[% t('Name') %]</th>
>+                        <th>[% t('Label') %]</th>
>+                        <th>[% t('MARC field') %]</th>
>+                        <th>[% t('MARC subfield') %]</th>
>+                        <th>[% t('Authorised values category') %]</th>
>+                        <th>[% t('Actions') %]</th>
>                       </tr>
>                     </thead>
>                     <tbody>
>@@ -76,8 +77,8 @@
>                           <td>[% field.tagsubfield %]</td>
>                           <td>[% field.authorised_values_category %]</td>
>                           <td>
>-                            <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/items_search_field.pl?name=[% field.name |html %]" title="Edit [% field.name |html %] field"><i class="fa fa-pencil"></i> Edit</a>
>-                            <a class="field-delete btn btn-default btn-xs" href="/cgi-bin/koha/admin/items_search_fields.pl?op=del&name=[% field.name |html %]"><i class="fa fa-trash"></i> Delete</a>
>+                            <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/items_search_field.pl?name=[% field.name |html %]" title="[% t('Edit') %] [% field.name |html %] [% t('field') %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a>
>+                            <a class="field-delete btn btn-default btn-xs" href="/cgi-bin/koha/admin/items_search_fields.pl?op=del&name=[% field.name |html %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a>
>                           </td>
>                         </tr>
>                       [% END %]
>@@ -86,19 +87,19 @@
>               </div>
>           [% ELSE %]
>               <div class="dialog message">
>-                  There are no item search fields defined.
>+                  [% t('There are no item search fields defined.') %]
>               </div>
>           [% END %]
> 
>           <form id="add_field_form" action="/cgi-bin/koha/admin/items_search_fields.pl" method="POST" class="validated">
>             <fieldset class="rows">
>-              <legend>Add a new field</legend>
>+              <legend>[% t('Add a new field') %]</legend>
>               [% INCLUDE 'admin-items-search-field-form.inc' field=undef %]
>               <input type="hidden" name="op" value="add" />
>             </fieldset>
>             <fieldset class="action">
>               <input type="submit" value="Submit" />
>-              <a href="#" class="cancel">Cancel</a>
>+              <a href="#" class="cancel">[% t('Cancel') %]</a>
>             </fieldset>
>           </form>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
>index 526ea9c2d2..5f58e30584 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
>@@ -1,25 +1,26 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% USE Koha %]
> [% USE AuthorisedValues %]
> [% USE Price %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Item types [% IF op == 'add_form' %]&rsaquo;
>+<title>[% t('Koha âº Administration âº Item types') %] [% IF op == 'add_form' %]âº
>   [% IF ( itemtype ) %]
>-Modify item type '[% itemtype.itemtype %]'
>+[% t('Modify item type \'') %][% itemtype.itemtype %]'
>   [% ELSE %]
>-Add item type
>+[% t('Add item type') %]
>   [% END %]
> [% END %]
>-[% IF op == 'delete_confirm' %]&rsaquo;
>+[% IF op == 'delete_confirm' %]âº
>   [% IF ( total ) %]
>-Cannot delete item type '[% itemtype.itemtype %]'
>+[% t('Cannot delete item type \'') %][% itemtype.itemtype %]'
>   [% ELSE %]
>-Delete item type '[% itemtype.itemtype %]'?
>+[% t('Delete item type \'') %][% itemtype.itemtype %]'?
>   [% END %]
> [% END %]
>-[% IF op == 'delete_confirmed' %]&rsaquo;
>-Data deleted
>+[% IF op == 'delete_confirmed' %]âº
>+[% t('Data deleted') %]
> [% END %]
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -36,25 +37,25 @@ Data deleted
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF op == 'add_form' %]
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> âº [% IF op == 'add_form' %]
>   [% IF itemtype %]
>-<a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a> &rsaquo; Modify item type '[% itemtype.itemtype %]'
>+<a href="/cgi-bin/koha/admin/itemtypes.pl">[% t('Item types') %]</a> [% t('âº Modify item type \'') %][% itemtype.itemtype %]'
>   [% ELSE %]
>-<a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a> &rsaquo; Add item type
>+<a href="/cgi-bin/koha/admin/itemtypes.pl">[% t('Item types') %]</a> [% t('âº Add item type') %]
>   [% END %]
> [% END %]
> [% IF op == 'delete_confirm' %]
>   [% IF total %]
>-<a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a> &rsaquo; Cannot delete item type '[% itemtype.itemtype %]'
>+<a href="/cgi-bin/koha/admin/itemtypes.pl">[% t('Item types') %]</a> [% t('âº Cannot delete item type \'') %][% itemtype.itemtype %]'
>   [% ELSE %]
>-<a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a> &rsaquo; Delete item type '[% itemtype.itemtype %]'?
>+<a href="/cgi-bin/koha/admin/itemtypes.pl">[% t('Item types') %]</a> [% t('âº Delete item type \'') %][% itemtype.itemtype %]'?
>   [% END %]
> [% END %]
> [% IF op == 'delete_confirmed' %]
>-<a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a> &rsaquo;Data deleted
>+<a href="/cgi-bin/koha/admin/itemtypes.pl">[% t('Item types') %]</a> [% t('âºData deleted') %]
> [% END %]
> [% IF op == 'list' %]
>-Item types administration
>+[% t('Item types administration') %]
> [% END %]</div>
> 
> <div id="doc3" class="yui-t2">
>@@ -65,28 +66,28 @@ Item types administration
> 	
> 
> [% IF op == 'list' %]<div id="toolbar" class="btn-toolbar">
>-    <a class="btn btn-default btn-sm" id="newitemtype" href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form"><i class="fa fa-plus"></i> New item type</a>
>+    <a class="btn btn-default btn-sm" id="newitemtype" href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form"><i class="fa fa-plus"></i> [% t('New item type') %]</a>
> </div>[% END %]
> 
> [% FOREACH m IN messages %]
>     <div class="dialog [% m.type %]">
>         [% SWITCH m.code %]
>         [% CASE 'error_on_update' %]
>-            An error occurred when updating this item type. Perhaps the value already exists.
>+            [% t('An error occurred when updating this item type. Perhaps the value already exists.') %]
>         [% CASE 'error_on_insert' %]
>-            An error occurred when inserting this item type. Perhaps the value already exists.
>+            [% t('An error occurred when inserting this item type. Perhaps the value already exists.') %]
>         [% CASE 'error_on_delete' %]
>-            An error occurred when deleting this item type. Check the logs.
>+            [% t('An error occurred when deleting this item type. Check the logs.') %]
>         [% CASE 'success_on_update' %]
>-            Item type updated successfully.
>+            [% t('Item type updated successfully.') %]
>         [% CASE 'success_on_insert' %]
>-            Item type inserted successfully.
>+            [% t('Item type inserted successfully.') %]
>         [% CASE 'success_on_delete' %]
>-            Item type deleted successfully.
>+            [% t('Item type deleted successfully.') %]
>         [% CASE 'already_exists' %]
>-            This item type already exists.
>+            [% t('This item type already exists.') %]
>         [% CASE 'cannot_be_deleted' %]
>-            Cannot delete this item type. <p><strong>This record is in use</strong>. Deletion is not possible.</p>
>+            [% t('Cannot delete this item type.') %] <p><strong>[% t('This record is in use') %]</strong>[% t('. Deletion is not possible.') %]</p>
>         [% CASE %]
>             [% m.code %]
>         [% END %]
>@@ -96,9 +97,9 @@ Item types administration
> 
> [% IF op == 'add_form' %]
>     [% IF itemtype %]
>-        <h3>Modify item type</h3>
>+        <h3>[% t('Modify item type') %]</h3>
>     [% ELSE %]
>-        <h3>Add item type</h3>
>+        <h3>[% t('Add item type') %]</h3>
>     [% END %]
>     <form action="/cgi-bin/koha/admin/itemtypes.pl" name="Aform" method="post" id="itemtypeentry">
>         <input type="hidden" name="op" value="add_validate" />
>@@ -107,51 +108,51 @@ Item types administration
>                 [% IF itemtype %]
>                     <li>
>                         <input type="hidden" name="is_a_modif" value="1" />
>-                        <span class="label">Item type: </span> <input type="hidden" name="itemtype" value="[% itemtype.itemtype %]" />
>+                        <span class="label">[% t('Item type:') %] </span> <input type="hidden" name="itemtype" value="[% itemtype.itemtype %]" />
>                         [% itemtype.itemtype %]
>                     </li>
>                 [% ELSE %]
>                     <li>
>-                        <label for="itemtype" class="required">Item type: </label>
>-                        <input type="text" id="itemtype" name="itemtype" size="10" maxlength="10" required="required" /> <span class="required">Required</span>
>+                        <label for="itemtype" class="required">[% t('Item type:') %] </label>
>+                        <input type="text" id="itemtype" name="itemtype" size="10" maxlength="10" required="required" /> <span class="required">[% t('Required') %]</span>
>                     </li>
>                 [% END %]
>                 <li>
>-                    <label for="description" class="required">Description: </label>
>-                    <input type="text" id="description" name="description" size="48" value="[% itemtype.description |html %]" required="required" /> <span class="required">Required</span>
>+                    <label for="description" class="required">[% t('Description:') %] </label>
>+                    <input type="text" id="description" name="description" size="48" value="[% itemtype.description |html %]" required="required" /> <span class="required">[% t('Required') %]</span>
>                     [% IF can_be_translated %]
>-                        <a href="/cgi-bin/koha/admin/localization.pl?entity=itemtypes&code=[% itemtype.itemtype %]" title="Translate item type [% itemtype.itemtype %]" rel="gb_page_center[600,500]"><i class="fa fa-pencil"></i> Translate into other languages</a>
>+                        <a href="/cgi-bin/koha/admin/localization.pl?entity=itemtypes&code=[% itemtype.itemtype %]" title="[% t('Translate item type') %] [% itemtype.itemtype %]" rel="gb_page_center[600,500]"><i class="fa fa-pencil"></i> [% t('Translate into other languages') %]</a>
>                     [% END %]
>                 </li>
>                 <li>
>-                    <span class="label">Search category</span>
>+                    <span class="label">[% t('Search category') %]</span>
>                     <select id="searchcategory" name="searchcategory">
>-                    <option value="">None</option>
>+                    <option value="">[% t('None') %]</option>
>                         [% FOREACH cat IN searchcategory %]
>                             [% IF cat.authorised_value == itemtype.searchcategory %]
>                                 <option value="[% cat.authorised_value %]" selected="selected">
>                                     [% cat.lib %]
>                                 </option>
>                             [% ELSE %]
>-                                <option value="[% cat.authorised_value %]" >
>+                                <option value="[% cat.authorised_value %]">
>                                     [% cat.lib %]
>                                 </option>
>                             [% END %]
>                         [% END %]
>                     </select>
>-                    (Options are defined as the authorized values for the ITEMTYPECAT category)
>+                    [% t('(Options are defined as the authorized values for the ITEMTYPECAT category)') %]
>                 </li>
>                 [% IF Koha.Preference('noItemTypeImages') %]
>                     <li>
>-                        <span class="label">Image: </span>Item type images are disabled. To enable them, turn off the <a href="/cgi-bin/koha/admin/preferences.pl?op=search&amp;searchfield=noItemTypeImages">noItemTypeImages system preference</a>
>+                        <span class="label">[% t('Image:') %] </span>[% t('Item type images are disabled. To enable them, turn off the') %] <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=noItemTypeImages">[% t('noItemTypeImages system preference') %]</a>
>                     </li>
>                 [% END %]
>             </ol>
>             [% UNLESS Koha.Preference('noItemTypeImages') %]
>                 <div id="icons" class="toptabs" style="clear:both">
>-                    <h5 style="margin-left:10px;">Choose an icon:</h5>
>+                    <h5 style="margin-left:10px;">[% t('Choose an icon:') %]</h5>
>                     <ul>
>-                        <li><a href="#none">None</a></li>
>+                        <li><a href="#none">[% t('None') %]</a></li>
>                         [% FOREACH imageset IN imagesets %]
>                             [% IF ( imageset.imagesetactive ) %]
>                                 <li class="ui-tabs-active">
>@@ -161,11 +162,11 @@ Item types administration
>                             <a href="#[% imageset.imagesetname %]">[% imageset.imagesetname %]</a>
>                             </li>
>                         [% END %]
>-                        [% IF itemtype.image_location('intranet').match('^http') %]<li class="ui-tabs-active">[% ELSE %]<li>[% END %]<a href="#remote">Remote image</a></li>
>+                        [% IF itemtype.image_location('intranet').match('^http') %]<li class="ui-tabs-active">[% ELSE %]<li>[% END %]<a href="#remote">[% t('Remote image') %]</a></li>
>                     </ul>
>                     <div id="none">
>                         <ul>
>-                            <li><label for="noimage">No image: </label><input type="radio" name="image" id="noimage" value="removeImage" /></li>
>+                            <li><label for="noimage">[% t('No image:') %] </label><input type="radio" name="image" id="noimage" value="removeImage" /></li>
>                         </ul>
>                         <br class="clear" />
>                     </div>
>@@ -195,7 +196,7 @@ Item types administration
>                     <div id="remote">
>                         <ul>
>                             <li>
>-                                <label for="remote_image_check"> Remote image:</label>
>+                                <label for="remote_image_check"> [% t('Remote image:') %]</label>
>                                 [% IF itemtype.imageurl %]
>                                     <input type="radio" id="remote_image_check" name="image" value="remoteImage" checked="checked" />
>                                 [% ELSE %]
>@@ -213,56 +214,56 @@ Item types administration
>             [% END %]
>             <ol class="oladditemtype">
>                 <li>
>-                    <label for="hideinopac">Hide in OPAC: </label>
>+                    <label for="hideinopac">[% t('Hide in OPAC:') %] </label>
>                     [% IF ( itemtype.hideinopac ) %]
>                         <input type="checkbox" id="hideinopac" name="hideinopac" checked="checked" value="1" />
>                     [% ELSE %]
>                         <input type="checkbox" id="hideinopac" name="hideinopac" value="1" />
>                     [% END %]
>-                    (if checked, items of this type will be hidden as filters in OPAC's advanced search)
>+                    [% t('(if checked, items of this type will be hidden as filters in OPAC\'s advanced search)') %]
>                 </li>
>                 <li>
>-                    <label for="notforloan">Not for loan: </label>
>+                    <label for="notforloan">[% t('Not for loan:') %] </label>
>                         [% IF itemtype.notforloan %]
>                             <input type="checkbox" id="notforloan" name="notforloan" checked="checked" value="1" />
>                         [% ELSE %]
>                             <input type="checkbox" id="notforloan" name="notforloan" value="1" />
>                         [% END %]
>-                      (if checked, no item of this type can be issued. If not checked, every item of this type can be issued unless notforloan is set for a specific item)
>+                      [% t('(if checked, no item of this type can be issued. If not checked, every item of this type can be issued unless notforloan is set for a specific item)') %]
>                 </li>
>                 <li>
>-                    <label for="rentalcharge">Rental charge: </label>
>+                    <label for="rentalcharge">[% t('Rental charge:') %] </label>
>                     <input type="text" id="rentalcharge" name="rentalcharge" size="10" value="[% itemtype.rentalcharge %]" />
>                 </li>
>                 <li>
>-                    <label for="defaultreplacecost">Default replacement cost: </label>
>+                    <label for="defaultreplacecost">[% t('Default replacement cost:') %] </label>
>                     <input type="text" id="defaultreplacecost" name="defaultreplacecost" size="10" value="[% itemtype.defaultreplacecost %]" />
>                 </li>
>                 <li>
>-                    <label for="processfee">Processing fee (when lost): </label>
>+                    <label for="processfee">[% t('Processing fee (when lost):') %] </label>
>                     <input type="text" id="processfee" name="processfee" size="10" value="[% itemtype.processfee %]" />
>                 </li>
>                 <li>
>-                    <label for="checkinmsg">Checkin message: </label>
>+                    <label for="checkinmsg">[% t('Checkin message:') %] </label>
>                     <textarea id="checkinmsg" name="checkinmsg" cols="55" rows="5">[% itemtype.checkinmsg %]</textarea>
>                 </li>
>                 <li>
>-                    <label for="checkinmsgtype">Checkin message type: </label>
>+                    <label for="checkinmsgtype">[% t('Checkin message type:') %] </label>
>                     <select type="text" id="checkinmsgtype" name="checkinmsgtype">
>                         [% IF itemtype.checkinmsgtype == 'message' %]
>-                            <option value="message" selected="selected">Message</option>
>+                            <option value="message" selected="selected">[% t('Message') %]</option>
>                         [% ELSE %]
>-                            <option value="message">Message</option>
>+                            <option value="message">[% t('Message') %]</option>
>                         [% END %]
>                         [% IF itemtype.checkinmsgtype == 'alert' %]
>-                            <option value="alert" selected="selected">Alert</option>
>+                            <option value="alert" selected="selected">[% t('Alert') %]</option>
>                         [% ELSE %]
>-                            <option value="alert">Alert</option>
>+                            <option value="alert">[% t('Alert') %]</option>
>                         [% END %]
>                     </select>
>                 </li>
>                 <li>
>-                    <label for="sip_media_type">SIP media type: </label>
>+                    <label for="sip_media_type">[% t('SIP media type:') %] </label>
>                     <select id="sip_media_type" name="sip_media_type">
>                         <option value=""></option>
>                         [% FOREACH a IN AuthorisedValues.Get('SIP_MEDIA_TYPE') %]
>@@ -275,99 +276,99 @@ Item types administration
>                     </select>
>                 </li>
>                 <li>
>-                    <label for="summary">Summary: </label>
>+                    <label for="summary">[% t('Summary:') %] </label>
>                    <textarea id="summary" name="summary" cols="55" rows="5">[% itemtype.summary %]</textarea>
>-                    <p>Enter a summary that will overwrite the default one in search results lists. Example, for a website itemtype : </p>
>-                    <p><b>&lt;a href="[856u]"&gt;open site&lt;/a&gt;</b> will show the link just below the title</p>
>+                    <p>[% t('Enter a summary that will overwrite the default one in search results lists. Example, for a website itemtype :') %] </p>
>+                    <p><b>[% t('&lt;a href=&#34;[856u]&#34;&gt;open site&lt;/a&gt;') %]</b> [% t('will show the link just below the title') %]</p>
>                 </li>
>             </ol>
>         </fieldset>
> 
>         <fieldset class="action">
>             <input type="submit" value="Save changes" />
>-            <a href="/cgi-bin/koha/admin/itemtypes.pl" class="cancel">Cancel</a>
>+            <a href="/cgi-bin/koha/admin/itemtypes.pl" class="cancel">[% t('Cancel') %]</a>
>         </fieldset>
>     </form>
> [% END %]
> 
> [% IF op == 'delete_confirm' %]
>     <div class="dialog alert">
>-        <h3>Delete item type '[% itemtype.itemtype %]'?</h3>
>+        <h3>[% t('Delete item type \'') %][% itemtype.itemtype %]'?</h3>
>         <table>
>             <tr>
>-                <th scope="row">Item type</th>
>+                <th scope="row">[% t('Item type') %]</th>
>                 <td>[% itemtype.itemtype %]</td>
>             </tr>
>-            <tr><th scope="row">Description</th><td>[% itemtype.translated_description %]</td></tr>
>+            <tr><th scope="row">[% t('Description') %]</th><td>[% itemtype.translated_description %]</td></tr>
>             [% UNLESS Koha.Preference('noItemTypeImages') %]
>                 <tr>
>-                    <th scope="row">Image</th>
>+                    <th scope="row">[% t('Image') %]</th>
>                     <td>
>                         [% SET image_location = itemtype.image_location('intranet') %]
>                         [% IF image_location %]<img src="[% image_location %]" alt="" />[% END %]
>                     </td>
>                 </tr>
>             [% END %]
>-            <tr><th scope="row">Rental charge</th><td>[% itemtype.rentalcharge | $Price %]</td></tr>
>+            <tr><th scope="row">[% t('Rental charge') %]</th><td>[% itemtype.rentalcharge | $Price %]</td></tr>
>         </table>
>         <form action="/cgi-bin/koha/admin/itemtypes.pl" method="post">
>             <input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="itemtype" value="[% itemtype.itemtype %]" />
>-            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this item type</button>
>+            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('Yes, delete this item type') %]</button>
>         </form>
>         <form action="/cgi-bin/koha/admin/itemtypes.pl" method="post">
>-            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
>+            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> [% t('No, do not delete') %]</button>
>         </form>
>     </div>
> [% END %]
> 
> [% IF op == 'list' %]
>-    <h2>Item types administration</h2>
>+    <h2>[% t('Item types administration') %]</h2>
>     [% IF itemtypes %]
>         <table id="table_item_type">
>           <thead>
>-            [% UNLESS Koha.Preference('noItemTypeImages') %]<th>Image</th>[% END %]
>-            <th>Code</th>
>-            <th>Description</th>
>-            <th>Search category</th>
>-            <th>Not for loan</th>
>-            <th>Hide in OPAC</th>
>-            <th>Charge</th>
>-            <th>Default replacement cost</th>
>-            <th>Processing fee (when lost)</th>
>-            <th>Checkin message</th>
>-            <th>Actions</th>
>+            [% UNLESS Koha.Preference('noItemTypeImages') %]<th>[% t('Image') %]</th>[% END %]
>+            <th>[% t('Code') %]</th>
>+            <th>[% t('Description') %]</th>
>+            <th>[% t('Search category') %]</th>
>+            <th>[% t('Not for loan') %]</th>
>+            <th>[% t('Hide in OPAC') %]</th>
>+            <th>[% t('Charge') %]</th>
>+            <th>[% t('Default replacement cost') %]</th>
>+            <th>[% t('Processing fee (when lost)') %]</th>
>+            <th>[% t('Checkin message') %]</th>
>+            <th>[% t('Actions') %]</th>
>           </thead>
>           [% FOREACH itemtype IN itemtypes %]
>             <tr>
>                 [% UNLESS Koha.Preference('noItemTypeImages') %]
>                     <td>
>                         [% SET image_location = itemtype.image_location('intranet') %]
>-                        [% IF image_location %]<img src="[% image_location %]" alt="" />[% ELSE %]&nbsp;[% END %]
>+                        [% IF image_location %]<img src="[% image_location %]" alt="" />[% ELSE %]Â [% END %]
>                     </td>
>                 [% END %]
>             <td>
>-              <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&amp;itemtype=[% itemtype.itemtype |html %]">
>+              <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&itemtype=[% itemtype.itemtype |html %]">
>                 [% itemtype.itemtype %]
>               </a>
>             </td>
>             <td>
>                 [% IF itemtype.translated_descriptions.size %]
>-                    [% itemtype.description %] (default)<br/>
>+                    [% itemtype.description %] [% t('(default)') %]<br />
>                     [% FOR description IN itemtype.translated_descriptions %]
>                         [% IF description.translation == itemtype.translated_description %]
>                             <b>[% description.translation %]</b>
>                         [% ELSE %]
>                             [% description.translation %] ([% description.lang %])
>                         [% END %]
>-                        <br/>
>+                        <br />
>                     [% END %]
>                 [% ELSE %]
>                     [% itemtype.description |html %]
>                 [% END %]
>             </td>
>             <td>[% itemtype.searchcategory %]</td>
>-            <td>[% IF ( itemtype.notforloan ) %]Yes[% ELSE %]&nbsp;[% END %]</td>
>-            <td>[% IF ( itemtype.hideinopac ) %]Yes[% ELSE %]&nbsp;[% END %]</td>
>+            <td>[% IF ( itemtype.notforloan ) %][% t('Yes') %][% ELSE %]Â [% END %]</td>
>+            <td>[% IF ( itemtype.hideinopac ) %][% t('Yes') %][% ELSE %]Â [% END %]</td>
>             <td>
>             [% UNLESS ( itemtype.notforloan ) %]
>               [% itemtype.rentalcharge | $Price %]
>@@ -377,14 +378,14 @@ Item types administration
>             <td>[% itemtype.processfee | $Price %]</td>
>             <td>[% itemtype.checkinmsg | html | html_line_break %]</td>
>             <td class="actions">
>-              <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&amp;itemtype=[% itemtype.itemtype |html %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
>-              <a href="/cgi-bin/koha/admin/itemtypes.pl?op=delete_confirm&amp;itemtype=[% itemtype.itemtype |html %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
>+              <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&itemtype=[% itemtype.itemtype |html %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> [% t('Edit') %]</a>
>+              <a href="/cgi-bin/koha/admin/itemtypes.pl?op=delete_confirm&itemtype=[% itemtype.itemtype |html %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> [% t('Delete') %]</a>
>             </td>
>           </tr>
>           [% END %]
>         </table>
>     [% ELSE %]
>-        <div class="dialog message">There are no itemtypes defined</div>
>+        <div class="dialog message">[% t('There are no itemtypes defined') %]</div>
>     [% END %]
> [% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
>index a692ad2eea..0bbe267809 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
>@@ -1,7 +1,8 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Koha to MARC mapping</title>
>+<title>[% t('Koha âº Administration âº Koha to MARC mapping') %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% Asset.css("css/datatables.css") %]
> </head>
>@@ -10,7 +11,7 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha to MARC Mapping</a></div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> âº <a href="/cgi-bin/koha/admin/koha2marclinks.pl">[% t('Koha to MARC Mapping') %]</a></div>
> 
> <div id="doc3" class="yui-t2">
> 
>@@ -18,21 +19,21 @@
>     <div id="yui-main">
>     <div class="yui-b">
> 
>-<h1>Koha to MARC mapping</h1>
>-<br/>
>+<h1>[% t('Koha to MARC mapping') %]</h1>
>+<br />
> <form action="/cgi-bin/koha/admin/koha2marclinks.pl" method="post" id="koha2marc">
> 
> [% IF error_add %]
>-    <div class="dialog alert">Failed to add mapping for [% error_info %]</div>
>+    <div class="dialog alert">[% t('Failed to add mapping for') %] [% error_info %]</div>
> [% END %]
> 
> <table id="kohafields">
> <thead><tr>
>-    <th>Koha field</th>
>-    <th>Tag</th>
>-    <th>Subfield</th>
>-    <th>Lib</th>
>-    <th>&nbsp;</th>
>+    <th>[% t('Koha field') %]</th>
>+    <th>[% t('Tag') %]</th>
>+    <th>[% t('Subfield') %]</th>
>+    <th>[% t('Lib') %]</th>
>+    <th>Â </th>
> </tr></thead>
> <tbody>
> [% FOREACH loo IN loop %]
>@@ -43,8 +44,8 @@
>     <td>[% loo.liblibrarian %]</td>
>     <td class="actions">
>         [% IF !loo.readonly %]
>-            <a onclick="AddFld('[% loo.kohafield %]');" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</a>
>-            [% IF loo.tagfield %] <a onclick="RemFld('[% loo.tagfield %]','[% loo.tagsubfield %]');" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> Remove</a> [% END %]
>+            <a onclick="AddFld('[% loo.kohafield %]');" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% t('Add') %]</a>
>+            [% IF loo.tagfield %] <a onclick="RemFld('[% loo.tagfield %]','[% loo.tagsubfield %]');" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> [% t('Remove') %]</a> [% END %]
>         [% END %]
>     </td>
>     </td>
>@@ -53,8 +54,8 @@
> </tbody>
> </table>
> 
>-<input id="remove_field" name="remove_field" type="hidden" value=""/>
>-<input id="add_field" name="add_field" type="hidden" value=""/>
>+<input id="remove_field" name="remove_field" type="hidden" value="" />
>+<input id="add_field" name="add_field" type="hidden" value="" />
> 
> </form>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
>index b9b433ffe0..2f7471787d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
>@@ -1,7 +1,8 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% USE KohaSpan %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Library groups</title>
>+<title>[% t('Koha âº Administration âº Library groups') %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% Asset.css("lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css") %]
> [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") %]
>@@ -112,30 +113,30 @@
> [% INCLUDE 'cat-search.inc' %]
> 
> <div id="breadcrumbs">
>-    <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>-    &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>-    &rsaquo; <a href="/cgi-bin/koha/admin/library_groups.pl">Library groups</a>
>+    <a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a>
>+    âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a>
>+    âº <a href="/cgi-bin/koha/admin/library_groups.pl">[% t('Library groups') %]</a>
> </div>
> 
> [% IF added %]
>     <div class="dialog message group-added">
>         [% IF added.branchcode %]
>-            [% added.library.branchname | $KohaSpan class = 'name' %] added to group.
>+            [% added.library.branchname | $KohaSpan class = 'name' %] [% t('added to group.') %]
>         [% ELSE %]
>-            Group [% added.title | $KohaSpan class = 'name' %] created.
>+            [% t('Group') %] [% added.title | $KohaSpan class = 'name' %] [% t('created.') %]
>         [% END %]
>     </div>
> [% ELSIF deleted %]
>     <div class="dialog message group-deleted">
>         [% IF deleted.title %]
>-            Group [% deleted.title | $KohaSpan class = 'name' %] has been deleted.
>+            [% t('Group') %] [% deleted.title | $KohaSpan class = 'name' %] [% t('has been deleted.') %]
>         [% ELSE %]
>-            [% deleted.library | $KohaSpan class = 'name' %] has been removed from group.
>+            [% deleted.library | $KohaSpan class = 'name' %] [% t('has been removed from group.') %]
>         [% END %]
>     </div>
> [% ELSIF error_duplicate_title %]
>     <div class="dialog alert error-duplicate-group-title">
>-            A group with the title [% error_duplicate_title | $KohaSpan class = 'name' %] already exists.
>+            [% t('A group with the title') %] [% error_duplicate_title | $KohaSpan class = 'name' %] [% t('already exists.') %]
>     </div>
> [% END %]
> 
>@@ -147,7 +148,7 @@
>                     <div id="toolbar" class="btn-toolbar">
>                         <div class="btn-group">
>                             <a id="add-group-root" class="btn btn-default btn-sm add-group" href="#">
>-                                <i class="fa fa-plus"></i> Add group
>+                                <i class="fa fa-plus"></i> [% t('Add group') %]
>                             </a>
>                         </div>
>                     </div>
>@@ -156,10 +157,10 @@
>                 [% FOREACH root_group IN root_groups %]
>                     <table class="library-groups">
>                         <tr>
>-                            <th>&nbsp;</th>
>-                            <th>Description</th>
>-                            <th>Features enabled</th>
>-                            <th>&nbsp;</th>
>+                            <th>Â </th>
>+                            <th>[% t('Description') %]</th>
>+                            <th>[% t('Features enabled') %]</th>
>+                            <th>Â </th>
>                         </tr>
>                         [% PROCESS tree group=root_group %]
>                     </table>
>@@ -176,45 +177,45 @@
>             <div class="modal-dialog">
>                 <div class="modal-content">
>                     <div class="modal-header">
>-                        <h3 id="add-group-modal-label">Add group</h3>
>+                        <h3 id="add-group-modal-label">[% t('Add group') %]</h3>
>                     </div>
>                     <div class="modal-body">
>                         <input type="hidden" id="add-group-modal-parent-id" name="parent_id" value="" />
>                         <input type="hidden" id="add-group-modal-action" name="action" value="add">
> 
>                         <p>
>-                            <label for="add-group-modal-title">Title: </label>
>+                            <label for="add-group-modal-title">[% t('Title:') %] </label>
>                             <input type="text" name="title" id="add-group-modal-title" required="required" />
>-                            <i>required</i>
>+                            <i>[% t('required') %]</i>
>                         </p>
> 
>                         <p>
>-                            <label for="add-group-modal-description">Description: </label>
>+                            <label for="add-group-modal-description">[% t('Description:') %] </label>
>                             <input type="text" name="description" id="add-group-modal-description" />
>                         </p>
>                         <div id="root-group-features-add">
>-                            <h3>Features</h3>
>+                            <h3>[% t('Features') %]</h3>
>                             <div class="checkbox">
>                                 <label>
>                                     <input type="checkbox" name="ft_hide_patron_info" id="add-group-modal-ft_hide_patron_info" value="1" />
>-                                    Limit patron data access by group
>+                                    [% t('Limit patron data access by group') %]
>                                 </label>
>                                 <p>
>                                 <label>
>                                     <input type="checkbox" name="ft_search_groups_opac" id="add-group-modal-ft_search_groups_opac" value="1" />
>-                                    Use for OPAC search groups
>+                                    [% t('Use for OPAC search groups') %]
>                                 </label>
>                                 <p>
>                                 <label>
>                                     <input type="checkbox" name="ft_search_groups_staff" id="add-group-modal-ft_search_groups_staff" value="1" />
>-                                    Use for staff search groups
>+                                    [% t('Use for staff search groups') %]
>                                 </label>
>                             </div>
>                         </div>
>                     </div>
>                     <div class="modal-footer">
>-                        <button type="submit" class="btn btn-primary">Save</button>
>-                        <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Cancel</button>
>+                        <button type="submit" class="btn btn-primary">[% t('Save') %]</button>
>+                        <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">[% t('Cancel') %]</button>
>                     </div>
>                 </div>
>             </div>
>@@ -226,45 +227,45 @@
>             <div class="modal-dialog">
>                 <div class="modal-content">
>                     <div class="modal-header">
>-                        <h3 id="edit-group-modal-label">Edit group</h3>
>+                        <h3 id="edit-group-modal-label">[% t('Edit group') %]</h3>
>                     </div>
>                     <div class="modal-body">
>                         <input type="hidden" id="edit-group-modal-id" name="id" value="" />
>                         <input type="hidden" id="edit-group-modal-action" name="action" value="edit" />
> 
>                         <p>
>-                            <label for="edit-group-modal-title">Title: </label>
>+                            <label for="edit-group-modal-title">[% t('Title:') %] </label>
>                             <input type="text" id="edit-group-modal-title" name="title" value="" required="required" />
>-                            <i>required</i>
>+                            <i>[% t('required') %]</i>
>                         </p>
> 
>                         <p>
>-                            <label for="edit-group-modal-description">Description: </label>
>+                            <label for="edit-group-modal-description">[% t('Description:') %] </label>
>                             <input type="text" id="edit-group-modal-description" name="description" value="" />
>                         </p>
>                         <div id="root-group-features-edit">
>-                            <h3>Features</h3>
>+                            <h3>[% t('Features') %]</h3>
>                             <div class="checkbox">
>                                 <label>
>                                     <input type="checkbox" id="edit-group-modal-ft_hide_patron_info" name="ft_hide_patron_info" value="1" />
>-                                    Limit patron data access by group
>+                                    [% t('Limit patron data access by group') %]
>                                 </label>
>                                 <p>
>                                 <label>
>                                     <input type="checkbox" id="edit-group-modal-ft_search_groups_opac" name="ft_search_groups_opac" value="1" />
>-                                    Use for OPAC search groups
>+                                    [% t('Use for OPAC search groups') %]
>                                 </label>
>                                 <p>
>                                 <label>
>                                     <input type="checkbox" id="edit-group-modal-ft_search_groups_staff" name="ft_search_groups_staff" value="1" />
>-                                    Use for staff search groups
>+                                    [% t('Use for staff search groups') %]
>                                 </label>
>                             </div>
>                         </div>
>                     </div>
>                     <div class="modal-footer">
>-                        <button type="submit" class="btn btn-primary">Update</button>
>-                        <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Cancel</button>
>+                        <button type="submit" class="btn btn-primary">[% t('Update') %]</button>
>+                        <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">[% t('Cancel') %]</button>
>                     </div>
>                 </div>
>             </div>
>@@ -278,14 +279,14 @@
>                     <input id="delete-group-modal-action" type="hidden" name="action" value="delete" />
>                     <input id="delete-group-modal-id" type="hidden" name="id" value="" />
>                     <div class="modal-header">
>-                        <h3 id="delete-group-modal-label">Delete group</h3>
>+                        <h3 id="delete-group-modal-label">[% t('Delete group') %]</h3>
>                     </div>
>                     <div class="modal-body">
>-                        Are you sure you want to delete <span id="delete-group-modal-title" class="name"></span>?
>+                        [% t('Are you sure you want to delete') %] <span id="delete-group-modal-title" class="name"></span>?
>                     </div>
>                     <div class="modal-footer">
>-                        <button type="submit" class="btn btn-danger"><i class="fa fa-trash"></i> Delete</button>
>-                        <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Cancel</button>
>+                        <button type="submit" class="btn btn-danger"><i class="fa fa-trash"></i> [% t('Delete') %]</button>
>+                        <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">[% t('Cancel') %]</button>
>                     </div>
>                 </div>
>             </div>
>@@ -299,14 +300,14 @@
>                     <input id="remove-library-modal-action" type="hidden" name="action" value="delete" />
>                     <input id="remove-library-modal-id" type="hidden" name="id" value="" />
>                     <div class="modal-header">
>-                        <h3 id="remove-library-modal-label">Remove library from group</h3>
>+                        <h3 id="remove-library-modal-label">[% t('Remove library from group') %]</h3>
>                     </div>
>                     <div class="modal-body">
>-                        Are you sure you want to remove <span id="remove-library-modal-library" class="name"></span> from <span id="remove-library-modal-group" class="name"><span>?
>+                        [% t('Are you sure you want to remove') %] <span id="remove-library-modal-library" class="name"></span> [% t('from') %] <span id="remove-library-modal-group" class="name"><span>?
>                     </div>
>                     <div class="modal-footer">
>-                        <button type="submit" class="btn btn-danger"><i class="fa fa-trash"></i> Remove</button>
>-                        <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Cancel</button>
>+                        <button type="submit" class="btn btn-danger"><i class="fa fa-trash"></i> [% t('Remove') %]</button>
>+                        <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">[% t('Cancel') %]</button>
>                     </div>
>                 </div>
>             </div>
>@@ -336,46 +337,46 @@
>             [% UNLESS group.branchcode %]
>               <ul>
>                 [% IF group.ft_hide_patron_info %]
>-                    <li>Hide patron's info for librarians outside of this group.</li>
>+                    <li>[% t('Hide patron\'s info for librarians outside of this group.') %]</li>
>                 [% END %]
>                 [% IF group.ft_search_groups_opac %]
>-                    <li>Use for OPAC search groups</li>
>+                    <li>[% t('Use for OPAC search groups') %]</li>
>                 [% END %]
>                 [% IF group.ft_search_groups_staff %]
>-                    <li>Use for staff search groups</li>
>+                    <li>[% t('Use for staff search groups') %]</li>
>                 [% END %]
>               </ul>
>             [% END %]
>         </td>
>         <td>
>             [% IF group.branchcode %]
>-                <button class="btn btn-default btn-sm remove-library" data-group-id="[% group.id %]" data-group-library="[% group.library.branchname %]" data-group-parent-title="[% group.parent.title %]" ><i class="fa fa-trash"></i> Remove from group</button>
>+                <button class="btn btn-default btn-sm remove-library" data-group-id="[% group.id %]" data-group-library="[% group.library.branchname %]" data-group-parent-title="[% group.parent.title %]"><i class="fa fa-trash"></i> [% t('Remove from group') %]</button>
>             [% ELSE %]
>                 <div class="btn-group">
>-                    <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-wrench"></i> Actions <span class="caret"></span></button>
>+                    <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-wrench"></i> [% t('Actions') %] <span class="caret"></span></button>
>                     <ul class="dropdown-menu">
>                         <li>
>                             <a id="add-group-[% group.id %]" href="#" class="add-group" data-group-id="[% group.id %]">
>-                                <i class="fa fa-plus"></i> Add sub-group
>+                                <i class="fa fa-plus"></i> [% t('Add sub-group') %]
>                             </a>
>                        </li>
> 
>                         <li>
>-                            <a class="edit-group" id="edit-group-[% group.id %]" href="#" class="edit-group" data-group-id="[% group.id %]" data-group-parent-id="[% group.parent_id %]" data-group-title="[% group.title | html %]" data-group-description="[% group.description | html %]" data-group-ft_hide_patron_info="[% group.ft_hide_patron_info | html %]" data-group-ft_search_groups_opac="[% group.ft_search_groups_opac | html %]" data-group-ft_search_groups_staff="[% group.ft_search_groups_staff | html %]" >
>-                                <i class="fa fa-pencil"></i> Edit
>+                            <a class="edit-group" id="edit-group-[% group.id %]" href="#" class="edit-group" data-group-id="[% group.id %]" data-group-parent-id="[% group.parent_id %]" data-group-title="[% group.title | html %]" data-group-description="[% group.description | html %]" data-group-ft_hide_patron_info="[% group.ft_hide_patron_info | html %]" data-group-ft_search_groups_opac="[% group.ft_search_groups_opac | html %]" data-group-ft_search_groups_staff="[% group.ft_search_groups_staff | html %]">
>+                                <i class="fa fa-pencil"></i> [% t('Edit') %]
>                             </a>
>                        </li>
> 
>                         <li>
>                             <a class="delete-group" id="delete-group-[% group.id %]" href="#" class="delete-group" data-group-id="[% group.id %]" data-group-title="[% group.title | html %]">
>-                                <i class="fa fa-trash"></i> Delete
>+                                <i class="fa fa-trash"></i> [% t('Delete') %]
>                             </a>
>                        </li>
>                     </ul>
>                 </div>
> 
>                 <div class="btn-group">
>-                    <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> Add library <span class="caret"></span></button>
>+                    <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> [% t('Add library') %] <span class="caret"></span></button>
>                     <ul class="dropdown-menu">
>                         [% FOREACH library IN group.libraries_not_direct_children %]
>                             <li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt
>index fc62473f92..f8b869e1ac 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt
>@@ -1,7 +1,8 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Localization</title>
>+<title>[% t('Koha âº Localization') %]</title>
> [% INCLUDE 'doc-head-close.inc' popup => 1 %]
> [% Asset.css("css/datatables.css") %]
> </head>
>@@ -11,7 +12,7 @@
> <form id="add_translation" method="post">
>     <input type="hidden" name="entity" value="[% entity %]" />
>     <input type="hidden" name="code" value="[% code %]" />
>-    Lang: <select name="lang">
>+    [% t('Lang:') %] <select name="lang">
>         [% FOR language IN languages %]
>             [% FOR sublanguage IN language.sublanguages_loop %]
>                 [% IF language.plural %]
>@@ -22,18 +23,18 @@
>             [% END %]
>         [% END %]
>     </select>
>-    Translation: <input type="text" name="translation" />
>+    [% t('Translation:') %] <input type="text" name="translation" />
>     <input type="submit" value="Add" />
> </form>
> <div id="messages"></div>
> <table id="localization">
>     <thead>
>         <tr>
>-            <th>Id</th>
>-            <th>Entity</th>
>-            <th>Code</th>
>-            <th>Lang</th>
>-            <th>Translation</th>
>+            <th>[% t('Id') %]</th>
>+            <th>[% t('Entity') %]</th>
>+            <th>[% t('Code') %]</th>
>+            <th>[% t('Lang') %]</th>
>+            <th>[% t('Translation') %]</th>
>             <th></th>
>         </tr>
>     </thead>
>@@ -45,7 +46,7 @@
>             <td>[% t.code %]</td>
>             <td class="lang">[% t.lang %]</td>
>             <td class="translation" contenteditable="true">[% t.translation %]</td>
>-            <td class="actions"><a href="#" class="delete"><i class="fa fa-trash"></i> Delete</a></td>
>+            <td class="actions"><a href="#" class="delete"><i class="fa fa-trash"></i> [% t('Delete') %]</a></td>
>         </tr>
>         [% END %]
>     </tbody>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
>index 199bbe8eb4..6b4d6c20f8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
>@@ -1,8 +1,9 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo;[% IF ( add_form ) %][% IF ( use_heading_flags_p ) %][% IF ( heading_edit_subfields_p ) %] MARC subfield structure &rsaquo; Edit MARC subfields constraints[% END %][% ELSE %] MARC subfield structure &rsaquo; [% action %][% END %][% END %]
>-[% IF ( delete_confirm ) %] MARC subfield structure &rsaquo; Confirm deletion of subfield [% tagsubfield %][% END %][% IF ( delete_confirmed ) %] MARC subfield structure &rsaquo; Subfield deleted[% END %][% IF ( else ) %]MARC subfield structure[% END %]</title>
>+<title>[% t('Koha âº Administration âº') %][% IF ( add_form ) %][% IF ( use_heading_flags_p ) %][% IF ( heading_edit_subfields_p ) %] [% t('MARC subfield structure âº Edit MARC subfields constraints') %][% END %][% ELSE %] [% t('MARC subfield structure âº') %] [% action %][% END %][% END %]
>+[% IF ( delete_confirm ) %] [% t('MARC subfield structure âº Confirm deletion of subfield') %] [% tagsubfield %][% END %][% IF ( delete_confirmed ) %] [% t('MARC subfield structure âº Subfield deleted') %][% END %][% IF ( else ) %][% t('MARC subfield structure') %][% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>@@ -11,19 +12,19 @@
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
> <div id="breadcrumbs">
>-  <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a> &rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode %]&amp;searchfield=[% tagfield | uri %]">[% IF ( frameworkcode ) %][% frameworkcode %][% ELSE %]Default[% END %] framework structure</a> &rsaquo;
>+  <a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> âº <a href="/cgi-bin/koha/admin/biblio_framework.pl">[% t('MARC frameworks') %]</a> âº <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode %]&searchfield=[% tagfield | uri %]">[% IF ( frameworkcode ) %][% frameworkcode %][% ELSE %][% t('Default') %][% END %] [% t('framework structure') %]</a> âº
>   [% IF ( add_form ) %]
>   [% IF ( use_heading_flags_p ) %]
>-  [% IF ( heading_edit_subfields_p ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;frameworkcode=[% frameworkcode %]">Tag [% tagfield | html %] subfield structure</a> &rsaquo; Edit subfields constraints
>+  [% IF ( heading_edit_subfields_p ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode %]">[% t('Tag') %] [% tagfield | html %] [% t('subfield structure') %]</a> [% t('âº Edit subfields constraints') %]
>   [% END %]
>-  [% ELSE %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;frameworkcode=[% frameworkcode %]">Tag [% tagfield | html %] Subfield structure</a> &rsaquo; [% action %]
>+  [% ELSE %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode %]">[% t('Tag') %] [% tagfield | html %] [% t('Subfield structure') %]</a> âº [% action %]
>   [% END %]
>   [% END %]
>-[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;frameworkcode=[% frameworkcode %]">Tag [% tagfield | html %] Subfield structure</a> &rsaquo; Confirm deletion of subfield [% tagsubfield %]
>+[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode %]">[% t('Tag') %] [% tagfield | html %] [% t('Subfield structure') %]</a> [% t('âº Confirm deletion of subfield') %] [% tagsubfield %]
> [% END %]
>-[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;frameworkcode=[% frameworkcode %]">Tag [% tagfield | html %] subfield structure</a> &rsaquo; Subfield deleted
>+[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode %]">[% t('Tag') %] [% tagfield | html %] [% t('subfield structure') %]</a> [% t('âº Subfield deleted') %]
> [% END %]
>-[% IF ( else ) %]Tag [% tagfield | html %] Subfield structure[% END %]
>+[% IF ( else ) %][% t('Tag') %] [% tagfield | html %] [% t('Subfield structure') %][% END %]
> </div>
> 
> <div id="doc3" class="yui-t2">
>@@ -35,7 +36,7 @@
> [% IF ( add_form ) %]
>     <h1>
>         [% IF ( use_heading_flags_p ) %]
>-            [% IF ( heading_edit_subfields_p ) %]Tag [% tagfield | html %] Subfield constraints[% END %]
>+            [% IF ( heading_edit_subfields_p ) %][% t('Tag') %] [% tagfield | html %] [% t('Subfield constraints') %][% END %]
>         [% ELSE %]
>             [% action %]
>         [% END %]
>@@ -48,7 +49,7 @@
>    <ul>
>         [% FOREACH loo IN loop %]
>             [% IF ( loo.new_subfield ) %]
>-                <li><a href="#sub[% loo.urisubfieldcode %]field" title="[% loo.liblibrarian | html_entity %]">New</a></li>
>+                <li><a href="#sub[% loo.urisubfieldcode %]field" title="[% loo.liblibrarian | html_entity %]">[% t('New') %]</a></li>
>             [% ELSE %]
>                 <li><a href="#sub[% loo.urisubfieldcode %]field" title="[% loo.liblibrarian | html_entity %]">
>                     [% loo.subfieldcode %]
>@@ -60,19 +61,19 @@
>     [% FOREACH loo IN loop %] 
>         <div class="constraints" id="sub[% loo.urisubfieldcode %]field">
> 
>-               <h3><a href="#basic[% loo.urisubfieldcode %]">Basic constraints</a></h3>
>+               <h3><a href="#basic[% loo.urisubfieldcode %]">[% t('Basic constraints') %]</a></h3>
>                     <div id="basic[% loo.urisubfieldcode %]">
>                     <fieldset class="rows">
>                 	<ol>
>                 		[% IF ( subfieldcode == 0 || subfieldcode ) %] 
>-                		<li><span class="label">Subfield code:</span> [% loo.subfieldcode %] <input type="hidden" name="tagsubfield" value="[% loo.subfieldcode %]" /></li>
>+                		<li><span class="label">[% t('Subfield code:') %]</span> [% loo.subfieldcode %] <input type="hidden" name="tagsubfield" value="[% loo.subfieldcode %]" /></li>
>                 		[% ELSE %]
>-                		<li><label for="tagsubfield[% loo.row %]">Subfield code:</label> <input type="text" id="tagsubfield[% loo.row %]" name="tagsubfield" value="[% loo.subfieldcode %]" /></li>
>+                		<li><label for="tagsubfield[% loo.row %]">[% t('Subfield code:') %]</label> <input type="text" id="tagsubfield[% loo.row %]" name="tagsubfield" value="[% loo.subfieldcode %]" /></li>
>                 		[% END %]
>-                        <li><label for="liblibrarian[% loo.row %]">Text for librarian: </label><input id="liblibrarian[% loo.row %]" type="text" name="liblibrarian" value="[% loo.liblibrarian | html_entity %]" size="40" maxlength="80" /></li>
>-                        <li><label for="libopac[% loo.row %]">Text for OPAC: </label><input type="text" id="libopac[% loo.row %]" name="libopac" value="[% loo.libopac | html_entity %]" size="40" maxlength="80" /></li>
>+                        <li><label for="liblibrarian[% loo.row %]">[% t('Text for librarian:') %] </label><input id="liblibrarian[% loo.row %]" type="text" name="liblibrarian" value="[% loo.liblibrarian | html_entity %]" size="40" maxlength="80" /></li>
>+                        <li><label for="libopac[% loo.row %]">[% t('Text for OPAC:') %] </label><input type="text" id="libopac[% loo.row %]" name="libopac" value="[% loo.libopac | html_entity %]" size="40" maxlength="80" /></li>
>                         <li>
>-                            <label for="repeatable[% loo.row %]">Repeatable: </label>
>+                            <label for="repeatable[% loo.row %]">[% t('Repeatable:') %] </label>
>                             [% IF loo.repeatable %]
>                                 <input type="checkbox" id="repeatable[% loo.row %]" name="repeatable[% loo.row %]" checked="checked" value="1" />
>                             [% ELSE %]
>@@ -80,19 +81,19 @@
>                             [% END %]
>                         </li>
>                         <li>
>-                            <label for="mandatory[% loo.row %]">Mandatory: </label>
>+                            <label for="mandatory[% loo.row %]">[% t('Mandatory:') %] </label>
>                             [% IF loo.mandatory %]
>                                 <input type="checkbox" id="mandatory[% loo.row %]" name="mandatory[% loo.row %]" checked="checked" value="1" />
>                             [% ELSE %]
>                                 <input type="checkbox" id="mandatory[% loo.row %]" name="mandatory[% loo.row %]" value="1" />
>                             [% END %]
>                         </li>
>-                        <li><label for="tab[% loo.row %]">Managed in tab: </label>
>+                        <li><label for="tab[% loo.row %]">[% t('Managed in tab:') %] </label>
>                             <select name="tab" tabindex="" size="1" id="tab[% loo.row %]">
>                             [%- IF ( loo.tab ==  -1 ) -%]
>-                                <option value="-1" selected="selected">ignore</option>
>+                                <option value="-1" selected="selected">[% t('ignore') %]</option>
>                             [%- ELSE -%]
>-                                <option value="-1">ignore</option>
>+                                <option value="-1">[% t('ignore') %]</option>
>                             [%- END -%]
>                             [%- FOREACH t IN [ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'] -%]
>                                 [%- IF ( loo.tab ==  t ) -%]
>@@ -102,51 +103,51 @@
>                                 [%- END -%]
>                             [%- END -%]
>                             [%- IF ( loo.tab ==  10 ) -%]
>-                                <option value="10" selected="selected">items (10)</option>
>+                                <option value="10" selected="selected">[% t('items (10)') %]</option>
>                             [%- ELSE -%]
>-                                <option value="10">items (10)</option>
>+                                <option value="10">[% t('items (10)') %]</option>
>                             [%- END -%]
>                             </select>
>-                            (ignore means that the subfield does not display in the record editor)
>+                            [% t('(ignore means that the subfield does not display in the record editor)') %]
>                         </li>
>                 	</ol>
>                     </fieldset>
>                     </div>
> 
> 
>-            <h3><a href="#advanced[% loo.urisubfieldcode %]">Advanced constraints</a></h3>
>+            <h3><a href="#advanced[% loo.urisubfieldcode %]">[% t('Advanced constraints') %]</a></h3>
>             <div id="advanced[% loo.urisubfieldcode %]">
>             <fieldset class="rows">
>-                <ol><li><label for="defaultvalue[% loo.row %]">Default value:</label>
>+                <ol><li><label for="defaultvalue[% loo.row %]">[% t('Default value:') %]</label>
>                     <input type="text" name="defaultvalue" id="defaultvalue[% loo.row %]" value="[% loo.defaultvalue %]" /></li>
>-				<li><label for="maxlength[% loo.row %]">Max length:</label><input type="text" id="maxlength[% loo.row %]" name="maxlength" value="[% loo.maxlength %]" size="4" /> (see online help)</li>
>+				<li><label for="maxlength[% loo.row %]">[% t('Max length:') %]</label><input type="text" id="maxlength[% loo.row %]" name="maxlength" value="[% loo.maxlength %]" size="4" /> [% t('(see online help)') %]</li>
>                 <li><input type="hidden" id="hidden-[% loo.row %]" name="hidden" value="[% loo.hidden %]" />
>-                    <label for="hidden[% loo.row %]" style="float: none;">Visibility: </label>
>-                    <input type="checkbox" id="hidden_opac_[% loo.row %]" class="inclusive_[% loo.row %]" name="hidden_opac_[% loo.row %]"/>
>-                    <label for="hidden_opac_[% loo.row %]" style="float: none;">OPAC</label>
>-                    <input type="checkbox" id="hidden_intranet_[% loo.row %]" class="inclusive_[% loo.row %]" name="hidden_intranet_[% loo.row %]"/>
>-                    <label for="hidden_intranet_[% loo.row %]" style="float: none;">Intranet</label>
>-                    <input type="checkbox" id="hidden_editor_[% loo.row %]" class="inclusive_[% loo.row %]" name="hidden_editor_[% loo.row %]"/>
>-                    <label for="hidden_editor_[% loo.row %]" style="float: none;">Editor</label>
>-                    <input type="checkbox" id="hidden_collapsed_[% loo.row %]" class="inclusive_[% loo.row %]" name="hidden_collapsed_[% loo.row %]"/>
>-                    <label for="hidden_collapsed_[% loo.row %]" style="float: none;">Collapsed</label>
>-                    <input type="checkbox" id="hidden_flagged_[% loo.row %]" name="flagged_[% loo.row %]"/>
>-                    <label for="hidden_flagged_[% loo.row %]" style="float: none;">Flagged</label>
>+                    <label for="hidden[% loo.row %]" style="float: none;">[% t('Visibility:') %] </label>
>+                    <input type="checkbox" id="hidden_opac_[% loo.row %]" class="inclusive_[% loo.row %]" name="hidden_opac_[% loo.row %]" />
>+                    <label for="hidden_opac_[% loo.row %]" style="float: none;">[% t('OPAC') %]</label>
>+                    <input type="checkbox" id="hidden_intranet_[% loo.row %]" class="inclusive_[% loo.row %]" name="hidden_intranet_[% loo.row %]" />
>+                    <label for="hidden_intranet_[% loo.row %]" style="float: none;">[% t('Intranet') %]</label>
>+                    <input type="checkbox" id="hidden_editor_[% loo.row %]" class="inclusive_[% loo.row %]" name="hidden_editor_[% loo.row %]" />
>+                    <label for="hidden_editor_[% loo.row %]" style="float: none;">[% t('Editor') %]</label>
>+                    <input type="checkbox" id="hidden_collapsed_[% loo.row %]" class="inclusive_[% loo.row %]" name="hidden_collapsed_[% loo.row %]" />
>+                    <label for="hidden_collapsed_[% loo.row %]" style="float: none;">[% t('Collapsed') %]</label>
>+                    <input type="checkbox" id="hidden_flagged_[% loo.row %]" name="flagged_[% loo.row %]" />
>+                    <label for="hidden_flagged_[% loo.row %]" style="float: none;">[% t('Flagged') %]</label>
>                 </li>
>                 <li>
>-                    <label for="isurl[% loo.row %]">Is a URL:</label>
>+                    <label for="isurl[% loo.row %]">[% t('Is a URL:') %]</label>
>                     [% IF loo.isurl %]
>                         <input type="checkbox" id="isurl[% loo.row %]" name="isurl[% loo.row %]" checked="checked" value="1" />
>                     [% ELSE %]
>                         <input type="checkbox" id="isurl[% loo.row %]" name="isurl[% loo.row %]" value="1" />
>                     [% END %]
>-                    (if checked, it means that the subfield is a URL and can be clicked)
>+                    [% t('(if checked, it means that the subfield is a URL and can be clicked)') %]
>                 </li>
>-                <li><label for="link[% loo.row %]">Link:</label><input type="text" id="link[% loo.row %]" name="link" value="[% loo.link %]" size="10" maxlength="80" /> (e.g., Title or Local-Number) <span class="error"><em>NOTE: If you change this value you must ask your administrator to run misc/batchRebuildBiblioTables.pl.</em></span></li>
>+                <li><label for="link[% loo.row %]">[% t('Link:') %]</label><input type="text" id="link[% loo.row %]" name="link" value="[% loo.link %]" size="10" maxlength="80" /> [% t('(e.g., Title or Local-Number)') %] <span class="error"><em>[% t('NOTE: If you change this value you must ask your administrator to run misc/batchRebuildBiblioTables.pl.') %]</em></span></li>
>                 <li>
>-                    <label for="kohafield[% loo.row %]">Koha link:</label>
>+                    <label for="kohafield[% loo.row %]">[% t('Koha link:') %]</label>
>                     
>-                    <select name="kohafield" id="kohafield[% loo.row %]" size="1" disabled>
>+                    <select name="kohafield" id="kohafield[% loo.row %]" size="1" disabled="">
>                     [% FOREACH value IN loo.kohafields %]
>                       [% IF ( value == loo.kohafield ) %]
>                         <option value="[% value %]" selected="selected">[% value %]</option>
>@@ -156,17 +157,17 @@
>                     [% END %]
>                     </select>
>                     
>-                    <input type="hidden" name="kohafield" value="[% loo.kohafield %]"/>
>+                    <input type="hidden" name="kohafield" value="[% loo.kohafield %]" />
>                 </li>
> 			</ol>
>             </fieldset>
>             </div>
>-            <h3><a href="#oth[% loo.urisubfieldcode %]">Other options (choose one)</a></h3>
>+            <h3><a href="#oth[% loo.urisubfieldcode %]">[% t('Other options (choose one)') %]</a></h3>
>             <div id="oth[% loo.urisubfieldcode %]">
>             <fieldset class="rows">
>                     	<ol>
>                             <li>
>-                                <label for="authorised_value[% loo.row %]">Authorized value:</label>
>+                                <label for="authorised_value[% loo.row %]">[% t('Authorized value:') %]</label>
>                                 <select name="authorised_value" id="authorised_value[% loo.row %]" size="1">
>                                 <option value=""></option>
>                                 [% FOREACH value IN loo.authorised_values %]
>@@ -179,7 +180,7 @@
>                                 </select>
>                             </li>
>                             <li>
>-                                <label for="authtypecode[% loo.row %]">Thesaurus:</label>
>+                                <label for="authtypecode[% loo.row %]">[% t('Thesaurus:') %]</label>
>                                 <select name="authtypecode" id="authtypecode[% loo.row %]" size="1">
>                                 [% FOREACH value IN loo.authtypes %]
>                                     [% IF ( value == loo.authtypecode ) %]
>@@ -191,7 +192,7 @@
>                                 </select>
>                             </li>
>                             <li>
>-                                <label for="value_builder[% loo.row %]">Plugin:</label>
>+                                <label for="value_builder[% loo.row %]">[% t('Plugin:') %]</label>
>                                 <select name="value_builder" id="value_builder[% loo.row %]" size="1">
>                                 [% FOREACH value IN loo.value_builders %]
>                                     [% IF ( value == loo.value_builder ) %]
>@@ -209,7 +210,7 @@
>         [% END %]
> 		</div>
>     <fieldset class="action">
>-        <input type="submit" value="Save changes" /> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield  | uri %]&amp;frameworkcode=[% frameworkcode %]" class="cancel">Cancel</a>
>+        <input type="submit" value="Save changes" /> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield  | uri %]&frameworkcode=[% frameworkcode %]" class="cancel">[% t('Cancel') %]</a>
>     </fieldset>
>     </form>
> [% END %]
>@@ -217,16 +218,16 @@
> [% IF ( delete_confirm ) %]
> 
>     <div class="dialog alert">
>-        <h3>Confirm deletion of subfield [% tagsubfield %]?</h3>
>-        <p>Subfield: [% tagsubfield %]</p>
>-        <p>Description: [% liblibrarian | html_entity %]</p>
>+        <h3>[% t('Confirm deletion of subfield') %] [% tagsubfield %]?</h3>
>+        <p>[% t('Subfield:') %] [% tagsubfield %]</p>
>+        <p>[% t('Description:') %] [% liblibrarian | html_entity %]</p>
> 
>         <form action="[% delete_link %]" method="post"><input type="hidden" name="op" value="delete_confirmed" />
>             <input type="hidden" name="searchfield" value="[% searchfield %]" />
>             <input type="hidden" name="tagfield" value="[% tagfield | html %]" />
>             <input type="hidden" name="tagsubfield" value="[% tagsubfield %]" />
>             <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
>-            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this subfield</button>
>+            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('Yes, delete this subfield') %]</button>
>         </form>
> 
> 
>@@ -235,7 +236,7 @@
>             <input type="hidden" name="tagfield" value="[% tagfield | html%]" />
>             <input type="hidden" name="tagsubfield" value="[% tagsubfield %]" />
>             <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
>-            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
>+            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> [% t('No, do not delete') %]</button>
>         </form>
>     </div>
> 
>@@ -243,7 +244,7 @@
> 
> [% IF ( delete_confirmed ) %]
> 
>-    <h3>Data deleted</h3>
>+    <h3>[% t('Data deleted') %]</h3>
>     <form action="[% script_name %]" method="post">
>         <input type="hidden" name="tagfield" value="[% tagfield | html %]" />
>     <input type="submit" value="OK" />
>@@ -252,20 +253,20 @@
> 
> 
> [% IF ( else ) %]
>-<h1>MARC subfield structure admin for [% tagfield | html %] [% IF ( frameworkcode ) %](framework [% frameworkcode %])[% ELSE %](default framework)[% END %]</h1>
>-<p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.</p>
>-<p>The column 'Koha field' shows that the subfield is linked with a Koha field.</p>
>+<h1>[% t('MARC subfield structure admin for') %] [% tagfield | html %] [% IF ( frameworkcode ) %][% t('(framework') %] [% frameworkcode %])[% ELSE %][% t('(default framework)') %][% END %]</h1>
>+<p>[% t('This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.') %]</p>
>+<p>[% t('The column \'Koha field\' shows that the subfield is linked with a Koha field.') %]</p>
> 
> <table>
> <tr>
>-    <th>Subfield</th>
>-    <th>Text</th>
>-    <th>Constraints</th>
>-    <th>Actions</th>
>+    <th>[% t('Subfield') %]</th>
>+    <th>[% t('Text') %]</th>
>+    <th>[% t('Constraints') %]</th>
>+    <th>[% t('Actions') %]</th>
> </tr>
> [% FOREACH loo IN loop %]
> <tr>
>-    <td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&amp;tagfield=[% loo.tagfield %]&amp;frameworkcode=[% frameworkcode %]#sub[% loo.tagsubfield %]field">[% loo.tagsubfield %]</a></td>
>+    <td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&tagfield=[% loo.tagfield %]&frameworkcode=[% frameworkcode %]#sub[% loo.tagsubfield %]field">[% loo.tagsubfield %]</a></td>
>     <td>
>         [% IF ( loo.subfield_ignored ) %]
>             <i>[% loo.liblibrarian | html_entity %]</i>
>@@ -275,24 +276,24 @@
>     </td>
>     <td>
>         [% IF ( loo.subfield_ignored ) %]
>-            <i>subfield ignored</i>
>+            <i>[% t('subfield ignored') %]</i>
>         [% ELSE %]
>-            Tab:[% loo.tab %],
>-            [% IF ( loo.kohafield ) %] | Koha field: [% loo.kohafield %], [% END %]
>-            [% IF ( loo.repeatable ) %]Repeatable, [% ELSE %]Not repeatable,[% END %]
>-            [% IF ( loo.mandatory ) %]Mandatory, [% ELSE %]Not mandatory,[% END %]
>-            [% IF ( loo.seealso ) %] | See Also: [% loo.seealso %],[% END %]
>-            [% IF ( loo.hidden ) %]hidden,[% END %]
>-            [% IF ( loo.isurl ) %]is a URL,[% END %]
>-            [% IF ( loo.authorised_value ) %] | Auth value:[% loo.authorised_value %],[% END %]
>-            [% IF ( loo.authtypecode ) %] | Authority:[% loo.authtypecode %],[% END %]
>-            [% IF ( loo.value_builder ) %] | Plugin:[% loo.value_builder %],[% END %]
>-            [% IF ( loo.link ) %] | Link:[% loo.link %],[% END %]
>+            [% t('Tab:') %][% loo.tab %],
>+            [% IF ( loo.kohafield ) %] [% t('| Koha field:') %] [% loo.kohafield %], [% END %]
>+            [% IF ( loo.repeatable ) %][% t('Repeatable,') %] [% ELSE %][% t('Not repeatable,') %][% END %]
>+            [% IF ( loo.mandatory ) %][% t('Mandatory,') %] [% ELSE %][% t('Not mandatory,') %][% END %]
>+            [% IF ( loo.seealso ) %] [% t('| See Also:') %] [% loo.seealso %],[% END %]
>+            [% IF ( loo.hidden ) %][% t('hidden,') %][% END %]
>+            [% IF ( loo.isurl ) %][% t('is a URL,') %][% END %]
>+            [% IF ( loo.authorised_value ) %] [% t('| Auth value:') %][% loo.authorised_value %],[% END %]
>+            [% IF ( loo.authtypecode ) %] [% t('| Authority:') %][% loo.authtypecode %],[% END %]
>+            [% IF ( loo.value_builder ) %] [% t('| Plugin:') %][% loo.value_builder %],[% END %]
>+            [% IF ( loo.link ) %] [% t('| Link:') %][% loo.link %],[% END %]
>         [% END %]
>     </td>
>     <td class="actions">
>-        <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&amp;tagfield=[% loo.tagfield %]&amp;frameworkcode=[% frameworkcode %]#sub[% loo.tagsubfield %]field" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
>-        <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=delete_confirm&amp;tagfield=[% loo.tagfield %]&amp;tagsubfield=[% loo.tagsubfield %]&amp;frameworkcode=[% frameworkcode %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
>+        <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&tagfield=[% loo.tagfield %]&frameworkcode=[% frameworkcode %]#sub[% loo.tagsubfield %]field" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> [% t('Edit') %]</a>
>+        <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=delete_confirm&tagfield=[% loo.tagfield %]&tagsubfield=[% loo.tagsubfield %]&frameworkcode=[% frameworkcode %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> [% t('Delete') %]</a>
>     </td>
> </tr>
> [% END %]
>@@ -303,7 +304,7 @@
>     <input type="hidden" name="tagfield" value="[% edit_tagfield %]" />
>     <input type="hidden" name="frameworkcode" value="[% edit_frameworkcode %]" />
>     <input type="submit" value="Edit subfields" />
>-        <a class="cancel" href="marctagstructure.pl?searchfield=[% tagfield | uri %]&amp;frameworkcode=[% frameworkcode %]">Cancel</a>
>+        <a class="cancel" href="marctagstructure.pl?searchfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode %]">[% t('Cancel') %]</a>
> 	</fieldset>
> </form>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
>index 0d0431fdc5..c5c12d4743 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
>@@ -1,12 +1,13 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% USE AuthorisedValues %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo;
>-[% IF ( add_form ) %]MARC frameworks &rsaquo; [% action %] [% searchfield %][% END %]
>-[% IF ( delete_confirm ) %]MARC frameworks &rsaquo; Confirm deletion of tag '[% searchfield %]'[% END %]
>-[% IF ( delete_confirmed ) %]MARC frameworks &rsaquo;  Data deleted[% END %]
>-[% IF ( else ) %]MARC frameworks[% END %]</title>
>+<title>[% t('Koha âº Administration âº') %]
>+[% IF ( add_form ) %][% t('MARC frameworks âº') %] [% action %] [% searchfield %][% END %]
>+[% IF ( delete_confirm ) %][% t('MARC frameworks âº Confirm deletion of tag \'') %][% searchfield %]'[% END %]
>+[% IF ( delete_confirmed ) %][% t('MARC frameworks âº') %]  [% t('Data deleted') %][% END %]
>+[% IF ( else ) %][% t('MARC frameworks') %][% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% Asset.css("css/datatables.css") %]
> </head>
>@@ -16,20 +17,20 @@
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
> <div id="breadcrumbs">
>-         <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>-&rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>-&rsaquo; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a>
>+         <a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a>
>+âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a>
>+âº <a href="/cgi-bin/koha/admin/biblio_framework.pl">[% t('MARC frameworks') %]</a>
> [% IF ( add_form ) %]
>-&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode %]">[% IF framework %][% framework.frameworktext |html %] ([% framework.frameworkcode %])[% ELSE %]Default MARC framework[% END%]</a>
>-&rsaquo; [% action %] [% searchfield %]
>+âº <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode %]">[% IF framework %][% framework.frameworktext |html %] ([% framework.frameworkcode %])[% ELSE %][% t('Default MARC framework') %][% END%]</a>
>+âº [% action %] [% searchfield %]
> [% ELSIF ( else ) %]
>-&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode %]">[% IF framework %][% framework.frameworktext |html %] ([% framework.frameworkcode %])[% ELSE %]Default MARC framework[% END %]</a>
>+âº <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode %]">[% IF framework %][% framework.frameworktext |html %] ([% framework.frameworkcode %])[% ELSE %][% t('Default MARC framework') %][% END %]</a>
> [% ELSIF ( delete_confirm ) %]
>-&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode %]">[% IF framework %][% framework.frameworktext |html %] ([% framework.frameworkcode %])[% ELSE %]Default MARC framework[% END %]</a>
>-&rsaquo; Confirm deletion of tag '[% searchfield %]'
>+âº <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode %]">[% IF framework %][% framework.frameworktext |html %] ([% framework.frameworkcode %])[% ELSE %][% t('Default MARC framework') %][% END %]</a>
>+[% t('âº Confirm deletion of tag \'') %][% searchfield %]'
> [% ELSIF ( delete_confirmed ) %]
>-&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode %]">[% IF framework %][% framework.frameworktext |html %] ([% framework.frameworkcode %])[% ELSE %]Default MARC framework[% END %]</a>
>-&rsaquo; Data deleted
>+âº <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode %]">[% IF framework %][% framework.frameworktext |html %] ([% framework.frameworkcode %])[% ELSE %][% t('Default MARC framework') %][% END %]</a>
>+[% t('âº Data deleted') %]
> [% END %]
> </div>
> 
>@@ -40,62 +41,62 @@
> 
> [% IF ( else ) %]
> <div id="toolbar" class="btn-toolbar">
>-    <a class="btn btn-default btn-sm" id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&amp;frameworkcode=[% framework.frameworkcode %]"><i class="fa fa-plus"></i> New tag</a>
>+    <a class="btn btn-default btn-sm" id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&frameworkcode=[% framework.frameworkcode %]"><i class="fa fa-plus"></i> [% t('New tag') %]</a>
> </div>[% END %]
> 
>-<h1>MARC Framework for [% IF framework %][% framework.frameworktext |html %] ([% framework.frameworkcode %])[% ELSE %]default MARC framework[% END %]</h1>
>+<h1>[% t('MARC Framework for') %] [% IF framework %][% framework.frameworktext |html %] ([% framework.frameworkcode %])[% ELSE %][% t('default MARC framework') %][% END %]</h1>
> 
> [% IF ( add_form ) %]
> 
>     <form action="[% script_name %]" name="Aform" method="post" class="validated">
> 
>-      <fieldset class="rows"><legend>[% IF ( use_heading_flags_p ) %][% IF ( heading_modify_tag_p ) %]Modify tag <input type="hidden" name="modif" value="1" />[% searchfield %][% END %][% IF ( heading_add_tag_p ) %]Add tag[% END %][% ELSE %][% action %][% END %]</legend>  <input type="hidden" name="op" value="add_validate" />
>+      <fieldset class="rows"><legend>[% IF ( use_heading_flags_p ) %][% IF ( heading_modify_tag_p ) %][% t('Modify tag') %] <input type="hidden" name="modif" value="1" />[% searchfield %][% END %][% IF ( heading_add_tag_p ) %][% t('Add tag') %][% END %][% ELSE %][% action %][% END %]</legend>  <input type="hidden" name="op" value="add_validate" />
>         <input type="hidden" name="frameworkcode" value="[% framework.frameworkcode %]" />
> 
>         <ol>
>             <li>
>                 [% IF ( heading_modify_tag_p ) %]
>                     <input type="hidden" name="tagfield" value="[% searchfield %]" />
>-                    <span class="label">Tag:</span>
>+                    <span class="label">[% t('Tag:') %]</span>
>                     [% searchfield %]
>                 [% ELSE %]
>-                    <label for="tagfield" class="required">Tag: </label>
>+                    <label for="tagfield" class="required">[% t('Tag:') %] </label>
>                     <input id="tagfield" type="text" name="tagfield" value="[% searchfield %]" maxlength="3" size="3" required="required" class="required" />
>-                    <span class="required">Required</span>
>+                    <span class="required">[% t('Required') %]</span>
>                 [% END %]
>             </li>
>-    <li><label for="liblibrarian">Label for lib: </label><input type="text" id="liblibrarian" name="liblibrarian" value="[% liblibrarian |html %]" size="40" maxlength="100" /></li>
>-    <li><label for="libopac">Label for opac: </label><input type="text" id="libopac" name="libopac" value="[% libopac |html %]" size="40" maxlength="100" /></li>
>-    <li><label for="repeatable">Repeatable: </label>
>+    <li><label for="liblibrarian">[% t('Label for lib:') %] </label><input type="text" id="liblibrarian" name="liblibrarian" value="[% liblibrarian |html %]" size="40" maxlength="100" /></li>
>+    <li><label for="libopac">[% t('Label for opac:') %] </label><input type="text" id="libopac" name="libopac" value="[% libopac |html %]" size="40" maxlength="100" /></li>
>+    <li><label for="repeatable">[% t('Repeatable:') %] </label>
>         [% IF ( repeatable ) %]
>             <input type="checkbox" name="repeatable" id="repeatable" value="1" checked="checked" />
>         [% ELSE %]
>             <input type="checkbox" name="repeatable" id="repeatable" value="1" />
>         [% END %]
>     </li>
>-    <li><label for="mandatory">Mandatory: </label>
>+    <li><label for="mandatory">[% t('Mandatory:') %] </label>
>         [% IF ( mandatory ) %]
>             <input type="checkbox" name="mandatory" id="mandatory" value="1" checked="checked" />
>         [% ELSE %]
>             <input type="checkbox" name="mandatory" id="mandatory" value="1" />
>         [% END %]
>     </li>
>-    <li><label for="ind1_defaultvalue">First indicator default value: </label>
>+    <li><label for="ind1_defaultvalue">[% t('First indicator default value:') %] </label>
>         <input id="ind1_defaultvalue" type="text" name="ind1_defaultvalue" value="[% ind1_defaultvalue |html %]" maxlength="1" size="1" />
>     </li>
>-    <li><label for="ind2_defaultvalue">Second indicator default value: </label>
>+    <li><label for="ind2_defaultvalue">[% t('Second indicator default value:') %] </label>
>         <input id="ind2_defaultvalue" type="text" name="ind2_defaultvalue" value="[% ind2_defaultvalue |html %]" maxlength="1" size="1" />
>     </li>
>-    <li><label for="authorised_value">Authorized value: </label>
>+    <li><label for="authorised_value">[% t('Authorized value:') %] </label>
>         <select name="authorised_value" id="authorised_value" size="1">
>             <option value=""></option>
>             [% PROCESS options_for_authorised_value_categories authorised_value_categories => AuthorisedValues.GetCategories( selected => authorised_value ) %]
>         </select>
>-        (if you select a value here, the indicators will be limited to the authorized value list)</li>
>+        [% t('(if you select a value here, the indicators will be limited to the authorized value list)') %]</li>
> </ol></fieldset> 
>     <fieldset class="action">
>         <input type="submit" value="Save changes" />
>-        <a class="cancel" href="[% script_name %]?frameworkcode=[% framework.frameworkcode %]">Cancel</a>
>+        <a class="cancel" href="[% script_name %]?frameworkcode=[% framework.frameworkcode %]">[% t('Cancel') %]</a>
>     </fieldset>
>     </form>
> [% END %]
>@@ -103,26 +104,26 @@
> 
> [% IF ( delete_confirm ) %]
>     <div class="dialog alert">
>-        <h3>Confirm deletion of tag <span class="ex">'[% searchfield %]'</span>?</h3>
>-        <p>Tag: [% searchfield %]</p>
>-        <p>Description: [% liblibrarian %]</p>
>+        <h3>[% t('Confirm deletion of tag') %] <span class="ex">'[% searchfield %]'</span>?</h3>
>+        <p>[% t('Tag:') %] [% searchfield %]</p>
>+        <p>[% t('Description:') %] [% liblibrarian %]</p>
>         <form action="[% script_name %]" method="post">
>             <input type="hidden" name="op" value="delete_confirmed" />
>             <input type="hidden" name="searchfield" value="[% searchfield %]" />
>             <input type="hidden" name="frameworkcode" value="[% framework.frameworkcode %]" />
>-            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this tag</button>
>+            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('Yes, delete this tag') %]</button>
>         </form>
>         <form action="[% script_name %]" method="get"><input type="hidden" name="frameworkcode" value="[% framework.frameworkcode %]" />
>-            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
>+            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> [% t('No, do not delete') %]</button>
>         </form>
>     </div>
> [% END %]
> 
> [% IF ( delete_confirmed ) %]
> 
>-    <div class="dialog message"><h3>Tag deleted</h3>
>+    <div class="dialog message"><h3>[% t('Tag deleted') %]</h3>
>     <form action="[% script_name %]" method="post"><input type="hidden" name="frameworkcode" value="[% framework.frameworkcode %]" />
>-        <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> OK</button>
>+        <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('OK') %]</button>
>     </form></div>
> [% END %]
> [% IF ( framework_create ) %]
>@@ -130,9 +131,9 @@
>     <form action="[% script_name %]" method="post">
>         <input type="hidden" name="op" value="framework_create_confirm" />
>         <input type="hidden" name="frameworkcode" value="[% framework.frameworkcode %]" />
>-        Create framework for [% frameworkcode %] ([% framework.frameworktext |html %]) using
>+        [% t('Create framework for') %] [% frameworkcode %] ([% framework.frameworktext |html %][% t(') using') %]
>         <select name="existingframeworkcode">
>-            <option value="">Default</option>
>+            <option value="">[% t('Default') %]</option>
>         [% FOREACH existingframeworkloo IN existingframeworkloop %]
>             <option value="[% existingframeworkloo.value %]">[% existingframeworkloo.frameworktext |html %]</option>
>         [% END %]
>@@ -145,12 +146,12 @@
> [% IF ( else ) %]
> <form name="f" action="[% script_name %]" method="post">
> <fieldset style="padding:.5em;">
>-        <label for="searchfield"><strong>Search for tag:</strong> </label>
>+        <label for="searchfield"><strong>[% t('Search for tag:') %]</strong> </label>
>         <input type="text" name="searchfield" id="searchfield" size="4" value="[% searchfield %]" />
> 
>-<label for="frameworkcode"><strong>In framework:</strong> </label>
>+<label for="frameworkcode"><strong>[% t('In framework:') %]</strong> </label>
>         <select id="frameworkcode" name="frameworkcode">
>-            <option value="">Default</option>
>+            <option value="">[% t('Default') %]</option>
>             [% FOREACH f IN frameworks %]
>             [% IF f.frameworkcode == framework.frameworkcode %]
>                 <option value="[% f.frameworkcode %]" selected="selected">[% f.frameworktext |html %]</option>
>@@ -160,7 +161,7 @@
>             [% END %]
>         </select>
>     <input type="submit" value="Search" />
>-<p>        <label for="select_display">Display only used tags/subfields</label>
>+<p>        <label for="select_display">[% t('Display only used tags/subfields') %]</label>
>         [% IF ( select_display ) %]
>             <input type="checkbox" name="select_display" id="select_display" value="True" checked="checked" />
>         [% ELSE %]
>@@ -172,14 +173,14 @@
>     <table id="table_marctagstructure">
>     <thead>
>         <tr>
>-        <th>Tag</th>
>-        <th>Lib</th>
>-        <th>Repeatable</th>
>-        <th>Mandatory</th>
>-        <th>Auth value</th>
>-        <th>Indicator 1</th>
>-        <th>Indicator 2</th>
>-        <th>&nbsp;</th>
>+        <th>[% t('Tag') %]</th>
>+        <th>[% t('Lib') %]</th>
>+        <th>[% t('Repeatable') %]</th>
>+        <th>[% t('Mandatory') %]</th>
>+        <th>[% t('Auth value') %]</th>
>+        <th>[% t('Indicator 1') %]</th>
>+        <th>[% t('Indicator 2') %]</th>
>+        <th>Â </th>
>         </tr>
>     </thead>
>     <tbody>
>@@ -191,24 +192,24 @@
>                 [% loo.liblibrarian %]
>                 [% FOREACH subfield IN loo.subfields %]
>                     <p>
>-                        Tab:[% subfield.tab %] | $[% subfield.tagsubfield %]
>-                        [% subfield.liblibrarian %] [% IF ( subfield.kohafield ) %][% subfield.kohafield %][% END %][% IF ( subfield.repeatable ) %], repeatable[% END %][% IF ( subfield.mandatory ) %], Mandatory[% END %][% IF ( subfield.seealso ) %], See [% subfield.seealso %][% END %][% IF ( subfield.authorised_value ) %], [% subfield.authorised_value %][% END %][% IF ( subfield.authtypecode ) %], [% subfield.authtypecode %][% END %][% IF ( subfield.value_builder ) %], [% subfield.value_builder %][% END %]
>+                        [% t('Tab:') %][% subfield.tab %] | $[% subfield.tagsubfield %]
>+                        [% subfield.liblibrarian %] [% IF ( subfield.kohafield ) %][% subfield.kohafield %][% END %][% IF ( subfield.repeatable ) %][% t(', repeatable') %][% END %][% IF ( subfield.mandatory ) %][% t(', Mandatory') %][% END %][% IF ( subfield.seealso ) %][% t(', See') %] [% subfield.seealso %][% END %][% IF ( subfield.authorised_value ) %], [% subfield.authorised_value %][% END %][% IF ( subfield.authtypecode ) %], [% subfield.authtypecode %][% END %][% IF ( subfield.value_builder ) %], [% subfield.value_builder %][% END %]
>                     </p>
>                 [% END %]
>             </td>
>-            <td>[% IF ( loo.repeatable ) %]Yes[% ELSE %]No[% END %]</td>
>-            <td>[% IF ( loo.mandatory ) %]Yes[% ELSE %]No[% END %]</td>
>+            <td>[% IF ( loo.repeatable ) %][% t('Yes') %][% ELSE %][% t('No') %][% END %]</td>
>+            <td>[% IF ( loo.mandatory ) %][% t('Yes') %][% ELSE %][% t('No') %][% END %]</td>
>             <td>[% loo.authorised_value %]</td>
>             <td>[% loo.ind1_defaultvalue %]</td>
>             <td>[% loo.ind2_defaultvalue %]</td>
>             <td>
>                 <div class="dropdown">
>                     <a class="btn btn-default btn-xs dropdown-toggle" id="marctagactions[% loo.tagfield %]" role="button" data-toggle="dropdown" href="#">
>-                        Actions <b class="caret"></b></a>
>+                        [% t('Actions') %] <b class="caret"></b></a>
>                     <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="marctagactions[% loo.tagfield %]">
>-                        <li><a href="[% loo.subfield_link %]"><i class="fa fa-eye"></i> Subfields</a></li>
>-                        <li><a href="[% loo.edit %]"><i class="fa fa-pencil"></i> Edit</a></li>
>-                        <li><a href="[% loo.delete %]"><i class="fa fa-trash"></i> Delete</a></li>
>+                        <li><a href="[% loo.subfield_link %]"><i class="fa fa-eye"></i> [% t('Subfields') %]</a></li>
>+                        <li><a href="[% loo.edit %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a></li>
>+                        <li><a href="[% loo.delete %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a></li>
>                     </ul>
>                 </div>
>             </td>
>@@ -219,19 +220,19 @@
>     <tr>
>         <td>[% loo.tagfield %]</td>
>         <td>[% loo.liblibrarian %]</td>
>-        <td>[% IF ( loo.repeatable ) %]Yes[% ELSE %]No[% END %]</td>
>-        <td>[% IF ( loo.mandatory ) %]Yes[% ELSE %]No[% END %]</td>
>+        <td>[% IF ( loo.repeatable ) %][% t('Yes') %][% ELSE %][% t('No') %][% END %]</td>
>+        <td>[% IF ( loo.mandatory ) %][% t('Yes') %][% ELSE %][% t('No') %][% END %]</td>
>         <td>[% loo.authorised_value %]</td>
>         <td>[% loo.ind1_defaultvalue %]</td>
>         <td>[% loo.ind2_defaultvalue %]</td>
>         <td>
>             <div class="dropdown">
>                 <a class="btn btn-default btn-xs dropdown-toggle" id="marctagactions[% loo.tagfield %]" role="button" data-toggle="dropdown" href="#">
>-                    Actions <b class="caret"></b></a>
>+                    [% t('Actions') %] <b class="caret"></b></a>
>                 <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="marctagactions[% loo.tagfield %]">
>-                    <li><a href="[% loo.subfield_link %]"><i class="fa fa-eye"></i> Subfields</a></li>
>-                    <li><a href="[% loo.edit %]"><i class="fa fa-pencil"></i> Edit</a></li>
>-                    <li><a href="[% loo.delete %]"><i class="fa fa-trash"></i> Delete</a></li>
>+                    <li><a href="[% loo.subfield_link %]"><i class="fa fa-eye"></i> [% t('Subfields') %]</a></li>
>+                    <li><a href="[% loo.edit %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a></li>
>+                    <li><a href="[% loo.delete %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a></li>
>                 </ul>
>             </div>
>         </td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
>index fce8032083..647707f3ac 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
>@@ -1,27 +1,28 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Record matching rules
>+<title>[% t('Koha âº Administration âº Record matching rules') %]
> [% IF ( matching_rule_form ) %]
>   [% IF ( edit_matching_rule ) %]
>-    &rsaquo; Modify record matching rule
>+    [% t('âº Modify record matching rule') %]
>   [% ELSE %]
>-    &rsaquo; Add record matching rule
>+    [% t('âº Add record matching rule') %]
>   [% END %]
> [% END %]
> [% IF ( delete_matching_rule_form ) %]
>-  &rsaquo; Confirm deletion of record matching rule &quot;[% code %]&quot;
>+  [% t('âº Confirm deletion of record matching rule &#34;') %][% code %]"
> [% END %]
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> 
> [% BLOCK norms_text %]
> [%    SWITCH norm %]
>-[%        CASE 'none'           %]None
>-[%        CASE 'remove_spaces'  %]Remove spaces
>-[%        CASE 'upper_case'     %]Uppercase
>-[%        CASE 'lower_case'     %]Lowercase
>-[%        CASE 'legacy_default' %]Legacy default
>+[%        CASE 'none'           %][% t('None') %]
>+[%        CASE 'remove_spaces'  %][% t('Remove spaces') %]
>+[%        CASE 'upper_case'     %][% t('Uppercase') %]
>+[%        CASE 'lower_case'     %][% t('Lowercase') %]
>+[%        CASE 'legacy_default' %][% t('Legacy default') %]
> [%        CASE %][% norm %]
> [%    END %]
> [% END %]
>@@ -60,16 +61,16 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( display_list ) %]Record matching rules[% ELSE %]<a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a>[% END %]
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> âº [% IF ( display_list ) %][% t('Record matching rules') %][% ELSE %]<a href="/cgi-bin/koha/admin/matching-rules.pl">[% t('Record matching rules') %]</a>[% END %]
> [% IF ( matching_rule_form ) %]
>   [% IF ( edit_matching_rule ) %]
>-    &rsaquo; Modify record matching rule
>+    [% t('âº Modify record matching rule') %]
>   [% ELSE %]
>-    &rsaquo; Add record matching rule
>+    [% t('âº Add record matching rule') %]
>   [% END %]
> [% END %]
> [% IF ( delete_matching_rule_form ) %]
>-  &rsaquo; Confirm deletion of record matching rule &quot;[% code %]&quot;
>+  [% t('âº Confirm deletion of record matching rule &#34;') %][% code %]"
> [% END %]
> </div>
> 
>@@ -81,9 +82,9 @@
> 
> [% IF ( matching_rule_form ) %]
>   [% IF ( edit_matching_rule ) %]
>-<h2>Modify record matching rule</h2>
>+<h2>[% t('Modify record matching rule') %]</h2>
>   [% ELSE %]
>-<h2>Add record matching rule</h2>
>+<h2>[% t('Add record matching rule') %]</h2>
>   [% END %]
> <form action="[% script_name %]" name="Aform" method="post">
>   <input type="hidden" name="op" value="[% confirm_op %]" />
>@@ -91,98 +92,78 @@
>     <ol>
>       <li>
>           [% IF ( edit_matching_rule ) %]
>-		  <span class="label">Matching rule code: </span>
>+		  <span class="label">[% t('Matching rule code:') %] </span>
>             <input type="hidden" name="matcher_id" value="[% matcher_id %]" />
>             <input type="hidden" name="code" value="[% code %]" />
>             [% code %]
>           [% ELSE %]
>-		  <label for="code" class="required">Matching rule code: </label>
>-            <input type="text" id="code" name="code"  size="10" maxlength="10" /> <span class="required">Required</span>
>+		  <label for="code" class="required">[% t('Matching rule code:') %] </label>
>+            <input type="text" id="code" name="code" size="10" maxlength="10" /> <span class="required">[% t('Required') %]</span>
>           [% END %]
>        </li>
>-       <li><label for="description" class="required">Description: </label>
>-           <input type="text" id="description" name="description" size="50" maxlength="250" 
>-                  value="[% description |html %]" /> <span class="required">Required</span>
>+       <li><label for="description" class="required">[% t('Description:') %] </label>
>+           <input type="text" id="description" name="description" size="50" maxlength="250" value="[% description |html %]" /> <span class="required">[% t('Required') %]</span>
>        </li>
>-       <li><label for="threshold" class="required">Match threshold: </label>
>-           <input type="text" id="threshold" name="threshold" size="5" maxlength="5" 
>-                  value="[% threshold |html %]" /> <span class="required">Required</span>
>+       <li><label for="threshold" class="required">[% t('Match threshold:') %] </label>
>+           <input type="text" id="threshold" name="threshold" size="5" maxlength="5" value="[% threshold |html %]" /> <span class="required">[% t('Required') %]</span>
>        </li>
>-       <li><label for="record_type" class="required">Record type: </label>
>+       <li><label for="record_type" class="required">[% t('Record type:') %] </label>
>            <select id="record_type" name="record_type">
>                [% IF ( record_type == "authority" ) %]
>-                   <option value="biblio">Bibliographic record</option>
>-                   <option value="authority" selected="selected">Authority record</option>
>+                   <option value="biblio">[% t('Bibliographic record') %]</option>
>+                   <option value="authority" selected="selected">[% t('Authority record') %]</option>
>                [% ELSE %]
>-                   <option value="biblio" selected="selected">Bibliographic record</option>
>-                   <option value="authority">Authority record</option>
>+                   <option value="biblio" selected="selected">[% t('Bibliographic record') %]</option>
>+                   <option value="authority">[% t('Authority record') %]</option>
>                [% END %]
>-           </select><span class="required">Required</span>
>+           </select><span class="required">[% t('Required') %]</span>
>        </li>
>     </ol>
>   </fieldset>
> 
>   <fieldset class="rows" id="match_points">
>-  <h4>Match points</h4>
>+  <h4>[% t('Match points') %]</h4>
>   [% IF ( edit_matching_rule ) %]
>-  [% IF ( matchpoints ) %]<p id="addMatchPoint" style="display:none;">[% ELSE %]<p id="addMatchPoint">[% END %]<a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;">Add match point</a></p>
>-  [% ELSE %]<p id="addMatchPoint" style="display:none;"><a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;">Add match point</a></p>[% END %]
>+  [% IF ( matchpoints ) %]<p id="addMatchPoint" style="display:none;">[% ELSE %]<p id="addMatchPoint">[% END %]<a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;">[% t('Add match point') %]</a></p>
>+  [% ELSE %]<p id="addMatchPoint" style="display:none;"><a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;">[% t('Add match point') %]</a></p>[% END %]
>   [% IF ( edit_matching_rule ) %]
>   [% FOREACH matchpoint IN matchpoints %]
>   <div id="mp_[% matchpoint.mp_num %]" class="matchgroup">
>   <fieldset class="rows">
>-    <legend>Match point [% matchpoint.mp_num %] | <a href="#" class="button" onclick="InsertMatchpoint('mp_[% matchpoint.mp_num %]', 'mp_template'); return false;">Add match point</a> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></legend>
>+    <legend>[% t('Match point') %] [% matchpoint.mp_num %] | <a href="#" class="button" onclick="InsertMatchpoint('mp_[% matchpoint.mp_num %]', 'mp_template'); return false;">[% t('Add match point') %]</a> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">[% t('Remove this match point') %]</a></legend>
>     <ol>
>       <li>
>-        <label for="mp_[% matchpoint.mp_num %]_search_index">Search index: </label>
>-        <input type ="text" id="mp_[% matchpoint.mp_num %]_search_index" 
>-               name="mp_[% matchpoint.mp_num %]_search_index" size="20" 
>-               value="[% matchpoint.index |html %]"
>-          maxlength="30" />
>+        <label for="mp_[% matchpoint.mp_num %]_search_index">[% t('Search index:') %] </label>
>+        <input type="text" id="mp_[% matchpoint.mp_num %]_search_index" name="mp_[% matchpoint.mp_num %]_search_index" size="20" value="[% matchpoint.index |html %]" maxlength="30" />
>       </li>
>       <li>
>-        <label for="mp_[% matchpoint.mp_num %]_score">Score: </label>
>-        <input type ="text" id="mp_[% matchpoint.mp_num %]_score" 
>-               name="mp_[% matchpoint.mp_num %]_score" size="5"
>-               value="[% matchpoint.score |html %]" 
>-               maxlength="5" />
>+        <label for="mp_[% matchpoint.mp_num %]_score">[% t('Score:') %] </label>
>+        <input type="text" id="mp_[% matchpoint.mp_num %]_score" name="mp_[% matchpoint.mp_num %]_score" size="5" value="[% matchpoint.score |html %]" maxlength="5" />
>       </li>
>       </ol>
>       [% FOREACH component IN matchpoint.components %]
>       <fieldset class="rows" id="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]">
>-      <legend>Matchpoint components</legend>
>+      <legend>[% t('Matchpoint components') %]</legend>
>         <ol>
>           <li>
>-            <label for="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_tag">Tag: </label>
>-            <input type="text" id="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_tag" 
>-                   name="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_tag" 
>-                   value="[% component.tag |html %]"
>-                   size="3" maxlength="3" />
>+            <label for="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_tag">[% t('Tag:') %] </label>
>+            <input type="text" id="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_tag" name="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_tag" value="[% component.tag |html %]" size="3" maxlength="3" />
>           </li>
>           <li>
>-            <label for="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_subfields">Subfields: </label>
>-            <input type="text" id="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_subfields" 
>-                   name="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_subfields" 
>-                   value="[% component.subfields |html %]"
>-                   size="10" maxlength="40" />
>+            <label for="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_subfields">[% t('Subfields:') %] </label>
>+            <input type="text" id="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_subfields" name="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_subfields" value="[% component.subfields |html %]" size="10" maxlength="40" />
>           </li>
>           <li>
>-            <label for="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_offset">Offset: </label>
>-            <input type="text" id="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_offset" 
>-                   name="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_offset" 
>-                   value="[% component.offset |html %]"
>-                   size="5" maxlength="5" />
>+            <label for="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_offset">[% t('Offset:') %] </label>
>+            <input type="text" id="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_offset" name="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_offset" value="[% component.offset |html %]" size="5" maxlength="5" />
>           </li>
>           <li>
>-            <label for="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_length">Length: </label>
>-            <input type="text" id="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_length" 
>-                   name="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_length" 
>-                   value="[% component.length |html %]"
>-                   size="5" maxlength="5" />
>+            <label for="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_length">[% t('Length:') %] </label>
>+            <input type="text" id="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_length" name="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_length" value="[% component.length |html %]" size="5" maxlength="5" />
>           </li>
>               [% FOREACH norm IN component.norms %]
>               <li id="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_n_[% norm.norm_num %]">
>-                <label for="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_n__[% norm.norm_num %]_norm">Normalization rule: </label>
>+                <label for="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_n__[% norm.norm_num %]_norm">[% t('Normalization rule:') %] </label>
>                 [%# Note: Following directive in one line, otherwise we have translatabiltiy problems %]
>                 [% PROCESS norms_select selected_norm=norm.norm id="mp_${norm.mp_num}_c_${component.comp_num}_n__${norm.norm_num}_norm" name="mp_${matchpoint.mp_num}_c_${component.comp_num}_n_${norm.norm_num}_norm" %]
>               </li>
>@@ -199,39 +180,38 @@
>   [% ELSE %]
>   <div id="mp_1" class="matchgroup">
>   <fieldset class="rows">
>-    <legend>Match point 1 | <a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;">Add match point</a> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></legend>
>+    <legend>[% t('Match point 1 |') %] <a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;">[% t('Add match point') %]</a> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">[% t('Remove this match point') %]</a></legend>
>     <ol>
>       <li>
>-        <label for="mp_1_search_index">Search index: </label>
>-        <input type ="text" id="mp_1_search_index" name="mp_1_search_index" size="20" 
>-          maxlength="30" />
>+        <label for="mp_1_search_index">[% t('Search index:') %] </label>
>+        <input type="text" id="mp_1_search_index" name="mp_1_search_index" size="20" maxlength="30" />
>       </li>
>       <li>
>-        <label for="mp_1_score">Score: </label>
>-        <input type ="text" id="mp_1_score" name="mp_1_score" size="5" maxlength="5" />
>+        <label for="mp_1_score">[% t('Score:') %] </label>
>+        <input type="text" id="mp_1_score" name="mp_1_score" size="5" maxlength="5" />
>       </li>
>     </ol>
>     <fieldset class="rows" id="mp_1_c_1">
>-      <legend>Matchpoint components</legend>
>+      <legend>[% t('Matchpoint components') %]</legend>
>         <ol>
>           <li>
>-            <label for="mp_1_c_1_tag">Tag: </label>
>+            <label for="mp_1_c_1_tag">[% t('Tag:') %] </label>
>             <input type="text" id="mp_1_c_1_tag" name="mp_1_c_1_tag" size="3" maxlength="3" />
>           </li>
>           <li>
>-            <label for="mp_1_c_1_subfields">Subfields: </label>
>+            <label for="mp_1_c_1_subfields">[% t('Subfields:') %] </label>
>             <input type="text" id="mp_1_c_1_subfields" name="mp_1_c_1_subfields" size="10" maxlength="40" />
>           </li>
>           <li>
>-            <label for="mp_1_c_1_offset">Offset: </label>
>+            <label for="mp_1_c_1_offset">[% t('Offset:') %] </label>
>             <input type="text" id="mp_1_c_1_offset" name="mp_1_c_1_offset" size="5" maxlength="5" />
>           </li>
>           <li>
>-            <label for="mp_1_c_1_length">Length: </label>
>+            <label for="mp_1_c_1_length">[% t('Length:') %] </label>
>             <input type="text" id="mp_1_c_1_length" name="mp_1_c_1_length" size="5" maxlength="5" />
>           </li>
>             <li id="mp_1_c_1_n_1">
>-              <label for="mp_1_c_1_n_1_norm">Normalization rule: </label>
>+              <label for="mp_1_c_1_n_1_norm">[% t('Normalization rule:') %] </label>
>                 [% PROCESS norms_select selected_norm="none" id="mp_1_c_1_n_1_norm" name="mp_1_c_1_n_1_norm" %]
>             </li>
>         </ol>
>@@ -244,51 +224,39 @@
>   [% END %]
> 
>   <fieldset class="rows" id="match_checks">
>-  <h4>Required match checks</h4>
>+  <h4>[% t('Required match checks') %]</h4>
>   [% IF ( edit_matching_rule ) %]
>-  [% IF ( matchchecks ) %]<p id="addMatchCheck" style="display:none;">[% ELSE %]<p id="addMatchCheck">[% END %]<a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;">Add match check</a></p>
>-  [% ELSE %]<p id="addMatchCheck" style="display:none;"><a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;">Add match check</a></p>[% END %]
>+  [% IF ( matchchecks ) %]<p id="addMatchCheck" style="display:none;">[% ELSE %]<p id="addMatchCheck">[% END %]<a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;">[% t('Add match check') %]</a></p>
>+  [% ELSE %]<p id="addMatchCheck" style="display:none;"><a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;">[% t('Add match check') %]</a></p>[% END %]
>   [% IF ( edit_matching_rule ) %]
>   [% FOREACH matchcheck IN matchchecks %]
>   <div id="mc_[% matchcheck.mc_num %]" class="matchgroup">
>   <fieldset class="rows">
>-    <legend>Match check [% matchcheck.mc_num %]<a href="#" class="button" onclick="InsertMatchcheck('mc_[% matchcheck.mc_num %]', 'mc_template'); return false;">Add match check</a> | <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">Remove this match check</a></legend>
>+    <legend>[% t('Match check') %] [% matchcheck.mc_num %]<a href="#" class="button" onclick="InsertMatchcheck('mc_[% matchcheck.mc_num %]', 'mc_template'); return false;">[% t('Add match check') %]</a> | <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">[% t('Remove this match check') %]</a></legend>
>     <input type="hidden" id="mc_[% matchcheck.mc_num %]_id" name="mc_[% matchcheck.mc_num %]_id" value="1" />
>       [% FOREACH src_component IN matchcheck.src_components %]
>       <fieldset class="rows" id="mc_[% src_component.mc_num %]_src_c_[% src_component.comp_num %]">
>-        <legend>Source (incoming) record check field</legend>
>+        <legend>[% t('Source (incoming) record check field') %]</legend>
>         <ol>
>           <li>
>-            <label for="mc_[% src_component.mc_num %]_src_c_[% src_component.comp_num %]_tag">Tag: </label>
>-            <input type="text" id="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_tag" 
>-                   name="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_tag" 
>-                   value="[% src_component.tag |html %]"
>-                   size="3" maxlength="3" />
>+            <label for="mc_[% src_component.mc_num %]_src_c_[% src_component.comp_num %]_tag">[% t('Tag:') %] </label>
>+            <input type="text" id="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_tag" name="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_tag" value="[% src_component.tag |html %]" size="3" maxlength="3" />
>           </li>
>           <li>
>-            <label for="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_subfields">Subfields: </label>
>-            <input type="text" id="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_subfields" 
>-                   name="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_subfields" 
>-                   value="[% src_component.subfields |html %]"
>-                   size="10" maxlength="40" />
>+            <label for="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_subfields">[% t('Subfields:') %] </label>
>+            <input type="text" id="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_subfields" name="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_subfields" value="[% src_component.subfields |html %]" size="10" maxlength="40" />
>           </li>
>           <li>
>-            <label for="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_offset">Offset: </label>
>-            <input type="text" id="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_offset" 
>-                   name="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_offset" 
>-                   value="[% src_component.offset |html %]"
>-                   size="5" maxlength="5" />
>+            <label for="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_offset">[% t('Offset:') %] </label>
>+            <input type="text" id="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_offset" name="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_offset" value="[% src_component.offset |html %]" size="5" maxlength="5" />
>           </li>
>           <li>
>-            <label for="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_length">Length: </label>
>-            <input type="text" id="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_length" 
>-                   name="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_length" 
>-                   value="[% src_component.length |html %]"
>-                   size="5" maxlength="5" />
>+            <label for="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_length">[% t('Length:') %] </label>
>+            <input type="text" id="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_length" name="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_length" value="[% src_component.length |html %]" size="5" maxlength="5" />
>           </li>
>           [% FOREACH norm IN src_component.norms %]
>             <li id="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_n_[% norm.norm_num %]">
>-              <label for="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_n_[% norm.norm_num %]_norm">Normalization rule: </label>
>+              <label for="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_n_[% norm.norm_num %]_norm">[% t('Normalization rule:') %] </label>
>                 [%# Note: Following directive in one line, otherwise we have translatabiltiy problems %]
>                 [% PROCESS norms_select selected_norm=norm.norm id="mc_${matchcheck.mc_num}_src_c_${src_component.comp_num}_n_${norm.norm_num}_norm" name="mc_${matchcheck.mc_num}_src_c_${src_component.comp_num}_n_${norm.norm_num}_norm" %]
>             </li>
>@@ -298,39 +266,27 @@
>       [% END %]
>       [% FOREACH tgt_component IN matchcheck.tgt_components %]
>       <fieldset class="rows" id="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]">
>-        <legend>Target (database) record check field</legend>
>+        <legend>[% t('Target (database) record check field') %]</legend>
>         <ol>
>           <li>
>-            <label for="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_tag">Tag: </label>
>-            <input type="text" id="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_tag" 
>-                   name="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_tag" 
>-                   value="[% tgt_component.tag |html %]"
>-                   size="3" maxlength="3" />
>+            <label for="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_tag">[% t('Tag:') %] </label>
>+            <input type="text" id="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_tag" name="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_tag" value="[% tgt_component.tag |html %]" size="3" maxlength="3" />
>           </li>
>           <li>
>-            <label for="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_subfields">Subfields: </label>
>-            <input type="text" id="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_subfields" 
>-                   name="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_subfields" 
>-                   value="[% tgt_component.subfields |html %]"
>-                   size="10" maxlength="40" />
>+            <label for="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_subfields">[% t('Subfields:') %] </label>
>+            <input type="text" id="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_subfields" name="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_subfields" value="[% tgt_component.subfields |html %]" size="10" maxlength="40" />
>           </li>
>           <li>
>-            <label for="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_offset">Offset: </label>
>-            <input type="text" id="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_offset" 
>-                   name="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_offset" 
>-                   value="[% tgt_component.offset |html %]"
>-                   size="5" maxlength="5" />
>+            <label for="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_offset">[% t('Offset:') %] </label>
>+            <input type="text" id="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_offset" name="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_offset" value="[% tgt_component.offset |html %]" size="5" maxlength="5" />
>           </li>
>           <li>
>-            <label for="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_length">Length: </label>
>-            <input type="text" id="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_length" 
>-                   name="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_length" 
>-                   value="[% tgt_component.length |html %]"
>-                   size="5" maxlength="5" />
>+            <label for="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_length">[% t('Length:') %] </label>
>+            <input type="text" id="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_length" name="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_length" value="[% tgt_component.length |html %]" size="5" maxlength="5" />
>           </li>
>           [% FOREACH norm IN tgt_component.norms %]
>             <li id="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_n_[% norm.norm_num %]">
>-              <label for="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_n_[% norm.norm_num %]_norm">Normalization rule: </label>
>+              <label for="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_n_[% norm.norm_num %]_norm">[% t('Normalization rule:') %] </label>
>                 [%# Note: Following directive in one line, otherwise we have translatabiltiy problems %]
>                 [% PROCESS norms_select selected_norm=norm.norm id="mc_${matchcheck.mc_num}_tgt_c_${tgt_component.comp_num}_n_${norm.norm_num}_norm" name="mc_${matchcheck.mc_num}_tgt_c_${tgt_component.comp_num}_n_${norm.norm_num}_norm" %]
>             </li>
>@@ -345,55 +301,55 @@
>   [% ELSE %]
>   <div id="mc_1" class="matchgroup">
>   <fieldset class="rows">
>-    <legend>Match check 1 | <a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;">Add match check</a> | <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">Remove this match check</a></legend>
>+    <legend>[% t('Match check 1 |') %] <a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;">[% t('Add match check') %]</a> | <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">[% t('Remove this match check') %]</a></legend>
>     <input type="hidden" id="mc_1_id" name="mc_1_id" value="1" />
>       <fieldset class="rows" id="mc_1_src_c_1">
>-        <legend>Source (incoming) record check field</legend>
>+        <legend>[% t('Source (incoming) record check field') %]</legend>
>         <ol>
>           <li>
>-            <label for="mc_1_src_c_1_tag">Tag: </label>
>+            <label for="mc_1_src_c_1_tag">[% t('Tag:') %] </label>
>             <input type="text" id="mc_1_src_c_1_tag" name="mc_1_src_c_1_tag" size="3" maxlength="3" />
>           </li>
>           <li>
>-            <label for="mc_1_src_c_1_subfields">Subfields: </label>
>+            <label for="mc_1_src_c_1_subfields">[% t('Subfields:') %] </label>
>             <input type="text" id="mc_1_src_c_1_subfields" name="mc_1_src_c_1_subfields" size="10" maxlength="40" />
>           </li>
>           <li>
>-            <label for="mc_1_src_c_1_offset">Offset: </label>
>+            <label for="mc_1_src_c_1_offset">[% t('Offset:') %] </label>
>             <input type="text" id="mc_1_src_c_1_offset" name="mc_1_src_c_1_offset" size="5" maxlength="5" />
>           </li>
>           <li>
>-            <label for="mc_1_src_c_1_length">Length: </label>
>+            <label for="mc_1_src_c_1_length">[% t('Length:') %] </label>
>             <input type="text" id="mc_1_src_c_1_length" name="mc_1_src_c_1_length" size="5" maxlength="5" />
>           </li>
>             <li id="mc_1_src_c_1_n_1">
>-              <label for="mc_1_src_c_1_n_1_norm">Normalization rule: </label>
>+              <label for="mc_1_src_c_1_n_1_norm">[% t('Normalization rule:') %] </label>
>                 [% PROCESS norms_select selected_norm="none" id="mc_1_src_c_1_n_1_norm" name="mc_1_src_c_1_n_1_norm" %]
>             </li>
>         </ol>
>       </fieldset>
> 
>       <fieldset class="rows" id="mc_1_tgt_c_1">
>-        <legend>Target (database) record check field</legend>
>+        <legend>[% t('Target (database) record check field') %]</legend>
>         <ol>
>           <li>
>-            <label for="mc_1_tgt_c_1_tag">Tag: </label>
>+            <label for="mc_1_tgt_c_1_tag">[% t('Tag:') %] </label>
>             <input type="text" id="mc_1_tgt_c_1_tag" name="mc_1_tgt_c_1_tag" size="3" maxlength="3" />
>           </li>
>           <li>
>-            <label for="mc_1_tgt_c_1_subfields">Subfields: </label>
>+            <label for="mc_1_tgt_c_1_subfields">[% t('Subfields:') %] </label>
>             <input type="text" id="mc_1_tgt_c_1_subfields" name="mc_1_tgt_c_1_subfields" size="10" maxlength="40" />
>           </li>
>           <li>
>-            <label for="mc_1_tgt_c_1_offset">Offset: </label>
>+            <label for="mc_1_tgt_c_1_offset">[% t('Offset:') %] </label>
>             <input type="text" id="mc_1_tgt_c_1_offset" name="mc_1_tgt_c_1_offset" size="5" maxlength="5" />
>           </li>
>           <li>
>-            <label for="mc_1_tgt_c_1_length">Length: </label>
>+            <label for="mc_1_tgt_c_1_length">[% t('Length:') %] </label>
>             <input type="text" id="mc_1_tgt_c_1_length" name="mc_1_tgt_c_1_length" size="5" maxlength="5" />
>           </li>
>             <li id="mc_1_tgt_c_1_n_1">
>-              <label for="mc_1_tgt_c_1_n_1_norm">Normalization rule: </label>
>+              <label for="mc_1_tgt_c_1_n_1_norm">[% t('Normalization rule:') %] </label>
>                 [% PROCESS norms_select selected_norm="none" id="mc_1_tgt_c_1_n_1_norm" name="mc_1_tgt_c_1_n_1_norm" %]
>             </li>
>         </ol>
>@@ -405,27 +361,25 @@
>   </fieldset>
>   <fieldset class="action">
>     [% IF ( edit_matching_rule ) %]
>-    <input type="button" value="Save"
>-           onclick="CheckMatchingRuleForm(this.form)" />
>+    <input type="button" value="Save" onclick="CheckMatchingRuleForm(this.form)" />
>     [% ELSE %]
>-    <input type="button" value="Save"
>-           onclick="CheckMatchingRuleForm(this.form)" />
>+    <input type="button" value="Save" onclick="CheckMatchingRuleForm(this.form)" />
>     [% END %]
>-    <a class="cancel" href="/cgi-bin/koha/admin/matching-rules.pl">Cancel</a>
>+    <a class="cancel" href="/cgi-bin/koha/admin/matching-rules.pl">[% t('Cancel') %]</a>
>   </fieldset>
> </form>
> [% END %]
> 
> [% IF ( delete_matching_rule_form ) %]
>     <div class="dialog alert">
>-        <h3>Confirm deletion of record matching rule <span class="ex">'[% code %]' ([% description %])</span>?</h3>
>+        <h3>[% t('Confirm deletion of record matching rule') %] <span class="ex">'[% code %]' ([% description %])</span>?</h3>
>         <form action="[% script_name %]" name="Aform" method="post">
>             <input type="hidden" name="op" value="[% confirm_op %]" />
>             <input type="hidden" name="matcher_id" value="[% matcher_id %]" />
>-            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete record matching rule</button>
>+            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('Yes, delete record matching rule') %]</button>
>         </form>
>         <form action="[% script_name %]" method="get">
>-            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
>+            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> [% t('No, do not delete') %]</button>
>         </form>
>     </div>
> [% END %]
>@@ -433,25 +387,25 @@
> [% IF ( display_list ) %]
> 
> <div id="toolbar" class="btn-toolbar">
>-    <a class="btn btn-default btn-sm" id="newrule" href="[% script_name %]?op=add_matching_rule"><i class="fa fa-plus"></i> New record matching rule</a>
>+    <a class="btn btn-default btn-sm" id="newrule" href="[% script_name %]?op=add_matching_rule"><i class="fa fa-plus"></i> [% t('New record matching rule') %]</a>
> </div>
> 
>-<h2>Record matching rules</h2>
>+<h2>[% t('Record matching rules') %]</h2>
> [% IF ( added_matching_rule ) %]
>-<div class="dialog message">Added record matching rule &quot;[% added_matching_rule %]&quot;</div>
>+<div class="dialog message">[% t('Added record matching rule &#34;') %][% added_matching_rule %]"</div>
> [% END %]
> [% IF ( edited_matching_rule ) %]
>-<div class="dialog message">Modified record matching rule &quot;[% edited_matching_rule %]&quot;</div>
>+<div class="dialog message">[% t('Modified record matching rule &#34;') %][% edited_matching_rule %]"</div>
> [% END %]
> [% IF ( deleted_matching_rule ) %]
>-<div class="dialog message">Deleted record matching rule &quot;[% deleted_matching_rule %]&quot;</div>
>+<div class="dialog message">[% t('Deleted record matching rule &#34;') %][% deleted_matching_rule %]"</div>
> [% END %]
> [% IF ( available_matching_rules ) %]<table>
>   <tr>
>     <th>#</th>
>-    <th>Code</th>
>-    <th>Description</th>
>-    <th>Actions</th>
>+    <th>[% t('Code') %]</th>
>+    <th>[% t('Description') %]</th>
>+    <th>[% t('Actions') %]</th>
>   </tr>
>   [% FOREACH available_matching_rule IN available_matching_rules %]
>   <tr>
>@@ -459,12 +413,12 @@
>     <td>[% available_matching_rule.code %]</td>
>     <td>[% available_matching_rule.description |html %]</td>
>     <td class="actions">
>-      <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name %]?op=edit_matching_rule&amp;matcher_id=[% available_matching_rule.matcher_id |html %]"><i class="fa fa-pencil"></i> Edit</a>
>-      <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name %]?op=delete_matching_rule&amp;matcher_id=[% available_matching_rule.matcher_id |html %]"><i class="fa fa-trash"></i> Delete</a>
>+      <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name %]?op=edit_matching_rule&matcher_id=[% available_matching_rule.matcher_id |html %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a>
>+      <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name %]?op=delete_matching_rule&matcher_id=[% available_matching_rule.matcher_id |html %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a>
>     </td>
>   </tr>
>   [% END %]
>-</table>[% ELSE %]<p>There are no saved matching rules.</p>[% END %]
>+</table>[% ELSE %]<p>[% t('There are no saved matching rules.') %]</p>[% END %]
> 
> <div class="pages">[% pagination_bar %]</div>
> 
>@@ -472,39 +426,38 @@
>  [% IF ( matching_rule_form ) %]
> <div id="mp_template" class="matchgroup" style="display:none;">
>   <fieldset class="rows">
>-    <legend>Match point <span class="counter"></span> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></legend>
>+    <legend>[% t('Match point') %] <span class="counter"></span> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">[% t('Remove this match point') %]</a></legend>
>     <ol>
>       <li>
>-        <label for="mp_num_search_index">Search index: </label>
>-        <input type ="text" id="mp_num_search_index" name="mp_num_search_index" size="20" 
>-          maxlength="30" />
>+        <label for="mp_num_search_index">[% t('Search index:') %] </label>
>+        <input type="text" id="mp_num_search_index" name="mp_num_search_index" size="20" maxlength="30" />
>       </li>
>       <li>
>-        <label for="mp_num_score">Score: </label>
>-        <input type ="text" id="mp_num_score" name="mp_num_score" size="5" maxlength="5" />
>+        <label for="mp_num_score">[% t('Score:') %] </label>
>+        <input type="text" id="mp_num_score" name="mp_num_score" size="5" maxlength="5" />
>       </li>
>     </ol>
>       <fieldset id="mp_num_c_1" class="rows">
>-      <legend>Matchpoint components</legend>
>+      <legend>[% t('Matchpoint components') %]</legend>
>         <ol>
>           <li>
>-            <label for="mp_num_c_1_tag">Tag: </label>
>+            <label for="mp_num_c_1_tag">[% t('Tag:') %] </label>
>             <input type="text" id="mp_num_c_1_tag" name="mp_num_c_1_tag" size="3" maxlength="3" />
>           </li>
>           <li>
>-            <label for="mp_num_c_1_subfields">Subfields: </label>
>+            <label for="mp_num_c_1_subfields">[% t('Subfields:') %] </label>
>             <input type="text" id="mp_num_c_1_subfields" name="mp_num_c_1_subfields" size="10" maxlength="40" />
>           </li>
>           <li>
>-            <label for="mp_num_c_1_offset">Offset: </label>
>+            <label for="mp_num_c_1_offset">[% t('Offset:') %] </label>
>             <input type="text" id="mp_num_c_1_offset" name="mp_num_c_1_offset" size="5" maxlength="5" />
>           </li>
>           <li>
>-            <label for="mp_num_c_1_length">Length: </label>
>+            <label for="mp_num_c_1_length">[% t('Length:') %] </label>
>             <input type="text" id="mp_num_c_1_length" name="mp_num_c_1_length" size="5" maxlength="5" />
>           </li>
>             <li id="mp_num_c_1_n_1">
>-              <label for="mp_num_c_1_n_1_norm">Normalization rule: </label>
>+              <label for="mp_num_c_1_n_1_norm">[% t('Normalization rule:') %] </label>
>                 [% PROCESS norms_select selected_norm="none" id="mp_num_c_1_n_1_norm" name="mp_num_c_1_n_1_norm" %]
>             </li>
>         </ol>
>@@ -515,54 +468,54 @@
> 
> <div id="mc_template" class="matchgroup" style="display:none">
> <fieldset class="rows">
>-  <legend>Match check <span class="counter"></span> | <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">Remove this match check</a></legend>
>+  <legend>[% t('Match check') %] <span class="counter"></span> | <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">[% t('Remove this match check') %]</a></legend>
>   <input type="hidden" id="mc_num_id" name="mc_num_id" value="1" />
>     <fieldset class="rows" id="mc_num_src_c_1">
>-      <legend>Source (incoming) record check field</legend>
>+      <legend>[% t('Source (incoming) record check field') %]</legend>
>       <ol>
>         <li>
>-          <label for="mc_num_src_c_1_tag">Tag: </label>
>+          <label for="mc_num_src_c_1_tag">[% t('Tag:') %] </label>
>           <input type="text" id="mc_num_src_c_1_tag" name="mc_num_src_c_1_tag" size="3" maxlength="3" />
>         </li>
>         <li>
>-          <label for="mc_num_src_c_1_subfields">Subfields: </label>
>+          <label for="mc_num_src_c_1_subfields">[% t('Subfields:') %] </label>
>           <input type="text" id="mc_num_src_c_1_subfields" name="mc_num_src_c_1_subfields" size="10" maxlength="40" />
>         </li>
>         <li>
>-          <label for="mc_num_src_c_1_offset">Offset: </label>
>+          <label for="mc_num_src_c_1_offset">[% t('Offset:') %] </label>
>           <input type="text" id="mc_num_src_c_1_offset" name="mc_num_src_c_1_offset" size="5" maxlength="5" />
>         </li>
>         <li>
>-          <label for="mc_num_src_c_1_length">Length: </label>
>+          <label for="mc_num_src_c_1_length">[% t('Length:') %] </label>
>           <input type="text" id="mc_num_src_c_1_length" name="mc_num_src_c_1_length" size="5" maxlength="5" />
>         </li>
>           <li id="mc_num_src_c_1_n_1">
>-            <label for="mc_num_src_c_1_n_1_norm">Normalization rule: </label>
>+            <label for="mc_num_src_c_1_n_1_norm">[% t('Normalization rule:') %] </label>
>                [% PROCESS norms_select selected_norm="none" id="mc_num_src_c_1_n_1_norm" name="mc_num_src_c_1_n_1_norm" %]
>           </li>
>       </ol>
>     </fieldset>
>     <fieldset class="rows" id="mc_num_tgt_c_1">
>-      <legend>Target (database) record check field</legend>
>+      <legend>[% t('Target (database) record check field') %]</legend>
>       <ol>
>         <li>
>-          <label for="mc_num_tgt_c_1_tag">Tag: </label>
>+          <label for="mc_num_tgt_c_1_tag">[% t('Tag:') %] </label>
>           <input type="text" id="mc_num_tgt_c_1_tag" name="mc_num_tgt_c_1_tag" size="3" maxlength="3" />
>         </li>
>         <li>
>-          <label for="mc_num_tgt_c_1_subfields">Subfields: </label>
>+          <label for="mc_num_tgt_c_1_subfields">[% t('Subfields:') %] </label>
>           <input type="text" id="mc_num_tgt_c_1_subfields" name="mc_num_tgt_c_1_subfields" size="10" maxlength="40" />
>         </li>
>         <li>
>-          <label for="mc_num_tgt_c_1_offset">Offset: </label>
>+          <label for="mc_num_tgt_c_1_offset">[% t('Offset:') %] </label>
>           <input type="text" id="mc_num_tgt_c_1_offset" name="mc_num_tgt_c_1_offset" size="5" maxlength="5" />
>         </li>
>         <li>
>-          <label for="mc_num_tgt_c_1_length">Length: </label>
>+          <label for="mc_num_tgt_c_1_length">[% t('Length:') %] </label>
>           <input type="text" id="mc_num_tgt_c_1_length" name="mc_num_tgt_c_1_length" size="5" maxlength="5" />
>         </li>
>           <li id="mc_num_tgt_c_1_n_1">
>-            <label for="mc_num_tgt_c_1_n_1_norm">Normalization rule: </label>
>+            <label for="mc_num_tgt_c_1_n_1_norm">[% t('Normalization rule:') %] </label>
>                [% PROCESS norms_select selected_norm="none" id="mc_num_tgt_c_1_n_1_norm" name="mc_num_tgt_c_1_n_1_norm" %]
>           </li>
>       </ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
>index 4846dc5a0a..a85e28ee75 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
>@@ -1,7 +1,8 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; OAI sets &rsaquo; OAI set mappings</title>
>+<title>[% t('Koha âº Administration âº OAI sets âº OAI set mappings') %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>@@ -9,7 +10,7 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a> &rsaquo; <a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% id %]">OAI set mappings</a></div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> âº <a href="/cgi-bin/koha/admin/oai_sets.pl">[% t('OAI sets configuration') %]</a> âº <a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% id %]">[% t('OAI set mappings') %]</a></div>
> 
> <div id="doc3" class="yui-t2">
> 
>@@ -18,24 +19,24 @@
>     <div class="yui-b">
>       [% IF ( mappings_saved ) %]
>         <div class="dialog message">
>-          <h4>Mappings have been saved</h4>
>-          <p><a href="/cgi-bin/koha/admin/oai_sets.pl">Return to sets management</a></p>
>+          <h4>[% t('Mappings have been saved') %]</h4>
>+          <p><a href="/cgi-bin/koha/admin/oai_sets.pl">[% t('Return to sets management') %]</a></p>
>         </div>
>       [% END %]
>-      <h1>Mappings for set '[% setName |html %]' ([% setSpec |html %])</h1>
>+      <h1>[% t('Mappings for set \'') %][% setName |html %]' ([% setSpec |html %])</h1>
>       [% UNLESS ( mappings ) %]
>-        <div class="dialog alert"><p><strong>Warning:</strong> No mappings have been defined for this set</p></div>
>+        <div class="dialog alert"><p><strong>[% t('Warning:') %]</strong> [% t('No mappings have been defined for this set') %]</p></div>
>       [% END %]
>       <form action="/cgi-bin/koha/admin/oai_set_mappings.pl" method="post" id="mappingform">
>         <table id="mappings">
>           <thead>
>             <tr>
>-              <th>Field</th>
>-              <th>Subfield</th>
>-              <th>Operator</th>
>-              <th>Value</th>
>-              <th>&nbsp;</th>
>-              <th>&nbsp;</th>
>+              <th>[% t('Field') %]</th>
>+              <th>[% t('Subfield') %]</th>
>+              <th>[% t('Operator') %]</th>
>+              <th>[% t('Value') %]</th>
>+              <th>Â </th>
>+              <th>Â </th>
>             </tr>
>           </thead>
>           <tbody>
>@@ -44,37 +45,37 @@
>                 <tr>
>                   <td><input type="text" name="marcfield" size="3" value="[% mapping.marcfield %]" /></td>
>                   <td style="text-align:center"><input type="text" name="marcsubfield" size="1" value="[% mapping.marcsubfield %]" /></td>
>-                  <td><select name=operator>
>+                  <td><select name="operator">
>                       [% IF mapping.operator == 'equal' %]
>-                        <option value="equal" selected="selected">is equal to</option>
>-                        <option value="notequal">not equal to</option>
>+                        <option value="equal" selected="selected">[% t('is equal to') %]</option>
>+                        <option value="notequal">[% t('not equal to') %]</option>
>                       [% ELSE %]
>-                        <option value="equal">is equal to</option>
>-                        <option value="notequal" selected="selected">not equal to</option>
>+                        <option value="equal">[% t('is equal to') %]</option>
>+                        <option value="notequal" selected="selected">[% t('not equal to') %]</option>
>                       [% END %]
>                       </select></td>
>                   <td><input type="text" name="marcvalue" value="[% mapping.marcvalue %]" /></td>
>                   <td style="text-align:center">
>                     [% IF ( loop.last ) %]
>-                      <input type="button" id="ORbutton" value="OR" title="Add another condition" />
>+                      <input type="button" id="ORbutton" value="OR" title="[% t('Add another condition') %]" />
>                     [% ELSE %]
>-                      OR
>+                      [% t('OR') %]
>                     [% END %]
>                   </td>
>-                  <td><button class="btn btn-default btn-xs clear-field" type="button"><i class="fa fa-trash"></i> Delete</button></td>
>+                  <td><button class="btn btn-default btn-xs clear-field" type="button"><i class="fa fa-trash"></i> [% t('Delete') %]</button></td>
>                 </tr>
>               [% END %]
>             [% ELSE %]
>               <tr>
>                 <td><input type="text" name="marcfield" size="3" /></td>
>                 <td style="text-align:center"><input type="text" name="marcsubfield" size="1" /></td>
>-                <td><select name=operator>
>-                    <option value="equal">is equal to</option>
>-                    <option value="notequal">not equal to</option>
>+                <td><select name="operator">
>+                    <option value="equal">[% t('is equal to') %]</option>
>+                    <option value="notequal">[% t('not equal to') %]</option>
>                     </select></td>
>                 <td><input type="text" name="marcvalue" /></td>
>                 <td><input type="button" id="ORbutton" value="OR" /></td>
>-                <td><button class="btn btn-default btn-xs clear-field" type="button"><i class="fa fa-trash"></i> Delete</button></td>
>+                <td><button class="btn btn-default btn-xs clear-field" type="button"><i class="fa fa-trash"></i> [% t('Delete') %]</button></td>
>               </tr>
>             [% END %]
>           </tbody>
>@@ -82,7 +83,7 @@
>         <input type="hidden" name="id" value="[% id %]" />
>         <input type="hidden" name="op" value="save" />
>         <fieldset class="action">
>-            <input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/oai_sets.pl">Cancel</a>
>+            <input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/oai_sets.pl">[% t('Cancel') %]</a>
>         </fieldset>
>       </form>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
>index 056365ab8a..f3a875699e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
>@@ -1,7 +1,8 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; [% IF ( op_new ) %]OAI sets configuration &rsaquo; Add a new OAI set[% ELSE %]OAI sets configuration[% END %]</title>
>+<title>[% t('Koha âº Administration âº') %] [% IF ( op_new ) %][% t('OAI sets configuration âº Add a new OAI set') %][% ELSE %][% t('OAI sets configuration') %][% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>@@ -9,7 +10,7 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( op_new ) %]<a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a> &rsaquo; Add a new OAI set[% ELSIF ( op_mod ) %]<a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a> &rsaquo; Edit OAI set '[% spec |html %]'[% ELSE %] OAI sets configuration[% END %]</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> âº [% IF ( op_new ) %]<a href="/cgi-bin/koha/admin/oai_sets.pl">[% t('OAI sets configuration') %]</a> [% t('âº Add a new OAI set') %][% ELSIF ( op_mod ) %]<a href="/cgi-bin/koha/admin/oai_sets.pl">[% t('OAI sets configuration') %]</a> [% t('âº Edit OAI set \'') %][% spec |html %]'[% ELSE %] [% t('OAI sets configuration') %][% END %]</div>
> 
> <div id="doc3" class="yui-t2">
> 
>@@ -19,55 +20,55 @@
>         [% IF ( op_new || op_mod ) %]
>             <form method="post" action="/cgi-bin/koha/admin/oai_sets.pl" class="validated">
>             [% IF ( op_new ) %]
>-                <h2>Add a new OAI set</h2>
>+                <h2>[% t('Add a new OAI set') %]</h2>
>                 <input type="hidden" name="op" value="savenew" />
>             [% ELSIF ( op_mod ) %]
>-                <h2>Edit OAI set '[% spec |html %]'</h2>
>+                <h2>[% t('Edit OAI set \'') %][% spec |html %]'</h2>
>                     <input type="hidden" name="op" value="savemod" />
>                     <input type="hidden" name="id" value="[% id %]" />
>             [% END %]
>                 <fieldset id="oaidetails" class="rows">
>                     <ol>
>                         <li>
>-                            <label for="spec" class="required">setSpec: </label>
>+                            <label for="spec" class="required">[% t('setSpec:') %] </label>
>                             <input type="text" id="spec" name="spec" value="[% spec %]" required="required" class="required" />
>-                            <span class="required">Required</span>
>+                            <span class="required">[% t('Required') %]</span>
>                         </li>
>                         <li>
>-                            <label for="name" class="required">setName: </label>
>+                            <label for="name" class="required">[% t('setName:') %] </label>
>                             <input type="text" id="name" name="name" value="[% name %]" required="required" class="required" />
>-                            <span class="required">Required</span>
>+                            <span class="required">[% t('Required') %]</span>
>                         </li>
>                         [% FOREACH desc IN descriptions %]
>                             <li>
>-                                <label>setDescription: </label>
>+                                <label>[% t('setDescription:') %] </label>
>                                 <textarea style="vertical-align:middle" rows="2" cols="30" name="description">[% desc.description %]</textarea>
>-                                <a class="remove_description" href="#"><i class="fa fa-fw fa-trash"></i> Remove</a>
>+                                <a class="remove_description" href="#"><i class="fa fa-fw fa-trash"></i> [% t('Remove') %]</a>
>                             </li>
>                         [% END %]
>-                        <li id="adddescription"><span class="label">&nbsp;</span><a href="#" class="add_description"><i class="fa fa-fw fa-plus"></i> Add description</a></li>
>+                        <li id="adddescription"><span class="label">Â </span><a href="#" class="add_description"><i class="fa fa-fw fa-plus"></i> [% t('Add description') %]</a></li>
> 
>                     </ol>
>                 </fieldset>
>                 <fieldset class="action">
>-                    <input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/oai_sets.pl">Cancel</a>
>+                    <input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/oai_sets.pl">[% t('Cancel') %]</a>
>                 </fieldset>
>             </form>
>         [% ELSE %]
> 
>         <div id="toolbar" class="btn-toolbar">
>-            <a class="btn btn-default btn-sm" id="newoaiset" href="/cgi-bin/koha/admin/oai_sets.pl?op=new"><i class="fa fa-plus"></i> New set</a>
>+            <a class="btn btn-default btn-sm" id="newoaiset" href="/cgi-bin/koha/admin/oai_sets.pl?op=new"><i class="fa fa-plus"></i> [% t('New set') %]</a>
>         </div>
> 
>-        <h2>OAI sets</h2>
>+        <h2>[% t('OAI sets') %]</h2>
>         [% IF sets_loop %]
>             <table>
>                 <thead>
>                     <tr>
>-                        <th>setSpec</th>
>-                        <th>setName</th>
>-                        <th>setDescriptions</th>
>-                        <th>&nbsp;</th>
>+                        <th>[% t('setSpec') %]</th>
>+                        <th>[% t('setName') %]</th>
>+                        <th>[% t('setDescriptions') %]</th>
>+                        <th>Â </th>
>                     </tr>
>                 </thead>
>                 <tbody>
>@@ -83,17 +84,17 @@
>                                         [% END %]
>                                     </ul>
>                                 [% ELSE %]
>-                                    <em>No descriptions</em>
>+                                    <em>[% t('No descriptions') %]</em>
>                                 [% END %]
>                             </td>
>                             <td>
>                               <div class="dropdown">
>                                 <a class="btn btn-default btn-xs dropdown-toggle" id="oaisetsactions[% set.id %]" role="button" data-toggle="dropdown" href="#">
>-                                  Actions <b class="caret"></b></a>
>+                                  [% t('Actions') %] <b class="caret"></b></a>
>                                 <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="oaisetsactions[% set.id %]">
>-                                  <li><a href="/cgi-bin/koha/admin/oai_sets.pl?op=mod&amp;id=[% set.id %]"><i class="fa fa-fw fa-pencil"></i> Edit</a></li>
>-                                  <li><a class="delete_oai_set" href="/cgi-bin/koha/admin/oai_sets.pl?op=del&amp;id=[% set.id %]"><i class="fa fa-fw fa-trash"></i> Delete</a></li>
>-                                  <li><a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% set.id %]"><i class="fa fa-fw fa-info"></i> Define mappings</a></li>
>+                                  <li><a href="/cgi-bin/koha/admin/oai_sets.pl?op=mod&id=[% set.id %]"><i class="fa fa-fw fa-pencil"></i> [% t('Edit') %]</a></li>
>+                                  <li><a class="delete_oai_set" href="/cgi-bin/koha/admin/oai_sets.pl?op=del&id=[% set.id %]"><i class="fa fa-fw fa-trash"></i> [% t('Delete') %]</a></li>
>+                                  <li><a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% set.id %]"><i class="fa fa-fw fa-info"></i> [% t('Define mappings') %]</a></li>
>                                 </ul>
>                               </div>
>                             </td>
>@@ -102,7 +103,7 @@
>                 </tbody>
>             </table>
>         [% ELSE %]
>-            <div class="dialog message"><p>There are no sets defined.</p></div>
>+            <div class="dialog message"><p>[% t('There are no sets defined.') %]</p></div>
>         [% END %]
>         [% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
>index 5232b795ca..771f07a767 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
>@@ -1,17 +1,18 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% USE AuthorisedValues %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Patron attribute types
>+<title>[% t('Koha âº Administration âº Patron attribute types') %]
> [% IF ( attribute_type_form ) %]
>   [% IF ( edit_attribute_type ) %]
>-    &rsaquo; Modify patron attribute type
>+    [% t('âº Modify patron attribute type') %]
>   [% ELSE %]
>-    &rsaquo; Add patron attribute type
>+    [% t('âº Add patron attribute type') %]
>   [% END %]
> [% END %]
> [% IF ( delete_attribute_type_form ) %]
>-  &rsaquo; Confirm deletion of patron attribute type &quot;[% code |html %]&quot;
>+  [% t('âº Confirm deletion of patron attribute type &#34;') %][% code |html %]"
> [% END %]
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -21,16 +22,16 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( display_list ) %]Patron attribute types[% ELSE %]<a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron attribute types</a>[% END %]
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> âº [% IF ( display_list ) %][% t('Patron attribute types') %][% ELSE %]<a href="/cgi-bin/koha/admin/patron-attr-types.pl">[% t('Patron attribute types') %]</a>[% END %]
> [% IF ( attribute_type_form ) %]
>   [% IF ( edit_attribute_type ) %]
>-    &rsaquo; Modify patron attribute type
>+    [% t('âº Modify patron attribute type') %]
>   [% ELSE %]
>-    &rsaquo; Add patron attribute type
>+    [% t('âº Add patron attribute type') %]
>   [% END %]
> [% END %]
> [% IF ( delete_attribute_type_form ) %]
>-  &rsaquo; Confirm deletion of patron attribute type &quot;[% code |html %]&quot;
>+  [% t('âº Confirm deletion of patron attribute type &#34;') %][% code |html %]"
> [% END %]
> </div>
> 
>@@ -41,18 +42,18 @@
>     <div class="yui-b">
> 
> [% IF ( WARNING_extended_attributes_off ) %]
>-<div class="dialog message">Because the 'ExtendedPatronAttributes` system preference is currently not enabled, extended patron attributes cannot be given to patron records.  Go <a href="/cgi-bin/koha/admin/preferences.pl?op=search&amp;searchfield=ExtendedPatronAttributes">here</a> if you wish to enable this feature.</div>
>+<div class="dialog message">[% t('Because the \'ExtendedPatronAttributes` system preference is currently not enabled, extended patron attributes cannot be given to patron records.') %]  [% t('Go') %] <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=ExtendedPatronAttributes">[% t('here') %]</a> [% t('if you wish to enable this feature.') %]</div>
> [% END %]
> 
> [% IF ( attribute_type_form ) %]
>   [% IF ( edit_attribute_type ) %]
>-<h2>Modify patron attribute type</h2>
>+<h2>[% t('Modify patron attribute type') %]</h2>
>   [% ELSE %]
>-<h2>Add patron attribute type</h2>
>+<h2>[% t('Add patron attribute type') %]</h2>
>   [% END %]
> [% IF ( duplicate_code_error ) %]
>-<div class="dialog message">Could not add patron attribute type &quot;[% duplicate_code_error %]&quot; 
>-    &mdash; one with that code already exists.
>+<div class="dialog message">[% t('Could not add patron attribute type &#34;') %][% duplicate_code_error %]" 
>+    [% t('â one with that code already exists.') %]
> </div>
> [% END %]
> <form action="[% script_name %]" class="validated" method="post">
>@@ -61,20 +62,20 @@
>     <ol>
>       <li>
>           [% IF ( edit_attribute_type ) %]
>-		  <span class="label">Patron attribute type code: </span>
>+		  <span class="label">[% t('Patron attribute type code:') %] </span>
>             <input type="hidden" name="code" value="[% code |html %]" />
>             [% code |html %]
>           [% ELSE %]
>-              <label for="code" class="required">Patron attribute type code: </label>
>+              <label for="code" class="required">[% t('Patron attribute type code:') %] </label>
>               <input type="text" id="code" name="code" required="required" class="required" size="10" maxlength="10" />
>-              <span class="required">Required</span>
>+              <span class="required">[% t('Required') %]</span>
>           [% END %]
>        </li>
>-       <li><label for="description" class="required">Description: </label>
>+       <li><label for="description" class="required">[% t('Description:') %] </label>
>            <input type="text" id="description" name="description" required="required" class="required" size="50" maxlength="250" value="[% description |html %]" />
>-           <span class="required">Required</span>
>+           <span class="required">[% t('Required') %]</span>
>        </li>
>-       <li><label for="repeatable">Repeatable: </label>
>+       <li><label for="repeatable">[% t('Repeatable:') %] </label>
>             [% IF ( repeatable_checked ) %]
>               [% IF ( repeatable_disabled ) %]
>                 <input type="checkbox" id="repeatable" name="repeatable" checked="checked" disabled="disabled" />
>@@ -88,10 +89,10 @@
>                 <input type="checkbox" id="repeatable" name="repeatable" />
>               [% END %]
>             [% END %]
>-            <span>Check to let a patron record have multiple values of this attribute.  
>-                  This setting cannot be changed after an attribute is defined.</span>
>+            <span>[% t('Check to let a patron record have multiple values of this attribute.') %]  
>+                  [% t('This setting cannot be changed after an attribute is defined.') %]</span>
>        </li>
>-       <li><label for="unique_id">Unique identifier: </label>
>+       <li><label for="unique_id">[% t('Unique identifier:') %] </label>
>             [% IF ( unique_id_checked ) %]
>               [% IF ( unique_id_disabled ) %]
>                 <input type="checkbox" id="unique_id" name="unique_id" checked="checked" disabled="disabled" />
>@@ -105,54 +106,54 @@
>                 <input type="checkbox" id="unique_id" name="unique_id" />
>               [% END %]
>             [% END %]
>-            <span>If checked, attribute will be a unique identifier &mdash; if a value is given to a patron record, the same value
>-                  cannot be given to a different record.  This setting cannot be changed after an attribute is defined.</span>
>+            <span>[% t('If checked, attribute will be a unique identifier â if a value is given to a patron record, the same value') %]
>+                  [% t('cannot be given to a different record.') %]  [% t('This setting cannot be changed after an attribute is defined.') %]</span>
>        </li>
>-       <li><label for="opac_display">Display in OPAC: </label>
>+       <li><label for="opac_display">[% t('Display in OPAC:') %] </label>
>           [% IF ( opac_display_checked ) %]
>             <input type="checkbox" id="opac_display" name="opac_display" checked="checked" />
>           [% ELSE %]
>             <input type="checkbox" id="opac_display" name="opac_display" />
>           [% END %]
>-            <span>Check to display this attribute on a patron's details page in the OPAC.</span>
>+            <span>[% t('Check to display this attribute on a patron\'s details page in the OPAC.') %]</span>
>        </li>
>-       <li><label for="opac_editable">Editable in OPAC: </label>
>+       <li><label for="opac_editable">[% t('Editable in OPAC:') %] </label>
>           [% IF ( opac_editable_checked ) %]
>             <input type="checkbox" id="opac_editable" name="opac_editable" checked="checked" />
>           [% ELSE %]
>             <input type="checkbox" id="opac_editable" name="opac_editable" />
>           [% END %]
>-            <span>Check to allow patrons to edit this attribute from their details page in the OPAC. (Requires above, does not work with <a href="/cgi-bin/koha/admin/preferences.pl?op=search&amp;searchfield=PatronSelfRegistrationVerifyByEmail" target="_blank">PatronSelfRegistrationVerifyByEmail</a>.)</span>
>+            <span>[% t('Check to allow patrons to edit this attribute from their details page in the OPAC. (Requires above, does not work with') %] <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=PatronSelfRegistrationVerifyByEmail" target="_blank">[% t('PatronSelfRegistrationVerifyByEmail') %]</a>.)</span>
>        </li>
>-       <li><label for="staff_searchable">Searchable: </label>
>+       <li><label for="staff_searchable">[% t('Searchable:') %] </label>
>           [% IF ( staff_searchable_checked ) %]
>             <input type="checkbox" id="staff_searchable" name="staff_searchable" checked="checked" />
>           [% ELSE %]
>             <input type="checkbox" id="staff_searchable" name="staff_searchable" />
>           [% END %]
>-            <span>Check to make this attribute staff_searchable in the staff patron search.</span>
>+            <span>[% t('Check to make this attribute staff_searchable in the staff patron search.') %]</span>
>        </li>
>-       <li><label for="display_checkout">Display in check-out: </label>
>+       <li><label for="display_checkout">[% t('Display in check-out:') %] </label>
>             [% IF display_checkout_checked %]
>                 <input type="checkbox" id="display_checkout" name="display_checkout" checked="checked" />
> 	    [% ELSE %]
> 	        <input type="checkbox" id="display_checkout" name="display_checkout" />
> 	    [% END %]
>-            <span>Check to show this attribute in patron check-out.</span>
>+            <span>[% t('Check to show this attribute in patron check-out.') %]</span>
>        </li>
> 
>-        <li><label for="authorised_value_category">Authorized value category: </label>
>+        <li><label for="authorised_value_category">[% t('Authorized value category:') %] </label>
>             <select name="authorised_value_category" id="authorised_value_category">
>                 <option value=""></option>
>                 [% PROCESS options_for_authorised_value_categories authorised_value_categories => AuthorisedValues.GetCategories( selected => authorised_value_category ) %]
>             </select>
>-            <span>Authorized value category; if one is selected, the patron record input page will only allow values 
>-                  to be chosen from the authorized value list.  However, an authorized value list is not 
>-                  enforced during batch patron import.</span>
>+            <span>[% t('Authorized value category; if one is selected, the patron record input page will only allow values') %] 
>+                  [% t('to be chosen from the authorized value list.') %]  [% t('However, an authorized value list is not') %] 
>+                  [% t('enforced during batch patron import.') %]</span>
>         </li>
>-        <li><label for="branches">Branches limitation: </label>
>-            <select id="branches" name="branches" multiple size="10">
>-                <option value="">All branches</option>
>+        <li><label for="branches">[% t('Branches limitation:') %] </label>
>+            <select id="branches" name="branches" multiple="" size="10">
>+                <option value="">[% t('All branches') %]</option>
>                 [% FOREACH branch IN branches_loop %]
>                   [% IF ( branch.selected ) %]
>                     <option selected="selected" value="[% branch.branchcode %]">[% branch.branchname |html %]</option>
>@@ -161,21 +162,21 @@
>                   [% END %]
>                 [% END %]
>             </select>
>-            <span>Select All if this attribute type must to be displayed all the time. Otherwise select libraries you want to associate with this value.
>+            <span>[% t('Select All if this attribute type must to be displayed all the time. Otherwise select libraries you want to associate with this value.') %]
>             </span>
>         </li>
>         <li>
>-            <label for="category">Category: </label>
>+            <label for="category">[% t('Category:') %] </label>
>             <select name="category_code" id="category">
>                 <option value=""></option>
>                 [% FOREACH cat IN categories %]
>                     [% IF ( cat.categorycode == category_code ) %]<option value="[% cat.categorycode %]" selected="selected">[% cat.description |html %]</option>[% ELSE %]<option value="[% cat.categorycode %]">[% cat.description |html %]</option>[% END %]
>                 [% END %]
>             </select>
>-            <span>Choose one to limit this attribute to one patron type. Please leave blank if you want these attributes to be available for all types of patrons.</span>
>+            <span>[% t('Choose one to limit this attribute to one patron type. Please leave blank if you want these attributes to be available for all types of patrons.') %]</span>
>         </li>
>         <li>
>-            <label for="class">Class: </label>
>+            <label for="class">[% t('Class:') %] </label>
>             <select name="class" id="class">
>                 <option value=""></option>
>                 [% FOREACH class IN classes_val_loop %]
>@@ -184,33 +185,33 @@
>                             [% class.lib |html %]
>                         </option>
>                     [% ELSE %]
>-                        <option value="[% class.authorised_value %]" >
>+                        <option value="[% class.authorised_value %]">
>                             [% class.lib |html %]
>                         </option>
>                     [% END %]
>                 [% END %]
>             </select>
>-            <span>Group attributes types with a block title (based on authorized values category 'PA_CLASS')</span>
>+            <span>[% t('Group attributes types with a block title (based on authorized values category \'PA_CLASS\')') %]</span>
>         </li>
>     </ol>
>   </fieldset>
>   <fieldset class="action">
>       <input type="submit" value="Save" />
>-    <a class="cancel" href="/cgi-bin/koha/admin/patron-attr-types.pl">Cancel</a>
>+    <a class="cancel" href="/cgi-bin/koha/admin/patron-attr-types.pl">[% t('Cancel') %]</a>
>   </fieldset>
> </form>
> [% END %]
> 
> [% IF ( delete_attribute_type_form ) %]
>     <div class="dialog alert">
>-        <h3>Confirm deletion of patron attribute type <span class="ex">'[% code |html %]' ([% description %])</span>?</h3>
>+        <h3>[% t('Confirm deletion of patron attribute type') %] <span class="ex">'[% code |html %]' ([% description %])</span>?</h3>
>         <form action="[% script_name %]" name="Aform" method="post">
>             <input type="hidden" name="op" value="[% confirm_op %]" />
>             <input type="hidden" name="code" value="[% code |html %]" />
>-            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete patron attribute type</button>
>+            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('Yes, delete patron attribute type') %]</button>
>         </form>
>         <form action="[% script_name %]" method="get">
>-            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
>+            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> [% t('No, do not delete') %]</button>
>         </form>
>     </div>
> [% END %]
>@@ -218,26 +219,26 @@
> [% IF ( display_list ) %]
> 
> <div id="toolbar" class="btn-toolbar">
>-    <a class="btn btn-default btn-sm" id="newrule" href="[% script_name %]?op=add_attribute_type"><i class="fa fa-plus"></i> New patron attribute type</a>
>+    <a class="btn btn-default btn-sm" id="newrule" href="[% script_name %]?op=add_attribute_type"><i class="fa fa-plus"></i> [% t('New patron attribute type') %]</a>
> </div>
> 
>-<h2>Patron attribute types</h2>
>+<h2>[% t('Patron attribute types') %]</h2>
> [% IF ( added_attribute_type ) %]
>-<div class="dialog message">Added patron attribute type &quot;[% added_attribute_type %]&quot;</div>
>+<div class="dialog message">[% t('Added patron attribute type &#34;') %][% added_attribute_type %]"</div>
> [% END %]
> [% IF ( edited_attribute_type ) %]
>-<div class="dialog message">Modified patron attribute type &quot;[% edited_attribute_type %]&quot;</div>
>+<div class="dialog message">[% t('Modified patron attribute type &#34;') %][% edited_attribute_type %]"</div>
> [% END %]
> [% IF ( deleted_attribute_type ) %]
>-<div class="dialog message">Deleted patron attribute type &quot;[% deleted_attribute_type %]&quot;</div>
>+<div class="dialog message">[% t('Deleted patron attribute type &#34;') %][% deleted_attribute_type %]"</div>
> [% END %]
> [% IF ( ERROR_delete_in_use ) %]
>-<div class="dialog message">Could not delete patron attribute type &quot;[% ERROR_delete_in_use %]&quot; 
>-    &mdash; it is in use by [% ERROR_num_patrons %] patron records</div>
>+<div class="dialog message">[% t('Could not delete patron attribute type &#34;') %][% ERROR_delete_in_use %]" 
>+    [% t('â it is in use by') %] [% ERROR_num_patrons %] [% t('patron records') %]</div>
> [% END %]
> [% IF ( ERROR_delete_not_found ) %]
>-<div class="dialog message">Could not delete patron attribute type &quot;[% ERROR_delete_not_found %]&quot; 
>-    &mdash; it was already absent from the database.</div>
>+<div class="dialog message">[% t('Could not delete patron attribute type &#34;') %][% ERROR_delete_not_found %]" 
>+    [% t('â it was already absent from the database.') %]</div>
> [% END %]
> [% IF ( available_attribute_types ) %]
>   [% FOREACH attribute IN available_attribute_types %]
>@@ -247,10 +248,10 @@
>     <table class="patron_attributes_types">
>       <thead>
>         <tr>
>-          <th>Code</th>
>-          <th>Description</th>
>-          <th>Branches limitation</th>
>-          <th>Actions</th>
>+          <th>[% t('Code') %]</th>
>+          <th>[% t('Description') %]</th>
>+          <th>[% t('Branches limitation') %]</th>
>+          <th>[% t('Actions') %]</th>
>         </tr>
>       </thead>
>       <tbody>
>@@ -266,18 +267,18 @@
>                     [% END %]
>                     <span title="[% branches_str %]">
>                         [% IF item.branches.size > 1 %]
>-                            [% item.branches.size %] branches limitations
>+                            [% item.branches.size %] [% t('branches limitations') %]
>                         [% ELSE %]
>-                            [% item.branches.size %] branch limitation
>+                            [% item.branches.size %] [% t('branch limitation') %]
>                         [% END %]
>                     </span>
>                 [% ELSE %]
>-                    No limitation
>+                    [% t('No limitation') %]
>                 [% END %]
>             </td>
>             <td class="actions">
>-              <a class="btn btn-default btn-xs" href="[% item.script_name %]?op=edit_attribute_type&amp;code=[% item.code |html %]"><i class="fa fa-pencil"></i> Edit</a>
>-              <a class="btn btn-default btn-xs" href="[% item.script_name %]?op=delete_attribute_type&amp;code=[% item.code |html %]"><i class="fa fa-trash"></i> Delete</a>
>+              <a class="btn btn-default btn-xs" href="[% item.script_name %]?op=edit_attribute_type&code=[% item.code |html %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a>
>+              <a class="btn btn-default btn-xs" href="[% item.script_name %]?op=delete_attribute_type&code=[% item.code |html %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a>
>             </td>
>           </tr>
>         [% END %]
>@@ -285,7 +286,7 @@
>     </table>
>   [% END %]
> [% ELSE %]
>-  <p>There are no saved patron attribute types.</p>
>+  <p>[% t('There are no saved patron attribute types.') %]</p>
> [% END %]
> 
> <div class="pages">[% pagination_bar %]</div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
>index 5f31fa0101..d3d1dcb411 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
>@@ -1,8 +1,9 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% USE Koha %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; System preferences</title>
>+<title>[% t('Koha âº Administration âº System preferences') %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% Asset.css("css/datatables.css") %]
> [% Asset.css("css/preferences.css") %]
>@@ -13,7 +14,7 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; System preferences</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> [% t('âº System preferences') %]</div>
> 
> <div id="doc3" class="yui-t2">
> 
>@@ -22,23 +23,23 @@
> 	    <div class="yui-b">
> 
>     [% IF ( jump_not_found ) %]
>-    <h2>System preferences</h2>
>+    <h2>[% t('System preferences') %]</h2>
>     <div class="dialog alert">
>-        Could not find a system preference named <code>[% jumpfield %]</code>.
>+        [% t('Could not find a system preference named') %] <code>[% jumpfield %]</code>.
>     </div>
>     [% END %]
>     [% IF ( search_not_found ) %]
>     <div class="dialog alert">
>-        No system preferences matched your search for: <strong>[% searchfield |html %]</strong>
>+        [% t('No system preferences matched your search for:') %] <strong>[% searchfield |html %]</strong>
>     </div>
>     [% ELSIF searchfield %]
>-        <h1>You searched for: [% searchfield | html %]</h1>
>+        <h1>[% t('You searched for:') %] [% searchfield | html %]</h1>
>     [% END %]
>     [% FOREACH TAB IN TABS %]
>     <div class="prefs-tab">
>-    <h2>[% TAB.tab_title %] preferences</h2>
>+    <h2>[% TAB.tab_title %] [% t('preferences') %]</h2>
>     <form action="/cgi-bin/koha/admin/preferences.pl" method="post">
>-        [% UNLESS ( searchfield ) %]<div id="toolbar"><button class="save-all submit" type="submit">Save all [% TAB.tab_title %] preferences</button></div>[% END %]
>+        [% UNLESS ( searchfield ) %]<div id="toolbar"><button class="save-all submit" type="submit">[% t('Save all') %] [% TAB.tab_title %] [% t('preferences') %]</button></div>[% END %]
>         <input type="hidden" name="op" value="save" />
>         <input type="hidden" name="tab" value="[% TAB.tab_id %]" />
> 
>@@ -47,10 +48,10 @@
>             [% UNLESS ( loop.first ) %]</tbody></table>[% END %]
>             <h3>[% LINE.title %]</h3>
>             <table class="preferences">
>-            <thead><tr><th>Preference</th><th>Value</th></tr></thead>
>+            <thead><tr><th>[% t('Preference') %]</th><th>[% t('Value') %]</th></tr></thead>
>             [% UNLESS ( loop.last ) %]<tbody>[% END %]
>             [% ELSE %]
>-            [% IF ( loop.first ) %]<table class="preferences"><thead><tr><th>Preference</th><th>Value</th></tr></thead><tbody>[% END %]
>+            [% IF ( loop.first ) %]<table class="preferences"><thead><tr><th>[% t('Preference') %]</th><th>[% t('Value') %]</th></tr></thead><tbody>[% END %]
>             <tr class="name-row">
>                 <td class="name-cell">
>                     <code>
>@@ -65,8 +66,8 @@
> 							[% END %]
> 
>                             [% IF NAME.overridden %]
>-                                <span class="overridden" title="The system preference [% NAME.name %] may have been overridden from this value by one or more virtual hosts.">
>-                                    [Overridden]
>+                                <span class="overridden" title="[% t('The system preference') %] [% NAME.name %] [% t('may have been overridden from this value by one or more virtual hosts.') %]">
>+                                    [% t('[Overridden]') %]
>                                 </span>
>                             [% END %]
> 						</label>
>@@ -100,9 +101,9 @@
>                         [% IF ( CHUNK.type_htmlarea ) && ( Koha.Preference('UseWYSIWYGinSystemPreferences') ) %]
>                         <textarea name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or 'short' %] mce" rows="20" cols="60">[% CHUNK.value %]</textarea>
>                         [% ELSE %]
>-                        <a class="expand-textarea" style="display: none" href="#">Click to Edit</a>
>+                        <a class="expand-textarea" style="display: none" href="#">[% t('Click to Edit') %]</a>
>                         <textarea name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or 'short' %]" rows="10" cols="40">[% CHUNK.value %]</textarea>
>-                        <a class="collapse-textarea" style="display:none" href="#">Click to collapse</br></a>
>+                        <a class="collapse-textarea" style="display:none" href="#">[% t('Click to collapse') %]</br></a>
>                         [% END %]
>                     [% ELSIF ( CHUNK.type_languages ) %]
>                     <dl class="sortable">
>@@ -116,9 +117,9 @@
>                         <dd>
>                             <label for="pref_[% CHUNK.name %]_[% sublanguages_loo.rfc4646_subtag %]">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]([% sublanguages_loo.rfc4646_subtag %])</label>
>                             [% IF ( sublanguages_loo.enabled ) %]
>-                            <input value="[% sublanguages_loo.rfc4646_subtag %]" name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]_[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" class="preference preference-checkbox"/>
>+                            <input value="[% sublanguages_loo.rfc4646_subtag %]" name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]_[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" class="preference preference-checkbox" />
>                             [% ELSE %]
>-                            <input value="[% sublanguages_loo.rfc4646_subtag %]" name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]_[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" class="preference preference-checkbox"/>
>+                            <input value="[% sublanguages_loo.rfc4646_subtag %]" name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]_[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" class="preference preference-checkbox" />
>                             [% END %]
>                         </dd>
>                         [% END %]
>@@ -126,9 +127,9 @@
>                         <dt>
>                             <label for="pref_[% CHUNK.name %]_[% language.rfc4646_subtag %]">[% language.native_description %]([% language.rfc4646_subtag %])</label>
>                             [% IF ( language.group_enabled ) %]
>-                            <input value="[% language.rfc4646_subtag %]" name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]_[% language.rfc4646_subtag %]" type="checkbox" checked="checked" class="preference preference-checkbox"/>
>+                            <input value="[% language.rfc4646_subtag %]" name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]_[% language.rfc4646_subtag %]" type="checkbox" checked="checked" class="preference preference-checkbox" />
>                             [% ELSE %]
>-                            <input value="[% language.rfc4646_subtag %]" name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]_[% language.rfc4646_subtag %]" type="checkbox" class="preference preference-checkbox"/>
>+                            <input value="[% language.rfc4646_subtag %]" name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]_[% language.rfc4646_subtag %]" type="checkbox" class="preference preference-checkbox" />
>                             [% END %]
>                         </dt>
>                         [% END %]
>@@ -142,7 +143,7 @@
>             [% IF ( loop.last ) %]</tbody></table>[% END %]
>             [% END %]
>         [% END %]
>-        <fieldset class="action"><button class="save-all submit" type="submit">Save all [% TAB.tab_title %] preferences</button> <a href="/cgi-bin/koha/admin/preferences.pl" class="force_reload cancel">Cancel</a></fieldset>
>+        <fieldset class="action"><button class="save-all submit" type="submit">[% t('Save all') %] [% TAB.tab_title %] [% t('preferences') %]</button> <a href="/cgi-bin/koha/admin/preferences.pl" class="force_reload cancel">[% t('Cancel') %]</a></fieldset>
>     </form>
>     </div>
>     [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
>index 7542190562..8c6a7149b7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
>@@ -1,11 +1,12 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo;
>-[% IF ( add_form ) %][% IF ( searchfield ) %] Printers &rsaquo; Modify printer '[% searchfield %]'[% ELSE %] Printers &rsaquo; New printer[% END %][% END %]
>-[% IF ( add_validate ) %] Printers &rsaquo; Printer added[% END %]
>-[% IF ( delete_confirm ) %] Printers &rsaquo; Confirm deletion of printer '[% searchfield %]'[% END %]
>-[% IF ( delete_confirmed ) %] Printers &rsaquo; Printer deleted[% END %]
>-[% IF ( else ) %]Printers[% END %]</title>
>+<title>[% t('Koha âº Administration âº') %]
>+[% IF ( add_form ) %][% IF ( searchfield ) %] [% t('Printers âº Modify printer \'') %][% searchfield %]'[% ELSE %] [% t('Printers âº New printer') %][% END %][% END %]
>+[% IF ( add_validate ) %] [% t('Printers âº Printer added') %][% END %]
>+[% IF ( delete_confirm ) %] [% t('Printers âº Confirm deletion of printer \'') %][% searchfield %]'[% END %]
>+[% IF ( delete_confirmed ) %] [% t('Printers âº Printer deleted') %][% END %]
>+[% IF ( else ) %][% t('Printers') %][% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% IF ( loop ) %]
> [% Asset.css("css/datatables.css") %]
>@@ -29,11 +30,11 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'cat-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( add_form ) %][% IF ( searchfield ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Modify printer '[% searchfield %]'[% ELSE %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; New printer[% END %][% END %]
>-[% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Printer added[% END %]
>-[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Confirm deletion of printer '[% searchfield %]'[% END %]
>-[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Printer deleted[% END %]
>-[% IF ( else ) %]Printers[% END %]</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> âº [% IF ( add_form ) %][% IF ( searchfield ) %] <a href="/cgi-bin/koha/admin/printers.pl">[% t('Printers') %]</a> [% t('âº Modify printer \'') %][% searchfield %]'[% ELSE %] <a href="/cgi-bin/koha/admin/printers.pl">[% t('Printers') %]</a> [% t('âº New printer') %][% END %][% END %]
>+[% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/printers.pl">[% t('Printers') %]</a> [% t('âº Printer added') %][% END %]
>+[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/printers.pl">[% t('Printers') %]</a> [% t('âº Confirm deletion of printer \'') %][% searchfield %]'[% END %]
>+[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/printers.pl">[% t('Printers') %]</a> [% t('âº Printer deleted') %][% END %]
>+[% IF ( else ) %][% t('Printers') %][% END %]</div>
> 
> <div id="doc3" class="yui-t2">
>    
>@@ -44,9 +45,9 @@
> [% IF ( add_form ) %]
> 
> [% IF ( searchfield ) %]
>-		<h1>Modify printer</h1>
>+		<h1>[% t('Modify printer') %]</h1>
> 	[% ELSE %]
>-		<h1>New printer</h1>
>+		<h1>[% t('New printer') %]</h1>
> 	[% END %]
>         <form action="[% script_name %]" name="Aform" method="post" class="validated">
>         <input type="hidden" name="op" value="add_validate" />
>@@ -58,33 +59,33 @@
> 	<fieldset class="rows">
> <ol>	[% IF ( searchfield ) %]
> 		<li>
>-            <span class="label">Printer name: </span>
>+            <span class="label">[% t('Printer name:') %] </span>
> 				<input type="hidden" name="printername" id="" value="[% searchfield %]" />[% searchfield %]
> 		</li>
> 	[% ELSE %]
> 		<li>
>-            <label for="printername" class="required">Printer name: </label>
>+            <label for="printername" class="required">[% t('Printer name:') %] </label>
>                 <input type="text" name="printername" id="printername" size="40" maxlength="40" class="required" required="required" />
>-                <span class="required">Required</span>
>+                <span class="required">[% t('Required') %]</span>
> 		</li>
> 	[% END %]
>         	<li>
>-            <label for="printqueue" class="required">Queue: </label>
>-            <input type="text" name="printqueue" id="printqueue" size="20" maxlength="20" value="[% printqueue %]"  class="required" required="required" />
>-            <span class="required">Required</span>
>+            <label for="printqueue" class="required">[% t('Queue:') %] </label>
>+            <input type="text" name="printqueue" id="printqueue" size="20" maxlength="20" value="[% printqueue %]" class="required" required="required" />
>+            <span class="required">[% t('Required') %]</span>
> 		</li>
>         	<li>
>-			<label for="printtype">Type: </label>
>+			<label for="printtype">[% t('Type:') %] </label>
>             <input type="text" name="printtype" id="printtype" size="20" maxlength="20" value="[% printtype %]" />
> 		</li></ol>
>         </fieldset>
>-        <fieldset class="action"><input type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/printers.pl">Cancel</a></fieldset>
>+        <fieldset class="action"><input type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/printers.pl">[% t('Cancel') %]</a></fieldset>
>         </form>
> 
> [% END %]
> 
> [% IF ( add_validate ) %]
>-<h3>Printer added</h3>
>+<h3>[% t('Printer added') %]</h3>
> <form action="[% script_name %]" method="post">
>        <fieldset class="action"> <input type="submit" value="OK" /></fieldset>
> </form>
>@@ -92,36 +93,36 @@
> 
> [% IF ( delete_confirm ) %]
>     <div class="dialog alert">
>-        <h3>Confirm deletion of printer <em>[% searchfield %]</em></h3>
>+        <h3>[% t('Confirm deletion of printer') %] <em>[% searchfield %]</em></h3>
> 
>         <table>
>             <tr>
>-                <th scope="row">Printer: </th><td>[% searchfield %]</td>
>+                <th scope="row">[% t('Printer:') %] </th><td>[% searchfield %]</td>
>             </tr>
>             <tr>
>-                <th scope="row">Queue: </th><td>[% printqueue %]</td>
>+                <th scope="row">[% t('Queue:') %] </th><td>[% printqueue %]</td>
>             </tr>
>             <tr>
>-                <th scope="row">Type: </th><td>[% printtype %]</td>
>+                <th scope="row">[% t('Type:') %] </th><td>[% printtype %]</td>
>             </tr>
>         </table>
> 
>         <form action="[% script_name %]" method="post">
>             <input type="hidden" name="op" value="delete_confirmed" />
>             <input type="hidden" name="searchfield" value="[% searchfield %]" />
>-            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
>+            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('Yes, delete') %]</button>
>         </form>
>         <form action="/cgi-bin/koha/admin/printers.pl" method="get">
>-            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
>+            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> [% t('No, do not delete') %]</button>
>         </form>
>     </div>
> [% END %]
> 
> [% IF ( delete_confirmed ) %]
>     <div class="dialog message">
>-        <h3>Printer deleted</h3>
>+        <h3>[% t('Printer deleted') %]</h3>
>         <form action="[% script_name %]" method="post">
>-            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> OK</button>
>+            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> [% t('OK') %]</button>
>         </form>
>     </div>
> 
>@@ -130,22 +131,22 @@
> [% IF ( else ) %]
> 
> <div id="toolbar" class="btn-toolbar">
>-    <a class="btn btn-default btn-sm" id="newprinter" href="/cgi-bin/koha/admin/printers.pl?op=add_form"><i class="fa fa-plus"></i> New printer</a>
>+    <a class="btn btn-default btn-sm" id="newprinter" href="/cgi-bin/koha/admin/printers.pl?op=add_form"><i class="fa fa-plus"></i> [% t('New printer') %]</a>
> </div>
> 
>-<h2>Printers</h2>
>+<h2>[% t('Printers') %]</h2>
> 	[% IF ( searchfield ) %]
>-		You searched for [% searchfield %]</span>
>+		[% t('You searched for') %] [% searchfield %]</span>
> 	[% END %]
> 
> [% IF ( loop ) %]
>     <table id="printerst">
>         <thead>
>             <tr>
>-                <th>Name</th>
>-                <th>Queue</th>
>-                <th>Type</th>
>-                <th>&nbsp;</th>
>+                <th>[% t('Name') %]</th>
>+                <th>[% t('Queue') %]</th>
>+                <th>[% t('Type') %]</th>
>+                <th>Â </th>
>             </tr>
>         </thead>
>         <tbody>
>@@ -154,11 +155,11 @@
> 			<td>[% loo.printername %]</td>
> 			<td>[% loo.printqueue %]</td>
> 			<td>[% loo.printtype %]</td>
>-            <td class="actions"><a class="btn btn-default btn-xs" href="[% loo.script_name %]?op=add_form&amp;searchfield=[% loo.printername |uri %]"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-default btn-xs" href="[% loo.script_name %]?op=delete_confirm&amp;searchfield=[% loo.printername |uri %]"><i class="fa fa-trash"></i> Delete</a></td>
>+            <td class="actions"><a class="btn btn-default btn-xs" href="[% loo.script_name %]?op=add_form&searchfield=[% loo.printername |uri %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a> <a class="btn btn-default btn-xs" href="[% loo.script_name %]?op=delete_confirm&searchfield=[% loo.printername |uri %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a></td>
> 		</tr>
> 		[% END %]
>         </tbody>
>-    </table>[% ELSE %]<div class="dialog message">No printers defined.</div>[% END %]
>+    </table>[% ELSE %]<div class="dialog message">[% t('No printers defined.') %]</div>[% END %]
> [% END %]
> 
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
>index 74466db5a9..a31d7cd318 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
>@@ -1,6 +1,7 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Search engine configuration</title>
>+<title>[% t('Koha âº Administration âº Search engine configuration') %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% Asset.js("lib/jquery/plugins/jquery.tablednd.js") %]
> <script type="text/javascript">
>@@ -63,7 +64,7 @@ a.add, a.delete {
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Search engine configuration</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> [% t('âº Search engine configuration') %]</div>
> 
> <div id="doc3" class="yui-t1">
> 
>@@ -75,32 +76,32 @@ a.add, a.delete {
>       <div class="dialog [% m.type %]">
>         [% SWITCH m.code %]
>         [% CASE 'error_on_update' %]
>-          An error occurred when updating mappings ([% m.message %]).
>+          [% t('An error occurred when updating mappings (') %][% m.message %]).
>         [% CASE 'error_on_delete' %]
>-          An error occurred when deleting the existing mappings. Nothing has been changed!
>-          (search field [% m.values.field_name %] with mapping [% m.values.marc_field %].)
>+          [% t('An error occurred when deleting the existing mappings. Nothing has been changed!') %]
>+          [% t('(search field') %] [% m.values.field_name %] [% t('with mapping') %] [% m.values.marc_field %].)
>         [% CASE 'success_on_update' %]
>-          Mapping updated successfully.
>+          [% t('Mapping updated successfully.') %]
>         [% CASE %]
>           [% m.code %]
>         [% END %]
>       </div>
>     [% END %]
> 
>-    <h1>Search engine configuration</h1>
>+    <h1>[% t('Search engine configuration') %]</h1>
>     <div class="warning">
>-        Warning: Any changes to the configuration will only take effect after a full reindex. Until then searching may not work correctly.
>+        [% t('Warning: Any changes to the configuration will only take effect after a full reindex. Until then searching may not work correctly.') %]
>     </div>
>     [% IF errors %]
>         <div class="error">
>-        Changes have not been applied. Please check the following values:
>+        [% t('Changes have not been applied. Please check the following values:') %]
>           <ul>
>             [% FOREACH e IN errors %]
>                 <li>
>                     [% IF ( e.type == "malformed_mapping" ) %]
>-                        The value "[% e.value %]" is not supported for mappings
>+                        [% t('The value &#34;') %][% e.value %][% t('&#34; is not supported for mappings') %]
>                     [% ELSIF ( e.type == "no_mapping" ) %]
>-                        There is no mapping for the index [% e.value %]
>+                        [% t('There is no mapping for the index') %] [% e.value %]
>                     [% END %]
>                 </li>
>             [% END %]
>@@ -112,11 +113,11 @@ a.add, a.delete {
>         <input type="hidden" name="op" value="edit" />
>         <div id="tabs" class="toptabs" style="clear:both">
>             <ul>
>-                <li><a href="#search_fields">Search fields</a></li>
>+                <li><a href="#search_fields">[% t('Search fields') %]</a></li>
>                 [% FOREACH index IN indexes %]
>                     [% SWITCH index.index_name %]
>-                        [% CASE 'biblios' %]<li><a href="#mapping_biblios">Biblios</a></li>
>-                        [% CASE 'authorities' %]<li><a href="#mapping_authorities">Authorities</a></li>
>+                        [% CASE 'biblios' %]<li><a href="#mapping_biblios">[% t('Biblios') %]</a></li>
>+                        [% CASE 'authorities' %]<li><a href="#mapping_authorities">[% t('Authorities') %]</a></li>
>                     [% END %]
>                 [% END %]
>             </ul>
>@@ -124,9 +125,9 @@ a.add, a.delete {
>               <table class="search_fields">
>                 <thead>
>                   <tr>
>-                    <th>Name</th>
>-                    <th>Label</th>
>-                    <th>Type</th>
>+                    <th>[% t('Name') %]</th>
>+                    <th>[% t('Label') %]</th>
>+                    <th>[% t('Type') %]</th>
>                   </tr>
>                 </thead>
>                 <tbody>
>@@ -140,29 +141,29 @@ a.add, a.delete {
>                         <select name="search_field_type">
>                           <option value=""></option>
>                           [% IF search_field.type == "string" %]
>-                            <option value="string" selected="selected">String</option>
>+                            <option value="string" selected="selected">[% t('String') %]</option>
>                           [% ELSE %]
>-                            <option value="string">String</option>
>+                            <option value="string">[% t('String') %]</option>
>                           [% END %]
>                           [% IF search_field.type == "date" %]
>-                            <option value="date" selected="selected">Date</option>
>+                            <option value="date" selected="selected">[% t('Date') %]</option>
>                           [% ELSE %]
>-                            <option value="date">Date</option>
>+                            <option value="date">[% t('Date') %]</option>
>                           [% END %]
>                           [% IF search_field.type == "number" %]
>-                            <option value="number" selected="selected">Number</option>
>+                            <option value="number" selected="selected">[% t('Number') %]</option>
>                           [% ELSE %]
>-                            <option value="number">Number</option>
>+                            <option value="number">[% t('Number') %]</option>
>                           [% END %]
>                           [% IF search_field.type == "boolean" %]
>-                            <option value="boolean" selected="selected">Boolean</option>
>+                            <option value="boolean" selected="selected">[% t('Boolean') %]</option>
>                           [% ELSE %]
>-                            <option value="boolean">Boolean</option>
>+                            <option value="boolean">[% t('Boolean') %]</option>
>                           [% END %]
>                           [% IF search_field.type == "sum" %]
>-                            <option value="sum" selected="selected">Sum</option>
>+                            <option value="sum" selected="selected">[% t('Sum') %]</option>
>                           [% ELSE %]
>-                            <option value="sum">Sum</option>
>+                            <option value="sum">[% t('Sum') %]</option>
>                           [% END %]
>                         </select>
>                       </td>
>@@ -176,11 +177,11 @@ a.add, a.delete {
>                     <table class="mappings" data-index_name="[% index.index_name%]">
>                       <thead>
>                         <tr class="nodrag nodrop">
>-                          <th>Search field</th>
>-                          <th>Sortable</th>
>-                          <th>Facetable</th>
>-                          <th>Suggestible</th>
>-                          <th>Mapping</th>
>+                          <th>[% t('Search field') %]</th>
>+                          <th>[% t('Sortable') %]</th>
>+                          <th>[% t('Facetable') %]</th>
>+                          <th>[% t('Suggestible') %]</th>
>+                          <th>[% t('Mapping') %]</th>
>                           <th></th>
>                         </tr>
>                       </thead>
>@@ -195,48 +196,48 @@ a.add, a.delete {
>                             <td>
>                               <select name="mapping_sort">
>                                 [% IF mapping.sort == 'undef' %]
>-                                  <option value="undef" selected="selected">Undef</option>
>+                                  <option value="undef" selected="selected">[% t('Undef') %]</option>
>                                 [% ELSE %]
>-                                  <option value="undef">Undef</option>
>+                                  <option value="undef">[% t('Undef') %]</option>
>                                 [% END %]
>                                 [% IF mapping.sort == 0 %]
>-                                  <option value="0" selected="selected">0</option>
>+                                  <option value="0" selected="selected">[% t('0') %]</option>
>                                 [% ELSE %]
>-                                  <option value="0">0</option>
>+                                  <option value="0">[% t('0') %]</option>
>                                 [% END %]
>                                 [% IF  mapping.sort == 1 %]
>-                                  <option value="1" selected="selected">1</option>
>+                                  <option value="1" selected="selected">[% t('1') %]</option>
>                                 [% ELSE %]
>-                                  <option value="1">1</option>
>+                                  <option value="1">[% t('1') %]</option>
>                                 [% END %]
>                               </select>
>                             </td>
>                             <td>
>                               <select name="mapping_facet">
>                                 [% IF mapping.facet %]
>-                                  <option value="0">No</option>
>-                                  <option value="1" selected="selected">Yes</option>
>+                                  <option value="0">[% t('No') %]</option>
>+                                  <option value="1" selected="selected">[% t('Yes') %]</option>
>                                 [% ELSE %]
>-                                  <option value="0" selected="selected">No</option>
>-                                  <option value="1">Yes</option>
>+                                  <option value="0" selected="selected">[% t('No') %]</option>
>+                                  <option value="1">[% t('Yes') %]</option>
>                                 [% END %]
>                               </select>
>                             </td>
>                             <td>
>                               <select name="mapping_suggestible">
>                                 [% IF mapping.suggestible %]
>-                                  <option value="0">No</option>
>-                                  <option value="1" selected="selected">Yes</option>
>+                                  <option value="0">[% t('No') %]</option>
>+                                  <option value="1" selected="selected">[% t('Yes') %]</option>
>                                 [% ELSE %]
>-                                  <option value="0" selected="selected">No</option>
>-                                  <option value="1">Yes</option>
>+                                  <option value="0" selected="selected">[% t('No') %]</option>
>+                                  <option value="1">[% t('Yes') %]</option>
>                                 [% END %]
>                               </select>
>                             </td>
>                             <td>
>                                 <input name="mapping_marc_field" type="text" value="[% mapping.marc_field %]" />
>                             </td>
>-                            <td><a class="btn btn-default btn-xs delete" style="cursor: pointer;"><i class="fa fa-trash"></i> Delete</a></td>
>+                            <td><a class="btn btn-default btn-xs delete" style="cursor: pointer;"><i class="fa fa-trash"></i> [% t('Delete') %]</a></td>
>                           </tr>
>                         [% END %]
>                       </tbody>
>@@ -252,42 +253,42 @@ a.add, a.delete {
>                           </td>
>                           <td>
>                             <select data-id="mapping_sort">
>-                              <option value="undef">Undef</option>
>-                              <option value="0">0</option>
>-                              <option value="1">1</option>
>+                              <option value="undef">[% t('Undef') %]</option>
>+                              <option value="0">[% t('0') %]</option>
>+                              <option value="1">[% t('1') %]</option>
>                             </select>
>                           </td>
>                           <td>
>                             <select data-id="mapping_facet">
>                               [% IF mapping.facet %]
>-                                <option value="0">No</option>
>-                                <option value="1" selected="selected">Yes</option>
>+                                <option value="0">[% t('No') %]</option>
>+                                <option value="1" selected="selected">[% t('Yes') %]</option>
>                               [% ELSE %]
>-                                <option value="0" selected="selected">No</option>
>-                                <option value="1">Yes</option>
>+                                <option value="0" selected="selected">[% t('No') %]</option>
>+                                <option value="1">[% t('Yes') %]</option>
>                               [% END %]
>                             </select>
>                           </td>
>                           <td>
>                             <select data-id="mapping_suggestible">
>                               [% IF mapping.suggestible %]
>-                                <option value="0">No</option>
>-                                <option value="1" selected="selected">Yes</option>
>+                                <option value="0">[% t('No') %]</option>
>+                                <option value="1" selected="selected">[% t('Yes') %]</option>
>                               [% ELSE %]
>-                                <option value="0" selected="selected">No</option>
>-                                <option value="1">Yes</option>
>+                                <option value="0" selected="selected">[% t('No') %]</option>
>+                                <option value="1">[% t('Yes') %]</option>
>                               [% END %]
>                             </select>
>                           </td>
>                           <td><input data-id="mapping_marc_field" type="text" /></td>
>-                          <td><a class="btn btn-default btn-xs add"><i class="fa fa-plus"></i> Add</a></td>
>+                          <td><a class="btn btn-default btn-xs add"><i class="fa fa-plus"></i> [% t('Add') %]</a></td>
>                         </tr>
>                       </tfoot>
>                     </table>
>                 </div>
>             [% END %]
>         </div>
>-        <p><button class="btn btn-default" type="submit"><i class="fa fa-hdd-o" aria-hidden="true"></i> Save</button></p>
>+        <p><button class="btn btn-default" type="submit"><i class="fa fa-hdd-o" aria-hidden="true"></i> [% t('Save') %]</button></p>
>     </form>
> </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>index 86226cb7d3..8eff5c0c97 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>@@ -1,8 +1,9 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% USE Branches %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Circulation and fine rules</title>
>+<title>[% t('Koha âº Administration âº Circulation and fine rules') %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>@@ -10,7 +11,7 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Circulation and fine rules</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> [% t('âº Circulation and fine rules') %]</div>
> 
> <div id="doc3" class="yui-t1">
> 
>@@ -19,36 +20,36 @@
>     <div class="yui-b">
>     <h1 class="parameters">
>         [% IF humanbranch %]
>-            Defining circulation and fine rules for "[% Branches.GetName( humanbranch ) %]"
>+            [% t('Defining circulation and fine rules for &#34;') %][% Branches.GetName( humanbranch ) %]"
>         [% ELSE %]
>-            Defining circulation and fine rules for all libraries
>+            [% t('Defining circulation and fine rules for all libraries') %]
>         [% END %]
>     </h1>
>     <div class="help">
>-        <p>The rules are applied from most specific to less specific, using the first found in this order:</p>
>+        <p>[% t('The rules are applied from most specific to less specific, using the first found in this order:') %]</p>
>         <ul>
>-            <li>same library, same patron category, same item type</li>
>-            <li>same library, same patron category, all item types</li>
>-            <li>same library, all patron categories, same item type</li>
>-            <li>same library, all patron categories, all item types</li>
>-            <li>default (all libraries), same patron category, same item type</li>
>-            <li>default (all libraries), same patron category, all item types</li>
>-            <li>default (all libraries), all patron categories, same item type</li>
>-            <li>default (all libraries), all patron categories, all item types</li>
>+            <li>[% t('same library, same patron category, same item type') %]</li>
>+            <li>[% t('same library, same patron category, all item types') %]</li>
>+            <li>[% t('same library, all patron categories, same item type') %]</li>
>+            <li>[% t('same library, all patron categories, all item types') %]</li>
>+            <li>[% t('default (all libraries), same patron category, same item type') %]</li>
>+            <li>[% t('default (all libraries), same patron category, all item types') %]</li>
>+            <li>[% t('default (all libraries), all patron categories, same item type') %]</li>
>+            <li>[% t('default (all libraries), all patron categories, all item types') %]</li>
>         </ul>
>-        <p>To modify a rule, create a new one with the same patron category and item type.</p>
>+        <p>[% t('To modify a rule, create a new one with the same patron category and item type.') %]</p>
>     </div>
>     <div>
>         <form method="get" action="/cgi-bin/koha/admin/smart-rules.pl" id="selectlibrary">
>-        Select a library :
>+        [% t('Select a library :') %]
>             <select name="branch" id="branch" style="width:20em;">
>-                <option value="*">Standard rules for all libraries</option>
>+                <option value="*">[% t('Standard rules for all libraries') %]</option>
>                 [% PROCESS options_for_libraries libraries => Branches.all( selected => current_branch, unfiltered => 1 ) %]
>             </select>
>         </form>
>         [% IF ( definedbranch ) %]
>             <form action="/cgi-bin/koha/admin/clone-rules.pl" method="post">
>-                <label for="tobranch"><strong>Clone these rules to:</strong></label>
>+                <label for="tobranch"><strong>[% t('Clone these rules to:') %]</strong></label>
>                 <input type="hidden" name="frombranch" value="[% current_branch %]" />
>                 <select name="tobranch" id="tobranch">
>                     [% PROCESS options_for_libraries libraries => Branches.all( unfiltered => 1 ) %]
>@@ -59,70 +60,70 @@
> 
>         <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
>             <input type="hidden" name="op" value="add" />
>-            <input type="hidden" name="branch" value="[% current_branch %]"/>
>+            <input type="hidden" name="branch" value="[% current_branch %]" />
>             <table id="default-circulation-rules">
>             <thead>
>             <tr>
>-                <th>Patron category</th>
>-                <th>Item type</th>
>-                <th>Actions</th>
>-                <th>Current checkouts allowed</th>
>-                <th>Current on-site checkouts allowed</th>
>-                <th>Loan period</th>
>-                <th>Unit</th>
>-                <th>Hard due date</th>
>-                <th>Fine amount</th>
>-                <th>Fine charging interval</th>
>-                <th>When to charge</th>
>-                <th>Fine grace period</th>
>-                <th>Overdue fines cap (amount)</th>
>-                <th>Cap fine at replacement price</th>
>-                <th>Suspension in days (day)</th>
>-                <th>Max. suspension duration (day)</th>
>-                <th>Suspension charging interval</th>
>-                <th>Renewals allowed (count)</th>
>-                <th>Renewal period</th>
>-                <th>No renewal before</th>
>-                <th>Automatic renewal</th>
>-                <th>No automatic renewal after</th>
>-                <th>No automatic renewal after (hard limit)</th>
>-                <th>Holds allowed (count)</th>
>-                <th>Holds per record (count)</th>
>-                <th>On shelf holds allowed</th>
>-                <th>Item level holds</th>
>-                <th>Article requests</th>
>-                <th>Rental discount (%)</th>
>-                <th>Actions</th>
>+                <th>[% t('Patron category') %]</th>
>+                <th>[% t('Item type') %]</th>
>+                <th>[% t('Actions') %]</th>
>+                <th>[% t('Current checkouts allowed') %]</th>
>+                <th>[% t('Current on-site checkouts allowed') %]</th>
>+                <th>[% t('Loan period') %]</th>
>+                <th>[% t('Unit') %]</th>
>+                <th>[% t('Hard due date') %]</th>
>+                <th>[% t('Fine amount') %]</th>
>+                <th>[% t('Fine charging interval') %]</th>
>+                <th>[% t('When to charge') %]</th>
>+                <th>[% t('Fine grace period') %]</th>
>+                <th>[% t('Overdue fines cap (amount)') %]</th>
>+                <th>[% t('Cap fine at replacement price') %]</th>
>+                <th>[% t('Suspension in days (day)') %]</th>
>+                <th>[% t('Max. suspension duration (day)') %]</th>
>+                <th>[% t('Suspension charging interval') %]</th>
>+                <th>[% t('Renewals allowed (count)') %]</th>
>+                <th>[% t('Renewal period') %]</th>
>+                <th>[% t('No renewal before') %]</th>
>+                <th>[% t('Automatic renewal') %]</th>
>+                <th>[% t('No automatic renewal after') %]</th>
>+                <th>[% t('No automatic renewal after (hard limit)') %]</th>
>+                <th>[% t('Holds allowed (count)') %]</th>
>+                <th>[% t('Holds per record (count)') %]</th>
>+                <th>[% t('On shelf holds allowed') %]</th>
>+                <th>[% t('Item level holds') %]</th>
>+                <th>[% t('Article requests') %]</th>
>+                <th>[% t('Rental discount (%)') %]</th>
>+                <th>[% t('Actions') %]</th>
>             </tr>
>             </thead>
>             <tbody>
> 				[% FOREACH rule IN rules %]
> 					<tr id="row_[% loop.count %]">
> 							<td>[% IF ( rule.default_humancategorycode ) %]
>-									<em>All</em>
>+									<em>[% t('All') %]</em>
> 								[% ELSE %]
> 									[% rule.humancategorycode %]
> 								[% END %]
> 							</td>
>                             <td>[% IF rule.default_translated_description %]
>-									<em>All</em>
>+									<em>[% t('All') %]</em>
> 								[% ELSE %]
> 									[% rule.translated_description %]
> 								[% END %]
> 							</td>
>                                                         <td class="actions">
>-                                                          <a href="#" class="editrule btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
>-                                                          <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;itemtype=[% rule.itemtype %]&amp;categorycode=[% rule.categorycode %]&amp;branch=[% rule.current_branch %]"><i class="fa fa-trash"></i> Delete</a>
>+                                                          <a href="#" class="editrule btn btn-default btn-xs"><i class="fa fa-pencil"></i> [% t('Edit') %]</a>
>+                                                          <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% rule.itemtype %]&categorycode=[% rule.categorycode %]&branch=[% rule.current_branch %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a>
>                                                         </td>
> 
> 							<td>[% IF ( rule.unlimited_maxissueqty ) %]
>-									<span>Unlimited</span>
>+									<span>[% t('Unlimited') %]</span>
> 								[% ELSE %]
> 									[% rule.maxissueqty %]
> 								[% END %]
> 							</td>
>                             <td>[% IF rule.unlimited_maxonsiteissueqty %]
>-                                    <span>Unlimited</span>
>+                                    <span>[% t('Unlimited') %]</span>
>                                 [% ELSE %]
>                                     [% rule.maxonsiteissueqty %]
>                                 [% END %]
>@@ -134,26 +135,26 @@
>                             <td>
>                               [% IF ( rule.hardduedate ) %]
>                                 [% IF ( rule.hardduedatebefore ) %]
>-                                  before [% rule.hardduedate %]
>+                                  [% t('before') %] [% rule.hardduedate %]
>                                   <input type="hidden" name="hardduedatecomparebackup" value="-1" />
>                                 [% ELSIF ( rule.hardduedateexact ) %]
>-                                  on [% rule.hardduedate %]
>+                                  [% t('on') %] [% rule.hardduedate %]
>                                   <input type="hidden" name="hardduedatecomparebackup" value="0" />
>                                 [% ELSIF ( rule.hardduedateafter ) %]
>-                                  after [% rule.hardduedate %]
>+                                  [% t('after') %] [% rule.hardduedate %]
>                                   <input type="hidden" name="hardduedatecomparebackup" value="1" />
>                                 [% END %]
>                               [% ELSE %]
>-                                <span>None defined</span>
>+                                <span>[% t('None defined') %]</span>
>                               [% END %]
>                             </td>
> 							<td>[% rule.fine %]</td>
> 							<td>[% rule.chargeperiod %]</td>
>                             <td>
>                                 [% IF rule.chargeperiod_charge_at %]
>-                                    <span>Start of interval</span>
>+                                    <span>[% t('Start of interval') %]</span>
>                                 [% ELSE %]
>-                                    <span>End of interval</span>
>+                                    <span>[% t('End of interval') %]</span>
>                                 [% END %]
>                             </td>
> 							<td>[% rule.firstremind %]</td>
>@@ -173,9 +174,9 @@
>                             <td>[% rule.norenewalbefore %]</td>
>                             <td>
>                                 [% IF ( rule.auto_renew ) %]
>-                                    <span>Yes</span>
>+                                    <span>[% t('Yes') %]</span>
>                                 [% ELSE %]
>-                                    <span>No</span>
>+                                    <span>[% t('No') %]</span>
>                                 [% END %]
>                             </td>
>                             <td>[% rule.no_auto_renewal_after %]</td>
>@@ -184,37 +185,37 @@
>                                                         <td>[% rule.holds_per_record %]</td>
>                                                         <td>
>                                                             [% IF rule.onshelfholds == 1 %]
>-                                                                <span>Yes</span>
>+                                                                <span>[% t('Yes') %]</span>
>                                                             [% ELSIF rule.onshelfholds == 2 %]
>-                                                                <span>If all unavailable</span>
>+                                                                <span>[% t('If all unavailable') %]</span>
>                                                             [% ELSE %]
>-                                                                <span>If any unavailable</span>
>+                                                                <span>[% t('If any unavailable') %]</span>
>                                                             [% END %]
>                                                         </td>
>                                                         <td>
>                                                             [% IF rule.opacitemholds == 'F'%]
>-                                                                <span>Force</span>
>+                                                                <span>[% t('Force') %]</span>
>                                                             [% ELSIF rule.opacitemholds == 'Y'%]
>-                                                                <span>Allow</span>
>+                                                                <span>[% t('Allow') %]</span>
>                                                             [% ELSE %]
>-                                                                <span>Don't allow</span>
>+                                                                <span>[% t('Don\'t allow') %]</span>
>                                                             [% END %]
>                                                         </td>
>                                                         <td>
>                                                             [% IF rule.article_requests == 'no' %]
>-                                                                <span>No</span>
>+                                                                <span>[% t('No') %]</span>
>                                                             [% ELSIF rule.article_requests == 'yes' %]
>-                                                                <span>Yes</span>
>+                                                                <span>[% t('Yes') %]</span>
>                                                             [% ELSIF rule.article_requests == 'bib_only' %]
>-                                                                <span>Record only</span>
>+                                                                <span>[% t('Record only') %]</span>
>                                                             [% ELSIF rule.article_requests == 'item_only' %]
>-                                                                <span>Item only</span>
>+                                                                <span>[% t('Item only') %]</span>
>                                                             [% END %]
>                                                         </td>
> 							<td>[% rule.rentaldiscount %]</td>
>                                                         <td class="actions">
>-                                                          <a href="#" class="editrule btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
>-                                                          <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;itemtype=[% rule.itemtype %]&amp;categorycode=[% rule.categorycode %]&amp;branch=[% rule.current_branch %]"><i class="fa fa-trash"></i> Delete</a>
>+                                                          <a href="#" class="editrule btn btn-default btn-xs"><i class="fa fa-pencil"></i> [% t('Edit') %]</a>
>+                                                          <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% rule.itemtype %]&categorycode=[% rule.categorycode %]&branch=[% rule.current_branch %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a>
>                                                         </td>
> 
>                 	</tr>
>@@ -222,7 +223,7 @@
>                 <tr id="edit_row">
>                     <td>
>                         <select name="categorycode" id="categorycode">
>-                            <option value="*">All</option>
>+                            <option value="*">[% t('All') %]</option>
>                         [% FOREACH patron_category IN patron_categories%]
>                             <option value="[% patron_category.categorycode %]">[% patron_category.description %]</option>
>                         [% END %]
>@@ -230,31 +231,31 @@
>                     </td>
>                     <td>
>                         <select name="itemtype" id="matrixitemtype" style="width:13em;">
>-                            <option value="*">All</option>
>+                            <option value="*">[% t('All') %]</option>
>                         [% FOREACH itemtypeloo IN itemtypeloop %]
>                             <option value="[% itemtypeloo.itemtype %]">[% itemtypeloo.translated_description %]</option>
>                         [% END %]
>                         </select>
>                     </td>
>                     <td class="actions">
>-                        <input type="hidden" name="branch" value="[% current_branch %]"/>
>-                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
>-                        <button name="cancel" class="clear_edit btn btn-default btn-xs"><i class="fa fa-undo"></i> Clear</button>
>+                        <input type="hidden" name="branch" value="[% current_branch %]" />
>+                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> [% t('Save') %]</button>
>+                        <button name="cancel" class="clear_edit btn btn-default btn-xs"><i class="fa fa-undo"></i> [% t('Clear') %]</button>
>                     </td>
>                     <td><input type="text" name="maxissueqty" id="maxissueqty" size="3" /></td>
>                     <td><input type="text" name="maxonsiteissueqty" id="maxonsiteissueqty" size="3" /></td>
>                     <td><input type="text" name="issuelength" id="issuelength" size="3" /> </td>
>                     <td>
>                       <select name="lengthunit" id="lengthunit">
>-                        <option value="days" selected="selected">Days</option>
>-                        <option value="hours">Hours</option>
>+                        <option value="days" selected="selected">[% t('Days') %]</option>
>+                        <option value="hours">[% t('Hours') %]</option>
>                       </select>
>                     </td>
>                     <td>
>                         <select name="hardduedatecompare" id="hardduedatecompare">
>-                           <option value="-1">Before</option>
>-                           <option value="0">Exactly on</option>
>-                           <option value="1">After</option>
>+                           <option value="-1">[% t('Before') %]</option>
>+                           <option value="0">[% t('Exactly on') %]</option>
>+                           <option value="1">[% t('After') %]</option>
>                         </select>
>                         <input type="text" size="10" id="hardduedate" name="hardduedate" value="[% hardduedate %]" class="datepicker" />
>                         <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>@@ -263,8 +264,8 @@
>                     <td><input type="text" name="chargeperiod" id="chargeperiod" size="2" /></td>
>                     <td>
>                         <select name="chargeperiod_charge_at" id="chargeperiod_charge_at">
>-                           <option value="0">End of interval</option>
>-                           <option value="1">Start of interval</option>
>+                           <option value="0">[% t('End of interval') %]</option>
>+                           <option value="1">[% t('Start of interval') %]</option>
>                         </select>
>                     </td>
>                     <td><input type="text" name="firstremind" id="firstremind" size="2" /> </td>
>@@ -278,78 +279,78 @@
>                     <td><input type="text" name="norenewalbefore" id="norenewalbefore" size="3" /></td>
>                     <td>
>                         <select name="auto_renew" id="auto_renew">
>-                            <option value="no" selected>No</option>
>-                            <option value="yes">Yes</option>
>+                            <option value="no" selected="">[% t('No') %]</option>
>+                            <option value="yes">[% t('Yes') %]</option>
>                         </select>
>                     </td>
>                     <td><input type="text" name="no_auto_renewal_after" id="no_auto_renewal_after" size="3" /></td>
>                     <td>
>-                        <input type="text" size="10" name="no_auto_renewal_after_hard_limit" id="no_auto_renewal_after_hard_limit" value="[% no_auto_renewal_after_hard_limit %]" class="datepicker"/>
>+                        <input type="text" size="10" name="no_auto_renewal_after_hard_limit" id="no_auto_renewal_after_hard_limit" value="[% no_auto_renewal_after_hard_limit %]" class="datepicker" />
>                         <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>                     </td>
>                     <td><input type="text" name="reservesallowed" id="reservesallowed" size="2" /></td>
>                     <td><input type="text" name="holds_per_record" id="holds_per_record" size="2" /></td>
>                     <td>
>                         <select name="onshelfholds" id="onshelfholds">
>-                            <option value="1">Yes</option>
>-                            <option value="0">If any unavailable</option>
>-                            <option value="2">If all unavailable</option>
>+                            <option value="1">[% t('Yes') %]</option>
>+                            <option value="0">[% t('If any unavailable') %]</option>
>+                            <option value="2">[% t('If all unavailable') %]</option>
>                         </select>
>                     </td>
>                     <td>
>                         <select id="opacitemholds" name="opacitemholds">
>-                            <option value="N">Don't allow</option>
>-                            <option value="Y">Allow</option>
>-                            <option value="F">Force</option>
>+                            <option value="N">[% t('Don\'t allow') %]</option>
>+                            <option value="Y">[% t('Allow') %]</option>
>+                            <option value="F">[% t('Force') %]</option>
>                         </select>
>                     </td>
>                     <td>
>                         <select id="article_requests" name="article_requests">
>-                            <option value="no">No</option>
>-                            <option value="yes">Yes</option>
>-                            <option value="bib_only">Record only</option>
>-                            <option value="item_only">Item only</option>
>+                            <option value="no">[% t('No') %]</option>
>+                            <option value="yes">[% t('Yes') %]</option>
>+                            <option value="bib_only">[% t('Record only') %]</option>
>+                            <option value="item_only">[% t('Item only') %]</option>
>                         </select>
>                     </td>
>                     <td><input type="text" name="rentaldiscount" id="rentaldiscount" size="2" /></td>
>                     <td class="actions">
>-                        <input type="hidden" name="branch" value="[% current_branch %]"/>
>-                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
>-                        <button name="cancel" class="clear_edit btn btn-default btn-xs"><i class="fa fa-undo"></i> Clear</button>
>+                        <input type="hidden" name="branch" value="[% current_branch %]" />
>+                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> [% t('Save') %]</button>
>+                        <button name="cancel" class="clear_edit btn btn-default btn-xs"><i class="fa fa-undo"></i> [% t('Clear') %]</button>
>                     </td>
>                 </tr>
>                 <tfoot>
>                     <tr>
>-                      <th>Patron category</th>
>-                      <th>Item type</th>
>-                      <th>&nbsp;</th>
>-                      <th>Current checkouts allowed</th>
>-                      <th>Current on-site checkouts allowed</th>
>-                      <th>Loan period</th>
>-                      <th>Unit</th>
>-                      <th>Hard due date</th>
>-                      <th>Fine amount</th>
>-                      <th>Fine charging interval</th>
>-                      <th>Charge when?</th>
>-                      <th>Fine grace period</th>
>-                      <th>Overdue fines cap (amount)</th>
>-                      <th>Cap fine at replacement price</th>
>-                      <th>Suspension in days (day)</th>
>-                      <th>Max. suspension duration (day)</th>
>-                      <th>Suspension charging interval</th>
>-                      <th>Renewals allowed (count)</th>
>-                      <th>Renewal period</th>
>-                      <th>No renewal before</th>
>-                      <th>Automatic renewal</th>
>-                      <th>No automatic renewal after</th>
>-                       <th>No automatic renewal after (hard limit)</th>
>-                      <th>Holds allowed (count)</th>
>-                      <th>Holds per record (count)</th>
>-                      <th>On shelf holds allowed</th>
>-                      <th>Item level holds</th>
>-                      <th>Article requests</th>
>-                      <th>Rental discount (%)</th>
>-                      <th>&nbsp;</th>
>+                      <th>[% t('Patron category') %]</th>
>+                      <th>[% t('Item type') %]</th>
>+                      <th>Â </th>
>+                      <th>[% t('Current checkouts allowed') %]</th>
>+                      <th>[% t('Current on-site checkouts allowed') %]</th>
>+                      <th>[% t('Loan period') %]</th>
>+                      <th>[% t('Unit') %]</th>
>+                      <th>[% t('Hard due date') %]</th>
>+                      <th>[% t('Fine amount') %]</th>
>+                      <th>[% t('Fine charging interval') %]</th>
>+                      <th>[% t('Charge when?') %]</th>
>+                      <th>[% t('Fine grace period') %]</th>
>+                      <th>[% t('Overdue fines cap (amount)') %]</th>
>+                      <th>[% t('Cap fine at replacement price') %]</th>
>+                      <th>[% t('Suspension in days (day)') %]</th>
>+                      <th>[% t('Max. suspension duration (day)') %]</th>
>+                      <th>[% t('Suspension charging interval') %]</th>
>+                      <th>[% t('Renewals allowed (count)') %]</th>
>+                      <th>[% t('Renewal period') %]</th>
>+                      <th>[% t('No renewal before') %]</th>
>+                      <th>[% t('Automatic renewal') %]</th>
>+                      <th>[% t('No automatic renewal after') %]</th>
>+                       <th>[% t('No automatic renewal after (hard limit)') %]</th>
>+                      <th>[% t('Holds allowed (count)') %]</th>
>+                      <th>[% t('Holds per record (count)') %]</th>
>+                      <th>[% t('On shelf holds allowed') %]</th>
>+                      <th>[% t('Item level holds') %]</th>
>+                      <th>[% t('Article requests') %]</th>
>+                      <th>[% t('Rental discount (%)') %]</th>
>+                      <th>Â </th>
>                     </tr>
>                   </tfoot>
>                 </tbody>
>@@ -357,25 +358,25 @@
>         </form>
>     </div>
>     <div id="defaults-for-this-library" class="container">
>-    <h3>Default checkout, hold and return policy[% IF humanbranch %] for [% Branches.GetName( humanbranch ) %][% END %]</h3>
>-        <p>You can set a default maximum number of checkouts, hold policy and return policy that will be used if none is defined below for a particular item type or category.</p>
>+    <h3>[% t('Default checkout, hold and return policy') %][% IF humanbranch %] [% t('for') %] [% Branches.GetName( humanbranch ) %][% END %]</h3>
>+        <p>[% t('You can set a default maximum number of checkouts, hold policy and return policy that will be used if none is defined below for a particular item type or category.') %]</p>
>         <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
>             <input type="hidden" name="op" value="set-branch-defaults" />
>-            <input type="hidden" name="branch" value="[% current_branch %]"/>
>+            <input type="hidden" name="branch" value="[% current_branch %]" />
>             <table>
>                 <tr>
>-                    <th>&nbsp;</th>
>-                    <th>Total current checkouts allowed</th>
>-                    <th>Total current on-site checkouts allowed</th>
>-                    <th>Hold policy</th>
>-                    <th>Hold pickup library match</th>
>-                    <th>Return policy</th>
>-                    <th>Actions</th>
>+                    <th>Â </th>
>+                    <th>[% t('Total current checkouts allowed') %]</th>
>+                    <th>[% t('Total current on-site checkouts allowed') %]</th>
>+                    <th>[% t('Hold policy') %]</th>
>+                    <th>[% t('Hold pickup library match') %]</th>
>+                    <th>[% t('Return policy') %]</th>
>+                    <th>[% t('Actions') %]</th>
>                 </tr>
>                 <tr>
>-                    <td><em>Defaults[% UNLESS ( default_rules ) %] (not set)[% END %]</em></td>
>-                    <td><input type="text" name="maxissueqty" size="3" value="[% default_maxissueqty %]"/></td>
>-                    <td><input type="text" name="maxonsiteissueqty" size="3" value="[% default_maxonsiteissueqty %]"/></td>
>+                    <td><em>[% t('Defaults') %][% UNLESS ( default_rules ) %] [% t('(not set)') %][% END %]</em></td>
>+                    <td><input type="text" name="maxissueqty" size="3" value="[% default_maxissueqty %]" /></td>
>+                    <td><input type="text" name="maxonsiteissueqty" size="3" value="[% default_maxonsiteissueqty %]" /></td>
>                     <td>
>                         <select name="holdallowed">
>                             [% IF ( default_holdallowed_any ) %]
>@@ -383,21 +384,21 @@
>                             [% ELSE %]
>                             <option value="2">
>                             [% END %]
>-                                From any library
>+                                [% t('From any library') %]
>                             </option>
>                             [% IF ( default_holdallowed_same ) %]
>                             <option value="1" selected="selected">
>                             [% ELSE %]
>                             <option value="1">
>                             [% END %]
>-                                From home library
>+                                [% t('From home library') %]
>                             </option>
>                             [% IF ( default_holdallowed_none ) %]
>                             <option value="0" selected="selected">
>                             [% ELSE %]
>                             <option value="0">
>                             [% END %]
>-                                No holds allowed
>+                                [% t('No holds allowed') %]
>                             </option>
>                         </select>
>                     </td>
>@@ -405,31 +406,31 @@
>                         <select name="hold_fulfillment_policy">
>                             [% IF default_hold_fulfillment_policy == 'any' %]
>                                 <option value="any" selected="selected">
>-                                    any library
>+                                    [% t('any library') %]
>                                 </option>
>                             [% ELSE %]
>                                 <option value="any">
>-                                    any library
>+                                    [% t('any library') %]
>                                 </option>
>                             [% END %]
> 
>                             [% IF default_hold_fulfillment_policy == 'homebranch' %]
>                                 <option value="homebranch" selected="selected">
>-                                    item's home library
>+                                    [% t('item\'s home library') %]
>                                 </option>
>                             [% ELSE %]
>                                 <option value="homebranch">
>-                                    item's home library
>+                                    [% t('item\'s home library') %]
>                                 </option>
>                             [% END %]
> 
>                             [% IF default_hold_fulfillment_policy == 'holdingbranch' %]
>                                 <option value="holdingbranch" selected="selected">
>-                                    item's holding library
>+                                    [% t('item\'s holding library') %]
>                                 </option>
>                             [% ELSE %]
>                                 <option value="holdingbranch">
>-                                    item's holding library
>+                                    [% t('item\'s holding library') %]
>                                 </option>
>                             [% END %]
>                         </select>
>@@ -441,27 +442,27 @@
>                             [% ELSE %]
>                             <option value="homebranch">
>                             [% END %]
>-                                Item returns home
>+                                [% t('Item returns home') %]
>                             </option>
>                             [% IF ( default_returnbranch == 'holdingbranch' ) %]
>                             <option value="holdingbranch" selected="selected">
>                             [% ELSE %]
>                             <option value="holdingbranch">
>                             [% END %]
>-                                Item returns to issuing library
>+                                [% t('Item returns to issuing library') %]
>                             </option>
>                             [% IF ( default_returnbranch == 'noreturn' ) %]
>                             <option value="noreturn" selected="selected">
>                             [% ELSE %]
>                             <option value="noreturn">
>                             [% END %]
>-                                Item floats
>+                                [% t('Item floats') %]
>                             </option>
>                         </select>
>                     </td>
>                     <td class="actions">
>-                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
>-                        <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-cat&amp;categorycode=*&amp;branch=[% current_branch %]" id="unset"><i class="fa fa-undo"></i> Unset</a>
>+                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> [% t('Save') %]</button>
>+                        <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-cat&categorycode=*&branch=[% current_branch %]" id="unset"><i class="fa fa-undo"></i> [% t('Unset') %]</a>
>                     </td>
>                 </tr>
>             </table>
>@@ -469,22 +470,22 @@
>     </div>
>     [% IF ( show_branch_cat_rule_form ) %]
>     <div id="holds-policy-by-patron-category" class="container">
>-    <h3>[% IF humanbranch %]Checkout limit by patron category for [% Branches.GetName( humanbranch ) %][% ELSE %]Default checkout limit by patron category[% END %]</h3>
>-        <p>For this library, you can specify the maximum number of loans that
>-            a patron of a given category can make, regardless of the item type.
>+    <h3>[% IF humanbranch %][% t('Checkout limit by patron category for') %] [% Branches.GetName( humanbranch ) %][% ELSE %][% t('Default checkout limit by patron category') %][% END %]</h3>
>+        <p>[% t('For this library, you can specify the maximum number of loans that') %]
>+            [% t('a patron of a given category can make, regardless of the item type.') %]
>         </p>
>-        <p>If the total amount loanable for a given patron category is left blank,
>-           no limit applies, except possibly for a limit you define for a specific item type.
>+        <p>[% t('If the total amount loanable for a given patron category is left blank,') %]
>+           [% t('no limit applies, except possibly for a limit you define for a specific item type.') %]
>         </p>
>         <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
>             <input type="hidden" name="op" value="add-branch-cat" />
>-            <input type="hidden" name="branch" value="[% current_branch %]"/>
>+            <input type="hidden" name="branch" value="[% current_branch %]" />
>             <table>
>                 <tr>
>-                    <th>Patron category</th>
>-                    <th>Total current checkouts allowed</th>
>-                    <th>Total current on-site checkouts allowed</th>
>-                    <th>&nbsp;</th>
>+                    <th>[% t('Patron category') %]</th>
>+                    <th>[% t('Total current checkouts allowed') %]</th>
>+                    <th>[% t('Total current on-site checkouts allowed') %]</th>
>+                    <th>Â </th>
>                 </tr>
>                 [% FOREACH branch_cat_rule_loo IN branch_cat_rule_loop %]
>                     [% UNLESS ( loop.odd ) %]
>@@ -493,26 +494,26 @@
>                     <tr>
>                     [% END %]
>                         <td>[% IF ( branch_cat_rule_loo.default_humancategorycode ) %]
>-                                <em>Default</em>
>+                                <em>[% t('Default') %]</em>
>                             [% ELSE %]
>                                 [% branch_cat_rule_loo.humancategorycode %]
>                             [% END %]
>                         </td>
>                         <td>[% IF ( branch_cat_rule_loo.unlimited_maxissueqty ) %]
>-                                <span>Unlimited</span>
>+                                <span>[% t('Unlimited') %]</span>
>                             [% ELSE %]
>                                 [% branch_cat_rule_loo.maxissueqty %]
>                             [% END %]
>                         </td>
>                         <td>[% IF ( branch_cat_rule_loo.unlimited_maxonsiteissueqty ) %]
>-                                <span>Unlimited</span>
>+                                <span>[% t('Unlimited') %]</span>
>                             [% ELSE %]
>                                 [% branch_cat_rule_loo.maxonsiteissueqty %]
>                             [% END %]
>                         </td>
> 
>                         <td class="actions">
>-                            <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-cat&amp;categorycode=[% branch_cat_rule_loo.categorycode %]&amp;branch=[% current_branch %]"><i class="fa fa-trash"></i> Delete</a>
>+                            <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-cat&categorycode=[% branch_cat_rule_loo.categorycode %]&branch=[% current_branch %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a>
>                         </td>
>                     </tr>
>                 [% END %]
>@@ -526,7 +527,7 @@
>                     </td>
>                     <td><input name="maxissueqty" size="3" /></td>
>                     <td><input name="maxonsiteissueqty" size="3" /></td>
>-                    <td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</td>
>+                    <td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% t('Add') %]</td>
>                 </tr>
>             </table>
>         </form>
>@@ -535,76 +536,76 @@
> 
>     <div id="refund-lost-item-fee-on-return" class="container">
>   [% IF current_branch == '*' %]
>-    <h3>Default lost item fee refund on return policy</h3>
>+    <h3>[% t('Default lost item fee refund on return policy') %]</h3>
>   [% ELSE %]
>-    <h3>Lost item fee refund on return policy for [% Branches.GetName(current_branch) %]</h3>
>+    <h3>[% t('Lost item fee refund on return policy for') %] [% Branches.GetName(current_branch) %]</h3>
>   [% END %]
>-        <p>Specify the default policy for lost item fees on return.
>+        <p>[% t('Specify the default policy for lost item fees on return.') %]
>         </p>
>         <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
>             <input type="hidden" name="op" value="mod-refund-lost-item-fee-rule" />
>             <input type="hidden" name="branch" value="[% current_branch %]" />
>             <table>
>                 <tr>
>-                    <th>Refund lost item fee</th>
>-                    <th>&nbsp;</th>
>+                    <th>[% t('Refund lost item fee') %]</th>
>+                    <th>Â </th>
>                 </tr>
>                 <tr>
>                     <td>
>                         <select name="refund">
>-                          [#% Default branch %#]
>+                          [% t('[#% Default branch %#]') %]
>                           [% IF ( current_branch == '*' ) %]
>                             [% IF ( refundLostItemFeeRule.refund ) %]
>                             <option value="1" selected="selected">
>                             [% ELSE %]
>                             <option value="1">
>                             [% END %]
>-                                Yes
>+                                [% t('Yes') %]
>                             </option>
>                             [% IF ( not refundLostItemFeeRule.refund ) %]
>                             <option value="0" selected="selected">
>                             [% ELSE %]
>                             <option value="0">
>                             [% END %]
>-                                No
>+                                [% t('No') %]
>                             </option>
>                           [% ELSE %]
>-                          [#% Branch-specific %#]
>+                          [% t('[#% Branch-specific %#]') %]
>                             [% IF ( not refundLostItemFeeRule ) %]
>                                 <option value="*" selected="selected">
>                             [% ELSE %]
>                                 <option value="*">
>                             [% END %]
>                               [% IF defaultRefundRule %]
>-                                Use default (Yes)
>+                                [% t('Use default (Yes)') %]
>                               [% ELSE %]
>-                                Use default (No)
>+                                [% t('Use default (No)') %]
>                               [% END %]
>                                 </option>
>                             [% IF ( not refundLostItemFeeRule ) %]
>-                                <option value="1">Yes</option>
>-                                <option value="0">No</option>
>+                                <option value="1">[% t('Yes') %]</option>
>+                                <option value="0">[% t('No') %]</option>
>                             [% ELSE %]
>                                 [% IF ( refundLostItemFeeRule.refund ) %]
>                                 <option value="1" selected="selected">
>                                 [% ELSE %]
>                                 <option value="1">
>                                 [% END %]
>-                                    Yes
>+                                    [% t('Yes') %]
>                                 </option>
>                                 [% IF ( not refundLostItemFeeRule.refund ) %]
>                                 <option value="0" selected="selected">
>                                 [% ELSE %]
>                                 <option value="0">
>                                 [% END %]
>-                                    No
>+                                    [% t('No') %]
>                                 </option>
>                             [% END %]
>                           [% END %]
>                         </select>
>                     </td>
>                     <td class="actions">
>-                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
>+                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> [% t('Save') %]</button>
>                     </td>
>                     </td>
>                 </tr>
>@@ -613,34 +614,34 @@
>     </div>
> 
>     <div id="holds-policy-by-item-type" class="container">
>-    <h3>[% IF humanbranch %]Holds policy by item type for [% Branches.GetName( humanbranch ) %][% ELSE %]Default holds policy by item type[% END %]</h3>
>+    <h3>[% IF humanbranch %][% t('Holds policy by item type for') %] [% Branches.GetName( humanbranch ) %][% ELSE %][% t('Default holds policy by item type') %][% END %]</h3>
>         <p>
>-            For this library, you can edit rules for given itemtypes, regardless
>-            of the patron's category.
>+            [% t('For this library, you can edit rules for given itemtypes, regardless') %]
>+            [% t('of the patron\'s category.') %]
>         </p>
>         <p>
>-            Currently, this means hold policies.
>-            The various policies have the following effects:
>+            [% t('Currently, this means hold policies.') %]
>+            [% t('The various policies have the following effects:') %]
>         </p>
>         <ul>
>-            <li><strong>From any library:</strong> Patrons from any library may put this item on hold. <cite>(default if none is defined)</cite></li>
>-            <li><strong>From home library:</strong> Only patrons from the item's home library may put this book on hold.</li>
>-            <li><strong>No holds allowed:</strong> No patron may put this book on hold.</li>
>+            <li><strong>[% t('From any library:') %]</strong> [% t('Patrons from any library may put this item on hold.') %] <cite>[% t('(default if none is defined)') %]</cite></li>
>+            <li><strong>[% t('From home library:') %]</strong> [% t('Only patrons from the item\'s home library may put this book on hold.') %]</li>
>+            <li><strong>[% t('No holds allowed:') %]</strong> [% t('No patron may put this book on hold.') %]</li>
>         </ul>
>-        <p><strong>Note: </strong>If the system preference 'AllowHoldPolicyOverride' is enabled, these policies can be overridden by your circulation staff.</br />
>-            <strong>Important: </strong>The policies are based on the patron's home library, not the library where the hold is being placed.
>+        <p><strong>[% t('Note:') %] </strong>[% t('If the system preference \'AllowHoldPolicyOverride\' is enabled, these policies can be overridden by your circulation staff.') %]</br>
>+            <strong>[% t('Important:') %] </strong>[% t('The policies are based on the patron\'s home library, not the library where the hold is being placed.') %]
>         </p>
> 
>         <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
>             <input type="hidden" name="op" value="add-branch-item" />
>-            <input type="hidden" name="branch" value="[% current_branch %]"/>
>+            <input type="hidden" name="branch" value="[% current_branch %]" />
>             <table>
>                 <tr>
>-                    <th>Item type</th>
>-                    <th>Hold policy</th>
>-                    <th>Hold pickup library match</th>
>-                    <th>Return policy</th>
>-                    <th>&nbsp;</th>
>+                    <th>[% t('Item type') %]</th>
>+                    <th>[% t('Hold policy') %]</th>
>+                    <th>[% t('Hold pickup library match') %]</th>
>+                    <th>[% t('Return policy') %]</th>
>+                    <th>Â </th>
>                 </tr>
>                 [% FOREACH branch_item_rule_loo IN branch_item_rule_loop %]
>                     [% UNLESS ( loop.odd ) %]
>@@ -649,39 +650,39 @@
>                     <tr>
>                     [% END %]
>                         <td>[% IF ( branch_item_rule_loo.default_translated_description ) %]
>-                                <em>Default</em>
>+                                <em>[% t('Default') %]</em>
>                             [% ELSE %]
>                                 [% branch_item_rule_loo.translated_description %]
>                             [% END %]
>                         </td>
>                         <td>[% IF ( branch_item_rule_loo.holdallowed_any ) %]
>-                                <span>From any library</span>
>+                                <span>[% t('From any library') %]</span>
>                             [% ELSIF ( branch_item_rule_loo.holdallowed_same ) %]
>-                                <span>From home library</span>
>+                                <span>[% t('From home library') %]</span>
>                             [% ELSE %]
>-                                <span>No holds allowed</span>
>+                                <span>[% t('No holds allowed') %]</span>
>                             [% END %]
>                         </td>
>                         <td>[% IF ( branch_item_rule_loo.hold_fulfillment_policy == 'any' ) %]
>-                                <span>any library</span>
>+                                <span>[% t('any library') %]</span>
>                             [% ELSIF ( branch_item_rule_loo.hold_fulfillment_policy == 'homebranch' ) %]
>-                                <span>item's home library</span>
>+                                <span>[% t('item\'s home library') %]</span>
>                             [% ELSIF ( branch_item_rule_loo.hold_fulfillment_policy == 'holdingbranch' ) %]
>-                                <span>item's holding library</span>
>+                                <span>[% t('item\'s holding library') %]</span>
>                             [% END %]
>                         </td>
>                         <td>[% IF ( branch_item_rule_loo.returnbranch == 'homebranch' ) %]
>-                                <span>Item returns home</span>
>+                                <span>[% t('Item returns home') %]</span>
>                             [% ELSIF ( branch_item_rule_loo.returnbranch == 'holdingbranch' ) %]
>-                                <span>Item returns to issuing branch</span>
>+                                <span>[% t('Item returns to issuing branch') %]</span>
>                             [% ELSIF ( branch_item_rule_loo.returnbranch == 'noreturn' ) %]
>-                                <span>Item floats</span>
>+                                <span>[% t('Item floats') %]</span>
>                             [% ELSE %]
>-                                <span>Error - unknown option</span>
>+                                <span>[% t('Error - unknown option') %]</span>
>                             [% END %]
>                         </td>
>                         <td class="actions">
>-                            <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-item&amp;itemtype=[% branch_item_rule_loo.itemtype %]&amp;branch=[% current_branch %]"><i class="fa fa-trash"></i> Delete</a>
>+                            <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-item&itemtype=[% branch_item_rule_loo.itemtype %]&branch=[% current_branch %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a>
>                         </td>
>                     </tr>
>                 [% END %]
>@@ -695,34 +696,34 @@
>                     </td>
>                     <td>
>                         <select name="holdallowed">
>-                            <option value="2">From any library</option>
>-                            <option value="1">From home library</option>
>-                            <option value="0">No holds allowed</option>
>+                            <option value="2">[% t('From any library') %]</option>
>+                            <option value="1">[% t('From home library') %]</option>
>+                            <option value="0">[% t('No holds allowed') %]</option>
>                         </select>
>                     </td>
>                     <td>
>                         <select name="hold_fulfillment_policy">
>                             <option value="any">
>-                                any library
>+                                [% t('any library') %]
>                             </option>
> 
>                             <option value="homebranch">
>-                                item's home library
>+                                [% t('item\'s home library') %]
>                             </option>
> 
>                             <option value="holdingbranch">
>-                                item's holding library
>+                                [% t('item\'s holding library') %]
>                             </option>
>                         </select>
>                     </td>
>                     <td>
>                         <select name="returnbranch">
>-                            <option value="homebranch">Item returns home</option>
>-                            <option value="holdingbranch">Item returns to issuing library</option>
>-                            <option value="noreturn">Item floats</option>
>+                            <option value="homebranch">[% t('Item returns home') %]</option>
>+                            <option value="holdingbranch">[% t('Item returns to issuing library') %]</option>
>+                            <option value="noreturn">[% t('Item floats') %]</option>
>                         </select>
>                     </td>
>-                    <td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</button></td>
>+                    <td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% t('Add') %]</button></td>
>                 </tr>
>             </table>
>         </form>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt
>index 4c41178faa..b418533b96 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt
>@@ -1,7 +1,8 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; SMS cellular providers</title>
>+<title>[% t('Koha âº Administration âº SMS cellular providers') %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>@@ -9,7 +10,7 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; SMS cellular providers</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> [% t('âº SMS cellular providers') %]</div>
> 
> <div id="doc3" class="yui-t2">
>     <div id="bd">
>@@ -17,20 +18,20 @@
>             <div class="yui-b">
> 
>                 <div id="toolbar" class="btn-toolbar">
>-                    <a class="btn btn-default btn-sm" id="new_provider" href="#"><i class="fa fa-plus"></i> New SMS provider</a>
>+                    <a class="btn btn-default btn-sm" id="new_provider" href="#"><i class="fa fa-plus"></i> [% t('New SMS provider') %]</a>
>                 </div>
> 
>-                <h2>SMS cellular providers</h2>
>+                <h2>[% t('SMS cellular providers') %]</h2>
> 
>                 [% IF providers.size %]
> 
>                     <table id="providerst">
>                         <thead>
>                             <tr>
>-                                <th>Name</th>
>-                                <th>Domain</th>
>-                                <th title="Patrons using this provider">Patrons</th>
>-                                <th>&nbsp;</th>
>+                                <th>[% t('Name') %]</th>
>+                                <th>[% t('Domain') %]</th>
>+                                <th title="[% t('Patrons using this provider') %]">[% t('Patrons') %]</th>
>+                                <th>Â </th>
>                             </tr>
>                         </thead>
> 
>@@ -42,10 +43,10 @@
>                                     <td id="patrons_using_[% p.id %]">[% p.patrons_using %]</td>
>                                     <td class="actions">
>                                         <a class="btn btn-default btn-xs edit" href="#" id="edit_[% p.id %]" data-providerid="[% p.id %]">
>-                                            <i class="fa fa-pencil"></i> Edit
>+                                            <i class="fa fa-pencil"></i> [% t('Edit') %]
>                                         </a>
>                                         <a class="btn btn-default btn-xs delete" href="#" data-providerid="[% p.id %]" data-patrons_using="[% p.patrons_using %]" id="delete_[% p.id %]">
>-                                            <i class="fa fa-trash"></i> Delete
>+                                            <i class="fa fa-trash"></i> [% t('Delete') %]
>                                         </a>
>                                     </td>
>                                 </tr>
>@@ -56,7 +57,7 @@
>                 [% ELSE %]
> 
>                     <div class="dialog message">
>-                        There are no SMS cellular providers defined.
>+                        [% t('There are no SMS cellular providers defined.') %]
>                     </div>
> 
>                 [% END %]
>@@ -64,26 +65,26 @@
>                 <div id="sms_add_form">
>                     <form id="sms_form" action="sms_providers.pl" method="post" class="validated">
>                         <fieldset class="rows">
>-                            <legend>Add an SMS cellular provider</legend>
>+                            <legend>[% t('Add an SMS cellular provider') %]</legend>
>                             <input type="hidden" id="id" name="id" value="" />
>                             <input type="hidden" id="op" name="op" value="add_update" />
>                             <ol>
>                                 <li>
>-                                    <label for="name" class="required">Name: </label>
>+                                    <label for="name" class="required">[% t('Name:') %] </label>
>                                     <input type="text" id="name" name="name" required="required" />
>-                                    <span class="required">Required</span>
>+                                    <span class="required">[% t('Required') %]</span>
>                                 </li>
>                                 <li>
>-                                    <label for="domain" class="required">Domain: </label>
>-                                    <input type="text" id="domain" name="domain" required="required" size="40"/>
>-                                    <span class="required">Required</span>
>+                                    <label for="domain" class="required">[% t('Domain:') %] </label>
>+                                    <input type="text" id="domain" name="domain" required="required" size="40" />
>+                                    <span class="required">[% t('Required') %]</span>
>                                 </li>
>                             </ol>
>                         </fieldset>
>                         <fieldset class="action">
>                             <input type="submit" id="submit_save" value="Submit" />
>                             <input type="submit" value="Submit" id="submit_update" />
>-                            <a class="cancel cancel_edit" id="cancel" href="sms_providers.pl">Cancel</a>
>+                            <a class="cancel cancel_edit" id="cancel" href="sms_providers.pl">[% t('Cancel') %]</a>
>                         </fieldset>
>                     </form>
>                 </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt
>index 341a7035c5..676110e16d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt
>@@ -1,7 +1,8 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; SRU search fields mapping</title>
>+<title>[% t('Koha âº SRU search fields mapping') %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>@@ -10,30 +11,30 @@
> <div id="custom-doc" class="yui-t7">
> 
>     <div id="bd">
>-        <h1>Modify SRU search fields mapping</h1>
>+        <h1>[% t('Modify SRU search fields mapping') %]</h1>
>         <form id="form01" method="post">
>             <fieldset class="rows">
>                 <div class="yui-g">
>                     <div class="yui-u first">
>                         <ol>
>                             <li>
>-                                <label for="title">Title: </label>
>+                                <label for="title">[% t('Title:') %] </label>
>                                 <input id="title" type="text" value="[% mapping.title %]" />
>                             </li>
>                             <li>
>-                                <label for="isbn">ISBN: </label>
>+                                <label for="isbn">[% t('ISBN:') %] </label>
>                                 <input id="isbn" type="text" value="[% mapping.isbn %]" />
>                             </li>
>                             <li>
>-                                <label for="lccall">LC call number: </label>
>+                                <label for="lccall">[% t('LC call number:') %] </label>
>                                 <input id="lccall" type="text" value="[% mapping.lccall %]" />
>                             </li>
>                             <li>
>-                                <label for="controlnumber">Control number: </label>
>+                                <label for="controlnumber">[% t('Control number:') %] </label>
>                                 <input id="controlnumber" type="text" value="[% mapping.controlnumber %]" />
>                             </li>
>                             <li>
>-                                <label for="srchany">Any: </label>
>+                                <label for="srchany">[% t('Any:') %] </label>
>                                 <input id="srchany" type="text" value="[% mapping.srchany %]" />
>                             </li>
>                         </ol>
>@@ -41,23 +42,23 @@
>                     <div class="yui-u">
>                         <ol>
>                             <li>
>-                                <label for="author">Author: </label>
>+                                <label for="author">[% t('Author:') %] </label>
>                                 <input id="author" type="text" value="[% mapping.author %]" />
>                             </li>
>                             <li>
>-                                <label for="issn">ISSN: </label>
>+                                <label for="issn">[% t('ISSN:') %] </label>
>                                 <input id="issn" type="text" value="[% mapping.issn %]" />
>                             </li>
>                             <li>
>-                                <label for="subject">Subject: </label>
>+                                <label for="subject">[% t('Subject:') %] </label>
>                                 <input id="subject" type="text" value="[% mapping.subject %]" />
>                             </li>
>                             <li>
>-                                <label for="dewey">Dewey: </label>
>+                                <label for="dewey">[% t('Dewey:') %] </label>
>                                 <input id="dewey" type="text" value="[% mapping.dewey %]" />
>                             </li>
>                             <li>
>-                                <label for="stdid">Standard ID: </label>
>+                                <label for="stdid">[% t('Standard ID:') %] </label>
>                                 <input id="stdid" type="text" value="[% mapping.stdid %]" />
>                             </li>
>                         </ol>
>@@ -66,7 +67,7 @@
>             </fieldset>
>             <fieldset class="action">
>                 <input type="submit" value="Save" class="submit" />
>-                <a class="close cancel" href="#">Cancel</a>
>+                <a class="close cancel" href="#">[% t('Cancel') %]</a>
>             </fieldset>
>         </form>
>     </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
>index c0b1148a42..85dabc6964 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
>@@ -1,9 +1,10 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% USE Koha %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; [% IF ( add_form ) %] System preferences &rsaquo; [% IF ( modify ) %]Modify system preference '[% searchfield %]'[% ELSE %]Add a system preference[% END %][% END %][% IF ( add_validate ) %] System preferences &rsaquo; Data added[% END %]
>-[% IF ( delete_confirm ) %] System preferences &rsaquo; [% searchfield %] &rsaquo; Confirm deletion of parameter '[% searchfield %]'[% END %][% IF ( delete_confirmed ) %] System preferences &rsaquo; Parameter deleted[% END %][% IF ( else ) %]System preferences[% END %]</title>
>+<title>[% t('Koha âº Administration âº') %] [% IF ( add_form ) %] [% t('System preferences âº') %] [% IF ( modify ) %][% t('Modify system preference \'') %][% searchfield %]'[% ELSE %][% t('Add a system preference') %][% END %][% END %][% IF ( add_validate ) %] [% t('System preferences âº Data added') %][% END %]
>+[% IF ( delete_confirm ) %] [% t('System preferences âº') %] [% searchfield %] [% t('âº Confirm deletion of parameter \'') %][% searchfield %]'[% END %][% IF ( delete_confirmed ) %] [% t('System preferences âº Parameter deleted') %][% END %][% IF ( else ) %][% t('System preferences') %][% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% Asset.css("css/datatables.css") %]
> </head>
>@@ -12,8 +13,8 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a> &rsaquo; [% IF ( modify ) %]Modify system preference '[% searchfield %]'[% ELSE %]Add a system preference[% END %][% END %][% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a> &rsaquo; Data added[% END %]
>-[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a> &rsaquo; <a href="/cgi-bin/koha/admin/systempreferences.pl?op=add_form&amp;searchfield=[% searchfield %]">[% searchfield %]</a> &rsaquo; Confirm deletion of parameter '[% searchfield %]'[% END %][% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a> &rsaquo; Parameter deleted[% END %][% IF ( else ) %]System preferences[% END %]</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> âº [% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">[% t('System preferences') %]</a> âº [% IF ( modify ) %][% t('Modify system preference \'') %][% searchfield %]'[% ELSE %][% t('Add a system preference') %][% END %][% END %][% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">[% t('System preferences') %]</a> [% t('âº Data added') %][% END %]
>+[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">[% t('System Preferences') %]</a> âº <a href="/cgi-bin/koha/admin/systempreferences.pl?op=add_form&searchfield=[% searchfield %]">[% searchfield %]</a> [% t('âº Confirm deletion of parameter \'') %][% searchfield %]'[% END %][% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">[% t('System preferences') %]</a> [% t('âº Parameter deleted') %][% END %][% IF ( else ) %][% t('System preferences') %][% END %]</div>
> 
> <div id="doc3" class="yui-t2">
>    
>@@ -28,13 +29,13 @@
>             <form action="[% script_name %]" name="Aform" method="post">
>         [% END %]
>         <fieldset class="rows"><legend>
>-        [% IF ( modify ) %]Modify
>-        [% ELSE %]Add
>-        [% END %] a system preference</legend><ol>
>-            <li><label for="explanation">Explanation: </label><input type="text" name="explanation" id="explanation" size="60" value="[% explanation |html %]" /><input type="hidden" name="op" value="add_validate" /></li>
>-            <li>[% IF ( searchfield ) %]<span class="label">Variable: </span>[% searchfield %]<input type="hidden" name="variable" value="[% searchfield %]" />
>-            [% ELSE %]<label for="variable">Variable: </label><input type="text" name="variable" id="variable" size="60" />[% END %]</li>
>-            <li><label for="value">Value: </label>
>+        [% IF ( modify ) %][% t('Modify') %]
>+        [% ELSE %][% t('Add') %]
>+        [% END %] [% t('a system preference') %]</legend><ol>
>+            <li><label for="explanation">[% t('Explanation:') %] </label><input type="text" name="explanation" id="explanation" size="60" value="[% explanation |html %]" /><input type="hidden" name="op" value="add_validate" /></li>
>+            <li>[% IF ( searchfield ) %]<span class="label">[% t('Variable:') %] </span>[% searchfield %]<input type="hidden" name="variable" value="[% searchfield %]" />
>+            [% ELSE %]<label for="variable">[% t('Variable:') %] </label><input type="text" name="variable" id="variable" size="60" />[% END %]</li>
>+            <li><label for="value">[% t('Value:') %] </label>
>                 [% IF ( type_free ) %]
>                     <textarea id="value" name="value" cols="[% fieldlength %]">[% value |html %]</textarea>
>                 [% ELSIF ( type_upload ) %]
>@@ -114,86 +115,86 @@
>                     [% IF ( value_yes ) %]
>                         <input type="radio" name="value" id="value" value="1" checked="checked" />[% ELSE %]<input type="radio" name="value" id="value" value="1" />
>                     [% END %]
>-                    <label for="value" class="yesno">ON</label>
>+                    <label for="value" class="yesno">[% t('ON') %]</label>
>                     [% IF ( value_no ) %]
>                         <input type="radio" name="value" id="value-no" value="0" checked="checked" />[% ELSE %]<input type="radio" name="value" id="value-no" value="0" />
>                     [% END %]
>-                    <label for="value-no" class="yesno">OFF</label>
>+                    <label for="value-no" class="yesno">[% t('OFF') %]</label>
>                 [% END %]
>                 </li>
>         </ol></fieldset>
>         <fieldset class="action"><input type="submit" value="Save" /> 
>           [% IF ( return_tab ) %]
>-            <a class="cancel" href="/cgi-bin/koha/admin/systempreferences.pl?tab=[% return_tab %]">Cancel</a>
>+            <a class="cancel" href="/cgi-bin/koha/admin/systempreferences.pl?tab=[% return_tab %]">[% t('Cancel') %]</a>
>           [% ELSE %]
>-            <a class="cancel" href="/cgi-bin/koha/admin/systempreferences.pl">Cancel</a>
>+            <a class="cancel" href="/cgi-bin/koha/admin/systempreferences.pl">[% t('Cancel') %]</a>
>           [% END %]
>         </fieldset>
>         
>         <fieldset class="brief">
>-        <legend>Koha internal</legend>
>-        <div class="hint">Note: change the variable type to one of the dropdown values as needed</div>
>+        <legend>[% t('Koha internal') %]</legend>
>+        <div class="hint">[% t('Note: change the variable type to one of the dropdown values as needed') %]</div>
>         <ol>
>-        <li><label for="preftype">Variable type:</label>
>+        <li><label for="preftype">[% t('Variable type:') %]</label>
>         <select name="preftype" id="preftype">
>         [%- IF (preftype && preftype == 'Free') || !preftype -%]
>-            <option value="Free" selected>Free</option>
>+            <option value="Free" selected="">[% t('Free') %]</option>
>         [%- ELSE -%]
>-            <option value="Free">Free</option>
>+            <option value="Free">[% t('Free') %]</option>
>         [% END %]
>         [%- IF (preftype && preftype == 'Choice') -%]
>-            <option value="Choice" selected>Choice</option>
>+            <option value="Choice" selected="">[% t('Choice') %]</option>
>         [%- ELSE -%]
>-            <option value="Choice">Choice</option>
>+            <option value="Choice">[% t('Choice') %]</option>
>         [% END %]
>         [%- IF (preftype && preftype == 'YesNo') -%]
>-            <option value="YesNo" selected>YesNo</option>
>+            <option value="YesNo" selected="">[% t('YesNo') %]</option>
>         [%- ELSE -%]
>-            <option value="YesNo">YesNo</option>
>+            <option value="YesNo">[% t('YesNo') %]</option>
>         [% END %]
>         [%- IF (preftype && preftype == 'Integer') -%]
>-            <option value="Integer" selected>Integer</option>
>+            <option value="Integer" selected="">[% t('Integer') %]</option>
>         [%- ELSE -%]
>-            <option value="Integer">Integer</option>
>+            <option value="Integer">[% t('Integer') %]</option>
>         [% END %]
>         [%- IF (preftype && preftype == 'Textarea') -%]
>-            <option value="Textarea" selected>Textarea</option>
>+            <option value="Textarea" selected="">[% t('Textarea') %]</option>
>         [%- ELSE -%]
>-            <option value="Textarea">Textarea</option>
>+            <option value="Textarea">[% t('Textarea') %]</option>
>         [% END %]
>         [%- IF (preftype && preftype == 'Htmlarea') -%]
>-            <option value="Htmlarea" selected>Htmlarea</option>
>+            <option value="Htmlarea" selected="">[% t('Htmlarea') %]</option>
>         [%- ELSE -%]
>-            <option value="Htmlarea">Htmlarea</option>
>+            <option value="Htmlarea">[% t('Htmlarea') %]</option>
>         [% END %]
>         [%- IF (preftype && preftype == 'Float') -%]
>-            <option value="Float" selected>Float</option>
>+            <option value="Float" selected="">[% t('Float') %]</option>
>         [%- ELSE -%]
>-            <option value="Float">Float</option>
>+            <option value="Float">[% t('Float') %]</option>
>         [% END %]
>         [%- IF (preftype && preftype == 'Themes') -%]
>-            <option value="Themes" selected>Themes</option>
>+            <option value="Themes" selected="">[% t('Themes') %]</option>
>         [%- ELSE -%]
>-            <option value="Themes">Themes</option>
>+            <option value="Themes">[% t('Themes') %]</option>
>         [% END %]
>         [%- IF (preftype && preftype == 'Languages') -%]
>-            <option value="Languages" selected>Languages</option>
>+            <option value="Languages" selected="">[% t('Languages') %]</option>
>         [%- ELSE -%]
>-            <option value="Languages">Languages</option>
>+            <option value="Languages">[% t('Languages') %]</option>
>         [% END %]
>         [%- IF (preftype && preftype == 'Upload') -%]
>-            <option value="Upload" selected>Upload</option>
>+            <option value="Upload" selected="">[% t('Upload') %]</option>
>         [%- ELSE -%]
>-            <option value="Upload">Upload</option>
>+            <option value="Upload">[% t('Upload') %]</option>
>         [% END %]
>         [%- IF (preftype && preftype == 'ClassSources') -%]
>-            <option value="ClassSources" selected>ClassSources</option>
>+            <option value="ClassSources" selected="">[% t('ClassSources') %]</option>
>         [%- ELSE -%]
>-            <option value="ClassSources">ClassSources</option>
>+            <option value="ClassSources">[% t('ClassSources') %]</option>
>         [% END %]
>         </select>
>-        <li><label for="prefoptions">Variable options:</label>
>-        <div class="hint">(a choice list for choice (separated by |) or cols|rows for texarea)</div>
>+        <li><label for="prefoptions">[% t('Variable options:') %]</label>
>+        <div class="hint">[% t('(a choice list for choice (separated by |) or cols|rows for texarea)') %]</div>
>         <input type="text" name="prefoptions" id="prefoptions" value="[% prefoptions %]" size="60" maxlength="80" /></li>
>         </ol>
>         </fieldset>
>@@ -201,7 +202,7 @@
>     [% END %]
>     
>     [% IF ( add_validate ) %]
>-        <h3>Data recorded</h3>
>+        <h3>[% t('Data recorded') %]</h3>
>         
>         <form action="[% script_name %]" method="post">
>         <input type="submit" value="OK" />
>@@ -210,24 +211,24 @@
>     
>     [% IF ( delete_confirm ) %]
>     <table>
>-        <caption>Confirm deletion of [% searchfield %]?</caption>
>+        <caption>[% t('Confirm deletion of') %] [% searchfield %]?</caption>
>         <tr>
>-            <th>Variable name:</th>
>+            <th>[% t('Variable name:') %]</th>
>             <td>[% searchfield %]</td>
>         </tr>
>-        <tr><th>Value: </th><td>
>+        <tr><th>[% t('Value:') %] </th><td>
>         [% Tvalue %]
>         </td></tr></table>
>         <form class="inline" action="[% script_name %]" method="post">
>         <input type="hidden" name="op" value="delete_confirmed" />
>         <input type="hidden" name="searchfield" value="[% searchfield %]" />
>         <input type="hidden" name="Tvalue" value="[% Tvalue %]" />
>-        <input type="submit"  value="Yes, delete" /></form>
>+        <input type="submit" value="Yes, delete" /></form>
>         <form class="inline" action="[% script_name %]" method="post"><input type="submit" value="No, do not delete" /></form>
>     [% END %]
>     
>     [% IF ( delete_confirmed ) %]
>-        <h3>Data deleted</h3>
>+        <h3>[% t('Data deleted') %]</h3>
>         <form action="[% script_name %]" method="post">
>             <input type="submit" value="Back to System Preferences" />
>         </form>
>@@ -236,20 +237,20 @@
>     [% IF ( else ) %]
> 
>     <div id="toolbar" class="btn-toolbar">
>-        <a class="btn btn-default btn-sm" id="newstopword" href="[% script_name %]?op=add_form"><i class="fa fa-plus"></i> New preference</a>
>+        <a class="btn btn-default btn-sm" id="newstopword" href="[% script_name %]?op=add_form"><i class="fa fa-plus"></i> [% t('New preference') %]</a>
>     </div>
> 
>     [% IF ( tab != 'local_use' ) %]
>-        <p>Please click on one of the tabs at the left side of this form.</p>
>+        <p>[% t('Please click on one of the tabs at the left side of this form.') %]</p>
>         <table>
>     [% ELSE %]
>-        <h1>Local use preferences</h1>
>+        <h1>[% t('Local use preferences') %]</h1>
>         <table width="80%" id="sysprefst">
>         <thead><tr>
>-        <th>Preference</th>
>-        <th>Explanation</th>
>-        <th>Value</th>
>-        <th>Actions</th>
>+        <th>[% t('Preference') %]</th>
>+        <th>[% t('Explanation') %]</th>
>+        <th>[% t('Value') %]</th>
>+        <th>[% t('Actions') %]</th>
>         </tr></thead>
>     [% END %]
>     <tbody>[% FOREACH loo IN loop %]
>@@ -276,7 +277,7 @@
>                     [% IF ( loo.type_htmlarea ) && ( Koha.Preference('UseWYSIWYGinSystemPreferences') ) %]
>                         <textarea class="mce" name="value" rows="[% loo.rows %]" cols="[% loo.cols %]">[% loo.value |html %]</textarea>
>                     [% ELSE %]
>-                        <a class="expand-textarea" style="display: none" href="#">Click to edit</a>
>+                        <a class="expand-textarea" style="display: none" href="#">[% t('Click to edit') %]</a>
>                         <textarea name="value" rows="[% loo.rows %]" cols="[% loo.cols %]">[% loo.value |html %]</textarea>
>                     [% END %]
>                 [% END %]
>@@ -349,22 +350,22 @@
>                     [% IF ( loo.value_yes ) %]
>                         <input type="radio" name="value" value="1" checked="checked" />[% ELSE %]<input type="radio" name="value" value="1" />
>                     [% END %]
>-                    <label for="value" class="yesno">ON</label>
>+                    <label for="value" class="yesno">[% t('ON') %]</label>
>                     [% IF ( loo.value_no ) %]
>                         <input type="radio" name="value" value="0" checked="checked" />[% ELSE %]<input type="radio" name="value" value="0" />
>                     [% END %]
>-                    <label for="value-no" class="yesno">OFF</label>
>+                    <label for="value-no" class="yesno">[% t('OFF') %]</label>
>                 [% END %]
>                 <input type="hidden" name="op" value="add_validate" />
>                 <input type="hidden" name="variable" value="[% loo.variable %]" />
>                 <input type="hidden" name="prefoptions" value="[% loo.prefoptions |html %]" />
>                 <input type="hidden" name="preftype" value="[% loo.type %]" />
>                 <input type="hidden" name="explanation" value="[% loo.explanation |html %]" />
>-                <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
>+                <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> [% t('Save') %]</button>
>             </form>
>         </td>
> 
>-        <td class="actions"><a class="btn btn-default btn-xs" href="[% loo.edit %]"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-default btn-xs" href="[% loo.delete %]"><i class="fa fa-trash"></i> Delete</a></td>
>+        <td class="actions"><a class="btn btn-default btn-xs" href="[% loo.edit %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a> <a class="btn btn-default btn-xs" href="[% loo.delete %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a></td>
>     </tr>
>     [% END %]</tbody>
>     </table>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
>index 17349ed0b4..815cb0ace7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
>@@ -1,8 +1,9 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% USE Branches %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Transport cost matrix</title>
>+<title>[% t('Koha âº Administration âº Transport cost matrix') %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <style type="text/css">
> .disabled-transfer {
>@@ -15,7 +16,7 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'prefs-admin-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Transport cost matrix</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> [% t('âº Transport cost matrix') %]</div>
> 
> <div id="doc3" class="yui-t1">
> 
>@@ -23,17 +24,17 @@
>     <div id="yui-main">
>     <div class="yui-b">
>     <h1 class="parameters">
>-            Defining transport costs between libraries
>+            [% t('Defining transport costs between libraries') %]
>     </h1>
> [% IF ( WARNING_transport_cost_matrix_off ) %]
>-<div class="dialog message">Because the "UseTransportCostMatrix" system preference is currently not enabled, the transport cost matrix is not being used.  Go <a href="/cgi-bin/koha/admin/preferences.pl?op=search&amp;searchfield=UseTransportCostMatrix">here</a> if you wish to enable this feature.</div>
>+<div class="dialog message">[% t('Because the &#34;UseTransportCostMatrix&#34; system preference is currently not enabled, the transport cost matrix is not being used.') %]  [% t('Go') %] <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=UseTransportCostMatrix">[% t('here') %]</a> [% t('if you wish to enable this feature.') %]</div>
> [% END %]
> 
>     [% IF ( errors ) %]<div class="dialog alert">
>-        <h4>There were problems with your submission</h4>
>+        <h4>[% t('There were problems with your submission') %]</h4>
>         <ul>
>             [% FOR e IN errors %]
>-                <li>Invalid value for [% e %]</li>
>+                <li>[% t('Invalid value for') %] [% e %]</li>
>             [% END %]
>         </ul>
>     </div>[% END %]
>@@ -42,14 +43,14 @@
>             <input type="hidden" name="op" value="set-cost-matrix" />
>             <fieldset id="transport-cost-matrix">
>                 <div class="help">
>-                    <p>Costs are decimal values between some arbitrary maximum value (e.g. 1 or 100) and 0 which is the minimum (no) cost.</p>
>-                    <p>Red cells signify no transfer allowed.</p>
>-                    <p>Click on individual cells to edit.</p>
>+                    <p>[% t('Costs are decimal values between some arbitrary maximum value (e.g. 1 or 100) and 0 which is the minimum (no) cost.') %]</p>
>+                    <p>[% t('Red cells signify no transfer allowed.') %]</p>
>+                    <p>[% t('Click on individual cells to edit.') %]</p>
>                 </div>
> 
>                 <table>
>                     <tr>
>-                        <th>From \ To</th>
>+                        <th>[% t('From \ To') %]</th>
>                         [% FOR b IN Branches.all() %]
>                         <th>[% b.branchname %]</th>
>                         [% END %]
>@@ -60,14 +61,14 @@
>                     [% FOR bt IN bf.branchtoloop %]
>                         <td>
>                         [% IF bt.skip %]
>-                            &nbsp;
>+                            Â 
>                         [% ELSE %]
>                             [% IF bt.disabled %]
>                             <div id="celldiv_[% bt.id %]" class="disabled-transfer">
>                             [% ELSE %]
>                             <div id="celldiv_[% bt.id %]">
>                             [% END %]
>-                            <div class="enable_cost_input" data-cost-id="[% bt.id %]">[% bt.disabled ? '&nbsp;' : bt.value %]</div>
>+                            <div class="enable_cost_input" data-cost-id="[% bt.id %]">[% bt.disabled ? 'Â ' : bt.value %]</div>
>                             <input type="hidden" name="cost_[% bt.id %]" value="[% bt.value %]" />
>                             [% IF bt.disabled %]
>                             <input type="hidden" name="disable_[% bt.id %]" value="1" />
>@@ -81,7 +82,7 @@
>                 </table>
>             </fieldset>
>             <fieldset class="action">
>-                <input type="submit" value="Save" class="submit" /> <a href="/cgi-bin/koha/admin/transport-cost-matrix.pl" class="cancel">Cancel</a>
>+                <input type="submit" value="Save" class="submit" /> <a href="/cgi-bin/koha/admin/transport-cost-matrix.pl" class="cancel">[% t('Cancel') %]</a>
>             </fieldset>
>         </form>
>     </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
>index 5819de043d..cd05dffc1a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
>@@ -1,10 +1,11 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% USE Koha %]
> [% USE KohaDates %]
> [% USE Price %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Koha usage statistics</title>
>+<title>[% t('Koha âº Administration âº Koha usage statistics') %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% Asset.css("lib/leaflet/leaflet.css") %]
> </head>
>@@ -13,7 +14,7 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'cat-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Usage statistics</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> [% t('âº Usage statistics') %]</div>
> 
> <div id="doc3" class="yui-t2">
>    <div id="bd">
>@@ -24,19 +25,19 @@
>     <div class="dialog [% m.type %]">
>         [% SWITCH m.code %]
>         [% CASE 'error_on_update' %]
>-            An error occurred when updating this patron category. Perhaps it already exists.
>+            [% t('An error occurred when updating this patron category. Perhaps it already exists.') %]
>         [% CASE 'error_on_insert' %]
>-            An error occurred when inserting this patron category. The patron category might already exist.
>+            [% t('An error occurred when inserting this patron category. The patron category might already exist.') %]
>         [% CASE 'error_on_delete' %]
>-            An error occurred when deleting this patron category. Check the logs.
>+            [% t('An error occurred when deleting this patron category. Check the logs.') %]
>         [% CASE 'success_on_update' %]
>-            Patron category updated successfully.
>+            [% t('Patron category updated successfully.') %]
>         [% CASE 'success_on_insert' %]
>-            Patron category inserted successfully.
>+            [% t('Patron category inserted successfully.') %]
>         [% CASE 'success_on_delete' %]
>-            Patron category deleted successfully.
>+            [% t('Patron category deleted successfully.') %]
>         [% CASE 'already_exists' %]
>-            This patron category already exists.
>+            [% t('This patron category already exists.') %]
>         [% CASE %]
>             [% m.code %]
>         [% END %]
>@@ -44,27 +45,27 @@
> [% END %]
> 
> [% IF NOT Koha.Preference('UsageStats') %]
>-    <div class="dialog message">You are not sharing any data with the Koha community</div>
>+    <div class="dialog message">[% t('You are not sharing any data with the Koha community') %]</div>
> [% END %]
> 
>     <form id="category_form" action="/cgi-bin/koha/admin/usage_statistics.pl" method="post">
>-        <h1>Modify the statistics you share with the Koha community</h1>
>+        <h1>[% t('Modify the statistics you share with the Koha community') %]</h1>
>         <fieldset class="rows">
>             <ol style="float:left;">
>                 <li>
>-                    <label for="UsageStats">Share my Koha usage statistics: </label>
>+                    <label for="UsageStats">[% t('Share my Koha usage statistics:') %] </label>
>                     <select name="UsageStats" id="UsageStats">
>                     [% IF Koha.Preference('UsageStats') %]
>-                        <option value="1" selected="selected">Yes</option>
>-                        <option value="0">No</option>
>+                        <option value="1" selected="selected">[% t('Yes') %]</option>
>+                        <option value="0">[% t('No') %]</option>
>                     [% ELSE %]
>-                        <option value="1">Yes</option>
>-                        <option value="0" selected="selected">No</option>
>+                        <option value="1">[% t('Yes') %]</option>
>+                        <option value="0" selected="selected">[% t('No') %]</option>
>                     [% END %]
>                     </select>
>                 </li>
>                 <li>
>-                    <label for="UsageStatsCountry">Your country: </label>
>+                    <label for="UsageStatsCountry">[% t('Your country:') %] </label>
>                     [% SET UsageStatsCountry = Koha.Preference('UsageStatsCountry') %]
>                     [% SET IsUsageStatsCountryValid = 0 %]
>                     [% IF NOT UsageStatsCountry %]
>@@ -72,7 +73,7 @@
>                     [% END %]
>                     [% PROCESS 'country-list.inc' %]
>                     <select name="UsageStatsCountry" id="UsageStatsCountry">
>-                        <option value="">&nbsp;</option>
>+                        <option value="">Â </option>
>                         [% FOR country IN countries %]
>                             [% IF country == UsageStatsCountry %]
>                                 <option value="[% country %]" selected="selected">[% country %]</option>
>@@ -83,115 +84,115 @@
>                         [% END %]
>                     </select>
>                     [% UNLESS IsUsageStatsCountryValid %]
>-                        Note: The value of your system preference 'UsageStatsCountry' is not valid ([% UsageStatsCountry %]).
>-                        Please select a valid one.
>+                        [% t('Note: The value of your system preference \'UsageStatsCountry\' is not valid (') %][% UsageStatsCountry %]).
>+                        [% t('Please select a valid one.') %]
>                     [% END %]
>                 </li>
>                 <li>
>-                    <label for="UsageStatsLibraryName">Library name: </label>
>+                    <label for="UsageStatsLibraryName">[% t('Library name:') %] </label>
>                     <input type="text" value="[% Koha.Preference('UsageStatsLibraryName') | html %]" name="UsageStatsLibraryName" id="UsageStatsLibraryName" />
>                 </li>
>                 <li>
>-                    <label for="UsageStatsLibraryType">Library type: </label>
>+                    <label for="UsageStatsLibraryType">[% t('Library type:') %] </label>
>                     [% SET UsageStatsLibraryType = Koha.Preference('UsageStatsLibraryType') %]
>                     <select name="UsageStatsLibraryType" id="UsageStatsLibraryType">
>-                        <option value="">&nbsp;</option>
>+                        <option value="">Â </option>
>                         [% IF UsageStatsLibraryType == 'public' %]
>-                            <option value="public" selected="selected">Public</option>
>+                            <option value="public" selected="selected">[% t('Public') %]</option>
>                         [% ELSE %]
>-                            <option value="public">Public</option>
>+                            <option value="public">[% t('Public') %]</option>
>                         [% END %]
> 
>                         [% IF UsageStatsLibraryType == 'school' %]
>-                            <option value="school" selected="selected">School</option>
>+                            <option value="school" selected="selected">[% t('School') %]</option>
>                         [% ELSE %]
>-                            <option value="school">School</option>
>+                            <option value="school">[% t('School') %]</option>
>                         [% END %]
>                         [% IF UsageStatsLibraryType == 'academic' %]
>-                            <option value="academic" selected="selected">Academic</option>
>+                            <option value="academic" selected="selected">[% t('Academic') %]</option>
>                         [% ELSE %]
>-                            <option value="academic">Academic</option>
>+                            <option value="academic">[% t('Academic') %]</option>
>                         [% END %]
>                         [% IF UsageStatsLibraryType == 'research' %]
>-                            <option value="research" selected="selected">Research</option>
>+                            <option value="research" selected="selected">[% t('Research') %]</option>
>                         [% ELSE %]
>-                            <option value="research">Research</option>
>+                            <option value="research">[% t('Research') %]</option>
>                         [% END %]
>                         [% IF UsageStatsLibraryType == 'private' %]
>-                            <option value="private" selected="selected">Private</option>
>+                            <option value="private" selected="selected">[% t('Private') %]</option>
>                         [% ELSE %]
>-                            <option value="private">Private</option>
>+                            <option value="private">[% t('Private') %]</option>
>                         [% END %]
>                         [% IF UsageStatsLibraryType == 'societyAssociation' %]
>-                            <option value="societyAssociation" selected="selected">Society or association</option>
>+                            <option value="societyAssociation" selected="selected">[% t('Society or association') %]</option>
>                         [% ELSE %]
>-                            <option value="societyAssociation">Society or association</option>
>+                            <option value="societyAssociation">[% t('Society or association') %]</option>
>                         [% END %]
>                         [% IF UsageStatsLibraryType == 'corporate' %]
>-                            <option value="corporate" selected="selected">Corporate</option>
>+                            <option value="corporate" selected="selected">[% t('Corporate') %]</option>
>                         [% ELSE %]
>-                            <option value="corporate">Corporate</option>
>+                            <option value="corporate">[% t('Corporate') %]</option>
>                         [% END %]
>                         [% IF UsageStatsLibraryType == 'government' %]
>-                            <option value="government" selected="selected">Government</option>
>+                            <option value="government" selected="selected">[% t('Government') %]</option>
>                         [% ELSE %]
>-                            <option value="government">Government</option>
>+                            <option value="government">[% t('Government') %]</option>
>                         [% END %]
>                         [% IF UsageStatsLibraryType == 'religiousOrg' %]
>-                            <option value="religiousOrg" selected="selected">Religious organization</option>
>+                            <option value="religiousOrg" selected="selected">[% t('Religious organization') %]</option>
>                         [% ELSE %]
>-                            <option value="religiousOrg">Religious organization</option>
>+                            <option value="religiousOrg">[% t('Religious organization') %]</option>
>                         [% END %]
>                         [% IF UsageStatsLibraryType == 'subscription' %]
>-                            <option value="subscription" selected="selected">Subscription</option>
>+                            <option value="subscription" selected="selected">[% t('Subscription') %]</option>
>                         [% ELSE %]
>-                            <option value="subscription">Subscription</option>
>+                            <option value="subscription">[% t('Subscription') %]</option>
>                         [% END %]
>                     </select>
>                 </li>
>                 <li>
>-                    <label for="UsageStatsLibraryUrl">Library URL: </label>
>+                    <label for="UsageStatsLibraryUrl">[% t('Library URL:') %] </label>
>                     <input type="text" name="UsageStatsLibraryUrl" value="[% Koha.Preference('UsageStatsLibraryUrl') %]" id="UsageStatsLibraryUrl" />
>                 </li>
>                 <li>
>-                    <span class="label">Last update: </span>
>+                    <span class="label">[% t('Last update:') %] </span>
>                     [% IF UsageStatsLastUpdateTime %]
>                         [% UsageStatsLastUpdateTime %]
>                     [% ELSE %]
>-                        Your data have never been shared
>+                        [% t('Your data have never been shared') %]
>                     [% END %]
>                 </li>
>                 <li>
>-                    <label for="UsageStatsGeolocation">Geolocation: </label>
>+                    <label for="UsageStatsGeolocation">[% t('Geolocation:') %] </label>
>                     <input id="UsageStatsGeolocation" name="UsageStatsGeolocation" value="[% Koha.Preference('UsageStatsGeolocation') %]" type="text" value="[% Koha.Preference('UsageStatsLibrariesInfo') %]" size="35" readonly="readonly" />
>-                    <a href="#" class="change_geolocation" data-branchname="" data-id="UsageStatsGeolocation"><img src="[% interface %]/lib/leaflet/images/marker-icon.png" title="Set geolocation" style="max-height: 2em;" /></a>
>+                    <a href="#" class="change_geolocation" data-branchname="" data-id="UsageStatsGeolocation"><img src="[% interface %]/lib/leaflet/images/marker-icon.png" title="[% t('Set geolocation') %]" style="max-height: 2em;" /></a>
>                 </li>
>                 <li>
>-                    <label for="UsageStatsLibrariesInfo">Libraries informations: </label>
>+                    <label for="UsageStatsLibrariesInfo">[% t('Libraries informations:') %] </label>
>                     <select name="UsageStatsLibrariesInfo" id="UsageStatsLibrariesInfo">
>                         [% IF Koha.Preference('UsageStatsLibrariesInfo') %]
>-                            <option value="1" selected="selected">Yes</option>
>-                            <option value="0">No</option>
>+                            <option value="1" selected="selected">[% t('Yes') %]</option>
>+                            <option value="0">[% t('No') %]</option>
>                         [% ELSE %]
>-                            <option value="1">Yes</option>
>-                            <option value="0" selected="selected">No</option>
>+                            <option value="1">[% t('Yes') %]</option>
>+                            <option value="0" selected="selected">[% t('No') %]</option>
>                         [% END %]
>                     </select>
>                 </li>
> 
>                 <li id="libraries_info">
>                     <fieldset class="rows">
>-                    <legend>Libraries</legend>
>+                    <legend>[% t('Libraries') %]</legend>
>                     <ol>
>                         [% FOR l IN libraries %]
>                         <li>
>                             <label for="[% l.branchcode %]">[% l.branchname %]: </label>
>                             <div style="float:left;">
>-                                <div>Country: [% l.branchcountry %]</div>
>-                                <div>Url: [% l.branchurl %]</div>
>+                                <div>[% t('Country:') %] [% l.branchcountry %]</div>
>+                                <div>[% t('Url:') %] [% l.branchurl %]</div>
>                                 <div>
>-                                    Geolocation: <input type="text" id="geolocation_[% l.branchcode %]" name="geolocation_[% l.branchcode %]" value="[% l.geolocation %]" size="35" readonly="readonly" />
>-                                    <a href="#" class="change_geolocation" data-branchname="[% l.branchname %]" data-id="geolocation_[% l.branchcode %]"><img src="[% interface %]/lib/leaflet/images/marker-icon.png" title="Set geolocation for [% l.branchname %]" style="max-height: 2em;" /></a>
>+                                    [% t('Geolocation:') %] <input type="text" id="geolocation_[% l.branchcode %]" name="geolocation_[% l.branchcode %]" value="[% l.geolocation %]" size="35" readonly="readonly" />
>+                                    <a href="#" class="change_geolocation" data-branchname="[% l.branchname %]" data-id="geolocation_[% l.branchcode %]"><img src="[% interface %]/lib/leaflet/images/marker-icon.png" title="[% t('Set geolocation for') %] [% l.branchname %]" style="max-height: 2em;" /></a>
>                                 </div>
>                             </div>
>                         </li>
>@@ -200,12 +201,12 @@
>                     </fieldset>
>                 </li>
>                 <li>
>-                    <label for="MyPublicLink">See your public page: </label>
>+                    <label for="MyPublicLink">[% t('See your public page:') %] </label>
>                     [% IF Koha.Preference('UsageStatsPublicID') %]
>                         [% SET my_url = 'https://hea.koha-community.org/libraries/' _  Koha.Preference('UsageStatsPublicID') %]
>                         <a href="[% my_url %]">[% my_url %]</a>
>                     [% ELSE %]
>-                        You do not have anything public yet.
>+                        [% t('You do not have anything public yet.') %]
>                     [% END %]
>                 </li>
> 
>@@ -217,7 +218,7 @@
>         <fieldset class="action">
>             <input type="hidden" name="op" value="update" />
>             <input type="submit" value="Update your statistics usage" />
>-            <a class="cancel" href="/cgi-bin/koha/admin/usage_statistics.pl">Cancel</a>
>+            <a class="cancel" href="/cgi-bin/koha/admin/usage_statistics.pl">[% t('Cancel') %]</a>
>         </fieldset>
>     </form>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
>index 6af148ec3e..c0eab9b683 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
>@@ -1,18 +1,19 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
> 
> [% BLOCK ServerType %]
>     [% IF (server.servertype||type) == 'sru' %]
>-        SRU
>+        [% t('SRU') %]
>     [% ELSIF (server.servertype||type) == 'zed' %]
>-        Z39.50
>+        [% t('Z39.50') %]
>     [% END %]
> [% END %]
> 
>-<title>Koha &rsaquo; Administration &rsaquo; Z39.50/SRU servers
>-[% IF op == 'edit' %] &rsaquo; Modify [% PROCESS ServerType %] server [% server.servername %][% END %]
>-[% IF op ==  'add' %] &rsaquo; New [% PROCESS ServerType %] server[% END %]
>+<title>[% t('Koha âº Administration âº Z39.50/SRU servers') %]
>+[% IF op == 'edit' %] [% t('âº Modify') %] [% PROCESS ServerType %] [% t('server') %] [% server.servername %][% END %]
>+[% IF op ==  'add' %] [% t('âº New') %] [% PROCESS ServerType %] [% t('server') %][% END %]
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> 
>@@ -25,10 +26,10 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'z3950-admin-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;
>-<a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50/SRU servers</a>
>-[% IF op == 'edit' %]&rsaquo; Modify [% PROCESS ServerType %] server [% server.servername %][% END %]
>-[% IF op ==  'add' %]&rsaquo; New [% PROCESS ServerType %] server[% END %]
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">[% t('Home') %]</a> âº <a href="/cgi-bin/koha/admin/admin-home.pl">[% t('Administration') %]</a> âº
>+<a href="/cgi-bin/koha/admin/z3950servers.pl">[% t('Z39.50/SRU servers') %]</a>
>+[% IF op == 'edit' %][% t('âº Modify') %] [% PROCESS ServerType %] [% t('server') %] [% server.servername %][% END %]
>+[% IF op ==  'add' %][% t('âº New') %] [% PROCESS ServerType %] [% t('server') %][% END %]
> </div>
> 
> <div id="doc3" class="yui-t2">
>@@ -37,76 +38,76 @@
> <div class="yui-b">
> 
> [% IF msg_deleted %]
>-    <div class="dialog alert">Z39.50/SRU server deleted ([% msg_add %])</div>
>+    <div class="dialog alert">[% t('Z39.50/SRU server deleted (') %][% msg_add %])</div>
> [% ELSIF msg_updated %]
>-    <div class="dialog message">Z39.50/SRU server updated ([% msg_add %])</div>
>+    <div class="dialog message">[% t('Z39.50/SRU server updated (') %][% msg_add %])</div>
> [% ELSIF msg_added %]
>-    <div class="dialog message">Z39.50/SRU server added ([% msg_add %])</div>
>+    <div class="dialog message">[% t('Z39.50/SRU server added (') %][% msg_add %])</div>
> [% ELSIF msg_notfound %]
>-    <div class="dialog alert">Error: Server with id [% msg_add %] not found</div>
>+    <div class="dialog alert">[% t('Error: Server with id') %] [% msg_add %] [% t('not found') %]</div>
> [% END %]
> 
> [% IF ( add_form ) %]
>     <form action="[% script_name %]" name="Aform" method="post" id="serverentry">
>         <input type="hidden" name="op" value="add_validated" />
>-        <input type="hidden" name="servertype" value="[% server.servertype||type||'zed' %]"/>
>+        <input type="hidden" name="servertype" value="[% server.servertype||type||'zed' %]" />
>         [% IF op == 'edit' %]
>-            <h1>Modify [% PROCESS ServerType %] server</h1>
>+            <h1>[% t('Modify') %] [% PROCESS ServerType %] [% t('server') %]</h1>
>             <input type="hidden" name="id" value="[% server.id %]" />
>         [% ELSE %]
>-            <h1>New [% PROCESS ServerType %] server</h1>
>+            <h1>[% t('New') %] [% PROCESS ServerType %] [% t('server') %]</h1>
>         [% END %]
>         <fieldset class="rows">
>         <ol>
>-        <li><label for="name" class="required">Server name: </label>
>-            <input type="text" name="servername" id="servername" size="65" maxlength="100" value="[% server.servername | html %]" required="required" /> <span class="required">Required</span>
>+        <li><label for="name" class="required">[% t('Server name:') %] </label>
>+            <input type="text" name="servername" id="servername" size="65" maxlength="100" value="[% server.servername | html %]" required="required" /> <span class="required">[% t('Required') %]</span>
>         </li>
> 
>-        <li><label for="host" class="required">Hostname: </label> <input type="text" name="host" id="host" size="30" value="[% server.host %]" required="required" /> <span class="required">Required</span>
>+        <li><label for="host" class="required">[% t('Hostname:') %] </label> <input type="text" name="host" id="host" size="30" value="[% server.host %]" required="required" /> <span class="required">[% t('Required') %]</span>
>             [% IF (server.servertype||type) == 'sru' %]
>-                <div class="hint">Includes the domain part, but the path part of the URL should go into Database.</div>
>+                <div class="hint">[% t('Includes the domain part, but the path part of the URL should go into Database.') %]</div>
>             [% END %]
>         </li>
>-        <li><label for="port" class="required">Port: </label> <input type="text" name="port" id="port" size="5" value="[% server.port %]" required="required" /> <span class="required">Required</span>
>+        <li><label for="port" class="required">[% t('Port:') %] </label> <input type="text" name="port" id="port" size="5" value="[% server.port %]" required="required" /> <span class="required">[% t('Required') %]</span>
>         </li>
>-        <li><label for="db" class="required">Database: </label> <input type="text" name="db" id="db" value="[% server.db %]" required="required" /> <span class="required">Required</span>
>+        <li><label for="db" class="required">[% t('Database:') %] </label> <input type="text" name="db" id="db" value="[% server.db %]" required="required" /> <span class="required">[% t('Required') %]</span>
>         </li>
>-        <li><label for="userid">Userid: </label> <input type="text" name="userid" id="userid" value="[% server.userid %]" />
>+        <li><label for="userid">[% t('Userid:') %] </label> <input type="text" name="userid" id="userid" value="[% server.userid %]" />
>         </li>
>-        <li><label for="password">Password: </label> <input type="text" name="password" id="password" value="[% server.password %]" />
>+        <li><label for="password">[% t('Password:') %] </label> <input type="text" name="password" id="password" value="[% server.password %]" />
>         </li>
>-        <li><label for="checked">Preselected (searched by default): </label>
>+        <li><label for="checked">[% t('Preselected (searched by default):') %] </label>
>         [% IF ( server.checked ) %]
>             <input type="checkbox" name="checked" id="checked" value="1" checked="checked" />
>         [% ELSE %]
>             <input type="checkbox" name="checked" id="checked" value="1" />
>         [% END %]
>         </li>
>-        <li><label for="rank">Rank (display order): </label> <input type="text" name="rank" id="rank" size="4" value="[% server.rank %]" />
>+        <li><label for="rank">[% t('Rank (display order):') %] </label> <input type="text" name="rank" id="rank" size="4" value="[% server.rank %]" />
>         </li>
> 
>-        <li><label for="syntax">Syntax (z3950 can send<br /> records in various format. Choose one): </label>
>+        <li><label for="syntax">[% t('Syntax (z3950 can send') %]<br /> [% t('records in various format. Choose one):') %] </label>
>         <select name="syntax" id="syntax">
>-            <option value="UNIMARC">UNIMARC</option>
>-            <option value="INTERMARC">INTERMARC</option>
>-            <option value="CCF">CCF</option>
>-            <option value="USMARC">MARC21/USMARC</option>
>-            <option value="UKMARC">UKMARC</option>
>-            <option value="NORMARC">NORMARC</option>
>-            <option value="LIBRISMARC">LIBRISMARC</option>
>-            <option value="DANMARC">DANMARC</option>
>-            <option value="FINMARC">FINMARC</option>
>-            <option value="CANMARC">CANMARC</option>
>-            <option value="SBN">SBN</option>
>-            <option value="PICAMARC">PICAMARC</option>
>-            <option value="AUSMARC">AUSMARC</option>
>-            <option value="IBERMARC">IBERMARC</option>
>-            <option value="CATMARC">CATMARC</option>
>-            <option value="MALMARC">MALMARC</option>
>+            <option value="UNIMARC">[% t('UNIMARC') %]</option>
>+            <option value="INTERMARC">[% t('INTERMARC') %]</option>
>+            <option value="CCF">[% t('CCF') %]</option>
>+            <option value="USMARC">[% t('MARC21/USMARC') %]</option>
>+            <option value="UKMARC">[% t('UKMARC') %]</option>
>+            <option value="NORMARC">[% t('NORMARC') %]</option>
>+            <option value="LIBRISMARC">[% t('LIBRISMARC') %]</option>
>+            <option value="DANMARC">[% t('DANMARC') %]</option>
>+            <option value="FINMARC">[% t('FINMARC') %]</option>
>+            <option value="CANMARC">[% t('CANMARC') %]</option>
>+            <option value="SBN">[% t('SBN') %]</option>
>+            <option value="PICAMARC">[% t('PICAMARC') %]</option>
>+            <option value="AUSMARC">[% t('AUSMARC') %]</option>
>+            <option value="IBERMARC">[% t('IBERMARC') %]</option>
>+            <option value="CATMARC">[% t('CATMARC') %]</option>
>+            <option value="MALMARC">[% t('MALMARC') %]</option>
>         </select>
>         </li>
> 
>-        <li><label for="encoding">Encoding (z3950 can send<br /> records in various encodings. Choose one): </label>
>+        <li><label for="encoding">[% t('Encoding (z3950 can send') %]<br /> [% t('records in various encodings. Choose one):') %] </label>
>         <select name="encoding" id="encoding">
>             [% FOREACH enc IN [ 'utf8' 'EUC-KR' 'ISO_5426' 'ISO_6937' 'ISO_8859-1' 'MARC-8' ] %]
>                 <option value="[% enc %]">[% enc %]</option>
>@@ -114,74 +115,74 @@
>         </select>
>         </li>
> 
>-        <li><label for="timeout">Timeout (0 its like not set): </label>
>-        <input type="text" name="timeout" id="timeout" size="4" value="[% server.timeout %]" /> seconds
>+        <li><label for="timeout">[% t('Timeout (0 its like not set):') %] </label>
>+        <input type="text" name="timeout" id="timeout" size="4" value="[% server.timeout %]" /> [% t('seconds') %]
>         </li>
>-        <li><label for="recordtype">Record type: </label>
>+        <li><label for="recordtype">[% t('Record type:') %] </label>
>         <select name="recordtype" id="recordtype">
>-            <option value="biblio">Bibliographic</option>
>-            <option value="authority">Authority</option>
>+            <option value="biblio">[% t('Bibliographic') %]</option>
>+            <option value="authority">[% t('Authority') %]</option>
>         </select>
>         </li>
>         [% IF (server.servertype||type) == 'sru' %]
>         <li>
>-        <label for="sru_options">Additional SRU options: </label>
>-        <input type="text" name="sru_options" id="sru_options" size="50" value="[% server.sru_options %]"/>
>-        <div class="hint">Separate options by commas. Example: sru=get,sru_version=1.1. See also http://www.indexdata.com/yaz/doc/zoom.html.</div>
>+        <label for="sru_options">[% t('Additional SRU options:') %] </label>
>+        <input type="text" name="sru_options" id="sru_options" size="50" value="[% server.sru_options %]" />
>+        <div class="hint">[% t('Separate options by commas. Example: sru=get,sru_version=1.1. See also http://www.indexdata.com/yaz/doc/zoom.html.') %]</div>
>         </li>
>         <li>
>-        <label for="sru_fields">SRU Search fields mapping: </label>
>+        <label for="sru_fields">[% t('SRU Search fields mapping:') %] </label>
>         <input type="hidden" name="sru_fields" id="sru_fields" value="[% server.sru_fields %]" />
>             <input type="text" name="show_sru_fields" id="show_sru_fields" size="100" value="[% server.sru_fields %]" disabled="disabled" /> <input type="button" id="modify_sru_fields" value="Modify" />
>         </li>
>         [% END %]
>         <li>
>-        <label for="add_xslt">XSLT File(s) for transforming results: </label>
>-        <input type="text" name="add_xslt" id="add_xslt" size="100" value="[% server.add_xslt %]"/>
>-        <div class="hint">Separate multiple filenames by commas.</span>
>+        <label for="add_xslt">[% t('XSLT File(s) for transforming results:') %] </label>
>+        <input type="text" name="add_xslt" id="add_xslt" size="100" value="[% server.add_xslt %]" />
>+        <div class="hint">[% t('Separate multiple filenames by commas.') %]</span>
>         </li>
> 
>         </ol>
>         </fieldset>
> 
>-        <fieldset class="action"><input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/z3950servers.pl">Cancel</a></fieldset>
>+        <fieldset class="action"><input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/z3950servers.pl">[% t('Cancel') %]</a></fieldset>
>     </form>
> [% END %]
> 
> [% IF op == 'list' %]
>     <div id="toolbar" class="btn-toolbar">
>-        <a id="newserver" class="btn btn-default btn-sm" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=zed"><i class="fa fa-plus"></i> New Z39.50 server</a>
>-        <a id="newserver" class="btn btn-default btn-sm" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=sru"><i class="fa fa-plus"></i> New SRU server</a>
>+        <a id="newserver" class="btn btn-default btn-sm" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=zed"><i class="fa fa-plus"></i> [% t('New Z39.50 server') %]</a>
>+        <a id="newserver" class="btn btn-default btn-sm" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=sru"><i class="fa fa-plus"></i> [% t('New SRU server') %]</a>
>     </div>
>-    <h3>Z39.50/SRU servers administration</h3>
>+    <h3>[% t('Z39.50/SRU servers administration') %]</h3>
>     [% IF id %]
>-        You searched for record [% id %]
>+        [% t('You searched for record') %] [% id %]
>     [% ELSIF searchfield %]
>-        You searched for [% searchfield |html %]
>+        [% t('You searched for') %] [% searchfield |html %]
>     [% END %]
>     <table id="serverst">
>-        <thead><tr><th>Target</th><th>Hostname/Port</th><th>Database</th><th>Userid</th><th>Password</th><th>Preselected</th><th>Rank</th><th>Syntax</th><th>Encoding</th><th>Timeout</th><th>Record type</th><th></th>
>+        <thead><tr><th>[% t('Target') %]</th><th>[% t('Hostname/Port') %]</th><th>[% t('Database') %]</th><th>[% t('Userid') %]</th><th>[% t('Password') %]</th><th>[% t('Preselected') %]</th><th>[% t('Rank') %]</th><th>[% t('Syntax') %]</th><th>[% t('Encoding') %]</th><th>[% t('Timeout') %]</th><th>[% t('Record type') %]</th><th></th>
>         </tr></thead>
>         <tbody>
>         [% FOREACH loo IN loop %]
>             <tr>
>-            <td><a href="/cgi-bin/koha/admin/z3950servers.pl?op=edit&amp;id=[% loo.id %]">[% loo.servername %]</a></td><td>[% loo.host %]:[% loo.port %]</td><td>[% loo.db %]</td><td>[% loo.userid %]</td><td>[% IF loo.password %]########[% END %]</td><td>[% IF ( loo.checked ) %]Yes[% ELSE %]No[% END %]</td><td>[% loo.rank %]</td>
>+            <td><a href="/cgi-bin/koha/admin/z3950servers.pl?op=edit&id=[% loo.id %]">[% loo.servername %]</a></td><td>[% loo.host %]:[% loo.port %]</td><td>[% loo.db %]</td><td>[% loo.userid %]</td><td>[% IF loo.password %]########[% END %]</td><td>[% IF ( loo.checked ) %][% t('Yes') %][% ELSE %][% t('No') %][% END %]</td><td>[% loo.rank %]</td>
>             <td>[% loo.syntax %]</td><td>[% loo.encoding %]</td><td>[% loo.timeout %]</td>
>             <td>[% IF ( loo.recordtype == 'biblio' )  %]
>-                <span>Bibliographic</span>
>+                <span>[% t('Bibliographic') %]</span>
>                 [% ELSIF ( loo.recordtype == 'authority' ) %]
>-                <span>Authority</span>
>+                <span>[% t('Authority') %]</span>
>                 [% END %]
>             </td>
>             <td>
>                 <div class="dropdown">
>                     <a class="btn btn-default btn-xs dropdown-toggle" id="reportactions[% savedreport.id %]" role="button" data-toggle="dropdown" href="#">
>-                        Actions <b class="caret"></b>
>+                        [% t('Actions') %] <b class="caret"></b>
>                     </a>
>                     <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reportactions[% savedreport.id %]">
>-                        <li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=edit&amp;id=[% loo.id %]"><i class="fa fa-pencil"></i> Edit</a></li>
>-                        <li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=add&amp;id=[% loo.id %]"><i class="fa fa-copy"></i> Copy</a></li>
>-                        <li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=delete_confirmed&amp;id=[% loo.id %]" class="delete" data-servername="[% loo.servername %]"><i class="fa fa-trash"></i> Delete</a></li>
>+                        <li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=edit&id=[% loo.id %]"><i class="fa fa-pencil"></i> [% t('Edit') %]</a></li>
>+                        <li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=add&id=[% loo.id %]"><i class="fa fa-copy"></i> [% t('Copy') %]</a></li>
>+                        <li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=delete_confirmed&id=[% loo.id %]" class="delete" data-servername="[% loo.servername %]"><i class="fa fa-trash"></i> [% t('Delete') %]</a></li>
>                     </ul>
>                 </div>
>             </td>
>-- 
>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