Attachment 107906 Details for Bug 25744 – Bug 25744: replace with in the staff interface

[patch] Bug 25744: replace with in the staff interface

Bug-25744-replace-b-with-strong-in-the-staff-inter.patch (text/plain), 101.36 KB, created by Lucas Gass (lukeg) on 2020-08-06 18:27:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lucas Gass (lukeg)

Created: 2020-08-06 18:27:04 UTC

Size: 101.36 KB

patch

obsolete

>From ef8db2fd76339f66246c9571f8763c7f6b290b50 Mon Sep 17 00:00:00 2001
>From: Lucas Gass <lucas@bywatersolutions.com>
>Date: Thu, 6 Aug 2020 18:21:52 +0000
>Subject: [PATCH] Bug 25744: replace with in the staff interface
>
>This patch set attempts to replace all the tags with and all the tags with in the staff interface.
>I attempted to get all the templates, includes, and xslt files.
>To test:
>1. Review the changes as best as possible, looking for mistakes.
>2. grep for and in the modules, includes, and xslt folders. You should get nothing/
>3. If you grep '<\/i>' you should only see instances of Font Awesome.
>4. If you grep '<\/b>' you should only see instances where caret is used.
>---
> .../prog/en/includes/budgets-active-currency.inc | 2 +-
> .../prog/en/includes/cateditor-ui.inc | 2 +-
> .../prog/en/includes/checkouts-table.inc | 2 +-
> .../intranet-tmpl/prog/en/includes/holds_table.inc | 206 ++++++++++-----------
> .../prog/en/includes/waiting_holds.inc | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 60 +++---
> .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 8 +-
> .../prog/en/modules/acqui/invoice-files.tt | 2 +-
> .../prog/en/modules/acqui/lateorders.tt | 2 +-
> .../prog/en/modules/acqui/neworderempty.tt | 4 +-
> .../prog/en/modules/acqui/orderreceive.tt | 2 +-
> .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 8 +-
> .../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 4 +-
> .../prog/en/modules/admin/auth_tag_structure.tt | 2 +-
> .../prog/en/modules/admin/checkmarc.tt | 2 +-
> .../prog/en/modules/admin/itemtypes.tt | 4 +-
> .../en/modules/admin/preferences/i18n_l10n.pref | 4 +-
> .../prog/en/modules/authorities/detail.tt | 2 +-
> .../modules/authorities/searchresultlist-auth.tt | 2 +-
> .../intranet-tmpl/prog/en/modules/basket/basket.tt | 2 +-
> .../prog/en/modules/catalogue/MARCdetail.tt | 4 +-
> .../prog/en/modules/catalogue/issuehistory.tt | 2 +-
> .../prog/en/modules/catalogue/labeledMARCdetail.tt | 4 +-
> .../prog/en/modules/cataloguing/addbooks.tt | 2 +-
> .../value_builder/unimarc_field_210c.tt | 2 +-
> .../prog/en/modules/circ/branchoverdues.tt | 2 +-
> .../prog/en/modules/circ/branchtransfers.tt | 6 +-
> .../prog/en/modules/circ/circulation.tt | 4 +-
> .../prog/en/modules/circ/pendingreserves.tt | 4 +-
> .../prog/en/modules/circ/reserveratios.tt | 6 +-
> .../intranet-tmpl/prog/en/modules/circ/returns.tt | 4 +-
> .../prog/en/modules/circ/transferstoreceive.tt | 2 +-
> .../prog/en/modules/ill/log/status_change.tt | 2 +-
> .../intranet-tmpl/prog/en/modules/labels/result.tt | 2 +-
> .../prog/en/modules/members/paycollect.tt | 2 +-
> .../prog/en/modules/onboarding/onboardingstep1.tt | 2 +-
> .../prog/en/modules/onboarding/onboardingstep2.tt | 4 +-
> .../prog/en/modules/onboarding/onboardingstep3.tt | 2 +-
> .../prog/en/modules/plugins/plugins-upload.tt | 14 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt | 2 +-
> .../prog/en/modules/reports/acquisitions_stats.tt | 2 +-
> .../en/modules/reports/guided_reports_start.tt | 6 +-
> .../prog/en/modules/reviews/reviewswaiting.tt | 2 +-
> .../prog/en/modules/serials/checkexpiration.tt | 6 +-
> .../prog/en/modules/serials/result.tt | 2 +-
> .../en/modules/serials/routing-preview-slip.tt | 6 +-
> .../prog/en/modules/suggestion/suggestion.tt | 2 +-
> .../intranet-tmpl/prog/en/modules/tools/export.tt | 6 +-
> .../prog/en/modules/tools/holidays.tt | 4 +-
> .../prog/en/modules/tools/import_borrowers.tt | 8 +-
> .../intranet-tmpl/prog/en/modules/tools/letter.tt | 2 +-
> .../prog/en/modules/tools/manage-marc-import.tt | 4 +-
> .../prog/en/modules/tools/picture-upload.tt | 36 ++--
> .../prog/en/modules/tools/problem-reports.tt | 2 +-
> .../intranet-tmpl/prog/en/modules/tools/quotes.tt | 2 +-
> .../prog/en/modules/tools/upload-images.tt | 12 +-
> 56 files changed, 248 insertions(+), 248 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc
>index ca14976e14..dfa669022d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc
>@@ -1,6 +1,6 @@
> [% IF ( currency ) %]
> [% IF ( not hide ) %]
>- Currency = [% currency | html %]
>+ Currency = [% currency | html %]
> [% END %]
> [% ELSE %]
> <div class="dialog alert">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc
>index cc038b955a..b8afedb50b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc
>@@ -1156,7 +1156,7 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr
> 
> var errors = [];
> $.each( result.errors, function() {
>- var error = '' + _("Line ") + (this.line + 1) + ': ';
>+ var error = '' + _("Line ") + (this.line + 1) + ': ';
> 
> switch ( this.error ) {
> case 'failed': error += _("failed to run"); break;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
>index 7b967bec89..1efa03b568 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
>@@ -55,7 +55,7 @@
> 
> [% IF Koha.Preference('ExportCircHistory') %]
> <fieldset>
>- <label for="issues-table-output-format">Export checkouts using format:</label>
>+ <label for="issues-table-output-format">Export checkouts using format:</label>
> <select name="issues-table-output-format" id="issues-table-output-format">
> <option value="iso2709_995">MARC with items</option>
> <option value="iso2709">MARC without items</option>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
>index b02763a143..5c4123a7fe 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
>@@ -1,130 +1,130 @@
> [% USE Koha %]
> <table>
>- <tr>
>- [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
>- <th>Priority</th>
>- <th>&nbsp;</th>
>- [% ELSE %]
>- <th>Delete?</th>
>- [% END %]
>- <th>Patron</th>
>- <th>Notes</th>
>- <th>Date</th>
>- <th>Expiration</th>
>- <th>Pickup library</th>
>- <th>Details</th>
>- [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
>- <th><img src="[% interface | html %]/[% theme | html %]/img/go-bottom.png" alt="Toggle set to lowest priority" /></th>
>- [% END %]
>+<tr>
>+ [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
>+ <th>Priority</th>
> <th>&nbsp;</th>
>- <th>&nbsp;</th>
>- </tr>
>+ [% ELSE %]
>+ <th>Delete?</th>
>+ [% END %]
>+ <th>Patron</th>
>+ <th>Notes</th>
>+ <th>Date</th>
>+ <th>Expiration</th>
>+ <th>Pickup library</th>
>+ <th>Details</th>
>+ [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
>+ <th><img src="[% interface | html %]/[% theme | html %]/img/go-bottom.png" alt="Toggle set to lowest priority" /></th>
>+ [% END %]
>+ <th>&nbsp;</th>
>+ <th>&nbsp;</th>
>+</tr>
> 
>- [% SET first_priority = 0 %]
>- [% SET last_priority = holds.last.priority %]
>+[% SET first_priority = 0 %]
>+[% SET last_priority = holds.last.priority %]
> 
>- [% FOREACH hold IN holds %]
>- [% IF !hold.found && first_priority == 0 %][% first_priority = hold.priority %][% END %]
>- <tr>
>- <td>
>- <input type="hidden" name="reserve_id" value="[% hold.reserve_id | html %]" />
>- <input type="hidden" name="borrowernumber" value="[% hold.borrowernumber | html %]" />
>- <input type="hidden" name="biblionumber" value="[% hold.biblionumber | html %]" />
>- [% IF Koha.Preference('HoldsSplitQueue') == "nothing" && !hold.found %]
>- <select name="rank-request">
>- [% ELSE %]
>- <input type="hidden" name="rank-request" value="[% hold.priority | html %]">
>- <select name="rank-request" disabled="disabled">
>- [% END %]
>- [% IF ( hold.found ) %]
>- [% IF ( hold.intransit ) %]
>- <option value="T" selected="selected">In transit</option>
>- [% ELSE %]
>- <option value="W" selected="selected">Waiting</option>
>- [% END %]
>+[% FOREACH hold IN holds %]
>+[% IF !hold.found && first_priority == 0 %][% first_priority = hold.priority %][% END %]
>+ <tr>
>+ <td>
>+ <input type="hidden" name="reserve_id" value="[% hold.reserve_id | html %]" />
>+ <input type="hidden" name="borrowernumber" value="[% hold.borrowernumber | html %]" />
>+ <input type="hidden" name="biblionumber" value="[% hold.biblionumber | html %]" />
>+ [% IF Koha.Preference('HoldsSplitQueue') == "nothing" && !hold.found %]
>+ <select name="rank-request">
>+ [% ELSE %]
>+ <input type="hidden" name="rank-request" value="[% hold.priority | html %]">
>+ <select name="rank-request" disabled="disabled">
>+ [% END %]
>+ [% IF ( hold.found ) %]
>+ [% IF ( hold.intransit ) %]
>+ <option value="T" selected="selected">In transit</option>
>+ [% ELSE %]
>+ <option value="W" selected="selected">Waiting</option>
> [% END %]
>+ [% END %]
> 
>- [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
>- [% IF Koha.Preference('HoldsSplitQueueNumbering') == 'actual' %]
>- [% FOREACH optionloo IN hold.optionloop %]
>- [% IF ( optionloo.selected ) %]
>- <option value="[% optionloo.num | html %]" selected="selected">[% optionloo.num | html %]</option>
>- [% ELSE %]
>- <option value="[% optionloo.num | html %]">[% optionloo.num | html %]</option>
>- [% END %]
>+ [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
>+ [% IF Koha.Preference('HoldsSplitQueueNumbering') == 'actual' %]
>+ [% FOREACH optionloo IN hold.optionloop %]
>+ [% IF ( optionloo.selected ) %]
>+ <option value="[% optionloo.num | html %]" selected="selected">[% optionloo.num | html %]</option>
>+ [% ELSE %]
>+ <option value="[% optionloo.num | html %]">[% optionloo.num | html %]</option>
> [% END %]
>- [% ELSE %]
>- [% SET ranker = 1 %]
>- [% FOREACH h IN holds %]
>- [% NEXT IF h.found %]
>- [% IF ( h.priority == hold.priority ) %]
>- <option value="[% h.priority | html %]" selected="selected">[% ranker | html %]</option>
>- [% ELSE %]
>- <option value="[% h.priority | html %]">[% ranker | html %]</option>
>- [% END %]
>- [% ranker = ranker + 1 %]
>+ [% END %]
>+ [% ELSE %]
>+ [% SET ranker = 1 %]
>+ [% FOREACH h IN holds %]
>+ [% NEXT IF h.found %]
>+ [% IF ( h.priority == hold.priority ) %]
>+ <option value="[% h.priority | html %]" selected="selected">[% ranker | html %]</option>
>+ [% ELSE %]
>+ <option value="[% h.priority | html %]">[% ranker | html %]</option>
> [% END %]
>+ [% ranker = ranker + 1 %]
> [% END %]
>- [% ELSIF !hold.found %]
>- <option value="[% hold.priority | html %]" selected="selected">[% hold.priority | html %]</option>
> [% END %]
>+ [% ELSIF !hold.found %]
>+ <option value="[% hold.priority | html %]" selected="selected">[% hold.priority | html %]</option>
>+ [% END %]
> 
>- <option value="del">del</option>
>- </select>
>- </td>
>-
>- [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
>- [% UNLESS hold.found %]
>- [% SET prev_priority = loop.prev.priority %]
>- [% SET next_priority = loop.next.priority %]
>- [% holds.index | html %]
>+ <option value="del">del</option>
>+ </select>
>+ </td>
> 
>- <td style="white-space:nowrap;">
>- <a title="Move hold up" href="request.pl?action=move&amp;where=up&amp;first_priority=[% first_priority | html %]&amp;last_priority=[% last_priority | html %]&amp;prev_priority=[% prev_priority | html %]&amp;next_priority=[% next_priority | html %]&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
>- <img src="[% interface | html %]/[% theme | html %]/img/go-up.png" alt="Go up" />
>- </a>
>+ [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
>+ [% UNLESS hold.found %]
>+ [% SET prev_priority = loop.prev.priority %]
>+ [% SET next_priority = loop.next.priority %]
>+ [% holds.index | html %]
>+
>+ <td style="white-space:nowrap;">
>+ <a title="Move hold up" href="request.pl?action=move&amp;where=up&amp;first_priority=[% first_priority | html %]&amp;last_priority=[% last_priority | html %]&amp;prev_priority=[% prev_priority | html %]&amp;next_priority=[% next_priority | html %]&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
>+ <img src="[% interface | html %]/[% theme | html %]/img/go-up.png" alt="Go up" />
>+ </a>
> 
>- <a title="Move hold to top" href="request.pl?action=move&amp;where=top&amp;first_priority=[% first_priority | html %]&amp;last_priority=[% last_priority | html %]&amp;prev_priority=[% prev_priority | html %]&amp;next_priority=[% next_priority | html %]&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
>- <img src="[% interface | html %]/[% theme | html %]/img/go-top.png" alt="Go top" />
>- </a>
>+ <a title="Move hold to top" href="request.pl?action=move&amp;where=top&amp;first_priority=[% first_priority | html %]&amp;last_priority=[% last_priority | html %]&amp;prev_priority=[% prev_priority | html %]&amp;next_priority=[% next_priority | html %]&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
>+ <img src="[% interface | html %]/[% theme | html %]/img/go-top.png" alt="Go top" />
>+ </a>
> 
>- <a title="Move hold to bottom" href="request.pl?action=move&amp;where=bottom&amp;first_priority=[% first_priority | html %]&amp;last_priority=[% last_priority | html %]&amp;prev_priority=[% prev_priority | html %]&amp;next_priority=[% next_priority | html %]&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
>- <img src="[% interface | html %]/[% theme | html %]/img/go-bottom.png" alt="Go bottom" />
>- </a>
>+ <a title="Move hold to bottom" href="request.pl?action=move&amp;where=bottom&amp;first_priority=[% first_priority | html %]&amp;last_priority=[% last_priority | html %]&amp;prev_priority=[% prev_priority | html %]&amp;next_priority=[% next_priority | html %]&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
>+ <img src="[% interface | html %]/[% theme | html %]/img/go-bottom.png" alt="Go bottom" />
>+ </a>
> 
>- <a title="Move hold down" href="request.pl?action=move&amp;where=down&amp;first_priority=[% first_priority | html %]&amp;last_priority=[% last_priority | html %]&amp;prev_priority=[% prev_priority | html %]&amp;next_priority=[% next_priority | html %]&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
>- <img src="[% interface | html %]/[% theme | html %]/img/go-down.png" alt="Go down" />
>- </a>
>- </td>
>- [% ELSE %]
>- <td></td>
>+ <a title="Move hold down" href="request.pl?action=move&amp;where=down&amp;first_priority=[% first_priority | html %]&amp;last_priority=[% last_priority | html %]&amp;prev_priority=[% prev_priority | html %]&amp;next_priority=[% next_priority | html %]&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
>+ <img src="[% interface | html %]/[% theme | html %]/img/go-down.png" alt="Go down" />
>+ </a>
>+ </td>
>+ [% ELSE %]
>+ <td></td>
>+ [% END %]
> [% END %]
>- [% END %]
> 
>- <td>
>- [% INCLUDE 'patron-title.inc' patron=hold.patron hide_patron_infos_if_needed=1 %]
>- </td>
>+ <td>
>+ [% INCLUDE 'patron-title.inc' patron=hold.patron hide_patron_infos_if_needed=1 %]
>+ </td>
> 
>- <td>[% hold.notes | html | html_line_break %]</td>
>- <td>
>- [% IF Koha.Preference('AllowHoldDateInFuture') %]
>- <input type="text" class="datepicker" value="[% hold.date | $KohaDates %]" required="required" size="10" name="reservedate" />
>- [% ELSE %]
>- [% hold.date | $KohaDates %]
>- [% END %]
>- </td>
>- <td><input type="text" class="datepickerto" value="[% hold.expirationdate | $KohaDates %]" size="10" name="expirationdate" /></td>
>+ <td>[% hold.notes | html | html_line_break %]</td>
>+ <td>
>+ [% IF Koha.Preference('AllowHoldDateInFuture') %]
>+ <input type="text" class="datepicker" value="[% hold.date | $KohaDates %]" required="required" size="10" name="reservedate" />
>+ [% ELSE %]
>+ [% hold.date | $KohaDates %]
>+ [% END %]
>+ </td>
>+ <td><input type="text" class="datepickerto" value="[% hold.expirationdate | $KohaDates %]" size="10" name="expirationdate" /></td>
> 
>- <td>
>- [% IF ( hold.found ) %]
>- [% IF ( hold.atdestination ) %]
>- [% IF ( hold.found ) %]
>- Item waiting at [% hold.wbrname | html %] <input type="hidden" name="pickup" value="[% hold.wbrcode | html %]" /> since [% hold.waiting_date | $KohaDates %]
>+ <td>
>+ [% IF ( hold.found ) %]
>+ [% IF ( hold.atdestination ) %]
>+ [% IF ( hold.found ) %]
>+ Item waiting at [% hold.wbrname | html %] <input type="hidden" name="pickup" value="[% hold.wbrcode | html %]" /> since [% hold.waiting_date | $KohaDates %]
> [% ELSE %]
> Waiting to be pulled <input type="hidden" name="pickup" value="[% hold.wbrcode | html %]" />
> [% END %]
> [% ELSE %]
>- Item being transferred to [% hold.wbrname | html %] <input type="hidden" name="pickup" value="[% hold.wbrcode | html %]" />
>+ Item being transferred to [% hold.wbrname | html %] <input type="hidden" name="pickup" value="[% hold.wbrcode | html %]" />
> [% END %]
> [% ELSE %]
> [% IF Koha.Preference('IndependentBranches') && Branches.all().size == 1 %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
>index e445ace165..1fff6fc2f0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
>@@ -25,7 +25,7 @@
> [% INCLUDE 'biblio-title.inc' biblio=reserveloo.biblio %]
> </a>
> [% UNLESS ( item_level_itypes ) %]
>- [% IF ( ItemTypes.GetDescription(reserveloo.item.effective_itemtype) ) %]&nbsp; ([% ItemTypes.GetDescription(reserveloo.item.effective_itemtype) | html %])
>+ [% IF ( ItemTypes.GetDescription(reserveloo.item.effective_itemtype) ) %]&nbsp; ([% ItemTypes.GetDescription(reserveloo.item.effective_itemtype) | html %])
> [% END %]
> [% END %]
> Barcode: [% reserveloo.item.barcode | html %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
>index 70ed9b183f..04fc2d9147 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
>@@ -109,9 +109,9 @@
> </tr>
> <tr><th scope="row">Zebra version: </th><td>[% zebraVersion | html %]</td></tr>
> [% IF (errZebraConnection == 10000) %]
>- <tr><th scope="row">Error </th><td>Zebra server seems not to be available. Is it started?</td></tr>
>+ <tr><th scope="row">Error </th><td>Zebra server seems not to be available. Is it started?</td></tr>
> [% ELSIF (errZebraConnection) %]
>- <tr><th scope="row">Warning </th><td>Error message from Zebra: [% ( errZebraConnection ) | html %] </td></tr>
>+ <tr><th scope="row">Warning </th><td>Error message from Zebra: [% ( errZebraConnection ) | html %] </td></tr>
> [% END %]
> <tr>
> <th scope="row">Date and time: </th>
>@@ -264,79 +264,79 @@
> <table>
> <caption>Preferences and parameters</caption>
> [% IF (warnPrefBiblioAddsAuthorities) %]
>- <tr><th scope="row">Warning </th><td>System preference 'AutoCreateAuthorities' set, but needs 'BiblioAddsAuthorities' set as well.</td></tr>
>+ <tr><th scope="row">Warning </th><td>System preference 'AutoCreateAuthorities' set, but needs 'BiblioAddsAuthorities' set as well.</td></tr>
> [% END %]
> [% IF (warnPrefEasyAnalyticalRecords) %]
>- <tr><th scope="row">Warning </th><td>System preference 'EasyAnalyticalRecords' set, but UseControlNumber preference is set to 'Use'. Set it to 'Don't use' or else the 'Show analytics' links in the staff client and the OPAC will be broken.</td></tr>
>+ <tr><th scope="row">Warning </th><td>System preference 'EasyAnalyticalRecords' set, but UseControlNumber preference is set to 'Use'. Set it to 'Don't use' or else the 'Show analytics' links in the staff client and the OPAC will be broken.</td></tr>
> [% END %]
> [% IF warnPrefAnonymousPatronOPACPrivacy %]
>- <tr><th scope="row">Warning </th><td>System preference 'OPACPrivacy' set, but AnonymousPatron preference is set to '0'. Set it to a valid borrower number if you want that this feature works correctly.</td></tr>
>+ <tr><th scope="row">Warning </th><td>System preference 'OPACPrivacy' set, but AnonymousPatron preference is set to '0'. Set it to a valid borrower number if you want that this feature works correctly.</td></tr>
> [% END %]
> [% IF warnPrefAnonymousPatronAnonSuggestions %]
>- <tr><th scope="row">Warning </th><td>System preference 'AnonSuggestions' set, but AnonymousPatron preference is set to '0'. Set it to a valid borrower number if you want that this feature works correctly.</td></tr>
>+ <tr><th scope="row">Warning </th><td>System preference 'AnonSuggestions' set, but AnonymousPatron preference is set to '0'. Set it to a valid borrower number if you want that this feature works correctly.</td></tr>
> [% END %]
> [% IF warnPrefAnonymousPatronOPACPrivacy_PatronDoesNotExist %]
>- <tr><th scope="row">Warning </th><td>Some patrons have requested a privacy on returning item but the AnonymousPatron pref is not set correctly. Set it to a valid borrower number if you want that this feature works correctly.</td></tr>
>+ <tr><th scope="row">Warning </th><td>Some patrons have requested a privacy on returning item but the AnonymousPatron pref is not set correctly. Set it to a valid borrower number if you want that this feature works correctly.</td></tr>
> [% END %]
> [% IF warnPrefAnonymousPatronAnonSuggestions_PatronDoesNotExist %]
>- <tr><th scope="row">Warning </th><td>System preference 'AnonSuggestions' set, but AnonymousPatron preference is not set correctly. Set it to a valid borrower number if you want that this feature works correctly.</td></tr>
>+ <tr><th scope="row">Warning </th><td>System preference 'AnonSuggestions' set, but AnonymousPatron preference is not set correctly. Set it to a valid borrower number if you want that this feature works correctly.</td></tr>
> [% END %]
> [% IF warnNoActiveCurrency %]
>- <tr><th scope="row">Warning </th><td>No active currency is defined. Please go to <a href="/cgi-bin/koha/admin/currency.pl">Administration &gt; Currencies and exchange rates</a> and mark one currency as active.</td></tr>
>+ <tr><th scope="row">Warning </th><td>No active currency is defined. Please go to <a href="/cgi-bin/koha/admin/currency.pl">Administration &gt; Currencies and exchange rates</a> and mark one currency as active.</td></tr>
> [% END %]
> [% IF warnStatisticsFieldsError %]
>- <tr><th scope="row">Warning </th><td>System preference 'StatisticsFields' contains field names not belonging to the items database table: [% warnStatisticsFieldsError | html %] </td></tr>
>+ <tr><th scope="row">Warning </th><td>System preference 'StatisticsFields' contains field names not belonging to the items database table: [% warnStatisticsFieldsError | html %] </td></tr>
> [% END %]
> [% IF AutoSelfCheckPatronDoesNotHaveSelfCheckPerm %]
>- <tr><th scope="row">Warning </th><td>
>+ <tr><th scope="row">Warning </th><td>
> The patron used for the self checkout module at the OPAC does not have the self_check => self_checkout_module permission.
> </td></tr>
> [% END %]
> [% IF AutoSelfCheckPatronHasTooManyPerm %]
>- <tr><th scope="row">Warning </th><td>
>+ <tr><th scope="row">Warning </th><td>
> The patron used for the self checkout module at the OPAC has too many permissions. They should only have self_check => self_checkout_module.
> </td></tr>
> [% END %]
> [% IF warnNoTemplateCaching %]
>- <tr><th scope="row">Warning </th><td>
>+ <tr><th scope="row">Warning </th><td>
> You are missing the &lt;template_cache_dir&gt; entry in your koha-conf.xml file.
> That will bring a performance boost to enable it.
> </td></tr>
> [% END %]
> [% IF warnILLConfiguration %]
> [% IF no_ill_backends %]
>- <tr><th scope="row">Warning </th><td>
>+ <tr><th scope="row">Warning </th><td>
> The ILL module is enabled, but there are no backends available.
> </td></tr>
> [% END %]
> [% IF ill_partner_code_not_defined %]
>- <tr><th scope="row">Warning </th><td>
>+ <tr><th scope="row">Warning </th><td>
> The ILL module is enabled, but no 'partner_code' defined in koha-conf.xml. Falling back to the hardcoded 'ILLLIBS'.
> </td></tr>
> [%END %]
> [% IF ill_branch_not_defined %]
>- <tr><th scope="row">Warning </th><td>
>+ <tr><th scope="row">Warning </th><td>
> The ILL module is enabled, but no 'branch' block is defined in koha-conf.xml. You must define this block before use.
> </td></tr>
> [%END %]
> [% IF ill_partner_code_doesnt_exist %]
>- <tr><th scope="row">Warning </th><td>
>+ <tr><th scope="row">Warning </th><td>
> The ILL module is enabled, but the configured 'partner_code' ([% ill_partner_code_doesnt_exist | html %]) is not defined on the system.
> </td></tr>
> [% END %]
> [% END %]
> [% IF oauth2_missing_deps %]
>- <tr><th scope="row">Warning </th><td>
>+ <tr><th scope="row">Warning </th><td>
> System preference 'RESTOAuth2ClientCredentials' is set, but the required Net::OAuth2::AuthorizationServer dependency is missing. The feature is disabled.
> </td></tr>
> [% END %]
> [% IF bad_yaml_prefs %]
>- <tr><th scope="row">Warning </th><td>
>+ <tr><th scope="row">Warning </th><td>
> Some system preferences have badly formatted YAML content: [% bad_yaml_prefs.join(', ') | html %]
> </td></tr>
> [% END %]
> [% IF config_bcrypt_settings_no_set %]
>- <tr><th scope="row">Warning </th><td>
>+ <tr><th scope="row">Warning </th><td>
> System preference 'Pseudonymization' is set, but there is not 'bcrypt_settings' entry defined in the $KOHA_CONF file.
> </td></tr>
> [% END %]
>@@ -349,7 +349,7 @@
> [% FOREACH config_entry IN xml_config_warnings %]
> [% IF config_entry.error == 'zebra_bib_index_mode_is_grs1' %]
> <tr>
>- <th scope="row">Warning</th>
>+ <th scope="row">Warning</th>
> <td>The &lt;zebra_bib_index_mode&gt; entry set to 'grs1', which is no longer supported.
> Please use DOM instead. To switch follow this page of wiki:
> <a href="https://wiki.koha-community.org/wiki/Switching_to_dom_indexing">Switching to dom indexing</a>
>@@ -357,7 +357,7 @@
> </tr>
> [% ELSIF config_entry.error == 'zebra_auth_index_mode_is_grs1' %]
> <tr>
>- <th scope="row">Warning</th>
>+ <th scope="row">Warning</th>
> <td>The &lt;zebra_auth_index_mode&gt; entry set to 'grs1', which is no longer supported.
> Please use DOM instead. To switch follow this page of wiki:
> <a href="https://wiki.koha-community.org/wiki/Switching_to_dom_indexing">Switching to dom indexing</a>
>@@ -365,42 +365,42 @@
> </tr>
> [% ELSIF config_entry.error == 'use_zebra_facets_entry_missing' %]
> <tr>
>- <th scope="row">Warning</th>
>+ <th scope="row">Warning</th>
> <td>The &lt;use_zebra_facets&gt; entry is missing in your configuration file. Falling back
> to legacy facet calculation.
> </td>
> </tr>
> [% ELSIF config_entry.error == 'log4perl_entry_missing' %]
> <tr>
>- <th scope="row">Warning</th>
>+ <th scope="row">Warning</th>
> <td>You are missing the &lt;log4perl_conf&gt; entry in your koha-conf.xml file. Please
> add it, pointing to the log4perl.conf file for your Koha instance.
> </td>
> </tr>
> [% ELSIF config_entry.error == 'lockdir_entry_missing' %]
> <tr>
>- <th scope="row">Warning</th>
>+ <th scope="row">Warning</th>
> <td>You are missing the &lt;lockdir&gt; entry in your koha-conf.xml file. Please
> add it, pointing to your Koha instance's lock dir.
> </td>
> </tr>
> [% ELSIF config_entry.error == 'lockdir_not_writable' %]
> <tr>
>- <th scope="row">Warning</th>
>+ <th scope="row">Warning</th>
> <td>The configured &lt;lockdir&gt; entry in your koha-conf.xml file points to a
> non-writable directory ([% config_entry.lockdir | html %]).
> </td>
> </tr>
> [% ELSIF config_entry.error == 'uploadpath_entry_missing' %]
> <tr>
>- <th scope="row">Warning</th>
>+ <th scope="row">Warning</th>
> <td>You are missing the &lt;upload_path&gt; entry in your koha-conf.xml file. Please
> add it, pointing to the configured file upload directory for your Koha instance.
> </td>
> </tr>
> [% ELSIF config_entry.error == 'uploadpath_and_opacbaseurl_entry_missing' %]
> <tr>
>- <th scope="row">Warning</th>
>+ <th scope="row">Warning</th>
> <td>You are missing the &lt;upload_path&gt; entry in your koha-conf.xml file. Please
> add it, pointing to the configured file upload directory for your Koha instance.
> Also note that you need to properly set the OPACBaseURL preference for the file upload plugin to work.
>@@ -408,7 +408,7 @@
> </tr>
> [% ELSIF config_entry.error == 'tmp_path_missing' %]
> <tr>
>- <th scope="row">Warning</th>
>+ <th scope="row">Warning</th>
> <td>You are missing the &lt;tmp_path&gt; entry in your koha-conf.xml file. Please
> add it, pointing to the configured temporary directory for your Koha instance.
> The effective temporary directory is '[% config_entry.effective_tmp_dir | html %]'.
>@@ -424,7 +424,7 @@
> <caption>Issuing rules</caption>
> [% FOREACH unit IN ir_units %]
> <tr>
>- <th scope="row">Warning</th>
>+ <th scope="row">Warning</th>
> <td>The [% unit.branchcode || 'branchcode=default' | html %], [% unit.categorycode || 'categorycode=default' | html %], [% unit.itemtype || 'itemtype=default' | html %]
> issuingrule will fallback to 'days' for 'lengthunit' as it is incorrectly defined as
> [% unit.rule_value | html %].
>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 a9359d3541..cab48b538e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>@@ -569,16 +569,16 @@
> Can't cancel order and delete catalog record 
> [% END %]
> [% IF ( books_loo.left_item ) %]
>- [% books_loo.items | html %] item(s) left 
>+ [% books_loo.items | html %] item(s) left 
> [% END %]
> [% IF ( books_loo.left_biblio ) %]
>- [% books_loo.biblios | html %] order(s) left 
>+ [% books_loo.biblios | html %] order(s) left 
> [% END %]
> [% IF ( books_loo.left_subscription ) %]
>- [% books_loo.subscriptions | html %] subscription(s) left 
>+ [% books_loo.subscriptions | html %] subscription(s) left 
> [% END %]
> [% IF ( books_loo.left_holds ) %]
>- [% books_loo.holds | html %] hold(s) left
>+ [% books_loo.holds | html %] hold(s) left
> [% END %]
> </td>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt
>index ff713b87b3..f28cfd6c17 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt
>@@ -19,7 +19,7 @@
> <main>
> 
> <h2>Files for invoice: [% invoicenumber | html %]</h2>
>- Vendor: <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% suppliername | html %]</a>
>+ Vendor: <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% suppliername | html %]</a>
> 
> [% IF errors %]
> <div class="dialog alert">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
>index d975162991..2bcb9a47b6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
>@@ -99,7 +99,7 @@
> ([% lateorder.basket.bookseller.id | html %])
> </td>
> <td>
>- [% lateorder.biblio.title | html %]
>+ [% lateorder.biblio.title | html %]
> [% IF ( lateorder.biblio.author ) %] Author: [% lateorder.biblio.author | html %][% END %]
> [% IF ( lateorder.biblio.biblioitem.publishercode ) %]
> Published by: [% lateorder.biblio.biblioitem.publishercode | html %]
>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 1aa9241296..955cfc6b17 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
>@@ -253,7 +253,7 @@
> [% IF (AcqCreateItemOrdering) %]
> 
> <div id="items_list" style="display:none">
>- Items list
>+ Items list
> <div style="width:100%;overflow:auto;">
> <table>
> <thead>
>@@ -486,7 +486,7 @@
> <div class="modal-dialog">
> <div class="modal-content">
> <h3>Invalid number of copies</h3>
>- Please enter a number, greater than or equal to 1
>+ Please enter a number, greater than or equal to 1
> </div>
> </div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
>index c9161e48a9..e4891b370b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
>@@ -142,7 +142,7 @@
> </fieldset>
> [% ELSIF (AcqCreateItemReceiving) %]
> <div id="items_list" style="display:none">
>- Items list
>+ Items list
> <div style="width:100%;overflow:auto;">
> <table>
> <thead>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>index f454b6b662..d23ab7a4f6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>@@ -192,16 +192,16 @@
> Can't cancel order and delete catalog record 
> [% END %]
> [% IF ( loop_order.left_item ) %]
>- [% loop_order.items | html %] item(s) left 
>+ [% loop_order.items | html %] item(s) left 
> [% END %]
> [% IF ( loop_order.left_biblio ) %]
>- [% loop_order.biblios | html %] order(s) left 
>+ [% loop_order.biblios | html %] order(s) left 
> [% END %]
> [% IF ( loop_order.left_subscription ) %]
>- [% loop_order.subscriptions | html %] subscription(s) left 
>+ [% loop_order.subscriptions | html %] subscription(s) left 
> [% END %]
> [% IF ( loop_order.left_holds ) %]
>- [% loop_order.holds | html %] hold(s) left
>+ [% loop_order.holds | html %] hold(s) left
> [% END %]
> </td>
> </tr>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
>index 4677ad4305..08a03e7dc0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
>@@ -37,9 +37,9 @@
> 
> [% INCLUDE 'budgets-active-currency.inc' %]
> [% IF ( show_actual ) %]
>- Each cell contain both actual and estimated values.
>+ Each cell contain both actual and estimated values.
> [% ELSE %]
>- Cells contain estimated values only.
>+ Cells contain estimated values only.
> [% END %]
> 
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
>index c6b95b17b4..53b35acbe6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
>@@ -202,7 +202,7 @@
> <tbody>
> [% FOREACH loo IN loop %]
> <tr>
>- <td>[% loo.tagfield | html %]</td>
>+ <td>[% loo.tagfield | html %]</td>
> <td>[% loo.liblibrarian | html %]</td>
> <td>[% IF ( loo.repeatable ) %]Yes[% ELSE %]No[% END %]</td>
> <td>[% IF ( loo.mandatory ) %]Yes[% ELSE %]No[% END %]</td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
>index c940616bd5..4a78bcc8d9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
>@@ -267,7 +267,7 @@
> </table>
> [% ELSE %]
> </table>
>- Configuration OK, you don't have errors in your MARC parameters table
>+ Configuration OK, you don't have errors in your MARC parameters table
> [% END %]
> 
> </main>
>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 e28d7e17ed..73e2e2747f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
>@@ -321,7 +321,7 @@ Item types administration
> <label for="summary">Summary: </label>
> <textarea id="summary" name="summary" cols="55" rows="5">[% itemtype.summary | html %]</textarea>
> Enter a summary that will overwrite the default one in search results lists. Example, for a website itemtype : 
>- &lt;a href="[856u]"&gt;open site&lt;/a&gt; will show the link just below the title
>+ &lt;a href="[856u]"&gt;open site&lt;/a&gt; will show the link just below the title
> </li>
> </ol>
> </fieldset>
>@@ -401,7 +401,7 @@ Item types administration
> [% itemtype.description | html %] (default) 
> [% FOR description IN itemtype.translated_descriptions %]
> [% IF description.translation == itemtype.translated_description %]
>- [% description.translation | html %]
>+ [% description.translation | html %]
> [% ELSE %]
> [% description.translation | html %] ([% description.lang | html %])
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref
>index 75e4ba289c..bab794bd57 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref
>@@ -8,7 +8,7 @@ I18N/L10N:
> metric: dd/mm/yyyy
> dmydot: dd.mm.yyyy
> iso: yyyy-mm-dd
>- - . Note: Do not change this preference on a production server with overdue items that are accruing fines. Doing so will result in duplicate fines!
>+ - . Note: Do not change this preference on a production server with overdue items that are accruing fines. Doing so will result in duplicate fines!
> -
> - Format times in
> - pref: TimeFormat
>@@ -16,7 +16,7 @@ I18N/L10N:
> choices:
> 24hr: 24 hour format ( e.g. "14:18" )
> 12hr: 12 hour format ( e.g. "02:18 PM" )
>- - . Note: Do not change this preference on a production server with overdue items that are accruing fines. Doing so will result in duplicate fines!
>+ - . Note: Do not change this preference on a production server with overdue items that are accruing fines. Doing so will result in duplicate fines!
> -
> - Use
> - pref: CalendarFirstDayOfWeek
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
>index 618e325105..41ebf5a0c4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
>@@ -77,7 +77,7 @@
> [% FOREACH subfiel IN innerloo.subfield %]
> 
> <label class="labelsubfield">&nbsp;
>- [% UNLESS ( subfiel.hide_marc ) %][% subfiel.marc_subfield | html %][% END %]
>+ [% UNLESS ( subfiel.hide_marc ) %][% subfiel.marc_subfield | html %][% END %]
> [% subfiel.short_desc | html %]</label>
> [% IF ( subfiel.is_url ) %]
> <a href="[% subfiel.marc_value | url %]">[% subfiel.marc_value | html %]</a>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
>index 21c6e24f05..e16baca296 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
>@@ -32,7 +32,7 @@
> [% END %]
> <div>
> 
>- Results [% from | html %] to [% to | html %] of [% total | html %]
>+ Results [% from | html %] to [% to | html %] of [% total | html %]
> [% ELSE %]
> 
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
>index d110dcbe52..3b8d56a268 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
>@@ -4,7 +4,7 @@
> [% BLOCK controls %]
> 
> <a id="CheckAll" href="#"> Select all</a> <a id="CheckNone" href="#"> Clear all</a>
>- | Selected items :
>+ | Selected items :
> <a href="#" id="remove_from_cart">Remove</a>
> 
> [% IF ( loggedinusername ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
>index b0376dacc3..498d4a2138 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
>@@ -40,7 +40,7 @@
> <h1>MARC record: [% biblionumber | html %] ( [% bibliotitle | html %] )</h1>
> [% END %]
> 
>- With framework : <select name="Frameworks" id="Frameworks">
>+ With framework : <select name="Frameworks" id="Frameworks">
> <option value="">Default</option>
> [% FOREACH framework IN frameworks %]
> [% IF framework.frameworkcode == frameworkcode %]
>@@ -49,7 +49,7 @@
> <option value="[% framework.frameworkcode | html %]">[% framework.frameworktext | html %]</option>
> [% END %]
> [% END %]
>- </select> 
>+ </select> 
> [% IF ( ocoins ) %]
> 
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
>index 4cf1161fe8..35e5c0cd17 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
>@@ -90,7 +90,7 @@
> 		</table>
> [% ELSE %]
> <div class="dialog message">
>- [% biblio.title | html %][% IF biblio.author %], by [% biblio.author | html %][% END %] has never been checked out.</div>
>+ [% biblio.title | html %][% IF biblio.author %], by [% biblio.author | html %][% END %] has never been checked out.</div>
> 
> [% END %]
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
>index c55028421a..9d16fd72ef 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
>@@ -42,7 +42,7 @@
> 					[% UNLESS ( popup ) %]
> <h1>Labeled MARC biblio : [% biblionumber | html %] ( [% bibliotitle | html %] )</h1>
> 					[% END %]
>- With framework:
>+ With framework:
> <select name="Frameworks" id="Frameworks" size="1" onchange="Changefwk(this);">
> <option value="">Default</option>
> [% FOREACH framework IN frameworks %]
>@@ -53,7 +53,7 @@
> [% END %]
> [% END %]
> </select>
>- 
>+ 
> 					
> 					<div>
> 						<table class="labeledmarc-table">
>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 18a22be998..ed525c7d8f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
>@@ -148,7 +148,7 @@
> </div> 
> [% ELSE # IF total %]
> [% IF ( query ) %]
>- [% IF ( error ) %]<div class="dialog alert">[% END %]No results found
>+ [% IF ( error ) %]<div class="dialog alert">[% END %]No results found
> [% IF ( error ) %]
> Error: [% error | html %]</div>
> [% END %]
>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 0ce0861bad..c7d95184bb 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
>@@ -48,7 +48,7 @@
> </div>[% END %]
> 
> [% IF ( total ) %]
>- &nbsp;Results [% from | html %] to [% to | html %] of [% total | html %] 
>+ &nbsp;Results [% from | html %] to [% to | html %] of [% total | html %] 
> [% ELSE %]
> &nbsp; No results found 
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
>index 2fe5e873a2..65173bbace 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
>@@ -85,7 +85,7 @@
> <td>
> 
> <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% todayoverduesloo.biblionumber | uri %]">[% todayoverduesloo.title | html %]</a>
>- &nbsp; ([% todayoverduesloo.description | html %])
>+ &nbsp; ([% todayoverduesloo.description | html %])
> Barcode : [% todayoverduesloo.barcode | html %]
> 
> </td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
>index 5eb69ed385..c47563be3a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
>@@ -124,11 +124,11 @@
> <li>Transfer is not allowed for:
> <ol>
> [% IF ( Koha.Preference('BranchTransferLimitsType') == 'itemtype' ) %]
>- <li>Item type: [% ItemTypes.GetDescription( errmsgloo.code ) | html %]</li>
>+ <li>Item type: [% ItemTypes.GetDescription( errmsgloo.code ) | html %]</li>
> [% ELSE %]
>- <li>Collection: [% AuthorisedValues.GetByCode( 'CCODE', errmsgloo.code ) | html %]</li>
>+ <li>Collection: [% AuthorisedValues.GetByCode( 'CCODE', errmsgloo.code ) | html %]</li>
> [% END %]
>- <li>Destination library: [% Branches.GetName( errmsgloo.tbr ) | html %]</li>
>+ <li>Destination library: [% Branches.GetName( errmsgloo.tbr ) | html %]</li>
> </ol>
> </li>
> [% END %]
>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 8ad231bfdc..69314746b6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -69,7 +69,7 @@
> [% END %]
> 
> [% IF alert.HIGHHOLDS %]
>- <div class="dialog message">High demand item. Loan period was not shortened due to override. Shortened due date would have been [% alert.HIGHHOLDS.returndate | $KohaDates %] ([% alert.HIGHHOLDS.duration | html %] days).</div>
>+ <div class="dialog message">High demand item. Loan period was not shortened due to override. Shortened due date would have been [% alert.HIGHHOLDS.returndate | $KohaDates %] ([% alert.HIGHHOLDS.duration | html %] days).</div>
> [% END %]
> 
> [% IF alert.RETURNED_FROM_ANOTHER %]
>@@ -185,7 +185,7 @@
> [% END %]
> 
> [% IF PREVISSUE %]
>- <li>Patron has previously checked out this title: [% biblio.title | html %] [% IF biblio.author %] by [% biblio.author | html %][% END %]. Check out anyway?</li>
>+ <li>Patron has previously checked out this title: [% biblio.title | html %] [% IF biblio.author %] by [% biblio.author | html %][% END %]. Check out anyway?</li>
> [% END %]
> 
> [% IF BIBLIO_ALREADY_ISSUED %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>index a7cd0c21e2..6328194357 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>@@ -70,7 +70,7 @@
> [% FOREACH reserveloo IN reserveloop %]
> <tr>
> [% IF ( reserveloo.borrowernumber ) %]
>- <td>[% reserveloo.pullcount | html %]</td>
>+ <td>[% reserveloo.pullcount | html %]</td>
> <td>[% reserveloo.count | html %]</td>
> <td>[% reserveloo.rcount | html %]</td>
> <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernumber | uri %]">[% reserveloo.firstname | html %] [% reserveloo.surname | html %]</a></td>
>@@ -197,7 +197,7 @@
> </tfoot>
> </table>
> [% ELSE %]
>- No items found.
>+ No items found.
> [% END %]
> </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
>index 74b4b360c3..9567fc3af9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
>@@ -100,9 +100,9 @@
> [% IF ( CAN_user_acquisition && basketno && booksellerid ) %]
> <a href="/cgi-bin/koha/acqui/neworderempty.pl?biblionumber=[% reserveloo.biblionumber | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;rr_quantity_to_order=[% reserveloo.ratiocalc | uri %]" class="btn btn-default btn-xs"> [% reserveloo.ratiocalc | html %] to order</a>
> [% ELSE %]
>- [% reserveloo.ratiocalc | html %] to order
>+ [% reserveloo.ratiocalc | html %] to order
> [% END %]
>- [% IF ( reserveloo.pendingorders ) %] [% reserveloo.pendingorders | html %] pending[% END %]
>+ [% IF ( reserveloo.pendingorders ) %] [% reserveloo.pendingorders | html %] pending[% END %]
> [% ELSE %]
> 0 to order
> [% END %]
>@@ -113,7 +113,7 @@
> </tbody>
> </table>
> [% ELSE %]
>- No items found.
>+ No items found.
> [% END %]
> 
> </main>
>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 1293dafe17..973cf61370 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>@@ -276,10 +276,10 @@
> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber | uri %]">[% errmsgloo.debarname | html %]([% errmsgloo.debarcardnumber | html %])</a> is now debarred until [% errmsgloo.debarred | $KohaDates %].
> [% END %]
> [% IF ( errmsgloo.prevdebarred ) %]
>- Reminder: Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].
>+ Reminder: Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].
> [% END %]
> [% IF ( errmsgloo.foreverdebarred ) %]
>- Reminder: Patron has an indefinite restriction.
>+ Reminder: Patron has an indefinite restriction.
> [% END %]
> [% IF errmsgloo.data_corrupted %]
> The item has not been checked in due to a configuration issue in your system. You must ask an administrator to take a look at the <a href="/cgi-bin/koha/about.pl#sysinfo">about page</a> and search for the "data problems" section
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
>index f0c3d4ffdf..bebcd88be1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
>@@ -53,7 +53,7 @@
> <td>[% reser.datetransfer | $KohaDates %] [% IF ( reser.messcompa ) %]Transfer is [% reser.diff | html %] days late[% END %]</td>
> <td>
> [% INCLUDE 'biblio-default-view.inc' biblionumber = reser.biblionumber %][% INCLUDE 'biblio-title.inc' biblio=reser %]</a> [% IF ( reser.author ) %]by [% reser.author | html %][% END %]
>- [% IF ( reser.itemtype ) %] ([% reser.itemtype | html %])[% END %]
>+ [% IF ( reser.itemtype ) %] ([% reser.itemtype | html %])[% END %]
> Barcode: [% reser.barcode | html %]
> </td>
> <td>[% IF ( reser.patron ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/status_change.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/status_change.tt
>index bde7367a0b..5c18443165 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/status_change.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/status_change.tt
>@@ -1,6 +1,6 @@
> [% USE KohaDates %]
> 
>-[% log.timestamp | $KohaDates with_hours => 1 %] : Status changed
>+[% log.timestamp | $KohaDates with_hours => 1 %] : Status changed
> [% IF log.info.status_before %]
> [% before = log.info.status_before %]
> [% display_before = log.aliases.$before ? log.aliases.$before.lib : request.capabilities.$before.name %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
>index 642a933de4..8e5657a219 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
>@@ -51,7 +51,7 @@
> <div style="border-bottom:1px solid #CCC;padding:1em 0;">
> <h4>[% result_se.title | html %]</h4>
> [% IF ( result_se.author ) %]by [% result_se.author | html %][% END %]
>- [[% result_se.itemtype | html %]], [% IF ( result_se.publishercode ) %][% result_se.publishercode | html %] [% END %][% IF ( result_se.place ) %][% result_se.place | html %] [% END %][% IF ( result_se.copyrightdate ) %][% result_se.copyrightdate | html %], [% END %][% IF ( result_se.pages ) %][% result_se.pages | html %][% END %][% IF ( result_se.isbn ) %], ISBN: [% result_se.isbn | html %][% END %][% IF ( result_se.notes ) %], [% result_se.notes | html %][% END %]
>+ [[% result_se.itemtype | html %]], [% IF ( result_se.publishercode ) %][% result_se.publishercode | html %] [% END %][% IF ( result_se.place ) %][% result_se.place | html %] [% END %][% IF ( result_se.copyrightdate ) %][% result_se.copyrightdate | html %], [% END %][% IF ( result_se.pages ) %][% result_se.pages | html %][% END %][% IF ( result_se.isbn ) %], ISBN: [% result_se.isbn | html %][% END %][% IF ( result_se.notes ) %], [% result_se.notes | html %][% END %]
> 
> <table>
> [% FOREACH item_tabl IN result_se.item_table %]
>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 7eee67249b..1119388c83 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>@@ -326,7 +326,7 @@
> </div>
> <div class="modal-body">
> The amount collected from the patron is higher than the amount to be paid.
>- The change to give is 0.00.
>+ The change to give is 0.00.
> Confirm this payment?
> </div>
> <div class="modal-footer">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt
>index ba5aaa3134..01fd4e5f1d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt
>@@ -30,7 +30,7 @@
> </li>
> </ol>
> To add another library and for more settings, go to:
>- Administration &rsaquo; Libraries and groups 
>+ Administration &rsaquo; Libraries and groups 
> 
> <input type="submit" class="btn btn-primary" value="Submit" />
> </fieldset>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
>index 4f7643c083..b01da625cd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
>@@ -116,7 +116,7 @@
> 
> 
> To add another patron category and for more settings go to:
>- Administration &rsaquo; Patron categories
>+ Administration &rsaquo; Patron categories
> 
> 
> <input type="submit" class="btn btn-primary" value="Submit" />
>@@ -132,4 +132,4 @@
> <script src="[% interface | html %]/[% theme | html %]/js/onboarding.js"></script>
> [% END %]
> 
>-[% INCLUDE 'installer-intranet-bottom.inc' %]
>\ No newline at end of file
>+[% INCLUDE 'installer-intranet-bottom.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
>index 63314b6fa8..3606b26a00 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
>@@ -65,7 +65,7 @@
> [% END %]
> </select>
> Required 
>- Note: If you installed sample patron categories please select the "Staff" option in the patron categories dropdown box.
>+ Note: If you installed sample patron categories please select the "Staff" option in the patron categories dropdown box.
> </li>
> </ol>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
>index 06daeb54f1..0095bdd963 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
>@@ -22,18 +22,18 @@
> [% IF ( ERRORS ) %]
> <div class="dialog alert">
> [% FOREACH ERROR IN ERRORS %]
>- [% IF ( ERROR.NOTKPZ ) %]<li>The upload file does not appear to be a kpz file. The extension is not '.kpz'.</li>
>- [% ELSIF ( ERROR.NOWRITETEMP ) %]<li>This script is not able to create/write to the necessary temporary directory.</li>
>- [% ELSIF ( ERROR.EMPTYUPLOAD ) %]<li>The upload file appears to be empty.</li>
>- [% ELSIF ( ERROR.UZIPFAIL ) %]<li>[% ERROR.UZIPFAIL | html %] failed to unpack. Please verify the integrity of the zip file and retry.</li>
>- [% ELSIF ( ERROR.NOWRITEPLUGINS ) %]<li>Cannot unpack file to the plugins directory. Please verify that the Apache user can write to the plugins directory.</li>
>- [% ELSE %]<li>[% ERROR.CORERR | html %] An unknown error has occurred. Please review the error log for more details.</li>[% END %]
>+ [% IF ( ERROR.NOTKPZ ) %]<li>The upload file does not appear to be a kpz file. The extension is not '.kpz'.</li>
>+ [% ELSIF ( ERROR.NOWRITETEMP ) %]<li>This script is not able to create/write to the necessary temporary directory.</li>
>+ [% ELSIF ( ERROR.EMPTYUPLOAD ) %]<li>The upload file appears to be empty.</li>
>+ [% ELSIF ( ERROR.UZIPFAIL ) %]<li>[% ERROR.UZIPFAIL | html %] failed to unpack. Please verify the integrity of the zip file and retry.</li>
>+ [% ELSIF ( ERROR.NOWRITEPLUGINS ) %]<li>Cannot unpack file to the plugins directory. Please verify that the Apache user can write to the plugins directory.</li>
>+ [% ELSE %]<li>[% ERROR.CORERR | html %] An unknown error has occurred. Please review the error log for more details.</li>[% END %]
> [% END %]
> </div>
> [% END %]
> <form method="post" action="/cgi-bin/koha/plugins/plugins-upload.pl" enctype="multipart/form-data">
> <fieldset class="brief">
>- <div class="hint">NOTE: Only KPZ file format is supported.</div>
>+ <div class="hint">NOTE: Only KPZ file format is supported.</div>
> <ol>
> <li>
> <label for="uploadfile">Select the file to upload: </label><input type="file" id="uploadfile" name="uploadfile" />
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
>index 021e4ea611..c4d9ef2b1f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
>@@ -156,7 +156,7 @@
> </div>
> <div class="modal-body">
> The amount collected from the patron is higher than the amount to be paid.
>- The change to give is [% 0 | $Price %].
>+ The change to give is [% 0 | $Price %].
> Confirm this payment?
> </div>
> <div class="modal-footer">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt
>index c1ad99bfa4..4db99d2c41 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt
>@@ -19,7 +19,7 @@
> 	[% FOREACH mainloo IN mainloop %]
> 		<h1>Acquisitions statistics </h1>
> [% IF ( mainloo.loopfilter.size ) %]
>- Filtered on:
>+ Filtered on:
> [% FOREACH loopfilte IN mainloo.loopfilter %]
> 
> [% SWITCH loopfilte.crit %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>index e704e19493..f33a6e3558 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>@@ -394,7 +394,7 @@
> [% IF ( build1 ) %]
> [% IF ( cache_error) %]
> <div class="dialog alert">
>- Please choose a cache_expiry less than 30 days 
>+ Please choose a cache_expiry less than 30 days 
> </div>
> [% END %]
> 
>@@ -1207,10 +1207,10 @@
> [% IF ( errors ) %]
> <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
> <div class="dialog alert">
>- The following error was encountered: 
>+ The following error was encountered: 
> [% FOREACH error IN errors %]
> [% IF ( error.sqlerr ) %]
>- This report contains the SQL keyword [% error.sqlerr | html %]. 
>+ This report contains the SQL keyword [% error.sqlerr | html %]. 
> Use of this keyword is not allowed in Koha reports due to security and data integrity risks. Only SELECT queries are allowed. 
> Please return to the &quot;Saved Reports&quot; screen and delete this report or retry creating a new one.
> [% ELSIF ( error.queryerr ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt
>index ec04aa2153..20b9b85f20 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt
>@@ -63,7 +63,7 @@
> </table>
> <div class="pages">[% pagination_bar | $raw %]</div>
> [% ELSE %]
>-[% IF ( status ) %]No comments have been approved.[% ELSE %]No comments to moderate.[% END %]
>+[% IF ( status ) %]No comments have been approved.[% ELSE %]No comments to moderate.[% END %]
> [% END %]
> </div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
>index 091451c2a7..c71a3ea278 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
>@@ -50,15 +50,15 @@
> 
> [% IF ( subscriptions_loop ) %]
> 
>- [% numsubscription | html %] subscription(s)
>+ [% numsubscription | html %] subscription(s)
> [% IF ( title ) %]
> with title matching [% title | html %]</class>
> [% IF ( issn ) %]and [% END %]
> [% END %]
> [% IF ( issn ) %]
>- with ISSN matching [% issn | html %]
>+ with ISSN matching [% issn | html %]
> [% END %]
>- will expire before [% date | $KohaDates %]
>+ will expire before [% date | $KohaDates %]
> 
> 
> <div class="checkexpiration-table_table_controls">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt
>index 064f09b3d4..2ead597be2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt
>@@ -43,7 +43,7 @@
> [% ELSE %]
> 
> <div class="dialog message">
>- No results found for [% query | html %]
>+ No results found for [% query | html %]
> </div>
> 
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt
>index 9caefcca57..a740c5d69f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt
>@@ -17,11 +17,11 @@
> <td colspan="2"><h3>[% libraryname | html %]</h3></td>
> </tr>
> <tr>
>- <td colspan="2">Title: [% title | html %] [% issue | html %]</td>
>+ <td colspan="2">Title: [% title | html %] [% issue | html %]</td>
> </tr>
> <tr>
>- <td>Name</td>
>- <td>Date due</td>
>+ <td>Name</td>
>+ <td>Date due</td>
> </tr>
> [% FOREACH memberloo IN memberloop %]
> <tr>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>index 16a37871e4..bbce3c8775 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>@@ -740,7 +740,7 @@
> </div>
> 
> [% ELSE %]
>- No results.
>+ No results.
> [% END %]
> </form>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt
>index bfd7809a6d..4e9a992c04 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt
>@@ -45,7 +45,7 @@
> </ul>
> <div id="bibs">
> 
>- Note : The items are exported by this tool unless specified.
>+ Note : The items are exported by this tool unless specified.
> 
> 
> <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/export.pl">
>@@ -230,7 +230,7 @@
> [% IF ( allow_db_export ) %]
> <div id="db">
> <form method="post" action="/cgi-bin/koha/tools/export.pl">
>- Note : This export file will be very large, and is generated nightly.
>+ Note : This export file will be very large, and is generated nightly.
> <fieldset class="rows">
> <legend> Choose a file </legend>
> [% IF ( dbfiles && (dbfiles.size > 0) ) %]
>@@ -256,7 +256,7 @@
> [% IF ( allow_conf_export ) %]
> <div id="conf">
> <form method="post" action="/cgi-bin/koha/tools/export.pl">
>- Note : This export file will be very large, and is generated nightly.
>+ Note : This export file will be very large, and is generated nightly.
> <fieldset class="rows">
> <legend> Choose a file </legend>
> [% IF ( conffiles && (conffiles.size > 0) ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
>index 7900be3f35..62142d8dd6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
>@@ -74,7 +74,7 @@ td.repeatableyearly a.ui-state-default { background: #FFCC66 none; color : Bl
> <input type="hidden" id="showYear" name="showYear" />
> </li>
> <li class="dateinsert">
>- To Date : 
>+ To Date : 
> <input type="text" id="datecancelrange" name="datecancelrange" size="20" value="[% datecancelrange | html %]" class="datepicker"/>
> </li>
> <li><label for="showTitle">Title: </label><input type="text" name="showTitle" id="showTitle" size="35" /></li>
>@@ -150,7 +150,7 @@ td.repeatableyearly a.ui-state-default { background: #FFCC66 none; color : Bl
> <input type="hidden" id="newYear" name="newYear" />
> </li>
> <li class="dateinsert">
>- To date: 
>+ To date: 
> <input type="text" id="dateofrange" name="dateofrange" size="20" value="[% dateofrange | html %]" class="datepicker" />
> </li>
> <li><label for="title">Title: </label><input type="text" name="newTitle" id="title" size="35" /></li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
>index 5ee2fadf72..9f69f69e3c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
>@@ -285,7 +285,7 @@
> <ul>
> <li>The first line in the file must be a header row defining which columns you are supplying in the import file.</li>
> 
>- <li>Download a starter CSV file with all the columns <a href="?sample=1">here</a>. Values are comma-separated.</li>
>+ <li>Download a starter CSV file with all the columns <a href="?sample=1">here</a>. Values are comma-separated.</li>
> 
> <li>
> OR choose which fields you want to supply from the following list:
>@@ -298,12 +298,12 @@
> 
> [% IF ( Koha.Preference('ExtendedPatronAttributes') ) %]
> <li>
>- If loading patron attributes, the 'patron_attributes' field should contain a comma-separated list of attribute types and values. The attribute type code and a colon should precede each value. For example: INSTID:12345,LANG:fr or STARTDATE:January 1 2010,TRACK:Day. If an input record has more than one attribute, the fields should either be entered as an unquoted string (previous examples), or with each field wrapped in separate double quotes and delimited by a comma: &quot;STARTDATE:January 1, 2010&quot;,&quot;TRACK:Day&quot;. The second syntax would be required if the data might have a comma in it, like a date string.
>+ If loading patron attributes, the 'patron_attributes' field should contain a comma-separated list of attribute types and values. The attribute type code and a colon should precede each value. For example: INSTID:12345,LANG:fr or STARTDATE:January 1 2010,TRACK:Day. If an input record has more than one attribute, the fields should either be entered as an unquoted string (previous examples), or with each field wrapped in separate double quotes and delimited by a comma: &quot;STARTDATE:January 1, 2010&quot;,&quot;TRACK:Day&quot;. The second syntax would be required if the data might have a comma in it, like a date string.
> </li>
> [% END %]
> 
> <li>
>- Required fields: The fields 'surname', 'branchcode', and 'categorycode' are required and 'branchcode' and 'categorycode' must match valid entries in your database.
>+ Required fields: The fields 'surname', 'branchcode', and 'categorycode' are required and 'branchcode' and 'categorycode' must match valid entries in your database.
> </li>
> 
> <li>
>@@ -311,7 +311,7 @@
> </li>
> 
> <li>
>- Date formats should match your system preference, and must be zero-padded, e.g. '01/02/2008'. Alternatively,
>+ Date formats should match your system preference, and must be zero-padded, e.g. '01/02/2008'. Alternatively,
> you can supply dates in ISO format (e.g., '2010-10-28').
> </li>
> </ul>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>index 4bfed8b44c..29e89152cc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>@@ -121,7 +121,7 @@
> </div> 
> 
> [% IF ( search ) %]
>- You searched for [% searchfield | html %]
>+ You searched for [% searchfield | html %]
> [% END %]
> 
> [% IF ( letter && !independant_branch) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
>index a3edfdf904..7880ed9e2e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
>@@ -45,13 +45,13 @@
> [% ELSE %]
> <div class="dialog message">
> [% END %]
>- 
>+ 
> [% IF ( label_batch_msg == "error" ) %]
> Error attempting to create label batch. Please ask your system administrator to check the log for more details.
> [% ELSE %]
> Label <a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=edit&element_id=[% label_batch_msg | uri %]" >batch #[% label_batch_msg | html %]</a> created.
> [% END %]
>- 
>+ 
> </div>
> [% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt
>index 38ea53f6df..29fd108ad3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt
>@@ -57,15 +57,15 @@
> <td>
> [% IF ( filename.filerrors ) %]
> [% FOREACH filerror IN filename.filerrors %]
>- [% IF ( filerror.DBERR ) %]ERROR: Image not imported because the database returned an error. Please refer to the error log for more details.
>- [% ELSIF ( filerror.IMGEXISTS ) %]ERROR: Image not imported because this patron does not exist in the database.
>- [% ELSIF ( filerror.MIMERR ) %]ERROR: Image not imported because the image format is unrecognized.
>- [% ELSIF ( filerror.CORERR ) %]ERROR: Image not imported because the image file is corrupted.
>- [% ELSIF ( filerror.OPNERR ) %]ERROR: Image not imported because Koha was unable to open the image for reading.
>- [% ELSIF ( filerror.OVRSIZ ) %]ERROR: Image not imported because the image file is too big (see online help for maximum size).
>- [% ELSIF ( filerror.CRDFIL ) %]ERROR: Image not imported ([% filerror.CRDFIL | html %] missing).
>- [% ELSIF ( filerror.CARDNUMBER_DOES_NOT_EXIST ) %]ERROR: Image not imported because this patron does not exist in the database.
>- [% ELSE %]ERROR: Image not imported because of an unknown error. Please refer to the error log for more details.
>+ [% IF ( filerror.DBERR ) %]ERROR: Image not imported because the database returned an error. Please refer to the error log for more details.
>+ [% ELSIF ( filerror.IMGEXISTS ) %]ERROR: Image not imported because this patron does not exist in the database.
>+ [% ELSIF ( filerror.MIMERR ) %]ERROR: Image not imported because the image format is unrecognized.
>+ [% ELSIF ( filerror.CORERR ) %]ERROR: Image not imported because the image file is corrupted.
>+ [% ELSIF ( filerror.OPNERR ) %]ERROR: Image not imported because Koha was unable to open the image for reading.
>+ [% ELSIF ( filerror.OVRSIZ ) %]ERROR: Image not imported because the image file is too big (see online help for maximum size).
>+ [% ELSIF ( filerror.CRDFIL ) %]ERROR: Image not imported ([% filerror.CRDFIL | html %] missing).
>+ [% ELSIF ( filerror.CARDNUMBER_DOES_NOT_EXIST ) %]ERROR: Image not imported because this patron does not exist in the database.
>+ [% ELSE %]ERROR: Image not imported because of an unknown error. Please refer to the error log for more details.
> [% END %]
> [% END %]
> [% ELSE %] imported successfully.
>@@ -88,20 +88,20 @@
> [% IF ( ERRORS ) %]
> <div class="dialog alert">
> [% FOREACH ERROR IN ERRORS %]
>- [% IF ( ERROR.NOTZIP ) %]<li>The upload file does not appear to be a zip file. The extension is not '.zip'.</li>
>- [% ELSIF ( ERROR.NOWRITETEMP ) %]<li>This script is not able to create/write to the necessary temporary directory.</li>
>- [% ELSIF ( ERROR.EMPTYUPLOAD ) %]<li>The upload file appears to be empty.</li>
>- [% ELSIF ( ERROR.OPNLINK ) %]<li>Cannot open [% ERROR.OPNLINK | html %] to read. Please verify that it exists.</li>
>- [% ELSIF ( ERROR.OPNIMG ) %]<li>Cannot open [% ERROR.OPNIMG | html %] to read. Please verify that it exists.</li>
>- [% ELSIF ( ERROR.DELERR ) %]<li>Unrecognized or missing field delimiter. Please verify that you are using either a single quote or a tab.</li>
>- [% ELSIF ( ERROR.UZIPFAIL ) %]<li>[% ERROR.UZIPFAIL | html %] failed to unpack. Please verify the integrity of the ZIP file and retry.</li>
>- [% ELSE %]<li>[% ERROR.CORERR | html %] An unknown error has occurred. Please review the error log for more details.</li>[% END %]
>+ [% IF ( ERROR.NOTZIP ) %]<li>The upload file does not appear to be a zip file. The extension is not '.zip'.</li>
>+ [% ELSIF ( ERROR.NOWRITETEMP ) %]<li>This script is not able to create/write to the necessary temporary directory.</li>
>+ [% ELSIF ( ERROR.EMPTYUPLOAD ) %]<li>The upload file appears to be empty.</li>
>+ [% ELSIF ( ERROR.OPNLINK ) %]<li>Cannot open [% ERROR.OPNLINK | html %] to read. Please verify that it exists.</li>
>+ [% ELSIF ( ERROR.OPNIMG ) %]<li>Cannot open [% ERROR.OPNIMG | html %] to read. Please verify that it exists.</li>
>+ [% ELSIF ( ERROR.DELERR ) %]<li>Unrecognized or missing field delimiter. Please verify that you are using either a single quote or a tab.</li>
>+ [% ELSIF ( ERROR.UZIPFAIL ) %]<li>[% ERROR.UZIPFAIL | html %] failed to unpack. Please verify the integrity of the ZIP file and retry.</li>
>+ [% ELSE %]<li>[% ERROR.CORERR | html %] An unknown error has occurred. Please review the error log for more details.</li>[% END %]
> [% END %]
> </div>
> [% END %]
> <form method="post" action="/cgi-bin/koha/tools/picture-upload.pl" enctype="multipart/form-data" id="upload_form">
> <fieldset class="rows">
>- NOTE: Only PNG, GIF, JPEG, XPM formats are supported.
>+ NOTE: Only PNG, GIF, JPEG, XPM formats are supported.
> <ol class="radio">
> <li>
> <label for="zipfile"><input type="radio" id="zipfile" name="filetype" value="zip" checked="checked" /> Zip file</label></li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt
>index 5beeebe111..afaea0615d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt
>@@ -76,7 +76,7 @@
> <tr>
> <td><input type="checkbox" name="report_ids" value="[% report.reportid | html %]"></td>
> <td>
>- [% report.title | html %] 
>+ [% report.title | html %] 
> [% report.content | html %]
> </td>
> <td><a href="[% OPACBaseURL | url %][% report.problempage | url %]">[% OPACBaseURL | url %][% report.problempage | html %]</a></td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
>index bf910d229c..e3acc497dd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
>@@ -26,7 +26,7 @@
> <div id="quote_editor_inst">
> <ul>
> <li>Click on the 'Add quote' button to add a single quote; Press the &lt;Enter&gt; key to save the quote. 
>- Note: Both the 'source' and 'text' fields must have content in order for the quote to be saved.</li>
>+ Note: Both the 'source' and 'text' fields must have content in order for the quote to be saved.</li>
> <li>Click on any field to edit the contents; Press the &lt;Enter&gt; key to save edit.</li>
> <li>Click on one or more quote numbers to select entire quotes for deletion; Click the 'Delete quote(s)' button to delete selected quotes.</li>
> <li>Click the 'Import quotes' button in the toolbar to import a CSV file of quotes.</li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
>index ac771fd61e..ee8296b7d4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
>@@ -27,12 +27,12 @@
> <li>[% total | html %] images found</li>
> [% IF ( error ) %]
> <div class="dialog alert">
>- [% IF ( error == 'UZIPFAIL' ) %]Failed to unzip archive. Please ensure you are uploading a valid zip file and try again.
>- [% ELSIF ( error == 'OPNLINK' ) %]Cannot open folder index (idlink.txt or datalink.txt) to read. Please verify that it exists.
>- [% ELSIF ( error == 'OPNIMG' ) %]Cannot process file as an image. Please ensure you only upload GIF, JPEG, PNG, or XPM images.
>- [% ELSIF ( error == 'DELERR' ) %]Unrecognized or missing field delimiter. Please verify that you are using either a single quote or a tab.
>- [% ELSIF ( error == 'DBERR' ) %]Unable to save image to database.
>- [% ELSE %]An unknown error has occurred. Please review the error log for more details.[% END %]
>+ [% IF ( error == 'UZIPFAIL' ) %]Failed to unzip archive. Please ensure you are uploading a valid zip file and try again.
>+ [% ELSIF ( error == 'OPNLINK' ) %]Cannot open folder index (idlink.txt or datalink.txt) to read. Please verify that it exists.
>+ [% ELSIF ( error == 'OPNIMG' ) %]Cannot process file as an image. Please ensure you only upload GIF, JPEG, PNG, or XPM images.
>+ [% ELSIF ( error == 'DELERR' ) %]Unrecognized or missing field delimiter. Please verify that you are using either a single quote or a tab.
>+ [% ELSIF ( error == 'DBERR' ) %]Unable to save image to database.
>+ [% ELSE %]An unknown error has occurred. Please review the error log for more details.[% END %]
> </div>
> </li>
> [% END %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 25744: 107903 | 107906 | 109758 | 109759 | 109889 | 109890