Attachment 134903 Details for Bug 30733 – Bug 30733: Simplify translatable strings

[patch] Bug 30733: Simplify translatable strings

Bug-30733-Simplify-translatable-strings.patch (text/plain), 245.00 KB, created by Victor Grousset/tuxayo on 2022-05-11 16:21:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Victor Grousset/tuxayo

Created: 2022-05-11 16:21:39 UTC

Size: 245.00 KB

patch

obsolete

>From b7c089f58786c0b6eb6c9a01c5b93fa529d7901b Mon Sep 17 00:00:00 2001
>From: Victor Grousset/tuxayo <victor@tuxayo.net>
>Date: Wed, 11 May 2022 17:08:32 +0200
>Subject: [PATCH] Bug 30733: Simplify translatable strings
>
>And a few minor fixes when they where causing issues for
>translatability.
>
>Simplified via wrapping strings with to split to huge
>concatenated strings with a lot of %s everywhere.
>
>== Test plan ==
>This patch needs mainly proof reading. Still it's possible to do some
>basic testing to demonstrate that adding a in an IF doesn't
>break anything.
>Pick in one of the 110 modified templates a string that you know how to
>display. Otherwise:
>1. acquisitions => vendor => basket => add to basket =>
> search "from existing record" => add order
>2. Cancel the order
>3. You see without issue "Bibliographic record will not be deleted"
>4. administration => Patron categories
>5. Try to delete a used and unused category
>6. You see as expected
> Category XXXX is in use. Deletion not possible!
> and
> Confirm deletion of category XXXX
>---
> .../background_jobs/update_elastic_index.inc | 2 +-
> .../background_jobs_update_elastic_index.inc | 2 +-
> .../prog/en/includes/biblio-title-head.inc | 2 +-
> .../prog/en/includes/recalls.inc | 20 ++++----
> .../prog/en/includes/transaction_types.inc | 4 +-
> .../prog/en/modules/acqui/addorderiso2709.tt | 20 ++++----
> .../prog/en/modules/acqui/basket.tt | 8 +--
> .../prog/en/modules/acqui/basketgroup.tt | 2 +-
> .../prog/en/modules/acqui/cancelorder.tt | 4 +-
> .../prog/en/modules/acqui/invoices.tt | 20 ++++----
> .../prog/en/modules/acqui/neworderempty.tt | 8 +--
> .../prog/en/modules/acqui/transferorder.tt | 2 +-
> .../en/modules/admin/additional-fields.tt | 4 +-
> .../prog/en/modules/admin/aqbudgets.tt | 4 +-
> .../modules/admin/auth_subfields_structure.tt | 8 +--
> .../en/modules/admin/authorised_values.tt | 12 ++---
> .../prog/en/modules/admin/authtypes.tt | 6 +--
> .../prog/en/modules/admin/categories.tt | 12 ++---
> .../prog/en/modules/admin/cities.tt | 6 +--
> .../prog/en/modules/admin/columns_settings.tt | 8 +--
> .../prog/en/modules/admin/credit_types.tt | 2 +-
> .../prog/en/modules/admin/debit_types.tt | 12 ++---
> .../prog/en/modules/admin/itemtypes.tt | 6 +--
> .../modules/admin/marc_subfields_structure.tt | 26 +++++-----
> .../prog/en/modules/admin/marctagstructure.tt | 12 ++---
> .../en/modules/admin/patron-attr-types.tt | 8 +--
> .../searchengine/elasticsearch/mappings.tt | 20 ++++----
> .../prog/en/modules/admin/smart-rules.tt | 14 +++---
> .../prog/en/modules/admin/smtp_servers.tt | 2 +-
> .../prog/en/modules/authorities/merge.tt | 10 ++--
> .../prog/en/modules/basket/sendbasket.tt | 2 +-
> .../prog/en/modules/catalogue/advsearch.tt | 8 +--
> .../prog/en/modules/catalogue/detail.tt | 44 ++++++++--------
> .../prog/en/modules/catalogue/moredetail.tt | 16 +++---
> .../prog/en/modules/catalogue/results.tt | 6 +--
> .../en/modules/catalogue/stockrotation.tt | 8 +--
> .../prog/en/modules/cataloguing/addbooks.tt | 10 ++--
> .../value_builder/marc21_linking_section.tt | 2 +-
> .../value_builder/unimarc_field_210c.tt | 2 +-
> .../value_builder/unimarc_field_4XX.tt | 2 +-
> .../prog/en/modules/circ/article-requests.tt | 6 +--
> .../prog/en/modules/circ/circulation.tt | 6 +--
> .../prog/en/modules/circ/overdue.tt | 2 +-
> .../prog/en/modules/circ/request-article.tt | 10 ++--
> .../prog/en/modules/circ/returns.tt | 16 +++---
> .../prog/en/modules/circ/view_holdsqueue.tt | 12 ++---
> .../prog/en/modules/clubs/clubs.tt | 8 +--
> .../course_reserves/add_items-step2.tt | 4 +-
> .../modules/course_reserves/course-details.tt | 4 +-
> .../prog/en/modules/course_reserves/course.tt | 4 +-
> .../en/modules/labels/label-bib-search.tt | 2 +-
> .../prog/en/modules/labels/label-print.tt | 6 +--
> .../en/modules/members/accountline-details.tt | 4 +-
> .../prog/en/modules/members/holdshistory.tt | 12 ++---
> .../prog/en/modules/members/memberentrygen.tt | 16 +++---
> .../prog/en/modules/members/moremember.tt | 14 +++---
> .../prog/en/modules/members/notices.tt | 16 +++---
> .../prog/en/modules/members/paycollect.tt | 20 ++++----
> .../prog/en/modules/members/routing-lists.tt | 6 +--
> .../prog/en/modules/patroncards/edit-batch.tt | 8 +--
> .../en/modules/patroncards/edit-layout.tt | 4 +-
> .../prog/en/modules/patroncards/print.tt | 8 +--
> .../modules/reports/guided_reports_start.tt | 14 +++---
> .../prog/en/modules/reports/itemslost.tt | 4 +-
> .../prog/en/modules/reports/serials_stats.tt | 4 +-
> .../prog/en/modules/reserve/request.tt | 18 +++----
> .../prog/en/modules/reviews/reviewswaiting.tt | 4 +-
> .../modules/rotating_collections/addItems.tt | 10 ++--
> .../rotating_collections/editCollections.tt | 6 +--
> .../prog/en/modules/serials/routing.tt | 4 +-
> .../en/modules/serials/serials-collection.tt | 24 ++++-----
> .../en/modules/serials/subscription-detail.tt | 24 ++++-----
> .../prog/en/modules/suggestion/suggestion.tt | 14 +++---
> .../prog/en/modules/tags/review.tt | 44 ++++++++--------
> .../en/modules/tools/additional-contents.tt | 10 ++--
> .../automatic_item_modification_by_age.tt | 4 +-
> .../en/modules/tools/batch_delete_records.tt | 12 ++---
> .../tools/batch_record_modification.tt | 10 ++--
> .../prog/en/modules/tools/csv-profiles.tt | 18 +++----
> .../prog/en/modules/tools/import_borrowers.tt | 34 ++++++-------
> .../prog/en/modules/tools/inventory.tt | 8 +--
> .../en/modules/tools/manage-marc-import.tt | 16 +++---
> .../tools/marc_modification_templates.tt | 36 ++++++-------
> .../prog/en/modules/tools/upload.tt | 4 +-
> .../prog/en/modules/tools/viewlog.tt | 4 +-
> .../en/modules/virtualshelves/sendshelf.tt | 2 +-
> .../bootstrap/en/includes/holds-table.inc | 10 ++--
> .../bootstrap/en/includes/masthead.inc | 4 +-
> .../bootstrap/en/includes/shelfbrowser.inc | 6 +--
> .../bootstrap/en/modules/maintenance.tt | 6 +--
> .../en/modules/opac-account-pay-error.tt | 2 +-
> .../en/modules/opac-addbybiblionumber.tt | 8 +--
> .../bootstrap/en/modules/opac-advsearch.tt | 8 +--
> .../en/modules/opac-alert-subscribe.tt | 4 +-
> .../bootstrap/en/modules/opac-detail.tt | 4 +-
> .../en/modules/opac-full-serial-issues.tt | 24 ++++-----
> .../bootstrap/en/modules/opac-holdshistory.tt | 10 ++--
> .../bootstrap/en/modules/opac-ics.tt | 4 +-
> .../bootstrap/en/modules/opac-library.tt | 2 +-
> .../bootstrap/en/modules/opac-main.tt | 8 +--
> .../bootstrap/en/modules/opac-messaging.tt | 22 ++++----
> .../bootstrap/en/modules/opac-passwd.tt | 10 ++--
> .../en/modules/opac-password-recovery.tt | 14 +++---
> .../bootstrap/en/modules/opac-recall.tt | 16 +++---
> .../bootstrap/en/modules/opac-recalls.tt | 22 ++++----
> .../bootstrap/en/modules/opac-reserve.tt | 26 +++++-----
> .../en/modules/opac-reset-password.tt | 16 +++---
> .../bootstrap/en/modules/opac-sendbasket.tt | 4 +-
> .../en/modules/opac-serial-issues.tt | 50 +++++++++----------
> .../bootstrap/en/modules/opac-shelves.tt | 10 ++--
> .../bootstrap/en/modules/opac-showreviews.tt | 4 +-
> .../bootstrap/en/modules/opac-suggestions.tt | 18 +++----
> .../bootstrap/en/modules/opac-tags.tt | 28 +++++------
> .../bootstrap/en/modules/opac-user.tt | 32 ++++++------
> .../bootstrap/en/modules/sco/sco-main.tt | 4 +-
> .../en/modules/text/explodedterms.tt | 6 +--
> 116 files changed, 632 insertions(+), 632 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_elastic_index.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_elastic_index.inc
>index 9386cedcb9..d6f24e89a9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_elastic_index.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_elastic_index.inc
>@@ -10,7 +10,7 @@
> [% ELSE %]
> <div class="dialog message">
> [% report.total_success | html %] / [% report.total_records | html %] records have successfully been reindexed. Some errors occurred.
>- [% IF job.status == 'cancelled' %]The job has been cancelled before it finished.[% END %]
>+ [% IF job.status == 'cancelled' %]The job has been cancelled before it finished.[% END %]
> </div>
> [% END %]
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs_update_elastic_index.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs_update_elastic_index.inc
>index d35f06fee5..11a243bf56 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs_update_elastic_index.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs_update_elastic_index.inc
>@@ -10,7 +10,7 @@
> [% ELSE %]
> <div class="dialog message">
> [% report.total_success | html %] / [% report.total_records | html %] records have successfully been reindexed. Some errors occurred.
>- [% IF job.status == 'cancelled' %]The job has been cancelled before it finished.[% END %]
>+ [% IF job.status == 'cancelled' %]The job has been cancelled before it finished.[% END %]
> </div>
> [% END %]
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title-head.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title-head.inc
>index d00be03687..c00d3b77c0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title-head.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title-head.inc
>@@ -1,7 +1,7 @@
> [%~ IF ( biblio.title ) ~%]
> [%~ biblio.title | html ~%]
> [%~ ELSE ~%]
>- No title
>+ No title
> [%~ END ~%]
> [%~ biblio.medium | html ~%]
> [%~ FOREACH subtitle IN biblio.subtitle.split(' \| ') ~%][%~ IF Koha.Preference('marcflavour')=='UNIMARC' ~%],[%~ END ~%]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc
>index 0c007f0285..fa3a7cedea 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc
>@@ -55,7 +55,7 @@
> [% IF ( recall.expiration_date ) %]
> [% recall.expiration_date | $KohaDates %]
> [% ELSIF ( !recall.completed ) %]
>- Never expires
>+ Never expires
> [% ELSE %]
> -
> [% END %]
>@@ -67,28 +67,28 @@
> 
> <td class="recall-status">
> [% IF ( recall.in_transit ) %]
>- In transit to [% recall.library.branchname | html %]
>+ In transit to [% recall.library.branchname | html %]
> [% ELSIF ( recall.waiting ) %]
>- Ready for pickup
>+ Ready for pickup
> [% ELSIF ( recall.expired ) %]
>- Expired on [% recall.expiration_date | $KohaDates %]
>+ Expired on [% recall.expiration_date | $KohaDates %]
> [% ELSIF ( recall.cancelled ) %]
>- Cancelled on [% recall.completed_date | $KohaDates %]
>+ Cancelled on [% recall.completed_date | $KohaDates %]
> [% ELSIF ( recall.overdue ) %]
>- Overdue to be returned
>+ Overdue to be returned
> [% ELSIF ( recall.fulfilled ) %]
>- Fulfilled
>+ Fulfilled
> [% ELSE %]
>- Requested
>+ Requested
> [% END %]
> </td>
> 
> [% UNLESS viewing_old %]
> <td class="recall-duedate">
> [% IF recall.requested and recall.checkout %]
>- Due to be returned by [% recall.checkout.date_due | $KohaDates %]
>+ Due to be returned by [% recall.checkout.date_due | $KohaDates %]
> [% ELSIF recall.waiting and RECALL.expiration_date %]
>- Pick up by [% RECALL.expiration_date | $KohaDates %]
>+ Pick up by [% RECALL.expiration_date | $KohaDates %]
> [% ELSE %]
> -
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/transaction_types.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/transaction_types.inc
>index e71b3fc8ee..8a8c0c710d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/transaction_types.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/transaction_types.inc
>@@ -7,7 +7,7 @@
> [% IF payment_types.size > 0 %]
> <li>
> [% IF Koha.Preference('UseCashRegisters') || Koha.Preference('RequirePaymentType') %]
>- <label for="[% type | html %]_type" class="required">[% IF type == 'payment' %]Payment[% ELSE %]Transaction[% END %] type: </label>
>+ <label for="[% type | html %]_type" class="required">[% IF type == 'payment' %]Payment type[% ELSE %]Transaction type[% END %]: </label>
> <select name="[% type | html %]_type" id="[% type | html %]_type" class="required" required="required">
> <option value="">None selected</option>
> [% IF type == 'refund' %]
>@@ -19,7 +19,7 @@
> </select>
> Required
> [%- ELSE -%]
>- <label for="[% type | html %]_type">[% IF type == 'payment' %]Payment[% ELSE %]Transaction[% END %] type: </label>
>+ <label for="[% type | html %]_type">[% IF type == 'payment' %]Payment type[% ELSE %]Transaction type[% END %]: </label>
> <select name="[% type | html %]_type" id="[% type | html %]_type">
> <option value="">None selected</option>
> [% IF type == 'refund' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
>index d22111bb6a..c5da4d2c52 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
>@@ -120,16 +120,16 @@ Batch list
> <li class="status">
> 
> [% IF ( biblio_lis.overlay_status == 'no_match' ) %]
>- No match
>+ No match
> [% ELSIF ( biblio_lis.overlay_status == 'match_applied' ) %]
>- Match applied
>+ Match applied
> [% ELSIF ( biblio_lis.overlay_status == 'auto_match' ) %]
>- Match found
>+ Match found
> [% ELSE %]
> [% biblio_lis.overlay_status | html %]
> [% END %]
> [% IF ( biblio.match_biblionumber ) %]
>- Matches biblio [% biblio.match_biblionumber | uri %] (score = [% biblio.match_score | html %]): <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.match_biblionumber | uri %]">[% biblio.match_citation | html %]</a>
>+ Matches biblio [% biblio.match_biblionumber | uri %] (score = [% biblio.match_score | html %]): <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.match_biblionumber | uri %]">[% biblio.match_citation | html %]</a>
> [% END %]
> 
> </li>
>@@ -430,17 +430,17 @@ Batch list
> <td>[% batch_lis.comments | html %]</td>
> <td>
> [% IF ( batch_lis.import_status == 'cleaned' ) %]
>- Cleaned
>+ Cleaned
> [% ELSIF ( batch_lis.import_status == 'imported' ) %]
>- Imported
>+ Imported
> [% ELSIF ( batch_lis.import_status == 'importing' ) %]
>- Importing
>+ Importing
> [% ELSIF ( batch_lis.import_status == 'reverted' ) %]
>- Reverted
>+ Reverted
> [% ELSIF ( batch_lis.import_status == 'reverting' ) %]
>- Reverting
>+ Reverting
> [% ELSIF ( batch_lis.import_status == 'staged' ) %]
>- Staged
>+ Staged
> [% ELSE %]
> [% batch_lis.import_status | html %]
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>index e1ae56b631..9d2687881d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>@@ -49,16 +49,16 @@
> <a href="#" aria-current="page">
> [% UNLESS ( basketno ) %]
> [% IF ( delete_confirmed ) %]
>- Deleted
>+ Deleted
> [% ELSE %]
>- New
>+ New
> [% END %]
> [% END %]
>- Basket [% basketname | html %]
>+ Basket [% basketname | html %]
> [% IF ( basketno ) %]
> ([% basketno | html %])
> [% END %]
>- for [% booksellername | html %]
>+ for [% booksellername | html %]
> </a>
> </li>
> </ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>index 4cd224ac2e..db725d2b91 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>@@ -293,7 +293,7 @@ fieldset.various li {
> [% IF ( selectedbasket.basketname ) %]
> [% selectedbasket.basketname | html %]
> [% ELSE %]
>- No name, basketnumber: [% selectedbasket.basketno | html %]
>+ No name, basketnumber: [% selectedbasket.basketno | html %]
> [% END %]
> </a>, 
> Total: [% selectedbasket.total | $Price %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt
>index 7c70c1200e..d40571d3bd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt
>@@ -35,9 +35,9 @@
> <h1>Are you sure you want to cancel this order ([% ordernumber | html %])</h1>
> 
> [% IF (del_biblio) %]
>- Bibliographic record will be deleted too.
>+ Bibliographic record will be deleted too.
> [% ELSE %]
>- Bibliographic record will not be deleted.
>+ Bibliographic record will not be deleted.
> [% END %]
> 
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
>index 8be858e6be..3985b521d1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
>@@ -84,9 +84,9 @@
> <td>[% invoice.receiveditems | html %]</td>
> <td>
> [% IF invoice.closedate %]
>- Closed on [% invoice.closedate | $KohaDates %]
>+ Closed on [% invoice.closedate | $KohaDates %]
> [% ELSE %]
>- Open
>+ Open
> [% END %]
> </td>
> <td>
>@@ -234,12 +234,12 @@
> [% END %]
> [% IF shipmentdatefrom %]
> <li>
>- Shipment date:
>+ Shipment date:
> [% IF shipmentdateto %]
>- From [% shipmentdatefrom | $KohaDates %]
>- To [% shipmentdateto | $KohaDates %]
>+ From [% shipmentdatefrom | $KohaDates %]
>+ To [% shipmentdateto | $KohaDates %]
> [% ELSE %]
>- All since [% shipmentdatefrom | $KohaDates %]
>+ All since [% shipmentdatefrom | $KohaDates %]
> [% END %]
> </li>
> [% ELSE %]
>@@ -252,12 +252,12 @@
> [% END %]
> [% IF billingdatefrom %]
> <li>
>- Billing date:
>+ Billing date:
> [% IF billingdateto %]
>- From [% billingdatefrom | $KohaDates %]
>- To [% billingdateto | $KohaDates %]
>+ From [% billingdatefrom | $KohaDates %]
>+ To [% billingdateto | $KohaDates %]
> [% ELSE %]
>- All since [% billingdatefrom | $KohaDates %]
>+ All since [% billingdatefrom | $KohaDates %]
> [% END %]
> </li>
> [% ELSE %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
>index 8f95f312bc..9237837550 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
>@@ -351,10 +351,10 @@
> [% IF subscription %]
> 
> <div class="hint">
>- Frequency: [% subscription.frequency.description | html %] |
>- [% IF subscription.numberlength %]Number of issues: [% subscription.numberlength | html %][% END %]
>- [% IF subscription.weeklength %]Number of weeks: [% subscription.weeklength | html %][% END %]
>- [% IF subscription.monthlength %]Number of months: [% subscription.monthlength | html %][% END %]
>+ Frequency: [% subscription.frequency.description | html %] |
>+ [% IF subscription.numberlength %]Number of issues: [% subscription.numberlength | html %][% END %]
>+ [% IF subscription.weeklength %]Number of weeks: [% subscription.weeklength | html %][% END %]
>+ [% IF subscription.monthlength %]Number of months: [% subscription.monthlength | html %][% END %]
> </div>
> [% END %]
> </li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
>index 92bcb32778..b6442bee42 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
>@@ -81,7 +81,7 @@
> [% IF ( ordersloo.author ) %] by [% ordersloo.author | html %][% END %]
> [% IF ( ordersloo.isbn ) %] &ndash; [% ordersloo.isbn | html %][% END %]
> [% IF ( ordersloo.publishercode ) %]
>- Publisher: [% ordersloo.publishercode | html %]
>+ Publisher: [% ordersloo.publishercode | html %]
> [%- IF ( ordersloo.publicationyear > 0) -%], [% ordersloo.publicationyear | html %]
> [%- ELSIF ( ordersloo.copyrightdate > 0) -%] [% ordersloo.copyrightdate | html %]
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
>index 38965080b7..21d968fcd7 100755
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
>@@ -109,10 +109,10 @@
> [% END %]
> <ul>
> [% IF CAN_user_acquisition_order_manage %]
>- [% WRAPPER table_option value="aqbasket" %]Order baskets[% END %]
>+ [% WRAPPER table_option value="aqbasket" %]Order baskets[% END %]
> [% END %]
> [% IF CAN_user_serials_edit_subscription %]
>- [% WRAPPER table_option value="subscription" %]Subscriptions[% END %]
>+ [% WRAPPER table_option value="subscription" %]Subscriptions[% END %]
> [% END %]
> </ul>
> [% ELSE %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
>index bb1b9ff600..4b9c51c450 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
>@@ -243,9 +243,9 @@
> [% IF op == 'add_form' && !error_not_authorised_to_modify %]
> <form action="/cgi-bin/koha/admin/aqbudgets.pl" id="edit_fund" name="Aform" method="post">
> <fieldset class="rows">
>- <legend><h1>[% IF ( budget_id ) %]Modify[% ELSE %]Add[% END %] Fund
>+ <legend><h1>[% IF ( budget_id ) %]Modify[% ELSE %]Add[% END %] Fund
> [% IF ( budget_period_description ) %]
>- [% budget_name | html %] for Budget '[% budget_period_description | html %]'
>+ [% budget_name | html %] for Budget '[% budget_period_description | html %]'
> [% END %]
> </h1>
> </legend>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
>index 67222253cc..11845d08fe 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
>@@ -338,13 +338,13 @@
> [% ELSE %]
> Tab:[% loo.tab | html %],
> [% IF ( loo.kohafield ) %] | Koha field: [% loo.kohafield | html %], [% END %]
>- [% IF ( loo.repeatable ) %]Repeatable, [% ELSE %]Not repeatable,
>+ [% IF ( loo.repeatable ) %]Repeatable, [% ELSE %]Not repeatable,
> [% END %]
>- [% IF ( loo.mandatory ) %]Mandatory, [% ELSE %]Not mandatory,
>+ [% IF ( loo.mandatory ) %]Mandatory, [% ELSE %]Not mandatory,
> [% END %]
>- [% IF ( loo.hidden ) %]hidden,
>+ [% IF ( loo.hidden ) %]hidden,
> [% END %]
>- [% IF ( loo.isurl ) %]is a url,
>+ [% IF ( loo.isurl ) %]is a url,
> [% END %]
> [% IF ( loo.authorised_value ) %] | Auth value:[% loo.authorised_value | html %],
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
>index 04c7c87731..46653abec4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
>@@ -103,9 +103,9 @@
> 
> [% IF op == 'add_form' %]
> <h1>
>- [% IF ( action_modify ) %]Modify authorized value[% END %]
>- [% IF ( action_add_value ) %]New authorized value[% END %]
>- [% IF ( action_add_category ) %]New category[% END %]
>+ [% IF ( action_modify ) %]Modify authorized value[% END %]
>+ [% IF ( action_add_value ) %]New authorized value[% END %]
>+ [% IF ( action_add_category ) %]New category[% END %]
> </h1>
> 
> [% IF ( action_modify ) %]
>@@ -352,12 +352,12 @@
> [% END %]
> 
> [% IF loo.branches.size > 1 %]
>- [% loo.branches.size | html %] library limitations
>+ [% loo.branches.size | html %] library limitations
> [% ELSE %]
>- [% loo.branches.size | html %] library limitation
>+ [% loo.branches.size | html %] library limitation
> [% END %]
> [% ELSE %]
>- No limitation
>+ No limitation
> [% END # /IF loo.branches.size > 0 %]
> </td>
> <td class="actions"><a href="/cgi-bin/koha/admin/authorised_values.pl?op=add_form&amp;id=[% loo.id | uri %]" class="btn btn-default btn-xs"> Edit</a>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
>index bb4e979402..cabfabbb3d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
>@@ -35,10 +35,10 @@ Authority types &rsaquo; Administration &rsaquo; Koha
> <li>
> <a href="#" aria-current="page">
> [% IF authority_type.authtypecode.defined %]
>- Modify
>+ Modify
> [% ELSE %]
>- New
>- [% END %] Authority type
>+ New
>+ [% END %] Authority type
> </a>
> </li>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>index ca6ba5c44c..5ed1aba71a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>@@ -431,9 +431,9 @@
> <legend>
> <h1>
> [% IF patrons_in_category > 0 %]
>- Category [% categorycode | html %] is in use. Deletion not possible!
>+ Category [% categorycode | html %] is in use. Deletion not possible!
> [% ELSE %]
>- Confirm deletion of category [% categorycode | html %]
>+ Confirm deletion of category [% categorycode | html %]
> [% END %]
> </h1>
> </legend>
>@@ -618,7 +618,7 @@
> [% END %]
> [% END %]
> [% ELSE %]
>- None
>+ None
> [% END %]
> </td>
> [% END %]
>@@ -635,12 +635,12 @@
> [% END %]
> 
> [% IF library_limits.count > 1 %]
>- [% library_limits.count | html %] library limitations
>+ [% library_limits.count | html %] library limitations
> [% ELSE %]
>- [% library_limits.count | html %] library limitation
>+ [% library_limits.count | html %] library limitation
> [% END %]
> [% ELSE %]
>- No limitation
>+ No limitation
> [% END %]
> </td>
> [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
>index feea946e9e..4f039c181d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
>@@ -38,10 +38,10 @@
> <li>
> <a href="#" aria-current="page">
> [% IF city.cityid %]
>- Modify
>+ Modify
> [% ELSE %]
>- New
>- [% END %] City
>+ New
>+ [% END %] City
> </a>
> </li>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
>index 0b4d54ecaa..a9d23b285e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
>@@ -5,7 +5,7 @@
> [% SET panel_id = 0 %]
> [% BLOCK pagelist %]
> [% IF module.keys and module.keys.size > 0 %]
>- Jump to:
>+ Jump to:
> [% FOR pagename IN module.keys.sort %]
> <a href="#[% pagename | url %]">[% pagename | html %]</a>
> [% UNLESS loop.last %] | [% END %]
>@@ -32,11 +32,11 @@
> <table>
> <caption>
> [% IF tablename == 'currencies-table' %]
>- Currency
>+ Currency
> [% ELSIF pagename == 'additem' AND tablename == 'itemst' %]
>- Items editor
>+ Items editor
> [% ELSE %]
>- Table id: [% tablename | html %]
>+ Table id: [% tablename | html %]
> [% END %]
> </caption>
> <thead>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt
>index 6bdcb18ea4..ff878f994f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt
>@@ -108,7 +108,7 @@
> <li>
> <label for="can_be_added_manually">Can be manually added ? </label>
> [% IF credit_type && credit_type.is_system %]
>- [% IF credit_type.can_be_added_manually %]Yes[% ELSE %]No[% END %]
>+ [% IF credit_type.can_be_added_manually %]Yes[% ELSE %]No[% END %]
> [% ELSIF credit_type.can_be_added_manually %]
> <input type="checkbox" name="can_be_added_manually" id="can_be_added_manually" checked="checked" value="1" />
> [% ELSE %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
>index 2b3e3fc7ba..9ce9b22370 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
>@@ -36,10 +36,10 @@
> <li>
> <a href="#" aria-current="page">
> [% IF debit_type.code %]
>- Modify
>+ Modify
> [% ELSE %]
>- New
>- [% END %] debit type
>+ New
>+ [% END %] debit type
> </a>
> </li>
> 
>@@ -189,12 +189,12 @@
> [% END %]
> 
> [% IF debit_type.library_limits.count > 1 %]
>- [% debit_type.library_limits.count | html %] library limitations
>+ [% debit_type.library_limits.count | html %] library limitations
> [% ELSE %]
>- [% debit_type.library_limits.count | html %] library limitation
>+ [% debit_type.library_limits.count | html %] library limitation
> [% END %]
> [% ELSE %]
>- No limitation
>+ No limitation
> [% END %]
> </td>
> <td class="actions">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
>index 79763e85e3..1066a8cd2d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
>@@ -575,12 +575,12 @@ Item types &rsaquo; Administration &rsaquo; Koha
> [% END %]
> 
> [% IF library_limits.count > 1 %]
>- [% library_limits.count | html %] library limitations
>+ [% library_limits.count | html %] library limitations
> [% ELSE %]
>- [% library_limits.count | html %] library limitation
>+ [% library_limits.count | html %] library limitation
> [% END %]
> [% ELSE %]
>- No limitation
>+ No limitation
> [% END %]
> </td>
> <td>[% IF ( itemtype.automatic_checkin ) %]Yes[% ELSE %]&nbsp;[% END %]</td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
>index 7970d63051..4617cc8e9d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
>@@ -113,7 +113,7 @@
> [% IF ( add_form ) %]
> <h1>
> [% IF ( use_heading_flags_p ) %]
>- [% IF ( heading_edit_subfields_p ) %]Tag [% tagfield | html %] Subfield constraints[% END %]
>+ [% IF ( heading_edit_subfields_p ) %]Tag [% tagfield | html %] Subfield constraints[% END %]
> [% ELSE %]
> [% action | html %]
> [% END %]
>@@ -398,18 +398,18 @@
> [% IF loo.tab == -1 %]
> subfield ignored
> [% ELSE %]
>- Tab:[% loo.tab | html %],
>- [% IF ( loo.kohafield ) %] | Koha field: [% loo.kohafield | html %], [% END %]
>- [% IF ( loo.repeatable ) %]Repeatable, [% ELSE %]Not repeatable,[% END %]
>- [% IF ( loo.mandatory ) %]Mandatory, [% ELSE %]Not mandatory,[% END %]
>- [% IF ( loo.important ) %]Important, [% ELSE %]Not important,[% END %]
>- [% IF ( loo.seealso ) %] | See also: [% loo.seealso | html %],[% END %]
>- [% IF ( loo.hidden ) %]hidden,[% END %]
>- [% IF ( loo.isurl ) %]is a URL,[% END %]
>- [% IF ( loo.authorised_value ) %] | Auth value:[% loo.authorised_value | html %],[% END %]
>- [% IF ( loo.authtypecode ) %] | Authority:[% loo.authtypecode | html %],[% END %]
>- [% IF ( loo.value_builder ) %] | Plugin:[% loo.value_builder | html %],[% END %]
>- [% IF ( loo.link ) %] | Link:[% loo.link | html %],[% END %]
>+ Tab:[% loo.tab | html %],
>+ [% IF ( loo.kohafield ) %] | Koha field: [% loo.kohafield | html %], [% END %]
>+ [% IF ( loo.repeatable ) %]Repeatable, [% ELSE %]Not repeatable,[% END %]
>+ [% IF ( loo.mandatory ) %]Mandatory, [% ELSE %]Not mandatory,[% END %]
>+ [% IF ( loo.important ) %]Important, [% ELSE %]Not important,[% END %]
>+ [% IF ( loo.seealso ) %] | See also: [% loo.seealso | html %],[% END %]
>+ [% IF ( loo.hidden ) %]hidden,[% END %]
>+ [% IF ( loo.isurl ) %]is a URL,[% END %]
>+ [% IF ( loo.authorised_value ) %] | Auth value:[% loo.authorised_value | html %],[% END %]
>+ [% IF ( loo.authtypecode ) %] | Authority:[% loo.authtypecode | html %],[% END %]
>+ [% IF ( loo.value_builder ) %] | Plugin:[% loo.value_builder | html %],[% END %]
>+ [% IF ( loo.link ) %] | Link:[% loo.link | html %],[% END %]
> [% END %]
> </td>
> <td class="actions">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
>index e73c986d33..a4e2d2e8d0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
>@@ -50,9 +50,9 @@ MARC frameworks &rsaquo; Administration &rsaquo; Koha
> <li>
> <a href="#" aria-current="page">
> [% IF heading_add_tag_p %]
>- Add tag
>+ Add tag
> [% ELSE %]
>- Modify tag
>+ Modify tag
> [% END %] [% searchfield | html %]
> </a>
> </li>
>@@ -122,9 +122,9 @@ MARC frameworks &rsaquo; Administration &rsaquo; Koha
> <fieldset class="rows">
> <legend>
> [% IF heading_add_tag_p %]
>- Add tag
>+ Add tag
> [% ELSE %]
>- Modify tag <input type="hidden" name="modif" value="1" />[% searchfield | html %]
>+ Modify tag <input type="hidden" name="modif" value="1" />[% searchfield | html %]
> [% END %]
> </legend>
> <input type="hidden" name="op" value="add_validate" />
>@@ -276,8 +276,8 @@ MARC frameworks &rsaquo; Administration &rsaquo; Koha
> [% IF ( select_display ) %]
> [% FOREACH subfield IN loo.subfields %]
> 
>- Tab:[% subfield.tab | html %] | $[% subfield.tagsubfield | html %]
>- [% subfield.liblibrarian | html %] [% IF ( subfield.kohafield ) %][% subfield.kohafield | html %][% END %][% IF ( subfield.repeatable ) %], repeatable[% END %][% IF ( subfield.mandatory ) %], Mandatory[% END %][% IF ( subfield.seealso ) %], See [% subfield.seealso | html %][% END %][% IF ( subfield.authorised_value ) %], [% subfield.authorised_value | html %][% END %][% IF ( subfield.authtypecode ) %], [% subfield.authtypecode | html %][% END %][% IF ( subfield.value_builder ) %], [% subfield.value_builder | html %][% END %]
>+ Tab:[% subfield.tab | html %] | $[% subfield.tagsubfield | html %]
>+ [% subfield.liblibrarian | html %] [% IF ( subfield.kohafield ) %][% subfield.kohafield | html %][% END %][% IF ( subfield.repeatable ) %], repeatable[% END %][% IF ( subfield.mandatory ) %], Mandatory[% END %][% IF ( subfield.seealso ) %], See [% subfield.seealso | html %][% END %][% IF ( subfield.authorised_value ) %], [% subfield.authorised_value | html %][% END %][% IF ( subfield.authtypecode ) %], [% subfield.authtypecode | html %][% END %][% IF ( subfield.value_builder ) %], [% subfield.value_builder | html %][% END %]
> 
> [% END %]
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
>index 4535f1a351..6733c3a663 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
>@@ -317,9 +317,9 @@ Patron attribute types &rsaquo; Administration &rsaquo; Koha
> [% END %]
> 
> [% IF libraries.count > 1 %]
>- [% libraries.count | html %] library limitations
>+ [% libraries.count | html %] library limitations
> [% ELSE %]
>- [% libraries.count | html %] library limitation
>+ [% libraries.count | html %] library limitation
> [% END %]
> 
> [% ELSE %]
>@@ -334,9 +334,9 @@ Patron attribute types &rsaquo; Administration &rsaquo; Koha
> [% END %]
> <td>
> [% IF ( item.mandatory ) -%]
>- Yes
>+ Yes
> [% ELSE -%]
>- No
>+ No
> [% END %]
> </td>
> <td class="actions">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
>index edfe3ec66f..05f3da43d2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
>@@ -442,16 +442,16 @@ a.add, a.delete {
> </td>
> <td>
> [% SWITCH f.name %]
>- [% CASE 'author' %]Authors
>- [% CASE 'itype' %]Item types
>- [% CASE 'location' %]Locations
>- [% CASE 'su-geo' %]Places
>- [% CASE 'title-series' %]Series
>- [% CASE 'subject' %]Topics
>- [% CASE 'ccode' %]Collections
>- [% CASE 'holdingbranch' %]Holding libraries
>- [% CASE 'homebranch' %]Home libraries
>- [% CASE 'ln' %]Language
>+ [% CASE 'author' %]Authors
>+ [% CASE 'itype' %]Item types
>+ [% CASE 'location' %]Locations
>+ [% CASE 'su-geo' %]Places
>+ [% CASE 'title-series' %]Series
>+ [% CASE 'subject' %]Topics
>+ [% CASE 'ccode' %]Collections
>+ [% CASE 'holdingbranch' %]Holding libraries
>+ [% CASE 'homebranch' %]Home libraries
>+ [% CASE 'ln' %]Language
> [% CASE %][% f | html %]
> [% END %]
> </td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>index 62e2f5639a..5c6c0e6a88 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>@@ -253,11 +253,11 @@
> </td>
> <td>
> [% IF ( lengthunit == 'days' ) %]
>- Days
>+ Days
> [% ELSIF ( lengthunit == 'hours') %]
>- Hours
>+ Hours
> [% ELSE %]
>- Undefined
>+ Undefined
> [% END %]
> </td>
> <td>
>@@ -1006,13 +1006,13 @@
> <option value="*">
> [% END %]
> [% IF defaultRefundRule == 'refund' %]
>- Use default (Refund lost item charge)
>+ Use default (Refund lost item charge)
> [% ELSIF defaultRefundRule == 'charge' %]
>- Use default (Refund lost item charge and restore overdue fine)
>+ Use default (Refund lost item charge and restore overdue fine)
> [% ELSIF defaultRefundRule == 'restore' %]
>- Use default (Refund lost item charge and charge new overdue fine)
>+ Use default (Refund lost item charge and charge new overdue fine)
> [% ELSE %]
>- Use default (Leave lost item charge)
>+ Use default (Leave lost item charge)
> [% END %]
> </option>
> [% IF ( not refundLostItemFeeRule ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
>index 7a39d63ed1..ae78a07dad 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
>@@ -240,7 +240,7 @@
> <li>Host: [%- default_config.host | html -%]</li>
> <li>Port: [%- default_config.port | html -%]</li>
> <li>Timeout (secs): [%- default_config.timeout | html -%]</li>
>- <li>SSL: [%- IF default_config.ssl_mode == 'disabled' -%]Disabled[%- ELSIF default_config.ssl_mode == 'ssl' -%]SSL[%- ELSE -%]STARTTLS[%- END -%]</li>
>+ <li>SSL: [%- IF default_config.ssl_mode == 'disabled' -%]Disabled[%- ELSIF default_config.ssl_mode == 'ssl' -%]SSL[%- ELSE -%]STARTTLS[%- END -%]</li>
> <li>Debug mode: [%- IF default_config.debug -%]Yes[%- ELSE -%]No[%- END -%]</li>
> </ul>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
>index 60d60e5026..80e0e71562 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
>@@ -44,15 +44,15 @@ div#result { margin-top: 1em; }
> [% FOREACH error IN errors %]
> <div class="dialog alert">
> [% IF error.code == 'WRONG_COUNT' %]
>- Number of records provided for merging: [% error.value | html %]. Currently only 2 records can be merged at a time.
>+ Number of records provided for merging: [% error.value | html %]. Currently only 2 records can be merged at a time.
> [% ELSIF error.code == 'DESTRUCTIVE_MERGE' %]
>- You cannot merge a record with itself. Please select two different authorities.
>+ You cannot merge a record with itself. Please select two different authorities.
> [% ELSIF error.code == 'WRONG_FRAMEWORK' %]
>- The default framework cannot be used, or the framework does not exist. Please select another framework for merging.
>+ The default framework cannot be used, or the framework does not exist. Please select another framework for merging.
> [% ELSIF error.code == 'EMPTY_MARC' %]
>- Sorry, but we did not find any MARC tags in the reference record.
>+ Sorry, but we did not find any MARC tags in the reference record.
> [% ELSIF error.code == 'MISSING_RECORD' %]
>- Sorry, but we did not find a record for number: [% error.value | html %].
>+ Sorry, but we did not find a record for number: [% error.value | html %].
> [% ELSE %]
> [% error | html %]
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt
>index 6af47706d0..141007a1bf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt
>@@ -38,7 +38,7 @@ Your cart
> 
> 
> [% IF ( BIBLIO_RESULT.HASAUTHORS ) %]
>- Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author | $raw %][% END %]
>+ Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author | $raw %][% END %]
> 
> [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %]
> [% IF ( BIBLIO_RESULT.author ) %]; [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
>index 65215c6dd3..29808258d1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
>@@ -182,10 +182,10 @@
> [% FOREACH advsearchloo IN advancedsearchesloop %]
> <li role="presentation" id="advsearch-tab-[% advsearchloo.advanced_search_type | html %]">
> <a href="#advsearch-[% advsearchloo.advanced_search_type | uri %]" aria-controls="advsearch-[% advsearchloo.advanced_search_type | uri %]" role="tab" data-toggle="tab">
>- [% IF ( advsearchloo.advanced_search_type == 'itemtypes' ) %]Item type
>- [% ELSIF ( advsearchloo.advanced_search_type == 'ccode' ) %]Collection
>- [% ELSIF ( advsearchloo.advanced_search_type == 'loc' ) %]Shelving location
>- [% ELSE %]Something else
>+ [% IF ( advsearchloo.advanced_search_type == 'itemtypes' ) %]Item type
>+ [% ELSIF ( advsearchloo.advanced_search_type == 'ccode' ) %]Collection
>+ [% ELSIF ( advsearchloo.advanced_search_type == 'loc' ) %]Shelving location
>+ [% ELSE %]Something else
> [% END %]
> </a>
> </li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>index 054d3b97b7..3c56ccb5f4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>@@ -516,9 +516,9 @@ Note that permanent location is a code, and location may be an authval.
> 
> [% IF item.recalled %]
> [% IF item.recall.waitingdate %]
>- Waiting at [% Branches.GetName( item.recall.branchcode ) | html %] since [% item.recall.waitingdate | $KohaDates %]
>+ Waiting at [% Branches.GetName( item.recall.branchcode ) | html %] since [% item.recall.waitingdate | $KohaDates %]
> [% ELSE %]
>- Item recalled by <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.recall.borrowernumber | uri %]">[% item.recall.patron.firstname | html %] [% item.recall.patron.surname | html %] ([% item.recall.patron.cardnumber | html %])</a> on [% item.recall.recalldate | $KohaDates %]
>+ Item recalled by <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.recall.borrowernumber | uri %]">[% item.recall.patron.firstname | html %] [% item.recall.patron.surname | html %] ([% item.recall.patron.cardnumber | html %])</a> on [% item.recall.recalldate | $KohaDates %]
> [% END %]
> [% END %]
> 
>@@ -743,18 +743,18 @@ Note that permanent location is a code, and location may be an authval.
> <td data-order="[% latestserial.planneddate | html %]">[% latestserial.planneddate | $KohaDates %]</td>
> <td data-order="[% latestserial.publisheddate | html %]">[% latestserial.publisheddate | $KohaDates %]</td>
> <td>
>- [% IF ( latestserial.status1 ) %]Expected[% END %]
>- [% IF ( latestserial.status2 ) %]Arrived[% END %]
>- [% IF ( latestserial.status3 ) %]Late[% END %]
>- [% IF ( latestserial.status4 ) %]Missing[% END %]
>- [% IF ( latestserial.status41 ) %]Missing (never received)[% END %]
>- [% IF ( latestserial.status42 ) %]Missing (sold out)[% END %]
>- [% IF ( latestserial.status43 ) %]Missing (damaged)[% END %]
>- [% IF ( latestserial.status44 ) %]Missing (lost)[% END %]
>- [% IF ( latestserial.status5 ) %]Not issued[% END %]
>- [% IF ( latestserial.status6 ) %]Delete[% END %]
>- [% IF ( latestserial.status7 ) %]Claimed[% END %]
>- [% IF ( latestserial.status8 ) %]Stopped[% END %]
>+ [% IF ( latestserial.status1 ) %]Expected[% END %]
>+ [% IF ( latestserial.status2 ) %]Arrived[% END %]
>+ [% IF ( latestserial.status3 ) %]Late[% END %]
>+ [% IF ( latestserial.status4 ) %]Missing[% END %]
>+ [% IF ( latestserial.status41 ) %]Missing (never received)[% END %]
>+ [% IF ( latestserial.status42 ) %]Missing (sold out)[% END %]
>+ [% IF ( latestserial.status43 ) %]Missing (damaged)[% END %]
>+ [% IF ( latestserial.status44 ) %]Missing (lost)[% END %]
>+ [% IF ( latestserial.status5 ) %]Not issued[% END %]
>+ [% IF ( latestserial.status6 ) %]Delete[% END %]
>+ [% IF ( latestserial.status7 ) %]Claimed[% END %]
>+ [% IF ( latestserial.status8 ) %]Stopped[% END %]
> </td>
> <td>[% latestserial.notes | html %]</td>
> </tr>
>@@ -906,15 +906,15 @@ Note that permanent location is a code, and location may be an authval.
> [% suggestion.fund.budget_name | html %]
> </td>
> <td>
>- [% IF suggestion.STATUS == 'ASKED' %]Pending
>- [% ELSIF suggestion.STATUS == 'ACCEPTED' %]Accepted
>- [% ELSIF suggestion.STATUS == 'ORDERED' %]Ordered
>- [% ELSIF suggestion.STATUS == 'REJECTED' %]Rejected
>- [% ELSIF suggestion.STATUS == 'CHECKED' %]Checked
>- [% ELSIF suggestion.STATUS == 'AVAILABLE' %]Available
>+ [% IF suggestion.STATUS == 'ASKED' %]Pending
>+ [% ELSIF suggestion.STATUS == 'ACCEPTED' %]Accepted
>+ [% ELSIF suggestion.STATUS == 'ORDERED' %]Ordered
>+ [% ELSIF suggestion.STATUS == 'REJECTED' %]Rejected
>+ [% ELSIF suggestion.STATUS == 'CHECKED' %]Checked
>+ [% ELSIF suggestion.STATUS == 'AVAILABLE' %]Available
> [% ELSIF AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestion.STATUS ) %]
> [% AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestion.STATUS ) | html %]
>- [% ELSE %]Status unknown
>+ [% ELSE %]Status unknown
> [% END %]
> [% IF suggestion.reason %]
> ([% suggestion.reason | html %])
>@@ -932,7 +932,7 @@ Note that permanent location is a code, and location may be an authval.
> <table>
> [% FOREACH XISBN IN XISBNS %]<tr>[% IF ( AmazonCoverImages ) %]<td><a href="http://www.amazon.com/gp/reader/[% XISBN.normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link"><img src="https://images-na.ssl-images-amazon.com/images/P/[% XISBN.normalized_isbn | html %].01._AA75_PU_PU-5_.jpg" /></a></td>[% END %]
> [% IF ( !item_level_itypes || Koha.Preference('BiblioItemtypeInfo') ) %]<td>[% IF ( noItemTypeImages ) %][% XISBN.description | html %][% ELSE %]<img src="[% XISBN.imageurl | html %]" alt="[% XISBN.description | html %]" title="[% XISBN.description | html %]">[% END %]</td>[% END %]
>-<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% XISBN.biblionumber | uri %]">[% XISBN.title | html %]</a> by [% XISBN.author | html %] &copy;[% XISBN.copyrightdate | html %]
>+<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% XISBN.biblionumber | uri %]">[% XISBN.title | html %]</a> by [% XISBN.author | html %] &copy;[% XISBN.copyrightdate | html %]
> [% IF ( XISBN.publishercode ) %]
> [% XISBN.publishercode | html %] [% IF ( XISBN.place ) %]([% XISBN.place | html %])[% END %] [% IF ( XISBN.publicationyear ) %], [% XISBN.publicationyear | html %][% END %] [% IF ( XISBN.editionstatement ) %][% XISBN.editionstatement | html %][% END %] [% IF ( XISBN.editionresponsibility ) %][% XISBN.editionresponsibility | html %][% END %]
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
>index 6db25bb690..3608179afd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
>@@ -108,26 +108,26 @@
> [% IF ( ITEM_DAT.replacementprice ) %]<li>Replacement price: [% ITEM_DAT.replacementprice | $Price %]&nbsp;</li> [% END %]
> 	 [% IF ITEM_DAT.materials %]<li>Materials specified: [% ITEM_DAT.materials | html %] </li> [% END %]
> </ol></div></div>
>- <div class="listgroup"><h4>Statuses [% IF ( ITEM_DAT.status_advisory ) %](
>+ <div class="listgroup"><h4>Statuses [% IF ( ITEM_DAT.status_advisory ) %](
> [% IF ( ITEM_DAT.notforloantext ) %][% ITEM_DAT.notforloantext | html %] [% END %]
>- [% IF ( ITEM_DAT.itemlost ) %]Lost[% END %]
>- [% IF ( ITEM_DAT.damaged ) %]Damaged[% END %]
>- [% IF ( ITEM_DAT.withdrawn ) %]Withdrawn[% END %]
>+ [% IF ( ITEM_DAT.itemlost ) %]Lost[% END %]
>+ [% IF ( ITEM_DAT.damaged ) %]Damaged[% END %]
>+ [% IF ( ITEM_DAT.withdrawn ) %]Withdrawn[% END %]
> )[% END %]</h4>
> 
> <div class="rows">
> <ol class="bibliodetails">
> <li>Current library: [% Branches.GetName( ITEM_DAT.holdingbranch ) | html %]&nbsp;</li>
> <li>Checkout status:
>- [% IF ( ITEM_DAT.issue ) %]Checked out to
>+ [% IF ( ITEM_DAT.issue ) %]Checked out to
> [% INCLUDE 'patron-title.inc' patron => ITEM_DAT.patron hide_patron_infos_if_needed=1 %]
> [% IF ( ITEM_DAT.lastreneweddate ) %]
>- Last renewed [% ITEM_DAT.lastreneweddate | $KohaDates %],
>+ Last renewed [% ITEM_DAT.lastreneweddate | $KohaDates %],
> [% END %]
> [% IF ( ITEM_DAT.datedue ) %]
>- Due back on [% ITEM_DAT.datedue | $KohaDates %]
>+ Due back on [% ITEM_DAT.datedue | $KohaDates %]
> [% ELSE %]
>- Not checked out
>+ Not checked out
> [% END %]
> [% END %]
> &nbsp;</li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>index cde3f0f090..a077f28d8a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>@@ -564,7 +564,7 @@
> 
> [% END %]
> 
>- [% tnx('{count} item', '{count} items', SEARCH_RESULT.items_count, {count = SEARCH_RESULT.items_count}) | html %][% IF ( SEARCH_RESULT.availablecount ) %], [% SEARCH_RESULT.availablecount | html %] available:[% ELSE %], None available[% END %]
>+ [% tnx('{count} item', '{count} items', SEARCH_RESULT.items_count, {count = SEARCH_RESULT.items_count}) | html %][% IF ( SEARCH_RESULT.availablecount ) %], [% SEARCH_RESULT.availablecount | html %] available:[% ELSE %], None available[% END %]
> 
> [% IF MaxSearchResultsItemsPerRecordStatusCheck && SEARCH_RESULT.items_count > MaxSearchResultsItemsPerRecordStatusCheck %]
> 
>@@ -612,10 +612,10 @@
> ([% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.damaged', authorised_value => items_loo.damaged ) | html %])
> [% END %]
> [% IF ( items_loo.intransit ) %]
>- (In transit)
>+ (In transit)
> [% END %]
> [% IF ( items_loo.onhold ) %]
>- (On hold)
>+ (On hold)
> [% END %]
> [% IF ( items_loo.notforloan ) %]
> [% items_loo.notforloan | html %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
>index a081592272..25c74f9fcf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
>@@ -68,9 +68,9 @@
> 
> [% END %]
> [% IF item.rota.active %]
>- Active
>+ Active
> [% ELSE %]
>- Inactive
>+ Inactive
> [% END %]
> [% IF !item.rota.active %]
> 
>@@ -79,9 +79,9 @@
> </td>
> <td>
> [% IF item.bib_item.get_transfer %]
>- Yes
>+ Yes
> [% ELSE %]
>- No
>+ No
> [% END %]
> </td>
> <td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
>index adf125d512..126e49e524 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
>@@ -151,11 +151,11 @@
> 
> [% END %]
> 
>- [% IF ( resultsloo.onloancount ) %] Checked out ([% resultsloo.onloancount | html %]), [% END %]
>- [% IF ( resultsloo.withdrawncount ) %] Withdrawn ([% resultsloo.withdrawncount | html %]), [% END %]
>- [% IF ( resultsloo.itemlostcount ) %] Lost ([% resultsloo.itemlostcount | html %]) [% END %]
>- [% IF ( resultsloo.recalledcount ) %] Waiting to fill recall ([% resultsloo.recalled | html %])[% END %]
>- [% IF ( resultsloo.onholdcount ) %] Waiting on hold ([% resultsloo.onholdcount | html %])[% END %]
>+ [% IF ( resultsloo.onloancount ) %] Checked out ([% resultsloo.onloancount | html %]), [% END %]
>+ [% IF ( resultsloo.withdrawncount ) %] Withdrawn ([% resultsloo.withdrawncount | html %]), [% END %]
>+ [% IF ( resultsloo.itemlostcount ) %] Lost ([% resultsloo.itemlostcount | html %]) [% END %]
>+ [% IF ( resultsloo.recalledcount ) %] Waiting to fill recall ([% resultsloo.recalled | html %])[% END %]
>+ [% IF ( resultsloo.onholdcount ) %] Waiting on hold ([% resultsloo.onholdcount | html %])[% END %]
> 
> 
> [% IF ( resultsloo.other_items_loop ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt
>index 9555d29856..ed0ab35d36 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt
>@@ -55,7 +55,7 @@
> [% END %]
> 
> [% IF ( total ) %]Results [% from | html %] to [% to | html %] of [% total | html %]
>- [% ELSE %]No results found
>+ [% ELSE %]No results found
> [% END %]</div>
> <div id="resultlist">
> <table>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt
>index 8af5f2ce91..480177d966 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt
>@@ -50,7 +50,7 @@
> [% IF ( total ) %]
> &nbsp;Results [% from | html %] to [% to | html %] of [% total | html %] 
> [% ELSE %]
>- &nbsp; No results found 
>+ &nbsp; No results found 
> [% END %]
> 
> [% IF ( total ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt
>index 43e862ede4..2b5c262f75 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt
>@@ -53,7 +53,7 @@
> [% END %]
> 			
> [% IF ( total ) %]Results [% from | html %] to [% to | html %] of [% total | html %]
>- [% ELSE %]No results found
>+ [% ELSE %]No results found
> [% END %]</div>
> 		<div id="resultlist">
> 			<table>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
>index 1c559b5330..1c70220f8d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
>@@ -247,7 +247,7 @@
> [% r.biblio.biblioitem.size | html %]
> 
> [% IF ar.biblio.biblioitem.isbn %]
>- ISBN: [% ar.biblio.biblioitem.isbn | html %]
>+ ISBN: [% ar.biblio.biblioitem.isbn | html %]
> [% END %]
> </div>
> 
>@@ -354,7 +354,7 @@
> [% r.biblio.biblioitem.size | html %]
> 
> [% IF ar.biblio.biblioitem.isbn %]
>- ISBN: [% ar.biblio.biblioitem.isbn | html %]
>+ ISBN: [% ar.biblio.biblioitem.isbn | html %]
> [% END %]
> </div>
> 
>@@ -458,7 +458,7 @@
> [% r.biblio.biblioitem.size | html %]
> 
> [% IF ar.biblio.biblioitem.isbn %]
>- ISBN: [% ar.biblio.biblioitem.isbn | html %]
>+ ISBN: [% ar.biblio.biblioitem.isbn | html %]
> [% END %]
> </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>index 6b5ef7c81d..2758b3d87d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -186,13 +186,13 @@
> [% IF ( NOT_FOR_LOAN_FORCING ) %]
> <li>
> [% IF ( itemtype_notforloan ) %]
>- Item type is normally not for loan.
>+ Item type is normally not for loan.
> [% ELSIF ( item_notforloan ) %]
> [% item_notforloan_lib = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => item.notforloan ) %]
>- Item is normally not for loan[% IF (item_notforloan_lib) %] ([% item_notforloan_lib | html %])[% END %].
>+ Item is normally not for loan[% IF (item_notforloan_lib) %] ([% item_notforloan_lib | html %])[% END %].
> [% END %]
> [% IF CAN_user_circulate_force_checkout %]
>- Check out anyway?
>+ Check out anyway?
> [% END %]
> </li>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>index 3271a6e028..faac9f1992 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>@@ -60,7 +60,7 @@
> 
> [% IF ( overdueloop ) %]
> 
>- <h2>[% nnoverdue | html %] [% IF ( noverdue_is_plural ) %]Items[% ELSE %]Item[% END %] overdue as of [% todaysdate | html %][% IF ( isfiltered ) %] (Filtered. <a href="/cgi-bin/koha/circ/overdue.pl">Reset filter</a>)[% END %]</h2>
>+ <h2>[% nnoverdue | html %] [% IF ( noverdue_is_plural ) %]Items[% ELSE %]Item[% END %] overdue as of [% todaysdate | html %][% IF ( isfiltered ) %] (Filtered. <a href="/cgi-bin/koha/circ/overdue.pl">Reset filter</a>)[% END %]</h2>
> 
> 
> [% IF ( isfiltered ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
>index a78b17fda7..0bda66110d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
>@@ -306,15 +306,15 @@
> </td>
> <td>
> [% IF ar.status == 'PENDING' %]
>- Pending
>+ Pending
> [% ELSIF ar.status == 'PROCESSING' %]
>- Processing
>+ Processing
> [% ELSIF ar.status == 'REQUESTED' %]
>- New
>+ New
> [% ELSIF ar.status == 'COMPLETED' %]
>- Completed
>+ Completed
> [% ELSIF ar.status == 'CANCELED' %]
>- Canceled
>+ Canceled
> [% END %]
> </td>
> <td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>index afba66427f..b802d89380 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>@@ -10,11 +10,11 @@
> [% SET footerjs = 1 %]
> [% BLOCK display_bormessagepref %]
> [% IF ( bormessagepref ) %]
>- <li class="notification_method">Patron notification:
>+ <li class="notification_method">Patron notification:
> [% FOREACH mtt IN bormessagepref.keys %]
>- [%~ IF ( mtt == 'email' ) %] Email[% END ~%]
>- [%~ IF ( mtt == 'phone' ) %] Phone[% END ~%]
>- [%~ IF ( mtt == 'sms' ) %] SMS[% END ~%]
>+ [%~ IF ( mtt == 'email' ) %] Email[% END ~%]
>+ [%~ IF ( mtt == 'phone' ) %] Phone[% END ~%]
>+ [%~ IF ( mtt == 'sms' ) %] SMS[% END ~%]
> [%~ UNLESS loop.last %], [% ELSE %].[% END ~%]
> [% END %]
> </li>
>@@ -249,18 +249,18 @@
> [% IF ( errmsgloo.ItemLocationUpdated ) %]
> 
> Item shelving location updated.
>- Old value:
>+ Old value:
> [% IF errmsgloo.ItemLocationUpdated.from %]
> [% SET av_description = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => errmsgloo.ItemLocationUpdated.from ) %]
> [% IF errmsgloo.ItemLocationUpdated.from == '' %]
>- empty
>+ empty
> [% ELSIF av_description == '' %]
>- [% errmsgloo.ItemLocationUpdated.from | html %] (No description available)
>+ [% errmsgloo.ItemLocationUpdated.from | html %] (No description available)
> [% ELSE %]
> [% av_description | html %]
> [% END %]
> [% ELSE %]
>- "Blank"
>+ "Blank"
> [% END %]
> New value:
> [% IF errmsgloo.ItemLocationUpdated.to %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
>index b0c0933df3..7d1032386c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
>@@ -63,11 +63,11 @@
> 
> [% IF ( run_report ) %]
> [% IF ( total ) %]
>- <div class="results">[% total | html %] items found for
>- [% IF ( branchlimit ) %][% Branches.GetName( branchlimit ) | html %][% ELSE %]All libraries[% END %]
>- [% IF ( itemtypeslimit ) %] and item type: [% ItemTypes.GetDescription( itemtypeslimit ) | html %][% END %]
>- [% IF ( ccodeslimit ) %] and collection: [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode' authorised_value = ccodeslimit ) | html %][% END %]
>- [% IF ( locationslimit ) %] and shelving location: [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location' authorised_value = locationslimit ) | html %][% END %]
>+ <div class="results">[% total | html %] items found for
>+ [% IF ( branchlimit ) %][% Branches.GetName( branchlimit ) | html %][% ELSE %]All libraries[% END %]
>+ [% IF ( itemtypeslimit ) %] and item type: [% ItemTypes.GetDescription( itemtypeslimit ) | html %][% END %]
>+ [% IF ( ccodeslimit ) %] and collection: [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode' authorised_value = ccodeslimit ) | html %][% END %]
>+ [% IF ( locationslimit ) %] and shelving location: [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location' authorised_value = locationslimit ) | html %][% END %]
> </div>
> [% ELSE %]
> <div class="dialog message">No items found.</div>
>@@ -175,7 +175,7 @@
> 
> [% IF ( itemsloo.item('size') ) %][% itemsloo.item('size') | html %][% END %]
> 
>- [% IF ( itemsloo.isbn ) %]ISBN: [% itemsloo.isbn | html %][% END %]
>+ [% IF ( itemsloo.isbn ) %]ISBN: [% itemsloo.isbn | html %][% END %]
> </div>
> 
> </td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt
>index b55a054fc4..027b9a1bdc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt
>@@ -84,16 +84,16 @@
> <td>[% t.description | html %]</td>
> <td>
> [% IF t.is_enrollable_from_opac %]
>- Yes
>+ Yes
> [% ELSE %]
>- No
>+ No
> [% END %]
> </td>
> <td>
> [% IF t.is_email_required %]
>- Yes
>+ Yes
> [% ELSE %]
>- No
>+ No
> [% END %]
> </td>
> <td>[% Branches.GetName( t.branchcode ) | html %]</td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt
>index 51aea6fa23..ce8e63fe14 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt
>@@ -20,7 +20,7 @@
> </li>
> <li>
> <a href="#" aria-current="page">
>- [% IF is_edit || course_reserve %] Edit [% ELSE %] Reserve [% END %]
>+ [% IF is_edit || course_reserve %] Edit [% ELSE %] Reserve [% END %]
> [% biblio.title | html %] for [% course.course_name | html %]
> </a>
> </li>
>@@ -31,7 +31,7 @@
> <div class="row">
> <div class="col-md-8 col-md-offset-2">
> <h1>
>-i [% IF is_edit || course_reserve %]Edit [% ELSE %]Reserve [% END %][% biblio.title | html %] for [% course.course_name | html %]
>+ [% IF is_edit || course_reserve %]Edit [% ELSE %]Reserve [% END %][% biblio.title | html %] for [% course.course_name | html %]
> </h1>
> 
> [% IF course_reserve && !is_edit%]<div class="dialog message" id="already_on_reserve_this">This course already has this item on reserve.</div>[% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
>index fbd03d48fa..0b706dc761 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
>@@ -268,9 +268,9 @@
> <td class="status">
> 
> [% IF cr.item.onloan %]
>- Checked out
>+ Checked out
> [% ELSE %]
>- Available
>+ Available
> [% END %]
> 
> </td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt
>index ca5e55fee5..1c7c3d7aac 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt
>@@ -161,9 +161,9 @@
> <h1>No DEPARTMENT authorized values found!</h1>
> 
> [% IF ( CAN_user_parameters ) %]
>- Please <a href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=DEPARTMENT">create one or more authorized values</a> with the category DEPARTMENT.
>+ Please <a href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=DEPARTMENT">create one or more authorized values</a> with the category DEPARTMENT.
> [% ELSE %]
>- An administrator must create one or more authorized values with the category DEPARTMENT.
>+ An administrator must create one or more authorized values with the category DEPARTMENT.
> [% END %]
> 
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt
>index 7082b27c02..9440e482c1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt
>@@ -1,4 +1,4 @@
>-[% INCLUDE 'doc-head-open.inc' %]Koha &rsaquo; Tools &rsaquo; Labels &rsaquo;: Search[% INCLUDE 'doc-head-close.inc' %]
>+[% INCLUDE 'doc-head-open.inc' %]Koha &rsaquo; Tools &rsaquo; Labels &rsaquo;: Search[% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="labels_label-bib-search" class="tools labels">
> <div id="main-compact">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
>index d8bda80551..fdfcf238ad 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
>@@ -58,11 +58,11 @@
> [% ELSE %]
> <h3>
> [% IF ( label_ids ) %]
>- [% IF ( label_count == 1 ) %]Exporting [% label_count | html %] label[% ELSE %]Exporting [% label_count | html %] labels[% END %]
>+ [% IF ( label_count == 1 ) %]Exporting [% label_count | html %] label[% ELSE %]Exporting [% label_count | html %] labels[% END %]
> [% ELSIF ( item_numbers ) %]
>- [% IF ( item_count == 1 ) %]Exporting [% item_count | html %] label[% ELSE %]Exporting [% item_count | html %] labels[% END %]
>+ [% IF ( item_count == 1 ) %]Exporting [% item_count | html %] label[% ELSE %]Exporting [% item_count | html %] labels[% END %]
> [% ELSE %]
>- [% IF ( multi_batch_count == 1 ) %][% multi_batch_count | html %] batch to export[% ELSE %][% multi_batch_count | html %] batches to export[% END %]
>+ [% IF ( multi_batch_count == 1 ) %][% multi_batch_count | html %] batch to export[% ELSE %][% multi_batch_count | html %] batches to export[% END %]
> [% END %]
> </h3>
> <form name="exporting" method="post" action="/cgi-bin/koha/labels/label-print.pl">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
>index b6677ce9c2..1a328dac49 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
>@@ -62,9 +62,9 @@
> 
> <h1>
> [% IF type == 'credit' %]
>- Details of payment
>+ Details of payment
> [% ELSIF type == 'debit' %]
>- Details of fee
>+ Details of fee
> [% END %]
> </h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt
>index 848d37bed5..cb53a59913 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt
>@@ -96,20 +96,20 @@
> [% END %]
> <td>
> [% IF hold.found == 'F' %]
>- Fulfilled
>+ Fulfilled
> [% ELSIF hold.cancellationdate %]
>- Cancelled
>+ Cancelled
> [% IF hold.cancellation_reason %]
> ([% AuthorisedValues.GetByCode('HOLD_CANCELLATION', hold.cancellation_reason) | html %])
> [% END %]
> [% ELSIF hold.found == 'W' %]
>- Waiting
>+ Waiting
> [% ELSIF hold.found == 'P' %]
>- Processing
>+ Processing
> [% ELSIF hold.found == 'T' %]
>- In transit
>+ In transit
> [% ELSE %]
>- Pending
>+ Pending
> [% END %]
> </td>
> </tr>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>index e61ae4f688..3e360b5bcc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>@@ -59,11 +59,11 @@ legend:hover {
> <li>
> <a href="#" aria-current="page">
> [% IF ( opadd ) %]
>- Add patron
>+ Add patron
> [% ELSIF ( opduplicate ) %]
>- Duplicate patron
>+ Duplicate patron
> [% ELSE %]
>- Modify patron
>+ Modify patron
> [% END %]
> [% IF categoryname %]
> ([% categoryname | html %])
>@@ -111,11 +111,11 @@ legend:hover {
> [% UNLESS ( no_add ) %]
> <h1>
> [% IF ( opadd ) %]
>- Add patron
>+ Add patron
> [% ELSIF ( opduplicate ) %]
>- Duplicate patron
>+ Duplicate patron
> [% ELSE %]
>- Modify patron
>+ Modify patron
> [% END %]
> [% INCLUDE 'patron-title.inc' %]
> [% IF categoryname %]([% categoryname | html %])[% END %]
>@@ -269,7 +269,7 @@ legend:hover {
> [% IF ( step_1 ) %]
> [% UNLESS notitle && nosurname && nofirstname && nodateofbirth && noinitials && noothernames &&nosex %]
> <fieldset class="rows" id="memberentry_identity">
>- <legend id="identity_lgd">[% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity</legend>
>+ <legend id="identity_lgd">[% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity</legend>
> <ol>
> [% UNLESS ( I ) %]
> [% UNLESS notitle %]
>@@ -1316,7 +1316,7 @@ legend:hover {
> No
> </label>
> [% ELSE %]
>- [% IF flagloo.yes %]Yes[% ELSE %]No[% END %]
>+ [% IF flagloo.yes %]Yes[% ELSE %]No[% END %]
> [% END # /IF CAN_user_circulate_manage_restrictions %]
> </li>
> [% END # /FOREACH flagloo %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>index dfd08255f8..f040204af7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -412,9 +412,9 @@
> [% IF Koha.Preference( 'OPACPrivacy') %]
> <li id="patron-privacypref">
> Privacy pref:
>- [% IF ( patron.privacy == 0 ) %]Forever[% END %]
>- [% IF ( patron.privacy == 1 ) %]Default[% END %]
>- [% IF ( patron.privacy == 2 ) %]Never[% END %]
>+ [% IF ( patron.privacy == 0 ) %]Forever[% END %]
>+ [% IF ( patron.privacy == 1 ) %]Default[% END %]
>+ [% IF ( patron.privacy == 2 ) %]Never[% END %]
> </li>
> [% END %]
> 
>@@ -454,7 +454,7 @@
> [% IF ( patron.password_expiration_date ) %]
> [% patron.password_expiration_date | $KohaDates %]
> [% ELSE %]
>- Never
>+ Never
> [% END %]
> </li>
> [% END %]
>@@ -477,11 +477,11 @@
> <li id="patron-checkprev">
> Check previous checkouts: 
> [% IF ( patron.checkprevcheckout == 'yes' ) %]
>- Yes
>+ Yes
> [% ELSIF ( patron.checkprevcheckout == 'no' ) %]
>- No
>+ No
> [% ELSE %]
>- Inherited
>+ Inherited
> [% END %]
> </li>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
>index 14f7d18188..8922a7557c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
>@@ -61,17 +61,17 @@
> <iframe class="notice" id="notice[% QUEUED_MESSAGE.message_id | html %]" srcdoc="[% QUEUED_MESSAGE.content | html | html_line_break %]"></iframe>
> </td>
> <td>
>- [% IF ( QUEUED_MESSAGE.message_transport_type == 'email' ) %]email
>- [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'print' ) %]print
>- [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'feed' ) %]feed
>- [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'sms' ) %]sms
>+ [% IF ( QUEUED_MESSAGE.message_transport_type == 'email' ) %]email
>+ [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'print' ) %]print
>+ [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'feed' ) %]feed
>+ [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'sms' ) %]sms
> [% ELSE %][% QUEUED_MESSAGE.message_transport_type | html %][% END %]
> </td>
> <td>
>- [% IF ( QUEUED_MESSAGE.status == 'sent' ) %]sent
>- [% ELSIF ( QUEUED_MESSAGE.status == 'pending' ) %]pending
>- [% ELSIF ( QUEUED_MESSAGE.status == 'failed' ) %]failed
>- [% ELSIF ( QUEUED_MESSAGE.status == 'deleted' ) %]deleted
>+ [% IF ( QUEUED_MESSAGE.status == 'sent' ) %]sent
>+ [% ELSIF ( QUEUED_MESSAGE.status == 'pending' ) %]pending
>+ [% ELSIF ( QUEUED_MESSAGE.status == 'failed' ) %]failed
>+ [% ELSIF ( QUEUED_MESSAGE.status == 'deleted' ) %]deleted
> [% ELSE %][% QUEUED_MESSAGE.status | html %][% END %]
> [% IF ( QUEUED_MESSAGE.status != 'pending' ) %]
> <div class="notice">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>index b153e3b91a..57b0947834 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>@@ -49,18 +49,18 @@
> <li>
> <a href="#" aria-current="page">
> [% IF ( pay_individual ) %]
>- Pay an individual fine
>+ Pay an individual fine
> [% ELSIF ( writeoff_individual ) %]
>- Write off an individual fine
>+ Write off an individual fine
> [% ELSE %]
> [% IF ( selected_accts ) %]
> [% IF type == 'WRITEOFF' %]
>- Write off an amount toward selected fines
>+ Write off an amount toward selected fines
> [% ELSE %]
>- Pay an amount toward selected fines
>+ Pay an amount toward selected fines
> [% END %]
> [% ELSE %]
>- Pay an amount toward all fines
>+ Pay an amount toward all fines
> [% END %]
> [% END %]
> </a>
>@@ -75,18 +75,18 @@
> 
> <h1>
> [% IF ( pay_individual ) %]
>- Pay an individual fine
>+ Pay an individual fine
> [% ELSIF ( writeoff_individual ) %]
>- Write off an individual fine
>+ Write off an individual fine
> [% ELSE %]
> [% IF ( selected_accts ) %]
> [% IF type == 'WRITEOFF' %]
>- Write off an amount toward selected fines
>+ Write off an amount toward selected fines
> [% ELSE %]
>- Pay an amount toward selected fines
>+ Pay an amount toward selected fines
> [% END %]
> [% ELSE %]
>- Pay an amount toward all fines
>+ Pay an amount toward all fines
> [% END %]
> [% END %]
> </h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
>index 81c7c03a3f..ce35ab360a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
>@@ -46,11 +46,11 @@
> [% SET routinglists = patron.get_routing_lists %]
> <h2>
> [% UNLESS ( routinglists ) %]
>-0 subscription routing lists
>+0 subscription routing lists
> [% ELSIF ( routinglists.count == 1 ) %]
>-[% routinglists.count | html %] subscription routing list
>+[% routinglists.count | html %] subscription routing list
> [% ELSE %]
>-[% routinglists.count | html %] subscription routing lists
>+[% routinglists.count | html %] subscription routing lists
> [% END %]
> </h2>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
>index e9a57f91ea..90a48c4465 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
>@@ -27,11 +27,11 @@
> <li>
> <a href="#" aria-current="page">
> [% IF description %]
>- Edit [% description | html %]
>+ Edit [% description | html %]
> [% ELSIF batch_id %]
>- Edit ([% batch_id | html %])
>+ Edit ([% batch_id | html %])
> [% ELSE %]
>- New
>+ New
> [% END %]
> </a>
> </li>
>@@ -45,7 +45,7 @@
> 
> [% INCLUDE 'patroncards-toolbar.inc' %]
> 
>- <h1>[% IF description %]Edit [% ELSIF batch_id %]Edit [% ELSE %]New [% END %]patron card batches</h1>
>+ <h1>[% IF description %]Edit [% ELSIF batch_id %]Edit [% ELSE %]New [% END %]patron card batches</h1>
> 
> [% IF ( duplicate_message ) %]
> <div class="dialog message">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
>index 16d698fb0f..2d9c45c5dc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
>@@ -41,7 +41,7 @@
> 
> [% INCLUDE 'patroncards-toolbar.inc' %]
> 
>- <h1>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card layout</h1>
>+ <h1>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card layout</h1>
> 
> 
> <form name="input" action="/cgi-bin/koha/patroncards/edit-layout.pl" method="get">
>@@ -279,7 +279,7 @@
> </div>
> <div class="col-sm-6">
> <fieldset class="rows">
>- <legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card graphic layout</legend>
>+ <legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card graphic layout</legend>
> <ol>
> 
> </div> 
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
>index 6637cfab6f..8cc6321d29 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
>@@ -35,7 +35,7 @@
> [% IF ( GNA ) %]
> <li id="gna">
> According to our records, we don't have up-to-date contact information. Please contact the library.
>- <a href="/cgi-bin/koha/opac-memberentry.pl">[% IF ( Koha.Preference('OPACPatronDetails') ) %]Update your contact information[% ELSE %]Go to your contact information[% END %]</a>
>+ <a href="/cgi-bin/koha/opac-memberentry.pl">[% IF ( Koha.Preference('OPACPatronDetails') ) %]Update your contact information[% ELSE %]Go to your contact information[% END %]</a>
> [% IF ( Koha.Preference('OPACPatronDetails') ) %](Please note: there may be a delay in restoring your account if you submit online.)[% END %]
> </li>
> [% END %]
>@@ -144,9 +144,9 @@
> [% IF (RESERVE_CHARGE) %]
> <div class="alert" id="reserve_fee">
> [% IF Koha.Preference('HoldFeeMode') == 'any_time_is_collected' %]
>- You will be charged a hold fee of [% RESERVE_CHARGE | $Price %] when you collect this item
>+ You will be charged a hold fee of [% RESERVE_CHARGE | $Price %] when you collect this item
> [% ELSE %]
>- You will be charged a hold fee of [% RESERVE_CHARGE | $Price %] for placing this hold
>+ You will be charged a hold fee of [% RESERVE_CHARGE | $Price %] for placing this hold
> [% END %]
> </div>
> [% END %]
>@@ -170,11 +170,11 @@
> [% IF bibitemloo.forced_hold_level %]
> <div class="alert alert-info forced_hold_level">
> [% IF bibitemloo.forced_hold_level == 'item' %]
>- You already have at least one item level hold on this title.
>- All further holds must be item level.
>+ You already have at least one item level hold on this title.
>+ All further holds must be item level.
> [% ELSE %]
>- You already have at least one record level hold on this title.
>- All further holds must be record level.
>+ You already have at least one record level hold on this title.
>+ All further holds must be record level.
> [% END %]
> </div>
> [% END %]
>@@ -443,17 +443,17 @@
> [% IF ( itemLoo.reservedate ) %]
> 
> [% IF ( itemLoo.waitingdate ) %]
>- Waiting
>+ Waiting
> [% ELSE %]
>- On hold
>+ On hold
> [% END %]
>- for patron
>+ for patron
> [% IF ( itemLoo.waitingdate ) %]
>- at
>+ at
> [% ELSE %]
>- expected at
>+ expected at
> [% END %]
>- [% itemLoo.ExpectedAtLibrary | html %] since
>+ [% itemLoo.ExpectedAtLibrary | html %] since
> [% IF ( itemLoo.waitingdate ) %]
> [% itemLoo.waitingdate | $KohaDates %]
> [% ELSE %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt
>index c770189a48..f77f9d09f5 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt
>@@ -38,17 +38,17 @@
> 
> [% SWITCH error %]
> [% CASE 'no_change' %]
>- New password must not be the same as old password.
>+ New password must not be the same as old password.
> [% CASE 'passwords_mismatch' %]
>- Passwords do not match. Please re-type your new password.
>+ Passwords do not match. Please re-type your new password.
> [% CASE 'password_too_short' %]
>- Password must be at least [% minPasswordLength | html %] characters long.
>+ Password must be at least [% minPasswordLength | html %] characters long.
> [% CASE 'password_too_weak' %]
>- Password must contain at least one digit, one lowercase and one uppercase.
>+ Password must contain at least one digit, one lowercase and one uppercase.
> [% CASE 'password_has_whitespaces' %]
>- Password must not contain leading or trailing whitespaces.
>+ Password must not contain leading or trailing whitespaces.
> [% CASE 'invalid_credentials' %]
>- You entered an incorrect username or password. Please try again! But note that passwords are case sensitive[% IF Koha.Preference('FailedLoginAttempts') %] and that your account will be locked out after a fixed number of failed login attempts[% END %]. Please contact a library staff member if you continue to have problems.
>+ You entered an incorrect username or password. Please try again! But note that passwords are case sensitive[% IF Koha.Preference('FailedLoginAttempts') %] and that your account will be locked out after a fixed number of failed login attempts[% END %]. Please contact a library staff member if you continue to have problems.
> [% CASE 'no_expire' %]
> Please log-in to account to update your password.
> <a href="/cgi-bin/koha/opac-user.pl" class="nav-link login-link loginModal-trigger"> Log in to your account</a>
>@@ -57,10 +57,10 @@
> [% IF Categories.can_any_reset_password && Koha.Preference('OpacBaseURL') %]
> <a href="[% Koha.Preference('OpacBaseURL') | url %]/cgi-bin/koha/opac-password-recovery.pl">You must reset your password via e-mail</a>.
> [% ELSE %]
>- You must contact the library for assistance
>+ You must contact the library for assistance
> [% END %]
> [% CASE %]
>- An unknown error occurred. PLease try again or contact the library for assistance
>+ An unknown error occurred. Please try again or contact the library for assistance
> [% END %]
> 
> </div>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt
>index 823e0bf0a5..00f93e7e0a 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt
>@@ -64,10 +64,10 @@ Your cart
> 
> [% IF BIBLIO_RESULT.publishercode %]
> 
>- Published by: [% BIBLIO_RESULT.publishercode | $raw %]
>+ Published by: [% BIBLIO_RESULT.publishercode | $raw %]
> [% IF ( BIBLIO_RESULT.publicationyear ) %]
> in [% BIBLIO_RESULT.publicationyear | $raw %]
>- [% END %]
>+ [% END %]
> [% IF ( BIBLIO_RESULT.pages ) %]
> , [% BIBLIO_RESULT.pages | $raw %]
> [% END %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
>index 755f1951fc..2197e4fe96 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
>@@ -59,72 +59,72 @@
> <div id="subscriptionline[% subscription_LOO.subscriptionid | html %]" class="subscriptionline">
> <caption><h2>Subscription information for [% subscription_LOO.bibliotitle | html %]</h2><caption>
> 
>- The current subscription began on [% subscription_LOO.startdate | html %] and is issued
>+ The current subscription began on [% subscription_LOO.startdate | html %] and is issued
> [% IF ( subscription_LOO.periodicity1 ) %]
>- twice per day
>+ twice per day
> [% END %]
> [% IF ( subscription_LOO.periodicity2 ) %]
>- every day
>+ every day
> [% END %]
> [% IF ( subscription_LOO.periodicity3 ) %]
>- three times per week
>+ three times per week
> [% END %]
> [% IF ( subscription_LOO.periodicity4 ) %]
>- every week
>+ every week
> [% END %]
> [% IF ( subscription_LOO.periodicity5 ) %]
>- every 2 weeks
>+ every 2 weeks
> [% END %]
> [% IF ( subscription_LOO.periodicity6 ) %]
>- every 3 weeks
>+ every 3 weeks
> [% END %]
> [% IF ( subscription_LOO.periodicity7 ) %]
>- every month
>+ every month
> [% END %]
> [% IF ( subscription_LOO.periodicity8 ) %]
>- every 2 months
>+ every 2 months
> [% END %]
> [% IF ( subscription_LOO.periodicity9 ) %]
>- every quarter
>+ every quarter
> [% END %]
> [% IF ( subscription_LOO.periodicity10 ) %]
>- twice per year
>+ twice per year
> [% END %]
> [% IF ( subscription_LOO.periodicity11 ) %]
>- every year
>+ every year
> [% END %]
> [% IF ( subscription_LOO.periodicity12 ) %]
>- every 2 years
>+ every 2 years
> [% END %]
> [% IF ( subscription_LOO.periodicity13 ) %]
>- irregularly
>+ irregularly
> [% END %]
> [% IF ( subscription_LOO.arrival1 ) %]
>- on Monday
>+ on Monday
> [% END %]
> [% IF ( subscription_LOO.arrival2 ) %]
>- on Tuesday
>+ on Tuesday
> [% END %]
> [% IF ( subscription_LOO.arrival3 ) %]
>- on Wednesday
>+ on Wednesday
> [% END %]
> [% IF ( subscription_LOO.arrival4 ) %]
>- on Thursday
>+ on Thursday
> [% END %]
> [% IF ( subscription_LOO.arrival5 ) %]
>- on Friday
>+ on Friday
> [% END %]
> [% IF ( subscription_LOO.arrival6 ) %]
>- on Saturday
>+ on Saturday
> [% END %]
> [% IF ( subscription_LOO.arrival7 ) %]
>- on Sunday
>+ on Sunday
> [% END %]
> 
>- for
>- [% IF ( subscription_LOO.numberlength ) %][% subscription_LOO.numberlength | html %] issues[% END %]
>- [% IF ( subscription_LOO.weeklength ) %][% subscription_LOO.weeklength | html %] weeks[% END %]
>- [% IF ( subscription_LOO.monthlength ) %][% subscription_LOO.monthlength | html %] months[% END %]
>+ for
>+ [% IF ( subscription_LOO.numberlength ) %][% subscription_LOO.numberlength | html %] issues[% END %]
>+ [% IF ( subscription_LOO.weeklength ) %][% subscription_LOO.weeklength | html %] weeks[% END %]
>+ [% IF ( subscription_LOO.monthlength ) %][% subscription_LOO.monthlength | html %] months[% END %]
> 
> The first subscription was started on [% subscription_LOO.histstartdate | html %]
> [% IF ( subscription_LOO.histenddate ) %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>index 05388eb3e8..e53cab6163 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>@@ -532,9 +532,9 @@
> </div> 
> 
> <div class="alert alert-info">
>- This list is empty.
>+ This list is empty.
> [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
>- You can add to your lists from the results of any <a href="opac-main.pl">search</a>.
>+ You can add to your lists from the results of any <a href="opac-main.pl">search</a>.
> [% END %]
> </div>
> 
>@@ -689,12 +689,12 @@
> [% SET contents = s.get_contents %]
> <tr>
> <td><a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | uri %]">[% s.shelfname | html %]</a></td>
>- <td>[% IF contents.count %][% contents.count | html %] [% IF contents.count == 1 %]item[% ELSE %]items[% END %][% ELSE %]Empty[% END %]</td>
>+ <td>[% IF contents.count %][% contents.count | html %] [% IF contents.count == 1 %]item[% ELSE %]items[% END %][% ELSE %]Empty[% END %]</td>
> <td>
> [% IF s.is_private %]
>- [% IF s.is_shared %]Shared[% ELSE %]Private[% END %]
>+ [% IF s.is_shared %]Shared[% ELSE %]Private[% END %]
> [% ELSE %]
>- Public
>+ Public
> [% END %]
> </td>
> <td>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt
>index 5404864f45..7821e5099f 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt
>@@ -88,10 +88,10 @@
> [% END %]
> 
> [% IF review.your_comment %]
>- Added [% review.datereviewed | $KohaDates %] by you
>+ Added [% review.datereviewed | $KohaDates %] by you
> [% ELSE %]
> [% IF ( review.borrowernumber && ShowReviewer != "none" ) %]
>- Added [% review.datereviewed | $KohaDates %] by
>+ Added [% review.datereviewed | $KohaDates %] by
> [% SWITCH ShowReviewer %]
> [% CASE 'full' %]
> [% review.borrtitle | html %] [% review.firstname | html %] [% review.surname | html %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
>index d3a23f688e..0a2a26460f 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
>@@ -281,12 +281,12 @@
> [% IF ( op_else ) %]
> <h1>
> [% IF Koha.Preference( 'OPACViewOthersSuggestions' ) == 1 %]
>- Purchase suggestions
>+ Purchase suggestions
> [% ELSE %]
> [% IF ( loggedinusername ) %]
>- Your purchase suggestions
>+ Your purchase suggestions
> [% ELSE %]
>- Purchase suggestions
>+ Purchase suggestions
> [% END %]
> [% END %]
> </h1>
>@@ -437,12 +437,12 @@
> [% END %]
> <td>
> Status:
>- [% IF ( suggestions_loo.ASKED ) %]Requested
>- [% ELSIF ( suggestions_loo.CHECKED ) %]Checked by the library
>- [% ELSIF ( suggestions_loo.ACCEPTED ) %]Accepted by the library
>- [% ELSIF ( suggestions_loo.ORDERED ) %]Ordered by the library
>- [% ELSIF ( suggestions_loo.REJECTED ) %]Suggestion declined
>- [% ELSIF ( suggestions_loo.AVAILABLE ) %]Available in the library
>+ [% IF ( suggestions_loo.ASKED ) %]Requested
>+ [% ELSIF ( suggestions_loo.CHECKED ) %]Checked by the library
>+ [% ELSIF ( suggestions_loo.ACCEPTED ) %]Accepted by the library
>+ [% ELSIF ( suggestions_loo.ORDERED ) %]Ordered by the library
>+ [% ELSIF ( suggestions_loo.REJECTED ) %]Suggestion declined
>+ [% ELSIF ( suggestions_loo.AVAILABLE ) %]Available in the library
> [% ELSE %] [% AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS, 1 ) | html %] [% END %]
> [% IF ( suggestions_loo.reason ) %]([% suggestions_loo.reason | html %])[% END %]
> </td>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
>index 8953297ab7..09e0e51c12 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
>@@ -64,21 +64,21 @@
> [% IF ( ERRORS ) %]
> [% FOREACH ERROR IN ERRORS %]
> <div class="alert alert-warning">
>- There was a problem with this operation:
>+ There was a problem with this operation:
> [% IF ( ERROR.badparam ) %]
>- ERROR: illegal parameter [% ERROR.badparam | html %]
>+ ERROR: illegal parameter [% ERROR.badparam | html %]
> [% ELSIF ( ERROR.login ) %]
>- ERROR: You must log in to complete that action.
>+ ERROR: You must log in to complete that action.
> [% ELSIF ( ERROR.failed_delete ) %]
>- ERROR: You cannot delete the tag [% ERROR.failed_delete | html %].
>- Note: you can only delete your own tags.
>+ ERROR: You cannot delete the tag [% ERROR.failed_delete | html %].
>+ Note: you can only delete your own tags.
> [% ELSIF ( ERROR.scrubbed ) %]
>- Note: your tag contained markup code that was removed.
>- The tag was added as &quot;[% ERROR.scrubbed | html %]&quot;.
>+ Note: your tag contained markup code that was removed.
>+ The tag was added as &quot;[% ERROR.scrubbed | html %]&quot;.
> [% ELSIF ( ERROR.scrubbed_all_bad ) %]
>- Note: your tag was entirely markup code. It was NOT added.
>- Please try again with plain text.
>- [% ELSE %]Unrecognized error.
>+ Note: your tag was entirely markup code. It was NOT added.
>+ Please try again with plain text.
>+ [% ELSE %]Unrecognized error.
> [% END %]
> </div>
> [% END %]
>@@ -89,9 +89,9 @@
> <div class="form-inline">
> <label>
> [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
>- Tags to show from other users:
>+ Tags to show from other users:
> [% ELSE %]
>- Tags to show:
>+ Tags to show:
> [% END %]
> </label>
> <input type="text" name="limit" class="form-control form-control-sm mr-2" maxlength="4" size="4" value="[% limit or '100' | html %]" />
>@@ -124,10 +124,10 @@
> [% END # / TAGLOOP%]
> [% IF ( add_op ) %]
> [% IF ( added_count ) %]
>- <div class="dialog message">[% added_count | html %] [% IF ( added_count == 1 ) %]tag[% ELSE %]tags[% END %] successfully added.</div>
>+ <div class="dialog message">[% added_count | html %] [% IF ( added_count == 1 ) %]tag[% ELSE %]tags[% END %] successfully added.</div>
> [% END %]
> [% IF ( deleted_count ) %]
>- <div class="dialog message">[% deleted_count | html %] [% IF ( deleted_count == 1 ) %]tag[% ELSE %]tags[% END %] successfully deleted.</div>
>+ <div class="dialog message">[% deleted_count | html %] [% IF ( deleted_count == 1 ) %]tag[% ELSE %]tags[% END %] successfully deleted.</div>
> [% END %]
> [% END # /add_op %]
> 
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>index a8dcd2a5f8..b78a0cc857 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>@@ -148,7 +148,7 @@
> [% END %]
> [% IF ( borrower.gonenoaddress ) %]
> <li id="gonenoaddress">Please note: According to our records, we don't have up-to-date contact information. Please contact the library.
>- <a href="/cgi-bin/koha/opac-memberentry.pl">[% IF ( Koha.Preference('OPACPatronDetails') ) %]Update your contact information[% ELSE %]Go to your contact information[% END %]</a>
>+ <a href="/cgi-bin/koha/opac-memberentry.pl">[% IF ( Koha.Preference('OPACPatronDetails') ) %]Update your contact information[% ELSE %]Go to your contact information[% END %]</a>
> [% IF ( Koha.Preference('OPACPatronDetails') ) %](Please note: there may be a delay in restoring your account if you submit online.)[% END %]
> </li>
> [% END %]
>@@ -431,11 +431,11 @@
> <td class="fines">
> Fines:
> [% IF ( ISSUE.charges ) %]
>- Yes (Item overdue or lost)
>+ Yes (Item overdue or lost)
> [% ELSIF ( ISSUE.rentalfines ) %]
>- Yes (Rental fees)
>+ Yes (Rental fees)
> [% ELSE %]
>- No
>+ No
> [% END %]
> </td>
> [% END %]
>@@ -724,9 +724,9 @@
> [% ELSIF ( OVERDUE.norenew_overdue ) %]
> Not allowed(overdue)
> [% ELSIF ( OVERDUE.onreserve ) %]
>- On hold
>+ On hold
> [% ELSE %]
>- No renewals left
>+ No renewals left
> [% END %]
> </td>
> [% END %]
>@@ -795,13 +795,13 @@
> <td class="status">
> Status:
> [% IF ( RECALL.requested ) %]
>- Requested
>+ Requested
> [% ELSIF ( RECALL.overdue ) %]
>- Overdue to be returned
>+ Overdue to be returned
> [% ELSIF ( RECALL.in_transit ) %]
>- In transit to [% RECALL.library.branchname | html %]
>+ In transit to [% RECALL.library.branchname | html %]
> [% ELSIF ( RECALL.waiting ) %]
>- Ready for pickup
>+ Ready for pickup
> [% END %]
> </td>
> <td class="cancelrecall">
>@@ -897,19 +897,19 @@
> [% ar.patron_notes | html %]
> </td>
> 
>- <td class="article-request-format">[% IF ar.format == 'PHOTOCOPY' %]Copy[% ELSIF ar.format == 'SCAN' %]Scan[% END %]</td>
>+ <td class="article-request-format">[% IF ar.format == 'PHOTOCOPY' %]Copy[% ELSIF ar.format == 'SCAN' %]Scan[% END %]</td>
> 
> <td class="article-request-status">
> [% IF ar.status == 'PENDING' %]
>- Pending
>+ Pending
> [% ELSIF ar.status == 'PROCESSING' %]
>- Processing
>+ Processing
> [% ELSIF ar.status == 'REQUESTED' %]
>- New
>+ New
> [% ELSIF ar.status == 'COMPLETED' %]
>- Completed
>+ Completed
> [% ELSIF ar.status == 'CANCELED' %]
>- Canceled
>+ Canceled
> [% END %]
> </td>
> 
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
>index b435b29501..7feec7e2fc 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
>@@ -246,9 +246,9 @@
> <form id="scan_form" name="scan_form" method="post" action="/cgi-bin/koha/sco/sco-main.pl" onsubmit="return checkout_confirm('[% patronid | html %]');">
> <legend><h2>
> [% IF ( Koha.Preference('SCOAllowCheckin') ) %]
>- Check out, return, or renew an item:
>+ Check out, return, or renew an item:
> [% ELSE %]
>- Check out or renew an item:
>+ Check out or renew an item:
> [% END %]
> </h2></legend>
> <div class="row">
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/text/explodedterms.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/text/explodedterms.tt
>index 6f394ad1cd..2a21289e7e 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/text/explodedterms.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/text/explodedterms.tt
>@@ -1,8 +1,8 @@
> [%- SWITCH index -%]
> [%- CASE 'su-na' -%]
>-Search also for narrower subjects
>+Search also for narrower subjects
> [%- CASE 'su-br' -%]
>-Search also for broader subjects
>+Search also for broader subjects
> [%- CASE 'su-rl' -%]
>-Search also for related subjects
>+Search also for related subjects
> [%- END -%]
>-- 
>2.36.0

Actions: View | Diff | Splinter Review

Attachments on bug 30733: 134903 | 134908 | 134912 | 135444 | 135564 | 135565 | 135566 | 135567 | 135568 | 135569 | 136012 | 136013 | 136014 | 136015 | 136016 | 136017 | 136018 | 136019 | 136020 | 136021 | 136045 | 136046 | 136047 | 136048 | 136049 | 136050 | 136051 | 136052 | 136053 | 136054 | 136098 | 136099 | 136100 | 136101 | 136102 | 136103 | 136104 | 136105 | 136106 | 136107 | 136108 | 136109 | 136110 | 136111 | 136112 | 136113 | 136114 | 136115 | 136116 | 136117 | 136174 | 136175 | 136176 | 136177 | 136178 | 136179 | 136180 | 136181 | 136182 | 136183 | 136188 | 136189 | 136190 | 136191 | 136192 | 136193 | 136194 | 136195 | 136196 | 136197 | 136202 | 136203 | 136204 | 136205 | 136206 | 136207 | 136208 | 136209 | 136210 | 136211 | 136286