Attachment 155998 Details for Bug 34862 – Bug 34862: Include messages.inc

[patch] Bug 34862: Include messages.inc

Bug-34862-Include-messagesinc.patch (text/plain), 190.00 KB, created by Jonathan Druart on 2023-09-21 13:13:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2023-09-21 13:13:11 UTC

Size: 190.00 KB

patch

obsolete

>From bcc2af69bfe758486bd4ffd7aeb06851ec078f2f Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 21 Sep 2023 15:10:48 +0200
>Subject: [PATCH] Bug 34862: Include messages.inc
>
>Generated using `perl add_blocking_errors.pl`
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/about.tt               | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt    | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt        | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt   | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt  | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt   | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt   | 1 +
> .../intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt    | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt       | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt   | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt        | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt    | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt       | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt      | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt    | 1 +
> .../intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt     | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt | 1 +
> .../prog/en/modules/acqui/neworderempty_duplicate.tt           | 1 +
> .../prog/en/modules/acqui/newordersubscription.tt              | 1 +
> .../intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt  | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt       | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt  | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt        | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt       | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt         | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt      | 1 +
> .../intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt      | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt  | 1 +
> .../intranet-tmpl/prog/en/modules/admin/additional-fields.tt   | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt    | 1 +
> .../intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt  | 1 +
> .../intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt     | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt     | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt    | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt        | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt  | 1 +
> .../prog/en/modules/admin/auth_subfields_structure.tt          | 1 +
> .../intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt  | 1 +
> .../intranet-tmpl/prog/en/modules/admin/authorised_values.tt   | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt     | 1 +
> .../intranet-tmpl/prog/en/modules/admin/background_jobs.tt     | 1 +
> .../intranet-tmpl/prog/en/modules/admin/biblio_framework.tt    | 1 +
> .../prog/en/modules/admin/branch_transfer_limits.tt            | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt      | 1 +
> .../intranet-tmpl/prog/en/modules/admin/cash_registers.tt      | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt    | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt     | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt        | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt  | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt   | 1 +
> .../intranet-tmpl/prog/en/modules/admin/columns_settings.tt    | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt  | 1 +
> .../intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt     | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt      | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt   | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt         | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt    | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt  | 1 +
> .../intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt    | 1 +
> .../prog/en/modules/admin/identity_provider_domains.tt         | 1 +
> .../intranet-tmpl/prog/en/modules/admin/identity_providers.tt  | 1 +
> .../prog/en/modules/admin/item_circulation_alerts.tt           | 1 +
> .../intranet-tmpl/prog/en/modules/admin/items_search_field.tt  | 1 +
> .../intranet-tmpl/prog/en/modules/admin/items_search_fields.tt | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt     | 1 +
> .../intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt      | 1 +
> .../intranet-tmpl/prog/en/modules/admin/library_groups.tt      | 1 +
> .../intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt  | 1 +
> .../prog/en/modules/admin/marc_subfields_structure.tt          | 1 +
> .../intranet-tmpl/prog/en/modules/admin/marctagstructure.tt    | 1 +
> .../intranet-tmpl/prog/en/modules/admin/matching-rules.tt      | 1 +
> .../intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt    | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt      | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt     | 1 +
> .../intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt   | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt   | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt  | 1 +
> .../intranet-tmpl/prog/en/modules/admin/search_filters.tt      | 1 +
> .../en/modules/admin/searchengine/elasticsearch/mappings.tt    | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt   | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt  | 1 +
> .../intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt      | 1 +
> .../intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt | 1 +
> .../intranet-tmpl/prog/en/modules/admin/systempreferences.tt   | 1 +
> .../intranet-tmpl/prog/en/modules/admin/transfer_limits.tt     | 1 +
> .../prog/en/modules/admin/transport-cost-matrix.tt             | 1 +
> .../intranet-tmpl/prog/en/modules/admin/usage_statistics.tt    | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt  | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt                | 1 +
> .../prog/en/modules/authorities/authorities-home.tt            | 1 +
> .../intranet-tmpl/prog/en/modules/authorities/authorities.tt   | 1 +
> .../prog/en/modules/authorities/blinddetail-biblio-search.tt   | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt  | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt   | 1 +
> .../prog/en/modules/authorities/searchresultlist.tt            | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt       | 1 +
> .../intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt      | 1 +
> .../intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt      | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt    | 1 +
> .../intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt     | 1 +
> .../intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt    | 1 +
> .../intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt      | 1 +
> .../prog/en/modules/catalogue/labeledMARCdetail.tt             | 1 +
> .../intranet-tmpl/prog/en/modules/catalogue/moredetail.tt      | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt   | 1 +
> .../intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt   | 1 +
> .../intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt     | 1 +
> .../intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt      | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt | 1 +
> .../prog/en/modules/cataloguing/cataloging-home.tt             | 1 +
> .../intranet-tmpl/prog/en/modules/cataloguing/concerns.tt      | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt  | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt   | 1 +
> .../intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt      | 1 +
> .../prog/en/modules/cataloguing/value_builder/cn_browser.tt    | 1 +
> .../intranet-tmpl/prog/en/modules/circ/article-requests.tt     | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt      | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt | 1 +
> .../intranet-tmpl/prog/en/modules/circ/branchtransfers.tt      | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt | 1 +
> .../intranet-tmpl/prog/en/modules/circ/circulation-home.tt     | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt    | 1 +
> .../prog/en/modules/circ/circulation_batch_checkouts.tt        | 1 +
> .../intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt     | 1 +
> .../intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt    | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt        | 1 +
> .../intranet-tmpl/prog/en/modules/circ/pendingreserves.tt      | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt          | 1 +
> .../intranet-tmpl/prog/en/modules/circ/request-article.tt      | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt  | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt        | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt    | 1 +
> .../intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt    | 1 +
> .../intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt   | 1 +
> .../intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt      | 1 +
> .../intranet-tmpl/prog/en/modules/circ/waitingreserves.tt      | 1 +
> .../intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt    | 1 +
> .../intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt    | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt         | 1 +
> .../prog/en/modules/clubs/templates-add-modify.tt              | 1 +
> .../prog/en/modules/course_reserves/add_items-step1.tt         | 1 +
> .../prog/en/modules/course_reserves/add_items-step2.tt         | 1 +
> .../prog/en/modules/course_reserves/batch_add_items.tt         | 1 +
> .../prog/en/modules/course_reserves/batch_rm_items.tt          | 1 +
> .../prog/en/modules/course_reserves/course-details.tt          | 1 +
> .../prog/en/modules/course_reserves/course-reserves.tt         | 1 +
> .../intranet-tmpl/prog/en/modules/course_reserves/course.tt    | 1 +
> .../prog/en/modules/course_reserves/invalid-course.tt          | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt    | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt    | 2 ++
> .../intranet-tmpl/prog/en/modules/labels/barcode-print.tt      | 1 +
> .../intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt   | 1 +
> .../intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt  | 1 +
> .../intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt | 1 +
> .../intranet-tmpl/prog/en/modules/labels/label-edit-range.tt   | 1 +
> .../prog/en/modules/labels/label-edit-template.tt              | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt   | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt  | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt       | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt       | 1 +
> .../intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt    | 1 +
> .../prog/en/modules/members/accountline-details.tt             | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt     | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt  | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt   | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt   | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt  | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt       | 1 +
> .../intranet-tmpl/prog/en/modules/members/holdshistory.tt      | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt  | 1 +
> .../intranet-tmpl/prog/en/modules/members/ill-requests.tt      | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt   | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt  | 1 +
> .../intranet-tmpl/prog/en/modules/members/member-flags.tt      | 1 +
> .../intranet-tmpl/prog/en/modules/members/member-password.tt   | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt      | 1 +
> .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt    | 1 +
> .../intranet-tmpl/prog/en/modules/members/members-update.tt    | 1 +
> .../intranet-tmpl/prog/en/modules/members/merge-patrons.tt     | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt  | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt     | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt         | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt  | 1 +
> .../prog/en/modules/members/purchase-suggestions.tt            | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt  | 1 +
> .../intranet-tmpl/prog/en/modules/members/recallshistory.tt    | 1 +
> .../intranet-tmpl/prog/en/modules/members/routing-lists.tt     | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt  | 1 +
> .../intranet-tmpl/prog/en/modules/members/two_factor_auth.tt   | 1 +
> .../intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt  | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt   | 1 +
> .../intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt  | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt   | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt  | 1 +
> .../intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt    | 1 +
> .../intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt   | 1 +
> .../intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt  | 1 +
> .../intranet-tmpl/prog/en/modules/patroncards/edit-template.tt | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt    | 1 +
> .../intranet-tmpl/prog/en/modules/patroncards/image-manage.tt  | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt  | 1 +
> .../intranet-tmpl/prog/en/modules/plugins/plugins-home.tt      | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt             | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt        | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt       | 1 +
> .../intranet-tmpl/prog/en/modules/recalls/recalls_old_queue.tt | 1 +
> .../intranet-tmpl/prog/en/modules/recalls/recalls_overdue.tt   | 1 +
> .../intranet-tmpl/prog/en/modules/recalls/recalls_queue.tt     | 1 +
> .../intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt   | 1 +
> .../intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt   | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/recalls/request.tt     | 1 +
> .../prog/en/modules/reports/acquisitions_stats.tt              | 1 +
> .../intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt    | 1 +
> .../intranet-tmpl/prog/en/modules/reports/borrowers_out.tt     | 1 +
> .../intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt   | 1 +
> .../prog/en/modules/reports/cash_register_stats.tt             | 1 +
> .../intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt    | 1 +
> .../intranet-tmpl/prog/en/modules/reports/catalogue_out.tt     | 1 +
> .../intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt   | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt  | 1 +
> .../prog/en/modules/reports/guided_reports_start.tt            | 1 +
> .../intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt  | 1 +
> .../intranet-tmpl/prog/en/modules/reports/issues_stats.tt      | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt   | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt   | 1 +
> .../intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt  | 1 +
> .../intranet-tmpl/prog/en/modules/reports/reports-home.tt      | 1 +
> .../intranet-tmpl/prog/en/modules/reports/reserves_stats.tt    | 1 +
> .../intranet-tmpl/prog/en/modules/reports/serials_stats.tt     | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt     | 1 +
> .../intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt    | 1 +
> .../prog/en/modules/rotating_collections/addItems.tt           | 1 +
> .../prog/en/modules/rotating_collections/editCollections.tt    | 1 +
> .../en/modules/rotating_collections/rotatingCollections.tt     | 1 +
> .../prog/en/modules/rotating_collections/transferCollection.tt | 1 +
> .../prog/en/modules/serials/acqui-search-result.tt             | 1 +
> .../intranet-tmpl/prog/en/modules/serials/checkexpiration.tt   | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt      | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt      | 1 +
> .../intranet-tmpl/prog/en/modules/serials/routing-preview.tt   | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt     | 1 +
> .../prog/en/modules/serials/serials-collection.tt              | 1 +
> .../intranet-tmpl/prog/en/modules/serials/serials-edit.tt      | 1 +
> .../intranet-tmpl/prog/en/modules/serials/serials-home.tt      | 1 +
> .../intranet-tmpl/prog/en/modules/serials/serials-search.tt    | 1 +
> .../intranet-tmpl/prog/en/modules/serials/subscription-add.tt  | 1 +
> .../prog/en/modules/serials/subscription-batchedit.tt          | 1 +
> .../prog/en/modules/serials/subscription-bib-search.tt         | 1 +
> .../prog/en/modules/serials/subscription-detail.tt             | 1 +
> .../prog/en/modules/serials/subscription-frequencies.tt        | 1 +
> .../prog/en/modules/serials/subscription-history.tt            | 1 +
> .../prog/en/modules/serials/subscription-numberpatterns.tt     | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt  | 1 +
> .../intranet-tmpl/prog/en/modules/suggestion/suggestion.tt     | 3 +++
> koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt           | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt         | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt  | 1 +
> .../intranet-tmpl/prog/en/modules/tools/additional-contents.tt | 1 +
> .../en/modules/tools/automatic_item_modification_by_age.tt     | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt  | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt      | 1 +
> .../prog/en/modules/tools/batch_delete_records.tt              | 1 +
> .../prog/en/modules/tools/batch_extend_due_dates.tt            | 1 +
> .../prog/en/modules/tools/batch_record_modification.tt         | 1 +
> .../intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt      | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt  | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt        | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt      | 1 +
> .../intranet-tmpl/prog/en/modules/tools/import_borrowers.tt    | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt     | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt        | 1 +
> .../intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt  | 1 +
> .../prog/en/modules/tools/marc_modification_templates.tt       | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt  | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt  | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/page.tt          | 1 +
> .../intranet-tmpl/prog/en/modules/tools/picture-upload.tt      | 1 +
> .../intranet-tmpl/prog/en/modules/tools/preview_letter.tt      | 1 +
> .../intranet-tmpl/prog/en/modules/tools/problem-reports.tt     | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt        | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt     | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt  | 1 +
> .../intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt   | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt    | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt        | 2 ++
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt       | 1 +
> .../intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt    | 1 +
> 298 files changed, 302 insertions(+)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
>index 2903094203b..ad96ee0af95 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
>@@ -23,6 +23,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-12">
>+            [% INCLUDE 'messages.inc' %]
> 
>             <h1>About Koha</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
>index de4aedbcd29..5924cc0472b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
>@@ -31,6 +31,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% INCLUDE 'acquisitions-toolbar.inc' %]
> 
>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 f79f8896f74..d9f2e10ca81 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>@@ -68,6 +68,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% IF (cannot_manage_basket) %]
>                     <div class="dialog alert">You are not authorised to manage this basket.</div>
>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 48824adea36..730d8a9711b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>@@ -48,6 +48,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% IF ( grouping ) %]
>                     [% IF (closedbg) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
>index 88bda81a430..8681745787c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
>@@ -49,6 +49,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+            [% INCLUDE 'messages.inc' %]
> 
>     [% IF ( add_form ) %]
>         [% IF ( basketno ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
>index fbf2d71fbee..cef856e4431 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
>@@ -38,6 +38,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% INCLUDE 'acquisitions-toolbar.inc' %]
> [% UNLESS ( count == 1 ) %]
>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 4098f2fe175..fe7e5439464 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt
>@@ -32,6 +32,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+            [% INCLUDE 'messages.inc' %]
> 
>       [% UNLESS ( confirmcancel ) %]
>       <form method="post" action="">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt
>index b8a04f11931..79aea17129d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt
>@@ -49,6 +49,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>Duplicate existing orders</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt
>index 77bb4d36095..22e4af5deb2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt
>@@ -29,6 +29,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>     <h1>Select the library account submitting the EDI order</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt
>index 7940e17a8ad..c256e154bc1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt
>@@ -35,6 +35,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> 
> <h1>EDIFACT messages</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt
>index edbf8228e50..67dd98afb24 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt
>@@ -28,6 +28,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>             <h1>EDIFACT message display</h1>
>                 <div id="edimsg">
>                     [% IF no_message %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
>index 45fb4ff1028..da3ae9312e7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
>@@ -48,6 +48,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 <h1>Order search</h1>
> 
>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 7411687e6fa..4a5477b8e41 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
>@@ -39,6 +39,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>       <h1>Files for invoice: [% invoicenumber | html %]</h1>
>       <p><strong>Vendor: </strong><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% suppliername | html %]</a></p>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
>index b93cc451128..7fa1d07b48f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
>@@ -48,6 +48,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 <h1>Invoice: [% invoicenumber | html %]</h1>
> 
>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 e88e29bde3a..5ee707ef362 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
>@@ -35,6 +35,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 <h1>Invoices</h1>
>                 [% IF ( do_search ) %]
>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 aa04abec747..25af559315e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
>@@ -35,6 +35,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>[% IF bookseller_filter %][% bookseller_filter.name | html %] : [% END %]Late orders</h1>
> <div id="acqui_lateorders" class="page-section">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt
>index b33e4fb4d7e..a0c1aaa6285 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt
>@@ -34,6 +34,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+            [% INCLUDE 'messages.inc' %]
> 
>       <h1>Change estimated delivery date</h1>
>       <form action="/cgi-bin/koha/acqui/moddeliverydate.pl" method="post">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt
>index dada233a8a9..2bbf17e99ad 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt
>@@ -40,6 +40,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+            [% INCLUDE 'messages.inc' %]
> 
>       [% IF (type == "vendor") %]
>           <h1>Change order vendor note (order no. [% ordernumber | html %])</h1>
>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 954ef814486..1b16962748d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
>@@ -263,6 +263,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>
>     [% IF ( ordernumber ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt
>index 157f722cc19..f906360cf26 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt
>@@ -33,6 +33,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <div class="dialog alert">
> <h1>Duplicate warning</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
>index 530035deb2d..7fec2b7c156 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
>@@ -40,6 +40,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>             <h1>Serials subscriptions</h1>
>             <div class="page-section">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
>index 84c6037dad5..834167e94a6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
>@@ -40,6 +40,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>Suggestions</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
>index 86516919652..cb34f83ca51 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
>@@ -34,6 +34,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>Ordered - Fund: [% fund_code | html %]</h1>
> 
>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 455cbb3056c..cfe5d7aede7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
>@@ -101,6 +101,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>Receive items from : [% name | html %] [% IF ( invoice ) %][[% invoice | html %]] [% END %] (order #[% multiple_orders | html %])</h1>
> [% SET only_one_order = ( multiple_orders.split(',').size == 1 ) %]
>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 c2eaea312ee..4e5a5a32e05 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>@@ -55,6 +55,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>     [% IF ( receive_error ) %]
>     <div class="dialog alert">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
>index 915bf002a57..318f15623fb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
>@@ -40,6 +40,7 @@
>             <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>         [% END %]
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> <h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a></h1>
> 
> [% IF ( error_failed_to_create_invoice ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
>index abb5b941ddc..75e58e86447 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
>@@ -34,6 +34,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>Spent - Fund: [% fund_code | html %]</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
>index 6aff9ea0ada..8dbbf43542d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
>@@ -191,6 +191,7 @@ div.rows { padding: 1rem; }
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>     [% IF ( enter ) %]
>         [% IF ( booksellerid ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
>index f5ead805071..2f0500941d4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
>@@ -46,6 +46,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% INCLUDE 'acquisitions-toolbar.inc' %]
>         [% IF ( validate ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt
>index 0a9de738a76..5507aaaa119 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt
>@@ -62,6 +62,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% FOR m IN messages %]
>     <div class="dialog [% m.type | html %]">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
>index a458291dbaf..14ebaa04ad6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
>@@ -82,6 +82,7 @@ tr.selected td {
> <div class="main container-fluid">
>       [% IF ( opsearch ) %]
>     <form method="post" action="z3950_search.pl" name="f" class="checkboxed">
>+            [% INCLUDE 'messages.inc' %]
>     <div class="row">
>     <div class="col-sm-6">
>     <h1>Order from external source</h1>
>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 a569c43fc8a..fd3392824b0 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
>@@ -79,6 +79,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>     [% IF op == 'list' %]
>         <div id="toolbar" class="btn-toolbar">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>index 790851940c5..4d66a5ccb36 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>@@ -25,6 +25,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+            [% INCLUDE 'messages.inc' %]
>         <h1>Koha administration</h1>
>             [% IF ( CAN_user_parameters_manage_mana ) %]
>                 [% IF ( Koha.Preference('Mana') == 1) && !mana_url %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt
>index 4b8428e395c..ff8d2333acf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt
>@@ -32,6 +32,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>                 <h1>Advanced editor keyboard shortcuts</h1>
>                 [% IF Koha.Preference('EnableAdvancedCatalogingEditor') %]
>                     <ul>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>index 84e44e25a09..e7ac7286c6a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>@@ -140,6 +140,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% UNLESS close_form OR closed OR duplicate_form %]
>   [% INCLUDE 'budgets-admin-toolbar.inc' %]
>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 fb1d387c166..c85e7cd6f0c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
>@@ -87,6 +87,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% UNLESS op == 'delete_confirm' %][% INCLUDE 'budgets-admin-toolbar.inc' %][% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
>index 4d3338e9a0e..a0ed2187f55 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
>@@ -92,6 +92,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% INCLUDE 'acquisitions-toolbar.inc' %]
> 
>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 25613238a50..5254ca69d57 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
>@@ -42,6 +42,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% INCLUDE 'budgets-admin-toolbar.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
>index 80f36551d1b..4adfa01082f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
>@@ -32,6 +32,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 <div id="toolbar" class="btn-toolbar">
>                     <a class="btn btn-default" id="newalert" href="/cgi-bin/koha/admin/audio_alerts.pl"><i class="fa fa-plus"></i> New alert</a>
>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 c7591dbdd18..dbb2f39baef 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
>@@ -74,6 +74,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% IF ( add_form ) %]
> 
>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 b967e80737b..c4d00d8aa11 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
>@@ -128,6 +128,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>Authority MARC framework for [% IF ( authtypecode ) %][% authtypecode | html %][% ELSE %]default framework[% END %]</h1>
> 
>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 436572b1b90..31edb4221ca 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
>@@ -108,6 +108,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% IF op == 'add_form' %]
>                     <h1>
>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 e0128143e96..f4f01aba95e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
>@@ -63,6 +63,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% FOR m IN messages %]
>     <div class="dialog [% m.type | html %]">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt
>index 49708ae6107..49cd6152012 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt
>@@ -52,6 +52,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% FOR m IN messages %]
>     <div class="dialog message">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
>index 6acf1b92cf9..f808cf212c1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
>@@ -65,6 +65,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% FOR m IN messages %]
>     <div class="dialog [% m.type | html %]">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
>index fb5b811c8e1..63261445844 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
>@@ -33,6 +33,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>     <h1>
>         [% tx("Library transfer limits for {library_name} ({library_code})", { library_name = Branches.GetName( branchcode), library_code = branchcode } ) | html %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>index 9f4b1e09e21..ca49a09d56f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>@@ -75,6 +75,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% FOREACH m IN messages %]
>     <div class="dialog [% m.type | html %]">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt
>index 2c5cf2236a3..b0993998ce1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt
>@@ -67,6 +67,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% FOREACH m IN messages %]
>                 <div class="dialog [% m.type | html %]">
>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 1e360ca394f..25bd7b6acf7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>@@ -88,6 +88,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% FOR m IN messages %]
>     <div class="dialog [% m.type | html %]">
>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 0dd34d64467..83b365184ac 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
>@@ -30,6 +30,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>MARC bibliographic framework test</h1>
> 
>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 c5b756a1253..ba80ebe1f1b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
>@@ -67,6 +67,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% FOR m IN messages %]
>     <div class="dialog [% m.type | html %]">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
>index e5a3981c912..eac396d9c88 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
>@@ -94,6 +94,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% FOR m IN messages %]
>     <div class="dialog [% m.type | html %]">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
>index ecc7b3b0db6..c3c1eefeef3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
>@@ -35,6 +35,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>     <h1>Cloning circulation and fine rules
>         [% IF frombranch == "*" %] from standard rules[% ELSIF frombranch %] from "[% Branches.GetName( frombranch ) | html %]"[% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
>index 526391b4bda..19c61db8f34 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
>@@ -206,6 +206,7 @@
>         <div class="row">
>                 <div class="col-sm-10 col-sm-push-2">
>                         <main>
>+                            [% INCLUDE 'messages.inc' %]
> 
>                             <h1>Table settings</h1>
>                             <div class="panel-group" id="modules" role="tablist" aria-multiselectable="true">
>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 bba0dcb8b1d..72de2899c2c 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
>@@ -57,6 +57,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% FOREACH m IN messages %]
>                 <div class="dialog [% m.type | html %]">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt
>index 85743caf236..eb38ac8b11d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt
>@@ -44,6 +44,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% FOR m IN messages %]
>     <div class="dialog [% m.type | html %]">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
>index 83644f7133b..3bc6e4e4738 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
>@@ -68,6 +68,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% IF op == 'list' %]
> <div id="toolbar" class="btn-toolbar">
>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 c28a95cc8e9..1c1f23bb192 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
>@@ -56,6 +56,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% FOREACH m IN messages %]
>                 <div class="dialog [% m.type | html %]">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt
>index 62ee07a5288..b8a3b8c6970 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt
>@@ -66,6 +66,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% FOR m IN messages %]
>     <div class="dialog [% m.type | html %]">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt
>index eed01c96621..b1cea02780d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt
>@@ -52,6 +52,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>         <h1>Did you mean?</h1>
>         <noscript><div class="dialog alert"><strong>Please enable Javascript:</strong>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
>index 9ca20268fe2..c6703c1eb8a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
>@@ -65,6 +65,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> 
> [% UNLESS Koha.Preference('EDIFACT') %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
>index 9ece1370357..023ce897b64 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
>@@ -63,6 +63,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% IF display %]
>     <div id="toolbar" class="btn-toolbar">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt
>index eb58e7b7df1..05f173752fb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt
>@@ -60,6 +60,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% FOREACH m IN messages %]
>     <div class="dialog [% m.type | html %]" id="identity_provider_domain_action_result_dialog">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt
>index 239c1166933..3d9afbc112b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt
>@@ -56,6 +56,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% FOREACH m IN messages %]
>     <div class="dialog [% m.type | html %]" id="identity_provider_action_result_dialog">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
>index 9a3a0d86239..f5308202bd6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
>@@ -69,6 +69,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>                 <div class="row">
>                     <div class="col-sm-6">
> <h1>Item circulation alerts</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
>index 564fa8a2639..bfe043b7ac1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
>@@ -43,6 +43,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
> 
>                     <h1>Item search field: [% field.label | html %]</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
>index 000cc01017b..a49cc98ef78 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
>@@ -35,6 +35,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
> 
>                     <div id="toolbar" class="btn-toolbar">
>                         <a class="btn btn-default" id="new_search_field" href="/cgi-bin/koha/admin/items_search_fields.pl"><i class="fa fa-plus"></i> New search field</a>
>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 5a093affbe9..e0764e6f8c5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
>@@ -111,6 +111,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% IF op == 'list' %]<div id="toolbar" class="btn-toolbar">
>     <a class="btn btn-default" id="newitemtype" href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form"><i class="fa fa-plus"></i> New item type</a>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
>index 70976c367f9..4c5ff41646a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
>@@ -31,6 +31,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>Koha to MARC mapping</h1>
> <br/>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
>index c179ec4e1a5..19e8f1e0b0e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
>@@ -66,6 +66,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                     <div id="toolbar" class="btn-toolbar">
>                         <div class="btn-group">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt
>index 8a6f1d89731..2af91bd8f5e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt
>@@ -42,6 +42,7 @@
>     <div class="main container-fluid">
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>+                [% INCLUDE 'messages.inc' %]
> 
>                 <h1>Manage MARC overlay rules</h1>
> 
>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 7bf53635304..a427d2e9e95 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
>@@ -97,6 +97,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
> 
>                     [% IF ( add_form ) %]
>                         <h1>
>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 6568a2070fc..262bb9fa50d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
>@@ -101,6 +101,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% IF ( else ) %]
> <div id="toolbar" class="btn-toolbar">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
>index 0c1e2922155..e2db6e16860 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
>@@ -105,6 +105,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% IF ( matching_rule_form ) %]
>                     [% IF ( edit_matching_rule ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
>index cd7c46481a6..1cb6a83f98d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
>@@ -35,6 +35,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>       [% IF ( mappings_saved ) %]
>         <div class="dialog message">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
>index 8a82e5f44db..7c789a7d6af 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
>@@ -55,6 +55,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>         [% IF ( op_new || op_mod ) %]
>             <form method="post" action="/cgi-bin/koha/admin/oai_sets.pl" class="validated">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt
>index 8aec826fe6f..14c9b45b145 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt
>@@ -34,6 +34,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 <h1>OverDrive library authnames</h1>
> 
>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 2129798b317..96e7b4ecdd8 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
>@@ -68,6 +68,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% IF ( WARNING_extended_attributes_off ) %]
> <div class="dialog message">Because the 'ExtendedPatronAttributes` system preference is currently not enabled, extended patron attributes cannot be given to patron records.  <br/>Go to the <a href="/cgi-bin/koha/admin/preferences.pl?op=search&amp;searchfield=ExtendedPatronAttributes">ExtendedPatronAttributes</a> system preference if you wish to enable this feature.</div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
>index 4c8f1cefc9a..beab889b8c2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
>@@ -38,6 +38,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>     [% IF ( jump_not_found ) %]
>     <div class="dialog alert">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
>index dd530d964f8..54f44251330 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
>@@ -67,6 +67,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% FOR m IN messages %]
>     <div class="dialog message [% m.code | html %]">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/search_filters.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/search_filters.tt
>index 0777c168cc9..7bd1596348a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/search_filters.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/search_filters.tt
>@@ -31,6 +31,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>         [% IF filters_count %]
>             <div id="search_filters_list">
>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 eec93177705..7bf27446875 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
>@@ -36,6 +36,7 @@ a.add, a.delete {
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>     [% FOR m IN messages %]
>       <div class="dialog [% m.type | html %]">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
>index f7228989560..8d4846cc961 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
>@@ -31,6 +31,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>+            [% INCLUDE 'messages.inc' %]
>             <div class="col-sm-6">
>                 [% IF result.code != 201 && result.msg %]
>                     <div class="dialog alert" role="alert">
>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 96ec772e940..3598e6c3d5e 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
>@@ -53,6 +53,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>                 <h1 class="parameters">
>                     [% IF humanbranch %]
>                         Defining circulation and fine rules for "[% Branches.GetName( humanbranch ) | html %]"
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt
>index 716c5342987..811582ae79f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt
>@@ -31,6 +31,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 <div id="toolbar" class="btn-toolbar">
>                     <a class="btn btn-default" id="new_provider" href="#"><i class="fa fa-plus"></i> New SMS provider</a>
>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 beefae38598..06bed08b4c1 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
>@@ -55,6 +55,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% FOREACH m IN messages %]
>     <div class="dialog [% m.type | html %]" id="smtp_action_result_dialog">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt
>index e06d1c2be6b..3b44c668ff8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt
>@@ -17,6 +17,7 @@
> <div class="main container-fluid">
> 
>     <main>
>+        [% INCLUDE 'messages.inc' %]
>         <h1>SRU search field mapping for bibliographic records</h1>
> 
>         <form id="form01" method="post">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt
>index 7c12e278d05..41132e39422 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt
>@@ -15,6 +15,7 @@
> <div class="main container-fluid">
> 
>     <main>
>+        [% INCLUDE 'messages.inc' %]
>         <h1>SRU search field mapping for authorities</h1>
>         <form id="form01" method="post">
>             <fieldset class="rows">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
>index cc1d9063a5f..b46257951d8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
>@@ -79,6 +79,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% IF ( add_form ) %]
>         <h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt
>index b400bb7a934..a9d047f6648 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt
>@@ -40,6 +40,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>                 <h1>Library transfer limits</h1>
> 
>                 <p>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
>index c4bec409555..0fb56f49e62 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
>@@ -37,6 +37,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>     <h1 class="parameters">
>         Transport cost matrix
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
>index a6630da114e..b445760f0a2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
>@@ -35,6 +35,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% FOR m IN messages %]
>     <div class="dialog [% m.type | html %]">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
>index 8167404fdc9..809bedab1d4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
>@@ -69,6 +69,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% IF msg_deleted %]
>     <div class="dialog alert">Z39.50/SRU server deleted ([% msg_add | html %])</div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>index e87cb438c4c..452040e00d2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>@@ -27,6 +27,7 @@
> <div class="main container-fluid">
> 
> <div id="login">
>+            [% INCLUDE 'messages.inc' %]
> <h1><a href="http://koha-community.org">Koha</a></h1>
> [% IF (Koha.Preference('StaffLoginInstructions')) %]<div id="login_instructions">[% Koha.Preference('StaffLoginInstructions') | $raw %]</div>[% END %]
> [% IF ( nopermission ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt
>index 5e6933caea9..3d05f3c7b37 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt
>@@ -25,6 +25,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-8 col-md-offset-2">
>+            [% INCLUDE 'messages.inc' %]
> 
>     [% INCLUDE 'authorities-toolbar.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
>index 689d62857aa..b1fc355a9a6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
>@@ -389,6 +389,7 @@
>     <div class="main container-fluid">
>         <div class="row">
>             <div class="col-md-10 col-md-offset-1">
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% IF ( authid ) %]
>                     <h1>Modify authority #[% authid | html %] [% authtypetext | html %]</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt
>index 2c1d6ae4f7e..84268c6cb5f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt
>@@ -14,6 +14,7 @@
>     <div class="main container-fluid">
>         <div class="row">
>             <div class="col-md-8 col-md-offset-2">
>+                [% INCLUDE 'messages.inc' %]
> 
>         <div id="loading"> <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading </div>
> 
>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 2392e86dff8..db2f35922b6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
>@@ -44,6 +44,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-8 col-md-offset-2">
>+            [% INCLUDE 'messages.inc' %]
> 
>             [% INCLUDE 'authorities-toolbar.inc' %]
> 
>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 cc2e0ffee66..7088b236b83 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
>@@ -37,6 +37,7 @@ div#result { margin-top: 1em; }
>     <div class="row">
>         <div class="col-md-8 col-md-offset-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>Merging records</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
>index 6d5baf41e43..4862e5e81ce 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
>@@ -42,6 +42,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-8 col-md-offset-2">
>+            [% INCLUDE 'messages.inc' %]
> 
>     [% INCLUDE 'authorities-toolbar.inc' %]
> <h1>Authority search results</h1>
>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 85cf354cd27..9595ce68d37 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
>@@ -36,6 +36,7 @@
>     <div class="main container-fluid">
>         <div class="row">
>             <div class="col-md-12">
>+                [% INCLUDE 'messages.inc' %]
> 
>                 <div class="container">
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
>index 479aad0d43e..42960de8dce 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
>@@ -43,6 +43,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>             [% INCLUDE 'cat-toolbar.inc' %]
>                 <h1>
>                     [% IF ( unknownbiblionumber ) %]
>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 c5db687dc91..35d0a5df7d2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
>@@ -44,6 +44,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% IF ( unknownbiblionumber ) %]
>     <h1>Unknown record</h1>
>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 d7b340b58a2..850337c8135 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
>@@ -41,6 +41,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+            [% INCLUDE 'messages.inc' %]
> 
>             <form action="search.pl" method="get">
>                 <div id="advanced-search">
>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 fe07a4345cc..7a0af92bd9f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>@@ -77,6 +77,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>                 <div class="row">
> 
> [% IF ( unknownbiblionumber ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt
>index 4cd3f0d5e9b..2bede4c5107 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt
>@@ -46,6 +46,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% INCLUDE 'cat-toolbar.inc' %]
> 
>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 ba2c56a392b..54d076fb271 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
>@@ -34,6 +34,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>Checkout history for [% INCLUDE 'biblio-title.inc' %]</h1>
> [% IF biblio.author %]<h3>by [% biblio.author | html %]</h3>[% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
>index 402001d33db..76760e8cd2c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
>@@ -166,6 +166,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+            [% INCLUDE 'messages.inc' %]
> 
>     <div id="item-search-block">
>       <h1>Item search</h1>
>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 b8aff7b211d..8f87a85197d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
>@@ -39,6 +39,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>     [% IF ( unknownbiblionumber ) %]
>         <div class="dialog message">The record you requested does not exist ([% biblionumber | html %]).</div>
>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 4ff7adc54e4..b986aeedce0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
>@@ -34,6 +34,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 <h1>Item details for [% INCLUDE 'biblio-title-head.inc' %]</h1>
> 
>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 231eec76d37..00985866894 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>@@ -50,6 +50,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>             <h1>Search results</h1>
> 
>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 8fbf62a7835..206c9b7fa5a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
>@@ -31,6 +31,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <div id="catalogue_detail_biblio">
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>index 787d19cb566..7800b36f9c7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>@@ -836,6 +836,7 @@ $(document).ready(function(){
>     <div class="main container-fluid">
>         <div class="row">
>             <div class="col-md-10 col-md-offset-1">
>+                [% INCLUDE 'messages.inc' %]
> 
>                 <div id="check_errors"></div>
> 
>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 1c68a871ac8..598ec9d05dc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
>@@ -48,6 +48,7 @@
>     <div class="main container-fluid">
>         <div class="row">
>             <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
>                     <div id="toolbar" class="btn-toolbar">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
>index d40e157eb82..b24d4e57a36 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
>@@ -69,6 +69,7 @@
>     <div class="row">
>         <div class="col-sm-12">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>                 [% IF item_doesnt_exist %]
>                     <div class="dialog alert">
>                         <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblio.biblionumber | uri %]">Add a new item</a> or <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]#holdings">go to the records holdings</a>.
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt
>index 9ba30c5aa16..fbf61da2bac 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt
>@@ -27,6 +27,7 @@
>     <div class="main container-fluid">
>         <div class="row">
>             <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+                [% INCLUDE 'messages.inc' %]
>                 [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
>                 <div id="toolbar" class="btn-toolbar">
>                     [% IF Koha.Preference( 'EnableAdvancedCatalogingEditor' ) == 1 && CAN_user_editcatalogue_advanced_editor %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt
>index 2a9336cc29b..c7b23e8204a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt
>@@ -36,6 +36,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
>                     <h1>Concerns</h1>
> 
>                     <div class="page-section">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
>index 1824673fc2b..a04b92fabc1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
>@@ -40,6 +40,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1 id="title">Cataloging editor</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
>index 9ed117f7c62..a0065df10d0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
>@@ -37,6 +37,7 @@ div#result { margin-top: 1em; }
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+            [% INCLUDE 'messages.inc' %]
> 
> <h1>Merging records</h1>
> [% IF ( result ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt
>index 175e731ac04..b1bf1968eee 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt
>@@ -31,6 +31,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+            [% INCLUDE 'messages.inc' %]
> 
>         <h1>Attach an item [% IF ( biblio.title ) %] to [% INCLUDE 'biblio-title.inc' %][% END %]</h1>
> [% BLOCK actions %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt
>index 4d22de2bde4..d46cdf51d62 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt
>@@ -18,6 +18,7 @@
>     <div class="main container-fluid">
> [% UNLESS ( popup ) %]
> [% INCLUDE 'header.inc' %]
>+                [% INCLUDE 'messages.inc' %]
> [% INCLUDE 'cat-search.inc' %]
> [% END %]
> 
>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 0cfcab953a2..ee735fb05ea 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
>@@ -152,6 +152,7 @@
>     <div class="main container-fluid starthidden">
>         <div class="row">
> 
>+                [% INCLUDE 'messages.inc' %]
>             [% IF Koha.Preference('CircSidebar') %]
>             <div class="col-sm-10 col-sm-push-2">
>             [% ELSE %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
>index c87eb61eabc..25f70ed546b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
>@@ -45,6 +45,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 <h1>
>                     [% IF ( author ) %]
>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 d631828b696..56fa9b1f603 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
>@@ -36,6 +36,7 @@
>             <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>         [% END %]
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>Circulation: Overdues at [% Branches.GetLoggedInBranchname | html %]</h1>
> 
>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 73570f27507..84aa3ce71a9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
>@@ -37,6 +37,7 @@
>             <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>         [% END %]
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>             <h1>Transfer items</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
>index 04a5dbcc801..dbcbaacfc32 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
>@@ -35,6 +35,7 @@
>     <div class="row">
>         <div class="col-sm-12">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>                 <div class="row">
> 
>                 [% IF Koha.Preference('CircSidebar') %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
>index f6dab7a0136..f7f0cf02605 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
>@@ -25,6 +25,7 @@
>     <div class="main container-fluid">
> 
>         <h1>Circulation</h1>
>+                [% INCLUDE 'messages.inc' %]
> 
>         <div class="row">
> 
>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 3388e387a53..d8c1ff0a82e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -53,6 +53,7 @@
> 
>     <div class="main container-fluid">
>         <main>
>+            [% INCLUDE 'messages.inc' %]
>             <div class="row">
>                 <div class="col-sm-10 col-sm-push-2">
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
>index f9f31a02129..14f16430760 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
>@@ -50,6 +50,7 @@
>             <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>         [% END %]
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>             <h1>Batch check out</h1>
> 
> [% IF patron %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
>index 962002e704a..443f7bf2deb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
>@@ -85,6 +85,7 @@
>     <div class="row">
>         <div class="col-sm-12">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>                 <div class="row">
>                 [% IF Koha.Preference('CircSidebar') %]
>                     <div class="col-sm-10 col-sm-push-2">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
>index 0cc609f443b..c4a41f22a21 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
>@@ -35,6 +35,7 @@
>     <div class="row">
>         <div class="col-sm-12">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>                 <div class="row">
> 
>                 [% IF Koha.Preference('CircSidebar') %]
>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 530e1d1e2d5..4ed67ec66f5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>@@ -56,6 +56,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% IF ( noreport ) %]
>   <h1>Overdue report</h1>
>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 8c47fe74f20..24faa979405 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>@@ -37,6 +37,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>         [% FOR m IN messages %]
>             <div class="dialog [% m.type | html %]">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
>index d3c48b93973..080c4a647ef 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
>@@ -35,6 +35,7 @@
>     <div class="row">
>         <div class="col-sm-12">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>                 <div class="row">
> 
>                 [% IF Koha.Preference('CircSidebar') %]
>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 fc55f3a697c..6dc82fcaf28 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
>@@ -92,6 +92,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                     <h1>Request article from [% INCLUDE 'biblio-title.inc' link = 1 %]</h1>
>                     [% IF error_message %]
>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 222f695d0eb..a480acab732 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
>@@ -41,6 +41,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>Hold ratios to calculate items needed</h1>
>    <h3>Calculated on [% todaysdate | $KohaDates %]. From [% from | $KohaDates %]
>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 b15efad24f5..1e47e5c75cd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>@@ -59,6 +59,7 @@
>         <div class="row">
>             <div class="col-sm-12">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
>                     <div class="row">
> 
>                         [% IF Koha.Preference('CircSidebar') %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
>index 4cb3da7fbe3..8f401a11d87 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
>@@ -41,6 +41,7 @@
>     <div class="row">
>         <div class="col-sm-12">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>                 <div class="row">
> 
>                 [% IF Koha.Preference('CircSidebar') %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt
>index afc08bff336..a848e527c83 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt
>@@ -36,6 +36,7 @@
>     <div class="row">
>         <div class="col-sm-12">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>                 <div class="row">
> 
>                     [% IF Koha.Preference('CircSidebar') %]
>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 dd410b59f2b..533ff9a510d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
>@@ -34,6 +34,7 @@
>     <div class="row">
>         <div class="col-sm-12">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>                 <div class="row">
> 
>                 [% IF Koha.Preference('CircSidebar') %]
>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 837d6e5ecc0..73ba26575fe 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
>@@ -49,6 +49,7 @@
>     <div class="row">
>         <div class="col-sm-12">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>                 <div class="row">
> 
>                 [% IF ( total || Koha.Preference('CircSidebar') ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
>index 45c8d1414be..758c172d2e4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
>@@ -36,6 +36,7 @@
>     <div class="row">
>         <div class="col-sm-12">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>                 <div class="row">
> 
>                     [% IF Koha.Preference('CircSidebar') %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt
>index 8bd3e534dab..0a7f54cfbeb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt
>@@ -34,6 +34,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>                 [% IF !club %]
>                 <div class="dialog message">The club you requested does not exist.</div>
>                 [% ELSE %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt
>index ebbb27897ad..5c39205009d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt
>@@ -41,6 +41,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-8 col-md-offset-2">
>+            [% INCLUDE 'messages.inc' %]
> 
>             <form method="post" class="validated">
>                 <input type="hidden" name="id" value="[% club.id | html %]" />
>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 dd7c26a7813..454a643b0c4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt
>@@ -30,6 +30,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 <h1>Patron clubs</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt
>index bb4d3e57382..4a0f0014a33 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt
>@@ -46,6 +46,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-8 col-md-offset-2">
>+            [% INCLUDE 'messages.inc' %]
> 
>             <form method="post" class="validated">
>                 <input type="hidden" name="id" value="[% club_template.id | html %]" />
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt
>index cbf154227b6..0eec76dc0b4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt
>@@ -33,6 +33,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-8 col-md-offset-2">
>+            [% INCLUDE 'messages.inc' %]
>             <h1>Add reserves for <em>[% course.course_name | html %]</em></h1>
> 
>         [% IF ERROR_ITEM_NOT_FOUND %]
>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 284fd5acd6d..18b1b9c3be5 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
>@@ -45,6 +45,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-8 col-md-offset-2">
>+            [% INCLUDE 'messages.inc' %]
>             <h1>
>                 [% IF is_edit || course_reserve %]<span>Edit</span> [% ELSE %]<span>Reserve</span> [% END %]<em>[% biblio.title | html %]</em> for <em>[% course.course_name | html %]</em>
>             </h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt
>index 4735ae20f36..0ecc016d2e8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt
>@@ -37,6 +37,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-8 col-md-offset-2">
>+            [% INCLUDE 'messages.inc' %]
>             <h1>Add reserves for <em>[% course.course_name | html %]</em></h1>
>         [% IF action == 'invalid_course' %]
>             <div id="invalid-course-error" class="dialog alert">Invalid course!</div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt
>index b390d5e755a..a9d0ae5bc44 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt
>@@ -30,6 +30,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-8 col-md-offset-2">
>+            [% INCLUDE 'messages.inc' %]
>             <h1>Batch remove reserves</h1>
>         [% IF action == 'display_form' %]
>             <form method="post" action="/cgi-bin/koha/course_reserves/batch_rm_items.pl">
>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 12d52116322..0b0a78e3f0f 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
>@@ -50,6 +50,7 @@
>     <div class="main container-fluid">
>         <div class="row">
>             <div class="col-md-10 col-md-offset-1">
>+                [% INCLUDE 'messages.inc' %]
> 
>             <h1>Reserves</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt
>index 28e62682818..0154ca7660e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt
>@@ -30,6 +30,7 @@
>     <div class="main container-fluid">
>         <div class="row">
>             <div class="col-md-10 col-md-offset-1">
>+                [% INCLUDE 'messages.inc' %]
> 
>                     [% IF CAN_user_coursereserves_add_reserves OR CAN_user_coursereserves_manage_courses OR CAN_user_coursereserves_manage_courses OR CAN_user_coursereserves_delete_reserves %]
>                     <div id="toolbar">
>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 b74f4b37a76..aafe826931e 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
>@@ -49,6 +49,7 @@
>     <div class="main container-fluid">
>         <div class="row">
>             <div class="col-md-8 col-md-offset-2">
>+                [% INCLUDE 'messages.inc' %]
>                 <h1>
>                     [% IF course_name %]
>                         <span>Edit [% course_name | html | $HtmlTags tag="em" %]</span>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt
>index 036f858fc12..abfdca22cb1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt
>@@ -27,6 +27,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-8 col-md-offset-2">
>+            [% INCLUDE 'messages.inc' %]
> 
>             <div class="dialog alert">
>                 <h1>Invalid course!</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt
>index 0d5e45b90ed..114616119c0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt
>@@ -22,6 +22,7 @@
>     <div class="main container-fluid">
>         <div class="row">
>             <div class="col-md-8 col-md-offset-2">
>+                [% INCLUDE 'messages.inc' %]
> 
>     <h1>An error has occurred!</h1>
>     <h2><em>Error [% errno | html %]</em></h2>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>index ce60d1fb23b..9b2872de8a6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>@@ -115,9 +115,11 @@
>             </div> 
>             <div class="col-sm-10">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
>         [% ELSE %]
>             <div class="col-sm-10 col-sm-offset-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
>         [% END %]
>             <div id="interlibraryloans">
>         [% IF !backends_available || !has_branch %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt
>index e2e7d0ebb43..079253c392e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt
>@@ -59,6 +59,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>                 <h2>Barcode image generator</h2>
> 
>                 <form action="/cgi-bin/koha/svc/barcode" method="post" id="barcodegen">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
>index cae46b81a4e..b43f4fba227 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
>@@ -39,6 +39,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
> 
>                         [% INCLUDE 'labels-toolbar.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
>index 6dbf2d80312..183b7ce3ae5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
>@@ -51,6 +51,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
> 
>                     [% INCLUDE 'labels-toolbar.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt
>index 9be72df403c..a64fd4f6432 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt
>@@ -35,6 +35,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
> 
>                     [% INCLUDE 'labels-toolbar.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt
>index e15fe31d4fa..63b13a36535 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt
>@@ -28,6 +28,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
>                     [% INCLUDE 'labels-toolbar.inc' %]
>                     <h1>Print barcode range</h1>
>                     <form name="add_by_number" action="/cgi-bin/koha/labels/label-edit-batch.pl" method="post">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt
>index 5ee5b03c7d4..8103ee093dc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt
>@@ -35,6 +35,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
>                     [% INCLUDE 'labels-toolbar.inc' %]
> 
>                     [% IF ( template_id ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt
>index 57a77ee233c..7f480a1aece 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt
>@@ -25,6 +25,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>                 [% INCLUDE 'labels-toolbar.inc' %]
>                 <h1>Label creator</h1>
>             </main>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt
>index 6819ec064b7..09b1e7a6bd3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt
>@@ -42,6 +42,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
> 
>                     [% INCLUDE 'labels-toolbar.inc' %]
>                     <h1>Manage labels</h1>
>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 04d910c739a..572d93e3606 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
>@@ -10,6 +10,7 @@
>     <div class="main container-fluid">
>         <h1>Label printing/exporting</h1>
>         [% IF ( batches ) %]
>+                [% INCLUDE 'messages.inc' %]
>             <form>
>                 <h3>Click on the following links to download the exported batch(es).</h3>
>                 [% IF warn_empty_range %]
>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 a8d3f3a4a3e..63a1cc00fdf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
>@@ -31,6 +31,7 @@
>     <div class="main container-fluid">
>         <h1>Search results</h1>
>         [% IF ( results ) %]
>+                [% INCLUDE 'messages.inc' %]
>             <h3>Results [% from | html %] through [% to | html %] [% IF ( total ) %] of [% total | html %][% END %]</h3>
>         [% ELSE %]
>             <h3>No results found</h3>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt
>index edf948b8024..dc0de159fb9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt
>@@ -8,6 +8,7 @@
>     <div class="main container-fluid">
> 
> <h1>Search for items
>+                [% INCLUDE 'messages.inc' %]
> [% IF ( batch_id ) %]
> to add to Batch [% batch_id | html %]
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
>index 3b400b0e0c2..991366edc3e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
>@@ -25,6 +25,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>Quick spine label creator</h1>
>                 <form action="/cgi-bin/koha/labels/spinelabel-print.pl" method="post" id="spinelabelprint">
>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 894e712799f..03f47c0cc7b 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
>@@ -59,6 +59,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>             [% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt
>index 1471572aa22..c395de294f2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt
>@@ -34,6 +34,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% INCLUDE 'members-toolbar.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>index ca7d032358c..337ed1b6e1f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>@@ -46,6 +46,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>             [% IF receipt_sent == '1' %]
>             <div id="receipt_sent_dialog" class="dialog message">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt
>index db5ab432619..ed4f4e73c6d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt
>@@ -35,6 +35,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>     [% INCLUDE 'members-toolbar.inc' %]
>     [% IF ItemsOnIssues || debits || is_guarantor %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
>index f45c8f9b5e0..7c8868b2406 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
>@@ -38,6 +38,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% INCLUDE 'members-toolbar.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt
>index f9190e3e0dd..974677156a4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt
>@@ -31,6 +31,7 @@
>     <div class="main container-fluid">
>         <div class="row">
>             <div class="col-md-8 col-md-offset-2">
>+                [% INCLUDE 'messages.inc' %]
> 
>     [% IF pending_discharges %]
>       <h1>Pending discharge requests</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
>index 7192a62d207..a9bd9564982 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
>@@ -37,6 +37,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% INCLUDE 'members-toolbar.inc' %]
> 
>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 8acf414340d..95b78c8ea0e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt
>@@ -40,6 +40,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% INCLUDE 'members-toolbar.inc' %]
> <h1>Holds history</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
>index 23775159b6c..8b7e54d8da9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
>@@ -82,6 +82,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% INCLUDE 'members-toolbar.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt
>index cea915d5953..e8792dd5f73 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt
>@@ -41,6 +41,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>                 [% INCLUDE 'members-toolbar.inc' %]
>                 <h1>ILL requests history</h1>
>                 <div class="page-section">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
>index 7493987d219..6c1914015bf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
>@@ -39,6 +39,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>             [% INCLUDE 'members-toolbar.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
>index 8113199b46e..43f3d8f8175 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
>@@ -38,6 +38,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> 
>             [% INCLUDE 'members-toolbar.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt
>index e7deafe7613..388db1c9091 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt
>@@ -36,6 +36,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% INCLUDE 'members-toolbar.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
>index 92020ee74b7..d924889e388 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
>@@ -44,6 +44,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% INCLUDE 'members-toolbar.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
>index 48cdbf6b25e..0890c99d06c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
>@@ -40,6 +40,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>           [% IF CAN_user_tools_manage_patron_lists %]
>             <div id="patron_list_dialog" class="dialog message">
>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 ed494bab10e..edd897acec5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>@@ -85,6 +85,7 @@ legend:hover {
>                 <div class="col-sm-10 col-sm-push-2">
>             [% END %]
>                 <main class="clearfix">
>+                    [% INCLUDE 'messages.inc' %]
> 
>                     [% IF error_alert %]
>                         [% IF ( error_alert == "no_email" ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
>index c5ea3677cb7..9ea7874ba6d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
>@@ -110,6 +110,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-8 col-md-offset-2">
>+            [% INCLUDE 'messages.inc' %]
> 
>             <h1>Update patron records</h1>
>             [% IF PendingModifications %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
>index c3ac7a4e58b..bdebabfb6e1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
>@@ -99,6 +99,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+            [% INCLUDE 'messages.inc' %]
>             <h1>Merge patron records</h1>
> 
>             [% IF action == 'show' %]
>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 639d2a65479..aee789dd995 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -51,6 +51,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
> 
> 
>                     [% INCLUDE 'members-toolbar.inc' %]
>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 d231e610c44..23420af0043 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
>@@ -43,6 +43,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
> 
>                     [% INCLUDE 'members-toolbar.inc' %]
>                     <h1>Sent notices for [% INCLUDE 'patron-title.inc' %]</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
>index d60d910ad5f..1cfdc154070 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
>@@ -43,6 +43,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
> 
>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 0c67b299ad6..83218e24b55 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>@@ -74,6 +74,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>             <h1>
>                 [% IF ( pay_individual ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
>index 1a715eb4160..de97861cf72 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
>@@ -38,6 +38,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% INCLUDE 'members-toolbar.inc' %]
>                 <h1>Purchase suggestions</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>index a872b6f79fe..1d5d4cc3990 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>@@ -39,6 +39,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% INCLUDE 'members-toolbar.inc' %]
> <h1>Circulation history</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt
>index 1e7d0deb593..cb4acf556e5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt
>@@ -27,6 +27,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
>                     [% INCLUDE 'members-toolbar.inc' %]
>                     <h1>Recalls history</h1>
>                     [% IF Koha.Preference('UseRecalls') %]
>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 ecbb11b7646..0da004e383b 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
>@@ -37,6 +37,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% INCLUDE 'members-toolbar.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt
>index e3cf8a53ecb..228b8f6ad7d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt
>@@ -39,6 +39,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>         [% INCLUDE 'members-toolbar.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt
>index 274cafcb5db..426c747589f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt
>@@ -35,6 +35,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% INCLUDE 'members-toolbar.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt
>index 05b7cfd2c3c..eac6c230ff3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt
>@@ -32,6 +32,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+            [% INCLUDE 'messages.inc' %]
> 
>             <h1>Koha offline circulation</h1>
>             <div class="page-section">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt
>index 77b88a7ce42..5cba158c4c3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt
>@@ -38,6 +38,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+            [% INCLUDE 'messages.inc' %]
> 
>         <h1>Offline circulation</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
>index cf392039fe2..dbd9e4400cf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
>@@ -49,6 +49,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+            [% INCLUDE 'messages.inc' %]
> 
> [% IF ( transactions_loaded ) %]
>   <h1>Koha offline circulation</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
>index be8c885b878..94a331704c6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
>@@ -57,6 +57,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>         <h1>[% list.name | html %]</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
>index 2404e9cd07b..260f6598525 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
>@@ -32,6 +32,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>         <div id="toolbar" class="btn-toolbar">
>             <div class="btn-group">
>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 49810c17ee1..08d7ec34c7b 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
>@@ -38,6 +38,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
> 
>                     [% INCLUDE 'patroncards-toolbar.inc' %]
> 
>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 5ab532b15eb..e5a61bcce4c 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
>@@ -35,6 +35,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
> 
>                     [% INCLUDE 'patroncards-toolbar.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt
>index 0d96f487459..e849ffce751 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt
>@@ -35,6 +35,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
> 
>                     [% INCLUDE 'patroncards-toolbar.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt
>index 8accfe9daee..05c2a6f92ed 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt
>@@ -36,6 +36,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
> 
>                     [% INCLUDE 'patroncards-toolbar.inc' %]
>                     <h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt
>index 1c47375bc92..0897452a06a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt
>@@ -23,6 +23,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% INCLUDE 'patroncards-toolbar.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
>index 7c9c49d79b5..152738c6dd2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
>@@ -29,6 +29,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% INCLUDE 'patroncards-toolbar.inc' %]
>                 <h1>Image manager</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
>index 3f583c4e66d..517bfa21db6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
>@@ -51,6 +51,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
> 
>                     [% INCLUDE 'patroncards-toolbar.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
>index 1ee0768912b..c947efc7e44 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
>@@ -40,6 +40,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>                     <h1>Plugins</h1>
> 
>                 <div class="details">
>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 0b97e033037..3e0748b86bb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
>@@ -32,6 +32,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-10 col-md-push-2">
>+            [% INCLUDE 'messages.inc' %]
> 
>             <h1>Point of sale</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
>index bb00da9cc2c..ae73cec7ae5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
>@@ -32,6 +32,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>+            [% INCLUDE 'messages.inc' %]
> 
>             [% IF ( error_registers ) %]
>                 <div id="error_message" class="dialog message">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
>index 61a053e9875..f3c70c09be1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
>@@ -30,6 +30,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
>                     [% IF ( error_registers ) %]
>                         <div id="error_message" class="dialog message">
>                             <p>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_old_queue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_old_queue.tt
>index 410363fd272..69cbfbd7dcb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_old_queue.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_old_queue.tt
>@@ -36,6 +36,7 @@
>             <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>         [% END %]
>         <main>
>+            [% INCLUDE 'messages.inc' %]
> 
>         <h1>Old recalls</h1>
>         [% IF Koha.Preference('UseRecalls') %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_overdue.tt
>index 68a98664aaf..54e5820321d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_overdue.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_overdue.tt
>@@ -36,6 +36,7 @@
>             <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>         [% END %]
>         <main>
>+            [% INCLUDE 'messages.inc' %]
> 
>         <h1>Overdue recalls</h1>
>         [% IF Koha.Preference('UseRecalls') %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_queue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_queue.tt
>index 8b833c3ab63..d159d8b7359 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_queue.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_queue.tt
>@@ -36,6 +36,7 @@
>             <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>         [% END %]
>         <main>
>+            [% INCLUDE 'messages.inc' %]
> 
>         <h1>Recalls queue</h1>
>         [% IF Koha.Preference('UseRecalls') %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt
>index feed9372df1..cdacbbbb37d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt
>@@ -39,6 +39,7 @@
>             <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>         [% END %]
>         <main>
>+            [% INCLUDE 'messages.inc' %]
> 
>         <h1>Recalls to pull</h1>
>         The following recalls could be fulfilled by available items.
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt
>index ce3bc20852a..b57658d2053 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt
>@@ -36,6 +36,7 @@
>             <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>         [% END %]
>         <main>
>+            [% INCLUDE 'messages.inc' %]
>                 <h1>Recalls awaiting pickup</h1>
> 
>                 [% IF Koha.Preference('UseRecalls') %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/request.tt
>index 206c83c4efe..6a552334cf2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/request.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/request.tt
>@@ -35,6 +35,7 @@
> <div class="row">
> <div class="col-sm-10 col-sm-push-2">
> <main>
>+    [% INCLUDE 'messages.inc' %]
> 
>     <h1>Existing recalls</h1>
> 
>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 e717fd904ad..c4a8816e9a6 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
>@@ -42,6 +42,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>Acquisitions statistics </h1>
> [% IF ( do_it ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt
>index 2cbeb322923..f8c9b49e8ac 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt
>@@ -42,6 +42,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% IF ( do_it ) %]
> 	[% FOREACH mainloo IN mainloop %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt
>index aa895c994c7..142414e1bff 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt
>@@ -39,6 +39,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% IF ( do_it ) %]
>     [% FOREACH mainloo IN mainloop %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
>index b1d18ce69d5..6f5adf7bfbe 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
>@@ -50,6 +50,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>Patrons statistics</h1>
> [% IF ( do_it ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
>index 5667a6defe5..42757789a95 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
>@@ -60,6 +60,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>     <h1>Cash register statistics</h1>
>     <form method="post" action="/cgi-bin/koha/reports/cash_register_stats.pl" id="frmCashRegister">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt
>index 8ff885af24a..f8c421ab15f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt
>@@ -43,6 +43,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% IF ( do_it ) %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
>index 6194de328a9..2ef97a2d093 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
>@@ -43,6 +43,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>                 [% IF ( do_it ) %]
>                     <h1>Items with no checkouts</h1>
>                     [% FOREACH mainloo IN mainloop %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
>index 997497e3aa7..486ad778d72 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
>@@ -43,6 +43,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>Catalog statistics</h1>
> [% IF ( do_it ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
>index 05e5d9f7369..ba651783035 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
>@@ -73,6 +73,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% IF ( start_dictionary ) %]
>     <div id="toolbar">
>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 e452fe4162e..a670947dd0c 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
>@@ -168,6 +168,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% INCLUDE "reports-toolbar.inc" %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt
>index 0843aa4212e..efe2023c40b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt
>@@ -40,6 +40,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>Average checkout period</h1>
> [% IF ( do_it ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
>index 6702b45055f..0cce6b7829b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
>@@ -46,6 +46,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>Circulation statistics</h1>
> [% IF ( do_it ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
>index fb20f860dac..89745878bb0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
>@@ -46,6 +46,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> 
> <h1>Lost items</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt
>index f8d55e3f325..98e1652358f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt
>@@ -44,6 +44,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> 
> [% IF ( do_it ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt
>index 80f0100fbe4..78763bb9c43 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt
>@@ -42,6 +42,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> 
> [% IF ( current_budget_name ) %]<h1>Orders for fund '[% current_budget_name | html %]'</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
>index 7939e38fb43..8731bdb98f3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
>@@ -24,6 +24,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+            [% INCLUDE 'messages.inc' %]
>             <h1>Reports</h1>
>             <div class="row">
>                 <div class="col-xs-6">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
>index b0c781a06aa..0df71a39319 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
>@@ -46,6 +46,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> 
> <h1>Holds statistics</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt
>index a5e24e25c82..1ed8beb3a86 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt
>@@ -45,6 +45,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> 	<h1>Serials subscriptions</h1>
> [% IF ( do_it ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>index 59f90bb2d8b..57f54a371a3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>@@ -146,6 +146,7 @@
>         [% END %]
> 
>         <main>
>+            [% INCLUDE 'messages.inc' %]
>             <h1>Holds</h1>
> 
>             [% IF ( nobiblio ) %]
>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 21d49e4de05..307118a99fa 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt
>@@ -34,6 +34,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>Comments</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
>index a13bc572d06..9d48ea03839 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
>@@ -39,6 +39,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>               [% IF ( ! colId ) %]
>                 <div class="dialog message">
>                     <p>Invalid collection id</p>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
>index bf4370550b4..0ef926b3525 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
>@@ -55,6 +55,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>               [% IF ( previousActionCreate ) %]
>                 [% IF ( createSuccess ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt
>index 1fadd9c4f53..ecb0b514bf2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt
>@@ -32,6 +32,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% INCLUDE 'rotating-collections-toolbar.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt
>index fb54c8f80a1..157fa1afc2e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt
>@@ -39,6 +39,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 <h1>[% tx("Transfer collection '{collection_title}'", { collection_title = colTitle }) | html %]</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt
>index ab5e55f5ab3..c8e8311fcc5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt
>@@ -9,6 +9,7 @@
> <div class="main container-fluid">
> 
> <h1>Vendor search results</h1>
>+            [% INCLUDE 'messages.inc' %]
> [% UNLESS count %]
>     <h2>Your search returned no results.</h2>
> [% ELSIF ( supplier.length < 1 ) %]
>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 f2eaebafef6..2c7bbd1c8e9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
>@@ -27,6 +27,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>Check expiration</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
>index 613650f5ab8..93253114b24 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
>@@ -40,6 +40,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 <h1>Claims [% IF ( suppliername ) %] for [% suppliername | html %] [% END %]</h1>
> 
>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 d46bd08f3a1..b58336a564a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt
>@@ -9,6 +9,7 @@
> <div class="main container-fluid">
> 
> [% IF ( total ) %]
>+            [% INCLUDE 'messages.inc' %]
> <h1>Search results from [% from | html %] to [% to | html %] of [% total | html %]</h1>
> <div class="page-section">
> <table>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
>index c44d66271f2..56bc219937b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
>@@ -28,6 +28,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>Preview routing list for <em>[% title | html %]</em></h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
>index 43565208cc3..0887b890fbc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
>@@ -34,6 +34,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% IF ( op ) %]
> <h1>Create routing list for <em>[% title | html %]</em></h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
>index cb662a179af..e1d8e8352c1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
>@@ -33,6 +33,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% INCLUDE 'modals/serials_multi_receiving.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
>index 172a015e6e1..f67b6433440 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
>@@ -100,6 +100,7 @@ $(document).ready(function() {
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>Serial edition <em>[% bibliotitle | html %]</em>
>     [% IF location %] ([% AuthorisedValues.GetByCode('LOC', location) | html %])[% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
>index a9a7c7e0612..45f7a0a3dae 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
>@@ -25,6 +25,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>       [% INCLUDE 'serials-toolbar.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
>index c1a95eab945..456e608f003 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
>@@ -220,6 +220,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
> 
>                     [% INCLUDE 'serials-toolbar.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
>index 10b7536775a..ae38d7b6418 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
>@@ -49,6 +49,7 @@ fieldset.rows table { clear: none; margin: 0; }
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+            [% INCLUDE 'messages.inc' %]
>             <h1>[% IF ( modify ) %] Modify subscription for <em>[% bibliotitle | html %]</em>[% ELSE %]Add a new subscription[% END %] (<span id="page_number">1/2</span>)</h1>
>         </div>
>     </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
>index 1f9050e60f5..ee1a6c7ff09 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
>@@ -28,6 +28,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                     <h1>Subscription batch edit</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt
>index b1557da4a55..4f3e8a042de 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt
>@@ -7,6 +7,7 @@
> <div class="main container-fluid">
> 
> <h1>Catalog search</h1>
>+            [% INCLUDE 'messages.inc' %]
> [% IF ( no_query ) %]
>     <div class="warning">You must enter a term to search on </div>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
>index 3d3d5a5052a..8523bc13111 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
>@@ -38,6 +38,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% INCLUDE 'serials-toolbar.inc' %]
>                 [% INCLUDE 'mana/mana-comment-status.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt
>index 5d67731a069..d386f51d6f3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt
>@@ -34,6 +34,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>       [% IF (new or modify) %]
>         [% IF (new) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt
>index 5507a38c44f..a2e161443b0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt
>@@ -29,6 +29,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>       <h1>Subscription history for [% title | html %]</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
>index 6bc37ca6f0a..0c6301528c5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
>@@ -41,6 +41,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>       [% IF (new or modify) %]
>           [% IF (new) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
>index cf2d4e0f537..bbfcc7decd7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
>@@ -26,6 +26,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 <h1>Alert subscribers for <em>[% bibliotitle | html %]</em></h1>
>                 <p>
>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 9d1cae4c0ed..0e6daed7763 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>@@ -93,6 +93,7 @@
>         <div class="main container-fluid">
>             <div class="row">
>                 <div class="col-md-8 col-md-offset-2">
>+                    [% INCLUDE 'messages.inc' %]
> 
>                     <div id="toolbar" class="btn-toolbar">
>                         <a class="btn btn-default" id="editsuggestion" href="suggestion.pl?op=edit&amp;csrf_token=[% csrf_token | html %]&amp;suggestionid=[% suggestionid | html %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
>@@ -315,10 +316,12 @@
>             <div class="main container-fluid">
>                 <div class="row">
>                     <div class="col-md-8 col-md-offset-2">
>+                        [% INCLUDE 'messages.inc' %]
>         [% ELSE %]
>             <div class="main container-fluid">
>                 <div class="row">
>                     <div class="col-sm-10 col-sm-push-2">
>+                        [% INCLUDE 'messages.inc' %]
>         [% END %]
> 
>         [% IF op == 'save' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt
>index a2e0ce2f74d..8a90afb4bd0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt
>@@ -33,6 +33,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 <h1>Results for tag <em>[% tag | html %]</em></h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
>index 7c66bfb0248..0fd53f65d85 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
>@@ -35,6 +35,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
>     <div class="row">
>         <div class="col-sm-12">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> <div class="row">
> <div class="col-sm-8 col-sm-push-2">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt
>index 886d8a4ee3c..fc6739bf3f9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt
>@@ -26,6 +26,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>     <h1>Access files</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
>index dbf97f69f08..658665ae330 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
>@@ -97,6 +97,7 @@
> [% END %]
> 
> <main>
>+    [% INCLUDE 'messages.inc' %]
> 
>     [% FOR m IN messages %]
>         <div class="dialog [% m.type | html %]">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
>index 22683cef3b7..4c9e85ef010 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
>@@ -36,6 +36,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>         [% IF ( op == 'edit_form' ) %]
>           <form method="post" id="rules_form" action="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
>index 1608d37c64c..9a7862c03ec 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
>@@ -31,6 +31,7 @@
> <div class="main container-fluid">
> 
>     <h1>Batch item deletion</h1>
>+            [% INCLUDE 'messages.inc' %]
> 
>     [% FOREACH message IN messages %]
>       [% IF message.type == 'success' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
>index 580c8b12df4..ac8f05f74a5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
>@@ -31,6 +31,7 @@
>     <div class="main container-fluid">
> 
>         <h1>Batch item modification</h1>
>+                [% INCLUDE 'messages.inc' %]
>         [% IF op == 'enqueued' %]
>             <div class="dialog message">
>               <p>The job has been enqueued! It will be processed as soon as possible.</p>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt
>index df5a93df6a9..042933d6311 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt
>@@ -32,6 +32,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 <h1>Batch item [% IF ( del ) %]deletion[% ELSE %]modification[% END %]</h1>
>                         <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/batchMod.pl">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
>index 6e30e93dd24..ea824ca5da2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
>@@ -27,6 +27,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>   <h1>Batch record deletion</h1>
>   [% FOREACH message IN messages %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
>index 36d14f5eeb1..a27e3d7b15e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
>@@ -33,6 +33,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
> 
>                     <h1>Batch extend due dates</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
>index 2c83052eb1a..c2180a4826f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
>@@ -37,6 +37,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
> 
>                     <h1>Batch record modification</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt
>index 3f7607347ed..b3f09ebfb22 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt
>@@ -54,6 +54,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% IF !OnlyMine %]
>   [% IF current_branch == '*' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
>index 6b604e77f23..022bb96b332 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
>@@ -50,6 +50,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% FOR m IN messages %]
>     <div class="dialog [% m.type | html %]">
>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 59f850f22be..d77a9df8cc0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt
>@@ -32,6 +32,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 <h1>Export data</h1>
> 
>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 f03db0c0ff0..1c15d0d34c1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
>@@ -28,6 +28,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 <h1>[% Branches.GetName( branch ) | html %] calendar</h1>
> 
>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 2cc8ede5cd9..b517b8d2890 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
>@@ -46,6 +46,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>     <div class="row">
>      <div class="col-sm-6">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
>index a430a3fc248..2b91ac2decb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
>@@ -39,6 +39,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>     <h1>Inventory</h1>
>     [% IF (moddatecount) %]<div class="dialog message">[% moddatecount | html %] items modified : datelastseen set to [% date | $KohaDates with_hours => 1 %]</div>
>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 15e2633ef04..1c07db7da45 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>@@ -125,6 +125,7 @@
>             <div class="row">
>                 <div class="col-sm-10 col-sm-push-2">
>                     <main>
>+                        [% INCLUDE 'messages.inc' %]
>     [% END %]
> 
>                 [% IF ( no_op_set ) %]
>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 e11c2611a1a..835cd19aa05 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,6 +45,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
>                     <h1>Manage staged MARC records
>                         [% IF ( import_batch_id ) %]
>                             &rsaquo; Batch [% import_batch_id | html %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
>index 160a82f7a8d..ee26212ec54 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
>@@ -57,6 +57,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>             <div id="toolbar" class="btn-toolbar">
>                 <a href="#" data-toggle="modal" data-template_id="" data-target="#createTemplate" id="new_template" class="btn btn-default duplicate_template"><i class="fa fa-plus"></i> New template</a>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
>index d66fd48da5d..3300a33007a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
>@@ -31,6 +31,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% IF ( op == 'show_form' ) %]
>                     <h1>Batch patron modification</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt
>index 953de54febe..4dc3aafc8f4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt
>@@ -29,6 +29,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>         <h1>Defining [% IF ( branch ) %]overdue actions for [% Branches.GetName( branch ) | html %][% ELSE %]default overdue actions[% END %]</h1>
>         <div class="help">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/page.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/page.tt
>index 634ce415a48..a7ef5e6eb55 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/page.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/page.tt
>@@ -30,6 +30,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
> 
>                     [% IF page %]
> 
>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 1e0a38c26f8..fb9f7bf2b80 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
>@@ -36,6 +36,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% IF ( TOTAL ) %]
>             [% IF ( ERRORS ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt
>index fb7b0f5fbe9..255cf279998 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt
>@@ -6,6 +6,7 @@
>         <div class="main container-fluid">
>             <h1>Preview notice template</h1>
>             [% FOR m IN messages %]
>+                    [% INCLUDE 'messages.inc' %]
>                 [%# FIXME The message block does not appear at the top of the modal! %]
>                 <div class="dialog [% m.type | html %]">
>                     [% SWITCH m.code %]
>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 5d6da9b6277..76b0ac0d2cb 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
>@@ -29,6 +29,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>             <h1>OPAC problem reports</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt
>index 583de621d6e..5c0e13b4fd0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt
>@@ -39,6 +39,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>                 <div id="toolbar" class="btn-toolbar" style="display:none">
>                     <div class="btn-group"><a class="btn btn-primary" id="save_quotes" href="#"><i class="fa fa-save"></i> Save quotes</a></div>
>                     <div class="btn-group"><a href="/cgi-bin/koha/tools/quotes-upload.pl" id="cancel_quotes" class="btn btn-default"><i class="fa fa-times"></i> Cancel import</a></div>
>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 39876554e22..3ec9f120401 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
>@@ -35,6 +35,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> [% FOREACH m IN messages %]
>     <div class="dialog [% m.type | html %]" id="quote_action_result_dialog">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt
>index 033d819884d..73baeb38967 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt
>@@ -26,6 +26,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 <h1>Task scheduler</h1>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt
>index 00acb8b599d..8dd5bff4188 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt
>@@ -36,6 +36,7 @@
> <div class="main container-fluid">
>     <div class="row">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
>             <h1>Compare matched records</h1>
> 
>         <div id="col1" class="col-sm-6">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
>index be7669afff7..38e92448ec1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
>@@ -41,6 +41,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>         [% FOREACH message IN messages %]
>           [% IF message.type == 'success' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
>index 75bb35ecd40..bb6b7018023 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
>@@ -69,6 +69,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>             <div id="stockrotation">
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
>index c2638ace0b1..5de96de3b1c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
>@@ -23,6 +23,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+            [% INCLUDE 'messages.inc' %]
>             <h1>Tools</h1>
>             <div class="row">
>                 <div class="col-sm-6">
>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 aef69c110aa..3b5f92526d4 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
>@@ -125,6 +125,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% UNLESS itemnumber || biblionumber %]
>                     <h1>Upload local cover image</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
>index c6c13cb9b50..79e5ad88c78 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
>@@ -239,6 +239,7 @@
>             <div class="row">
>                 <div class="col-sm-12">
>                     <main>
>+                        [% INCLUDE 'messages.inc' %]
> [% ELSE %]
>     <body id="tools_upload" class="tools">
>     [% WRAPPER 'header.inc' %]
>@@ -268,6 +269,7 @@
>         <div class="row">
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>+                    [% INCLUDE 'messages.inc' %]
> [% END %]
> 
> <h1>Upload</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>index c4c3d3d6d96..68cee194b60 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>@@ -191,6 +191,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
> 				<h1>Browse system logs</h1>
> 				<form method="post" action="/cgi-bin/koha/tools/viewlog.pl">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
>index ee7b98290c8..2796159d6e4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
>@@ -132,6 +132,7 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-1">
>             <main>
>+                [% INCLUDE 'messages.inc' %]
> 
>             [% IF op != 'transfer' %][% INCLUDE 'virtualshelves-toolbar.inc' %][% END %]
> 
>-- 
>2.25.1

Actions: View | Diff | Splinter Review

Attachments on bug 34862: 155991 | 155992 | 155993 | 155997 | 155998 | 155999 | 156000 | 158755 | 158756 | 158757 | 158758 | 158759 | 159472 | 159473 | 159474 | 159475 | 159476 | 159477 | 161666 | 161667 | 161668 | 161669 | 161670 | 161671 | 161672 | 161673 | 161674 | 161675 | 161676 | 161677 | 161678