Attachment 76361 Details for Bug 20988 – Bug 20988: koha-tmpl/opac-tmpl/bootstrap/en/includes

[patch] Bug 20988: koha-tmpl/opac-tmpl/bootstrap/en/includes

Bug-20988-koha-tmplopac-tmplbootstrapenincludes.patch (text/plain), 132.59 KB, created by Julian Maurice on 2018-06-25 07:23:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2018-06-25 07:23:55 UTC

Size: 132.59 KB

patch

obsolete

>From 9d1bcae895166d0ed1c6e7c52e0a1e0a4defe439 Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Mon, 25 Jun 2018 08:51:28 +0200
>Subject: [PATCH] Bug 20988: koha-tmpl/opac-tmpl/bootstrap/en/includes
>
>---
> .../includes/authorities-search-results.inc   |  27 +-
> .../en/includes/av-build-dropbox.inc          |   2 +-
> .../bootstrap/en/includes/date-format.inc     |   3 +-
> .../bootstrap/en/includes/doc-head-close.inc  |   3 +-
> .../bootstrap/en/includes/item-status.inc     |  29 +-
> .../en/includes/masthead-langmenu.inc         |  11 +-
> .../bootstrap/en/includes/masthead-sco.inc    |   3 +-
> .../bootstrap/en/includes/masthead.inc        | 137 ++++----
> .../en/includes/opac-authorities.inc          |  27 +-
> .../bootstrap/en/includes/opac-bottom.inc     |   9 +-
> .../en/includes/opac-detail-sidebar.inc       |  61 ++--
> .../bootstrap/en/includes/opac-facets.inc     |  41 +--
> .../bootstrap/en/includes/opac-note.inc       |   5 +-
> .../bootstrap/en/includes/opac-topissues.inc  |  49 +--
> .../en/includes/openlibrary-readapi.inc       |   3 +-
> .../en/includes/overdrive-checkout.inc        |   7 +-
> .../bootstrap/en/includes/page-numbers.inc    |  11 +-
> .../bootstrap/en/includes/resort_form.inc     |  61 ++--
> .../bootstrap/en/includes/search/facets.inc   |  11 +-
> .../en/includes/search/page-numbers.inc       |   7 +-
> .../en/includes/search/resort_form.inc        |  17 +-
> .../bootstrap/en/includes/shelfbrowser.inc    |  31 +-
> .../en/includes/subtypes_unimarc.inc          | 317 +++++++++---------
> .../bootstrap/en/includes/usermenu.inc        |  31 +-
> 24 files changed, 463 insertions(+), 440 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc
>index 8934ccafd5..ce870f0916 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% BLOCK showreference %]
> [%# Parameters: %]
> [%# heading: the heading itself %]
>@@ -10,13 +11,13 @@
>     [% IF marcflavour == 'UNIMARC' %]
>         [% SWITCH type %]
>             [% CASE 'broader' %]
>-              <span class="BT"><abbr title="Broader Term">BT</abbr>: [% heading | html %]</span>
>+              <span class="BT"><abbr title="[% t('Broader Term') %]">[% t('BT') %]</abbr>: [% heading | html %]</span>
>             [% CASE 'narrower' %]
>-              <span class="NT"><abbr title="Narrower Term">NT</abbr>: [% heading | html %]</span>
>+              <span class="NT"><abbr title="[% t('Narrower Term') %]">[% t('NT') %]</abbr>: [% heading | html %]</span>
>             [% CASE 'seefrom' %]
>-              <span class="UF"><abbr title="Used For">UF</abbr>: [% heading | html %]</span>
>+              <span class="UF"><abbr title="[% t('Used For') %]">[% t('UF') %]</abbr>: [% heading | html %]</span>
>             [% CASE 'seealso' %]
>-              <span class="RT"><abbr title="Related Term">RT</abbr>: [% heading | html %]</span>
>+              <span class="RT"><abbr title="[% t('Related Term') %]">[% t('RT') %]</abbr>: [% heading | html %]</span>
>         [% END %]
>     [% ELSE %]
>         <span class="heading">
>@@ -33,13 +34,13 @@
>         [% UNLESS ( type=='seefrom' || type=='seealso' ) %]
>             <span class="type">
>                 [% SWITCH type %]
>-                    [% CASE 'earlier' %](Earlier heading)
>-                    [% CASE 'later' %](Later heading)
>-                    [% CASE 'acronym' %](Acronym)
>-                    [% CASE 'musical' %](Musical composition)
>-                    [% CASE 'broader' %](Broader heading)
>-                    [% CASE 'narrower' %](Narrower heading)
>-                    [% CASE 'parent' %](Immediate parent body)
>+                    [% CASE 'earlier' %][% t('(Earlier heading)') %]
>+                    [% CASE 'later' %][% t('(Later heading)') %]
>+                    [% CASE 'acronym' %][% t('(Acronym)') %]
>+                    [% CASE 'musical' %][% t('(Musical composition)') %]
>+                    [% CASE 'broader' %][% t('(Broader heading)') %]
>+                    [% CASE 'narrower' %][% t('(Narrower heading)') %]
>+                    [% CASE 'parent' %][% t('(Immediate parent body)') %]
>                     [% CASE %]
>                         [% IF type %]([% type | html %])[% END %]
>                     [% END %]
>@@ -89,7 +90,7 @@
>             [% END %]
>         [% ELSE %]
>             [% IF ( summary.seefrom.size >= 1 ) %]
>-                    <span class="seefrom">used for/see from:</span>
>+                    <span class="seefrom">[% t('used for/see from:') %]</span>
>                 [% FOREACH seefro IN summary.seefrom %]
>                     <div class="seefrom authref">
>                     [%# Following on one line for translatability %]
>@@ -98,7 +99,7 @@
>                 [% END %]
>             [% END %]
>             [% IF ( summary.seealso.size >= 1 ) %]
>-                    <span class="seealso">see also:</span>
>+                    <span class="seealso">[% t('see also:') %]</span>
>                 [% FOREACH seeals IN summary.seealso %]
>                     <div class="seealso authref">
>                     [%# Following on one line for translatability %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/av-build-dropbox.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/av-build-dropbox.inc
>index 917406b9a3..b6999b5235 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/av-build-dropbox.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/av-build-dropbox.inc
>@@ -10,7 +10,7 @@
> [% DEFAULT class = '' size = 20 %]
> 
> [% IF avs %]
>-  <select id="[% name %]" name="[% name %]" class="[% class %]" >
>+  <select id="[% name %]" name="[% name %]" class="[% class %]">
>   [% FOR av IN avs %]
>     [% IF av.authorised_value == default %]
>       <option value="[% av.authorised_value %]" selected="selected">[% av.lib | html_entity %]</option>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/date-format.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/date-format.inc
>index f651b74eb0..7de1055a49 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/date-format.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/date-format.inc
>@@ -1 +1,2 @@
>-<span class="dateformat">[% IF ( dateformat == "us" ) %](MM/DD/YYYY)[% ELSIF ( dateformat == "metric" ) %](DD/MM/YYYY)[% ELSE %](YYYY-MM-DD)[% END %]</span>
>+[% PROCESS 'i18n.inc' %]
>+<span class="dateformat">[% IF ( dateformat == "us" ) %][% t('(MM/DD/YYYY)') %][% ELSIF ( dateformat == "metric" ) %][% t('(DD/MM/YYYY)') %][% ELSE %][% t('(YYYY-MM-DD)') %][% END %]</span>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
>index 740d19770d..0eb29866a7 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [%- USE KohaPlugins -%]
> [% USE Asset %]
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>@@ -43,7 +44,7 @@
>         <style>[% SCOUserCSS %]</style>
>     [% END %]
> [% END %]
>-<link rel="unapi-server" type="application/xml" title="unAPI" href="[% OPACBaseURL %]/cgi-bin/koha/unapi" />
>+<link rel="unapi-server" type="application/xml" title="[% t('unAPI') %]" href="[% OPACBaseURL %]/cgi-bin/koha/unapi" />
> [% PROCESS cssinclude %]
> 
> 
>                         <div class="alert alert-info">
>-                            <p>Sorry, your Shibboleth identity does not match a valid library identity. If you have a local login, you may use that below.</p>
>+                            <p>[% t('Sorry, your Shibboleth identity does not match a valid library identity. If you have a local login, you may use that below.') %]</p>
>                         </div>
>                     [% ELSE %]
>-                        <h4>Shibboleth login</h4>
>-                        <p>If you have a Shibboleth account, please <a href="[% shibbolethLoginUrl %]">click here to login</a>.</p>
>-                        <h4>Local Login</h4>
>+                        <h4>[% t('Shibboleth login') %]</h4>
>+                        <p>[% t('If you have a Shibboleth account, please') %] <a href="[% shibbolethLoginUrl %]">[% t('click here to login') %]</a>.</p>
>+                        <h4>[% t('Local Login') %]</h4>
>                     [% END %]
>                 [% END %]
>                 <input type="hidden" name="koha_login_context" value="opac" />
>                 <fieldset class="brief">
>-                    <label for="muserid">Login:</label><input type="text" id="muserid" name="userid" />
>-                    <label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" />
>+                    <label for="muserid">[% t('Login:') %]</label><input type="text" id="muserid" name="userid" />
>+                    <label for="mpassword">[% t('Password:') %]</label><input type="password" id="mpassword" name="password" />
>                     [% IF Koha.Preference( 'OpacLoginInstructions' ) %]
>                         <div id="nologininstructions-modal" class="nologininstructions">
>                             [% Koha.Preference( 'OpacLoginInstructions' ) %]
>@@ -325,19 +326,19 @@
>                     [% END %]
>                     [% IF Koha.Preference('OpacPasswordChange') && Koha.Preference('OpacResetPassword') %]
>                         <div id="forgotpassword-modal" class="forgotpassword">
>-                            <p><a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a></p>
>+                            <p><a href="/cgi-bin/koha/opac-password-recovery.pl">[% t('Forgot your password?') %]</a></p>
>                         </div>
>                     [% END %]
>                     [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
>                         <div id="patronregistration-modal" class="patronregistration">
>-                            <p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p>
>+                            <p>[% t('Don\'t have an account?') %] <a href="/cgi-bin/koha/opac-memberentry.pl">[% t('Register here.') %]</a></p>
>                         </div>
>                     [% END %]
>                 </fieldset>
>             </div>
>             <div class="modal-footer">
>                 <input type="submit" class="btn btn-primary" value="Log in" />
>-                <a href="#" data-dismiss="modal" aria-hidden="true" class="cancel">Cancel</a>
>+                <a href="#" data-dismiss="modal" aria-hidden="true" class="cancel">[% t('Cancel') %]</a>
>             </div>
>         </form> 
>     </div>  
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc
>index aed68e500a..fc64594a90 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [% BLOCK showhierarchy %]
>     [% FOREACH tree IN trees %]
>         [% PROCESS showtree tree = tree %]
>@@ -11,7 +12,7 @@
>             [% IF ( node.current_value ) %]
>                 <span class="currentauth">[% node.value | html %]</span>
>             [% ELSE %]
>-                <a href="opac-authoritiesdetail.pl?authid=[% node.authid %]" title="Term">[% node.value | html %]</a>
>+                <a href="opac-authoritiesdetail.pl?authid=[% node.authid %]" title="[% t('Term') %]">[% node.value | html %]</a>
>             [% END %]
>             [% IF ( node.children && node.children.size > 0 ) %]
>                 [% PROCESS showtree tree = node.children %]
>@@ -24,12 +25,12 @@
> [% BLOCK authtypelabel %]
>     [% UNLESS ( type=='seefrom' || type=='seealso' || type=='' ) %]
>         <span class="type">[% FILTER trim %][% SWITCH type %]
>-        [% CASE 'earlier' %]Earlier heading
>-        [% CASE 'later' %]Later heading
>-        [% CASE 'acronym' %]Acronym
>-        [% CASE 'musical' %]Musical composition
>-        [% CASE 'broader' %]Broader heading
>-        [% CASE 'narrower' %]Narrower heading
>+        [% CASE 'earlier' %][% t('Earlier heading') %]
>+        [% CASE 'later' %][% t('Later heading') %]
>+        [% CASE 'acronym' %][% t('Acronym') %]
>+        [% CASE 'musical' %][% t('Musical composition') %]
>+        [% CASE 'broader' %][% t('Broader heading') %]
>+        [% CASE 'narrower' %][% t('Narrower heading') %]
>         [% CASE %][% type %]
>         [% END %][% END %]</span>
>     [% END %]
>@@ -53,18 +54,18 @@
> 
> [% BLOCK authheadingdisplay %]
>     [% IF authid %]<a href="/cgi-bin/koha/opac-authoritiesdetail.pl?authid=[% authid %]">[% heading %]</a>
>-    [% ELSIF search %]<a href="/cgi-bin/koha/opac-authorities-home.pl?op=do_search&amp;type=opac&amp;operator=contains&amp;marclist=mainentry&amp;and_or=and&amp;orderby=HeadingAsc&amp;value=[% search %]">[% heading %]</a>
>+    [% ELSIF search %]<a href="/cgi-bin/koha/opac-authorities-home.pl?op=do_search&type=opac&operator=contains&marclist=mainentry&and_or=and&orderby=HeadingAsc&value=[% search %]">[% heading %]</a>
>     [% ELSE %][% heading %]
>     [% END %]
> [% END %]
> 
> [% BLOCK language %]
>     [% SWITCH lang %]
>-        [% CASE ['en', 'eng'] %]English
>-        [% CASE ['fr', 'fre'] %]French
>-        [% CASE ['it', 'ita'] %]Italian
>-        [% CASE ['de', 'ger', 'deu'] %]German
>-        [% CASE ['es', 'spa'] %]Spanish
>+        [% CASE ['en', 'eng'] %][% t('English') %]
>+        [% CASE ['fr', 'fre'] %][% t('French') %]
>+        [% CASE ['it', 'ita'] %][% t('Italian') %]
>+        [% CASE ['de', 'ger', 'deu'] %][% t('German') %]
>+        [% CASE ['es', 'spa'] %][% t('Spanish') %]
>         [% CASE %][% lang %]
>     [% END %]
> [% END %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
>index 763d090dad..9d5f6bb1d7 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'i18n.inc' %]
> [%- USE KohaPlugins -%]
> [% USE Asset %]
> [% UNLESS ( is_popup ) %]
>@@ -19,11 +20,11 @@
>             <div class="row-fluid">
>                 <div class="span12">
>                     <div id="koha_url" class="clearfix noprint">
>-                        <p>Powered by
>+                        <p>[% t('Powered by') %]
>                         [% IF template.name.match('opac-main.tt') %]
>-                            <a class="koha_url" href="http://koha-community.org">Koha</a>
>+                            <a class="koha_url" href="http://koha-community.org">[% t('Koha') %]</a>
>                         [% ELSE %]
>-                            <a class="koha_url" rel="nofollow" href="http://koha-community.org">Koha</a>
>+                            <a class="koha_url" rel="nofollow" href="http://koha-community.org">[% t('Koha') %]</a>
>                         [% END %]</p>
>                     </div>
>                 </div> 
>@@ -39,7 +40,7 @@
>                 <div id="changelanguage" class="navbar navbar-fixed-bottom navbar-static-bottom noprint">
>                     <div class="navbar-inner">
>                         <ul id="i18nMenu" class="nav">
>-                            <li><p class="lang navbar-text"><strong>Languages:&nbsp;</strong></p></li>
>+                            <li><p class="lang navbar-text"><strong>[% t('Languages:Â ') %]</strong></p></li>
>                             [% FOREACH languages_loo IN languages_loop %]
>                                 [% IF ( languages_loo.group_enabled ) %]
>                                     [% IF ( languages_loo.plural ) %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
>index e408d0af9e..7a39b46d3d 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
>@@ -1,41 +1,42 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Biblio %]
> <ul id="action">
>     [% UNLESS ( norequests ) %]
>         [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
>             [% IF Koha.Preference( 'RequestOnOpac' ) == 1 %]
>                 [% IF ( ReservableItems ) %]
>-                    <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblio.biblionumber %]">Place hold</a></li>
>+                    <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblio.biblionumber %]">[% t('Place hold') %]</a></li>
>                 [% END %]
>             [% END %]
>         [% END %]
>     [% END %]
> 
>-    <li><a class="print-large" href="#">Print</a></li>
>+    <li><a class="print-large" href="#">[% t('Print') %]</a></li>
> 
>     [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
>         [% IF Koha.Preference('ArticleRequests') %]
>-            <li><a class="article_request" href="/cgi-bin/koha/opac-request-article.pl?biblionumber=[% biblio.biblionumber %]">Request article</a></li>
>+            <li><a class="article_request" href="/cgi-bin/koha/opac-request-article.pl?biblionumber=[% biblio.biblionumber %]">[% t('Request article') %]</a></li>
>         [% END %]
>     [% END %]
> 
>     [% IF Koha.Preference( 'virtualshelves' ) == 1 %]
>         [% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && loggedinusername ) %]
>-            <li><a class="addtoshelf" href="/cgi-bin/koha/opac-addbybiblionumber.pl?biblionumber=[% biblio.biblionumber %]">Save to your lists</a></li>
>+            <li><a class="addtoshelf" href="/cgi-bin/koha/opac-addbybiblionumber.pl?biblionumber=[% biblio.biblionumber %]">[% t('Save to your lists') %]</a></li>
>         [% END %]
>     [% END %]
> 
>     [% IF Koha.Preference( 'opacbookbag' ) == 1 %]
>         [% IF ( incart ) %]
>-            <li><a class="incart cart[% biblio.biblionumber %] addrecord" href="#">In your cart</a> <a class="cartRemove cartR[% biblio.biblionumber %]" href="#">(remove)</a></li>
>+            <li><a class="incart cart[% biblio.biblionumber %] addrecord" href="#">[% t('In your cart') %]</a> <a class="cartRemove cartR[% biblio.biblionumber %]" href="#">[% t('(remove)') %]</a></li>
>         [% ELSE %]
>-            <li><a class="addtocart cart[% biblio.biblionumber %] addrecord" href="#">Add to your cart</a>  <a style="display:none;" class="cartRemove cartR[% biblio.biblionumber %]" href="#">(remove)</a></li>
>+            <li><a class="addtocart cart[% biblio.biblionumber %] addrecord" href="#">[% t('Add to your cart') %]</a>  <a style="display:none;" class="cartRemove cartR[% biblio.biblionumber %]" href="#">[% t('(remove)') %]</a></li>
>         [% END %]
>     [% END %]
> 
>     [% IF ( OpacHighlightedWords && query_desc ) %]
>     <li>
>-        <a href="#" class="highlight_toggle" id="highlight_toggle_off">Unhighlight</a>
>-        <a href="#" class="highlight_toggle" id="highlight_toggle_on">Highlight</a>
>+        <a href="#" class="highlight_toggle" id="highlight_toggle_off">[% t('Unhighlight') %]</a>
>+        <a href="#" class="highlight_toggle" id="highlight_toggle_on">[% t('Highlight') %]</a>
>     </li>
>     [% END %]
> 
>@@ -44,24 +45,24 @@
>         <li>
>             <div id="export">
>                 <div class="dropdown">
>-                    <a id="format" class="dropdown-toggle" data-toggle="dropdown" href="#">Save record <b class="caret"></b></a>
>+                    <a id="format" class="dropdown-toggle" data-toggle="dropdown" href="#">[% t('Save record') %] <b class="caret"></b></a>
>                         <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="format">
>                             [% FOREACH option IN export_options %]
>                                 [% IF option == 'dc' %]
>-                                    <li><a role="menuitem" href="#" data-toggle="modal" data-target="#exportModal_">Dublin Core</a></li>
>+                                    <li><a role="menuitem" href="#" data-toggle="modal" data-target="#exportModal_">[% t('Dublin Core') %]</a></li>
>                                 [% ELSE %]
>                                 <li>
>-                                    <a role="menuitem" href="/cgi-bin/koha/opac-export.pl?op=export&amp;bib=[% biblio.biblionumber %]&amp;format=[% option %]">
>+                                    <a role="menuitem" href="/cgi-bin/koha/opac-export.pl?op=export&bib=[% biblio.biblionumber %]&format=[% option %]">
>                                         [% SWITCH option %]
>-                                            [% CASE 'bibtex' %]BIBTEX
>-                                            [% CASE 'endnote' %]EndNote
>-                                            [% CASE 'marcxml' %]MARCXML
>-                                            [% CASE 'marc8' %]MARC (non-Unicode/MARC-8)
>-                                            [% CASE 'utf8' %]MARC (Unicode/UTF-8)
>-                                            [% CASE 'marcstd' %]MARC (Unicode/UTF-8, Standard)
>-                                            [% CASE 'mods' %]MODS (XML)
>-                                            [% CASE 'ris' %]RIS
>-                                            [% CASE 'isbd' %]ISBD
>+                                            [% CASE 'bibtex' %][% t('BIBTEX') %]
>+                                            [% CASE 'endnote' %][% t('EndNote') %]
>+                                            [% CASE 'marcxml' %][% t('MARCXML') %]
>+                                            [% CASE 'marc8' %][% t('MARC (non-Unicode/MARC-8)') %]
>+                                            [% CASE 'utf8' %][% t('MARC (Unicode/UTF-8)') %]
>+                                            [% CASE 'marcstd' %][% t('MARC (Unicode/UTF-8, Standard)') %]
>+                                            [% CASE 'mods' %][% t('MODS (XML)') %]
>+                                            [% CASE 'ris' %][% t('RIS') %]
>+                                            [% CASE 'isbd' %][% t('ISBD') %]
>                                         [% END %]
>                                     </a>
>                                 </li>
>@@ -77,9 +78,9 @@
>         <li>
>             <div id="moresearches_menu">
>                 <div class="dropdown">
>-                    <a id="furthersearches" class="dropdown-toggle" data-toggle="dropdown" href="#">More searches <b class="caret"></b></a>
>+                    <a id="furthersearches" class="dropdown-toggle" data-toggle="dropdown" href="#">[% t('More searches') %] <b class="caret"></b></a>
>                         <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="furthersearches">
>-                            <li><a href="#" class="menu-inactive">Search for this title in:</a></li>
>+                            <li><a href="#" class="menu-inactive">[% t('Search for this title in:') %]</a></li>
>                             [% OPACSearchForTitleIn %]
>                         </ul>
>                 </div>
>@@ -91,28 +92,28 @@
> 
> <div class="modal hide" id="exportModal_" tabindex="-1" role="dialog" aria-labelledby="exportLabelexportModal_" aria-hidden="true">
>     <div class="modal-header">
>-        <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">&times;</button>
>-        <h3 class="modal-title" id="exportModalLabel">Exporting to Dublin Core...</h3>
>+        <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button>
>+        <h3 class="modal-title" id="exportModalLabel">[% t('Exporting to Dublin Core...') %]</h3>
>     </div>
>     <form method="get" action="/cgi-bin/koha/opac-export.pl">
>     <div class="modal-body">
>         <fieldset id="dc_fieldset">
>                 <input id="input-simple" type="radio" name="format" value="rdfdc">
>-                <label class="label_dc" for="input-simple">Simple DC-RDF</label>
>+                <label class="label_dc" for="input-simple">[% t('Simple DC-RDF') %]</label>
>                 <br>
>-                <input id="input-oai" type="radio" name="format" value="oaidc" checked>
>-                <label class="label_dc" for="input-oai">OAI-DC</label>
>+                <input id="input-oai" type="radio" name="format" value="oaidc" checked="">
>+                <label class="label_dc" for="input-oai">[% t('OAI-DC') %]</label>
>                 <br>
>                 <input id="input-srw" type="radio" name="format" value="srwdc">
>-                <label class="label_dc" for="input-srw">SRW-DC</label>
>+                <label class="label_dc" for="input-srw">[% t('SRW-DC') %]</label>
>                 <br>
>         <input type="hidden" name="op" value="export">
>         <input type="hidden" name="bib" value="[% biblio.biblionumber %]">
>         </fieldset>
>     </div>
>     <div class="modal-footer">
>-        <button type="submit" class="btn">Export</button>
>-        <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button>
>+        <button type="submit" class="btn">[% t('Export') %]</button>
>+        <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">[% t('Cancel') %]</button>
>     </div>
>     </form>
> </div>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
>index 31089ef534..e6d033aa4a 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
>@@ -1,50 +1,51 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE AuthorisedValues %]
> [% IF ( opacfacets && facets_loop && total ) %]
>     <div id="search-facets">
>-        <h4><a href="#" class="menu-collapse-toggle">Refine your search</a></h4>
>+        <h4><a href="#" class="menu-collapse-toggle">[% t('Refine your search') %]</a></h4>
>         <ul class="menu-collapse">
>-            <li id="availability_facet"><h5 id="facet-availability">Availability</h5>
>+            <li id="availability_facet"><h5 id="facet-availability">[% t('Availability') %]</h5>
>                 <ul>
>                     <li>
>                         [% IF ( available ) %]
>-                            <strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi_not_availablity %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]">Show all items</a>
>+                            <strong>[% t('Showing only available items') %]</strong></li><li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi_not_availablity %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]">[% t('Show all items') %]</a>
>                         [% ELSE %]
>-                            <a href="/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi |url %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]&amp;limit=available">Limit to currently available items.</a>
>+                            <a href="/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi |url %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]&limit=available">[% t('Limit to currently available items.') %]</a>
>                         [% END %]
>                     </li>
>                 </ul>
>-                [% IF ( related ) %] <li>(related searches: [% FOREACH relate IN related %][% relate.related_search %][% END %])</li>[% END %]
>+                [% IF ( related ) %] <li>[% t('(related searches:') %] [% FOREACH relate IN related %][% relate.related_search %][% END %])</li>[% END %]
>             </li>
> 
>             [% FOREACH facets_loo IN facets_loop %]
>                 [% IF facets_loo.facets.size > 0 %]
>                     <li id="[% facets_loo.type_id %]">
>-                        [% IF facets_loo.type_label_Authors %]<h5 id="facet-authors">Authors</h5>[% END %]
>-                        [% IF facets_loo.type_label_Titles %]<h5 id="facet-titles">Titles</h5>[% END %]
>-                        [% IF facets_loo.type_label_Topics %]<h5 id="facet-topics">Topics</h5>[% END %]
>-                        [% IF facets_loo.type_label_Places %]<h5 id="facet-places">Places</h5>[% END %]
>-                        [% IF facets_loo.type_label_Series %]<h5 id="facet-series">Series</h5>[% END %]
>-                        [% IF facets_loo.type_label_ItemTypes %]<h5 id="facet-itemtypes">Item types</h5>[% END %]
>-                        [% IF facets_loo.type_label_CollectionCodes %]<h5 id="facet-itemtypes">Collections</h5>[% END %]
>+                        [% IF facets_loo.type_label_Authors %]<h5 id="facet-authors">[% t('Authors') %]</h5>[% END %]
>+                        [% IF facets_loo.type_label_Titles %]<h5 id="facet-titles">[% t('Titles') %]</h5>[% END %]
>+                        [% IF facets_loo.type_label_Topics %]<h5 id="facet-topics">[% t('Topics') %]</h5>[% END %]
>+                        [% IF facets_loo.type_label_Places %]<h5 id="facet-places">[% t('Places') %]</h5>[% END %]
>+                        [% IF facets_loo.type_label_Series %]<h5 id="facet-series">[% t('Series') %]</h5>[% END %]
>+                        [% IF facets_loo.type_label_ItemTypes %]<h5 id="facet-itemtypes">[% t('Item types') %]</h5>[% END %]
>+                        [% IF facets_loo.type_label_CollectionCodes %]<h5 id="facet-itemtypes">[% t('Collections') %]</h5>[% END %]
>                         [% UNLESS singleBranchMode %]
>-                            [% IF ( facets_loo.type_label_HomeLibrary ) %]<h5 id="facet-home-libraries">Home libraries</h5>[% END %]
>-                            [% IF ( facets_loo.type_label_HoldingLibrary ) %]<h5 id="facet-holding-libraries">Holding libraries</h5>[% END %]
>+                            [% IF ( facets_loo.type_label_HomeLibrary ) %]<h5 id="facet-home-libraries">[% t('Home libraries') %]</h5>[% END %]
>+                            [% IF ( facets_loo.type_label_HoldingLibrary ) %]<h5 id="facet-holding-libraries">[% t('Holding libraries') %]</h5>[% END %]
>                         [% END %]
>-                        [% IF facets_loo.type_label_Location %]<h5 id="facet-locations">Locations</h5>[% END %]
>+                        [% IF facets_loo.type_label_Location %]<h5 id="facet-locations">[% t('Locations') %]</h5>[% END %]
>                         <ul>
>                             [% SET url = "/cgi-bin/koha/opac-search.pl?" _ query_cgi _ limit_cgi %]
>                             [% IF ( sort_by ) %]
>-                              [% url = BLOCK %][% url %][% "&amp;sort_by=" _ sort_by |url %][% END %]
>+                              [% url = BLOCK %][% url %][% "&sort_by=" _ sort_by |url %][% END %]
>                             [% END %]
>                             [% FOREACH facet IN facets_loo.facets %]
>                             [% IF facets_loo.type_label_CollectionCodes %][% SET facet.facet_label_value = AuthorisedValues.GetByCode('CCODE',facet.facet_label_value,1) || facet.facet_label_value %][% END %]
>                                 <li>
>                                   [% IF facet.active %]
>-                                    [% SET local_url = url _ "&amp;nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
>+                                    [% SET local_url = url _ "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
>                                     <span class="facet-label">[% facet.facet_label_value %]</span>
>-                                    [<a href="[% local_url %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
>+                                    [<a href="[% local_url %]" title="[% t('Remove facet') %] [% facet.facet_link_value | html %]">[% t('x') %]</a>]
>                                   [% ELSE %]
>-                                    [% SET local_url = url _ "&amp;limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
>+                                    [% SET local_url = url _ "&limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
>                                     <span class="facet-label"><a href="[% local_url %]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a></span>
>                                     [% IF ( displayFacetCount ) %]
>                                       <span class="facet-count"> ([% facet.facet_count %])</span>
>@@ -54,7 +55,7 @@
>                             [% END %]
>                             [% IF ( facets_loo.expandable ) %]
>                                 <li class="showmore">
>-                                    <a href="[% url %][% IF offset %]&amp;offset=[% offset |url %][% END %]&amp;expand=[% facets_loo.expand |url %]#[% facets_loo.type_id |url %]">Show more</a>
>+                                    <a href="[% url %][% IF offset %]&offset=[% offset |url %][% END %]&expand=[% facets_loo.expand |url %]#[% facets_loo.type_id |url %]">[% t('Show more') %]</a>
>                                 </li>
>                             [% END %]
>                         </ul>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc
>index e2b3d67d08..c30ad263c4 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc
>@@ -1,11 +1,12 @@
>+[% PROCESS 'i18n.inc' %]
> [% IF patron_messages.count OR opacnote %]
>     <div class="alert alert-info">
>-        <h3>Messages for you</h3>
>+        <h3>[% t('Messages for you') %]</h3>
>         <ul>
>             [% FOREACH message IN patron_messages %]
>                 <li>
>                     <strong>[% message.message %]</strong><br>
>-                    &nbsp;&nbsp;&nbsp;<i>Written on [% message.message_date | $KohaDates %] by [% Branches.GetName(message.branchcode) %]</i>
>+                    Â Â Â <i>[% t('Written on') %] [% message.message_date | $KohaDates %] [% t('by') %] [% Branches.GetName(message.branchcode) %]</i>
>                 </li>
>             [% END %]
> 
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc
>index dd447130cb..9b00c1ce30 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc
>@@ -1,26 +1,27 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> [% USE Branches %]
> [% PROCESS 'html_helpers.inc' %]
> 
> <div id="search-facets">
>     <form method="get" action="/cgi-bin/koha/opac-topissues.pl">
>-    <h4><a href="#" class="menu-collapse-toggle">Refine your search</a></h4>
>+    <h4><a href="#" class="menu-collapse-toggle">[% t('Refine your search') %]</a></h4>
>             <ul class="menu-collapse">
>-                <li><label for="limit">Show the top </label>
>+                <li><label for="limit">[% t('Show the top') %] </label>
>                             <select name="limit" id="limit">
>-                                [% IF ( limit == 10 ) %]<option value ="10" selected="selected">10 titles</option>[% ELSE %]<option value="10">10 titles</option>[% END %]
>-                                [% IF ( limit == 15 ) %]<option value ="15" selected="selected">15 titles</option>[% ELSE %]<option value="15">15 titles</option>[% END %]
>-                                [% IF ( limit == 20 ) %]<option value ="20" selected="selected">20 titles</option>[% ELSE %]<option value="20">20 titles</option>[% END %]
>-                                [% IF ( limit == 30 ) %]<option value ="30" selected="selected">30 titles</option>[% ELSE %]<option value="30">30 titles</option>[% END %]
>-                                [% IF ( limit == 40 ) %]<option value ="40" selected="selected">40 titles</option>[% ELSE %]<option value="40">40 titles</option>[% END %]
>-                                [% IF ( limit == 50 ) %]<option value ="50" selected="selected">50 titles</option>[% ELSE %]<option value="50">50 titles</option>[% END %]
>-                                [% IF ( limit == 100 ) %]<option value ="100" selected="selected">100 titles</option>[% ELSE %]<option value="100">100 titles</option>[% END %]
>+                                [% IF ( limit == 10 ) %]<option value="10" selected="selected">[% t('10 titles') %]</option>[% ELSE %]<option value="10">[% t('10 titles') %]</option>[% END %]
>+                                [% IF ( limit == 15 ) %]<option value="15" selected="selected">[% t('15 titles') %]</option>[% ELSE %]<option value="15">[% t('15 titles') %]</option>[% END %]
>+                                [% IF ( limit == 20 ) %]<option value="20" selected="selected">[% t('20 titles') %]</option>[% ELSE %]<option value="20">[% t('20 titles') %]</option>[% END %]
>+                                [% IF ( limit == 30 ) %]<option value="30" selected="selected">[% t('30 titles') %]</option>[% ELSE %]<option value="30">[% t('30 titles') %]</option>[% END %]
>+                                [% IF ( limit == 40 ) %]<option value="40" selected="selected">[% t('40 titles') %]</option>[% ELSE %]<option value="40">[% t('40 titles') %]</option>[% END %]
>+                                [% IF ( limit == 50 ) %]<option value="50" selected="selected">[% t('50 titles') %]</option>[% ELSE %]<option value="50">[% t('50 titles') %]</option>[% END %]
>+                                [% IF ( limit == 100 ) %]<option value="100" selected="selected">[% t('100 titles') %]</option>[% ELSE %]<option value="100">[% t('100 titles') %]</option>[% END %]
>                             </select></li>
> 
>                 [% IF Branches.all.size > 1 %]
>-                <li><label for="branch">From: </label>
>+                <li><label for="branch">[% t('From:') %] </label>
>                             <select name="branch" id="branch">
>-                                <option value="">All libraries</option>
>+                                <option value="">[% t('All libraries') %]</option>
>                                 [% PROCESS options_for_libraries libraries => Branches.all( selected => branch ) %]
>                             </select></li>
>                 [% END %]
>@@ -28,9 +29,9 @@
>                 [% AdvancedSearchTypes = Koha.Preference('AdvancedSearchTypes').split('\|') %]
>                 [% IF AdvancedSearchTypes.grep('^itemtypes$').size %]
>                     <li>
>-                        <label for="itemtype">Limit to: </label>
>+                        <label for="itemtype">[% t('Limit to:') %] </label>
>                         <select name="itemtype" id="itemtype">
>-                            <option value="">All item types</option>
>+                            <option value="">[% t('All item types') %]</option>
>                             [% FOREACH itemtype IN ItemTypes.Get() %]
>                                 [% IF itemtype.itemtype == selected_itemtype %]
>                                     <option value="[% itemtype.itemtype %]" selected="selected">
>@@ -46,9 +47,9 @@
> 
>                 [% IF AdvancedSearchTypes.grep('^ccode$').size %]
>                     <li>
>-                        <label for="ccode">Limit to:</label>
>+                        <label for="ccode">[% t('Limit to:') %]</label>
>                         <select name="ccode" id="ccode">
>-                            <option value="">All collections</option>
>+                            <option value="">[% t('All collections') %]</option>
>                             [% FOREACH ccode IN AuthorisedValues.Get('CCODE', 1) %]
>                                 [% IF ccode.authorised_value == selected_ccode %]
>                                     <option value="[% ccode.authorised_value %]" selected="selected">
>@@ -62,27 +63,27 @@
>                     </li>
>                 [% END %]
> 
>-                <li><label for="timeLimit">Acquired in the last:</label>
>+                <li><label for="timeLimit">[% t('Acquired in the last:') %]</label>
>                             <select name="timeLimit" id="timeLimit">
>                                 [% IF ( timeLimit == 3 ) %]
>-                                    <option value="3" selected="selected">3 months</option>
>+                                    <option value="3" selected="selected">[% t('3 months') %]</option>
>                                 [% ELSE %]
>-                                    <option value="3">3 months</option>
>+                                    <option value="3">[% t('3 months') %]</option>
>                                 [% END %]
>                                 [% IF ( timeLimit == 6 ) %]
>-                                    <option value="6" selected="selected">6 months</option>
>+                                    <option value="6" selected="selected">[% t('6 months') %]</option>
>                                 [% ELSE %]
>-                                    <option value="6">6 months</option>
>+                                    <option value="6">[% t('6 months') %]</option>
>                                 [% END %]
>                                 [% IF ( timeLimit == 12 ) %]
>-                                    <option value="12" selected="selected">12 months</option>
>+                                    <option value="12" selected="selected">[% t('12 months') %]</option>
>                                 [% ELSE %]
>-                                    <option value="12">12 months</option>
>+                                    <option value="12">[% t('12 months') %]</option>
>                                 [% END %]
>                                 [% IF ( timeLimit == 999 ) %]
>-                                    <option value="999" selected="selected">No limit</option>
>+                                    <option value="999" selected="selected">[% t('No limit') %]</option>
>                                 [% ELSE %]
>-                                    <option value="999">No limit</option>
>+                                    <option value="999">[% t('No limit') %]</option>
>                                 [% END %]
>                             </select></li>
>                 <li>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/openlibrary-readapi.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/openlibrary-readapi.inc
>index 91cf4d7704..93f3a9a4c1 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/openlibrary-readapi.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/openlibrary-readapi.inc
>@@ -1,4 +1,5 @@
>+[% PROCESS 'i18n.inc' %]
> [%# Input params: bib - search result biblio record %]
> [% IF OpenLibrarySearch && ( bib.normalized_isbn || bib.lccn || bib.normalized_oclc ) %]
>-    <div class="ol_readapi_book" isbn="[% bib.normalized_isbn %]" lccn="[% bib.lccn %]" oclc="[% bib.normalized_oclc %]">Open Library: </div>
>+    <div class="ol_readapi_book" isbn="[% bib.normalized_isbn %]" lccn="[% bib.lccn %]" oclc="[% bib.normalized_oclc %]">[% t('Open Library:') %] </div>
> [% END %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/overdrive-checkout.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/overdrive-checkout.inc
>index a8d60bb311..c3600c33d9 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/overdrive-checkout.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/overdrive-checkout.inc
>@@ -1,19 +1,20 @@
>+[% PROCESS 'i18n.inc' %]
> <div id="overdrive-checkout" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="overdrive-checkout-label" aria-hidden="true">
>     <div class="modal-header">
>         <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button>
>-        <h3 id="overdrive-checkout-label">Checkout</h3>
>+        <h3 id="overdrive-checkout-label">[% t('Checkout') %]</h3>
>     </div>
>     <form action="#" method="post" id="overdrive-checkout-form">
>         <div class="modal-body">
>                 <input type="hidden" name="id" value="" />
>                 <fieldset class="brief">
>-                    <label for="format">Format:</label>
>+                    <label for="format">[% t('Format:') %]</label>
>                     <ul class="overdrive-format-list">
>                 </fieldset>
>         </div>
>         <div class="modal-footer">
>             <input type="submit" class="btn btn-primary overdrive-checkout-submit" value="Checkout" />
>-            <a href="#" data-dismiss="modal" aria-hidden="true" class="cancel">Cancel</a>
>+            <a href="#" data-dismiss="modal" aria-hidden="true" class="cancel">[% t('Cancel') %]</a>
>         </div>
>     </form> 
> </div>  
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc
>index fbfdfc8124..66e758682c 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc
>@@ -1,20 +1,21 @@
>+[% PROCESS 'i18n.inc' %]
> [% IF ( PAGE_NUMBERS ) %]
>     <div class="pagination pagination-small noprint">
>         <ul>
>             [% IF ( previous_page_offset.defined ) %]
>-                <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |html %][% END %]">First</a></li>
>-                <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;offset=[% previous_page_offset %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |html %][% END %]">&laquo; Previous</a></li>
>+                <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&sort_by=[% sort_by |html %][% END %]">[% t('First') %]</a></li>
>+                <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&offset=[% previous_page_offset %][% IF ( sort_by ) %]&sort_by=[% sort_by |html %][% END %]">[% t('Â« Previous') %]</a></li>
>             [% END %]
>             [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %]
>                 [% IF ( PAGE_NUMBER.highlight ) %]
>                     <li class="active"><a href="#">[% PAGE_NUMBER.pg %]</a></li>
>                 [% ELSE %]
>-                    <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;offset=[% PAGE_NUMBER.offset %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |html%][% END %]">[% PAGE_NUMBER.pg %]</a></li>
>+                    <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&offset=[% PAGE_NUMBER.offset %][% IF ( sort_by ) %]&sort_by=[% sort_by |html%][% END %]">[% PAGE_NUMBER.pg %]</a></li>
>                 [% END %]
>             [% END %]
>             [% IF ( next_page_offset ) %]
>-                <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;offset=[% next_page_offset %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |html %][% END %]">Next &raquo;</a></li>
>-                <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;offset=[% last_page_offset %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |html %][% END %]">Last</a></li>
>+                <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&offset=[% next_page_offset %][% IF ( sort_by ) %]&sort_by=[% sort_by |html %][% END %]">[% t('Next Â»') %]</a></li>
>+                <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&offset=[% last_page_offset %][% IF ( sort_by ) %]&sort_by=[% sort_by |html %][% END %]">[% t('Last') %]</a></li>
>             [% END %]
>         </ul>
>     </div>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/resort_form.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/resort_form.inc
>index c5a30f6e6b..4b77ecbe8b 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/resort_form.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/resort_form.inc
>@@ -1,71 +1,72 @@
>-<option value="relevance">Relevance</option>
>-<optgroup label="Popularity">
>+[% PROCESS 'i18n.inc' %]
>+<option value="relevance">[% t('Relevance') %]</option>
>+<optgroup label="[% t('Popularity') %]">
>     [% IF ( sort_by == "popularity_dsc" ) %]
>-        <option value="popularity_dsc" selected="selected">Popularity (most to least)</option>
>+        <option value="popularity_dsc" selected="selected">[% t('Popularity (most to least)') %]</option>
>     [% ELSE %]
>-        <option value="popularity_dsc">Popularity (most to least)</option>
>+        <option value="popularity_dsc">[% t('Popularity (most to least)') %]</option>
>     [% END %]
>     [% IF ( sort_by == "popularity_asc" ) %]
>-        <option value="popularity_asc" selected="selected">Popularity (least to most)</option>
>+        <option value="popularity_asc" selected="selected">[% t('Popularity (least to most)') %]</option>
>     [% ELSE %]
>-        <option value="popularity_asc">Popularity (least to most)</option>
>+        <option value="popularity_asc">[% t('Popularity (least to most)') %]</option>
>     [% END %]
> </optgroup>
>-<optgroup label="Author">
>+<optgroup label="[% t('Author') %]">
>     [% IF ( sort_by == "author_az" || sort_by == "author_asc" ) %]
>-        <option value="author_az" selected="selected">Author (A-Z)</option>
>+        <option value="author_az" selected="selected">[% t('Author (A-Z)') %]</option>
>     [% ELSE %]
>-        <option value="author_az">Author (A-Z)</option>
>+        <option value="author_az">[% t('Author (A-Z)') %]</option>
>     [% END %]
>     [% IF ( sort_by == "author_za" || sort_by == "author_dsc" ) %]
>-        <option value="author_za" selected="selected">Author (Z-A)</option>
>+        <option value="author_za" selected="selected">[% t('Author (Z-A)') %]</option>
>     [% ELSE %]
>-        <option value="author_za">Author (Z-A)</option>
>+        <option value="author_za">[% t('Author (Z-A)') %]</option>
>     [% END %]
> </optgroup>
>-<optgroup label="Call Number">
>+<optgroup label="[% t('Call Number') %]">
>     [% IF ( sort_by == "call_number_asc" ) %]
>-        <option value="call_number_asc" selected="selected">Call number (0-9 to A-Z)</option>
>+        <option value="call_number_asc" selected="selected">[% t('Call number (0-9 to A-Z)') %]</option>
>     [% ELSE %]
>-        <option value="call_number_asc">Call number (0-9 to A-Z)</option>
>+        <option value="call_number_asc">[% t('Call number (0-9 to A-Z)') %]</option>
>     [% END %]
>     [% IF ( sort_by == "call_number_dsc" ) %]
>-        <option value="call_number_dsc" selected="selected">Call number (Z-A to 9-0)</option>
>+        <option value="call_number_dsc" selected="selected">[% t('Call number (Z-A to 9-0)') %]</option>
>     [% ELSE %]
>-        <option value="call_number_dsc">Call number (Z-A to 9-0)</option>
>+        <option value="call_number_dsc">[% t('Call number (Z-A to 9-0)') %]</option>
>     [% END %]
> </optgroup>
>-<optgroup label="Dates">
>+<optgroup label="[% t('Dates') %]">
>     [% IF ( sort_by == "pubdate_dsc" ) %]
>-        <option value="pubdate_dsc" selected="selected">Publication/Copyright date: Newest to oldest</option>
>+        <option value="pubdate_dsc" selected="selected">[% t('Publication/Copyright date: Newest to oldest') %]</option>
>     [% ELSE %]
>-        <option value="pubdate_dsc">Publication/Copyright date: Newest to oldest</option>
>+        <option value="pubdate_dsc">[% t('Publication/Copyright date: Newest to oldest') %]</option>
>     [% END %]
>     [% IF ( sort_by == "pubdate_asc" ) %]
>-        <option value="pubdate_asc" selected="selected">Publication/Copyright date: Oldest to newest</option>
>+        <option value="pubdate_asc" selected="selected">[% t('Publication/Copyright date: Oldest to newest') %]</option>
>     [% ELSE %]
>-        <option value="pubdate_asc">Publication/Copyright date: Oldest to newest</option>
>+        <option value="pubdate_asc">[% t('Publication/Copyright date: Oldest to newest') %]</option>
>     [% END %]
>     [% IF ( sort_by == "acqdate_dsc" ) %]
>-        <option value="acqdate_dsc" selected="selected">Acquisition date: Newest to oldest</option>
>+        <option value="acqdate_dsc" selected="selected">[% t('Acquisition date: Newest to oldest') %]</option>
>     [% ELSE %]
>-        <option value="acqdate_dsc">Acquisition date: Newest to oldest</option>
>+        <option value="acqdate_dsc">[% t('Acquisition date: Newest to oldest') %]</option>
>     [% END %]
>     [% IF ( sort_by == "acqdate_asc" ) %]
>-        <option value="acqdate_asc" selected="selected">Acquisition date: Oldest to newest</option>
>+        <option value="acqdate_asc" selected="selected">[% t('Acquisition date: Oldest to newest') %]</option>
>     [% ELSE %]
>-        <option value="acqdate_asc">Acquisition date: Oldest to newest</option>
>+        <option value="acqdate_asc">[% t('Acquisition date: Oldest to newest') %]</option>
>     [% END %]
> </optgroup>
>-<optgroup label="Title">
>+<optgroup label="[% t('Title') %]">
>     [% IF ( sort_by == "title_az" || sort_by == "title_asc" ) %]
>-        <option value="title_az" selected="selected">Title (A-Z)</option>
>+        <option value="title_az" selected="selected">[% t('Title (A-Z)') %]</option>
>     [% ELSE %]
>-        <option value="title_az">Title (A-Z)</option>
>+        <option value="title_az">[% t('Title (A-Z)') %]</option>
>     [% END %]
>     [% IF ( sort_by == "title_za" || sort_by == "title_dsc" ) %]
>-        <option value="title_za" selected="selected">Title (Z-A)</option>
>+        <option value="title_za" selected="selected">[% t('Title (Z-A)') %]</option>
>     [% ELSE %]
>-        <option value="title_za">Title (Z-A)</option>
>+        <option value="title_za">[% t('Title (Z-A)') %]</option>
>     [% END %]
> </optgroup>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/search/facets.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/search/facets.inc
>index 93c8b0f591..16bedc4667 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/search/facets.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/search/facets.inc
>@@ -1,6 +1,7 @@
>+[% PROCESS 'i18n.inc' %]
> [% IF facets_loop %]
>   <div id="search-facets">
>-    <h4>Refine your search</h4>
>+    <h4>[% t('Refine your search') %]</h4>
>     <ul>
>       [% FOR facets IN facets_loop %]
>         <li>
>@@ -23,10 +24,10 @@
>                   [% END %]
>                   [% FOR f IN filters %]
>                     [% UNLESS f.var == facets.indexname && f.val == value.value %]
>-                      [% SET url = url _ '&filters=' _ f.var _ ':&quot;' _ f.val _ '&quot;' %]
>+                      [% SET url = url _ '&filters=' _ f.var _ ':"' _ f.val _ '"' %]
>                     [% END %]
>                   [% END %]
>-                  [<a href="[% url |url %]">x</a>]
>+                  [<a href="[% url |url %]">[% t('x') %]</a>]
>                 [% ELSE %]
>                   [% SET url = "/cgi-bin/koha/opac-search.pl?" %]
>                   [% SET first = 1 %]
>@@ -40,9 +41,9 @@
>                     [% END %]
>                   [% END %]
>                   [% FOR f IN filters %]
>-                    [% SET url = url _ '&filters=' _ f.var _ ':&quot;' _ f.val _ '&quot;' %]
>+                    [% SET url = url _ '&filters=' _ f.var _ ':"' _ f.val _ '"' %]
>                   [% END %]
>-                  [% SET url = url _ '&filters=' _ facets.indexname _ ':&quot;' _ value.value _ '&quot;' %]
>+                  [% SET url = url _ '&filters=' _ facets.indexname _ ':"' _ value.value _ '"' %]
> 
>                   <a href="[% url |url %]">[% value.lib %]</a> ([% value.count %])
>                 [% END %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/search/page-numbers.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/search/page-numbers.inc
>index 2de511fa55..d6e0aa23e0 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/search/page-numbers.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/search/page-numbers.inc
>@@ -1,17 +1,18 @@
>+[% PROCESS 'i18n.inc' %]
> [% IF ( PAGE_NUMBERS ) %]
>   <div class="pages">
>     [% IF ( previous_page ) %]
>-      <a class="nav" href="?[% FOREACH fp IN follower_params %][% fp.var |url %]=[% fp.val |url %]&amp;[% END %]page=[% previous_page |url %]">&lt;&lt; Previous</a>
>+      <a class="nav" href="?[% FOREACH fp IN follower_params %][% fp.var |url %]=[% fp.val |url %]&[% END %]page=[% previous_page |url %]">[% t('&lt;&lt; Previous') %]</a>
>     [% END %]
>     [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %]
>       [% IF ( PAGE_NUMBER.current ) %]
>         <span class="current">[% PAGE_NUMBER.page %]</span>
>       [% ELSE %]
>-        <a class="nav" href="?[% FOREACH fp IN follower_params %][% fp.var |url %]=[% fp.val |url %]&amp;[% END %]page=[% PAGE_NUMBER.page |url %]">[% PAGE_NUMBER.page %]</a>
>+        <a class="nav" href="?[% FOREACH fp IN follower_params %][% fp.var |url %]=[% fp.val |url %]&[% END %]page=[% PAGE_NUMBER.page |url %]">[% PAGE_NUMBER.page %]</a>
>       [% END %]
>     [% END %]
>     [% IF ( next_page ) %]
>-      <a class="nav" href="?[% FOREACH fp IN follower_params %][% fp.var |url %]=[% fp.val |url %]&amp;[% END %]page=[% next_page |url %]">Next &gt;&gt;</a>
>+      <a class="nav" href="?[% FOREACH fp IN follower_params %][% fp.var |url %]=[% fp.val |url %]&[% END %]page=[% next_page |url %]">[% t('Next &gt;&gt;') %]</a>
>     [% END %]
>   </div>
> [% END %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/search/resort_form.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/search/resort_form.inc
>index 88c9f66c06..5f7750b3a5 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/search/resort_form.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/search/resort_form.inc
>@@ -1,23 +1,24 @@
>+[% PROCESS 'i18n.inc' %]
> [% IF sort_by == "score asc" %]
>-  <option value="score asc" selected="selected">Relevance asc</option>
>+  <option value="score asc" selected="selected">[% t('Relevance asc') %]</option>
> [% ELSE %]
>-  <option value="score asc">Relevance asc</option>
>+  <option value="score asc">[% t('Relevance asc') %]</option>
> [% END %]
> [% IF sort_by == "score desc" %]
>-  <option value="score desc" selected="selected">Relevance desc</option>
>+  <option value="score desc" selected="selected">[% t('Relevance desc') %]</option>
> [% ELSE %]
>-  <option value="score desc">Relevance desc</option>
>+  <option value="score desc">[% t('Relevance desc') %]</option>
> [% END %]
> 
> [% FOREACH ind IN sortable_indexes %]
>   [% IF sort_by == "$ind.code asc" %]
>-    <option value="[% ind.code %] asc" selected="selected">[% ind.label %] asc</option>
>+    <option value="[% ind.code %] asc" selected="selected">[% ind.label %] [% t('asc') %]</option>
>   [% ELSE %]
>-    <option value="[% ind.code %] asc">[% ind.label %] asc</option>
>+    <option value="[% ind.code %] asc">[% ind.label %] [% t('asc') %]</option>
>   [% END %]
>   [% IF sort_by == "$ind.code desc" %]
>-    <option value="[% ind.code %] desc" selected="selected">[% ind.label %] desc</option>
>+    <option value="[% ind.code %] desc" selected="selected">[% ind.label %] [% t('desc') %]</option>
>   [% ELSE %]
>-    <option value="[% ind.code %] desc">[% ind.label %] desc</option>
>+    <option value="[% ind.code %] desc">[% ind.label %] [% t('desc') %]</option>
>   [% END %]
> [% END %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc
>index 161f279499..271c7148bd 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc
>@@ -1,11 +1,12 @@
>+[% PROCESS 'i18n.inc' %]
> [% BLOCK shelfbrowser %]
>     [% IF OpenOPACShelfBrowser %]
>         <div id="shelfbrowser">
>             <h5 style="text-align: center;">
>-                [% IF ( starting_homebranch ) %]Browsing [% starting_homebranch %] Shelves[% END %]
>-                [% IF ( starting_location ) %], Shelving location: [% starting_location %][% END %]
>-                [% IF ( starting_ccode ) %], Collection code: [% starting_ccode %][% END %]
>-                <a style="font-size: 75%;" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]" class="close_shelf" >Close shelf browser</a>
>+                [% IF ( starting_homebranch ) %][% t('Browsing') %] [% starting_homebranch %] [% t('Shelves') %][% END %]
>+                [% IF ( starting_location ) %][% t(', Shelving location:') %] [% starting_location %][% END %]
>+                [% IF ( starting_ccode ) %][% t(', Collection code:') %] [% starting_ccode %][% END %]
>+                <a style="font-size: 75%;" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]" class="close_shelf">[% t('Close shelf browser') %]</a>
>             </h5>
> 
>             <table class="table">
>@@ -13,14 +14,14 @@
>                     <td rowspan="2">
>                       [% IF shelfbrowser_prev_item %]
>                         <div id="browser_previous">
>-                            <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% shelfbrowser_prev_item.biblionumber %]&amp;shelfbrowse_itemnumber=[% shelfbrowser_prev_item.itemnumber %]#shelfbrowser" data-prev-itemnumber="[% shelfbrowser_prev_item.itemnumber %]">Previous</a>
>+                            <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% shelfbrowser_prev_item.biblionumber %]&shelfbrowse_itemnumber=[% shelfbrowser_prev_item.itemnumber %]#shelfbrowser" data-prev-itemnumber="[% shelfbrowser_prev_item.itemnumber %]">[% t('Previous') %]</a>
>                         </div>
>                       [% END %]
>                     </td>
> 
>                     [% FOREACH item IN shelfbrowser_items %]
>                         <td>
>-                            <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% item.biblionumber %]&amp;shelfbrowse_itemnumber=[% item.itemnumber %]#shelfbrowser">
>+                            <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% item.biblionumber %]&shelfbrowse_itemnumber=[% item.itemnumber %]#shelfbrowser">
>                                 [% IF ( OPACLocalCoverImages ) %]
>                                     <div title="[% item.biblionumber |url %]" class="[% item.biblionumber %] thumbnail-shelfbrowser" id="local-thumbnail-shelf-[% item.biblionumber %]"></div>
>                                 [% END %]
>@@ -28,7 +29,7 @@
>                                     [% IF ( item.browser_normalized_isbn ) %]
>                                         <img src="https://images-na.ssl-images-amazon.com/images/P/[% item.browser_normalized_isbn %].01._AA75_PU_PU-5_.jpg" alt="" />
>                                     [% ELSE %]
>-                                        <span class="no-image">No cover image available</span>
>+                                        <span class="no-image">[% t('No cover image available') %]</span>
>                                     [% END %]
>                                 [% END %]
> 
>@@ -36,12 +37,12 @@
>                                     [% IF ( SyndeticsCoverImages ) %]
>                                         [% IF ( content_identifier_exists ) %]
>                                             [% IF ( using_https ) %]
>-                                                <img src="https://secure.syndetics.com/index.aspx?isbn=[% item.browser_normalized_isbn %]/SC.GIF&amp;client=[% SyndeticsClientCode %][% IF ( item.browser_normalized_upc ) %]&amp;upc=[% item.browser_normalized_upc %][% END %][% IF ( item.browser_normalized_oclc ) %]&amp;oclc=[% item.browser_normalized_oclc %][% END %]&amp;type=xw10" alt="" />
>+                                                <img src="https://secure.syndetics.com/index.aspx?isbn=[% item.browser_normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %][% IF ( item.browser_normalized_upc ) %]&upc=[% item.browser_normalized_upc %][% END %][% IF ( item.browser_normalized_oclc ) %]&oclc=[% item.browser_normalized_oclc %][% END %]&type=xw10" alt="" />
>                                             [% ELSE %]
>-                                                <img src="http://www.syndetics.com/index.aspx?isbn=[% item.browser_normalized_isbn %]/SC.GIF&amp;client=[% SyndeticsClientCode %][% IF ( item.browser_normalized_upc ) %]&amp;upc=[% item.browser_normalized_upc %][% END %][% IF ( item.browser_normalized_oclc ) %]&amp;oclc=[% item.browser_normalized_oclc %][% END %]&amp;type=xw10" alt="" />
>+                                                <img src="http://www.syndetics.com/index.aspx?isbn=[% item.browser_normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %][% IF ( item.browser_normalized_upc ) %]&upc=[% item.browser_normalized_upc %][% END %][% IF ( item.browser_normalized_oclc ) %]&oclc=[% item.browser_normalized_oclc %][% END %]&type=xw10" alt="" />
>                                             [% END %]
>                                         [% ELSE %]
>-                                            <span class="no-image">No cover image available</span>
>+                                            <span class="no-image">[% t('No cover image available') %]</span>
>                                         [% END %]
>                                     [% END %]
>                                 [% END %]
>@@ -50,7 +51,7 @@
>                                     [% IF ( item.browser_normalized_isbn ) %]
>                                         <div style="block" title="[% item.biblionumber |url %]" class="[% item.browser_normalized_isbn %]" id="gbs-thumbnail-preview[% loop.count %]"></div>
>                                     [% ELSE %]
>-                                        <span class="no-image">No cover image available</span>
>+                                        <span class="no-image">[% t('No cover image available') %]</span>
>                                     [% END %]
>                                 [% END %]
>                                 [% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %]
>@@ -60,9 +61,9 @@
>                                 [% IF ( BakerTaylorEnabled ) %]
>                                     [% bt_id = ( item.browser_normalized_upc || item.browser_normalized_isbn ) %]
>                                     [% IF ( bt_id ) %]
>-                                        <img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL |html %][% bt_id %]" />
>+                                        <img alt="[% t('See Baker &amp; Taylor') %]" src="[% BakerTaylorImageURL |html %][% bt_id %]" />
>                                     [% ELSE %]
>-                                        <span class="no-image">No cover image available</span>
>+                                        <span class="no-image">[% t('No cover image available') %]</span>
>                                     [% END %]
>                                 [% END %]
>                             </a>
>@@ -71,7 +72,7 @@
>                     <td rowspan="2">
>                         [% IF shelfbrowser_next_item %]
>                             <div id="browser_next">
>-                                <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% shelfbrowser_next_item.biblionumber %]&amp;shelfbrowse_itemnumber=[% shelfbrowser_next_item.itemnumber %]#shelfbrowser" data-next-itemnumber="[% shelfbrowser_next_item.itemnumber %]">Next</a>
>+                                <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% shelfbrowser_next_item.biblionumber %]&shelfbrowse_itemnumber=[% shelfbrowser_next_item.itemnumber %]#shelfbrowser" data-next-itemnumber="[% shelfbrowser_next_item.itemnumber %]">[% t('Next') %]</a>
>                             </div>
>                         [% END %]
>                     </td>
>@@ -81,7 +82,7 @@
>                     [% FOREACH item IN shelfbrowser_items %]
>                         <td class="top">
>                             [% item.itemcallnumber %]
>-                            <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% item.biblionumber %]&amp;shelfbrowse_itemnumber=[% item.itemnumber %]#shelfbrowser">
>+                            <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% item.biblionumber %]&shelfbrowse_itemnumber=[% item.itemnumber %]#shelfbrowser">
>                                 [% item.title |html %]
>                                 [% FOREACH subtitl IN item.subtitle %]
>                                     [% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/subtypes_unimarc.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/subtypes_unimarc.inc
>index bae9cd3c95..5eea4c32a2 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/subtypes_unimarc.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/subtypes_unimarc.inc
>@@ -1,210 +1,211 @@
>+[% PROCESS 'i18n.inc' %]
> <fieldset>
>-    <legend>Coded fields</legend>
>+    <legend>[% t('Coded fields') %]</legend>
>     <p>
>-        <label>Audience</label>
>+        <label>[% t('Audience') %]</label>
>         <select name="limit" class="subtype">
>-                <option value="" selected="selected" >Any</option>
>-          <option value="aud:a">juvenile, general</option>
>-          <option value="aud:b">pre-primary (0-5)</option>
>-          <option value="aud:c">primary (5-8)</option>
>-          <option value="aud:d">children (9-14)</option>
>-          <option value="aud:e">young adult</option>
>-          <option value="aud:k">adult, serious</option>
>-          <option value="aud:m">adult, General</option>
>-          <option value="aud:u">unknown</option>
>+                <option value="" selected="selected">[% t('Any') %]</option>
>+          <option value="aud:a">[% t('juvenile, general') %]</option>
>+          <option value="aud:b">[% t('pre-primary (0-5)') %]</option>
>+          <option value="aud:c">[% t('primary (5-8)') %]</option>
>+          <option value="aud:d">[% t('children (9-14)') %]</option>
>+          <option value="aud:e">[% t('young adult') %]</option>
>+          <option value="aud:k">[% t('adult, serious') %]</option>
>+          <option value="aud:m">[% t('adult, General') %]</option>
>+          <option value="aud:u">[% t('unknown') %]</option>
>         </select>
>     </p>
>     <p>
>-        <label>Physical presentation</label>
>+        <label>[% t('Physical presentation') %]</label>
>             <select name="limit" class="subtype">
>-                <option value="" selected="selected" >Any</option>
>-                <option value="Material-type:r">regular print</option>
>-                <option value="Material-type:d">large print</option>
>-                <option value="Material-type:e">newspaper format</option>
>-                <option value="Material-type:f">Braille or Moon script</option>
>-                <option value="Material-type:g">microprint</option>
>-                <option value="Material-type:h">hand-written</option>
>-                <option value="Material-type:i">multimedia</option>
>-                <option value="Material-type:j">mini-print</option>
>-                <option value="Material-type:s">electronic ressource</option>
>-                <option value="Material-type:t">microform</option>
>-                <option value="Material-type:z">other form of textual material</option>
>+                <option value="" selected="selected">[% t('Any') %]</option>
>+                <option value="Material-type:r">[% t('regular print') %]</option>
>+                <option value="Material-type:d">[% t('large print') %]</option>
>+                <option value="Material-type:e">[% t('newspaper format') %]</option>
>+                <option value="Material-type:f">[% t('Braille or Moon script') %]</option>
>+                <option value="Material-type:g">[% t('microprint') %]</option>
>+                <option value="Material-type:h">[% t('hand-written') %]</option>
>+                <option value="Material-type:i">[% t('multimedia') %]</option>
>+                <option value="Material-type:j">[% t('mini-print') %]</option>
>+                <option value="Material-type:s">[% t('electronic ressource') %]</option>
>+                <option value="Material-type:t">[% t('microform') %]</option>
>+                <option value="Material-type:z">[% t('other form of textual material') %]</option>
>             </select>
>     </p>
>     <p>
>-        <label>Literary genre</label>
>+        <label>[% t('Literary genre') %]</label>
>         <select name="limit" class="subtype">
>-            <option value="" selected="selected" >Any</option>
>-            <option value="Literature-Code:a">fiction</option>
>-            <option value="Literature-Code:b">drama</option>
>-            <option value="Literature-Code:c">essays</option>
>-            <option value="Literature-Code:d">humour, satire</option>
>-            <option value="Literature-Code:e">letters</option>
>-            <option value="Literature-Code:f">short stories</option>
>-            <option value="Literature-Code:g">poetry</option>
>-            <option value="Literature-Code:h">speeches, oratory</option>
>-            <option value="Literature-Code:i">libretto</option>
>-            <option value="Literature-Code:y">not a literary text</option>
>-            <option value="Literature-Code:z">multiple/other literary forms</option>
>+            <option value="" selected="selected">[% t('Any') %]</option>
>+            <option value="Literature-Code:a">[% t('fiction') %]</option>
>+            <option value="Literature-Code:b">[% t('drama') %]</option>
>+            <option value="Literature-Code:c">[% t('essays') %]</option>
>+            <option value="Literature-Code:d">[% t('humour, satire') %]</option>
>+            <option value="Literature-Code:e">[% t('letters') %]</option>
>+            <option value="Literature-Code:f">[% t('short stories') %]</option>
>+            <option value="Literature-Code:g">[% t('poetry') %]</option>
>+            <option value="Literature-Code:h">[% t('speeches, oratory') %]</option>
>+            <option value="Literature-Code:i">[% t('libretto') %]</option>
>+            <option value="Literature-Code:y">[% t('not a literary text') %]</option>
>+            <option value="Literature-Code:z">[% t('multiple/other literary forms') %]</option>
>         </select>
>     </p>
>     <p>
>-        <label>Biography</label>
>+        <label>[% t('Biography') %]</label>
>             <select name="limit" class="subtype" size="1">
>-                <option value="">Any</option>
>-                <option value="Biography-code:y">not a biography</option>
>-                <option value="Biography-code:a">autobiography</option>
>-                <option value="Biography-code:b">individual biography</option>
>-                <option value="Biography-code:c">collective biography</option>
>-                <option value="Biography-code:d">contains biographical data</option>
>+                <option value="">[% t('Any') %]</option>
>+                <option value="Biography-code:y">[% t('not a biography') %]</option>
>+                <option value="Biography-code:a">[% t('autobiography') %]</option>
>+                <option value="Biography-code:b">[% t('individual biography') %]</option>
>+                <option value="Biography-code:c">[% t('collective biography') %]</option>
>+                <option value="Biography-code:d">[% t('contains biographical data') %]</option>
>         </select>
>     </p>
>     <p>
>-        <label>Illustration</label>
>+        <label>[% t('Illustration') %]</label>
>         <select name="limit" class="subtype" size="1">
>-            <option value="">Any</option>
>-            <option value="Illustration-Code:a">illustrations</option>
>-            <option value="Illustration-Code:b">maps</option>
>-            <option value="Illustration-Code:c">portraits</option>
>-            <option value="Illustration-Code:d">charts</option>
>-            <option value="Illustration-Code:e">plans</option>
>-            <option value="Illustration-Code:f">plates</option>
>-            <option value="Illustration-Code:g">music</option>
>-            <option value="Illustration-Code:h">facsimiles</option>
>-            <option value="Illustration-Code:i">coats of arms</option>
>-            <option value="Illustration-Code:j">genealogical tables</option>
>-            <option value="Illustration-Code:k">forms</option>
>-            <option value="Illustration-Code:l">samples</option>
>-            <option value="Illustration-Code:m">sound recordings</option>
>-            <option value="Illustration-Code:n">transparencies</option>
>-            <option value="Illustration-Code:o">illuminations</option>
>-            <option value="Illustration-Code:y">no illustrations</option>
>+            <option value="">[% t('Any') %]</option>
>+            <option value="Illustration-Code:a">[% t('illustrations') %]</option>
>+            <option value="Illustration-Code:b">[% t('maps') %]</option>
>+            <option value="Illustration-Code:c">[% t('portraits') %]</option>
>+            <option value="Illustration-Code:d">[% t('charts') %]</option>
>+            <option value="Illustration-Code:e">[% t('plans') %]</option>
>+            <option value="Illustration-Code:f">[% t('plates') %]</option>
>+            <option value="Illustration-Code:g">[% t('music') %]</option>
>+            <option value="Illustration-Code:h">[% t('facsimiles') %]</option>
>+            <option value="Illustration-Code:i">[% t('coats of arms') %]</option>
>+            <option value="Illustration-Code:j">[% t('genealogical tables') %]</option>
>+            <option value="Illustration-Code:k">[% t('forms') %]</option>
>+            <option value="Illustration-Code:l">[% t('samples') %]</option>
>+            <option value="Illustration-Code:m">[% t('sound recordings') %]</option>
>+            <option value="Illustration-Code:n">[% t('transparencies') %]</option>
>+            <option value="Illustration-Code:o">[% t('illuminations') %]</option>
>+            <option value="Illustration-Code:y">[% t('no illustrations') %]</option>
>         </select>
>     </p>
>     <p>
>-    <label>Content</label>
>+    <label>[% t('Content') %]</label>
>         <select name="limit" class="subtype">
>-            <option value="" >Any</option>
>-            <option value="ctype:a" >bibliography</option>
>-            <option value="ctype:b" >catalogue</option>
>-            <option value="ctype:c" >index</option>
>-            <option value="ctype:d" >abstract</option>
>-            <option value="ctype:e" >dictionary</option>
>-            <option value="ctype:f" >encyclopaedia</option>
>-            <option value="ctype:g" >directory</option>
>-            <option value="ctype:h" >project description</option>
>-            <option value="ctype:i" >statistics</option>
>-            <option value="ctype:j" >programmed text books</option>
>-            <option value="ctype:k" >patent</option>
>-            <option value="ctype:l" >standard</option>
>-            <option value="ctype:m" >dissertation or thesis</option>
>-            <option value="ctype:n" >laws and legislation</option>
>-            <option value="ctype:o" >numeric table</option>
>-            <option value="ctype:p" >technical report</option>
>-            <option value="ctype:q" >examination paper</option>
>-            <option value="ctype:r" >literature surveys/reviews</option>
>-            <option value="ctype:s" >treaties</option>
>-            <option value="ctype:t" >cartoons or comic strips</option>
>-            <option value="ctype:v" >dissertation or thesis (revised)</option>
>-            <option value="ctype:w" >religious text</option>
>-            <option value="ctype:z" >other</option>
>+            <option value="">[% t('Any') %]</option>
>+            <option value="ctype:a">[% t('bibliography') %]</option>
>+            <option value="ctype:b">[% t('catalogue') %]</option>
>+            <option value="ctype:c">[% t('index') %]</option>
>+            <option value="ctype:d">[% t('abstract') %]</option>
>+            <option value="ctype:e">[% t('dictionary') %]</option>
>+            <option value="ctype:f">[% t('encyclopaedia') %]</option>
>+            <option value="ctype:g">[% t('directory') %]</option>
>+            <option value="ctype:h">[% t('project description') %]</option>
>+            <option value="ctype:i">[% t('statistics') %]</option>
>+            <option value="ctype:j">[% t('programmed text books') %]</option>
>+            <option value="ctype:k">[% t('patent') %]</option>
>+            <option value="ctype:l">[% t('standard') %]</option>
>+            <option value="ctype:m">[% t('dissertation or thesis') %]</option>
>+            <option value="ctype:n">[% t('laws and legislation') %]</option>
>+            <option value="ctype:o">[% t('numeric table') %]</option>
>+            <option value="ctype:p">[% t('technical report') %]</option>
>+            <option value="ctype:q">[% t('examination paper') %]</option>
>+            <option value="ctype:r">[% t('literature surveys/reviews') %]</option>
>+            <option value="ctype:s">[% t('treaties') %]</option>
>+            <option value="ctype:t">[% t('cartoons or comic strips') %]</option>
>+            <option value="ctype:v">[% t('dissertation or thesis (revised)') %]</option>
>+            <option value="ctype:w">[% t('religious text') %]</option>
>+            <option value="ctype:z">[% t('other') %]</option>
>         </select>
>     </p>
>     <p>
>-        <label>Video types</label>
>+        <label>[% t('Video types') %]</label>
>             <select name="limit" class="subtype">
>-                <option value="">Any</option>
>-                <option value="Video-mt:a">motion picture</option>
>-                <option value="Video-mt:b">visual projection</option>
>-                <option value="Video-mt:c">video recording</option>
>+                <option value="">[% t('Any') %]</option>
>+                <option value="Video-mt:a">[% t('motion picture') %]</option>
>+                <option value="Video-mt:b">[% t('visual projection') %]</option>
>+                <option value="Video-mt:c">[% t('video recording') %]</option>
>             </select>
>     </p>
> </fieldset>
> 
> <fieldset>
>-    <legend>Serials</legend><p>
>+    <legend>[% t('Serials') %]</legend><p>
>     <p>
>-        <label>Serial type</label>
>+        <label>[% t('Serial type') %]</label>
>         <select name="limit" class="subtype">
>-            <option value="">Any type</option>
>-            <option value="Type-Of-Serial:a">Periodical</option>
>-            <option value="Type-Of-Serial:b">Monographic series</option>
>-            <option value="Type-Of-Serial:c">Newspaper</option>
>-            <option value="Type-Of-Serial:e">Updating loose-leaf</option>
>-            <option value="Type-Of-Serial:f">Database</option>
>-            <option value="Type-Of-Serial:g">Updating website</option>
>-            <option value="Type-Of-Serial:z">Other</option>
>+            <option value="">[% t('Any type') %]</option>
>+            <option value="Type-Of-Serial:a">[% t('Periodical') %]</option>
>+            <option value="Type-Of-Serial:b">[% t('Monographic series') %]</option>
>+            <option value="Type-Of-Serial:c">[% t('Newspaper') %]</option>
>+            <option value="Type-Of-Serial:e">[% t('Updating loose-leaf') %]</option>
>+            <option value="Type-Of-Serial:f">[% t('Database') %]</option>
>+            <option value="Type-Of-Serial:g">[% t('Updating website') %]</option>
>+            <option value="Type-Of-Serial:z">[% t('Other') %]</option>
>         </select>
>     </p>
>     <p>
>-        <label>Periodicity</label>
>+        <label>[% t('Periodicity') %]</label>
>         <select name="limit" class="subtype">
>-            <option value="">Any</option>
>-            <option value="Frequency-code:a">Daily</option>
>-            <option value="Frequency-code:b">Semiweekly</option>
>-            <option value="Frequency-code:c">Weekly</option>
>-            <option value="Frequency-code:d">Biweekly</option>
>-            <option value="Frequency-code:e">Semimonthly</option>
>-            <option value="Frequency-code:f">Monthly</option>
>-            <option value="Frequency-code:g">Bimonthly</option>
>-            <option value="Frequency-code:h">Quarterly</option>
>-            <option value="Frequency-code:i">Three times a year</option>
>-            <option value="Frequency-code:j">Semiannual</option>
>-            <option value="Frequency-code:k">Annual</option>
>-            <option value="Frequency-code:l">Biennial</option>
>-            <option value="Frequency-code:m">Triennial</option>
>-            <option value="Frequency-code:n">Three times a week</option>
>-            <option value="Frequency-code:o">Three times a month</option>
>-            <option value="Frequency-code:y">Without periodicity</option>
>-            <option value="Frequency-code:u">Unknown</option>
>-            <option value="Frequency-code:z">Other</option>
>+            <option value="">[% t('Any') %]</option>
>+            <option value="Frequency-code:a">[% t('Daily') %]</option>
>+            <option value="Frequency-code:b">[% t('Semiweekly') %]</option>
>+            <option value="Frequency-code:c">[% t('Weekly') %]</option>
>+            <option value="Frequency-code:d">[% t('Biweekly') %]</option>
>+            <option value="Frequency-code:e">[% t('Semimonthly') %]</option>
>+            <option value="Frequency-code:f">[% t('Monthly') %]</option>
>+            <option value="Frequency-code:g">[% t('Bimonthly') %]</option>
>+            <option value="Frequency-code:h">[% t('Quarterly') %]</option>
>+            <option value="Frequency-code:i">[% t('Three times a year') %]</option>
>+            <option value="Frequency-code:j">[% t('Semiannual') %]</option>
>+            <option value="Frequency-code:k">[% t('Annual') %]</option>
>+            <option value="Frequency-code:l">[% t('Biennial') %]</option>
>+            <option value="Frequency-code:m">[% t('Triennial') %]</option>
>+            <option value="Frequency-code:n">[% t('Three times a week') %]</option>
>+            <option value="Frequency-code:o">[% t('Three times a month') %]</option>
>+            <option value="Frequency-code:y">[% t('Without periodicity') %]</option>
>+            <option value="Frequency-code:u">[% t('Unknown') %]</option>
>+            <option value="Frequency-code:z">[% t('Other') %]</option>
>         </select>
>     </p>
>     <p>
>-        <label>Regularity</label>
>+        <label>[% t('Regularity') %]</label>
>         <select name="limit" class="subtype">
>-            <option value="">Any regularity</option>
>-            <option value="Regularity-code:a">regular</option>
>-            <option value="Regularity-code:b">normalised irregular</option>
>-            <option value="Regularity-code:y">irregular</option>
>-            <option value="Regularity-code:u">unknown</option>
>+            <option value="">[% t('Any regularity') %]</option>
>+            <option value="Regularity-code:a">[% t('regular') %]</option>
>+            <option value="Regularity-code:b">[% t('normalised irregular') %]</option>
>+            <option value="Regularity-code:y">[% t('irregular') %]</option>
>+            <option value="Regularity-code:u">[% t('unknown') %]</option>
>          </select>
>     </p>
> </fieldset>
> 
> <fieldset>
>-    <legend>Picture</legend>
>+    <legend>[% t('Picture') %]</legend>
>     <select name="limit" class="subtype">
>-        <option value="">Any</option>
>-        <option value="Graphics-type:a">collage</option>
>-        <option value="Graphics-type:b">drawing</option>
>-        <option value="Graphics-type:c">painting</option>
>-        <option value="Graphics-type:d">photomechanical reproduction</option>
>-        <option value="Graphics-type:e">photonegative</option>
>-        <option value="Graphics-type:f">photoprint</option>
>-        <option value="Graphics-type:h">picture</option>
>-        <option value="Graphics-type:i">print</option>
>-        <option value="Graphics-type:k">technical drawing</option>
>-        <option value="Graphics-type:z">other non-projected graphic type</option>
>+        <option value="">[% t('Any') %]</option>
>+        <option value="Graphics-type:a">[% t('collage') %]</option>
>+        <option value="Graphics-type:b">[% t('drawing') %]</option>
>+        <option value="Graphics-type:c">[% t('painting') %]</option>
>+        <option value="Graphics-type:d">[% t('photomechanical reproduction') %]</option>
>+        <option value="Graphics-type:e">[% t('photonegative') %]</option>
>+        <option value="Graphics-type:f">[% t('photoprint') %]</option>
>+        <option value="Graphics-type:h">[% t('picture') %]</option>
>+        <option value="Graphics-type:i">[% t('print') %]</option>
>+        <option value="Graphics-type:k">[% t('technical drawing') %]</option>
>+        <option value="Graphics-type:z">[% t('other non-projected graphic type') %]</option>
>     </select>
>     <select name="limit" class="subtype">
>-        <option value="">Any</option>
>-        <option value="Graphics-support:a">canvas</option>
>-        <option value="Graphics-support:b">bristol board</option>
>-        <option value="Graphics-support:c">cardboard/illustration board</option>
>-        <option value="Graphics-support:d">glass</option>
>-        <option value="Graphics-support:j">plaster</option>
>-        <option value="Graphics-support:k">hardboard</option>
>-        <option value="Graphics-support:l">porcelaine</option>
>-        <option value="Graphics-support:m">stone</option>
>-        <option value="Graphics-support:n">wood</option>
>-        <option value="Graphics-support:v">mixed collection</option>
>-        <option value="Graphics-support:e">synthetics</option>
>-        <option value="Graphics-support:f">skin</option>
>-        <option value="Graphics-support:g">textile</option>
>-        <option value="Graphics-support:h">metal</option>
>-        <option value="Graphics-support:i">paper</option>
>-        <option value="Graphics-support:z">others</option>
>-        <option value="Graphics-support:u">unknown</option>
>+        <option value="">[% t('Any') %]</option>
>+        <option value="Graphics-support:a">[% t('canvas') %]</option>
>+        <option value="Graphics-support:b">[% t('bristol board') %]</option>
>+        <option value="Graphics-support:c">[% t('cardboard/illustration board') %]</option>
>+        <option value="Graphics-support:d">[% t('glass') %]</option>
>+        <option value="Graphics-support:j">[% t('plaster') %]</option>
>+        <option value="Graphics-support:k">[% t('hardboard') %]</option>
>+        <option value="Graphics-support:l">[% t('porcelaine') %]</option>
>+        <option value="Graphics-support:m">[% t('stone') %]</option>
>+        <option value="Graphics-support:n">[% t('wood') %]</option>
>+        <option value="Graphics-support:v">[% t('mixed collection') %]</option>
>+        <option value="Graphics-support:e">[% t('synthetics') %]</option>
>+        <option value="Graphics-support:f">[% t('skin') %]</option>
>+        <option value="Graphics-support:g">[% t('textile') %]</option>
>+        <option value="Graphics-support:h">[% t('metal') %]</option>
>+        <option value="Graphics-support:i">[% t('paper') %]</option>
>+        <option value="Graphics-support:z">[% t('others') %]</option>
>+        <option value="Graphics-support:u">[% t('unknown') %]</option>
>     </select>
> </fieldset>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
>index da5e1ec8a8..ac4981ceb9 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
>@@ -1,21 +1,22 @@
>+[% PROCESS 'i18n.inc' %]
> [% USE Koha %]
> [% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && loggedinusername ) %]
>     <div id="menu">
>-        <h4><a href="#" class="menu-collapse-toggle">Your account menu</a></h4>
>+        <h4><a href="#" class="menu-collapse-toggle">[% t('Your account menu') %]</a></h4>
>         <ul class="menu-collapse">
>             [% IF ( userview ) %]
>                 <li class="active">
>             [% ELSE %]
>                 <li>
>             [% END %]
>-                <a href="/cgi-bin/koha/opac-user.pl">your summary</a></li>
>+                <a href="/cgi-bin/koha/opac-user.pl">[% t('your summary') %]</a></li>
>             [% IF ( OPACFinesTab ) %]
>                 [% IF ( accountview ) %]
>                     <li class="active">
>                 [% ELSE %]
>                     <li>
>                 [% END %]
>-                <a href="/cgi-bin/koha/opac-account.pl">your fines</a></li>
>+                <a href="/cgi-bin/koha/opac-account.pl">[% t('your fines') %]</a></li>
>             [% END %]
> 
>             [% IF ( userupdateview ) %]
>@@ -23,14 +24,14 @@
>             [% ELSE %]
>                 <li>
>             [% END %]
>-                <a href="/cgi-bin/koha/opac-memberentry.pl">your personal details</a></li>
>+                <a href="/cgi-bin/koha/opac-memberentry.pl">[% t('your personal details') %]</a></li>
>             [% IF Koha.Preference( 'TagsEnabled' ) == 1 %]
>                 [% IF ( tagsview ) %]
>                     <li class="active">
>                 [% ELSE %]
>                     <li>
>                 [% END %]
>-                <a href="/cgi-bin/koha/opac-tags.pl?mine=1">your tags</a></li>
>+                <a href="/cgi-bin/koha/opac-tags.pl?mine=1">[% t('your tags') %]</a></li>
>             [% END %]
> 
>             [% IF ( OpacPasswordChange ) %]
>@@ -39,7 +40,7 @@
>                 [% ELSE %]
>                     <li>
>                 [% END %]
>-                <a href="/cgi-bin/koha/opac-passwd.pl">change your password</a></li>
>+                <a href="/cgi-bin/koha/opac-passwd.pl">[% t('change your password') %]</a></li>
>             [% END %]
> 
>             [% IF EnableOpacSearchHistory %]
>@@ -48,7 +49,7 @@
>                 [% ELSE %]
>                     <li>
>                 [% END %]
>-                <a href="/cgi-bin/koha/opac-search-history.pl">your search history</a></li>
>+                <a href="/cgi-bin/koha/opac-search-history.pl">[% t('your search history') %]</a></li>
>             [% END %]
> 
>             [% IF ( opacreadinghistory ) %]
>@@ -57,14 +58,14 @@
>                 [% ELSE %]
>                     <li>
>                 [% END %]
>-                <a href="/cgi-bin/koha/opac-readingrecord.pl">your reading history</a></li>
>+                <a href="/cgi-bin/koha/opac-readingrecord.pl">[% t('your reading history') %]</a></li>
>                 [% IF ( OPACPrivacy ) %]
>                     [% IF ( privacyview ) %]
>                         <li class="active">
>                     [% ELSE %]
>                         <li>
>                     [% END %]
>-                    <a href="/cgi-bin/koha/opac-privacy.pl">your privacy</a></li>
>+                    <a href="/cgi-bin/koha/opac-privacy.pl">[% t('your privacy') %]</a></li>
>                 [% END %]
>             [% END # / opacreadinghistory %]
> 
>@@ -74,7 +75,7 @@
>                 [% ELSE %]
>                     <li>
>                 [% END %]
>-                <a href="/cgi-bin/koha/opac-suggestions.pl">your purchase suggestions</a></li>
>+                <a href="/cgi-bin/koha/opac-suggestions.pl">[% t('your purchase suggestions') %]</a></li>
>             [% END %]
> 
>             [% IF ( EnhancedMessagingPreferences ) %]
>@@ -84,7 +85,7 @@
>                     [% ELSE %]
>                         <li>
>                     [% END %]
>-                    <a href="/cgi-bin/koha/opac-messaging.pl">your messaging</a></li>
>+                    <a href="/cgi-bin/koha/opac-messaging.pl">[% t('your messaging') %]</a></li>
>                  [% END %]
>             [% END %]
> 
>@@ -94,7 +95,7 @@
>                 [% ELSE %]
>                     <li>
>                 [% END %]
>-                <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=1">your lists</a></li>
>+                <a href="/cgi-bin/koha/opac-shelves.pl?op=list&category=1">[% t('your lists') %]</a></li>
>             [% END %]
> 
>             [% IF Koha.Preference( 'RoutingSerials' ) && logged_in_user && logged_in_user.get_routing_lists.count %]
>@@ -103,7 +104,7 @@
>                 [% ELSE %]
>                     <li>
>                 [% END %]
>-                <a href="/cgi-bin/koha/opac-routing-lists.pl">your routing lists</a></li>
>+                <a href="/cgi-bin/koha/opac-routing-lists.pl">[% t('your routing lists') %]</a></li>
>             [% END %]
> 
>             [% IF Koha.Preference( 'useDischarge' ) == 1 %]
>@@ -112,7 +113,7 @@
>                 [% ELSE %]
>                     <li>
>                 [% END %]
>-                <a href="/cgi-bin/koha/opac-discharge.pl">ask for a discharge</a></li>
>+                <a href="/cgi-bin/koha/opac-discharge.pl">[% t('ask for a discharge') %]</a></li>
>             [% END %]
> 
>             [% IF Koha.Preference( 'ILLModule' ) == 1 %]
>@@ -121,7 +122,7 @@
>                 [% ELSE %]
>                     <li>
>                 [% END %]
>-                <a href="/cgi-bin/koha/opac-illrequests.pl">your interlibrary loan requests</a></li>
>+                <a href="/cgi-bin/koha/opac-illrequests.pl">[% t('your interlibrary loan requests') %]</a></li>
>             [% END %]
> 
>         </ul>
>-- 
>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